From f03f08a38f4f343bd8690d5582b892e4c20d3a27 Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Wed, 24 Mar 2021 08:39:43 +0000 Subject: [PATCH] Battle items (#222) * a * Dizzy Dial * Dried shroom * Dusty Hammer * Egg Missile * Electro Pop * Fire Flower * Food * Fright Jar * Hustle Drink * Insecticide Herb * Life Shroom * Mushroom * Mystery (partial) * Pebble * Please Come Back * POW Block * Repel Gel * Shooting Star * Sleepy Sheep * Snowman Doll * Stone Cap * Stop Watch * Strange Cake * Strange Cake fixed * Stone Cap broked * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "db0b6f0cba" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "db0b6f0cba" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Static all the things * Tasty Tonic * Thunder Bolt * Thunder Rage * Ultra Shroom * Unknown Item * Volt Shroom Format & coverage * Item Ids Co-authored-by: Lavos1 --- include/enums.h | 218 ++++---- include/functions.h | 10 +- include/include_asm.h | 4 +- include/macros.h | 4 + src/battle/item/coconut/coconut.c | 18 +- src/battle/item/coconut/lib.c | 2 +- src/battle/item/dizzy_dial/dizzy_dial.c | 51 ++ src/battle/item/dizzy_dial/dizzy_dial.h | 17 + src/battle/item/dizzy_dial/lib.c | 192 +++++++ src/battle/item/dizzy_dial_727910.c | 9 - src/battle/item/dried_shroom/dried_shroom.c | 24 + src/battle/item/dried_shroom/dried_shroom.h | 19 + src/battle/item/dried_shroom/lib.c | 175 ++++++ src/battle/item/dried_shroom_71CCE0.c | 9 - src/battle/item/dusty_hammer/dusty_hammer.c | 80 +++ src/battle/item/dusty_hammer/dusty_hammer.h | 13 + src/battle/item/dusty_hammer/lib.c | 147 ++++++ src/battle/item/dusty_hammer_7179D0.c | 5 - src/battle/item/egg_missile/egg_missile.c | 154 ++++++ src/battle/item/egg_missile/egg_missile.h | 15 + src/battle/item/egg_missile/lib.c | 158 ++++++ src/battle/item/egg_missile_728EC0.c | 7 - src/battle/item/electro_pop/electro_pop.c | 33 ++ src/battle/item/electro_pop/electro_pop.h | 22 + src/battle/item/electro_pop/lib.c | 225 ++++++++ src/battle/item/electro_pop_7305A0.c | 21 - src/battle/item/fire_flower/fire_flower.c | 63 +++ src/battle/item/fire_flower/fire_flower.h | 17 + src/battle/item/fire_flower/lib.c | 175 ++++++ src/battle/item/fire_flower_716C60.c | 22 - src/battle/item/food/food.c | 139 +++++ src/battle/item/food/food.h | 29 + src/battle/item/food/lib.c | 232 ++++++++ src/battle/item/food_7330D0.c | 21 - src/battle/item/fright_jar/fright_jar.c | 55 ++ src/battle/item/fright_jar/fright_jar.h | 17 + src/battle/item/fright_jar/lib.c | 164 ++++++ src/battle/item/fright_jar_72B910.c | 10 - src/battle/item/hustle_drink/hustle_drink.c | 79 +++ src/battle/item/hustle_drink/hustle_drink.h | 18 + src/battle/item/hustle_drink/lib.c | 178 +++++++ src/battle/item/hustle_drink_725F60.c | 9 - .../item/insecticide_herb/insecticide_herb.c | 96 ++++ .../item/insecticide_herb/insecticide_herb.h | 16 + src/battle/item/insecticide_herb/lib.c | 210 ++++++++ src/battle/item/insecticide_herb_72A750.c | 11 - src/battle/item/life_shroom/lib.c | 225 ++++++++ src/battle/item/life_shroom/life_shroom.c | 110 ++++ src/battle/item/life_shroom/life_shroom.h | 26 + src/battle/item/life_shroom_72E530.c | 15 - src/battle/item/mushroom/lib.c | 224 ++++++++ src/battle/item/mushroom/mushroom.c | 129 +++++ src/battle/item/mushroom/mushroom.h | 28 + src/battle/item/mushroom_715850.c | 21 - src/battle/item/mystery/lib.c | 364 +++++++++++++ src/battle/item/mystery/mystery.c | 91 ++++ src/battle/item/mystery/mystery.h | 23 + src/battle/item/mystery_72C5B0.c | 11 - src/battle/item/pebble/lib.c | 147 ++++++ src/battle/item/pebble/pebble.c | 80 +++ src/battle/item/pebble/pebble.h | 13 + src/battle/item/pebble_719970.c | 5 - src/battle/item/please_come_back/lib.c | 146 +++++ .../item/please_come_back/please_come_back.c | 15 + .../item/please_come_back/please_come_back.h | 14 + src/battle/item/please_come_back_7285E0.c | 5 - src/battle/item/pow_block/lib.c | 189 +++++++ src/battle/item/pow_block/pow_block.c | 76 +++ src/battle/item/pow_block/pow_block.h | 20 + src/battle/item/pow_block_718850.c | 11 - src/battle/item/repel_gel/lib.c | 158 ++++++ src/battle/item/repel_gel/repel_gel.c | 21 + src/battle/item/repel_gel/repel_gel.h | 15 + src/battle/item/repel_gel_72DB70.c | 7 - src/battle/item/shooting_star/lib.c | 237 +++++++++ src/battle/item/shooting_star/shooting_star.c | 72 +++ src/battle/item/shooting_star/shooting_star.h | 18 + src/battle/item/shooting_star_71D770.c | 13 - src/battle/item/sleepy_sheep/lib.c | 365 +++++++++++++ src/battle/item/sleepy_sheep/sleepy_sheep.c | 248 +++++++++ src/battle/item/sleepy_sheep/sleepy_sheep.h | 24 + src/battle/item/sleepy_sheep_71E650.c | 11 - src/battle/item/snowman_doll/lib.c | 176 +++++++ src/battle/item/snowman_doll/snowman_doll.c | 69 +++ src/battle/item/snowman_doll/snowman_doll.h | 19 + src/battle/item/snowman_doll_71BE30.c | 12 - src/battle/item/stone_cap/lib.c | 188 +++++++ src/battle/item/stone_cap/stone_cap.c | 15 + src/battle/item/stone_cap/stone_cap.h | 17 + src/battle/item/stone_cap_7215A0.c | 7 - src/battle/item/stop_watch/lib.c | 164 ++++++ src/battle/item/stop_watch/stop_watch.c | 35 ++ src/battle/item/stop_watch/stop_watch.h | 20 + src/battle/item/stop_watch_726DD0.c | 10 - src/battle/item/strange_cake/lib.c | 431 +++++++++++++++ src/battle/item/strange_cake/strange_cake.c | 110 ++++ src/battle/item/strange_cake/strange_cake.h | 30 ++ src/battle/item/strange_cake_731300.c | 29 - src/battle/item/super_soda/lib.c | 224 ++++++++ src/battle/item/super_soda/super_soda.c | 114 ++++ src/battle/item/super_soda/super_soda.h | 24 + src/battle/item/super_soda_724CE0.c | 17 - src/battle/item/tasty_tonic/lib.c | 171 ++++++ src/battle/item/tasty_tonic/tasty_tonic.c | 39 ++ src/battle/item/tasty_tonic/tasty_tonic.h | 19 + src/battle/item/tasty_tonic_722000.c | 7 - src/battle/item/thunder_bolt/lib.c | 193 +++++++ src/battle/item/thunder_bolt/thunder_bolt.c | 34 ++ src/battle/item/thunder_bolt/thunder_bolt.h | 17 + src/battle/item/thunder_bolt_722B40.c | 12 - src/battle/item/thunder_rage/lib.c | 192 +++++++ src/battle/item/thunder_rage/thunder_rage.c | 40 ++ src/battle/item/thunder_rage/thunder_rage.h | 17 + src/battle/item/thunder_rage_71B1A0.c | 12 - src/battle/item/ultra_shroom/lib.c | 167 ++++++ src/battle/item/ultra_shroom/ultra_shroom.c | 27 + src/battle/item/ultra_shroom/ultra_shroom.h | 20 + src/battle/item/ultra_shroom_723780.c | 9 - src/battle/item/unknown_item/lib.c | 167 ++++++ src/battle/item/unknown_item/unknown_item.c | 25 + src/battle/item/unknown_item/unknown_item.h | 20 + src/battle/item/unknown_item_724240.c | 9 - src/battle/item/volt_shroom/lib.c | 155 ++++++ src/battle/item/volt_shroom/volt_shroom.c | 22 + src/battle/item/volt_shroom/volt_shroom.h | 16 + src/battle/item/volt_shroom_71A7F0.c | 7 - src/battle/move/hammer_charge_0_74F130.c | 2 +- src/battle/move/hammer_charge_1_7595B0.c | 2 +- src/battle/move/hammer_charge_2_75E5D0.c | 2 +- src/battle/move/jump_charge_0_74D570.c | 2 +- src/battle/move/jump_charge_1_75C980.c | 2 +- src/battle/move/jump_charge_2_761920.c | 2 +- src/battle/partner/bombette_6FAD10.c | 18 +- src/battle/partner/bow_710EF0.c | 10 +- src/battle/partner/goombario_6F10E0.c | 3 +- src/battle/partner/kooper_6F5E80.c | 6 +- src/battle/star/chill_out_7900D0.c | 3 +- src/battle/star/lullaby_78D150.c | 4 +- src/code_10400_len_d30.c | 2 +- src/code_104940_len_dc0.c | 5 +- src/code_106EF0.c | 3 +- src/code_13870_len_6980.c | 4 +- src/code_16F740.c | 4 +- src/code_16c8e0.c | 2 +- src/code_182B30.c | 14 +- src/code_18F340.c | 10 +- src/code_190B20.c | 4 +- src/code_1AC760.c | 3 +- src/code_1AF230.c | 9 +- src/code_1b40_len_20b0.c | 6 +- src/code_23680.c | 2 +- src/code_28910_len_5090.c | 2 +- src/code_31650.c | 2 +- src/code_328110.c | 2 +- src/code_32C110.c | 2 +- src/code_32C7A0.c | 2 +- src/code_32DD10.c | 2 +- src/code_32E490.c | 2 +- src/code_32EE30.c | 2 +- src/code_32F580.c | 2 +- src/code_32FE30.c | 2 +- src/code_330910.c | 2 +- src/code_331940.c | 2 +- src/code_333EC0.c | 2 +- src/code_337240.c | 2 +- src/code_339250.c | 2 +- src/code_33B180.c | 2 +- src/code_33CDF0.c | 2 +- src/code_33E8C0.c | 2 +- src/code_33FE80.c | 2 +- src/code_3419E0.c | 2 +- src/code_342140.c | 2 +- src/code_343680.c | 2 +- src/code_344A10.c | 2 +- src/code_3454E0.c | 4 +- src/code_34DD20.c | 2 +- src/code_34EC80.c | 2 +- src/code_34F4C0.c | 4 +- src/code_352440.c | 2 +- src/code_353300.c | 2 +- src/code_3547A0.c | 2 +- src/code_354F60.c | 2 +- src/code_355EE0.c | 2 +- src/code_356980.c | 2 +- src/code_3584C0.c | 2 +- src/code_359F20.c | 2 +- src/code_35B9D0.c | 2 +- src/code_35BFD0.c | 2 +- src/code_35CA80.c | 2 +- src/code_35DA00.c | 2 +- src/code_35E920.c | 2 +- src/code_3602C0.c | 2 +- src/code_360F40.c | 2 +- src/code_3625C0.c | 4 +- src/code_363160.c | 2 +- src/code_364300.c | 2 +- src/code_364F10.c | 2 +- src/code_366030.c | 2 +- src/code_36A8D0.c | 2 +- src/code_36D020.c | 2 +- src/code_36E1D0.c | 2 +- src/code_372790.c | 2 +- src/code_3740B0.c | 4 +- src/code_374E50.c | 2 +- src/code_376460.c | 2 +- src/code_377070.c | 6 +- src/code_37A3F0.c | 4 +- src/code_37C540.c | 4 +- src/code_37D490.c | 2 +- src/code_37F720.c | 2 +- src/code_3812C0.c | 4 +- src/code_385640.c | 4 +- src/code_3889D0.c | 2 +- src/code_389850.c | 4 +- src/code_38ADF0.c | 2 +- src/code_38C5F0.c | 2 +- src/code_38DE00.c | 2 +- src/code_38EE60.c | 2 +- src/code_38F900.c | 4 +- src/code_391D30.c | 2 +- src/code_3928D0.c | 2 +- src/code_394280.c | 2 +- src/code_395BB0.c | 2 +- src/code_3965B0.c | 2 +- src/code_3981F0.c | 2 +- src/code_39FF20.c | 2 +- src/code_3A2990.c | 4 +- src/code_3A37E0.c | 4 +- src/code_3A5550.c | 4 +- src/code_3A70F0.c | 4 +- src/code_3AA920.c | 2 +- src/code_3AEE20.c | 4 +- src/code_3B2350.c | 4 +- src/code_3B3EB0.c | 2 +- src/code_3B4790.c | 4 +- src/code_3B5CF0.c | 4 +- src/code_3B7160.c | 4 +- src/code_3B7B80.c | 4 +- src/code_3B8BD0.c | 4 +- src/code_3BA030.c | 4 +- src/code_3BBF60.c | 4 +- src/code_3BCD60.c | 4 +- src/code_3C11D0.c | 4 +- src/code_3CADF0.c | 4 +- src/code_3CC9E0.c | 2 +- src/code_3CF3A0.c | 4 +- src/code_3D0500.c | 2 +- src/code_3D1690.c | 4 +- src/code_3D2AC0.c | 4 +- src/code_3D3E20.c | 2 +- src/code_3D4970.c | 4 +- src/code_3D5020.c | 4 +- src/code_3D67C0.c | 6 +- src/code_3D7240.c | 4 +- src/code_3D7A70.c | 4 +- src/code_3D8720.c | 2 +- src/code_3DB460.c | 4 +- src/code_3DC310.c | 4 +- src/code_3DE000.c | 4 +- src/code_3E0930.c | 4 +- src/code_3E1690.c | 2 +- src/code_3E1EE0.c | 4 +- src/code_3E43A0.c | 2 +- src/code_3E54C0.c | 2 +- src/code_3EB4E0.c | 2 +- src/code_3F83F0.c | 2 +- src/code_3F9E50.c | 2 +- src/code_3FEAE0.c | 2 +- src/code_402640.c | 2 +- src/code_403400.c | 2 +- src/code_404220.c | 4 +- src/code_406B40.c | 2 +- src/code_409990.c | 2 +- src/code_40B3F0.c | 2 +- src/code_40C5A0.c | 2 +- src/code_412730.c | 2 +- src/code_413360.c | 2 +- src/code_414BA0.c | 2 +- src/code_415D90.c | 4 +- src/code_43F0.c | 6 +- src/code_4DF30.c | 2 +- src/code_4ac90_len_3910.c | 7 +- src/code_77480.c | 12 +- src/code_7bb60_len_41b0.c | 11 +- src/code_CEE40.c | 2 +- src/code_DF950.c | 9 +- src/code_E2EDE0.c | 2 +- src/code_F5750.c | 5 +- src/code_b72b0_len_15ed0.c | 2 +- src/code_d5a50_len_5fd0.c | 6 +- src/code_ddaf0_len_c50.c | 6 +- src/code_e0b30_len_b80.c | 3 +- src/code_ebd0_len_6a0.c | 1 - src/code_fee30_len_2d60.c | 3 +- src/os/code_4a1f0_len_170.c | 6 +- src/os/code_4a360_len_930.c | 2 +- src/os/osCreatePiManager.c | 5 +- src/os/osSetThreadPri.c | 6 +- src/world/actions.c | 78 +-- src/world/partners.c | 12 +- tools/compile_dsl_macros.py | 3 + tools/disasm_script.py | 149 +++++- tools/m2ctx.py | 3 +- tools/splat/.gitrepo | 4 +- tools/splat/segtypes/n64/code.py | 7 +- tools/splat/split.py | 2 +- .../data/battle/item/dizzy_dial_727CE0.data.s | 9 - .../data/battle/item/mystery_72CF00.data.s | 4 +- .../battle/item/sleepy_sheep_71EFC0.data.s | 11 - .../battle/item/strange_cake_731EA0.data.s | 11 - .../dizzy_dial_727910/func_802A1000_727910.s | 125 ----- .../dizzy_dial_727910/func_802A11D4_727AE4.s | 31 -- .../dizzy_dial_727910/func_802A123C_727B4C.s | 17 - .../dizzy_dial_727910/func_802A1270_727B80.s | 96 ---- .../func_802A1000_71CCE0.s | 125 ----- .../func_802A11D4_71CEB4.s | 31 -- .../func_802A123C_71CF1C.s | 52 -- .../func_802A12FC_71CFDC.s | 18 - .../func_802A1000_7179D0.s | 125 ----- .../func_802A11D4_717BA4.s | 32 -- .../egg_missile_728EC0/func_802A1000_728EC0.s | 125 ----- .../egg_missile_728EC0/func_802A11D4_729094.s | 31 -- .../egg_missile_728EC0/func_802A123C_7290FC.s | 57 -- .../electro_pop_7305A0/func_802A1000_7305A0.s | 125 ----- .../electro_pop_7305A0/func_802A11D4_730774.s | 31 -- .../electro_pop_7305A0/func_802A123C_7307DC.s | 20 - .../electro_pop_7305A0/func_802A127C_73081C.s | 52 -- .../electro_pop_7305A0/func_802A133C_7308DC.s | 52 -- .../electro_pop_7305A0/func_802A1450_7309F0.s | 24 - .../electro_pop_7305A0/func_802A149C_730A3C.s | 26 - .../electro_pop_7305A0/func_802A14F0_730A90.s | 25 - .../fire_flower_716C60/func_802A1000_716C60.s | 125 ----- .../fire_flower_716C60/func_802A123C_716E9C.s | 45 -- .../fire_flower_716C60/func_802A1378_716FD8.s | 41 -- .../item/food_7330D0/func_802A1000_7330D0.s | 125 ----- .../item/food_7330D0/func_802A11D4_7332A4.s | 31 -- .../item/food_7330D0/func_802A123C_73330C.s | 48 -- .../item/food_7330D0/func_802A12EC_7333BC.s | 43 -- .../item/food_7330D0/func_802A1378_733448.s | 52 -- .../item/food_7330D0/func_802A1438_733508.s | 52 -- .../item/food_7330D0/func_802A15A0_733670.s | 43 -- .../fright_jar_72B910/func_802A1000_72B910.s | 125 ----- .../fright_jar_72B910/func_802A11D4_72BAE4.s | 31 -- .../fright_jar_72B910/func_802A12D4_72BBE4.s | 38 -- .../func_802A1000_725F60.s | 125 ----- .../func_802A11D4_726134.s | 31 -- .../func_802A123C_72619C.s | 42 -- .../func_802A12C4_726224.s | 11 - .../func_802A1000_72A750.s | 125 ----- .../func_802A11D4_72A924.s | 31 -- .../func_802A123C_72A98C.s | 21 - .../func_802A1280_72A9D0.s | 28 - .../func_802A12E0_72AA30.s | 84 --- .../life_shroom_72E530/func_802A1000_72E530.s | 125 ----- .../life_shroom_72E530/func_802A11D4_72E704.s | 31 -- .../life_shroom_72E530/func_802A123C_72E76C.s | 48 -- .../life_shroom_72E530/func_802A12EC_72E81C.s | 43 -- .../life_shroom_72E530/func_802A1378_72E8A8.s | 52 -- .../life_shroom_72E530/func_802A1438_72E968.s | 24 - .../life_shroom_72E530/func_802A1484_72E9B4.s | 33 -- .../mushroom_715850/func_802A1000_715850.s | 125 ----- .../mushroom_715850/func_802A11D4_715A24.s | 31 -- .../mushroom_715850/func_802A123C_715A8C.s | 48 -- .../mushroom_715850/func_802A12EC_715B3C.s | 43 -- .../mushroom_715850/func_802A1378_715BC8.s | 52 -- .../mushroom_715850/func_802A1438_715C88.s | 52 -- .../mushroom_715850/func_802A15A0_715DF0.s | 28 - ...attle_item_mystery_func_802A123C_72C7EC.s} | 0 ...attle_item_mystery_func_802A13E4_72C994.s} | 18 +- .../mystery_72C5B0/func_802A1000_72C5B0.s | 125 ----- .../mystery_72C5B0/func_802A11D4_72C784.s | 31 -- .../mystery_72C5B0/func_802A188C_72CE3C.s | 53 -- .../item/pebble_719970/func_802A1000_719970.s | 125 ----- .../item/pebble_719970/func_802A11D4_719B44.s | 32 -- .../func_802A1000_7285E0.s | 125 ----- .../func_802A11D4_7287B4.s | 32 -- .../pow_block_718850/func_802A1000_718850.s | 125 ----- .../pow_block_718850/func_802A11D4_718A24.s | 31 -- .../pow_block_718850/func_802A123C_718A8C.s | 47 -- .../pow_block_718850/func_802A12E4_718B34.s | 17 - .../pow_block_718850/func_802A1318_718B68.s | 39 -- .../repel_gel_72DB70/func_802A1000_72DB70.s | 125 ----- .../repel_gel_72DB70/func_802A11D4_72DD44.s | 31 -- .../repel_gel_72DB70/func_802A123C_72DDAC.s | 25 - ...item_shooting_star_func_802A123C_71D9AC.s} | 0 .../func_802A1000_71D770.s | 125 ----- .../func_802A11D4_71D944.s | 31 -- .../func_802A1388_71DAF8.s | 51 -- .../func_802A1444_71DBB4.s | 41 -- .../func_802A14D4_71DC44.s | 38 -- ..._item_sleepy_sheep_func_802A123C_71E88C.s} | 15 +- .../func_802A1000_71E650.s | 125 ----- .../func_802A11D4_71E824.s | 31 -- .../func_802A1740_71ED90.s | 76 --- .../func_802A1848_71EE98.s | 83 --- .../func_802A1000_71BE30.s | 125 ----- .../func_802A11D4_71C004.s | 31 -- .../func_802A123C_71C06C.s | 61 --- .../func_802A13B8_71C1E8.s | 41 -- .../stone_cap_7215A0/func_802A1000_7215A0.s | 125 ----- .../stone_cap_7215A0/func_802A11D4_721774.s | 31 -- .../stone_cap_7215A0/func_802A123C_7217DC.s | 112 ---- .../stop_watch_726DD0/func_802A1000_726DD0.s | 125 ----- .../stop_watch_726DD0/func_802A11D4_726FA4.s | 31 -- .../stop_watch_726DD0/func_802A12D4_7270A4.s | 38 -- ..._item_strange_cake_func_802A123C_73153C.s} | 0 ..._item_strange_cake_func_802A13E4_7316E4.s} | 19 +- .../func_802A1000_731300.s | 125 ----- .../func_802A11D4_7314D4.s | 31 -- .../func_802A1818_731B18.s | 52 -- .../func_802A18D8_731BD8.s | 52 -- .../func_802A1A40_731D40.s | 24 - .../func_802A1A8C_731D8C.s | 24 - .../func_802A1AD8_731DD8.s | 19 - .../func_802A1B14_731E14.s | 25 - .../func_802A1B68_731E68.s | 18 - .../super_soda_724CE0/func_802A1000_724CE0.s | 125 ----- .../super_soda_724CE0/func_802A11D4_724EB4.s | 31 -- .../super_soda_724CE0/func_802A123C_724F1C.s | 48 -- .../super_soda_724CE0/func_802A12EC_724FCC.s | 43 -- .../super_soda_724CE0/func_802A1378_725058.s | 47 -- .../super_soda_724CE0/func_802A1418_7250F8.s | 52 -- .../tasty_tonic_722000/func_802A1000_722000.s | 125 ----- .../tasty_tonic_722000/func_802A11D4_7221D4.s | 31 -- .../tasty_tonic_722000/func_802A123C_72223C.s | 44 -- .../func_802A1000_722B40.s | 125 ----- .../func_802A11D4_722D14.s | 31 -- .../func_802A123C_722D7C.s | 89 ---- .../func_802A1420_722F60.s | 39 -- .../func_802A1000_71B1A0.s | 125 ----- .../func_802A11D4_71B374.s | 31 -- .../func_802A12D4_71B474.s | 39 -- .../func_802A1354_71B4F4.s | 89 ---- .../func_802A1000_723780.s | 125 ----- .../func_802A11D4_723954.s | 31 -- .../func_802A123C_7239BC.s | 52 -- .../func_802A12FC_723A7C.s | 18 - .../func_802A1000_724240.s | 125 ----- .../func_802A11D4_724414.s | 31 -- .../func_802A123C_72447C.s | 52 -- .../func_802A12FC_72453C.s | 18 - .../volt_shroom_71A7F0/func_802A1000_71A7F0.s | 125 ----- .../volt_shroom_71A7F0/func_802A11D4_71A9C4.s | 31 -- .../volt_shroom_71A7F0/func_802A123C_71AA2C.s | 21 - ver/us/splat.yaml | 298 +++++++---- ver/us/symbol_addrs.txt | 498 +++++++++++++----- 446 files changed, 10090 insertions(+), 8742 deletions(-) create mode 100644 src/battle/item/dizzy_dial/dizzy_dial.c create mode 100644 src/battle/item/dizzy_dial/dizzy_dial.h create mode 100644 src/battle/item/dizzy_dial/lib.c delete mode 100644 src/battle/item/dizzy_dial_727910.c create mode 100644 src/battle/item/dried_shroom/dried_shroom.c create mode 100644 src/battle/item/dried_shroom/dried_shroom.h create mode 100644 src/battle/item/dried_shroom/lib.c delete mode 100644 src/battle/item/dried_shroom_71CCE0.c create mode 100644 src/battle/item/dusty_hammer/dusty_hammer.c create mode 100644 src/battle/item/dusty_hammer/dusty_hammer.h create mode 100644 src/battle/item/dusty_hammer/lib.c delete mode 100644 src/battle/item/dusty_hammer_7179D0.c create mode 100644 src/battle/item/egg_missile/egg_missile.c create mode 100644 src/battle/item/egg_missile/egg_missile.h create mode 100644 src/battle/item/egg_missile/lib.c delete mode 100644 src/battle/item/egg_missile_728EC0.c create mode 100644 src/battle/item/electro_pop/electro_pop.c create mode 100644 src/battle/item/electro_pop/electro_pop.h create mode 100644 src/battle/item/electro_pop/lib.c delete mode 100644 src/battle/item/electro_pop_7305A0.c create mode 100644 src/battle/item/fire_flower/fire_flower.c create mode 100644 src/battle/item/fire_flower/fire_flower.h create mode 100644 src/battle/item/fire_flower/lib.c delete mode 100644 src/battle/item/fire_flower_716C60.c create mode 100644 src/battle/item/food/food.c create mode 100644 src/battle/item/food/food.h create mode 100644 src/battle/item/food/lib.c delete mode 100644 src/battle/item/food_7330D0.c create mode 100644 src/battle/item/fright_jar/fright_jar.c create mode 100644 src/battle/item/fright_jar/fright_jar.h create mode 100644 src/battle/item/fright_jar/lib.c delete mode 100644 src/battle/item/fright_jar_72B910.c create mode 100644 src/battle/item/hustle_drink/hustle_drink.c create mode 100644 src/battle/item/hustle_drink/hustle_drink.h create mode 100644 src/battle/item/hustle_drink/lib.c delete mode 100644 src/battle/item/hustle_drink_725F60.c create mode 100644 src/battle/item/insecticide_herb/insecticide_herb.c create mode 100644 src/battle/item/insecticide_herb/insecticide_herb.h create mode 100644 src/battle/item/insecticide_herb/lib.c delete mode 100644 src/battle/item/insecticide_herb_72A750.c create mode 100644 src/battle/item/life_shroom/lib.c create mode 100644 src/battle/item/life_shroom/life_shroom.c create mode 100644 src/battle/item/life_shroom/life_shroom.h delete mode 100644 src/battle/item/life_shroom_72E530.c create mode 100644 src/battle/item/mushroom/lib.c create mode 100644 src/battle/item/mushroom/mushroom.c create mode 100644 src/battle/item/mushroom/mushroom.h delete mode 100644 src/battle/item/mushroom_715850.c create mode 100644 src/battle/item/mystery/lib.c create mode 100644 src/battle/item/mystery/mystery.c create mode 100644 src/battle/item/mystery/mystery.h delete mode 100644 src/battle/item/mystery_72C5B0.c create mode 100644 src/battle/item/pebble/lib.c create mode 100644 src/battle/item/pebble/pebble.c create mode 100644 src/battle/item/pebble/pebble.h delete mode 100644 src/battle/item/pebble_719970.c create mode 100644 src/battle/item/please_come_back/lib.c create mode 100644 src/battle/item/please_come_back/please_come_back.c create mode 100644 src/battle/item/please_come_back/please_come_back.h delete mode 100644 src/battle/item/please_come_back_7285E0.c create mode 100644 src/battle/item/pow_block/lib.c create mode 100644 src/battle/item/pow_block/pow_block.c create mode 100644 src/battle/item/pow_block/pow_block.h delete mode 100644 src/battle/item/pow_block_718850.c create mode 100644 src/battle/item/repel_gel/lib.c create mode 100644 src/battle/item/repel_gel/repel_gel.c create mode 100644 src/battle/item/repel_gel/repel_gel.h delete mode 100644 src/battle/item/repel_gel_72DB70.c create mode 100644 src/battle/item/shooting_star/lib.c create mode 100644 src/battle/item/shooting_star/shooting_star.c create mode 100644 src/battle/item/shooting_star/shooting_star.h delete mode 100644 src/battle/item/shooting_star_71D770.c create mode 100644 src/battle/item/sleepy_sheep/lib.c create mode 100644 src/battle/item/sleepy_sheep/sleepy_sheep.c create mode 100644 src/battle/item/sleepy_sheep/sleepy_sheep.h delete mode 100644 src/battle/item/sleepy_sheep_71E650.c create mode 100644 src/battle/item/snowman_doll/lib.c create mode 100644 src/battle/item/snowman_doll/snowman_doll.c create mode 100644 src/battle/item/snowman_doll/snowman_doll.h delete mode 100644 src/battle/item/snowman_doll_71BE30.c create mode 100644 src/battle/item/stone_cap/lib.c create mode 100644 src/battle/item/stone_cap/stone_cap.c create mode 100644 src/battle/item/stone_cap/stone_cap.h delete mode 100644 src/battle/item/stone_cap_7215A0.c create mode 100644 src/battle/item/stop_watch/lib.c create mode 100644 src/battle/item/stop_watch/stop_watch.c create mode 100644 src/battle/item/stop_watch/stop_watch.h delete mode 100644 src/battle/item/stop_watch_726DD0.c create mode 100644 src/battle/item/strange_cake/lib.c create mode 100644 src/battle/item/strange_cake/strange_cake.c create mode 100644 src/battle/item/strange_cake/strange_cake.h delete mode 100644 src/battle/item/strange_cake_731300.c create mode 100644 src/battle/item/super_soda/lib.c create mode 100644 src/battle/item/super_soda/super_soda.c create mode 100644 src/battle/item/super_soda/super_soda.h delete mode 100644 src/battle/item/super_soda_724CE0.c create mode 100644 src/battle/item/tasty_tonic/lib.c create mode 100644 src/battle/item/tasty_tonic/tasty_tonic.c create mode 100644 src/battle/item/tasty_tonic/tasty_tonic.h delete mode 100644 src/battle/item/tasty_tonic_722000.c create mode 100644 src/battle/item/thunder_bolt/lib.c create mode 100644 src/battle/item/thunder_bolt/thunder_bolt.c create mode 100644 src/battle/item/thunder_bolt/thunder_bolt.h delete mode 100644 src/battle/item/thunder_bolt_722B40.c create mode 100644 src/battle/item/thunder_rage/lib.c create mode 100644 src/battle/item/thunder_rage/thunder_rage.c create mode 100644 src/battle/item/thunder_rage/thunder_rage.h delete mode 100644 src/battle/item/thunder_rage_71B1A0.c create mode 100644 src/battle/item/ultra_shroom/lib.c create mode 100644 src/battle/item/ultra_shroom/ultra_shroom.c create mode 100644 src/battle/item/ultra_shroom/ultra_shroom.h delete mode 100644 src/battle/item/ultra_shroom_723780.c create mode 100644 src/battle/item/unknown_item/lib.c create mode 100644 src/battle/item/unknown_item/unknown_item.c create mode 100644 src/battle/item/unknown_item/unknown_item.h delete mode 100644 src/battle/item/unknown_item_724240.c create mode 100644 src/battle/item/volt_shroom/lib.c create mode 100644 src/battle/item/volt_shroom/volt_shroom.c create mode 100644 src/battle/item/volt_shroom/volt_shroom.h delete mode 100644 src/battle/item/volt_shroom_71A7F0.c delete mode 100644 ver/us/asm/data/battle/item/dizzy_dial_727CE0.data.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1000_727910.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A11D4_727AE4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A123C_727B4C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1270_727B80.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A1000_71CCE0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A11D4_71CEB4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A123C_71CF1C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A12FC_71CFDC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A1000_7179D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A11D4_717BA4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A1000_728EC0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A11D4_729094.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A123C_7290FC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1000_7305A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A11D4_730774.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A123C_7307DC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A127C_73081C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A133C_7308DC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1450_7309F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A149C_730A3C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A14F0_730A90.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1000_716C60.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A123C_716E9C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1378_716FD8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1000_7330D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A11D4_7332A4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A123C_73330C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A12EC_7333BC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1378_733448.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1438_733508.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A15A0_733670.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A1000_72B910.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A11D4_72BAE4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A12D4_72BBE4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A1000_725F60.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A11D4_726134.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A123C_72619C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A12C4_726224.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1000_72A750.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A11D4_72A924.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A123C_72A98C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1280_72A9D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A12E0_72AA30.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1000_72E530.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A11D4_72E704.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A123C_72E76C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A12EC_72E81C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1378_72E8A8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1438_72E968.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1484_72E9B4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1000_715850.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A11D4_715A24.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A123C_715A8C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A12EC_715B3C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1378_715BC8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1438_715C88.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A15A0_715DF0.s rename ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/{func_802A123C_72C7EC.s => battle_item_mystery_func_802A123C_72C7EC.s} (100%) rename ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/{func_802A13E4_72C994.s => battle_item_mystery_func_802A13E4_72C994.s} (95%) delete mode 100644 ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A1000_72C5B0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A11D4_72C784.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A188C_72CE3C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A1000_719970.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A11D4_719B44.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A1000_7285E0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A11D4_7287B4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1000_718850.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A11D4_718A24.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A123C_718A8C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A12E4_718B34.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1318_718B68.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A1000_72DB70.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A11D4_72DD44.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A123C_72DDAC.s rename ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/{func_802A123C_71D9AC.s => battle_item_shooting_star_func_802A123C_71D9AC.s} (100%) delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1000_71D770.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A11D4_71D944.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1388_71DAF8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1444_71DBB4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A14D4_71DC44.s rename ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/{func_802A123C_71E88C.s => battle_item_sleepy_sheep_func_802A123C_71E88C.s} (95%) delete mode 100644 ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1000_71E650.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A11D4_71E824.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1740_71ED90.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1848_71EE98.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A1000_71BE30.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A11D4_71C004.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A123C_71C06C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A13B8_71C1E8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A1000_7215A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A11D4_721774.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A123C_7217DC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A1000_726DD0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A11D4_726FA4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A12D4_7270A4.s rename ver/us/asm/nonmatchings/battle/item/strange_cake_731300/{func_802A123C_73153C.s => battle_item_strange_cake_func_802A123C_73153C.s} (100%) rename ver/us/asm/nonmatchings/battle/item/strange_cake_731300/{func_802A13E4_7316E4.s => battle_item_strange_cake_func_802A13E4_7316E4.s} (95%) delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1000_731300.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A11D4_7314D4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1818_731B18.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A18D8_731BD8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A40_731D40.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A8C_731D8C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1AD8_731DD8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B14_731E14.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B68_731E68.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1000_724CE0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A11D4_724EB4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A123C_724F1C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A12EC_724FCC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1378_725058.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1418_7250F8.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A1000_722000.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A11D4_7221D4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A123C_72223C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1000_722B40.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A11D4_722D14.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A123C_722D7C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1420_722F60.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1000_71B1A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A11D4_71B374.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A12D4_71B474.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1354_71B4F4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A1000_723780.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A11D4_723954.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A123C_7239BC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A12FC_723A7C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A1000_724240.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A11D4_724414.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A123C_72447C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A12FC_72453C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A1000_71A7F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A11D4_71A9C4.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A123C_71AA2C.s diff --git a/include/enums.h b/include/enums.h index 46b06eb33a..83c540d569 100644 --- a/include/enums.h +++ b/include/enums.h @@ -270,30 +270,30 @@ typedef UNK_TYPE SoundID; #define SoundId_SMOKE_BURST 0x000002CD #define SoundId_DAYZEE_SONG 0x000002D7 #define SoundId_POWER_UP 0x000002D8 +#define SoundId_CLOSE_SHELL 0x000002FF #define SoundId_SHY_GUY_SCREAMS1 0x0000030C #define SoundId_SHY_GUY_SCREAMS2 0x0000030D #define SoundId_SHY_GUY_SCREAMS3 0x0000030E #define SoundId_TOY_TANK_MOVE1 0x0000030F #define SoundId_TOY_TANK_MOVE2 0x00000310 -#define SoundId_GENERAL_WHISTLE 0x00000395 #define SoundId_MOLE_SURFACE 0x00000321 #define SoundId_MOLE_DIG 0x00000322 #define SoundId_MOLE_POP 0x00000323 +#define SoundId_GENERAL_WHISTLE 0x00000395 +#define SoundId_OPEN_SHELL 0x000003D4 #define SoundId_JUMP 0x000003E2 #define SoundId_MISS_JUMP 0x000003E3 #define SoundId_DEATH 0x000003E5 #define SoundId_BIG_POWER_UP 0x000003E6 #define SoundId_MOLE_THROW 0x000003E8 -#define SoundId_CLOSE_SHELL 0x000002FF -#define SoundId_OPEN_SHELL 0x000003D4 #define SoundId_THROW 0x000003FA #define SoundId_BOW_VANISH 0x0000200E #define SoundId_BOW_APPEAR 0x0000200F #define SoundId_CANNON1 0x00002016 #define SoundId_CANNON2 0x00002017 #define SoundId_CANNON3 0x00002018 -#define SoundId_JUMP2 0x00002081 #define SoundId_BOMB_BLAST 0x00002076 +#define SoundId_JUMP2 0x00002081 #define SoundId_SPELL_CAST1 0x000020D4 #define SoundId_SPELL_CAST2 0x000020D5 #define SoundId_SPELL_CAST3 0x000020D6 @@ -306,7 +306,6 @@ typedef UNK_TYPE Cam; #define Cam_TATTLE 0x00000002 #define Cam_CAM3 0x00000003 - #define LOOKUP_ITEM(itemID) gItemTable[itemID & ~0xF0000] typedef s16 ItemId; @@ -678,6 +677,7 @@ typedef UNK_TYPE PlayerAnim; #define PlayerAnim_BEFORE_JUMP 0x00010006 #define PlayerAnim_MIDAIR_STILL 0x00010007 #define PlayerAnim_MIDAIR 0x00010008 +#define PlayerAnim_9 0x00010009 // TODO #define PlayerAnim_STUNNED_STILL 0x0001000E #define PlayerAnim_DEAD_STILL 0x0001000F #define PlayerAnim_SPINNING 0x00010011 @@ -704,11 +704,16 @@ typedef UNK_TYPE PlayerAnim; #define PlayerAnim_RUN_THINKING 0x00010027 #define PlayerAnim_QUESTION 0x00010028 #define PlayerAnim_NOD_YES 0x00010029 +#define PlayerAnim_1002B 0x0001002B // TODO #define PlayerAnim_PRAY 0x0001002C #define PlayerAnim_CHARRED 0x0001002F #define PlayerAnim_GET_UP 0x00010030 #define PlayerAnim_DUST_OFF 0x00010031 #define PlayerAnim_THUMBS_UP 0x00010032 +#define PlayerAnim_30004 0x00030004 // TODO +#define PlayerAnim_30008 0x00030008 // TODO +#define PlayerAnim_30009 0x00030009 // TODO +#define PlayerAnim_8000B 0x0008000B // TODO typedef UNK_TYPE AmbientSounds; #define AmbientSounds_SPOOKY 0x00000000 @@ -751,13 +756,12 @@ typedef UNK_TYPE HitResult; #define HitResult_MISS 0x00000006 #define HitResult_HIT_STATIC 0x00000007 #define HitResult_IMMUNE 0x00000008 -#define HitResult_ED_EXPLODE -1 typedef UNK_TYPE Iter; #define Iter_FIRST 0xFFFFFFFF -#define Iter_LAST 0x0000000A #define Iter_NEXT 0x00000000 #define Iter_PREV 0x00000001 +#define Iter_LAST 0x0000000A typedef UNK_TYPE ActorSound; #define ActorSound_WALK 0x00000000 @@ -772,13 +776,13 @@ typedef UNK_TYPE Phase; #define Phase_FIRST_STRIKE 0x00000001 #define Phase_RUN_AWAY_START 0x00000003 #define Phase_RUN_AWAY_RESET 0x00000004 -#define Phase_RUN_AWAY_FAIL 0x00000007 #define Phase_USE_DEFEND 0x00000006 +#define Phase_RUN_AWAY_FAIL 0x00000007 #define Phase_USE_LIFE_SHROOM 0x00000008 #define Phase_PLAYER_BEGIN 0x0000000A -#define Phase_PLAYER_END 0x0000000D -#define Phase_ENEMY_BEGIN 0x0000000C #define Phase_ENEMY_END 0x0000000B +#define Phase_ENEMY_BEGIN 0x0000000C +#define Phase_PLAYER_END 0x0000000D #define Phase_MERLEE_ATTACK_BONUS 0x00000014 #define Phase_MERLEE_DEFENSE_BONUS 0x00000015 #define Phase_MERLEE_EXP_BONUS 0x00000016 @@ -814,6 +818,7 @@ typedef s32 ActorID; #define ActorID_ENEMY23 0x00000217 typedef UNK_TYPE Element; +#define Element_END 0x00000000 #define Element_NORMAL 0x00000001 #define Element_FIRE 0x00000002 #define Element_WATER 0x00000003 @@ -827,45 +832,44 @@ typedef UNK_TYPE Element; #define Element_SHOCK 0x0000000C #define Element_QUAKE 0x0000000D #define Element_THROW 0x0000000F -#define Element_END 0x00000000 typedef UNK_TYPE Event; -#define Event_IMMUNE 0x00000019 #define Event_HIT_COMBO 0x00000009 #define Event_HIT 0x0000000A -#define Event_DEATH 0x00000020 -#define Event_FALL_TriggerFlags 0x0000000C -#define Event_FLIP_TriggerFlags 0x0000000D -#define Event_EXPLODE_TriggerFlags 0x00000022 #define Event_SPIN_SMASH_HIT 0x0000000B -#define Event_SPIN_SMASH_DEATH 0x00000021 +#define Event_FALL_TriggerFlags 0x0000000C +#define Event_FLIP_TriggerFlags 0x0000000D +#define Event_BURN_HIT 0x0000000E #define Event_SPIN_SMASH_LAUNCH_HIT 0x00000011 +#define Event_STAR_BEAM 0x00000013 #define Event_SPIN_SMASH_LAUNCH_DEATH 0x00000015 #define Event_POWER_BOUNCE_HIT 0x00000015 -#define Event_POWER_BOUNCE_DEATH 0x00000028 -#define Event_BURN_HIT 0x0000000E -#define Event_BURN_DEATH 0x00000024 -#define Event_SHOCK_HIT 0x0000002F -#define Event_SHOCK_DEATH 0x00000026 -#define Event_BEGIN_AIR_LIFT 0x0000003A -#define Event_AIR_LIFT_FAILED 0x0000001F #define Event_BLOW_AWAY 0x00000016 -#define Event_SCARE_AWAY 0x00000039 -#define Event_UP_AND_AWAY 0x0000003D -#define Event_STAR_BEAM 0x00000013 -#define Event_RECOVER_STATUS 0x00000031 -#define Event_SWAP_PARTNER 0x0000003F +#define Event_IMMUNE 0x00000019 #define Event_BLOCK 0x0000001A -#define Event_SPIKE_CONTACT 0x0000002A -#define Event_SPIKE_DEATH 0x00000027 #define Event_SPIKE_TAUNT 0x0000001B -#define Event_BURN_CONTACT 0x0000002C #define Event_BURN_TAUNT 0x0000001C -#define Event_BEGIN_FIRST_STRIKE 0x00000038 +#define Event_AIR_LIFT_FAILED 0x0000001F +#define Event_DEATH 0x00000020 +#define Event_SPIN_SMASH_DEATH 0x00000021 +#define Event_EXPLODE_TriggerFlags 0x00000022 +#define Event_BURN_DEATH 0x00000024 +#define Event_SHOCK_DEATH 0x00000026 +#define Event_SPIKE_DEATH 0x00000027 +#define Event_POWER_BOUNCE_DEATH 0x00000028 +#define Event_SPIKE_CONTACT 0x0000002A +#define Event_BURN_CONTACT 0x0000002C +#define Event_SHOCK_HIT 0x0000002F +#define Event_RECOVER_STATUS 0x00000031 #define Event_END_FIRST_STRIKE 0x00000035 +#define Event_LUCKY 0x00000037 +#define Event_BEGIN_FIRST_STRIKE 0x00000038 +#define Event_SCARE_AWAY 0x00000039 +#define Event_BEGIN_AIR_LIFT 0x0000003A +#define Event_UP_AND_AWAY 0x0000003D +#define Event_SWAP_PARTNER 0x0000003F #define Event_LIFE_SHROOM_PROC 0x00000040 #define Event_REVIVE 0x00000041 -#define Event_LUCKY 0x00000037 typedef UNK_TYPE HitSound; #define HitSound_MISS 0x00000000 @@ -876,40 +880,40 @@ typedef UNK_TYPE HitSound; #define HitSound_SHOCK 0x00000005 typedef s8 Debuff; +#define Debuff_END 0x00000000 #define Debuff_NORMAL 0x00000001 #define Debuff_DEFAULT 0x00000002 -#define Debuff_DEFAULT_TURN_MOD 0x0000001F -#define Debuff_SLEEP 0x00000006 -#define Debuff_SLEEP_TURN_MOD 0x00000020 -#define Debuff_POISON 0x00000009 -#define Debuff_POISON_TURN_MOD 0x00000025 -#define Debuff_FROZEN 0x00000007 -#define Debuff_FROZEN_TURN_MOD 0x00000022 -#define Debuff_DIZZY 0x00000004 -#define Debuff_DIZZY_TURN_MOD 0x00000024 #define Debuff_FEAR 0x00000003 -#define Debuff_FEAR_TURN_MOD 0x00000023 -#define Debuff_STATIC 0x0000000B -#define Debuff_STATIC_TURN_MOD 0x00000021 +#define Debuff_DIZZY 0x00000004 #define Debuff_PARALYZE 0x00000005 -#define Debuff_PARALYZE_TURN_MOD 0x00000026 -#define Debuff_SHRINK 0x0000000A -#define Debuff_SHRINK_TURN_MOD 0x00000027 +#define Debuff_SLEEP 0x00000006 +#define Debuff_FROZEN 0x00000007 #define Debuff_STOP 0x00000008 -#define Debuff_STOP_TURN_MOD 0x00000029 +#define Debuff_POISON 0x00000009 +#define Debuff_SHRINK 0x0000000A +#define Debuff_STATIC 0x0000000B #define Debuff_STONE 0x0000000C #define Debuff_DAZE 0x0000000D -#define Debuff_END 0x00000000 +#define Debuff_0xE 0x0000000E // TODO #define Debuff_BERSERK 0x00000010 #define Debuff_TURN_DONE 0x00000012 #define Debuff_HUSTLE 0x00000019 #define Debuff_DANGER 0x0000001A #define Debuff_THINKING 0x0000001C #define Debuff_WEARY 0x0000001D +#define Debuff_DEFAULT_TURN_MOD 0x0000001F +#define Debuff_SLEEP_TURN_MOD 0x00000020 +#define Debuff_STATIC_TURN_MOD 0x00000021 +#define Debuff_FROZEN_TURN_MOD 0x00000022 +#define Debuff_FEAR_TURN_MOD 0x00000023 +#define Debuff_DIZZY_TURN_MOD 0x00000024 +#define Debuff_POISON_TURN_MOD 0x00000025 +#define Debuff_PARALYZE_TURN_MOD 0x00000026 +#define Debuff_SHRINK_TURN_MOD 0x00000027 +#define Debuff_STOP_TURN_MOD 0x00000029 typedef UNK_TYPE DoorSwing; #define DoorSwing_IN 0x00000001 -#define DoorSwing_OUT -1 typedef UNK_TYPE ItemSpawnMode; #define ItemSpawnMode_DECORATION 0x00000001 @@ -936,41 +940,41 @@ typedef UNK_TYPE ItemSpawnMode; #define ItemSpawnMode_TOSS__SPAWN_ALWAYS__SMALL 0x0000001A typedef UNK_TYPE Location; -#define Location_NONE 0x00000018 -#define Location_TESTING 0x00000017 #define Location_TOAD_TOWN 0x00000001 -#define Location_PEACH_CASTLE_GROUNDS 0x00000019 -#define Location_SHOOTING_STAR_SUMMIT 0x0000001B #define Location_TOAD_TOWN_TUNNELS 0x00000002 +#define Location_KOOPA_BROS_FORTRESS 0x00000007 +#define Location_MT_RUGGED 0x00000008 +#define Location_DRY_DRY_OUTPOST 0x00000009 +#define Location_DRY_DRY_DESERT 0x0000000A +#define Location_DRY_DRY_RUINS 0x0000000B +#define Location_FOREVER_FOREST 0x0000000C +#define Location_BOOS_MANSION 0x0000000D +#define Location_TUBBAS_MANOR 0x0000000F +#define Location_SHY_GUYS_TOYBOX 0x00000010 +#define Location_MT_LAVALAVA 0x00000012 +#define Location_CRYSTAL_PALACE 0x00000015 +#define Location_BOWSERS_CASTLE 0x00000016 +#define Location_TESTING 0x00000017 +#define Location_NONE 0x00000018 +#define Location_PEACH_CASTLE_GROUNDS 0x00000019 +#define Location_PEACHS_CASTLE 0x0000001A +#define Location_SHOOTING_STAR_SUMMIT 0x0000001B +#define Location_STAR_WAY 0x0000001C +#define Location_STAR_HAVEN 0x0000001D #define Location_GOOMBA_VILLAGE 0x0000001E #define Location_GOOMBA_ROAD 0x0000001F #define Location_PLEASANT_PATH 0x00000020 #define Location_KOOPA_VILLAGE 0x00000021 -#define Location_KOOPA_BROS_FORTRESS 0x00000007 -#define Location_MT_RUGGED 0x00000008 -#define Location_DRY_DRY_DESERT 0x0000000A -#define Location_DRY_DRY_OUTPOST 0x00000009 -#define Location_DRY_DRY_RUINS 0x0000000B -#define Location_FOREVER_FOREST 0x0000000C -#define Location_BOOS_MANSION 0x0000000D #define Location_GUSTY_GULCH 0x00000022 -#define Location_TUBBAS_MANOR 0x0000000F #define Location_WINDY_MILL 0x00000023 -#define Location_SHY_GUYS_TOYBOX 0x00000010 #define Location_JADE_JUNGLE 0x00000024 #define Location_YOSHIS_VILLAGE 0x00000025 -#define Location_MT_LAVALAVA 0x00000012 #define Location_FLOWER_FIELDS 0x00000026 #define Location_CLOUDY_CLIMB 0x00000027 #define Location_SHIVER_CITY 0x00000028 #define Location_SHIVER_SNOWFIELD 0x00000029 #define Location_STARBORN_VALLEY 0x0000002A #define Location_SHIVER_MOUNTAIN 0x0000002B -#define Location_CRYSTAL_PALACE 0x00000015 -#define Location_STAR_WAY 0x0000001C -#define Location_STAR_HAVEN 0x0000001D -#define Location_BOWSERS_CASTLE 0x00000016 -#define Location_PEACHS_CASTLE 0x0000001A #define Location_MARIOS_HOUSE 0x0000002C typedef UNK_TYPE DoorSounds; @@ -1017,37 +1021,36 @@ typedef s32 NpcId; #define NpcId_PARTNER -4 typedef UNK_TYPE TriggerFlag; +#define TriggerFlag_WALL_PUSH 0x00000040 #define TriggerFlag_FLOOR_TOUCH 0x00000080 -#define TriggerFlag_FLOOR_ABOVE 0x00080000 -#define TriggerFlag_FLOOR_INTERACT 0x00000800 +#define TriggerFlag_WALL_INTERACT 0x00000100 #define TriggerFlag_FLOOR_JUMP 0x00000200 #define TriggerFlag_WALL_TOUCH 0x00000400 -#define TriggerFlag_WALL_PUSH 0x00000040 -#define TriggerFlag_WALL_INTERACT 0x00000100 +#define TriggerFlag_FLOOR_INTERACT 0x00000800 #define TriggerFlag_WALL_HAMMER 0x00001000 -#define TriggerFlag_CEILING_TOUCH 0x00040000 -#define TriggerFlag_BOMB 0x00100000 #define TriggerFlag_SAVE_FLAG_SET 0x00010000 #define TriggerFlag_AREA_FLAG_SET 0x00020000 +#define TriggerFlag_CEILING_TOUCH 0x00040000 +#define TriggerFlag_FLOOR_ABOVE 0x00080000 +#define TriggerFlag_BOMB 0x00100000 typedef UNK_TYPE Button; -#define Button_A 0x00008000 -#define Button_B 0x00004000 -#define Button_Z 0x00002000 -#define Button_START 0x00001000 -#define Button_D_UP 0x00000800 -#define Button_D_DOWN 0x00000400 -#define Button_D_LEFT 0x00000200 -#define Button_D_RIGHT 0x00000100 -#define Button_L 0x00000020 -#define Button_R 0x00000010 -#define Button_C_UP 0x00000008 -#define Button_C_DOWN 0x00000004 -#define Button_C_LEFT 0x00000002 #define Button_C_RIGHT 0x00000001 +#define Button_C_LEFT 0x00000002 +#define Button_C_DOWN 0x00000004 +#define Button_C_UP 0x00000008 +#define Button_R 0x00000010 +#define Button_L 0x00000020 +#define Button_D_RIGHT 0x00000100 +#define Button_D_LEFT 0x00000200 +#define Button_D_DOWN 0x00000400 +#define Button_D_UP 0x00000800 +#define Button_START 0x00001000 +#define Button_Z 0x00002000 +#define Button_B 0x00004000 +#define Button_A 0x00008000 typedef UNK_TYPE PlayerBuff; -#define PlayerBuff_ALL 0x0FFFFFFF #define PlayerBuff_JUMP_CHARGE 0x00000001 #define PlayerBuff_HAMMER_CHARGE 0x00000002 #define PlayerBuff_STONE 0x00000008 @@ -1058,6 +1061,7 @@ typedef UNK_TYPE PlayerBuff; #define PlayerBuff_TURBO_CHARGE 0x00000100 #define PlayerBuff_WATER_BLOCK 0x00000200 #define PlayerBuff_PARTNER_GLOWING 0x00010000 +#define PlayerBuff_ALL 0x0FFFFFFF typedef UNK_TYPE StatusFlags; #define StatusFlags_SLEEP 0x00001000 @@ -1079,22 +1083,22 @@ typedef UNK_TYPE StatusFlags; #define StatusFlags_RIGHT_ON 0x40000000 typedef UNK_TYPE DamageType; -#define DamageType_IGNORE_DEFENSE 0x08000000 -#define DamageType_NO_CONTACT 0x10000000 -#define DamageType_UNBLOCKABLE 0x20000000 -#define DamageType_TriggerFlags_LUCKY 0x80000000 -#define DamageType_FIRE 0x00000002 -#define DamageType_WATER 0x00000004 -#define DamageType_ICE 0x00000008 -#define DamageType_MAGIC 0x00000010 -#define DamageType_ELECTRIC 0x00000020 -#define DamageType_SMASH 0x00000040 -#define DamageType_JUMP 0x00000080 -#define DamageType_COSMIC 0x00000100 -#define DamageType_BLAST 0x00000200 -#define DamageType_POW 0x00000400 -#define DamageType_QUAKE 0x00000800 -#define DamageType_THROW 0x00040000 +#define DamageType_TriggerFlags_LUCKY 0x80000000 +#define DamageType_FIRE 0x00000002 +#define DamageType_WATER 0x00000004 +#define DamageType_ICE 0x00000008 +#define DamageType_MAGIC 0x00000010 +#define DamageType_ELECTRIC 0x00000020 +#define DamageType_SMASH 0x00000040 +#define DamageType_JUMP 0x00000080 +#define DamageType_COSMIC 0x00000100 +#define DamageType_BLAST 0x00000200 +#define DamageType_POW 0x00000400 +#define DamageType_QUAKE 0x00000800 +#define DamageType_THROW 0x00040000 +#define DamageType_IGNORE_DEFENSE 0x08000000 +#define DamageType_NO_CONTACT 0x10000000 +#define DamageType_UNBLOCKABLE 0x20000000 typedef s8 PartnerID; #define PartnerID_NONE 0 diff --git a/include/functions.h b/include/functions.h index 1b74ae12b3..fce407e2f2 100644 --- a/include/functions.h +++ b/include/functions.h @@ -140,8 +140,8 @@ s32 osGetId(); void mem_clear(s8* data, s32 numBytes); -s32* create_icon(s32 iconIndex); -void set_icon_render_pos(s32 iconIndex, s32 posX, s32 posY); +MenuIcon* create_icon(s32* iconIndex); +void set_icon_render_pos(MenuIcon* iconIndex, s32 posX, s32 posY); void set_curtain_scale_goal(f32 scale); void set_curtain_fade(f32 scale); @@ -207,7 +207,7 @@ ItemEntity* get_item_entity(s32 itemEntityIndex); s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar); void set_item_entity_flags(s32 itemEntityIndex, s32 flag); -s32 bind_dynamic_entity_7(s32* updateFunc, s32* drawFunc); +s32 bind_dynamic_entity_7(s32* updateFunc, void (*drawFunc)(void)); s32 get_dynamic_entity(s32 arg0); void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height); @@ -275,6 +275,10 @@ void func_800701F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3); void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg); void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); +void func_80138D88(s32, s32, s32, s32, f32); +s32 func_80071030(s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); +void func_80070CD0(s32, f32, f32, f32, f32, f32); + // Dead functions: f32 func_8002AF70(f32 startX, f32 startZ, f32 endX, f32 endZ); // atan2 Npc* func_8003E4BC(NpcId npcId); // get_npc_safe diff --git a/include/include_asm.h b/include/include_asm.h index 5fca5b481b..7c0d4e23f1 100644 --- a/include/include_asm.h +++ b/include/include_asm.h @@ -10,9 +10,9 @@ TYPE NAME(ARGS); \ TYPE __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"ver/"STRINGIFY(VERSION)"/asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } #endif -__asm__( ".include \"include/macro.inc\"\n"); +__asm__(".include \"include/macro.inc\"\n"); #ifdef MOVE_ADDU -__asm__( ".include \"include/move_addu.inc\"\n"); +__asm__(".include \"include/move_addu.inc\"\n"); #endif #else #define INCLUDE_ASM(TYPE, FOLDER, NAME, ARGS...) diff --git a/include/macros.h b/include/macros.h index 305f37a6bd..d78bc12980 100644 --- a/include/macros.h +++ b/include/macros.h @@ -74,4 +74,8 @@ #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) +#define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) +#define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x)) +#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x)) + #endif diff --git a/src/battle/item/coconut/coconut.c b/src/battle/item/coconut/coconut.c index 0415676d54..a5c579ea98 100644 --- a/src/battle/item/coconut/coconut.c +++ b/src/battle/item/coconut/coconut.c @@ -2,14 +2,14 @@ #include "battle/item/coconut/coconut.png.h" /// 32x32 square. -Vtx N(coconutModel)[] = { +Vtx N(model)[] = { { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, }; -Gfx N(coconutDL)[] = { +Gfx N(displayList)[] = { gsDPPipeSync(), gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), @@ -20,23 +20,23 @@ Gfx N(coconutDL)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &battle_item_coconut_coconut_pal_png), - gsDPLoadTextureTile_4b(&battle_item_coconut_coconut_png, G_IM_FMT_CI, battle_item_coconut_coconut_png_width, battle_item_coconut_coconut_png_height, 0, 0, battle_item_coconut_coconut_png_width - 1, battle_item_coconut_coconut_png_height - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsDPLoadTLUT_pal16(0, &N(coconut_pal_png)), + gsDPLoadTextureTile_4b(&N(coconut_png), G_IM_FMT_CI, N(coconut_png_width), N(coconut_png_height), 0, 0, N(coconut_png_width) - 1, N(coconut_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), - gsSPVertex(&N(coconutModel), ARRAY_COUNT(N(coconutModel)), 0), + gsSPVertex(&N(model), ARRAY_COUNT(N(model)), 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPPipeSync(), gsSPEndDisplayList(), }; -s32 N(coconutItemModelCommandList)[] = { - 0x00000004, 0x0000000D, 0x00000001, sizeof(N(coconutDL)) / sizeof(s32), &N(coconutDL), 0x00000002, 0x00000000, +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, }; Script N(main) = SCRIPT({ - SI_VAR(10) =c ItemId_COCONUT; + SI_VAR(10) = c ItemId_COCONUT; await N(UseItemWithEffect); @@ -47,7 +47,7 @@ Script N(main) = SCRIPT({ PlaySound(SoundId_THROW); sleep 3; - func_802D3474(SI_VAR(10), N(coconutItemModelCommandList)); + func_802D3474(SI_VAR(10), N(modelCommandList)); $x = 1.0; MultiplyByActorScale($x); diff --git a/src/battle/item/coconut/lib.c b/src/battle/item/coconut/lib.c index 20388625d4..4b9e7bfa94 100644 --- a/src/battle/item/coconut/lib.c +++ b/src/battle/item/coconut/lib.c @@ -1,7 +1,7 @@ #include "coconut.h" -MenuIcon* D_802A1E80; void* D_80108A64; // an image +static MenuIcon* D_802A1E80; // Returns time to sleep for on $x. ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { diff --git a/src/battle/item/dizzy_dial/dizzy_dial.c b/src/battle/item/dizzy_dial/dizzy_dial.c new file mode 100644 index 0000000000..20005958a6 --- /dev/null +++ b/src/battle/item/dizzy_dial/dizzy_dial.c @@ -0,0 +1,51 @@ +#include "dizzy_dial.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_DIZZY_DIAL; + await N(UseItemWithEffect); + UseCamPreset(2); + MoveBattleCamOver(20); + sleep 10; + spawn { + sleep 5; + AddBattleCamZoom(0xFFFFFF06); + MoveBattleCamOver(80); + func_8024ECF8(0, 0, 1); + sleep 80; + AddBattleCamZoom(250); + MoveBattleCamOver(3); + func_8024ECF8(0, 0, 1); + } + N(func_802A1270_727B80)(); + spawn { + StartRumble(8); + ShakeCam(1, 0, 2, 1.0); + ShakeCam(1, 0, 2, 4.0); + ShakeCam(1, 0, 2, 3.0); + ShakeCam(1, 0, 2, 2.0); + ShakeCam(1, 0, 2, 1.0); + ShakeCam(1, 0, 2, 0.5); + sleep 10; + UseCamPreset(3); + MoveBattleCamOver(10); + func_8024ECF8(0, 0, 0); + } + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetItemPower(ItemId_DIZZY_DIAL, SI_VAR(0), SI_VAR(1)); + MakeStatusField(SI_VAR(0), 0x40000, 100, SI_VAR(0)); + func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32); +1: + sleep 5; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + sleep 30; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/dizzy_dial/dizzy_dial.h b/src/battle/item/dizzy_dial/dizzy_dial.h new file mode 100644 index 0000000000..d6f11269b2 --- /dev/null +++ b/src/battle/item/dizzy_dial/dizzy_dial.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_DIZZY_DIAL +#define BATTLE_ITEM_DIZZY_DIAL + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_dizzy_dial + +ApiStatus func_8024ECF8(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/dizzy_dial/lib.c b/src/battle/item/dizzy_dial/lib.c new file mode 100644 index 0000000000..dddc9ccf26 --- /dev/null +++ b/src/battle/item/dizzy_dial/lib.c @@ -0,0 +1,192 @@ +#include "dizzy_dial.h" + +extern s32 D_80108A64; +static s32* D_802A1CD0; +static MenuIcon* D_802A1CD4; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1CD4 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1CD4, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1CD4); + } + + return ApiStatus_DONE2; +} + +void func_802A123C_727B4C(void) { + func_80138D88(0, 0, 0x140, 0xF0, 160.0f); +} + +ApiStatus N(func_802A1270_727B80)(ScriptInstance* script, s32 isInitialCall) { + Camera* camera = &gCameras[1]; + f32 a; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + } + + switch (script->functionTemp[0].s) { + case 0: + script->functionTemp[1].s = 0; + script->functionTemp[2].s = 0; + play_sound(0x2033); + camera->unk_1C = 0; + D_802A1CD0 = bind_dynamic_entity_7(NULL, func_802A123C_727B4C); + script->functionTemp[0].s = 1; + case 1: + camera->flags |= 8; + a = script->functionTemp[1].s; + guRotateF(camera->viewMtxShaking, a, 0.0f, 0.0f, 1.0f); + script->functionTemp[1].s = 2.0 * ((1.0 - sin_rad(((script->functionTemp[2].s + 90) * 6.28318f) / 360.0f)) * 360.0); + script->functionTemp[2].s++; + if (script->functionTemp[2].s <= 90) { + return ApiStatus_BLOCK; + } + camera->unk_1C = 0; + camera->flags &= ~8; + func_801235C0(D_802A1CD0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + + N(GiveRefund)(); + sleep SI_VAR(0); + + sleep 15; + + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(0); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/dizzy_dial_727910.c b/src/battle/item/dizzy_dial_727910.c deleted file mode 100644 index 37d235ceb1..0000000000 --- a/src/battle/item/dizzy_dial_727910.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/dizzy_dial_727910", func_802A1000_727910); - -INCLUDE_ASM(s32, "battle/item/dizzy_dial_727910", func_802A11D4_727AE4); - -INCLUDE_ASM(s32, "battle/item/dizzy_dial_727910", func_802A123C_727B4C); - -INCLUDE_ASM(s32, "battle/item/dizzy_dial_727910", func_802A1270_727B80); diff --git a/src/battle/item/dried_shroom/dried_shroom.c b/src/battle/item/dried_shroom/dried_shroom.c new file mode 100644 index 0000000000..453e6d14cb --- /dev/null +++ b/src/battle/item/dried_shroom/dried_shroom.c @@ -0,0 +1,24 @@ +#include "dried_shroom.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_DRIED_SHROOM; + await N(UseItemWithEffect); + await N(EatItem); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_STICK_OUT_TONGUE); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A123C_71CF1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + SI_VAR(2) += 5; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1); + N(func_802A12FC_71CFDC)(); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(2) += 5; + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 1); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/dried_shroom/dried_shroom.h b/src/battle/item/dried_shroom/dried_shroom.h new file mode 100644 index 0000000000..30efd22daf --- /dev/null +++ b/src/battle/item/dried_shroom/dried_shroom.h @@ -0,0 +1,19 @@ +#ifndef BATTLE_ITEM_DRIED_SHROOM +#define BATTLE_ITEM_DRIED_SHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_dried_shroom + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_71CF1C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12FC_71CFDC)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); + +#endif diff --git a/src/battle/item/dried_shroom/lib.c b/src/battle/item/dried_shroom/lib.c new file mode 100644 index 0000000000..fc611e2ff4 --- /dev/null +++ b/src/battle/item/dried_shroom/lib.c @@ -0,0 +1,175 @@ +#include "dried_shroom.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1A90; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1A90 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1A90, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1A90); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_71CF1C)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12FC_71CFDC)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + playerData->curHP++; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + + N(GiveRefund)(); + sleep SI_VAR(0); + + sleep 15; + + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(0); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/dried_shroom_71CCE0.c b/src/battle/item/dried_shroom_71CCE0.c deleted file mode 100644 index d61ef3a697..0000000000 --- a/src/battle/item/dried_shroom_71CCE0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/dried_shroom_71CCE0", func_802A1000_71CCE0); - -INCLUDE_ASM(s32, "battle/item/dried_shroom_71CCE0", func_802A11D4_71CEB4); - -INCLUDE_ASM(s32, "battle/item/dried_shroom_71CCE0", func_802A123C_71CF1C); - -INCLUDE_ASM(s32, "battle/item/dried_shroom_71CCE0", func_802A12FC_71CFDC); diff --git a/src/battle/item/dusty_hammer/dusty_hammer.c b/src/battle/item/dusty_hammer/dusty_hammer.c new file mode 100644 index 0000000000..1b98353328 --- /dev/null +++ b/src/battle/item/dusty_hammer/dusty_hammer.c @@ -0,0 +1,80 @@ +#include "dusty_hammer.h" +#include "battle/item/dusty_hammer/dusty_hammer.png.h" + +Vtx N(model)[] = { + { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, + { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, + { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, + { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, +}; + +Gfx N(displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(dusty_hammer_pal_png)), + gsDPLoadTextureTile_4b(&N(dusty_hammer_png), G_IM_FMT_CI, N(dusty_hammer_png_width), N(dusty_hammer_png_height), 0, 0, N(dusty_hammer_png_width) - 1, N(dusty_hammer_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, +}; + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_DUSTY_HAMMER; + await N(UseItemWithEffect); + UseCamPreset(3); + MoveBattleCamOver(15); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + PlaySound(1018); + sleep 3; + func_802D3474(SI_VAR(10), N(modelCommandList)); + SI_VAR(0) = 1.0; + MultiplyByActorScale(SI_VAR(0)); + func_802D38EC(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(3) = 20; + SI_VAR(4) = 42; + SI_VAR(5) = 5; + MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SI_VAR(0) += SI_VAR(3); + SI_VAR(1) += SI_VAR(4); + SI_VAR(2) += SI_VAR(5); + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + SI_VAR(0) = 0; + loop 18 { + SI_VAR(0) += 0xFFFFFFC4; + func_802D3840(SI_VAR(10), 0, 0, SI_VAR(0)); + sleep 1; + } + } + func_802D39FC(SI_VAR(10), 0.80078125); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18); + GetItemPower(ItemId_DUSTY_HAMMER, SI_VAR(3), SI_VAR(4)); + ApplyShrinkFromOwner(SI_VAR(3)); + ItemDamageEnemy(SI_VAR(9), 0x18000000, 0, SI_VAR(3), 32); + SI_VAR(0) += 40; + SI_VAR(1) += 10; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + func_802D3624(SI_VAR(10)); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/dusty_hammer/dusty_hammer.h b/src/battle/item/dusty_hammer/dusty_hammer.h new file mode 100644 index 0000000000..ea2ad4893c --- /dev/null +++ b/src/battle/item/dusty_hammer/dusty_hammer.h @@ -0,0 +1,13 @@ +#ifndef BATTLE_ITEM_DUSTY_HAMMER +#define BATTLE_ITEM_DUSTY_HAMMER + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_dusty_hammer + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/dusty_hammer/lib.c b/src/battle/item/dusty_hammer/lib.c new file mode 100644 index 0000000000..feb4bc8394 --- /dev/null +++ b/src/battle/item/dusty_hammer/lib.c @@ -0,0 +1,147 @@ +#include "dusty_hammer.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1E80; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1E80 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1E80, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1E80); + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); + diff --git a/src/battle/item/dusty_hammer_7179D0.c b/src/battle/item/dusty_hammer_7179D0.c deleted file mode 100644 index f3e075d521..0000000000 --- a/src/battle/item/dusty_hammer_7179D0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/dusty_hammer_7179D0", func_802A1000_7179D0); - -INCLUDE_ASM(s32, "battle/item/dusty_hammer_7179D0", func_802A11D4_717BA4); diff --git a/src/battle/item/egg_missile/egg_missile.c b/src/battle/item/egg_missile/egg_missile.c new file mode 100644 index 0000000000..e1f4d1c59b --- /dev/null +++ b/src/battle/item/egg_missile/egg_missile.c @@ -0,0 +1,154 @@ +#include "egg_missile.h" +#include "battle/item/egg_missile/egg_missile1.png.h" +#include "battle/item/egg_missile/egg_missile2.png.h" +#include "battle/item/egg_missile/egg_missile3.png.h" +#include "battle/item/egg_missile/egg_missile4.png.h" + +Vtx N(model)[] = { + { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, + { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, + { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, + { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, +}; + +Gfx N(frame1_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(egg_missile1_pal_png)), + gsDPLoadTextureTile_4b(&N(egg_missile1_png), G_IM_FMT_CI, N(egg_missile1_png_width), N(egg_missile1_png_height), 0, 0, N(egg_missile1_png_width) - 1, N(egg_missile1_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx N(frame2_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(egg_missile2_pal_png)), + gsDPLoadTextureTile_4b(&N(egg_missile2_png), G_IM_FMT_CI, N(egg_missile2_png_width), 0, 0, 0, N(egg_missile2_png_width) - 1, N(egg_missile2_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx N(frame3_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(egg_missile3_pal_png)), + gsDPLoadTextureTile_4b(&N(egg_missile3_png), G_IM_FMT_CI, N(egg_missile3_png_width), 0, 0, 0, N(egg_missile3_png_width) - 1, N(egg_missile3_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx N(frame4_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(egg_missile4_pal_png)), + gsDPLoadTextureTile_4b(&N(egg_missile4_png), G_IM_FMT_CI, N(egg_missile4_png_width), 0, 0, 0, N(egg_missile4_png_width) - 1, N(egg_missile4_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000002, &N(frame2_displayList), + 0x00000001, 0x00000002, &N(frame3_displayList), + 0x00000002, 0x00000000, + 0x00000004, 0x0000000D, + 0x00000001, sizeof(N(frame4_displayList)) / sizeof(s32), &N(frame4_displayList), + 0x00000002, 0x00000000, +}; + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_EGG_MISSILE; + await N(UseItemWithEffect); + UseCamPreset(3); + MoveBattleCamOver(15); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + PlaySound(1018); + sleep 3; + func_802D3474(SI_VAR(10), N(modelCommandList)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 20; + SI_VAR(1) += 42; + SI_VAR(2) += 5; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + SI_VAR(0) = 0; + loop 18 { + SI_VAR(0) += 60; + func_802D3840(SI_VAR(10), 0, 0, SI_VAR(0)); + sleep 1; + } + } + func_802D39FC(SI_VAR(10), 1.0); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18); + func_802D3624(SI_VAR(10)); + PlaySound(8208); + N(func_802A123C_71CF1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + StartRumble(5); + ShakeCam(1, 0, 2, 0.75); + ShakeCam(1, 0, 5, 1.5); + ShakeCam(1, 0, 4, 1.2001953125); + ShakeCam(1, 0, 2, 0.4501953125); + } + GetItemPower(ItemId_EGG_MISSILE, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x18000202, 0, SI_VAR(0), 32); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/egg_missile/egg_missile.h b/src/battle/item/egg_missile/egg_missile.h new file mode 100644 index 0000000000..909c909a6d --- /dev/null +++ b/src/battle/item/egg_missile/egg_missile.h @@ -0,0 +1,15 @@ +#ifndef BATTLE_ITEM_EGG_MISSILE +#define BATTLE_ITEM_EGG_MISSILE + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_egg_missile + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +ApiStatus N(func_802A123C_71CF1C)(ScriptInstance* script, s32 isInitialCall); + +#endif diff --git a/src/battle/item/egg_missile/lib.c b/src/battle/item/egg_missile/lib.c new file mode 100644 index 0000000000..7705cef555 --- /dev/null +++ b/src/battle/item/egg_missile/lib.c @@ -0,0 +1,158 @@ +#include "egg_missile.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A2890; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A2890 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A2890, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A2890); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_71CF1C)(ScriptInstance* 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++); + + func_80070130(0, a, b, c); + func_800701F0(0, a, b + 20, c); + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/egg_missile_728EC0.c b/src/battle/item/egg_missile_728EC0.c deleted file mode 100644 index ef9ca45eb9..0000000000 --- a/src/battle/item/egg_missile_728EC0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/egg_missile_728EC0", func_802A1000_728EC0); - -INCLUDE_ASM(s32, "battle/item/egg_missile_728EC0", func_802A11D4_729094); - -INCLUDE_ASM(s32, "battle/item/egg_missile_728EC0", func_802A123C_7290FC); diff --git a/src/battle/item/electro_pop/electro_pop.c b/src/battle/item/electro_pop/electro_pop.c new file mode 100644 index 0000000000..17feea688e --- /dev/null +++ b/src/battle/item/electro_pop/electro_pop.c @@ -0,0 +1,33 @@ +#include "electro_pop.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_ELECTRO_POP; + await N(UseItemWithEffect); + await N(EatItem); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + PlayEffect(87, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + PlaySound(889); + GetItemPower(ItemId_VOLT_SHROOM, SI_VAR(0), SI_VAR(1)); + N(func_802A123C_7307DC)(); + sleep 40; + N(func_802A14F0_730A90)(); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 20; + SI_VAR(1) += 25; + N(func_802A133C_7308DC)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + N(AddFP)(SI_VAR(3)); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + ShowMessageBox(16, 60); + WaitForMessageBoxDone(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/electro_pop/electro_pop.h b/src/battle/item/electro_pop/electro_pop.h new file mode 100644 index 0000000000..0123fe9315 --- /dev/null +++ b/src/battle/item/electro_pop/electro_pop.h @@ -0,0 +1,22 @@ +#ifndef BATTLE_ITEM_ELECTRO_POP +#define BATTLE_ITEM_ELECTRO_POP + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_electro_pop + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_7307DC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A14F0_730A90)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A133C_7308DC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); + +#endif diff --git a/src/battle/item/electro_pop/lib.c b/src/battle/item/electro_pop/lib.c new file mode 100644 index 0000000000..0f9bb977c4 --- /dev/null +++ b/src/battle/item/electro_pop/lib.c @@ -0,0 +1,225 @@ +#include "electro_pop.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1D60; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1D60 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1D60, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1D60); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_7307DC)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + + inflict_status(player, Debuff_STATIC, script->varTable[0]); + player->status = 0; + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A127C_73081C)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A133C_7308DC)(ScriptInstance* 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++); + + func_80071090(1, a, b, c, d); + + return ApiStatus_DONE2; +} + +#include "common/AddHP.inc.c" + +ApiStatus N(func_802A1450_7309F0)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* item = &gItemTable[ItemId_ELECTRO_POP]; + PlayerData* playerData = &gPlayerData; + + playerData->curHP += item->potencyA; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + + script->varTable[3] = item->potencyA; + + return ApiStatus_DONE2; +} + +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + PlayerData* playerData2 = &gPlayerData; + s32 amt = get_variable(script, *script->ptrReadPos); + // @bug Should be playerData->curFP + s32 newFP = playerData->curHP + amt; + + if (newFP > playerData->curMaxFP) { + newFP = playerData->curMaxFP; + } + + playerData2->curFP = newFP; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A14F0_730A90)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* item = &gItemTable[ItemId_ELECTRO_POP]; + PlayerData* playerData = &gPlayerData; + + playerData->curFP += item->potencyA; + if (playerData->curFP > playerData->curMaxFP) { + playerData->curFP = playerData->curMaxFP; + } + + script->varTable[3] = item->potencyB; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/electro_pop_7305A0.c b/src/battle/item/electro_pop_7305A0.c deleted file mode 100644 index e675397c13..0000000000 --- a/src/battle/item/electro_pop_7305A0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_item_electro_pop - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A1000_7305A0); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A11D4_730774); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A123C_7307DC); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A127C_73081C); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A133C_7308DC); - -#include "common/AddHP.inc.c" - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A1450_7309F0); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A149C_730A3C); - -INCLUDE_ASM(s32, "battle/item/electro_pop_7305A0", func_802A14F0_730A90); diff --git a/src/battle/item/fire_flower/fire_flower.c b/src/battle/item/fire_flower/fire_flower.c new file mode 100644 index 0000000000..c98f8f1895 --- /dev/null +++ b/src/battle/item/fire_flower/fire_flower.c @@ -0,0 +1,63 @@ +#include "fire_flower.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_FIRE_FLOWER; + await N(UseItemWithEffect); + N(FadeBackgroundToBlack)(); + PlaySound(887); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_PLANT); + spawn { + sleep 50; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + sleep 35; + UseCamPreset(2); + MoveBattleCamOver(20); + sleep 10; + GetActorPos(ActorID_PLAYER, SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SI_VAR(0) = 40; + MultiplyByActorScale(SI_VAR(0)); + SI_VAR(3) += SI_VAR(0); + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) -= 10; + SetActorSpeed(ActorID_PLAYER, 2.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + spawn { + N(func_802A123C_716E9C)(SI_VAR(3), SI_VAR(4), SI_VAR(5)); + sleep 25; + loop 12 { + sleep 1; + PlaySound(8236); + sleep 2; + PlaySound(8237); + sleep 1; + } + } + sleep 80; + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetItemPower(ItemId_FIRE_FLOWER, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x38000002, 0, SI_VAR(0), 32); +1: + sleep 5; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + N(func_802A1378_716FD8)(); + sleep 30; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/fire_flower/fire_flower.h b/src/battle/item/fire_flower/fire_flower.h new file mode 100644 index 0000000000..b280e88ec5 --- /dev/null +++ b/src/battle/item/fire_flower/fire_flower.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_FIRE_FLOWER +#define BATTLE_ITEM_FIRE_FLOWER + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_fire_flower + +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_716E9C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1378_716FD8)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/fire_flower/lib.c b/src/battle/item/fire_flower/lib.c new file mode 100644 index 0000000000..f8816d5a07 --- /dev/null +++ b/src/battle/item/fire_flower/lib.c @@ -0,0 +1,175 @@ +#include "fire_flower.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1D70; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1D70 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1D70, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1D70); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_716E9C)(ScriptInstance* 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++); + + func_80071030(0, a, b, c, 0); + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A1378_716FD8)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/fire_flower_716C60.c b/src/battle/item/fire_flower_716C60.c deleted file mode 100644 index bd97093061..0000000000 --- a/src/battle/item/fire_flower_716C60.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "common.h" - -extern s32 D_802A1D70; - -INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A1000_716C60); - -ApiStatus func_802A11D4_716E34(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battlestatus = &gBattleStatus; - s32 sellValue = gItemTable[battlestatus->selectedItemID].sellValue; - - if (heroes_is_ability_active(battlestatus->playerActor, Ability_REFUND) && sellValue > 0) { - free_icon(D_802A1D70); - } - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A123C_716E9C); - -#define NAMESPACE battle_item_fire_flower -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A1378_716FD8); diff --git a/src/battle/item/food/food.c b/src/battle/item/food/food.c new file mode 100644 index 0000000000..458a18c872 --- /dev/null +++ b/src/battle/item/food/food.c @@ -0,0 +1,139 @@ +#include "food.h" + +Script N(script6) = SCRIPT({ + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 180); + sleep 10; + SI_VAR(1) = SI_VAR(15); + await N(UseItem); + SI_VAR(14) = SI_VAR(10); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + spawn { + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + func_802D3474(SI_VAR(10), 0x80283EE8); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 30; + SI_VAR(2) += 5; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D3F74(SI_VAR(10), 32); + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + loop 25 { + func_802D378C(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A123C_73330C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + RemoveItemEntity(SI_VAR(14)); + } + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetBattleCamTarget(0xFFFFFF83, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(25); + func_802D39FC(SI_VAR(10), 0.400390625); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25); + AddBattleCamZoom(100); + MoveBattleCamOver(30); + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) > 0) { + N(func_802A12EC_7333BC)(SI_VAR(11)); + } + sleep 30; + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + sleep 20; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 0); + sleep 10; +}); + +Script N(main) = SCRIPT({ + SI_VAR(14) = SI_VAR(1); + GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(10) = SI_VAR(1); + N(func_802A15A0_733670)(SI_VAR(10)); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + if (SI_VAR(0) == ActorID_PARTNER) { + await N(script6); + return; + } + SI_VAR(1) = SI_VAR(14); + await N(UseItemWithEffect); + if (SI_VAR(13) == 0) { + await N(EatItem); + } else { + await N(DrinkItem); + } + if (SI_VAR(15) == 1) { + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_STICK_OUT_TONGUE); + } + if (SI_VAR(11) > 0) { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A1378_733448)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + } + if (SI_VAR(11) < 0) { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A1378_733448)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + } + if (SI_VAR(12) > 0) { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 20; + SI_VAR(1) += 25; + N(func_802A1438_733508)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(12)); + } + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) != 0) { + N(AddHP)(SI_VAR(11)); + } + if (SI_VAR(12) != 0) { + N(AddFP)(SI_VAR(12)); + } + if (SI_VAR(15) == 0) { + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + } else { + sleep 30; + } + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/food/food.h b/src/battle/item/food/food.h new file mode 100644 index 0000000000..a7ea6b5f99 --- /dev/null +++ b/src/battle/item/food/food.h @@ -0,0 +1,29 @@ +#ifndef BATTLE_ITEM_FOOD +#define BATTLE_ITEM_FOOD + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_food + +ApiStatus func_802D3F74(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D378C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_73330C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12EC_7333BC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A15A0_733670)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1378_733448)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1438_733508)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddHP)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(UseItem); +Script N(EatItem); +Script N(DrinkItem); + +#endif diff --git a/src/battle/item/food/lib.c b/src/battle/item/food/lib.c new file mode 100644 index 0000000000..8997dbc532 --- /dev/null +++ b/src/battle/item/food/lib.c @@ -0,0 +1,232 @@ +#include "food.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A24D0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A24D0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A24D0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A24D0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_73330C)(ScriptInstance* 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++); + ItemEntity* item = get_item_entity(script->varTable[14]); + + item->position.x = a; + item->position.y = b; + item->position.z = c; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12EC_7333BC)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + Bytecode* args = script->ptrReadPos; + + if (partner->koDuration == 0) { + return ApiStatus_DONE2; + } + + partner->koDuration -= get_variable(script, *args++); + if (partner->koDuration < 0) { + partner->koDuration = 0; + } + if (partner->koDuration > 0) { + partner->ptrDefuffIcon->ptrPropertyList[0xF] = partner->koDuration; + } else { + partner->koStatus = 0; + dispatch_event_partner(0x34); + partner->ptrDefuffIcon->ptrPropertyList[0xF] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1378_733448)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1438_733508)(ScriptInstance* 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++); + + func_80071090(1, a, b, c, d); + + return ApiStatus_DONE2; +} + +#include "common/AddHP.inc.c" + +#include "common/AddFP.inc.c" + +ApiStatus N(func_802A15A0_733670)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* itemTable = gItemTable; + Bytecode* args = script->ptrReadPos; + s32 itemIdx = get_variable(script, *args++); + StaticItem* item = &itemTable[itemIdx]; + + script->varTable[11] = item->potencyA; + script->varTable[12] = item->potencyB; + script->varTable[13] = 0; + + if (item->typeFlags & 0x100) { + script->varTable[13] = 1; + } + + script->varTable[15] = script->varTable[11] < 0 || + (script->varTable[11] <= 0 && script->varTable[12] < 0); + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/food_7330D0.c b/src/battle/item/food_7330D0.c deleted file mode 100644 index 97b7ce769e..0000000000 --- a/src/battle/item/food_7330D0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_item_food - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1000_7330D0); - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A11D4_7332A4); - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A123C_73330C); - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A12EC_7333BC); - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1378_733448); - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A1438_733508); - -#include "common/AddHP.inc.c" - -#include "common/AddFP.inc.c" - -INCLUDE_ASM(s32, "battle/item/food_7330D0", func_802A15A0_733670); diff --git a/src/battle/item/fright_jar/fright_jar.c b/src/battle/item/fright_jar/fright_jar.c new file mode 100644 index 0000000000..6a258778c7 --- /dev/null +++ b/src/battle/item/fright_jar/fright_jar.c @@ -0,0 +1,55 @@ +#include "fright_jar.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_FRIGHT_JAR; + await N(UseItemWithEffect); + N(FadeBackgroundToBlack)(); + spawn { + sleep 5; + UseCamPreset(2); + MoveBattleCamOver(50); + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_CROUCH); + PlaySoundAtActor(ActorID_PLAYER, 871); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0xFFFFFFD8; + SI_VAR(1) += 5; + SI_VAR(3) = 0.7001953125; + loop 5 { + PlayEffect(97, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3), 25, 0, 0, 0, 0, 0, 0, 0); + SI_VAR(0) += 5; + SI_VAR(3) += 0.150390625; + sleep 7; + } + PlayEffect(97, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.5, 60, 0, 0, 0, 0, 0, 0, 0); + sleep 20; + loop 4 { + AddBattleCamZoom(0xFFFFFF9C); + MoveBattleCamOver(2); + sleep 2; + AddBattleCamZoom(100); + MoveBattleCamOver(2); + sleep 2; + } + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + func_80269EAC(21); + ItemAfflictEnemy(SI_VAR(0), 0x70001000, 0, 100, 0, 32); +1: + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_WALKING); + N(func_802A12D4_72BBE4)(); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/fright_jar/fright_jar.h b/src/battle/item/fright_jar/fright_jar.h new file mode 100644 index 0000000000..4c92404626 --- /dev/null +++ b/src/battle/item/fright_jar/fright_jar.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_FRIGHT_JAR +#define BATTLE_ITEM_FRIGHT_JAR + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_fright_jar + +ApiStatus func_80269EAC(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12D4_72BBE4)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/fright_jar/lib.c b/src/battle/item/fright_jar/lib.c new file mode 100644 index 0000000000..aaaf6a0aba --- /dev/null +++ b/src/battle/item/fright_jar/lib.c @@ -0,0 +1,164 @@ +#include "fright_jar.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1CA0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1CA0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1CA0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1CA0); + } + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A12D4_72BBE4)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/fright_jar_72B910.c b/src/battle/item/fright_jar_72B910.c deleted file mode 100644 index db5e5869ec..0000000000 --- a/src/battle/item/fright_jar_72B910.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/fright_jar_72B910", func_802A1000_72B910); - -INCLUDE_ASM(s32, "battle/item/fright_jar_72B910", func_802A11D4_72BAE4); - -#define NAMESPACE battle_item_fright_jar -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/fright_jar_72B910", func_802A12D4_72BBE4); diff --git a/src/battle/item/hustle_drink/hustle_drink.c b/src/battle/item/hustle_drink/hustle_drink.c new file mode 100644 index 0000000000..3a8759ec59 --- /dev/null +++ b/src/battle/item/hustle_drink/hustle_drink.c @@ -0,0 +1,79 @@ +#include "hustle_drink.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_HUSTLE_DRINK; + await N(UseItemWithEffect); + await N(DrinkItem); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_SQUISH); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + N(func_802A12C4_726224)(); + N(func_802A123C_72619C)(); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + UseCamPreset(13); + BattleCamTargetActor(ActorID_SELF); + MoveBattleCamOver(20); + PlaySoundAtActor(ActorID_PLAYER, 873); + spawn { + loop 2 { + SetActorScale(ActorID_SELF, 1.0, 1.0, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.1005859375, 1.0, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.2001953125, 0.9501953125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.30078125, 0.900390625, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.3505859375, 0.8505859375, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.380859375, 0.80078125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.400390625, 0.80078125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.30078125, 0.8505859375, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.2001953125, 0.900390625, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.1005859375, 0.9501953125, 1.0); + sleep 1; + } + SetActorScale(ActorID_SELF, 1.0, 1.0, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.1005859375, 1.0, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.2001953125, 0.9501953125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.30078125, 0.900390625, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.3505859375, 0.8505859375, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.380859375, 0.80078125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.400390625, 0.80078125, 1.0); + sleep 1; + PlaySoundAtActor(ActorID_PLAYER, 8334); + SetActorScale(ActorID_SELF, 0.900390625, 1.30078125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 0.900390625, 1.2001953125, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 0.9501953125, 1.1005859375, 1.0); + sleep 1; + SetActorScale(ActorID_SELF, 1.0, 1.0, 1.0); + sleep 1; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + loop 10 { + PlaySoundAtActor(ActorID_PLAYER, 873); + PlayEffect(6, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(6, 1, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + sleep 4; + } + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + UseCamPreset(2); + MoveBattleCamOver(20); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/hustle_drink/hustle_drink.h b/src/battle/item/hustle_drink/hustle_drink.h new file mode 100644 index 0000000000..3e921dfd5a --- /dev/null +++ b/src/battle/item/hustle_drink/hustle_drink.h @@ -0,0 +1,18 @@ +#ifndef BATTLE_ITEM_HUSTLE_DRINK +#define BATTLE_ITEM_HUSTLE_DRINK + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_hustle_drink + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12C4_726224)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_72619C)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(DrinkItem); + +#endif diff --git a/src/battle/item/hustle_drink/lib.c b/src/battle/item/hustle_drink/lib.c new file mode 100644 index 0000000000..f8a475d249 --- /dev/null +++ b/src/battle/item/hustle_drink/lib.c @@ -0,0 +1,178 @@ +#include "hustle_drink.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1E70; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1E70 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1E70, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1E70); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72619C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + + if (player->debuff != 0) { + player->debuffDuration = 0; + player->debuff = 0; + func_80047898(player->unk_436); + } + if (player->staticStatus != 0) { + player->staticDuration = 0; + player->staticStatus = 0; + func_800479A0(player->unk_436); + } + if (player->stoneStatus != 0) { + player->stoneDuration = 0; + player->stoneStatus = 0; + } + if (player->transStatus != 0) { + player->transDuration = 0; + player->transStatus = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12C4_726224)(ScriptInstance* script, s32 isInitialCall) { + gBattleStatus.hustleTurns = 2; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/hustle_drink_725F60.c b/src/battle/item/hustle_drink_725F60.c deleted file mode 100644 index 0578e451c5..0000000000 --- a/src/battle/item/hustle_drink_725F60.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/hustle_drink_725F60", func_802A1000_725F60); - -INCLUDE_ASM(s32, "battle/item/hustle_drink_725F60", func_802A11D4_726134); - -INCLUDE_ASM(s32, "battle/item/hustle_drink_725F60", func_802A123C_72619C); - -INCLUDE_ASM(s32, "battle/item/hustle_drink_725F60", func_802A12C4_726224); diff --git a/src/battle/item/insecticide_herb/insecticide_herb.c b/src/battle/item/insecticide_herb/insecticide_herb.c new file mode 100644 index 0000000000..608cd05702 --- /dev/null +++ b/src/battle/item/insecticide_herb/insecticide_herb.c @@ -0,0 +1,96 @@ +#include "insecticide_herb.h" +#include "battle/item/insecticide_herb/insecticide_herb.png.h" + +Vtx N(model)[] = { + { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, + { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, + { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, + { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, +}; + +Gfx N(displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(insecticide_herb_pal_png)), + gsDPLoadTextureTile_4b(&N(insecticide_herb_png), G_IM_FMT_CI, N(insecticide_herb_png_width), N(insecticide_herb_png_height), 0, 0, N(insecticide_herb_png_width) - 1, N(insecticide_herb_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, +}; + +Script script = SCRIPT({ + SI_VAR(10) = c ItemId_INSECTICIDE_HERB; + await N(UseItemWithEffect); + UseCamPreset(3); + MoveBattleCamOver(15); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + PlaySound(1018); + sleep 3; + func_802D3474(SI_VAR(10), N(modelCommandList)); + SI_VAR(0) = 1.0; + MultiplyByActorScale(SI_VAR(0)); + func_802D38EC(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(3) = 20; + SI_VAR(4) = 42; + SI_VAR(5) = 5; + MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SI_VAR(0) += SI_VAR(3); + SI_VAR(1) += SI_VAR(4); + SI_VAR(2) += SI_VAR(5); + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + SI_VAR(0) = 0; + loop 18 { + SI_VAR(0) += 0xFFFFFFC4; + func_802D3840(SI_VAR(10), 0, 0, SI_VAR(0)); + sleep 1; + } + } + func_802D39FC(SI_VAR(10), 0.80078125); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18); + PlayEffect(7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + SI_VAR(0) -= 10; + PlayEffect(7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + SI_VAR(0) += 20; + PlayEffect(7, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + spawn { + N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 3; + N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 3; + N(func_802A12E0_72AA30)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + } + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + N(func_802A123C_72A98C)(); + func_802D3624(SI_VAR(10)); + if (SI_VAR(9) == 0) { + ItemDamageEnemy(SI_VAR(0), 0, 0, 0, 32); + } else { + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + N(func_802A1280_72A9D0)(); + } + await N(PlayerGoHome); +}); diff --git a/src/battle/item/insecticide_herb/insecticide_herb.h b/src/battle/item/insecticide_herb/insecticide_herb.h new file mode 100644 index 0000000000..e48945764d --- /dev/null +++ b/src/battle/item/insecticide_herb/insecticide_herb.h @@ -0,0 +1,16 @@ +#ifndef BATTLE_ITEM_INSECTICIDE_HERB +#define BATTLE_ITEM_INSECTICIDE_HERB + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_insecticide_herb + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +ApiStatus N(func_802A12E0_72AA30)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A123C_72A98C)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A1280_72A9D0)(ScriptInstance *script, s32 isInitialCall); + +#endif diff --git a/src/battle/item/insecticide_herb/lib.c b/src/battle/item/insecticide_herb/lib.c new file mode 100644 index 0000000000..ecf2140c58 --- /dev/null +++ b/src/battle/item/insecticide_herb/lib.c @@ -0,0 +1,210 @@ +#include "insecticide_herb.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A21C0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A21C0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A21C0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A21C0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72A98C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* enemy = get_actor(script->owner1.enemyID); + Actor* target = get_actor(enemy->targetActorID); + + script->varTable[9] = target->actorType == 49; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1280_72A9D0)(ScriptInstance* script, s32 isInitialCall) { + Actor* enemy = get_actor(script->owner1.enemyID); + Actor* target; + + play_sound_at_position(0x231, 0, enemy->walk.goalPos.x, enemy->walk.goalPos.y, enemy->walk.goalPos.z); + target = get_actor(enemy->targetActorID); + dispatch_event_actor(target, 0x39); + + return ApiStatus_DONE2; +} + +// TODO figure out what this actually is +// func_80072230 invokes gEffectTable[111]'s entryPoint function +// that function is currently typed to return void +// Assume it returns an Effect* and unk_0C is this EffectInstanceData +// s32 unk_0C; //? Maybe EffectInstanceData too ? +struct N(temp2) { + char unk_00[0x18]; + s32 unk_18; + s32 unk_1C; + s32 unk_20; + char unk_24[0x4]; + s32 unk_28; + s32 unk_2C; + s32 unk_30; +} N(temp2); + +struct N(temp) { + char unk_00[0xC]; + struct N(temp2)* unk_0C; +} N(temp); + +ApiStatus N(func_802A12E0_72AA30)(ScriptInstance* 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++); + struct N(temp)* effect; + + a += rand_int(20) - 10; + b += rand_int(10) - 5; + + effect = (struct N(temp)*)func_80072230(0, a, b, c, 1.0f, 30); + + effect->unk_0C->unk_18 = 0xF4; + effect->unk_0C->unk_1C = 0xF4; + effect->unk_0C->unk_20 = 0xDC; + effect->unk_0C->unk_28 = 0xD2; + effect->unk_0C->unk_2C = 0xD2; + effect->unk_0C->unk_30 = 0xBE; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/insecticide_herb_72A750.c b/src/battle/item/insecticide_herb_72A750.c deleted file mode 100644 index 08446be905..0000000000 --- a/src/battle/item/insecticide_herb_72A750.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/insecticide_herb_72A750", func_802A1000_72A750); - -INCLUDE_ASM(s32, "battle/item/insecticide_herb_72A750", func_802A11D4_72A924); - -INCLUDE_ASM(s32, "battle/item/insecticide_herb_72A750", func_802A123C_72A98C); - -INCLUDE_ASM(s32, "battle/item/insecticide_herb_72A750", func_802A1280_72A9D0); - -INCLUDE_ASM(s32, "battle/item/insecticide_herb_72A750", func_802A12E0_72AA30); diff --git a/src/battle/item/life_shroom/lib.c b/src/battle/item/life_shroom/lib.c new file mode 100644 index 0000000000..67559c77f2 --- /dev/null +++ b/src/battle/item/life_shroom/lib.c @@ -0,0 +1,225 @@ +#include "life_shroom.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A21F0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A21F0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A21F0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A21F0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72E76C)(ScriptInstance* 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++); + ItemEntity* item = get_item_entity(script->varTable[14]); + + item->position.x = a; + item->position.y = b; + item->position.z = c; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12EC_72E81C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + Bytecode* args = script->ptrReadPos; + + if (partner->koDuration == 0) { + return ApiStatus_DONE2; + } + + partner->koDuration -= get_variable(script, *args++); + if (partner->koDuration < 0) { + partner->koDuration = 0; + } + if (partner->koDuration > 0) { + partner->ptrDefuffIcon->ptrPropertyList[0xF] = partner->koDuration; + } else { + partner->koStatus = 0; + dispatch_event_partner(0x34); + partner->ptrDefuffIcon->ptrPropertyList[0xF] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1378_72E8A8)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1438_72E968)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* item = &gItemTable[ItemId_LIFE_SHROOM]; + PlayerData* playerData = &gPlayerData; + + playerData->curHP += item->potencyA; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + + script->varTable[3] = item->potencyA; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1484_72E9B4)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 itemIdx = get_variable(script, *args++); + StaticItem* itemTable = gItemTable; + StaticItem* item = &itemTable[itemIdx]; + + script->varTable[11] = item->potencyA; + script->varTable[12] = item->potencyB; + + itemIdx = script->varTable[11] < 0 || (script->varTable[11] <= 0 && script->varTable[12] < 0); + script->varTable[15] = itemIdx; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/life_shroom/life_shroom.c b/src/battle/item/life_shroom/life_shroom.c new file mode 100644 index 0000000000..91a4f94226 --- /dev/null +++ b/src/battle/item/life_shroom/life_shroom.c @@ -0,0 +1,110 @@ +#include "life_shroom.h" + +Script N(script6) = SCRIPT({ + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 180); + sleep 10; + SI_VAR(1) = SI_VAR(15); + await N(UseItem); + SI_VAR(14) = SI_VAR(10); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + spawn { + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + func_802D3474(SI_VAR(10), 0x80283EE8); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 30; + SI_VAR(2) += 5; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D3F74(SI_VAR(10), 32); + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + loop 25 { + func_802D378C(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A123C_72E76C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + RemoveItemEntity(SI_VAR(14)); + } + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetBattleCamTarget(0xFFFFFF83, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(25); + func_802D39FC(SI_VAR(10), 0.400390625); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25); + AddBattleCamZoom(100); + MoveBattleCamOver(30); + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) > 0) { + N(func_802A12EC_72E81C)(SI_VAR(11)); + } + sleep 30; + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + sleep 20; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 0); + sleep 10; +}); + +Script N(main) = SCRIPT({ + SI_VAR(15) = SI_VAR(1); + GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(10) = SI_VAR(1); + N(func_802A1484_72E9B4)(SI_VAR(10)); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + if (SI_VAR(0) == ActorID_PARTNER) { + await N(script6); + return; + } + SI_VAR(10) = c ItemId_LIFE_SHROOM; + SI_VAR(1) = SI_VAR(15); + await N(UseItemWithEffect); + await N(EatItem); + N(func_802A1438_72E968)(); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A1378_72E8A8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/life_shroom/life_shroom.h b/src/battle/item/life_shroom/life_shroom.h new file mode 100644 index 0000000000..fa114f73f5 --- /dev/null +++ b/src/battle/item/life_shroom/life_shroom.h @@ -0,0 +1,26 @@ +#ifndef BATTLE_ITEM_LIFE_SHROOM +#define BATTLE_ITEM_LIFE_SHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_life_shroom + +ApiStatus func_802D3F74(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D378C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_72E76C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12EC_72E81C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1484_72E9B4)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1438_72E968)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1378_72E8A8)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(UseItem); +Script N(EatItem); + +#endif diff --git a/src/battle/item/life_shroom_72E530.c b/src/battle/item/life_shroom_72E530.c deleted file mode 100644 index b370d12540..0000000000 --- a/src/battle/item/life_shroom_72E530.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A1000_72E530); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A11D4_72E704); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A123C_72E76C); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A12EC_72E81C); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A1378_72E8A8); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A1438_72E968); - -INCLUDE_ASM(s32, "battle/item/life_shroom_72E530", func_802A1484_72E9B4); diff --git a/src/battle/item/mushroom/lib.c b/src/battle/item/mushroom/lib.c new file mode 100644 index 0000000000..2c1ae8315c --- /dev/null +++ b/src/battle/item/mushroom/lib.c @@ -0,0 +1,224 @@ +#include "mushroom.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A2410; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A2410 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A2410, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A2410); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_715A8C)(ScriptInstance* 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++); + ItemEntity* item = get_item_entity(script->varTable[14]); + + item->position.x = a; + item->position.y = b; + item->position.z = c; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12EC_715B3C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + Bytecode* args = script->ptrReadPos; + + if (partner->koDuration == 0) { + return ApiStatus_DONE2; + } + + partner->koDuration -= get_variable(script, *args++); + if (partner->koDuration < 0) { + partner->koDuration = 0; + } + if (partner->koDuration > 0) { + partner->ptrDefuffIcon->ptrPropertyList[0xF] = partner->koDuration; + } else { + partner->koStatus = 0; + dispatch_event_partner(0x34); + partner->ptrDefuffIcon->ptrPropertyList[0xF] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1378_715BC8)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1438_715C88)(ScriptInstance* 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++); + + func_80071090(1, a, b, c, d); + + return ApiStatus_DONE2; +} + +#include "common/AddHP.inc.c" + +#include "common/AddFP.inc.c" + +ApiStatus N(func_802A15A0_715DF0)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + StaticItem* itemTable = gItemTable; + StaticItem* item = &itemTable[get_variable(script, *args++)]; + + script->varTable[11] = item->potencyA; + script->varTable[12] = item->potencyB; + script->varTable[15] = item->potencyA == 1; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/mushroom/mushroom.c b/src/battle/item/mushroom/mushroom.c new file mode 100644 index 0000000000..16fb9c457a --- /dev/null +++ b/src/battle/item/mushroom/mushroom.c @@ -0,0 +1,129 @@ +#include "mushroom.h" + +Script N(script6) = SCRIPT({ + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 180); + sleep 10; + SI_VAR(1) = SI_VAR(15); + await N(UseItem); + SI_VAR(14) = SI_VAR(10); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + spawn { + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + func_802D3474(SI_VAR(10), 0x80283EE8); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 30; + SI_VAR(2) += 5; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D3F74(SI_VAR(10), 32); + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + loop 25 { + func_802D378C(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A123C_715A8C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + RemoveItemEntity(SI_VAR(14)); + } + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetBattleCamTarget(0xFFFFFF83, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(25); + func_802D39FC(SI_VAR(10), 0.400390625); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25); + AddBattleCamZoom(100); + MoveBattleCamOver(30); + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) > 0) { + N(func_802A12EC_715B3C)(SI_VAR(11)); + } + sleep 30; + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + sleep 20; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 0); + sleep 10; +}); + +Script N(main) = SCRIPT({ + SI_VAR(14) = SI_VAR(1); + GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(10) = SI_VAR(1); + N(func_802A15A0_715DF0)(SI_VAR(10)); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + if (SI_VAR(0) == ActorID_PARTNER) { + await N(script6); + return; + } + SI_VAR(1) = SI_VAR(14); + await N(UseItemWithEffect); + await N(EatItem); + if (SI_VAR(15) == 1) { + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_STICK_OUT_TONGUE); + } + if (SI_VAR(11) > 0) { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A1378_715BC8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + } + if (SI_VAR(12) > 0) { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 20; + SI_VAR(1) += 25; + N(func_802A1438_715C88)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(12)); + } + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) != 0) { + N(AddHP)(SI_VAR(11)); + } + if (SI_VAR(12) != 0) { + N(AddFP)(SI_VAR(12)); + } + if (SI_VAR(15) == 0) { + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + } else { + sleep 30; + } + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/mushroom/mushroom.h b/src/battle/item/mushroom/mushroom.h new file mode 100644 index 0000000000..2a5075ae54 --- /dev/null +++ b/src/battle/item/mushroom/mushroom.h @@ -0,0 +1,28 @@ +#ifndef BATTLE_ITEM_MUSHROOM +#define BATTLE_ITEM_MUSHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_mushroom + +ApiStatus func_802D3F74(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D378C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_715A8C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12EC_715B3C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A15A0_715DF0)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1378_715BC8)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1438_715C88)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddHP)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(UseItem); +Script N(EatItem); + +#endif diff --git a/src/battle/item/mushroom_715850.c b/src/battle/item/mushroom_715850.c deleted file mode 100644 index 75deebaa88..0000000000 --- a/src/battle/item/mushroom_715850.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_item_mushroom - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1000_715850); - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A11D4_715A24); - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A123C_715A8C); - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A12EC_715B3C); - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1378_715BC8); - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A1438_715C88); - -#include "common/AddHP.inc.c" - -#include "common/AddFP.inc.c" - -INCLUDE_ASM(s32, "battle/item/mushroom_715850", func_802A15A0_715DF0); diff --git a/src/battle/item/mystery/lib.c b/src/battle/item/mystery/lib.c new file mode 100644 index 0000000000..c623585f1c --- /dev/null +++ b/src/battle/item/mystery/lib.c @@ -0,0 +1,364 @@ +#include "mystery.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A25C0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A25C0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A25C0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A25C0); + } + + return ApiStatus_DONE2; +} + +#ifdef NON_MATCHING + +extern s32 D_802A25E4; +extern MenuIcon* D_802A25C8; +extern s32 D_802A25EC; + +void N(func_802A123C_72C7EC)(void) { + s32 i; + MenuIcon** ptr; + s32 var; + s32* var2; + + if (D_802A25E4 < 6) { + if (D_802A25E4 > 0) { + draw_box(0, 7, 0x6A, 0x56, 0, 0x24, 0x24, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x140, 0xF0, 0); + + gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); + + ptr = &D_802A25C8; + for (i = 0; i < 7; i++) { + var2 = *ptr; + var = (D_802A25EC / 100) - 0x68; + ptr++; + set_icon_render_pos(var2, 0x7C, (i * 0x1A) - var); + draw_icon_2(var2); + } + + var2 = D_802A25C8; + var = (D_802A25EC / 100) - 0x68; + set_icon_render_pos(var2, 0x7C, (i * 0x1A) - var); + draw_icon_2(var2); + } + } +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/mystery_72C5B0", battle_item_mystery_func_802A123C_72C7EC, ScriptInstance* script, + s32 isInitialCall); +#endif + +#ifdef NON_MATCHING + +extern s32 D_802A25E4; +extern s32 D_802A25E8; +extern s32 D_802A25EC; +extern s32 D_802A25F0; +extern s32 D_802A25F4; +extern s32 D_802A25F8; +extern s16** D_802A25FC; +extern MenuIcon** D_802A25C8; +extern struct N(tempStc) D_8008A680[100]; + +ApiStatus N(func_802A13E4_72C994)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + + if (isInitialCall) { + D_802A25E4 = 0; + } + + switch (D_802A25E4) { + case 0: { + s32* tablePtr; + s32 i; + f32 t0; + f32 t1; + MenuIcon* icon; + MenuIcon** iconPtr; + struct N(tempStc)* ic; + StaticItem* itemTable; + + D_802A25F8 = bind_dynamic_entity_7(NULL, func_802A123C_72C7EC); + D_802A25EC = rand_int(18200); + D_802A25F0 = 1000; + tablePtr = &D_802A25FC; + *tablePtr = N(D_802A227C_72D82C); + + if (battleStatus->unk_432 > 0) { + func_80137DC0(1, &t0, &t1); + if (t1 >= 215.0f) { + *tablePtr = N(D_802A229C_72D84C); + } + } + + i = 0; + ic = &D_8008A680; + itemTable = gItemTable; + iconPtr = &D_802A25C8; + for (; i < 7; i++, iconPtr++) { + icon = create_icon(ic[itemTable[D_802A25FC[i]].iconID].iconId); + *iconPtr = icon; + set_icon_flags(icon, 0x80); + } + D_802A25E4 = 1; + } + break; + + case 1: { + s32* ECptr = &D_802A25EC; + s32* F0ptr = &D_802A25F0; + + *ECptr += *F0ptr; + if (*ECptr / 100 > 181) { + s32* test = ECptr; + *test -= 0x4718; + } + + if (*F0ptr > 400) { + *F0ptr -= 10; + } else if (*F0ptr > 100) { + *F0ptr -= 5; + } else { + *F0ptr -= 1; + } + + if (D_802A25F0 < 10) { + D_802A25E8 = D_802A25EC / 100; + if (D_802A25E8 % 26 < 13) { + if (rand_int(100) < 80) { + D_802A25E4 = 2; + } else { + D_802A25E4 = 3; + } + } else if (rand_int(100) < 60) { + D_802A25E4 = 3; + } else { + D_802A25E4 = 2; + } + } + } + break; + + case 2: { + s32* E8ptr = &D_802A25E8; + s32 a, b, c, d; + + d = *E8ptr % 26; + a = d; + c = a + 3; + if (c < 0) { + c = a + 6; + } + d = c >> 2; + *E8ptr -= d; + D_802A25EC = *E8ptr * 100; + if (d == 0) { + D_802A25E4 = 4; + } + } + break; + + case 3: { + s32* E8ptr = &D_802A25E8; + s32 a, b, c, d; + + d = *E8ptr % 26; + if (d == 0) { + D_802A25E4 = 4; + break; + } + a = d; + b = 26; + b -= a; + c = b + 3; + if (c < 0) { + c = b + 6; + } + c = c >> 2; + *E8ptr += c; + D_802A25EC = *E8ptr * 100; + } + break; + + case 4: { + D_802A25F4 = 20; + D_802A25E4 = 5; + } + break; + + case 5: { + s32* F4ptr = &D_802A25F4; + s32 i; + s16 g; + MenuIcon** iconPtr; + + if (*F4ptr != 0) { + *F4ptr -= 1; + break; + } + iconPtr = &D_802A25C8; + i = D_802A25E8 / 26; + g = D_802A25FC[i]; + battleStatus->selectedItemID = g; + script->varTable[0] = g; + func_801235C0(D_802A25F8); + for (i = 0; i < 7; i++) { + free_icon(*iconPtr++); + } + } + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/mystery_72C5B0", battle_item_mystery_func_802A13E4_72C994, ScriptInstance* script, + s32 isInitialCall); +#endif + +ApiStatus N(func_802A188C_72CE3C)(ScriptInstance* 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++); + + func_80070190(2, a, b, c, 0, -1.0f, 0, 5); + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/mystery/mystery.c b/src/battle/item/mystery/mystery.c new file mode 100644 index 0000000000..5ddc89a12c --- /dev/null +++ b/src/battle/item/mystery/mystery.c @@ -0,0 +1,91 @@ +#include "mystery.h" +#include "battle/item/mystery/mystery.png.h" + +Vtx N(model)[] = { + { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, + { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, + { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, + { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, +}; + +Gfx N(displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(mystery_pal_png)), + gsDPLoadTextureTile_4b(&N(mystery_png), G_IM_FMT_CI, N(mystery_png_width), N(mystery_png_height), 0, 0, N(mystery_png_width) - 1, N(mystery_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, +}; + +s32 N(D_802A227C_72D82C)[8] = { + 0x0000008A, 0x0000008C, 0x00000080, 0x00000088, + 0x0000009A, 0x00000082, 0x00000085, 0x0000008A +}; + +s32 N(D_802A229C_72D84C)[8] = { + 0x0000008A, 0x0000008C, 0x00000085, 0x00000088, + 0x0000008A, 0x0000008C, 0x00000085, 0x0000008A +}; + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_MYSTERY; + await N(UseItemWithEffect); + spawn { + sleep 220; + PlaySoundAtActor(ActorID_PLAYER, 1011); + } + PlaySoundAtActor(ActorID_PLAYER, 872); + N(func_802A13E4_72C994)(); + sleep 2; + if (SI_VAR(0) != ItemId_PEBBLE) { + jump UseMystery; + return; + } + func_802D3474(SI_VAR(10), N(modelCommandList)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 150; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetOwnerTarget(0, 0); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + SI_VAR(0) = 0; + loop 18 { + SI_VAR(0) += 0xFFFFFFC4; + func_802D3840(SI_VAR(10), 0, 0, SI_VAR(0)); + sleep 1; + } + } + func_802D39FC(SI_VAR(10), 0.6005859375); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 12); + spawn { + SI_VAR(0) += 60; + SI_VAR(1) += 0; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 16); + func_802D3624(SI_VAR(10)); + } + SetTargetActor(ActorID_SELF, 0); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A188C_72CE3C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetBattleFlagBits(32, 1); + DispatchDamagePlayerEvent(1, Event_HIT); +}); diff --git a/src/battle/item/mystery/mystery.h b/src/battle/item/mystery/mystery.h new file mode 100644 index 0000000000..8479ca5392 --- /dev/null +++ b/src/battle/item/mystery/mystery.h @@ -0,0 +1,23 @@ +#ifndef BATTLE_ITEM_MYSTERY +#define BATTLE_ITEM_MYSTERY + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_mystery + +struct N(tempStc) { + s32 iconId; + s32 unk_04; +} N(tempStc); + +s32 N(D_802A227C_72D82C)[8]; +s32 N(D_802A229C_72D84C)[8]; + +ApiStatus N(func_802A13E4_72C994)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A188C_72CE3C)(ScriptInstance *script, s32 isInitialCall); + +Script N(UseItemWithEffect); + +#endif diff --git a/src/battle/item/mystery_72C5B0.c b/src/battle/item/mystery_72C5B0.c deleted file mode 100644 index 9a2bf67837..0000000000 --- a/src/battle/item/mystery_72C5B0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/mystery_72C5B0", func_802A1000_72C5B0); - -INCLUDE_ASM(s32, "battle/item/mystery_72C5B0", func_802A11D4_72C784); - -INCLUDE_ASM(s32, "battle/item/mystery_72C5B0", func_802A123C_72C7EC); - -INCLUDE_ASM(s32, "battle/item/mystery_72C5B0", func_802A13E4_72C994); - -INCLUDE_ASM(s32, "battle/item/mystery_72C5B0", func_802A188C_72CE3C); diff --git a/src/battle/item/pebble/lib.c b/src/battle/item/pebble/lib.c new file mode 100644 index 0000000000..6f33935f4e --- /dev/null +++ b/src/battle/item/pebble/lib.c @@ -0,0 +1,147 @@ +#include "pebble.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1E80; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1E80 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1E80, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1E80); + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); + diff --git a/src/battle/item/pebble/pebble.c b/src/battle/item/pebble/pebble.c new file mode 100644 index 0000000000..a4a425935e --- /dev/null +++ b/src/battle/item/pebble/pebble.c @@ -0,0 +1,80 @@ +#include "pebble.h" +#include "battle/item/pebble/pebble.png.h" + +Vtx N(model)[] = { + { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, + { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, + { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, + { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, +}; + +Gfx N(displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(pebble_pal_png)), + gsDPLoadTextureTile_4b(&N(pebble_png), G_IM_FMT_CI, N(pebble_png_width), N(pebble_png_height), 0, 0, N(pebble_png_width) - 1, N(pebble_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, +}; + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_PEBBLE; + await N(UseItemWithEffect); + UseCamPreset(3); + MoveBattleCamOver(15); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + PlaySound(1018); + sleep 3; + func_802D3474(SI_VAR(10), N(modelCommandList)); + SI_VAR(0) = 1.0; + MultiplyByActorScale(SI_VAR(0)); + func_802D38EC(SI_VAR(10), SI_VAR(0), SI_VAR(0), SI_VAR(0)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(3) = 20; + SI_VAR(4) = 42; + SI_VAR(5) = 5; + MultiplyVec3ByActorScale(SI_VAR(3), SI_VAR(4), SI_VAR(5)); + SI_VAR(0) += SI_VAR(3); + SI_VAR(1) += SI_VAR(4); + SI_VAR(2) += SI_VAR(5); + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn { + SI_VAR(0) = 0; + loop 18 { + SI_VAR(0) += 0xFFFFFFC4; + func_802D3840(SI_VAR(10), 0, 0, SI_VAR(0)); + sleep 1; + } + } + func_802D39FC(SI_VAR(10), 0.80078125); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 18); + GetItemPower(ItemId_PEBBLE, SI_VAR(3), SI_VAR(4)); + ApplyShrinkFromOwner(SI_VAR(3)); + ItemDamageEnemy(SI_VAR(9), 0x18000000, 0, SI_VAR(3), 32); + SI_VAR(0) += 60; + SI_VAR(1) += 0; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 16); + func_802D3624(SI_VAR(10)); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/pebble/pebble.h b/src/battle/item/pebble/pebble.h new file mode 100644 index 0000000000..bfcb559cf8 --- /dev/null +++ b/src/battle/item/pebble/pebble.h @@ -0,0 +1,13 @@ +#ifndef BATTLE_ITEM_PEBBLE +#define BATTLE_ITEM_PEBBLE + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_pebble + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/pebble_719970.c b/src/battle/item/pebble_719970.c deleted file mode 100644 index 8c8d6b2500..0000000000 --- a/src/battle/item/pebble_719970.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/pebble_719970", func_802A1000_719970); - -INCLUDE_ASM(s32, "battle/item/pebble_719970", func_802A11D4_719B44); diff --git a/src/battle/item/please_come_back/lib.c b/src/battle/item/please_come_back/lib.c new file mode 100644 index 0000000000..8a6cd69691 --- /dev/null +++ b/src/battle/item/please_come_back/lib.c @@ -0,0 +1,146 @@ +#include "please_come_back.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A18E0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A18E0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A18E0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A18E0); + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/please_come_back/please_come_back.c b/src/battle/item/please_come_back/please_come_back.c new file mode 100644 index 0000000000..9ce0c0f6d2 --- /dev/null +++ b/src/battle/item/please_come_back/please_come_back.c @@ -0,0 +1,15 @@ +#include "please_come_back.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_DIZZY_DIAL; + await N(UseItemWithEffect); + SetGoalToHome(0); + SetJumpAnimations(ActorID_PLAYER, 0, PlayerAnim_MIDAIR_STILL, PlayerAnim_MIDAIR, PlayerAnim_9); + SetActorSpeed(ActorID_PLAYER, 4.0); + SetActorJumpGravity(ActorID_PLAYER, 1.80078125); + func_80273444(4, 0, 0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_8000B); + sleep 8; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); +}); + diff --git a/src/battle/item/please_come_back/please_come_back.h b/src/battle/item/please_come_back/please_come_back.h new file mode 100644 index 0000000000..dddd52b21b --- /dev/null +++ b/src/battle/item/please_come_back/please_come_back.h @@ -0,0 +1,14 @@ +#ifndef BATTLE_ITEM_PLEASE_COME_BACK +#define BATTLE_ITEM_PLEASE_COME_BACK + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_please_come_back + +ApiStatus func_80273444(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); + +#endif diff --git a/src/battle/item/please_come_back_7285E0.c b/src/battle/item/please_come_back_7285E0.c deleted file mode 100644 index fdd9314b3e..0000000000 --- a/src/battle/item/please_come_back_7285E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/please_come_back_7285E0", func_802A1000_7285E0); - -INCLUDE_ASM(s32, "battle/item/please_come_back_7285E0", func_802A11D4_7287B4); diff --git a/src/battle/item/pow_block/lib.c b/src/battle/item/pow_block/lib.c new file mode 100644 index 0000000000..a9aa6138d1 --- /dev/null +++ b/src/battle/item/pow_block/lib.c @@ -0,0 +1,189 @@ +#include "pow_block.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A2120; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A2120 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A2120, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A2120); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_718A8C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + CollisionStatus* collisionStatus = &gCollisionStatus; + PlayerStatus* playerStatus = &gPlayerStatus; + + if (player->scalingFactor == 1.0) { + s32 var = script->varTable[10]; + get_entity_by_index(var); + collisionStatus->currentCeiling = var | 0x4000; + playerStatus->flags |= 2; + update_entities(); + collisionStatus->currentCeiling = -1; + playerStatus->flags &= ~2; + return ApiStatus_DONE2; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12E4_718B34)(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + entity->flags |= 0x20000000; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1318_718B68)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + Entity* entity = get_entity_by_index(script->varTable[10]); + + entity->scale.x = player->scalingFactor; + entity->scale.y = player->scalingFactor; + entity->scale.z = player->scalingFactor; + if (player->scalingFactor != 1.0) { + entity->position.y -= 10.0f; + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/pow_block/pow_block.c b/src/battle/item/pow_block/pow_block.c new file mode 100644 index 0000000000..8b833583f3 --- /dev/null +++ b/src/battle/item/pow_block/pow_block.c @@ -0,0 +1,76 @@ +#include "pow_block.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_P_O_W_BLOCK; + await N(UseItemWithEffect); + sleep 10; + MakeEntity(0x802EA2E0, 0xFFFFFFD8, 60, 0, 0, 0x80000000); + SI_VAR(10) = SI_VAR(0); + N(func_802A1318_718B68)(); + PlayEffect(7, 2, 0xFFFFFFD8, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFE2, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFD8, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFD8, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + UseCamPreset(2); + MoveBattleCamOver(20); + spawn { + sleep 15; + PlaySoundAtActor(ActorID_PLAYER, 334); + N(func_802A123C_718A8C)(); + PlayEffect(7, 2, 0xFFFFFFD8, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFE2, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFD8, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFD8, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + StartRumble(4); + ShakeCam(1, 0, 2, 1.0); + ShakeCam(1, 0, 2, 3.0); + ShakeCam(1, 0, 2, 6.0); + ShakeCam(1, 0, 2, 5.0); + ShakeCam(1, 0, 2, 4.0); + PlaySoundAtActor(ActorID_PLAYER, 8240); + ShakeCam(1, 0, 2, 3.0); + ShakeCam(1, 0, 2, 2.0); + ShakeCam(1, 0, 2, 1.0); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 0.2001953125); + } + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 30; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetAnimation(ActorID_PLAYER, 0, 0x10005); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + sleep 5; + SetJumpAnimations(ActorID_PLAYER, 0, PlayerAnim_MIDAIR_STILL, PlayerAnim_MIDAIR, PlayerAnim_9); + SetActorJumpGravity(ActorID_PLAYER, 0.6005859375); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80273444(20, 0, 0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetItemPower(ItemId_P_O_W_BLOCK, SI_VAR(3), SI_VAR(4)); + ApplyShrinkFromOwner(SI_VAR(3)); + func_80269EAC(22); + ItemDamageEnemy(SI_VAR(0), 0x38000400, 0, SI_VAR(3), 32); +1: + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + PlayEffect(7, 2, 0xFFFFFFBA, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFC4, 65, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFBA, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + PlayEffect(7, 2, 0xFFFFFFBA, 55, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0); + N(func_802A12E4_718B34)(); + sleep 30; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/pow_block/pow_block.h b/src/battle/item/pow_block/pow_block.h new file mode 100644 index 0000000000..b2723adc14 --- /dev/null +++ b/src/battle/item/pow_block/pow_block.h @@ -0,0 +1,20 @@ +#ifndef BATTLE_ITEM_POW_BLOCK +#define BATTLE_ITEM_POW_BLOCK + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_pow_block + +ApiStatus func_80273444(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_80269EAC(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A1318_718B68)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_718A8C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12E4_718B34)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/pow_block_718850.c b/src/battle/item/pow_block_718850.c deleted file mode 100644 index 04626f09f8..0000000000 --- a/src/battle/item/pow_block_718850.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/pow_block_718850", func_802A1000_718850); - -INCLUDE_ASM(s32, "battle/item/pow_block_718850", func_802A11D4_718A24); - -INCLUDE_ASM(s32, "battle/item/pow_block_718850", func_802A123C_718A8C); - -INCLUDE_ASM(s32, "battle/item/pow_block_718850", func_802A12E4_718B34); - -INCLUDE_ASM(s32, "battle/item/pow_block_718850", func_802A1318_718B68); diff --git a/src/battle/item/repel_gel/lib.c b/src/battle/item/repel_gel/lib.c new file mode 100644 index 0000000000..46f3498aca --- /dev/null +++ b/src/battle/item/repel_gel/lib.c @@ -0,0 +1,158 @@ +#include "repel_gel.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A19C0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A19C0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A19C0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A19C0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72DDAC)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + ActorPart* part = player->partsTable; + + inflict_status(player, Debuff_0xE, script->varTable[0]); + player->status = 0; + part->flags |= 0x100; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/repel_gel/repel_gel.c b/src/battle/item/repel_gel/repel_gel.c new file mode 100644 index 0000000000..80eec4bf15 --- /dev/null +++ b/src/battle/item/repel_gel/repel_gel.c @@ -0,0 +1,21 @@ +#include "repel_gel.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_REPEL_GEL; + await N(UseItemWithEffect); + PlaySoundAtActor(ActorID_PLAYER, 885); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_30008); + sleep 45; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + PlayEffect(51, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + PlaySoundAtActor(ActorID_PLAYER, 886); + GetItemPower(ItemId_REPEL_GEL, SI_VAR(0), SI_VAR(1)); + N(func_802A123C_72DDAC)(); + sleep 20; + ShowMessageBox(17, 60); + WaitForMessageBoxDone(); + await N(PlayerGoHome); +}); + diff --git a/src/battle/item/repel_gel/repel_gel.h b/src/battle/item/repel_gel/repel_gel.h new file mode 100644 index 0000000000..be3deade6b --- /dev/null +++ b/src/battle/item/repel_gel/repel_gel.h @@ -0,0 +1,15 @@ +#ifndef BATTLE_ITEM_REPEL_GEL +#define BATTLE_ITEM_REPEL_GEL + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_repel_gel + +ApiStatus N(func_802A123C_72DDAC)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/repel_gel_72DB70.c b/src/battle/item/repel_gel_72DB70.c deleted file mode 100644 index 5328f15248..0000000000 --- a/src/battle/item/repel_gel_72DB70.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/repel_gel_72DB70", func_802A1000_72DB70); - -INCLUDE_ASM(s32, "battle/item/repel_gel_72DB70", func_802A11D4_72DD44); - -INCLUDE_ASM(s32, "battle/item/repel_gel_72DB70", func_802A123C_72DDAC); diff --git a/src/battle/item/shooting_star/lib.c b/src/battle/item/shooting_star/lib.c new file mode 100644 index 0000000000..818b7f8049 --- /dev/null +++ b/src/battle/item/shooting_star/lib.c @@ -0,0 +1,237 @@ +#include "shooting_star.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1EE0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1EE0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1EE0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1EE0); + } + + return ApiStatus_DONE2; +} + +#ifdef NON_MATCHING + +void func_8006FE30(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7); + +ApiStatus N(func_802A123C_71D9AC)(ScriptInstance* script, s32 isInitialCall) { + s32 c8 = 200; + s32 temp_s1 = 100 + rand_int(c8); + s32 temp_s0 = rand_int(40); + s32 phi_a0; + s32 phi_v0; + s32 rand; + f32 temp_f20; + f32 temp_f22; + f32 test; + + if (script->varTable[0] & 3) { + rand = rand_int(100); + rand += c8; + temp_f22 = temp_s1 - rand; + rand = rand_int(100); + rand -= 50; + temp_f20 = temp_s0 - rand; + phi_v0 = rand_int(10); + phi_a0 = 2; + } else { + rand = rand_int(100); + rand += 200; + temp_f22 = temp_s1 - rand; + rand = rand_int(100); + rand -= 50; + temp_f20 = temp_s0 - rand; + phi_v0 = rand_int(10); + phi_a0 = 3; + } + + do { + func_8006FE30(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7); + if (temp_f20) { + temp_f20 -= rand; + } + } while (0); + + return ApiStatus_DONE2; +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/shooting_star_71D770", battle_item_shooting_star_func_802A123C_71D9AC, + ScriptInstance* script, s32 isInitialCall); +#endif + +ApiStatus N(func_802A1388_71DAF8)(ScriptInstance* 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++); + + func_80070190(2, a, b, c, 0, -1.0f, 0, 5); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1444_71DBB4)(ScriptInstance* script, s32 isInitialCall) { + s32 ret; + + if (isInitialCall) { + func_8011D82C(1); + *D_801512F0 = 1; + set_background_color_blend(0, 0, 0, 0); + script->functionTemp[0].s = 10; + } + + set_background_color_blend(0, 0, 0, ((10 - script->functionTemp[0].s) * 16) & 240); + script->functionTemp[0].s--; + do {} while (0); + return (script->functionTemp[0].s == 0) * ApiStatus_DONE2; +} + +ApiStatus N(func_802A14D4_71DC44)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 10; + } + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 16) & 240); + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/shooting_star/shooting_star.c b/src/battle/item/shooting_star/shooting_star.c new file mode 100644 index 0000000000..f607721bcc --- /dev/null +++ b/src/battle/item/shooting_star/shooting_star.c @@ -0,0 +1,72 @@ +#include "shooting_star.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_SHOOTING_STAR; + await N(UseItemWithEffect); + spawn { + sleep 5; + UseCamPreset(2); + MoveBattleCamOver(20); + } + N(func_802A1444_71DBB4)(); + spawn { + SI_VAR(0) = 0; + loop 10 { + PlaySoundAtActor(ActorID_PLAYER, 601); + N(func_802A123C_71D9AC)(); + SI_VAR(0) += 1; + sleep 5; + PlaySoundAtActor(ActorID_PLAYER, 602); + N(func_802A123C_71D9AC)(); + SI_VAR(0) += 1; + sleep 5; + } + } + spawn { + SI_VAR(0) = 0; + sleep 50; + loop 10 { + PlaySoundAtActor(ActorID_PLAYER, 604); + SI_VAR(0) += 1; + sleep 5; + PlaySoundAtActor(ActorID_PLAYER, 605); + SI_VAR(0) += 1; + sleep 5; + } + } + spawn { + loop 5 { + sleep 15; + StartRumble(8); + ShakeCam(1, 0, 5, 1.0); + } + } + sleep 90; + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A1388_71DAF8)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetItemPower(ItemId_SHOOTING_STAR, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x38000100, 0, SI_VAR(0), 32); +1: + sleep 10; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + sleep 20; + UseCamPreset(2); + MoveBattleCamOver(20); + await N(PlayerGoHome); + spawn { + N(func_802A14D4_71DC44)(); + } + sleep 30; +}); diff --git a/src/battle/item/shooting_star/shooting_star.h b/src/battle/item/shooting_star/shooting_star.h new file mode 100644 index 0000000000..bf032a6f35 --- /dev/null +++ b/src/battle/item/shooting_star/shooting_star.h @@ -0,0 +1,18 @@ +#ifndef BATTLE_ITEM_SHOOTING_STAR +#define BATTLE_ITEM_SHOOTING_STAR + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_shooting_star + +ApiStatus N(func_802A1444_71DBB4)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_71D9AC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1388_71DAF8)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A14D4_71DC44)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/shooting_star_71D770.c b/src/battle/item/shooting_star_71D770.c deleted file mode 100644 index 160a3e6e66..0000000000 --- a/src/battle/item/shooting_star_71D770.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A1000_71D770); - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A11D4_71D944); - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A123C_71D9AC); - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A1388_71DAF8); - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A1444_71DBB4); - -INCLUDE_ASM(s32, "battle/item/shooting_star_71D770", func_802A14D4_71DC44); diff --git a/src/battle/item/sleepy_sheep/lib.c b/src/battle/item/sleepy_sheep/lib.c new file mode 100644 index 0000000000..fc7716cab0 --- /dev/null +++ b/src/battle/item/sleepy_sheep/lib.c @@ -0,0 +1,365 @@ +#include "sleepy_sheep.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A3F50; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A3F50 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A3F50, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A3F50); + } + + return ApiStatus_DONE2; +} + +#ifdef NON_MATCHING + +extern Vec3f D_802A3F88; +extern s32* D_802A3F58; + +s32 N(D_802A3E88_7214D8)[] = { + 0x00000000, 0x00000000, 0x00000000, + 0xFFFFFFE2, 0x00000000, 0xFFFFFFCE, + 0xFFFFFFE5, 0x00000000, 0x0000001E, + 0xFFFFFFBA, 0x00000000, 0xFFFFFFFB, + 0xFFFFFF97, 0x00000000, 0x0000001E, + 0xFFFFFF92, 0x00000000, 0xFFFFFFCE, + 0xFFFFFF6F, 0x00000000, 0xFFFFFFFB, + 0xFFFFFF56, 0x00000000, 0xFFFFFFCE, + 0xFFFFFF42, 0x00000000, 0xFFFFFFE2, + 0xFFFFFF2E, 0x00000000, 0xFFFFFFF6 +}; + +f32 N(D_802A3F00_721550)[] = { + 0x3F800000, 0x3F800000, 0x3F400000, 0x3F800000, + 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, + 0x3F400000, 0x3F400000 +}; + +s32 N(D_802A3F28_721578)[] = { + 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260, + 0x802A32A0, 0x802A32E0, 0x802A3260, 0x802A32A0, + 0x802A32E0, 0x802A3260 +}; + +void fx_walk_large(s32, f32, f32, f32, s32); +void func_802D4364(s32, s32, s32, s32); +void func_802D43AC(s32, f32, f32, f32); +void func_802D43F4(s32); + +ApiStatus func_802A123C_71E88C(ScriptInstance* script, s32 isInitialCall) { + s32 i; + Vec3f vecf; + s32 flag; + Vec3f* D_802A3F88_ptr = &D_802A3F88; + s32* D_802A3E88_7214D8_ptr1; // = &N(D_802A3E88_7214D8); + s32* D_802A3E88_7214D8_ptr2; // = &N(D_802A3E88_7214D8); + s32* D_802A3E88_7214D8_ptr3; // = &N(D_802A3E88_7214D8); + s32* D_802A3F58_ptr; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + } + + switch (script->functionTemp[0].s) { + case 0: { + s32* D_802A3F28_721578_ptr = &N(D_802A3F28_721578); + s32 loop1, loop2, loop3; + D_802A3F58_ptr = &D_802A3F58; + + D_802A3F88_ptr->x = -200.0f; + D_802A3F88_ptr->z = 10.0f; + + D_802A3E88_7214D8_ptr1 = N(D_802A3E88_7214D8) + 0; + D_802A3E88_7214D8_ptr2 = N(D_802A3E88_7214D8) + 1; + D_802A3E88_7214D8_ptr3 = N(D_802A3E88_7214D8) + 2; + + for (i = 0; i < 10; i++) { + D_802A3F58_ptr[i] = func_802D420C(D_802A3F28_721578_ptr[i]); + + func_802D4364(D_802A3F58_ptr[i], + *D_802A3E88_7214D8_ptr1 + D_802A3F88_ptr->x, + *D_802A3E88_7214D8_ptr2, + *D_802A3E88_7214D8_ptr3 + D_802A3F88_ptr->z); + func_802D43AC(D_802A3F58_ptr[i], N(D_802A3F00_721550)[i], N(D_802A3F00_721550)[i], 1.0f); + D_802A3E88_7214D8_ptr1 += i * 3 + 0; + D_802A3E88_7214D8_ptr2 += i * 3 + 1; + D_802A3E88_7214D8_ptr3 += i * 3 + 2; + } + script->functionTemp[0].s = 1; + script->functionTemp[1].s = gGameStatusPtr->frameCounter % 10; + } + break; + + case 1: + D_802A3F88.x += 6.0f; + if (gGameStatusPtr->frameCounter % 3 == 0) { + script->functionTemp[1].s++; + script->functionTemp[1].s %= 10; + } + + flag = 0; + D_802A3F58_ptr = &D_802A3F58; + D_802A3E88_7214D8_ptr1 = N(D_802A3E88_7214D8); + D_802A3E88_7214D8_ptr2 = N(D_802A3E88_7214D8); + D_802A3E88_7214D8_ptr3 = N(D_802A3E88_7214D8); + for (i = 0; i < 10; i++) { + f32 x, y, z; + + D_802A3E88_7214D8_ptr1 += i * 3 + 0; + D_802A3E88_7214D8_ptr2 += i * 3 + 1; + D_802A3E88_7214D8_ptr3 += i * 3 + 2; + + x = *D_802A3E88_7214D8_ptr1 + D_802A3F88.x; + y = *D_802A3E88_7214D8_ptr2; + z = *D_802A3E88_7214D8_ptr3 + D_802A3F88.z; + + func_802D4364(D_802A3F58_ptr[i], x, y, z); + + if (flag == 0 && script->functionTemp[1].s == i) { + f32 x2, y2; + if (gGameStatusPtr->frameCounter % 5 == 0) { + + y2 = y; + if (x > 0.0f) { + x2 = x; + if (x > 100.0f) { + x2 = x - 50.0f; + } + y2 = rand_int(x2); + } + x2 = x; + if (x > 40.0f) { + x2 = -(x - 40.0f); + } + fx_walk_large(3, x2, y2, z, 0); + flag = 1; + } + } + D_802A3E88_7214D8_ptr1 += 0xC; + D_802A3E88_7214D8_ptr2 += 0xC; + D_802A3E88_7214D8_ptr3 += 0xC; + } + if (gGameStatusPtr->frameCounter & 1) { + s32 randIdx = rand_int(9); + fx_walk_large(2, N(D_802A3E88_7214D8)[randIdx * 3 + 0] + D_802A3F88_ptr->x, + N(D_802A3E88_7214D8)[randIdx * 3 + 1], + N(D_802A3E88_7214D8)[randIdx * 3 + 2] + D_802A3F88_ptr->z, 0); + } + if (D_802A3F88_ptr->x >= 320.0f) { + script->functionTemp[0].s = 2; + break; + } + return ApiStatus_DONE2; + + case 2: + for (i = 0; i < 10; i++) { + func_802D43F4(*(&D_802A3F58 + i)); + } + + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/sleepy_sheep_71E650", battle_item_sleepy_sheep_func_802A123C_71E88C, + ScriptInstance* script, s32 isInitialCall); +#endif + +ApiStatus N(func_802A1740_71ED90)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 i; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + script->functionTemp[1].s = 0x5A; + } + + for (i = 0; i < player->targetListLength; i++) { + s8 targetIdx = player->targetIndexList[i]; + SelectableTarget* target = &player->targetData[targetIdx]; + Actor* targetActor = get_actor(target->actorID); + ActorPart* targetPart = get_actor_part(targetActor, target->partID); + + if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) { + targetActor->yaw += 33.0f; + targetActor->yaw = clamp_angle(targetActor->yaw); + } + } + + if (script->functionTemp[1].s != 0) { + script->functionTemp[1].s--; + return ApiStatus_BLOCK; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1848_71EE98)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 i; + s32 ret; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + } + + ret = 0; + + for (i = 0; i < player->targetListLength; i++) { + s8 targetIdx = player->targetIndexList[i]; + SelectableTarget* target = &player->targetData[targetIdx]; + Actor* targetActor = get_actor(target->actorID); + + if (targetActor != NULL) { + ActorPart* targetPart = get_actor_part(targetActor, target->partID); + if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) { + if (targetActor->yaw < 360.0f) { + targetActor->yaw += 33.0f; + if (targetActor->yaw >= 360.0f) { + targetActor->yaw = 360.0f; + } + ret = 1; + } + } + } + } + + return (ret == 0) * ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/sleepy_sheep/sleepy_sheep.c b/src/battle/item/sleepy_sheep/sleepy_sheep.c new file mode 100644 index 0000000000..6d79bd02db --- /dev/null +++ b/src/battle/item/sleepy_sheep/sleepy_sheep.c @@ -0,0 +1,248 @@ +#include "sleepy_sheep.h" +#include "battle/item/sleepy_sheep/sleepy_sheep1.png.h" +#include "battle/item/sleepy_sheep/sleepy_sheep2.png.h" +#include "battle/item/sleepy_sheep/sleepy_sheep3.png.h" + +Vtx N(model)[] = { + { .v = { -28, 0, 0, FALSE, 0, 1536, 0, 0, 0, 255 } }, + { .v = { 27, 0, 0, FALSE, 1792, 1536, 0, 0, 0, 255 } }, + { .v = { 27, 47, 0, FALSE, 1792, 0, 0, 0, 0, 255 } }, + { .v = { -28, 47, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, +}; + +Gfx N(frame1_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(sleepy_sheep1_pal_png)), + gsDPLoadTextureTile_4b(&N(sleepy_sheep1_png), G_IM_FMT_CI, N(sleepy_sheep1_png_width), N(sleepy_sheep1_png_height), 0, 0, N(sleepy_sheep1_png_width) - 1, N(sleepy_sheep1_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx N(frame2_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(sleepy_sheep2_pal_png)), + gsDPLoadTextureTile_4b(&N(sleepy_sheep2_png), G_IM_FMT_CI, N(sleepy_sheep2_png_width), N(sleepy_sheep2_png_height), 0, 0, N(sleepy_sheep2_png_width) - 1, N(sleepy_sheep2_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx N(frame3_displayList)[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetTextureConvert(G_TC_FILT), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, &N(sleepy_sheep3_pal_png)), + gsDPLoadTextureTile_4b(&N(sleepy_sheep3_png), G_IM_FMT_CI, N(sleepy_sheep3_png_width), N(sleepy_sheep3_png_height), 0, 0, N(sleepy_sheep3_png_width) - 1, N(sleepy_sheep3_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +s32 N(modelCommandList)[] = { + 0x00000004, 0x0000000D, + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000003, &N(frame2_displayList), + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000002, &N(frame3_displayList), + 0x00000002, 0x00000000, + + 0x00000004, 0x0000000D, + 0x00000001, 0x00000003, &N(frame2_displayList), + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000002, &N(frame3_displayList), + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000002, 0x00000000, + + 0x00000004, 0x0000000D, + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000002, &N(frame3_displayList), + 0x00000001, 0x00000002, &N(frame1_displayList), + 0x00000001, 0x00000003, &N(frame2_displayList), + 0x00000002, 0x00000000, +}; + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_SLEEPY_SHEEP; + await N(UseItemWithEffect); + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFBD, 0xFFFFFFF1, 0xFFFFFFFB); + SetBattleCamOffsetZ(45); + SetBattleCamZoom(169); + MoveBattleCamOver(50); + spawn { + PlaySoundAtActor(ActorID_PLAYER, 868); + loop 7 { + StartRumble(2); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 1.5); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 0.2001953125); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 2.0); + ShakeCam(1, 0, 2, 1.5); + ShakeCam(1, 0, 2, 1.0); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 0.25); + sleep 2; + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 1.5); + ShakeCam(1, 0, 2, 0.5); + ShakeCam(1, 0, 2, 0.2001953125); + } + } + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 32; + ShowEmote(0, 2, 0xFFFFFFD3, 20, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + sleep 30; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 180); + spawn { + N(func_802A123C_71E88C)(); + } + InitTargetIterator(); + spawn { + sleep 40; + N(func_802A1740_71ED90)(); + N(func_802A1848_71EE98)(); + } + UseCamPreset(2); + MoveBattleCamOver(20); + sleep 8; + SetJumpAnimations(ActorID_PLAYER, 0, PlayerAnim_1002B, PlayerAnim_1002B, PlayerAnim_MIDAIR); + SetActorJumpGravity(ActorID_PLAYER, 1.80078125); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetGoalPos(0, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_80273444(15, 0, 0); + spawn { + sleep 5; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 0); + } + sleep 40; + func_802D3474(SI_VAR(10), N(modelCommandList)); + SI_VAR(7) = 0xFFFFFF38; + SI_VAR(8) = 0; + SI_VAR(9) = 0; + func_802D36E0(SI_VAR(10), SI_VAR(7), SI_VAR(8), SI_VAR(9)); + func_802D38EC(SI_VAR(10), 0.7109375, 0.7109375, 0.7109375); + func_802D3998(SI_VAR(10), 7.0); + func_802D39FC(SI_VAR(10), 1.400390625); + SetOwnerTarget(0, 0); + SetGoalToTarget(ActorID_PLAYER); + GetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) -= 60; + func_802D3A60(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + GetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + PlaySoundAtActor(ActorID_PLAYER, 334); + spawn { + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_SHOCK_STILL); + SetActorScale(ActorID_PLAYER, 1.2001953125, 0.900390625, 1.0); + sleep 1; + SetActorScale(ActorID_PLAYER, 1.30078125, 0.80078125, 1.0); + sleep 3; + SetActorScale(ActorID_PLAYER, 1.2001953125, 0.900390625, 1.0); + sleep 1; + SetActorScale(ActorID_PLAYER, 1.0, 1.0, 1.0); + } + PlayEffect(6, 3, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + sleep 2; + func_802D39FC(SI_VAR(10), 1.400390625); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 60; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + PlayEffect(6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + SI_VAR(0) += 20; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + PlayEffect(6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + SI_VAR(0) += 10; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + PlayEffect(6, 2, SI_VAR(0), SI_VAR(1), SI_VAR(2), 0, 0, 0, 0, 0, 0, 0, 0, 0); + sleep 5; + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 270; + func_802D3A60(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 0); + func_802D3624(SI_VAR(10)); + } + sleep 30; + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetItemPower(ItemId_SLEEPY_SHEEP, SI_VAR(0), SI_VAR(1)); + MakeStatusField(SI_VAR(0), 4096, 100, SI_VAR(0)); + func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32); +1: + sleep 5; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + sleep 30; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/sleepy_sheep/sleepy_sheep.h b/src/battle/item/sleepy_sheep/sleepy_sheep.h new file mode 100644 index 0000000000..36dc2bea53 --- /dev/null +++ b/src/battle/item/sleepy_sheep/sleepy_sheep.h @@ -0,0 +1,24 @@ +#ifndef BATTLE_ITEM_SLEEPY_SHEEP +#define BATTLE_ITEM_SLEEPY_SHEEP + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_sleepy_sheep + +ApiStatus func_80273444(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D3998(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D3A60(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_71E88C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1740_71ED90)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1848_71EE98)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif + + diff --git a/src/battle/item/sleepy_sheep_71E650.c b/src/battle/item/sleepy_sheep_71E650.c deleted file mode 100644 index 349ddd2de4..0000000000 --- a/src/battle/item/sleepy_sheep_71E650.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/sleepy_sheep_71E650", func_802A1000_71E650); - -INCLUDE_ASM(s32, "battle/item/sleepy_sheep_71E650", func_802A11D4_71E824); - -INCLUDE_ASM(s32, "battle/item/sleepy_sheep_71E650", func_802A123C_71E88C); - -INCLUDE_ASM(s32, "battle/item/sleepy_sheep_71E650", func_802A1740_71ED90); - -INCLUDE_ASM(s32, "battle/item/sleepy_sheep_71E650", func_802A1848_71EE98); diff --git a/src/battle/item/snowman_doll/lib.c b/src/battle/item/snowman_doll/lib.c new file mode 100644 index 0000000000..d89dc97fbf --- /dev/null +++ b/src/battle/item/snowman_doll/lib.c @@ -0,0 +1,176 @@ +#include "snowman_doll.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1EB0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1EB0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1EB0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1EB0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_71C06C)(ScriptInstance* 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++); + + func_8006FEF0(2, a, b, c, 30.0f); + func_8006FEF0(2, a, b, c, 30.0f); + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A13B8_71C1E8)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/snowman_doll/snowman_doll.c b/src/battle/item/snowman_doll/snowman_doll.c new file mode 100644 index 0000000000..22340d928a --- /dev/null +++ b/src/battle/item/snowman_doll/snowman_doll.c @@ -0,0 +1,69 @@ +#include "snowman_doll.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_SNOWMAN_DOLL; + await N(UseItemWithEffect); + N(FadeBackgroundToBlack)(); + PlaySoundAtActor(ActorID_PLAYER, 867); + spawn { + loop 45 { + RandInt(300, SI_VAR(0)); + SI_VAR(0) -= 150; + SI_VAR(1) = 170; + RandInt(50, SI_VAR(2)); + SI_VAR(2) -= 25; + PlayEffect(14, SI_VAR(0), SI_VAR(1), SI_VAR(2), 60, 0, 0, 0, 0, 0, 0, 0, 0, 0); + sleep 2; + } + } + sleep 10; + UseCamPreset(3); + MoveBattleCamOver(50); + sleep 50; + PlayEffect(96, 0, 0, 0, 20, 1.0, 160, 0, 0, 0, 0, 0, 0, 0); + spawn { + sleep 17; + PlaySoundAtActor(ActorID_PLAYER, 8238); + StartRumble(9); + ShakeCam(1, 0, 5, 1.0); + sleep 46; + PlaySoundAtActor(ActorID_PLAYER, 8238); + StartRumble(9); + ShakeCam(1, 0, 5, 1.0); + sleep 25; + PlaySoundAtActor(ActorID_PLAYER, 8238); + StartRumble(9); + ShakeCam(1, 0, 5, 1.0); + sleep 25; + PlaySoundAtActor(ActorID_PLAYER, 8238); + StartRumble(9); + ShakeCam(1, 0, 5, 1.0); + } + sleep 15; + StartRumble(10); + ShakeCam(1, 0, 5, 1.0); + ShakeCam(1, 0, 10, 2.0); + ShakeCam(1, 0, 5, 1.0); + sleep 110; + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A123C_71C06C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetItemPower(ItemId_SNOWMAN_DOLL, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x38000008, 0, SI_VAR(0), 32); + sleep 5; +1: + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 30; + N(func_802A13B8_71C1E8)(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/snowman_doll/snowman_doll.h b/src/battle/item/snowman_doll/snowman_doll.h new file mode 100644 index 0000000000..156a722595 --- /dev/null +++ b/src/battle/item/snowman_doll/snowman_doll.h @@ -0,0 +1,19 @@ +#ifndef BATTLE_ITEM_SNOWMAN_DOLL +#define BATTLE_ITEM_SNOWMAN_DOLL + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_snowman_doll + +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_71C06C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A13B8_71C1E8)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif + + diff --git a/src/battle/item/snowman_doll_71BE30.c b/src/battle/item/snowman_doll_71BE30.c deleted file mode 100644 index e35d19f465..0000000000 --- a/src/battle/item/snowman_doll_71BE30.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/snowman_doll_71BE30", func_802A1000_71BE30); - -INCLUDE_ASM(s32, "battle/item/snowman_doll_71BE30", func_802A11D4_71C004); - -INCLUDE_ASM(s32, "battle/item/snowman_doll_71BE30", func_802A123C_71C06C); - -#define NAMESPACE battle_item_snowman_doll -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/snowman_doll_71BE30", func_802A13B8_71C1E8); diff --git a/src/battle/item/stone_cap/lib.c b/src/battle/item/stone_cap/lib.c new file mode 100644 index 0000000000..f2fc0e42a9 --- /dev/null +++ b/src/battle/item/stone_cap/lib.c @@ -0,0 +1,188 @@ +#include "stone_cap.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1A60; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1A60 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1A60, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1A60); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_7217DC)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 i; + + if (isInitialCall) { + script->functionTemp[0].s = 0; + } + + switch (script->functionTemp[0].s) { + case 0: + inflict_status(player, Debuff_STONE, script->varTable[0]); + player->status = 0; + script->functionTemp[1].s = 3; + script->functionTemp[0].s = 1; + break; + + case 1: + for (i = 0; i < 10; i++) { + f32 x = player->currentPos.x + ((rand_int(20) - 10) * player->scalingFactor); + f32 y = player->currentPos.y + ((rand_int(20) + 10) * player->scalingFactor); + f32 z = player->currentPos.z + 5.0f; + func_80071FF0(0, x, y, z, 1.0f, 25); + } + + if (script->functionTemp[1].s == 0) { + BattleStatus* battleStatus2 = &gBattleStatus; + + battleStatus2->flags1 &= ~0x04000000; + battleStatus->hustleTurns = 0; + battleStatus->itemUsesLeft = 0; + + return ApiStatus_DONE2; + } + + script->functionTemp[1].s--; + break; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/stone_cap/stone_cap.c b/src/battle/item/stone_cap/stone_cap.c new file mode 100644 index 0000000000..c28058d3dc --- /dev/null +++ b/src/battle/item/stone_cap/stone_cap.c @@ -0,0 +1,15 @@ +#include "stone_cap.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_STONE_CAP; + await N(UseItemWithEffect); + PlaySound(865); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_30009); + sleep 30; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_CROUCH); + GetItemPower(ItemId_STONE_CAP, SI_VAR(0), SI_VAR(1)); + PlaySound(866); + N(func_802A123C_7217DC)(); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 20; +}); diff --git a/src/battle/item/stone_cap/stone_cap.h b/src/battle/item/stone_cap/stone_cap.h new file mode 100644 index 0000000000..cf8d55ef8b --- /dev/null +++ b/src/battle/item/stone_cap/stone_cap.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_STONE_CAP +#define BATTLE_ITEM_STONE_CAP + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_stone_cap + +ApiStatus N(func_802A123C_7217DC)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif + + diff --git a/src/battle/item/stone_cap_7215A0.c b/src/battle/item/stone_cap_7215A0.c deleted file mode 100644 index 9cef8cf0b5..0000000000 --- a/src/battle/item/stone_cap_7215A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/stone_cap_7215A0", func_802A1000_7215A0); - -INCLUDE_ASM(s32, "battle/item/stone_cap_7215A0", func_802A11D4_721774); - -INCLUDE_ASM(s32, "battle/item/stone_cap_7215A0", func_802A123C_7217DC); diff --git a/src/battle/item/stop_watch/lib.c b/src/battle/item/stop_watch/lib.c new file mode 100644 index 0000000000..10a7c62639 --- /dev/null +++ b/src/battle/item/stop_watch/lib.c @@ -0,0 +1,164 @@ +#include "stop_watch.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1B40; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1B40 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1B40, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1B40); + } + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A12D4_7270A4)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/stop_watch/stop_watch.c b/src/battle/item/stop_watch/stop_watch.c new file mode 100644 index 0000000000..0ca434a44e --- /dev/null +++ b/src/battle/item/stop_watch/stop_watch.c @@ -0,0 +1,35 @@ +#include "stop_watch.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_STOP_WATCH; + await N(UseItemWithEffect); + spawn { + sleep 5; + UseCamPreset(2); + MoveBattleCamOver(20); + } + N(FadeBackgroundToBlack)(); + PlayEffect(98, 0, 0, 0, 0, 1.0, 200, 0, 0, 0, 0, 0, 0, 0); + PlaySoundAtActor(ActorID_PLAYER, 582); + sleep 200; + UseCamPreset(3); + MoveBattleCamOver(20); + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + GetItemPower(ItemId_STOP_WATCH, SI_VAR(0), SI_VAR(1)); + MakeStatusField(SI_VAR(0), 0x200000, 100, SI_VAR(0)); + func_80252B3C(SI_VAR(0), 0x50000000, SI_VAR(0), 0, 32); +1: + sleep 5; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + N(func_802A12D4_7270A4)(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/stop_watch/stop_watch.h b/src/battle/item/stop_watch/stop_watch.h new file mode 100644 index 0000000000..c39f049cf3 --- /dev/null +++ b/src/battle/item/stop_watch/stop_watch.h @@ -0,0 +1,20 @@ +#ifndef BATTLE_ITEM_STOP_WATCH +#define BATTLE_ITEM_STOP_WATCH + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_stop_watch + +ApiStatus func_80252B3C(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12D4_7270A4)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif + + diff --git a/src/battle/item/stop_watch_726DD0.c b/src/battle/item/stop_watch_726DD0.c deleted file mode 100644 index f946ee313d..0000000000 --- a/src/battle/item/stop_watch_726DD0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/stop_watch_726DD0", func_802A1000_726DD0); - -INCLUDE_ASM(s32, "battle/item/stop_watch_726DD0", func_802A11D4_726FA4); - -#define NAMESPACE battle_item_stop_watch -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/stop_watch_726DD0", func_802A12D4_7270A4); diff --git a/src/battle/item/strange_cake/lib.c b/src/battle/item/strange_cake/lib.c new file mode 100644 index 0000000000..71308f0a31 --- /dev/null +++ b/src/battle/item/strange_cake/lib.c @@ -0,0 +1,431 @@ +#include "strange_cake.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A2DD0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A2DD0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A2DD0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A2DD0); + } + + return ApiStatus_DONE2; +} + +#ifdef NON_MATCHING + +extern s32 D_802A25E4; +extern MenuIcon* D_802A2DF4; +extern s32 D_802A2DD8; + +ApiStatus N(func_802A123C_73153C)(ScriptInstance* script, s32 isInitialCall) { + s32 i; + MenuIcon** ptr; + s32 var; + s32* var2; + + if (D_802A25E4 < 6) { + if (D_802A25E4 > 0) { + draw_box(0, 7, 0x6A, 0x56, 0, 0x24, 0x24, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x140, 0xF0, 0); + + gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); + + ptr = &D_802A2DF4; + for (i = 0; i < 7; i++) { + var2 = *ptr; + var = (D_802A2DD8 / 100) - 0x68; + ptr++; + set_icon_render_pos(var2, 0x7C, (i * 0x1A) - var); + draw_icon_2(var2); + } + + var2 = D_802A2DF4; + var = (D_802A2DD8 / 100) - 0x68; + set_icon_render_pos(var2, 0x7C, (i * 0x1A) - var); + draw_icon_2(var2); + } + } +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/strange_cake_731300", battle_item_strange_cake_func_802A123C_73153C); +#endif + +#ifdef NON_MATCHING + +extern s32 D_802A2DEC; +extern s32 D_802A2DF0; +extern s32 D_802A2DF4; +extern s32 D_802A2DF8; +extern s32 D_802A2DFC; +extern s32 D_802A2E00; +extern s32* D_802A2DD8; +extern MenuIcon** D_802A25C8; + +s32 N(D_802A2848_732B48)[] = { + 0x802A27F8, 0x802A2820, 0x802A27D0, 0x802A27F8 +}; + +s32 N(D_802A2858_732B58)[] = { + 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001 +}; + +ApiStatus N(func_802A13E4_7316E4)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + + if (isInitialCall) { + D_802A2DEC = 0; + } + + switch (D_802A2DEC) { + case 0: { + s32 i; + MenuIcon** iconPtr; + + D_802A2E00 = bind_dynamic_entity_7(NULL, func_802A123C_73153C); + i = rand_int(13000); + D_802A2DF4 = i; + + D_802A2DF8 = 1000; + + for (i = 0; i < 5; i++) { + s32* B48Ptr = &N(D_802A2848_732B48); + s32* B58Ptr = &N(D_802A2858_732B58); + MenuIcon* icon = create_icon(*(B48Ptr + * (B58Ptr + i))); + + *(&D_802A2DD8 + i) = icon; + set_icon_flags(icon, 0x80); + } + D_802A2DEC = 1; + } + break; + + case 1: { + s32* ECptr = &D_802A2DF4; + s32* F0ptr = &D_802A2DF8; + + *ECptr += *F0ptr; + if (*ECptr / 100 >= 130) { + s32* test = ECptr; + *test -= 0x32C8; + } + + if (*F0ptr > 400) { + *F0ptr -= 10; + } else if (*F0ptr > 100) { + *F0ptr -= 5; + } else { + *F0ptr -= 1; + } + + if (D_802A2DF8 < 10) { + D_802A2DF0 = D_802A2DF4 / 100; + if (D_802A2DF0 % 26 < 13) { + if (rand_int(100) < 80) { + D_802A2DEC = 2; + } else { + D_802A2DEC = 3; + } + } else if (rand_int(100) < 60) { + D_802A2DEC = 3; + } else { + D_802A2DEC = 2; + } + } + } + break; + + case 2: { + s32* E8ptr = &D_802A2DF0; + s32 a, b, c, d; + + d = *E8ptr % 26; + a = d; + c = a + 3; + if (c < 0) { + c = a + 6; + } + d = c >> 2; + *E8ptr -= d; + D_802A2DF4 = *E8ptr * 100; + if (d == 0) { + D_802A2DEC = 4; + } + } + break; + + case 3: { + s32* E8ptr = &D_802A2DF0; + s32 a, b, c, d; + + d = *E8ptr % 26; + if (d == 0) { + D_802A2DEC = 4; + break; + } + a = d; + b = 26; + b -= a; + c = b + 3; + if (c < 0) { + c = b + 6; + } + c = c >> 2; + *E8ptr += c; + D_802A2DF4 = *E8ptr * 100; + } + break; + + case 4: { + D_802A2DFC = 20; + D_802A2DEC = 5; + } + break; + + case 5: { + s32* F4ptr = &D_802A2DFC; + s32 i; + s16 g; + MenuIcon** iconPtr; + + if (*F4ptr != 0) { + *F4ptr -= 1; + break; + } + iconPtr = &D_802A25C8; + i = D_802A2DF0 / 26; + g = N(D_802A2858_732B58)[i]; + battleStatus->selectedItemID = g; + script->varTable[0] = g; + func_801235C0(D_802A2E00); + for (i = 0; i < 5; i++) { + free_icon(*iconPtr++); + } + } + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} +#else +INCLUDE_ASM(ApiStatus, "battle/item/strange_cake_731300", battle_item_strange_cake_func_802A13E4_7316E4, + ScriptInstance* script, s32 isInitialCall); +#endif + +ApiStatus N(func_802A1818_731B18)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A18D8_731BD8)(ScriptInstance* 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++); + + func_80071090(1, a, b, c, d); + return ApiStatus_DONE2; +} + +#include "common/AddHP.inc.c" + +#include "common/AddFP.inc.c" + +ApiStatus N(func_802A1A40_731D40)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* item = &gItemTable[ItemId_KOOKY_COOKIE]; + PlayerData* playerData = &gPlayerData; + + playerData->curHP += item->potencyA; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + + script->varTable[3] = item->potencyA; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1A8C_731D8C)(ScriptInstance* script, s32 isInitialCall) { + StaticItem* item = &gItemTable[ItemId_KOOKY_COOKIE]; + PlayerData* playerData = &gPlayerData; + + playerData->curFP += item->potencyB; + if (playerData->curFP > playerData->curMaxFP) { + playerData->curFP = playerData->curMaxFP; + } + + script->varTable[3] = item->potencyB; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1AD8_731DD8)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + + inflict_status(player, Debuff_STATIC, 3); + player->status = 0; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1B14_731E14)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + ActorPart* part = player->partsTable; + + inflict_status(player, Debuff_0xE, 3); + player->status = 0; + part->flags |= 0x100; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1B68_731E68)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + + inflict_status(player, Debuff_SLEEP, 3); + player->status = 0; + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/strange_cake/strange_cake.c b/src/battle/item/strange_cake/strange_cake.c new file mode 100644 index 0000000000..73d09e2d27 --- /dev/null +++ b/src/battle/item/strange_cake/strange_cake.c @@ -0,0 +1,110 @@ +#include "strange_cake.h" +#include "battle/item/strange_cake/strange_cake1.png.h" +#include "battle/item/strange_cake/strange_cake2.png.h" +#include "battle/item/strange_cake/strange_cake3.png.h" + +s32 N(data)[] = { + 0x00000008, 0x00000005, 0x00000003, 0x00000004, + 0x00000002, 0x0000003C, 0x802A2170, 0x802A2370, + 0x00000003, 0x00000000, 0x00000008, 0x00000005, + 0x00000003, 0x00000004, 0x00000002, 0x0000003C, + 0x802A2390, 0x802A2590, 0x00000003, 0x00000000, + 0x00000008, 0x00000005, 0x00000003, 0x00000004, + 0x00000002, 0x0000003C, 0x802A25B0, 0x802A27B0, + 0x00000003, 0x00000000 +}; + +s32 N(D_802A2848_732B48)[] = { + 0x802A27F8, 0x802A2820, 0x802A27D0, 0x802A27F8 +}; + +s32 N(D_802A2858_732B58)[] = { + 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x000000000 +}; + +Script N(script6) = SCRIPT({ + GetMenuSelection(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + if (SI_VAR(1) == 211) { + SI_VAR(10) = c ItemId_KOOKY_COOKIE; + SI_VAR(1) = 0; + await N(UseItemWithEffect); + await N(EatItem); + N(func_802A1A8C_731D8C)(); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 20; + SI_VAR(1) += 25; + N(func_802A18D8_731BD8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + N(AddFP)(SI_VAR(3)); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3)); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + } else { + SI_VAR(10) = c ItemId_STRANGE_CAKE; + SI_VAR(1) = 0; + await N(UseItemWithEffect); + await N(EatItem); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + } + sleep 10; + spawn { + sleep 220; + PlaySoundAtActor(ActorID_PLAYER, 1011); + } + PlaySoundAtActor(ActorID_PLAYER, 872); + N(func_802A13E4_7316E4)(); + sleep 2; + match SI_VAR(0) { + == 0 { + await N(script7); + } + == 1 { + await N(script8); + } + == 2 { + await N(script9); + } + } + await N(PlayerGoHome); +}); + +Script N(script7) = SCRIPT({ + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + PlayEffect(87, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + N(func_802A1AD8_731DD8)(); + sleep 20; + ShowMessageBox(16, 60); + WaitForMessageBoxDone(); +}); + +Script N(script8) = SCRIPT({ + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + PlayEffect(51, 6, SI_VAR(0), SI_VAR(1), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + N(func_802A1B14_731E14)(); + sleep 20; + ShowMessageBox(17, 60); + WaitForMessageBoxDone(); +}); + +Script N(script9) = SCRIPT({ + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_30004); + SetGoalToTarget(ActorID_PLAYER); + GetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + spawn DoSleepHit; + N(func_802A1B68_731E68)(); + sleep 20; + ShowMessageBox(11, 60); + WaitForMessageBoxDone(); +}); + diff --git a/src/battle/item/strange_cake/strange_cake.h b/src/battle/item/strange_cake/strange_cake.h new file mode 100644 index 0000000000..4e10916280 --- /dev/null +++ b/src/battle/item/strange_cake/strange_cake.h @@ -0,0 +1,30 @@ +#ifndef BATTLE_ITEM_STRANGE_CAKE +#define BATTLE_ITEM_STRANGE_CAKE + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_strange_cake + +ApiStatus func_802D75D8(ScriptInstance *script, s32 isInitialCall); +ApiStatus func_802D7520(ScriptInstance *script, s32 isInitialCall); + +ApiStatus N(func_802A1A8C_731D8C)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A18D8_731BD8)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(AddFP)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A13E4_7316E4)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A1AD8_731DD8)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A1B14_731E14)(ScriptInstance *script, s32 isInitialCall); +ApiStatus N(func_802A1B68_731E68)(ScriptInstance *script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); +Script N(script7); +Script N(script8); +Script N(script9); + +#endif + + diff --git a/src/battle/item/strange_cake_731300.c b/src/battle/item/strange_cake_731300.c deleted file mode 100644 index c3988727b8..0000000000 --- a/src/battle/item/strange_cake_731300.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_item_strange_cake - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1000_731300); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A11D4_7314D4); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A123C_73153C); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A13E4_7316E4); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1818_731B18); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A18D8_731BD8); - -#include "common/AddHP.inc.c" - -#include "common/AddFP.inc.c" - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1A40_731D40); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1A8C_731D8C); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1AD8_731DD8); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1B14_731E14); - -INCLUDE_ASM(s32, "battle/item/strange_cake_731300", func_802A1B68_731E68); diff --git a/src/battle/item/super_soda/lib.c b/src/battle/item/super_soda/lib.c new file mode 100644 index 0000000000..53e11f63d3 --- /dev/null +++ b/src/battle/item/super_soda/lib.c @@ -0,0 +1,224 @@ +#include "super_soda.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A2280; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A2280 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A2280, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A2280); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_724F1C)(ScriptInstance* 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++); + ItemEntity* item = get_item_entity(script->varTable[14]); + + item->position.x = a; + item->position.y = b; + item->position.z = c; + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12EC_724FCC)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + Bytecode* args = script->ptrReadPos; + + if (partner->koDuration == 0) { + return ApiStatus_DONE2; + } + + partner->koDuration -= get_variable(script, *args++); + if (partner->koDuration < 0) { + partner->koDuration = 0; + } + if (partner->koDuration > 0) { + partner->ptrDefuffIcon->ptrPropertyList[0xF] = partner->koDuration; + } else { + partner->koStatus = 0; + dispatch_event_partner(0x34); + partner->ptrDefuffIcon->ptrPropertyList[0xF] = 0; + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1378_725058)(ScriptInstance* script, s32 isInitialCall) { + s32 arg = get_variable(script, *script->ptrReadPos); + Actor* actor = get_actor(arg); + s32 id = actor->actorID & 0x700; + + if (actor->debuff != Debuff_END) { + actor->debuffDuration = 0; + actor->debuff = 0; + func_80047898(actor->unk_436); + } + + if (actor->koStatus != 0) { + actor->koDuration = 0; + actor->koStatus = 0; + if (id != 0) { + if (id == 0x100) { + dispatch_event_partner(0x31); + } + } + actor->ptrDefuffIcon->ptrPropertyList[15] = 0; + } + + func_8026777C(); + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A1418_7250F8)(ScriptInstance* 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++); + + func_80071090(1, a, b, c, d); + return ApiStatus_DONE2; +} + +#include "common/AddFP.inc.c" + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/super_soda/super_soda.c b/src/battle/item/super_soda/super_soda.c new file mode 100644 index 0000000000..f792920a3a --- /dev/null +++ b/src/battle/item/super_soda/super_soda.c @@ -0,0 +1,114 @@ +#include "super_soda.h" + +Script N(script6) = SCRIPT({ + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 180); + sleep 10; + SI_VAR(1) = SI_VAR(15); + await 0x802A1834; + SI_VAR(14) = SI_VAR(10); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THROW); + spawn { + sleep 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + } + func_802D3474(SI_VAR(10), 0x80283EE8); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 30; + SI_VAR(2) += 5; + func_802D36E0(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D3F74(SI_VAR(10), 32); + spawn { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(14), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + loop 25 { + func_802D378C(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2)); + N(func_802A123C_724F1C)(SI_VAR(0), SI_VAR(1), SI_VAR(2)); + sleep 1; + } + RemoveItemEntity(SI_VAR(14)); + } + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + GetGoalPos(ActorID_SELF, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SetBattleCamTarget(0xFFFFFF83, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(25); + func_802D39FC(SI_VAR(10), 0.400390625); + SI_VAR(2) += 5; + func_802D3C58(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 25); + AddBattleCamZoom(100); + MoveBattleCamOver(30); + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + if (SI_VAR(11) > 0) { + N(func_802A12EC_724FCC)(SI_VAR(11)); + } + sleep 30; + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(11)); + sleep 20; + SetActorYaw(ActorID_PLAYER, 150); + sleep 1; + SetActorYaw(ActorID_PLAYER, 120); + sleep 1; + SetActorYaw(ActorID_PLAYER, 90); + sleep 1; + SetActorYaw(ActorID_PLAYER, 60); + sleep 1; + SetActorYaw(ActorID_PLAYER, 30); + sleep 1; + SetActorYaw(ActorID_PLAYER, 0); + sleep 10; +}); + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_SUPER_SODA; + await N(UseItemWithEffect); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + if (SI_VAR(0) == 0) { + PlaySoundAtActor(ActorID_PLAYER, 8341); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A1418_7250F8)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + N(AddFP)(5); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + N(func_802A1378_725058)(0); + sleep 20; + } else { + SI_VAR(11) = 0; + SI_VAR(12) = 0; + SI_VAR(15) = 0; + await 0x802A1AEC; + } + await N(PlayerGoHome); +}); diff --git a/src/battle/item/super_soda/super_soda.h b/src/battle/item/super_soda/super_soda.h new file mode 100644 index 0000000000..12548b5ac5 --- /dev/null +++ b/src/battle/item/super_soda/super_soda.h @@ -0,0 +1,24 @@ +#ifndef BATTLE_ITEM_SUPER_SODA +#define BATTLE_ITEM_SUPER_SODA + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_super_soda + +ApiStatus func_802D3F74(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D378C(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_724F1C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12EC_724FCC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1418_7250F8)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(AddFP)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1378_725058)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/super_soda_724CE0.c b/src/battle/item/super_soda_724CE0.c deleted file mode 100644 index 8ad2b0e4bd..0000000000 --- a/src/battle/item/super_soda_724CE0.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -#define NAMESPACE battle_item_super_soda - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1000_724CE0); - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A11D4_724EB4); - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A123C_724F1C); - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A12EC_724FCC); - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1378_725058); - -INCLUDE_ASM(s32, "battle/item/super_soda_724CE0", func_802A1418_7250F8); - -#include "common/AddFP.inc.c" diff --git a/src/battle/item/tasty_tonic/lib.c b/src/battle/item/tasty_tonic/lib.c new file mode 100644 index 0000000000..36ca0f0ef3 --- /dev/null +++ b/src/battle/item/tasty_tonic/lib.c @@ -0,0 +1,171 @@ +#include "tasty_tonic.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1B40; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1B40 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1B40, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1B40); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72223C)(ScriptInstance* script, s32 isInitialCall) { + s32 arg = get_variable(script, *script->ptrReadPos); + Actor* actor = get_actor(arg); + s32 id = actor->actorID & 0x700; + + if (actor->debuff != Debuff_END) { + actor->debuffDuration = 0; + actor->debuff = 0; + func_80047898(actor->unk_436); + } + + if (actor->koStatus != 0) { + actor->koDuration = 0; + actor->koStatus = 0; + if (id != 0) { + if (id == 0x100) { + dispatch_event_partner(0x31); + } + } + actor->ptrDefuffIcon->ptrPropertyList[15] = 0; + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/tasty_tonic/tasty_tonic.c b/src/battle/item/tasty_tonic/tasty_tonic.c new file mode 100644 index 0000000000..e001aafcfc --- /dev/null +++ b/src/battle/item/tasty_tonic/tasty_tonic.c @@ -0,0 +1,39 @@ +#include "tasty_tonic.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_TASTY_TONIC; + await N(UseItemWithEffect); + InitTargetIterator(); + GetOwnerTarget(SI_VAR(0), SI_VAR(1)); + if (SI_VAR(0) == 0) { + await N(DrinkItem); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + SI_VAR(2) += 5; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(2) += 5; + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + N(func_802A123C_72223C)(0); + sleep 20; + } else { + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + SI_VAR(2) += 5; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 20; + sleep 30; + GetActorPos(ActorID_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(2) += 5; + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 5); + N(func_802A123C_72223C)(256); + sleep 20; + } + await N(PlayerGoHome); +}); diff --git a/src/battle/item/tasty_tonic/tasty_tonic.h b/src/battle/item/tasty_tonic/tasty_tonic.h new file mode 100644 index 0000000000..66f378e3fc --- /dev/null +++ b/src/battle/item/tasty_tonic/tasty_tonic.h @@ -0,0 +1,19 @@ +#ifndef BATTLE_ITEM_TASTY_TONIC +#define BATTLE_ITEM_TASTY_TONIC + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_tasty_tonic + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_72223C)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(DrinkItem); + +#endif diff --git a/src/battle/item/tasty_tonic_722000.c b/src/battle/item/tasty_tonic_722000.c deleted file mode 100644 index 4bceec4214..0000000000 --- a/src/battle/item/tasty_tonic_722000.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/tasty_tonic_722000", func_802A1000_722000); - -INCLUDE_ASM(s32, "battle/item/tasty_tonic_722000", func_802A11D4_7221D4); - -INCLUDE_ASM(s32, "battle/item/tasty_tonic_722000", func_802A123C_72223C); diff --git a/src/battle/item/thunder_bolt/lib.c b/src/battle/item/thunder_bolt/lib.c new file mode 100644 index 0000000000..9212269f51 --- /dev/null +++ b/src/battle/item/thunder_bolt/lib.c @@ -0,0 +1,193 @@ +#include "thunder_bolt.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1C40; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1C40 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1C40, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1C40); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_722D7C)(ScriptInstance* script, s32 isInitialCall) { + Actor* enemyTarget = get_actor(script->owner1.enemyID); + Actor* actor = get_actor(enemyTarget->targetActorID); + f32 posY, posX, posZ; + s32 scaleX, scaleY; + + if (actor != NULL) { + play_sound(0x366); + + posX = actor->currentPos.x; + posY = actor->currentPos.y + (actor->size.y / 10); + posZ = actor->currentPos.z; + + scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor; + scaleY = (actor->size.y - 2) * actor->scalingFactor; + + if (actor->flags & 0x8000) { + posY -= actor->size.y / 2; + } + + func_80070CD0(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY); + + return ApiStatus_DONE2; + } + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A1420_722F60)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); + diff --git a/src/battle/item/thunder_bolt/thunder_bolt.c b/src/battle/item/thunder_bolt/thunder_bolt.c new file mode 100644 index 0000000000..c75e05ef74 --- /dev/null +++ b/src/battle/item/thunder_bolt/thunder_bolt.c @@ -0,0 +1,34 @@ +#include "thunder_bolt.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_THUNDER_BOLT; + await N(UseItemWithEffect); + spawn { + sleep 5; + UseCamPreset(2); + MoveBattleCamOver(20); + } + N(FadeBackgroundToBlack)(); + PlaySound(869); + sleep 10; + InitTargetIterator(); + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + N(func_802A123C_722D7C)(); + sleep 5; + StartRumble(10); + ShakeCam(1, 0, 5, 1.0); + GetItemPower(ItemId_THUNDER_RAGE, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x38000020, 0, SI_VAR(0), 32); +1: + sleep 5; + UseCamPreset(3); + MoveBattleCamOver(20); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 30; + N(func_802A1420_722F60)(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/thunder_bolt/thunder_bolt.h b/src/battle/item/thunder_bolt/thunder_bolt.h new file mode 100644 index 0000000000..7fbef369a7 --- /dev/null +++ b/src/battle/item/thunder_bolt/thunder_bolt.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_THUNDER_BOLT +#define BATTLE_ITEM_THUNDER_BOLT + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_thunder_bolt + +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A123C_722D7C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1420_722F60)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/thunder_bolt_722B40.c b/src/battle/item/thunder_bolt_722B40.c deleted file mode 100644 index 733018e047..0000000000 --- a/src/battle/item/thunder_bolt_722B40.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/thunder_bolt_722B40", func_802A1000_722B40); - -INCLUDE_ASM(s32, "battle/item/thunder_bolt_722B40", func_802A11D4_722D14); - -INCLUDE_ASM(s32, "battle/item/thunder_bolt_722B40", func_802A123C_722D7C); - -#define NAMESPACE battle_item_thunder_bolt -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/thunder_bolt_722B40", func_802A1420_722F60); diff --git a/src/battle/item/thunder_rage/lib.c b/src/battle/item/thunder_rage/lib.c new file mode 100644 index 0000000000..8683bcc52e --- /dev/null +++ b/src/battle/item/thunder_rage/lib.c @@ -0,0 +1,192 @@ +#include "thunder_rage.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1C90; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1C90 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1C90, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1C90); + } + + return ApiStatus_DONE2; +} + +#include "common/FadeBackgroundToBlack.inc.c" + +ApiStatus N(func_802A12D4_71B474)(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0].s = 20; + } + + set_background_color_blend(0, 0, 0, (script->functionTemp[0].s * 10) & 254); + + script->functionTemp[0].s--; + if (script->functionTemp[0].s == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +ApiStatus N(func_802A1354_71B4F4)(ScriptInstance* script, s32 isInitialCall) { + Actor* enemyTarget = get_actor(script->owner1.enemyID); + Actor* actor = get_actor(enemyTarget->targetActorID); + f32 posY, posX, posZ; + s32 scaleX, scaleY; + + if (actor != NULL) { + play_sound(0x366); + + posX = actor->currentPos.x; + posY = actor->currentPos.y + (actor->size.y / 10); + posZ = actor->currentPos.z; + + scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor; + scaleY = (actor->size.y - 2) * actor->scalingFactor; + + if (actor->flags & 0x8000) { + posY -= actor->size.y / 2; + } + + func_80070CD0(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY); + + return ApiStatus_DONE2; + } + + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/thunder_rage/thunder_rage.c b/src/battle/item/thunder_rage/thunder_rage.c new file mode 100644 index 0000000000..abf27b8c6b --- /dev/null +++ b/src/battle/item/thunder_rage/thunder_rage.c @@ -0,0 +1,40 @@ +#include "thunder_rage.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_THUNDER_RAGE; + await N(UseItemWithEffect); + parallel { + sleep 5; + UseCamPreset(2); + MoveBattleCamOver(20); + } + N(FadeBackgroundToBlack)(); + PlaySound(869); + sleep 10; + InitTargetIterator(); +0: + SetGoalToTarget(ActorID_SELF); + ItemCheckHit(SI_VAR(0), 0x10000000, 0, SI_VAR(0), 0); + if (SI_VAR(0) == 6) { + goto 1; + } + N(func_802A1354_71B4F4)(); + sleep 5; + StartRumble(10); + ShakeCam(1, 0, 5, 1.0); + SetGoalToTarget(ActorID_SELF); + GetItemPower(ItemId_THUNDER_RAGE, SI_VAR(0), SI_VAR(1)); + ItemDamageEnemy(SI_VAR(0), 0x38000020, 0, SI_VAR(0), 32); +1: + sleep 5; + ChooseNextTarget(0, SI_VAR(0)); + if (SI_VAR(0) != -1) { + goto 0; + } + UseCamPreset(3); + MoveBattleCamOver(20); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 30; + N(func_802A12D4_71B474)(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/thunder_rage/thunder_rage.h b/src/battle/item/thunder_rage/thunder_rage.h new file mode 100644 index 0000000000..2af16f6ea6 --- /dev/null +++ b/src/battle/item/thunder_rage/thunder_rage.h @@ -0,0 +1,17 @@ +#ifndef BATTLE_ITEM_THUNDER_RAGE +#define BATTLE_ITEM_THUNDER_RAGE + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_thunder_rage + +ApiStatus N(FadeBackgroundToBlack)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A1354_71B4F4)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12D4_71B474)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); + +#endif diff --git a/src/battle/item/thunder_rage_71B1A0.c b/src/battle/item/thunder_rage_71B1A0.c deleted file mode 100644 index d159309e95..0000000000 --- a/src/battle/item/thunder_rage_71B1A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/thunder_rage_71B1A0", func_802A1000_71B1A0); - -INCLUDE_ASM(s32, "battle/item/thunder_rage_71B1A0", func_802A11D4_71B374); - -#define NAMESPACE battle_item_thunder_rage -#include "common/FadeBackgroundToBlack.inc.c" - -INCLUDE_ASM(s32, "battle/item/thunder_rage_71B1A0", func_802A12D4_71B474); - -INCLUDE_ASM(s32, "battle/item/thunder_rage_71B1A0", func_802A1354_71B4F4); diff --git a/src/battle/item/ultra_shroom/lib.c b/src/battle/item/ultra_shroom/lib.c new file mode 100644 index 0000000000..c8256686dd --- /dev/null +++ b/src/battle/item/ultra_shroom/lib.c @@ -0,0 +1,167 @@ +#include "ultra_shroom.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1AC0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1AC0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1AC0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1AC0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_7239BC)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12FC_723A7C)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + playerData->curHP += 10; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/ultra_shroom/ultra_shroom.c b/src/battle/item/ultra_shroom/ultra_shroom.c new file mode 100644 index 0000000000..0432f86950 --- /dev/null +++ b/src/battle/item/ultra_shroom/ultra_shroom.c @@ -0,0 +1,27 @@ +#include "ultra_shroom.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_SUPER_SHROOM; + await N(UseItemWithEffect); + AddBattleCamZoom(50); + MoveBattleCamOver(20); + await N(EatItem); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A123C_7239BC)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + SI_VAR(2) += 5; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + N(func_802A12FC_723A7C)(); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(2) += 5; + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 10); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/ultra_shroom/ultra_shroom.h b/src/battle/item/ultra_shroom/ultra_shroom.h new file mode 100644 index 0000000000..287ff59c6a --- /dev/null +++ b/src/battle/item/ultra_shroom/ultra_shroom.h @@ -0,0 +1,20 @@ +#ifndef BATTLE_ITEM_ULTRA_SHROOM +#define BATTLE_ITEM_ULTRA_SHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_ultra_shroom + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_7239BC)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12FC_723A7C)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); + +#endif diff --git a/src/battle/item/ultra_shroom_723780.c b/src/battle/item/ultra_shroom_723780.c deleted file mode 100644 index 7b741f75c5..0000000000 --- a/src/battle/item/ultra_shroom_723780.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/ultra_shroom_723780", func_802A1000_723780); - -INCLUDE_ASM(s32, "battle/item/ultra_shroom_723780", func_802A11D4_723954); - -INCLUDE_ASM(s32, "battle/item/ultra_shroom_723780", func_802A123C_7239BC); - -INCLUDE_ASM(s32, "battle/item/ultra_shroom_723780", func_802A12FC_723A7C); diff --git a/src/battle/item/unknown_item/lib.c b/src/battle/item/unknown_item/lib.c new file mode 100644 index 0000000000..051b9acdcd --- /dev/null +++ b/src/battle/item/unknown_item/lib.c @@ -0,0 +1,167 @@ +#include "unknown_item.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A1AA0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A1AA0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A1AA0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A1AA0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_72447C)(ScriptInstance* 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++); + + func_80071090(0, a, b, c, d); + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A12FC_72453C)(ScriptInstance* script, s32 isInitialCall) { + PlayerData* playerData = &gPlayerData; + + playerData->curHP += 20; + if (playerData->curHP > playerData->curMaxHP) { + playerData->curHP = playerData->curMaxHP; + } + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/unknown_item/unknown_item.c b/src/battle/item/unknown_item/unknown_item.c new file mode 100644 index 0000000000..f6d7576ac5 --- /dev/null +++ b/src/battle/item/unknown_item/unknown_item.c @@ -0,0 +1,25 @@ +#include "unknown_item.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_ULTRA_SHROOM; + await N(UseItemWithEffect); + await N(EatItem); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 0; + SI_VAR(1) += 35; + N(func_802A123C_72447C)(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 25; + SI_VAR(2) += 5; + func_802D7520(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20); + N(func_802A12FC_72453C)(); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_THUMBS_UP); + sleep 30; + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(2) += 5; + func_802D75D8(SI_VAR(0), SI_VAR(1), SI_VAR(2), 20); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + sleep 20; + await N(PlayerGoHome); +}); diff --git a/src/battle/item/unknown_item/unknown_item.h b/src/battle/item/unknown_item/unknown_item.h new file mode 100644 index 0000000000..2140511b1b --- /dev/null +++ b/src/battle/item/unknown_item/unknown_item.h @@ -0,0 +1,20 @@ +#ifndef BATTLE_ITEM_UNKNOWN_ITEM +#define BATTLE_ITEM_UNKNOWN_ITEM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_unknown_item + +ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall); +ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall); + +ApiStatus N(func_802A123C_72447C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(func_802A12FC_72453C)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); + +#endif diff --git a/src/battle/item/unknown_item_724240.c b/src/battle/item/unknown_item_724240.c deleted file mode 100644 index 9e752c3bec..0000000000 --- a/src/battle/item/unknown_item_724240.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/unknown_item_724240", func_802A1000_724240); - -INCLUDE_ASM(s32, "battle/item/unknown_item_724240", func_802A11D4_724414); - -INCLUDE_ASM(s32, "battle/item/unknown_item_724240", func_802A123C_72447C); - -INCLUDE_ASM(s32, "battle/item/unknown_item_724240", func_802A12FC_72453C); diff --git a/src/battle/item/volt_shroom/lib.c b/src/battle/item/volt_shroom/lib.c new file mode 100644 index 0000000000..ae08266b7f --- /dev/null +++ b/src/battle/item/volt_shroom/lib.c @@ -0,0 +1,155 @@ +#include "volt_shroom.h" + +extern s32 D_80108A64; +static MenuIcon* D_802A19B0; + +ApiStatus N(GiveRefund)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + f32 facingAngleSign = 0.0f; + s32 sleepTime = 0; + f32 posX, posY, posZ; + posY = player->currentPos.y + player->size.y; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + s32 i; + s32 iconPosX, iconPosY, iconPosZ; + + sellValue = (sellValue * 75 + 99) / 100; + + for (i = 0; i < sellValue; i++) { + posX = player->currentPos.x; + posZ = player->currentPos.z; + + make_item_entity(ItemId_COIN, posX, posY, posZ, 0x17, (i * 3) + 1, facingAngleSign, 0); + add_coins(1); + facingAngleSign += 30.0f; + } + + sleepTime = (i * 3) + 30; + + posX = player->currentPos.x; + posY = player->currentPos.y; + posZ = player->currentPos.z; + get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); + D_802A19B0 = create_icon(&D_80108A64); + set_icon_render_pos(D_802A19B0, iconPosX + 36, iconPosY - 63); + } + + script->varTable[0] = sleepTime; + + return ApiStatus_DONE2; +} + +ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue; + + if (heroes_is_ability_active(player, Ability_REFUND) && sellValue > 0) { + free_icon(D_802A19B0); + } + + return ApiStatus_DONE2; +} + +ApiStatus N(func_802A123C_71AA2C)(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + + inflict_status(player, Debuff_STATIC, script->varTable[0]); + player->status = 0; + return ApiStatus_DONE2; +} + +Script N(UseItemWithEffect) = SCRIPT({ + if (SI_VAR(1) == 0) { + UseCamPreset(69); + sleep 10; + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(0) += 18; + SetActorSpeed(ActorID_PLAYER, 4.0); + SetGoalPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlayerRunToGoal(0); + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(10)); + } else { + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + PlaySoundAtActor(ActorID_PLAYER, 8333); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + sleep 4; + SI_VAR(1) += 45; + SI_VAR(3) = SI_VAR(1); + SI_VAR(3) += 10; + SI_VAR(3) += 2; + PlayEffect(51, 1, SI_VAR(0), SI_VAR(3), SI_VAR(2), 1.0, 30, 0, 0, 0, 0, 0, 0, 0); + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(10) = SI_VAR(0); + sleep 15; + RemoveItemEntity(SI_VAR(10)); + } +}); + +Script N(UseItem) = SCRIPT({ + UseCamPreset(19); + SetBattleCamTarget(0xFFFFFFAB, 1, 0); + SetBattleCamOffsetZ(41); + SetBattleCamZoom(248); + MoveBattleCamOver(30); + sleep 10; + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_GOT_ITEM); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(1) += 45; + MakeItemEntity(SI_VAR(10), SI_VAR(0), SI_VAR(1), SI_VAR(2), 1, 0); + SI_VAR(14) = SI_VAR(0); + N(GiveRefund)(); + sleep SI_VAR(0); + sleep 15; + N(GiveRefundCleanup)(); + RemoveItemEntity(SI_VAR(14)); +}); + +Script N(PlayerGoHome) = SCRIPT({ + UseIdleAnimation(ActorID_PLAYER, 0); + SetGoalToHome(ActorID_PLAYER); + SetActorSpeed(ActorID_PLAYER, 8.0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_RUNNING); + PlayerRunToGoal(0); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + UseIdleAnimation(ActorID_PLAYER, 1); +}); + +Script N(EatItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_EAT); + sleep 45; +}); + +Script N(DrinkItem) = SCRIPT({ + spawn { + loop 4 { + PlaySoundAtActor(ActorID_PLAYER, 8341); + sleep 10; + } + } + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_DRINK); + sleep 45; +}); diff --git a/src/battle/item/volt_shroom/volt_shroom.c b/src/battle/item/volt_shroom/volt_shroom.c new file mode 100644 index 0000000000..eb0bdca2ca --- /dev/null +++ b/src/battle/item/volt_shroom/volt_shroom.c @@ -0,0 +1,22 @@ +#include "volt_shroom.h" + +Script N(main) = SCRIPT({ + SI_VAR(10) = c ItemId_VOLT_SHROOM; + await N(UseItemWithEffect); + await N(EatItem); + SetAnimation(ActorID_PLAYER, 0, PlayerAnim_2); + GetActorPos(ActorID_PLAYER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + SI_VAR(3) = 20; + MultiplyByActorScale(SI_VAR(3)); + SI_VAR(1) += SI_VAR(3); + SI_VAR(3) = 1.0; + MultiplyByActorScale(SI_VAR(3)); + PlayEffect(87, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2), SI_VAR(3), 30, 0, 0, 0, 0, 0, 0, 0); + PlaySound(889); + GetItemPower(ItemId_VOLT_SHROOM, SI_VAR(0), SI_VAR(1)); + N(func_802A123C_71AA2C)(); + sleep 20; + ShowMessageBox(16, 60); + WaitForMessageBoxDone(); + await N(PlayerGoHome); +}); diff --git a/src/battle/item/volt_shroom/volt_shroom.h b/src/battle/item/volt_shroom/volt_shroom.h new file mode 100644 index 0000000000..5293e4eb8b --- /dev/null +++ b/src/battle/item/volt_shroom/volt_shroom.h @@ -0,0 +1,16 @@ +#ifndef BATTLE_ITEM_VOLT_SHROOM +#define BATTLE_ITEM_VOLT_SHROOM + +#include "common.h" +#include "script_api/battle.h" + +#undef NAMESPACE +#define NAMESPACE battle_item_volt_shroom + +ApiStatus N(func_802A123C_71AA2C)(ScriptInstance* script, s32 isInitialCall); + +Script N(UseItemWithEffect); +Script N(PlayerGoHome); +Script N(EatItem); + +#endif diff --git a/src/battle/item/volt_shroom_71A7F0.c b/src/battle/item/volt_shroom_71A7F0.c deleted file mode 100644 index e629ce2627..0000000000 --- a/src/battle/item/volt_shroom_71A7F0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/item/volt_shroom_71A7F0", func_802A1000_71A7F0); - -INCLUDE_ASM(s32, "battle/item/volt_shroom_71A7F0", func_802A11D4_71A9C4); - -INCLUDE_ASM(s32, "battle/item/volt_shroom_71A7F0", func_802A123C_71AA2C); diff --git a/src/battle/move/hammer_charge_0_74F130.c b/src/battle/move/hammer_charge_0_74F130.c index 38ad38d92f..058914b0d7 100644 --- a/src/battle/move/hammer_charge_0_74F130.c +++ b/src/battle/move/hammer_charge_0_74F130.c @@ -19,7 +19,7 @@ ApiStatus func_802A10C8_74F1F8(ScriptInstance* script, s32 isInitialCall) { battleStatus->hammerCharge += 1; if (battleStatus->hammerCharge > 99) { - (*&battleStatus)->hammerCharge = 99; // TODO: macro? + (* &battleStatus)->hammerCharge = 99; // TODO: macro? } battleStatus->jumpCharge = 0; diff --git a/src/battle/move/hammer_charge_1_7595B0.c b/src/battle/move/hammer_charge_1_7595B0.c index 8116b68311..443cf8a794 100644 --- a/src/battle/move/hammer_charge_1_7595B0.c +++ b/src/battle/move/hammer_charge_1_7595B0.c @@ -29,7 +29,7 @@ ApiStatus func_802A10C8_759678(ScriptInstance* script, s32 isInitialCall) { battleStatus2->hammerCharge += 2; if (battleStatus2->hammerCharge > 99) { - (*&battleStatus)->hammerCharge = 99; // TODO: macro? + (* &battleStatus)->hammerCharge = 99; // TODO: macro? } battleStatus->jumpCharge = 0; diff --git a/src/battle/move/hammer_charge_2_75E5D0.c b/src/battle/move/hammer_charge_2_75E5D0.c index 4be3d8732f..0e3dca99ef 100644 --- a/src/battle/move/hammer_charge_2_75E5D0.c +++ b/src/battle/move/hammer_charge_2_75E5D0.c @@ -29,7 +29,7 @@ ApiStatus func_802A10C8_75E698(ScriptInstance* script, s32 isInitialCall) { battleStatus2->hammerCharge += 3; if (battleStatus2->hammerCharge > 99) { - (*&battleStatus)->hammerCharge = 99; // TODO: macro? + (* &battleStatus)->hammerCharge = 99; // TODO: macro? } battleStatus->jumpCharge = 0; diff --git a/src/battle/move/jump_charge_0_74D570.c b/src/battle/move/jump_charge_0_74D570.c index 237782b815..3f83d6a631 100644 --- a/src/battle/move/jump_charge_0_74D570.c +++ b/src/battle/move/jump_charge_0_74D570.c @@ -17,7 +17,7 @@ ApiStatus func_802A1108_74D678(ScriptInstance* script, s32 isInitialCall) { battleStatus->jumpCharge += 1; if (battleStatus->jumpCharge > 99) { - (*&battleStatus)->jumpCharge = 99; // TODO: macro? + (* &battleStatus)->jumpCharge = 99; // TODO: macro? } battleStatus->hammerCharge = 0; diff --git a/src/battle/move/jump_charge_1_75C980.c b/src/battle/move/jump_charge_1_75C980.c index c9e9100bff..1246abde41 100644 --- a/src/battle/move/jump_charge_1_75C980.c +++ b/src/battle/move/jump_charge_1_75C980.c @@ -27,7 +27,7 @@ ApiStatus func_802A1108_75CA88(ScriptInstance* script, s32 isInitialCall) { battleStatus2->jumpCharge += 2; if (battleStatus2->jumpCharge > 99) { - (*&battleStatus)->jumpCharge = 99; // TODO: macro? + (* &battleStatus)->jumpCharge = 99; // TODO: macro? } battleStatus->hammerCharge = 0; diff --git a/src/battle/move/jump_charge_2_761920.c b/src/battle/move/jump_charge_2_761920.c index d21a47f7b7..0bfeeeb40a 100644 --- a/src/battle/move/jump_charge_2_761920.c +++ b/src/battle/move/jump_charge_2_761920.c @@ -27,7 +27,7 @@ ApiStatus func_802A1108_761A28(ScriptInstance* script, s32 isInitialCall) { battleStatus2->jumpCharge += 3; if (battleStatus2->jumpCharge > 99) { - (*&battleStatus)->jumpCharge = 99; // TODO: macro? + (* &battleStatus)->jumpCharge = 99; // TODO: macro? } battleStatus->hammerCharge = 0; diff --git a/src/battle/partner/bombette_6FAD10.c b/src/battle/partner/bombette_6FAD10.c index c600560af0..ac0d66b426 100644 --- a/src/battle/partner/bombette_6FAD10.c +++ b/src/battle/partner/bombette_6FAD10.c @@ -61,9 +61,11 @@ ApiStatus func_80238244_6FAF54(ScriptInstance* script, s32 isInitialCall) { add_xz_vec3f(&partnerActorMovement->currentPos, partnerActor->walk.speed, partnerActor->walk.angle); if (partnerActor->walk.speed < 4.0f) { - play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, partnerActor->walk.currentPos.z, partnerActor->walk.angle); + play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, + partnerActor->walk.currentPos.z, partnerActor->walk.angle); } else { - play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, partnerActor->walk.currentPos.z, partnerActor->walk.angle); + play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, + partnerActor->walk.currentPos.z, partnerActor->walk.angle); } partnerActorMovement->speed /= 1.5; @@ -198,17 +200,13 @@ ApiStatus func_80238590_6FB2A0(ScriptInstance* script, s32 isInitialCall) { case 2: if (var0 < 36) { var1 = 1; - } - else if (var0 < 61) { + } else if (var0 < 61) { var1 = 3; - } - else if (var0 < 81) { + } else if (var0 < 81) { var1 = 5; - } - else if (var0 < 100) { + } else if (var0 < 100) { var1 = 6; - } - else { + } else { var1 = 7; } break; diff --git a/src/battle/partner/bow_710EF0.c b/src/battle/partner/bow_710EF0.c index 4f2a171f90..cba46197e0 100644 --- a/src/battle/partner/bow_710EF0.c +++ b/src/battle/partner/bow_710EF0.c @@ -48,11 +48,11 @@ ApiStatus N(IsPartnerImmobile)(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; s32 isImmobile = playerActor->debuff == Debuff_FEAR - || playerActor->debuff == Debuff_DIZZY - || playerActor->debuff == Debuff_PARALYZE - || playerActor->debuff == Debuff_SLEEP - || playerActor->debuff == Debuff_FROZEN - || playerActor->debuff == Debuff_STOP; + || playerActor->debuff == Debuff_DIZZY + || playerActor->debuff == Debuff_PARALYZE + || playerActor->debuff == Debuff_SLEEP + || playerActor->debuff == Debuff_FROZEN + || playerActor->debuff == Debuff_STOP; if (playerActor->stoneStatus == 12) { isImmobile = TRUE; diff --git a/src/battle/partner/goombario_6F10E0.c b/src/battle/partner/goombario_6F10E0.c index f93ccee5ea..89f6f8f176 100644 --- a/src/battle/partner/goombario_6F10E0.c +++ b/src/battle/partner/goombario_6F10E0.c @@ -73,7 +73,8 @@ ApiStatus func_80238A20_6F1B00(ScriptInstance* script, s32 isInitialCall) { if (partnerActor->currentPos.y < 10.0f) { partnerActor->currentPos.y = 10.0f; - play_movement_dust_effects(2, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z, partnerActor->yaw); + play_movement_dust_effects(2, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z, + partnerActor->yaw); play_sound(0x148); return ApiStatus_DONE1; diff --git a/src/battle/partner/kooper_6F5E80.c b/src/battle/partner/kooper_6F5E80.c index 7a4ce1ab66..7e0552903d 100644 --- a/src/battle/partner/kooper_6F5E80.c +++ b/src/battle/partner/kooper_6F5E80.c @@ -17,9 +17,11 @@ ApiStatus func_80238000_6F5E80(ScriptInstance* script, s32 isInitialCall) { add_xz_vec3f(&partnerActorMovement->currentPos, partnerActor->walk.speed, partnerActor->walk.angle); if (partnerActor->walk.speed < 4.0f) { - play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, partnerActor->walk.currentPos.z, partnerActor->walk.angle); + play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, + partnerActor->walk.currentPos.z, partnerActor->walk.angle); } else { - play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, partnerActor->walk.currentPos.z, partnerActor->walk.angle); + play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, + partnerActor->walk.currentPos.z, partnerActor->walk.angle); } partnerActorMovement->speed = partnerActorMovement->speed / 1.5; diff --git a/src/battle/star/chill_out_7900D0.c b/src/battle/star/chill_out_7900D0.c index e998e8c05a..12f0d1d6d5 100644 --- a/src/battle/star/chill_out_7900D0.c +++ b/src/battle/star/chill_out_7900D0.c @@ -51,8 +51,7 @@ ApiStatus func_802A163C_79070C(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = 0; if ((target->flags & 0x4000) || (target->flags & flag1) || (target->flags & 0x2000) || - (part->eventFlags & 0x40000) || (part->eventFlags & flag2)) - { + (part->eventFlags & 0x40000) || (part->eventFlags & flag2)) { return ApiStatus_DONE2; } diff --git a/src/battle/star/lullaby_78D150.c b/src/battle/star/lullaby_78D150.c index 7102a7a91f..421f3876c9 100644 --- a/src/battle/star/lullaby_78D150.c +++ b/src/battle/star/lullaby_78D150.c @@ -20,8 +20,8 @@ ApiStatus func_802A1518_78D668(ScriptInstance* script, s32 isInitialCall) { } switch (script->functionTemp[0].s) { - s32 temp; - s32 temp2; + s32 temp; + s32 temp2; case 0: script->functionTemp[2].s = -80; diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c index 1d911637bb..f7a43105af 100644 --- a/src/code_10400_len_d30.c +++ b/src/code_10400_len_d30.c @@ -72,7 +72,7 @@ void func_80035660(void) { D_800A0931 = 0; D_800A0932[0] = 0; D_800A0930 = 0; - + if (func_80244BC4() == 0) { set_map_transition_effect(7); } else { diff --git a/src/code_104940_len_dc0.c b/src/code_104940_len_dc0.c index db51232dc0..d351a6082d 100644 --- a/src/code_104940_len_dc0.c +++ b/src/code_104940_len_dc0.c @@ -135,8 +135,9 @@ void func_802E38D8(Entity* entity) { if ((temp->unk_04 == 0) || (temp->unk_06 == 0)) { temp->unk_03 = 1; - set_entity_updatecmd(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, - entity->rotation.y, 0x80000000)), &D_802E9E54); + set_entity_updatecmd(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, + entity->position.z, + entity->rotation.y, 0x80000000)), &D_802E9E54); entity->flags |= 0x20000020; } } diff --git a/src/code_106EF0.c b/src/code_106EF0.c index 910daa0210..d6573a5ba6 100644 --- a/src/code_106EF0.c +++ b/src/code_106EF0.c @@ -33,7 +33,8 @@ void func_802E56EC(Entity* entity) { Entity* someEntity; struct802E3650* temp2; - temp_s0->unk_12 = create_entity(&D_802EA934, entity->position.x, entity->position.y, entity->position.z, 0.0f, 0x80000000); + temp_s0->unk_12 = create_entity(&D_802EA934, entity->position.x, entity->position.y, entity->position.z, 0.0f, + 0x80000000); someEntity = get_entity_by_index(temp_s0->unk_12); temp2 = someEntity->dataBuf; temp2->unk_00 = entity->listIndex; diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index 54579b91bc..2bc0f017d6 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -111,7 +111,7 @@ void disable_npc_shadow(Npc* npc) { func_802DE2AC(s32 arg0, s32 arg1, f32 arg2); -void set_npc_sprite(Npc *npc, s32 arg1, s32 arg2) { +void set_npc_sprite(Npc* npc, s32 arg1, s32 arg2) { s32 flagsTemp; ASSERT(((npc->flags & 0x1000000)) || (func_802DE5E8(npc->unk_24) == 0)); @@ -129,7 +129,7 @@ void set_npc_sprite(Npc *npc, s32 arg1, s32 arg2) { } } -void enable_npc_blur(Npc *npc) { +void enable_npc_blur(Npc* npc) { NpcBlurData* blurData; s32 i; diff --git a/src/code_16F740.c b/src/code_16F740.c index 9d14917d90..036b1061bd 100644 --- a/src/code_16F740.c +++ b/src/code_16F740.c @@ -80,7 +80,7 @@ void func_80243910(void) { } void switch_order(void) { - BattleStatus *battleStatus = &gBattleStatus; + BattleStatus* battleStatus = &gBattleStatus; battleStatus->unk_4D = -1; battleStatus->unk_4E = -1; @@ -187,7 +187,7 @@ void func_80247214(void) { // Something weird with using battleStatus twice but in specific ways #ifdef NON_MATCHING void func_8024721C(void) { - BattleStatus *battleStatus; + BattleStatus* battleStatus; battleStatus = &gBattleStatus; if (gBattleStatus.battleState == 0) { diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index d4cfddb8c1..faa8f54062 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -215,7 +215,7 @@ INCLUDE_ASM(s32, "code_16c8e0", func_802409F4); INCLUDE_ASM(s32, "code_16c8e0", func_80240AA8); -void delete_actor(Actor *actor) { +void delete_actor(Actor* actor) { ActorPart* partsTable; ActorPart* actorPartTemp; BattleStatus* battleStatus; diff --git a/src/code_182B30.c b/src/code_182B30.c index 04613e278a..c8460d0a88 100644 --- a/src/code_182B30.c +++ b/src/code_182B30.c @@ -91,7 +91,7 @@ INCLUDE_ASM(s32, "code_182B30", enable_player_blur); void disable_player_blur(void) { DecorationTable* decorationTable = gBattleStatus.playerActor->partsTable->decorationTable; - + if (decorationTable->unk_7DB != 0) { decorationTable->unk_7DB--; if (decorationTable->unk_7DB == 0) { @@ -103,7 +103,7 @@ void disable_player_blur(void) { void func_80254950(void) { Actor* playerActor = gBattleStatus.playerActor; DecorationTable* decorationTable = playerActor->partsTable->decorationTable; - + if (decorationTable->unk_7DB != 0) { decorationTable->unk_7DB--; if (decorationTable->unk_7DB == 0) { @@ -115,7 +115,7 @@ void func_80254950(void) { void func_802549A0(void) { DecorationTable* decorationTable = gBattleStatus.playerActor->partsTable->decorationTable; - + decorationTable->unk_7DB = 0; decorationTable->effectType = 20; } @@ -248,7 +248,7 @@ INCLUDE_ASM(s32, "code_182B30", func_8025BAA0); INCLUDE_ASM(s32, "code_182B30", func_8025C120); -s32 func_8025C840(s32 arg0, ActorPart *arg1) { +s32 func_8025C840(s32 arg0, ActorPart* arg1) { if (!(arg1->flags & 2)) { switch (arg1->decorationTable->unk_750) { @@ -263,7 +263,7 @@ s32 func_8025C840(s32 arg0, ActorPart *arg1) { return 0; } -s32 func_8025C8A0(s32 arg0, ActorPart *arg1) { +s32 func_8025C8A0(s32 arg0, ActorPart* arg1) { if (arg1->decorationTable->unk_751 != 0) { arg1->decorationTable->unk_751 = 0; @@ -276,7 +276,7 @@ s32 func_8025C8A0(s32 arg0, ActorPart *arg1) { INCLUDE_ASM(s32, "code_182B30", func_8025C918); -s32 func_8025CCC8(s32 arg0, ActorPart *arg1) { +s32 func_8025CCC8(s32 arg0, ActorPart* arg1) { if (!(arg1->flags & 2)) { switch (arg1->decorationTable->unk_764) { @@ -294,7 +294,7 @@ s32 func_8025CCC8(s32 arg0, ActorPart *arg1) { void func_8025CD28(s32 arg0, ActorPart* arg1) { DecorationTable* decorationTable = arg1->decorationTable; - if (decorationTable->unk_765 != 0 ) { + if (decorationTable->unk_765 != 0) { decorationTable->unk_765 = 0; } decorationTable->unk_768 = 0; diff --git a/src/code_18F340.c b/src/code_18F340.c index 04d15bab31..b04f04b66e 100644 --- a/src/code_18F340.c +++ b/src/code_18F340.c @@ -6,11 +6,11 @@ ApiStatus IsPartnerImmobile(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; Actor* playerActor = battleStatus->playerActor; s32 isImmobile = playerActor->debuff == Debuff_FEAR - || playerActor->debuff == Debuff_DIZZY - || playerActor->debuff == Debuff_PARALYZE - || playerActor->debuff == Debuff_SLEEP - || playerActor->debuff == Debuff_FROZEN - || playerActor->debuff == Debuff_STOP; + || playerActor->debuff == Debuff_DIZZY + || playerActor->debuff == Debuff_PARALYZE + || playerActor->debuff == Debuff_SLEEP + || playerActor->debuff == Debuff_FROZEN + || playerActor->debuff == Debuff_STOP; if (playerActor->stoneStatus == 12) { isImmobile = TRUE; diff --git a/src/code_190B20.c b/src/code_190B20.c index f8b55b358b..18d2d136ee 100644 --- a/src/code_190B20.c +++ b/src/code_190B20.c @@ -1012,7 +1012,7 @@ s32 D_80283524[] = { s32 D_8028358C[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, &D_8028358C, &D_8028358C, &D_8028358C, &D_8028358C, &D_8028358C, &D_8028358C, &D_8028358C, &D_8028358C, 0x00000000, -}; + }; s16 D_802835D0[] = { 0x1C, 0x28 }; s16 D_802835D4[] = { 0, -2 }; @@ -1173,7 +1173,7 @@ INCLUDE_ASM(s32, "code_190B20", inflict_status); s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) { if (statusTypeKey == Debuff_DAZE) { if (statusTypeKey != target->koStatus) { - inflict_status(target, Debuff_DAZE); + inflict_status(target, Debuff_DAZE, duration); play_sound(0x2107); } else { target->koDuration += duration; diff --git a/src/code_1AC760.c b/src/code_1AC760.c index 9623aca8f2..45a731c3d5 100644 --- a/src/code_1AC760.c +++ b/src/code_1AC760.c @@ -113,7 +113,8 @@ ApiStatus func_8027FC90(ScriptInstance* script, s32 isInitialCall) { battleStatus->flags1 |= 0x20; hitResult = calc_partner_damage_enemy(); - show_damage_popup(actor->walk.goalPos.x, actor->walk.goalPos.y, actor->walk.goalPos.z, battleStatus->lastAttackDamage, 0); + show_damage_popup(actor->walk.goalPos.x, actor->walk.goalPos.y, actor->walk.goalPos.z, battleStatus->lastAttackDamage, + 0); set_variable(script, outVar, hitResult); return ApiStatus_DONE2; diff --git a/src/code_1AF230.c b/src/code_1AF230.c index 6fb8ff9c31..8995f99050 100644 --- a/src/code_1AF230.c +++ b/src/code_1AF230.c @@ -22,14 +22,15 @@ typedef struct StarPowerDesc { extern StarPowerDesc D_8008F071[]; -ApiStatus LoadStarPowerScript(ScriptInstance *script, s32 isInitialCall) { - BattleStatus *battleStatus = &gBattleStatus; - PlayerData *playerData = &gPlayerData; +ApiStatus LoadStarPowerScript(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; s16 selectedItemID; playerData->specialBarsFilled -= D_8008F071[battleStatus->selectedMoveID].starPoints * 256; selectedItemID = battleStatus->selectedItemID; - dma_copy((&D_8029C7D0[selectedItemID])->dmaStart, (&D_8029C7D0[selectedItemID])->dmaEnd, (&D_8029C7D0[selectedItemID])->dmaDest); + dma_copy((&D_8029C7D0[selectedItemID])->dmaStart, (&D_8029C7D0[selectedItemID])->dmaEnd, + (&D_8029C7D0[selectedItemID])->dmaDest); script->varTable[0] = (&D_8029C7D0[selectedItemID])->init; return ApiStatus_DONE2; } diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index 8b823c9f88..218e1485f6 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -11,7 +11,8 @@ s16 D_800741A2 = 0; s32 D_800741A4 = 0; s32 D_800741A8[] = { 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, }; + 0x00000000, 0x00000000, + }; u16 gMatrixListPos = 0; u16 D_800741F2 = 0; s32 gCurrentDisplayContextIndex = 0; @@ -161,7 +162,8 @@ void gfx_task_background(void) { gSPEndDisplayList((*gfx)++); // TODO these << 3 >> 3 shouldn't be necessary. There's almost definitely something we're missing here... - ASSERT((s32)((u32)((*gfx) - (*gDisplayContextPtr)->backgroundGfx) << 3 >> 3) < ARRAY_COUNT((*gDisplayContextPtr)->backgroundGfx)); + ASSERT((s32)((u32)((*gfx) - (*gDisplayContextPtr)->backgroundGfx) << 3 >> 3) < ARRAY_COUNT(( + *gDisplayContextPtr)->backgroundGfx)); nuGfxTaskStart(&gDisplayContext->backgroundGfx[0], (gMasterGfxPos - gDisplayContext->backgroundGfx) << 3, NU_GFX_UCODE_F3DEX2, NU_SC_NOSWAPBUFFER); diff --git a/src/code_23680.c b/src/code_23680.c index e6ebd69e66..7b9a0d4c85 100644 --- a/src/code_23680.c +++ b/src/code_23680.c @@ -136,7 +136,7 @@ s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { return 0; } -void func_800494C0(Npc *npc, s32 arg1, s32 arg2) { +void func_800494C0(Npc* npc, s32 arg1, s32 arg2) { Enemy* enemy = get_enemy(npc->npcID); s32 value2 = (arg2 & 0xFFFF0000) | 2; diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index 2dfe5689ab..ad4bbd0e54 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -176,7 +176,7 @@ void func_8004E3A4(UnkAlA9C* arg0) { func_8004E444(arg0); } -void func_8004E444(UnkAlA9C *arg0) { +void func_8004E444(UnkAlA9C* arg0) { u16 mult = (arg0->unk_2C.unk_00.u16 * arg0->unk_2C.unk_10.u16) >> 15; s32 i; diff --git a/src/code_31650.c b/src/code_31650.c index 3dbdf2f0dd..ff0e850b32 100644 --- a/src/code_31650.c +++ b/src/code_31650.c @@ -208,7 +208,7 @@ void func_80057ED0(s16 arg0) { D_800A3FE8 = 0; } -INCLUDE_ASM(void, "code_31650", alHeapInit, ALHeap *hp, u8 *base, s32 len); +INCLUDE_ASM(void, "code_31650", alHeapInit, ALHeap* hp, u8* base, s32 len); void* alHeapAlloc(ALHeap* heap, s32 arg1, s32 size) { void* ret = NULL; diff --git a/src/code_328110.c b/src/code_328110.c index e55190f4c6..0ffedede7a 100644 --- a/src/code_328110.c +++ b/src/code_328110.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "code_328110", func_E000C0C8); INCLUDE_ASM(s32, "code_328110", func_E000C160); -void func_E000C64C(void){ +void func_E000C64C(void) { } INCLUDE_ASM(s32, "code_328110", func_E000C654); diff --git a/src/code_32C110.c b/src/code_32C110.c index 73650b7316..21a3ec2b0d 100644 --- a/src/code_32C110.c +++ b/src/code_32C110.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_32C110", func_E000E000); -void func_E000E16C(void){ +void func_E000E16C(void) { } INCLUDE_ASM(s32, "code_32C110", func_E000E174); diff --git a/src/code_32C7A0.c b/src/code_32C7A0.c index 89e05ca5da..044c002689 100644 --- a/src/code_32C7A0.c +++ b/src/code_32C7A0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "code_32C7A0", func_E0010104); INCLUDE_ASM(s32, "code_32C7A0", func_E00101E8); -void func_E00103EC(void){ +void func_E00103EC(void) { } INCLUDE_ASM(s32, "code_32C7A0", func_E00103F4); diff --git a/src/code_32DD10.c b/src/code_32DD10.c index 61a190f11a..46897cdc6f 100644 --- a/src/code_32DD10.c +++ b/src/code_32DD10.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "code_32DD10", func_E0012104); INCLUDE_ASM(s32, "code_32DD10", func_E0012204); -void func_E0012440(void){ +void func_E0012440(void) { } INCLUDE_ASM(s32, "code_32DD10", func_E0012448); diff --git a/src/code_32E490.c b/src/code_32E490.c index 3721596602..921d5d16ee 100644 --- a/src/code_32E490.c +++ b/src/code_32E490.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_32E490", func_E0014000); -void func_E0014258(void){ +void func_E0014258(void) { } INCLUDE_ASM(s32, "code_32E490", func_E0014260); diff --git a/src/code_32EE30.c b/src/code_32EE30.c index 222d35f358..452bd95736 100644 --- a/src/code_32EE30.c +++ b/src/code_32EE30.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_32EE30", func_E0016000); -void func_E0016220(void){ +void func_E0016220(void) { } INCLUDE_ASM(s32, "code_32EE30", func_E0016228); diff --git a/src/code_32F580.c b/src/code_32F580.c index 5faecb4032..aeadda39a4 100644 --- a/src/code_32F580.c +++ b/src/code_32F580.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "code_32F580", func_E0018000); INCLUDE_ASM(s32, "code_32F580", func_E0018078); -void func_E00182AC(void){ +void func_E00182AC(void) { } INCLUDE_ASM(s32, "code_32F580", func_E00182B4); diff --git a/src/code_32FE30.c b/src/code_32FE30.c index da9ec1bfe3..53bd6977e3 100644 --- a/src/code_32FE30.c +++ b/src/code_32FE30.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_32FE30", func_E001A000); -void func_E001A21C(void){ +void func_E001A21C(void) { } INCLUDE_ASM(s32, "code_32FE30", func_E001A224); diff --git a/src/code_330910.c b/src/code_330910.c index e4305b5fb1..b4b8e55f77 100644 --- a/src/code_330910.c +++ b/src/code_330910.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_330910", func_E001C000); -void func_E001C120(void){ +void func_E001C120(void) { } INCLUDE_ASM(s32, "code_330910", func_E001C128); diff --git a/src/code_331940.c b/src/code_331940.c index 8aa8c28c74..2e02153af1 100644 --- a/src/code_331940.c +++ b/src/code_331940.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_331940", func_E001E000); -void func_E001E370(void){ +void func_E001E370(void) { } INCLUDE_ASM(s32, "code_331940", func_E001E378); diff --git a/src/code_333EC0.c b/src/code_333EC0.c index da7b138b93..dbe8a1e632 100644 --- a/src/code_333EC0.c +++ b/src/code_333EC0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "code_333EC0", func_E0020000); INCLUDE_ASM(s32, "code_333EC0", func_E00202CC); -void func_E0020460(void){ +void func_E0020460(void) { } INCLUDE_ASM(s32, "code_333EC0", func_E0020468); diff --git a/src/code_337240.c b/src/code_337240.c index 300588887d..d23200bf6a 100644 --- a/src/code_337240.c +++ b/src/code_337240.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_337240", func_E0022000); -void func_E0022544(void){ +void func_E0022544(void) { } INCLUDE_ASM(s32, "code_337240", func_E002254C); diff --git a/src/code_339250.c b/src/code_339250.c index 8cbe92f7eb..1f7129ab02 100644 --- a/src/code_339250.c +++ b/src/code_339250.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_339250", func_E0024000); -void func_E0024180(void){ +void func_E0024180(void) { } INCLUDE_ASM(s32, "code_339250", func_E0024188); diff --git a/src/code_33B180.c b/src/code_33B180.c index 74ea913303..12de8fd51b 100644 --- a/src/code_33B180.c +++ b/src/code_33B180.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_33B180", func_E0026000); -void func_E0026184(void){ +void func_E0026184(void) { } INCLUDE_ASM(s32, "code_33B180", func_E002618C); diff --git a/src/code_33CDF0.c b/src/code_33CDF0.c index 0452c21d00..e8b0c7fb43 100644 --- a/src/code_33CDF0.c +++ b/src/code_33CDF0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_33CDF0", func_E0028000); -void func_E0028240(void){ +void func_E0028240(void) { } INCLUDE_ASM(s32, "code_33CDF0", func_E0028248); diff --git a/src/code_33E8C0.c b/src/code_33E8C0.c index c4cf137538..59c5c6f76d 100644 --- a/src/code_33E8C0.c +++ b/src/code_33E8C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_33E8C0", func_E002A000); -void func_E002A284(void){ +void func_E002A284(void) { } INCLUDE_ASM(s32, "code_33E8C0", func_E002A28C); diff --git a/src/code_33FE80.c b/src/code_33FE80.c index c17f66be34..9612750d27 100644 --- a/src/code_33FE80.c +++ b/src/code_33FE80.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_33FE80", func_E002C000); -void func_E002C234(void){ +void func_E002C234(void) { } INCLUDE_ASM(s32, "code_33FE80", func_E002C23C); diff --git a/src/code_3419E0.c b/src/code_3419E0.c index 2a85d47957..815ae33fb9 100644 --- a/src/code_3419E0.c +++ b/src/code_3419E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3419E0", func_E002E000); -void func_E002E248(void){ +void func_E002E248(void) { } INCLUDE_ASM(s32, "code_3419E0", func_E002E250); diff --git a/src/code_342140.c b/src/code_342140.c index ca6806b3b1..a10f1b5bcc 100644 --- a/src/code_342140.c +++ b/src/code_342140.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_342140", func_E0030000); -void func_E0030728(void){ +void func_E0030728(void) { } INCLUDE_ASM(s32, "code_342140", func_E0030730); diff --git a/src/code_343680.c b/src/code_343680.c index 969ec32241..38d8aea253 100644 --- a/src/code_343680.c +++ b/src/code_343680.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_343680", func_E0032000); -void func_E00321D0(void){ +void func_E00321D0(void) { } INCLUDE_ASM(s32, "code_343680", func_E00321D8); diff --git a/src/code_344A10.c b/src/code_344A10.c index e4a29052e3..df1f9dafea 100644 --- a/src/code_344A10.c +++ b/src/code_344A10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_344A10", func_E0034000); -void func_E0034108(void){ +void func_E0034108(void) { } INCLUDE_ASM(s32, "code_344A10", func_E0034110); diff --git a/src/code_3454E0.c b/src/code_3454E0.c index c280970fe3..703751159e 100644 --- a/src/code_3454E0.c +++ b/src/code_3454E0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3454E0", func_E0036000); -void func_E00360DC(void){ +void func_E00360DC(void) { } INCLUDE_ASM(s32, "code_3454E0", func_E00360E4); INCLUDE_ASM(s32, "code_3454E0", func_E00361D8); -void func_E003621C(void){ +void func_E003621C(void) { } INCLUDE_ASM(s32, "code_3454E0", func_E0036224); diff --git a/src/code_34DD20.c b/src/code_34DD20.c index ab580ffbef..48107b2848 100644 --- a/src/code_34DD20.c +++ b/src/code_34DD20.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_34DD20", func_E0038000); -void func_E003841C(void){ +void func_E003841C(void) { } INCLUDE_ASM(s32, "code_34DD20", func_E0038424); diff --git a/src/code_34EC80.c b/src/code_34EC80.c index f00f631e9e..6411b0d208 100644 --- a/src/code_34EC80.c +++ b/src/code_34EC80.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_34EC80", func_E003A000); -void func_E003A1D4(void){ +void func_E003A1D4(void) { } INCLUDE_ASM(s32, "code_34EC80", func_E003A1DC); diff --git a/src/code_34F4C0.c b/src/code_34F4C0.c index cf41b9da2f..17b1bc189f 100644 --- a/src/code_34F4C0.c +++ b/src/code_34F4C0.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_34F4C0", func_E003C000); -void func_E003C23C(void){ +void func_E003C23C(void) { } INCLUDE_ASM(s32, "code_34F4C0", func_E003C244); -void func_E003C474(void){ +void func_E003C474(void) { } INCLUDE_ASM(s32, "code_34F4C0", func_E003C47C); diff --git a/src/code_352440.c b/src/code_352440.c index b52f6f716e..0fa90d3ec7 100644 --- a/src/code_352440.c +++ b/src/code_352440.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_352440", func_E003E000); -void func_E003E3F8(void){ +void func_E003E3F8(void) { } INCLUDE_ASM(s32, "code_352440", func_E003E400); diff --git a/src/code_353300.c b/src/code_353300.c index dddf8b1cfa..7d2b73ff74 100644 --- a/src/code_353300.c +++ b/src/code_353300.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_353300", func_E0040000); -void func_E0040148(void){ +void func_E0040148(void) { } INCLUDE_ASM(s32, "code_353300", func_E0040150); diff --git a/src/code_3547A0.c b/src/code_3547A0.c index e90ff0416b..574961ff3b 100644 --- a/src/code_3547A0.c +++ b/src/code_3547A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3547A0", func_E0042000); -void func_E004222C(void){ +void func_E004222C(void) { } INCLUDE_ASM(s32, "code_3547A0", func_E0042234); diff --git a/src/code_354F60.c b/src/code_354F60.c index 1cfae2849f..b54e433d68 100644 --- a/src/code_354F60.c +++ b/src/code_354F60.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_354F60", func_E0044000); -void func_E004441C(void){ +void func_E004441C(void) { } INCLUDE_ASM(s32, "code_354F60", func_E0044424); diff --git a/src/code_355EE0.c b/src/code_355EE0.c index de8ecd1a60..a7ad6bd150 100644 --- a/src/code_355EE0.c +++ b/src/code_355EE0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_355EE0", func_E0046000); -void func_E0046158(void){ +void func_E0046158(void) { } INCLUDE_ASM(s32, "code_355EE0", func_E0046160); diff --git a/src/code_356980.c b/src/code_356980.c index 3ac737fd6e..07b93118bb 100644 --- a/src/code_356980.c +++ b/src/code_356980.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_356980", func_E0048000); -void func_E0048128(void){ +void func_E0048128(void) { } INCLUDE_ASM(s32, "code_356980", func_E0048130); diff --git a/src/code_3584C0.c b/src/code_3584C0.c index d480352d6f..7226d38eb1 100644 --- a/src/code_3584C0.c +++ b/src/code_3584C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3584C0", func_E004A000); -void func_E004A328(void){ +void func_E004A328(void) { } INCLUDE_ASM(s32, "code_3584C0", func_E004A330); diff --git a/src/code_359F20.c b/src/code_359F20.c index 622bcbb009..f641928019 100644 --- a/src/code_359F20.c +++ b/src/code_359F20.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_359F20", func_E004C000); -void func_E004C204(void){ +void func_E004C204(void) { } INCLUDE_ASM(s32, "code_359F20", func_E004C20C); diff --git a/src/code_35B9D0.c b/src/code_35B9D0.c index 7980717ff8..24716cffac 100644 --- a/src/code_35B9D0.c +++ b/src/code_35B9D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_35B9D0", func_E004E000); -void func_E004E15C(void){ +void func_E004E15C(void) { } INCLUDE_ASM(s32, "code_35B9D0", func_E004E164); diff --git a/src/code_35BFD0.c b/src/code_35BFD0.c index ade6b5f738..6586ae6130 100644 --- a/src/code_35BFD0.c +++ b/src/code_35BFD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_35BFD0", func_E0050000); -void func_E00501D0(void){ +void func_E00501D0(void) { } INCLUDE_ASM(s32, "code_35BFD0", func_E00501D8); diff --git a/src/code_35CA80.c b/src/code_35CA80.c index 7ad27cf5d5..0ab1a440cb 100644 --- a/src/code_35CA80.c +++ b/src/code_35CA80.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_35CA80", func_E0052000); -void func_E00520E8(void){ +void func_E00520E8(void) { } INCLUDE_ASM(s32, "code_35CA80", func_E00520F0); diff --git a/src/code_35DA00.c b/src/code_35DA00.c index 6b9c9fec9a..844c6af9f2 100644 --- a/src/code_35DA00.c +++ b/src/code_35DA00.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_35DA00", func_E0056000); -void func_E0056304(void){ +void func_E0056304(void) { } INCLUDE_ASM(s32, "code_35DA00", func_E005630C); diff --git a/src/code_35E920.c b/src/code_35E920.c index a1b63a6a39..b78ae7803a 100644 --- a/src/code_35E920.c +++ b/src/code_35E920.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_35E920", func_E0058000); -void func_E00581AC(void){ +void func_E00581AC(void) { } INCLUDE_ASM(s32, "code_35E920", func_E00581B4); diff --git a/src/code_3602C0.c b/src/code_3602C0.c index 5eceea7e4c..5590d450c8 100644 --- a/src/code_3602C0.c +++ b/src/code_3602C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3602C0", func_E005A000); -void func_E005A1F4(void){ +void func_E005A1F4(void) { } INCLUDE_ASM(s32, "code_3602C0", func_E005A1FC); diff --git a/src/code_360F40.c b/src/code_360F40.c index 1fd38e214d..13a801440a 100644 --- a/src/code_360F40.c +++ b/src/code_360F40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_360F40", func_E005C000); -void func_E005C178(void){ +void func_E005C178(void) { } INCLUDE_ASM(s32, "code_360F40", func_E005C180); diff --git a/src/code_3625C0.c b/src/code_3625C0.c index d29dbf50e6..cb4499552b 100644 --- a/src/code_3625C0.c +++ b/src/code_3625C0.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_3625C0", func_E005E000); -void func_E005E1B0(void){ +void func_E005E1B0(void) { } INCLUDE_ASM(s32, "code_3625C0", func_E005E1B8); -void func_E005E310(void){ +void func_E005E310(void) { } INCLUDE_ASM(s32, "code_3625C0", func_E005E318); diff --git a/src/code_363160.c b/src/code_363160.c index 72d1e72c4a..fb8e14a883 100644 --- a/src/code_363160.c +++ b/src/code_363160.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_363160", func_E0060000); -void func_E00601D8(void){ +void func_E00601D8(void) { } INCLUDE_ASM(s32, "code_363160", func_E00601E0); diff --git a/src/code_364300.c b/src/code_364300.c index 277922b7a0..9ccfba5c4f 100644 --- a/src/code_364300.c +++ b/src/code_364300.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_364300", func_E0062000); -void func_E0062218(void){ +void func_E0062218(void) { } INCLUDE_ASM(s32, "code_364300", func_E0062220); diff --git a/src/code_364F10.c b/src/code_364F10.c index 67e6a0002b..653d6144ce 100644 --- a/src/code_364F10.c +++ b/src/code_364F10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_364F10", func_E0064000); -void func_E006419C(void){ +void func_E006419C(void) { } INCLUDE_ASM(s32, "code_364F10", func_E00641A4); diff --git a/src/code_366030.c b/src/code_366030.c index 664b8d7d6e..d068ed052f 100644 --- a/src/code_366030.c +++ b/src/code_366030.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_366030", func_E0066000); -void func_E0066490(void){ +void func_E0066490(void) { } INCLUDE_ASM(s32, "code_366030", func_E0066498); diff --git a/src/code_36A8D0.c b/src/code_36A8D0.c index 57b170a8ae..9626977654 100644 --- a/src/code_36A8D0.c +++ b/src/code_36A8D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_36A8D0", func_E0068000); -void func_E0068140(void){ +void func_E0068140(void) { } INCLUDE_ASM(s32, "code_36A8D0", func_E0068148); diff --git a/src/code_36D020.c b/src/code_36D020.c index c5376128ff..f8aaf0dbc5 100644 --- a/src/code_36D020.c +++ b/src/code_36D020.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "code_36D020", func_E006A0BC); INCLUDE_ASM(s32, "code_36D020", func_E006A1E8); -void func_E006A45C(void){ +void func_E006A45C(void) { } INCLUDE_ASM(s32, "code_36D020", func_E006A464); diff --git a/src/code_36E1D0.c b/src/code_36E1D0.c index 16e65579d1..e23ff3147d 100644 --- a/src/code_36E1D0.c +++ b/src/code_36E1D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_36E1D0", func_E006C000); -void func_E006C298(void){ +void func_E006C298(void) { } INCLUDE_ASM(s32, "code_36E1D0", func_E006C2A0); diff --git a/src/code_372790.c b/src/code_372790.c index 25ffa798d0..7287e211b8 100644 --- a/src/code_372790.c +++ b/src/code_372790.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_372790", func_E006E000); -void func_E006E354(void){ +void func_E006E354(void) { } INCLUDE_ASM(s32, "code_372790", func_E006E35C); diff --git a/src/code_3740B0.c b/src/code_3740B0.c index 01e4e26812..85ecbd8204 100644 --- a/src/code_3740B0.c +++ b/src/code_3740B0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3740B0", func_E0070000); -void func_E00701EC(void){ +void func_E00701EC(void) { } INCLUDE_ASM(s32, "code_3740B0", func_E00701F4); INCLUDE_ASM(s32, "code_3740B0", func_E00706F0); -void func_E0070738(void){ +void func_E0070738(void) { } INCLUDE_ASM(s32, "code_3740B0", func_E0070740); diff --git a/src/code_374E50.c b/src/code_374E50.c index 18e0313e72..ebc9700fa2 100644 --- a/src/code_374E50.c +++ b/src/code_374E50.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_374E50", func_E0072000); -void func_E0072148(void){ +void func_E0072148(void) { } INCLUDE_ASM(s32, "code_374E50", func_E0072150); diff --git a/src/code_376460.c b/src/code_376460.c index 405eee1efd..2056469220 100644 --- a/src/code_376460.c +++ b/src/code_376460.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_376460", func_E0074000); -void func_E00741E0(void){ +void func_E00741E0(void) { } INCLUDE_ASM(s32, "code_376460", func_E00741E8); diff --git a/src/code_377070.c b/src/code_377070.c index df44a171f5..bcf1f19a95 100644 --- a/src/code_377070.c +++ b/src/code_377070.c @@ -2,17 +2,17 @@ INCLUDE_ASM(s32, "code_377070", func_E0076000); -void func_E0076370(void){ +void func_E0076370(void) { } INCLUDE_ASM(s32, "code_377070", func_E0076378); INCLUDE_ASM(s32, "code_377070", func_E0076808); -void func_E007684C(void){ +void func_E007684C(void) { } -void func_E0076854(void){ +void func_E0076854(void) { } INCLUDE_ASM(s32, "code_377070", func_E007685C); diff --git a/src/code_37A3F0.c b/src/code_37A3F0.c index 0eb7424281..936ff4cc7c 100644 --- a/src/code_37A3F0.c +++ b/src/code_37A3F0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_37A3F0", func_E0078000); -void func_E0078124(void){ +void func_E0078124(void) { } INCLUDE_ASM(s32, "code_37A3F0", func_E007812C); INCLUDE_ASM(s32, "code_37A3F0", func_E0078210); -void func_E0078274(void){ +void func_E0078274(void) { } INCLUDE_ASM(s32, "code_37A3F0", func_E007827C); diff --git a/src/code_37C540.c b/src/code_37C540.c index 2a51ee5c92..ccca34cd94 100644 --- a/src/code_37C540.c +++ b/src/code_37C540.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_37C540", func_E007A000); -void func_E007A504(void){ +void func_E007A504(void) { } INCLUDE_ASM(s32, "code_37C540", func_E007A50C); INCLUDE_ASM(s32, "code_37C540", func_E007A840); -void func_E007A884(void){ +void func_E007A884(void) { } INCLUDE_ASM(s32, "code_37C540", func_E007A88C); diff --git a/src/code_37D490.c b/src/code_37D490.c index bc99d58d82..889845a983 100644 --- a/src/code_37D490.c +++ b/src/code_37D490.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_37D490", func_E007C000); -void func_E007C128(void){ +void func_E007C128(void) { } INCLUDE_ASM(s32, "code_37D490", func_E007C130); diff --git a/src/code_37F720.c b/src/code_37F720.c index 31aa50629d..2abcdbcdfc 100644 --- a/src/code_37F720.c +++ b/src/code_37F720.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_37F720", func_E007E000); -void func_E007E1FC(void){ +void func_E007E1FC(void) { } INCLUDE_ASM(s32, "code_37F720", func_E007E204); diff --git a/src/code_3812C0.c b/src/code_3812C0.c index 48399ccdf2..127a82b00c 100644 --- a/src/code_3812C0.c +++ b/src/code_3812C0.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_3812C0", func_E0080000); -void func_E00801C8(void){ +void func_E00801C8(void) { } INCLUDE_ASM(s32, "code_3812C0", func_E00801D0); -void func_E0080424(void){ +void func_E0080424(void) { } INCLUDE_ASM(s32, "code_3812C0", func_E008042C); diff --git a/src/code_385640.c b/src/code_385640.c index e2a45eecc0..13238c9d86 100644 --- a/src/code_385640.c +++ b/src/code_385640.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_385640", func_E0082000); -void func_E00821B0(void){ +void func_E00821B0(void) { } INCLUDE_ASM(s32, "code_385640", func_E00821B8); -void func_E0082520(void){ +void func_E0082520(void) { } INCLUDE_ASM(s32, "code_385640", func_E0082528); diff --git a/src/code_3889D0.c b/src/code_3889D0.c index bdd70f7243..1d0717ca3f 100644 --- a/src/code_3889D0.c +++ b/src/code_3889D0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "code_3889D0", func_E0084060); INCLUDE_ASM(s32, "code_3889D0", func_E0084084); -void func_E0084658(void){ +void func_E0084658(void) { } INCLUDE_ASM(s32, "code_3889D0", func_E0084660); diff --git a/src/code_389850.c b/src/code_389850.c index 9f2483cf9d..32772c4447 100644 --- a/src/code_389850.c +++ b/src/code_389850.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_389850", func_E0086000); -void func_E0086270(void){ +void func_E0086270(void) { } INCLUDE_ASM(s32, "code_389850", func_E0086278); -void func_E0086390(void){ +void func_E0086390(void) { } INCLUDE_ASM(s32, "code_389850", func_E0086398); diff --git a/src/code_38ADF0.c b/src/code_38ADF0.c index 012d2a8692..a81a407e00 100644 --- a/src/code_38ADF0.c +++ b/src/code_38ADF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "code_38ADF0", func_E0088000); INCLUDE_ASM(s32, "code_38ADF0", func_E008817C); -void func_E00885A0(void){ +void func_E00885A0(void) { } INCLUDE_ASM(s32, "code_38ADF0", func_E00885A8); diff --git a/src/code_38C5F0.c b/src/code_38C5F0.c index d3d4eebf7f..530e7ba549 100644 --- a/src/code_38C5F0.c +++ b/src/code_38C5F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "code_38C5F0", func_E008A000); INCLUDE_ASM(s32, "code_38C5F0", func_E008A188); -void func_E008A288(void){ +void func_E008A288(void) { } INCLUDE_ASM(s32, "code_38C5F0", func_E008A290); diff --git a/src/code_38DE00.c b/src/code_38DE00.c index 2c58ed9113..5ab833e864 100644 --- a/src/code_38DE00.c +++ b/src/code_38DE00.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_38DE00", func_E008C000); -void func_E008C3F4(void){ +void func_E008C3F4(void) { } INCLUDE_ASM(s32, "code_38DE00", func_E008C3FC); diff --git a/src/code_38EE60.c b/src/code_38EE60.c index 7c92dfcd95..bbaacb63c8 100644 --- a/src/code_38EE60.c +++ b/src/code_38EE60.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_38EE60", func_E008E000); -void func_E008E1FC(void){ +void func_E008E1FC(void) { } INCLUDE_ASM(s32, "code_38EE60", func_E008E204); diff --git a/src/code_38F900.c b/src/code_38F900.c index 15fe9f80bf..a101ffc099 100644 --- a/src/code_38F900.c +++ b/src/code_38F900.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_38F900", func_E0090000); -void func_E00901C0(void){ +void func_E00901C0(void) { } INCLUDE_ASM(s32, "code_38F900", func_E00901C8); -void func_E0090420(void){ +void func_E0090420(void) { } INCLUDE_ASM(s32, "code_38F900", func_E0090428); diff --git a/src/code_391D30.c b/src/code_391D30.c index 3537685448..0a5d78d3e4 100644 --- a/src/code_391D30.c +++ b/src/code_391D30.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_391D30", func_E0092000); -void func_E00921AC(void){ +void func_E00921AC(void) { } INCLUDE_ASM(s32, "code_391D30", func_E00921B4); diff --git a/src/code_3928D0.c b/src/code_3928D0.c index d74d300e31..d9c506443d 100644 --- a/src/code_3928D0.c +++ b/src/code_3928D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3928D0", func_E0094000); -void func_E0094190(void){ +void func_E0094190(void) { } INCLUDE_ASM(s32, "code_3928D0", func_E0094198); diff --git a/src/code_394280.c b/src/code_394280.c index 8b34dfee0f..d2e592cf52 100644 --- a/src/code_394280.c +++ b/src/code_394280.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_394280", func_E0096000); -void func_E00960EC(void){ +void func_E00960EC(void) { } INCLUDE_ASM(s32, "code_394280", func_E00960F4); diff --git a/src/code_395BB0.c b/src/code_395BB0.c index 8c955f918f..e23e7a1a57 100644 --- a/src/code_395BB0.c +++ b/src/code_395BB0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_395BB0", func_E0098000); -void func_E0098168(void){ +void func_E0098168(void) { } INCLUDE_ASM(s32, "code_395BB0", func_E0098170); diff --git a/src/code_3965B0.c b/src/code_3965B0.c index 91d8d2cd6a..9987fdba67 100644 --- a/src/code_3965B0.c +++ b/src/code_3965B0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3965B0", func_E009A000); -void func_E009A138(void){ +void func_E009A138(void) { } INCLUDE_ASM(s32, "code_3965B0", func_E009A140); diff --git a/src/code_3981F0.c b/src/code_3981F0.c index 2dbf608fc1..54295c1c03 100644 --- a/src/code_3981F0.c +++ b/src/code_3981F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3981F0", func_E009C000); -void func_E009C100(void){ +void func_E009C100(void) { } INCLUDE_ASM(s32, "code_3981F0", func_E009C108); diff --git a/src/code_39FF20.c b/src/code_39FF20.c index 86cc347723..38ac9b97d5 100644 --- a/src/code_39FF20.c +++ b/src/code_39FF20.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_39FF20", func_E009E000); -void func_E009E1DC(void){ +void func_E009E1DC(void) { } INCLUDE_ASM(s32, "code_39FF20", func_E009E1E4); diff --git a/src/code_3A2990.c b/src/code_3A2990.c index e08c1bec90..c1fd1b6bb0 100644 --- a/src/code_3A2990.c +++ b/src/code_3A2990.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3A2990", func_E00A2000); -void func_E00A2118(void){ +void func_E00A2118(void) { } INCLUDE_ASM(s32, "code_3A2990", func_E00A2120); INCLUDE_ASM(s32, "code_3A2990", func_E00A21EC); -void func_E00A2234(void){ +void func_E00A2234(void) { } INCLUDE_ASM(s32, "code_3A2990", func_E00A223C); diff --git a/src/code_3A37E0.c b/src/code_3A37E0.c index 24224cd98d..1c20c558b2 100644 --- a/src/code_3A37E0.c +++ b/src/code_3A37E0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3A37E0", func_E00A4000); -void func_E00A41A4(void){ +void func_E00A41A4(void) { } INCLUDE_ASM(s32, "code_3A37E0", func_E00A41AC); INCLUDE_ASM(s32, "code_3A37E0", func_E00A45DC); -void func_E00A4648(void){ +void func_E00A4648(void) { } INCLUDE_ASM(s32, "code_3A37E0", func_E00A4650); diff --git a/src/code_3A5550.c b/src/code_3A5550.c index 6a3ca789e0..8dbcb247b5 100644 --- a/src/code_3A5550.c +++ b/src/code_3A5550.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3A5550", func_E00A6000); -void func_E00A611C(void){ +void func_E00A611C(void) { } INCLUDE_ASM(s32, "code_3A5550", func_E00A6124); INCLUDE_ASM(s32, "code_3A5550", func_E00A6358); -void func_E00A639C(void){ +void func_E00A639C(void) { } INCLUDE_ASM(s32, "code_3A5550", func_E00A63A4); diff --git a/src/code_3A70F0.c b/src/code_3A70F0.c index 68d7253377..e90bfb53f9 100644 --- a/src/code_3A70F0.c +++ b/src/code_3A70F0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3A70F0", func_E00A8000); -void func_E00A80FC(void){ +void func_E00A80FC(void) { } INCLUDE_ASM(s32, "code_3A70F0", func_E00A8104); INCLUDE_ASM(s32, "code_3A70F0", func_E00A82D4); -void func_E00A8318(void){ +void func_E00A8318(void) { } INCLUDE_ASM(s32, "code_3A70F0", func_E00A8320); diff --git a/src/code_3AA920.c b/src/code_3AA920.c index a47a31cd5e..457f85631f 100644 --- a/src/code_3AA920.c +++ b/src/code_3AA920.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3AA920", func_E00AA000); -void func_E00AA104(void){ +void func_E00AA104(void) { } INCLUDE_ASM(s32, "code_3AA920", func_E00AA10C); diff --git a/src/code_3AEE20.c b/src/code_3AEE20.c index 4c29634ff7..331f47d1e4 100644 --- a/src/code_3AEE20.c +++ b/src/code_3AEE20.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_3AEE20", func_E00AC000); -void func_E00AC11C(void){ +void func_E00AC11C(void) { } INCLUDE_ASM(s32, "code_3AEE20", func_E00AC124); -void func_E00AC280(void){ +void func_E00AC280(void) { } INCLUDE_ASM(s32, "code_3AEE20", func_E00AC288); diff --git a/src/code_3B2350.c b/src/code_3B2350.c index a44a6179ec..c27c42b165 100644 --- a/src/code_3B2350.c +++ b/src/code_3B2350.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B2350", func_E00AE000); -void func_E00AE1AC(void){ +void func_E00AE1AC(void) { } INCLUDE_ASM(s32, "code_3B2350", func_E00AE1B4); INCLUDE_ASM(s32, "code_3B2350", func_E00AE4FC); -void func_E00AE544(void){ +void func_E00AE544(void) { } INCLUDE_ASM(s32, "code_3B2350", func_E00AE54C); diff --git a/src/code_3B3EB0.c b/src/code_3B3EB0.c index e1d6c5cabe..ef7cd508d4 100644 --- a/src/code_3B3EB0.c +++ b/src/code_3B3EB0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3B3EB0", func_E00B0000); -void func_E00B011C(void){ +void func_E00B011C(void) { } INCLUDE_ASM(s32, "code_3B3EB0", func_E00B0124); diff --git a/src/code_3B4790.c b/src/code_3B4790.c index 0e42f30e4d..4ff72ebfaa 100644 --- a/src/code_3B4790.c +++ b/src/code_3B4790.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B4790", func_E00B2000); -void func_E00B21DC(void){ +void func_E00B21DC(void) { } INCLUDE_ASM(s32, "code_3B4790", func_E00B21E4); INCLUDE_ASM(s32, "code_3B4790", func_E00B2460); -void func_E00B24A8(void){ +void func_E00B24A8(void) { } INCLUDE_ASM(s32, "code_3B4790", func_E00B24B0); diff --git a/src/code_3B5CF0.c b/src/code_3B5CF0.c index 72b5594810..8efc896914 100644 --- a/src/code_3B5CF0.c +++ b/src/code_3B5CF0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B5CF0", func_E00B4000); -void func_E00B4134(void){ +void func_E00B4134(void) { } INCLUDE_ASM(s32, "code_3B5CF0", func_E00B413C); INCLUDE_ASM(s32, "code_3B5CF0", func_E00B452C); -void func_E00B4574(void){ +void func_E00B4574(void) { } INCLUDE_ASM(s32, "code_3B5CF0", func_E00B457C); diff --git a/src/code_3B7160.c b/src/code_3B7160.c index aaea708525..e4b5099875 100644 --- a/src/code_3B7160.c +++ b/src/code_3B7160.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B7160", func_E00B6000); -void func_E00B6178(void){ +void func_E00B6178(void) { } INCLUDE_ASM(s32, "code_3B7160", func_E00B6180); INCLUDE_ASM(s32, "code_3B7160", func_E00B629C); -void func_E00B62D8(void){ +void func_E00B62D8(void) { } INCLUDE_ASM(s32, "code_3B7160", func_E00B62E0); diff --git a/src/code_3B7B80.c b/src/code_3B7B80.c index c516bfeb21..fd74a1e60c 100644 --- a/src/code_3B7B80.c +++ b/src/code_3B7B80.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B7B80", func_E00B8000); -void func_E00B812C(void){ +void func_E00B812C(void) { } INCLUDE_ASM(s32, "code_3B7B80", func_E00B8134); INCLUDE_ASM(s32, "code_3B7B80", func_E00B81B8); -void func_E00B8200(void){ +void func_E00B8200(void) { } INCLUDE_ASM(s32, "code_3B7B80", func_E00B8208); diff --git a/src/code_3B8BD0.c b/src/code_3B8BD0.c index 7a839c87fe..e7e9592c85 100644 --- a/src/code_3B8BD0.c +++ b/src/code_3B8BD0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA000); -void func_E00BA16C(void){ +void func_E00BA16C(void) { } INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA174); INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA5DC); -void func_E00BA618(void){ +void func_E00BA618(void) { } INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA620); diff --git a/src/code_3BA030.c b/src/code_3BA030.c index 8878e30371..fcaa167d42 100644 --- a/src/code_3BA030.c +++ b/src/code_3BA030.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3BA030", func_E00BC000); -void func_E00BC1D0(void){ +void func_E00BC1D0(void) { } INCLUDE_ASM(s32, "code_3BA030", func_E00BC1D8); @@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "code_3BA030", func_E00BC238); INCLUDE_ASM(s32, "code_3BA030", func_E00BC2E8); -void func_E00BC36C(void){ +void func_E00BC36C(void) { } INCLUDE_ASM(s32, "code_3BA030", func_E00BC374); diff --git a/src/code_3BBF60.c b/src/code_3BBF60.c index 8fba662a09..f7401c8ce4 100644 --- a/src/code_3BBF60.c +++ b/src/code_3BBF60.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3BBF60", func_E00BE000); -void func_E00BE39C(void){ +void func_E00BE39C(void) { } INCLUDE_ASM(s32, "code_3BBF60", func_E00BE3A4); INCLUDE_ASM(s32, "code_3BBF60", func_E00BE578); -void func_E00BE5B4(void){ +void func_E00BE5B4(void) { } INCLUDE_ASM(s32, "code_3BBF60", func_E00BE5BC); diff --git a/src/code_3BCD60.c b/src/code_3BCD60.c index d2932c3fec..126a90a8f2 100644 --- a/src/code_3BCD60.c +++ b/src/code_3BCD60.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3BCD60", func_E00C0000); -void func_E00C0158(void){ +void func_E00C0158(void) { } INCLUDE_ASM(s32, "code_3BCD60", func_E00C0160); INCLUDE_ASM(s32, "code_3BCD60", func_E00C0710); -void func_E00C0758(void){ +void func_E00C0758(void) { } INCLUDE_ASM(s32, "code_3BCD60", func_E00C0760); diff --git a/src/code_3C11D0.c b/src/code_3C11D0.c index a5d8e143ee..105c448ced 100644 --- a/src/code_3C11D0.c +++ b/src/code_3C11D0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3C11D0", func_E00C2000); -void func_E00C2124(void){ +void func_E00C2124(void) { } INCLUDE_ASM(s32, "code_3C11D0", func_E00C212C); INCLUDE_ASM(s32, "code_3C11D0", func_E00C21CC); -void func_E00C2214(void){ +void func_E00C2214(void) { } INCLUDE_ASM(s32, "code_3C11D0", func_E00C221C); diff --git a/src/code_3CADF0.c b/src/code_3CADF0.c index caaf66de6a..c51e4cfa09 100644 --- a/src/code_3CADF0.c +++ b/src/code_3CADF0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3CADF0", func_E00C4000); -void func_E00C4170(void){ +void func_E00C4170(void) { } INCLUDE_ASM(s32, "code_3CADF0", func_E00C4178); INCLUDE_ASM(s32, "code_3CADF0", func_E00C42C4); -void func_E00C4300(void){ +void func_E00C4300(void) { } INCLUDE_ASM(s32, "code_3CADF0", func_E00C4308); diff --git a/src/code_3CC9E0.c b/src/code_3CC9E0.c index 533b5ce1fc..f0c212ef72 100644 --- a/src/code_3CC9E0.c +++ b/src/code_3CC9E0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3CC9E0", func_E00C6000); -void func_E00C6394(void){ +void func_E00C6394(void) { } INCLUDE_ASM(s32, "code_3CC9E0", func_E00C639C); diff --git a/src/code_3CF3A0.c b/src/code_3CF3A0.c index f6b22adbc2..51bfd88df3 100644 --- a/src/code_3CF3A0.c +++ b/src/code_3CF3A0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8000); -void func_E00C8218(void){ +void func_E00C8218(void) { } INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8220); INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8404); -void func_E00C844C(void){ +void func_E00C844C(void) { } INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8454); diff --git a/src/code_3D0500.c b/src/code_3D0500.c index 20887d61ec..3e7f6267a4 100644 --- a/src/code_3D0500.c +++ b/src/code_3D0500.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3D0500", func_E00CA000); -void func_E00CA240(void){ +void func_E00CA240(void) { } INCLUDE_ASM(s32, "code_3D0500", func_E00CA248); diff --git a/src/code_3D1690.c b/src/code_3D1690.c index 49aa91083b..e6c0129190 100644 --- a/src/code_3D1690.c +++ b/src/code_3D1690.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D1690", func_E00CC000); -void func_E00CC250(void){ +void func_E00CC250(void) { } INCLUDE_ASM(s32, "code_3D1690", func_E00CC258); INCLUDE_ASM(s32, "code_3D1690", func_E00CC980); -void func_E00CC9C8(void){ +void func_E00CC9C8(void) { } INCLUDE_ASM(s32, "code_3D1690", func_E00CC9D0); diff --git a/src/code_3D2AC0.c b/src/code_3D2AC0.c index fe8e35afd6..61d57a5441 100644 --- a/src/code_3D2AC0.c +++ b/src/code_3D2AC0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE000); -void func_E00CE21C(void){ +void func_E00CE21C(void) { } INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE224); INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE428); -void func_E00CE470(void){ +void func_E00CE470(void) { } INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE478); diff --git a/src/code_3D3E20.c b/src/code_3D3E20.c index 2c5ea58f8e..877a4f4037 100644 --- a/src/code_3D3E20.c +++ b/src/code_3D3E20.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3D3E20", func_E00D0000); -void func_E00D018C(void){ +void func_E00D018C(void) { } INCLUDE_ASM(s32, "code_3D3E20", func_E00D0194); diff --git a/src/code_3D4970.c b/src/code_3D4970.c index bbba58298f..0dd44de42b 100644 --- a/src/code_3D4970.c +++ b/src/code_3D4970.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D4970", func_E00D2000); -void func_E00D2118(void){ +void func_E00D2118(void) { } INCLUDE_ASM(s32, "code_3D4970", func_E00D2120); INCLUDE_ASM(s32, "code_3D4970", func_E00D2234); -void func_E00D227C(void){ +void func_E00D227C(void) { } INCLUDE_ASM(s32, "code_3D4970", func_E00D2284); diff --git a/src/code_3D5020.c b/src/code_3D5020.c index 334a39036e..e148664429 100644 --- a/src/code_3D5020.c +++ b/src/code_3D5020.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D5020", func_E00D6000); -void func_E00D6718(void){ +void func_E00D6718(void) { } INCLUDE_ASM(s32, "code_3D5020", func_E00D6720); INCLUDE_ASM(s32, "code_3D5020", func_E00D693C); -void func_E00D6978(void){ +void func_E00D6978(void) { } INCLUDE_ASM(s32, "code_3D5020", func_E00D6980); diff --git a/src/code_3D67C0.c b/src/code_3D67C0.c index f8af30d959..98566e1720 100644 --- a/src/code_3D67C0.c +++ b/src/code_3D67C0.c @@ -2,17 +2,17 @@ INCLUDE_ASM(s32, "code_3D67C0", func_E00D8000); -void func_E00D8120(void){ +void func_E00D8120(void) { } INCLUDE_ASM(s32, "code_3D67C0", func_E00D8128); -void func_E00D825C(void){ +void func_E00D825C(void) { } INCLUDE_ASM(s32, "code_3D67C0", func_E00D8264); -void func_E00D8280(void){ +void func_E00D8280(void) { } void func_E00D8288(s32 l, s32 r, s32 t, s32 b) { diff --git a/src/code_3D7240.c b/src/code_3D7240.c index 8de0f72f51..c6abaf2792 100644 --- a/src/code_3D7240.c +++ b/src/code_3D7240.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D7240", func_E00DA000); -void func_E00DA0FC(void){ +void func_E00DA0FC(void) { } INCLUDE_ASM(s32, "code_3D7240", func_E00DA104); INCLUDE_ASM(s32, "code_3D7240", func_E00DA1E0); -void func_E00DA228(void){ +void func_E00DA228(void) { } INCLUDE_ASM(s32, "code_3D7240", func_E00DA230); diff --git a/src/code_3D7A70.c b/src/code_3D7A70.c index 9d2657d7ad..d3299fe00d 100644 --- a/src/code_3D7A70.c +++ b/src/code_3D7A70.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3D7A70", func_E00DC000); -void func_E00DC190(void){ +void func_E00DC190(void) { } INCLUDE_ASM(s32, "code_3D7A70", func_E00DC198); INCLUDE_ASM(s32, "code_3D7A70", func_E00DC2C0); -void func_E00DC2FC(void){ +void func_E00DC2FC(void) { } INCLUDE_ASM(s32, "code_3D7A70", func_E00DC304); diff --git a/src/code_3D8720.c b/src/code_3D8720.c index a97346a18f..837bf15c37 100644 --- a/src/code_3D8720.c +++ b/src/code_3D8720.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3D8720", func_E00DE000); -void func_E00DE11C(void){ +void func_E00DE11C(void) { } INCLUDE_ASM(s32, "code_3D8720", func_E00DE124); diff --git a/src/code_3DB460.c b/src/code_3DB460.c index 11d809d89a..85421c159a 100644 --- a/src/code_3DB460.c +++ b/src/code_3DB460.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3DB460", func_E00E0000); -void func_E00E01D0(void){ +void func_E00E01D0(void) { } INCLUDE_ASM(s32, "code_3DB460", func_E00E01D8); INCLUDE_ASM(s32, "code_3DB460", func_E00E05B0); -void func_E00E05F8(void){ +void func_E00E05F8(void) { } INCLUDE_ASM(s32, "code_3DB460", func_E00E0600); diff --git a/src/code_3DC310.c b/src/code_3DC310.c index 0b253ff69d..e0049bd390 100644 --- a/src/code_3DC310.c +++ b/src/code_3DC310.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3DC310", func_E00E2000); -void func_E00E212C(void){ +void func_E00E212C(void) { } INCLUDE_ASM(s32, "code_3DC310", func_E00E2134); INCLUDE_ASM(s32, "code_3DC310", func_E00E21C8); -void func_E00E2210(void){ +void func_E00E2210(void) { } INCLUDE_ASM(s32, "code_3DC310", func_E00E2218); diff --git a/src/code_3DE000.c b/src/code_3DE000.c index bc6b3d7335..d0e30e34d4 100644 --- a/src/code_3DE000.c +++ b/src/code_3DE000.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3DE000", func_E00E4000); -void func_E00E4288(void){ +void func_E00E4288(void) { } INCLUDE_ASM(s32, "code_3DE000", func_E00E4290); INCLUDE_ASM(s32, "code_3DE000", func_E00E490C); -void func_E00E4954(void){ +void func_E00E4954(void) { } INCLUDE_ASM(s32, "code_3DE000", func_E00E495C); diff --git a/src/code_3E0930.c b/src/code_3E0930.c index 288234a89f..47d289863f 100644 --- a/src/code_3E0930.c +++ b/src/code_3E0930.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3E0930", func_E00E6000); -void func_E00E617C(void){ +void func_E00E617C(void) { } INCLUDE_ASM(s32, "code_3E0930", func_E00E6184); INCLUDE_ASM(s32, "code_3E0930", func_E00E64D4); -void func_E00E651C(void){ +void func_E00E651C(void) { } INCLUDE_ASM(s32, "code_3E0930", func_E00E6524); diff --git a/src/code_3E1690.c b/src/code_3E1690.c index dab09a9654..1346ddb4b1 100644 --- a/src/code_3E1690.c +++ b/src/code_3E1690.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3E1690", func_E00E8000); -void func_E00E825C(void){ +void func_E00E825C(void) { } INCLUDE_ASM(s32, "code_3E1690", func_E00E8264); diff --git a/src/code_3E1EE0.c b/src/code_3E1EE0.c index 4b4371f185..a01d166f8f 100644 --- a/src/code_3E1EE0.c +++ b/src/code_3E1EE0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA000); -void func_E00EA190(void){ +void func_E00EA190(void) { } INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA198); INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA520); -void func_E00EA664(void){ +void func_E00EA664(void) { } INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA66C); diff --git a/src/code_3E43A0.c b/src/code_3E43A0.c index d2da9528b1..07e124a2f9 100644 --- a/src/code_3E43A0.c +++ b/src/code_3E43A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3E43A0", func_E010A000); -void func_E010A184(void){ +void func_E010A184(void) { } INCLUDE_ASM(s32, "code_3E43A0", func_E010A18C); diff --git a/src/code_3E54C0.c b/src/code_3E54C0.c index ab4402f96f..18b4e6159d 100644 --- a/src/code_3E54C0.c +++ b/src/code_3E54C0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3E54C0", func_E010C000); -void func_E010C190(void){ +void func_E010C190(void) { } INCLUDE_ASM(s32, "code_3E54C0", func_E010C198); diff --git a/src/code_3EB4E0.c b/src/code_3EB4E0.c index 8251e919d2..0cefd02a9d 100644 --- a/src/code_3EB4E0.c +++ b/src/code_3EB4E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "code_3EB4E0", func_E010E000); INCLUDE_ASM(s32, "code_3EB4E0", func_E010E32C); -void func_E010E4A0(void){ +void func_E010E4A0(void) { } INCLUDE_ASM(s32, "code_3EB4E0", func_E010E4A8); diff --git a/src/code_3F83F0.c b/src/code_3F83F0.c index 5486b84adc..1b1e7a0bc5 100644 --- a/src/code_3F83F0.c +++ b/src/code_3F83F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3F83F0", func_E0110000); -void func_E0110224(void){ +void func_E0110224(void) { } INCLUDE_ASM(s32, "code_3F83F0", func_E011022C); diff --git a/src/code_3F9E50.c b/src/code_3F9E50.c index 71129a1a46..b3b240aebc 100644 --- a/src/code_3F9E50.c +++ b/src/code_3F9E50.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3F9E50", func_E0112000); -void func_E01121B8(void){ +void func_E01121B8(void) { } INCLUDE_ASM(s32, "code_3F9E50", func_E01121C0); diff --git a/src/code_3FEAE0.c b/src/code_3FEAE0.c index 69c0622e92..5403311b35 100644 --- a/src/code_3FEAE0.c +++ b/src/code_3FEAE0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_3FEAE0", func_E0114000); -void func_E01140D4(void){ +void func_E01140D4(void) { } INCLUDE_ASM(s32, "code_3FEAE0", func_E01140DC); diff --git a/src/code_402640.c b/src/code_402640.c index 334f9324af..1f52ef2db9 100644 --- a/src/code_402640.c +++ b/src/code_402640.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_402640", func_E0116000); -void func_E0116184(void){ +void func_E0116184(void) { } INCLUDE_ASM(s32, "code_402640", func_E011618C); diff --git a/src/code_403400.c b/src/code_403400.c index dd878703ac..93e77bbaf7 100644 --- a/src/code_403400.c +++ b/src/code_403400.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_403400", func_E0118000); -void func_E01182EC(void){ +void func_E01182EC(void) { } INCLUDE_ASM(s32, "code_403400", func_E01182F4); diff --git a/src/code_404220.c b/src/code_404220.c index 028ca87976..7bd1ca4983 100644 --- a/src/code_404220.c +++ b/src/code_404220.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "code_404220", func_E011A000); -void func_E011A0FC(void){ +void func_E011A0FC(void) { } INCLUDE_ASM(s32, "code_404220", func_E011A104); -void func_E011A398(void){ +void func_E011A398(void) { } INCLUDE_ASM(s32, "code_404220", func_E011A3A0); diff --git a/src/code_406B40.c b/src/code_406B40.c index 4922c4f716..6d8fa48328 100644 --- a/src/code_406B40.c +++ b/src/code_406B40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_406B40", func_E011C000); -void func_E011C0F4(void){ +void func_E011C0F4(void) { } INCLUDE_ASM(s32, "code_406B40", func_E011C0FC); diff --git a/src/code_409990.c b/src/code_409990.c index 53150629a6..366dc8e783 100644 --- a/src/code_409990.c +++ b/src/code_409990.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_409990", func_E011E000); -void func_E011E18C(void){ +void func_E011E18C(void) { } INCLUDE_ASM(s32, "code_409990", func_E011E194); diff --git a/src/code_40B3F0.c b/src/code_40B3F0.c index 29cdaae3bc..58bbc7b6b5 100644 --- a/src/code_40B3F0.c +++ b/src/code_40B3F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_40B3F0", func_E0120000); -void func_E0120134(void){ +void func_E0120134(void) { } INCLUDE_ASM(s32, "code_40B3F0", func_E012013C); diff --git a/src/code_40C5A0.c b/src/code_40C5A0.c index 5f9a9bbff1..43ca3d21a1 100644 --- a/src/code_40C5A0.c +++ b/src/code_40C5A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_40C5A0", func_E0122000); -void func_E0122174(void){ +void func_E0122174(void) { } INCLUDE_ASM(s32, "code_40C5A0", func_E012217C); diff --git a/src/code_412730.c b/src/code_412730.c index 3b4d256085..56b3de6439 100644 --- a/src/code_412730.c +++ b/src/code_412730.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_412730", func_E0124000); -void func_E01242FC(void){ +void func_E01242FC(void) { } INCLUDE_ASM(s32, "code_412730", func_E0124304); diff --git a/src/code_413360.c b/src/code_413360.c index c4f1b9ce3c..5e3cbd16da 100644 --- a/src/code_413360.c +++ b/src/code_413360.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_413360", func_E0126000); -void func_E012612C(void){ +void func_E012612C(void) { } INCLUDE_ASM(s32, "code_413360", func_E0126134); diff --git a/src/code_414BA0.c b/src/code_414BA0.c index 8d964c1e93..ef3d240873 100644 --- a/src/code_414BA0.c +++ b/src/code_414BA0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_414BA0", func_E0128000); -void func_E0128128(void){ +void func_E0128128(void) { } INCLUDE_ASM(s32, "code_414BA0", func_E0128130); diff --git a/src/code_415D90.c b/src/code_415D90.c index a7c1c19785..728f7ca8cf 100644 --- a/src/code_415D90.c +++ b/src/code_415D90.c @@ -90,8 +90,8 @@ INCLUDE_ASM(s32, "code_415D90", update_targeting_enemies); INCLUDE_ASM(s32, "code_415D90", func_802AACD8); -void func_802AB330(void){ +void func_802AB330(void) { } -void func_802AB338(void){ +void func_802AB338(void) { } diff --git a/src/code_43F0.c b/src/code_43F0.c index d04813c8be..dea930173c 100644 --- a/src/code_43F0.c +++ b/src/code_43F0.c @@ -269,8 +269,7 @@ f32 clamp_angle(f32 theta) { if (thetaInt >= 0) { thetaInt = -(thetaInt / 360 * 360) + thetaInt; - } - else { + } else { thetaInt = -thetaInt; thetaInt = (thetaInt / 360 * 360) - thetaInt; } @@ -384,7 +383,8 @@ f32 cos_deg(f32 angle) { INCLUDE_ASM(f32, "code_43F0", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); //void func_8002A904(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); -INCLUDE_ASM(void, "code_43F0", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); +INCLUDE_ASM(void, "code_43F0", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, + u16 arg7); INCLUDE_ASM(s32, "code_43F0", func_8002AAC4); // void func_8002AAC4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7) { diff --git a/src/code_4DF30.c b/src/code_4DF30.c index 48559e616e..8533fd5ee8 100644 --- a/src/code_4DF30.c +++ b/src/code_4DF30.c @@ -48,7 +48,7 @@ void func_80072CDC(s32 arg0) { gBattleStatus.unk_484 = arg0; } -void func_80072CEC(f32 arg0, f32 arg1, f32 arg2){ +void func_80072CEC(f32 arg0, f32 arg1, f32 arg2) { } void func_80072CF4(void) { diff --git a/src/code_4ac90_len_3910.c b/src/code_4ac90_len_3910.c index 188af13685..eb8cade318 100644 --- a/src/code_4ac90_len_3910.c +++ b/src/code_4ac90_len_3910.c @@ -32,7 +32,8 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FD70); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FDD0); -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FE30); +INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006FE30, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + f32 arg6, f32 arg7); INCLUDE_ASM(void, "code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32* arg8); @@ -113,7 +114,7 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C10); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C70); -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070CD0); +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070CD0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070D30); @@ -131,7 +132,7 @@ INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070F70); INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070FD0); -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071030); +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071030, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); diff --git a/src/code_77480.c b/src/code_77480.c index 63af7e9e1a..547049718e 100644 --- a/src/code_77480.c +++ b/src/code_77480.c @@ -18,11 +18,13 @@ INCLUDE_ASM(s32, "code_77480", collision_check_above); INCLUDE_ASM(s32, "code_77480", trace_above_player); -INCLUDE_ASM(s32, "code_77480", do_lateral_collision, s32 arg0, PlayerStatus* arg1, f32* arg2, f32* arg3, f32* arg4, f32 arg5, f32 arg6); +INCLUDE_ASM(s32, "code_77480", do_lateral_collision, s32 arg0, PlayerStatus* arg1, f32* arg2, f32* arg3, f32* arg4, + f32 arg5, f32 arg6); INCLUDE_ASM(s32, "code_77480", func_800DEE5C); -INCLUDE_ASM(s32, "code_77480", func_800DF15C, PlayerStatus* arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4, f32 arg5, s32* arg6); +INCLUDE_ASM(s32, "code_77480", func_800DF15C, PlayerStatus* arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4, f32 arg5, + s32* arg6); void func_800DF3FC(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { f32 temp = (arg2 * arg4) + (arg3 * arg5); @@ -151,7 +153,8 @@ void func_800DFAAC(void) { func_800E4F10(); } - if ((playerStatus->actionState != ActionState_ENEMY_FIRST_STRIKE) && (playerStatus->actionState != ActionState_STEP_UP)) { + if ((playerStatus->actionState != ActionState_ENEMY_FIRST_STRIKE) + && (playerStatus->actionState != ActionState_STEP_UP)) { func_800E4744(); } } @@ -204,8 +207,7 @@ void func_800DFC74(void) { s32 func_800DFCF4(void) { if (D_8010EBB0.unk_00 == 1 && (D_8010EBB0.unk_03 == 6 || D_8010EBB0.unk_03 == 9 || D_8010EBB0.unk_03 == 7 || D_8010EBB0.unk_03 == 4 || - D_8010EBB0.unk_03 == 8)) - { + D_8010EBB0.unk_03 == 8)) { return 0; } return 1; diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c index c8aacda58d..270c2b5d47 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/code_7bb60_len_41b0.c @@ -23,8 +23,7 @@ s32 func_800E26C4(void) { actionState == ActionState_WALK || actionState == ActionState_RUN || actionState == ActionState_USE_TWEESTER || - actionState == ActionState_SPIN) - { + actionState == ActionState_SPIN) { return 1; } @@ -164,7 +163,7 @@ s32 collision_check_player_intersecting_world(s32 arg0, s32 arg1, f32 arg2) { return ret; } #else -INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_check_player_intersecting_world,s32 arg0, s32 arg1, f32 arg2); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_check_player_intersecting_world, s32 arg0, s32 arg1, f32 arg2); #endif s32 func_800E4404(s32 arg0, s32 arg1, f32 arg2, f32* outX, f32* outY, f32* outZ) { @@ -256,8 +255,7 @@ void check_input_midair_jump(void) { !(gPlayerStatus.animFlags & 0x4001) && gPlayerStatus.unk_C2 >= 6 && gPlayerStatus.decorationList < 0x12 && - gPlayerStatus.pressedButtons & A_BUTTON) - { + gPlayerStatus.pressedButtons & A_BUTTON) { switch (gPlayerData.bootsLevel) { case 0: break; @@ -500,8 +498,7 @@ void check_input_spin(void) { (actionState < 0x22) && (actionState < 3) && (actionState >= 0) && - !(playerStatus->animFlags & 0x10000)) - { + !(playerStatus->animFlags & 0x10000)) { set_action_state(ActionState_SPIN); if (temp_8010F250->unk_01 != 0) { if (temp_8010F250->unk_08 == 0) { diff --git a/src/code_CEE40.c b/src/code_CEE40.c index a3f368e27d..338483515a 100644 --- a/src/code_CEE40.c +++ b/src/code_CEE40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_CEE40", func_80138740); -INCLUDE_ASM(s32, "code_CEE40", func_80138D88); +INCLUDE_ASM(void, "code_CEE40", func_80138D88, s32 param0, s32 param1, s32 param2, s32 param3, f32 param4); INCLUDE_ASM(s32, "code_CEE40", func_80138E54); diff --git a/src/code_DF950.c b/src/code_DF950.c index d666f0e512..1874e20f49 100644 --- a/src/code_DF950.c +++ b/src/code_DF950.c @@ -13,7 +13,8 @@ s32 D_8014F2D0[] = { 0x00000287, 0x000002A8, 0x00000054, 0x00000056, 0x00000024, 0x00000197, 0x00000221, 0x0000022A, 0x0000022B, 0x00002040, 0x00000046, 0x00000033, 0x00000034, 0x00000039, 0x0000004C, 0x0000004D, 0x000001B1, 0x000001B2, 0x00000094, 0x0000005D, 0x0000005B, 0x00000060, 0x000001B3, 0x00000000, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000023D, 0x000000A2, - 0x00000248, 0x00000249, 0x00000391, 0x000003BC, 0x000003AD, 0x0000022C, 0x0000022D, }; + 0x00000248, 0x00000249, 0x00000391, 0x000003BC, 0x000003AD, 0x0000022C, 0x0000022D, + }; s32 D_8014F48C[] = { 0x00000336, 0x00000316 }; s32 D_8014F494[] = { 0x00000337, 0x00000317 }; @@ -58,10 +59,12 @@ s32 D_8014F5A4[] = { &D_8014F48C, 0x00020000, &D_8014F494, 0x00020000, &D_8014F4 &D_8014F52C, 0x00030000, &D_8014F538, 0x00020000, &D_8014F540, 0x00020000, &D_8014F548, 0x00030000, &D_8014F554, 0x00020000, &D_8014F55C, 0x00020000, &D_8014F564, 0x00020000, &D_8014F56C, 0x00020000, &D_8014F574, 0x00020000, &D_8014F57C, 0x00020000, &D_8014F584, 0x00020000, &D_8014F58C, 0x00020000, - &D_8014F594, 0x00020000, &D_8014F59C, 0x00020000, }; + &D_8014F594, 0x00020000, &D_8014F59C, 0x00020000, + }; s32 D_8014F6B4[] = { 0x000001C1, 0x000001C2, 0x000001C3, 0x000001C4, 0x000001C5, 0x000001C6, 0x000001C7, 0x000001C8, - 0x000001C9, 0x000001CA, 0x000001CB, 0x000001CC, 0x000020A3, 0x000020A4, 0x00000000, }; + 0x000001C9, 0x000001CA, 0x000001CB, 0x000001CC, 0x000020A3, 0x000020A4, 0x00000000, + }; extern s32 D_80159AD4; diff --git a/src/code_E2EDE0.c b/src/code_E2EDE0.c index 6c289bae9b..2e95945048 100644 --- a/src/code_E2EDE0.c +++ b/src/code_E2EDE0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "code_E2EDE0", func_802BC4B0_E2EDE0); -void func_802BC628_E2EF58(){ +void func_802BC628_E2EF58() { } INCLUDE_ASM(s32, "code_E2EDE0", func_802BC630_E2EF60); diff --git a/src/code_F5750.c b/src/code_F5750.c index 3de7b505a8..dda9b49011 100644 --- a/src/code_F5750.c +++ b/src/code_F5750.c @@ -427,7 +427,7 @@ ApiStatus func_802D2C14(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D2C40(ScriptInstance *script) { +ApiStatus func_802D2C40(ScriptInstance* script) { Bytecode* args = script->ptrReadPos; f32 x = get_variable(script, *args++); PlayerStatus* playerStatus = &gPlayerStatus; @@ -570,7 +570,8 @@ UnkF5750* func_802D4164(s32 index) { INCLUDE_ASM(s32, "code_F5750", func_802D417C); -INCLUDE_ASM(s32, "code_F5750", func_802D420C); +void func_802D420C(UnkF5750* arg0); +INCLUDE_ASM(void, "code_F5750", func_802D420C, UnkF5750* arg0); INCLUDE_ASM(s32, "code_F5750", func_802D42AC); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index be705dda79..e83a11e07c 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -112,7 +112,7 @@ void init_dynamic_entity_list(void) { INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_3); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_7, s32* updateFunc, s32* drawFunc); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_7, s32* updateFunc, void (*drawFunc)(void)); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_B); diff --git a/src/code_d5a50_len_5fd0.c b/src/code_d5a50_len_5fd0.c index bed8f8ce65..881f2733d0 100644 --- a/src/code_d5a50_len_5fd0.c +++ b/src/code_d5a50_len_5fd0.c @@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "code_d5a50_len_5fd0", init_menu_icon_list); INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801413F8); -INCLUDE_ASM(s32*, "code_d5a50_len_5fd0", create_icon, s32 iconIndex); +INCLUDE_ASM(MenuIcon*, "code_d5a50_len_5fd0", create_icon, s32* iconIndex); INCLUDE_ASM(s32, "code_d5a50_len_5fd0", update_menu_icons); @@ -67,9 +67,9 @@ INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon_script); INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon); -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", free_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", free_icon, MenuIcon* iconIndex); -INCLUDE_ASM(void, "code_d5a50_len_5fd0", set_icon_render_pos, s32 iconIndex, s32 posX, s32 posY); +INCLUDE_ASM(void, "code_d5a50_len_5fd0", set_icon_render_pos, MenuIcon* iconIndex, s32 posX, s32 posY); INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_icon_render_pos); diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index 532071f997..c5668f1025 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -7,11 +7,13 @@ s32 D_8014F150[] = { 0x00000003, 0x00000003, 0x0000000B, 0x0000000C, 0x0000000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x0000000B, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, }; + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, + }; s32 D_8014F250[] = { 0x00000800, 0x0000000C, 0x00000004, 0x08000001, 0x00080000, 0x04000864, 0x00040008, 0x00000200, 0x0800B802, 0x000800FF, 0x02000C00, 0xB804000C, 0x64000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, }; + 0x00000000, 0x00000000, + }; s32 D_8014F298[] = { 0x32506469, 0x64000000, }; diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index b2fe96da1a..c84e7aea6b 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -18,7 +18,8 @@ MusicPlayer D_8014F6F0 = { }; SongID gSongsUsingVariationFlag[] = { Song_SPECIAL_BATTLE, Song_TUBBA_BLUBBA_BATTLE, Song_JR_TROOPA_BATTLE, - Song_YOSHI_KIDS_FOUND, Song_ITEM_UPGRADE, Song_NEW_PARTNER, }; + Song_YOSHI_KIDS_FOUND, Song_ITEM_UPGRADE, Song_NEW_PARTNER, + }; s16 D_8014F738 = 0; diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index c96f715cca..4160d7b9f5 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -48,7 +48,6 @@ s16 intro_logos_fade_out(s16 addAlpha) { void intro_logos_update_fade(void) { GameStatus** gameStatus = &gGameStatusPtr; - set_transition_stencil_zoom_0(0, (*gameStatus)->bootAlpha); set_transition_stencil_color(0, (*gameStatus)->bootBlue, (*gameStatus)->bootGreen, (*gameStatus)->bootRed); } diff --git a/src/code_fee30_len_2d60.c b/src/code_fee30_len_2d60.c index 035ebdd963..08fa4b72a5 100644 --- a/src/code_fee30_len_2d60.c +++ b/src/code_fee30_len_2d60.c @@ -1,7 +1,8 @@ #include "common.h" s32 D_802DF390[] = { 0xFFF00038, 0x00000000, 0x00000000, 0xF0F0F0FF, 0x00100038, 0x00000000, 0x04000000, 0x787878FF, - 0x00100000, 0x00000000, 0x04000700, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000700, 0x787878FF, }; + 0x00100000, 0x00000000, 0x04000700, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000700, 0x787878FF, + }; s32 D_802DF3D0[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; diff --git a/src/os/code_4a1f0_len_170.c b/src/os/code_4a1f0_len_170.c index 4325eeb1f3..26493fb8ee 100644 --- a/src/os/code_4a1f0_len_170.c +++ b/src/os/code_4a1f0_len_170.c @@ -2,13 +2,13 @@ INCLUDE_ASM(void, "os/code_4a1f0_len_170", decode_yay0, void* src, void* dest); -void func_8006EF18(){ +void func_8006EF18() { } -void func_8006EF20(){ +void func_8006EF20() { } INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF28); -void func_8006EF58(){ +void func_8006EF58() { } diff --git a/src/os/code_4a360_len_930.c b/src/os/code_4a360_len_930.c index e51497f514..7c3c5c23de 100644 --- a/src/os/code_4a360_len_930.c +++ b/src/os/code_4a360_len_930.c @@ -1,6 +1,6 @@ #include "common.h" -void func_8006EF60(){ +void func_8006EF60() { } INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashInit); diff --git a/src/os/osCreatePiManager.c b/src/os/osCreatePiManager.c index a5144668a3..4514ceb656 100644 --- a/src/os/osCreatePiManager.c +++ b/src/os/osCreatePiManager.c @@ -5,8 +5,9 @@ OSPiHandle* __osPiTable = NULL; extern OSPiHandle CartRomHandle; extern OSPiHandle LeoDiskHandle; -OSPiHandle *__osCurrentHandle[2] = {&CartRomHandle, &LeoDiskHandle}; +OSPiHandle* __osCurrentHandle[2] = {&CartRomHandle, &LeoDiskHandle}; INCLUDE_ASM(void, "os/osCreatePiManager", osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); -INCLUDE_ASM(s32, "os/osCreatePiManager", osEPiRawStartDma, OSPiHandle *arg0, s32 dir, u32 cart_addr, void *dram_addr, u32 size); +INCLUDE_ASM(s32, "os/osCreatePiManager", osEPiRawStartDma, OSPiHandle* arg0, s32 dir, u32 cart_addr, void* dram_addr, + u32 size); diff --git a/src/os/osSetThreadPri.c b/src/os/osSetThreadPri.c index f485d967e1..c587b3eb00 100644 --- a/src/os/osSetThreadPri.c +++ b/src/os/osSetThreadPri.c @@ -2,14 +2,14 @@ #include "common.h" - struct __osThreadTail { +struct __osThreadTail { OSThread* next; OSPri priority; }; struct __osThreadTail __osThreadTail = {0, -1}; -OSThread* __osRunQueue = (OSThread*)&__osThreadTail; -OSThread* __osActiveQueue = (OSThread*)&__osThreadTail; +OSThread* __osRunQueue = (OSThread*) &__osThreadTail; +OSThread* __osActiveQueue = (OSThread*) &__osThreadTail; OSThread* __osRunningThread = NULL; OSThread* __osFaultedThread = NULL; diff --git a/src/world/actions.c b/src/world/actions.c index 6690e5badb..9c754e7e37 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -37,43 +37,43 @@ void* D_800F7C7C[] = { &D_800F7BE8, &D_800F7BE8, &D_800F7BBC, &D_800F7B94 }; s32 D_800F7C8C[] = { // TODO: struct for dma table // TODO: ld addrs - (s32)&func_802B6000_E24920, &code_code_E23260_ROM_START, &code_code_E23260_ROM_END, 0x01000000, - (s32)&func_802B6000_E24920, 0x00E236E0, 0x00E24040, 0x01000000, - (s32)&func_802B6288_E23968, 0x00E236E0, 0x00E24040, 0x01000000, - (s32)&func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x01000000, - (s32)&func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x01000000, - (s32)&func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x00000000, - (s32)&func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x00000000, - (s32)&func_802B6198_E241D8, 0x00E24040, 0x00E245D0, 0x00000000, - (s32)&func_802B6294_E242D4, 0x00E24040, 0x00E245D0, 0x01000000, - (s32)&func_802B6348_E24388, 0x00E24040, 0x00E245D0, 0x01000000, - (s32)&func_802B6000_E24920, 0x00E24920, 0x00E24ED0, 0x01000000, - (s32)&func_802B61C0_E24AE0, 0x00E24920, 0x00E24ED0, 0x01000000, - (s32)&func_802B6638_E29068, 0x00E28A30, 0x00E291A0, 0x01000000, - (s32)&func_802B6000_E24920, 0x00E26DE0, 0x00E27510, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E26DE0, 0x00E27510, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E26710, 0x00E26DE0, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E26710, 0x00E26DE0, 0x00000000, - (s32)&func_802B6060_E27570, 0x00E27510, 0x00E27C90, 0x00000000, - (s32)&func_802B66A8_E25578, 0x00E24ED0, 0x00E25D60, 0x00000000, - (s32)&func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, - (s32)&func_802B6508_E28F38, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E27C90, 0x00E27F40, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E287F0, 0x00E28A30, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E27F40, 0x00E287F0, 0x00000000, - (s32)&func_802B6230_E24800, 0x00E245D0, 0x00E24920, 0x01000000, - (s32)&func_802B6120_E2A7D0, 0x00E2A6B0, 0x00E2B530, 0x01000000, - (s32)&func_802B6000_E24920, 0x00E25D60, 0x00E26710, 0x00000000, - (s32)&func_802B63D4_E28E04, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B6478_E28EA8, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B60A4_E29514, 0x00E29470, 0x00E2A340, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E291A0, 0x00E29470, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E2A340, 0x00E2A6B0, 0x00000000, - (s32)&func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, - (s32)&func_802B6000_E24920, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B6000_E24920, 0x00E245D0, 0x00E24920, 0x01000000, - (s32)&func_802B609C_E28ACC, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x00000000, - (s32)&func_802B6350_E28D80, 0x00E236E0, 0x00E24040, 0x00000000, - (s32)&func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, + (s32) &func_802B6000_E24920, &code_code_E23260_ROM_START, &code_code_E23260_ROM_END, 0x01000000, + (s32) &func_802B6000_E24920, 0x00E236E0, 0x00E24040, 0x01000000, + (s32) &func_802B6288_E23968, 0x00E236E0, 0x00E24040, 0x01000000, + (s32) &func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x01000000, + (s32) &func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x01000000, + (s32) &func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x00000000, + (s32) &func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x00000000, + (s32) &func_802B6198_E241D8, 0x00E24040, 0x00E245D0, 0x00000000, + (s32) &func_802B6294_E242D4, 0x00E24040, 0x00E245D0, 0x01000000, + (s32) &func_802B6348_E24388, 0x00E24040, 0x00E245D0, 0x01000000, + (s32) &func_802B6000_E24920, 0x00E24920, 0x00E24ED0, 0x01000000, + (s32) &func_802B61C0_E24AE0, 0x00E24920, 0x00E24ED0, 0x01000000, + (s32) &func_802B6638_E29068, 0x00E28A30, 0x00E291A0, 0x01000000, + (s32) &func_802B6000_E24920, 0x00E26DE0, 0x00E27510, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E26DE0, 0x00E27510, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E26710, 0x00E26DE0, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E26710, 0x00E26DE0, 0x00000000, + (s32) &func_802B6060_E27570, 0x00E27510, 0x00E27C90, 0x00000000, + (s32) &func_802B66A8_E25578, 0x00E24ED0, 0x00E25D60, 0x00000000, + (s32) &func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, + (s32) &func_802B6508_E28F38, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E27C90, 0x00E27F40, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E287F0, 0x00E28A30, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E27F40, 0x00E287F0, 0x00000000, + (s32) &func_802B6230_E24800, 0x00E245D0, 0x00E24920, 0x01000000, + (s32) &func_802B6120_E2A7D0, 0x00E2A6B0, 0x00E2B530, 0x01000000, + (s32) &func_802B6000_E24920, 0x00E25D60, 0x00E26710, 0x00000000, + (s32) &func_802B63D4_E28E04, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B6478_E28EA8, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B60A4_E29514, 0x00E29470, 0x00E2A340, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E291A0, 0x00E29470, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E2A340, 0x00E2A6B0, 0x00000000, + (s32) &func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, + (s32) &func_802B6000_E24920, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B6000_E24920, 0x00E245D0, 0x00E24920, 0x01000000, + (s32) &func_802B609C_E28ACC, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x00000000, + (s32) &func_802B6350_E28D80, 0x00E236E0, 0x00E24040, 0x00000000, + (s32) &func_802B6350_E28D80, 0x00E28A30, 0x00E291A0, 0x01000000, }; diff --git a/src/world/partners.c b/src/world/partners.c index 3783463b2b..2be90b1fcc 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -46,7 +46,7 @@ s32 D_800F7F80[] = { s32* D_800F7FA8 = &D_80108068; s32 D_800F7FAC = 0x80108090; s32 D_800F7FB0[] = { 0x80108298, 0x801082E8, 0x801082C0, 0x80108310, 0x80108338, 0x80108360, 0x80108388 }; -s32 D_800F7FCC[] = { (s32)&D_801083D8, 0x80108428, 0x80108400, 0x80108450, 0x80108478, 0x801084A0, 0x801084C8 }; +s32 D_800F7FCC[] = { (s32) &D_801083D8, 0x80108428, 0x80108400, 0x80108450, 0x80108478, 0x801084A0, 0x801084C8 }; s32 D_800F7FE8 = -1; s32 D_800F7FEC = 1; @@ -55,7 +55,7 @@ s32 D_800F7FF4 = 4; s32 D_800F7FF8 = 5; s32 D_800F7FFC = 7; s32 D_800F8000[] = { 8, 0, 0, 0 }; -s32 D_800F8010[] = { &code_code_3251D0_ROM_START, &code_code_3251D0_ROM_END, (s32)&D_802C05CC, 0x00000000 }; +s32 D_800F8010[] = { &code_code_3251D0_ROM_START, &code_code_3251D0_ROM_END, (s32) &D_802C05CC, 0x00000000 }; s32 D_800F8020 = 0; s32 D_800F8024 = 0; s32 D_800F8028 = 0; @@ -409,8 +409,7 @@ s32 partner_use_ability(void) { if (!is_starting_conversation() && wPartner != NULL && - (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) - { + (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) { if ((gGameStatusPtr->unk_81 != 0) && (temp8010EBB0->unk_08 & 0x4000)) { play_sound(0x21D); } else if (D_8010CFD8 != 0) { @@ -593,11 +592,12 @@ INCLUDE_ASM(void, "world/partners", enable_partner_walking, Npc* partner, s32 va INCLUDE_ASM(void, "world/partners", func_800EBA3C, Npc* partner); -void func_800EBB40(Npc *partner) { +void func_800EBB40(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; Temp8010EBB0* temp8010EBB0 = &D_8010EBB0; - if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & 0x3000 || temp8010EBB0->unk_14 != 0 || temp8010EBB0->unk_02 != 0) { + if (gGameStatusPtr->unk_81 == 0 || playerStatus->flags & 0x3000 || temp8010EBB0->unk_14 != 0 + || temp8010EBB0->unk_02 != 0) { if (!(playerStatus->animFlags & 0x800)) { func_800EBC74(partner); } diff --git a/tools/compile_dsl_macros.py b/tools/compile_dsl_macros.py index c96b206d6f..d8e831b255 100755 --- a/tools/compile_dsl_macros.py +++ b/tools/compile_dsl_macros.py @@ -47,6 +47,7 @@ script_parser = Lark(r""" | "sleep" expr "secs" -> sleep_secs_stmt | "spawn" expr -> spawn_stmt | "await" expr -> await_stmt + | "jump" expr -> jump_stmt | lhs "=" "spawn" expr -> spawn_set_stmt | lhs set_op expr -> set_stmt | lhs set_op "f" expr -> set_float_stmt @@ -523,6 +524,8 @@ class Compile(Transformer): return Cmd("ScriptOpcode_SPAWN_SCRIPT_GET_ID", script, lhs, meta=tree.meta) def await_stmt(self, tree): return Cmd("ScriptOpcode_AWAIT_SCRIPT", tree.children[0], meta=tree.meta) + def jump_stmt(self, tree): + return Cmd("ScriptOpcode_JUMP", tree.children[0], meta=tree.meta) def set_stmt(self, tree): lhs, opcodes, rhs = tree.children diff --git a/tools/disasm_script.py b/tools/disasm_script.py index 945e89cab4..992d063f35 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -1,15 +1,15 @@ #! /usr/bin/python3 import sys +from pathlib import Path _script_lib = None -def script_lib(): +def script_lib(offset): global _script_lib if not _script_lib: _script_lib = {} - from pathlib import Path from os import path import re @@ -35,23 +35,125 @@ def script_lib(): pass """ - # symbol_addrs.txt - with open(Path(path.dirname(__file__), "symbol_addrs.txt"), "r") as file: + repo_root = Path(__file__).resolve().parent.parent + symbols = Path(repo_root / "ver" / "current" / "symbol_addrs.txt") + with open(symbols, "r") as file: for line in file.readlines(): - line = line.split(";")[0] - s = [s.strip() for s in line.split("=", 1)] name = s[0] - addr = s[1].split(";")[0].split(" ")[0] - _script_lib[int(addr, 16)] = name + vaddr = int(s[1].split(";")[0].split(" ")[0], 16) + raddr = "0xFFFFFFFF" + if "rom:" in line: + raddr = line.split("rom:",1)[1] + if " " in raddr: + raddr = raddr.split(" ",1)[0] + raddr = raddr.strip() + + if vaddr not in _script_lib: + _script_lib[vaddr] = [] + _script_lib[vaddr].append([int(raddr, 16), name]) + + # Sort the symbols for each vram address by the difference + # between their rom address and the offset passed in. + # If offset - rom address goes below 0, it's part of the + # previous file, so treat it as min priority, same as a default. + # After sorting, the first rom address and name should be the best candidate. + for k in _script_lib.keys(): + for i,entry in enumerate(_script_lib[k]): + diff = offset - entry[0] + entry[0] = 0xFFFFFFFF if diff < 0 else diff + _script_lib[k][i][0] = entry[0] + _script_lib[k] = sorted(_script_lib[k], key=lambda x: x[0]) return _script_lib +# Grab constants from the include/ folder to save manual work +constants = {} +def get_constants(): + global constants + + constants["ItemId"] = {} + constants["AnimId"] = {} + constants["ActorId"] = {} + constants["Event"] = {} + + include_path = Path(Path(__file__).resolve().parent.parent / "include") + enums = Path(include_path / "enums.h").read_text() + + for line in enums.splitlines(): + if "#define ItemId_" in line: + name = line.split(" ",2)[1] + id_ = line.split("0x", 1)[1] + if " " in id_: + id_ = id_.split(" ",1)[0] + constants["ItemId"][int(id_, 16)] = name + + elif "#define PlayerAnim_" in line: + name = line.split(" ",2)[1] + id_ = line.split("0x", 1)[1] + if " " in id_: + id_ = id_.split(" ",1)[0] + constants["AnimId"][int(id_, 16)] = name + + elif "#define ActorID_" in line: + name = line.split(" ",2)[1] + id_ = line.split("0x", 1)[1] + if " " in id_: + id_ = id_.split(" ",1)[0] + constants["ActorId"][int(id_, 16)] = name + + elif "#define Event_" in line: + name = line.split(" ",2)[1] + id_ = line.split("0x", 1)[1] + if " " in id_: + id_ = id_.split(" ",1)[0] + constants["Event"][int(id_, 16)] = name + return + +def fix_args(args, info): + global constants + + new_args = [] + for i,arg in enumerate(args.split(", ")): + if i in info: + if "0x" in arg: + argNum = int(arg, 16) + else: + argNum = int(arg, 10) + if argNum in constants[info[i]]: + new_args.append(f"{constants[info[i]][argNum]}") + else: + print(f"{argNum:X} was not found within {info[i]} constants, add it.") + new_args.append(f"{arg}") + else: + new_args.append(f"{arg}") + return ", ".join(new_args) + +def replace_constants(func, args): + if func == "SetAnimation": return fix_args(args, {0:"ActorId", 2:"AnimId"}) + elif func == "SetJumpAnimations": return fix_args(args, {0:"ActorId", 2:"AnimId", 3:"AnimId", 4:"AnimId"}) + elif func == "SetActorJumpGravity": return fix_args(args, {0:"ActorId"}) + elif func == "SetActorSpeed": return fix_args(args, {0:"ActorId"}) + elif func == "SetActorScale": return fix_args(args, {0:"ActorId"}) + elif func == "SetActorYaw": return fix_args(args, {0:"ActorId"}) + elif func == "GetActorPos": return fix_args(args, {0:"ActorId"}) + elif func == "SetTargetActor": return fix_args(args, {0:"ActorId"}) + elif func == "SetGoalToTarget": return fix_args(args, {0:"ActorId"}) + elif func == "SetGoalToHome": return fix_args(args, {0:"ActorId"}) + elif func == "GetGoalPos": return fix_args(args, {0:"ActorId"}) + elif func == "PlaySoundAtActor": return fix_args(args, {0:"ActorId"}) + elif func == "GetItemPower": return fix_args(args, {0:"ItemId"}) + elif func == "UseIdleAnimation": return fix_args(args, {0:"ActorId"}) + elif func == "DispatchDamagePlayerEvent": return fix_args(args, {1:"Event"}) + + return args + class ScriptDisassembler: def __init__(self, bytes, script_name = "script", symbol_map = {}): self.bytes = bytes self.script_name = script_name - self.symbol_map = { **script_lib(), **symbol_map } + + self.symbol_map = { **script_lib(self.bytes.tell()), **symbol_map } self.out = "" self.prefix = "" @@ -61,6 +163,10 @@ class ScriptDisassembler: self.done = False + self.start_pos = self.bytes.tell() + self.end_pos = 0 + self.instructions = 0 + def disassemble(self): while True: opcode = self.read_word() @@ -75,7 +181,10 @@ class ScriptDisassembler: self.disassemble_command(opcode, argc, argv) + self.instructions += 1 + if self.done: + self.end_pos = self.bytes.tell() return self.prefix + self.out def write(self, line): @@ -95,7 +204,7 @@ class ScriptDisassembler: def var(self, arg): if arg in self.symbol_map: - return self.symbol_map[arg] + return self.symbol_map[arg][0][1] v = arg - 2**32 # convert to s32 if v > -250000000: @@ -120,8 +229,8 @@ class ScriptDisassembler: def addr_ref(self, addr): if addr in self.symbol_map: - return self.symbol_map[addr] - return script_lib().get(addr, f"0x{addr:08X}") + return self.symbol_map[addr][0][1] + return f"0x{addr:08X}" def trigger(self, trigger): if trigger == 0x00000080: trigger = "TriggerFlag_FLOOR_TOUCH" @@ -374,7 +483,7 @@ class ScriptDSLDisassembler(ScriptDisassembler): def var(self, arg): if arg in self.symbol_map: - return self.symbol_map[arg] + return self.symbol_map[arg][0][1] v = arg - 2**32 # convert to s32 if v > -250000000: @@ -602,9 +711,11 @@ class ScriptDSLDisassembler(ScriptDisassembler): elif opcode == 0x43: addr = argv[0] if addr in self.symbol_map: - func_name = self.symbol_map[addr] + func_name = self.symbol_map[addr][0][1] argv_str = ", ".join(self.var(arg) for arg in argv[1:]) + argv_str = replace_constants(func_name, argv_str) + self.write_line(f"{func_name}({argv_str});") else: print(f"script API function {addr:X} is not present in symbol_addrs.txt, please add it") @@ -620,6 +731,7 @@ class ScriptDSLDisassembler(ScriptDisassembler): self.write_line(f"bind {self.addr_ref(argv[0])} to {self.trigger(argv[1])} {self.var(argv[2])};") elif opcode == 0x48: self.write_line(f"unbind;") elif opcode == 0x49: self.write_line(f"kill {self.var(argv[0])};") + elif opcode == 0x4A: self.write_line(f"jump {self.var(argv[0])};") elif opcode == 0x4D: self.write_line(f"group {self.var(argv[0])};") elif opcode == 0x4F: self.write_line(f"suspend group {self.var(argv[0])};") elif opcode == 0x50: self.write_line(f"resume group {self.var(argv[0])};") @@ -651,9 +763,16 @@ if __name__ == "__main__": offset = eval(sys.argv[2]) if len(sys.argv) >= 3 else 0 with open(file, "rb") as f: + get_constants() f.seek(offset) try: - print(ScriptDSLDisassembler(f).disassemble(), end="") + script = ScriptDSLDisassembler(f) + script_text = script.disassemble() + + print(f"Script read from 0x{script.start_pos:X} to 0x{script.end_pos:X} " + f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)") + print() + print(script_text, end="") except UnsupportedScript: print(ScriptDisassembler(f).disassemble(), end="") diff --git a/tools/m2ctx.py b/tools/m2ctx.py index fdc76539c1..ff11145881 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -59,7 +59,8 @@ def main(): output = [] for line in processed_lines: - if "__attribute__" not in line and "__asm__" not in line: + if ("__attribute__" not in line + and "__asm" not in line): output.append(line) with open(os.path.join(root_dir, "ctx.c"), "w", encoding="UTF-8") as f: diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index f1cac5d7d7..3e510e041d 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 8f4395956b436d5137b950202abd53dc3a9fbbae - parent = eff0155585ddb319c0b1b17aeb8882e4d113a2c6 + commit = db0b6f0cba3e07edac25fdb38ae30d2bd52044ca + parent = b97c4c139cd95cda596c9ee5097ccd1efa37185a method = merge cmdver = 0.4.3 diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py index 174f275905..9a547ea418 100644 --- a/tools/splat/segtypes/n64/code.py +++ b/tools/splat/segtypes/n64/code.py @@ -249,10 +249,11 @@ class DataSubsegment(Subsegment): class BssSubsegment(DataSubsegment): def __init__(self, start, end, name, type, vram, args, parent): super().__init__(start, end, name, type, vram, args, parent) - self.rom_start = 0 + #self.rom_start = 0 self.rom_end = 0 - self.size = self.args[0] - self.vram_end = self.vram_start + self.size + if type == "bss": + self.size = self.args[0] + self.vram_end = self.vram_start + self.size class BinSubsegment(Subsegment): def split_inner(self, segment, rom_bytes, base_path, generic_out_path): diff --git a/tools/splat/split.py b/tools/splat/split.py index e1a6b935de..7236c403c2 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -355,7 +355,7 @@ def main(config_path, out_dir, target_path, modes, verbose, ignore_cache=False): log.dot(status=segment.status()) # Write ldscript - if options.mode_active("ld"): + if options.mode_active("ld") and not options.get("skip_ld"): if verbose: log.write(f"saving {config['basename']}.ld") write_ldscript(config['basename'], out_dir, ld_sections) diff --git a/ver/us/asm/data/battle/item/dizzy_dial_727CE0.data.s b/ver/us/asm/data/battle/item/dizzy_dial_727CE0.data.s deleted file mode 100644 index 696285797d..0000000000 --- a/ver/us/asm/data/battle/item/dizzy_dial_727CE0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802A13D0_727CE0 -.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_727910, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_727AE4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_727910, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_727AE4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000025, 0x00000002, 0xFE363C8A, 0x0000009A, 0x00000046, 0x00000001, D_802A13D0_727CE0, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, AddBattleCamZoom, 0xFFFFFF06, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000050, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, AddBattleCamZoom, 0x000000FA, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000003, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802A1270_727B80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000008, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000004, func_8024ECF8, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x10000000, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetItemPower, 0x0000009A, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, MakeStatusField, 0xFE363C80, 0x00040000, 0x00000064, 0xFE363C80, 0x00000043, 0x00000006, func_80252B3C, 0xFE363C80, 0x50000000, 0xFE363C80, 0x00000000, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x802A1800, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 - -glabel D_802A1CC0_7285D0 -.double 360.0, 0.0 diff --git a/ver/us/asm/data/battle/item/mystery_72CF00.data.s b/ver/us/asm/data/battle/item/mystery_72CF00.data.s index 2a8bfea68b..daa4d3ba31 100644 --- a/ver/us/asm/data/battle/item/mystery_72CF00.data.s +++ b/ver/us/asm/data/battle/item/mystery_72CF00.data.s @@ -9,7 +9,5 @@ glabel D_802A227C_72D82C .word 0x0000008A, 0x0000008C, 0x00000080, 0x00000088, 0x0000009A, 0x00000082, 0x00000085, 0x0000008A glabel D_802A229C_72D84C -.word 0x0000008A, 0x0000008C, 0x00000085, 0x00000088, 0x0000008A, 0x0000008C, 0x00000085, 0x0000008A, 0x00000025, 0x00000002, 0xFE363C8A, 0x00000096, 0x00000046, 0x00000001, D_802A1950_72CF00, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000DC, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x000003F3, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000368, 0x00000043, 0x00000001, func_802A13E4_72C994, 0x00000008, 0x00000001, 0x00000002, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000085, 0x0000004A, 0x00000001, UseMystery, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x802A2260, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000096, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetOwnerTarget, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000012, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFC4, 0x00000043, 0x00000005, func_802D3840, 0xFE363C8A, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A7CE7, 0x00000027, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000056, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000010, 0x00000043, 0x00000002, func_802D3624, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802A188C_72CE3C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00000020, 0x00000001, 0x00000043, 0x00000003, DispatchDamagePlayerEvent, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000008A, 0x0000008C, 0x00000085, 0x00000088, 0x0000008A, 0x0000008C, 0x00000085, 0x0000008A, -glabel jtbl_802A25A0_72DB50 -.word L802A143C_72C9EC, L802A1548_72CAF8, L802A168C_72CC3C, L802A1710_72CCC0, L802A17AC_72CD5C, L802A17CC_72CD7C, 0, 0 diff --git a/ver/us/asm/data/battle/item/sleepy_sheep_71EFC0.data.s b/ver/us/asm/data/battle/item/sleepy_sheep_71EFC0.data.s index 2ab3c38e9b..01e6e18b7d 100644 --- a/ver/us/asm/data/battle/item/sleepy_sheep_71EFC0.data.s +++ b/ver/us/asm/data/battle/item/sleepy_sheep_71EFC0.data.s @@ -2,14 +2,3 @@ .section .data -glabel D_802A1970_71EFC0 -.word 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_71E650, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_71E824, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_71E650, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_71E824, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05555555, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000055, 0x55555555, 0x55000000, 0x00000000, 0x00000000, 0x00000000, 0x05555555, 0x00005555, 0x53211123, 0x55500000, 0x00000000, 0x00000000, 0x00000005, 0x55555555, 0x55555521, 0x11111111, 0x25550000, 0x00000000, 0x00000000, 0x00000555, 0x52211223, 0x55531111, 0x11111111, 0x11550000, 0x00000000, 0x00000000, 0x00005552, 0x11111111, 0x13211111, 0x11111111, 0x11255000, 0x00000000, 0x00000000, 0x00055521, 0x11111111, 0x11111111, 0x11111111, 0x11155000, 0x00000000, 0x00000000, 0x05555211, 0x11111112, 0xDDDDDD21, 0x11111111, 0x11155000, 0x00000000, 0x00000005, 0x55552111, 0x111111DD, 0xDCBBBCDD, 0x11111111, 0x11255000, 0x00000000, 0x00000555, 0x52131111, 0x11111DDC, 0xBBBBBBBC, 0xD1125555, 0x51555000, 0x00000000, 0x00005552, 0x11121111, 0x1111DDBB, 0xBBBBBBBB, 0xD1558777, 0x85550000, 0x00000000, 0x00005511, 0x11112111, 0x1112DBBB, 0xBBCCCBBB, 0xD2577777, 0x89550000, 0x00000000, 0x00055111, 0x11111111, 0x111DCBBB, 0xBCDDDCBD, 0xD5877789, 0x9EF50000, 0x00000000, 0x00053111, 0x11111111, 0x111DBBBB, 0xCD111DDD, 0x15778996, 0x6EE55000, 0x00000000, 0x00552111, 0x11111111, 0x111DBBBB, 0xD1111111, 0x15899EE6, 0x6EE55500, 0x00000000, 0x00551111, 0x11111111, 0x111DBBBB, 0xD111111D, 0x159FEEE6, 0x6EF55500, 0x00000000, 0x00551111, 0x11111111, 0x111DBBBB, 0xD11111DD, 0x135FEEEE, 0xEE545550, 0x00000000, 0x00551111, 0x11111111, 0x111DCBBB, 0xBD111DBD, 0x1255FEEE, 0xF5544550, 0x00000000, 0x00552111, 0x11111111, 0x1112DBBB, 0xBBDDDBCD, 0x11255555, 0x54444550, 0x00000000, 0x00053111, 0x11111111, 0x1111DDBB, 0xBBBBBCD2, 0x11235444, 0x44444550, 0x00000000, 0x00055211, 0x11111111, 0x11111DDC, 0xBBBBCDD1, 0x11125444, 0x44445550, 0x00000000, 0x00055311, 0x11111111, 0x1111112D, 0xDDDDD211, 0x11115444, 0x44445500, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x11115444, 0x44455500, 0x00000000, 0x00005532, 0x11111111, 0x11111111, 0x11111111, 0x11115444, 0x44555000, 0x00000000, 0x00005553, 0x21111111, 0x11111111, 0x11111111, 0x11133544, 0x55550000, 0x00000000, 0x00055311, 0x11111111, 0x11111111, 0x11111111, 0x11232555, 0x55500000, 0x00000000, 0x00055111, 0x11111111, 0x11111111, 0x11111111, 0x13311355, 0x50000000, 0x00000000, 0x00055111, 0x11111111, 0x11111111, 0x11111111, 0x11111255, 0x00000000, 0x00000000, 0x00055211, 0x11111112, 0x11111111, 0x11111111, 0x11111255, 0x00000000, 0x00000000, 0x00055311, 0x11111113, 0x11111111, 0x11211111, 0x11111255, 0x00000000, 0x00000000, 0x00005521, 0x11111113, 0x21111111, 0x11321111, 0x11111550, 0x00000000, 0x00000000, 0x00005552, 0x21111112, 0x32111111, 0x11232111, 0x11115550, 0x00000000, 0x00000000, 0x00000555, 0x52222355, 0x55322112, 0x23555322, 0x22355500, 0x00000000, 0x00000000, 0x00000005, 0x55555555, 0x55555555, 0x55555555, 0x55550000, 0x00000000, 0x00000000, 0x00000000, 0x05544450, 0x00055555, 0x50005554, 0x44500000, 0x00000000, 0x00000000, 0x00000000, 0x05444500, 0x00000000, 0x00000054, 0x44450000, 0x00000000, 0x00000000, 0x00000000, 0x54444500, 0x00000000, 0x00000005, 0x44445000, 0x00000000, 0x00000000, 0x00000000, 0x57545000, 0x00000000, 0x00000005, 0x54475000, 0x00000000, 0x00000000, 0x00000000, 0x57775000, 0x00000000, 0x00000000, 0x57775000, 0x00000000, 0x00000000, 0x00000000, 0x05550000, 0x00000000, 0x00000000, 0x05550000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x41C6CE51, 0xAD4B8C05, 0x734541C7, 0x318DCE0D, 0xA50383C3, 0x7345C55B, 0x93D76213, 0xC6317CA9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00055555, 0x55000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x55555555, 0x55550000, 0x00000000, 0x00000000, 0x00000000, 0x00555555, 0x50000555, 0x55322111, 0x23555000, 0x00000000, 0x00000000, 0x00000000, 0x55555555, 0x55555553, 0x21111111, 0x11255500, 0x00000000, 0x00000000, 0x00000055, 0x55322111, 0x23555311, 0x11111111, 0x11115500, 0x00000000, 0x00000000, 0x00000555, 0x31111111, 0x11131111, 0x11111111, 0x11112550, 0x00000000, 0x00000000, 0x00005552, 0x11111111, 0x11111111, 0x11111111, 0x11111550, 0x00000000, 0x00000000, 0x00555521, 0x11111111, 0x12DDDDDD, 0x21111111, 0x11111550, 0x00000000, 0x00000000, 0x55555211, 0x11111111, 0xDDDCBBBC, 0xDD111111, 0x11112550, 0x00000000, 0x00000055, 0x55213111, 0x1111111D, 0xDCBBBBBB, 0xBCD11255, 0x55515500, 0x00000000, 0x00000555, 0x21112111, 0x111111DD, 0xBBBBBBBB, 0xBBD15587, 0x77855500, 0x00000000, 0x00005551, 0x11111211, 0x111112DB, 0xBBBBCCCB, 0xBBD25777, 0x77895500, 0x00000000, 0x00005511, 0x11111111, 0x11111DCB, 0xBBBCDDDC, 0xBDD58777, 0x899EF500, 0x00000000, 0x00055311, 0x11111111, 0x11111DBB, 0xBBCD111D, 0xDD157789, 0x966EE550, 0x00000000, 0x00055211, 0x11111111, 0x11111DBB, 0xBBD11111, 0x1115899E, 0xE66EE555, 0x00000000, 0x00055111, 0x11111111, 0x11111DBB, 0xBBD11111, 0x1D159FEE, 0xE66EF555, 0x00000000, 0x00055111, 0x11111111, 0x11111DBB, 0xBBD11111, 0xDD135FEE, 0xEEEE5455, 0x50000000, 0x00055111, 0x11111111, 0x11111DCB, 0xBBBD111D, 0xBD1155FE, 0xEEF55445, 0x50000000, 0x00055211, 0x11111111, 0x111112DB, 0xBBBBDDDB, 0xCD112555, 0x55544445, 0x50000000, 0x00055311, 0x11111111, 0x111111DD, 0xBBBBBBBC, 0xD2112354, 0x44444445, 0x50000000, 0x00005521, 0x11111111, 0x1111111D, 0xDCBBBBCD, 0xD1111254, 0x44444455, 0x50000000, 0x00005532, 0x11111111, 0x11111111, 0x2DDDDDD2, 0x11111254, 0x44444455, 0x00000000, 0x00000553, 0x21111111, 0x11111111, 0x11111111, 0x11111254, 0x44444555, 0x00000000, 0x00005521, 0x32111111, 0x11111111, 0x11111111, 0x11111335, 0x44445550, 0x00000000, 0x00055321, 0x11111111, 0x11111111, 0x11111111, 0x11112322, 0x54555500, 0x00000000, 0x00055211, 0x11111111, 0x11111111, 0x11111111, 0x11123211, 0x25555000, 0x00000000, 0x00055211, 0x11111111, 0x11111111, 0x11111111, 0x11121111, 0x15500000, 0x00000000, 0x00055211, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x15500000, 0x00000000, 0x00055311, 0x11111111, 0x21111111, 0x11111111, 0x11111111, 0x25500000, 0x00000000, 0x00005521, 0x11111111, 0x31111111, 0x11111111, 0x11111111, 0x45000000, 0x00000000, 0x00005552, 0x11111111, 0x33211111, 0x11123321, 0x11111115, 0x55000000, 0x00000000, 0x00000555, 0x32111223, 0x55532111, 0x12355553, 0x22112355, 0x50000000, 0x00000000, 0x00000005, 0x55555555, 0x55555555, 0x55555555, 0x55555544, 0x55000000, 0x00000000, 0x00000055, 0x44444555, 0x00005555, 0x55500000, 0x55554444, 0x47500000, 0x00000000, 0x00000574, 0x44455000, 0x00000000, 0x00000000, 0x00055444, 0x77500000, 0x00000000, 0x00000577, 0x45550000, 0x00000000, 0x00000000, 0x00000557, 0x75500000, 0x00000000, 0x00000557, 0x75000000, 0x00000000, 0x00000000, 0x00000005, 0x55000000, 0x00000000, 0x00000055, 0x50000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x41C6CE51, 0xAD4B8C05, 0x734541C7, 0x318DCE0D, 0xA50383C3, 0x7345C55B, 0x93D76213, 0xC6317CA9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x55555550, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000555, 0x55555555, 0x50000000, 0x00000000, 0x00000000, 0x00000000, 0x05555555, 0x00055555, 0x32111235, 0x55000000, 0x00000000, 0x00000000, 0x00000005, 0x55555555, 0x55555211, 0x11111112, 0x55500000, 0x00000000, 0x00000000, 0x00000555, 0x52211223, 0x55521111, 0x11111111, 0x15500000, 0x00000000, 0x00000000, 0x00005552, 0x11111111, 0x13211111, 0x11111111, 0x12550000, 0x00000000, 0x00000000, 0x00055521, 0x11111111, 0x11111111, 0x11111111, 0x11550000, 0x00000000, 0x00000000, 0x05555211, 0x1111112D, 0xDDDDD211, 0x11111111, 0x11550000, 0x00000000, 0x00000005, 0x55552111, 0x11111DDD, 0xCBBBCDD1, 0x11111111, 0x12550000, 0x00000000, 0x00000555, 0x52131111, 0x1111DDCB, 0xBBBBBBCD, 0x11255555, 0x15550000, 0x00000000, 0x00005552, 0x11121111, 0x111DDBBB, 0xBBBBBBBD, 0x15587778, 0x55500000, 0x00000000, 0x00005511, 0x11112111, 0x112DBBBB, 0xBCCCBBBD, 0x25777778, 0x95500000, 0x00000000, 0x00055111, 0x11111111, 0x11DCBBBB, 0xCDDDCBDD, 0x58777899, 0xEF500000, 0x00000000, 0x00053111, 0x11111111, 0x11DBBBBC, 0xD111DDD1, 0x57789966, 0xEE550000, 0x00000000, 0x00552111, 0x11111111, 0x11DBBBBD, 0x11111111, 0x5899EE66, 0xEE555000, 0x00000000, 0x00551111, 0x11111111, 0x11DBBBBD, 0x111111D1, 0x59FEEE66, 0xEF555000, 0x00000000, 0x00551111, 0x11111111, 0x11DBBBBD, 0x11111DD1, 0x35FEEEEE, 0xE5455500, 0x00000000, 0x00551111, 0x11111111, 0x11DCBBBB, 0xD111DBD1, 0x255FEEEF, 0x55445500, 0x00000000, 0x00552111, 0x11111111, 0x112DBBBB, 0xBDDDBCD1, 0x12555555, 0x44445500, 0x00000000, 0x00053111, 0x11111111, 0x111DDBBB, 0xBBBBCD21, 0x12354444, 0x44445500, 0x00000000, 0x00055111, 0x11111111, 0x1111DDCB, 0xBBBCDD11, 0x11254444, 0x44455500, 0x00000000, 0x00055211, 0x11111111, 0x111112DD, 0xDDDD2111, 0x11154444, 0x44455000, 0x00000000, 0x00055311, 0x11111111, 0x11111111, 0x11111111, 0x11154444, 0x44555000, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x11154444, 0x45550000, 0x00000000, 0x00005532, 0x11111111, 0x11111111, 0x11111111, 0x11354445, 0x55500000, 0x00000000, 0x00000553, 0x22111111, 0x11111111, 0x11111111, 0x12355555, 0x55000000, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x33235555, 0x00000000, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x11115500, 0x00000000, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x11115500, 0x00000000, 0x00000000, 0x00005551, 0x11111111, 0x21111111, 0x11111111, 0x11115500, 0x00000000, 0x00000000, 0x00000552, 0x11111111, 0x32111111, 0x12111111, 0x11125500, 0x00000000, 0x00000000, 0x00000055, 0x21111111, 0x32111111, 0x13211111, 0x11255000, 0x00000000, 0x00000000, 0x00000055, 0x52111111, 0x23211112, 0x23321111, 0x12555000, 0x00000000, 0x00000000, 0x00000005, 0x55522222, 0x35321123, 0x55533222, 0x35550000, 0x00000000, 0x00000000, 0x00000000, 0x05555445, 0x55555555, 0x55455555, 0x55000000, 0x00000000, 0x00000000, 0x00000000, 0x00055444, 0x55055555, 0x54445555, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00005544, 0x45500005, 0x44455000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000544, 0x47500057, 0x44450000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x77500057, 0x77500000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x55000005, 0x55000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x41C6CE51, 0xAD4B8C05, 0x734541C7, 0x318DCE0D, 0xA50383C3, 0x7345C55B, 0x93D76213, 0xC6317CA9, 0xFFE40000, 0x00000000, 0x00000600, 0x000000FF, 0x001B0000, 0x00000000, 0x07000600, 0x000000FF, 0x001B002F, 0x00000000, 0x07000000, 0x000000FF, 0xFFE4002F, 0x00000000, 0x00000000, 0x000000FF, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, 0x802A2470, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48001B, 0x802A1F30, 0xF5480800, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0706E0BC, 0xE7000000, 0x00000000, 0xF5400800, 0x00000000, 0xF2000000, 0x000DC0BC, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, 0x802A2F50, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, 0x802A29D0, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48001B, 0x802A2490, 0xF5480800, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0706E0BC, 0xE7000000, 0x00000000, 0xF5400800, 0x00000000, 0xF2000000, 0x000DC0BC, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, 0x802A2F50, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, 0x802A2F30, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48001B, 0x802A29F0, 0xF5480800, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0706E0BC, 0xE7000000, 0x00000000, 0xF5400800, 0x00000000, 0xF2000000, 0x000DC0BC, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, 0x802A2F50, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x00000002, 0x802A2F90, 0x00000001, 0x00000003, 0x802A3080, 0x00000001, 0x00000002, 0x802A2F90, 0x00000001, 0x00000002, 0x802A3170, 0x00000002, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x00000003, 0x802A3080, 0x00000001, 0x00000002, 0x802A2F90, 0x00000001, 0x00000002, 0x802A3170, 0x00000001, 0x00000002, 0x802A2F90, 0x00000002, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x00000002, 0x802A2F90, 0x00000001, 0x00000002, 0x802A3170, 0x00000001, 0x00000002, 0x802A2F90, 0x00000001, 0x00000003, 0x802A3080, 0x00000002, 0x00000000, 0x00000025, 0x00000002, 0xFE363C8A, 0x0000008F, 0x00000046, 0x00000001, D_802A1970_71EFC0, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFBD, 0xFFFFFFF1, 0xFFFFFFFB, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000002D, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000A9, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000364, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000002, StartRumble, 0x00000002, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B80, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8080, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000020, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000014, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x000000B4, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802A123C_71E88C, 0x00000057, 0x00000000, 0x00000043, 0x00000001, InitTargetIterator, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802A1740_71ED90, 0x00000043, 0x00000001, func_802A1848_71EE98, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SetJumpAnimations, 0x00000000, 0x00000000, 0x0001002B, 0x0001002B, 0x00010008, 0x00000043, 0x00000003, SetActorJumpGravity, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80273444, 0x0000000F, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000096, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000078, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetActorYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, func_802D3474, 0xFE363C8A, 0x802A3260, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, func_802D36E0, 0xFE363C8A, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802D38EC, 0xFE363C8A, 0xF24A7D58, 0xF24A7D58, 0xF24A7D58, 0x00000043, 0x00000003, func_802D3998, 0xFE363C8A, 0xF24A9680, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A801A, 0x00000043, 0x00000003, SetOwnerTarget, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000006, func_802D3A60, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, GetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000014E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010023, 0x00000043, 0x00000005, SetActorScale, 0x00000000, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0x00000000, 0xF24A7FB4, 0xF24A7DB4, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetActorScale, 0x00000000, 0xF24A7F4D, 0xF24A7E1A, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetActorScale, 0x00000000, 0xF24A7E80, 0xF24A7E80, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, func_802D39FC, 0xFE363C8A, 0xF24A801A, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, func_802D3C58, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000010E, 0x00000043, 0x00000006, func_802D3A60, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000043, 0x00000002, func_802D3624, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x10000000, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetItemPower, 0x0000008F, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, MakeStatusField, 0xFE363C80, 0x00001000, 0x00000064, 0xFE363C80, 0x00000043, 0x00000006, func_80252B3C, 0xFE363C80, 0x50000000, 0xFE363C80, 0x00000000, 0x00000020, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x802A1DA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -glabel D_802A3E88_7214D8 -.word 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFE2, 0x00000000, 0xFFFFFFCE, 0xFFFFFFE5, 0x00000000, 0x0000001E, 0xFFFFFFBA, 0x00000000, 0xFFFFFFFB, 0xFFFFFF97, 0x00000000, 0x0000001E, 0xFFFFFF92, 0x00000000, 0xFFFFFFCE, 0xFFFFFF6F, 0x00000000, 0xFFFFFFFB, 0xFFFFFF56, 0x00000000, 0xFFFFFFCE, 0xFFFFFF42, 0x00000000, 0xFFFFFFE2, 0xFFFFFF2E, 0x00000000, 0xFFFFFFF6 - -glabel D_802A3F00_721550 -.word 0x3F800000, 0x3F800000, 0x3F400000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F400000, 0x3F400000 - -glabel D_802A3F28_721578 -.word 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260 diff --git a/ver/us/asm/data/battle/item/strange_cake_731EA0.data.s b/ver/us/asm/data/battle/item/strange_cake_731EA0.data.s index 0cec99bd48..448d560670 100644 --- a/ver/us/asm/data/battle/item/strange_cake_731EA0.data.s +++ b/ver/us/asm/data/battle/item/strange_cake_731EA0.data.s @@ -5,14 +5,3 @@ glabel D_802A1BA0_731EA0 .word 0x27BD0018, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000012, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_731300, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7314D4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x0000208D, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000008, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFAB, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000029, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F8, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000043, 0x00000001, func_802A1000_731300, 0x00000008, 0x00000001, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802A11D4_7314D4, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0xFFF42211, 0x11224FFF, 0x00000000, 0x0000000F, 0xF5211111, 0x1111125F, 0xF0000000, 0x000000FF, 0x41111111, 0x11111115, 0xFF000000, 0x00000FF5, 0x11111999, 0x99911111, 0x5FF00000, 0x00000FF2, 0x11199999, 0x99999111, 0x2FF00000, 0x0000FF41, 0x11999999, 0x99999911, 0x14FF0000, 0x0000FF21, 0x19999999, 0x99977777, 0x72FF0000, 0x0000FF21, 0x19999999, 0x999AAA77, 0x92FF0000, 0x0000FF11, 0x99999777, 0x77999779, 0x91FF0000, 0x0000FF11, 0x99999AAA, 0x77997799, 0x11FF0000, 0x0000FF11, 0x99999997, 0x79977AAA, 0xA1FF0000, 0x0000FF19, 0x99999977, 0x99977777, 0x71FF0000, 0x0000FF17, 0x7788977A, 0xAA999999, 0x12FF0000, 0x0000FF11, 0x96A99777, 0x77999991, 0x12FF0000, 0x0000FF19, 0x6A999999, 0x99999991, 0x14FF0000, 0x0000FF18, 0x87779999, 0x99999911, 0x2FF00000, 0x0000FF19, 0x99999999, 0x99999111, 0x5FF00000, 0x0000FF11, 0x11111999, 0x99911115, 0xFF000000, 0x0000FF11, 0x11111111, 0x1111125F, 0xF0000000, 0x0000FF21, 0x11111111, 0x11224FFF, 0x00000000, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000FFF, 0xFFFFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8420DEF7, 0xB5AD94A5, 0x52954211, 0x886F6867, 0x481FDD3D, 0xA3330001, 0x00010001, 0x00012109, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0xFFF42211, 0x19924FFF, 0x00000000, 0x0000000F, 0xF5211111, 0x9C91625F, 0xF0000000, 0x000000FF, 0x41111119, 0xCC966115, 0xFF000000, 0x00000FF5, 0x1111119C, 0xCA666111, 0x5FF00000, 0x00000FF2, 0x111119CC, 0x8A661111, 0x2FF00000, 0x0000FF41, 0x11119CCC, 0xA6661111, 0x14FF0000, 0x0000FF21, 0x1119CCC8, 0xA6611111, 0x12FF0000, 0x0000FF21, 0x119CCC8A, 0x66611111, 0x12FF0000, 0x0000FF11, 0x1898CCC8, 0xA6111111, 0x11FF0000, 0x0000FF11, 0x11898CCC, 0x9A611111, 0x11FF0000, 0x0000FF11, 0x11189CCC, 0x89761111, 0x11FF0000, 0x0000FF11, 0x111189CC, 0xC8961111, 0x11FF0000, 0x0000FF11, 0x1111199C, 0xCCC96111, 0x12FF0000, 0x0000FF11, 0x111119CC, 0xCC8A6611, 0x12FF0000, 0x0000FF11, 0x11119CCC, 0x8A766611, 0x14FF0000, 0x0000FF11, 0x1119CC8A, 0x76666111, 0x2FF00000, 0x0000FF11, 0x119C9A76, 0x66611111, 0x5FF00000, 0x0000FF11, 0x1AAA7666, 0x61111115, 0xFF000000, 0x0000FF11, 0x11116661, 0x1111125F, 0xF0000000, 0x0000FF21, 0x11666111, 0x11224FFF, 0x00000000, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000FFF, 0xFFFFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8420DEF1, 0xB5A9949D, 0x5AD3420D, 0xC4F5BC1D, 0xEDC7DC85, 0xC383B241, 0xFE87F801, 0xF8012109, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000FFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x0FFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000000, 0xFFF56666, 0x66665FFF, 0x00000000, 0x0000000F, 0xF5666666, 0x6666665F, 0xF0000000, 0x000000FF, 0x56666911, 0x11966665, 0xFF000000, 0x00000FF5, 0x66691111, 0x11119666, 0x5FF00000, 0x00000FF6, 0x66111111, 0x11111166, 0x6FF00000, 0x0000FF56, 0x69111196, 0x69111196, 0x65FF0000, 0x0000FF66, 0x61119666, 0x66691116, 0x66FF0000, 0x0000FF66, 0x91116666, 0x66661119, 0x66FF0000, 0x0000FF66, 0x11196666, 0x66669111, 0x66FF0000, 0x0000FF66, 0x11166666, 0x66666111, 0x66FF0000, 0x0000FF11, 0x66691111, 0x11119666, 0x11FF0000, 0x0000FF11, 0x66691111, 0x11119666, 0x11FF0000, 0x0000FF11, 0x66661111, 0x11116666, 0x19FF0000, 0x0000FF11, 0x96669111, 0x11196669, 0x19FF0000, 0x0000FF11, 0x16666691, 0x19666661, 0x16FF0000, 0x0000FF11, 0x11666666, 0x66666611, 0x9FF00000, 0x0000FF11, 0x11166666, 0x66666111, 0x6FF00000, 0x0000FF11, 0x11119666, 0x66691116, 0xFF000000, 0x0000FF11, 0x11111111, 0x1111196F, 0xF0000000, 0x0000FF91, 0x11111111, 0x11996FFF, 0x00000000, 0x0000FFFF, 0xFFFFFFFF, 0xFFFFFFF0, 0x00000000, 0x00000FFF, 0xFFFFFFFF, 0xFFFFF000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8420E731, 0xCFBB2F31, 0x05E74211, 0x5295F3BB, 0xED67B5A7, 0xBB6F0001, 0x00010001, 0x00012109, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x802A2170, 0x802A2370, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x802A2390, 0x802A2590, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, 0x802A25B0, 0x802A27B0, 0x00000003, 0x00000000 -glabel D_802A2848_732B48 -.word 0x802A27F8, 0x802A2820, 0x802A27D0, 0x802A27F8 - -glabel D_802A2858_732B58 -.short 0x0000 - -glabel D_802A285A_732B5A -.short 0x0000, 0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0004, 0x8027, 0x33C4, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x000A, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x00D3, 0x0000, 0x0025, 0x0000, 0x0002, 0xFE36, 0x3C8A, 0x0000, 0x00D3, 0x0000, 0x0024, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0000, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x1BB0, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x207C, 0x0000, 0x0043, 0x0000, 0x0001, 0x802A, 0x1A8C, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xAAA8, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0027, 0x0000, 0x0002, 0xFE36, 0x3C80, 0x0000, 0x0014, 0x0000, 0x0027, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0019, 0x0000, 0x0043, 0x0000, 0x0005, 0x802A, 0x18D8, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0xFE36, 0x3C83, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xAAA8, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0027, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0019, 0x0000, 0x0043, 0x0000, 0x0005, 0x802D, 0x7520, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0xFE36, 0x3C83, 0x0000, 0x0043, 0x0000, 0x0002, 0x802A, 0x19EC, 0xFE36, 0x3C83, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x000A, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0032, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x001E, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xAAA8, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0043, 0x0000, 0x0005, 0x802D, 0x75D8, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0xFE36, 0x3C83, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x001F, 0x0000, 0x0012, 0x0000, 0x0000, 0x0000, 0x0025, 0x0000, 0x0002, 0xFE36, 0x3C8A, 0x0000, 0x00D2, 0x0000, 0x0024, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0000, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x1BB0, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x207C, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x001F, 0x0000, 0x0013, 0x0000, 0x0000, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x000A, 0x0000, 0x0056, 0x0000, 0x0000, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x00DC, 0x0000, 0x0043, 0x0000, 0x0003, 0x8025, 0x385C, 0x0000, 0x0000, 0x0000, 0x03F3, 0x0000, 0x0057, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0003, 0x8025, 0x385C, 0x0000, 0x0000, 0x0000, 0x0368, 0x0000, 0x0043, 0x0000, 0x0001, 0x802A, 0x13E4, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0014, 0x0000, 0x0001, 0xFE36, 0x3C80, 0x0000, 0x0016, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x2B70, 0x0000, 0x0016, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x2C40, 0x0000, 0x0016, 0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x2D10, 0x0000, 0x0023, 0x0000, 0x0000, 0x0000, 0x0046, 0x0000, 0x0001, 0x802A, 0x1FE0, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xAAA8, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0027, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x000F, 0x802D, 0x829C, 0x0000, 0x0057, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0xF24A, 0x7E80, 0x0000, 0x001E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0001, 0x802A, 0x1AD8, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x0003, 0x8025, 0x12B4, 0x0000, 0x0010, 0x0000, 0x003C, 0x0000, 0x0043, 0x0000, 0x0001, 0x8025, 0x13CC, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0002, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xAAA8, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0027, 0x0000, 0x0002, 0xFE36, 0x3C81, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x000F, 0x802D, 0x829C, 0x0000, 0x0033, 0x0000, 0x0006, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0xF24A, 0x7E80, 0x0000, 0x001E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0001, 0x802A, 0x1B14, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x0003, 0x8025, 0x12B4, 0x0000, 0x0011, 0x0000, 0x003C, 0x0000, 0x0043, 0x0000, 0x0001, 0x8025, 0x13CC, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0004, 0x8026, 0xB1B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0003, 0x0004, 0x0000, 0x0043, 0x0000, 0x0002, 0x8026, 0xA3A8, 0x0000, 0x0000, 0x0000, 0x0043, 0x0000, 0x0005, 0x8026, 0xA820, 0x0000, 0x0000, 0xFE36, 0x3C80, 0xFE36, 0x3C81, 0xFE36, 0x3C82, 0x0000, 0x0044, 0x0000, 0x0001, 0x8029, 0x45E0, 0x0000, 0x0043, 0x0000, 0x0001, 0x802A, 0x1B68, 0x0000, 0x0008, 0x0000, 0x0001, 0x0000, 0x0014, 0x0000, 0x0043, 0x0000, 0x0003, 0x8025, 0x12B4, 0x0000, 0x000B, 0x0000, 0x003C, 0x0000, 0x0043, 0x0000, 0x0001, 0x8025, 0x13CC, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -glabel jtbl_802A2DB0_7330B0 -.word L802A1434_731734, L802A14D0_7317D0, L802A1614_731914, L802A1698_731998, L802A1734_731A34, L802A1754_731A54, 0, 0 diff --git a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1000_727910.s b/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1000_727910.s deleted file mode 100644 index 0302fbbe72..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1000_727910.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_727910 -/* 727910 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 727914 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 727918 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72791C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 727920 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 727924 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 727928 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72792C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 727930 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 727934 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 727938 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72793C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 727940 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 727944 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 727948 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72794C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 727950 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 727954 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 727958 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72795C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 727960 802A1050 00021140 */ sll $v0, $v0, 5 -/* 727964 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 727968 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72796C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 727970 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 727974 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 727978 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72797C 802A106C 00000000 */ nop -/* 727980 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 727984 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 727988 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72798C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 727990 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 727994 802A1084 1A400045 */ blez $s2, .L802A119C -/* 727998 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72799C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 7279A0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 7279A4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 7279A8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 7279AC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7279B0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7279B4 802A10A4 00440018 */ mult $v0, $a0 -/* 7279B8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7279BC 802A10AC 00004010 */ mfhi $t0 -/* 7279C0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 7279C4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 7279C8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 7279CC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 7279D0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 7279D4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 7279D8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 7279DC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7279E0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7279E4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7279E8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7279EC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7279F0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7279F4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7279F8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7279FC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 727A00 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 727A04 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 727A08 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 727A0C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 727A10 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 727A14 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 727A18 802A1108 0C04C4FD */ jal make_item_entity -/* 727A1C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 727A20 802A1110 0C03A830 */ jal add_coins -/* 727A24 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 727A28 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 727A2C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 727A30 802A1120 00000000 */ nop -.L802A1124: -/* 727A34 802A1124 00101040 */ sll $v0, $s0, 1 -/* 727A38 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 727A3C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 727A40 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 727A44 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 727A48 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 727A4C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 727A50 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 727A54 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 727A58 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 727A5C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 727A60 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 727A64 802A1154 44050000 */ mfc1 $a1, $f0 -/* 727A68 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 727A6C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 727A70 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 727A74 802A1164 0C00B94E */ jal get_screen_coords -/* 727A78 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 727A7C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 727A80 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 727A84 802A1174 0C050529 */ jal create_icon -/* 727A88 802A1178 00000000 */ nop -/* 727A8C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 727A90 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 727A94 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 727A98 802A1188 3C01802A */ lui $at, %hi(D_802A1CD4) -/* 727A9C 802A118C AC241CD4 */ sw $a0, %lo(D_802A1CD4)($at) -/* 727AA0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 727AA4 802A1194 0C051261 */ jal set_icon_render_pos -/* 727AA8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 727AAC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 727AB0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 727AB4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 727AB8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 727ABC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 727AC0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 727AC4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 727AC8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 727ACC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 727AD0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 727AD4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 727AD8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 727ADC 802A11CC 03E00008 */ jr $ra -/* 727AE0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A11D4_727AE4.s b/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A11D4_727AE4.s deleted file mode 100644 index 6676bd056e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A11D4_727AE4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_727AE4 -/* 727AE4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 727AE8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 727AEC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 727AF0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 727AF4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 727AF8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 727AFC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 727B00 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 727B04 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 727B08 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 727B0C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 727B10 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 727B14 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 727B18 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 727B1C 802A120C 00000000 */ nop -/* 727B20 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 727B24 802A1214 00000000 */ nop -/* 727B28 802A1218 3C04802A */ lui $a0, %hi(D_802A1CD4) -/* 727B2C 802A121C 8C841CD4 */ lw $a0, %lo(D_802A1CD4)($a0) -/* 727B30 802A1220 0C05123D */ jal free_icon -/* 727B34 802A1224 00000000 */ nop -.L802A1228: -/* 727B38 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 727B3C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 727B40 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 727B44 802A1234 03E00008 */ jr $ra -/* 727B48 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A123C_727B4C.s b/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A123C_727B4C.s deleted file mode 100644 index 14e33b2094..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A123C_727B4C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_727B4C -/* 727B4C 802A123C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 727B50 802A1240 0000202D */ daddu $a0, $zero, $zero -/* 727B54 802A1244 0080282D */ daddu $a1, $a0, $zero -/* 727B58 802A1248 24060140 */ addiu $a2, $zero, 0x140 -/* 727B5C 802A124C 3C014320 */ lui $at, 0x4320 -/* 727B60 802A1250 44810000 */ mtc1 $at, $f0 -/* 727B64 802A1254 240700F0 */ addiu $a3, $zero, 0xf0 -/* 727B68 802A1258 AFBF0018 */ sw $ra, 0x18($sp) -/* 727B6C 802A125C 0C04E362 */ jal func_80138D88 -/* 727B70 802A1260 E7A00010 */ swc1 $f0, 0x10($sp) -/* 727B74 802A1264 8FBF0018 */ lw $ra, 0x18($sp) -/* 727B78 802A1268 03E00008 */ jr $ra -/* 727B7C 802A126C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1270_727B80.s b/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1270_727B80.s deleted file mode 100644 index 1a5d8656a9..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1270_727B80.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1270_727B80 -/* 727B80 802A1270 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 727B84 802A1274 AFB00018 */ sw $s0, 0x18($sp) -/* 727B88 802A1278 0080802D */ daddu $s0, $a0, $zero -/* 727B8C 802A127C AFB1001C */ sw $s1, 0x1c($sp) -/* 727B90 802A1280 3C11800B */ lui $s1, %hi(gCameras+0x558) -/* 727B94 802A1284 263122D8 */ addiu $s1, $s1, %lo(gCameras+0x558) -/* 727B98 802A1288 10A00002 */ beqz $a1, .L802A1294 -/* 727B9C 802A128C AFBF0020 */ sw $ra, 0x20($sp) -/* 727BA0 802A1290 AE000070 */ sw $zero, 0x70($s0) -.L802A1294: -/* 727BA4 802A1294 8E030070 */ lw $v1, 0x70($s0) -/* 727BA8 802A1298 10600005 */ beqz $v1, .L802A12B0 -/* 727BAC 802A129C 24020001 */ addiu $v0, $zero, 1 -/* 727BB0 802A12A0 10620010 */ beq $v1, $v0, .L802A12E4 -/* 727BB4 802A12A4 0000102D */ daddu $v0, $zero, $zero -/* 727BB8 802A12A8 080A84EF */ j .L802A13BC -/* 727BBC 802A12AC 00000000 */ nop -.L802A12B0: -/* 727BC0 802A12B0 24042033 */ addiu $a0, $zero, 0x2033 -/* 727BC4 802A12B4 AE000074 */ sw $zero, 0x74($s0) -/* 727BC8 802A12B8 0C05272D */ jal play_sound -/* 727BCC 802A12BC AE000078 */ sw $zero, 0x78($s0) -/* 727BD0 802A12C0 0000202D */ daddu $a0, $zero, $zero -/* 727BD4 802A12C4 3C05802A */ lui $a1, %hi(func_802A123C_727B4C) -/* 727BD8 802A12C8 24A5123C */ addiu $a1, $a1, %lo(func_802A123C_727B4C) -/* 727BDC 802A12CC 0C048C8F */ jal bind_dynamic_entity_7 -/* 727BE0 802A12D0 A620001C */ sh $zero, 0x1c($s1) -/* 727BE4 802A12D4 3C01802A */ lui $at, %hi(D_802A1CD0) -/* 727BE8 802A12D8 AC221CD0 */ sw $v0, %lo(D_802A1CD0)($at) -/* 727BEC 802A12DC 24020001 */ addiu $v0, $zero, 1 -/* 727BF0 802A12E0 AE020070 */ sw $v0, 0x70($s0) -.L802A12E4: -/* 727BF4 802A12E4 96220000 */ lhu $v0, ($s1) -/* 727BF8 802A12E8 34420008 */ ori $v0, $v0, 8 -/* 727BFC 802A12EC A6220000 */ sh $v0, ($s1) -/* 727C00 802A12F0 C6000074 */ lwc1 $f0, 0x74($s0) -/* 727C04 802A12F4 46800020 */ cvt.s.w $f0, $f0 -/* 727C08 802A12F8 44050000 */ mfc1 $a1, $f0 -/* 727C0C 802A12FC 44800000 */ mtc1 $zero, $f0 -/* 727C10 802A1300 3C013F80 */ lui $at, 0x3f80 -/* 727C14 802A1304 44811000 */ mtc1 $at, $f2 -/* 727C18 802A1308 44060000 */ mfc1 $a2, $f0 -/* 727C1C 802A130C 26240194 */ addiu $a0, $s1, 0x194 -/* 727C20 802A1310 E7A20010 */ swc1 $f2, 0x10($sp) -/* 727C24 802A1314 0C019EC8 */ jal guRotateF -/* 727C28 802A1318 00C0382D */ daddu $a3, $a2, $zero -/* 727C2C 802A131C 8E020078 */ lw $v0, 0x78($s0) -/* 727C30 802A1320 3C0140C9 */ lui $at, 0x40c9 -/* 727C34 802A1324 34210FD0 */ ori $at, $at, 0xfd0 -/* 727C38 802A1328 44810000 */ mtc1 $at, $f0 -/* 727C3C 802A132C 2442005A */ addiu $v0, $v0, 0x5a -/* 727C40 802A1330 44826000 */ mtc1 $v0, $f12 -/* 727C44 802A1334 00000000 */ nop -/* 727C48 802A1338 46806320 */ cvt.s.w $f12, $f12 -/* 727C4C 802A133C 46006302 */ mul.s $f12, $f12, $f0 -/* 727C50 802A1340 00000000 */ nop -/* 727C54 802A1344 3C0143B4 */ lui $at, 0x43b4 -/* 727C58 802A1348 44810000 */ mtc1 $at, $f0 -/* 727C5C 802A134C 0C00A85B */ jal sin_rad -/* 727C60 802A1350 46006303 */ div.s $f12, $f12, $f0 -/* 727C64 802A1354 3C013FF0 */ lui $at, 0x3ff0 -/* 727C68 802A1358 44811800 */ mtc1 $at, $f3 -/* 727C6C 802A135C 44801000 */ mtc1 $zero, $f2 -/* 727C70 802A1360 46000021 */ cvt.d.s $f0, $f0 -/* 727C74 802A1364 46201081 */ sub.d $f2, $f2, $f0 -/* 727C78 802A1368 3C01802A */ lui $at, %hi(D_802A1CC0_7285D0) -/* 727C7C 802A136C D4201CC0 */ ldc1 $f0, %lo(D_802A1CC0_7285D0)($at) -/* 727C80 802A1370 46201082 */ mul.d $f2, $f2, $f0 -/* 727C84 802A1374 00000000 */ nop -/* 727C88 802A1378 8E020078 */ lw $v0, 0x78($s0) -/* 727C8C 802A137C 24420001 */ addiu $v0, $v0, 1 -/* 727C90 802A1380 46221080 */ add.d $f2, $f2, $f2 -/* 727C94 802A1384 AE020078 */ sw $v0, 0x78($s0) -/* 727C98 802A1388 2842005B */ slti $v0, $v0, 0x5b -/* 727C9C 802A138C 4620110D */ trunc.w.d $f4, $f2 -/* 727CA0 802A1390 E6040074 */ swc1 $f4, 0x74($s0) -/* 727CA4 802A1394 54400009 */ bnel $v0, $zero, .L802A13BC -/* 727CA8 802A1398 0000102D */ daddu $v0, $zero, $zero -/* 727CAC 802A139C 3C04802A */ lui $a0, %hi(D_802A1CD0) -/* 727CB0 802A13A0 8C841CD0 */ lw $a0, %lo(D_802A1CD0)($a0) -/* 727CB4 802A13A4 96220000 */ lhu $v0, ($s1) -/* 727CB8 802A13A8 A620001C */ sh $zero, 0x1c($s1) -/* 727CBC 802A13AC 3042FFF7 */ andi $v0, $v0, 0xfff7 -/* 727CC0 802A13B0 0C048D70 */ jal func_801235C0 -/* 727CC4 802A13B4 A6220000 */ sh $v0, ($s1) -/* 727CC8 802A13B8 24020002 */ addiu $v0, $zero, 2 -.L802A13BC: -/* 727CCC 802A13BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 727CD0 802A13C0 8FB1001C */ lw $s1, 0x1c($sp) -/* 727CD4 802A13C4 8FB00018 */ lw $s0, 0x18($sp) -/* 727CD8 802A13C8 03E00008 */ jr $ra -/* 727CDC 802A13CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A1000_71CCE0.s b/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A1000_71CCE0.s deleted file mode 100644 index 0a1ba6689f..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A1000_71CCE0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71CCE0 -/* 71CCE0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71CCE4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71CCE8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71CCEC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71CCF0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71CCF4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71CCF8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71CCFC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71CD00 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71CD04 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71CD08 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71CD0C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71CD10 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71CD14 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71CD18 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71CD1C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71CD20 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71CD24 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71CD28 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71CD2C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71CD30 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71CD34 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71CD38 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71CD3C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71CD40 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71CD44 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71CD48 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71CD4C 802A106C 00000000 */ nop -/* 71CD50 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71CD54 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71CD58 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71CD5C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71CD60 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71CD64 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71CD68 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71CD6C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71CD70 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71CD74 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71CD78 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71CD7C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71CD80 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71CD84 802A10A4 00440018 */ mult $v0, $a0 -/* 71CD88 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71CD8C 802A10AC 00004010 */ mfhi $t0 -/* 71CD90 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71CD94 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71CD98 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71CD9C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71CDA0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71CDA4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71CDA8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71CDAC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71CDB0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71CDB4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71CDB8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71CDBC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71CDC0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71CDC4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71CDC8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71CDCC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71CDD0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71CDD4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71CDD8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71CDDC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71CDE0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71CDE4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71CDE8 802A1108 0C04C4FD */ jal make_item_entity -/* 71CDEC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71CDF0 802A1110 0C03A830 */ jal add_coins -/* 71CDF4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71CDF8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71CDFC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71CE00 802A1120 00000000 */ nop -.L802A1124: -/* 71CE04 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71CE08 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71CE0C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71CE10 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71CE14 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71CE18 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71CE1C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71CE20 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71CE24 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71CE28 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71CE2C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71CE30 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71CE34 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71CE38 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71CE3C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71CE40 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71CE44 802A1164 0C00B94E */ jal get_screen_coords -/* 71CE48 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71CE4C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71CE50 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71CE54 802A1174 0C050529 */ jal create_icon -/* 71CE58 802A1178 00000000 */ nop -/* 71CE5C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71CE60 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71CE64 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71CE68 802A1188 3C01802A */ lui $at, %hi(D_802A1A90) -/* 71CE6C 802A118C AC241A90 */ sw $a0, %lo(D_802A1A90)($at) -/* 71CE70 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71CE74 802A1194 0C051261 */ jal set_icon_render_pos -/* 71CE78 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71CE7C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71CE80 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71CE84 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71CE88 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71CE8C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71CE90 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71CE94 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71CE98 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71CE9C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71CEA0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71CEA4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71CEA8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71CEAC 802A11CC 03E00008 */ jr $ra -/* 71CEB0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A11D4_71CEB4.s b/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A11D4_71CEB4.s deleted file mode 100644 index 7f16cf5e65..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A11D4_71CEB4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71CEB4 -/* 71CEB4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71CEB8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71CEBC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71CEC0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71CEC4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71CEC8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71CECC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71CED0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71CED4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71CED8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71CEDC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71CEE0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71CEE4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71CEE8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71CEEC 802A120C 00000000 */ nop -/* 71CEF0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71CEF4 802A1214 00000000 */ nop -/* 71CEF8 802A1218 3C04802A */ lui $a0, %hi(D_802A1A90) -/* 71CEFC 802A121C 8C841A90 */ lw $a0, %lo(D_802A1A90)($a0) -/* 71CF00 802A1220 0C05123D */ jal free_icon -/* 71CF04 802A1224 00000000 */ nop -.L802A1228: -/* 71CF08 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71CF0C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71CF10 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71CF14 802A1234 03E00008 */ jr $ra -/* 71CF18 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A123C_71CF1C.s b/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A123C_71CF1C.s deleted file mode 100644 index 720ca1c208..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A123C_71CF1C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_71CF1C -/* 71CF1C 802A123C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 71CF20 802A1240 AFB1001C */ sw $s1, 0x1c($sp) -/* 71CF24 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 71CF28 802A1248 AFBF0028 */ sw $ra, 0x28($sp) -/* 71CF2C 802A124C AFB30024 */ sw $s3, 0x24($sp) -/* 71CF30 802A1250 AFB20020 */ sw $s2, 0x20($sp) -/* 71CF34 802A1254 AFB00018 */ sw $s0, 0x18($sp) -/* 71CF38 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 71CF3C 802A125C 8E050000 */ lw $a1, ($s0) -/* 71CF40 802A1260 0C0B1EAF */ jal get_variable -/* 71CF44 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 71CF48 802A1268 8E050000 */ lw $a1, ($s0) -/* 71CF4C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 71CF50 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 71CF54 802A1274 0C0B1EAF */ jal get_variable -/* 71CF58 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 71CF5C 802A127C 8E050000 */ lw $a1, ($s0) -/* 71CF60 802A1280 26100004 */ addiu $s0, $s0, 4 -/* 71CF64 802A1284 0220202D */ daddu $a0, $s1, $zero -/* 71CF68 802A1288 0C0B1EAF */ jal get_variable -/* 71CF6C 802A128C 0040902D */ daddu $s2, $v0, $zero -/* 71CF70 802A1290 0220202D */ daddu $a0, $s1, $zero -/* 71CF74 802A1294 8E050000 */ lw $a1, ($s0) -/* 71CF78 802A1298 0C0B1EAF */ jal get_variable -/* 71CF7C 802A129C 0040802D */ daddu $s0, $v0, $zero -/* 71CF80 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 71CF84 802A12A4 00000000 */ nop -/* 71CF88 802A12A8 46800020 */ cvt.s.w $f0, $f0 -/* 71CF8C 802A12AC 44050000 */ mfc1 $a1, $f0 -/* 71CF90 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 71CF94 802A12B4 00000000 */ nop -/* 71CF98 802A12B8 46800020 */ cvt.s.w $f0, $f0 -/* 71CF9C 802A12BC 44060000 */ mfc1 $a2, $f0 -/* 71CFA0 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 71CFA4 802A12C4 00000000 */ nop -/* 71CFA8 802A12C8 46800020 */ cvt.s.w $f0, $f0 -/* 71CFAC 802A12CC 44070000 */ mfc1 $a3, $f0 -/* 71CFB0 802A12D0 0000202D */ daddu $a0, $zero, $zero -/* 71CFB4 802A12D4 0C01C424 */ jal func_80071090 -/* 71CFB8 802A12D8 AFA20010 */ sw $v0, 0x10($sp) -/* 71CFBC 802A12DC 8FBF0028 */ lw $ra, 0x28($sp) -/* 71CFC0 802A12E0 8FB30024 */ lw $s3, 0x24($sp) -/* 71CFC4 802A12E4 8FB20020 */ lw $s2, 0x20($sp) -/* 71CFC8 802A12E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 71CFCC 802A12EC 8FB00018 */ lw $s0, 0x18($sp) -/* 71CFD0 802A12F0 24020002 */ addiu $v0, $zero, 2 -/* 71CFD4 802A12F4 03E00008 */ jr $ra -/* 71CFD8 802A12F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A12FC_71CFDC.s b/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A12FC_71CFDC.s deleted file mode 100644 index 7312db9139..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dried_shroom_71CCE0/func_802A12FC_71CFDC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12FC_71CFDC -/* 71CFDC 802A12FC 3C048011 */ lui $a0, %hi(gPlayerData) -/* 71CFE0 802A1300 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) -/* 71CFE4 802A1304 90820002 */ lbu $v0, 2($a0) -/* 71CFE8 802A1308 80830003 */ lb $v1, 3($a0) -/* 71CFEC 802A130C 24420001 */ addiu $v0, $v0, 1 -/* 71CFF0 802A1310 A0820002 */ sb $v0, 2($a0) -/* 71CFF4 802A1314 00021600 */ sll $v0, $v0, 0x18 -/* 71CFF8 802A1318 00021603 */ sra $v0, $v0, 0x18 -/* 71CFFC 802A131C 0062182A */ slt $v1, $v1, $v0 -/* 71D000 802A1320 90820003 */ lbu $v0, 3($a0) -/* 71D004 802A1324 54600001 */ bnel $v1, $zero, .L802A132C -/* 71D008 802A1328 A0820002 */ sb $v0, 2($a0) -.L802A132C: -/* 71D00C 802A132C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A1000_7179D0.s b/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A1000_7179D0.s deleted file mode 100644 index 0ec3aa17df..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A1000_7179D0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7179D0 -/* 7179D0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7179D4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7179D8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7179DC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7179E0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7179E4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7179E8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7179EC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7179F0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7179F4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7179F8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7179FC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 717A00 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 717A04 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 717A08 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 717A0C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 717A10 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 717A14 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 717A18 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 717A1C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 717A20 802A1050 00021140 */ sll $v0, $v0, 5 -/* 717A24 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 717A28 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 717A2C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 717A30 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 717A34 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 717A38 802A1068 44820000 */ mtc1 $v0, $f0 -/* 717A3C 802A106C 00000000 */ nop -/* 717A40 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 717A44 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 717A48 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 717A4C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 717A50 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 717A54 802A1084 1A400045 */ blez $s2, .L802A119C -/* 717A58 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 717A5C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 717A60 802A1090 00121880 */ sll $v1, $s2, 2 -/* 717A64 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 717A68 802A1098 00031100 */ sll $v0, $v1, 4 -/* 717A6C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 717A70 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 717A74 802A10A4 00440018 */ mult $v0, $a0 -/* 717A78 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 717A7C 802A10AC 00004010 */ mfhi $t0 -/* 717A80 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 717A84 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 717A88 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 717A8C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 717A90 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 717A94 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 717A98 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 717A9C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 717AA0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 717AA4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 717AA8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 717AAC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 717AB0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 717AB4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 717AB8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 717ABC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 717AC0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 717AC4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 717AC8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 717ACC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 717AD0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 717AD4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 717AD8 802A1108 0C04C4FD */ jal make_item_entity -/* 717ADC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 717AE0 802A1110 0C03A830 */ jal add_coins -/* 717AE4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 717AE8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 717AEC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 717AF0 802A1120 00000000 */ nop -.L802A1124: -/* 717AF4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 717AF8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 717AFC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 717B00 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 717B04 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 717B08 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 717B0C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 717B10 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 717B14 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 717B18 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 717B1C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 717B20 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 717B24 802A1154 44050000 */ mfc1 $a1, $f0 -/* 717B28 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 717B2C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 717B30 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 717B34 802A1164 0C00B94E */ jal get_screen_coords -/* 717B38 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 717B3C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 717B40 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 717B44 802A1174 0C050529 */ jal create_icon -/* 717B48 802A1178 00000000 */ nop -/* 717B4C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 717B50 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 717B54 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 717B58 802A1188 3C01802A */ lui $at, %hi(D_802A1E80) -/* 717B5C 802A118C AC241E80 */ sw $a0, %lo(D_802A1E80)($at) -/* 717B60 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 717B64 802A1194 0C051261 */ jal set_icon_render_pos -/* 717B68 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 717B6C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 717B70 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 717B74 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 717B78 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 717B7C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 717B80 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 717B84 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 717B88 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 717B8C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 717B90 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 717B94 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 717B98 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 717B9C 802A11CC 03E00008 */ jr $ra -/* 717BA0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A11D4_717BA4.s b/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A11D4_717BA4.s deleted file mode 100644 index 8b39a3754a..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/dusty_hammer_7179D0/func_802A11D4_717BA4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_717BA4 -/* 717BA4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 717BA8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 717BAC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 717BB0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 717BB4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 717BB8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 717BBC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 717BC0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 717BC4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 717BC8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 717BCC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 717BD0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 717BD4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 717BD8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 717BDC 802A120C 00000000 */ nop -/* 717BE0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 717BE4 802A1214 00000000 */ nop -/* 717BE8 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) -/* 717BEC 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) -/* 717BF0 802A1220 0C05123D */ jal free_icon -/* 717BF4 802A1224 00000000 */ nop -.L802A1228: -/* 717BF8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 717BFC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 717C00 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 717C04 802A1234 03E00008 */ jr $ra -/* 717C08 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 717C0C 802A123C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A1000_728EC0.s b/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A1000_728EC0.s deleted file mode 100644 index 8260bb2b97..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A1000_728EC0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_728EC0 -/* 728EC0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 728EC4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 728EC8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 728ECC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 728ED0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 728ED4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 728ED8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 728EDC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 728EE0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 728EE4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 728EE8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 728EEC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 728EF0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 728EF4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 728EF8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 728EFC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 728F00 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 728F04 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 728F08 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 728F0C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 728F10 802A1050 00021140 */ sll $v0, $v0, 5 -/* 728F14 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 728F18 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 728F1C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 728F20 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 728F24 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 728F28 802A1068 44820000 */ mtc1 $v0, $f0 -/* 728F2C 802A106C 00000000 */ nop -/* 728F30 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 728F34 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 728F38 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 728F3C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 728F40 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 728F44 802A1084 1A400045 */ blez $s2, .L802A119C -/* 728F48 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 728F4C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 728F50 802A1090 00121880 */ sll $v1, $s2, 2 -/* 728F54 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 728F58 802A1098 00031100 */ sll $v0, $v1, 4 -/* 728F5C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 728F60 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 728F64 802A10A4 00440018 */ mult $v0, $a0 -/* 728F68 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 728F6C 802A10AC 00004010 */ mfhi $t0 -/* 728F70 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 728F74 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 728F78 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 728F7C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 728F80 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 728F84 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 728F88 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 728F8C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 728F90 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 728F94 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 728F98 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 728F9C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 728FA0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 728FA4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 728FA8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 728FAC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 728FB0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 728FB4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 728FB8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 728FBC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 728FC0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 728FC4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 728FC8 802A1108 0C04C4FD */ jal make_item_entity -/* 728FCC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 728FD0 802A1110 0C03A830 */ jal add_coins -/* 728FD4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 728FD8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 728FDC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 728FE0 802A1120 00000000 */ nop -.L802A1124: -/* 728FE4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 728FE8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 728FEC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 728FF0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 728FF4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 728FF8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 728FFC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 729000 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 729004 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 729008 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72900C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 729010 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 729014 802A1154 44050000 */ mfc1 $a1, $f0 -/* 729018 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72901C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 729020 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 729024 802A1164 0C00B94E */ jal get_screen_coords -/* 729028 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72902C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 729030 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 729034 802A1174 0C050529 */ jal create_icon -/* 729038 802A1178 00000000 */ nop -/* 72903C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 729040 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 729044 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 729048 802A1188 3C01802A */ lui $at, %hi(D_802A2890) -/* 72904C 802A118C AC242890 */ sw $a0, %lo(D_802A2890)($at) -/* 729050 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 729054 802A1194 0C051261 */ jal set_icon_render_pos -/* 729058 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72905C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 729060 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 729064 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 729068 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72906C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 729070 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 729074 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 729078 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72907C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 729080 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 729084 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 729088 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72908C 802A11CC 03E00008 */ jr $ra -/* 729090 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A11D4_729094.s b/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A11D4_729094.s deleted file mode 100644 index 8dbb7fbac8..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A11D4_729094.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_729094 -/* 729094 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 729098 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72909C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7290A0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7290A4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7290A8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7290AC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7290B0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7290B4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7290B8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7290BC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7290C0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7290C4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7290C8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7290CC 802A120C 00000000 */ nop -/* 7290D0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7290D4 802A1214 00000000 */ nop -/* 7290D8 802A1218 3C04802A */ lui $a0, %hi(D_802A2890) -/* 7290DC 802A121C 8C842890 */ lw $a0, %lo(D_802A2890)($a0) -/* 7290E0 802A1220 0C05123D */ jal free_icon -/* 7290E4 802A1224 00000000 */ nop -.L802A1228: -/* 7290E8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7290EC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 7290F0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 7290F4 802A1234 03E00008 */ jr $ra -/* 7290F8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A123C_7290FC.s b/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A123C_7290FC.s deleted file mode 100644 index 101711d756..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/egg_missile_728EC0/func_802A123C_7290FC.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_7290FC -/* 7290FC 802A123C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 729100 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 729104 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 729108 802A1248 AFBF001C */ sw $ra, 0x1c($sp) -/* 72910C 802A124C AFB20018 */ sw $s2, 0x18($sp) -/* 729110 802A1250 AFB00010 */ sw $s0, 0x10($sp) -/* 729114 802A1254 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 729118 802A1258 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 72911C 802A125C 8E30000C */ lw $s0, 0xc($s1) -/* 729120 802A1260 8E050000 */ lw $a1, ($s0) -/* 729124 802A1264 0C0B1EAF */ jal get_variable -/* 729128 802A1268 26100004 */ addiu $s0, $s0, 4 -/* 72912C 802A126C 8E050000 */ lw $a1, ($s0) -/* 729130 802A1270 26100004 */ addiu $s0, $s0, 4 -/* 729134 802A1274 0220202D */ daddu $a0, $s1, $zero -/* 729138 802A1278 0C0B1EAF */ jal get_variable -/* 72913C 802A127C 0040902D */ daddu $s2, $v0, $zero -/* 729140 802A1280 0220202D */ daddu $a0, $s1, $zero -/* 729144 802A1284 8E050000 */ lw $a1, ($s0) -/* 729148 802A1288 0C0B1EAF */ jal get_variable -/* 72914C 802A128C 0040802D */ daddu $s0, $v0, $zero -/* 729150 802A1290 4492B000 */ mtc1 $s2, $f22 -/* 729154 802A1294 00000000 */ nop -/* 729158 802A1298 4680B5A0 */ cvt.s.w $f22, $f22 -/* 72915C 802A129C 4482A000 */ mtc1 $v0, $f20 -/* 729160 802A12A0 00000000 */ nop -/* 729164 802A12A4 4680A520 */ cvt.s.w $f20, $f20 -/* 729168 802A12A8 44900000 */ mtc1 $s0, $f0 -/* 72916C 802A12AC 00000000 */ nop -/* 729170 802A12B0 46800020 */ cvt.s.w $f0, $f0 -/* 729174 802A12B4 4405B000 */ mfc1 $a1, $f22 -/* 729178 802A12B8 4407A000 */ mfc1 $a3, $f20 -/* 72917C 802A12BC 44060000 */ mfc1 $a2, $f0 -/* 729180 802A12C0 0C01C04C */ jal func_80070130 -/* 729184 802A12C4 0000202D */ daddu $a0, $zero, $zero -/* 729188 802A12C8 26100014 */ addiu $s0, $s0, 0x14 -/* 72918C 802A12CC 44900000 */ mtc1 $s0, $f0 -/* 729190 802A12D0 00000000 */ nop -/* 729194 802A12D4 46800020 */ cvt.s.w $f0, $f0 -/* 729198 802A12D8 4405B000 */ mfc1 $a1, $f22 -/* 72919C 802A12DC 4407A000 */ mfc1 $a3, $f20 -/* 7291A0 802A12E0 44060000 */ mfc1 $a2, $f0 -/* 7291A4 802A12E4 0C01C07C */ jal func_800701F0 -/* 7291A8 802A12E8 0000202D */ daddu $a0, $zero, $zero -/* 7291AC 802A12EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7291B0 802A12F0 8FB20018 */ lw $s2, 0x18($sp) -/* 7291B4 802A12F4 8FB10014 */ lw $s1, 0x14($sp) -/* 7291B8 802A12F8 8FB00010 */ lw $s0, 0x10($sp) -/* 7291BC 802A12FC D7B60028 */ ldc1 $f22, 0x28($sp) -/* 7291C0 802A1300 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7291C4 802A1304 24020002 */ addiu $v0, $zero, 2 -/* 7291C8 802A1308 03E00008 */ jr $ra -/* 7291CC 802A130C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1000_7305A0.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1000_7305A0.s deleted file mode 100644 index 8fdea879b4..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1000_7305A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7305A0 -/* 7305A0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7305A4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7305A8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7305AC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7305B0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7305B4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7305B8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7305BC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7305C0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7305C4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7305C8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7305CC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7305D0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7305D4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7305D8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7305DC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7305E0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7305E4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7305E8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7305EC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7305F0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7305F4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7305F8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7305FC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 730600 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 730604 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 730608 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73060C 802A106C 00000000 */ nop -/* 730610 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 730614 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 730618 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 73061C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 730620 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 730624 802A1084 1A400045 */ blez $s2, .L802A119C -/* 730628 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 73062C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 730630 802A1090 00121880 */ sll $v1, $s2, 2 -/* 730634 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 730638 802A1098 00031100 */ sll $v0, $v1, 4 -/* 73063C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 730640 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 730644 802A10A4 00440018 */ mult $v0, $a0 -/* 730648 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 73064C 802A10AC 00004010 */ mfhi $t0 -/* 730650 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 730654 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 730658 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 73065C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 730660 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 730664 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 730668 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 73066C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 730670 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 730674 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 730678 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 73067C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 730680 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 730684 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 730688 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 73068C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 730690 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 730694 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 730698 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 73069C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7306A0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7306A4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7306A8 802A1108 0C04C4FD */ jal make_item_entity -/* 7306AC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7306B0 802A1110 0C03A830 */ jal add_coins -/* 7306B4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7306B8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7306BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7306C0 802A1120 00000000 */ nop -.L802A1124: -/* 7306C4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7306C8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7306CC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 7306D0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7306D4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 7306D8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7306DC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7306E0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7306E4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 7306E8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 7306EC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7306F0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7306F4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7306F8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7306FC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 730700 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 730704 802A1164 0C00B94E */ jal get_screen_coords -/* 730708 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 73070C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 730710 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 730714 802A1174 0C050529 */ jal create_icon -/* 730718 802A1178 00000000 */ nop -/* 73071C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 730720 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 730724 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 730728 802A1188 3C01802A */ lui $at, %hi(D_802A1D60) -/* 73072C 802A118C AC241D60 */ sw $a0, %lo(D_802A1D60)($at) -/* 730730 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 730734 802A1194 0C051261 */ jal set_icon_render_pos -/* 730738 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 73073C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 730740 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 730744 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 730748 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 73074C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 730750 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 730754 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 730758 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 73075C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 730760 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 730764 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 730768 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 73076C 802A11CC 03E00008 */ jr $ra -/* 730770 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A11D4_730774.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A11D4_730774.s deleted file mode 100644 index 627054344c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A11D4_730774.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_730774 -/* 730774 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 730778 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 73077C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 730780 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 730784 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 730788 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 73078C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 730790 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 730794 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 730798 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 73079C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7307A0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7307A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7307A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7307AC 802A120C 00000000 */ nop -/* 7307B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7307B4 802A1214 00000000 */ nop -/* 7307B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1D60) -/* 7307BC 802A121C 8C841D60 */ lw $a0, %lo(D_802A1D60)($a0) -/* 7307C0 802A1220 0C05123D */ jal free_icon -/* 7307C4 802A1224 00000000 */ nop -.L802A1228: -/* 7307C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7307CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 7307D0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 7307D4 802A1234 03E00008 */ jr $ra -/* 7307D8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A123C_7307DC.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A123C_7307DC.s deleted file mode 100644 index 713d3321cf..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A123C_7307DC.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_7307DC -/* 7307DC 802A123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7307E0 802A1240 0080102D */ daddu $v0, $a0, $zero -/* 7307E4 802A1244 AFB00010 */ sw $s0, 0x10($sp) -/* 7307E8 802A1248 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 7307EC 802A124C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 7307F0 802A1250 2405000B */ addiu $a1, $zero, 0xb -/* 7307F4 802A1254 AFBF0014 */ sw $ra, 0x14($sp) -/* 7307F8 802A1258 8C460084 */ lw $a2, 0x84($v0) -/* 7307FC 802A125C 0C0997D0 */ jal inflict_status -/* 730800 802A1260 0200202D */ daddu $a0, $s0, $zero -/* 730804 802A1264 A200021C */ sb $zero, 0x21c($s0) -/* 730808 802A1268 8FBF0014 */ lw $ra, 0x14($sp) -/* 73080C 802A126C 8FB00010 */ lw $s0, 0x10($sp) -/* 730810 802A1270 24020002 */ addiu $v0, $zero, 2 -/* 730814 802A1274 03E00008 */ jr $ra -/* 730818 802A1278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A127C_73081C.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A127C_73081C.s deleted file mode 100644 index 6f0fc5a802..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A127C_73081C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A127C_73081C -/* 73081C 802A127C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 730820 802A1280 AFB1001C */ sw $s1, 0x1c($sp) -/* 730824 802A1284 0080882D */ daddu $s1, $a0, $zero -/* 730828 802A1288 AFBF0028 */ sw $ra, 0x28($sp) -/* 73082C 802A128C AFB30024 */ sw $s3, 0x24($sp) -/* 730830 802A1290 AFB20020 */ sw $s2, 0x20($sp) -/* 730834 802A1294 AFB00018 */ sw $s0, 0x18($sp) -/* 730838 802A1298 8E30000C */ lw $s0, 0xc($s1) -/* 73083C 802A129C 8E050000 */ lw $a1, ($s0) -/* 730840 802A12A0 0C0B1EAF */ jal get_variable -/* 730844 802A12A4 26100004 */ addiu $s0, $s0, 4 -/* 730848 802A12A8 8E050000 */ lw $a1, ($s0) -/* 73084C 802A12AC 26100004 */ addiu $s0, $s0, 4 -/* 730850 802A12B0 0220202D */ daddu $a0, $s1, $zero -/* 730854 802A12B4 0C0B1EAF */ jal get_variable -/* 730858 802A12B8 0040982D */ daddu $s3, $v0, $zero -/* 73085C 802A12BC 8E050000 */ lw $a1, ($s0) -/* 730860 802A12C0 26100004 */ addiu $s0, $s0, 4 -/* 730864 802A12C4 0220202D */ daddu $a0, $s1, $zero -/* 730868 802A12C8 0C0B1EAF */ jal get_variable -/* 73086C 802A12CC 0040902D */ daddu $s2, $v0, $zero -/* 730870 802A12D0 0220202D */ daddu $a0, $s1, $zero -/* 730874 802A12D4 8E050000 */ lw $a1, ($s0) -/* 730878 802A12D8 0C0B1EAF */ jal get_variable -/* 73087C 802A12DC 0040802D */ daddu $s0, $v0, $zero -/* 730880 802A12E0 44930000 */ mtc1 $s3, $f0 -/* 730884 802A12E4 00000000 */ nop -/* 730888 802A12E8 46800020 */ cvt.s.w $f0, $f0 -/* 73088C 802A12EC 44050000 */ mfc1 $a1, $f0 -/* 730890 802A12F0 44920000 */ mtc1 $s2, $f0 -/* 730894 802A12F4 00000000 */ nop -/* 730898 802A12F8 46800020 */ cvt.s.w $f0, $f0 -/* 73089C 802A12FC 44060000 */ mfc1 $a2, $f0 -/* 7308A0 802A1300 44900000 */ mtc1 $s0, $f0 -/* 7308A4 802A1304 00000000 */ nop -/* 7308A8 802A1308 46800020 */ cvt.s.w $f0, $f0 -/* 7308AC 802A130C 44070000 */ mfc1 $a3, $f0 -/* 7308B0 802A1310 0000202D */ daddu $a0, $zero, $zero -/* 7308B4 802A1314 0C01C424 */ jal func_80071090 -/* 7308B8 802A1318 AFA20010 */ sw $v0, 0x10($sp) -/* 7308BC 802A131C 8FBF0028 */ lw $ra, 0x28($sp) -/* 7308C0 802A1320 8FB30024 */ lw $s3, 0x24($sp) -/* 7308C4 802A1324 8FB20020 */ lw $s2, 0x20($sp) -/* 7308C8 802A1328 8FB1001C */ lw $s1, 0x1c($sp) -/* 7308CC 802A132C 8FB00018 */ lw $s0, 0x18($sp) -/* 7308D0 802A1330 24020002 */ addiu $v0, $zero, 2 -/* 7308D4 802A1334 03E00008 */ jr $ra -/* 7308D8 802A1338 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A133C_7308DC.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A133C_7308DC.s deleted file mode 100644 index 522d37e91d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A133C_7308DC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A133C_7308DC -/* 7308DC 802A133C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7308E0 802A1340 AFB1001C */ sw $s1, 0x1c($sp) -/* 7308E4 802A1344 0080882D */ daddu $s1, $a0, $zero -/* 7308E8 802A1348 AFBF0028 */ sw $ra, 0x28($sp) -/* 7308EC 802A134C AFB30024 */ sw $s3, 0x24($sp) -/* 7308F0 802A1350 AFB20020 */ sw $s2, 0x20($sp) -/* 7308F4 802A1354 AFB00018 */ sw $s0, 0x18($sp) -/* 7308F8 802A1358 8E30000C */ lw $s0, 0xc($s1) -/* 7308FC 802A135C 8E050000 */ lw $a1, ($s0) -/* 730900 802A1360 0C0B1EAF */ jal get_variable -/* 730904 802A1364 26100004 */ addiu $s0, $s0, 4 -/* 730908 802A1368 8E050000 */ lw $a1, ($s0) -/* 73090C 802A136C 26100004 */ addiu $s0, $s0, 4 -/* 730910 802A1370 0220202D */ daddu $a0, $s1, $zero -/* 730914 802A1374 0C0B1EAF */ jal get_variable -/* 730918 802A1378 0040982D */ daddu $s3, $v0, $zero -/* 73091C 802A137C 8E050000 */ lw $a1, ($s0) -/* 730920 802A1380 26100004 */ addiu $s0, $s0, 4 -/* 730924 802A1384 0220202D */ daddu $a0, $s1, $zero -/* 730928 802A1388 0C0B1EAF */ jal get_variable -/* 73092C 802A138C 0040902D */ daddu $s2, $v0, $zero -/* 730930 802A1390 0220202D */ daddu $a0, $s1, $zero -/* 730934 802A1394 8E050000 */ lw $a1, ($s0) -/* 730938 802A1398 0C0B1EAF */ jal get_variable -/* 73093C 802A139C 0040802D */ daddu $s0, $v0, $zero -/* 730940 802A13A0 44930000 */ mtc1 $s3, $f0 -/* 730944 802A13A4 00000000 */ nop -/* 730948 802A13A8 46800020 */ cvt.s.w $f0, $f0 -/* 73094C 802A13AC 44050000 */ mfc1 $a1, $f0 -/* 730950 802A13B0 44920000 */ mtc1 $s2, $f0 -/* 730954 802A13B4 00000000 */ nop -/* 730958 802A13B8 46800020 */ cvt.s.w $f0, $f0 -/* 73095C 802A13BC 44060000 */ mfc1 $a2, $f0 -/* 730960 802A13C0 44900000 */ mtc1 $s0, $f0 -/* 730964 802A13C4 00000000 */ nop -/* 730968 802A13C8 46800020 */ cvt.s.w $f0, $f0 -/* 73096C 802A13CC 44070000 */ mfc1 $a3, $f0 -/* 730970 802A13D0 24040001 */ addiu $a0, $zero, 1 -/* 730974 802A13D4 0C01C424 */ jal func_80071090 -/* 730978 802A13D8 AFA20010 */ sw $v0, 0x10($sp) -/* 73097C 802A13DC 8FBF0028 */ lw $ra, 0x28($sp) -/* 730980 802A13E0 8FB30024 */ lw $s3, 0x24($sp) -/* 730984 802A13E4 8FB20020 */ lw $s2, 0x20($sp) -/* 730988 802A13E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 73098C 802A13EC 8FB00018 */ lw $s0, 0x18($sp) -/* 730990 802A13F0 24020002 */ addiu $v0, $zero, 2 -/* 730994 802A13F4 03E00008 */ jr $ra -/* 730998 802A13F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1450_7309F0.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1450_7309F0.s deleted file mode 100644 index 452e0da1ca..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A1450_7309F0.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1450_7309F0 -/* 7309F0 802A1450 3C058011 */ lui $a1, %hi(gPlayerData) -/* 7309F4 802A1454 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 7309F8 802A1458 90A20002 */ lbu $v0, 2($a1) -/* 7309FC 802A145C 3C068009 */ lui $a2, %hi(gItemTable+0x199B) -/* 730A00 802A1460 90C6927B */ lbu $a2, %lo(gItemTable+0x199B)($a2) -/* 730A04 802A1464 80A30003 */ lb $v1, 3($a1) -/* 730A08 802A1468 00461021 */ addu $v0, $v0, $a2 -/* 730A0C 802A146C A0A20002 */ sb $v0, 2($a1) -/* 730A10 802A1470 00021600 */ sll $v0, $v0, 0x18 -/* 730A14 802A1474 00021603 */ sra $v0, $v0, 0x18 -/* 730A18 802A1478 0062182A */ slt $v1, $v1, $v0 -/* 730A1C 802A147C 90A20003 */ lbu $v0, 3($a1) -/* 730A20 802A1480 54600001 */ bnel $v1, $zero, .L802A1488 -/* 730A24 802A1484 A0A20002 */ sb $v0, 2($a1) -.L802A1488: -/* 730A28 802A1488 00061600 */ sll $v0, $a2, 0x18 -/* 730A2C 802A148C 00021603 */ sra $v0, $v0, 0x18 -/* 730A30 802A1490 AC820090 */ sw $v0, 0x90($a0) -/* 730A34 802A1494 03E00008 */ jr $ra -/* 730A38 802A1498 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A149C_730A3C.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A149C_730A3C.s deleted file mode 100644 index d4a92147f9..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A149C_730A3C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A149C_730A3C -/* 730A3C 802A149C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 730A40 802A14A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 730A44 802A14A4 AFB00010 */ sw $s0, 0x10($sp) -/* 730A48 802A14A8 8C82000C */ lw $v0, 0xc($a0) -/* 730A4C 802A14AC 0C0B1EAF */ jal get_variable -/* 730A50 802A14B0 8C450000 */ lw $a1, ($v0) -/* 730A54 802A14B4 3C038011 */ lui $v1, %hi(gPlayerData) -/* 730A58 802A14B8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 730A5C 802A14BC 80640002 */ lb $a0, 2($v1) -/* 730A60 802A14C0 80650006 */ lb $a1, 6($v1) -/* 730A64 802A14C4 00822021 */ addu $a0, $a0, $v0 -/* 730A68 802A14C8 00A4102A */ slt $v0, $a1, $a0 -/* 730A6C 802A14CC 10400002 */ beqz $v0, .L802A14D8 -/* 730A70 802A14D0 0060802D */ daddu $s0, $v1, $zero -/* 730A74 802A14D4 00A0202D */ daddu $a0, $a1, $zero -.L802A14D8: -/* 730A78 802A14D8 A2040005 */ sb $a0, 5($s0) -/* 730A7C 802A14DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 730A80 802A14E0 8FB00010 */ lw $s0, 0x10($sp) -/* 730A84 802A14E4 24020002 */ addiu $v0, $zero, 2 -/* 730A88 802A14E8 03E00008 */ jr $ra -/* 730A8C 802A14EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A14F0_730A90.s b/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A14F0_730A90.s deleted file mode 100644 index 419dd443a4..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/electro_pop_7305A0/func_802A14F0_730A90.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14F0_730A90 -/* 730A90 802A14F0 3C068009 */ lui $a2, %hi(gItemTable+0x1980) -/* 730A94 802A14F4 24C69260 */ addiu $a2, $a2, %lo(gItemTable+0x1980) -/* 730A98 802A14F8 3C058011 */ lui $a1, %hi(gPlayerData) -/* 730A9C 802A14FC 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 730AA0 802A1500 90A20005 */ lbu $v0, 5($a1) -/* 730AA4 802A1504 90C3001B */ lbu $v1, 0x1b($a2) -/* 730AA8 802A1508 00431021 */ addu $v0, $v0, $v1 -/* 730AAC 802A150C A0A20005 */ sb $v0, 5($a1) -/* 730AB0 802A1510 00021600 */ sll $v0, $v0, 0x18 -/* 730AB4 802A1514 80A30006 */ lb $v1, 6($a1) -/* 730AB8 802A1518 00021603 */ sra $v0, $v0, 0x18 -/* 730ABC 802A151C 0062182A */ slt $v1, $v1, $v0 -/* 730AC0 802A1520 90A20006 */ lbu $v0, 6($a1) -/* 730AC4 802A1524 54600001 */ bnel $v1, $zero, .L802A152C -/* 730AC8 802A1528 A0A20005 */ sb $v0, 5($a1) -.L802A152C: -/* 730ACC 802A152C 80C2001C */ lb $v0, 0x1c($a2) -/* 730AD0 802A1530 AC820090 */ sw $v0, 0x90($a0) -/* 730AD4 802A1534 03E00008 */ jr $ra -/* 730AD8 802A1538 24020002 */ addiu $v0, $zero, 2 -/* 730ADC 802A153C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1000_716C60.s b/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1000_716C60.s deleted file mode 100644 index 1a86e63c83..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1000_716C60.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_716C60 -/* 716C60 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 716C64 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 716C68 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 716C6C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 716C70 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 716C74 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 716C78 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 716C7C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 716C80 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 716C84 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 716C88 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 716C8C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 716C90 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 716C94 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 716C98 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 716C9C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 716CA0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 716CA4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 716CA8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 716CAC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 716CB0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 716CB4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 716CB8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 716CBC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 716CC0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 716CC4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 716CC8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 716CCC 802A106C 00000000 */ nop -/* 716CD0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 716CD4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 716CD8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 716CDC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 716CE0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 716CE4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 716CE8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 716CEC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 716CF0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 716CF4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 716CF8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 716CFC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 716D00 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 716D04 802A10A4 00440018 */ mult $v0, $a0 -/* 716D08 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 716D0C 802A10AC 00004010 */ mfhi $t0 -/* 716D10 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 716D14 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 716D18 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 716D1C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 716D20 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 716D24 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 716D28 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 716D2C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 716D30 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 716D34 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 716D38 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 716D3C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 716D40 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 716D44 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 716D48 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 716D4C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 716D50 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 716D54 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 716D58 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 716D5C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 716D60 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 716D64 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 716D68 802A1108 0C04C4FD */ jal make_item_entity -/* 716D6C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 716D70 802A1110 0C03A830 */ jal add_coins -/* 716D74 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 716D78 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 716D7C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 716D80 802A1120 00000000 */ nop -.L802A1124: -/* 716D84 802A1124 00101040 */ sll $v0, $s0, 1 -/* 716D88 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 716D8C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 716D90 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 716D94 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 716D98 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 716D9C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 716DA0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 716DA4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 716DA8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 716DAC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 716DB0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 716DB4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 716DB8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 716DBC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 716DC0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 716DC4 802A1164 0C00B94E */ jal get_screen_coords -/* 716DC8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 716DCC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 716DD0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 716DD4 802A1174 0C050529 */ jal create_icon -/* 716DD8 802A1178 00000000 */ nop -/* 716DDC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 716DE0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 716DE4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 716DE8 802A1188 3C01802A */ lui $at, %hi(D_802A1D70) -/* 716DEC 802A118C AC241D70 */ sw $a0, %lo(D_802A1D70)($at) -/* 716DF0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 716DF4 802A1194 0C051261 */ jal set_icon_render_pos -/* 716DF8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 716DFC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 716E00 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 716E04 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 716E08 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 716E0C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 716E10 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 716E14 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 716E18 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 716E1C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 716E20 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 716E24 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 716E28 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 716E2C 802A11CC 03E00008 */ jr $ra -/* 716E30 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A123C_716E9C.s b/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A123C_716E9C.s deleted file mode 100644 index dbb9514e43..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A123C_716E9C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_716E9C -/* 716E9C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 716EA0 802A1240 AFB1001C */ sw $s1, 0x1c($sp) -/* 716EA4 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 716EA8 802A1248 AFBF0024 */ sw $ra, 0x24($sp) -/* 716EAC 802A124C AFB20020 */ sw $s2, 0x20($sp) -/* 716EB0 802A1250 AFB00018 */ sw $s0, 0x18($sp) -/* 716EB4 802A1254 8E30000C */ lw $s0, 0xc($s1) -/* 716EB8 802A1258 8E050000 */ lw $a1, ($s0) -/* 716EBC 802A125C 0C0B1EAF */ jal get_variable -/* 716EC0 802A1260 26100004 */ addiu $s0, $s0, 4 -/* 716EC4 802A1264 8E050000 */ lw $a1, ($s0) -/* 716EC8 802A1268 26100004 */ addiu $s0, $s0, 4 -/* 716ECC 802A126C 0220202D */ daddu $a0, $s1, $zero -/* 716ED0 802A1270 0C0B1EAF */ jal get_variable -/* 716ED4 802A1274 0040902D */ daddu $s2, $v0, $zero -/* 716ED8 802A1278 0220202D */ daddu $a0, $s1, $zero -/* 716EDC 802A127C 8E050000 */ lw $a1, ($s0) -/* 716EE0 802A1280 0C0B1EAF */ jal get_variable -/* 716EE4 802A1284 0040802D */ daddu $s0, $v0, $zero -/* 716EE8 802A1288 44920000 */ mtc1 $s2, $f0 -/* 716EEC 802A128C 00000000 */ nop -/* 716EF0 802A1290 46800020 */ cvt.s.w $f0, $f0 -/* 716EF4 802A1294 44050000 */ mfc1 $a1, $f0 -/* 716EF8 802A1298 44900000 */ mtc1 $s0, $f0 -/* 716EFC 802A129C 00000000 */ nop -/* 716F00 802A12A0 46800020 */ cvt.s.w $f0, $f0 -/* 716F04 802A12A4 44060000 */ mfc1 $a2, $f0 -/* 716F08 802A12A8 44820000 */ mtc1 $v0, $f0 -/* 716F0C 802A12AC 00000000 */ nop -/* 716F10 802A12B0 46800020 */ cvt.s.w $f0, $f0 -/* 716F14 802A12B4 44070000 */ mfc1 $a3, $f0 -/* 716F18 802A12B8 0000202D */ daddu $a0, $zero, $zero -/* 716F1C 802A12BC 0C01C40C */ jal func_80071030 -/* 716F20 802A12C0 AFA00010 */ sw $zero, 0x10($sp) -/* 716F24 802A12C4 8FBF0024 */ lw $ra, 0x24($sp) -/* 716F28 802A12C8 8FB20020 */ lw $s2, 0x20($sp) -/* 716F2C 802A12CC 8FB1001C */ lw $s1, 0x1c($sp) -/* 716F30 802A12D0 8FB00018 */ lw $s0, 0x18($sp) -/* 716F34 802A12D4 24020002 */ addiu $v0, $zero, 2 -/* 716F38 802A12D8 03E00008 */ jr $ra -/* 716F3C 802A12DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1378_716FD8.s b/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1378_716FD8.s deleted file mode 100644 index 6ca95ec0d7..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A1378_716FD8.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_716FD8 -/* 716FD8 802A1378 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 716FDC 802A137C AFB00010 */ sw $s0, 0x10($sp) -/* 716FE0 802A1380 0080802D */ daddu $s0, $a0, $zero -/* 716FE4 802A1384 10A00003 */ beqz $a1, .L802A1394 -/* 716FE8 802A1388 AFBF0014 */ sw $ra, 0x14($sp) -/* 716FEC 802A138C 24020014 */ addiu $v0, $zero, 0x14 -/* 716FF0 802A1390 AE020070 */ sw $v0, 0x70($s0) -.L802A1394: -/* 716FF4 802A1394 0000202D */ daddu $a0, $zero, $zero -/* 716FF8 802A1398 0080282D */ daddu $a1, $a0, $zero -/* 716FFC 802A139C 8E020070 */ lw $v0, 0x70($s0) -/* 717000 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 717004 802A13A4 00023880 */ sll $a3, $v0, 2 -/* 717008 802A13A8 00E23821 */ addu $a3, $a3, $v0 -/* 71700C 802A13AC 00073840 */ sll $a3, $a3, 1 -/* 717010 802A13B0 0C046F97 */ jal set_background_color_blend -/* 717014 802A13B4 30E700FE */ andi $a3, $a3, 0xfe -/* 717018 802A13B8 8E020070 */ lw $v0, 0x70($s0) -/* 71701C 802A13BC 2442FFFF */ addiu $v0, $v0, -1 -/* 717020 802A13C0 10400003 */ beqz $v0, .L802A13D0 -/* 717024 802A13C4 AE020070 */ sw $v0, 0x70($s0) -/* 717028 802A13C8 080A84FA */ j .L802A13E8 -/* 71702C 802A13CC 0000102D */ daddu $v0, $zero, $zero -.L802A13D0: -/* 717030 802A13D0 0000202D */ daddu $a0, $zero, $zero -/* 717034 802A13D4 0080282D */ daddu $a1, $a0, $zero -/* 717038 802A13D8 0080302D */ daddu $a2, $a0, $zero -/* 71703C 802A13DC 0C046F97 */ jal set_background_color_blend -/* 717040 802A13E0 0080382D */ daddu $a3, $a0, $zero -/* 717044 802A13E4 24020002 */ addiu $v0, $zero, 2 -.L802A13E8: -/* 717048 802A13E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 71704C 802A13EC 8FB00010 */ lw $s0, 0x10($sp) -/* 717050 802A13F0 03E00008 */ jr $ra -/* 717054 802A13F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 717058 802A13F8 00000000 */ nop -/* 71705C 802A13FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1000_7330D0.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1000_7330D0.s deleted file mode 100644 index f1233496bc..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1000_7330D0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7330D0 -/* 7330D0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7330D4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7330D8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7330DC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7330E0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7330E4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7330E8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7330EC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7330F0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7330F4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7330F8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7330FC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 733100 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 733104 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 733108 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 73310C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 733110 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 733114 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 733118 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 73311C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 733120 802A1050 00021140 */ sll $v0, $v0, 5 -/* 733124 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 733128 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 73312C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 733130 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 733134 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 733138 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73313C 802A106C 00000000 */ nop -/* 733140 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 733144 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 733148 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 73314C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 733150 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 733154 802A1084 1A400045 */ blez $s2, .L802A119C -/* 733158 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 73315C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 733160 802A1090 00121880 */ sll $v1, $s2, 2 -/* 733164 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 733168 802A1098 00031100 */ sll $v0, $v1, 4 -/* 73316C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 733170 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 733174 802A10A4 00440018 */ mult $v0, $a0 -/* 733178 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 73317C 802A10AC 00004010 */ mfhi $t0 -/* 733180 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 733184 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 733188 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 73318C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 733190 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 733194 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 733198 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 73319C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7331A0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7331A4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7331A8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7331AC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7331B0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7331B4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7331B8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7331BC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 7331C0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 7331C4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 7331C8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 7331CC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7331D0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7331D4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7331D8 802A1108 0C04C4FD */ jal make_item_entity -/* 7331DC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7331E0 802A1110 0C03A830 */ jal add_coins -/* 7331E4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7331E8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7331EC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7331F0 802A1120 00000000 */ nop -.L802A1124: -/* 7331F4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7331F8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7331FC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 733200 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 733204 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 733208 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 73320C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 733210 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 733214 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 733218 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 73321C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 733220 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 733224 802A1154 44050000 */ mfc1 $a1, $f0 -/* 733228 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 73322C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 733230 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 733234 802A1164 0C00B94E */ jal get_screen_coords -/* 733238 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 73323C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 733240 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 733244 802A1174 0C050529 */ jal create_icon -/* 733248 802A1178 00000000 */ nop -/* 73324C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 733250 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 733254 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 733258 802A1188 3C01802A */ lui $at, %hi(D_802A24D0) -/* 73325C 802A118C AC2424D0 */ sw $a0, %lo(D_802A24D0)($at) -/* 733260 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 733264 802A1194 0C051261 */ jal set_icon_render_pos -/* 733268 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 73326C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 733270 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 733274 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 733278 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 73327C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 733280 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 733284 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 733288 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 73328C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 733290 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 733294 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 733298 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 73329C 802A11CC 03E00008 */ jr $ra -/* 7332A0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A11D4_7332A4.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A11D4_7332A4.s deleted file mode 100644 index a970c4c79b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A11D4_7332A4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_7332A4 -/* 7332A4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7332A8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 7332AC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7332B0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7332B4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7332B8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7332BC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7332C0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7332C4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7332C8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7332CC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7332D0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7332D4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7332D8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7332DC 802A120C 00000000 */ nop -/* 7332E0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7332E4 802A1214 00000000 */ nop -/* 7332E8 802A1218 3C04802A */ lui $a0, %hi(D_802A24D0) -/* 7332EC 802A121C 8C8424D0 */ lw $a0, %lo(D_802A24D0)($a0) -/* 7332F0 802A1220 0C05123D */ jal free_icon -/* 7332F4 802A1224 00000000 */ nop -.L802A1228: -/* 7332F8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7332FC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 733300 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 733304 802A1234 03E00008 */ jr $ra -/* 733308 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A123C_73330C.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A123C_73330C.s deleted file mode 100644 index b578de0aa6..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A123C_73330C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_73330C -/* 73330C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 733310 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 733314 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 733318 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 73331C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 733320 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 733324 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 733328 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 73332C 802A125C 8E050000 */ lw $a1, ($s0) -/* 733330 802A1260 0C0B1EAF */ jal get_variable -/* 733334 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 733338 802A1268 8E050000 */ lw $a1, ($s0) -/* 73333C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 733340 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 733344 802A1274 0C0B1EAF */ jal get_variable -/* 733348 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 73334C 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 733350 802A1280 8E050000 */ lw $a1, ($s0) -/* 733354 802A1284 0C0B1EAF */ jal get_variable -/* 733358 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 73335C 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 733360 802A1290 0C04C3D6 */ jal get_item_entity -/* 733364 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 733368 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 73336C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 733370 802A12A0 00000000 */ nop -/* 733374 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 733378 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 73337C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 733380 802A12B0 00000000 */ nop -/* 733384 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 733388 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 73338C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 733390 802A12C0 00000000 */ nop -/* 733394 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 733398 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 73339C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 7333A0 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 7333A4 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 7333A8 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 7333AC 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 7333B0 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 7333B4 802A12E4 03E00008 */ jr $ra -/* 7333B8 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A12EC_7333BC.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A12EC_7333BC.s deleted file mode 100644 index b4a118fe89..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A12EC_7333BC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_7333BC -/* 7333BC 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7333C0 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 7333C4 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 7333C8 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 7333CC 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 7333D0 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 7333D4 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 7333D8 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 7333DC 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 7333E0 802A1310 8CA50000 */ lw $a1, ($a1) -/* 7333E4 802A1314 0C0B1EAF */ jal get_variable -/* 7333E8 802A1318 00000000 */ nop -/* 7333EC 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 7333F0 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 7333F4 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 7333F8 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 7333FC 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 733400 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 733404 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 733408 802A1338 18600005 */ blez $v1, .L802A1350 -/* 73340C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 733410 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 733414 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 733418 802A1348 080A84D9 */ j .L802A1364 -/* 73341C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 733420 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 733424 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 733428 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 73342C 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 733430 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 733434 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 733438 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 73343C 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 733440 802A1370 03E00008 */ jr $ra -/* 733444 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1378_733448.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1378_733448.s deleted file mode 100644 index f1543bbd69..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1378_733448.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_733448 -/* 733448 802A1378 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 73344C 802A137C AFB1001C */ sw $s1, 0x1c($sp) -/* 733450 802A1380 0080882D */ daddu $s1, $a0, $zero -/* 733454 802A1384 AFBF0028 */ sw $ra, 0x28($sp) -/* 733458 802A1388 AFB30024 */ sw $s3, 0x24($sp) -/* 73345C 802A138C AFB20020 */ sw $s2, 0x20($sp) -/* 733460 802A1390 AFB00018 */ sw $s0, 0x18($sp) -/* 733464 802A1394 8E30000C */ lw $s0, 0xc($s1) -/* 733468 802A1398 8E050000 */ lw $a1, ($s0) -/* 73346C 802A139C 0C0B1EAF */ jal get_variable -/* 733470 802A13A0 26100004 */ addiu $s0, $s0, 4 -/* 733474 802A13A4 8E050000 */ lw $a1, ($s0) -/* 733478 802A13A8 26100004 */ addiu $s0, $s0, 4 -/* 73347C 802A13AC 0220202D */ daddu $a0, $s1, $zero -/* 733480 802A13B0 0C0B1EAF */ jal get_variable -/* 733484 802A13B4 0040982D */ daddu $s3, $v0, $zero -/* 733488 802A13B8 8E050000 */ lw $a1, ($s0) -/* 73348C 802A13BC 26100004 */ addiu $s0, $s0, 4 -/* 733490 802A13C0 0220202D */ daddu $a0, $s1, $zero -/* 733494 802A13C4 0C0B1EAF */ jal get_variable -/* 733498 802A13C8 0040902D */ daddu $s2, $v0, $zero -/* 73349C 802A13CC 0220202D */ daddu $a0, $s1, $zero -/* 7334A0 802A13D0 8E050000 */ lw $a1, ($s0) -/* 7334A4 802A13D4 0C0B1EAF */ jal get_variable -/* 7334A8 802A13D8 0040802D */ daddu $s0, $v0, $zero -/* 7334AC 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 7334B0 802A13E0 00000000 */ nop -/* 7334B4 802A13E4 46800020 */ cvt.s.w $f0, $f0 -/* 7334B8 802A13E8 44050000 */ mfc1 $a1, $f0 -/* 7334BC 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 7334C0 802A13F0 00000000 */ nop -/* 7334C4 802A13F4 46800020 */ cvt.s.w $f0, $f0 -/* 7334C8 802A13F8 44060000 */ mfc1 $a2, $f0 -/* 7334CC 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 7334D0 802A1400 00000000 */ nop -/* 7334D4 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 7334D8 802A1408 44070000 */ mfc1 $a3, $f0 -/* 7334DC 802A140C 0000202D */ daddu $a0, $zero, $zero -/* 7334E0 802A1410 0C01C424 */ jal func_80071090 -/* 7334E4 802A1414 AFA20010 */ sw $v0, 0x10($sp) -/* 7334E8 802A1418 8FBF0028 */ lw $ra, 0x28($sp) -/* 7334EC 802A141C 8FB30024 */ lw $s3, 0x24($sp) -/* 7334F0 802A1420 8FB20020 */ lw $s2, 0x20($sp) -/* 7334F4 802A1424 8FB1001C */ lw $s1, 0x1c($sp) -/* 7334F8 802A1428 8FB00018 */ lw $s0, 0x18($sp) -/* 7334FC 802A142C 24020002 */ addiu $v0, $zero, 2 -/* 733500 802A1430 03E00008 */ jr $ra -/* 733504 802A1434 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1438_733508.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1438_733508.s deleted file mode 100644 index b8cb06859b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A1438_733508.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1438_733508 -/* 733508 802A1438 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 73350C 802A143C AFB1001C */ sw $s1, 0x1c($sp) -/* 733510 802A1440 0080882D */ daddu $s1, $a0, $zero -/* 733514 802A1444 AFBF0028 */ sw $ra, 0x28($sp) -/* 733518 802A1448 AFB30024 */ sw $s3, 0x24($sp) -/* 73351C 802A144C AFB20020 */ sw $s2, 0x20($sp) -/* 733520 802A1450 AFB00018 */ sw $s0, 0x18($sp) -/* 733524 802A1454 8E30000C */ lw $s0, 0xc($s1) -/* 733528 802A1458 8E050000 */ lw $a1, ($s0) -/* 73352C 802A145C 0C0B1EAF */ jal get_variable -/* 733530 802A1460 26100004 */ addiu $s0, $s0, 4 -/* 733534 802A1464 8E050000 */ lw $a1, ($s0) -/* 733538 802A1468 26100004 */ addiu $s0, $s0, 4 -/* 73353C 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 733540 802A1470 0C0B1EAF */ jal get_variable -/* 733544 802A1474 0040982D */ daddu $s3, $v0, $zero -/* 733548 802A1478 8E050000 */ lw $a1, ($s0) -/* 73354C 802A147C 26100004 */ addiu $s0, $s0, 4 -/* 733550 802A1480 0220202D */ daddu $a0, $s1, $zero -/* 733554 802A1484 0C0B1EAF */ jal get_variable -/* 733558 802A1488 0040902D */ daddu $s2, $v0, $zero -/* 73355C 802A148C 0220202D */ daddu $a0, $s1, $zero -/* 733560 802A1490 8E050000 */ lw $a1, ($s0) -/* 733564 802A1494 0C0B1EAF */ jal get_variable -/* 733568 802A1498 0040802D */ daddu $s0, $v0, $zero -/* 73356C 802A149C 44930000 */ mtc1 $s3, $f0 -/* 733570 802A14A0 00000000 */ nop -/* 733574 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 733578 802A14A8 44050000 */ mfc1 $a1, $f0 -/* 73357C 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 733580 802A14B0 00000000 */ nop -/* 733584 802A14B4 46800020 */ cvt.s.w $f0, $f0 -/* 733588 802A14B8 44060000 */ mfc1 $a2, $f0 -/* 73358C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 733590 802A14C0 00000000 */ nop -/* 733594 802A14C4 46800020 */ cvt.s.w $f0, $f0 -/* 733598 802A14C8 44070000 */ mfc1 $a3, $f0 -/* 73359C 802A14CC 24040001 */ addiu $a0, $zero, 1 -/* 7335A0 802A14D0 0C01C424 */ jal func_80071090 -/* 7335A4 802A14D4 AFA20010 */ sw $v0, 0x10($sp) -/* 7335A8 802A14D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 7335AC 802A14DC 8FB30024 */ lw $s3, 0x24($sp) -/* 7335B0 802A14E0 8FB20020 */ lw $s2, 0x20($sp) -/* 7335B4 802A14E4 8FB1001C */ lw $s1, 0x1c($sp) -/* 7335B8 802A14E8 8FB00018 */ lw $s0, 0x18($sp) -/* 7335BC 802A14EC 24020002 */ addiu $v0, $zero, 2 -/* 7335C0 802A14F0 03E00008 */ jr $ra -/* 7335C4 802A14F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A15A0_733670.s b/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A15A0_733670.s deleted file mode 100644 index fe95652080..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/food_7330D0/func_802A15A0_733670.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15A0_733670 -/* 733670 802A15A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 733674 802A15A4 AFB00010 */ sw $s0, 0x10($sp) -/* 733678 802A15A8 0080802D */ daddu $s0, $a0, $zero -/* 73367C 802A15AC AFBF0014 */ sw $ra, 0x14($sp) -/* 733680 802A15B0 8E02000C */ lw $v0, 0xc($s0) -/* 733684 802A15B4 0C0B1EAF */ jal get_variable -/* 733688 802A15B8 8C450000 */ lw $a1, ($v0) -/* 73368C 802A15BC 3C038008 */ lui $v1, %hi(gItemTable) -/* 733690 802A15C0 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 733694 802A15C4 00021140 */ sll $v0, $v0, 5 -/* 733698 802A15C8 00431021 */ addu $v0, $v0, $v1 -/* 73369C 802A15CC 8043001B */ lb $v1, 0x1b($v0) -/* 7336A0 802A15D0 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7336A4 802A15D4 8043001C */ lb $v1, 0x1c($v0) -/* 7336A8 802A15D8 AE0000B8 */ sw $zero, 0xb8($s0) -/* 7336AC 802A15DC AE0300B4 */ sw $v1, 0xb4($s0) -/* 7336B0 802A15E0 94420018 */ lhu $v0, 0x18($v0) -/* 7336B4 802A15E4 30420100 */ andi $v0, $v0, 0x100 -/* 7336B8 802A15E8 10400002 */ beqz $v0, .L802A15F4 -/* 7336BC 802A15EC 24020001 */ addiu $v0, $zero, 1 -/* 7336C0 802A15F0 AE0200B8 */ sw $v0, 0xb8($s0) -.L802A15F4: -/* 7336C4 802A15F4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7336C8 802A15F8 04400006 */ bltz $v0, .L802A1614 -/* 7336CC 802A15FC 0000182D */ daddu $v1, $zero, $zero -/* 7336D0 802A1600 5C400006 */ bgtzl $v0, .L802A161C -/* 7336D4 802A1604 AE0300C0 */ sw $v1, 0xc0($s0) -/* 7336D8 802A1608 8E0200B4 */ lw $v0, 0xb4($s0) -/* 7336DC 802A160C 04430003 */ bgezl $v0, .L802A161C -/* 7336E0 802A1610 AE0300C0 */ sw $v1, 0xc0($s0) -.L802A1614: -/* 7336E4 802A1614 24030001 */ addiu $v1, $zero, 1 -/* 7336E8 802A1618 AE0300C0 */ sw $v1, 0xc0($s0) -.L802A161C: -/* 7336EC 802A161C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7336F0 802A1620 8FB00010 */ lw $s0, 0x10($sp) -/* 7336F4 802A1624 24020002 */ addiu $v0, $zero, 2 -/* 7336F8 802A1628 03E00008 */ jr $ra -/* 7336FC 802A162C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A1000_72B910.s b/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A1000_72B910.s deleted file mode 100644 index 16942c4975..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A1000_72B910.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_72B910 -/* 72B910 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72B914 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 72B918 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72B91C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 72B920 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 72B924 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 72B928 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72B92C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 72B930 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 72B934 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 72B938 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72B93C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 72B940 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 72B944 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 72B948 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72B94C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 72B950 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 72B954 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 72B958 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72B95C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 72B960 802A1050 00021140 */ sll $v0, $v0, 5 -/* 72B964 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 72B968 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72B96C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 72B970 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 72B974 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 72B978 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72B97C 802A106C 00000000 */ nop -/* 72B980 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 72B984 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 72B988 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72B98C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 72B990 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 72B994 802A1084 1A400045 */ blez $s2, .L802A119C -/* 72B998 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72B99C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 72B9A0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 72B9A4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 72B9A8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72B9AC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 72B9B0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 72B9B4 802A10A4 00440018 */ mult $v0, $a0 -/* 72B9B8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72B9BC 802A10AC 00004010 */ mfhi $t0 -/* 72B9C0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 72B9C4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 72B9C8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72B9CC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 72B9D0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 72B9D4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 72B9D8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72B9DC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 72B9E0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 72B9E4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72B9E8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72B9EC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 72B9F0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 72B9F4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 72B9F8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72B9FC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 72BA00 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 72BA04 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 72BA08 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72BA0C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 72BA10 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 72BA14 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 72BA18 802A1108 0C04C4FD */ jal make_item_entity -/* 72BA1C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 72BA20 802A1110 0C03A830 */ jal add_coins -/* 72BA24 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 72BA28 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72BA2C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72BA30 802A1120 00000000 */ nop -.L802A1124: -/* 72BA34 802A1124 00101040 */ sll $v0, $s0, 1 -/* 72BA38 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72BA3C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 72BA40 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72BA44 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 72BA48 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72BA4C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 72BA50 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 72BA54 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 72BA58 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72BA5C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 72BA60 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 72BA64 802A1154 44050000 */ mfc1 $a1, $f0 -/* 72BA68 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72BA6C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 72BA70 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 72BA74 802A1164 0C00B94E */ jal get_screen_coords -/* 72BA78 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72BA7C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 72BA80 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 72BA84 802A1174 0C050529 */ jal create_icon -/* 72BA88 802A1178 00000000 */ nop -/* 72BA8C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 72BA90 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 72BA94 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 72BA98 802A1188 3C01802A */ lui $at, %hi(D_802A1CA0) -/* 72BA9C 802A118C AC241CA0 */ sw $a0, %lo(D_802A1CA0)($at) -/* 72BAA0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 72BAA4 802A1194 0C051261 */ jal set_icon_render_pos -/* 72BAA8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72BAAC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 72BAB0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 72BAB4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 72BAB8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72BABC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 72BAC0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 72BAC4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 72BAC8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72BACC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 72BAD0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 72BAD4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 72BAD8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72BADC 802A11CC 03E00008 */ jr $ra -/* 72BAE0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A11D4_72BAE4.s b/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A11D4_72BAE4.s deleted file mode 100644 index b71787bb28..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A11D4_72BAE4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_72BAE4 -/* 72BAE4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72BAE8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72BAEC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 72BAF0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 72BAF4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 72BAF8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72BAFC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 72BB00 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 72BB04 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 72BB08 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72BB0C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 72BB10 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 72BB14 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 72BB18 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72BB1C 802A120C 00000000 */ nop -/* 72BB20 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72BB24 802A1214 00000000 */ nop -/* 72BB28 802A1218 3C04802A */ lui $a0, %hi(D_802A1CA0) -/* 72BB2C 802A121C 8C841CA0 */ lw $a0, %lo(D_802A1CA0)($a0) -/* 72BB30 802A1220 0C05123D */ jal free_icon -/* 72BB34 802A1224 00000000 */ nop -.L802A1228: -/* 72BB38 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72BB3C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 72BB40 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 72BB44 802A1234 03E00008 */ jr $ra -/* 72BB48 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A12D4_72BBE4.s b/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A12D4_72BBE4.s deleted file mode 100644 index 79cd07879f..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/fright_jar_72B910/func_802A12D4_72BBE4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12D4_72BBE4 -/* 72BBE4 802A12D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72BBE8 802A12D8 AFB00010 */ sw $s0, 0x10($sp) -/* 72BBEC 802A12DC 0080802D */ daddu $s0, $a0, $zero -/* 72BBF0 802A12E0 10A00003 */ beqz $a1, .L802A12F0 -/* 72BBF4 802A12E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 72BBF8 802A12E8 24020014 */ addiu $v0, $zero, 0x14 -/* 72BBFC 802A12EC AE020070 */ sw $v0, 0x70($s0) -.L802A12F0: -/* 72BC00 802A12F0 0000202D */ daddu $a0, $zero, $zero -/* 72BC04 802A12F4 0080282D */ daddu $a1, $a0, $zero -/* 72BC08 802A12F8 8E020070 */ lw $v0, 0x70($s0) -/* 72BC0C 802A12FC 0080302D */ daddu $a2, $a0, $zero -/* 72BC10 802A1300 00023880 */ sll $a3, $v0, 2 -/* 72BC14 802A1304 00E23821 */ addu $a3, $a3, $v0 -/* 72BC18 802A1308 00073840 */ sll $a3, $a3, 1 -/* 72BC1C 802A130C 0C046F97 */ jal set_background_color_blend -/* 72BC20 802A1310 30E700FE */ andi $a3, $a3, 0xfe -/* 72BC24 802A1314 8E020070 */ lw $v0, 0x70($s0) -/* 72BC28 802A1318 2442FFFF */ addiu $v0, $v0, -1 -/* 72BC2C 802A131C 10400003 */ beqz $v0, .L802A132C -/* 72BC30 802A1320 AE020070 */ sw $v0, 0x70($s0) -/* 72BC34 802A1324 080A84D1 */ j .L802A1344 -/* 72BC38 802A1328 0000102D */ daddu $v0, $zero, $zero -.L802A132C: -/* 72BC3C 802A132C 0000202D */ daddu $a0, $zero, $zero -/* 72BC40 802A1330 0080282D */ daddu $a1, $a0, $zero -/* 72BC44 802A1334 0080302D */ daddu $a2, $a0, $zero -/* 72BC48 802A1338 0C046F97 */ jal set_background_color_blend -/* 72BC4C 802A133C 0080382D */ daddu $a3, $a0, $zero -/* 72BC50 802A1340 24020002 */ addiu $v0, $zero, 2 -.L802A1344: -/* 72BC54 802A1344 8FBF0014 */ lw $ra, 0x14($sp) -/* 72BC58 802A1348 8FB00010 */ lw $s0, 0x10($sp) -/* 72BC5C 802A134C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A1000_725F60.s b/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A1000_725F60.s deleted file mode 100644 index ba8c9d6b80..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A1000_725F60.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_725F60 -/* 725F60 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 725F64 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 725F68 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 725F6C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 725F70 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 725F74 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 725F78 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 725F7C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 725F80 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 725F84 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 725F88 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 725F8C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 725F90 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 725F94 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 725F98 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 725F9C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 725FA0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 725FA4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 725FA8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 725FAC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 725FB0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 725FB4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 725FB8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 725FBC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 725FC0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 725FC4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 725FC8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 725FCC 802A106C 00000000 */ nop -/* 725FD0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 725FD4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 725FD8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 725FDC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 725FE0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 725FE4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 725FE8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 725FEC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 725FF0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 725FF4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 725FF8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 725FFC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 726000 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 726004 802A10A4 00440018 */ mult $v0, $a0 -/* 726008 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72600C 802A10AC 00004010 */ mfhi $t0 -/* 726010 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 726014 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 726018 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72601C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 726020 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 726024 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 726028 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72602C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 726030 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 726034 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 726038 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72603C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 726040 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 726044 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 726048 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72604C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 726050 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 726054 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 726058 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72605C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 726060 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 726064 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 726068 802A1108 0C04C4FD */ jal make_item_entity -/* 72606C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 726070 802A1110 0C03A830 */ jal add_coins -/* 726074 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 726078 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72607C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 726080 802A1120 00000000 */ nop -.L802A1124: -/* 726084 802A1124 00101040 */ sll $v0, $s0, 1 -/* 726088 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72608C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 726090 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 726094 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 726098 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72609C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7260A0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7260A4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 7260A8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 7260AC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7260B0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7260B4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7260B8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7260BC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7260C0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7260C4 802A1164 0C00B94E */ jal get_screen_coords -/* 7260C8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7260CC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7260D0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7260D4 802A1174 0C050529 */ jal create_icon -/* 7260D8 802A1178 00000000 */ nop -/* 7260DC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 7260E0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 7260E4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 7260E8 802A1188 3C01802A */ lui $at, %hi(D_802A1E70) -/* 7260EC 802A118C AC241E70 */ sw $a0, %lo(D_802A1E70)($at) -/* 7260F0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 7260F4 802A1194 0C051261 */ jal set_icon_render_pos -/* 7260F8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 7260FC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 726100 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 726104 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 726108 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72610C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 726110 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 726114 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 726118 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72611C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 726120 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 726124 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 726128 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72612C 802A11CC 03E00008 */ jr $ra -/* 726130 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A11D4_726134.s b/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A11D4_726134.s deleted file mode 100644 index dc6c7eda29..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A11D4_726134.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_726134 -/* 726134 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 726138 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72613C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 726140 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 726144 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 726148 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72614C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 726150 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 726154 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 726158 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72615C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 726160 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 726164 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 726168 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72616C 802A120C 00000000 */ nop -/* 726170 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 726174 802A1214 00000000 */ nop -/* 726178 802A1218 3C04802A */ lui $a0, %hi(D_802A1E70) -/* 72617C 802A121C 8C841E70 */ lw $a0, %lo(D_802A1E70)($a0) -/* 726180 802A1220 0C05123D */ jal free_icon -/* 726184 802A1224 00000000 */ nop -.L802A1228: -/* 726188 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72618C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 726190 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 726194 802A1234 03E00008 */ jr $ra -/* 726198 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A123C_72619C.s b/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A123C_72619C.s deleted file mode 100644 index 2f37053690..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A123C_72619C.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72619C -/* 72619C 802A123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7261A0 802A1240 AFB00010 */ sw $s0, 0x10($sp) -/* 7261A4 802A1244 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 7261A8 802A1248 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 7261AC 802A124C AFBF0014 */ sw $ra, 0x14($sp) -/* 7261B0 802A1250 82020210 */ lb $v0, 0x210($s0) -/* 7261B4 802A1254 10400005 */ beqz $v0, .L802A126C -/* 7261B8 802A1258 00000000 */ nop -/* 7261BC 802A125C 86040436 */ lh $a0, 0x436($s0) -/* 7261C0 802A1260 A2000211 */ sb $zero, 0x211($s0) -/* 7261C4 802A1264 0C011E26 */ jal func_80047898 -/* 7261C8 802A1268 A2000210 */ sb $zero, 0x210($s0) -.L802A126C: -/* 7261CC 802A126C 82020212 */ lb $v0, 0x212($s0) -/* 7261D0 802A1270 10400005 */ beqz $v0, .L802A1288 -/* 7261D4 802A1274 00000000 */ nop -/* 7261D8 802A1278 86040436 */ lh $a0, 0x436($s0) -/* 7261DC 802A127C A2000213 */ sb $zero, 0x213($s0) -/* 7261E0 802A1280 0C011E68 */ jal func_800479A0 -/* 7261E4 802A1284 A2000212 */ sb $zero, 0x212($s0) -.L802A1288: -/* 7261E8 802A1288 82020214 */ lb $v0, 0x214($s0) -/* 7261EC 802A128C 10400003 */ beqz $v0, .L802A129C -/* 7261F0 802A1290 00000000 */ nop -/* 7261F4 802A1294 A2000215 */ sb $zero, 0x215($s0) -/* 7261F8 802A1298 A2000214 */ sb $zero, 0x214($s0) -.L802A129C: -/* 7261FC 802A129C 82020218 */ lb $v0, 0x218($s0) -/* 726200 802A12A0 10400003 */ beqz $v0, .L802A12B0 -/* 726204 802A12A4 00000000 */ nop -/* 726208 802A12A8 A2000219 */ sb $zero, 0x219($s0) -/* 72620C 802A12AC A2000218 */ sb $zero, 0x218($s0) -.L802A12B0: -/* 726210 802A12B0 8FBF0014 */ lw $ra, 0x14($sp) -/* 726214 802A12B4 8FB00010 */ lw $s0, 0x10($sp) -/* 726218 802A12B8 24020002 */ addiu $v0, $zero, 2 -/* 72621C 802A12BC 03E00008 */ jr $ra -/* 726220 802A12C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A12C4_726224.s b/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A12C4_726224.s deleted file mode 100644 index d20d7aa1ed..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/hustle_drink_725F60/func_802A12C4_726224.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12C4_726224 -/* 726224 802A12C4 24020002 */ addiu $v0, $zero, 2 -/* 726228 802A12C8 3C01800E */ lui $at, %hi(gBattleStatus+0x8B) -/* 72622C 802A12CC A022C0FB */ sb $v0, %lo(gBattleStatus+0x8B)($at) -/* 726230 802A12D0 03E00008 */ jr $ra -/* 726234 802A12D4 24020002 */ addiu $v0, $zero, 2 -/* 726238 802A12D8 00000000 */ nop -/* 72623C 802A12DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1000_72A750.s b/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1000_72A750.s deleted file mode 100644 index f5347389ba..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1000_72A750.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_72A750 -/* 72A750 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72A754 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 72A758 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72A75C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 72A760 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 72A764 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 72A768 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72A76C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 72A770 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 72A774 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 72A778 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72A77C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 72A780 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 72A784 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 72A788 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72A78C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 72A790 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 72A794 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 72A798 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72A79C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 72A7A0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 72A7A4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 72A7A8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72A7AC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 72A7B0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 72A7B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 72A7B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72A7BC 802A106C 00000000 */ nop -/* 72A7C0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 72A7C4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 72A7C8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72A7CC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 72A7D0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 72A7D4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 72A7D8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72A7DC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 72A7E0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 72A7E4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 72A7E8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72A7EC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 72A7F0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 72A7F4 802A10A4 00440018 */ mult $v0, $a0 -/* 72A7F8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72A7FC 802A10AC 00004010 */ mfhi $t0 -/* 72A800 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 72A804 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 72A808 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72A80C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 72A810 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 72A814 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 72A818 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72A81C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 72A820 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 72A824 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72A828 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72A82C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 72A830 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 72A834 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 72A838 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72A83C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 72A840 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 72A844 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 72A848 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72A84C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 72A850 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 72A854 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 72A858 802A1108 0C04C4FD */ jal make_item_entity -/* 72A85C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 72A860 802A1110 0C03A830 */ jal add_coins -/* 72A864 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 72A868 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72A86C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72A870 802A1120 00000000 */ nop -.L802A1124: -/* 72A874 802A1124 00101040 */ sll $v0, $s0, 1 -/* 72A878 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72A87C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 72A880 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72A884 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 72A888 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72A88C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 72A890 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 72A894 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 72A898 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72A89C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 72A8A0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 72A8A4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 72A8A8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72A8AC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 72A8B0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 72A8B4 802A1164 0C00B94E */ jal get_screen_coords -/* 72A8B8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72A8BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 72A8C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 72A8C4 802A1174 0C050529 */ jal create_icon -/* 72A8C8 802A1178 00000000 */ nop -/* 72A8CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 72A8D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 72A8D4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 72A8D8 802A1188 3C01802A */ lui $at, %hi(D_802A21C0) -/* 72A8DC 802A118C AC2421C0 */ sw $a0, %lo(D_802A21C0)($at) -/* 72A8E0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 72A8E4 802A1194 0C051261 */ jal set_icon_render_pos -/* 72A8E8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72A8EC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 72A8F0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 72A8F4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 72A8F8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72A8FC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 72A900 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 72A904 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 72A908 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72A90C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 72A910 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 72A914 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 72A918 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72A91C 802A11CC 03E00008 */ jr $ra -/* 72A920 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A11D4_72A924.s b/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A11D4_72A924.s deleted file mode 100644 index b6811fdb41..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A11D4_72A924.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_72A924 -/* 72A924 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72A928 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72A92C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 72A930 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 72A934 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 72A938 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72A93C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 72A940 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 72A944 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 72A948 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72A94C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 72A950 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 72A954 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 72A958 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72A95C 802A120C 00000000 */ nop -/* 72A960 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72A964 802A1214 00000000 */ nop -/* 72A968 802A1218 3C04802A */ lui $a0, %hi(D_802A21C0) -/* 72A96C 802A121C 8C8421C0 */ lw $a0, %lo(D_802A21C0)($a0) -/* 72A970 802A1220 0C05123D */ jal free_icon -/* 72A974 802A1224 00000000 */ nop -.L802A1228: -/* 72A978 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72A97C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 72A980 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 72A984 802A1234 03E00008 */ jr $ra -/* 72A988 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A123C_72A98C.s b/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A123C_72A98C.s deleted file mode 100644 index 7ca16f92ed..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A123C_72A98C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72A98C -/* 72A98C 802A123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72A990 802A1240 AFB00010 */ sw $s0, 0x10($sp) -/* 72A994 802A1244 0080802D */ daddu $s0, $a0, $zero -/* 72A998 802A1248 AFBF0014 */ sw $ra, 0x14($sp) -/* 72A99C 802A124C 0C09A75B */ jal get_actor -/* 72A9A0 802A1250 8E040148 */ lw $a0, 0x148($s0) -/* 72A9A4 802A1254 0C09A75B */ jal get_actor -/* 72A9A8 802A1258 84440428 */ lh $a0, 0x428($v0) -/* 72A9AC 802A125C 90430136 */ lbu $v1, 0x136($v0) -/* 72A9B0 802A1260 38630031 */ xori $v1, $v1, 0x31 -/* 72A9B4 802A1264 2C630001 */ sltiu $v1, $v1, 1 -/* 72A9B8 802A1268 AE0300A8 */ sw $v1, 0xa8($s0) -/* 72A9BC 802A126C 8FBF0014 */ lw $ra, 0x14($sp) -/* 72A9C0 802A1270 8FB00010 */ lw $s0, 0x10($sp) -/* 72A9C4 802A1274 24020002 */ addiu $v0, $zero, 2 -/* 72A9C8 802A1278 03E00008 */ jr $ra -/* 72A9CC 802A127C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1280_72A9D0.s b/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1280_72A9D0.s deleted file mode 100644 index b3e60bc738..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A1280_72A9D0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1280_72A9D0 -/* 72A9D0 802A1280 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 72A9D4 802A1284 AFBF001C */ sw $ra, 0x1c($sp) -/* 72A9D8 802A1288 AFB00018 */ sw $s0, 0x18($sp) -/* 72A9DC 802A128C 0C09A75B */ jal get_actor -/* 72A9E0 802A1290 8C840148 */ lw $a0, 0x148($a0) -/* 72A9E4 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 72A9E8 802A1298 C6000020 */ lwc1 $f0, 0x20($s0) -/* 72A9EC 802A129C 24040231 */ addiu $a0, $zero, 0x231 -/* 72A9F0 802A12A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 72A9F4 802A12A4 8E060018 */ lw $a2, 0x18($s0) -/* 72A9F8 802A12A8 8E07001C */ lw $a3, 0x1c($s0) -/* 72A9FC 802A12AC 0C052757 */ jal play_sound_at_position -/* 72AA00 802A12B0 0000282D */ daddu $a1, $zero, $zero -/* 72AA04 802A12B4 86040428 */ lh $a0, 0x428($s0) -/* 72AA08 802A12B8 0C09A75B */ jal get_actor -/* 72AA0C 802A12BC 00000000 */ nop -/* 72AA10 802A12C0 0040202D */ daddu $a0, $v0, $zero -/* 72AA14 802A12C4 0C09DC58 */ jal dispatch_event_actor -/* 72AA18 802A12C8 24050039 */ addiu $a1, $zero, 0x39 -/* 72AA1C 802A12CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 72AA20 802A12D0 8FB00018 */ lw $s0, 0x18($sp) -/* 72AA24 802A12D4 24020002 */ addiu $v0, $zero, 2 -/* 72AA28 802A12D8 03E00008 */ jr $ra -/* 72AA2C 802A12DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A12E0_72AA30.s b/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A12E0_72AA30.s deleted file mode 100644 index e75bda22ff..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/insecticide_herb_72A750/func_802A12E0_72AA30.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12E0_72AA30 -/* 72AA30 802A12E0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 72AA34 802A12E4 AFB1001C */ sw $s1, 0x1c($sp) -/* 72AA38 802A12E8 0080882D */ daddu $s1, $a0, $zero -/* 72AA3C 802A12EC AFBF0020 */ sw $ra, 0x20($sp) -/* 72AA40 802A12F0 AFB00018 */ sw $s0, 0x18($sp) -/* 72AA44 802A12F4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 72AA48 802A12F8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 72AA4C 802A12FC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 72AA50 802A1300 8E30000C */ lw $s0, 0xc($s1) -/* 72AA54 802A1304 8E050000 */ lw $a1, ($s0) -/* 72AA58 802A1308 0C0B1EAF */ jal get_variable -/* 72AA5C 802A130C 26100004 */ addiu $s0, $s0, 4 -/* 72AA60 802A1310 4482A000 */ mtc1 $v0, $f20 -/* 72AA64 802A1314 00000000 */ nop -/* 72AA68 802A1318 4680A520 */ cvt.s.w $f20, $f20 -/* 72AA6C 802A131C 8E050000 */ lw $a1, ($s0) -/* 72AA70 802A1320 26100004 */ addiu $s0, $s0, 4 -/* 72AA74 802A1324 0C0B1EAF */ jal get_variable -/* 72AA78 802A1328 0220202D */ daddu $a0, $s1, $zero -/* 72AA7C 802A132C 4482B000 */ mtc1 $v0, $f22 -/* 72AA80 802A1330 00000000 */ nop -/* 72AA84 802A1334 4680B5A0 */ cvt.s.w $f22, $f22 -/* 72AA88 802A1338 8E050000 */ lw $a1, ($s0) -/* 72AA8C 802A133C 0C0B1EAF */ jal get_variable -/* 72AA90 802A1340 0220202D */ daddu $a0, $s1, $zero -/* 72AA94 802A1344 4482C000 */ mtc1 $v0, $f24 -/* 72AA98 802A1348 00000000 */ nop -/* 72AA9C 802A134C 4680C620 */ cvt.s.w $f24, $f24 -/* 72AAA0 802A1350 0C00A67F */ jal rand_int -/* 72AAA4 802A1354 24040014 */ addiu $a0, $zero, 0x14 -/* 72AAA8 802A1358 2404000A */ addiu $a0, $zero, 0xa -/* 72AAAC 802A135C 2442FFF6 */ addiu $v0, $v0, -0xa -/* 72AAB0 802A1360 44820000 */ mtc1 $v0, $f0 -/* 72AAB4 802A1364 00000000 */ nop -/* 72AAB8 802A1368 46800020 */ cvt.s.w $f0, $f0 -/* 72AABC 802A136C 0C00A67F */ jal rand_int -/* 72AAC0 802A1370 4600A500 */ add.s $f20, $f20, $f0 -/* 72AAC4 802A1374 0000202D */ daddu $a0, $zero, $zero -/* 72AAC8 802A1378 2442FFFB */ addiu $v0, $v0, -5 -/* 72AACC 802A137C 44820000 */ mtc1 $v0, $f0 -/* 72AAD0 802A1380 00000000 */ nop -/* 72AAD4 802A1384 46800020 */ cvt.s.w $f0, $f0 -/* 72AAD8 802A1388 4600B580 */ add.s $f22, $f22, $f0 -/* 72AADC 802A138C 3C013F80 */ lui $at, 0x3f80 -/* 72AAE0 802A1390 44811000 */ mtc1 $at, $f2 -/* 72AAE4 802A1394 4407C000 */ mfc1 $a3, $f24 -/* 72AAE8 802A1398 4405A000 */ mfc1 $a1, $f20 -/* 72AAEC 802A139C 4406B000 */ mfc1 $a2, $f22 -/* 72AAF0 802A13A0 2402001E */ addiu $v0, $zero, 0x1e -/* 72AAF4 802A13A4 AFA20014 */ sw $v0, 0x14($sp) -/* 72AAF8 802A13A8 0C01C88C */ jal func_80072230 -/* 72AAFC 802A13AC E7A20010 */ swc1 $f2, 0x10($sp) -/* 72AB00 802A13B0 0040202D */ daddu $a0, $v0, $zero -/* 72AB04 802A13B4 8C82000C */ lw $v0, 0xc($a0) -/* 72AB08 802A13B8 240300F4 */ addiu $v1, $zero, 0xf4 -/* 72AB0C 802A13BC AC430018 */ sw $v1, 0x18($v0) -/* 72AB10 802A13C0 8C82000C */ lw $v0, 0xc($a0) -/* 72AB14 802A13C4 AC43001C */ sw $v1, 0x1c($v0) -/* 72AB18 802A13C8 8C83000C */ lw $v1, 0xc($a0) -/* 72AB1C 802A13CC 240200DC */ addiu $v0, $zero, 0xdc -/* 72AB20 802A13D0 AC620020 */ sw $v0, 0x20($v1) -/* 72AB24 802A13D4 8C82000C */ lw $v0, 0xc($a0) -/* 72AB28 802A13D8 240500D2 */ addiu $a1, $zero, 0xd2 -/* 72AB2C 802A13DC AC450028 */ sw $a1, 0x28($v0) -/* 72AB30 802A13E0 8C83000C */ lw $v1, 0xc($a0) -/* 72AB34 802A13E4 AC65002C */ sw $a1, 0x2c($v1) -/* 72AB38 802A13E8 8C84000C */ lw $a0, 0xc($a0) -/* 72AB3C 802A13EC 240300BE */ addiu $v1, $zero, 0xbe -/* 72AB40 802A13F0 AC830030 */ sw $v1, 0x30($a0) -/* 72AB44 802A13F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 72AB48 802A13F8 8FB1001C */ lw $s1, 0x1c($sp) -/* 72AB4C 802A13FC 8FB00018 */ lw $s0, 0x18($sp) -/* 72AB50 802A1400 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 72AB54 802A1404 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 72AB58 802A1408 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 72AB5C 802A140C 24020002 */ addiu $v0, $zero, 2 -/* 72AB60 802A1410 03E00008 */ jr $ra -/* 72AB64 802A1414 27BD0040 */ addiu $sp, $sp, 0x40 -/* 72AB68 802A1418 00000000 */ nop -/* 72AB6C 802A141C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1000_72E530.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1000_72E530.s deleted file mode 100644 index 95f11bb7cc..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1000_72E530.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_72E530 -/* 72E530 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72E534 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 72E538 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72E53C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 72E540 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 72E544 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 72E548 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72E54C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 72E550 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 72E554 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 72E558 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72E55C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 72E560 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 72E564 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 72E568 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72E56C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 72E570 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 72E574 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 72E578 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72E57C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 72E580 802A1050 00021140 */ sll $v0, $v0, 5 -/* 72E584 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 72E588 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72E58C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 72E590 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 72E594 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 72E598 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72E59C 802A106C 00000000 */ nop -/* 72E5A0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 72E5A4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 72E5A8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72E5AC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 72E5B0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 72E5B4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 72E5B8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72E5BC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 72E5C0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 72E5C4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 72E5C8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72E5CC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 72E5D0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 72E5D4 802A10A4 00440018 */ mult $v0, $a0 -/* 72E5D8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72E5DC 802A10AC 00004010 */ mfhi $t0 -/* 72E5E0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 72E5E4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 72E5E8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72E5EC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 72E5F0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 72E5F4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 72E5F8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72E5FC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 72E600 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 72E604 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72E608 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72E60C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 72E610 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 72E614 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 72E618 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72E61C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 72E620 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 72E624 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 72E628 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72E62C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 72E630 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 72E634 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 72E638 802A1108 0C04C4FD */ jal make_item_entity -/* 72E63C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 72E640 802A1110 0C03A830 */ jal add_coins -/* 72E644 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 72E648 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72E64C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72E650 802A1120 00000000 */ nop -.L802A1124: -/* 72E654 802A1124 00101040 */ sll $v0, $s0, 1 -/* 72E658 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72E65C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 72E660 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72E664 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 72E668 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72E66C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 72E670 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 72E674 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 72E678 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72E67C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 72E680 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 72E684 802A1154 44050000 */ mfc1 $a1, $f0 -/* 72E688 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72E68C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 72E690 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 72E694 802A1164 0C00B94E */ jal get_screen_coords -/* 72E698 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72E69C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 72E6A0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 72E6A4 802A1174 0C050529 */ jal create_icon -/* 72E6A8 802A1178 00000000 */ nop -/* 72E6AC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 72E6B0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 72E6B4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 72E6B8 802A1188 3C01802A */ lui $at, %hi(D_802A21F0) -/* 72E6BC 802A118C AC2421F0 */ sw $a0, %lo(D_802A21F0)($at) -/* 72E6C0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 72E6C4 802A1194 0C051261 */ jal set_icon_render_pos -/* 72E6C8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72E6CC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 72E6D0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 72E6D4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 72E6D8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72E6DC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 72E6E0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 72E6E4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 72E6E8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72E6EC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 72E6F0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 72E6F4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 72E6F8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72E6FC 802A11CC 03E00008 */ jr $ra -/* 72E700 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A11D4_72E704.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A11D4_72E704.s deleted file mode 100644 index 13d786d64e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A11D4_72E704.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_72E704 -/* 72E704 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72E708 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72E70C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 72E710 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 72E714 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 72E718 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72E71C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 72E720 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 72E724 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 72E728 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72E72C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 72E730 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 72E734 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 72E738 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72E73C 802A120C 00000000 */ nop -/* 72E740 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72E744 802A1214 00000000 */ nop -/* 72E748 802A1218 3C04802A */ lui $a0, %hi(D_802A21F0) -/* 72E74C 802A121C 8C8421F0 */ lw $a0, %lo(D_802A21F0)($a0) -/* 72E750 802A1220 0C05123D */ jal free_icon -/* 72E754 802A1224 00000000 */ nop -.L802A1228: -/* 72E758 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72E75C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 72E760 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 72E764 802A1234 03E00008 */ jr $ra -/* 72E768 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A123C_72E76C.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A123C_72E76C.s deleted file mode 100644 index 8e678a2ef0..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A123C_72E76C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72E76C -/* 72E76C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 72E770 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 72E774 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 72E778 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 72E77C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 72E780 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 72E784 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 72E788 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 72E78C 802A125C 8E050000 */ lw $a1, ($s0) -/* 72E790 802A1260 0C0B1EAF */ jal get_variable -/* 72E794 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 72E798 802A1268 8E050000 */ lw $a1, ($s0) -/* 72E79C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 72E7A0 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 72E7A4 802A1274 0C0B1EAF */ jal get_variable -/* 72E7A8 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 72E7AC 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 72E7B0 802A1280 8E050000 */ lw $a1, ($s0) -/* 72E7B4 802A1284 0C0B1EAF */ jal get_variable -/* 72E7B8 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 72E7BC 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 72E7C0 802A1290 0C04C3D6 */ jal get_item_entity -/* 72E7C4 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 72E7C8 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 72E7CC 802A129C 44930000 */ mtc1 $s3, $f0 -/* 72E7D0 802A12A0 00000000 */ nop -/* 72E7D4 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 72E7D8 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 72E7DC 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 72E7E0 802A12B0 00000000 */ nop -/* 72E7E4 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 72E7E8 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 72E7EC 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 72E7F0 802A12C0 00000000 */ nop -/* 72E7F4 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 72E7F8 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 72E7FC 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 72E800 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 72E804 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 72E808 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 72E80C 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 72E810 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 72E814 802A12E4 03E00008 */ jr $ra -/* 72E818 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A12EC_72E81C.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A12EC_72E81C.s deleted file mode 100644 index 038ec679f6..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A12EC_72E81C.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_72E81C -/* 72E81C 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72E820 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 72E824 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 72E828 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 72E82C 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 72E830 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 72E834 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 72E838 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 72E83C 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 72E840 802A1310 8CA50000 */ lw $a1, ($a1) -/* 72E844 802A1314 0C0B1EAF */ jal get_variable -/* 72E848 802A1318 00000000 */ nop -/* 72E84C 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 72E850 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 72E854 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 72E858 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 72E85C 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 72E860 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 72E864 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 72E868 802A1338 18600005 */ blez $v1, .L802A1350 -/* 72E86C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 72E870 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 72E874 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 72E878 802A1348 080A84D9 */ j .L802A1364 -/* 72E87C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 72E880 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 72E884 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 72E888 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 72E88C 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 72E890 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 72E894 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 72E898 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 72E89C 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 72E8A0 802A1370 03E00008 */ jr $ra -/* 72E8A4 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1378_72E8A8.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1378_72E8A8.s deleted file mode 100644 index a729f852d8..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1378_72E8A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_72E8A8 -/* 72E8A8 802A1378 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 72E8AC 802A137C AFB1001C */ sw $s1, 0x1c($sp) -/* 72E8B0 802A1380 0080882D */ daddu $s1, $a0, $zero -/* 72E8B4 802A1384 AFBF0028 */ sw $ra, 0x28($sp) -/* 72E8B8 802A1388 AFB30024 */ sw $s3, 0x24($sp) -/* 72E8BC 802A138C AFB20020 */ sw $s2, 0x20($sp) -/* 72E8C0 802A1390 AFB00018 */ sw $s0, 0x18($sp) -/* 72E8C4 802A1394 8E30000C */ lw $s0, 0xc($s1) -/* 72E8C8 802A1398 8E050000 */ lw $a1, ($s0) -/* 72E8CC 802A139C 0C0B1EAF */ jal get_variable -/* 72E8D0 802A13A0 26100004 */ addiu $s0, $s0, 4 -/* 72E8D4 802A13A4 8E050000 */ lw $a1, ($s0) -/* 72E8D8 802A13A8 26100004 */ addiu $s0, $s0, 4 -/* 72E8DC 802A13AC 0220202D */ daddu $a0, $s1, $zero -/* 72E8E0 802A13B0 0C0B1EAF */ jal get_variable -/* 72E8E4 802A13B4 0040982D */ daddu $s3, $v0, $zero -/* 72E8E8 802A13B8 8E050000 */ lw $a1, ($s0) -/* 72E8EC 802A13BC 26100004 */ addiu $s0, $s0, 4 -/* 72E8F0 802A13C0 0220202D */ daddu $a0, $s1, $zero -/* 72E8F4 802A13C4 0C0B1EAF */ jal get_variable -/* 72E8F8 802A13C8 0040902D */ daddu $s2, $v0, $zero -/* 72E8FC 802A13CC 0220202D */ daddu $a0, $s1, $zero -/* 72E900 802A13D0 8E050000 */ lw $a1, ($s0) -/* 72E904 802A13D4 0C0B1EAF */ jal get_variable -/* 72E908 802A13D8 0040802D */ daddu $s0, $v0, $zero -/* 72E90C 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 72E910 802A13E0 00000000 */ nop -/* 72E914 802A13E4 46800020 */ cvt.s.w $f0, $f0 -/* 72E918 802A13E8 44050000 */ mfc1 $a1, $f0 -/* 72E91C 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 72E920 802A13F0 00000000 */ nop -/* 72E924 802A13F4 46800020 */ cvt.s.w $f0, $f0 -/* 72E928 802A13F8 44060000 */ mfc1 $a2, $f0 -/* 72E92C 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 72E930 802A1400 00000000 */ nop -/* 72E934 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 72E938 802A1408 44070000 */ mfc1 $a3, $f0 -/* 72E93C 802A140C 0000202D */ daddu $a0, $zero, $zero -/* 72E940 802A1410 0C01C424 */ jal func_80071090 -/* 72E944 802A1414 AFA20010 */ sw $v0, 0x10($sp) -/* 72E948 802A1418 8FBF0028 */ lw $ra, 0x28($sp) -/* 72E94C 802A141C 8FB30024 */ lw $s3, 0x24($sp) -/* 72E950 802A1420 8FB20020 */ lw $s2, 0x20($sp) -/* 72E954 802A1424 8FB1001C */ lw $s1, 0x1c($sp) -/* 72E958 802A1428 8FB00018 */ lw $s0, 0x18($sp) -/* 72E95C 802A142C 24020002 */ addiu $v0, $zero, 2 -/* 72E960 802A1430 03E00008 */ jr $ra -/* 72E964 802A1434 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1438_72E968.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1438_72E968.s deleted file mode 100644 index 1a4270a3eb..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1438_72E968.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1438_72E968 -/* 72E968 802A1438 3C058011 */ lui $a1, %hi(gPlayerData) -/* 72E96C 802A143C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 72E970 802A1440 90A20002 */ lbu $v0, 2($a1) -/* 72E974 802A1444 3C068009 */ lui $a2, %hi(gItemTable+0x12BB) -/* 72E978 802A1448 90C68B9B */ lbu $a2, %lo(gItemTable+0x12BB)($a2) -/* 72E97C 802A144C 80A30003 */ lb $v1, 3($a1) -/* 72E980 802A1450 00461021 */ addu $v0, $v0, $a2 -/* 72E984 802A1454 A0A20002 */ sb $v0, 2($a1) -/* 72E988 802A1458 00021600 */ sll $v0, $v0, 0x18 -/* 72E98C 802A145C 00021603 */ sra $v0, $v0, 0x18 -/* 72E990 802A1460 0062182A */ slt $v1, $v1, $v0 -/* 72E994 802A1464 90A20003 */ lbu $v0, 3($a1) -/* 72E998 802A1468 54600001 */ bnel $v1, $zero, .L802A1470 -/* 72E99C 802A146C A0A20002 */ sb $v0, 2($a1) -.L802A1470: -/* 72E9A0 802A1470 00061600 */ sll $v0, $a2, 0x18 -/* 72E9A4 802A1474 00021603 */ sra $v0, $v0, 0x18 -/* 72E9A8 802A1478 AC820090 */ sw $v0, 0x90($a0) -/* 72E9AC 802A147C 03E00008 */ jr $ra -/* 72E9B0 802A1480 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1484_72E9B4.s b/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1484_72E9B4.s deleted file mode 100644 index 2a4c9099d0..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/life_shroom_72E530/func_802A1484_72E9B4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1484_72E9B4 -/* 72E9B4 802A1484 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72E9B8 802A1488 AFB00010 */ sw $s0, 0x10($sp) -/* 72E9BC 802A148C 0080802D */ daddu $s0, $a0, $zero -/* 72E9C0 802A1490 AFBF0014 */ sw $ra, 0x14($sp) -/* 72E9C4 802A1494 8E02000C */ lw $v0, 0xc($s0) -/* 72E9C8 802A1498 0C0B1EAF */ jal get_variable -/* 72E9CC 802A149C 8C450000 */ lw $a1, ($v0) -/* 72E9D0 802A14A0 3C038008 */ lui $v1, %hi(gItemTable) -/* 72E9D4 802A14A4 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 72E9D8 802A14A8 00021140 */ sll $v0, $v0, 5 -/* 72E9DC 802A14AC 00431021 */ addu $v0, $v0, $v1 -/* 72E9E0 802A14B0 8043001B */ lb $v1, 0x1b($v0) -/* 72E9E4 802A14B4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 72E9E8 802A14B8 8044001C */ lb $a0, 0x1c($v0) -/* 72E9EC 802A14BC 0000102D */ daddu $v0, $zero, $zero -/* 72E9F0 802A14C0 04600005 */ bltz $v1, .L802A14D8 -/* 72E9F4 802A14C4 AE0400B4 */ sw $a0, 0xb4($s0) -/* 72E9F8 802A14C8 5C600005 */ bgtzl $v1, .L802A14E0 -/* 72E9FC 802A14CC AE0200C0 */ sw $v0, 0xc0($s0) -/* 72EA00 802A14D0 04830003 */ bgezl $a0, .L802A14E0 -/* 72EA04 802A14D4 AE0200C0 */ sw $v0, 0xc0($s0) -.L802A14D8: -/* 72EA08 802A14D8 24020001 */ addiu $v0, $zero, 1 -/* 72EA0C 802A14DC AE0200C0 */ sw $v0, 0xc0($s0) -.L802A14E0: -/* 72EA10 802A14E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 72EA14 802A14E4 8FB00010 */ lw $s0, 0x10($sp) -/* 72EA18 802A14E8 24020002 */ addiu $v0, $zero, 2 -/* 72EA1C 802A14EC 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1000_715850.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1000_715850.s deleted file mode 100644 index bec9e437c9..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1000_715850.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_715850 -/* 715850 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 715854 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 715858 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71585C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 715860 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 715864 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 715868 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71586C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 715870 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 715874 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 715878 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71587C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 715880 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 715884 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 715888 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71588C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 715890 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 715894 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 715898 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71589C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7158A0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7158A4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7158A8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7158AC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7158B0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7158B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7158B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7158BC 802A106C 00000000 */ nop -/* 7158C0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7158C4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7158C8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7158CC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7158D0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7158D4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7158D8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7158DC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 7158E0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 7158E4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 7158E8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 7158EC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7158F0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7158F4 802A10A4 00440018 */ mult $v0, $a0 -/* 7158F8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7158FC 802A10AC 00004010 */ mfhi $t0 -/* 715900 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 715904 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 715908 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71590C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 715910 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 715914 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 715918 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71591C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 715920 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 715924 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 715928 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71592C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 715930 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 715934 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 715938 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71593C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 715940 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 715944 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 715948 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71594C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 715950 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 715954 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 715958 802A1108 0C04C4FD */ jal make_item_entity -/* 71595C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 715960 802A1110 0C03A830 */ jal add_coins -/* 715964 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 715968 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71596C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 715970 802A1120 00000000 */ nop -.L802A1124: -/* 715974 802A1124 00101040 */ sll $v0, $s0, 1 -/* 715978 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71597C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 715980 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 715984 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 715988 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71598C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 715990 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 715994 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 715998 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71599C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7159A0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7159A4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7159A8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7159AC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7159B0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7159B4 802A1164 0C00B94E */ jal get_screen_coords -/* 7159B8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7159BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7159C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7159C4 802A1174 0C050529 */ jal create_icon -/* 7159C8 802A1178 00000000 */ nop -/* 7159CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 7159D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 7159D4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 7159D8 802A1188 3C01802A */ lui $at, %hi(D_802A2410) -/* 7159DC 802A118C AC242410 */ sw $a0, %lo(D_802A2410)($at) -/* 7159E0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 7159E4 802A1194 0C051261 */ jal set_icon_render_pos -/* 7159E8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 7159EC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7159F0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7159F4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7159F8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7159FC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 715A00 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 715A04 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 715A08 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 715A0C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 715A10 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 715A14 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 715A18 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 715A1C 802A11CC 03E00008 */ jr $ra -/* 715A20 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A11D4_715A24.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A11D4_715A24.s deleted file mode 100644 index 6620a2255e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A11D4_715A24.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_715A24 -/* 715A24 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715A28 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 715A2C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 715A30 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 715A34 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 715A38 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 715A3C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 715A40 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 715A44 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 715A48 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 715A4C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 715A50 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 715A54 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 715A58 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 715A5C 802A120C 00000000 */ nop -/* 715A60 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 715A64 802A1214 00000000 */ nop -/* 715A68 802A1218 3C04802A */ lui $a0, %hi(D_802A2410) -/* 715A6C 802A121C 8C842410 */ lw $a0, %lo(D_802A2410)($a0) -/* 715A70 802A1220 0C05123D */ jal free_icon -/* 715A74 802A1224 00000000 */ nop -.L802A1228: -/* 715A78 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 715A7C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 715A80 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 715A84 802A1234 03E00008 */ jr $ra -/* 715A88 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A123C_715A8C.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A123C_715A8C.s deleted file mode 100644 index d33f15408e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A123C_715A8C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_715A8C -/* 715A8C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 715A90 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 715A94 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 715A98 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 715A9C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 715AA0 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 715AA4 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 715AA8 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 715AAC 802A125C 8E050000 */ lw $a1, ($s0) -/* 715AB0 802A1260 0C0B1EAF */ jal get_variable -/* 715AB4 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 715AB8 802A1268 8E050000 */ lw $a1, ($s0) -/* 715ABC 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 715AC0 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 715AC4 802A1274 0C0B1EAF */ jal get_variable -/* 715AC8 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 715ACC 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 715AD0 802A1280 8E050000 */ lw $a1, ($s0) -/* 715AD4 802A1284 0C0B1EAF */ jal get_variable -/* 715AD8 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 715ADC 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 715AE0 802A1290 0C04C3D6 */ jal get_item_entity -/* 715AE4 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 715AE8 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 715AEC 802A129C 44930000 */ mtc1 $s3, $f0 -/* 715AF0 802A12A0 00000000 */ nop -/* 715AF4 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 715AF8 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 715AFC 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 715B00 802A12B0 00000000 */ nop -/* 715B04 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 715B08 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 715B0C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 715B10 802A12C0 00000000 */ nop -/* 715B14 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 715B18 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 715B1C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 715B20 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 715B24 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 715B28 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 715B2C 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 715B30 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 715B34 802A12E4 03E00008 */ jr $ra -/* 715B38 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A12EC_715B3C.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A12EC_715B3C.s deleted file mode 100644 index 5bfee63806..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A12EC_715B3C.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_715B3C -/* 715B3C 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715B40 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 715B44 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 715B48 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 715B4C 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 715B50 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 715B54 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 715B58 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 715B5C 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 715B60 802A1310 8CA50000 */ lw $a1, ($a1) -/* 715B64 802A1314 0C0B1EAF */ jal get_variable -/* 715B68 802A1318 00000000 */ nop -/* 715B6C 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 715B70 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 715B74 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 715B78 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 715B7C 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 715B80 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 715B84 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 715B88 802A1338 18600005 */ blez $v1, .L802A1350 -/* 715B8C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 715B90 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 715B94 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 715B98 802A1348 080A84D9 */ j .L802A1364 -/* 715B9C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 715BA0 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 715BA4 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 715BA8 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 715BAC 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 715BB0 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 715BB4 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 715BB8 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 715BBC 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 715BC0 802A1370 03E00008 */ jr $ra -/* 715BC4 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1378_715BC8.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1378_715BC8.s deleted file mode 100644 index 5a7bbcbb61..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1378_715BC8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_715BC8 -/* 715BC8 802A1378 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 715BCC 802A137C AFB1001C */ sw $s1, 0x1c($sp) -/* 715BD0 802A1380 0080882D */ daddu $s1, $a0, $zero -/* 715BD4 802A1384 AFBF0028 */ sw $ra, 0x28($sp) -/* 715BD8 802A1388 AFB30024 */ sw $s3, 0x24($sp) -/* 715BDC 802A138C AFB20020 */ sw $s2, 0x20($sp) -/* 715BE0 802A1390 AFB00018 */ sw $s0, 0x18($sp) -/* 715BE4 802A1394 8E30000C */ lw $s0, 0xc($s1) -/* 715BE8 802A1398 8E050000 */ lw $a1, ($s0) -/* 715BEC 802A139C 0C0B1EAF */ jal get_variable -/* 715BF0 802A13A0 26100004 */ addiu $s0, $s0, 4 -/* 715BF4 802A13A4 8E050000 */ lw $a1, ($s0) -/* 715BF8 802A13A8 26100004 */ addiu $s0, $s0, 4 -/* 715BFC 802A13AC 0220202D */ daddu $a0, $s1, $zero -/* 715C00 802A13B0 0C0B1EAF */ jal get_variable -/* 715C04 802A13B4 0040982D */ daddu $s3, $v0, $zero -/* 715C08 802A13B8 8E050000 */ lw $a1, ($s0) -/* 715C0C 802A13BC 26100004 */ addiu $s0, $s0, 4 -/* 715C10 802A13C0 0220202D */ daddu $a0, $s1, $zero -/* 715C14 802A13C4 0C0B1EAF */ jal get_variable -/* 715C18 802A13C8 0040902D */ daddu $s2, $v0, $zero -/* 715C1C 802A13CC 0220202D */ daddu $a0, $s1, $zero -/* 715C20 802A13D0 8E050000 */ lw $a1, ($s0) -/* 715C24 802A13D4 0C0B1EAF */ jal get_variable -/* 715C28 802A13D8 0040802D */ daddu $s0, $v0, $zero -/* 715C2C 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 715C30 802A13E0 00000000 */ nop -/* 715C34 802A13E4 46800020 */ cvt.s.w $f0, $f0 -/* 715C38 802A13E8 44050000 */ mfc1 $a1, $f0 -/* 715C3C 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 715C40 802A13F0 00000000 */ nop -/* 715C44 802A13F4 46800020 */ cvt.s.w $f0, $f0 -/* 715C48 802A13F8 44060000 */ mfc1 $a2, $f0 -/* 715C4C 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 715C50 802A1400 00000000 */ nop -/* 715C54 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 715C58 802A1408 44070000 */ mfc1 $a3, $f0 -/* 715C5C 802A140C 0000202D */ daddu $a0, $zero, $zero -/* 715C60 802A1410 0C01C424 */ jal func_80071090 -/* 715C64 802A1414 AFA20010 */ sw $v0, 0x10($sp) -/* 715C68 802A1418 8FBF0028 */ lw $ra, 0x28($sp) -/* 715C6C 802A141C 8FB30024 */ lw $s3, 0x24($sp) -/* 715C70 802A1420 8FB20020 */ lw $s2, 0x20($sp) -/* 715C74 802A1424 8FB1001C */ lw $s1, 0x1c($sp) -/* 715C78 802A1428 8FB00018 */ lw $s0, 0x18($sp) -/* 715C7C 802A142C 24020002 */ addiu $v0, $zero, 2 -/* 715C80 802A1430 03E00008 */ jr $ra -/* 715C84 802A1434 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1438_715C88.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1438_715C88.s deleted file mode 100644 index 4e7982ce37..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A1438_715C88.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1438_715C88 -/* 715C88 802A1438 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 715C8C 802A143C AFB1001C */ sw $s1, 0x1c($sp) -/* 715C90 802A1440 0080882D */ daddu $s1, $a0, $zero -/* 715C94 802A1444 AFBF0028 */ sw $ra, 0x28($sp) -/* 715C98 802A1448 AFB30024 */ sw $s3, 0x24($sp) -/* 715C9C 802A144C AFB20020 */ sw $s2, 0x20($sp) -/* 715CA0 802A1450 AFB00018 */ sw $s0, 0x18($sp) -/* 715CA4 802A1454 8E30000C */ lw $s0, 0xc($s1) -/* 715CA8 802A1458 8E050000 */ lw $a1, ($s0) -/* 715CAC 802A145C 0C0B1EAF */ jal get_variable -/* 715CB0 802A1460 26100004 */ addiu $s0, $s0, 4 -/* 715CB4 802A1464 8E050000 */ lw $a1, ($s0) -/* 715CB8 802A1468 26100004 */ addiu $s0, $s0, 4 -/* 715CBC 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 715CC0 802A1470 0C0B1EAF */ jal get_variable -/* 715CC4 802A1474 0040982D */ daddu $s3, $v0, $zero -/* 715CC8 802A1478 8E050000 */ lw $a1, ($s0) -/* 715CCC 802A147C 26100004 */ addiu $s0, $s0, 4 -/* 715CD0 802A1480 0220202D */ daddu $a0, $s1, $zero -/* 715CD4 802A1484 0C0B1EAF */ jal get_variable -/* 715CD8 802A1488 0040902D */ daddu $s2, $v0, $zero -/* 715CDC 802A148C 0220202D */ daddu $a0, $s1, $zero -/* 715CE0 802A1490 8E050000 */ lw $a1, ($s0) -/* 715CE4 802A1494 0C0B1EAF */ jal get_variable -/* 715CE8 802A1498 0040802D */ daddu $s0, $v0, $zero -/* 715CEC 802A149C 44930000 */ mtc1 $s3, $f0 -/* 715CF0 802A14A0 00000000 */ nop -/* 715CF4 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 715CF8 802A14A8 44050000 */ mfc1 $a1, $f0 -/* 715CFC 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 715D00 802A14B0 00000000 */ nop -/* 715D04 802A14B4 46800020 */ cvt.s.w $f0, $f0 -/* 715D08 802A14B8 44060000 */ mfc1 $a2, $f0 -/* 715D0C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 715D10 802A14C0 00000000 */ nop -/* 715D14 802A14C4 46800020 */ cvt.s.w $f0, $f0 -/* 715D18 802A14C8 44070000 */ mfc1 $a3, $f0 -/* 715D1C 802A14CC 24040001 */ addiu $a0, $zero, 1 -/* 715D20 802A14D0 0C01C424 */ jal func_80071090 -/* 715D24 802A14D4 AFA20010 */ sw $v0, 0x10($sp) -/* 715D28 802A14D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 715D2C 802A14DC 8FB30024 */ lw $s3, 0x24($sp) -/* 715D30 802A14E0 8FB20020 */ lw $s2, 0x20($sp) -/* 715D34 802A14E4 8FB1001C */ lw $s1, 0x1c($sp) -/* 715D38 802A14E8 8FB00018 */ lw $s0, 0x18($sp) -/* 715D3C 802A14EC 24020002 */ addiu $v0, $zero, 2 -/* 715D40 802A14F0 03E00008 */ jr $ra -/* 715D44 802A14F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A15A0_715DF0.s b/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A15A0_715DF0.s deleted file mode 100644 index 53bf24e282..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mushroom_715850/func_802A15A0_715DF0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A15A0_715DF0 -/* 715DF0 802A15A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 715DF4 802A15A4 AFB00010 */ sw $s0, 0x10($sp) -/* 715DF8 802A15A8 0080802D */ daddu $s0, $a0, $zero -/* 715DFC 802A15AC AFBF0014 */ sw $ra, 0x14($sp) -/* 715E00 802A15B0 8E02000C */ lw $v0, 0xc($s0) -/* 715E04 802A15B4 0C0B1EAF */ jal get_variable -/* 715E08 802A15B8 8C450000 */ lw $a1, ($v0) -/* 715E0C 802A15BC 3C038008 */ lui $v1, %hi(gItemTable) -/* 715E10 802A15C0 246378E0 */ addiu $v1, $v1, %lo(gItemTable) -/* 715E14 802A15C4 00021140 */ sll $v0, $v0, 5 -/* 715E18 802A15C8 00431021 */ addu $v0, $v0, $v1 -/* 715E1C 802A15CC 8043001B */ lb $v1, 0x1b($v0) -/* 715E20 802A15D0 AE0300B0 */ sw $v1, 0xb0($s0) -/* 715E24 802A15D4 8043001C */ lb $v1, 0x1c($v0) -/* 715E28 802A15D8 AE0300B4 */ sw $v1, 0xb4($s0) -/* 715E2C 802A15DC 8043001B */ lb $v1, 0x1b($v0) -/* 715E30 802A15E0 38630001 */ xori $v1, $v1, 1 -/* 715E34 802A15E4 2C630001 */ sltiu $v1, $v1, 1 -/* 715E38 802A15E8 AE0300C0 */ sw $v1, 0xc0($s0) -/* 715E3C 802A15EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 715E40 802A15F0 8FB00010 */ lw $s0, 0x10($sp) -/* 715E44 802A15F4 24020002 */ addiu $v0, $zero, 2 -/* 715E48 802A15F8 03E00008 */ jr $ra -/* 715E4C 802A15FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A123C_72C7EC.s b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/battle_item_mystery_func_802A123C_72C7EC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A123C_72C7EC.s rename to ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/battle_item_mystery_func_802A123C_72C7EC.s diff --git a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A13E4_72C994.s b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/battle_item_mystery_func_802A13E4_72C994.s similarity index 95% rename from ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A13E4_72C994.s rename to ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/battle_item_mystery_func_802A13E4_72C994.s index 6704900bf8..efe9b73575 100644 --- a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A13E4_72C994.s +++ b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/battle_item_mystery_func_802A13E4_72C994.s @@ -1,6 +1,12 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802A25A0_72DB50 +.word L802A143C_72C9EC, L802A1548_72CAF8, L802A168C_72CC3C, L802A1710_72CCC0, L802A17AC_72CD5C, L802A17CC_72CD7C, 0, 0 + +.section .text glabel func_802A13E4_72C994 /* 72C994 802A13E4 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 72C998 802A13E8 0080302D */ daddu $a2, $a0, $zero @@ -26,8 +32,8 @@ glabel func_802A13E4_72C994 /* 72C9E4 802A1434 00400008 */ jr $v0 /* 72C9E8 802A1438 00000000 */ nop glabel L802A143C_72C9EC -/* 72C9EC 802A143C 3C05802A */ lui $a1, %hi(func_802A123C_72C7EC) -/* 72C9F0 802A1440 24A5123C */ addiu $a1, $a1, %lo(func_802A123C_72C7EC) +/* 72C9EC 802A143C 3C05802A */ lui $a1, %hi(battle_item_mystery_func_802A123C_72C7EC) +/* 72C9F0 802A1440 24A5123C */ addiu $a1, $a1, %lo(battle_item_mystery_func_802A123C_72C7EC) /* 72C9F4 802A1444 0C048C8F */ jal bind_dynamic_entity_7 /* 72C9F8 802A1448 0000202D */ daddu $a0, $zero, $zero /* 72C9FC 802A144C 3C01802A */ lui $at, %hi(D_802A25F8) @@ -42,8 +48,8 @@ glabel L802A143C_72C9EC /* 72CA20 802A1470 3C01802A */ lui $at, %hi(D_802A25F0) /* 72CA24 802A1474 AC2225F0 */ sw $v0, %lo(D_802A25F0)($at) /* 72CA28 802A1478 82430432 */ lb $v1, 0x432($s2) -/* 72CA2C 802A147C 3C02802A */ lui $v0, %hi(D_802A227C_72D82C) -/* 72CA30 802A1480 2442227C */ addiu $v0, $v0, %lo(D_802A227C_72D82C) +/* 72CA2C 802A147C 3C02802A */ lui $v0, %hi(battle_item_mystery_D_802A227C_72D82C) +/* 72CA30 802A1480 2442227C */ addiu $v0, $v0, %lo(battle_item_mystery_D_802A227C_72D82C) /* 72CA34 802A1484 18600010 */ blez $v1, .L802A14C8 /* 72CA38 802A1488 AE020000 */ sw $v0, ($s0) /* 72CA3C 802A148C 24040001 */ addiu $a0, $zero, 1 @@ -58,8 +64,8 @@ glabel L802A143C_72C9EC /* 72CA60 802A14B0 00000000 */ nop /* 72CA64 802A14B4 45020005 */ bc1fl .L802A14CC /* 72CA68 802A14B8 0000802D */ daddu $s0, $zero, $zero -/* 72CA6C 802A14BC 3C02802A */ lui $v0, %hi(D_802A229C_72D84C) -/* 72CA70 802A14C0 2442229C */ addiu $v0, $v0, %lo(D_802A229C_72D84C) +/* 72CA6C 802A14BC 3C02802A */ lui $v0, %hi(battle_item_mystery_D_802A229C_72D84C) +/* 72CA70 802A14C0 2442229C */ addiu $v0, $v0, %lo(battle_item_mystery_D_802A229C_72D84C) /* 72CA74 802A14C4 AE020000 */ sw $v0, ($s0) .L802A14C8: /* 72CA78 802A14C8 0000802D */ daddu $s0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A1000_72C5B0.s b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A1000_72C5B0.s deleted file mode 100644 index a0d5140011..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A1000_72C5B0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_72C5B0 -/* 72C5B0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72C5B4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 72C5B8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72C5BC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 72C5C0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 72C5C4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 72C5C8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72C5CC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 72C5D0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 72C5D4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 72C5D8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72C5DC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 72C5E0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 72C5E4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 72C5E8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72C5EC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 72C5F0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 72C5F4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 72C5F8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72C5FC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 72C600 802A1050 00021140 */ sll $v0, $v0, 5 -/* 72C604 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 72C608 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72C60C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 72C610 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 72C614 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 72C618 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72C61C 802A106C 00000000 */ nop -/* 72C620 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 72C624 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 72C628 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72C62C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 72C630 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 72C634 802A1084 1A400045 */ blez $s2, .L802A119C -/* 72C638 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72C63C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 72C640 802A1090 00121880 */ sll $v1, $s2, 2 -/* 72C644 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 72C648 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72C64C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 72C650 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 72C654 802A10A4 00440018 */ mult $v0, $a0 -/* 72C658 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72C65C 802A10AC 00004010 */ mfhi $t0 -/* 72C660 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 72C664 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 72C668 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72C66C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 72C670 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 72C674 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 72C678 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72C67C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 72C680 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 72C684 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72C688 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72C68C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 72C690 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 72C694 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 72C698 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72C69C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 72C6A0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 72C6A4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 72C6A8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72C6AC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 72C6B0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 72C6B4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 72C6B8 802A1108 0C04C4FD */ jal make_item_entity -/* 72C6BC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 72C6C0 802A1110 0C03A830 */ jal add_coins -/* 72C6C4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 72C6C8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72C6CC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72C6D0 802A1120 00000000 */ nop -.L802A1124: -/* 72C6D4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 72C6D8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72C6DC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 72C6E0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72C6E4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 72C6E8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72C6EC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 72C6F0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 72C6F4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 72C6F8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72C6FC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 72C700 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 72C704 802A1154 44050000 */ mfc1 $a1, $f0 -/* 72C708 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72C70C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 72C710 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 72C714 802A1164 0C00B94E */ jal get_screen_coords -/* 72C718 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72C71C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 72C720 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 72C724 802A1174 0C050529 */ jal create_icon -/* 72C728 802A1178 00000000 */ nop -/* 72C72C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 72C730 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 72C734 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 72C738 802A1188 3C01802A */ lui $at, %hi(D_802A25C0) -/* 72C73C 802A118C AC2425C0 */ sw $a0, %lo(D_802A25C0)($at) -/* 72C740 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 72C744 802A1194 0C051261 */ jal set_icon_render_pos -/* 72C748 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72C74C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 72C750 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 72C754 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 72C758 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72C75C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 72C760 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 72C764 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 72C768 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72C76C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 72C770 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 72C774 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 72C778 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72C77C 802A11CC 03E00008 */ jr $ra -/* 72C780 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A11D4_72C784.s b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A11D4_72C784.s deleted file mode 100644 index 49d66b29a5..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A11D4_72C784.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_72C784 -/* 72C784 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72C788 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72C78C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 72C790 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 72C794 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 72C798 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72C79C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 72C7A0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 72C7A4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 72C7A8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72C7AC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 72C7B0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 72C7B4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 72C7B8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72C7BC 802A120C 00000000 */ nop -/* 72C7C0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72C7C4 802A1214 00000000 */ nop -/* 72C7C8 802A1218 3C04802A */ lui $a0, %hi(D_802A25C0) -/* 72C7CC 802A121C 8C8425C0 */ lw $a0, %lo(D_802A25C0)($a0) -/* 72C7D0 802A1220 0C05123D */ jal free_icon -/* 72C7D4 802A1224 00000000 */ nop -.L802A1228: -/* 72C7D8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72C7DC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 72C7E0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 72C7E4 802A1234 03E00008 */ jr $ra -/* 72C7E8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A188C_72CE3C.s b/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A188C_72CE3C.s deleted file mode 100644 index 7d98a22d10..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mystery_72C5B0/func_802A188C_72CE3C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A188C_72CE3C -/* 72CE3C 802A188C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 72CE40 802A1890 AFB10024 */ sw $s1, 0x24($sp) -/* 72CE44 802A1894 0080882D */ daddu $s1, $a0, $zero -/* 72CE48 802A1898 AFBF002C */ sw $ra, 0x2c($sp) -/* 72CE4C 802A189C AFB20028 */ sw $s2, 0x28($sp) -/* 72CE50 802A18A0 AFB00020 */ sw $s0, 0x20($sp) -/* 72CE54 802A18A4 8E30000C */ lw $s0, 0xc($s1) -/* 72CE58 802A18A8 8E050000 */ lw $a1, ($s0) -/* 72CE5C 802A18AC 0C0B1EAF */ jal get_variable -/* 72CE60 802A18B0 26100004 */ addiu $s0, $s0, 4 -/* 72CE64 802A18B4 8E050000 */ lw $a1, ($s0) -/* 72CE68 802A18B8 26100004 */ addiu $s0, $s0, 4 -/* 72CE6C 802A18BC 0220202D */ daddu $a0, $s1, $zero -/* 72CE70 802A18C0 0C0B1EAF */ jal get_variable -/* 72CE74 802A18C4 0040902D */ daddu $s2, $v0, $zero -/* 72CE78 802A18C8 0220202D */ daddu $a0, $s1, $zero -/* 72CE7C 802A18CC 8E050000 */ lw $a1, ($s0) -/* 72CE80 802A18D0 0C0B1EAF */ jal get_variable -/* 72CE84 802A18D4 0040802D */ daddu $s0, $v0, $zero -/* 72CE88 802A18D8 24040002 */ addiu $a0, $zero, 2 -/* 72CE8C 802A18DC 44921000 */ mtc1 $s2, $f2 -/* 72CE90 802A18E0 00000000 */ nop -/* 72CE94 802A18E4 468010A0 */ cvt.s.w $f2, $f2 -/* 72CE98 802A18E8 44051000 */ mfc1 $a1, $f2 -/* 72CE9C 802A18EC 44901000 */ mtc1 $s0, $f2 -/* 72CEA0 802A18F0 00000000 */ nop -/* 72CEA4 802A18F4 468010A0 */ cvt.s.w $f2, $f2 -/* 72CEA8 802A18F8 44061000 */ mfc1 $a2, $f2 -/* 72CEAC 802A18FC 44821000 */ mtc1 $v0, $f2 -/* 72CEB0 802A1900 00000000 */ nop -/* 72CEB4 802A1904 468010A0 */ cvt.s.w $f2, $f2 -/* 72CEB8 802A1908 3C01BF80 */ lui $at, 0xbf80 -/* 72CEBC 802A190C 44810000 */ mtc1 $at, $f0 -/* 72CEC0 802A1910 44071000 */ mfc1 $a3, $f2 -/* 72CEC4 802A1914 24030005 */ addiu $v1, $zero, 5 -/* 72CEC8 802A1918 AFA00010 */ sw $zero, 0x10($sp) -/* 72CECC 802A191C AFA00018 */ sw $zero, 0x18($sp) -/* 72CED0 802A1920 AFA3001C */ sw $v1, 0x1c($sp) -/* 72CED4 802A1924 0C01C064 */ jal func_80070190 -/* 72CED8 802A1928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 72CEDC 802A192C 8FBF002C */ lw $ra, 0x2c($sp) -/* 72CEE0 802A1930 8FB20028 */ lw $s2, 0x28($sp) -/* 72CEE4 802A1934 8FB10024 */ lw $s1, 0x24($sp) -/* 72CEE8 802A1938 8FB00020 */ lw $s0, 0x20($sp) -/* 72CEEC 802A193C 24020002 */ addiu $v0, $zero, 2 -/* 72CEF0 802A1940 03E00008 */ jr $ra -/* 72CEF4 802A1944 27BD0030 */ addiu $sp, $sp, 0x30 -/* 72CEF8 802A1948 00000000 */ nop -/* 72CEFC 802A194C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A1000_719970.s b/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A1000_719970.s deleted file mode 100644 index c2c343f02b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A1000_719970.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_719970 -/* 719970 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 719974 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 719978 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71997C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 719980 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 719984 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 719988 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71998C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 719990 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 719994 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 719998 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71999C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7199A0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7199A4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7199A8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7199AC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7199B0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7199B4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7199B8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7199BC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7199C0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7199C4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7199C8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7199CC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7199D0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7199D4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7199D8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7199DC 802A106C 00000000 */ nop -/* 7199E0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7199E4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7199E8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7199EC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7199F0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7199F4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7199F8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7199FC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 719A00 802A1090 00121880 */ sll $v1, $s2, 2 -/* 719A04 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 719A08 802A1098 00031100 */ sll $v0, $v1, 4 -/* 719A0C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 719A10 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 719A14 802A10A4 00440018 */ mult $v0, $a0 -/* 719A18 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 719A1C 802A10AC 00004010 */ mfhi $t0 -/* 719A20 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 719A24 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 719A28 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 719A2C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 719A30 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 719A34 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 719A38 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 719A3C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 719A40 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 719A44 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 719A48 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 719A4C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 719A50 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 719A54 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 719A58 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 719A5C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 719A60 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 719A64 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 719A68 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 719A6C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 719A70 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 719A74 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 719A78 802A1108 0C04C4FD */ jal make_item_entity -/* 719A7C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 719A80 802A1110 0C03A830 */ jal add_coins -/* 719A84 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 719A88 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 719A8C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 719A90 802A1120 00000000 */ nop -.L802A1124: -/* 719A94 802A1124 00101040 */ sll $v0, $s0, 1 -/* 719A98 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 719A9C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 719AA0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 719AA4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 719AA8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 719AAC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 719AB0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 719AB4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 719AB8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 719ABC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 719AC0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 719AC4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 719AC8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 719ACC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 719AD0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 719AD4 802A1164 0C00B94E */ jal get_screen_coords -/* 719AD8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 719ADC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 719AE0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 719AE4 802A1174 0C050529 */ jal create_icon -/* 719AE8 802A1178 00000000 */ nop -/* 719AEC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 719AF0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 719AF4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 719AF8 802A1188 3C01802A */ lui $at, %hi(D_802A1E80) -/* 719AFC 802A118C AC241E80 */ sw $a0, %lo(D_802A1E80)($at) -/* 719B00 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 719B04 802A1194 0C051261 */ jal set_icon_render_pos -/* 719B08 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 719B0C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 719B10 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 719B14 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 719B18 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 719B1C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 719B20 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 719B24 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 719B28 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 719B2C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 719B30 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 719B34 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 719B38 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 719B3C 802A11CC 03E00008 */ jr $ra -/* 719B40 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A11D4_719B44.s b/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A11D4_719B44.s deleted file mode 100644 index f13f9c6409..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pebble_719970/func_802A11D4_719B44.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_719B44 -/* 719B44 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 719B48 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 719B4C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 719B50 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 719B54 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 719B58 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 719B5C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 719B60 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 719B64 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 719B68 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 719B6C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 719B70 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 719B74 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 719B78 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 719B7C 802A120C 00000000 */ nop -/* 719B80 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 719B84 802A1214 00000000 */ nop -/* 719B88 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80) -/* 719B8C 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0) -/* 719B90 802A1220 0C05123D */ jal free_icon -/* 719B94 802A1224 00000000 */ nop -.L802A1228: -/* 719B98 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 719B9C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 719BA0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 719BA4 802A1234 03E00008 */ jr $ra -/* 719BA8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 719BAC 802A123C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A1000_7285E0.s b/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A1000_7285E0.s deleted file mode 100644 index 17ba2dab24..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A1000_7285E0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7285E0 -/* 7285E0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7285E4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7285E8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7285EC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7285F0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7285F4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7285F8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7285FC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 728600 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 728604 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 728608 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72860C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 728610 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 728614 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 728618 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72861C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 728620 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 728624 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 728628 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72862C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 728630 802A1050 00021140 */ sll $v0, $v0, 5 -/* 728634 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 728638 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72863C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 728640 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 728644 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 728648 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72864C 802A106C 00000000 */ nop -/* 728650 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 728654 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 728658 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72865C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 728660 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 728664 802A1084 1A400045 */ blez $s2, .L802A119C -/* 728668 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72866C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 728670 802A1090 00121880 */ sll $v1, $s2, 2 -/* 728674 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 728678 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72867C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 728680 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 728684 802A10A4 00440018 */ mult $v0, $a0 -/* 728688 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72868C 802A10AC 00004010 */ mfhi $t0 -/* 728690 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 728694 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 728698 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72869C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 7286A0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 7286A4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 7286A8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 7286AC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7286B0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7286B4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7286B8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7286BC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7286C0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7286C4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7286C8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7286CC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 7286D0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 7286D4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 7286D8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 7286DC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7286E0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7286E4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7286E8 802A1108 0C04C4FD */ jal make_item_entity -/* 7286EC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7286F0 802A1110 0C03A830 */ jal add_coins -/* 7286F4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7286F8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7286FC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 728700 802A1120 00000000 */ nop -.L802A1124: -/* 728704 802A1124 00101040 */ sll $v0, $s0, 1 -/* 728708 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72870C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 728710 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 728714 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 728718 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72871C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 728720 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 728724 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 728728 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72872C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 728730 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 728734 802A1154 44050000 */ mfc1 $a1, $f0 -/* 728738 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72873C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 728740 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 728744 802A1164 0C00B94E */ jal get_screen_coords -/* 728748 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72874C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 728750 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 728754 802A1174 0C050529 */ jal create_icon -/* 728758 802A1178 00000000 */ nop -/* 72875C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 728760 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 728764 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 728768 802A1188 3C01802A */ lui $at, %hi(D_802A18E0) -/* 72876C 802A118C AC2418E0 */ sw $a0, %lo(D_802A18E0)($at) -/* 728770 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 728774 802A1194 0C051261 */ jal set_icon_render_pos -/* 728778 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72877C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 728780 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 728784 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 728788 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72878C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 728790 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 728794 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 728798 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72879C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 7287A0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 7287A4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 7287A8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 7287AC 802A11CC 03E00008 */ jr $ra -/* 7287B0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A11D4_7287B4.s b/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A11D4_7287B4.s deleted file mode 100644 index ca33cb533d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/please_come_back_7285E0/func_802A11D4_7287B4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_7287B4 -/* 7287B4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7287B8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 7287BC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7287C0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7287C4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7287C8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7287CC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7287D0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7287D4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7287D8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7287DC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7287E0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7287E4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7287E8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7287EC 802A120C 00000000 */ nop -/* 7287F0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7287F4 802A1214 00000000 */ nop -/* 7287F8 802A1218 3C04802A */ lui $a0, %hi(D_802A18E0) -/* 7287FC 802A121C 8C8418E0 */ lw $a0, %lo(D_802A18E0)($a0) -/* 728800 802A1220 0C05123D */ jal free_icon -/* 728804 802A1224 00000000 */ nop -.L802A1228: -/* 728808 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72880C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 728810 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 728814 802A1234 03E00008 */ jr $ra -/* 728818 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72881C 802A123C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1000_718850.s b/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1000_718850.s deleted file mode 100644 index 131f818cd3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1000_718850.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_718850 -/* 718850 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 718854 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 718858 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71885C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 718860 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 718864 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 718868 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71886C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 718870 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 718874 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 718878 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71887C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 718880 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 718884 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 718888 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71888C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 718890 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 718894 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 718898 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71889C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7188A0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7188A4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7188A8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7188AC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7188B0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7188B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7188B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7188BC 802A106C 00000000 */ nop -/* 7188C0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7188C4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7188C8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7188CC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7188D0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7188D4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7188D8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7188DC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 7188E0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 7188E4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 7188E8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 7188EC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7188F0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7188F4 802A10A4 00440018 */ mult $v0, $a0 -/* 7188F8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7188FC 802A10AC 00004010 */ mfhi $t0 -/* 718900 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 718904 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 718908 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71890C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 718910 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 718914 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 718918 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71891C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 718920 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 718924 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 718928 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71892C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 718930 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 718934 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 718938 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71893C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 718940 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 718944 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 718948 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71894C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 718950 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 718954 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 718958 802A1108 0C04C4FD */ jal make_item_entity -/* 71895C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 718960 802A1110 0C03A830 */ jal add_coins -/* 718964 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 718968 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71896C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 718970 802A1120 00000000 */ nop -.L802A1124: -/* 718974 802A1124 00101040 */ sll $v0, $s0, 1 -/* 718978 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71897C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 718980 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 718984 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 718988 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71898C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 718990 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 718994 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 718998 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71899C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7189A0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7189A4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7189A8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7189AC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7189B0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7189B4 802A1164 0C00B94E */ jal get_screen_coords -/* 7189B8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7189BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7189C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7189C4 802A1174 0C050529 */ jal create_icon -/* 7189C8 802A1178 00000000 */ nop -/* 7189CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 7189D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 7189D4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 7189D8 802A1188 3C01802A */ lui $at, %hi(D_802A2120) -/* 7189DC 802A118C AC242120 */ sw $a0, %lo(D_802A2120)($at) -/* 7189E0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 7189E4 802A1194 0C051261 */ jal set_icon_render_pos -/* 7189E8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 7189EC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7189F0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7189F4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7189F8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7189FC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 718A00 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 718A04 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 718A08 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 718A0C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 718A10 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 718A14 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 718A18 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 718A1C 802A11CC 03E00008 */ jr $ra -/* 718A20 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A11D4_718A24.s b/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A11D4_718A24.s deleted file mode 100644 index 4e1e4863cf..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A11D4_718A24.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_718A24 -/* 718A24 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 718A28 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 718A2C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 718A30 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 718A34 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 718A38 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 718A3C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 718A40 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 718A44 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 718A48 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 718A4C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 718A50 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 718A54 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 718A58 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 718A5C 802A120C 00000000 */ nop -/* 718A60 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 718A64 802A1214 00000000 */ nop -/* 718A68 802A1218 3C04802A */ lui $a0, %hi(D_802A2120) -/* 718A6C 802A121C 8C842120 */ lw $a0, %lo(D_802A2120)($a0) -/* 718A70 802A1220 0C05123D */ jal free_icon -/* 718A74 802A1224 00000000 */ nop -.L802A1228: -/* 718A78 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 718A7C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 718A80 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 718A84 802A1234 03E00008 */ jr $ra -/* 718A88 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A123C_718A8C.s b/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A123C_718A8C.s deleted file mode 100644 index 277819da13..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A123C_718A8C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_718A8C -/* 718A8C 802A123C 3C02800E */ lui $v0, %hi(gBattleStatus+0xD8) -/* 718A90 802A1240 8C42C148 */ lw $v0, %lo(gBattleStatus+0xD8)($v0) -/* 718A94 802A1244 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 718A98 802A1248 AFB20018 */ sw $s2, 0x18($sp) -/* 718A9C 802A124C 3C128016 */ lui $s2, %hi(gCollisionStatus) -/* 718AA0 802A1250 2652A550 */ addiu $s2, $s2, %lo(gCollisionStatus) -/* 718AA4 802A1254 AFB10014 */ sw $s1, 0x14($sp) -/* 718AA8 802A1258 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 718AAC 802A125C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 718AB0 802A1260 AFBF001C */ sw $ra, 0x1c($sp) -/* 718AB4 802A1264 AFB00010 */ sw $s0, 0x10($sp) -/* 718AB8 802A1268 C4400188 */ lwc1 $f0, 0x188($v0) -/* 718ABC 802A126C 3C013FF0 */ lui $at, 0x3ff0 -/* 718AC0 802A1270 44811800 */ mtc1 $at, $f3 -/* 718AC4 802A1274 44801000 */ mtc1 $zero, $f2 -/* 718AC8 802A1278 46000021 */ cvt.d.s $f0, $f0 -/* 718ACC 802A127C 46220032 */ c.eq.d $f0, $f2 -/* 718AD0 802A1280 00000000 */ nop -/* 718AD4 802A1284 45000011 */ bc1f .L802A12CC -/* 718AD8 802A1288 24020002 */ addiu $v0, $zero, 2 -/* 718ADC 802A128C 8C9000AC */ lw $s0, 0xac($a0) -/* 718AE0 802A1290 0C04417A */ jal get_entity_by_index -/* 718AE4 802A1294 0200202D */ daddu $a0, $s0, $zero -/* 718AE8 802A1298 8E220000 */ lw $v0, ($s1) -/* 718AEC 802A129C 36104000 */ ori $s0, $s0, 0x4000 -/* 718AF0 802A12A0 A6500008 */ sh $s0, 8($s2) -/* 718AF4 802A12A4 34420002 */ ori $v0, $v0, 2 -/* 718AF8 802A12A8 0C043DB4 */ jal update_entities -/* 718AFC 802A12AC AE220000 */ sw $v0, ($s1) -/* 718B00 802A12B0 24020002 */ addiu $v0, $zero, 2 -/* 718B04 802A12B4 2403FFFF */ addiu $v1, $zero, -1 -/* 718B08 802A12B8 A6430008 */ sh $v1, 8($s2) -/* 718B0C 802A12BC 8E230000 */ lw $v1, ($s1) -/* 718B10 802A12C0 2404FFFD */ addiu $a0, $zero, -3 -/* 718B14 802A12C4 00641824 */ and $v1, $v1, $a0 -/* 718B18 802A12C8 AE230000 */ sw $v1, ($s1) -.L802A12CC: -/* 718B1C 802A12CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 718B20 802A12D0 8FB20018 */ lw $s2, 0x18($sp) -/* 718B24 802A12D4 8FB10014 */ lw $s1, 0x14($sp) -/* 718B28 802A12D8 8FB00010 */ lw $s0, 0x10($sp) -/* 718B2C 802A12DC 03E00008 */ jr $ra -/* 718B30 802A12E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A12E4_718B34.s b/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A12E4_718B34.s deleted file mode 100644 index 5f25449342..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A12E4_718B34.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12E4_718B34 -/* 718B34 802A12E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 718B38 802A12E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 718B3C 802A12EC 0C04417A */ jal get_entity_by_index -/* 718B40 802A12F0 8C8400AC */ lw $a0, 0xac($a0) -/* 718B44 802A12F4 0040182D */ daddu $v1, $v0, $zero -/* 718B48 802A12F8 8C640000 */ lw $a0, ($v1) -/* 718B4C 802A12FC 3C052000 */ lui $a1, 0x2000 -/* 718B50 802A1300 00852025 */ or $a0, $a0, $a1 -/* 718B54 802A1304 AC640000 */ sw $a0, ($v1) -/* 718B58 802A1308 8FBF0010 */ lw $ra, 0x10($sp) -/* 718B5C 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 718B60 802A1310 03E00008 */ jr $ra -/* 718B64 802A1314 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1318_718B68.s b/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1318_718B68.s deleted file mode 100644 index c62fde6344..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/pow_block_718850/func_802A1318_718B68.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1318_718B68 -/* 718B68 802A1318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 718B6C 802A131C AFBF0014 */ sw $ra, 0x14($sp) -/* 718B70 802A1320 AFB00010 */ sw $s0, 0x10($sp) -/* 718B74 802A1324 8C8400AC */ lw $a0, 0xac($a0) -/* 718B78 802A1328 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 718B7C 802A132C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 718B80 802A1330 0C04417A */ jal get_entity_by_index -/* 718B84 802A1334 00000000 */ nop -/* 718B88 802A1338 C6000188 */ lwc1 $f0, 0x188($s0) -/* 718B8C 802A133C E4400054 */ swc1 $f0, 0x54($v0) -/* 718B90 802A1340 C6000188 */ lwc1 $f0, 0x188($s0) -/* 718B94 802A1344 E4400058 */ swc1 $f0, 0x58($v0) -/* 718B98 802A1348 C6000188 */ lwc1 $f0, 0x188($s0) -/* 718B9C 802A134C E440005C */ swc1 $f0, 0x5c($v0) -/* 718BA0 802A1350 C6000188 */ lwc1 $f0, 0x188($s0) -/* 718BA4 802A1354 3C013FF0 */ lui $at, 0x3ff0 -/* 718BA8 802A1358 44811800 */ mtc1 $at, $f3 -/* 718BAC 802A135C 44801000 */ mtc1 $zero, $f2 -/* 718BB0 802A1360 46000021 */ cvt.d.s $f0, $f0 -/* 718BB4 802A1364 46220032 */ c.eq.d $f0, $f2 -/* 718BB8 802A1368 00000000 */ nop -/* 718BBC 802A136C 45010007 */ bc1t .L802A138C -/* 718BC0 802A1370 00000000 */ nop -/* 718BC4 802A1374 C440004C */ lwc1 $f0, 0x4c($v0) -/* 718BC8 802A1378 3C014120 */ lui $at, 0x4120 -/* 718BCC 802A137C 44811000 */ mtc1 $at, $f2 -/* 718BD0 802A1380 00000000 */ nop -/* 718BD4 802A1384 46020001 */ sub.s $f0, $f0, $f2 -/* 718BD8 802A1388 E440004C */ swc1 $f0, 0x4c($v0) -.L802A138C: -/* 718BDC 802A138C 8FBF0014 */ lw $ra, 0x14($sp) -/* 718BE0 802A1390 8FB00010 */ lw $s0, 0x10($sp) -/* 718BE4 802A1394 24020002 */ addiu $v0, $zero, 2 -/* 718BE8 802A1398 03E00008 */ jr $ra -/* 718BEC 802A139C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A1000_72DB70.s b/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A1000_72DB70.s deleted file mode 100644 index 6631454944..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A1000_72DB70.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_72DB70 -/* 72DB70 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72DB74 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 72DB78 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72DB7C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 72DB80 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 72DB84 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 72DB88 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72DB8C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 72DB90 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 72DB94 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 72DB98 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72DB9C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 72DBA0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 72DBA4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 72DBA8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72DBAC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 72DBB0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 72DBB4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 72DBB8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72DBBC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 72DBC0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 72DBC4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 72DBC8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72DBCC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 72DBD0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 72DBD4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 72DBD8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72DBDC 802A106C 00000000 */ nop -/* 72DBE0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 72DBE4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 72DBE8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72DBEC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 72DBF0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 72DBF4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 72DBF8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72DBFC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 72DC00 802A1090 00121880 */ sll $v1, $s2, 2 -/* 72DC04 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 72DC08 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72DC0C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 72DC10 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 72DC14 802A10A4 00440018 */ mult $v0, $a0 -/* 72DC18 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72DC1C 802A10AC 00004010 */ mfhi $t0 -/* 72DC20 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 72DC24 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 72DC28 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72DC2C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 72DC30 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 72DC34 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 72DC38 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72DC3C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 72DC40 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 72DC44 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72DC48 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72DC4C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 72DC50 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 72DC54 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 72DC58 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72DC5C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 72DC60 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 72DC64 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 72DC68 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72DC6C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 72DC70 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 72DC74 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 72DC78 802A1108 0C04C4FD */ jal make_item_entity -/* 72DC7C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 72DC80 802A1110 0C03A830 */ jal add_coins -/* 72DC84 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 72DC88 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72DC8C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72DC90 802A1120 00000000 */ nop -.L802A1124: -/* 72DC94 802A1124 00101040 */ sll $v0, $s0, 1 -/* 72DC98 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72DC9C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 72DCA0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 72DCA4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 72DCA8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72DCAC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 72DCB0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 72DCB4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 72DCB8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72DCBC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 72DCC0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 72DCC4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 72DCC8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72DCCC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 72DCD0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 72DCD4 802A1164 0C00B94E */ jal get_screen_coords -/* 72DCD8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72DCDC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 72DCE0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 72DCE4 802A1174 0C050529 */ jal create_icon -/* 72DCE8 802A1178 00000000 */ nop -/* 72DCEC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 72DCF0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 72DCF4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 72DCF8 802A1188 3C01802A */ lui $at, %hi(D_802A19C0) -/* 72DCFC 802A118C AC2419C0 */ sw $a0, %lo(D_802A19C0)($at) -/* 72DD00 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 72DD04 802A1194 0C051261 */ jal set_icon_render_pos -/* 72DD08 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72DD0C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 72DD10 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 72DD14 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 72DD18 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72DD1C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 72DD20 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 72DD24 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 72DD28 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72DD2C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 72DD30 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 72DD34 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 72DD38 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72DD3C 802A11CC 03E00008 */ jr $ra -/* 72DD40 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A11D4_72DD44.s b/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A11D4_72DD44.s deleted file mode 100644 index cdafccd5e4..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A11D4_72DD44.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_72DD44 -/* 72DD44 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 72DD48 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72DD4C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 72DD50 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 72DD54 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 72DD58 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72DD5C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 72DD60 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 72DD64 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 72DD68 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72DD6C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 72DD70 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 72DD74 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 72DD78 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72DD7C 802A120C 00000000 */ nop -/* 72DD80 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72DD84 802A1214 00000000 */ nop -/* 72DD88 802A1218 3C04802A */ lui $a0, %hi(D_802A19C0) -/* 72DD8C 802A121C 8C8419C0 */ lw $a0, %lo(D_802A19C0)($a0) -/* 72DD90 802A1220 0C05123D */ jal free_icon -/* 72DD94 802A1224 00000000 */ nop -.L802A1228: -/* 72DD98 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72DD9C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 72DDA0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 72DDA4 802A1234 03E00008 */ jr $ra -/* 72DDA8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A123C_72DDAC.s b/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A123C_72DDAC.s deleted file mode 100644 index f911b8f033..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/repel_gel_72DB70/func_802A123C_72DDAC.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72DDAC -/* 72DDAC 802A123C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 72DDB0 802A1240 0080102D */ daddu $v0, $a0, $zero -/* 72DDB4 802A1244 AFB00010 */ sw $s0, 0x10($sp) -/* 72DDB8 802A1248 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 72DDBC 802A124C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 72DDC0 802A1250 2405000E */ addiu $a1, $zero, 0xe -/* 72DDC4 802A1254 AFBF0018 */ sw $ra, 0x18($sp) -/* 72DDC8 802A1258 AFB10014 */ sw $s1, 0x14($sp) -/* 72DDCC 802A125C 8C460084 */ lw $a2, 0x84($v0) -/* 72DDD0 802A1260 8E1101F4 */ lw $s1, 0x1f4($s0) -/* 72DDD4 802A1264 0C0997D0 */ jal inflict_status -/* 72DDD8 802A1268 0200202D */ daddu $a0, $s0, $zero -/* 72DDDC 802A126C A200021C */ sb $zero, 0x21c($s0) -/* 72DDE0 802A1270 8E230000 */ lw $v1, ($s1) -/* 72DDE4 802A1274 34630100 */ ori $v1, $v1, 0x100 -/* 72DDE8 802A1278 AE230000 */ sw $v1, ($s1) -/* 72DDEC 802A127C 8FBF0018 */ lw $ra, 0x18($sp) -/* 72DDF0 802A1280 8FB10014 */ lw $s1, 0x14($sp) -/* 72DDF4 802A1284 8FB00010 */ lw $s0, 0x10($sp) -/* 72DDF8 802A1288 24020002 */ addiu $v0, $zero, 2 -/* 72DDFC 802A128C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A123C_71D9AC.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/battle_item_shooting_star_func_802A123C_71D9AC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A123C_71D9AC.s rename to ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/battle_item_shooting_star_func_802A123C_71D9AC.s diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1000_71D770.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1000_71D770.s deleted file mode 100644 index 0e213a33c1..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1000_71D770.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71D770 -/* 71D770 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71D774 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71D778 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71D77C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71D780 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71D784 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71D788 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71D78C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71D790 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71D794 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71D798 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71D79C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71D7A0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71D7A4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71D7A8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71D7AC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71D7B0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71D7B4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71D7B8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71D7BC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71D7C0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71D7C4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71D7C8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71D7CC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71D7D0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71D7D4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71D7D8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71D7DC 802A106C 00000000 */ nop -/* 71D7E0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71D7E4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71D7E8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71D7EC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71D7F0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71D7F4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71D7F8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71D7FC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71D800 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71D804 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71D808 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71D80C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71D810 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71D814 802A10A4 00440018 */ mult $v0, $a0 -/* 71D818 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71D81C 802A10AC 00004010 */ mfhi $t0 -/* 71D820 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71D824 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71D828 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71D82C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71D830 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71D834 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71D838 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71D83C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71D840 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71D844 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71D848 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71D84C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71D850 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71D854 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71D858 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71D85C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71D860 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71D864 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71D868 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71D86C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71D870 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71D874 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71D878 802A1108 0C04C4FD */ jal make_item_entity -/* 71D87C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71D880 802A1110 0C03A830 */ jal add_coins -/* 71D884 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71D888 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71D88C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71D890 802A1120 00000000 */ nop -.L802A1124: -/* 71D894 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71D898 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71D89C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71D8A0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71D8A4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71D8A8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71D8AC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71D8B0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71D8B4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71D8B8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71D8BC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71D8C0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71D8C4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71D8C8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71D8CC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71D8D0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71D8D4 802A1164 0C00B94E */ jal get_screen_coords -/* 71D8D8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71D8DC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71D8E0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71D8E4 802A1174 0C050529 */ jal create_icon -/* 71D8E8 802A1178 00000000 */ nop -/* 71D8EC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71D8F0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71D8F4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71D8F8 802A1188 3C01802A */ lui $at, %hi(D_802A1EE0) -/* 71D8FC 802A118C AC241EE0 */ sw $a0, %lo(D_802A1EE0)($at) -/* 71D900 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71D904 802A1194 0C051261 */ jal set_icon_render_pos -/* 71D908 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71D90C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71D910 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71D914 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71D918 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71D91C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71D920 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71D924 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71D928 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71D92C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71D930 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71D934 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71D938 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71D93C 802A11CC 03E00008 */ jr $ra -/* 71D940 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A11D4_71D944.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A11D4_71D944.s deleted file mode 100644 index 954aa12e87..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A11D4_71D944.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71D944 -/* 71D944 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71D948 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71D94C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71D950 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71D954 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71D958 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71D95C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71D960 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71D964 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71D968 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71D96C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71D970 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71D974 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71D978 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71D97C 802A120C 00000000 */ nop -/* 71D980 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71D984 802A1214 00000000 */ nop -/* 71D988 802A1218 3C04802A */ lui $a0, %hi(D_802A1EE0) -/* 71D98C 802A121C 8C841EE0 */ lw $a0, %lo(D_802A1EE0)($a0) -/* 71D990 802A1220 0C05123D */ jal free_icon -/* 71D994 802A1224 00000000 */ nop -.L802A1228: -/* 71D998 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71D99C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71D9A0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71D9A4 802A1234 03E00008 */ jr $ra -/* 71D9A8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1388_71DAF8.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1388_71DAF8.s deleted file mode 100644 index eb3ed04313..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1388_71DAF8.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1388_71DAF8 -/* 71DAF8 802A1388 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 71DAFC 802A138C AFB10024 */ sw $s1, 0x24($sp) -/* 71DB00 802A1390 0080882D */ daddu $s1, $a0, $zero -/* 71DB04 802A1394 AFBF002C */ sw $ra, 0x2c($sp) -/* 71DB08 802A1398 AFB20028 */ sw $s2, 0x28($sp) -/* 71DB0C 802A139C AFB00020 */ sw $s0, 0x20($sp) -/* 71DB10 802A13A0 8E30000C */ lw $s0, 0xc($s1) -/* 71DB14 802A13A4 8E050000 */ lw $a1, ($s0) -/* 71DB18 802A13A8 0C0B1EAF */ jal get_variable -/* 71DB1C 802A13AC 26100004 */ addiu $s0, $s0, 4 -/* 71DB20 802A13B0 8E050000 */ lw $a1, ($s0) -/* 71DB24 802A13B4 26100004 */ addiu $s0, $s0, 4 -/* 71DB28 802A13B8 0220202D */ daddu $a0, $s1, $zero -/* 71DB2C 802A13BC 0C0B1EAF */ jal get_variable -/* 71DB30 802A13C0 0040902D */ daddu $s2, $v0, $zero -/* 71DB34 802A13C4 0220202D */ daddu $a0, $s1, $zero -/* 71DB38 802A13C8 8E050000 */ lw $a1, ($s0) -/* 71DB3C 802A13CC 0C0B1EAF */ jal get_variable -/* 71DB40 802A13D0 0040802D */ daddu $s0, $v0, $zero -/* 71DB44 802A13D4 24040002 */ addiu $a0, $zero, 2 -/* 71DB48 802A13D8 44921000 */ mtc1 $s2, $f2 -/* 71DB4C 802A13DC 00000000 */ nop -/* 71DB50 802A13E0 468010A0 */ cvt.s.w $f2, $f2 -/* 71DB54 802A13E4 44051000 */ mfc1 $a1, $f2 -/* 71DB58 802A13E8 44901000 */ mtc1 $s0, $f2 -/* 71DB5C 802A13EC 00000000 */ nop -/* 71DB60 802A13F0 468010A0 */ cvt.s.w $f2, $f2 -/* 71DB64 802A13F4 44061000 */ mfc1 $a2, $f2 -/* 71DB68 802A13F8 44821000 */ mtc1 $v0, $f2 -/* 71DB6C 802A13FC 00000000 */ nop -/* 71DB70 802A1400 468010A0 */ cvt.s.w $f2, $f2 -/* 71DB74 802A1404 3C01BF80 */ lui $at, 0xbf80 -/* 71DB78 802A1408 44810000 */ mtc1 $at, $f0 -/* 71DB7C 802A140C 44071000 */ mfc1 $a3, $f2 -/* 71DB80 802A1410 24030005 */ addiu $v1, $zero, 5 -/* 71DB84 802A1414 AFA00010 */ sw $zero, 0x10($sp) -/* 71DB88 802A1418 AFA00018 */ sw $zero, 0x18($sp) -/* 71DB8C 802A141C AFA3001C */ sw $v1, 0x1c($sp) -/* 71DB90 802A1420 0C01C064 */ jal func_80070190 -/* 71DB94 802A1424 E7A00014 */ swc1 $f0, 0x14($sp) -/* 71DB98 802A1428 8FBF002C */ lw $ra, 0x2c($sp) -/* 71DB9C 802A142C 8FB20028 */ lw $s2, 0x28($sp) -/* 71DBA0 802A1430 8FB10024 */ lw $s1, 0x24($sp) -/* 71DBA4 802A1434 8FB00020 */ lw $s0, 0x20($sp) -/* 71DBA8 802A1438 24020002 */ addiu $v0, $zero, 2 -/* 71DBAC 802A143C 03E00008 */ jr $ra -/* 71DBB0 802A1440 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1444_71DBB4.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1444_71DBB4.s deleted file mode 100644 index b7da64c874..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A1444_71DBB4.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1444_71DBB4 -/* 71DBB4 802A1444 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71DBB8 802A1448 AFB00010 */ sw $s0, 0x10($sp) -/* 71DBBC 802A144C 0080802D */ daddu $s0, $a0, $zero -/* 71DBC0 802A1450 10A0000E */ beqz $a1, .L802A148C -/* 71DBC4 802A1454 AFBF0014 */ sw $ra, 0x14($sp) -/* 71DBC8 802A1458 0C04760B */ jal func_8011D82C -/* 71DBCC 802A145C 24040001 */ addiu $a0, $zero, 1 -/* 71DBD0 802A1460 0000202D */ daddu $a0, $zero, $zero -/* 71DBD4 802A1464 0080282D */ daddu $a1, $a0, $zero -/* 71DBD8 802A1468 0080302D */ daddu $a2, $a0, $zero -/* 71DBDC 802A146C 0080382D */ daddu $a3, $a0, $zero -/* 71DBE0 802A1470 3C028015 */ lui $v0, %hi(D_801512F0) -/* 71DBE4 802A1474 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0) -/* 71DBE8 802A1478 24030001 */ addiu $v1, $zero, 1 -/* 71DBEC 802A147C 0C046F97 */ jal set_background_color_blend -/* 71DBF0 802A1480 A0430000 */ sb $v1, ($v0) -/* 71DBF4 802A1484 2402000A */ addiu $v0, $zero, 0xa -/* 71DBF8 802A1488 AE020070 */ sw $v0, 0x70($s0) -.L802A148C: -/* 71DBFC 802A148C 0000202D */ daddu $a0, $zero, $zero -/* 71DC00 802A1490 0080282D */ daddu $a1, $a0, $zero -/* 71DC04 802A1494 0080302D */ daddu $a2, $a0, $zero -/* 71DC08 802A1498 8E020070 */ lw $v0, 0x70($s0) -/* 71DC0C 802A149C 2407000A */ addiu $a3, $zero, 0xa -/* 71DC10 802A14A0 00E23823 */ subu $a3, $a3, $v0 -/* 71DC14 802A14A4 00073900 */ sll $a3, $a3, 4 -/* 71DC18 802A14A8 0C046F97 */ jal set_background_color_blend -/* 71DC1C 802A14AC 30E700F0 */ andi $a3, $a3, 0xf0 -/* 71DC20 802A14B0 8E020070 */ lw $v0, 0x70($s0) -/* 71DC24 802A14B4 2442FFFF */ addiu $v0, $v0, -1 -/* 71DC28 802A14B8 AE020070 */ sw $v0, 0x70($s0) -/* 71DC2C 802A14BC 2C420001 */ sltiu $v0, $v0, 1 -/* 71DC30 802A14C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 71DC34 802A14C4 8FB00010 */ lw $s0, 0x10($sp) -/* 71DC38 802A14C8 00021040 */ sll $v0, $v0, 1 -/* 71DC3C 802A14CC 03E00008 */ jr $ra -/* 71DC40 802A14D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A14D4_71DC44.s b/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A14D4_71DC44.s deleted file mode 100644 index 85f4e22a5e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star_71D770/func_802A14D4_71DC44.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A14D4_71DC44 -/* 71DC44 802A14D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71DC48 802A14D8 AFB00010 */ sw $s0, 0x10($sp) -/* 71DC4C 802A14DC 0080802D */ daddu $s0, $a0, $zero -/* 71DC50 802A14E0 10A00003 */ beqz $a1, .L802A14F0 -/* 71DC54 802A14E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 71DC58 802A14E8 2402000A */ addiu $v0, $zero, 0xa -/* 71DC5C 802A14EC AE020070 */ sw $v0, 0x70($s0) -.L802A14F0: -/* 71DC60 802A14F0 0000202D */ daddu $a0, $zero, $zero -/* 71DC64 802A14F4 0080282D */ daddu $a1, $a0, $zero -/* 71DC68 802A14F8 8E070070 */ lw $a3, 0x70($s0) -/* 71DC6C 802A14FC 0080302D */ daddu $a2, $a0, $zero -/* 71DC70 802A1500 00073900 */ sll $a3, $a3, 4 -/* 71DC74 802A1504 0C046F97 */ jal set_background_color_blend -/* 71DC78 802A1508 30E700F0 */ andi $a3, $a3, 0xf0 -/* 71DC7C 802A150C 8E020070 */ lw $v0, 0x70($s0) -/* 71DC80 802A1510 2442FFFF */ addiu $v0, $v0, -1 -/* 71DC84 802A1514 10400003 */ beqz $v0, .L802A1524 -/* 71DC88 802A1518 AE020070 */ sw $v0, 0x70($s0) -/* 71DC8C 802A151C 080A854F */ j .L802A153C -/* 71DC90 802A1520 0000102D */ daddu $v0, $zero, $zero -.L802A1524: -/* 71DC94 802A1524 0000202D */ daddu $a0, $zero, $zero -/* 71DC98 802A1528 0080282D */ daddu $a1, $a0, $zero -/* 71DC9C 802A152C 0080302D */ daddu $a2, $a0, $zero -/* 71DCA0 802A1530 0C046F97 */ jal set_background_color_blend -/* 71DCA4 802A1534 0080382D */ daddu $a3, $a0, $zero -/* 71DCA8 802A1538 24020002 */ addiu $v0, $zero, 2 -.L802A153C: -/* 71DCAC 802A153C 8FBF0014 */ lw $ra, 0x14($sp) -/* 71DCB0 802A1540 8FB00010 */ lw $s0, 0x10($sp) -/* 71DCB4 802A1544 03E00008 */ jr $ra -/* 71DCB8 802A1548 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71DCBC 802A154C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A123C_71E88C.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/battle_item_sleepy_sheep_func_802A123C_71E88C.s similarity index 95% rename from ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A123C_71E88C.s rename to ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/battle_item_sleepy_sheep_func_802A123C_71E88C.s index 19f6f845ba..718a7dec81 100644 --- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A123C_71E88C.s +++ b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/battle_item_sleepy_sheep_func_802A123C_71E88C.s @@ -1,7 +1,20 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_802A123C_71E88C +.section .rodata + +glabel D_802A3E88_7214D8 +.word 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFE2, 0x00000000, 0xFFFFFFCE, 0xFFFFFFE5, 0x00000000, 0x0000001E, 0xFFFFFFBA, 0x00000000, 0xFFFFFFFB, 0xFFFFFF97, 0x00000000, 0x0000001E, 0xFFFFFF92, 0x00000000, 0xFFFFFFCE, 0xFFFFFF6F, 0x00000000, 0xFFFFFFFB, 0xFFFFFF56, 0x00000000, 0xFFFFFFCE, 0xFFFFFF42, 0x00000000, 0xFFFFFFE2, 0xFFFFFF2E, 0x00000000, 0xFFFFFFF6 + +glabel D_802A3F00_721550 +.word 0x3F800000, 0x3F800000, 0x3F400000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F400000, 0x3F400000 + +glabel D_802A3F28_721578 +.word 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260, 0x802A32A0, 0x802A32E0, 0x802A3260 + +.section .text + +glabel battle_item_sleepy_sheep_func_802A123C_71E88C /* 71E88C 802A123C 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 71E890 802A1240 AFBE0038 */ sw $fp, 0x38($sp) /* 71E894 802A1244 3C1E802A */ lui $fp, %hi(D_802A3F88) diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1000_71E650.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1000_71E650.s deleted file mode 100644 index 6bd0f1b8a3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1000_71E650.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71E650 -/* 71E650 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71E654 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71E658 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71E65C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71E660 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71E664 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71E668 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71E66C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71E670 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71E674 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71E678 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71E67C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71E680 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71E684 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71E688 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71E68C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71E690 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71E694 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71E698 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71E69C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71E6A0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71E6A4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71E6A8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71E6AC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71E6B0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71E6B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71E6B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71E6BC 802A106C 00000000 */ nop -/* 71E6C0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71E6C4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71E6C8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71E6CC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71E6D0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71E6D4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71E6D8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71E6DC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71E6E0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71E6E4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71E6E8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71E6EC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71E6F0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71E6F4 802A10A4 00440018 */ mult $v0, $a0 -/* 71E6F8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71E6FC 802A10AC 00004010 */ mfhi $t0 -/* 71E700 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71E704 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71E708 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71E70C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71E710 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71E714 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71E718 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71E71C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71E720 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71E724 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71E728 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71E72C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71E730 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71E734 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71E738 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71E73C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71E740 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71E744 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71E748 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71E74C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71E750 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71E754 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71E758 802A1108 0C04C4FD */ jal make_item_entity -/* 71E75C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71E760 802A1110 0C03A830 */ jal add_coins -/* 71E764 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71E768 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71E76C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71E770 802A1120 00000000 */ nop -.L802A1124: -/* 71E774 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71E778 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71E77C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71E780 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71E784 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71E788 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71E78C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71E790 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71E794 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71E798 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71E79C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71E7A0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71E7A4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71E7A8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71E7AC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71E7B0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71E7B4 802A1164 0C00B94E */ jal get_screen_coords -/* 71E7B8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71E7BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71E7C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71E7C4 802A1174 0C050529 */ jal create_icon -/* 71E7C8 802A1178 00000000 */ nop -/* 71E7CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71E7D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71E7D4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71E7D8 802A1188 3C01802A */ lui $at, %hi(D_802A3F50) -/* 71E7DC 802A118C AC243F50 */ sw $a0, %lo(D_802A3F50)($at) -/* 71E7E0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71E7E4 802A1194 0C051261 */ jal set_icon_render_pos -/* 71E7E8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71E7EC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71E7F0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71E7F4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71E7F8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71E7FC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71E800 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71E804 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71E808 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71E80C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71E810 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71E814 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71E818 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71E81C 802A11CC 03E00008 */ jr $ra -/* 71E820 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A11D4_71E824.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A11D4_71E824.s deleted file mode 100644 index 7b3e255495..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A11D4_71E824.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71E824 -/* 71E824 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71E828 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71E82C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71E830 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71E834 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71E838 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71E83C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71E840 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71E844 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71E848 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71E84C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71E850 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71E854 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71E858 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71E85C 802A120C 00000000 */ nop -/* 71E860 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71E864 802A1214 00000000 */ nop -/* 71E868 802A1218 3C04802A */ lui $a0, %hi(D_802A3F50) -/* 71E86C 802A121C 8C843F50 */ lw $a0, %lo(D_802A3F50)($a0) -/* 71E870 802A1220 0C05123D */ jal free_icon -/* 71E874 802A1224 00000000 */ nop -.L802A1228: -/* 71E878 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71E87C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71E880 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71E884 802A1234 03E00008 */ jr $ra -/* 71E888 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1740_71ED90.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1740_71ED90.s deleted file mode 100644 index 781d8cb57e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1740_71ED90.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1740_71ED90 -/* 71ED90 802A1740 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 71ED94 802A1744 AFB3001C */ sw $s3, 0x1c($sp) -/* 71ED98 802A1748 3C13800E */ lui $s3, %hi(gBattleStatus+0xD8) -/* 71ED9C 802A174C 8E73C148 */ lw $s3, %lo(gBattleStatus+0xD8)($s3) -/* 71EDA0 802A1750 AFB40020 */ sw $s4, 0x20($sp) -/* 71EDA4 802A1754 AFBF0024 */ sw $ra, 0x24($sp) -/* 71EDA8 802A1758 AFB20018 */ sw $s2, 0x18($sp) -/* 71EDAC 802A175C AFB10014 */ sw $s1, 0x14($sp) -/* 71EDB0 802A1760 AFB00010 */ sw $s0, 0x10($sp) -/* 71EDB4 802A1764 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 71EDB8 802A1768 10A00004 */ beqz $a1, .L802A177C -/* 71EDBC 802A176C 0080A02D */ daddu $s4, $a0, $zero -/* 71EDC0 802A1770 2402005A */ addiu $v0, $zero, 0x5a -/* 71EDC4 802A1774 AE800070 */ sw $zero, 0x70($s4) -/* 71EDC8 802A1778 AE820074 */ sw $v0, 0x74($s4) -.L802A177C: -/* 71EDCC 802A177C 8262040C */ lb $v0, 0x40c($s3) -/* 71EDD0 802A1780 18400021 */ blez $v0, .L802A1808 -/* 71EDD4 802A1784 0000902D */ daddu $s2, $zero, $zero -/* 71EDD8 802A1788 3C014204 */ lui $at, 0x4204 -/* 71EDDC 802A178C 4481A000 */ mtc1 $at, $f20 -/* 71EDE0 802A1790 02721021 */ addu $v0, $s3, $s2 -.L802A1794: -/* 71EDE4 802A1794 8042040D */ lb $v0, 0x40d($v0) -/* 71EDE8 802A1798 00028080 */ sll $s0, $v0, 2 -/* 71EDEC 802A179C 02028021 */ addu $s0, $s0, $v0 -/* 71EDF0 802A17A0 00108080 */ sll $s0, $s0, 2 -/* 71EDF4 802A17A4 2610022C */ addiu $s0, $s0, 0x22c -/* 71EDF8 802A17A8 02708021 */ addu $s0, $s3, $s0 -/* 71EDFC 802A17AC 0C09A75B */ jal get_actor -/* 71EE00 802A17B0 86040000 */ lh $a0, ($s0) -/* 71EE04 802A17B4 0040882D */ daddu $s1, $v0, $zero -/* 71EE08 802A17B8 86050002 */ lh $a1, 2($s0) -/* 71EE0C 802A17BC 0C099117 */ jal get_actor_part -/* 71EE10 802A17C0 0220202D */ daddu $a0, $s1, $zero -/* 71EE14 802A17C4 82230218 */ lb $v1, 0x218($s1) -/* 71EE18 802A17C8 1460000A */ bnez $v1, .L802A17F4 -/* 71EE1C 802A17CC 00000000 */ nop -/* 71EE20 802A17D0 8C42007C */ lw $v0, 0x7c($v0) -/* 71EE24 802A17D4 30420020 */ andi $v0, $v0, 0x20 -/* 71EE28 802A17D8 14400006 */ bnez $v0, .L802A17F4 -/* 71EE2C 802A17DC 00000000 */ nop -/* 71EE30 802A17E0 C62C018C */ lwc1 $f12, 0x18c($s1) -/* 71EE34 802A17E4 46146300 */ add.s $f12, $f12, $f20 -/* 71EE38 802A17E8 0C00A6C9 */ jal clamp_angle -/* 71EE3C 802A17EC E62C018C */ swc1 $f12, 0x18c($s1) -/* 71EE40 802A17F0 E620018C */ swc1 $f0, 0x18c($s1) -.L802A17F4: -/* 71EE44 802A17F4 8262040C */ lb $v0, 0x40c($s3) -/* 71EE48 802A17F8 26520001 */ addiu $s2, $s2, 1 -/* 71EE4C 802A17FC 0242102A */ slt $v0, $s2, $v0 -/* 71EE50 802A1800 1440FFE4 */ bnez $v0, .L802A1794 -/* 71EE54 802A1804 02721021 */ addu $v0, $s3, $s2 -.L802A1808: -/* 71EE58 802A1808 8E820074 */ lw $v0, 0x74($s4) -/* 71EE5C 802A180C 14400003 */ bnez $v0, .L802A181C -/* 71EE60 802A1810 2442FFFF */ addiu $v0, $v0, -1 -/* 71EE64 802A1814 080A8609 */ j .L802A1824 -/* 71EE68 802A1818 24020002 */ addiu $v0, $zero, 2 -.L802A181C: -/* 71EE6C 802A181C AE820074 */ sw $v0, 0x74($s4) -/* 71EE70 802A1820 0000102D */ daddu $v0, $zero, $zero -.L802A1824: -/* 71EE74 802A1824 8FBF0024 */ lw $ra, 0x24($sp) -/* 71EE78 802A1828 8FB40020 */ lw $s4, 0x20($sp) -/* 71EE7C 802A182C 8FB3001C */ lw $s3, 0x1c($sp) -/* 71EE80 802A1830 8FB20018 */ lw $s2, 0x18($sp) -/* 71EE84 802A1834 8FB10014 */ lw $s1, 0x14($sp) -/* 71EE88 802A1838 8FB00010 */ lw $s0, 0x10($sp) -/* 71EE8C 802A183C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 71EE90 802A1840 03E00008 */ jr $ra -/* 71EE94 802A1844 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1848_71EE98.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1848_71EE98.s deleted file mode 100644 index f4b172baaf..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep_71E650/func_802A1848_71EE98.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1848_71EE98 -/* 71EE98 802A1848 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 71EE9C 802A184C AFB3001C */ sw $s3, 0x1c($sp) -/* 71EEA0 802A1850 3C13800E */ lui $s3, %hi(gBattleStatus+0xD8) -/* 71EEA4 802A1854 8E73C148 */ lw $s3, %lo(gBattleStatus+0xD8)($s3) -/* 71EEA8 802A1858 AFBF0024 */ sw $ra, 0x24($sp) -/* 71EEAC 802A185C AFB40020 */ sw $s4, 0x20($sp) -/* 71EEB0 802A1860 AFB20018 */ sw $s2, 0x18($sp) -/* 71EEB4 802A1864 AFB10014 */ sw $s1, 0x14($sp) -/* 71EEB8 802A1868 AFB00010 */ sw $s0, 0x10($sp) -/* 71EEBC 802A186C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 71EEC0 802A1870 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 71EEC4 802A1874 54A00001 */ bnel $a1, $zero, .L802A187C -/* 71EEC8 802A1878 AC800070 */ sw $zero, 0x70($a0) -.L802A187C: -/* 71EECC 802A187C 0000902D */ daddu $s2, $zero, $zero -/* 71EED0 802A1880 8262040C */ lb $v0, 0x40c($s3) -/* 71EED4 802A1884 1840002C */ blez $v0, .L802A1938 -/* 71EED8 802A1888 0240A02D */ daddu $s4, $s2, $zero -/* 71EEDC 802A188C 3C0143B4 */ lui $at, 0x43b4 -/* 71EEE0 802A1890 4481A000 */ mtc1 $at, $f20 -/* 71EEE4 802A1894 3C014204 */ lui $at, 0x4204 -/* 71EEE8 802A1898 4481B000 */ mtc1 $at, $f22 -/* 71EEEC 802A189C 02721021 */ addu $v0, $s3, $s2 -.L802A18A0: -/* 71EEF0 802A18A0 8043040D */ lb $v1, 0x40d($v0) -/* 71EEF4 802A18A4 00031080 */ sll $v0, $v1, 2 -/* 71EEF8 802A18A8 00431021 */ addu $v0, $v0, $v1 -/* 71EEFC 802A18AC 00021080 */ sll $v0, $v0, 2 -/* 71EF00 802A18B0 2442022C */ addiu $v0, $v0, 0x22c -/* 71EF04 802A18B4 02628821 */ addu $s1, $s3, $v0 -/* 71EF08 802A18B8 0C09A75B */ jal get_actor -/* 71EF0C 802A18BC 86240000 */ lh $a0, ($s1) -/* 71EF10 802A18C0 0040802D */ daddu $s0, $v0, $zero -/* 71EF14 802A18C4 12000017 */ beqz $s0, .L802A1924 -/* 71EF18 802A18C8 00000000 */ nop -/* 71EF1C 802A18CC 86250002 */ lh $a1, 2($s1) -/* 71EF20 802A18D0 0C099117 */ jal get_actor_part -/* 71EF24 802A18D4 0200202D */ daddu $a0, $s0, $zero -/* 71EF28 802A18D8 82030218 */ lb $v1, 0x218($s0) -/* 71EF2C 802A18DC 14600011 */ bnez $v1, .L802A1924 -/* 71EF30 802A18E0 00000000 */ nop -/* 71EF34 802A18E4 8C42007C */ lw $v0, 0x7c($v0) -/* 71EF38 802A18E8 30420020 */ andi $v0, $v0, 0x20 -/* 71EF3C 802A18EC 1440000D */ bnez $v0, .L802A1924 -/* 71EF40 802A18F0 00000000 */ nop -/* 71EF44 802A18F4 C600018C */ lwc1 $f0, 0x18c($s0) -/* 71EF48 802A18F8 4614003C */ c.lt.s $f0, $f20 -/* 71EF4C 802A18FC 00000000 */ nop -/* 71EF50 802A1900 45000008 */ bc1f .L802A1924 -/* 71EF54 802A1904 00000000 */ nop -/* 71EF58 802A1908 46160000 */ add.s $f0, $f0, $f22 -/* 71EF5C 802A190C 4600A03E */ c.le.s $f20, $f0 -/* 71EF60 802A1910 00000000 */ nop -/* 71EF64 802A1914 45000002 */ bc1f .L802A1920 -/* 71EF68 802A1918 E600018C */ swc1 $f0, 0x18c($s0) -/* 71EF6C 802A191C E614018C */ swc1 $f20, 0x18c($s0) -.L802A1920: -/* 71EF70 802A1920 24140001 */ addiu $s4, $zero, 1 -.L802A1924: -/* 71EF74 802A1924 8262040C */ lb $v0, 0x40c($s3) -/* 71EF78 802A1928 26520001 */ addiu $s2, $s2, 1 -/* 71EF7C 802A192C 0242102A */ slt $v0, $s2, $v0 -/* 71EF80 802A1930 1440FFDB */ bnez $v0, .L802A18A0 -/* 71EF84 802A1934 02721021 */ addu $v0, $s3, $s2 -.L802A1938: -/* 71EF88 802A1938 2E820001 */ sltiu $v0, $s4, 1 -/* 71EF8C 802A193C 8FBF0024 */ lw $ra, 0x24($sp) -/* 71EF90 802A1940 8FB40020 */ lw $s4, 0x20($sp) -/* 71EF94 802A1944 8FB3001C */ lw $s3, 0x1c($sp) -/* 71EF98 802A1948 8FB20018 */ lw $s2, 0x18($sp) -/* 71EF9C 802A194C 8FB10014 */ lw $s1, 0x14($sp) -/* 71EFA0 802A1950 8FB00010 */ lw $s0, 0x10($sp) -/* 71EFA4 802A1954 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 71EFA8 802A1958 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 71EFAC 802A195C 00021040 */ sll $v0, $v0, 1 -/* 71EFB0 802A1960 03E00008 */ jr $ra -/* 71EFB4 802A1964 27BD0038 */ addiu $sp, $sp, 0x38 -/* 71EFB8 802A1968 00000000 */ nop -/* 71EFBC 802A196C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A1000_71BE30.s b/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A1000_71BE30.s deleted file mode 100644 index 0e6715e52e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A1000_71BE30.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71BE30 -/* 71BE30 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71BE34 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71BE38 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71BE3C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71BE40 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71BE44 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71BE48 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71BE4C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71BE50 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71BE54 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71BE58 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71BE5C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71BE60 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71BE64 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71BE68 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71BE6C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71BE70 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71BE74 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71BE78 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71BE7C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71BE80 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71BE84 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71BE88 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71BE8C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71BE90 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71BE94 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71BE98 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71BE9C 802A106C 00000000 */ nop -/* 71BEA0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71BEA4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71BEA8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71BEAC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71BEB0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71BEB4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71BEB8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71BEBC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71BEC0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71BEC4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71BEC8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71BECC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71BED0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71BED4 802A10A4 00440018 */ mult $v0, $a0 -/* 71BED8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71BEDC 802A10AC 00004010 */ mfhi $t0 -/* 71BEE0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71BEE4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71BEE8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71BEEC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71BEF0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71BEF4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71BEF8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71BEFC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71BF00 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71BF04 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71BF08 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71BF0C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71BF10 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71BF14 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71BF18 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71BF1C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71BF20 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71BF24 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71BF28 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71BF2C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71BF30 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71BF34 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71BF38 802A1108 0C04C4FD */ jal make_item_entity -/* 71BF3C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71BF40 802A1110 0C03A830 */ jal add_coins -/* 71BF44 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71BF48 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71BF4C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71BF50 802A1120 00000000 */ nop -.L802A1124: -/* 71BF54 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71BF58 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71BF5C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71BF60 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71BF64 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71BF68 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71BF6C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71BF70 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71BF74 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71BF78 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71BF7C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71BF80 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71BF84 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71BF88 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71BF8C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71BF90 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71BF94 802A1164 0C00B94E */ jal get_screen_coords -/* 71BF98 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71BF9C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71BFA0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71BFA4 802A1174 0C050529 */ jal create_icon -/* 71BFA8 802A1178 00000000 */ nop -/* 71BFAC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71BFB0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71BFB4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71BFB8 802A1188 3C01802A */ lui $at, %hi(D_802A1EB0) -/* 71BFBC 802A118C AC241EB0 */ sw $a0, %lo(D_802A1EB0)($at) -/* 71BFC0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71BFC4 802A1194 0C051261 */ jal set_icon_render_pos -/* 71BFC8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71BFCC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71BFD0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71BFD4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71BFD8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71BFDC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71BFE0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71BFE4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71BFE8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71BFEC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71BFF0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71BFF4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71BFF8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71BFFC 802A11CC 03E00008 */ jr $ra -/* 71C000 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A11D4_71C004.s b/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A11D4_71C004.s deleted file mode 100644 index 8355227a8b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A11D4_71C004.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71C004 -/* 71C004 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71C008 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71C00C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71C010 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71C014 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71C018 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71C01C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71C020 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71C024 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71C028 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71C02C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71C030 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71C034 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71C038 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71C03C 802A120C 00000000 */ nop -/* 71C040 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71C044 802A1214 00000000 */ nop -/* 71C048 802A1218 3C04802A */ lui $a0, %hi(D_802A1EB0) -/* 71C04C 802A121C 8C841EB0 */ lw $a0, %lo(D_802A1EB0)($a0) -/* 71C050 802A1220 0C05123D */ jal free_icon -/* 71C054 802A1224 00000000 */ nop -.L802A1228: -/* 71C058 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71C05C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71C060 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71C064 802A1234 03E00008 */ jr $ra -/* 71C068 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A123C_71C06C.s b/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A123C_71C06C.s deleted file mode 100644 index 1c3ccbdf7e..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A123C_71C06C.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_71C06C -/* 71C06C 802A123C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 71C070 802A1240 AFB1001C */ sw $s1, 0x1c($sp) -/* 71C074 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 71C078 802A1248 AFBF0024 */ sw $ra, 0x24($sp) -/* 71C07C 802A124C AFB20020 */ sw $s2, 0x20($sp) -/* 71C080 802A1250 AFB00018 */ sw $s0, 0x18($sp) -/* 71C084 802A1254 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 71C088 802A1258 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 71C08C 802A125C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 71C090 802A1260 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 71C094 802A1264 8E30000C */ lw $s0, 0xc($s1) -/* 71C098 802A1268 8E050000 */ lw $a1, ($s0) -/* 71C09C 802A126C 0C0B1EAF */ jal get_variable -/* 71C0A0 802A1270 26100004 */ addiu $s0, $s0, 4 -/* 71C0A4 802A1274 8E050000 */ lw $a1, ($s0) -/* 71C0A8 802A1278 26100004 */ addiu $s0, $s0, 4 -/* 71C0AC 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 71C0B0 802A1280 0C0B1EAF */ jal get_variable -/* 71C0B4 802A1284 0040902D */ daddu $s2, $v0, $zero -/* 71C0B8 802A1288 0220202D */ daddu $a0, $s1, $zero -/* 71C0BC 802A128C 8E050000 */ lw $a1, ($s0) -/* 71C0C0 802A1290 0C0B1EAF */ jal get_variable -/* 71C0C4 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 71C0C8 802A1298 4492D000 */ mtc1 $s2, $f26 -/* 71C0CC 802A129C 00000000 */ nop -/* 71C0D0 802A12A0 4680D6A0 */ cvt.s.w $f26, $f26 -/* 71C0D4 802A12A4 4490C000 */ mtc1 $s0, $f24 -/* 71C0D8 802A12A8 00000000 */ nop -/* 71C0DC 802A12AC 4680C620 */ cvt.s.w $f24, $f24 -/* 71C0E0 802A12B0 4482A000 */ mtc1 $v0, $f20 -/* 71C0E4 802A12B4 00000000 */ nop -/* 71C0E8 802A12B8 4680A520 */ cvt.s.w $f20, $f20 -/* 71C0EC 802A12BC 4405D000 */ mfc1 $a1, $f26 -/* 71C0F0 802A12C0 4406C000 */ mfc1 $a2, $f24 -/* 71C0F4 802A12C4 4407A000 */ mfc1 $a3, $f20 -/* 71C0F8 802A12C8 3C0141F0 */ lui $at, 0x41f0 -/* 71C0FC 802A12CC 4481B000 */ mtc1 $at, $f22 -/* 71C100 802A12D0 24040002 */ addiu $a0, $zero, 2 -/* 71C104 802A12D4 0C01BFBC */ jal func_8006FEF0 -/* 71C108 802A12D8 E7B60010 */ swc1 $f22, 0x10($sp) -/* 71C10C 802A12DC 4405D000 */ mfc1 $a1, $f26 -/* 71C110 802A12E0 4406C000 */ mfc1 $a2, $f24 -/* 71C114 802A12E4 4407A000 */ mfc1 $a3, $f20 -/* 71C118 802A12E8 24040002 */ addiu $a0, $zero, 2 -/* 71C11C 802A12EC 0C01BFBC */ jal func_8006FEF0 -/* 71C120 802A12F0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 71C124 802A12F4 8FBF0024 */ lw $ra, 0x24($sp) -/* 71C128 802A12F8 8FB20020 */ lw $s2, 0x20($sp) -/* 71C12C 802A12FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 71C130 802A1300 8FB00018 */ lw $s0, 0x18($sp) -/* 71C134 802A1304 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 71C138 802A1308 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 71C13C 802A130C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 71C140 802A1310 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 71C144 802A1314 24020002 */ addiu $v0, $zero, 2 -/* 71C148 802A1318 03E00008 */ jr $ra -/* 71C14C 802A131C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A13B8_71C1E8.s b/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A13B8_71C1E8.s deleted file mode 100644 index 8532910a58..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/snowman_doll_71BE30/func_802A13B8_71C1E8.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A13B8_71C1E8 -/* 71C1E8 802A13B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71C1EC 802A13BC AFB00010 */ sw $s0, 0x10($sp) -/* 71C1F0 802A13C0 0080802D */ daddu $s0, $a0, $zero -/* 71C1F4 802A13C4 10A00003 */ beqz $a1, .L802A13D4 -/* 71C1F8 802A13C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 71C1FC 802A13CC 24020014 */ addiu $v0, $zero, 0x14 -/* 71C200 802A13D0 AE020070 */ sw $v0, 0x70($s0) -.L802A13D4: -/* 71C204 802A13D4 0000202D */ daddu $a0, $zero, $zero -/* 71C208 802A13D8 0080282D */ daddu $a1, $a0, $zero -/* 71C20C 802A13DC 8E020070 */ lw $v0, 0x70($s0) -/* 71C210 802A13E0 0080302D */ daddu $a2, $a0, $zero -/* 71C214 802A13E4 00023880 */ sll $a3, $v0, 2 -/* 71C218 802A13E8 00E23821 */ addu $a3, $a3, $v0 -/* 71C21C 802A13EC 00073840 */ sll $a3, $a3, 1 -/* 71C220 802A13F0 0C046F97 */ jal set_background_color_blend -/* 71C224 802A13F4 30E700FE */ andi $a3, $a3, 0xfe -/* 71C228 802A13F8 8E020070 */ lw $v0, 0x70($s0) -/* 71C22C 802A13FC 2442FFFF */ addiu $v0, $v0, -1 -/* 71C230 802A1400 10400003 */ beqz $v0, .L802A1410 -/* 71C234 802A1404 AE020070 */ sw $v0, 0x70($s0) -/* 71C238 802A1408 080A850A */ j .L802A1428 -/* 71C23C 802A140C 0000102D */ daddu $v0, $zero, $zero -.L802A1410: -/* 71C240 802A1410 0000202D */ daddu $a0, $zero, $zero -/* 71C244 802A1414 0080282D */ daddu $a1, $a0, $zero -/* 71C248 802A1418 0080302D */ daddu $a2, $a0, $zero -/* 71C24C 802A141C 0C046F97 */ jal set_background_color_blend -/* 71C250 802A1420 0080382D */ daddu $a3, $a0, $zero -/* 71C254 802A1424 24020002 */ addiu $v0, $zero, 2 -.L802A1428: -/* 71C258 802A1428 8FBF0014 */ lw $ra, 0x14($sp) -/* 71C25C 802A142C 8FB00010 */ lw $s0, 0x10($sp) -/* 71C260 802A1430 03E00008 */ jr $ra -/* 71C264 802A1434 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71C268 802A1438 00000000 */ nop -/* 71C26C 802A143C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A1000_7215A0.s b/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A1000_7215A0.s deleted file mode 100644 index 614d9879c7..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A1000_7215A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7215A0 -/* 7215A0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7215A4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 7215A8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 7215AC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 7215B0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 7215B4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 7215B8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 7215BC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7215C0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7215C4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7215C8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7215CC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7215D0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7215D4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7215D8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7215DC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7215E0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7215E4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7215E8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7215EC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7215F0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7215F4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7215F8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7215FC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 721600 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 721604 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 721608 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72160C 802A106C 00000000 */ nop -/* 721610 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 721614 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 721618 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72161C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 721620 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 721624 802A1084 1A400045 */ blez $s2, .L802A119C -/* 721628 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72162C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 721630 802A1090 00121880 */ sll $v1, $s2, 2 -/* 721634 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 721638 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72163C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 721640 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 721644 802A10A4 00440018 */ mult $v0, $a0 -/* 721648 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72164C 802A10AC 00004010 */ mfhi $t0 -/* 721650 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 721654 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 721658 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72165C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 721660 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 721664 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 721668 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72166C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 721670 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 721674 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 721678 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72167C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 721680 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 721684 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 721688 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72168C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 721690 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 721694 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 721698 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72169C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 7216A0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 7216A4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 7216A8 802A1108 0C04C4FD */ jal make_item_entity -/* 7216AC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 7216B0 802A1110 0C03A830 */ jal add_coins -/* 7216B4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 7216B8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 7216BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7216C0 802A1120 00000000 */ nop -.L802A1124: -/* 7216C4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7216C8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7216CC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 7216D0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7216D4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 7216D8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7216DC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7216E0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7216E4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 7216E8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 7216EC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7216F0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7216F4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7216F8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7216FC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 721700 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 721704 802A1164 0C00B94E */ jal get_screen_coords -/* 721708 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72170C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 721710 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 721714 802A1174 0C050529 */ jal create_icon -/* 721718 802A1178 00000000 */ nop -/* 72171C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 721720 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 721724 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 721728 802A1188 3C01802A */ lui $at, %hi(battle_item_coconut_coconutDL) -/* 72172C 802A118C AC241A60 */ sw $a0, %lo(battle_item_coconut_coconutDL)($at) -/* 721730 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 721734 802A1194 0C051261 */ jal set_icon_render_pos -/* 721738 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72173C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 721740 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 721744 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 721748 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72174C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 721750 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 721754 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 721758 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72175C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 721760 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 721764 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 721768 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72176C 802A11CC 03E00008 */ jr $ra -/* 721770 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A11D4_721774.s b/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A11D4_721774.s deleted file mode 100644 index 622c7523a1..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A11D4_721774.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_721774 -/* 721774 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 721778 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72177C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 721780 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 721784 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 721788 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72178C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 721790 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 721794 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 721798 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72179C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 7217A0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 7217A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 7217A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7217AC 802A120C 00000000 */ nop -/* 7217B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7217B4 802A1214 00000000 */ nop -/* 7217B8 802A1218 3C04802A */ lui $a0, %hi(battle_item_coconut_coconutDL) -/* 7217BC 802A121C 8C841A60 */ lw $a0, %lo(battle_item_coconut_coconutDL)($a0) -/* 7217C0 802A1220 0C05123D */ jal free_icon -/* 7217C4 802A1224 00000000 */ nop -.L802A1228: -/* 7217C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7217CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 7217D0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 7217D4 802A1234 03E00008 */ jr $ra -/* 7217D8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A123C_7217DC.s b/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A123C_7217DC.s deleted file mode 100644 index 93d3cbd6ba..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stone_cap_7215A0/func_802A123C_7217DC.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_7217DC -/* 7217DC 802A123C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7217E0 802A1240 AFB20020 */ sw $s2, 0x20($sp) -/* 7217E4 802A1244 AFB30024 */ sw $s3, 0x24($sp) -/* 7217E8 802A1248 3C13800E */ lui $s3, %hi(gBattleStatus) -/* 7217EC 802A124C 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) -/* 7217F0 802A1250 AFBF002C */ sw $ra, 0x2c($sp) -/* 7217F4 802A1254 AFB40028 */ sw $s4, 0x28($sp) -/* 7217F8 802A1258 AFB1001C */ sw $s1, 0x1c($sp) -/* 7217FC 802A125C AFB00018 */ sw $s0, 0x18($sp) -/* 721800 802A1260 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 721804 802A1264 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 721808 802A1268 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 72180C 802A126C 8E7000D8 */ lw $s0, 0xd8($s3) -/* 721810 802A1270 10A00002 */ beqz $a1, .L802A127C -/* 721814 802A1274 0080902D */ daddu $s2, $a0, $zero -/* 721818 802A1278 AE400070 */ sw $zero, 0x70($s2) -.L802A127C: -/* 72181C 802A127C 8E430070 */ lw $v1, 0x70($s2) -/* 721820 802A1280 10600005 */ beqz $v1, .L802A1298 -/* 721824 802A1284 24020001 */ addiu $v0, $zero, 1 -/* 721828 802A1288 1062000D */ beq $v1, $v0, .L802A12C0 -/* 72182C 802A128C 0000102D */ daddu $v0, $zero, $zero -/* 721830 802A1290 080A84E9 */ j .L802A13A4 -/* 721834 802A1294 00000000 */ nop -.L802A1298: -/* 721838 802A1298 0200202D */ daddu $a0, $s0, $zero -/* 72183C 802A129C 8E460084 */ lw $a2, 0x84($s2) -/* 721840 802A12A0 0C0997D0 */ jal inflict_status -/* 721844 802A12A4 2405000C */ addiu $a1, $zero, 0xc -/* 721848 802A12A8 24020003 */ addiu $v0, $zero, 3 -/* 72184C 802A12AC A200021C */ sb $zero, 0x21c($s0) -/* 721850 802A12B0 AE420074 */ sw $v0, 0x74($s2) -/* 721854 802A12B4 24020001 */ addiu $v0, $zero, 1 -/* 721858 802A12B8 080A84E8 */ j .L802A13A0 -/* 72185C 802A12BC AE420070 */ sw $v0, 0x70($s2) -.L802A12C0: -/* 721860 802A12C0 0000882D */ daddu $s1, $zero, $zero -/* 721864 802A12C4 24140019 */ addiu $s4, $zero, 0x19 -/* 721868 802A12C8 3C0140A0 */ lui $at, 0x40a0 -/* 72186C 802A12CC 4481C000 */ mtc1 $at, $f24 -/* 721870 802A12D0 3C013F80 */ lui $at, 0x3f80 -/* 721874 802A12D4 4481B000 */ mtc1 $at, $f22 -.L802A12D8: -/* 721878 802A12D8 0C00A67F */ jal rand_int -/* 72187C 802A12DC 24040014 */ addiu $a0, $zero, 0x14 -/* 721880 802A12E0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 721884 802A12E4 C6020188 */ lwc1 $f2, 0x188($s0) -/* 721888 802A12E8 44820000 */ mtc1 $v0, $f0 -/* 72188C 802A12EC 00000000 */ nop -/* 721890 802A12F0 46800020 */ cvt.s.w $f0, $f0 -/* 721894 802A12F4 46020002 */ mul.s $f0, $f0, $f2 -/* 721898 802A12F8 00000000 */ nop -/* 72189C 802A12FC C6140144 */ lwc1 $f20, 0x144($s0) -/* 7218A0 802A1300 24040014 */ addiu $a0, $zero, 0x14 -/* 7218A4 802A1304 0C00A67F */ jal rand_int -/* 7218A8 802A1308 4600A500 */ add.s $f20, $f20, $f0 -/* 7218AC 802A130C 2442000A */ addiu $v0, $v0, 0xa -/* 7218B0 802A1310 C6020188 */ lwc1 $f2, 0x188($s0) -/* 7218B4 802A1314 44820000 */ mtc1 $v0, $f0 -/* 7218B8 802A1318 00000000 */ nop -/* 7218BC 802A131C 46800020 */ cvt.s.w $f0, $f0 -/* 7218C0 802A1320 46020002 */ mul.s $f0, $f0, $f2 -/* 7218C4 802A1324 00000000 */ nop -/* 7218C8 802A1328 C6020148 */ lwc1 $f2, 0x148($s0) -/* 7218CC 802A132C 46001080 */ add.s $f2, $f2, $f0 -/* 7218D0 802A1330 C600014C */ lwc1 $f0, 0x14c($s0) -/* 7218D4 802A1334 26310001 */ addiu $s1, $s1, 1 -/* 7218D8 802A1338 46180000 */ add.s $f0, $f0, $f24 -/* 7218DC 802A133C 4405A000 */ mfc1 $a1, $f20 -/* 7218E0 802A1340 44061000 */ mfc1 $a2, $f2 -/* 7218E4 802A1344 44070000 */ mfc1 $a3, $f0 -/* 7218E8 802A1348 0000202D */ daddu $a0, $zero, $zero -/* 7218EC 802A134C E7B60010 */ swc1 $f22, 0x10($sp) -/* 7218F0 802A1350 0C01C7FC */ jal func_80071FF0 -/* 7218F4 802A1354 AFB40014 */ sw $s4, 0x14($sp) -/* 7218F8 802A1358 2A22000A */ slti $v0, $s1, 0xa -/* 7218FC 802A135C 1440FFDE */ bnez $v0, .L802A12D8 -/* 721900 802A1360 00000000 */ nop -/* 721904 802A1364 8E420074 */ lw $v0, 0x74($s2) -/* 721908 802A1368 1440000C */ bnez $v0, .L802A139C -/* 72190C 802A136C 2442FFFF */ addiu $v0, $v0, -1 -/* 721910 802A1370 3C05FBFF */ lui $a1, 0xfbff -/* 721914 802A1374 34A5FFFF */ ori $a1, $a1, 0xffff -/* 721918 802A1378 3C04800E */ lui $a0, %hi(gBattleStatus) -/* 72191C 802A137C 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) -/* 721920 802A1380 8C830000 */ lw $v1, ($a0) -/* 721924 802A1384 24020002 */ addiu $v0, $zero, 2 -/* 721928 802A1388 A260008B */ sb $zero, 0x8b($s3) -/* 72192C 802A138C A2600088 */ sb $zero, 0x88($s3) -/* 721930 802A1390 00651824 */ and $v1, $v1, $a1 -/* 721934 802A1394 080A84E9 */ j .L802A13A4 -/* 721938 802A1398 AC830000 */ sw $v1, ($a0) -.L802A139C: -/* 72193C 802A139C AE420074 */ sw $v0, 0x74($s2) -.L802A13A0: -/* 721940 802A13A0 0000102D */ daddu $v0, $zero, $zero -.L802A13A4: -/* 721944 802A13A4 8FBF002C */ lw $ra, 0x2c($sp) -/* 721948 802A13A8 8FB40028 */ lw $s4, 0x28($sp) -/* 72194C 802A13AC 8FB30024 */ lw $s3, 0x24($sp) -/* 721950 802A13B0 8FB20020 */ lw $s2, 0x20($sp) -/* 721954 802A13B4 8FB1001C */ lw $s1, 0x1c($sp) -/* 721958 802A13B8 8FB00018 */ lw $s0, 0x18($sp) -/* 72195C 802A13BC D7B80040 */ ldc1 $f24, 0x40($sp) -/* 721960 802A13C0 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 721964 802A13C4 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 721968 802A13C8 03E00008 */ jr $ra -/* 72196C 802A13CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A1000_726DD0.s b/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A1000_726DD0.s deleted file mode 100644 index 6a8d0df6b5..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A1000_726DD0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_726DD0 -/* 726DD0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 726DD4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 726DD8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 726DDC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 726DE0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 726DE4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 726DE8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 726DEC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 726DF0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 726DF4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 726DF8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 726DFC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 726E00 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 726E04 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 726E08 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 726E0C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 726E10 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 726E14 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 726E18 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 726E1C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 726E20 802A1050 00021140 */ sll $v0, $v0, 5 -/* 726E24 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 726E28 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 726E2C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 726E30 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 726E34 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 726E38 802A1068 44820000 */ mtc1 $v0, $f0 -/* 726E3C 802A106C 00000000 */ nop -/* 726E40 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 726E44 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 726E48 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 726E4C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 726E50 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 726E54 802A1084 1A400045 */ blez $s2, .L802A119C -/* 726E58 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 726E5C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 726E60 802A1090 00121880 */ sll $v1, $s2, 2 -/* 726E64 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 726E68 802A1098 00031100 */ sll $v0, $v1, 4 -/* 726E6C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 726E70 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 726E74 802A10A4 00440018 */ mult $v0, $a0 -/* 726E78 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 726E7C 802A10AC 00004010 */ mfhi $t0 -/* 726E80 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 726E84 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 726E88 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 726E8C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 726E90 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 726E94 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 726E98 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 726E9C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 726EA0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 726EA4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 726EA8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 726EAC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 726EB0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 726EB4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 726EB8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 726EBC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 726EC0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 726EC4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 726EC8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 726ECC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 726ED0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 726ED4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 726ED8 802A1108 0C04C4FD */ jal make_item_entity -/* 726EDC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 726EE0 802A1110 0C03A830 */ jal add_coins -/* 726EE4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 726EE8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 726EEC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 726EF0 802A1120 00000000 */ nop -.L802A1124: -/* 726EF4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 726EF8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 726EFC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 726F00 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 726F04 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 726F08 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 726F0C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 726F10 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 726F14 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 726F18 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 726F1C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 726F20 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 726F24 802A1154 44050000 */ mfc1 $a1, $f0 -/* 726F28 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 726F2C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 726F30 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 726F34 802A1164 0C00B94E */ jal get_screen_coords -/* 726F38 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 726F3C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 726F40 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 726F44 802A1174 0C050529 */ jal create_icon -/* 726F48 802A1178 00000000 */ nop -/* 726F4C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 726F50 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 726F54 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 726F58 802A1188 3C01802A */ lui $at, %hi(D_802A1B40) -/* 726F5C 802A118C AC241B40 */ sw $a0, %lo(D_802A1B40)($at) -/* 726F60 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 726F64 802A1194 0C051261 */ jal set_icon_render_pos -/* 726F68 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 726F6C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 726F70 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 726F74 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 726F78 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 726F7C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 726F80 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 726F84 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 726F88 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 726F8C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 726F90 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 726F94 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 726F98 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 726F9C 802A11CC 03E00008 */ jr $ra -/* 726FA0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A11D4_726FA4.s b/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A11D4_726FA4.s deleted file mode 100644 index 3601b9f2c3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A11D4_726FA4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_726FA4 -/* 726FA4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 726FA8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 726FAC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 726FB0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 726FB4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 726FB8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 726FBC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 726FC0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 726FC4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 726FC8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 726FCC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 726FD0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 726FD4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 726FD8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 726FDC 802A120C 00000000 */ nop -/* 726FE0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 726FE4 802A1214 00000000 */ nop -/* 726FE8 802A1218 3C04802A */ lui $a0, %hi(D_802A1B40) -/* 726FEC 802A121C 8C841B40 */ lw $a0, %lo(D_802A1B40)($a0) -/* 726FF0 802A1220 0C05123D */ jal free_icon -/* 726FF4 802A1224 00000000 */ nop -.L802A1228: -/* 726FF8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 726FFC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 727000 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 727004 802A1234 03E00008 */ jr $ra -/* 727008 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A12D4_7270A4.s b/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A12D4_7270A4.s deleted file mode 100644 index fb41c22ce3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/stop_watch_726DD0/func_802A12D4_7270A4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12D4_7270A4 -/* 7270A4 802A12D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7270A8 802A12D8 AFB00010 */ sw $s0, 0x10($sp) -/* 7270AC 802A12DC 0080802D */ daddu $s0, $a0, $zero -/* 7270B0 802A12E0 10A00003 */ beqz $a1, .L802A12F0 -/* 7270B4 802A12E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7270B8 802A12E8 24020014 */ addiu $v0, $zero, 0x14 -/* 7270BC 802A12EC AE020070 */ sw $v0, 0x70($s0) -.L802A12F0: -/* 7270C0 802A12F0 0000202D */ daddu $a0, $zero, $zero -/* 7270C4 802A12F4 0080282D */ daddu $a1, $a0, $zero -/* 7270C8 802A12F8 8E020070 */ lw $v0, 0x70($s0) -/* 7270CC 802A12FC 0080302D */ daddu $a2, $a0, $zero -/* 7270D0 802A1300 00023880 */ sll $a3, $v0, 2 -/* 7270D4 802A1304 00E23821 */ addu $a3, $a3, $v0 -/* 7270D8 802A1308 00073840 */ sll $a3, $a3, 1 -/* 7270DC 802A130C 0C046F97 */ jal set_background_color_blend -/* 7270E0 802A1310 30E700FE */ andi $a3, $a3, 0xfe -/* 7270E4 802A1314 8E020070 */ lw $v0, 0x70($s0) -/* 7270E8 802A1318 2442FFFF */ addiu $v0, $v0, -1 -/* 7270EC 802A131C 10400003 */ beqz $v0, .L802A132C -/* 7270F0 802A1320 AE020070 */ sw $v0, 0x70($s0) -/* 7270F4 802A1324 080A84D1 */ j .L802A1344 -/* 7270F8 802A1328 0000102D */ daddu $v0, $zero, $zero -.L802A132C: -/* 7270FC 802A132C 0000202D */ daddu $a0, $zero, $zero -/* 727100 802A1330 0080282D */ daddu $a1, $a0, $zero -/* 727104 802A1334 0080302D */ daddu $a2, $a0, $zero -/* 727108 802A1338 0C046F97 */ jal set_background_color_blend -/* 72710C 802A133C 0080382D */ daddu $a3, $a0, $zero -/* 727110 802A1340 24020002 */ addiu $v0, $zero, 2 -.L802A1344: -/* 727114 802A1344 8FBF0014 */ lw $ra, 0x14($sp) -/* 727118 802A1348 8FB00010 */ lw $s0, 0x10($sp) -/* 72711C 802A134C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A123C_73153C.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/battle_item_strange_cake_func_802A123C_73153C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A123C_73153C.s rename to ver/us/asm/nonmatchings/battle/item/strange_cake_731300/battle_item_strange_cake_func_802A123C_73153C.s diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A13E4_7316E4.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/battle_item_strange_cake_func_802A13E4_7316E4.s similarity index 95% rename from ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A13E4_7316E4.s rename to ver/us/asm/nonmatchings/battle/item/strange_cake_731300/battle_item_strange_cake_func_802A13E4_7316E4.s index 84a1690d0b..f284257a2e 100644 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A13E4_7316E4.s +++ b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/battle_item_strange_cake_func_802A13E4_7316E4.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +glabel jtbl_802A2DB0_7330B0 +.word L802A1434_731734, L802A14D0_7317D0, L802A1614_731914, L802A1698_731998, L802A1734_731A34, L802A1754_731A54, 0, 0 + + +.section .text glabel func_802A13E4_7316E4 /* 7316E4 802A13E4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 7316E8 802A13E8 0080302D */ daddu $a2, $a0, $zero @@ -33,12 +40,12 @@ glabel L802A1434_731734 /* 73174C 802A144C 0C00A67F */ jal rand_int /* 731750 802A1450 240432C8 */ addiu $a0, $zero, 0x32c8 /* 731754 802A1454 0000802D */ daddu $s0, $zero, $zero -/* 731758 802A1458 3C13802A */ lui $s3, %hi(D_802A2848_732B48) -/* 73175C 802A145C 26732848 */ addiu $s3, $s3, %lo(D_802A2848_732B48) +/* 731758 802A1458 3C13802A */ lui $s3, %hi(battle_item_strange_cake_D_802A2848_732B48) +/* 73175C 802A145C 26732848 */ addiu $s3, $s3, %lo(battle_item_strange_cake_D_802A2848_732B48) /* 731760 802A1460 3C12802A */ lui $s2, %hi(D_802A2DD8) /* 731764 802A1464 26522DD8 */ addiu $s2, $s2, %lo(D_802A2DD8) -/* 731768 802A1468 3C11802A */ lui $s1, %hi(D_802A2858_732B58) -/* 73176C 802A146C 26312858 */ addiu $s1, $s1, %lo(D_802A2858_732B58) +/* 731768 802A1468 3C11802A */ lui $s1, %hi(battle_item_strange_cake_D_802A2858_732B58) +/* 73176C 802A146C 26312858 */ addiu $s1, $s1, %lo(battle_item_strange_cake_D_802A2858_732B58) /* 731770 802A1470 3C01802A */ lui $at, %hi(D_802A2DF4) /* 731774 802A1474 AC222DF4 */ sw $v0, %lo(D_802A2DF4)($at) /* 731778 802A1478 240203E8 */ addiu $v0, $zero, 0x3e8 @@ -264,9 +271,9 @@ glabel L802A1754_731A54 /* 731AA0 802A17A0 00628023 */ subu $s0, $v1, $v0 /* 731AA4 802A17A4 00101080 */ sll $v0, $s0, 2 /* 731AA8 802A17A8 0000802D */ daddu $s0, $zero, $zero -/* 731AAC 802A17AC 3C01802A */ lui $at, %hi(D_802A285A_732B5A) +/* 731AAC 802A17AC 3C01802A */ lui $at, %hi(battle_item_strange_cake_D_802A2858_732B58+2) /* 731AB0 802A17B0 00220821 */ addu $at, $at, $v0 -/* 731AB4 802A17B4 9422285A */ lhu $v0, %lo(D_802A285A_732B5A)($at) +/* 731AB4 802A17B4 9422285A */ lhu $v0, %lo(battle_item_strange_cake_D_802A2858_732B58+2)($at) /* 731AB8 802A17B8 3C03800E */ lui $v1, %hi(gBattleStatus) /* 731ABC 802A17BC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 731AC0 802A17C0 A462017A */ sh $v0, 0x17a($v1) diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1000_731300.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1000_731300.s deleted file mode 100644 index 0457c82353..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1000_731300.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_731300 -/* 731300 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 731304 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 731308 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 73130C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 731310 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 731314 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 731318 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 73131C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 731320 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 731324 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 731328 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 73132C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 731330 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 731334 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 731338 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 73133C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 731340 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 731344 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 731348 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 73134C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 731350 802A1050 00021140 */ sll $v0, $v0, 5 -/* 731354 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 731358 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 73135C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 731360 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 731364 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 731368 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73136C 802A106C 00000000 */ nop -/* 731370 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 731374 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 731378 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 73137C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 731380 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 731384 802A1084 1A400045 */ blez $s2, .L802A119C -/* 731388 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 73138C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 731390 802A1090 00121880 */ sll $v1, $s2, 2 -/* 731394 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 731398 802A1098 00031100 */ sll $v0, $v1, 4 -/* 73139C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7313A0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7313A4 802A10A4 00440018 */ mult $v0, $a0 -/* 7313A8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7313AC 802A10AC 00004010 */ mfhi $t0 -/* 7313B0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 7313B4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 7313B8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 7313BC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 7313C0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 7313C4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 7313C8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 7313CC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7313D0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7313D4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7313D8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7313DC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7313E0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7313E4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7313E8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7313EC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 7313F0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 7313F4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 7313F8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 7313FC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 731400 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 731404 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 731408 802A1108 0C04C4FD */ jal make_item_entity -/* 73140C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 731410 802A1110 0C03A830 */ jal add_coins -/* 731414 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 731418 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 73141C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 731420 802A1120 00000000 */ nop -.L802A1124: -/* 731424 802A1124 00101040 */ sll $v0, $s0, 1 -/* 731428 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 73142C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 731430 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 731434 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 731438 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 73143C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 731440 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 731444 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 731448 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 73144C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 731450 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 731454 802A1154 44050000 */ mfc1 $a1, $f0 -/* 731458 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 73145C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 731460 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 731464 802A1164 0C00B94E */ jal get_screen_coords -/* 731468 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 73146C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 731470 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 731474 802A1174 0C050529 */ jal create_icon -/* 731478 802A1178 00000000 */ nop -/* 73147C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 731480 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 731484 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 731488 802A1188 3C01802A */ lui $at, %hi(D_802A2DD0) -/* 73148C 802A118C AC242DD0 */ sw $a0, %lo(D_802A2DD0)($at) -/* 731490 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 731494 802A1194 0C051261 */ jal set_icon_render_pos -/* 731498 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 73149C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7314A0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7314A4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7314A8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7314AC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 7314B0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 7314B4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 7314B8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 7314BC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 7314C0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 7314C4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 7314C8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 7314CC 802A11CC 03E00008 */ jr $ra -/* 7314D0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A11D4_7314D4.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A11D4_7314D4.s deleted file mode 100644 index b24928173d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A11D4_7314D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_7314D4 -/* 7314D4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7314D8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 7314DC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7314E0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7314E4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7314E8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7314EC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7314F0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7314F4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7314F8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7314FC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 731500 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 731504 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 731508 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 73150C 802A120C 00000000 */ nop -/* 731510 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 731514 802A1214 00000000 */ nop -/* 731518 802A1218 3C04802A */ lui $a0, %hi(D_802A2DD0) -/* 73151C 802A121C 8C842DD0 */ lw $a0, %lo(D_802A2DD0)($a0) -/* 731520 802A1220 0C05123D */ jal free_icon -/* 731524 802A1224 00000000 */ nop -.L802A1228: -/* 731528 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 73152C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 731530 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 731534 802A1234 03E00008 */ jr $ra -/* 731538 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1818_731B18.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1818_731B18.s deleted file mode 100644 index eb707c90d2..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1818_731B18.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1818_731B18 -/* 731B18 802A1818 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 731B1C 802A181C AFB1001C */ sw $s1, 0x1c($sp) -/* 731B20 802A1820 0080882D */ daddu $s1, $a0, $zero -/* 731B24 802A1824 AFBF0028 */ sw $ra, 0x28($sp) -/* 731B28 802A1828 AFB30024 */ sw $s3, 0x24($sp) -/* 731B2C 802A182C AFB20020 */ sw $s2, 0x20($sp) -/* 731B30 802A1830 AFB00018 */ sw $s0, 0x18($sp) -/* 731B34 802A1834 8E30000C */ lw $s0, 0xc($s1) -/* 731B38 802A1838 8E050000 */ lw $a1, ($s0) -/* 731B3C 802A183C 0C0B1EAF */ jal get_variable -/* 731B40 802A1840 26100004 */ addiu $s0, $s0, 4 -/* 731B44 802A1844 8E050000 */ lw $a1, ($s0) -/* 731B48 802A1848 26100004 */ addiu $s0, $s0, 4 -/* 731B4C 802A184C 0220202D */ daddu $a0, $s1, $zero -/* 731B50 802A1850 0C0B1EAF */ jal get_variable -/* 731B54 802A1854 0040982D */ daddu $s3, $v0, $zero -/* 731B58 802A1858 8E050000 */ lw $a1, ($s0) -/* 731B5C 802A185C 26100004 */ addiu $s0, $s0, 4 -/* 731B60 802A1860 0220202D */ daddu $a0, $s1, $zero -/* 731B64 802A1864 0C0B1EAF */ jal get_variable -/* 731B68 802A1868 0040902D */ daddu $s2, $v0, $zero -/* 731B6C 802A186C 0220202D */ daddu $a0, $s1, $zero -/* 731B70 802A1870 8E050000 */ lw $a1, ($s0) -/* 731B74 802A1874 0C0B1EAF */ jal get_variable -/* 731B78 802A1878 0040802D */ daddu $s0, $v0, $zero -/* 731B7C 802A187C 44930000 */ mtc1 $s3, $f0 -/* 731B80 802A1880 00000000 */ nop -/* 731B84 802A1884 46800020 */ cvt.s.w $f0, $f0 -/* 731B88 802A1888 44050000 */ mfc1 $a1, $f0 -/* 731B8C 802A188C 44920000 */ mtc1 $s2, $f0 -/* 731B90 802A1890 00000000 */ nop -/* 731B94 802A1894 46800020 */ cvt.s.w $f0, $f0 -/* 731B98 802A1898 44060000 */ mfc1 $a2, $f0 -/* 731B9C 802A189C 44900000 */ mtc1 $s0, $f0 -/* 731BA0 802A18A0 00000000 */ nop -/* 731BA4 802A18A4 46800020 */ cvt.s.w $f0, $f0 -/* 731BA8 802A18A8 44070000 */ mfc1 $a3, $f0 -/* 731BAC 802A18AC 0000202D */ daddu $a0, $zero, $zero -/* 731BB0 802A18B0 0C01C424 */ jal func_80071090 -/* 731BB4 802A18B4 AFA20010 */ sw $v0, 0x10($sp) -/* 731BB8 802A18B8 8FBF0028 */ lw $ra, 0x28($sp) -/* 731BBC 802A18BC 8FB30024 */ lw $s3, 0x24($sp) -/* 731BC0 802A18C0 8FB20020 */ lw $s2, 0x20($sp) -/* 731BC4 802A18C4 8FB1001C */ lw $s1, 0x1c($sp) -/* 731BC8 802A18C8 8FB00018 */ lw $s0, 0x18($sp) -/* 731BCC 802A18CC 24020002 */ addiu $v0, $zero, 2 -/* 731BD0 802A18D0 03E00008 */ jr $ra -/* 731BD4 802A18D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A18D8_731BD8.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A18D8_731BD8.s deleted file mode 100644 index 352c2c3c98..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A18D8_731BD8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A18D8_731BD8 -/* 731BD8 802A18D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 731BDC 802A18DC AFB1001C */ sw $s1, 0x1c($sp) -/* 731BE0 802A18E0 0080882D */ daddu $s1, $a0, $zero -/* 731BE4 802A18E4 AFBF0028 */ sw $ra, 0x28($sp) -/* 731BE8 802A18E8 AFB30024 */ sw $s3, 0x24($sp) -/* 731BEC 802A18EC AFB20020 */ sw $s2, 0x20($sp) -/* 731BF0 802A18F0 AFB00018 */ sw $s0, 0x18($sp) -/* 731BF4 802A18F4 8E30000C */ lw $s0, 0xc($s1) -/* 731BF8 802A18F8 8E050000 */ lw $a1, ($s0) -/* 731BFC 802A18FC 0C0B1EAF */ jal get_variable -/* 731C00 802A1900 26100004 */ addiu $s0, $s0, 4 -/* 731C04 802A1904 8E050000 */ lw $a1, ($s0) -/* 731C08 802A1908 26100004 */ addiu $s0, $s0, 4 -/* 731C0C 802A190C 0220202D */ daddu $a0, $s1, $zero -/* 731C10 802A1910 0C0B1EAF */ jal get_variable -/* 731C14 802A1914 0040982D */ daddu $s3, $v0, $zero -/* 731C18 802A1918 8E050000 */ lw $a1, ($s0) -/* 731C1C 802A191C 26100004 */ addiu $s0, $s0, 4 -/* 731C20 802A1920 0220202D */ daddu $a0, $s1, $zero -/* 731C24 802A1924 0C0B1EAF */ jal get_variable -/* 731C28 802A1928 0040902D */ daddu $s2, $v0, $zero -/* 731C2C 802A192C 0220202D */ daddu $a0, $s1, $zero -/* 731C30 802A1930 8E050000 */ lw $a1, ($s0) -/* 731C34 802A1934 0C0B1EAF */ jal get_variable -/* 731C38 802A1938 0040802D */ daddu $s0, $v0, $zero -/* 731C3C 802A193C 44930000 */ mtc1 $s3, $f0 -/* 731C40 802A1940 00000000 */ nop -/* 731C44 802A1944 46800020 */ cvt.s.w $f0, $f0 -/* 731C48 802A1948 44050000 */ mfc1 $a1, $f0 -/* 731C4C 802A194C 44920000 */ mtc1 $s2, $f0 -/* 731C50 802A1950 00000000 */ nop -/* 731C54 802A1954 46800020 */ cvt.s.w $f0, $f0 -/* 731C58 802A1958 44060000 */ mfc1 $a2, $f0 -/* 731C5C 802A195C 44900000 */ mtc1 $s0, $f0 -/* 731C60 802A1960 00000000 */ nop -/* 731C64 802A1964 46800020 */ cvt.s.w $f0, $f0 -/* 731C68 802A1968 44070000 */ mfc1 $a3, $f0 -/* 731C6C 802A196C 24040001 */ addiu $a0, $zero, 1 -/* 731C70 802A1970 0C01C424 */ jal func_80071090 -/* 731C74 802A1974 AFA20010 */ sw $v0, 0x10($sp) -/* 731C78 802A1978 8FBF0028 */ lw $ra, 0x28($sp) -/* 731C7C 802A197C 8FB30024 */ lw $s3, 0x24($sp) -/* 731C80 802A1980 8FB20020 */ lw $s2, 0x20($sp) -/* 731C84 802A1984 8FB1001C */ lw $s1, 0x1c($sp) -/* 731C88 802A1988 8FB00018 */ lw $s0, 0x18($sp) -/* 731C8C 802A198C 24020002 */ addiu $v0, $zero, 2 -/* 731C90 802A1990 03E00008 */ jr $ra -/* 731C94 802A1994 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A40_731D40.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A40_731D40.s deleted file mode 100644 index 01c6b4b76b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A40_731D40.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1A40_731D40 -/* 731D40 802A1A40 3C058011 */ lui $a1, %hi(gPlayerData) -/* 731D44 802A1A44 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 731D48 802A1A48 90A20002 */ lbu $v0, 2($a1) -/* 731D4C 802A1A4C 3C068009 */ lui $a2, %hi(gItemTable+0x1A7B) -/* 731D50 802A1A50 90C6935B */ lbu $a2, %lo(gItemTable+0x1A7B)($a2) -/* 731D54 802A1A54 80A30003 */ lb $v1, 3($a1) -/* 731D58 802A1A58 00461021 */ addu $v0, $v0, $a2 -/* 731D5C 802A1A5C A0A20002 */ sb $v0, 2($a1) -/* 731D60 802A1A60 00021600 */ sll $v0, $v0, 0x18 -/* 731D64 802A1A64 00021603 */ sra $v0, $v0, 0x18 -/* 731D68 802A1A68 0062182A */ slt $v1, $v1, $v0 -/* 731D6C 802A1A6C 90A20003 */ lbu $v0, 3($a1) -/* 731D70 802A1A70 54600001 */ bnel $v1, $zero, .L802A1A78 -/* 731D74 802A1A74 A0A20002 */ sb $v0, 2($a1) -.L802A1A78: -/* 731D78 802A1A78 00061600 */ sll $v0, $a2, 0x18 -/* 731D7C 802A1A7C 00021603 */ sra $v0, $v0, 0x18 -/* 731D80 802A1A80 AC820090 */ sw $v0, 0x90($a0) -/* 731D84 802A1A84 03E00008 */ jr $ra -/* 731D88 802A1A88 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A8C_731D8C.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A8C_731D8C.s deleted file mode 100644 index a7b38f9cdd..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1A8C_731D8C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1A8C_731D8C -/* 731D8C 802A1A8C 3C058011 */ lui $a1, %hi(gPlayerData) -/* 731D90 802A1A90 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 731D94 802A1A94 90A20005 */ lbu $v0, 5($a1) -/* 731D98 802A1A98 3C068009 */ lui $a2, %hi(gItemTable+0x1A7C) -/* 731D9C 802A1A9C 90C6935C */ lbu $a2, %lo(gItemTable+0x1A7C)($a2) -/* 731DA0 802A1AA0 80A30006 */ lb $v1, 6($a1) -/* 731DA4 802A1AA4 00461021 */ addu $v0, $v0, $a2 -/* 731DA8 802A1AA8 A0A20005 */ sb $v0, 5($a1) -/* 731DAC 802A1AAC 00021600 */ sll $v0, $v0, 0x18 -/* 731DB0 802A1AB0 00021603 */ sra $v0, $v0, 0x18 -/* 731DB4 802A1AB4 0062182A */ slt $v1, $v1, $v0 -/* 731DB8 802A1AB8 90A20006 */ lbu $v0, 6($a1) -/* 731DBC 802A1ABC 54600001 */ bnel $v1, $zero, .L802A1AC4 -/* 731DC0 802A1AC0 A0A20005 */ sb $v0, 5($a1) -.L802A1AC4: -/* 731DC4 802A1AC4 00061600 */ sll $v0, $a2, 0x18 -/* 731DC8 802A1AC8 00021603 */ sra $v0, $v0, 0x18 -/* 731DCC 802A1ACC AC820090 */ sw $v0, 0x90($a0) -/* 731DD0 802A1AD0 03E00008 */ jr $ra -/* 731DD4 802A1AD4 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1AD8_731DD8.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1AD8_731DD8.s deleted file mode 100644 index 9b3fa277f9..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1AD8_731DD8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1AD8_731DD8 -/* 731DD8 802A1AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 731DDC 802A1ADC 2405000B */ addiu $a1, $zero, 0xb -/* 731DE0 802A1AE0 AFB00010 */ sw $s0, 0x10($sp) -/* 731DE4 802A1AE4 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 731DE8 802A1AE8 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 731DEC 802A1AEC 24060003 */ addiu $a2, $zero, 3 -/* 731DF0 802A1AF0 AFBF0014 */ sw $ra, 0x14($sp) -/* 731DF4 802A1AF4 0C0997D0 */ jal inflict_status -/* 731DF8 802A1AF8 0200202D */ daddu $a0, $s0, $zero -/* 731DFC 802A1AFC A200021C */ sb $zero, 0x21c($s0) -/* 731E00 802A1B00 8FBF0014 */ lw $ra, 0x14($sp) -/* 731E04 802A1B04 8FB00010 */ lw $s0, 0x10($sp) -/* 731E08 802A1B08 24020002 */ addiu $v0, $zero, 2 -/* 731E0C 802A1B0C 03E00008 */ jr $ra -/* 731E10 802A1B10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B14_731E14.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B14_731E14.s deleted file mode 100644 index 1441f1c2ee..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B14_731E14.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1B14_731E14 -/* 731E14 802A1B14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 731E18 802A1B18 2405000E */ addiu $a1, $zero, 0xe -/* 731E1C 802A1B1C AFB00010 */ sw $s0, 0x10($sp) -/* 731E20 802A1B20 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 731E24 802A1B24 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 731E28 802A1B28 24060003 */ addiu $a2, $zero, 3 -/* 731E2C 802A1B2C AFBF0018 */ sw $ra, 0x18($sp) -/* 731E30 802A1B30 AFB10014 */ sw $s1, 0x14($sp) -/* 731E34 802A1B34 8E1101F4 */ lw $s1, 0x1f4($s0) -/* 731E38 802A1B38 0C0997D0 */ jal inflict_status -/* 731E3C 802A1B3C 0200202D */ daddu $a0, $s0, $zero -/* 731E40 802A1B40 A200021C */ sb $zero, 0x21c($s0) -/* 731E44 802A1B44 8E230000 */ lw $v1, ($s1) -/* 731E48 802A1B48 34630100 */ ori $v1, $v1, 0x100 -/* 731E4C 802A1B4C AE230000 */ sw $v1, ($s1) -/* 731E50 802A1B50 8FBF0018 */ lw $ra, 0x18($sp) -/* 731E54 802A1B54 8FB10014 */ lw $s1, 0x14($sp) -/* 731E58 802A1B58 8FB00010 */ lw $s0, 0x10($sp) -/* 731E5C 802A1B5C 24020002 */ addiu $v0, $zero, 2 -/* 731E60 802A1B60 03E00008 */ jr $ra -/* 731E64 802A1B64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B68_731E68.s b/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B68_731E68.s deleted file mode 100644 index 96dd961e01..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake_731300/func_802A1B68_731E68.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1B68_731E68 -/* 731E68 802A1B68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 731E6C 802A1B6C 24050006 */ addiu $a1, $zero, 6 -/* 731E70 802A1B70 AFB00010 */ sw $s0, 0x10($sp) -/* 731E74 802A1B74 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 731E78 802A1B78 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 731E7C 802A1B7C 24060003 */ addiu $a2, $zero, 3 -/* 731E80 802A1B80 AFBF0014 */ sw $ra, 0x14($sp) -/* 731E84 802A1B84 0C0997D0 */ jal inflict_status -/* 731E88 802A1B88 0200202D */ daddu $a0, $s0, $zero -/* 731E8C 802A1B8C A200021C */ sb $zero, 0x21c($s0) -/* 731E90 802A1B90 8FBF0014 */ lw $ra, 0x14($sp) -/* 731E94 802A1B94 8FB00010 */ lw $s0, 0x10($sp) -/* 731E98 802A1B98 24020002 */ addiu $v0, $zero, 2 -/* 731E9C 802A1B9C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1000_724CE0.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1000_724CE0.s deleted file mode 100644 index 28aa9603c2..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1000_724CE0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_724CE0 -/* 724CE0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 724CE4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 724CE8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 724CEC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 724CF0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 724CF4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 724CF8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 724CFC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 724D00 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 724D04 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 724D08 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 724D0C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 724D10 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 724D14 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 724D18 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 724D1C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 724D20 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 724D24 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 724D28 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 724D2C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 724D30 802A1050 00021140 */ sll $v0, $v0, 5 -/* 724D34 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 724D38 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 724D3C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 724D40 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 724D44 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 724D48 802A1068 44820000 */ mtc1 $v0, $f0 -/* 724D4C 802A106C 00000000 */ nop -/* 724D50 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 724D54 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 724D58 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 724D5C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 724D60 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 724D64 802A1084 1A400045 */ blez $s2, .L802A119C -/* 724D68 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 724D6C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 724D70 802A1090 00121880 */ sll $v1, $s2, 2 -/* 724D74 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 724D78 802A1098 00031100 */ sll $v0, $v1, 4 -/* 724D7C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 724D80 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 724D84 802A10A4 00440018 */ mult $v0, $a0 -/* 724D88 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 724D8C 802A10AC 00004010 */ mfhi $t0 -/* 724D90 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 724D94 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 724D98 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 724D9C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 724DA0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 724DA4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 724DA8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 724DAC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 724DB0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 724DB4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724DB8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 724DBC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 724DC0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 724DC4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 724DC8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 724DCC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 724DD0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 724DD4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 724DD8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 724DDC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 724DE0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 724DE4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 724DE8 802A1108 0C04C4FD */ jal make_item_entity -/* 724DEC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 724DF0 802A1110 0C03A830 */ jal add_coins -/* 724DF4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 724DF8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 724DFC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 724E00 802A1120 00000000 */ nop -.L802A1124: -/* 724E04 802A1124 00101040 */ sll $v0, $s0, 1 -/* 724E08 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 724E0C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 724E10 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724E14 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 724E18 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 724E1C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 724E20 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 724E24 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 724E28 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 724E2C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 724E30 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 724E34 802A1154 44050000 */ mfc1 $a1, $f0 -/* 724E38 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 724E3C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 724E40 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 724E44 802A1164 0C00B94E */ jal get_screen_coords -/* 724E48 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 724E4C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 724E50 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 724E54 802A1174 0C050529 */ jal create_icon -/* 724E58 802A1178 00000000 */ nop -/* 724E5C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 724E60 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 724E64 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 724E68 802A1188 3C01802A */ lui $at, %hi(D_802A2280) -/* 724E6C 802A118C AC242280 */ sw $a0, %lo(D_802A2280)($at) -/* 724E70 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 724E74 802A1194 0C051261 */ jal set_icon_render_pos -/* 724E78 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 724E7C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 724E80 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 724E84 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 724E88 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 724E8C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 724E90 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 724E94 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 724E98 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 724E9C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 724EA0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 724EA4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 724EA8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 724EAC 802A11CC 03E00008 */ jr $ra -/* 724EB0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A11D4_724EB4.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A11D4_724EB4.s deleted file mode 100644 index 81033fdbd5..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A11D4_724EB4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_724EB4 -/* 724EB4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 724EB8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 724EBC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 724EC0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 724EC4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 724EC8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 724ECC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 724ED0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 724ED4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 724ED8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 724EDC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 724EE0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 724EE4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 724EE8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 724EEC 802A120C 00000000 */ nop -/* 724EF0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 724EF4 802A1214 00000000 */ nop -/* 724EF8 802A1218 3C04802A */ lui $a0, %hi(D_802A2280) -/* 724EFC 802A121C 8C842280 */ lw $a0, %lo(D_802A2280)($a0) -/* 724F00 802A1220 0C05123D */ jal free_icon -/* 724F04 802A1224 00000000 */ nop -.L802A1228: -/* 724F08 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 724F0C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 724F10 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 724F14 802A1234 03E00008 */ jr $ra -/* 724F18 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A123C_724F1C.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A123C_724F1C.s deleted file mode 100644 index bc9b427a74..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A123C_724F1C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_724F1C -/* 724F1C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 724F20 802A1240 AFB10014 */ sw $s1, 0x14($sp) -/* 724F24 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 724F28 802A1248 AFBF0020 */ sw $ra, 0x20($sp) -/* 724F2C 802A124C AFB3001C */ sw $s3, 0x1c($sp) -/* 724F30 802A1250 AFB20018 */ sw $s2, 0x18($sp) -/* 724F34 802A1254 AFB00010 */ sw $s0, 0x10($sp) -/* 724F38 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 724F3C 802A125C 8E050000 */ lw $a1, ($s0) -/* 724F40 802A1260 0C0B1EAF */ jal get_variable -/* 724F44 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 724F48 802A1268 8E050000 */ lw $a1, ($s0) -/* 724F4C 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 724F50 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 724F54 802A1274 0C0B1EAF */ jal get_variable -/* 724F58 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 724F5C 802A127C 0220202D */ daddu $a0, $s1, $zero -/* 724F60 802A1280 8E050000 */ lw $a1, ($s0) -/* 724F64 802A1284 0C0B1EAF */ jal get_variable -/* 724F68 802A1288 0040902D */ daddu $s2, $v0, $zero -/* 724F6C 802A128C 8E2400BC */ lw $a0, 0xbc($s1) -/* 724F70 802A1290 0C04C3D6 */ jal get_item_entity -/* 724F74 802A1294 0040802D */ daddu $s0, $v0, $zero -/* 724F78 802A1298 0040182D */ daddu $v1, $v0, $zero -/* 724F7C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 724F80 802A12A0 00000000 */ nop -/* 724F84 802A12A4 46800020 */ cvt.s.w $f0, $f0 -/* 724F88 802A12A8 E4600008 */ swc1 $f0, 8($v1) -/* 724F8C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 724F90 802A12B0 00000000 */ nop -/* 724F94 802A12B4 46800020 */ cvt.s.w $f0, $f0 -/* 724F98 802A12B8 E460000C */ swc1 $f0, 0xc($v1) -/* 724F9C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 724FA0 802A12C0 00000000 */ nop -/* 724FA4 802A12C4 46800020 */ cvt.s.w $f0, $f0 -/* 724FA8 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) -/* 724FAC 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) -/* 724FB0 802A12D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 724FB4 802A12D4 8FB20018 */ lw $s2, 0x18($sp) -/* 724FB8 802A12D8 8FB10014 */ lw $s1, 0x14($sp) -/* 724FBC 802A12DC 8FB00010 */ lw $s0, 0x10($sp) -/* 724FC0 802A12E0 24020002 */ addiu $v0, $zero, 2 -/* 724FC4 802A12E4 03E00008 */ jr $ra -/* 724FC8 802A12E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A12EC_724FCC.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A12EC_724FCC.s deleted file mode 100644 index 63bbdbcd4d..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A12EC_724FCC.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12EC_724FCC -/* 724FCC 802A12EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 724FD0 802A12F0 AFB00010 */ sw $s0, 0x10($sp) -/* 724FD4 802A12F4 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) -/* 724FD8 802A12F8 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) -/* 724FDC 802A12FC AFBF0014 */ sw $ra, 0x14($sp) -/* 724FE0 802A1300 82020217 */ lb $v0, 0x217($s0) -/* 724FE4 802A1304 8C85000C */ lw $a1, 0xc($a0) -/* 724FE8 802A1308 10400017 */ beqz $v0, .L802A1368 -/* 724FEC 802A130C 24020002 */ addiu $v0, $zero, 2 -/* 724FF0 802A1310 8CA50000 */ lw $a1, ($a1) -/* 724FF4 802A1314 0C0B1EAF */ jal get_variable -/* 724FF8 802A1318 00000000 */ nop -/* 724FFC 802A131C 92030217 */ lbu $v1, 0x217($s0) -/* 725000 802A1320 00621823 */ subu $v1, $v1, $v0 -/* 725004 802A1324 A2030217 */ sb $v1, 0x217($s0) -/* 725008 802A1328 00031E00 */ sll $v1, $v1, 0x18 -/* 72500C 802A132C 04620001 */ bltzl $v1, .L802A1334 -/* 725010 802A1330 A2000217 */ sb $zero, 0x217($s0) -.L802A1334: -/* 725014 802A1334 82030217 */ lb $v1, 0x217($s0) -/* 725018 802A1338 18600005 */ blez $v1, .L802A1350 -/* 72501C 802A133C 24040034 */ addiu $a0, $zero, 0x34 -/* 725020 802A1340 8E020440 */ lw $v0, 0x440($s0) -/* 725024 802A1344 8C42000C */ lw $v0, 0xc($v0) -/* 725028 802A1348 080A84D9 */ j .L802A1364 -/* 72502C 802A134C AC43003C */ sw $v1, 0x3c($v0) -.L802A1350: -/* 725030 802A1350 0C09F7A0 */ jal dispatch_event_partner -/* 725034 802A1354 A2000216 */ sb $zero, 0x216($s0) -/* 725038 802A1358 8E020440 */ lw $v0, 0x440($s0) -/* 72503C 802A135C 8C42000C */ lw $v0, 0xc($v0) -/* 725040 802A1360 AC40003C */ sw $zero, 0x3c($v0) -.L802A1364: -/* 725044 802A1364 24020002 */ addiu $v0, $zero, 2 -.L802A1368: -/* 725048 802A1368 8FBF0014 */ lw $ra, 0x14($sp) -/* 72504C 802A136C 8FB00010 */ lw $s0, 0x10($sp) -/* 725050 802A1370 03E00008 */ jr $ra -/* 725054 802A1374 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1378_725058.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1378_725058.s deleted file mode 100644 index 511e8ebccd..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1378_725058.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1378_725058 -/* 725058 802A1378 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 72505C 802A137C AFBF0018 */ sw $ra, 0x18($sp) -/* 725060 802A1380 AFB10014 */ sw $s1, 0x14($sp) -/* 725064 802A1384 AFB00010 */ sw $s0, 0x10($sp) -/* 725068 802A1388 8C82000C */ lw $v0, 0xc($a0) -/* 72506C 802A138C 0C0B1EAF */ jal get_variable -/* 725070 802A1390 8C450000 */ lw $a1, ($v0) -/* 725074 802A1394 0C09A75B */ jal get_actor -/* 725078 802A1398 0040202D */ daddu $a0, $v0, $zero -/* 72507C 802A139C 0040802D */ daddu $s0, $v0, $zero -/* 725080 802A13A0 96020192 */ lhu $v0, 0x192($s0) -/* 725084 802A13A4 82030210 */ lb $v1, 0x210($s0) -/* 725088 802A13A8 10600005 */ beqz $v1, .L802A13C0 -/* 72508C 802A13AC 30510700 */ andi $s1, $v0, 0x700 -/* 725090 802A13B0 86040436 */ lh $a0, 0x436($s0) -/* 725094 802A13B4 A2000211 */ sb $zero, 0x211($s0) -/* 725098 802A13B8 0C011E26 */ jal func_80047898 -/* 72509C 802A13BC A2000210 */ sb $zero, 0x210($s0) -.L802A13C0: -/* 7250A0 802A13C0 82020216 */ lb $v0, 0x216($s0) -/* 7250A4 802A13C4 1040000C */ beqz $v0, .L802A13F8 -/* 7250A8 802A13C8 00000000 */ nop -/* 7250AC 802A13CC A2000217 */ sb $zero, 0x217($s0) -/* 7250B0 802A13D0 12200006 */ beqz $s1, .L802A13EC -/* 7250B4 802A13D4 A2000216 */ sb $zero, 0x216($s0) -/* 7250B8 802A13D8 24020100 */ addiu $v0, $zero, 0x100 -/* 7250BC 802A13DC 16220003 */ bne $s1, $v0, .L802A13EC -/* 7250C0 802A13E0 00000000 */ nop -/* 7250C4 802A13E4 0C09F7A0 */ jal dispatch_event_partner -/* 7250C8 802A13E8 24040031 */ addiu $a0, $zero, 0x31 -.L802A13EC: -/* 7250CC 802A13EC 8E020440 */ lw $v0, 0x440($s0) -/* 7250D0 802A13F0 8C42000C */ lw $v0, 0xc($v0) -/* 7250D4 802A13F4 AC40003C */ sw $zero, 0x3c($v0) -.L802A13F8: -/* 7250D8 802A13F8 0C099DDF */ jal func_8026777C -/* 7250DC 802A13FC 00000000 */ nop -/* 7250E0 802A1400 8FBF0018 */ lw $ra, 0x18($sp) -/* 7250E4 802A1404 8FB10014 */ lw $s1, 0x14($sp) -/* 7250E8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7250EC 802A140C 24020002 */ addiu $v0, $zero, 2 -/* 7250F0 802A1410 03E00008 */ jr $ra -/* 7250F4 802A1414 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1418_7250F8.s b/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1418_7250F8.s deleted file mode 100644 index a2011bd42b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/super_soda_724CE0/func_802A1418_7250F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1418_7250F8 -/* 7250F8 802A1418 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7250FC 802A141C AFB1001C */ sw $s1, 0x1c($sp) -/* 725100 802A1420 0080882D */ daddu $s1, $a0, $zero -/* 725104 802A1424 AFBF0028 */ sw $ra, 0x28($sp) -/* 725108 802A1428 AFB30024 */ sw $s3, 0x24($sp) -/* 72510C 802A142C AFB20020 */ sw $s2, 0x20($sp) -/* 725110 802A1430 AFB00018 */ sw $s0, 0x18($sp) -/* 725114 802A1434 8E30000C */ lw $s0, 0xc($s1) -/* 725118 802A1438 8E050000 */ lw $a1, ($s0) -/* 72511C 802A143C 0C0B1EAF */ jal get_variable -/* 725120 802A1440 26100004 */ addiu $s0, $s0, 4 -/* 725124 802A1444 8E050000 */ lw $a1, ($s0) -/* 725128 802A1448 26100004 */ addiu $s0, $s0, 4 -/* 72512C 802A144C 0220202D */ daddu $a0, $s1, $zero -/* 725130 802A1450 0C0B1EAF */ jal get_variable -/* 725134 802A1454 0040982D */ daddu $s3, $v0, $zero -/* 725138 802A1458 8E050000 */ lw $a1, ($s0) -/* 72513C 802A145C 26100004 */ addiu $s0, $s0, 4 -/* 725140 802A1460 0220202D */ daddu $a0, $s1, $zero -/* 725144 802A1464 0C0B1EAF */ jal get_variable -/* 725148 802A1468 0040902D */ daddu $s2, $v0, $zero -/* 72514C 802A146C 0220202D */ daddu $a0, $s1, $zero -/* 725150 802A1470 8E050000 */ lw $a1, ($s0) -/* 725154 802A1474 0C0B1EAF */ jal get_variable -/* 725158 802A1478 0040802D */ daddu $s0, $v0, $zero -/* 72515C 802A147C 44930000 */ mtc1 $s3, $f0 -/* 725160 802A1480 00000000 */ nop -/* 725164 802A1484 46800020 */ cvt.s.w $f0, $f0 -/* 725168 802A1488 44050000 */ mfc1 $a1, $f0 -/* 72516C 802A148C 44920000 */ mtc1 $s2, $f0 -/* 725170 802A1490 00000000 */ nop -/* 725174 802A1494 46800020 */ cvt.s.w $f0, $f0 -/* 725178 802A1498 44060000 */ mfc1 $a2, $f0 -/* 72517C 802A149C 44900000 */ mtc1 $s0, $f0 -/* 725180 802A14A0 00000000 */ nop -/* 725184 802A14A4 46800020 */ cvt.s.w $f0, $f0 -/* 725188 802A14A8 44070000 */ mfc1 $a3, $f0 -/* 72518C 802A14AC 24040001 */ addiu $a0, $zero, 1 -/* 725190 802A14B0 0C01C424 */ jal func_80071090 -/* 725194 802A14B4 AFA20010 */ sw $v0, 0x10($sp) -/* 725198 802A14B8 8FBF0028 */ lw $ra, 0x28($sp) -/* 72519C 802A14BC 8FB30024 */ lw $s3, 0x24($sp) -/* 7251A0 802A14C0 8FB20020 */ lw $s2, 0x20($sp) -/* 7251A4 802A14C4 8FB1001C */ lw $s1, 0x1c($sp) -/* 7251A8 802A14C8 8FB00018 */ lw $s0, 0x18($sp) -/* 7251AC 802A14CC 24020002 */ addiu $v0, $zero, 2 -/* 7251B0 802A14D0 03E00008 */ jr $ra -/* 7251B4 802A14D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A1000_722000.s b/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A1000_722000.s deleted file mode 100644 index a5c15e33f3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A1000_722000.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_722000 -/* 722000 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 722004 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 722008 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72200C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 722010 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 722014 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 722018 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72201C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 722020 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 722024 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 722028 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72202C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 722030 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 722034 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 722038 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72203C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 722040 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 722044 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 722048 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72204C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 722050 802A1050 00021140 */ sll $v0, $v0, 5 -/* 722054 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 722058 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72205C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 722060 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 722064 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 722068 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72206C 802A106C 00000000 */ nop -/* 722070 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 722074 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 722078 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 72207C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 722080 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 722084 802A1084 1A400045 */ blez $s2, .L802A119C -/* 722088 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72208C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 722090 802A1090 00121880 */ sll $v1, $s2, 2 -/* 722094 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 722098 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72209C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7220A0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7220A4 802A10A4 00440018 */ mult $v0, $a0 -/* 7220A8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7220AC 802A10AC 00004010 */ mfhi $t0 -/* 7220B0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 7220B4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 7220B8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 7220BC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 7220C0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 7220C4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 7220C8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 7220CC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 7220D0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 7220D4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7220D8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7220DC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 7220E0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7220E4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 7220E8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 7220EC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 7220F0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 7220F4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 7220F8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 7220FC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 722100 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 722104 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 722108 802A1108 0C04C4FD */ jal make_item_entity -/* 72210C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 722110 802A1110 0C03A830 */ jal add_coins -/* 722114 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 722118 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72211C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 722120 802A1120 00000000 */ nop -.L802A1124: -/* 722124 802A1124 00101040 */ sll $v0, $s0, 1 -/* 722128 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72212C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 722130 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 722134 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 722138 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72213C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 722140 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 722144 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 722148 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72214C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 722150 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 722154 802A1154 44050000 */ mfc1 $a1, $f0 -/* 722158 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72215C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 722160 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 722164 802A1164 0C00B94E */ jal get_screen_coords -/* 722168 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 72216C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 722170 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 722174 802A1174 0C050529 */ jal create_icon -/* 722178 802A1178 00000000 */ nop -/* 72217C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 722180 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 722184 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 722188 802A1188 3C01802A */ lui $at, %hi(D_802A1B40) -/* 72218C 802A118C AC241B40 */ sw $a0, %lo(D_802A1B40)($at) -/* 722190 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 722194 802A1194 0C051261 */ jal set_icon_render_pos -/* 722198 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72219C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7221A0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7221A4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7221A8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7221AC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 7221B0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 7221B4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 7221B8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 7221BC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 7221C0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 7221C4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 7221C8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 7221CC 802A11CC 03E00008 */ jr $ra -/* 7221D0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A11D4_7221D4.s b/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A11D4_7221D4.s deleted file mode 100644 index 7beb1dce15..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A11D4_7221D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_7221D4 -/* 7221D4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7221D8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 7221DC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 7221E0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 7221E4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7221E8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 7221EC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 7221F0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 7221F4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 7221F8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 7221FC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 722200 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 722204 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 722208 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72220C 802A120C 00000000 */ nop -/* 722210 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 722214 802A1214 00000000 */ nop -/* 722218 802A1218 3C04802A */ lui $a0, %hi(D_802A1B40) -/* 72221C 802A121C 8C841B40 */ lw $a0, %lo(D_802A1B40)($a0) -/* 722220 802A1220 0C05123D */ jal free_icon -/* 722224 802A1224 00000000 */ nop -.L802A1228: -/* 722228 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72222C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 722230 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 722234 802A1234 03E00008 */ jr $ra -/* 722238 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A123C_72223C.s b/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A123C_72223C.s deleted file mode 100644 index ebbe7fac6c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/tasty_tonic_722000/func_802A123C_72223C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72223C -/* 72223C 802A123C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 722240 802A1240 AFBF0018 */ sw $ra, 0x18($sp) -/* 722244 802A1244 AFB10014 */ sw $s1, 0x14($sp) -/* 722248 802A1248 AFB00010 */ sw $s0, 0x10($sp) -/* 72224C 802A124C 8C82000C */ lw $v0, 0xc($a0) -/* 722250 802A1250 0C0B1EAF */ jal get_variable -/* 722254 802A1254 8C450000 */ lw $a1, ($v0) -/* 722258 802A1258 0C09A75B */ jal get_actor -/* 72225C 802A125C 0040202D */ daddu $a0, $v0, $zero -/* 722260 802A1260 0040802D */ daddu $s0, $v0, $zero -/* 722264 802A1264 96020192 */ lhu $v0, 0x192($s0) -/* 722268 802A1268 82030210 */ lb $v1, 0x210($s0) -/* 72226C 802A126C 10600005 */ beqz $v1, .L802A1284 -/* 722270 802A1270 30510700 */ andi $s1, $v0, 0x700 -/* 722274 802A1274 86040436 */ lh $a0, 0x436($s0) -/* 722278 802A1278 A2000211 */ sb $zero, 0x211($s0) -/* 72227C 802A127C 0C011E26 */ jal func_80047898 -/* 722280 802A1280 A2000210 */ sb $zero, 0x210($s0) -.L802A1284: -/* 722284 802A1284 82020216 */ lb $v0, 0x216($s0) -/* 722288 802A1288 1040000C */ beqz $v0, .L802A12BC -/* 72228C 802A128C 00000000 */ nop -/* 722290 802A1290 A2000217 */ sb $zero, 0x217($s0) -/* 722294 802A1294 12200006 */ beqz $s1, .L802A12B0 -/* 722298 802A1298 A2000216 */ sb $zero, 0x216($s0) -/* 72229C 802A129C 24020100 */ addiu $v0, $zero, 0x100 -/* 7222A0 802A12A0 16220003 */ bne $s1, $v0, .L802A12B0 -/* 7222A4 802A12A4 00000000 */ nop -/* 7222A8 802A12A8 0C09F7A0 */ jal dispatch_event_partner -/* 7222AC 802A12AC 24040031 */ addiu $a0, $zero, 0x31 -.L802A12B0: -/* 7222B0 802A12B0 8E020440 */ lw $v0, 0x440($s0) -/* 7222B4 802A12B4 8C42000C */ lw $v0, 0xc($v0) -/* 7222B8 802A12B8 AC40003C */ sw $zero, 0x3c($v0) -.L802A12BC: -/* 7222BC 802A12BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 7222C0 802A12C0 8FB10014 */ lw $s1, 0x14($sp) -/* 7222C4 802A12C4 8FB00010 */ lw $s0, 0x10($sp) -/* 7222C8 802A12C8 24020002 */ addiu $v0, $zero, 2 -/* 7222CC 802A12CC 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1000_722B40.s b/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1000_722B40.s deleted file mode 100644 index cc90b937a8..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1000_722B40.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_722B40 -/* 722B40 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 722B44 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 722B48 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 722B4C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 722B50 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 722B54 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 722B58 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 722B5C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 722B60 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 722B64 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 722B68 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 722B6C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 722B70 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 722B74 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 722B78 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 722B7C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 722B80 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 722B84 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 722B88 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 722B8C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 722B90 802A1050 00021140 */ sll $v0, $v0, 5 -/* 722B94 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 722B98 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 722B9C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 722BA0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 722BA4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 722BA8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 722BAC 802A106C 00000000 */ nop -/* 722BB0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 722BB4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 722BB8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 722BBC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 722BC0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 722BC4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 722BC8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 722BCC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 722BD0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 722BD4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 722BD8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 722BDC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 722BE0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 722BE4 802A10A4 00440018 */ mult $v0, $a0 -/* 722BE8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 722BEC 802A10AC 00004010 */ mfhi $t0 -/* 722BF0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 722BF4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 722BF8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 722BFC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 722C00 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 722C04 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 722C08 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 722C0C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 722C10 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 722C14 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 722C18 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 722C1C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 722C20 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 722C24 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 722C28 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 722C2C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 722C30 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 722C34 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 722C38 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 722C3C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 722C40 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 722C44 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 722C48 802A1108 0C04C4FD */ jal make_item_entity -/* 722C4C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 722C50 802A1110 0C03A830 */ jal add_coins -/* 722C54 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 722C58 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 722C5C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 722C60 802A1120 00000000 */ nop -.L802A1124: -/* 722C64 802A1124 00101040 */ sll $v0, $s0, 1 -/* 722C68 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 722C6C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 722C70 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 722C74 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 722C78 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 722C7C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 722C80 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 722C84 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 722C88 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 722C8C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 722C90 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 722C94 802A1154 44050000 */ mfc1 $a1, $f0 -/* 722C98 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 722C9C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 722CA0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 722CA4 802A1164 0C00B94E */ jal get_screen_coords -/* 722CA8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 722CAC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 722CB0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 722CB4 802A1174 0C050529 */ jal create_icon -/* 722CB8 802A1178 00000000 */ nop -/* 722CBC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 722CC0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 722CC4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 722CC8 802A1188 3C01802A */ lui $at, %hi(D_802A1C40) -/* 722CCC 802A118C AC241C40 */ sw $a0, %lo(D_802A1C40)($at) -/* 722CD0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 722CD4 802A1194 0C051261 */ jal set_icon_render_pos -/* 722CD8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 722CDC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 722CE0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 722CE4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 722CE8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 722CEC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 722CF0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 722CF4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 722CF8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 722CFC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 722D00 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 722D04 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 722D08 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 722D0C 802A11CC 03E00008 */ jr $ra -/* 722D10 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A11D4_722D14.s b/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A11D4_722D14.s deleted file mode 100644 index b3e6542173..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A11D4_722D14.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_722D14 -/* 722D14 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 722D18 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 722D1C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 722D20 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 722D24 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 722D28 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 722D2C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 722D30 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 722D34 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 722D38 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 722D3C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 722D40 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 722D44 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 722D48 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 722D4C 802A120C 00000000 */ nop -/* 722D50 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 722D54 802A1214 00000000 */ nop -/* 722D58 802A1218 3C04802A */ lui $a0, %hi(D_802A1C40) -/* 722D5C 802A121C 8C841C40 */ lw $a0, %lo(D_802A1C40)($a0) -/* 722D60 802A1220 0C05123D */ jal free_icon -/* 722D64 802A1224 00000000 */ nop -.L802A1228: -/* 722D68 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 722D6C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 722D70 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 722D74 802A1234 03E00008 */ jr $ra -/* 722D78 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A123C_722D7C.s b/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A123C_722D7C.s deleted file mode 100644 index 85c4a5820c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A123C_722D7C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_722D7C -/* 722D7C 802A123C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 722D80 802A1240 AFBF0024 */ sw $ra, 0x24($sp) -/* 722D84 802A1244 AFB20020 */ sw $s2, 0x20($sp) -/* 722D88 802A1248 AFB1001C */ sw $s1, 0x1c($sp) -/* 722D8C 802A124C AFB00018 */ sw $s0, 0x18($sp) -/* 722D90 802A1250 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 722D94 802A1254 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 722D98 802A1258 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 722D9C 802A125C 0C09A75B */ jal get_actor -/* 722DA0 802A1260 8C840148 */ lw $a0, 0x148($a0) -/* 722DA4 802A1264 0C09A75B */ jal get_actor -/* 722DA8 802A1268 84440428 */ lh $a0, 0x428($v0) -/* 722DAC 802A126C 0040802D */ daddu $s0, $v0, $zero -/* 722DB0 802A1270 1200003C */ beqz $s0, .L802A1364 -/* 722DB4 802A1274 24020002 */ addiu $v0, $zero, 2 -/* 722DB8 802A1278 0C05272D */ jal play_sound -/* 722DBC 802A127C 24040366 */ addiu $a0, $zero, 0x366 -/* 722DC0 802A1280 3C03CCCC */ lui $v1, 0xcccc -/* 722DC4 802A1284 3463CCCD */ ori $v1, $v1, 0xcccd -/* 722DC8 802A1288 92040191 */ lbu $a0, 0x191($s0) -/* 722DCC 802A128C 92020190 */ lbu $v0, 0x190($s0) -/* 722DD0 802A1290 00830019 */ multu $a0, $v1 -/* 722DD4 802A1294 C6000188 */ lwc1 $f0, 0x188($s0) -/* 722DD8 802A1298 00021882 */ srl $v1, $v0, 2 -/* 722DDC 802A129C 00431021 */ addu $v0, $v0, $v1 -/* 722DE0 802A12A0 44823000 */ mtc1 $v0, $f6 -/* 722DE4 802A12A4 00000000 */ nop -/* 722DE8 802A12A8 468031A0 */ cvt.s.w $f6, $f6 -/* 722DEC 802A12AC 46003182 */ mul.s $f6, $f6, $f0 -/* 722DF0 802A12B0 00000000 */ nop -/* 722DF4 802A12B4 2482FFFE */ addiu $v0, $a0, -2 -/* 722DF8 802A12B8 44822000 */ mtc1 $v0, $f4 -/* 722DFC 802A12BC 00000000 */ nop -/* 722E00 802A12C0 46802120 */ cvt.s.w $f4, $f4 -/* 722E04 802A12C4 46002102 */ mul.s $f4, $f4, $f0 -/* 722E08 802A12C8 00000000 */ nop -/* 722E0C 802A12CC C6020148 */ lwc1 $f2, 0x148($s0) -/* 722E10 802A12D0 C6160144 */ lwc1 $f22, 0x144($s0) -/* 722E14 802A12D4 C618014C */ lwc1 $f24, 0x14c($s0) -/* 722E18 802A12D8 00004010 */ mfhi $t0 -/* 722E1C 802A12DC 000810C2 */ srl $v0, $t0, 3 -/* 722E20 802A12E0 304200FF */ andi $v0, $v0, 0xff -/* 722E24 802A12E4 44820000 */ mtc1 $v0, $f0 -/* 722E28 802A12E8 00000000 */ nop -/* 722E2C 802A12EC 46800020 */ cvt.s.w $f0, $f0 -/* 722E30 802A12F0 4600320D */ trunc.w.s $f8, $f6 -/* 722E34 802A12F4 44114000 */ mfc1 $s1, $f8 -/* 722E38 802A12F8 4600220D */ trunc.w.s $f8, $f4 -/* 722E3C 802A12FC 44124000 */ mfc1 $s2, $f8 -/* 722E40 802A1300 8E020000 */ lw $v0, ($s0) -/* 722E44 802A1304 30428000 */ andi $v0, $v0, 0x8000 -/* 722E48 802A1308 10400006 */ beqz $v0, .L802A1324 -/* 722E4C 802A130C 46001500 */ add.s $f20, $f2, $f0 -/* 722E50 802A1310 00041042 */ srl $v0, $a0, 1 -/* 722E54 802A1314 44820000 */ mtc1 $v0, $f0 -/* 722E58 802A1318 00000000 */ nop -/* 722E5C 802A131C 46800020 */ cvt.s.w $f0, $f0 -/* 722E60 802A1320 4600A501 */ sub.s $f20, $f20, $f0 -.L802A1324: -/* 722E64 802A1324 0C00A67F */ jal rand_int -/* 722E68 802A1328 24040002 */ addiu $a0, $zero, 2 -/* 722E6C 802A132C 24440003 */ addiu $a0, $v0, 3 -/* 722E70 802A1330 4405B000 */ mfc1 $a1, $f22 -/* 722E74 802A1334 4406A000 */ mfc1 $a2, $f20 -/* 722E78 802A1338 4407C000 */ mfc1 $a3, $f24 -/* 722E7C 802A133C 44910000 */ mtc1 $s1, $f0 -/* 722E80 802A1340 00000000 */ nop -/* 722E84 802A1344 46800020 */ cvt.s.w $f0, $f0 -/* 722E88 802A1348 E7A00010 */ swc1 $f0, 0x10($sp) -/* 722E8C 802A134C 44920000 */ mtc1 $s2, $f0 -/* 722E90 802A1350 00000000 */ nop -/* 722E94 802A1354 46800020 */ cvt.s.w $f0, $f0 -/* 722E98 802A1358 0C01C334 */ jal func_80070CD0 -/* 722E9C 802A135C E7A00014 */ swc1 $f0, 0x14($sp) -/* 722EA0 802A1360 24020002 */ addiu $v0, $zero, 2 -.L802A1364: -/* 722EA4 802A1364 8FBF0024 */ lw $ra, 0x24($sp) -/* 722EA8 802A1368 8FB20020 */ lw $s2, 0x20($sp) -/* 722EAC 802A136C 8FB1001C */ lw $s1, 0x1c($sp) -/* 722EB0 802A1370 8FB00018 */ lw $s0, 0x18($sp) -/* 722EB4 802A1374 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 722EB8 802A1378 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 722EBC 802A137C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 722EC0 802A1380 03E00008 */ jr $ra -/* 722EC4 802A1384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1420_722F60.s b/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1420_722F60.s deleted file mode 100644 index 0ad3832e8c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_bolt_722B40/func_802A1420_722F60.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1420_722F60 -/* 722F60 802A1420 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 722F64 802A1424 AFB00010 */ sw $s0, 0x10($sp) -/* 722F68 802A1428 0080802D */ daddu $s0, $a0, $zero -/* 722F6C 802A142C 10A00003 */ beqz $a1, .L802A143C -/* 722F70 802A1430 AFBF0014 */ sw $ra, 0x14($sp) -/* 722F74 802A1434 24020014 */ addiu $v0, $zero, 0x14 -/* 722F78 802A1438 AE020070 */ sw $v0, 0x70($s0) -.L802A143C: -/* 722F7C 802A143C 0000202D */ daddu $a0, $zero, $zero -/* 722F80 802A1440 0080282D */ daddu $a1, $a0, $zero -/* 722F84 802A1444 8E020070 */ lw $v0, 0x70($s0) -/* 722F88 802A1448 0080302D */ daddu $a2, $a0, $zero -/* 722F8C 802A144C 00023880 */ sll $a3, $v0, 2 -/* 722F90 802A1450 00E23821 */ addu $a3, $a3, $v0 -/* 722F94 802A1454 00073840 */ sll $a3, $a3, 1 -/* 722F98 802A1458 0C046F97 */ jal set_background_color_blend -/* 722F9C 802A145C 30E700FE */ andi $a3, $a3, 0xfe -/* 722FA0 802A1460 8E020070 */ lw $v0, 0x70($s0) -/* 722FA4 802A1464 2442FFFF */ addiu $v0, $v0, -1 -/* 722FA8 802A1468 10400003 */ beqz $v0, .L802A1478 -/* 722FAC 802A146C AE020070 */ sw $v0, 0x70($s0) -/* 722FB0 802A1470 080A8524 */ j .L802A1490 -/* 722FB4 802A1474 0000102D */ daddu $v0, $zero, $zero -.L802A1478: -/* 722FB8 802A1478 0000202D */ daddu $a0, $zero, $zero -/* 722FBC 802A147C 0080282D */ daddu $a1, $a0, $zero -/* 722FC0 802A1480 0080302D */ daddu $a2, $a0, $zero -/* 722FC4 802A1484 0C046F97 */ jal set_background_color_blend -/* 722FC8 802A1488 0080382D */ daddu $a3, $a0, $zero -/* 722FCC 802A148C 24020002 */ addiu $v0, $zero, 2 -.L802A1490: -/* 722FD0 802A1490 8FBF0014 */ lw $ra, 0x14($sp) -/* 722FD4 802A1494 8FB00010 */ lw $s0, 0x10($sp) -/* 722FD8 802A1498 03E00008 */ jr $ra -/* 722FDC 802A149C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1000_71B1A0.s b/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1000_71B1A0.s deleted file mode 100644 index adf3ec8b30..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1000_71B1A0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71B1A0 -/* 71B1A0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71B1A4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71B1A8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71B1AC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71B1B0 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71B1B4 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71B1B8 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71B1BC 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71B1C0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71B1C4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71B1C8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71B1CC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71B1D0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71B1D4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71B1D8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71B1DC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71B1E0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71B1E4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71B1E8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71B1EC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71B1F0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71B1F4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71B1F8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71B1FC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71B200 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71B204 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71B208 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71B20C 802A106C 00000000 */ nop -/* 71B210 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71B214 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71B218 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71B21C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71B220 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71B224 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71B228 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71B22C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71B230 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71B234 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71B238 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71B23C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71B240 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71B244 802A10A4 00440018 */ mult $v0, $a0 -/* 71B248 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71B24C 802A10AC 00004010 */ mfhi $t0 -/* 71B250 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71B254 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71B258 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71B25C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71B260 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71B264 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71B268 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71B26C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71B270 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71B274 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71B278 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71B27C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71B280 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71B284 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71B288 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71B28C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71B290 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71B294 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71B298 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71B29C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71B2A0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71B2A4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71B2A8 802A1108 0C04C4FD */ jal make_item_entity -/* 71B2AC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71B2B0 802A1110 0C03A830 */ jal add_coins -/* 71B2B4 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71B2B8 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71B2BC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71B2C0 802A1120 00000000 */ nop -.L802A1124: -/* 71B2C4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71B2C8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71B2CC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71B2D0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71B2D4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71B2D8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71B2DC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71B2E0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71B2E4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71B2E8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71B2EC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71B2F0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71B2F4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71B2F8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71B2FC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71B300 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71B304 802A1164 0C00B94E */ jal get_screen_coords -/* 71B308 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71B30C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71B310 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71B314 802A1174 0C050529 */ jal create_icon -/* 71B318 802A1178 00000000 */ nop -/* 71B31C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71B320 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71B324 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71B328 802A1188 3C01802A */ lui $at, %hi(D_802A1C90) -/* 71B32C 802A118C AC241C90 */ sw $a0, %lo(D_802A1C90)($at) -/* 71B330 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71B334 802A1194 0C051261 */ jal set_icon_render_pos -/* 71B338 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71B33C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71B340 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71B344 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71B348 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71B34C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71B350 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71B354 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71B358 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71B35C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71B360 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71B364 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71B368 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71B36C 802A11CC 03E00008 */ jr $ra -/* 71B370 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A11D4_71B374.s b/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A11D4_71B374.s deleted file mode 100644 index c727cfebb3..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A11D4_71B374.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71B374 -/* 71B374 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71B378 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71B37C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71B380 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71B384 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71B388 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71B38C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71B390 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71B394 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71B398 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71B39C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71B3A0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71B3A4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71B3A8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71B3AC 802A120C 00000000 */ nop -/* 71B3B0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71B3B4 802A1214 00000000 */ nop -/* 71B3B8 802A1218 3C04802A */ lui $a0, %hi(D_802A1C90) -/* 71B3BC 802A121C 8C841C90 */ lw $a0, %lo(D_802A1C90)($a0) -/* 71B3C0 802A1220 0C05123D */ jal free_icon -/* 71B3C4 802A1224 00000000 */ nop -.L802A1228: -/* 71B3C8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71B3CC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71B3D0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71B3D4 802A1234 03E00008 */ jr $ra -/* 71B3D8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A12D4_71B474.s b/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A12D4_71B474.s deleted file mode 100644 index 2cbe5cb1c0..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A12D4_71B474.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12D4_71B474 -/* 71B474 802A12D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71B478 802A12D8 AFB00010 */ sw $s0, 0x10($sp) -/* 71B47C 802A12DC 0080802D */ daddu $s0, $a0, $zero -/* 71B480 802A12E0 10A00003 */ beqz $a1, .L802A12F0 -/* 71B484 802A12E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 71B488 802A12E8 24020014 */ addiu $v0, $zero, 0x14 -/* 71B48C 802A12EC AE020070 */ sw $v0, 0x70($s0) -.L802A12F0: -/* 71B490 802A12F0 0000202D */ daddu $a0, $zero, $zero -/* 71B494 802A12F4 0080282D */ daddu $a1, $a0, $zero -/* 71B498 802A12F8 8E020070 */ lw $v0, 0x70($s0) -/* 71B49C 802A12FC 0080302D */ daddu $a2, $a0, $zero -/* 71B4A0 802A1300 00023880 */ sll $a3, $v0, 2 -/* 71B4A4 802A1304 00E23821 */ addu $a3, $a3, $v0 -/* 71B4A8 802A1308 00073840 */ sll $a3, $a3, 1 -/* 71B4AC 802A130C 0C046F97 */ jal set_background_color_blend -/* 71B4B0 802A1310 30E700FE */ andi $a3, $a3, 0xfe -/* 71B4B4 802A1314 8E020070 */ lw $v0, 0x70($s0) -/* 71B4B8 802A1318 2442FFFF */ addiu $v0, $v0, -1 -/* 71B4BC 802A131C 10400003 */ beqz $v0, .L802A132C -/* 71B4C0 802A1320 AE020070 */ sw $v0, 0x70($s0) -/* 71B4C4 802A1324 080A84D1 */ j .L802A1344 -/* 71B4C8 802A1328 0000102D */ daddu $v0, $zero, $zero -.L802A132C: -/* 71B4CC 802A132C 0000202D */ daddu $a0, $zero, $zero -/* 71B4D0 802A1330 0080282D */ daddu $a1, $a0, $zero -/* 71B4D4 802A1334 0080302D */ daddu $a2, $a0, $zero -/* 71B4D8 802A1338 0C046F97 */ jal set_background_color_blend -/* 71B4DC 802A133C 0080382D */ daddu $a3, $a0, $zero -/* 71B4E0 802A1340 24020002 */ addiu $v0, $zero, 2 -.L802A1344: -/* 71B4E4 802A1344 8FBF0014 */ lw $ra, 0x14($sp) -/* 71B4E8 802A1348 8FB00010 */ lw $s0, 0x10($sp) -/* 71B4EC 802A134C 03E00008 */ jr $ra -/* 71B4F0 802A1350 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1354_71B4F4.s b/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1354_71B4F4.s deleted file mode 100644 index afc751fb0c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/thunder_rage_71B1A0/func_802A1354_71B4F4.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1354_71B4F4 -/* 71B4F4 802A1354 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 71B4F8 802A1358 AFBF0024 */ sw $ra, 0x24($sp) -/* 71B4FC 802A135C AFB20020 */ sw $s2, 0x20($sp) -/* 71B500 802A1360 AFB1001C */ sw $s1, 0x1c($sp) -/* 71B504 802A1364 AFB00018 */ sw $s0, 0x18($sp) -/* 71B508 802A1368 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 71B50C 802A136C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 71B510 802A1370 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 71B514 802A1374 0C09A75B */ jal get_actor -/* 71B518 802A1378 8C840148 */ lw $a0, 0x148($a0) -/* 71B51C 802A137C 0C09A75B */ jal get_actor -/* 71B520 802A1380 84440428 */ lh $a0, 0x428($v0) -/* 71B524 802A1384 0040802D */ daddu $s0, $v0, $zero -/* 71B528 802A1388 1200003C */ beqz $s0, .L802A147C -/* 71B52C 802A138C 24020002 */ addiu $v0, $zero, 2 -/* 71B530 802A1390 0C05272D */ jal play_sound -/* 71B534 802A1394 24040366 */ addiu $a0, $zero, 0x366 -/* 71B538 802A1398 3C03CCCC */ lui $v1, 0xcccc -/* 71B53C 802A139C 3463CCCD */ ori $v1, $v1, 0xcccd -/* 71B540 802A13A0 92040191 */ lbu $a0, 0x191($s0) -/* 71B544 802A13A4 92020190 */ lbu $v0, 0x190($s0) -/* 71B548 802A13A8 00830019 */ multu $a0, $v1 -/* 71B54C 802A13AC C6000188 */ lwc1 $f0, 0x188($s0) -/* 71B550 802A13B0 00021882 */ srl $v1, $v0, 2 -/* 71B554 802A13B4 00431021 */ addu $v0, $v0, $v1 -/* 71B558 802A13B8 44823000 */ mtc1 $v0, $f6 -/* 71B55C 802A13BC 00000000 */ nop -/* 71B560 802A13C0 468031A0 */ cvt.s.w $f6, $f6 -/* 71B564 802A13C4 46003182 */ mul.s $f6, $f6, $f0 -/* 71B568 802A13C8 00000000 */ nop -/* 71B56C 802A13CC 2482FFFE */ addiu $v0, $a0, -2 -/* 71B570 802A13D0 44822000 */ mtc1 $v0, $f4 -/* 71B574 802A13D4 00000000 */ nop -/* 71B578 802A13D8 46802120 */ cvt.s.w $f4, $f4 -/* 71B57C 802A13DC 46002102 */ mul.s $f4, $f4, $f0 -/* 71B580 802A13E0 00000000 */ nop -/* 71B584 802A13E4 C6020148 */ lwc1 $f2, 0x148($s0) -/* 71B588 802A13E8 C6160144 */ lwc1 $f22, 0x144($s0) -/* 71B58C 802A13EC C618014C */ lwc1 $f24, 0x14c($s0) -/* 71B590 802A13F0 00004010 */ mfhi $t0 -/* 71B594 802A13F4 000810C2 */ srl $v0, $t0, 3 -/* 71B598 802A13F8 304200FF */ andi $v0, $v0, 0xff -/* 71B59C 802A13FC 44820000 */ mtc1 $v0, $f0 -/* 71B5A0 802A1400 00000000 */ nop -/* 71B5A4 802A1404 46800020 */ cvt.s.w $f0, $f0 -/* 71B5A8 802A1408 4600320D */ trunc.w.s $f8, $f6 -/* 71B5AC 802A140C 44114000 */ mfc1 $s1, $f8 -/* 71B5B0 802A1410 4600220D */ trunc.w.s $f8, $f4 -/* 71B5B4 802A1414 44124000 */ mfc1 $s2, $f8 -/* 71B5B8 802A1418 8E020000 */ lw $v0, ($s0) -/* 71B5BC 802A141C 30428000 */ andi $v0, $v0, 0x8000 -/* 71B5C0 802A1420 10400006 */ beqz $v0, .L802A143C -/* 71B5C4 802A1424 46001500 */ add.s $f20, $f2, $f0 -/* 71B5C8 802A1428 00041042 */ srl $v0, $a0, 1 -/* 71B5CC 802A142C 44820000 */ mtc1 $v0, $f0 -/* 71B5D0 802A1430 00000000 */ nop -/* 71B5D4 802A1434 46800020 */ cvt.s.w $f0, $f0 -/* 71B5D8 802A1438 4600A501 */ sub.s $f20, $f20, $f0 -.L802A143C: -/* 71B5DC 802A143C 0C00A67F */ jal rand_int -/* 71B5E0 802A1440 24040002 */ addiu $a0, $zero, 2 -/* 71B5E4 802A1444 24440003 */ addiu $a0, $v0, 3 -/* 71B5E8 802A1448 4405B000 */ mfc1 $a1, $f22 -/* 71B5EC 802A144C 4406A000 */ mfc1 $a2, $f20 -/* 71B5F0 802A1450 4407C000 */ mfc1 $a3, $f24 -/* 71B5F4 802A1454 44910000 */ mtc1 $s1, $f0 -/* 71B5F8 802A1458 00000000 */ nop -/* 71B5FC 802A145C 46800020 */ cvt.s.w $f0, $f0 -/* 71B600 802A1460 E7A00010 */ swc1 $f0, 0x10($sp) -/* 71B604 802A1464 44920000 */ mtc1 $s2, $f0 -/* 71B608 802A1468 00000000 */ nop -/* 71B60C 802A146C 46800020 */ cvt.s.w $f0, $f0 -/* 71B610 802A1470 0C01C334 */ jal func_80070CD0 -/* 71B614 802A1474 E7A00014 */ swc1 $f0, 0x14($sp) -/* 71B618 802A1478 24020002 */ addiu $v0, $zero, 2 -.L802A147C: -/* 71B61C 802A147C 8FBF0024 */ lw $ra, 0x24($sp) -/* 71B620 802A1480 8FB20020 */ lw $s2, 0x20($sp) -/* 71B624 802A1484 8FB1001C */ lw $s1, 0x1c($sp) -/* 71B628 802A1488 8FB00018 */ lw $s0, 0x18($sp) -/* 71B62C 802A148C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 71B630 802A1490 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 71B634 802A1494 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 71B638 802A1498 03E00008 */ jr $ra -/* 71B63C 802A149C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A1000_723780.s b/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A1000_723780.s deleted file mode 100644 index 6a1411db6a..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A1000_723780.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_723780 -/* 723780 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 723784 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 723788 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72378C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 723790 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 723794 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 723798 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72379C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 7237A0 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 7237A4 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 7237A8 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 7237AC 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 7237B0 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 7237B4 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 7237B8 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 7237BC 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 7237C0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 7237C4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 7237C8 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 7237CC 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 7237D0 802A1050 00021140 */ sll $v0, $v0, 5 -/* 7237D4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 7237D8 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 7237DC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7237E0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7237E4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7237E8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7237EC 802A106C 00000000 */ nop -/* 7237F0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7237F4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7237F8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7237FC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 723800 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 723804 802A1084 1A400045 */ blez $s2, .L802A119C -/* 723808 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 72380C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 723810 802A1090 00121880 */ sll $v1, $s2, 2 -/* 723814 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 723818 802A1098 00031100 */ sll $v0, $v1, 4 -/* 72381C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 723820 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 723824 802A10A4 00440018 */ mult $v0, $a0 -/* 723828 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 72382C 802A10AC 00004010 */ mfhi $t0 -/* 723830 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 723834 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 723838 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 72383C 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 723840 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 723844 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 723848 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72384C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 723850 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 723854 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 723858 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72385C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 723860 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 723864 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 723868 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72386C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 723870 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 723874 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 723878 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72387C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 723880 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 723884 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 723888 802A1108 0C04C4FD */ jal make_item_entity -/* 72388C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 723890 802A1110 0C03A830 */ jal add_coins -/* 723894 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 723898 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72389C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7238A0 802A1120 00000000 */ nop -.L802A1124: -/* 7238A4 802A1124 00101040 */ sll $v0, $s0, 1 -/* 7238A8 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 7238AC 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 7238B0 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 7238B4 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 7238B8 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 7238BC 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7238C0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7238C4 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 7238C8 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 7238CC 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 7238D0 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 7238D4 802A1154 44050000 */ mfc1 $a1, $f0 -/* 7238D8 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 7238DC 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7238E0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7238E4 802A1164 0C00B94E */ jal get_screen_coords -/* 7238E8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7238EC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7238F0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7238F4 802A1174 0C050529 */ jal create_icon -/* 7238F8 802A1178 00000000 */ nop -/* 7238FC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 723900 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 723904 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 723908 802A1188 3C01802A */ lui $at, %hi(D_802A1AC0) -/* 72390C 802A118C AC241AC0 */ sw $a0, %lo(D_802A1AC0)($at) -/* 723910 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 723914 802A1194 0C051261 */ jal set_icon_render_pos -/* 723918 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 72391C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 723920 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 723924 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 723928 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 72392C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 723930 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 723934 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 723938 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 72393C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 723940 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 723944 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 723948 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72394C 802A11CC 03E00008 */ jr $ra -/* 723950 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A11D4_723954.s b/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A11D4_723954.s deleted file mode 100644 index d88655f519..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A11D4_723954.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_723954 -/* 723954 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 723958 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72395C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 723960 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 723964 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 723968 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72396C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 723970 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 723974 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 723978 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72397C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 723980 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 723984 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 723988 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72398C 802A120C 00000000 */ nop -/* 723990 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 723994 802A1214 00000000 */ nop -/* 723998 802A1218 3C04802A */ lui $a0, %hi(D_802A1AC0) -/* 72399C 802A121C 8C841AC0 */ lw $a0, %lo(D_802A1AC0)($a0) -/* 7239A0 802A1220 0C05123D */ jal free_icon -/* 7239A4 802A1224 00000000 */ nop -.L802A1228: -/* 7239A8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7239AC 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 7239B0 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 7239B4 802A1234 03E00008 */ jr $ra -/* 7239B8 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A123C_7239BC.s b/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A123C_7239BC.s deleted file mode 100644 index 53c602e256..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A123C_7239BC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_7239BC -/* 7239BC 802A123C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7239C0 802A1240 AFB1001C */ sw $s1, 0x1c($sp) -/* 7239C4 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 7239C8 802A1248 AFBF0028 */ sw $ra, 0x28($sp) -/* 7239CC 802A124C AFB30024 */ sw $s3, 0x24($sp) -/* 7239D0 802A1250 AFB20020 */ sw $s2, 0x20($sp) -/* 7239D4 802A1254 AFB00018 */ sw $s0, 0x18($sp) -/* 7239D8 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 7239DC 802A125C 8E050000 */ lw $a1, ($s0) -/* 7239E0 802A1260 0C0B1EAF */ jal get_variable -/* 7239E4 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 7239E8 802A1268 8E050000 */ lw $a1, ($s0) -/* 7239EC 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 7239F0 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 7239F4 802A1274 0C0B1EAF */ jal get_variable -/* 7239F8 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 7239FC 802A127C 8E050000 */ lw $a1, ($s0) -/* 723A00 802A1280 26100004 */ addiu $s0, $s0, 4 -/* 723A04 802A1284 0220202D */ daddu $a0, $s1, $zero -/* 723A08 802A1288 0C0B1EAF */ jal get_variable -/* 723A0C 802A128C 0040902D */ daddu $s2, $v0, $zero -/* 723A10 802A1290 0220202D */ daddu $a0, $s1, $zero -/* 723A14 802A1294 8E050000 */ lw $a1, ($s0) -/* 723A18 802A1298 0C0B1EAF */ jal get_variable -/* 723A1C 802A129C 0040802D */ daddu $s0, $v0, $zero -/* 723A20 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 723A24 802A12A4 00000000 */ nop -/* 723A28 802A12A8 46800020 */ cvt.s.w $f0, $f0 -/* 723A2C 802A12AC 44050000 */ mfc1 $a1, $f0 -/* 723A30 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 723A34 802A12B4 00000000 */ nop -/* 723A38 802A12B8 46800020 */ cvt.s.w $f0, $f0 -/* 723A3C 802A12BC 44060000 */ mfc1 $a2, $f0 -/* 723A40 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 723A44 802A12C4 00000000 */ nop -/* 723A48 802A12C8 46800020 */ cvt.s.w $f0, $f0 -/* 723A4C 802A12CC 44070000 */ mfc1 $a3, $f0 -/* 723A50 802A12D0 0000202D */ daddu $a0, $zero, $zero -/* 723A54 802A12D4 0C01C424 */ jal func_80071090 -/* 723A58 802A12D8 AFA20010 */ sw $v0, 0x10($sp) -/* 723A5C 802A12DC 8FBF0028 */ lw $ra, 0x28($sp) -/* 723A60 802A12E0 8FB30024 */ lw $s3, 0x24($sp) -/* 723A64 802A12E4 8FB20020 */ lw $s2, 0x20($sp) -/* 723A68 802A12E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 723A6C 802A12EC 8FB00018 */ lw $s0, 0x18($sp) -/* 723A70 802A12F0 24020002 */ addiu $v0, $zero, 2 -/* 723A74 802A12F4 03E00008 */ jr $ra -/* 723A78 802A12F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A12FC_723A7C.s b/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A12FC_723A7C.s deleted file mode 100644 index 1d1738f5c5..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/ultra_shroom_723780/func_802A12FC_723A7C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12FC_723A7C -/* 723A7C 802A12FC 3C048011 */ lui $a0, %hi(gPlayerData) -/* 723A80 802A1300 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) -/* 723A84 802A1304 90820002 */ lbu $v0, 2($a0) -/* 723A88 802A1308 80830003 */ lb $v1, 3($a0) -/* 723A8C 802A130C 2442000A */ addiu $v0, $v0, 0xa -/* 723A90 802A1310 A0820002 */ sb $v0, 2($a0) -/* 723A94 802A1314 00021600 */ sll $v0, $v0, 0x18 -/* 723A98 802A1318 00021603 */ sra $v0, $v0, 0x18 -/* 723A9C 802A131C 0062182A */ slt $v1, $v1, $v0 -/* 723AA0 802A1320 90820003 */ lbu $v0, 3($a0) -/* 723AA4 802A1324 54600001 */ bnel $v1, $zero, .L802A132C -/* 723AA8 802A1328 A0820002 */ sb $v0, 2($a0) -.L802A132C: -/* 723AAC 802A132C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A1000_724240.s b/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A1000_724240.s deleted file mode 100644 index 992cdc6ee2..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A1000_724240.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_724240 -/* 724240 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 724244 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 724248 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 72424C 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 724250 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 724254 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 724258 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 72425C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 724260 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 724264 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 724268 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 72426C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 724270 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 724274 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 724278 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 72427C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 724280 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 724284 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 724288 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 72428C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 724290 802A1050 00021140 */ sll $v0, $v0, 5 -/* 724294 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 724298 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 72429C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 7242A0 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 7242A4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 7242A8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7242AC 802A106C 00000000 */ nop -/* 7242B0 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 7242B4 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 7242B8 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 7242BC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 7242C0 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 7242C4 802A1084 1A400045 */ blez $s2, .L802A119C -/* 7242C8 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 7242CC 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 7242D0 802A1090 00121880 */ sll $v1, $s2, 2 -/* 7242D4 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 7242D8 802A1098 00031100 */ sll $v0, $v1, 4 -/* 7242DC 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 7242E0 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 7242E4 802A10A4 00440018 */ mult $v0, $a0 -/* 7242E8 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 7242EC 802A10AC 00004010 */ mfhi $t0 -/* 7242F0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 7242F4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 7242F8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 7242FC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 724300 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 724304 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 724308 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 72430C 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 724310 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 724314 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724318 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72431C 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 724320 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 724324 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 724328 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 72432C 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 724330 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 724334 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 724338 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 72433C 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 724340 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 724344 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 724348 802A1108 0C04C4FD */ jal make_item_entity -/* 72434C 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 724350 802A1110 0C03A830 */ jal add_coins -/* 724354 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 724358 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 72435C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 724360 802A1120 00000000 */ nop -.L802A1124: -/* 724364 802A1124 00101040 */ sll $v0, $s0, 1 -/* 724368 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 72436C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 724370 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 724374 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 724378 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 72437C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 724380 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 724384 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 724388 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 72438C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 724390 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 724394 802A1154 44050000 */ mfc1 $a1, $f0 -/* 724398 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 72439C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 7243A0 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 7243A4 802A1164 0C00B94E */ jal get_screen_coords -/* 7243A8 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 7243AC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 7243B0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 7243B4 802A1174 0C050529 */ jal create_icon -/* 7243B8 802A1178 00000000 */ nop -/* 7243BC 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 7243C0 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 7243C4 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 7243C8 802A1188 3C01802A */ lui $at, %hi(D_802A1AA0) -/* 7243CC 802A118C AC241AA0 */ sw $a0, %lo(D_802A1AA0)($at) -/* 7243D0 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 7243D4 802A1194 0C051261 */ jal set_icon_render_pos -/* 7243D8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 7243DC 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 7243E0 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 7243E4 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 7243E8 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 7243EC 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 7243F0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 7243F4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 7243F8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 7243FC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 724400 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 724404 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 724408 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 72440C 802A11CC 03E00008 */ jr $ra -/* 724410 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A11D4_724414.s b/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A11D4_724414.s deleted file mode 100644 index 2cbf7ddf35..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A11D4_724414.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_724414 -/* 724414 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 724418 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 72441C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 724420 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 724424 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 724428 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 72442C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 724430 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 724434 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 724438 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 72443C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 724440 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 724444 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 724448 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72444C 802A120C 00000000 */ nop -/* 724450 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 724454 802A1214 00000000 */ nop -/* 724458 802A1218 3C04802A */ lui $a0, %hi(D_802A1AA0) -/* 72445C 802A121C 8C841AA0 */ lw $a0, %lo(D_802A1AA0)($a0) -/* 724460 802A1220 0C05123D */ jal free_icon -/* 724464 802A1224 00000000 */ nop -.L802A1228: -/* 724468 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 72446C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 724470 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 724474 802A1234 03E00008 */ jr $ra -/* 724478 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A123C_72447C.s b/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A123C_72447C.s deleted file mode 100644 index 4ab022282f..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A123C_72447C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_72447C -/* 72447C 802A123C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 724480 802A1240 AFB1001C */ sw $s1, 0x1c($sp) -/* 724484 802A1244 0080882D */ daddu $s1, $a0, $zero -/* 724488 802A1248 AFBF0028 */ sw $ra, 0x28($sp) -/* 72448C 802A124C AFB30024 */ sw $s3, 0x24($sp) -/* 724490 802A1250 AFB20020 */ sw $s2, 0x20($sp) -/* 724494 802A1254 AFB00018 */ sw $s0, 0x18($sp) -/* 724498 802A1258 8E30000C */ lw $s0, 0xc($s1) -/* 72449C 802A125C 8E050000 */ lw $a1, ($s0) -/* 7244A0 802A1260 0C0B1EAF */ jal get_variable -/* 7244A4 802A1264 26100004 */ addiu $s0, $s0, 4 -/* 7244A8 802A1268 8E050000 */ lw $a1, ($s0) -/* 7244AC 802A126C 26100004 */ addiu $s0, $s0, 4 -/* 7244B0 802A1270 0220202D */ daddu $a0, $s1, $zero -/* 7244B4 802A1274 0C0B1EAF */ jal get_variable -/* 7244B8 802A1278 0040982D */ daddu $s3, $v0, $zero -/* 7244BC 802A127C 8E050000 */ lw $a1, ($s0) -/* 7244C0 802A1280 26100004 */ addiu $s0, $s0, 4 -/* 7244C4 802A1284 0220202D */ daddu $a0, $s1, $zero -/* 7244C8 802A1288 0C0B1EAF */ jal get_variable -/* 7244CC 802A128C 0040902D */ daddu $s2, $v0, $zero -/* 7244D0 802A1290 0220202D */ daddu $a0, $s1, $zero -/* 7244D4 802A1294 8E050000 */ lw $a1, ($s0) -/* 7244D8 802A1298 0C0B1EAF */ jal get_variable -/* 7244DC 802A129C 0040802D */ daddu $s0, $v0, $zero -/* 7244E0 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 7244E4 802A12A4 00000000 */ nop -/* 7244E8 802A12A8 46800020 */ cvt.s.w $f0, $f0 -/* 7244EC 802A12AC 44050000 */ mfc1 $a1, $f0 -/* 7244F0 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 7244F4 802A12B4 00000000 */ nop -/* 7244F8 802A12B8 46800020 */ cvt.s.w $f0, $f0 -/* 7244FC 802A12BC 44060000 */ mfc1 $a2, $f0 -/* 724500 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 724504 802A12C4 00000000 */ nop -/* 724508 802A12C8 46800020 */ cvt.s.w $f0, $f0 -/* 72450C 802A12CC 44070000 */ mfc1 $a3, $f0 -/* 724510 802A12D0 0000202D */ daddu $a0, $zero, $zero -/* 724514 802A12D4 0C01C424 */ jal func_80071090 -/* 724518 802A12D8 AFA20010 */ sw $v0, 0x10($sp) -/* 72451C 802A12DC 8FBF0028 */ lw $ra, 0x28($sp) -/* 724520 802A12E0 8FB30024 */ lw $s3, 0x24($sp) -/* 724524 802A12E4 8FB20020 */ lw $s2, 0x20($sp) -/* 724528 802A12E8 8FB1001C */ lw $s1, 0x1c($sp) -/* 72452C 802A12EC 8FB00018 */ lw $s0, 0x18($sp) -/* 724530 802A12F0 24020002 */ addiu $v0, $zero, 2 -/* 724534 802A12F4 03E00008 */ jr $ra -/* 724538 802A12F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A12FC_72453C.s b/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A12FC_72453C.s deleted file mode 100644 index 0deb84fdca..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/unknown_item_724240/func_802A12FC_72453C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A12FC_72453C -/* 72453C 802A12FC 3C048011 */ lui $a0, %hi(gPlayerData) -/* 724540 802A1300 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) -/* 724544 802A1304 90820002 */ lbu $v0, 2($a0) -/* 724548 802A1308 80830003 */ lb $v1, 3($a0) -/* 72454C 802A130C 24420014 */ addiu $v0, $v0, 0x14 -/* 724550 802A1310 A0820002 */ sb $v0, 2($a0) -/* 724554 802A1314 00021600 */ sll $v0, $v0, 0x18 -/* 724558 802A1318 00021603 */ sra $v0, $v0, 0x18 -/* 72455C 802A131C 0062182A */ slt $v1, $v1, $v0 -/* 724560 802A1320 90820003 */ lbu $v0, 3($a0) -/* 724564 802A1324 54600001 */ bnel $v1, $zero, .L802A132C -/* 724568 802A1328 A0820002 */ sb $v0, 2($a0) -.L802A132C: -/* 72456C 802A132C 03E00008 */ jr $ra diff --git a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A1000_71A7F0.s b/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A1000_71A7F0.s deleted file mode 100644 index 1687f8932c..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A1000_71A7F0.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_71A7F0 -/* 71A7F0 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 71A7F4 802A1004 AFB50044 */ sw $s5, 0x44($sp) -/* 71A7F8 802A1008 0080A82D */ daddu $s5, $a0, $zero -/* 71A7FC 802A100C AFB10034 */ sw $s1, 0x34($sp) -/* 71A800 802A1010 0000882D */ daddu $s1, $zero, $zero -/* 71A804 802A1014 2405001D */ addiu $a1, $zero, 0x1d -/* 71A808 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp) -/* 71A80C 802A101C 4480A000 */ mtc1 $zero, $f20 -/* 71A810 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 71A814 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 71A818 802A1028 AFBF0048 */ sw $ra, 0x48($sp) -/* 71A81C 802A102C AFB40040 */ sw $s4, 0x40($sp) -/* 71A820 802A1030 AFB3003C */ sw $s3, 0x3c($sp) -/* 71A824 802A1034 AFB20038 */ sw $s2, 0x38($sp) -/* 71A828 802A1038 AFB00030 */ sw $s0, 0x30($sp) -/* 71A82C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp) -/* 71A830 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp) -/* 71A834 802A1044 8C5300D8 */ lw $s3, 0xd8($v0) -/* 71A838 802A1048 8442017A */ lh $v0, 0x17a($v0) -/* 71A83C 802A104C 0260202D */ daddu $a0, $s3, $zero -/* 71A840 802A1050 00021140 */ sll $v0, $v0, 5 -/* 71A844 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC) -/* 71A848 802A1058 02429021 */ addu $s2, $s2, $v0 -/* 71A84C 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2) -/* 71A850 802A1060 92620191 */ lbu $v0, 0x191($s3) -/* 71A854 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) -/* 71A858 802A1068 44820000 */ mtc1 $v0, $f0 -/* 71A85C 802A106C 00000000 */ nop -/* 71A860 802A1070 46800020 */ cvt.s.w $f0, $f0 -/* 71A864 802A1074 0C099CAB */ jal heroes_is_ability_active -/* 71A868 802A1078 46001580 */ add.s $f22, $f2, $f0 -/* 71A86C 802A107C 50400048 */ beql $v0, $zero, .L802A11A0 -/* 71A870 802A1080 AEB10084 */ sw $s1, 0x84($s5) -/* 71A874 802A1084 1A400045 */ blez $s2, .L802A119C -/* 71A878 802A1088 3C0451EB */ lui $a0, 0x51eb -/* 71A87C 802A108C 3484851F */ ori $a0, $a0, 0x851f -/* 71A880 802A1090 00121880 */ sll $v1, $s2, 2 -/* 71A884 802A1094 00721821 */ addu $v1, $v1, $s2 -/* 71A888 802A1098 00031100 */ sll $v0, $v1, 4 -/* 71A88C 802A109C 00431023 */ subu $v0, $v0, $v1 -/* 71A890 802A10A0 24420063 */ addiu $v0, $v0, 0x63 -/* 71A894 802A10A4 00440018 */ mult $v0, $a0 -/* 71A898 802A10A8 000217C3 */ sra $v0, $v0, 0x1f -/* 71A89C 802A10AC 00004010 */ mfhi $t0 -/* 71A8A0 802A10B0 00081943 */ sra $v1, $t0, 5 -/* 71A8A4 802A10B4 00629023 */ subu $s2, $v1, $v0 -/* 71A8A8 802A10B8 0232102A */ slt $v0, $s1, $s2 -/* 71A8AC 802A10BC 10400019 */ beqz $v0, .L802A1124 -/* 71A8B0 802A10C0 0220802D */ daddu $s0, $s1, $zero -/* 71A8B4 802A10C4 24140017 */ addiu $s4, $zero, 0x17 -/* 71A8B8 802A10C8 3C0141F0 */ lui $at, 0x41f0 -/* 71A8BC 802A10CC 4481C000 */ mtc1 $at, $f24 -/* 71A8C0 802A10D0 24110001 */ addiu $s1, $zero, 1 -.L802A10D4: -/* 71A8C4 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71A8C8 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71A8CC 802A10DC 4600A10D */ trunc.w.s $f4, $f20 -/* 71A8D0 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 71A8D4 802A10E4 24040157 */ addiu $a0, $zero, 0x157 -/* 71A8D8 802A10E8 AFB10014 */ sw $s1, 0x14($sp) -/* 71A8DC 802A10EC 26310003 */ addiu $s1, $s1, 3 -/* 71A8E0 802A10F0 26100001 */ addiu $s0, $s0, 1 -/* 71A8E4 802A10F4 4406B000 */ mfc1 $a2, $f22 -/* 71A8E8 802A10F8 44050000 */ mfc1 $a1, $f0 -/* 71A8EC 802A10FC 44071000 */ mfc1 $a3, $f2 -/* 71A8F0 802A1100 4618A500 */ add.s $f20, $f20, $f24 -/* 71A8F4 802A1104 AFB40010 */ sw $s4, 0x10($sp) -/* 71A8F8 802A1108 0C04C4FD */ jal make_item_entity -/* 71A8FC 802A110C AFA0001C */ sw $zero, 0x1c($sp) -/* 71A900 802A1110 0C03A830 */ jal add_coins -/* 71A904 802A1114 24040001 */ addiu $a0, $zero, 1 -/* 71A908 802A1118 0212102A */ slt $v0, $s0, $s2 -/* 71A90C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 71A910 802A1120 00000000 */ nop -.L802A1124: -/* 71A914 802A1124 00101040 */ sll $v0, $s0, 1 -/* 71A918 802A1128 00501021 */ addu $v0, $v0, $s0 -/* 71A91C 802A112C 2451001E */ addiu $s1, $v0, 0x1e -/* 71A920 802A1130 C6600144 */ lwc1 $f0, 0x144($s3) -/* 71A924 802A1134 C6760148 */ lwc1 $f22, 0x148($s3) -/* 71A928 802A1138 C662014C */ lwc1 $f2, 0x14c($s3) -/* 71A92C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 71A930 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 71A934 802A1144 27A20020 */ addiu $v0, $sp, 0x20 -/* 71A938 802A1148 AFA20010 */ sw $v0, 0x10($sp) -/* 71A93C 802A114C 27A20024 */ addiu $v0, $sp, 0x24 -/* 71A940 802A1150 AFA20014 */ sw $v0, 0x14($sp) -/* 71A944 802A1154 44050000 */ mfc1 $a1, $f0 -/* 71A948 802A1158 4406B000 */ mfc1 $a2, $f22 -/* 71A94C 802A115C 44071000 */ mfc1 $a3, $f2 -/* 71A950 802A1160 27A20028 */ addiu $v0, $sp, 0x28 -/* 71A954 802A1164 0C00B94E */ jal get_screen_coords -/* 71A958 802A1168 AFA20018 */ sw $v0, 0x18($sp) -/* 71A95C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) -/* 71A960 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) -/* 71A964 802A1174 0C050529 */ jal create_icon -/* 71A968 802A1178 00000000 */ nop -/* 71A96C 802A117C 8FA50020 */ lw $a1, 0x20($sp) -/* 71A970 802A1180 8FA60024 */ lw $a2, 0x24($sp) -/* 71A974 802A1184 0040202D */ daddu $a0, $v0, $zero -/* 71A978 802A1188 3C01802A */ lui $at, %hi(D_802A19B0) -/* 71A97C 802A118C AC2419B0 */ sw $a0, %lo(D_802A19B0)($at) -/* 71A980 802A1190 24A50024 */ addiu $a1, $a1, 0x24 -/* 71A984 802A1194 0C051261 */ jal set_icon_render_pos -/* 71A988 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f -.L802A119C: -/* 71A98C 802A119C AEB10084 */ sw $s1, 0x84($s5) -.L802A11A0: -/* 71A990 802A11A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 71A994 802A11A4 8FB50044 */ lw $s5, 0x44($sp) -/* 71A998 802A11A8 8FB40040 */ lw $s4, 0x40($sp) -/* 71A99C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 71A9A0 802A11B0 8FB20038 */ lw $s2, 0x38($sp) -/* 71A9A4 802A11B4 8FB10034 */ lw $s1, 0x34($sp) -/* 71A9A8 802A11B8 8FB00030 */ lw $s0, 0x30($sp) -/* 71A9AC 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp) -/* 71A9B0 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp) -/* 71A9B4 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* 71A9B8 802A11C8 24020002 */ addiu $v0, $zero, 2 -/* 71A9BC 802A11CC 03E00008 */ jr $ra -/* 71A9C0 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A11D4_71A9C4.s b/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A11D4_71A9C4.s deleted file mode 100644 index cdc7df50aa..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A11D4_71A9C4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A11D4_71A9C4 -/* 71A9C4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71A9C8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 71A9CC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 71A9D0 802A11E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 71A9D4 802A11E4 AFB00010 */ sw $s0, 0x10($sp) -/* 71A9D8 802A11E8 8462017A */ lh $v0, 0x17a($v1) -/* 71A9DC 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1) -/* 71A9E0 802A11F0 00021140 */ sll $v0, $v0, 5 -/* 71A9E4 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC) -/* 71A9E8 802A11F8 02028021 */ addu $s0, $s0, $v0 -/* 71A9EC 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0) -/* 71A9F0 802A1200 0C099CAB */ jal heroes_is_ability_active -/* 71A9F4 802A1204 2405001D */ addiu $a1, $zero, 0x1d -/* 71A9F8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 71A9FC 802A120C 00000000 */ nop -/* 71AA00 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 71AA04 802A1214 00000000 */ nop -/* 71AA08 802A1218 3C04802A */ lui $a0, %hi(D_802A19B0) -/* 71AA0C 802A121C 8C8419B0 */ lw $a0, %lo(D_802A19B0)($a0) -/* 71AA10 802A1220 0C05123D */ jal free_icon -/* 71AA14 802A1224 00000000 */ nop -.L802A1228: -/* 71AA18 802A1228 8FBF0014 */ lw $ra, 0x14($sp) -/* 71AA1C 802A122C 8FB00010 */ lw $s0, 0x10($sp) -/* 71AA20 802A1230 24020002 */ addiu $v0, $zero, 2 -/* 71AA24 802A1234 03E00008 */ jr $ra -/* 71AA28 802A1238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A123C_71AA2C.s b/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A123C_71AA2C.s deleted file mode 100644 index 47bd62992b..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/volt_shroom_71A7F0/func_802A123C_71AA2C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A123C_71AA2C -/* 71AA2C 802A123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 71AA30 802A1240 0080102D */ daddu $v0, $a0, $zero -/* 71AA34 802A1244 AFB00010 */ sw $s0, 0x10($sp) -/* 71AA38 802A1248 3C10800E */ lui $s0, %hi(gBattleStatus+0xD8) -/* 71AA3C 802A124C 8E10C148 */ lw $s0, %lo(gBattleStatus+0xD8)($s0) -/* 71AA40 802A1250 2405000B */ addiu $a1, $zero, 0xb -/* 71AA44 802A1254 AFBF0014 */ sw $ra, 0x14($sp) -/* 71AA48 802A1258 8C460084 */ lw $a2, 0x84($v0) -/* 71AA4C 802A125C 0C0997D0 */ jal inflict_status -/* 71AA50 802A1260 0200202D */ daddu $a0, $s0, $zero -/* 71AA54 802A1264 A200021C */ sb $zero, 0x21c($s0) -/* 71AA58 802A1268 8FBF0014 */ lw $ra, 0x14($sp) -/* 71AA5C 802A126C 8FB00010 */ lw $s0, 0x10($sp) -/* 71AA60 802A1270 24020002 */ addiu $v0, $zero, 2 -/* 71AA64 802A1274 03E00008 */ jr $ra -/* 71AA68 802A1278 27BD0018 */ addiu $sp, $sp, 0x18 -/* 71AA6C 802A127C 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 0cd737a302..73200d3c1f 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2259,222 +2259,324 @@ segments: subsections: - [0x714CF0, c] - [0x714DC0, data] - - name: battle/item/mushroom + - name: battle/item/mushroom/ type: code start: 0x715850 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x715850, c] - - [0x715E50, data] - - name: battle/item/fire_flower + - [0x715850, c, lib] + - [0x715E50, .data, lib] + - [0x71640C, .data, mushroom] + - [0x716C60, .bss, lib] + - name: battle/item/fire_flower/ type: code start: 0x716C60 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x716C60, c] - - [0x717060, data] - - name: battle/item/dusty_hammer + - [0x716C60, c, lib] + - [0x717060, .data, lib] + - [0x71761C, .data, fire_flower] + - [0x7179D0, .bss, lib] + - name: battle/item/dusty_hammer/ + ld_name: battle_item_dusty_hammer type: code start: 0x7179D0 vram: 0x802A1000 overlay: True subsections: - - [0x7179D0, c] - - [0x717C10, data] - - name: battle/item/pow_block + - [0x7179D0, c, lib] + - [0x717C10, .data, lib] + - [0x7181D0, ci4, dusty_hammer, 32, 32] + - [0x7183D0, palette, dusty_hammer] + - [0x7183F0, .data, dusty_hammer] + - [0x718850, .bss, lib] + - name: battle/item/pow_block/ type: code start: 0x718850 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x718850, c] - - [0x718BF0, data] - - name: battle/item/pebble + - [0x718850, c, lib] + - [0x718BF0, .data, lib] + - [0x7191AC, .data, pow_block] + - [0x719970, .bss, lib] + - name: battle/item/pebble/ type: code start: 0x719970 vram: 0x802A1000 overlay: True subsections: - - [0x719970, c] - - [0x719BB0, data] - - name: battle/item/volt_shroom + - [0x719970, c, lib] + - [0x719BB0, .data, lib] + - [0x71A170, ci4, pebble, 32, 32] + - [0x71A370, palette, pebble] + - [0x71A390, .data, pebble] + - [0x71A7F0, .bss, lib] + - name: battle/item/volt_shroom/ type: code start: 0x71A7F0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x71A7F0, c] - - [0x71AA70, data] - - name: battle/item/thunder_rage + - [0x71A7F0, c, lib] + - [0x71AA70, .data, lib] + - [0x71B02C, .data, volt_shroom] + - [0x71B1A0, .bss, lib] + - name: battle/item/thunder_rage/ type: code start: 0x71B1A0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x71B1A0, c] - - [0x71B640, data] - - name: battle/item/snowman_doll + - [0x71B1A0, c, lib] + - [0x71B640, .data, lib] + - [0x71BBFC, .data, thunder_rage] + - [0x71BE30, .bss, lib] + - name: battle/item/snowman_doll/ type: code start: 0x71BE30 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x71BE30, c] - - [0x71C270, data] - - name: battle/item/dried_shroom + - [0x71BE30, c, lib] + - [0x71C270, .data, lib] + - [0x71C82C, .data, snowman_doll] + - [0x71CCE0, .bss, lib] + - name: battle/item/dried_shroom/ type: code start: 0x71CCE0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x71CCE0, c] - - [0x71D010, data] - - name: battle/item/shooting_star + - [0x71CCE0, c, lib] + - [0x71D010, .data, lib] + - [0x71D5DC, .data, dried_shroom] + - [0x71D770, .bss, lib] + - name: battle/item/shooting_star/ type: code start: 0x71D770 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x71D770, c] - - [0x71DCC0, data] - - name: battle/item/sleepy_sheep + - [0x71D770, c, lib] + - [0x71DCC0, .data, lib] + - [0x71E27C, .data, shooting_star] + - [0x71E650, .bss, lib] + - name: battle/item/sleepy_sheep/ type: code start: 0x71E650 vram: 0x802A1000 overlay: True subsections: - - [0x71E650, c] - - [0x71EFC0, data] - - name: battle/item/stone_cap + - [0x71E650, c, lib] + - [0x71EFC0, .data, lib] + - [0x71F580, ci4, sleepy_sheep1, 56, 48] + - [0x71FAC0, palette, sleepy_sheep1] + - [0x71FAE0, ci4, sleepy_sheep2, 56, 48] + - [0x720020, palette, sleepy_sheep2] + - [0x720040, ci4, sleepy_sheep3, 56, 48] + - [0x720580, palette, sleepy_sheep3] + - [0x7205A0, .data, sleepy_sheep] + - [0x7214D8, .rodata, lib] + - [0x7215A0, .bss, lib] + - name: battle/item/stone_cap/ type: code start: 0x7215A0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x7215A0, c] - - [0x721970, data] - - name: battle/item/tasty_tonic + - [0x7215A0, c, lib] + - [0x721970, .data, lib] + - [0x721F2C, .data, stone_cap] + - [0x722000, .bss, lib] + - name: battle/item/tasty_tonic/ type: code start: 0x722000 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x722000, c] - - [0x7222D0, data] - - name: battle/item/thunder_bolt + - [0x722000, c, lib] + - [0x7222D0, .data, lib] + - [0x72289C, .data, tasty_tonic] + - [0x722B40, .bss, lib] + - name: battle/item/thunder_bolt/ type: code start: 0x722B40 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x722B40, c] - - [0x722FE0, data] - - name: battle/item/ultra_shroom + - [0x722B40, c, lib] + - [0x722FE0, .data, lib] + - [0x72359C, .data, thunder_bolt] + - [0x723780, .bss, lib] + - name: battle/item/ultra_shroom/ type: code start: 0x723780 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x723780, c] - - [0x723AB0, data] - - name: battle/item/unknown_item + - [0x723780, c, lib] + - [0x723AB0, .data, lib] + - [0x72407C, .data, ultra_shroom] + - [0x724240, .bss, lib] + - name: battle/item/unknown_item/ type: code start: 0x724240 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x724240, c] - - [0x724570, data] - - name: battle/item/super_soda + - [0x724240, c, lib] + - [0x724570, .data, lib] + - [0x724B3C, .data, unknown_item] + - [0x724CE0, .bss, lib] + - name: battle/item/super_soda/ type: code start: 0x724CE0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x724CE0, c] - - [0x725210, data] - - name: battle/item/hustle_drink + - [0x724CE0, c, lib] + - [0x725210, .data, lib] + - [0x7257CC, .data, super_soda] + - [0x725F60, .bss, lib] + - name: battle/item/hustle_drink/ type: code start: 0x725F60 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x725F60, c] - - [0x726240, data] - - name: battle/item/stop_watch + - [0x725F60, c, lib] + - [0x726240, .data, lib] + - [0x7267FC, .data, hustle_drink] + - [0x726DD0, .bss, lib] + - name: battle/item/stop_watch/ type: code start: 0x726DD0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x726DD0, c] - - [0x727120, data] - - name: battle/item/dizzy_dial + - [0x726DD0, c, lib] + - [0x727120, .data, lib] + - [0x7276EC, .data, stop_watch] + - [0x727910, .bss, lib] + - name: battle/item/dizzy_dial/ type: code start: 0x727910 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x727910, c] - - [0x727CE0, data] - - name: battle/item/please_come_back + - [0x727910, c, lib] + - [0x727CE0, .data, lib] + - [0x72829C, .data, dizzy_dial] + - [0x7285D0, .rodata, lib] + - [0x7285E0, .bss, lib] + - name: battle/item/please_come_back/ type: code start: 0x7285E0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x7285E0, c] - - [0x728820, data] - - name: battle/item/egg_missile + - [0x7285E0, c, lib] + - [0x728820, .data, lib] + - [0x728DDC, .data, please_come_back] + - [0x728EC0, .bss, lib] + - name: battle/item/egg_missile/ + ld_name: battle_item_egg_missile type: code start: 0x728EC0 vram: 0x802A1000 overlay: True subsections: - - [0x728EC0, c] - - [0x7291D0, data] - - name: battle/item/insecticide_herb + - [0x728EC0, c, lib] + - [0x7291D0, .data, lib] + - [0x729790, ci4, egg_missile1, 32, 32] + - [0x729990, palette, egg_missile1] + - [0x7299B0, ci4, egg_missile2, 32, 32] + - [0x729BB0, palette, egg_missile2] + - [0x729BD0, ci4, egg_missile3, 32, 32] + - [0x729DD0, palette, egg_missile3] + - [0x729DF0, ci4, egg_missile4, 32, 32] + - [0x729FF0, palette, egg_missile4] + - [0x72A010, .data, egg_missile] + - [0x72A750, .bss, lib] + - name: battle/item/insecticide_herb/ type: code start: 0x72A750 vram: 0x802A1000 overlay: True subsections: - - [0x72A750, c] - - [0x72AB70, data] - - name: battle/item/fright_jar + - [0x72A750, c, lib] + - [0x72AB70, .data, lib] + - [0x72B130, ci4, insecticide_herb, 32, 32] + - [0x72B330, palette, insecticide_herb] + - [0x72B350, .data, insecticide_herb] + - [0x72B910, .bss, lib] + - name: battle/item/fright_jar/ type: code start: 0x72B910 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x72B910, c] - - [0x72BC60, data] - - name: battle/item/mystery + - [0x72B910, c, lib] + - [0x72BC60, .data, lib] + - [0x72C22C, .data, fright_jar] + - [0x72C5B0, .bss, lib] + - name: battle/item/mystery/ type: code start: 0x72C5B0 vram: 0x802A1000 overlay: True subsections: - - [0x72C5B0, c] - - [0x72CF00, data] - - name: battle/item/repel_gel + - [0x72C5B0, c, lib] + - [0x72CF00, .data, lib] + - [0x72D4C0, ci4, mystery, 32, 32] + - [0x72D6C0, palette, mystery] + - [0x72D6E0, .data, mystery] + - [0x72DB50, .rodata, lib] + - [0x72DB70, .bss, lib] + - name: battle/item/repel_gel/ type: code start: 0x72DB70 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x72DB70, c] - - [0x72DE00, data] - - name: battle/item/life_shroom + - [0x72DB70, c, lib] + - [0x72DE00, .data, lib] + - [0x72E3CC, .data, repel_gel] + - [0x72E530, .bss, lib] + - name: battle/item/life_shroom/ type: code start: 0x72E530 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x72E530, c] - - [0x72EA20, data] + - [0x72E530, c, lib] + - [0x72EA20, .data, lib] + - [0x72EFEC, .data, life_shroom] + - [0x72F720, .bss, lib] - name: battle/item/coconut/ ld_name: battle_item_coconut type: code @@ -2487,30 +2589,46 @@ segments: - [0x72FF20, ci4, coconut, 32, 32] - [0x730120, palette, coconut] - [0x730140, .data, coconut] - - name: battle/item/electro_pop + - [0x7305A0, .bss, lib] + - name: battle/item/electro_pop/ type: code start: 0x7305A0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x7305A0, c] - - [0x730AE0, data] - - name: battle/item/strange_cake + - [0x7305A0, c, lib] + - [0x730AE0, .data, lib] + - [0x73109C, .data, electro_pop] + - [0x731300, .bss, lib] + - name: battle/item/strange_cake/ type: code start: 0x731300 vram: 0x802A1000 overlay: True subsections: - - [0x731300, c] - - [0x731EA0, data] - - name: battle/item/food + - [0x731300, c, lib] + - [0x731EA0, .data, lib] + - [0x732470, ci4, strange_cake1, 32, 32] + - [0x732670, palette, strange_cake1] + - [0x732690, ci4, strange_cake2, 32, 32] + - [0x732890, palette, strange_cake2] + - [0x7328B0, ci4, strange_cake3, 32, 32] + - [0x732AB0, palette, strange_cake3] + - [0x732AD0, .data, strange_cake] + - [0x7330B0, .rodata, lib] + - [0x7330D0, .bss, lib] + - name: battle/item/food/ type: code start: 0x7330D0 vram: 0x802A1000 overlay: True + subalign: 4 subsections: - - [0x7330D0, c] - - [0x733700, data] + - [0x7330D0, c, lib] + - [0x733700, .data, lib] + - [0x733CBC, .data, food] + - [0x7345A0, .bss, lib] - name: battle/move/hammer type: code start: 0x7345A0 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 42f5d6f66c..d163f3f090 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1739,6 +1739,7 @@ D_800F7B70 = 0x800F7B70; // type:data rom:0x91020 D_800F7B80 = 0x800F7B80; // type:data rom:0x91030 D_800F7B84 = 0x800F7B84; // type:data rom:0x91034 D_800F7B90 = 0x800F7B90; // type:data rom:0x91040 +D_800F7B94 = 0x800F7B94; // type:data rom:0x91044 D_800F7C1C = 0x800F7C1C; // type:data rom:0x910CC D_800F7C30 = 0x800F7C30; // type:data rom:0x910E0 D_800F7C7C = 0x800F7C7C; // type:data rom:0x9112C @@ -4236,6 +4237,7 @@ bPlayerStatusTable = 0x8028342C; // type:data rom:0x1B1D0C bPlayerActorDesc = 0x802834D8; // type:data rom:0x1B1DB8 bMarioParts = 0x80283500; // type:data rom:0x1B1DE0 D_80283524 = 0x80283524; // type:data rom:0x1B1E04 +D_8028358C = 0x8028358C; // type:data rom:0x1B1E6C D_802835D0 = 0x802835D0; // type:data rom:0x1B1EB0 D_802835D4 = 0x802835D4; // type:data rom:0x1B1EB4 D_802835D8 = 0x802835D8; // type:data rom:0x1B1EB8 @@ -6448,124 +6450,317 @@ func_802381C8_7110B8 = 0x802381C8; // type:func rom:0x7110B8 battle_partner_bow_AverageTargetStatusChance = 0x802381E8; // type:func rom:0x7110D8 func_80238000_714CF0 = 0x80238000; // type:func rom:0x714CF0 func_80238028_714D18 = 0x80238028; // type:func rom:0x714D18 -func_802A1000_715850 = 0x802A1000; // type:func rom:0x715850 -func_802A11D4_715A24 = 0x802A11D4; // type:func rom:0x715A24 -func_802A123C_715A8C = 0x802A123C; // type:func rom:0x715A8C -func_802A12EC_715B3C = 0x802A12EC; // type:func rom:0x715B3C -func_802A1378_715BC8 = 0x802A1378; // type:func rom:0x715BC8 -func_802A1438_715C88 = 0x802A1438; // type:func rom:0x715C88 +battle_item_mushroom_GiveRefund = 0x802A1000; // type:func rom:0x715850 +battle_item_mushroom_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x715A24 +battle_item_mushroom_func_802A123C_715A8C = 0x802A123C; // type:func rom:0x715A8C +battle_item_mushroom_func_802A12EC_715B3C = 0x802A12EC; // type:func rom:0x715B3C +battle_item_mushroom_func_802A1378_715BC8 = 0x802A1378; // type:func rom:0x715BC8 +battle_item_mushroom_func_802A1438_715C88 = 0x802A1438; // type:func rom:0x715C88 battle_item_mushroom_AddHP = 0x802A14F8; // type:func rom:0x715D48 battle_item_mushroom_AddFP = 0x802A154C; // type:func rom:0x715D9C -func_802A15A0_715DF0 = 0x802A15A0; // type:func rom:0x715DF0 -func_802A1000_716C60 = 0x802A1000; // type:func rom:0x716C60 -func_802A11D4_716E34 = 0x802A11D4; // type:func rom:0x716E34 -func_802A123C_716E9C = 0x802A123C; // type:func rom:0x716E9C +battle_item_mushroom_func_802A15A0_715DF0 = 0x802A15A0; // type:func rom:0x715DF0 +battle_item_mushroom_UseItemWithEffect = 0x802A1600; // type:data rom:0x715E50 +battle_item_mushroom_UseItem = 0x802A1904; // type:data rom:0x716154 +battle_item_mushroom_PlayerGoHome = 0x802A1A30; // type:data rom:0x716280 +battle_item_mushroom_EatItem = 0x802A1ACC; // type:data rom:0x71631C +battle_item_mushroom_DrinkItem = 0x802A1B44; // type:data rom:0x716394 +battle_item_mushroom_script6 = 0x802A1BBC; // type:data rom:0x71640C +battle_item_mushroom_main = 0x802A20CC; // type:data rom:0x71691C +battle_item_fire_flower_GiveRefund = 0x802A1000; // type:func rom:0x716C60 +battle_item_fire_flower_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x716E34 +battle_item_fire_flower_func_802A123C_716E9C = 0x802A123C; // type:func rom:0x716E9C battle_item_fire_flower_FadeBackgroundToBlack = 0x802A12E0; // type:func rom:0x716F40 -func_802A1378_716FD8 = 0x802A1378; // type:func rom:0x716FD8 -func_802A1000_7179D0 = 0x802A1000; // type:func rom:0x7179D0 -func_802A11D4_717BA4 = 0x802A11D4; // type:func rom:0x717BA4 -func_802A1000_718850 = 0x802A1000; // type:func rom:0x718850 -func_802A11D4_718A24 = 0x802A11D4; // type:func rom:0x718A24 -func_802A123C_718A8C = 0x802A123C; // type:func rom:0x718A8C -func_802A12E4_718B34 = 0x802A12E4; // type:func rom:0x718B34 -func_802A1318_718B68 = 0x802A1318; // type:func rom:0x718B68 -func_802A1000_719970 = 0x802A1000; // type:func rom:0x719970 -func_802A11D4_719B44 = 0x802A11D4; // type:func rom:0x719B44 -func_802A1000_71A7F0 = 0x802A1000; // type:func rom:0x71A7F0 -func_802A11D4_71A9C4 = 0x802A11D4; // type:func rom:0x71A9C4 -func_802A123C_71AA2C = 0x802A123C; // type:func rom:0x71AA2C -func_802A1000_71B1A0 = 0x802A1000; // type:func rom:0x71B1A0 -func_802A11D4_71B374 = 0x802A11D4; // type:func rom:0x71B374 +battle_item_fire_flower_func_802A1378_716FD8 = 0x802A1378; // type:func rom:0x716FD8 +battle_item_fire_flower_UseItemWithEffect = 0x802A1400; // type:data rom:0x717060 +battle_item_fire_flower_UseItem = 0x802A1704; // type:data rom:0x717364 +battle_item_fire_flower_PlayerGoHome = 0x802A1830; // type:data rom:0x717490 +battle_item_fire_flower_EatItem = 0x802A18CC; // type:data rom:0x71752C +battle_item_fire_flower_DrinkItem = 0x802A1944; // type:data rom:0x7175A4 +battle_item_fire_flower_main = 0x802A19BC; // type:data rom:0x71761C +battle_item_dusty_hammer_GiveRefund = 0x802A1000; // type:func rom:0x7179D0 +battle_item_dusty_hammer_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x717BA4 +battle_item_dusty_hammer_UseItemWithEffect = 0x802A1240; // type:data rom:0x717C10 +battle_item_dusty_hammer_UseItem = 0x802A1544; // type:data rom:0x717F14 +battle_item_dusty_hammer_PlayerGoHome = 0x802A1670; // type:data rom:0x718040 +battle_item_dusty_hammer_EatItem = 0x802A170C; // type:data rom:0x7180DC +battle_item_dusty_hammer_DrinkItem = 0x802A1784; // type:data rom:0x718154 +battle_item_dusty_hammer_model = 0x802A1A20; // type:data rom:0x7183F0 +battle_item_dusty_hammer_displayList = 0x802A1A60; // type:data rom:0x718430 +battle_item_dusty_hammer_modelCommandList = 0x802A1B50; // type:data rom:0x718520 +battle_item_dusty_hammer_main = 0x802A1B6C; // type:data rom:0x71853C +battle_item_pow_block_GiveRefund = 0x802A1000; // type:func rom:0x718850 +battle_item_pow_block_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x718A24 +battle_item_pow_block_func_802A123C_718A8C = 0x802A123C; // type:func rom:0x718A8C +battle_item_pow_block_func_802A12E4_718B34 = 0x802A12E4; // type:func rom:0x718B34 +battle_item_pow_block_func_802A1318_718B68 = 0x802A1318; // type:func rom:0x718B68 +battle_item_pow_block_UseItemWithEffect = 0x802A13A0; // type:data rom:0x718BF0 +battle_item_pow_block_UseItem = 0x802A16A4; // type:data rom:0x718EF4 +battle_item_pow_block_PlayerGoHome = 0x802A17D0; // type:data rom:0x719020 +battle_item_pow_block_EatItem = 0x802A186C; // type:data rom:0x7190BC +battle_item_pow_block_DrinkItem = 0x802A18E4; // type:data rom:0x719134 +battle_item_pow_block_main = 0x802A195C; // type:data rom:0x7191AC +battle_item_pebble_GiveRefund = 0x802A1000; // type:func rom:0x719970 +battle_item_pebble_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x719B44 +battle_item_pebble_UseItemWithEffect = 0x802A1240; // type:data rom:0x719BB0 +battle_item_pebble_UseItem = 0x802A1544; // type:data rom:0x719EB4 +battle_item_pebble_PlayerGoHome = 0x802A1670; // type:data rom:0x719FE0 +battle_item_pebble_EatItem = 0x802A170C; // type:data rom:0x71A07C +battle_item_pebble_DrinkItem = 0x802A1784; // type:data rom:0x71A0F4 +battle_item_pebble_model = 0x802A1A20; // type:data rom:0x71A390 +battle_item_pebble_displayList = 0x802A1A60; // type:data rom:0x71A3D0 +battle_item_pebble_modelCommandList = 0x802A1B50; // type:data rom:0x71A4C0 +battle_item_pebble_main = 0x802A1B6C; // type:data rom:0x71A4DC +battle_item_volt_shroom_GiveRefund = 0x802A1000; // type:func rom:0x71A7F0 +battle_item_volt_shroom_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71A9C4 +battle_item_volt_shroom_func_802A123C_71AA2C = 0x802A123C; // type:func rom:0x71AA2C +battle_item_volt_shroom_UseItemWithEffect = 0x802A1280; // type:data rom:0x71AA70 +battle_item_volt_shroom_UseItem = 0x802A1584; // type:data rom:0x71AD74 +battle_item_volt_shroom_PlayerGoHome = 0x802A16B0; // type:data rom:0x71AEA0 +battle_item_volt_shroom_EatItem = 0x802A174C; // type:data rom:0x71AF3C +battle_item_volt_shroom_DrinkItem = 0x802A17C4; // type:data rom:0x71AFB4 +battle_item_volt_shroom_main = 0x802A183C; // type:data rom:0x71B02C +battle_item_thunder_rage_GiveRefund = 0x802A1000; // type:func rom:0x71B1A0 +battle_item_thunder_rage_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71B374 battle_item_thunder_rage_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x71B3DC -func_802A12D4_71B474 = 0x802A12D4; // type:func rom:0x71B474 -func_802A1354_71B4F4 = 0x802A1354; // type:func rom:0x71B4F4 -func_802A1000_71BE30 = 0x802A1000; // type:func rom:0x71BE30 -func_802A11D4_71C004 = 0x802A11D4; // type:func rom:0x71C004 -func_802A123C_71C06C = 0x802A123C; // type:func rom:0x71C06C +battle_item_thunder_rage_func_802A12D4_71B474 = 0x802A12D4; // type:func rom:0x71B474 +battle_item_thunder_rage_func_802A1354_71B4F4 = 0x802A1354; // type:func rom:0x71B4F4 +battle_item_thunder_rage_UseItemWithEffect = 0x802A14A0; // type:data rom:0x71B640 +battle_item_thunder_rage_UseItem = 0x802A17A4; // type:data rom:0x71B944 +battle_item_thunder_rage_PlayerGoHome = 0x802A18D0; // type:data rom:0x71BA70 +battle_item_thunder_rage_EatItem = 0x802A196C; // type:data rom:0x71BB0C +battle_item_thunder_rage_DrinkItem = 0x802A19E4; // type:data rom:0x71BB84 +battle_item_thunder_rage_main = 0x802A1A5C; // type:data rom:0x71BBFC +battle_item_snowman_doll_GiveRefund = 0x802A1000; // type:func rom:0x71BE30 +battle_item_snowman_doll_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71C004 +battle_item_snowman_doll_func_802A123C_71C06C = 0x802A123C; // type:func rom:0x71C06C battle_item_snowman_doll_FadeBackgroundToBlack = 0x802A1320; // type:func rom:0x71C150 -func_802A13B8_71C1E8 = 0x802A13B8; // type:func rom:0x71C1E8 -func_802A1000_71CCE0 = 0x802A1000; // type:func rom:0x71CCE0 -func_802A11D4_71CEB4 = 0x802A11D4; // type:func rom:0x71CEB4 -func_802A123C_71CF1C = 0x802A123C; // type:func rom:0x71CF1C -func_802A12FC_71CFDC = 0x802A12FC; // type:func rom:0x71CFDC -func_802A1000_71D770 = 0x802A1000; // type:func rom:0x71D770 -func_802A11D4_71D944 = 0x802A11D4; // type:func rom:0x71D944 -func_802A123C_71D9AC = 0x802A123C; // type:func rom:0x71D9AC -func_802A1388_71DAF8 = 0x802A1388; // type:func rom:0x71DAF8 -func_802A1444_71DBB4 = 0x802A1444; // type:func rom:0x71DBB4 -func_802A14D4_71DC44 = 0x802A14D4; // type:func rom:0x71DC44 -func_802A1000_71E650 = 0x802A1000; // type:func rom:0x71E650 -func_802A11D4_71E824 = 0x802A11D4; // type:func rom:0x71E824 -func_802A123C_71E88C = 0x802A123C; // type:func rom:0x71E88C -func_802A1740_71ED90 = 0x802A1740; // type:func rom:0x71ED90 -func_802A1848_71EE98 = 0x802A1848; // type:func rom:0x71EE98 -func_802A1000_7215A0 = 0x802A1000; // type:func rom:0x7215A0 -func_802A11D4_721774 = 0x802A11D4; // type:func rom:0x721774 -func_802A123C_7217DC = 0x802A123C; // type:func rom:0x7217DC -func_802A1000_722000 = 0x802A1000; // type:func rom:0x722000 -func_802A11D4_7221D4 = 0x802A11D4; // type:func rom:0x7221D4 -func_802A123C_72223C = 0x802A123C; // type:func rom:0x72223C -func_802A1000_722B40 = 0x802A1000; // type:func rom:0x722B40 -func_802A11D4_722D14 = 0x802A11D4; // type:func rom:0x722D14 -func_802A123C_722D7C = 0x802A123C; // type:func rom:0x722D7C +battle_item_snowman_doll_func_802A13B8_71C1E8 = 0x802A13B8; // type:func rom:0x71C1E8 +battle_item_snowman_doll_UseItemWithEffect = 0x802A1440; // type:data rom:0x71C270 +battle_item_snowman_doll_UseItem = 0x802A1744; // type:data rom:0x71C574 +battle_item_snowman_doll_PlayerGoHome = 0x802A1870; // type:data rom:0x71C6A0 +battle_item_snowman_doll_EatItem = 0x802A190C; // type:data rom:0x71C73C +battle_item_snowman_doll_DrinkItem = 0x802A1984; // type:data rom:0x71C7B4 +battle_item_snowman_doll_main = 0x802A19FC; // type:data rom:0x71C82C +battle_item_dried_shroom_GiveRefund = 0x802A1000; // type:func rom:0x71CCE0 +battle_item_dried_shroom_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71CEB4 +battle_item_dried_shroom_func_802A123C_71CF1C = 0x802A123C; // type:func rom:0x71CF1C +battle_item_dried_shroom_func_802A12FC_71CFDC = 0x802A12FC; // type:func rom:0x71CFDC +battle_item_dried_shroom_UseItemWithEffect = 0x802A1340; // type:data rom:0x71D020 +battle_item_dried_shroom_UseItem = 0x802A1644; // type:data rom:0x71D324 +battle_item_dried_shroom_PlayerGoHome = 0x802A1770; // type:data rom:0x71D450 +battle_item_dried_shroom_EatItem = 0x802A180C; // type:data rom:0x71D4EC +battle_item_dried_shroom_DrinkItem = 0x802A1884; // type:data rom:0x71D564 +battle_item_dried_shroom_main = 0x802A18FC; // type:data rom:0x71D5DC +battle_item_shooting_star_GiveRefund = 0x802A1000; // type:func rom:0x71D770 +battle_item_shooting_star_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71D944 +battle_item_shooting_star_func_802A123C_71D9AC = 0x802A123C; // type:func rom:0x71D9AC +battle_item_shooting_star_func_802A1388_71DAF8 = 0x802A1388; // type:func rom:0x71DAF8 +battle_item_shooting_star_func_802A1444_71DBB4 = 0x802A1444; // type:func rom:0x71DBB4 +battle_item_shooting_star_func_802A14D4_71DC44 = 0x802A14D4; // type:func rom:0x71DC44 +battle_item_shooting_star_UseItemWithEffect = 0x802A1550; // type:data rom:0x71DCC0 +battle_item_shooting_star_UseItem = 0x802A1854; // type:data rom:0x71DFC4 +battle_item_shooting_star_PlayerGoHome = 0x802A1980; // type:data rom:0x71E0F0 +battle_item_shooting_star_EatItem = 0x802A1A1C; // type:data rom:0x71E18C +battle_item_shooting_star_DrinkItem = 0x802A1A94; // type:data rom:0x71E204 +battle_item_shooting_star_main = 0x802A1B0C; // type:data rom:0x71E27C +battle_item_sleepy_sheep_GiveRefund = 0x802A1000; // type:func rom:0x71E650 +battle_item_sleepy_sheep_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x71E824 +battle_item_sleepy_sheep_func_802A123C_71E88C = 0x802A123C; // type:func rom:0x71E88C +battle_item_sleepy_sheep_func_802A1740_71ED90 = 0x802A1740; // type:func rom:0x71ED90 +battle_item_sleepy_sheep_func_802A1848_71EE98 = 0x802A1848; // type:func rom:0x71EE98 +battle_item_sleepy_sheep_UseItemWithEffect = 0x802A1970; // type:data rom:0x71EFC0 +battle_item_sleepy_sheep_UseItem = 0x802A1C74; // type:data rom:0x71F2C4 +battle_item_sleepy_sheep_PlayerGoHome = 0x802A1DA0; // type:data rom:0x71F3F0 +battle_item_sleepy_sheep_EatItem = 0x802A1E3C; // type:data rom:0x71F48C +battle_item_sleepy_sheep_DrinkItem = 0x802A1EB4; // type:data rom:0x71F504 +battle_item_sleepy_sheep_model = 0x802A2F50; // type:data rom:0x7205A0 +battle_item_sleepy_sheep_frame1_displayList = 0x802A2F90; // type:data rom:0x7205E0 +battle_item_sleepy_sheep_frame2_displayList = 0x802A3080; // type:data rom:0x7206D0 +battle_item_sleepy_sheep_frame3_displayList = 0x802A3170; // type:data rom:0x7207C0 +battle_item_sleepy_sheep_modelCommandList = 0x802A3260; // type:data rom:0x7208B0 +battle_item_sleepy_sheep_main = 0x802A3320; // type:data rom:0x720970 +D_802A3E88_7214D8 = 0x802A3E88; // type:data rom:0x7214D8 +D_802A3F00_721550 = 0x802A3F00; // type:data rom:0x721550 +D_802A3F28_721578 = 0x802A3F28; // type:data rom:0x721578 +battle_item_stone_cap_GiveRefund = 0x802A1000; // type:func rom:0x7215A0 +battle_item_stone_cap_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x721774 +battle_item_stone_cap_func_802A123C_7217DC = 0x802A123C; // type:func rom:0x7217DC +battle_item_stone_cap_UseItemWithEffect = 0x802A13D0; // type:data rom:0x721970 +battle_item_stone_cap_UseItem = 0x802A16D4; // type:data rom:0x721C74 +battle_item_stone_cap_PlayerGoHome = 0x802A1800; // type:data rom:0x721DA0 +battle_item_stone_cap_EatItem = 0x802A189C; // type:data rom:0x721E3C +battle_item_stone_cap_DrinkItem = 0x802A1914; // type:data rom:0x721EB4 +battle_item_stone_cap_main = 0x802A198C; // type:data rom:0x721F2C +battle_item_tasty_tonic_GiveRefund = 0x802A1000; // type:func rom:0x722000 +battle_item_tasty_tonic_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x7221D4 +battle_item_tasty_tonic_func_802A123C_72223C = 0x802A123C; // type:func rom:0x72223C +battle_item_tasty_tonic_UseItemWithEffect = 0x802A12E0; // type:data rom:0x7222E0 +battle_item_tasty_tonic_UseItem = 0x802A15E4; // type:data rom:0x7225E4 +battle_item_tasty_tonic_PlayerGoHome = 0x802A1710; // type:data rom:0x722710 +battle_item_tasty_tonic_EatItem = 0x802A17AC; // type:data rom:0x7227AC +battle_item_tasty_tonic_DrinkItem = 0x802A1824; // type:data rom:0x722824 +battle_item_tasty_tonic_main = 0x802A189C; // type:data rom:0x72289C +battle_item_thunder_bolt_GiveRefund = 0x802A1000; // type:func rom:0x722B40 +battle_item_thunder_bolt_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x722D14 +battle_item_thunder_bolt_func_802A123C_722D7C = 0x802A123C; // type:func rom:0x722D7C battle_item_thunder_bolt_FadeBackgroundToBlack = 0x802A1388; // type:func rom:0x722EC8 -func_802A1420_722F60 = 0x802A1420; // type:func rom:0x722F60 -func_802A1000_723780 = 0x802A1000; // type:func rom:0x723780 -func_802A11D4_723954 = 0x802A11D4; // type:func rom:0x723954 -func_802A123C_7239BC = 0x802A123C; // type:func rom:0x7239BC -func_802A12FC_723A7C = 0x802A12FC; // type:func rom:0x723A7C -func_802A1000_724240 = 0x802A1000; // type:func rom:0x724240 -func_802A11D4_724414 = 0x802A11D4; // type:func rom:0x724414 -func_802A123C_72447C = 0x802A123C; // type:func rom:0x72447C -func_802A12FC_72453C = 0x802A12FC; // type:func rom:0x72453C -func_802A1000_724CE0 = 0x802A1000; // type:func rom:0x724CE0 -func_802A11D4_724EB4 = 0x802A11D4; // type:func rom:0x724EB4 -func_802A123C_724F1C = 0x802A123C; // type:func rom:0x724F1C -func_802A12EC_724FCC = 0x802A12EC; // type:func rom:0x724FCC -func_802A1378_725058 = 0x802A1378; // type:func rom:0x725058 -func_802A1418_7250F8 = 0x802A1418; // type:func rom:0x7250F8 +battle_item_thunder_bolt_func_802A1420_722F60 = 0x802A1420; // type:func rom:0x722F60 +battle_item_thunder_bolt_UseItemWithEffect = 0x802A14A0; // type:data rom:0x722FE0 +battle_item_thunder_bolt_UseItem = 0x802A17A4; // type:data rom:0x7232E4 +battle_item_thunder_bolt_PlayerGoHome = 0x802A18D0; // type:data rom:0x723410 +battle_item_thunder_bolt_EatItem = 0x802A196C; // type:data rom:0x7234AC +battle_item_thunder_bolt_DrinkItem = 0x802A19E4; // type:data rom:0x723524 +battle_item_thunder_bolt_main = 0x802A1A5C; // type:data rom:0x72359C +battle_item_ultra_shroom_GiveRefund = 0x802A1000; // type:func rom:0x723780 +battle_item_ultra_shroom_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x723954 +battle_item_ultra_shroom_func_802A123C_7239BC = 0x802A123C; // type:func rom:0x7239BC +battle_item_ultra_shroom_func_802A12FC_723A7C = 0x802A12FC; // type:func rom:0x723A7C +battle_item_ultra_shroom_UseItemWithEffect = 0x802A1340; // type:data rom:0x723AC0 +battle_item_ultra_shroom_UseItem = 0x802A1644; // type:data rom:0x723DC4 +battle_item_ultra_shroom_PlayerGoHome = 0x802A1770; // type:data rom:0x723EF0 +battle_item_ultra_shroom_EatItem = 0x802A180C; // type:data rom:0x723F8C +battle_item_ultra_shroom_DrinkItem = 0x802A1884; // type:data rom:0x724004 +battle_item_ultra_shroom_main = 0x802A18FC; // type:data rom:0x72407C +battle_item_unknown_item_GiveRefund = 0x802A1000; // type:func rom:0x724240 +battle_item_unknown_item_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x724414 +battle_item_unknown_item_func_802A123C_72447C = 0x802A123C; // type:func rom:0x72447C +battle_item_unknown_item_func_802A12FC_72453C = 0x802A12FC; // type:func rom:0x72453C +battle_item_unknown_item_UseItemWithEffect = 0x802A1340; // type:data rom:0x724580 +battle_item_unknown_item_UseItem = 0x802A1644; // type:data rom:0x724884 +battle_item_unknown_item_PlayerGoHome = 0x802A1770; // type:data rom:0x7249B0 +battle_item_unknown_item_EatItem = 0x802A180C; // type:data rom:0x724A4C +battle_item_unknown_item_DrinkItem = 0x802A1884; // type:data rom:0x724AC4 +battle_item_unknown_item_main = 0x802A18FC; // type:data rom:0x724B3C +battle_item_super_soda_GiveRefund = 0x802A1000; // type:func rom:0x724CE0 +battle_item_super_soda_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x724EB4 +battle_item_super_soda_func_802A123C_724F1C = 0x802A123C; // type:func rom:0x724F1C +battle_item_super_soda_func_802A12EC_724FCC = 0x802A12EC; // type:func rom:0x724FCC +battle_item_super_soda_func_802A1378_725058 = 0x802A1378; // type:func rom:0x725058 +battle_item_super_soda_func_802A1418_7250F8 = 0x802A1418; // type:func rom:0x7250F8 battle_item_super_soda_AddFP = 0x802A14D8; // type:func rom:0x7251B8 -func_802A1000_725F60 = 0x802A1000; // type:func rom:0x725F60 -func_802A11D4_726134 = 0x802A11D4; // type:func rom:0x726134 -func_802A123C_72619C = 0x802A123C; // type:func rom:0x72619C -func_802A12C4_726224 = 0x802A12C4; // type:func rom:0x726224 -func_802A1000_726DD0 = 0x802A1000; // type:func rom:0x726DD0 -func_802A11D4_726FA4 = 0x802A11D4; // type:func rom:0x726FA4 +battle_item_super_soda_UseItemWithEffect = 0x802A1530; // type:data rom:0x725210 +battle_item_super_soda_UseItem = 0x802A1834; // type:data rom:0x725514 +battle_item_super_soda_PlayerGoHome = 0x802A1960; // type:data rom:0x725640 +battle_item_super_soda_EatItem = 0x802A19FC; // type:data rom:0x7256DC +battle_item_super_soda_DrinkItem = 0x802A1A74; // type:data rom:0x725754 +battle_item_super_soda_script6 = 0x802A1AEC; // type:data rom:0x7257CC +battle_item_super_soda_main = 0x802A1FFC; // type:data rom:0x725CDC +battle_item_hustle_drink_GiveRefund = 0x802A1000; // type:func rom:0x725F60 +battle_item_hustle_drink_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x726134 +battle_item_hustle_drink_func_802A123C_72619C = 0x802A123C; // type:func rom:0x72619C +battle_item_hustle_drink_func_802A12C4_726224 = 0x802A12C4; // type:func rom:0x726224 +battle_item_hustle_drink_UseItemWithEffect = 0x802A12E0; // type:data rom:0x726240 +battle_item_hustle_drink_UseItem = 0x802A15E4; // type:data rom:0x726544 +battle_item_hustle_drink_PlayerGoHome = 0x802A1710; // type:data rom:0x726670 +battle_item_hustle_drink_EatItem = 0x802A17AC; // type:data rom:0x72670C +battle_item_hustle_drink_DrinkItem = 0x802A1824; // type:data rom:0x726784 +battle_item_hustle_drink_main = 0x802A189C; // type:data rom:0x7267FC +battle_item_stop_watch_GiveRefund = 0x802A1000; // type:func rom:0x726DD0 +battle_item_stop_watch_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x726FA4 battle_item_stop_watch_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x72700C -func_802A12D4_7270A4 = 0x802A12D4; // type:func rom:0x7270A4 -func_802A1000_727910 = 0x802A1000; // type:func rom:0x727910 -func_802A11D4_727AE4 = 0x802A11D4; // type:func rom:0x727AE4 +battle_item_stop_watch_func_802A12D4_7270A4 = 0x802A12D4; // type:func rom:0x7270A4 +battle_item_stop_watch_UseItemWithEffect = 0x802A1360; // type:data rom:0x727130 +battle_item_stop_watch_UseItem = 0x802A1664; // type:data rom:0x727434 +battle_item_stop_watch_PlayerGoHome = 0x802A1790; // type:data rom:0x727560 +battle_item_stop_watch_EatItem = 0x802A182C; // type:data rom:0x7275FC +battle_item_stop_watch_DrinkItem = 0x802A18A4; // type:data rom:0x727674 +battle_item_stop_watch_main = 0x802A191C; // type:data rom:0x7276EC +battle_item_dizzy_dial_GiveRefund = 0x802A1000; // type:func rom:0x727910 +battle_item_dizzy_dial_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x727AE4 func_802A123C_727B4C = 0x802A123C; // type:func rom:0x727B4C -func_802A1270_727B80 = 0x802A1270; // type:func rom:0x727B80 -func_802A1000_7285E0 = 0x802A1000; // type:func rom:0x7285E0 -func_802A11D4_7287B4 = 0x802A11D4; // type:func rom:0x7287B4 -func_802A1000_728EC0 = 0x802A1000; // type:func rom:0x728EC0 -func_802A11D4_729094 = 0x802A11D4; // type:func rom:0x729094 -func_802A123C_7290FC = 0x802A123C; // type:func rom:0x7290FC -func_802A1000_72A750 = 0x802A1000; // type:func rom:0x72A750 -func_802A11D4_72A924 = 0x802A11D4; // type:func rom:0x72A924 -func_802A123C_72A98C = 0x802A123C; // type:func rom:0x72A98C -func_802A1280_72A9D0 = 0x802A1280; // type:func rom:0x72A9D0 -func_802A12E0_72AA30 = 0x802A12E0; // type:func rom:0x72AA30 -func_802A1000_72B910 = 0x802A1000; // type:func rom:0x72B910 -func_802A11D4_72BAE4 = 0x802A11D4; // type:func rom:0x72BAE4 +battle_item_dizzy_dial_func_802A1270_727B80 = 0x802A1270; // type:func rom:0x727B80 +battle_item_dizzy_dial_UseItemWithEffect = 0x802A13D0; // type:data rom:0x727CE0 +battle_item_dizzy_dial_UseItem = 0x802A16D4; // type:data rom:0x727FE4 +battle_item_dizzy_dial_PlayerGoHome = 0x802A1800; // type:data rom:0x728110 +battle_item_dizzy_dial_EatItem = 0x802A189C; // type:data rom:0x7281AC +battle_item_dizzy_dial_DrinkItem = 0x802A1914; // type:data rom:0x728224 +battle_item_dizzy_dial_main = 0x802A198C; // type:data rom:0x72829C +battle_item_please_come_back_GiveRefund = 0x802A1000; // type:func rom:0x7285E0 +battle_item_please_come_back_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x7287B4 +battle_item_please_come_back_UseItemWithEffect = 0x802A1240; // type:data rom:0x728820 +battle_item_please_come_back_UseItem = 0x802A1544; // type:data rom:0x728B24 +battle_item_please_come_back_PlayerGoHome = 0x802A1670; // type:data rom:0x728C50 +battle_item_please_come_back_EatItem = 0x802A170C; // type:data rom:0x728CEC +battle_item_please_come_back_DrinkItem = 0x802A1784; // type:data rom:0x728D64 +battle_item_please_come_back_main = 0x802A17FC; // type:data rom:0x728DDC +battle_item_egg_missile_GiveRefund = 0x802A1000; // type:func rom:0x728EC0 +battle_item_egg_missile_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x729094 +battle_item_egg_missile_func_802A123C_71CF1C = 0x802A123C; // type:func rom:0x7290FC +battle_item_egg_missile_UseItemWithEffect = 0x802A1310; // type:data rom:0x7291D0 +battle_item_egg_missile_UseItem = 0x802A1614; // type:data rom:0x7294D4 +battle_item_egg_missile_PlayerGoHome = 0x802A1740; // type:data rom:0x729600 +battle_item_egg_missile_EatItem = 0x802A17DC; // type:data rom:0x72969C +battle_item_egg_missile_DrinkItem = 0x802A1854; // type:data rom:0x729714 +battle_item_egg_missile_model = 0x802A2150; // type:data rom:0x72A010 +battle_item_egg_missile_frame1_displayList = 0x802A2190; // type:data rom:0x72A050 +battle_item_egg_missile_frame2_displayList = 0x802A2280; // type:data rom:0x72A140 +battle_item_egg_missile_frame3_displayList = 0x802A2370; // type:data rom:0x72A230 +battle_item_egg_missile_frame4_displayList = 0x802A2460; // type:data rom:0x72A320 +battle_item_egg_missile_modelCommandList = 0x802A2550; // type:data rom:0x72A410 +battle_item_egg_missile_main = 0x802A25A0; // type:data rom:0x72A460 +battle_item_insecticide_herb_GiveRefund = 0x802A1000; // type:func rom:0x72A750 +battle_item_insecticide_herb_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72A924 +battle_item_insecticide_herb_func_802A123C_72A98C = 0x802A123C; // type:func rom:0x72A98C +battle_item_insecticide_herb_func_802A1280_72A9D0 = 0x802A1280; // type:func rom:0x72A9D0 +battle_item_insecticide_herb_func_802A12E0_72AA30 = 0x802A12E0; // type:func rom:0x72AA30 +battle_item_insecticide_herb_UseItemWithEffect = 0x802A1420; // type:data rom:0x72AB70 +battle_item_insecticide_herb_UseItem = 0x802A1724; // type:data rom:0x72AE74 +battle_item_insecticide_herb_PlayerGoHome = 0x802A1850; // type:data rom:0x72AFA0 +battle_item_insecticide_herb_EatItem = 0x802A18EC; // type:data rom:0x72B03C +battle_item_insecticide_herb_DrinkItem = 0x802A1964; // type:data rom:0x72B0B4 +battle_item_insecticide_herb_model = 0x802A1C00; // type:data rom:0x72B350 +battle_item_insecticide_herb_displayList = 0x802A1C40; // type:data rom:0x72B390 +battle_item_insecticide_herb_modelCommandList = 0x802A1D30; // type:data rom:0x72B480 +script = 0x802A1D4C; // type:data rom:0x72B49C +battle_item_fright_jar_GiveRefund = 0x802A1000; // type:func rom:0x72B910 +battle_item_fright_jar_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72BAE4 battle_item_fright_jar_FadeBackgroundToBlack = 0x802A123C; // type:func rom:0x72BB4C -func_802A12D4_72BBE4 = 0x802A12D4; // type:func rom:0x72BBE4 -func_802A1000_72C5B0 = 0x802A1000; // type:func rom:0x72C5B0 -func_802A11D4_72C784 = 0x802A11D4; // type:func rom:0x72C784 -func_802A123C_72C7EC = 0x802A123C; // type:func rom:0x72C7EC -func_802A13E4_72C994 = 0x802A13E4; // type:func rom:0x72C994 -func_802A188C_72CE3C = 0x802A188C; // type:func rom:0x72CE3C -func_802A1000_72DB70 = 0x802A1000; // type:func rom:0x72DB70 -func_802A11D4_72DD44 = 0x802A11D4; // type:func rom:0x72DD44 -func_802A123C_72DDAC = 0x802A123C; // type:func rom:0x72DDAC -func_802A1000_72E530 = 0x802A1000; // type:func rom:0x72E530 -func_802A11D4_72E704 = 0x802A11D4; // type:func rom:0x72E704 -func_802A123C_72E76C = 0x802A123C; // type:func rom:0x72E76C -func_802A12EC_72E81C = 0x802A12EC; // type:func rom:0x72E81C -func_802A1378_72E8A8 = 0x802A1378; // type:func rom:0x72E8A8 -func_802A1438_72E968 = 0x802A1438; // type:func rom:0x72E968 -func_802A1484_72E9B4 = 0x802A1484; // type:func rom:0x72E9B4 +battle_item_fright_jar_func_802A12D4_72BBE4 = 0x802A12D4; // type:func rom:0x72BBE4 +battle_item_fright_jar_UseItemWithEffect = 0x802A1360; // type:data rom:0x72BC70 +battle_item_fright_jar_UseItem = 0x802A1664; // type:data rom:0x72BF74 +battle_item_fright_jar_PlayerGoHome = 0x802A1790; // type:data rom:0x72C0A0 +battle_item_fright_jar_EatItem = 0x802A182C; // type:data rom:0x72C13C +battle_item_fright_jar_DrinkItem = 0x802A18A4; // type:data rom:0x72C1B4 +battle_item_fright_jar_main = 0x802A191C; // type:data rom:0x72C22C +battle_item_mystery_GiveRefund = 0x802A1000; // type:func rom:0x72C5B0 +battle_item_mystery_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72C784 +battle_item_mystery_func_802A123C_72C7EC = 0x802A123C; // type:func rom:0x72C7EC +battle_item_mystery_func_802A13E4_72C994 = 0x802A13E4; // type:func rom:0x72C994 +battle_item_mystery_func_802A188C_72CE3C = 0x802A188C; // type:func rom:0x72CE3C +battle_item_mystery_UseItemWithEffect = 0x802A1950; // type:data rom:0x72CF00 +battle_item_mystery_UseItem = 0x802A1C54; // type:data rom:0x72D204 +battle_item_mystery_PlayerGoHome = 0x802A1D80; // type:data rom:0x72D330 +battle_item_mystery_EatItem = 0x802A1E1C; // type:data rom:0x72D3CC +battle_item_mystery_DrinkItem = 0x802A1E94; // type:data rom:0x72D444 +battle_item_mystery_model = 0x802A2130; // type:data rom:0x72D6E0 +battle_item_mystery_displayList = 0x802A2170; // type:data rom:0x72D720 +battle_item_mystery_modelCommandList = 0x802A2260; // type:data rom:0x72D810 +battle_item_mystery_D_802A227C_72D82C = 0x802A227C; // type:data rom:0x72D82C +battle_item_mystery_D_802A229C_72D84C = 0x802A229C; // type:data rom:0x72D84C +battle_item_mystery_main = 0x802A22BC; // type:data rom:0x72D86C +battle_item_repel_gel_GiveRefund = 0x802A1000; // type:func rom:0x72DB70 +battle_item_repel_gel_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72DD44 +battle_item_repel_gel_func_802A123C_72DDAC = 0x802A123C; // type:func rom:0x72DDAC +battle_item_repel_gel_UseItemWithEffect = 0x802A12A0; // type:data rom:0x72DE10 +battle_item_repel_gel_UseItem = 0x802A15A4; // type:data rom:0x72E114 +battle_item_repel_gel_PlayerGoHome = 0x802A16D0; // type:data rom:0x72E240 +battle_item_repel_gel_EatItem = 0x802A176C; // type:data rom:0x72E2DC +battle_item_repel_gel_DrinkItem = 0x802A17E4; // type:data rom:0x72E354 +battle_item_repel_gel_main = 0x802A185C; // type:data rom:0x72E3CC +battle_item_life_shroom_GiveRefund = 0x802A1000; // type:func rom:0x72E530 +battle_item_life_shroom_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72E704 +battle_item_life_shroom_func_802A123C_72E76C = 0x802A123C; // type:func rom:0x72E76C +battle_item_life_shroom_func_802A12EC_72E81C = 0x802A12EC; // type:func rom:0x72E81C +battle_item_life_shroom_func_802A1378_72E8A8 = 0x802A1378; // type:func rom:0x72E8A8 +battle_item_life_shroom_func_802A1438_72E968 = 0x802A1438; // type:func rom:0x72E968 +battle_item_life_shroom_func_802A1484_72E9B4 = 0x802A1484; // type:func rom:0x72E9B4 +battle_item_life_shroom_UseItemWithEffect = 0x802A1500; // type:data rom:0x72EA30 +battle_item_life_shroom_UseItem = 0x802A1804; // type:data rom:0x72ED34 +battle_item_life_shroom_PlayerGoHome = 0x802A1930; // type:data rom:0x72EE60 +battle_item_life_shroom_EatItem = 0x802A19CC; // type:data rom:0x72EEFC +battle_item_life_shroom_DrinkItem = 0x802A1A44; // type:data rom:0x72EF74 +battle_item_life_shroom_script6 = 0x802A1ABC; // type:data rom:0x72EFEC +battle_item_life_shroom_main = 0x802A1FCC; // type:data rom:0x72F4FC battle_item_coconut_GiveRefund = 0x802A1000; // type:func rom:0x72F720 battle_item_coconut_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72F8F4 battle_item_coconut_UseItemWithEffect = 0x802A1240; // type:data rom:0x72F960 @@ -6573,41 +6768,66 @@ battle_item_coconut_UseItem = 0x802A1544; // type:data rom:0x72FC64 battle_item_coconut_PlayerGoHome = 0x802A1670; // type:data rom:0x72FD90 battle_item_coconut_EatItem = 0x802A170C; // type:data rom:0x72FE2C battle_item_coconut_DrinkItem = 0x802A1784; // type:data rom:0x72FEA4 -battle_item_coconut_coconutModel = 0x802A1A20; // type:data rom:0x730140 -battle_item_coconut_coconutDL = 0x802A1A60; // type:data rom:0x730180 -battle_item_coconut_coconutItemModelCommandList = 0x802A1B50; // type:data rom:0x730270 +battle_item_coconut_model = 0x802A1A20; // type:data rom:0x730140 +battle_item_coconut_displayList = 0x802A1A60; // type:data rom:0x730180 +battle_item_coconut_modelCommandList = 0x802A1B50; // type:data rom:0x730270 battle_item_coconut_main = 0x802A1B6C; // type:data rom:0x73028C -func_802A1000_7305A0 = 0x802A1000; // type:func rom:0x7305A0 -func_802A11D4_730774 = 0x802A11D4; // type:func rom:0x730774 -func_802A123C_7307DC = 0x802A123C; // type:func rom:0x7307DC -func_802A127C_73081C = 0x802A127C; // type:func rom:0x73081C -func_802A133C_7308DC = 0x802A133C; // type:func rom:0x7308DC +battle_item_electro_pop_GiveRefund = 0x802A1000; // type:func rom:0x7305A0 +battle_item_electro_pop_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x730774 +battle_item_electro_pop_func_802A123C_7307DC = 0x802A123C; // type:func rom:0x7307DC +battle_item_electro_pop_func_802A127C_73081C = 0x802A127C; // type:func rom:0x73081C +battle_item_electro_pop_func_802A133C_7308DC = 0x802A133C; // type:func rom:0x7308DC battle_item_electro_pop_AddHP = 0x802A13FC; // type:func rom:0x73099C -func_802A1450_7309F0 = 0x802A1450; // type:func rom:0x7309F0 -func_802A149C_730A3C = 0x802A149C; // type:func rom:0x730A3C -func_802A14F0_730A90 = 0x802A14F0; // type:func rom:0x730A90 -func_802A1000_731300 = 0x802A1000; // type:func rom:0x731300 -func_802A11D4_7314D4 = 0x802A11D4; // type:func rom:0x7314D4 -func_802A123C_73153C = 0x802A123C; // type:func rom:0x73153C +battle_item_electro_pop_func_802A1450_7309F0 = 0x802A1450; // type:func rom:0x7309F0 +battle_item_electro_pop_AddFP = 0x802A149C; // type:func rom:0x730A3C +battle_item_electro_pop_func_802A14F0_730A90 = 0x802A14F0; // type:func rom:0x730A90 +battle_item_electro_pop_UseItemWithEffect = 0x802A1540; // type:data rom:0x730AE0 +battle_item_electro_pop_UseItem = 0x802A1844; // type:data rom:0x730DE4 +battle_item_electro_pop_PlayerGoHome = 0x802A1970; // type:data rom:0x730F10 +battle_item_electro_pop_EatItem = 0x802A1A0C; // type:data rom:0x730FAC +battle_item_electro_pop_DrinkItem = 0x802A1A84; // type:data rom:0x731024 +battle_item_electro_pop_main = 0x802A1AFC; // type:data rom:0x73109C +battle_item_strange_cake_GiveRefund = 0x802A1000; // type:func rom:0x731300 +battle_item_strange_cake_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x7314D4 +battle_item_strange_cake_func_802A123C_73153C = 0x802A123C; // type:func rom:0x73153C func_802A13E4_7316E4 = 0x802A13E4; // type:func rom:0x7316E4 -func_802A1818_731B18 = 0x802A1818; // type:func rom:0x731B18 -func_802A18D8_731BD8 = 0x802A18D8; // type:func rom:0x731BD8 +battle_item_strange_cake_func_802A1818_731B18 = 0x802A1818; // type:func rom:0x731B18 +battle_item_strange_cake_func_802A18D8_731BD8 = 0x802A18D8; // type:func rom:0x731BD8 battle_item_strange_cake_AddHP = 0x802A1998; // type:func rom:0x731C98 battle_item_strange_cake_AddFP = 0x802A19EC; // type:func rom:0x731CEC -func_802A1A40_731D40 = 0x802A1A40; // type:func rom:0x731D40 -func_802A1A8C_731D8C = 0x802A1A8C; // type:func rom:0x731D8C -func_802A1AD8_731DD8 = 0x802A1AD8; // type:func rom:0x731DD8 -func_802A1B14_731E14 = 0x802A1B14; // type:func rom:0x731E14 -func_802A1B68_731E68 = 0x802A1B68; // type:func rom:0x731E68 -func_802A1000_7330D0 = 0x802A1000; // type:func rom:0x7330D0 -func_802A11D4_7332A4 = 0x802A11D4; // type:func rom:0x7332A4 -func_802A123C_73330C = 0x802A123C; // type:func rom:0x73330C -func_802A12EC_7333BC = 0x802A12EC; // type:func rom:0x7333BC -func_802A1378_733448 = 0x802A1378; // type:func rom:0x733448 -func_802A1438_733508 = 0x802A1438; // type:func rom:0x733508 +battle_item_strange_cake_func_802A1A40_731D40 = 0x802A1A40; // type:func rom:0x731D40 +battle_item_strange_cake_func_802A1A8C_731D8C = 0x802A1A8C; // type:func rom:0x731D8C +battle_item_strange_cake_func_802A1AD8_731DD8 = 0x802A1AD8; // type:func rom:0x731DD8 +battle_item_strange_cake_func_802A1B14_731E14 = 0x802A1B14; // type:func rom:0x731E14 +battle_item_strange_cake_func_802A1B68_731E68 = 0x802A1B68; // type:func rom:0x731E68 +battle_item_strange_cake_UseItemWithEffect = 0x802A1BB0; // type:data rom:0x731EB0 +battle_item_strange_cake_UseItem = 0x802A1EB4; // type:data rom:0x7321B4 +battle_item_strange_cake_PlayerGoHome = 0x802A1FE0; // type:data rom:0x7322E0 +battle_item_strange_cake_EatItem = 0x802A207C; // type:data rom:0x73237C +battle_item_strange_cake_DrinkItem = 0x802A20F4; // type:data rom:0x7323F4 +battle_item_strange_cake_data = 0x802A27D0; // type:data rom:0x732AD0 +battle_item_strange_cake_D_802A2848_732B48 = 0x802A2848; // type:data rom:0x732B48 +battle_item_strange_cake_D_802A2858_732B58 = 0x802A2858; // type:data rom:0x732B58 +battle_item_strange_cake_script6 = 0x802A2870; // type:data rom:0x732B70 +battle_item_strange_cake_script7 = 0x802A2B70; // type:data rom:0x732E70 +battle_item_strange_cake_script8 = 0x802A2C40; // type:data rom:0x732F40 +battle_item_strange_cake_script9 = 0x802A2D10; // type:data rom:0x733010 +battle_item_food_GiveRefund = 0x802A1000; // type:func rom:0x7330D0 +battle_item_food_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x7332A4 +battle_item_food_func_802A123C_73330C = 0x802A123C; // type:func rom:0x73330C +battle_item_food_func_802A12EC_7333BC = 0x802A12EC; // type:func rom:0x7333BC +battle_item_food_func_802A1378_733448 = 0x802A1378; // type:func rom:0x733448 +battle_item_food_func_802A1438_733508 = 0x802A1438; // type:func rom:0x733508 battle_item_food_AddHP = 0x802A14F8; // type:func rom:0x7335C8 battle_item_food_AddFP = 0x802A154C; // type:func rom:0x73361C -func_802A15A0_733670 = 0x802A15A0; // type:func rom:0x733670 +battle_item_food_func_802A15A0_733670 = 0x802A15A0; // type:func rom:0x733670 +battle_item_food_UseItemWithEffect = 0x802A1630; // type:data rom:0x733700 +battle_item_food_UseItem = 0x802A1934; // type:data rom:0x733A04 +battle_item_food_PlayerGoHome = 0x802A1A60; // type:data rom:0x733B30 +battle_item_food_EatItem = 0x802A1AFC; // type:data rom:0x733BCC +battle_item_food_DrinkItem = 0x802A1B74; // type:data rom:0x733C44 +battle_item_food_script6 = 0x802A1BEC; // type:data rom:0x733CBC +battle_item_food_main = 0x802A1BEC; // type:data rom:0x7341CC battle_move_hammer_IsBerserkerEquipped = 0x802A1000; // type:func rom:0x7345A0 battle_move_hammer_IsRightOnEquipped = 0x802A1050; // type:func rom:0x7345F0 func_802A1000_737890 = 0x802A1000; // type:func rom:0x737890 @@ -15232,6 +15452,9 @@ kmr_05_config = 0x28002C0; // type:data kmr_06_config = 0x2800300; // type:data kmr_24_config = 0x2800340; // type:data kmr_20_config = 0x2800380; // type:data +battle_item_insecticide_herb_temp = 0x28003C0; // type:data +battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data +battle_item_mystery_tempStc = 0x2800410; // type:data D_0A000328 = 0xA000328; // type:data D_0A000380 = 0xA000380; // type:data D_0A000740 = 0xA000740; // type:data @@ -15690,7 +15913,6 @@ D_800DC064 = 0x800DC064; // type:data gBattleState = 0x800DC068; // gBattleStatus = 0x800DC070; // size:0x490 _use_partner_ability = 0x800EA6CC; // type:func -D_800F7B94 = 0x800F7B94; // type:data D_800F7BBC = 0x800F7BBC; // type:data D_800F7BE8 = 0x800F7BE8; // type:data D_800F7C20 = 0x800F7C20; // type:data @@ -16815,7 +17037,6 @@ D_80281104 = 0x80281104; // type:data D_80282EE9 = 0x80282EE9; // type:data D_80282EEA = 0x80282EEA; // type:data bMarioHideAnims = 0x80283370; // type:data -D_8028358C = 0x8028358C; // type:data D_80283770 = 0x80283770; // type:data ExecutePlayerAction = 0x8028505C; // ExecutePeachAction = 0x80285174; // @@ -17044,6 +17265,7 @@ D_802A18E0 = 0x802A18E0; // type:data D_802A19B0 = 0x802A19B0; // type:data D_802A19C0 = 0x802A19C0; // type:data D_802A1A60 = 0x802A1A60; // type:data +battle_item_coconut_coconutDL = 0x802A1A60; // type:data D_802A1A90 = 0x802A1A90; // type:data D_802A1AA0 = 0x802A1AA0; // type:data D_802A1AC0 = 0x802A1AC0; // type:data