From ae64b1b5cc13bc2100f33c6ced7eba6cd811cc38 Mon Sep 17 00:00:00 2001 From: Unnunu Date: Sun, 17 Jul 2022 19:38:19 +0300 Subject: [PATCH] entities (#741) * matched execute_render_tasks * step_entity_command_list * partially migrated entity data * entity blueprints migrated * matched create_entity * matched entity functions * SaveBlock * SaveBlock and Switch * switch model done * matched shattering block functions * shattering block models * matched block funcs * block models * finish Block.c * ItemBlock * HeartBlock * SuperBlock * SimpleSpring * HiddenPanel wip * HiddenPanel * Chest * WoodenCrate * BlueWarpPipe * SignPost * Padlock * Boarded floor and padlocks * BombableRock * Tweester * StarBoxLauncher * wip * ArrowSign * BellbellPlant * TrumpetPlant * munchlesia wip * Munchlesia * UnusedBlock * cleaning * fix warnings * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "fd9cbc3a1" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "fd9cbc3a1" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * PR suggestions * created vtx splat segments --- include/common_structs.h | 279 +- include/effects.h | 2 +- include/entity.h | 437 +++ include/enums.h | 89 +- include/functions.h | 9 +- include/model.h | 2 +- include/script_api/common.h | 2 +- include/variables.h | 55 +- src/182B30.c | 16 +- src/43F0.c | 2 +- src/77480.c | 8 +- src/7bb60_len_41b0.c | 4 +- src/B4580.c | 32 +- src/C50A0.c | 10 +- src/E225B0.c | 2 +- src/a5dd0_len_114e0.c | 884 ++++- src/animation_script.h | 13 +- src/battle/area_kkj/6DBDA0.c | 6 +- src/battle/item/pow_block.c | 2 +- src/battle/item/pow_block.h | 1 + src/bss3.c | 16 +- src/collision.c | 2 +- src/effects/aura.c | 2 +- src/effects/balloon.c | 2 +- src/effects/big_smoke_puff.c | 2 +- src/effects/big_snowflakes.c | 2 +- src/effects/blast.c | 4 +- src/effects/bombette_breaking.c | 2 +- src/effects/breaking_junk.c | 2 +- src/effects/bulb_glow.c | 2 +- src/effects/butterflies.c | 2 +- src/effects/chapter_change.c | 2 +- src/effects/chomp_drop.c | 2 +- src/effects/cloud_puff.c | 2 +- src/effects/cloud_trail.c | 2 +- src/effects/cold_breath.c | 2 +- src/effects/damage_stars.c | 2 +- src/effects/debuff.c | 2 +- src/effects/drop_leaves.c | 2 +- src/effects/dust.c | 2 +- src/effects/effect_3D.c | 2 +- src/effects/effect_46.c | 2 +- src/effects/effect_63.c | 2 +- src/effects/effect_65.c | 2 +- src/effects/effect_75.c | 2 +- src/effects/effect_86.c | 2 +- src/effects/embers.c | 2 +- src/effects/emote.c | 2 +- src/effects/ending_decals.c | 4 +- src/effects/energy_orb_wave.c | 2 +- src/effects/energy_shockwave.c | 2 +- src/effects/falling_leaves.c | 2 +- src/effects/fire_breath.c | 2 +- src/effects/fire_flower.c | 2 +- src/effects/firework_rocket.c | 2 +- src/effects/floating_cloud_puff.c | 2 +- src/effects/floating_flower.c | 2 +- src/effects/floating_rock.c | 4 +- src/effects/flower_splash.c | 2 +- src/effects/flower_trail.c | 2 +- src/effects/footprint.c | 2 +- src/effects/fright_jar.c | 2 +- src/effects/gather_energy_pink.c | 2 +- src/effects/gather_magic.c | 2 +- src/effects/got_item_outline.c | 2 +- src/effects/hieroglyphs.c | 2 +- src/effects/ice_pillar.c | 2 +- src/effects/ice_shard.c | 2 +- src/effects/landing_dust.c | 2 +- src/effects/lens_flare.c | 2 +- src/effects/light_rays.c | 2 +- src/effects/lightning.c | 2 +- src/effects/lightning_bolt.c | 2 +- src/effects/lil_oink.c | 2 +- src/effects/merlin_house_stars.c | 2 +- src/effects/misc_particles.c | 2 +- src/effects/motion_blur_flame.c | 2 +- src/effects/moving_cloud.c | 2 +- src/effects/music_note.c | 4 +- src/effects/peach_star_beam.c | 2 +- src/effects/purple_ring.c | 2 +- src/effects/quizmo_assistant.c | 2 +- src/effects/quizmo_audience.c | 2 +- src/effects/quizmo_stage.c | 2 +- src/effects/radial_shimmer.c | 2 +- src/effects/radiating_energy_orb.c | 2 +- src/effects/red_impact.c | 2 +- src/effects/ring_blast.c | 2 +- src/effects/rising_bubble.c | 2 +- src/effects/shape_spell.c | 4 +- src/effects/shattering_stones.c | 2 +- src/effects/shimmer_burst.c | 2 +- src/effects/shimmer_wave.c | 2 +- src/effects/shiny_flare.c | 2 +- src/effects/shockwave.c | 2 +- src/effects/sleep_bubble.c | 6 +- src/effects/small_gold_sparkle.c | 2 +- src/effects/smoke_burst.c | 2 +- src/effects/smoke_impact.c | 2 +- src/effects/snaking_static.c | 2 +- src/effects/snowfall.c | 2 +- src/effects/snowflake.c | 2 +- src/effects/snowman_doll.c | 2 +- src/effects/something_rotating.c | 2 +- src/effects/spiky_white_aura.c | 2 +- src/effects/spirit_card.c | 2 +- src/effects/squirt.c | 2 +- src/effects/star_outline.c | 2 +- src/effects/star_spirits_energy.c | 2 +- src/effects/stars_burst.c | 2 +- src/effects/stars_spread.c | 2 +- src/effects/static_status.c | 2 +- src/effects/steam_burst.c | 2 +- src/effects/sun.c | 2 +- src/effects/sweat.c | 2 +- src/effects/throw_spiny.c | 2 +- src/effects/tubba_heart_attack.c | 2 +- src/effects/walking_dust.c | 2 +- src/effects/water_block.c | 2 +- src/effects/water_fountain.c | 2 +- src/effects/whirlwind.c | 2 +- src/effects/windy_leaves.c | 2 +- src/entity/103CD0.c | 66 - src/entity/104730.c | 343 -- src/entity/Block.c | 622 ++- src/entity/BlueWarpPipe.c | 54 +- src/entity/Chest.c | 249 +- src/entity/HeartBlock.c | 201 +- src/entity/HiddenPanel.c | 372 ++ src/entity/ItemBlock.c | 275 +- src/entity/SaveBlock.c | 101 +- src/entity/Shadow.c | 129 + src/entity/ShatteringBlock.c | 206 + src/entity/ShatteringBlock_common.c | 206 + src/entity/Signpost.c | 28 +- src/entity/SimpleSpring.c | 201 +- src/entity/SuperBlock.c | 208 +- src/entity/Switch.c | 222 +- src/entity/WoodenCrate.c | 232 +- src/entity/default/BoardedFloor.c | 255 ++ src/entity/default/BombableRock.c | 274 ++ src/entity/default/E2B530.c | 15 - src/entity/default/E2BE40.c | 13 - src/entity/default/E2C930.c | 18 - src/entity/default/Padlock.c | 289 ++ src/entity/jan_iwa/ArrowSign.c | 66 + src/entity/jan_iwa/E2D730.c | 235 -- src/entity/jan_iwa/E2E5F0.c | 147 - src/entity/jan_iwa/E2EDE0.c | 32 - src/entity/jan_iwa/Plants1.c | 431 +++ src/entity/jan_iwa/Plants2.c | 470 +++ src/entity/model/ArrowSign.c | 89 + src/entity/model/BellbellPlant_anim.c | 469 +++ src/entity/model/BellbellPlant_gfx.c | 176 + src/entity/model/BlueSwitch.c | 202 + src/entity/model/BlueWarpPipe.c | 94 + src/entity/model/BoardedFloor.c | 473 +++ src/entity/model/BombableRock.c | 260 ++ src/entity/model/BrickBlock.c | 49 + src/entity/model/Chest.c | 159 + src/entity/model/CymbalPlant_anim.c | 385 ++ src/entity/model/CymbalPlant_gfx.c | 273 ++ src/entity/model/GreenStompSwitch.c | 107 + src/entity/model/Hammer1Block.c | 50 + src/entity/model/Hammer2Block.c | 50 + src/entity/model/Hammer3Block.c | 45 + src/entity/model/HeartBlock.c | 52 + src/entity/model/HeartBlockContent.c | 78 + src/entity/model/HiddenPanel.c | 96 + .../model/HitFloatingYellowBlock_anim.c | 98 + src/entity/model/HitFloatingYellowBlock_gfx.c | 48 + src/entity/model/HitRedBlock_anim.c | 88 + src/entity/model/HitRedBlock_gfx.c | 56 + src/entity/model/HitYellowBlock_anim.c | 99 + src/entity/model/HitYellowBlock_gfx.c | 48 + src/entity/model/InertRedBlock.c | 48 + src/entity/model/InertYellowBlock.c | 50 + src/entity/model/MunchlesiaBeginChew_anim.c | 227 ++ src/entity/model/MunchlesiaBeginChew_gfx.c | 3343 +++++++++++++++++ src/entity/model/MunchlesiaChewing_anim.c | 199 + src/entity/model/MunchlesiaChewing_gfx.c | 148 + src/entity/model/MunchlesiaEnvelop_anim.c | 215 ++ src/entity/model/MunchlesiaEnvelop_gfx.c | 2944 +++++++++++++++ src/entity/model/MunchlesiaGrab_anim.c | 220 ++ src/entity/model/MunchlesiaGrab_gfx.c | 2944 +++++++++++++++ src/entity/model/MunchlesiaReset1_anim.c | 227 ++ src/entity/model/MunchlesiaReset1_gfx.c | 3343 +++++++++++++++++ src/entity/model/MunchlesiaReset_anim.c | 234 ++ src/entity/model/MunchlesiaReset_gfx.c | 2944 +++++++++++++++ src/entity/model/MunchlesiaSpitOut_anim.c | 227 ++ src/entity/model/MunchlesiaSpitOut_gfx.c | 3343 +++++++++++++++++ src/entity/model/Padlock.c | 177 + src/entity/model/PadlockBlueFace.c | 181 + src/entity/model/PadlockRedFace.c | 181 + src/entity/model/PadlockRedFrame.c | 161 + src/entity/model/PinkFlower_anim.c | 356 ++ src/entity/model/PinkFlower_gfx.c | 161 + src/entity/model/PowBlock.c | 76 + src/entity/model/PushBlock.c | 60 + src/entity/model/RedBlock.c | 47 + src/entity/model/RedSwitch.c | 196 + src/entity/model/SaveBlock.c | 152 + src/entity/model/ScriptSpring_anim.c | 610 +++ src/entity/model/ScriptSpring_gfx.c | 176 + src/entity/model/ShatteringBrickBlock.c | 1287 +++++++ src/entity/model/ShatteringHammer1Block.c | 1311 +++++++ src/entity/model/ShatteringHammer2Block.c | 1311 +++++++ src/entity/model/ShatteringHammer3Block.c | 1328 +++++++ src/entity/model/Signpost.c | 101 + src/entity/model/SimpleSpring_anim.c | 610 +++ src/entity/model/SimpleSpring_gfx.c | 173 + src/entity/model/SpinningFlower.c | 121 + src/entity/model/StarBoxLauncher.c | 129 + src/entity/model/SuperBlock.c | 135 + src/entity/model/SuperBlockContent.c | 49 + src/entity/model/TrumpetPlant_anim.c | 145 + src/entity/model/TrumpetPlant_gfx.c | 116 + src/entity/model/Tweester.c | 239 ++ src/entity/model/UltraBlock.c | 129 + src/entity/model/UltraBlockContent.c | 73 + src/entity/model/UnusedBlock.c | 157 + src/entity/model/WoodenCrate.c | 1434 +++++++ src/entity/model/YellowBlock.c | 47 + src/entity/sbk_omo/E2F750.c | 93 - src/entity/sbk_omo/E307C0.c | 108 - src/entity/sbk_omo/StarBoxLauncher.c | 276 ++ src/entity/sbk_omo/Tweester.c | 329 ++ src/{entity.c => entity_model.c} | 8 +- src/npc.c | 8 +- src/state_battle.c | 2 +- src/state_file_select.c | 2 +- src/state_pause.c | 2 +- src/world/action/hammer.c | 8 +- src/world/action/super_boots.c | 4 +- src/world/action/ultra_boots.c | 6 +- src/world/action/use_tweester.c | 1 - src/world/area_arn/arn_02/events.c | 7 +- src/world/area_arn/arn_03/events.c | 4 +- src/world/area_arn/arn_04/events.c | 7 +- src/world/area_arn/arn_05/events.c | 1 + src/world/area_arn/arn_07/events.c | 3 +- src/world/area_arn/arn_08/events.c | 3 +- src/world/area_arn/arn_09/events.c | 7 +- src/world/area_arn/arn_10/events.c | 3 +- src/world/area_arn/arn_12/arn_12.h | 2 - src/world/area_arn/arn_12/events.c | 3 +- src/world/area_arn/arn_13/arn_13.h | 2 - src/world/area_arn/arn_13/events.c | 3 +- src/world/area_dgb/dgb_00/BFA100.c | 2 + src/world/area_dgb/dgb_01/BFD9A0.c | 3 +- src/world/area_dgb/dgb_03/C31730.c | 3 +- src/world/area_dgb/dgb_04/C36530.c | 3 +- src/world/area_dgb/dgb_05/C3AA10.c | 3 +- src/world/area_dgb/dgb_06/C3D080.c | 3 +- src/world/area_dgb/dgb_07/C3DBF0.c | 5 +- src/world/area_dgb/dgb_10/C4C390.c | 7 +- src/world/area_dgb/dgb_11/C4D3E0.c | 7 +- src/world/area_dgb/dgb_12/C4DEF0.c | 3 +- src/world/area_dgb/dgb_14/C4F030.c | 3 +- src/world/area_dgb/dgb_15/C4F510.c | 3 +- src/world/area_dgb/dgb_17/C55A60.c | 1 + src/world/area_dgb/dgb_18/C55F40.c | 3 +- src/world/area_dro/dro_01/95B7E0.c | 3 +- src/world/area_dro/dro_02/9694C0.c | 3 +- src/world/area_flo/flo_00/C9DF60.c | 2 + src/world/area_flo/flo_03/CA72E0.c | 3 +- src/world/area_flo/flo_08/CAFAC0.c | 3 +- src/world/area_flo/flo_11/CBDCD0.c | 3 +- src/world/area_flo/flo_13/CC3850.c | 3 +- src/world/area_flo/flo_15/CD06C0.c | 3 +- src/world/area_flo/flo_16/CD1F10.c | 5 +- src/world/area_flo/flo_17/CD7350.c | 3 +- src/world/area_flo/flo_23/CEE2A0.c | 9 +- src/world/area_flo/flo_23/flo_23.h | 2 - src/world/area_flo/flo_24/CF0980.c | 7 +- src/world/area_flo/flo_25/CF2C10.c | 3 +- src/world/area_kmr/kmr_03/8C8140.c | 18 +- src/world/area_kmr/kmr_03/kmr_03.h | 2 - src/world/area_kmr/kmr_12/events.c | 3 +- src/world/area_kmr/kmr_12/kmr_12.h | 2 - src/world/area_mgm/mgm_01/E12930.c | 11 +- src/world/area_mgm/mgm_02/E15D80.c | 4 +- src/world/area_sbk/sbk_00/9292B0.c | 5 +- src/world/area_tik/tik_05/8750D0.c | 4 +- src/world/area_tst/tst_13/B1D760.c | 2 +- src/world/common/atomic/Quizmo.inc.c | 4 +- src/world/partner/kooper.c | 2 +- src/world/script_api/7E3700.c | 4 +- tools/splat/.gitrepo | 4 +- tools/splat/CHANGELOG.md | 3 + tools/splat/segtypes/common/data.py | 2 +- tools/splat/segtypes/n64/ia16.py | 13 +- ver/us/asm/data/10A9F0.data.s | 9 - ver/us/asm/data/10AAF0.data.s | 9 - ver/us/asm/data/10B610.data.s | 327 -- ver/us/asm/data/battle/area_kkj/6DC340.data.s | 2 +- ver/us/asm/data/entity/default/E2D410.data.s | 45 - ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s | 120 - ver/us/asm/data/entity/sbk_omo/E31380.data.s | 21 - .../data/world/area_hos/hos_00/A0E520.data.s | 2 +- .../data/world/area_hos/hos_01/A15860.data.s | 2 +- .../data/world/area_hos/hos_06/A3BA40.data.s | 2 +- .../data/world/area_isk/isk_02/979390.data.s | 2 +- .../data/world/area_isk/isk_04/97CA70.data.s | 2 +- .../data/world/area_isk/isk_05/97FCE0.data.s | 2 +- .../data/world/area_isk/isk_07/982860.data.s | 2 +- .../data/world/area_isk/isk_09/986BD0.data.s | 2 +- .../data/world/area_isk/isk_10/989910.data.s | 2 +- .../data/world/area_isk/isk_11/98B330.data.s | 2 +- .../data/world/area_isk/isk_12/98DA70.data.s | 2 +- .../data/world/area_isk/isk_13/991A90.data.s | 2 +- .../data/world/area_isk/isk_14/9946D0.data.s | 2 +- .../data/world/area_iwa/iwa_00/90CF20.data.s | 2 +- .../data/world/area_iwa/iwa_01/912990.data.s | 2 +- .../data/world/area_iwa/iwa_02/917170.data.s | 2 +- .../data/world/area_iwa/iwa_03/919F00.data.s | 2 +- .../data/world/area_iwa/iwa_04/91CA50.data.s | 2 +- .../data/world/area_iwa/iwa_10/923FD0.data.s | 2 +- .../data/world/area_jan/jan_00/B226D0.data.s | 2 +- .../data/world/area_jan/jan_01/B2B430.data.s | 2 +- .../data/world/area_jan/jan_02/B33E00.data.s | 2 +- .../data/world/area_jan/jan_03/B435D0.data.s | 2 +- .../data/world/area_jan/jan_04/B45A20.data.s | 2 +- .../data/world/area_jan/jan_04/B490C0.data.s | 2 +- .../data/world/area_jan/jan_05/B523E0.data.s | 2 +- .../data/world/area_jan/jan_06/B572C0.data.s | 2 +- .../data/world/area_jan/jan_08/B620B0.data.s | 2 +- .../data/world/area_jan/jan_09/B6BFB0.data.s | 2 +- .../data/world/area_jan/jan_12/B75D30.data.s | 2 +- .../data/world/area_jan/jan_13/B79FA0.data.s | 2 +- .../data/world/area_jan/jan_15/B7FF80.data.s | 2 +- .../data/world/area_jan/jan_16/B82C70.data.s | 2 +- .../data/world/area_jan/jan_17/B83B20.data.s | 2 +- .../data/world/area_jan/jan_19/B84110.data.s | 2 +- .../data/world/area_jan/jan_22/B85AE0.data.s | 2 +- .../data/world/area_kkj/kkj_10/ACC510.data.s | 2 +- .../data/world/area_kkj/kkj_11/ACFD40.data.s | 2 +- .../data/world/area_kkj/kkj_20/AFE3C0.data.s | 2 +- .../data/world/area_kkj/kkj_25/B0F280.data.s | 2 +- .../data/world/area_kmr/kmr_00/8B0010.data.s | 2 +- .../data/world/area_kmr/kmr_02/8C4A40.data.s | 2 +- .../data/world/area_kmr/kmr_04/8CB160.data.s | 2 +- .../data/world/area_kmr/kmr_06/8D3AC0.data.s | 2 +- .../data/world/area_kmr/kmr_07/8D49A0.data.s | 2 +- .../data/world/area_kmr/kmr_09/8D83B0.data.s | 2 +- .../data/world/area_kmr/kmr_10/8D90F0.data.s | 2 +- .../data/world/area_kmr/kmr_11/8DFBB0.data.s | 2 +- .../data/world/area_kmr/kmr_20/8F1500.data.s | 2 +- .../data/world/area_kpa/kpa_01/A48500.data.s | 2 +- .../data/world/area_kpa/kpa_03/A4A750.data.s | 2 +- .../data/world/area_kpa/kpa_10/A51D90.data.s | 2 +- .../data/world/area_kpa/kpa_11/A53D80.data.s | 2 +- .../data/world/area_kpa/kpa_111/A9C740.data.s | 2 +- .../data/world/area_kpa/kpa_113/A9DA60.data.s | 2 +- .../data/world/area_kpa/kpa_114/A9EAA0.data.s | 2 +- .../data/world/area_kpa/kpa_13/A56BD0.data.s | 2 +- .../data/world/area_kpa/kpa_133/AA8290.data.s | 2 +- .../data/world/area_kpa/kpa_134/AAC3B0.data.s | 2 +- .../data/world/area_kpa/kpa_14/A58DB0.data.s | 2 +- .../data/world/area_kpa/kpa_15/A59E30.data.s | 2 +- .../data/world/area_kpa/kpa_16/A5A3D0.data.s | 2 +- .../data/world/area_kpa/kpa_17/A5CB00.data.s | 2 +- .../data/world/area_kpa/kpa_52/A68510.data.s | 2 +- .../data/world/area_kpa/kpa_53/A6CA80.data.s | 2 +- .../data/world/area_kpa/kpa_60/A6CEF0.data.s | 2 +- .../data/world/area_kpa/kpa_61/A71FC0.data.s | 2 +- .../data/world/area_kpa/kpa_62/A72740.data.s | 2 +- .../data/world/area_kpa/kpa_91/A8C230.data.s | 2 +- .../data/world/area_kpa/kpa_95/A8E450.data.s | 2 +- .../data/world/area_kzn/kzn_03/C66FC0.data.s | 2 +- .../data/world/area_kzn/kzn_04/C69D70.data.s | 2 +- .../data/world/area_kzn/kzn_06/C6D390.data.s | 2 +- .../data/world/area_kzn/kzn_07/C70C60.data.s | 2 +- .../data/world/area_kzn/kzn_08/C76030.data.s | 2 +- .../data/world/area_kzn/kzn_09/C7A9E0.data.s | 2 +- .../data/world/area_kzn/kzn_17/C88B50.data.s | 2 +- .../data/world/area_kzn/kzn_18/C8C460.data.s | 2 +- .../data/world/area_kzn/kzn_19/C95E70.data.s | 2 +- .../data/world/area_kzn/kzn_22/C9A650.data.s | 2 +- .../data/world/area_kzn/kzn_23/C9D020.data.s | 2 +- .../data/world/area_mac/mac_00/7EE870.data.s | 2 +- .../data/world/area_mac/mac_02/828F10.data.s | 2 +- .../data/world/area_mac/mac_03/83F500.data.s | 2 +- .../data/world/area_mac/mac_04/851410.data.s | 2 +- .../data/world/area_mac/mac_05/8564E0.data.s | 2 +- .../data/world/area_mac/machi/7E7A30.data.s | 2 +- .../data/world/area_mgm/mgm_01/E141D0.data.s | 2 +- .../data/world/area_mim/mim_01/B953B0.data.s | 2 +- .../data/world/area_mim/mim_07/BAB6D0.data.s | 2 +- .../data/world/area_mim/mim_08/BB0E30.data.s | 2 +- .../data/world/area_mim/mim_09/BB4130.data.s | 2 +- .../data/world/area_mim/mim_11/BBA180.data.s | 2 +- .../data/world/area_mim/mim_12/BBB960.data.s | 2 +- .../data/world/area_nok/nok_01/9C8920.data.s | 2 +- .../data/world/area_nok/nok_02/9DCD20.data.s | 2 +- .../data/world/area_nok/nok_11/9F6A50.data.s | 2 +- .../data/world/area_nok/nok_12/9FC970.data.s | 2 +- .../data/world/area_nok/nok_13/A02040.data.s | 4 +- .../data/world/area_nok/nok_14/A052F0.data.s | 2 +- .../data/world/area_nok/nok_15/A0AB50.data.s | 2 +- .../data/world/area_obk/obk_01/BC11A0.data.s | 2 +- .../data/world/area_obk/obk_02/BC3F60.data.s | 2 +- .../data/world/area_obk/obk_03/BC5A00.data.s | 6 +- .../data/world/area_obk/obk_04/BC8DE0.data.s | 2 +- .../data/world/area_obk/obk_05/BCE040.data.s | 2 +- .../data/world/area_obk/obk_06/BCEAD0.data.s | 2 +- .../data/world/area_obk/obk_07/BD0BA0.data.s | 2 +- .../data/world/area_obk/obk_08/BD64D0.data.s | 2 +- .../data/world/area_omo/omo_01/D9D250.data.s | 2 +- .../data/world/area_omo/omo_02/DA0300.data.s | 2 +- .../data/world/area_omo/omo_03/DA6050.data.s | 2 +- .../data/world/area_omo/omo_04/DAF3E0.data.s | 2 +- .../data/world/area_omo/omo_05/DB7410.data.s | 2 +- .../data/world/area_omo/omo_06/DBCFD0.data.s | 2 +- .../data/world/area_omo/omo_07/DC30B0.data.s | 2 +- .../data/world/area_omo/omo_08/DC8100.data.s | 2 +- .../data/world/area_omo/omo_09/DD3520.data.s | 2 +- .../data/world/area_omo/omo_10/DDC720.data.s | 2 +- .../data/world/area_omo/omo_11/DDDD90.data.s | 2 +- .../data/world/area_omo/omo_13/DE5100.data.s | 2 +- .../data/world/area_omo/omo_17/DF6380.data.s | 2 +- .../data/world/area_osr/osr_02/AB2B00.data.s | 2 +- .../data/world/area_pra/pra_02/D52DE0.data.s | 2 +- .../data/world/area_pra/pra_03/D543C0.data.s | 2 +- .../data/world/area_pra/pra_04/D554E0.data.s | 2 +- .../data/world/area_pra/pra_05/D56E20.data.s | 2 +- .../data/world/area_pra/pra_11/D62B10.data.s | 2 +- .../data/world/area_pra/pra_12/D63FB0.data.s | 2 +- .../data/world/area_pra/pra_14/D69630.data.s | 2 +- .../data/world/area_pra/pra_21/D78540.data.s | 2 +- .../data/world/area_pra/pra_22/D796B0.data.s | 2 +- .../data/world/area_pra/pra_27/D7B080.data.s | 2 +- .../data/world/area_pra/pra_28/D7C930.data.s | 2 +- .../data/world/area_pra/pra_29/D7DE90.data.s | 2 +- .../data/world/area_pra/pra_34/D8D130.data.s | 2 +- .../data/world/area_pra/pra_35/D91030.data.s | 2 +- .../data/world/area_pra/pra_40/D9AE80.data.s | 2 +- .../data/world/area_sam/sam_01/D05460.data.s | 2 +- .../data/world/area_sam/sam_04/D18720.data.s | 2 +- .../data/world/area_sam/sam_05/D1A890.data.s | 2 +- .../data/world/area_sam/sam_07/D2E0B0.data.s | 2 +- .../data/world/area_sam/sam_08/D314C0.data.s | 2 +- .../data/world/area_sam/sam_10/D38840.data.s | 2 +- .../data/world/area_sam/sam_11/D3D900.data.s | 2 +- .../data/world/area_sbk/sbk_02/92F830.data.s | 2 +- .../data/world/area_sbk/sbk_06/933160.data.s | 2 +- .../data/world/area_sbk/sbk_10/933FD0.data.s | 2 +- .../data/world/area_sbk/sbk_14/936B20.data.s | 2 +- .../data/world/area_sbk/sbk_20/9389F0.data.s | 2 +- .../data/world/area_sbk/sbk_22/93A610.data.s | 2 +- .../data/world/area_sbk/sbk_23/93AB20.data.s | 2 +- .../data/world/area_sbk/sbk_24/93B3C0.data.s | 2 +- .../data/world/area_sbk/sbk_25/93DB80.data.s | 2 +- .../data/world/area_sbk/sbk_33/945A10.data.s | 2 +- .../data/world/area_sbk/sbk_36/94A470.data.s | 2 +- .../data/world/area_sbk/sbk_40/94BF70.data.s | 2 +- .../data/world/area_sbk/sbk_41/94C400.data.s | 2 +- .../data/world/area_sbk/sbk_43/94D530.data.s | 2 +- .../data/world/area_sbk/sbk_45/94E8E0.data.s | 2 +- .../data/world/area_sbk/sbk_46/950570.data.s | 2 +- .../data/world/area_sbk/sbk_52/951A30.data.s | 2 +- .../data/world/area_sbk/sbk_54/952940.data.s | 2 +- .../data/world/area_sbk/sbk_55/953520.data.s | 2 +- .../data/world/area_sbk/sbk_56/9553F0.data.s | 2 +- .../data/world/area_sbk/sbk_61/9572E0.data.s | 2 +- .../data/world/area_sbk/sbk_64/9588E0.data.s | 2 +- .../data/world/area_sbk/sbk_66/95AD50.data.s | 2 +- .../data/world/area_sbk/sbk_99/95B190.data.s | 2 +- .../data/world/area_tik/tik_01/86BC00.data.s | 2 +- .../data/world/area_tik/tik_02/86D800.data.s | 2 +- .../data/world/area_tik/tik_03/871730.data.s | 2 +- .../data/world/area_tik/tik_05/8765C0.data.s | 2 +- .../data/world/area_tik/tik_06/879860.data.s | 2 +- .../data/world/area_tik/tik_07/87D5D0.data.s | 2 +- .../data/world/area_tik/tik_08/881770.data.s | 2 +- .../data/world/area_tik/tik_09/8856E0.data.s | 2 +- .../data/world/area_tik/tik_10/8883F0.data.s | 2 +- .../data/world/area_tik/tik_12/88C810.data.s | 2 +- .../data/world/area_tik/tik_17/893E40.data.s | 2 +- .../data/world/area_tik/tik_18/897450.data.s | 2 +- .../data/world/area_tik/tik_19/899C90.data.s | 2 +- .../data/world/area_tik/tik_20/89D200.data.s | 2 +- .../data/world/area_tik/tik_21/89FD70.data.s | 2 +- .../data/world/area_tik/tik_23/8A35A0.data.s | 2 +- .../data/world/area_tik/tik_24/8A7810.data.s | 2 +- .../data/world/area_tik/tik_25/8A93D0.data.s | 2 +- .../data/world/area_trd/trd_00/99AFB0.data.s | 2 +- .../data/world/area_trd/trd_01/99F960.data.s | 2 +- .../data/world/area_trd/trd_02/9A3870.data.s | 2 +- .../data/world/area_trd/trd_04/9ABD70.data.s | 2 +- .../data/world/area_trd/trd_05/9AF7C0.data.s | 2 +- .../data/world/area_trd/trd_06/9B5FC0.data.s | 2 +- .../data/world/area_trd/trd_09/9BDD80.data.s | 2 +- .../data/world/area_tst/tst_01/B1AB20.data.s | 2 +- .../data/world/area_tst/tst_02/B1AE50.data.s | 2 +- .../data/world/area_tst/tst_03/B1B240.data.s | 2 +- .../data/world/area_tst/tst_10/B1C540.data.s | 2 +- .../a5dd0_len_114e0/clear_entity_data.s | 118 - .../a5dd0_len_114e0/create_entity.s | 222 -- .../entity_anim_make_vertex_pointers.s | 55 - .../a5dd0_len_114e0/entity_free_static_data.s | 67 - .../a5dd0_len_114e0/execute_render_tasks.s | 337 -- .../a5dd0_len_114e0/func_80110F10.s | 115 - .../a5dd0_len_114e0/is_entity_data_loaded.s | 96 - .../a5dd0_len_114e0/load_split_entity_data.s | 255 -- .../a5dd0_len_114e0/step_entity_commandlist.s | 124 - .../entity/103CD0/entity_shattering_idle.s | 386 -- .../103CD0/entity_shattering_init_pieces.s | 132 - .../103CD0/entity_shattering_setupGfx.s | 202 - .../entity_base_block_update_slow_sinking.s | 220 -- .../Block/entity_block_handle_collision.s | 185 - .../entity_BlueWarpPipe_setupGfx.s | 86 - .../entity/Chest/entity_Chest_adjust_camera.s | 36 - .../entity/Chest/entity_Chest_open.s | 150 - .../entity/Chest/entity_Chest_reset_camera.s | 24 - .../entity/Chest/entity_Chest_setupGfx.s | 91 - .../Chest/entity_GiantChest_hide_effect.s | 14 - .../entity_HeartBlockContent__setupGfx.s | 247 -- .../entity_HeartBlockContent_anim_beating.s | 79 - .../ItemBlock/entity_HitItemBlock_appear.s | 17 - .../ItemBlock/entity_ItemBlock_spawn_item.s | 86 - .../SaveBlock/entity_SaveBlock_setupGfx.s | 201 - .../entity_HiddenPanel_flip_over.s | 420 --- .../SimpleSpring/entity_HiddenPanel_idle.s | 127 - .../SimpleSpring/entity_HiddenPanel_init.s | 134 - .../entity_HiddenPanel_is_item_on_top.s | 51 - ...entity_HiddenPanel_set_ispy_notification.s | 27 - .../entity_HiddenPanel_setupGfx.s | 103 - .../SimpleSpring/entity_ScriptSpring_idle.s | 51 - .../SimpleSpring/entity_SimpleSpring_idle.s | 51 - .../entity_SuperBlockContent_setupGfx.s | 389 -- .../entity_WoodenCrate_init_fragments.s | 94 - .../WoodenCrate/entity_WoodenCrate_setupGfx.s | 202 - .../entity_WoodenCrate_update_fragments.s | 403 -- .../default/E2B530/func_802BAE00_E2B530.s | 149 - .../default/E2B530/func_802BB044_E2B774.s | 114 - .../default/E2B530/func_802BB1E8_E2B918.s | 312 -- .../default/E2B530/func_802BB62C_E2BD5C.s | 18 - .../default/E2B530/func_802BB664_E2BD94.s | 18 - .../default/E2B530/func_802BB69C_E2BDCC.s | 18 - .../default/E2B530/func_802BB6D4_E2BE04.s | 19 - .../default/E2BE40/func_802BB710_E2BE40.s | 94 - .../default/E2BE40/func_802BB870_E2BFA0.s | 17 - .../default/E2BE40/func_802BB8A4_E2BFD4.s | 398 -- .../default/E2BE40/func_802BBE3C_E2C56C.s | 202 - .../default/E2BE40/func_802BC148_E2C878.s | 30 - .../default/E2BE40/func_802BC1A8_E2C8D8.s | 27 - .../default/E2C930/func_802BC200_E2C930.s | 126 - .../default/E2C930/func_802BC3A8_E2CAD8.s | 17 - .../default/E2C930/func_802BC3DC_E2CB0C.s | 398 -- .../default/E2C930/func_802BC974_E2D0A4.s | 202 - .../jan_iwa/E2D730/func_802BAE00_E2D730.s | 133 - .../jan_iwa/E2D730/func_802BB0A0_E2D9D0.s | 120 - .../jan_iwa/E2D730/func_802BB374_E2DCA4.s | 185 - .../jan_iwa/E2D730/func_802BB648_E2DF78.s | 43 - .../jan_iwa/E2D730/func_802BB78C_E2E0BC.s | 102 - .../jan_iwa/E2D730/func_802BB9E0_E2E310.s | 207 - .../jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s | 28 - .../jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s | 28 - .../jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s | 101 - .../jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s | 18 - .../jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s | 98 - .../sbk_omo/E2F750/func_802BAE00_E2F750.s | 102 - .../sbk_omo/E2F750/func_802BAF84_E2F8D4.s | 102 - .../sbk_omo/E2F750/func_802BB108_E2FA58.s | 176 - .../sbk_omo/E2F750/func_802BB3B8_E2FD08.s | 215 -- .../sbk_omo/E2F750/func_802BB76C_E300BC.s | 35 - .../sbk_omo/E2F750/func_802BB7E0_E30130.s | 75 - .../sbk_omo/E2F750/func_802BBA60_E303B0.s | 240 -- .../sbk_omo/E307C0/func_802BBE70_E307C0.s | 279 -- .../sbk_omo/E307C0/func_802BC570_E30EC0.s | 305 -- ver/us/splat.yaml | 1221 +++++- ver/us/symbol_addrs.txt | 48 +- ver/us/undefined_syms.txt | 29 +- 574 files changed, 43901 insertions(+), 13432 deletions(-) create mode 100644 include/entity.h delete mode 100644 src/entity/103CD0.c delete mode 100644 src/entity/104730.c create mode 100644 src/entity/HiddenPanel.c create mode 100644 src/entity/Shadow.c create mode 100644 src/entity/ShatteringBlock.c create mode 100644 src/entity/ShatteringBlock_common.c create mode 100644 src/entity/default/BoardedFloor.c create mode 100644 src/entity/default/BombableRock.c delete mode 100644 src/entity/default/E2B530.c delete mode 100644 src/entity/default/E2BE40.c delete mode 100644 src/entity/default/E2C930.c create mode 100644 src/entity/default/Padlock.c create mode 100644 src/entity/jan_iwa/ArrowSign.c delete mode 100644 src/entity/jan_iwa/E2D730.c delete mode 100644 src/entity/jan_iwa/E2E5F0.c delete mode 100644 src/entity/jan_iwa/E2EDE0.c create mode 100644 src/entity/jan_iwa/Plants1.c create mode 100644 src/entity/jan_iwa/Plants2.c create mode 100644 src/entity/model/ArrowSign.c create mode 100644 src/entity/model/BellbellPlant_anim.c create mode 100644 src/entity/model/BellbellPlant_gfx.c create mode 100644 src/entity/model/BlueSwitch.c create mode 100644 src/entity/model/BlueWarpPipe.c create mode 100644 src/entity/model/BoardedFloor.c create mode 100644 src/entity/model/BombableRock.c create mode 100644 src/entity/model/BrickBlock.c create mode 100644 src/entity/model/Chest.c create mode 100644 src/entity/model/CymbalPlant_anim.c create mode 100644 src/entity/model/CymbalPlant_gfx.c create mode 100644 src/entity/model/GreenStompSwitch.c create mode 100644 src/entity/model/Hammer1Block.c create mode 100644 src/entity/model/Hammer2Block.c create mode 100644 src/entity/model/Hammer3Block.c create mode 100644 src/entity/model/HeartBlock.c create mode 100644 src/entity/model/HeartBlockContent.c create mode 100644 src/entity/model/HiddenPanel.c create mode 100644 src/entity/model/HitFloatingYellowBlock_anim.c create mode 100644 src/entity/model/HitFloatingYellowBlock_gfx.c create mode 100644 src/entity/model/HitRedBlock_anim.c create mode 100644 src/entity/model/HitRedBlock_gfx.c create mode 100644 src/entity/model/HitYellowBlock_anim.c create mode 100644 src/entity/model/HitYellowBlock_gfx.c create mode 100644 src/entity/model/InertRedBlock.c create mode 100644 src/entity/model/InertYellowBlock.c create mode 100644 src/entity/model/MunchlesiaBeginChew_anim.c create mode 100644 src/entity/model/MunchlesiaBeginChew_gfx.c create mode 100644 src/entity/model/MunchlesiaChewing_anim.c create mode 100644 src/entity/model/MunchlesiaChewing_gfx.c create mode 100644 src/entity/model/MunchlesiaEnvelop_anim.c create mode 100644 src/entity/model/MunchlesiaEnvelop_gfx.c create mode 100644 src/entity/model/MunchlesiaGrab_anim.c create mode 100644 src/entity/model/MunchlesiaGrab_gfx.c create mode 100644 src/entity/model/MunchlesiaReset1_anim.c create mode 100644 src/entity/model/MunchlesiaReset1_gfx.c create mode 100644 src/entity/model/MunchlesiaReset_anim.c create mode 100644 src/entity/model/MunchlesiaReset_gfx.c create mode 100644 src/entity/model/MunchlesiaSpitOut_anim.c create mode 100644 src/entity/model/MunchlesiaSpitOut_gfx.c create mode 100644 src/entity/model/Padlock.c create mode 100644 src/entity/model/PadlockBlueFace.c create mode 100644 src/entity/model/PadlockRedFace.c create mode 100644 src/entity/model/PadlockRedFrame.c create mode 100644 src/entity/model/PinkFlower_anim.c create mode 100644 src/entity/model/PinkFlower_gfx.c create mode 100644 src/entity/model/PowBlock.c create mode 100644 src/entity/model/PushBlock.c create mode 100644 src/entity/model/RedBlock.c create mode 100644 src/entity/model/RedSwitch.c create mode 100644 src/entity/model/SaveBlock.c create mode 100644 src/entity/model/ScriptSpring_anim.c create mode 100644 src/entity/model/ScriptSpring_gfx.c create mode 100644 src/entity/model/ShatteringBrickBlock.c create mode 100644 src/entity/model/ShatteringHammer1Block.c create mode 100644 src/entity/model/ShatteringHammer2Block.c create mode 100644 src/entity/model/ShatteringHammer3Block.c create mode 100644 src/entity/model/Signpost.c create mode 100644 src/entity/model/SimpleSpring_anim.c create mode 100644 src/entity/model/SimpleSpring_gfx.c create mode 100644 src/entity/model/SpinningFlower.c create mode 100644 src/entity/model/StarBoxLauncher.c create mode 100644 src/entity/model/SuperBlock.c create mode 100644 src/entity/model/SuperBlockContent.c create mode 100644 src/entity/model/TrumpetPlant_anim.c create mode 100644 src/entity/model/TrumpetPlant_gfx.c create mode 100644 src/entity/model/Tweester.c create mode 100644 src/entity/model/UltraBlock.c create mode 100644 src/entity/model/UltraBlockContent.c create mode 100644 src/entity/model/UnusedBlock.c create mode 100644 src/entity/model/WoodenCrate.c create mode 100644 src/entity/model/YellowBlock.c delete mode 100644 src/entity/sbk_omo/E2F750.c delete mode 100644 src/entity/sbk_omo/E307C0.c create mode 100644 src/entity/sbk_omo/StarBoxLauncher.c create mode 100644 src/entity/sbk_omo/Tweester.c rename src/{entity.c => entity_model.c} (99%) delete mode 100644 ver/us/asm/data/10A9F0.data.s delete mode 100644 ver/us/asm/data/10AAF0.data.s delete mode 100644 ver/us/asm/data/10B610.data.s delete mode 100644 ver/us/asm/data/entity/default/E2D410.data.s delete mode 100644 ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s delete mode 100644 ver/us/asm/data/entity/sbk_omo/E31380.data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_anim_make_vertex_pointers.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_commandlist.s delete mode 100644 ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_idle.s delete mode 100644 ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_init_pieces.s delete mode 100644 ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/Block/entity_base_block_update_slow_sinking.s delete mode 100644 ver/us/asm/nonmatchings/entity/Block/entity_block_handle_collision.s delete mode 100644 ver/us/asm/nonmatchings/entity/BlueWarpPipe/entity_BlueWarpPipe_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/Chest/entity_Chest_adjust_camera.s delete mode 100644 ver/us/asm/nonmatchings/entity/Chest/entity_Chest_open.s delete mode 100644 ver/us/asm/nonmatchings/entity/Chest/entity_Chest_reset_camera.s delete mode 100644 ver/us/asm/nonmatchings/entity/Chest/entity_Chest_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/Chest/entity_GiantChest_hide_effect.s delete mode 100644 ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent__setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent_anim_beating.s delete mode 100644 ver/us/asm/nonmatchings/entity/ItemBlock/entity_HitItemBlock_appear.s delete mode 100644 ver/us/asm/nonmatchings/entity/ItemBlock/entity_ItemBlock_spawn_item.s delete mode 100644 ver/us/asm/nonmatchings/entity/SaveBlock/entity_SaveBlock_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_flip_over.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_idle.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_is_item_on_top.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_set_ispy_notification.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_ScriptSpring_idle.s delete mode 100644 ver/us/asm/nonmatchings/entity/SimpleSpring/entity_SimpleSpring_idle.s delete mode 100644 ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_init_fragments.s delete mode 100644 ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_setupGfx.s delete mode 100644 ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_update_fragments.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s delete mode 100644 ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s delete mode 100644 ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s delete mode 100644 ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s diff --git a/include/common_structs.h b/include/common_structs.h index a04114b8d5..d668ff6663 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -408,207 +408,49 @@ typedef struct Evt { typedef Evt* ScriptList[MAX_SCRIPTS]; struct Entity; - -// BEGIN ENTITY-SPECIFIC STRUCTS - -typedef struct struct802E2BA4 { - /* 0x00 */ char unk_00[2]; - /* 0x02 */ u16 unk_02[24][2]; -} struct802E2BA4; - -// from 102c80, size unknown. -typedef struct SwitchData { - /* 0x000 */ f32 fallVelocity; - /* 0x004 */ f32 deltaScaleX; - /* 0x008 */ f32 deltaScaleY; - /* 0x00C */ char unk_0C[4]; - /* 0x010 */ s8 animStateScaleX; - /* 0x011 */ s8 animStateScaleY; - /* 0x014 */ Vec3f baseScale; - /* 0x020 */ u16 areaFlagIndex; - /* 0x022 */ s16 greenMotionTimer; - /* 0x024 */ s16 scaleAnimTimer; - /* 0x028 */ struct Entity* linkedSwitch; /* a hidden switch can be linked to a visible one and automatically trigger it on hit */ - /* 0x02C */ char unk_2C[8]; - /* 0x034 */ struct802E2BA4* unk_34; - /* 0x038 */ f32 unk_38; - /* 0x03C */ union { - /* */ s16 s; - /* */ s8 b[2]; - } unk_3C; - /* 0x03E */ char unk_3E[0x4D]; - /* 0x08B */ u8 fragmentRotX[24]; // scaled to map [0,255] -> [0,360] - /* 0x0A3 */ char unk_A3; // padding? - /* 0x0A4 */ u8 fragmentRotY[24]; // scaled to map [0,255] -> [0,360] - /* 0x0BC */ char unk_BC[4]; - /* 0x0C0 */ f32 fragmentPosX[24]; - /* 0x120 */ char unk_120[4]; - /* 0x124 */ f32 fragmentPosY[24]; - /* 0x184 */ char unk_184[4]; - /* 0x188 */ f32 fragmentPosZ[24]; -} SwitchData; - -// from 104940_len_dc0, size unknown -// appears to belong to the hammer blocks(?) -typedef struct BlockData { - /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities - /* 0x001 */ char unk_01[2]; - /* 0x003 */ s8 empty; - /* 0x004 */ s16 coinsLeft; - /* 0x006 */ s16 timeLeft; - /* 0x008 */ char unk_08[2]; - /* 0x00A */ u16 gameFlagIndex; - /* 0x00C */ char unk_0C[2]; - /* 0x00E */ s16 unk_0E; - /* 0x010 */ s16 itemEntityIndex; // for spawned item entities - /* 0x012 */ s16 childEntityIndex; // for block entities that spawn other block entities - /* 0x014 */ f32 initialY; - /* 0x018 */ f32 recoilInterpPhase; - /* 0x01C */ char unk_1C[0x10C]; - /* 0x128 */ UNK_PTR unk_128; - /* 0x12C */ UNK_PTR unk_12C; -} BlockData; - -typedef struct ItemBlockData { - /* 0x00 */ u16 unk_00; - /* 0x02 */ char unk_02[8]; - /* 0x0A */ u16 gameFlagIndex; - /* 0x0C */ char unk_C[4]; - /* 0x10 */ s16 itemID; - /* 0x12 */ s16 childEntityIndex; // for block entities that spawn other block entities -} ItemBlockData; - -typedef struct SaveBlockData { - /* 0x000 */ char unk_0[4]; - /* 0x004 */ s16 angle; -} SaveBlockData; - -// size unknown -typedef struct SuperBlockContentData { - /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities - /* 0x001 */ u8 unk_01; - /* 0x002 */ s8 unk_02; - /* 0x003 */ s8 unk_03; - /* 0x004 */ f32 unk_04; - /* 0x008 */ char unk_08; - /* 0x009 */ u8 unk_09; - /* 0x00A */ u8 unk_0A; - /* 0x00B */ char unk_0B; // padding? - /* 0x00C */ s32 unk_0C; - /* 0x010 */ s32 unk_10; - /* 0x014 */ f32 unk_14; - /* 0x018 */ f32 unk_18; - /* 0x01C */ f32 unk_1C; - /* 0x020 */ f32 unk_20; - /* 0x024 */ u16 unk_24; - /* 0x024 */ s16 unk_26; - /* 0x028 */ f32 unk_28[0xB]; - /* 0x054 */ f32 unk_54; - /* 0x058 */ char unk_58[0x78]; - /* 0x0D0 */ u16 yawBufferPos; - /* 0x0D4 */ f32 yawBuffer[20]; - /* 0x124 */ s32 unk_124; - /* 0x128 */ s32* unk_128; - /* 0x12C */ s32* unk_12C; -} SuperBlockContentData; - -// size unknown -typedef struct HeartBlockContentData { - /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities - /* 0x001 */ u8 state; - /* 0x002 */ s8 sparkleTimer; - /* 0x003 */ s8 sparkleTrailTimer; - /* 0x004 */ f32 sparkleTrailPosY; - /* 0x008 */ char heartbeatTimer; - /* 0x009 */ u8 unk_09; - /* 0x00A */ u8 sparkleEffectType; - /* 0x00B */ char unk_0B; // padding? - /* 0x00C */ s32 unk_0C; - /* 0x010 */ s32 unk_10; - /* 0x014 */ f32 riseVelocity; - /* 0x018 */ f32 sparkleTrailAngle; - /* 0x01C */ f32 sparkleTrailRadius; - /* 0x020 */ f32 bouncePhase; - /* 0x024 */ u16 yawBufferPos; - /* 0x024 */ s16 unk_26; - /* 0x028 */ f32 yawBuffer[10]; - /* 0x050 */ f32 unk_50; - /* 0x054 */ f32 rotationRate; - /* 0x058 */ char unk_58[0x78]; - /* 0x0D0 */ u16 yawBufferPosX; - /* 0x0D4 */ f32 yawBufferX[20]; - /* 0x124 */ s32 unk_124; - /* 0x128 */ s32* unk_128; - /* 0x12C */ s32* unk_12C; -} HeartBlockContentData; - -typedef struct WoodenCrateData { - /* 0x000 */ s32 itemID; - /* 0x004 */ u16 globalFlagIndex; - /* 0x006 */ u8 unk_06[2]; - /* 0x008 */ u8* fragmentsGfx; //TODO type when more WoodenCrate.c is done - /* 0x00C */ f32 basePosY; - /* 0x010 */ u8 fragmentScale[36]; - /* 0x034 */ s8 fragmentMoveAngle[36]; // X,Z plane -- scaled to map [0,255] -> [0,360] - /* 0x058 */ u8 fragmentRotX[36]; // scaled to map [0,255] -> [0,360] - /* 0x07C */ u8 fragmentRotY[36]; // scaled to map [0,255] -> [0,360] - /* 0x0A0 */ u8 fragmentLateralSpeed[36]; - /* 0x0C4 */ f32 fragmentFallSpeed[36]; - /* 0x154 */ f32 fragmentPosX[36]; - /* 0x1E4 */ f32 fragmentPosY[36]; - /* 0x274 */ f32 fragmentPosZ[36]; - /* 0x304 */ f32 unk_304[36]; -} WoodenCrateData; - -// size unknown -typedef struct ChestData { - /* 0x00 */ u16 gameFlagIndex; - /* 0x02 */ s16 giveItemTimer; - /* 0x04 */ u8 state; - /* 0x04 */ s8 unk_05; - /* 0x06 */ s8 postLidAnimDelay; - /* 0x07 */ u8 unk_07; - /* 0x08 */ f32 lidAngle; - /* 0x0C */ f32 lidAnimInterpPhase; - /* 0x10 */ s32 itemID; - /* 0x14 */ s32 itemEntityIndex; - /* 0x18 */ Vec3f itemEntityPos; - /* 0x24 */ f32 giveItemRadiusInterpPhase; - /* 0x28 */ f32 giveItemHeightInterpPhase; - /* 0x2C */ f32 itemVelY; - /* 0x30 */ s8 unk_30; - /* 0x31 */ char unk_31[3]; - /* 0x34 */ struct EffectInstance* gotItemEffect; -} ChestData; - -typedef struct BlueWarpPipeData { - /* 0x00 */ s32 unk_00; // proably flags - /* 0x04 */ s32 timer; - /* 0x08 */ s32 isRaised; - /* 0x0C */ s32 entryID; - /* 0x10 */ EvtScript* onEnterPipeEvt; - /* 0x14 */ s32 flagIndex; - /* 0x18 */ f32 finalPosY; -} BlueWarpPipeData; - -typedef struct SimpleSpringData { - /* 0x00 */ s32 launchVelocity; -} SimpleSpringData; - -// END ENTITY-SPECIFIC STRUCTS +struct SaveBlockData; +struct SwitchData; +struct ShatteringBlockData; +struct BlockData; +struct WoodenCrateData; +struct ChestData; +struct BlueWarpPipeData; +struct HeartBlockContentData; +struct SuperBlockContentData; +struct SimpleSpringData; +struct HiddenPanelData; +struct SignpostData; +struct PadlockData; +struct BoardedFloorData; +struct BombableRockData; +struct TweesterData; +struct StarBoxLauncherData; +struct CymbalPlantData; +struct PinkFlowerData; +struct SpinningFlowerData; +struct TrumpetPlantData; +struct MunchlesiaData; +struct ArrowSignData; typedef s32 (*EntityCallback)(struct Entity*); +typedef struct DmaEntry { + void* start; + void* end; +} DmaEntry; + typedef struct EntityBlueprint { /* 0x00 */ u16 flags; /* 0x02 */ u16 typeDataSize; /* 0x04 */ UNK_PTR renderCommandList; /* 0x08 */ UNK_PTR modelAnimationNodes; - /* 0x0C */ EntityCallback(fpInit); + /* 0x0C */ void (*fpInit)(struct Entity*); /* 0x10 */ UNK_PTR updateEntityScript; /* 0x14 */ EntityCallback fpHandleCollision; - /* 0x18 */ s32 dmaStart; - /* 0x1C */ s32 dmaEnd; + /* 0x18 */ union { + DmaEntry dma; + DmaEntry* dmaList; + }; /* 0x20 */ u8 entityType; /* 0x21 */ u8 aabbSize[3]; } EntityBlueprint; // size = 0x24 @@ -618,9 +460,9 @@ typedef struct Entity { /* 0x04 */ u8 listIndex; /* 0x05 */ s8 unk_05; /* 0x06 */ u8 collisionFlags; - /* 0x07 */ s8 unk_07; + /* 0x07 */ s8 collisionTimer; /* 0x08 */ u8 unk_08; - /* 0x09 */ u8 hasEntityScript; + /* 0x09 */ u8 scriptDelay; /* 0x0A */ u8 type; /* 0x0B */ u8 alpha; /* 0x0C */ Vec3s aabb; @@ -632,31 +474,42 @@ typedef struct Entity { /* 0x20 */ EntityCallback updateMatrixOverride; /* 0x24 */ Evt* boundScript; /* 0x28 */ EvtScript* boundScriptBytecode; - /* 0x2C */ s32* savedReadPos; - /* 0x30 */ char unk_30[0x8]; + /* 0x2C */ s32* savedReadPos[3]; /* 0x38 */ EntityBlueprint* blueprint; - /* 0x3C */ UNK_PTR renderSetupFunc; // pointer to draw func(?) + /* 0x3C */ void (*renderSetupFunc)(s32); /* 0x40 */ union { s32* any; - SwitchData* swtch; - BlockData* block; - ItemBlockData* itemBlock; - SaveBlockData* saveBlock; - WoodenCrateData* crate; - ChestData* chest; - BlueWarpPipeData* bluePipe; - HeartBlockContentData* heartBlockContent; - SuperBlockContentData* superBlockContent; - SimpleSpringData* simpleSpring; - s32* unk; + struct SaveBlockData* saveBlock; + struct SwitchData* swtch; + struct ShatteringBlockData* shatteringBlock; + struct BlockData* block; + struct WoodenCrateData* crate; + struct ChestData* chest; + struct BlueWarpPipeData* bluePipe; + struct HeartBlockContentData* heartBlockContent; + struct SuperBlockContentData* superBlockContent; + struct SimpleSpringData* simpleSpring; + struct HiddenPanelData* hiddenPanel; + struct SignpostData* signPost; + struct PadlockData* padlock; + struct BoardedFloorData* boardedFloor; + struct BombableRockData* bombableRock; + struct TweesterData* tweester; + struct StarBoxLauncherData* starBoxLauncher; + struct CymbalPlantData* cymbalPlant; + struct PinkFlowerData* pinkFlower; + struct SpinningFlowerData* spinningFlower; + struct TrumpetPlantData* trumpetPlant; + struct MunchlesiaData* munchlesia; + struct ArrowSignData* arrowSign; } dataBuf; - /* 0x44 */ Vec3s* vertexData; + /* 0x44 */ void* gfxBaseAddr; /* 0x48 */ Vec3f position; /* 0x54 */ Vec3f scale; /* 0x60 */ Vec3f rotation; /* 0x6C */ f32 shadowPosY; /* 0x70 */ Matrix4f inverseTransformMatrix; /* world-to-local */ - /* 0xB0 */ float effectiveSize; + /* 0xB0 */ f32 effectiveSize; /* 0xB4 */ char unk_B4[4]; /* 0xB8 */ Mtx transformMatrix; } Entity; // size = 0xF8 @@ -665,7 +518,7 @@ typedef Entity* EntityList[MAX_ENTITIES]; struct Shadow; -typedef s32 (*ShadowCallback)(struct Shadow*); +typedef void (*ShadowCallback)(struct Shadow*); // same as EntityBlueprint typedef struct ShadowBlueprint { @@ -1174,7 +1027,7 @@ typedef struct ModelAnimator { /* 0x090 */ f32 nextUpdateTime; /* 0x094 */ f32 timeScale; /* 0x098 */ Mtx mtx; - /* 0x0D8 */ Vec3s* vertexArray; + /* 0x0D8 */ void* baseAddr; /* 0x0DC */ s16* animationBuffer; /* 0x0E0 */ StaticAnimatorNode* staticNodes[0x7A]; /* 0x2C8 */ StaticAnimatorNode** staticRoot; @@ -2399,9 +2252,9 @@ typedef struct PopupMessage { } PopupMessage; // size = 0x1C typedef struct Struct8015A578 { - /* 0x00 */ u8 unk_00; + /* 0x00 */ s8 unk_00; /* 0x01 */ u8 unk_01; - /* 0x02 */ u8 unk_02; + /* 0x02 */ s8 unk_02; /* 0x03 */ u8 unk_03[5]; /* 0x08 */ f32 unk_08; /* 0x0C */ char unk_0C[0x4]; diff --git a/include/effects.h b/include/effects.h index 53d8b40fe0..711e7585a6 100644 --- a/include/effects.h +++ b/include/effects.h @@ -976,7 +976,7 @@ void fx_smoke_ring(s32, f32, f32, f32); void fx_damage_stars(s32, f32, f32, f32, f32, f32, f32, s32); void fx_explosion(s32, f32, f32, f32); EffectInstance* fx_lens_flare(s32, f32, f32, f32, s32); -EffectInstance* fx_got_item_outline(s32, f32, f32, f32, f32, s32*); +EffectInstance* fx_got_item_outline(s32, f32, f32, f32, f32, EffectInstance**); EffectInstance* fx_spiky_white_aura(s32, f32, f32, f32, s32); void fx_smoke_impact(s32, f32, f32, f32, f32, s32, f32, s32); EffectInstance* fx_damage_indicator(s32, f32, f32, f32, f32, f32, s32, EffectInstance**); diff --git a/include/entity.h b/include/entity.h new file mode 100644 index 0000000000..3b3bee75f3 --- /dev/null +++ b/include/entity.h @@ -0,0 +1,437 @@ +#ifndef ENTITY_H +#define ENTITY_H + +#include "common.h" + +typedef s32 EntityScript[0]; +typedef s32 EntityModelScript[0]; + +enum { + ENTITY_SCRIPT_OP_End, + ENTITY_SCRIPT_OP_Jump, + ENTITY_SCRIPT_OP_Call, + ENTITY_SCRIPT_OP_SetCallback, + ENTITY_SCRIPT_OP_Goto, + ENTITY_SCRIPT_OP_Label, + ENTITY_SCRIPT_OP_RestartBoundScript, + ENTITY_SCRIPT_OP_SetFlags, + ENTITY_SCRIPT_OP_ClearFlags, + ENTITY_SCRIPT_OP_PlaySound, +}; + +enum { + ENTITY_MODEL_SCRIPT_OP_End, + ENTITY_MODEL_SCRIPT_OP_Draw, + ENTITY_MODEL_SCRIPT_OP_Restart, + ENTITY_MODEL_SCRIPT_OP_Loop, + ENTITY_MODEL_SCRIPT_OP_SetRenderMode, + ENTITY_MODEL_SCRIPT_OP_SetFlags, + ENTITY_MODEL_SCRIPT_OP_ClearFlags, + ENTITY_MODEL_SCRIPT_OP_DrawImage, +}; + +#define es_End ENTITY_SCRIPT_OP_End, +#define es_Jump(script) ENTITY_SCRIPT_OP_Jump, (s32)script, +#define es_Call(func) ENTITY_SCRIPT_OP_Call, (s32)func, +#define es_SetCallback(func, time) ENTITY_SCRIPT_OP_SetCallback, time, (s32)func, +#define es_Goto(labelId) ENTITY_SCRIPT_OP_Goto, labelId, +#define es_Restart ENTITY_SCRIPT_OP_Goto, 0, +#define es_Label(labelId) ENTITY_SCRIPT_OP_Label, labelId, +#define es_RestartBoundScript ENTITY_SCRIPT_OP_RestartBoundScript, +#define es_SetFlags(flags) ENTITY_SCRIPT_OP_SetFlags, flags, +#define es_ClearFlags(flags) ENTITY_SCRIPT_OP_ClearFlags, flags, +#define es_PlaySound(soundId) ENTITY_SCRIPT_OP_PlaySound, soundId, + +#define ems_End ENTITY_MODEL_SCRIPT_OP_End, +#define ems_Draw(dlist, holdTime) ENTITY_MODEL_SCRIPT_OP_Draw, holdTime, (s32)dlist, +#define ems_Restart ENTITY_MODEL_SCRIPT_OP_Restart, +#define ems_Loop ENTITY_MODEL_SCRIPT_OP_Loop, +#define ems_SetRenderMode(mode) ENTITY_MODEL_SCRIPT_OP_SetRenderMode, mode, +#define ems_SetFlags(flags) ENTITY_MODEL_SCRIPT_OP_SetFlags, flags, +#define ems_ClearFlags(flags) ENTITY_MODEL_SCRIPT_OP_ClearFlags, flags, +#define ems_DrawImage(raster, palette, width, height, holdTime) ENTITY_MODEL_SCRIPT_OP_DrawImage, holdTime, (s32)raster, (s32)palette, width, height, + +#define STANDARD_ENTITY_MODEL_SCRIPT(gfx, renderMode) \ + { \ + ems_SetRenderMode(renderMode) \ + ems_Draw(gfx, 60) \ + ems_Restart \ + ems_End \ + } + +#define ENTITY_ADDR(entity, type, data) (type)((s32)(entity->gfxBaseAddr) + ((s32)(data) & 0xFFFF)) +#define ENTITY_ROM(name) { entity_model_##name##_ROM_START, entity_model_##name##_ROM_END } + +typedef struct SaveBlockData { + /* 0x000 */ char unk_0[4]; + /* 0x004 */ s16 angle; + /* 0x006 */ char unk_6[0x1A]; +} SaveBlockData; // size = 0x20 + +typedef struct SwitchData { + /* 0x000 */ f32 fallVelocity; + /* 0x004 */ f32 deltaScaleX; + /* 0x008 */ f32 deltaScaleY; + /* 0x00C */ char unk_0C[4]; + /* 0x010 */ s8 animStateScaleX; + /* 0x011 */ s8 animStateScaleY; + /* 0x014 */ Vec3f baseScale; + /* 0x020 */ u16 areaFlagIndex; + /* 0x022 */ s16 greenMotionTimer; + /* 0x024 */ s16 scaleAnimTimer; + /* 0x028 */ struct Entity* linkedSwitch; +} SwitchData; // size = 0x2C + +typedef struct ShatteringBlockData { + /* 0x000 */ u16 fragmentFlags[25]; + /* 0x034 */ Gfx** fragmentDisplayLists; + /* 0x038 */ f32 originalPosY; + /* 0x03C */ s16 alpha; + /* 0x03E */ s16 fadeOutCounter; + /* 0x040 */ s8 fragmentRebounds[25]; + /* 0x059 */ s8 fragmentRotSpeed[25]; + /* 0x072 */ u8 fragmentMoveAngle[25]; // scaled to map [0,255] -> [0,360] + /* 0x08B */ u8 fragmentRotX[25]; // scaled to map [0,255] -> [0,360] + /* 0x0A4 */ u8 fragmentRotY[25]; // scaled to map [0,255] -> [0,360] + /* 0x0C0 */ f32 fragmentPosX[25]; + /* 0x124 */ f32 fragmentPosY[25]; + /* 0x188 */ f32 fragmentPosZ[25]; + /* 0x1EC */ f32 fragmentFallSpeed[25]; +} ShatteringBlockData; // size = 0x250 + +typedef struct BlockData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ char unk_01[2]; + /* 0x003 */ s8 empty; + /* 0x004 */ s16 coinsLeft; + /* 0x006 */ s16 timeLeft; + /* 0x008 */ char unk_08[2]; + /* 0x00A */ u16 gameFlagIndex; + /* 0x00C */ char unk_0C[2]; + /* 0x00E */ s16 sinkingTimer; + /* 0x010 */ s16 item; // for spawned item entities + /* 0x012 */ s16 childEntityIndex; // for block entities that spawn other block entities + /* 0x014 */ f32 initialY; + /* 0x018 */ f32 recoilInterpPhase; + /* 0x01C */ char unk_1C[0x4]; +} BlockData; // size = 0x20 + +typedef struct SuperBlockContentData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ u8 unk_01; + /* 0x002 */ s8 effectTimer; + /* 0x003 */ s8 unk_03; + /* 0x004 */ f32 unk_04; + /* 0x008 */ u8 paletteTimer; + /* 0x009 */ u8 paletteArrOffset; + /* 0x00A */ u8 isHidden; + /* 0x00B */ char unk_0B; // padding? + /* 0x00C */ s32 unk_0C; + /* 0x010 */ Mtx unk_10; + /* 0x050 */ Mtx unk_50; + /* 0x090 */ Mtx unk_90; + /* 0x0D0 */ u16 yawBufferPos; + /* 0x0D4 */ f32 yawBuffer[20]; + /* 0x124 */ s32 unk_124; + /* 0x128 */ Gfx* gfx1; + /* 0x12C */ Gfx* gfx2; +} SuperBlockContentData; // size = 0x130 + +// size unknown +typedef struct HeartBlockContentData { + /* 0x000 */ u8 parentEntityIndex; // for block entities spawned by other block entities + /* 0x001 */ u8 state; + /* 0x002 */ s8 sparkleTimer; + /* 0x003 */ s8 sparkleTrailTimer; + /* 0x004 */ f32 sparkleTrailPosY; + /* 0x008 */ u8 heartbeatTimer; + /* 0x009 */ u8 unk_09; + /* 0x00A */ u8 sparkleEffectType; + /* 0x00B */ char unk_0B; // padding? + /* 0x00C */ s32 unk_0C; + /* 0x010 */ s32 unk_10; + /* 0x014 */ f32 riseVelocity; + /* 0x018 */ f32 sparkleTrailAngle; + /* 0x01C */ f32 sparkleTrailRadius; + /* 0x020 */ f32 bouncePhase; + /* 0x024 */ u16 yawBufferPos; + /* 0x024 */ s16 unk_26; + /* 0x028 */ f32 yawBuffer[10]; + /* 0x050 */ f32 unk_50; + /* 0x054 */ f32 rotationRate; + /* 0x058 */ Mtx unk_58; + /* 0x098 */ Mtx unk_98; +} HeartBlockContentData; // size = 0xD8 + +typedef struct WoodenCrateData { + /* 0x000 */ s32 itemID; + /* 0x004 */ u16 globalFlagIndex; + /* 0x006 */ u8 unk_06[2]; + /* 0x008 */ Gfx** fragmentsGfx; + /* 0x00C */ f32 basePosY; + /* 0x010 */ s8 fragmentRebounds[36]; + /* 0x034 */ u8 fragmentMoveAngle[36]; // X,Z plane -- scaled to map [0,255] -> [0,360], also used as fragment alpha + /* 0x058 */ u8 fragmentRotX[36]; // scaled to map [0,255] -> [0,360] + /* 0x07C */ u8 fragmentRotY[36]; // scaled to map [0,255] -> [0,360] + /* 0x0A0 */ u8 fragmentLateralSpeed[36]; // scaled to map [0,255] -> [0,25.5] + /* 0x0C4 */ f32 fragmentRotationSpeed[36]; + /* 0x154 */ f32 fragmentPosX[36]; + /* 0x1E4 */ f32 fragmentPosY[36]; + /* 0x274 */ f32 fragmentPosZ[36]; + /* 0x304 */ f32 fragmentFallSpeed[36]; +} WoodenCrateData; // size = 0x394 + +// size unknown +typedef struct ChestData { + /* 0x00 */ u16 gameFlagIndex; + /* 0x02 */ s16 giveItemTimer; + /* 0x04 */ u8 state; + /* 0x05 */ u8 openState; + /* 0x06 */ s8 postLidAnimDelay; + /* 0x07 */ s8 unk_07; + /* 0x08 */ f32 lidAngle; + /* 0x0C */ f32 lidAnimInterpPhase; + /* 0x10 */ s32 itemID; + /* 0x14 */ s32 itemEntityIndex; + /* 0x18 */ Vec3f itemEntityPos; + /* 0x24 */ f32 giveItemRadiusInterpPhase; + /* 0x28 */ f32 giveItemHeightInterpPhase; + /* 0x2C */ f32 itemVelY; + /* 0x30 */ s8 unk_30; + /* 0x31 */ char unk_31[3]; + /* 0x34 */ struct EffectInstance* gotItemEffect; +} ChestData; // size = 0x38 + +typedef struct BlueWarpPipeData { + /* 0x00 */ s32 unk_00; // proably flags + /* 0x04 */ s32 timer; + /* 0x08 */ s32 isRaised; + /* 0x0C */ s32 entryID; + /* 0x10 */ EvtScript* onEnterPipeEvt; + /* 0x14 */ s32 flagIndex; + /* 0x18 */ f32 finalPosY; +} BlueWarpPipeData; // size = 0x1C + +typedef struct SimpleSpringData { + /* 0x00 */ s32 launchVelocity; +} SimpleSpringData; // size = 0x04 + +typedef struct HiddenPanelData { + /* 0x00 */ s8 state; // TODO: enum + /* 0x01 */ s8 timer; + /* 0x02 */ s8 unk_02; + /* 0x03 */ s8 needSpawnItem; + /* 0x04 */ s8 unk_04; + /* 0x05 */ s8 unk_05; + /* 0x06 */ u16 pickupVar; + /* 0x08 */ s32 standingNpcIndex; + /* 0x0C */ s32 npcFlags; + /* 0x10 */ s32 itemID; + /* 0x14 */ s32 spawnedItemIndex; + /* 0x18 */ Vec3i spawnedItemPos; + /* 0x24 */ f32 initialY; + /* 0x28 */ f32 riseVelocity; + /* 0x2C */ f32 riseInterpPhase; + /* 0x30 */ f32 rotationSpeed; + /* 0x34 */ Matrix4f entityMatrix; + /* 0x74 */ u16 modelID; + /* 0x76 */ char unk_76[0x2]; + /* 0x78 */ Gfx* renderDList; +} HiddenPanelData; // size = 0x7C + +typedef struct SignpostData { + /* 0x00 */ char unk_00[8]; +} SignpostData; // size = 0x08 + +typedef struct PadlockData { + /* 0x00 */ f32 pushSpeed; + /* 0x04 */ f32 shacklePos; + /* 0x08 */ f32 fallSpeed; + /* 0x0C */ f32 rotationSpeed; + /* 0x10 */ u8 blinkCounter; + /* 0x11 */ s8 timer; + /* 0x12 */ s8 state; + /* 0x13 */ char unk_13; + /* 0x14 */ Mtx* shackleMtx; + /* 0x18 */ Gfx* shackleGfx; +} PadlockData; // size = 0x1C + +typedef struct BoardedFloorData { + /* 0x000 */ Gfx** fragmentsGfx; + /* 0x004 */ f32 inititalY; + /* 0x008 */ s8 fragmentRebounds[13]; + /* 0x015 */ u8 fragmentMoveAngle[13]; + /* 0x022 */ u8 fragmentRotX[13]; + /* 0x02F */ u8 fragmentRotY[13]; + /* 0x03C */ u8 fragmentLateralSpeed[13]; + /* 0x04C */ f32 fragmentRotationSpeed[13]; + /* 0x080 */ f32 fragmentPosX[13]; + /* 0x0B4 */ f32 fragmentPosY[13]; + /* 0x0E8 */ f32 fragmentPosZ[13]; + /* 0x11C */ f32 fragmentFallSpeed[13]; +} BoardedFloorData; // size = 0x150 + +typedef struct BombableRockData { + /* 0x00 */ Gfx** fragmentsGfx; + /* 0x04 */ f32 inititalY; + /* 0x08 */ s8 fragmentRebounds[6]; + /* 0x0E */ u8 fragmentMoveAngle[6]; + /* 0x14 */ u8 fragmentRotX[6]; + /* 0x1A */ u8 fragmentRotY[6]; + /* 0x20 */ u8 fragmentLateralSpeed[6]; + /* 0x28 */ f32 fragmentRotationSpeed[6]; + /* 0x40 */ f32 fragmentPosX[6]; + /* 0x58 */ f32 fragmentPosY[6]; + /* 0x70 */ f32 fragmentPosZ[6]; + /* 0x88 */ f32 fragmentFallSpeed[6]; +} BombableRockData; // size = 0xA0 + +typedef struct TweesterData { + /* 0x00 */ s8 unk_00; + /* 0x01 */ s8 faceAnimState; + /* 0x02 */ s8 faceAnimTimer; + /* 0x03 */ s8 faceAnimTexOffset; + /* 0x04 */ f32 rotationSpeed; + /* 0x08 */ f32 innerWhirlRotY; + /* 0x0C */ f32 outerWhirlRotY; + /* 0x10 */ Mtx mtxInnerWhirl; + /* 0x50 */ Mtx mtxOuterWhirl; + /* 0x90 */ s16 innerWhirlTexOffsetX; + /* 0x92 */ s16 innerWhirlTexOffsetY; + /* 0x94 */ s16 outerWhirlTexOffsetX; + /* 0x96 */ s16 outerWhirlTexOffsetY; + /* 0x98 */ s16 frameCounter; + /* 0x9C */ s32* currentPath; + /* 0xA0 */ s32** paths; + /* 0xA4 */ s16 targetX; + /* 0xA6 */ s16 targetY; + /* 0xA8 */ s16 targetZ; + /* 0xAA */ s16 pathOffset; + /* 0xAC */ char unk_AC[12]; + /* 0xB8 */ f32 yaw; + /* 0xBC */ char unk_BC[4]; +} TweesterData; // size = 0xC0; + +typedef struct StarBoxLauncherData { + /* 0x00 */ s8 state; + /* 0x01 */ s8 timer; + /* 0x02 */ s8 flags; + /* 0x03 */ s8 faceDataIndex; + /* 0x04 */ s8 faceAnimTimer; + /* 0x05 */ s8 faceTexOffset; + /* 0x08 */ f32 basePosX; + /* 0x0C */ f32 basePosZ; + /* 0x10 */ f32 basePosY; + /* 0x14 */ f32 riseSpeedPhase; + /* 0x18 */ f32 riseVelocity; + /* 0x1C */ f32 rotationZPhase; + /* 0x20 */ f32 maxRotationZ; +} StarBoxLauncherData; // size = 0x24 + +typedef struct CymbalPlantData { + /* 0x0 */ u8 state; + /* 0x1 */ s8 unk_01; + /* 0x2 */ s16 timer; + /* 0x4 */ f32 angle; + /* 0x8 */ f32 dist; +} CymbalPlantData; // size = 0xC + +typedef struct PinkFlowerData { + /* 0x0 */ u16 state; + /* 0x2 */ u16 timer; + /* 0x4 */ u16 linkedEntityIndex; + /* 0x8 */ f32 initialRotY; +} PinkFlowerData; // size = 0xC + +typedef struct SpinningFlowerData { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s8 state; + /* 0x04 */ Vec3f rotation; + /* 0x10 */ s32 unk_10; + /* 0x14 */ f32 spinSpeed; + /* 0x18 */ s32 unk_18; + /* 0x1C */ char unk_1C[0x0C]; + /* 0x28 */ s16 unk_28; + /* 0x2A */ s16 unk_2A; + /* 0x2C */ s16 unk_2C; + /* 0x30 */ Mtx unk_30; +} SpinningFlowerData; // size = 0x70 + +typedef struct TrumpetPlantData { + /* 0x0 */ s32 numCoins; +} TrumpetPlantData; // size = 0x4 + +typedef struct MunchlesiaData { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s8 unk_04[0x8]; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; +} MunchlesiaData; // size = 0x1C + +typedef struct ArrowSignData { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 angle; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; +} ArrowSignData; // size = 0x10 + +extern ShadowBlueprint CircularShadowA; +extern ShadowBlueprint CircularShadowB; +extern ShadowBlueprint SquareShadow; +extern EntityBlueprint Entity_SavePoint; +extern EntityBlueprint Entity_RedSwitch; +extern EntityBlueprint Entity_BlueSwitch; +extern EntityBlueprint Entity_HugeBlueSwitch; +extern EntityBlueprint Entity_GreenStompSwitch; +extern EntityBlueprint Entity_InertYellowBlock; +extern EntityBlueprint Entity_InertRedBlock; +extern EntityBlueprint Entity_BrickBlock; +extern EntityBlueprint Entity_MulticoinBlock; +extern EntityBlueprint Entity_Hammer1Block; +extern EntityBlueprint Entity_Hammer1Block_WideHitbox; +extern EntityBlueprint Entity_Hammer1Block_TallHitbox; +extern EntityBlueprint Entity_Hammer1BlockTiny; +extern EntityBlueprint Entity_Hammer2Block; +extern EntityBlueprint Entity_Hammer2Block_WideHitbox; +extern EntityBlueprint Entity_Hammer2Block_TallHitbox; +extern EntityBlueprint Entity_Hammer2BlockTiny; +extern EntityBlueprint Entity_Hammer3Block_WideHitbox; +extern EntityBlueprint Entity_Hammer3Block_TallHitbox; +extern EntityBlueprint Entity_Hammer3BlockTiny; +extern EntityBlueprint Entity_PushBlock; +extern EntityBlueprint Entity_PowBlock; +extern EntityBlueprint Entity_YellowBlock; +extern EntityBlueprint Entity_HiddenYellowBlock; +extern EntityBlueprint Entity_RedBlock; +extern EntityBlueprint Entity_HiddenRedBlock; +extern EntityBlueprint Entity_TriggerBlock; +extern EntityBlueprint Entity_HeartBlock; +extern EntityBlueprint Entity_SuperBlock; +extern EntityBlueprint Entity_ScriptSpring; +extern EntityBlueprint Entity_SimpleSpring; +extern EntityBlueprint Entity_HiddenPanel; +extern EntityBlueprint Entity_GiantChest; +extern EntityBlueprint Entity_Chest; +extern EntityBlueprint Entity_WoodenCrate; +extern EntityBlueprint Entity_BlueWarpPipe; +extern EntityBlueprint Entity_Signpost; +extern EntityBlueprint Entity_Padlock; +extern EntityBlueprint Entity_PadlockRedFrame; +extern EntityBlueprint Entity_PadlockRedFace; +extern EntityBlueprint Entity_PadlockBlueFace; +extern EntityBlueprint Entity_BoardedFloor; +extern EntityBlueprint Entity_BombableRock; +extern EntityBlueprint Entity_BombableRock2; +extern EntityBlueprint Entity_Tweester; +extern EntityBlueprint Entity_StarBoxLauncher; +extern EntityBlueprint Entity_CymbalPlant; +extern EntityBlueprint Entity_PinkFlower; +extern EntityBlueprint Entity_SpinningFlower; +extern EntityBlueprint Entity_BellbellPlant; +extern EntityBlueprint Entity_TrumpetPlant; +extern EntityBlueprint Entity_Munchlesia; +extern EntityBlueprint Entity_ArrowSign; + +#endif diff --git a/include/enums.h b/include/enums.h index 699b3c785d..cfbcb9ce2f 100644 --- a/include/enums.h +++ b/include/enums.h @@ -536,6 +536,8 @@ enum SoundIDs { SOUND_HIT_FIRE = 0x000000EA, SOUND_HIT_ICE = 0x000000EB, SOUND_F1 = 0x000000F1, + SOUND_F3 = 0x000000F3, + SOUND_F4 = 0x000000F4, SOUND_FD = 0x000000FD, SOUND_FE = 0x000000FE, SOUND_108 = 0x00000108, @@ -558,6 +560,7 @@ enum SoundIDs { SOUND_14F = 0x0000014F, SOUND_150 = 0x00000150, SOUND_151 = 0x00000151, + SOUND_152 = 0x00000152, SOUND_SEARCH_BUSH = 0x00000153, SOUND_158 = 0x00000158, SOUND_162 = 0x00000162, @@ -603,6 +606,8 @@ enum SoundIDs { SOUND_25C = 0x0000025C, SOUND_25D = 0x0000025D, SOUND_262 = 0x00000262, + SOUND_269 = 0x00000269, + SOUND_26A = 0x0000026A, SOUND_281 = 0x00000281, SOUND_282 = 0x00000282, SOUND_283 = 0x00000283, @@ -673,6 +678,7 @@ enum SoundIDs { SOUND_HIT_PLAYER_SHOCK = 0x0000037A, SOUND_HIT_SHOCK = 0x0000037B, SOUND_392 = 0x00000392, + SOUND_393 = 0x00000393, SOUND_GENERAL_WHISTLE = 0x00000395, SOUND_3AB = 0x000003AB, SOUND_3AD = 0x000003AD, @@ -745,14 +751,19 @@ enum SoundIDs { SOUND_BOMB_BLAST = 0x00002076, SOUND_JUMP_2081 = 0x00002081, SOUND_JUMP_8BIT_MARIO = 0x00002082, + SOUND_2085 = 0x00002085, SOUND_2086 = 0x00002086, SOUND_208C = 0x0000208C, SOUND_208D = 0x0000208D, SOUND_208E = 0x0000208E, SOUND_208F = 0x0000208F, + SOUND_2092 = 0x00002092, SOUND_2095 = 0x00002095, + SOUND_209B = 0x0000209B, SOUND_20A3 = 0x000020A3, SOUND_20A4 = 0x000020A4, + SOUND_20AB = 0x000020AB, + SOUND_20AC = 0x000020AC, SOUND_20AE = 0x000020AE, SOUND_20B8 = 0x000020B8, SOUND_20BA = 0x000020BA, @@ -1802,11 +1813,11 @@ enum EntityFlags { ENTITY_FLAGS_HAS_DYNAMIC_SHADOW = 0x00000004, ENTITY_FLAGS_HAS_ANIMATED_MODEL = 0x00000008, ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, - ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX = 0x00000020, + ENTITY_FLAGS_DISABLE_COLLISION = 0x00000020, ENTITY_FLAGS_CONTINUOUS_COLLISION = 0x00000040, ENTITY_FLAGS_80 = 0x00000080, - ENTITY_FLAGS_100 = 0x00000100, - ENTITY_FLAGS_SET_SHADOW_FLAG200 = 0x00000200, + ENTITY_FLAGS_HAS_SHADOW = 0x00000100, + ENTITY_FLAGS_FIXED_SHADOW_SIZE = 0x00000200, ENTITY_FLAGS_400 = 0x00000400, ENTITY_FLAGS_SQUARE_SHADOW = 0x00000800, ENTITY_FLAGS_SHOWS_INSPECT_PROMPT = 0x00001000, @@ -1814,18 +1825,18 @@ enum EntityFlags { ENTITY_FLAGS_4000 = 0x00004000, ENTITY_FLAGS_8000 = 0x00008000, ENTITY_FLAGS_DETECTED_COLLISION = 0x00010000, - ENTITY_FLAGS_BLOCK_BEING_HIT = 0x00020000, + ENTITY_FLAGS_PARTNER_COLLISION = 0x00020000, ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, ENTITY_FLAGS_IGNORE_DISTANCE_CULLING = 0x00080000, ENTITY_FLAGS_100000 = 0x00100000, ENTITY_FLAGS_200000 = 0x00200000, - ENTITY_FLAGS_400000 = 0x00400000, - ENTITY_FLAGS_800000 = 0x00800000, + ENTITY_FLAGS_SHADOW_POS_DIRTY = 0x00400000, + ENTITY_FLAGS_DARK_SHADOW = 0x00800000, ENTITY_FLAGS_BOUND_SCRIPT_DIRTY = 0x01000000, ENTITY_FLAGS_2000000 = 0x02000000, ENTITY_FLAGS_PENDING_FULL_DELETE = 0x04000000, ENTITY_FLAGS_8000000 = 0x08000000, - ENTITY_FLAGS_10000000 = 0x10000000, + ENTITY_FLAGS_FADING_AWAY = 0x10000000, ENTITY_FLAGS_PENDING_INSTANCE_DELETE = 0x20000000, ENTITY_FLAGS_SKIP_UPDATE = 0x40000000, ENTITY_FLAGS_CREATED = 0x80000000, @@ -1839,7 +1850,7 @@ enum EntityCollisionFlags { ENTITY_COLLISION_PLAYER_PUSHING_AGAINST = 0x00000010, ENTITY_COLLISION_FLAGS_20 = 0x00000020, ENTITY_COLLISION_PLAYER_HAMMER = 0x00000040, - ENTITY_COLLISION_BLOCK_HIT = 0x00000080, + ENTITY_COLLISION_PARTNER = 0x00000080, ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100 }; @@ -2208,22 +2219,40 @@ enum RenderMode { RENDER_MODE_SURFACE_OPA_NO_AA = 0x00000003, RENDER_MODE_SURFACE_OPA_NO_ZB = 0x00000004, RENDER_MODE_DECAL_OPA = 0x00000005, + RENDER_MODE_6 = 0x00000006, RENDER_MODE_DECAL_OPA_NO_AA = 0x00000007, + RENDER_MODE_8 = 0x00000008, RENDER_MODE_INTERSECTING_OPA = 0x00000009, + RENDER_MODE_A = 0x0000000A, + RENDER_MODE_B = 0x0000000B, + RENDER_MODE_C = 0x0000000C, RENDER_MODE_ALPHATEST = 0x0000000D, + RENDER_MODE_E = 0x0000000E, RENDER_MODE_ALPHATEST_ONESIDED = 0x0000000F, RENDER_MODE_ALPHATEST_NO_ZB = 0x00000010, RENDER_MODE_SURFACE_XLU_LAYER1 = 0x00000011, + RENDER_MODE_12 = 0x00000012, RENDER_MODE_SURFACE_XLU_NO_AA = 0x00000013, RENDER_MODE_SURFACE_XLU_NO_ZB = 0x00000014, RENDER_MODE_SURFXLU_ZB_ZUPD = 0x00000015, RENDER_MODE_SURFACE_XLU_LAYER2 = 0x00000016, + RENDER_MODE_17 = 0x00000017, + RENDER_MODE_18 = 0x00000018, + RENDER_MODE_19 = 0x00000019, RENDER_MODE_DECAL_XLU = 0x0000001A, + RENDER_MODE_1B = 0x0000001B, RENDER_MODE_DECAL_XLU_NOAA = 0x0000001C, + RENDER_MODE_1D = 0x0000001D, RENDER_MODE_1E = 0x0000001E, + RENDER_MODE_1F = 0x0000001F, RENDER_MODE_SHADOW = 0x00000020, + RENDER_MODE_21 = 0x00000021, RENDER_MODE_SURFACE_XLU_LAYER3 = 0x00000022, + RENDER_MODE_23 = 0x00000023, + RENDER_MODE_24 = 0x00000024, + RENDER_MODE_25 = 0x00000025, RENDER_MODE_INTERSECTING_XLU = 0x00000026, + RENDER_MODE_27 = 0x00000027, RENDER_MODE_28 = 0x00000028, RENDER_MODE_SURFXLU_AA_ZB_ZUPD = 0x00000029, RENDER_MODE_2A = 0x0000002A, @@ -2232,6 +2261,13 @@ enum RenderMode { RENDER_MODE_2D = 0x0000002D, RENDER_MODE_CLOUD = 0x0000002E, RENDER_MODE_CLOUD_NO_ZB = 0x0000002F, + RENDER_MODE_COUNT = 0x00000030, +}; + +enum RenderTaskFlags { + RENDER_TASK_FLAG_ENABLED = 0x01, + RENDER_TASK_FLAG_2 = 0x02, + RENDER_TASK_FLAG_20 = 0x20, }; enum ActorFlags { @@ -3367,41 +3403,6 @@ enum ModelAnimatorFlags { MODEL_ANIMATOR_FLAGS_80000000 = 0x80000000, }; -enum ShadowFlags { - SHADOW_FLAGS_HIDDEN = 0x00000001, - SHADOW_FLAGS_2 = 0x00000002, - SHADOW_FLAGS_4 = 0x00000004, - SHADOW_FLAGS_COMPLEX_MODEL = 0x00000008, - SHADOW_FLAGS_10 = 0x00000010, - SHADOW_FLAGS_20 = 0x00000020, - SHADOW_FLAGS_40 = 0x00000040, - SHADOW_FLAGS_80 = 0x00000080, - SHADOW_FLAGS_100 = 0x00000100, - SHADOW_FLAGS_200 = 0x00000200, - SHADOW_FLAGS_400 = 0x00000400, - SHADOW_FLAGS_800 = 0x00000800, - SHADOW_FLAGS_1000 = 0x00001000, - SHADOW_FLAGS_ALIGNED_TO_CAMERA = 0x00002000, - SHADOW_FLAGS_4000 = 0x00004000, - SHADOW_FLAGS_8000 = 0x00008000, - SHADOW_FLAGS_10000 = 0x00010000, - SHADOW_FLAGS_20000 = 0x00020000, - SHADOW_FLAGS_40000 = 0x00040000, - SHADOW_FLAGS_80000 = 0x00080000, - SHADOW_FLAGS_100000 = 0x00100000, - SHADOW_FLAGS_200000 = 0x00200000, - SHADOW_FLAGS_POSITION_DIRTY = 0x00400000, - SHADOW_FLAGS_800000 = 0x00800000, - SHADOW_FLAGS_1000000 = 0x01000000, - SHADOW_FLAGS_2000000 = 0x02000000, - SHADOW_FLAGS_4000000 = 0x04000000, - SHADOW_FLAGS_8000000 = 0x08000000, - SHADOW_FLAGS_FADING_AWAY = 0x10000000, - SHADOW_FLAGS_READY_TO_DELETE = 0x20000000, - SHADOW_FLAGS_40000000 = 0x40000000, - SHADOW_FLAGS_80000000 = 0x80000000, -}; - enum ShopFlags { SHOP_FLAGS_0 = 0x00000000, SHOP_FLAGS_1 = 0x00000001, @@ -3501,7 +3502,7 @@ enum EntityModelFlags { ENTITY_MODEL_FLAGS_40 = 0x00000040, ENTITY_MODEL_FLAGS_80 = 0x00000080, ENTITY_MODEL_FLAGS_100 = 0x00000100, - ENTITY_MODEL_FLAGS_200 = 0x00000200, + ENTITY_MODEL_FLAGS_REFLECT = 0x00000200, ENTITY_MODEL_FLAGS_USE_IMAGE = 0x00000400, ENTITY_MODEL_FLAGS_FOG_DISABLED = 0x00000800, ENTITY_MODEL_FLAGS_1000 = 0x00001000, diff --git a/include/functions.h b/include/functions.h index 8852ca550e..811e6eef08 100644 --- a/include/functions.h +++ b/include/functions.h @@ -30,7 +30,7 @@ void* _heap_malloc_tail(HeapNode* head, u32 size); u32 _heap_free(HeapNode* heapNodeList, void* addrToFree); void* _heap_realloc(HeapNode* heapNodeList, void* addr, u32 newSize); HeapNode* _heap_create(HeapNode* addr, u32 size); -s32 dma_copy(Addr romStart, Addr romEnd, void* vramDest); +u32 dma_copy(Addr romStart, Addr romEnd, void* vramDest); f32 rand_float(void); void copy_matrix(Matrix4f src, Matrix4f dest); @@ -60,7 +60,7 @@ void intro_logos_update_fade(void); u32 get_entity_type(s32 arg0); Entity* get_entity_by_index(s32 index); -s32 create_entity(EntityBlueprint* bp, s32 x, s32 y, s32 z, s32 rotY, ...); +s32 create_entity(EntityBlueprint* bp, ...); void entity_shattering_idle(Entity* entity); void func_802666E4(Actor* actor, f32 x, f32 y, f32 z, s32 damage); @@ -84,6 +84,9 @@ void exec_entity_model_commandlist(s32 idx); s32 load_entity_model(s32* cmdList); RenderTask* queue_render_task(RenderTask* task); +s32 create_mesh_animator(s16* animPos, s16* animBuffer); +void load_mesh_animator_tree(s32 index, StaticAnimatorNode** tree); + void setup_pause_menu_tab(MenuWindowBP* bpArray, s32 arraySize); s32 draw_ci_image_with_clipping(s32* raster, s32 width, s32 height, s32 fmt, s32 bitDepth, s32* palette, s16 posX, @@ -297,7 +300,7 @@ void clear_virtual_entity_list(void); void reset_model_animators(void); void init_virtual_entity_list(void); void init_model_animators(void); -void play_model_animation(s32, s32); +void play_model_animation(s32, s16*); s32 heap_free(void* ptr); void btl_state_update_normal_start(void); diff --git a/include/model.h b/include/model.h index e4c668159e..ab89fb33bd 100644 --- a/include/model.h +++ b/include/model.h @@ -169,7 +169,7 @@ void animator_node_update_model_transform(ModelAnimator* animator, f32 (*flipMtx void delete_model_animator_node(AnimatorNode* node); void delete_model_animator_nodes(ModelAnimator* animator); void delete_model_animator(ModelAnimator* animator); -void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 vtxSegment, Vec3s* vertexArray); +void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 segment, void* baseAddr); void appendGfx_animator(ModelAnimator* animator); ModelAnimator* set_animator_render_callback(s32 animModelID, s32 callbackArg, void (*callbackFunc)(void*)); void reload_mesh_animator_tree(ModelAnimator* animator); diff --git a/include/script_api/common.h b/include/script_api/common.h index dc87ae8a0c..cb5fc82bd4 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -46,7 +46,7 @@ ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall); ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall); ApiStatus AssignScript(Evt* script, s32 isInitialCall); -ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall); +ApiStatus AssignSwitchFlag(Evt* script, s32 isInitialCall); ApiStatus AssignChestFlag(Evt* script, s32 isInitialCall); ApiStatus AssignBlockFlag(Evt* script, s32 isInitialCall); ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index 460b3d882b..866ae06f82 100644 --- a/include/variables.h +++ b/include/variables.h @@ -88,14 +88,10 @@ extern MessagePrintState* gCurrentPrintContext; extern s32 D_802DB264; extern MessagePrintState* D_802DB268; -extern ShadowBlueprint CircularShadowA; -extern ShadowBlueprint CircularShadowB; -extern ShadowBlueprint SquareShadow; extern s32 SaveBlockTutorialPrinterClosed; extern s32 SaveBlockResultPrinterClosed; extern MessagePrintState* SaveBlockTutorialPrinter; extern MessagePrintState* SaveBlockResultPrinter; -extern s32 D_802E99DC; extern Entity* SwitchToLink; extern s32 CreateEntityVarArgBuffer[4]; @@ -190,6 +186,7 @@ extern s8 D_8014C248[]; extern UNK_FUN_PTR(D_8010C920); extern UNK_FUN_PTR(D_8010C940); extern Entity* TweesterTouchingPartner; +extern Entity* TweesterTouchingPlayer; extern UNK_FUN_PTR(D_8010C958); extern s32 D_8010C95C; extern s32 D_8010C96C; @@ -225,20 +222,9 @@ extern u32 D_80078174; extern u8 D_800A0963; extern struct EffectInstance* TriggerBlockVanishEffect; -extern UNK_TYPE D_00000094; -extern UNK_TYPE D_00000094_2; // two symbols resolve to the same addr. Required for matching -extern EntityBlueprint Entity_InertRedBlock; -extern EntityBlueprint Entity_InertYellowBlock; -extern UNK_TYPE D_802EA310; -extern EntityBlueprint Entity_HitGroundedYellowBlock; -extern EntityBlueprint Entity_HitFloatingYellowBlock; -extern EntityBlueprint Entity_HitRedBlock; +extern s32 D_802EA310[]; +extern s32 Entity_WoodenCrate_RenderShatteredScript[]; -extern UNK_TYPE D_0A000328; -extern UNK_TYPE D_0A000380; -extern UNK_TYPE D_0A000750; -extern UNK_TYPE D_0A000800; -extern UNK_TYPE D_0A000808; // Scripts extern EvtScript SCRIPT_NpcDefeat; @@ -263,10 +249,6 @@ extern Gfx* gMasterGfxPos; extern u16 gMatrixListPos; extern s32 gCurrentDisplayContextIndex; -extern UNK_TYPE D_0A004350; -extern UNK_TYPE D_0A0026F0; -extern u32* D_802EAE7C; - extern s32 D_80291FA8[]; extern s32 D_80291FD0[]; extern s32 D_80291FF8[]; @@ -304,37 +286,6 @@ extern u32 bMarioIdleAnims[]; extern s32 bMarioDefendAnims[]; extern s32 bPeachIdleAnims[]; -// TODO: name these entity symbols -extern EntityBlueprint Entity_SavePoint; // entitySaveBlock -extern EntityBlueprint Entity_RedSwitch; -extern EntityBlueprint Entity_BlueSwitch; // entityBlueSwitch -extern EntityBlueprint Entity_HugeBlueSwitch; // entityHugeBlueSwitch -extern EntityBlueprint Entity_GreenStompSwitch; -extern EntityBlueprint Entity_ShatteringHammer1Block; -extern EntityBlueprint Entity_ShatteringHammer2Block; -extern EntityBlueprint Entity_ShatteringHammer3Block; -extern EntityBlueprint Entity_ShatteringHammer1BlockTiny; -extern EntityBlueprint Entity_ShatteringHammer2BlockTiny; -extern EntityBlueprint Entity_ShatteringHammer3BlockTiny; -extern EntityBlueprint Entity_ShatteringBrickBlock; -extern EntityBlueprint Entity_D_802EA2E0; -extern EntityBlueprint Entity_D_802EA564; -extern EntityBlueprint Entity_D_802EA0E8; -extern EntityBlueprint Entity_D_802EA10C; -extern EntityBlueprint Entity_D_802EA130; -extern EntityBlueprint Entity_D_802EA154; -extern EntityBlueprint Entity_D_802EA178; -extern EntityBlueprint Entity_D_802EA19C; -extern EntityBlueprint Entity_D_802EA588; -extern EntityBlueprint Entity_D_802EA5AC; -extern EntityBlueprint Entity_D_802EA5D0; //unused -extern EntityBlueprint Entity_D_802EA798; //unused -extern EntityBlueprint Entity_HeartBlock; //unused -extern EntityBlueprint Entity_D_802EAA30; -extern EntityBlueprint Entity_D_802EAA54; -extern EntityBlueprint Entity_D_802EA910; - - extern s32 D_802EBFF0[]; extern s32 D_802EC010[]; extern s32 D_802EC030[]; diff --git a/src/182B30.c b/src/182B30.c index 0752f3f5c0..d3053d8e13 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -589,7 +589,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { if (actor != NULL) { shadow = get_shadow_by_index(actor->shadow.id); - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; if (!(actor->flags & ACTOR_FLAG_DISABLED)) { if (actor->flags & ACTOR_FLAG_10000000) { if (arg0 == 0) { @@ -639,7 +639,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { if (!(actorPart->flags & ACTOR_PART_FLAG_4)) { shadow = get_shadow_by_index(actorPart->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAGS_HIDDEN; x1 = actorPart->currentPos.x; if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) { y1 = actorPart->currentPos.y + 12.0; @@ -652,7 +652,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -670,7 +670,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { shadow = get_shadow_by_index(actor->shadow.id); if (!(actor->flags & ACTOR_FLAG_NO_SHADOW)) { - shadow->flags &= ~ACTOR_FLAG_DISABLED; + shadow->flags &= ~ENTITY_FLAGS_HIDDEN; } x1 = actor->currentPos.x + actor->headOffset.x; @@ -685,7 +685,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -751,7 +751,7 @@ void update_player_actor_shadow(void) { } shadow = get_shadow_by_index(player->shadow.id); - shadow->flags &= ~SHADOW_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAGS_HIDDEN; if (!battleStatus->outtaSightActive) { shadow->alpha = 128; @@ -766,7 +766,7 @@ void update_player_actor_shadow(void) { npc_raycast_down_sides(0, &x, &y, &z, &distance); if (distance > 200.0f) { - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } shadow->position.x = x; shadow->position.y = y; @@ -1941,7 +1941,7 @@ INCLUDE_ASM(s32, "182B30", func_8025CD40); void func_8025CEC8(ActorPart* actorPart) { DecorationTable* decorationTable; s32 i; - + if (!(actorPart->flags & 2)) { decorationTable = actorPart->decorationTable; for (i = 0; i < ARRAY_COUNT(decorationTable->decorationType); i++) { diff --git a/src/43F0.c b/src/43F0.c index 77e5efe212..06e548ca7d 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -445,7 +445,7 @@ void copy_matrix(Matrix4f src, Matrix4f dest) { } // maybe u32 -s32 dma_copy(Addr romStart, Addr romEnd, void* vramDest) { +u32 dma_copy(Addr romStart, Addr romEnd, void* vramDest) { u32 length = romEnd - romStart; s32 i; diff --git a/src/77480.c b/src/77480.c index 84f2e36a9d..9848fec7d5 100644 --- a/src/77480.c +++ b/src/77480.c @@ -190,7 +190,7 @@ s32 player_raycast_down(f32* x, f32* y, f32* z, f32* length) { if (entityID >= 0) { entity = get_entity_by_index(entityID); if (entity->alpha < 255) { - entity->unk_07 = 4; + entity->collisionTimer = 4; entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; @@ -420,7 +420,7 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir if (entityID >= 0) { entity = get_entity_by_index(entityID); if (entity->alpha < 255) { - entity->unk_07 = 0; + entity->collisionTimer = 0; entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; @@ -911,11 +911,11 @@ f32 get_xz_dist_to_player(f32 x, f32 z) { } void enable_player_shadow(void) { - get_shadow_by_index(gPlayerStatus.shadowID)->flags &= ~1; + get_shadow_by_index(gPlayerStatus.shadowID)->flags &= ~ENTITY_FLAGS_HIDDEN; } void disable_player_shadow(void) { - get_shadow_by_index(gPlayerStatus.shadowID)->flags |= 1; + get_shadow_by_index(gPlayerStatus.shadowID)->flags |= ENTITY_FLAGS_HIDDEN; } s32 disable_player_static_collisions(void) { diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 18ff9be107..403fffcb5f 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -1198,7 +1198,7 @@ f32 func_800E5348(void) { return clamp_angle(temp_f0 - 90.0f + gCameras[gCurrentCameraID].currentYaw); } -void player_get_camera_facing_angle(void) { +f32 player_get_camera_facing_angle(void) { f32 angle = 0.0f; if (gPlayerStatus.spriteFacingAngle >= 90.0f && gPlayerStatus.spriteFacingAngle < 270.0f) { @@ -1207,7 +1207,7 @@ void player_get_camera_facing_angle(void) { angle = angle + gCameras[CAM_DEFAULT].currentYaw + 90.0f; - clamp_angle(angle); + return clamp_angle(angle); } void phys_save_ground_pos(void) { diff --git a/src/B4580.c b/src/B4580.c index aec26366ce..ffdd0143bb 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -76,9 +76,9 @@ Vtx* animator_copy_vertices_to_buffer(ModelAnimator* animator, AnimatorNode* nod handle->ttl = 3; nodeVtxList = &node->fcData.vtxList[startIdx]; - if (animator->vertexArray != NULL) { + if (animator->baseAddr != NULL) { i = ((s32)buffer & 0xFFFFFF); // needed to match - buffer = (Vec3s*)(i + (s32)animator->vertexArray); + buffer = (Vec3s*)(i + (s32)animator->baseAddr); } for (i = 0; i < vtxCount; i++) { @@ -299,7 +299,7 @@ s32 create_model_animator(s16* animPos) { animator->savedReadPos = animPos; animator->animationBuffer = NULL; - animator->vertexArray = NULL; + animator->baseAddr = NULL; animator->fpRenderCallback = NULL; animator->rootNode = NULL; animator->nextUniqueID = 0; @@ -314,7 +314,7 @@ s32 create_model_animator(s16* animPos) { return i; } -s32 create_mesh_animator(s32 animPos, s16* animBuffer) { +s32 create_mesh_animator(s16* animPos, s16* animBuffer) { ModelAnimator* animator; s32 i, j; @@ -333,16 +333,16 @@ s32 create_mesh_animator(s32 animPos, s16* animBuffer) { animator->flags = MODEL_ANIMATOR_FLAGS_UPDATE_PENDING | MODEL_ANIMATOR_FLAGS_ENABLED | MODEL_ANIMATOR_FLAGS_CAM_2 | MODEL_ANIMATOR_FLAGS_CAM_1 | MODEL_ANIMATOR_FLAGS_CAM_0; animator->renderMode = RENDER_MODE_ALPHATEST; - animator->vertexArray = NULL; + animator->baseAddr = NULL; animator->fpRenderCallback = NULL; animator->rootNode = NULL; animator->nextUniqueID = 0; animator->animationBuffer = animBuffer; animator->nextUpdateTime = 1.0f; animator->timeScale = 1.0f; - animPos = (animPos & 0xFFFFFF) + (s32)animator->animationBuffer; - animator->animReadPos = (s16*)animPos; - animator->savedReadPos = (s16*)animPos; + animPos = (s16*)(((s32)animPos & 0xFFFFFF) + (s32)animator->animationBuffer); + animator->animReadPos = animPos; + animator->savedReadPos = animPos; for (j = 0; j < ARRAY_COUNT(animator->staticNodeIDs); j++) { animator->staticNodeIDs[j] = j + 1; @@ -708,7 +708,7 @@ void render_animated_model(s32 animatorID, Mtx* rootTransform) { animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_HIDDEN)) { animator->mtx = *rootTransform; - animator->vertexArray = NULL; + animator->baseAddr = NULL; rtPtr->appendGfxArg = animator; rtPtr->appendGfx = (void (*)(void*))appendGfx_animator; rtPtr->distance = 0; @@ -718,7 +718,7 @@ void render_animated_model(s32 animatorID, Mtx* rootTransform) { } } -void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 vtxSegment, Vec3s* vertexArray) { +void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 segment, void* baseAddr) { RenderTask rt; RenderTask* rtPtr = &rt; @@ -731,8 +731,8 @@ void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_HIDDEN)) { animator->mtx = *rootTransform; - gAnimVtxSegment = vtxSegment; - animator->vertexArray = vertexArray; + gAnimVtxSegment = segment; + animator->baseAddr = baseAddr; rtPtr->appendGfxArg = animator; rtPtr->appendGfx = (void (*)(void*))appendGfx_animator; rtPtr->distance = 0; @@ -745,8 +745,8 @@ void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 void appendGfx_animator(ModelAnimator* animator) { Matrix4f sp10; - if (animator->vertexArray != NULL) { - gSPSegment(gMasterGfxPos++, gAnimVtxSegment, VIRTUAL_TO_PHYSICAL(animator->vertexArray)); + if (animator->baseAddr != NULL) { + gSPSegment(gMasterGfxPos++, gAnimVtxSegment, VIRTUAL_TO_PHYSICAL(animator->baseAddr)); } gDisplayContext->matrixStack[gMatrixListPos] = animator->mtx; @@ -1008,11 +1008,11 @@ void clear_animator_flags(s32 index, s32 bits) { animator->flags &= ~bits; } -void play_model_animation(s32 index, s32 animPos) { +void play_model_animation(s32 index, s16* animPos) { ModelAnimator* animator = (*gCurrentAnimMeshListPtr)[index & ~0x800]; if (animator->animationBuffer != NULL) { - animPos = (animPos & 0xFFFFFF) + (s32)animator->animationBuffer; // TODO: array access? + animPos = ((s32)animPos & 0xFFFFFF) + (s32)animator->animationBuffer; // TODO: array access? } animator->animReadPos = (s16*)animPos; animator->savedReadPos = (s16*)animPos; diff --git a/src/C50A0.c b/src/C50A0.c index d0903cc695..ec6364e268 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -261,7 +261,7 @@ void item_entity_disable_shadow(ItemEntity* itemEntity) { itemEntity->flags |= ITEM_ENTITY_FLAGS_40; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } } @@ -271,7 +271,7 @@ void item_entity_enable_shadow(ItemEntity* itemEntity) { itemEntity->flags &= ~ITEM_ENTITY_FLAGS_40; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAGS_HIDDEN; } } @@ -541,7 +541,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic shadow = get_shadow_by_index(itemEntity->shadowIndex); if (itemEntity->spawnType == ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS) { - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } x = itemEntity->position.x; @@ -644,7 +644,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { item->shadowIndex = create_shadow_type(0, item->position.x, item->position.y, item->position.z); shadow = get_shadow_by_index(item->shadowIndex); - shadow->flags |= 1; + shadow->flags |= ENTITY_FLAGS_HIDDEN; posX = item->position.x; posY = item->position.y + 12.0f; @@ -787,7 +787,7 @@ void draw_item_entities(void) { rtPtr->distance = 0; retTask = queue_render_task(rtPtr); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } do {} while (0); // required to match diff --git a/src/E225B0.c b/src/E225B0.c index b3f32f420e..79dbc435fc 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -161,7 +161,7 @@ void func_802B735C_E2290C(void) { } if (D_802B7C78_E23228->unk_18++ > 50) { - D_8015A578.unk_02 = 0; + D_8015A578.unk_02 = FALSE; D_8010C93C = NULL; playerStatus->animFlags &= ~0x100; } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 1c6425a422..e11792f8da 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -2,6 +2,7 @@ #include "model.h" #include "ld_addrs.h" #include "stdlib/stdarg.h" +#include "entity.h" typedef struct GameMode { /* 0x00 */ u16 flags; @@ -22,6 +23,8 @@ typedef struct Fog { /* 0x18 */ s32 endDistance; } Fog; // size = 0x1C +extern s32 D_801516FC; + extern Gfx D_8014B7F8[]; extern Gfx D_8014B820[]; extern Gfx D_8014B848[]; @@ -943,7 +946,57 @@ Gfx D_8014C160[] = { gsSPEndDisplayList(), }; -s32 D_8014C188[] = { 0xFFFE7960, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x000F4240, 0x000F4240, 0x000F4240, 0x00000000, 0x007A1200, 0x007A1200, 0x007A1200, 0x00000000, 0x007A1200, 0x007270E0, 0x007270E0, 0x007270E0, 0x00000000, 0x006ACFC0, 0x006ACFC0, 0x006ACFC0, 0x006ACFC0, 0x00632EA0, 0x00632EA0, 0x00632EA0, 0x00000000, 0x005B8D80, 0x005B8D80, 0x005B8D80, 0x00000000, 0x0053EC60, 0x0053EC60, 0x0053EC60, 0x007A1200, 0x003D0900, 0x0040D990, 0x0044AA20, 0x0044AA20, 0x007A1200, 0x000AAE60, }; // render mode -> distance map? +s32 mdl_renderTaskBasePriorities[RENDER_MODE_COUNT] = { + [RENDER_MODE_SURF_SOLID_AA_ZB_LAYER0] = -100000, + [RENDER_MODE_SURFACE_OPA] = 1000000, + [RENDER_MODE_2] = 1000000, + [RENDER_MODE_SURFACE_OPA_NO_AA] = 1000000, + [RENDER_MODE_SURFACE_OPA_NO_ZB] = 0, + [RENDER_MODE_DECAL_OPA] = 1000000, + [RENDER_MODE_6] = 1000000, + [RENDER_MODE_DECAL_OPA_NO_AA] = 1000000, + [RENDER_MODE_8] = 0, + [RENDER_MODE_INTERSECTING_OPA] = 1000000, + [RENDER_MODE_A] = 1000000, + [RENDER_MODE_B] = 1000000, + [RENDER_MODE_C] = 0, + [RENDER_MODE_ALPHATEST] = 1000000, + [RENDER_MODE_E] = 1000000, + [RENDER_MODE_ALPHATEST_ONESIDED] = 1000000, + [RENDER_MODE_ALPHATEST_NO_ZB] = 0, + [RENDER_MODE_SURFACE_XLU_LAYER1] = 8000000, + [RENDER_MODE_12] = 8000000, + [RENDER_MODE_SURFACE_XLU_NO_AA] = 8000000, + [RENDER_MODE_SURFACE_XLU_NO_ZB] = 0, + [RENDER_MODE_SURFXLU_ZB_ZUPD] = 8000000, + [RENDER_MODE_SURFACE_XLU_LAYER2] = 7500000, + [RENDER_MODE_17] = 7500000, + [RENDER_MODE_18] = 7500000, + [RENDER_MODE_19] = 0, + [RENDER_MODE_DECAL_XLU] = 7000000, + [RENDER_MODE_1B] = 7000000, + [RENDER_MODE_DECAL_XLU_NOAA] = 7000000, + [RENDER_MODE_1D] = 7000000, + [RENDER_MODE_1E] = 6500000, + [RENDER_MODE_1F] = 6500000, + [RENDER_MODE_SHADOW] = 6500000, + [RENDER_MODE_21] = 0, + [RENDER_MODE_SURFACE_XLU_LAYER3] = 6000000, + [RENDER_MODE_23] = 6000000, + [RENDER_MODE_24] = 6000000, + [RENDER_MODE_25] = 0, + [RENDER_MODE_INTERSECTING_XLU] = 5500000, + [RENDER_MODE_27] = 5500000, + [RENDER_MODE_28] = 5500000, + [RENDER_MODE_SURFXLU_AA_ZB_ZUPD] = 8000000, + [RENDER_MODE_2A] = 4000000, + [RENDER_MODE_2B] = 4250000, + [RENDER_MODE_2C] = 4500000, + [RENDER_MODE_2D] = 4500000, + [RENDER_MODE_CLOUD] = 8000000, + [RENDER_MODE_CLOUD_NO_ZB] = 700000, +}; + s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -951,10 +1004,11 @@ s8 D_8014C248[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; extern s32 B_801512B0[2]; extern ModelCustomGfxBuilderList* gCurrentCustomModelGfxBuildersPtr; extern s32 D_801512BC; -extern s32 D_801512C0; +extern s32 D_80151304; +extern s32 D_80151344; +extern s32 entity_numEntities; extern s32 gEntityHeapBase; extern s32 gHudElementCacheTableRaster; -extern ModelList* gCurrentModels; extern s32 gHudElementCacheTablePalette[4]; extern ModelNode** gCurrentModelTreeRoot; extern ModelTransformGroupList* gCurrentTransformGroups; @@ -964,13 +1018,13 @@ extern s32 gLastCreatedEntityIndex; extern s8 B_801512F0[0x410]; extern GameMode gMainGameState[2]; // TODO rename -extern s32 D_80151300; -extern s32 D_80151324; -extern s32 D_8015132C; -extern s32 D_80151330; +extern s32 gEntityHeapBottom; +extern s32 entity_numShadows; +extern s32 entity_area_specific_data_is_loaded; +extern s32 entity_updateCounter; -extern s32 wEntityBlueprintSize; -extern s32 bEntityBlueprintSize; +extern s32 wEntityDataLoadedSize; +extern s32 bEntityDataLoadedSize; extern EntityBlueprint* wEntityBlueprint[30]; extern EntityBlueprint* bEntityBlueprint[4]; @@ -1017,8 +1071,8 @@ extern u16 D_80153374; extern u16 D_80153376; extern u16 D_8015336E; extern RenderTask* mdl_renderTaskLists[3]; -extern s32 mdl_renderTaskMode; -extern s32 mdl_renderTaskCount; // num render task entries? +extern s32 mdl_renderTaskQueueIdx; +extern s32 mdl_renderTaskCount; extern TextureHandle mdl_textureHandles[128]; extern RenderTask mdl_clearRenderTasks[3][0x100]; @@ -1027,6 +1081,7 @@ extern s32 D_801A7000; // todo ??? void update_shadows(void); s32 step_entity_commandlist(Entity* entity); +void entity_swizzle_anim_pointers(EntityBlueprint* entityData, void* baseAnim, void* baseGfx); void render_shadows(void); void update_entity_transform_matrix(Entity* entity); void update_shadow_transform_matrix(Shadow* shadow); @@ -1034,7 +1089,7 @@ void update_entity_inverse_rotation_matrix(Entity* entity); void delete_entity(s32 entityIndex); void delete_entity_and_unload_data(s32 entityIndex); void _delete_shadow(s32 shadowIndex); -void func_80110F10(void); +void reload_world_entity_data(void); s32 entity_get_collision_flags(Entity* entity); void entity_free_static_data(EntityBlueprint* data); s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z); @@ -1044,20 +1099,19 @@ void appendGfx_model_group(Model* model); void render_transform_group_node(ModelNode* node); void render_transform_group(ModelTransformGroup* group); void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth); -void enable_transform_group(u16 modelID); void update_entities(void) { s32 i; D_801512BC = 0; - D_801512C0 = 0; - D_80151330++; + entity_numEntities = 0; + entity_updateCounter++; for (i = 0; i < MAX_ENTITIES; i++) { Entity* entity = get_entity_by_index(i); if (entity != NULL) { - D_801512C0++; + entity_numEntities++; if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE)) { if (entity->flags & ENTITY_FLAGS_BOUND_SCRIPT_DIRTY) { @@ -1089,28 +1143,28 @@ void update_entities(void) { } } - if (entity->unk_07 == 0) { + if (entity->collisionTimer == 0) { entity->collisionFlags = entity_get_collision_flags(entity); if (entity->collisionFlags) { - EntityCallback entityCallback = entity->blueprint->fpHandleCollision; + EntityCallback handleCollision = entity->blueprint->fpHandleCollision; - if (entityCallback != NULL && entityCallback(entity) != 0) { - entity->unk_07 = 0xA; + if (handleCollision != NULL && handleCollision(entity) != 0) { + entity->collisionTimer = 10; entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; } } } else { - entity->unk_07--; + entity->collisionTimer--; if (entity->flags & ENTITY_FLAGS_CONTINUOUS_COLLISION) { - if (entity->unk_07 == 0) { - entity->flags &= ~(ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_CONTINUOUS_COLLISION); + if (entity->collisionTimer == 0) { + entity->flags &= ~(ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_CONTINUOUS_COLLISION); } else { - entity->flags |= ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX; + entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; } - } else if (entity->unk_07 == 0) { + } else if (entity->collisionTimer == 0) { entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; - entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT; + entity->flags &= ~ENTITY_FLAGS_PARTNER_COLLISION; entity->collisionFlags = 0; } } @@ -1125,9 +1179,9 @@ void update_entities(void) { } if (entity->scriptReadPos != NULL) { - if (entity->hasEntityScript) { - entity->hasEntityScript--; - if (!(entity->hasEntityScript)) { + if (entity->scriptDelay != 0) { + entity->scriptDelay--; + if (entity->scriptDelay == 0) { while (step_entity_commandlist(entity)); } } @@ -1138,7 +1192,7 @@ void update_entities(void) { update_entity_transform_matrix(entity); } - if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX)) { + if (!(entity->flags & ENTITY_FLAGS_DISABLE_COLLISION)) { update_entity_inverse_rotation_matrix(entity); } @@ -1164,34 +1218,34 @@ void update_entities(void) { } update_shadows(); - D_8015A578.unk_00 = 0; + D_8015A578.unk_00 = FALSE; } void update_shadows(void) { s32 i; - D_80151324 = 0; + entity_numShadows = 0; for (i = 0; i < MAX_SHADOWS; i++) { Shadow* shadow = get_shadow_by_index(i); if (shadow != NULL) { - D_80151324++; + entity_numShadows++; - if (!(shadow->flags & SHADOW_FLAGS_40000000)) { - if (shadow->flags & SHADOW_FLAGS_ALIGNED_TO_CAMERA) { + if (!(shadow->flags & ENTITY_FLAGS_SKIP_UPDATE)) { + if (shadow->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { shadow->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } update_shadow_transform_matrix(shadow); - if (shadow->flags & SHADOW_FLAGS_COMPLEX_MODEL) { + if (shadow->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { update_model_animator(shadow->entityModelID); } else { exec_entity_model_commandlist(shadow->entityModelID); } - if (shadow->flags & SHADOW_FLAGS_READY_TO_DELETE) { + if (shadow->flags & ENTITY_FLAGS_PENDING_INSTANCE_DELETE) { _delete_shadow(shadow->listIndex); } } @@ -1201,71 +1255,69 @@ void update_shadows(void) { void set_entity_commandlist(Entity* entity, s32* entityScript) { entity->scriptReadPos = entityScript; - entity->hasEntityScript = TRUE; - entity->savedReadPos = entity->scriptReadPos; + entity->scriptDelay = 1; + entity->savedReadPos[0] = entity->scriptReadPos; } -// Ordering issues with the savedReadPos cases (4 and 5) -#ifdef NON_EQUIVALENT s32 step_entity_commandlist(Entity* entity) { s32* args = entity->scriptReadPos; s32 ret; - s32 a1; - s32 (*tempfunc)(Entity*); + s32 labelId; + void (*tempfunc)(Entity*); switch (*args++) { - case 0: - entity->hasEntityScript = -1; + case ENTITY_SCRIPT_OP_End: + entity->scriptDelay = -1; entity->updateScriptCallback = NULL; entity->scriptReadPos = NULL; ret = FALSE; break; - case 1: - entity->scriptReadPos = *args; - entity->hasEntityScript = 1; - entity->savedReadPos = entity->scriptReadPos; + case ENTITY_SCRIPT_OP_Jump: + entity->scriptReadPos = (s32*)*args; + entity->scriptDelay = 1; + entity->savedReadPos[0] = entity->scriptReadPos; ret = TRUE; break; - case 2: - tempfunc = *args++; + case ENTITY_SCRIPT_OP_Call: + tempfunc = (void (*)(Entity*))(*args++); entity->scriptReadPos = args; (tempfunc)(entity); ret = TRUE; break; - case 3: - entity->hasEntityScript = *args++; + case ENTITY_SCRIPT_OP_SetCallback: + entity->scriptDelay = *args++; entity->updateScriptCallback = (s32 (*)(Entity*)) *args++; entity->scriptReadPos = args++; ret = FALSE; break; - case 4: - entity->scriptReadPos = entity->savedReadPos[*args++]; + case ENTITY_SCRIPT_OP_Goto: + entity->scriptReadPos = entity->savedReadPos[*args]; ret = TRUE; break; - case 5: - a1 = *args++; - entity->savedReadPos[a1] = args; + case ENTITY_SCRIPT_OP_Label: + labelId = *args++; + entity->savedReadPos[labelId] = args; entity->scriptReadPos = args; ret = TRUE; break; - case 6: + case ENTITY_SCRIPT_OP_RestartBoundScript: if (entity->boundScriptBytecode != NULL) { entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; } entity->scriptReadPos = args++; ret = TRUE; break; - case 7: + case ENTITY_SCRIPT_OP_SetFlags: entity->flags |= *args++; entity->scriptReadPos = args++; ret = TRUE; break; - case 8: + case ENTITY_SCRIPT_OP_ClearFlags: entity->flags &= ~*args++; entity->scriptReadPos = args++; ret = TRUE; break; - case 9: + case ENTITY_SCRIPT_OP_PlaySound: sfx_play_sound(*args++); entity->scriptReadPos = args++; ret = TRUE; @@ -1278,9 +1330,6 @@ s32 step_entity_commandlist(Entity* entity) { } return ret; } -#else -INCLUDE_ASM(s32, "a5dd0_len_114e0", step_entity_commandlist, Entity* entity); -#endif void exec_entity_commandlist(Entity* entity) { while (step_entity_commandlist(entity)); @@ -1292,7 +1341,7 @@ void func_8010FD98(void* arg0, s32 alpha) { gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0x00, 0x00, 0x00, alpha); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); } } @@ -1304,7 +1353,7 @@ void entity_model_set_shadow_color(void* data) { s32 alpha = (s32)data; gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, 0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0x00, 0x00, 0x00, alpha); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); } void render_entities(void) { @@ -1346,13 +1395,13 @@ void render_entities(void) { set_animator_render_callback(entity->virtualModelIndex, entity->listIndex, func_8010FE44); } - if (entity->vertexData == NULL) { + if (entity->gfxBaseAddr == NULL) { render_animated_model(entity->virtualModelIndex, &entity->transformMatrix); } else { render_animated_model_with_vertices(entity->virtualModelIndex, &entity->transformMatrix, entity->vertexSegment, - entity->vertexData); + entity->gfxBaseAddr); } } else { if (D_8014AFB0 == 0xFF) { @@ -1367,13 +1416,13 @@ void render_entities(void) { bind_entity_model_setupGfx(entity->virtualModelIndex, entity->listIndex, func_8010FE44); } - if (entity->vertexData == NULL) { + if (entity->gfxBaseAddr == NULL) { draw_entity_model_A(entity->virtualModelIndex, &entity->transformMatrix); } else { draw_entity_model_B(entity->virtualModelIndex, &entity->transformMatrix, entity->vertexSegment, - entity->vertexData); + entity->gfxBaseAddr); } } } @@ -1390,14 +1439,14 @@ void render_shadows(void) { Shadow* shadow = get_shadow_by_index(i); if (shadow != NULL) { - if (shadow->flags & SHADOW_FLAGS_HIDDEN) { - if (shadow->flags & SHADOW_FLAGS_FADING_AWAY) { + if (shadow->flags & ENTITY_FLAGS_HIDDEN) { + if (shadow->flags & ENTITY_FLAGS_FADING_AWAY) { shadow->alpha -= 20; if (shadow->alpha <= 20) { - shadow->flags |= SHADOW_FLAGS_READY_TO_DELETE; + shadow->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; } } - } else if (shadow->flags & SHADOW_FLAGS_COMPLEX_MODEL) { + } else if (shadow->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { if (shadow->vertexArray == NULL) { render_animated_model(shadow->entityModelID, &shadow->transformMatrix); } else { @@ -1407,14 +1456,14 @@ void render_shadows(void) { shadow->vertexArray); } } else { - if (shadow->flags & SHADOW_FLAGS_FADING_AWAY) { + if (shadow->flags & ENTITY_FLAGS_FADING_AWAY) { shadow->alpha -= 20; if (shadow->alpha <= 20) { - shadow->flags |= SHADOW_FLAGS_READY_TO_DELETE; + shadow->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; } } - bind_entity_model_setupGfx(shadow->entityModelID, shadow->alpha, entity_model_set_shadow_color); + bind_entity_model_setupGfx(shadow->entityModelID, (void*)shadow->alpha, entity_model_set_shadow_color); if (shadow->vertexArray == NULL) { draw_entity_model_A(shadow->entityModelID, &shadow->transformMatrix); @@ -1553,7 +1602,7 @@ void delete_entity(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_FADING_AWAY; + shadow->flags |= ENTITY_FLAGS_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1578,7 +1627,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_FADING_AWAY; + shadow->flags |= ENTITY_FLAGS_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1598,9 +1647,9 @@ s32 entity_get_collision_flags(Entity* entity) { s32 entityFlags = 0; u32 flag; - if (entity->flags & ENTITY_FLAGS_BLOCK_BEING_HIT) { - entityFlags = ENTITY_COLLISION_BLOCK_HIT; - entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT; + if (entity->flags & ENTITY_FLAGS_PARTNER_COLLISION) { + entityFlags = ENTITY_COLLISION_PARTNER; + entity->flags &= ~ENTITY_FLAGS_PARTNER_COLLISION; } flag = gCollisionStatus.currentFloor; @@ -1662,7 +1711,7 @@ s32 entity_interacts_with_current_partner(s32 entityIdx) { case ENTITY_TYPE_SUPER_BLOCK: case ENTITY_TYPE_BOMBABLE_ROCK: entity = get_entity_by_index(entityIdx); - entity->flags |= ENTITY_FLAGS_BLOCK_BEING_HIT; + entity->flags |= ENTITY_FLAGS_PARTNER_COLLISION; ret = TRUE; } break; @@ -1685,7 +1734,7 @@ s32 entity_interacts_with_current_partner(s32 entityIdx) { case ENTITY_TYPE_SAVE_POINT: case ENTITY_TYPE_SUPER_BLOCK: entity = get_entity_by_index(entityIdx); - entity->flags |= ENTITY_FLAGS_BLOCK_BEING_HIT; + entity->flags |= ENTITY_FLAGS_PARTNER_COLLISION; ret = TRUE; } break; @@ -1726,8 +1775,8 @@ void entity_set_render_script(Entity* entity, u32* commandList) { } } -void func_80110BF8(Entity* entity) { - entity->unk_07 = 0; +void entity_reset_collision(Entity* entity) { + entity->collisionTimer = 0; entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; } @@ -1738,7 +1787,7 @@ void func_80110BF8(Entity* entity) { #endif void load_area_specific_entity_data(void) { - if (D_8015132C == 0) { + if (!entity_area_specific_data_is_loaded) { if (gGameStatusPtr->areaID == AREA_JAN || gGameStatusPtr->areaID == AREA_IWA) { dma_copy(entity_jan_iwa_ROM_START, entity_jan_iwa_ROM_END, (void*)AREA_SPECIFIC_ENTITY_VRAM); } else if (gGameStatusPtr->areaID == AREA_SBK || gGameStatusPtr->areaID == AREA_OMO) { @@ -1747,88 +1796,382 @@ void load_area_specific_entity_data(void) { dma_copy(entity_default_ROM_START, entity_default_ROM_END, (void*)AREA_SPECIFIC_ENTITY_VRAM); } - D_8015132C = 1; + entity_area_specific_data_is_loaded = TRUE; } } -INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_entity_data); +void clear_entity_data(s32 arg0) { + s32 i; + + D_801516FC = 1; + entity_numEntities = 0; + entity_numShadows = 0; + entity_updateCounter = 0; + D_80151304 = 0; -void func_80110E58(void) { if (!gGameStatusPtr->isBattle) { - D_80151300 = 0x80250000; + gEntityHideMode = 0; + } + + entity_area_specific_data_is_loaded = FALSE; + D_8015A578.unk_01 = 0; + D_8015A578.unk_02 = FALSE; + if (!arg0) { + D_80151344 = 0; + } + D_8014AFB0 = 0xFF; + + if (!gGameStatusPtr->isBattle) { + wEntityDataLoadedSize = 0; + for (i = 0; i < MAX_ENTITIES; i++) { + wEntityBlueprint[i] = NULL; + } + } else { + bEntityDataLoadedSize = 0; + for (i = 0; i < 4; i++) { + bEntityBlueprint[i] = NULL; + } + } + + if (!gGameStatusPtr->isBattle) { + gEntityHeapBottom = 0x80250000; gEntityHeapBase = 0x80267FF0; - func_80110F10(); + } else { + gEntityHeapBottom = (s32)&D_801A7000; + gEntityHeapBase = gEntityHeapBottom + 0x3000; + } + + gCurrentEntityListPtr = get_entity_list(); + gCurrentShadowListPtr = get_shadow_list(); + + for (i = 0; i < MAX_ENTITIES; i++) { + (*gCurrentEntityListPtr)[i] = NULL; + } + + for (i = 0; i < MAX_SHADOWS; i++) { + (*gCurrentShadowListPtr)[i] = NULL; + } +} + +void init_entity_data(void) { + if (!gGameStatusPtr->isBattle) { + gEntityHeapBottom = 0x80250000; + gEntityHeapBase = 0x80267FF0; + reload_world_entity_data(); } else { s32 i; for (i = 0; i < 4; i++) { bEntityBlueprint[i] = 0; } - D_80151300 = &D_801A7000; - gEntityHeapBase = D_80151300 + 0x3000; + gEntityHeapBottom = (s32)&D_801A7000; + gEntityHeapBase = gEntityHeapBottom + 0x3000; } gCurrentEntityListPtr = get_entity_list(); gCurrentShadowListPtr = get_shadow_list(); - D_801512C0 = 0; - D_80151324 = 0; + entity_numEntities = 0; + entity_numShadows = 0; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110F10); +void reload_world_entity_data(void) { + s32 i; + s32 totalSize = 0; + s32 temp1; + s32 dataLength; + void* gfxData; + void* animData; -void entity_anim_make_vertex_pointers(EntityBlueprint* entityData, void* baseAddr, Vtx* baseVtx); -INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_anim_make_vertex_pointers); + for (i = 0; i < MAX_ENTITIES; i++) { + EntityBlueprint* bp = wEntityBlueprint[i]; + if (bp == NULL) { + break; + } -s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* entityData, s32* loadedStart, s32* loadedEnd); -INCLUDE_ASM(s32, "a5dd0_len_114e0", is_entity_data_loaded); + if (!(bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + void* gfxData; -void load_simple_entity_data(Entity* entity, EntityBlueprint* entityData, s32 listIndex) { + dataLength = ((bp->dma.end - bp->dma.start) >> 2); + gfxData = (void*)(gEntityHeapBase - totalSize * 4 - dataLength * 4); + totalSize += dma_copy(bp->dma.start, bp->dma.end, gfxData) >> 2; + } else { + DmaEntry* dmaList = bp->dmaList; + + if (bp->entityType == ENTITY_TYPE_RESET_MUNCHLESIA) { + gfxData = (void*)gEntityHeapBottom; + temp1 = dma_copy(dmaList[0].start, dmaList[0].end, gfxData) >> 2; + dma_copy(dmaList[1].start, dmaList[1].end, (void*)(gEntityHeapBottom + temp1 * 4)) >> 2; + animData = (void*)(gEntityHeapBottom + temp1 * 4); + entity_swizzle_anim_pointers(bp, animData, gfxData); + } else { + s32 temp5; + s32 q; + + dataLength = ((dmaList[0].end - dmaList[0].start) >> 2); + q = gEntityHeapBase - totalSize * 4; + gfxData = (void*)(q - dataLength * 4); + totalSize += dma_copy(dmaList[0].start, dmaList[0].end, gfxData) >> 2; + + dataLength = ((dmaList[1].end - dmaList[1].start) >> 2); + q = gEntityHeapBase - totalSize * 4; + animData = (void*)(q - dataLength * 4); + totalSize += dma_copy(dmaList[1].start, dmaList[1].end, animData) >> 2; + + entity_swizzle_anim_pointers(bp, animData, gfxData); + } + } + } +} + +void entity_swizzle_anim_pointers(EntityBlueprint* entityData, void* baseAnim, void* baseGfx) { + StaticAnimatorNode* node; + s32* ptr = (s32*)((s32)baseAnim + (s32)entityData->modelAnimationNodes); + + while (TRUE) { + if (*ptr == -1) { + *ptr = 0; + return; + } + node = (StaticAnimatorNode*)((s32)baseAnim + ((*ptr) & 0xFFFF)); + *ptr++ = (s32)node; + + if ((s32)node->displayList != -1) { + node->displayList = (Gfx*)((s32)baseGfx + ((s32)(node->displayList) & 0xFFFF)); + } else { + node->displayList = NULL; + } + + if ((s32)node->sibling != -1) { + node->sibling = (StaticAnimatorNode*)((s32)baseAnim + ((s32)(node->sibling) & 0xFFFF)); + } else { + node->sibling = NULL; + } + + if ((s32)node->child != -1) { + node->child = (StaticAnimatorNode*)((s32)baseAnim + ((s32)(node->child) & 0xFFFF)); + } else { + node->child = NULL; + } + + if ((s32)node->vtxList != -1) { + node->vtxList = (Vtx*)((s32)baseGfx + ((s32)(node->vtxList) & 0xFFFFF)); + } else { + node->vtxList = NULL; + } + } +} + +s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* blueprint, s32* loadedStart, s32* loadedEnd) { + EntityBlueprint** blueprints; + s32 i; + s32 ret; + s32 size; + DmaEntry* entDmaList; + + *loadedStart = 0; + *loadedEnd = 0; + ret = FALSE; + + if (!gGameStatusPtr->isBattle) { + blueprints = wEntityBlueprint; + } else { + blueprints = bEntityBlueprint; + } + + for (i = 0; i < MAX_ENTITIES; i++, blueprints++) { + EntityBlueprint* bp = *blueprints; + if (bp == NULL) { + blueprints[0] = blueprint; + blueprints[1] = NULL; + ret = TRUE; + if (blueprint->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + s32 size; + entDmaList = blueprint->dmaList; + size = (entDmaList[0].end - entDmaList[0].start) >> 2; + *loadedEnd = *loadedStart + size; + } + break; + } else { + DmaEntry* bpDmaList = bp->dmaList; + do {} while (0); // TODO find better match + entDmaList = blueprint->dmaList; + if (bpDmaList == entDmaList) { + if (blueprint->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + s32 size = (bpDmaList[0].end - bpDmaList[0].start) >> 2; + *loadedEnd = *loadedStart + size; + } + break; + } else if (bp == blueprint) { + if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + s32 size = (entDmaList[0].end - entDmaList[0].start) >> 2; + *loadedEnd = *loadedStart + size; + } + break; + } else { + if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + s32 size = (bpDmaList[0].end - bpDmaList[0].start) >> 2; + *loadedEnd = *loadedStart = *loadedStart + size; + size = (bpDmaList[1].end - bpDmaList[1].start) >> 2;; + *loadedStart = *loadedStart + size; + } else { + *loadedStart += (bp->dma.end - bp->dma.start) >> 2; + } + } + } + } + + return ret; +} + +void load_simple_entity_data(Entity* entity, EntityBlueprint* bp, s32 listIndex) { s32 loadedStart; s32 loadedEnd; s32 entitySize; u32 temp; - s32 sizeTemp; + s32 totalSize; - entity->vertexSegment = 10; + entity->vertexSegment = 0xA; if (!gGameStatusPtr->isBattle) { - sizeTemp = wEntityBlueprintSize; + totalSize = wEntityDataLoadedSize; } else { - sizeTemp = bEntityBlueprintSize; + totalSize = bEntityDataLoadedSize; } - if (is_entity_data_loaded(entity, entityData, &loadedStart, &loadedEnd)) { - if (sizeTemp + ((entityData->dmaEnd - entityData->dmaStart) >> 2) >= 0x5FFDU) { + if (is_entity_data_loaded(entity, bp, &loadedStart, &loadedEnd)) { + if (totalSize + ((bp->dma.end - bp->dma.start) >> 2) > 0x5FFCU) { get_entity_type(entity->listIndex); get_entity_type(entity->listIndex); PANIC(); } - entitySize = (entityData->dmaEnd - entityData->dmaStart) >> 2; - entity->vertexData = (gEntityHeapBase - (sizeTemp * 4)) - (entitySize * 4); - temp = dma_copy(entityData->dmaStart, entityData->dmaEnd, entity->vertexData); - sizeTemp += temp / 4; + entitySize = (bp->dma.end - bp->dma.start) >> 2; + entity->gfxBaseAddr = (void*)(gEntityHeapBase - totalSize * 4 - entitySize * 4); + totalSize += dma_copy(bp->dma.start, bp->dma.end, entity->gfxBaseAddr) >> 2; get_entity_type(entity->listIndex); } else { - entitySize = (entityData->dmaEnd - entityData->dmaStart) >> 2; - entity->vertexData = (gEntityHeapBase - (loadedStart * 4)) - (entitySize * 4); + entitySize = (bp->dma.end - bp->dma.start) >> 2; + entity->gfxBaseAddr = (void*)(gEntityHeapBase - loadedStart * 4 - entitySize * 4); get_entity_type(entity->listIndex); } if (!gGameStatusPtr->isBattle) { - wEntityBlueprintSize = sizeTemp; + wEntityDataLoadedSize = totalSize; } else { - bEntityBlueprintSize = sizeTemp; + bEntityDataLoadedSize = totalSize; } } -INCLUDE_ASM(s32, "a5dd0_len_114e0", load_split_entity_data); +void load_split_entity_data(Entity* entity, EntityBlueprint* entityData, s32 listIndex) { + s32 swizzlePointers = FALSE; + s32 s2; + s32 loadedStart, loadedEnd; + void* animBaseAddr; + s32 v0, v00; + s16* animationScript; + StaticAnimatorNode** animationNodes; + s32 s00; + s32 specialSize; + s32 dma1size; + s32 dma2size_1; + s32 dma2size_2; + s32 totalLoaded; + s32 totalLoadedBytes; -s32 func_80111790(void) { + if (entityData->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + DmaEntry* dmaList = entityData->dmaList; + entity->vertexSegment = 0xA; + + switch (entityData->entityType) { + case ENTITY_TYPE_RESET_MUNCHLESIA: + case ENTITY_TYPE_MUNCHLESIA_ENVELOP: + case ENTITY_TYPE_MUNCHLESIA_CHEWING: + case ENTITY_TYPE_MUNCHLESIA_RESET1: + specialSize = 0x1000; + break; + case ENTITY_TYPE_MUNCHLESIA_GRAB: + case ENTITY_TYPE_MUNCHLESIA_BEGIN_CHEW: + case ENTITY_TYPE_MUNCHLESIA_SPIT_OUT: + case ENTITY_TYPE_MUNCHLESIA_RESET2: + specialSize = 0x2BC0; + break; + default: + specialSize = 0; + break; + } + + if (specialSize != 0) { + if (entityData->entityType == ENTITY_TYPE_RESET_MUNCHLESIA) { + is_entity_data_loaded(entity, entityData, &loadedStart, &loadedEnd); + } + specialSize -= 0x1000; + + dma1size = dma_copy(dmaList[0].start, dmaList[0].end, (void*)(gEntityHeapBottom + specialSize * 4)) / 4; + entity->gfxBaseAddr = (void*)(gEntityHeapBottom + specialSize * 4); + dma_copy(dmaList[1].start, dmaList[1].end, (void*)(gEntityHeapBottom + specialSize * 4 + dma1size * 4)); + animBaseAddr = (void*)(gEntityHeapBottom + specialSize * 4 + dma1size * 4); + swizzlePointers = TRUE; + } else if (is_entity_data_loaded(entity, entityData, &loadedStart, &loadedEnd)) { + if (!gGameStatusPtr->isBattle) { + totalLoaded = wEntityDataLoadedSize; + } else { + totalLoaded = bEntityDataLoadedSize; + } + + if ((totalLoaded + ((dmaList[0].end - dmaList[0].start) >> 2)) > 0x5FFCU) { + get_entity_type(entity->listIndex); + PANIC(); + } + + if ((totalLoaded + ((dmaList[1].end - dmaList[1].start) >> 2)) > 0x5FFCU) { + get_entity_type(entity->listIndex); + PANIC(); + } + + dma2size_1 = dma_copy(dmaList[0].start, dmaList[0].end, dmaList[0].start + ((gEntityHeapBase - totalLoaded * 4 - (s32)dmaList[0].end) >> 2) * 4) >> 2; + entity->gfxBaseAddr = (void*)(gEntityHeapBase - totalLoaded * 4 - dma2size_1 * 4); + totalLoaded += dma2size_1; + + dma2size_2 = dma_copy(dmaList[1].start, dmaList[1].end, dmaList[1].start + ((gEntityHeapBase - totalLoaded * 4 - (s32)dmaList[1].end) >> 2) * 4) >> 2; + animBaseAddr = (void*)(gEntityHeapBase - totalLoaded * 4 - dma2size_2 * 4); + totalLoaded += dma2size_2; + get_entity_type(entity->listIndex); + + if (!gGameStatusPtr->isBattle) { + wEntityDataLoadedSize = totalLoaded; + } else { + bEntityDataLoadedSize = totalLoaded; + } + swizzlePointers = TRUE; + } else { + u32 temp = (dmaList[0].end - dmaList[0].start) >> 2; + entity->gfxBaseAddr = (void*)(gEntityHeapBase - loadedStart * 4 - temp * 4); + temp = (dmaList[1].end - dmaList[1].start) >> 2; + animBaseAddr = (void*)(gEntityHeapBase - loadedEnd * 4 - temp * 4); + get_entity_type(entity->listIndex); + } + } else { + entity->virtualModelIndex = create_model_animator(entityData->renderCommandList); + load_model_animator_tree(entity->virtualModelIndex, entityData->modelAnimationNodes); + update_model_animator(entity->virtualModelIndex); + return; + } + animationScript = entityData->renderCommandList; + animationNodes = (StaticAnimatorNode**)((s32)animBaseAddr + (s32)entityData->modelAnimationNodes); + if (swizzlePointers) { + entity_swizzle_anim_pointers(entityData, animBaseAddr, entity->gfxBaseAddr); + } + entity->virtualModelIndex = create_mesh_animator(animationScript, animBaseAddr); + load_mesh_animator_tree(entity->virtualModelIndex, animationNodes); + update_model_animator(entity->virtualModelIndex); + entity->flags |= ENTITY_FLAGS_HAS_ANIMATED_MODEL; +} + +s32 func_80111790(EntityBlueprint* data) { s32 i; for (i = 0; i < ARRAY_COUNT(*gCurrentEntityListPtr); i++) { Entity* entity = (*gCurrentEntityListPtr)[i]; - if (entity != NULL && entity->blueprint->dmaStart != NULL) { - if (entity->blueprint->dmaStart == entity->blueprint) { + if (entity != NULL && entity->blueprint->dma.start != NULL) { + if (entity->blueprint->dma.start == entity->blueprint) { return TRUE; } } @@ -1836,23 +2179,51 @@ s32 func_80111790(void) { return FALSE; } -INCLUDE_ASM(void, "a5dd0_len_114e0", entity_free_static_data, EntityBlueprint* data); +void entity_free_static_data(EntityBlueprint* data) { + s32 freeSlot; + s32 size; + EntityBlueprint* bp; + + for (freeSlot = 0; freeSlot < MAX_ENTITIES; freeSlot++) { + bp = wEntityBlueprint[freeSlot]; + if (bp == NULL) { + break; + } + } + + if (freeSlot < MAX_ENTITIES) { + bp = wEntityBlueprint[freeSlot - 1]; + if (bp == data) { + if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + DmaEntry* dmaList = bp->dmaList; + size = ((dmaList[0].end - dmaList[0].start) >> 2); + size += ((dmaList[1].end - dmaList[1].start) >> 2); + if (!func_80111790(bp)) { + wEntityBlueprint[freeSlot - 1] = NULL; + wEntityDataLoadedSize -= size; + } + } else { + size = (bp->dma.end - bp->dma.start) >> 2; + if (!func_80111790(bp)) { + wEntityBlueprint[freeSlot - 1] = NULL; + wEntityDataLoadedSize -= size; + } + } + } + } +} -// matches with this sig, but that breaks other usages of this func. -#ifdef NON_EQUIVALENT s32 create_entity(EntityBlueprint* bp, ...) { va_list ap; EntityBlueprint** bpPtr; - f32 x; - f32 y; - f32 z; + f32 x, y, z; f32 rotY; - s32 i; s32 listIndex; Entity* entity; - s32* a; + s32* args; va_start(ap, bp); + // needed to match bpPtr = &bp; *bpPtr = bp; @@ -1863,11 +2234,11 @@ s32 create_entity(EntityBlueprint* bp, ...) { z = va_arg(ap, s32); rotY = va_arg(ap, s32); - a = &CreateEntityVarArgBuffer[3]; + args = &CreateEntityVarArgBuffer[2]; - *a-- = 0; - *a-- = 0; - *a = 0; + *args-- = 0; + *args-- = 0; + *args = 0; for (listIndex = 3; listIndex > 0; listIndex--) { s32 arg = va_arg(ap, s32); @@ -1875,7 +2246,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { if (arg == MAKE_ENTITY_END) { break; } - *a++ = arg; + *args++ = arg; } va_end(ap); @@ -1886,7 +2257,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { } } - if (listIndex >= 30) { + if (listIndex >= MAX_ENTITIES) { return -1; } @@ -1903,12 +2274,12 @@ s32 create_entity(EntityBlueprint* bp, ...) { entity->updateMatrixOverride = NULL; entity->blueprint = bp; entity->scriptReadPos = bp->updateEntityScript; - entity->hasEntityScript = entity->scriptReadPos != NULL; - entity->savedReadPos = bp->updateEntityScript; + entity->scriptDelay = entity->scriptReadPos != NULL ? 1 : 0; + entity->savedReadPos[0] = bp->updateEntityScript; entity->updateScriptCallback = NULL; - entity->flags = bp->flags | 0x80000000; + entity->flags = bp->flags | ENTITY_FLAGS_CREATED; entity->collisionFlags = 0; - entity->unk_07 = 0; + entity->collisionTimer = 0; entity->renderSetupFunc = NULL; entity->position.x = x; entity->position.y = y; @@ -1924,13 +2295,13 @@ s32 create_entity(EntityBlueprint* bp, ...) { entity->aabb.z = bp->aabbSize[2]; entity->unk_05 = 1; entity->unk_08 = -1; - entity->alpha = -1; + entity->alpha = 255; entity->virtualModelIndex = -1; entity->shadowIndex = -1; - entity->vertexData = NULL; + entity->gfxBaseAddr = NULL; - if (!(bp->flags & 8)) { - if (bp->dmaStart != 0) { + if (!(bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (bp->dma.start != 0) { load_simple_entity_data(entity, bp, listIndex); } if (bp->renderCommandList != NULL) { @@ -1941,7 +2312,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { load_split_entity_data(entity, bp, listIndex); } - if (bp->entityType != 1 && (entity->flags & (ENTITY_FLAGS_SET_SHADOW_FLAG200 | ENTITY_FLAGS_100))) { + if (bp->entityType != ENTITY_TYPE_SHADOW && (entity->flags & (ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_SHADOW))) { create_entity_shadow(entity, x, y, z); } @@ -1962,12 +2333,8 @@ s32 create_entity(EntityBlueprint* bp, ...) { update_entity_transform_matrix(entity); return entity->listIndex; } -#else -INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity, EntityBlueprint* data, s32 x, s32 y, s32 z, s32 arg4, - ...); -#endif -s32 create_shadow_from_data(ShadowBlueprint* data, f32 x, f32 y, f32 z) { +s32 create_shadow_from_data(ShadowBlueprint* bp, f32 x, f32 y, f32 z) { Shadow* shadow; s32 i; @@ -1983,8 +2350,8 @@ s32 create_shadow_from_data(ShadowBlueprint* data, f32 x, f32 y, f32 z) { (*gCurrentShadowListPtr)[i] = shadow; mem_clear(shadow, sizeof(*shadow)); shadow->listIndex = i; - shadow->flags = data->flags | SHADOW_FLAGS_80000000; - shadow->alpha = 0x80; + shadow->flags = bp->flags | ENTITY_FLAGS_CREATED; + shadow->alpha = 128; shadow->unk_06 = 0x80; shadow->position.x = x; shadow->position.y = y; @@ -1993,16 +2360,16 @@ s32 create_shadow_from_data(ShadowBlueprint* data, f32 x, f32 y, f32 z) { shadow->scale.y = 1.0f; shadow->scale.z = 1.0f; - if (data->animModelNode != NULL) { - shadow->flags |= SHADOW_FLAGS_COMPLEX_MODEL; - shadow->entityModelID = create_model_animator(data->renderCommandList); - load_model_animator_tree(shadow->entityModelID, data->animModelNode); + if (bp->animModelNode != NULL) { + shadow->flags |= ENTITY_FLAGS_HAS_ANIMATED_MODEL; + shadow->entityModelID = create_model_animator(bp->renderCommandList); + load_model_animator_tree(shadow->entityModelID, bp->animModelNode); } else { - shadow->entityModelID = load_entity_model(data->renderCommandList); + shadow->entityModelID = load_entity_model(bp->renderCommandList); } - if (data->onCreateCallback != NULL) { - data->onCreateCallback(shadow); + if (bp->onCreateCallback != NULL) { + bp->onCreateCallback(shadow); } update_shadow_transform_matrix(shadow); return shadow->listIndex; @@ -2075,7 +2442,7 @@ ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) { entity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_POSITION_DIRTY; + shadow->flags |= ENTITY_FLAGS_SHADOW_POS_DIRTY; } else { entity->flags &= ~ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } @@ -2096,16 +2463,16 @@ ApiStatus AssignScript(Evt* script, s32 isInitialCall) { return ApiStatus_DONE1; } -ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall) { +ApiStatus AssignSwitchFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - s32 temp_s0 = evt_get_variable(script, *args++); + s32 areaFlag = evt_get_variable(script, *args++); Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); + SwitchData* data = entity->dataBuf.swtch; - // TODO find proper struct for the dataBuf - ((s16*)(entity->dataBuf.unk))[16] = temp_s0; - if (get_area_flag(temp_s0) != 0) { + data->areaFlagIndex = areaFlag; + if (get_area_flag(areaFlag) != 0) { entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; } return ApiStatus_DONE2; @@ -2146,10 +2513,9 @@ ApiStatus AssignPanelFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - // TODO find proper struct for the dataBuf - s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.unk; + HiddenPanelData* data = get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.hiddenPanel; - dataBuf[3] = evt_get_variable_index(script, *args++); + data->pickupVar = evt_get_variable_index(script, *args++); return ApiStatus_DONE2; } @@ -2160,10 +2526,9 @@ ApiStatus AssignCrateFlag(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall == TRUE) { - // TODO find proper struct for the dataBuf - s16* dataBuf = (s16*)get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.unk; + WoodenCrateData* data = get_entity_by_index(gLastCreatedEntityIndex)->dataBuf.crate; - dataBuf[2] = evt_get_variable_index(script, *args++); + data->globalFlagIndex = evt_get_variable_index(script, *args++); return ApiStatus_DONE2; } @@ -2175,8 +2540,8 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { s32 type; s16 shadowIndex; - if (staticFlags & 0x200) { - if (staticFlags & 0x800) { + if (staticFlags & ENTITY_FLAGS_FIXED_SHADOW_SIZE) { + if (staticFlags & ENTITY_FLAGS_SQUARE_SHADOW) { type = 2; } else { type = 3; @@ -2188,38 +2553,38 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { shadowIndex = create_shadow_type(type, x, y, z); entity->shadowIndex = shadowIndex; - get_shadow_by_index(shadowIndex)->flags |= 0xC00000; + get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAGS_DARK_SHADOW | ENTITY_FLAGS_SHADOW_POS_DIRTY; return entity->shadowIndex; } s32 create_shadow_type(s32 type, f32 x, f32 y, f32 z) { - s32 setFlag200 = FALSE; - ShadowBlueprint* data = &CircularShadowA; + s32 isFixedSize = FALSE; + ShadowBlueprint* bp = &CircularShadowA; s32 shadowIndex; switch (type) { case 2: - setFlag200 = TRUE; + isFixedSize = TRUE; case 0: - data = &CircularShadowA; + bp = &CircularShadowA; break; case 3: - setFlag200 = TRUE; + isFixedSize = TRUE; case 1: - data = &SquareShadow; + bp = &SquareShadow; break; case 5: - setFlag200 = TRUE; + isFixedSize = TRUE; case 4: - data = &CircularShadowB; + bp = &CircularShadowB; break; } - shadowIndex = create_shadow_from_data(data, x, y, z); + shadowIndex = create_shadow_from_data(bp, x, y, z); - if (setFlag200) { - get_shadow_by_index(shadowIndex)->flags |= 0x200; + if (isFixedSize) { + get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAGS_FIXED_SHADOW_SIZE; } return shadowIndex; @@ -2246,7 +2611,7 @@ void update_entity_shadow_position(Entity* entity) { } else { u8 alphaTemp; - if (shadow->flags & SHADOW_FLAGS_800000) { + if (shadow->flags & ENTITY_FLAGS_DARK_SHADOW) { alphaTemp = 160; } else { alphaTemp = 128; @@ -2255,8 +2620,8 @@ void update_entity_shadow_position(Entity* entity) { } if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) { - if (shadow->flags & SHADOW_FLAGS_POSITION_DIRTY) { - shadow->flags &= ~SHADOW_FLAGS_POSITION_DIRTY; + if (shadow->flags & ENTITY_FLAGS_SHADOW_POS_DIRTY) { + shadow->flags &= ~ENTITY_FLAGS_SHADOW_POS_DIRTY; } else { return; } @@ -2272,7 +2637,7 @@ void update_entity_shadow_position(Entity* entity) { origHitLength = hitLength; - if (shadow->flags & SHADOW_FLAGS_200) { + if (shadow->flags & ENTITY_FLAGS_FIXED_SHADOW_SIZE) { hitLength = 212.5f; shadow->scale.x = entity->aabb.x / hitLength; shadow->scale.z = entity->aabb.z / hitLength; @@ -2291,15 +2656,15 @@ void update_entity_shadow_position(Entity* entity) { shadow->rotation.y = entity->rotation.y; if (entity->position.y < rayY) { - shadow->flags |= SHADOW_FLAGS_40000000; + shadow->flags |= ENTITY_FLAGS_SKIP_UPDATE; entity->position.y = rayY + 10.0f; } else { - shadow->flags &= ~SHADOW_FLAGS_40000000; + shadow->flags &= ~ENTITY_FLAGS_SKIP_UPDATE; } - shadow->flags = (shadow->flags & ~SHADOW_FLAGS_HIDDEN) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); + shadow->flags = (shadow->flags & ~ENTITY_FLAGS_HIDDEN) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); if (!(entity->flags & ENTITY_FLAGS_400) && origHitLength == 0.0f) { - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; } } else { entity->shadowPosY = 0.0f; @@ -2321,7 +2686,7 @@ s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* hitID = -1; ret = FALSE; - if ((entityID >= 0) && ((get_entity_type(entityID) != 0xC) || (hitNx == 0.0f && hitNz == 0.0f && hitNy == 1.0))) { + if ((entityID >= 0) && ((get_entity_type(entityID) != ENTITY_TYPE_PUSH_BLOCK) || (hitNx == 0.0f && hitNz == 0.0f && hitNy == 1.0))) { hitID = entityID | COLLISION_WITH_ENTITY_BIT; } @@ -3841,7 +4206,7 @@ Gfx* mdl_get_copied_gfx(s32 copyIndex) { return gfxCopy; } -void mdl_project_tex_coords(s32 modelID, Gfx* destGfx, Matrix4f* destMtx, Vtx* destVertices); +void mdl_project_tex_coords(s32 modelID, Gfx* destGfx, Matrix4f destMtx, void* destVertices); INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_project_tex_coords); INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C80C); @@ -3906,7 +4271,7 @@ void clear_render_tasks(void) { mdl_renderTaskLists[i] = mdl_clearRenderTasks[i]; } - mdl_renderTaskMode = 0; + mdl_renderTaskQueueIdx = 0; mdl_renderTaskCount = 0; } @@ -3917,27 +4282,140 @@ void clear_render_tasks_alt(void) { mdl_renderTaskLists[i] = mdl_clearRenderTasks[i]; } - mdl_renderTaskMode = 0; + mdl_renderTaskQueueIdx = 0; mdl_renderTaskCount = 0; } RenderTask* queue_render_task(RenderTask* task) { - RenderTask* ret = mdl_renderTaskLists[mdl_renderTaskMode]; + RenderTask* ret = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; - ASSERT(mdl_renderTaskCount < 0x100); + ASSERT(mdl_renderTaskCount < ARRAY_COUNT(*mdl_clearRenderTasks)); ret = &ret[mdl_renderTaskCount++]; - ret->renderMode = 1; - if (task->renderMode == 0x2D) { - ret->renderMode = 0x21; + ret->renderMode = RENDER_TASK_FLAG_ENABLED; + if (task->renderMode == RENDER_MODE_2D) { + ret->renderMode |= RENDER_TASK_FLAG_20; } ret->appendGfxArg = task->appendGfxArg; ret->appendGfx = task->appendGfx; - ret->distance = D_8014C188[task->renderMode] - task->distance; + ret->distance = mdl_renderTaskBasePriorities[task->renderMode] - task->distance; return ret; } -INCLUDE_ASM(s32, "a5dd0_len_114e0", execute_render_tasks); +void execute_render_tasks(void) { + s32 i, j, taskCount; + s32 sorted[ARRAY_COUNT(*mdl_clearRenderTasks)]; + RenderTask* taskList; + RenderTask* task; + RenderTask* task2; + Matrix4f mtxFlipY; + void (*appendGfx)(void*); + + if (mdl_renderTaskCount == 0) { + return; + } + + for (i = taskCount = 0; i < mdl_renderTaskCount; i++) { + sorted[taskCount++] = i; + } + + // sort in ascending order + taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; + for (i = 0; i < taskCount - 1; i++) { + for (j = i + 1; j < taskCount; j++) { + s32 t1 = sorted[i]; + s32 t2 = sorted[j]; + task = &taskList[t1]; + task2 = &taskList[t2]; + if (task->distance > task2->distance) { + sorted[i] = t2; + sorted[j] = t1; + } + } + } + + // tasks with dist >= 3M sort in descending order + taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; + for (i = 0; i < taskCount - 1; i++) { + task = &taskList[sorted[i]]; + if (task->distance >= 3000000) { + for (j = i + 1; j < taskCount; j++) { + s32 t1 = sorted[i]; + s32 t2 = sorted[j]; + task = &taskList[t1]; + task2 = &taskList[t2]; + if (task->distance < task2->distance) { + sorted[i] = t2; + sorted[j] = t1; + } + } + } + } + + // tasks with dist <= 800k sort in descending order + taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; + for (i = 0; i < taskCount - 1; i++) { + task = &taskList[sorted[i]]; + if (task->distance > 800000) { + break; + } + for (j = i + 1; j < taskCount; j++) { + s32 t1 = sorted[i]; + s32 t2 = sorted[j]; + task = &taskList[t1]; + task2 = &taskList[t2]; + if (task2->distance > 800000) { + break; + } + if (task->distance < task2->distance) { + sorted[i] = t2; + sorted[j] = t1; + } + } + } + + D_8014B7F0 = taskCount; + taskList = mdl_renderTaskLists[mdl_renderTaskQueueIdx]; + if (gOverrideFlags & GLOBAL_OVERRIDES_80) { + Mtx* dispMtx; + Gfx* savedGfxPos = NULL; + + guScaleF(mtxFlipY, 1.0f, -1.0f, 1.0f); + guMtxF2L(mtxFlipY, &gDisplayContext->matrixStack[gMatrixListPos]); + dispMtx = &gDisplayContext->matrixStack[gMatrixListPos++]; + for (i = 0; i < taskCount; i++) { + task = &taskList[sorted[i]]; + appendGfx = task->appendGfx; + + if (task->renderMode & RENDER_TASK_FLAG_2) { + savedGfxPos = gMasterGfxPos++; + } + + appendGfx(task->appendGfxArg); + + if (task->renderMode & RENDER_TASK_FLAG_2) { + gSPEndDisplayList(gMasterGfxPos++); + gSPBranchList(savedGfxPos, gMasterGfxPos); + gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); + gSPMatrix(gMasterGfxPos++, dispMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPDisplayList(gMasterGfxPos++, savedGfxPos + 1); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + } + } + } else { + for (i = 0; i < taskCount; i++) { + task = &taskList[sorted[i]]; + appendGfx = task->appendGfx; + appendGfx(task->appendGfxArg); + } + } + + mdl_renderTaskQueueIdx++; + if (mdl_renderTaskQueueIdx > 2) { + mdl_renderTaskQueueIdx = 0; + } + mdl_renderTaskCount = 0; +} diff --git a/src/animation_script.h b/src/animation_script.h index 2e75365bb9..70b9fa4503 100644 --- a/src/animation_script.h +++ b/src/animation_script.h @@ -29,7 +29,18 @@ enum { }; #define _AS_ROUND(x) ((int) (x < 0 ? x - 0.5 : x + 0.5)) - #define AS_F(x) (_AS_ROUND((x) * 32767.0 / 180.0)) +#define as_End AS_END, +#define as_Wait(time) AS_WAIT, time, +#define as_EndLoop AS_END_LOOP, +#define as_Restart AS_END_LOOP, +#define as_Loop AS_LOOP, +#define as_SetRotation(node, x, y, z) AS_SET_ROTATION, node, AS_F(x), AS_F(y), AS_F(z), +#define as_SetPos(node, x, y, z) AS_SET_POS, node, x, y, z, +#define as_SetScale(node, x, y, z) AS_SET_SCALE, node, AS_F(x), AS_F(y), AS_F(z), +#define as_DisableMirroring AS_OP_19, + +// used in entity models +#define ANIM_NULL (void*)(0xFFFFFFFF) #endif diff --git a/src/battle/area_kkj/6DBDA0.c b/src/battle/area_kkj/6DBDA0.c index 8c7766ec6a..6dc1a1e663 100644 --- a/src/battle/area_kkj/6DBDA0.c +++ b/src/battle/area_kkj/6DBDA0.c @@ -80,13 +80,13 @@ ApiStatus func_8021849C_6DC23C(Evt* script, s32 isInitialCall) { s32 entityIndex = script->varTable[9]; Entity* entity = get_entity_by_index(entityIndex); - entity->unk_07 = 0; + entity->collisionTimer = 0; collisionStatus->lastWallHammered = entityIndex | 0x4000; playerStatus->flags |= 0x1000000; - entity->collisionFlags = 0x40; + entity->collisionFlags = ENTITY_COLLISION_PLAYER_HAMMER; playerStatus->actionState = ACTION_STATE_HAMMER; entity->blueprint->fpHandleCollision(entity); - entity->unk_07 = 0xA; + entity->collisionTimer = 10; entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; collisionStatus->lastWallHammered = -1; diff --git a/src/battle/item/pow_block.c b/src/battle/item/pow_block.c index c4e45b26d6..f6bd93a189 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/item/pow_block.c @@ -51,7 +51,7 @@ EvtScript N(main) = { EVT_SET_CONST(EVT_VAR(10), 0x00000090) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_WAIT_FRAMES(10) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA2E0), -40, 60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_PowBlock), -40, 60, 0, 0, MAKE_ENTITY_END) EVT_SET(EVT_VAR(10), EVT_VAR(0)) EVT_CALL(N(func_802A1318_718B68)) EVT_CALL(PlayEffect, 0x7, 2, -40, 60, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0) diff --git a/src/battle/item/pow_block.h b/src/battle/item/pow_block.h index d95da1b78b..716370a9c8 100644 --- a/src/battle/item/pow_block.h +++ b/src/battle/item/pow_block.h @@ -3,6 +3,7 @@ #include "common.h" #include "script_api/battle.h" +#include "entity.h" #undef NAMESPACE #define NAMESPACE battle_item_pow_block diff --git a/src/bss3.c b/src/bss3.c index 44d6ed31dd..ce572bd332 100644 --- a/src/bss3.c +++ b/src/bss3.c @@ -12,7 +12,7 @@ BSS s32 D_801512B0; BSS s32 gHudElementsNumber; BSS s32 gCurrentCustomModelGfxBuildersPtr; BSS s32 D_801512BC; -BSS s32 D_801512C0; +BSS s32 entity_numEntities; BSS s32 gEntityHeapBase; BSS s32 gHudElementCacheTableRaster; BSS s32 gCurrentModels; @@ -29,7 +29,7 @@ BSS s32 D_801512F0; BSS s32 gMsgVarImages; BSS s32 ItemEntitiesCreated; BSS s32 gCurrentModelTreeRoot; -BSS s32 D_80151300; +BSS s32 gEntityHeapBottom; BSS s32 D_80151304; BSS s32 D_80151308; BSS s16 gMsgBGScrollAmtY; @@ -39,10 +39,10 @@ BSS s32 gHudElementCacheBuffer; BSS s32 gEntityModelCount; BSS s32 D_8015131C; BSS char D_80151320[0x4]; -BSS s32 D_80151324; +BSS s32 entity_numShadows; BSS s32 D_80151328; -BSS s32 D_8015132C; -BSS s32 D_80151330; +BSS s32 entity_area_specific_data_is_loaded; +BSS s32 entity_updateCounter; BSS s32 gTriggerCount; BSS s32 D_80151338; BSS s32 gHudElementCacheSize; @@ -56,8 +56,8 @@ BSS char D_80151474[0x4]; BSS s8 gWorldShadowList[0xF0]; BSS s8 gBattleShadowList[0xF0]; BSS s32 gCurrentShadowListPtr; -BSS s32 wEntityBlueprintSize; -BSS s32 bEntityBlueprintSize; +BSS s32 wEntityDataLoadedSize; +BSS s32 bEntityDataLoadedSize; BSS char D_80151664[0x4]; BSS s8 wEntityBlueprint[0x74]; BSS s32 D_801516DC; @@ -104,7 +104,7 @@ BSS s16 D_80153376; BSS s8 D_80153378[0x8]; BSS s8 D_80153380[0x20]; BSS s8 mdl_renderTaskLists[0xC]; -BSS s32 mdl_renderTaskMode; +BSS s32 mdl_renderTaskQueueIdx; BSS s8 mdl_renderTaskCount[0x10]; BSS s8 D_801533C0[0x300]; BSS s8 D_801536C0[0x300]; diff --git a/src/collision.c b/src/collision.c index 0788f25542..c4eb8c24ef 100644 --- a/src/collision.c +++ b/src/collision.c @@ -965,7 +965,7 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 for (i = 0; i < MAX_ENTITIES; i++) { entity = get_entity_by_index(i); - if (entity == NULL || (entity->flags & 0x40000020)) { + if (entity == NULL || (entity->flags & (ENTITY_FLAGS_SKIP_UPDATE | ENTITY_FLAGS_DISABLE_COLLISION))) { continue; } diff --git a/src/effects/aura.c b/src/effects/aura.c index 193f1c9a66..9bf50283e9 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -254,7 +254,7 @@ void aura_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E007684C(void) { diff --git a/src/effects/balloon.c b/src/effects/balloon.c index 8a8591ff7c..1e463a3641 100644 --- a/src/effects/balloon.c +++ b/src/effects/balloon.c @@ -80,7 +80,7 @@ void balloon_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void balloon_appendGfx(void* effect) { diff --git a/src/effects/big_smoke_puff.c b/src/effects/big_smoke_puff.c index 048f946839..7e1eebcaca 100644 --- a/src/effects/big_smoke_puff.c +++ b/src/effects/big_smoke_puff.c @@ -116,7 +116,7 @@ void big_smoke_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void big_smoke_puff_appendGfx(void* effect) { diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index 169619706a..796f785629 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -104,7 +104,7 @@ void big_snowflakes_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void big_snowflakes_appendGfx(void* effect) { diff --git a/src/effects/blast.c b/src/effects/blast.c index 48ae3ec215..20c0369549 100644 --- a/src/effects/blast.c +++ b/src/effects/blast.c @@ -23,7 +23,7 @@ void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; - + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data != NULL); @@ -71,7 +71,7 @@ void blast_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/blast", blast_appendGfx); diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c index aadfcf4280..123cf4a457 100644 --- a/src/effects/bombette_breaking.c +++ b/src/effects/bombette_breaking.c @@ -50,7 +50,7 @@ void bombette_breaking_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_appendGfx); diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c index 3042e8df63..c24c1d2216 100644 --- a/src/effects/breaking_junk.c +++ b/src/effects/breaking_junk.c @@ -20,7 +20,7 @@ void breaking_junk_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_appendGfx); diff --git a/src/effects/bulb_glow.c b/src/effects/bulb_glow.c index 72965ea336..deb1d85add 100644 --- a/src/effects/bulb_glow.c +++ b/src/effects/bulb_glow.c @@ -27,7 +27,7 @@ void bulb_glow_render(EffectInstance* effect) { } retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E0078274(void) { diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index 1306172438..a2a3423627 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -157,7 +157,7 @@ void butterflies_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index a2b757d6a3..8d34152731 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -22,7 +22,7 @@ void chapter_change_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/chapter_change", chapter_change_appendGfx); diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c index 99c586811a..d880680fbd 100644 --- a/src/effects/chomp_drop.c +++ b/src/effects/chomp_drop.c @@ -20,7 +20,7 @@ void chomp_drop_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/chomp_drop", chomp_drop_appendGfx); diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c index 4aa750fd5d..cdfff4983a 100644 --- a/src/effects/cloud_puff.c +++ b/src/effects/cloud_puff.c @@ -109,7 +109,7 @@ void cloud_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void cloud_puff_appendGfx(void* effect) { diff --git a/src/effects/cloud_trail.c b/src/effects/cloud_trail.c index 40d77888cb..b3c6d9650e 100644 --- a/src/effects/cloud_trail.c +++ b/src/effects/cloud_trail.c @@ -110,7 +110,7 @@ void cloud_trail_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void cloud_trail_appendGfx(void* effect) { diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index df1859f8a1..8945d1df71 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -20,7 +20,7 @@ void cold_breath_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/cold_breath", cold_breath_appendGfx); diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index c9cecc97ea..7d748072c9 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -20,7 +20,7 @@ void damage_stars_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/damage_stars", damage_stars_appendGfx); diff --git a/src/effects/debuff.c b/src/effects/debuff.c index 78217fa665..148428f084 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -127,7 +127,7 @@ void debuff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void debuff_appendGfx(void* effect) { diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index e58a67da43..2fe9a7f9ca 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -20,7 +20,7 @@ void drop_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/drop_leaves", drop_leaves_appendGfx); diff --git a/src/effects/dust.c b/src/effects/dust.c index e51e726855..29be872ec1 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -20,7 +20,7 @@ void dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/dust", dust_appendGfx); diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index b3efb46110..bdf0dccf10 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -20,7 +20,7 @@ void fx_3D_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E007A884(void) { diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index 99f6b88b89..d7d7053068 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -20,7 +20,7 @@ void fx_46_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/effect_46", fx_46_appendGfx); diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index 12650e3f28..5debe63b8e 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -20,7 +20,7 @@ void fx_63_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/effect_63", fx_63_appendGfx); diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c index 46a1fe4586..ad433a8f22 100644 --- a/src/effects/effect_65.c +++ b/src/effects/effect_65.c @@ -20,7 +20,7 @@ void fx_65_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/effect_65", fx_65_appendGfx); diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 294a225fa1..d861bf8e96 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -44,7 +44,7 @@ void fx_75_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00EA664(void) { diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index 76c3f7c968..a61ec64977 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -103,7 +103,7 @@ void fx_86_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void fx_86_appendGfx(void* effect) { diff --git a/src/effects/embers.c b/src/effects/embers.c index 4246467533..102407cbc3 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -20,7 +20,7 @@ void embers_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00E05F8(void) { diff --git a/src/effects/emote.c b/src/effects/emote.c index 1dfc8e1328..a4c1c680fe 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -165,7 +165,7 @@ void emote_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } // lots of issues diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index d9644443c3..f746b8bde6 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -28,9 +28,9 @@ void ending_decals_render(EffectInstance* effect) { } else { renderTaskPtr->renderMode = RENDER_MODE_2D; } - + retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/ending_decals", ending_decals_appendGfx); diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index e6e861d4f4..4f62f31726 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -30,7 +30,7 @@ void energy_orb_wave_render(EffectInstance* effect) { } retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00A4648(void) { diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index 4dad7fa6aa..3e708da128 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -20,7 +20,7 @@ void energy_shockwave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/energy_shockwave", energy_shockwave_appendGfx); diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index 212117ad79..ebe1c9f53c 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -20,7 +20,7 @@ void falling_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/falling_leaves", falling_leaves_appendGfx); diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index 6354a9b725..945115c91e 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -175,7 +175,7 @@ void fire_breath_render(EffectInstance* effect) { renderTaskPointer->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void fire_breath_appendGfx(void* effect) { diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index 53bba48025..a0604de66b 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -82,7 +82,7 @@ void fire_flower_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/fire_flower", fire_flower_appendGfx); diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index 9dda8a62af..f5c3111bac 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -20,7 +20,7 @@ void firework_rocket_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/firework_rocket", firework_rocket_appendGfx); diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index fe3271fe9a..8628b686da 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -20,7 +20,7 @@ void floating_cloud_puff_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00D227C(void) { diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index 165f4e5f4d..4fd3148d5a 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -137,7 +137,7 @@ void floating_flower_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void floating_flower_appendGfx(void* effect) { diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c index f23a5461ea..891afd18dc 100644 --- a/src/effects/floating_rock.c +++ b/src/effects/floating_rock.c @@ -24,9 +24,9 @@ void floating_rock_render(EffectInstance *effect) { renderTask.appendGfxArg = effect; renderTask.distance = effect76->unk_0C; renderTask.renderMode = RENDER_MODE_2D; - + retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/floating_rock", floating_rock_appendGfx); diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index 45c4a3a013..368c5e6a3c 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -130,7 +130,7 @@ void flower_splash_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00104F4(EffectInstance* effect) { diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index 02f6b63518..e308d5cd0b 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -148,7 +148,7 @@ void flower_trail_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E0012548(EffectInstance* effect) { diff --git a/src/effects/footprint.c b/src/effects/footprint.c index 5180664427..61944406dc 100644 --- a/src/effects/footprint.c +++ b/src/effects/footprint.c @@ -107,7 +107,7 @@ void footprint_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00183BC(EffectInstance* effect) { diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index 6b5265bf4c..5d8ad6ffba 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -20,7 +20,7 @@ void fright_jar_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00C2214(void) { diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index 62cf2e7ef7..cb19f26a96 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -20,7 +20,7 @@ void gather_energy_pink_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/gather_energy_pink", gather_energy_pink_appendGfx); diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index 1bb7fc95d6..828440cf99 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -82,7 +82,7 @@ void gather_magic_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/gather_magic", gather_magic_appendGfx); diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index 9699cbb5a2..19345a0e05 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -20,7 +20,7 @@ void got_item_outline_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E003621C(void) { diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index 3229c0267d..85de45cfab 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -20,7 +20,7 @@ void hieroglyphs_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00E2210(void) { diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index 137a509679..b40c8e5cb0 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -20,7 +20,7 @@ void ice_pillar_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/ice_pillar", ice_pillar_appendGfx); diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index 756ba5c4b2..cce1dbe9fb 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -20,7 +20,7 @@ void ice_shard_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/ice_shard", ice_shard_appendGfx); diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index be545e787a..fb03afa244 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -254,7 +254,7 @@ void landing_dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void landing_dust_appendGfx(void* effect) { diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c index b05659705b..16b44a3048 100644 --- a/src/effects/lens_flare.c +++ b/src/effects/lens_flare.c @@ -20,7 +20,7 @@ void lens_flare_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/lens_flare", lens_flare_appendGfx); diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c index 383e929f90..d022935286 100644 --- a/src/effects/light_rays.c +++ b/src/effects/light_rays.c @@ -26,7 +26,7 @@ void light_rays_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/light_rays", func_E006A85C); diff --git a/src/effects/lightning.c b/src/effects/lightning.c index 1db1d1dc44..475da1dcd7 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -20,7 +20,7 @@ void lightning_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/lightning", lightning_appendGfx); diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index e57178c676..1f98b4c920 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -36,7 +36,7 @@ void lightning_bolt_render(EffectInstance *effect) { renderTaskPointer->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPointer); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00BC36C(void) { diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index d4e30c8ad6..d60d93070a 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -20,7 +20,7 @@ void lil_oink_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/lil_oink", lil_oink_appendGfx); diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c index bf797fd2f7..cfe65b4799 100644 --- a/src/effects/merlin_house_stars.c +++ b/src/effects/merlin_house_stars.c @@ -20,7 +20,7 @@ void merlin_house_stars_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00A639C(void) { diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index 66ce8d62b7..b8b6b2a855 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -20,7 +20,7 @@ void misc_particles_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00E4954(void) { diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 93a9d26a28..b210845de3 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -26,7 +26,7 @@ void motion_blur_flame_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00A2234(void) { diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index a67f27e020..76c0797033 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -20,7 +20,7 @@ void moving_cloud_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/moving_cloud", moving_cloud_appendGfx); diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 8037d7cb80..1fa9c0bd4b 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -49,7 +49,7 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; - + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); ASSERT(effect->data != NULL); @@ -124,7 +124,7 @@ void music_note_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/music_note", music_note_appendGfx); diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index 45a6533954..dd224b20ca 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -20,7 +20,7 @@ void peach_star_beam_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/peach_star_beam", peach_star_beam_appendGfx); diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c index 6e4a2b4125..4a72e2c86b 100644 --- a/src/effects/purple_ring.c +++ b/src/effects/purple_ring.c @@ -20,7 +20,7 @@ void purple_ring_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/purple_ring", purple_ring_appendGfx); diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index 744fb9c43e..b21aae0422 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -20,7 +20,7 @@ void quizmo_assistant_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/quizmo_assistant", quizmo_assistant_appendGfx); diff --git a/src/effects/quizmo_audience.c b/src/effects/quizmo_audience.c index b8f869fefe..68e059827b 100644 --- a/src/effects/quizmo_audience.c +++ b/src/effects/quizmo_audience.c @@ -28,7 +28,7 @@ void quizmo_audience_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00A8318(void) { diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index 37117516c2..3f7062a5a1 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -20,7 +20,7 @@ void quizmo_stage_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/quizmo_stage", quizmo_stage_appendGfx); diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index 340d653154..ac7950fe21 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -20,7 +20,7 @@ void radial_shimmer_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/radial_shimmer", radial_shimmer_appendGfx); diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index c4512c0729..2377ec1be9 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -28,7 +28,7 @@ void radiating_energy_orb_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/radiating_energy_orb", radiating_energy_orb_appendGfx); diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c index 7a8bb58c7a..181bc91020 100644 --- a/src/effects/red_impact.c +++ b/src/effects/red_impact.c @@ -20,7 +20,7 @@ void red_impact_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/red_impact", red_impact_appendGfx); diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c index 1e7cc0069a..f3b4bd89b8 100644 --- a/src/effects/ring_blast.c +++ b/src/effects/ring_blast.c @@ -20,7 +20,7 @@ void ring_blast_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/ring_blast", ring_blast_appendGfx); diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c index 436e281c76..62ecea1e6d 100644 --- a/src/effects/rising_bubble.c +++ b/src/effects/rising_bubble.c @@ -20,7 +20,7 @@ void rising_bubble_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_appendGfx); diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c index 417cc8b6d8..f21ef8705e 100644 --- a/src/effects/shape_spell.c +++ b/src/effects/shape_spell.c @@ -124,12 +124,12 @@ void shape_spell_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } s32 func_E0024324(s32 arg0, s32 arg1) { s32 frameCounter = gGameStatusPtr->frameCounter * 32; - + return (f32)((shim_sin_deg(frameCounter + arg1) * (255 - arg0) + (255 - arg0)) * 0.5 + arg0); } diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c index 98c6dde812..937e8a88c2 100644 --- a/src/effects/shattering_stones.c +++ b/src/effects/shattering_stones.c @@ -20,7 +20,7 @@ void shattering_stones_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/shattering_stones", shattering_stones_appendGfx); diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index bef5663763..a22f9a8000 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -20,7 +20,7 @@ void shimmer_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E0070738(void) { diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 0900936b3d..a55988e29f 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -20,7 +20,7 @@ void shimmer_wave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/shimmer_wave", shimmer_wave_appendGfx); diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index af22728120..724963e0c9 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -20,7 +20,7 @@ void shiny_flare_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00DA228(void) { diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index c3f541c69b..823a59bb81 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -20,7 +20,7 @@ void shockwave_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/shockwave", shockwave_appendGfx); diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index fc5ba921cc..f870c0807f 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -65,7 +65,7 @@ void sleep_bubble_update(EffectInstance* effect) { shim_remove_effect(effect); return; } - + unk_20 = part->unk_20; timeLeft = part->timeLeft; @@ -79,7 +79,7 @@ void sleep_bubble_update(EffectInstance* effect) { do { angle = i * 360.0f / 21.0f + 17.0f; - + *xPtr = temp2 * shim_sin_deg(angle); *yPtr = -temp2 * shim_cos_deg(angle); @@ -112,7 +112,7 @@ void sleep_bubble_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/sleep_bubble", sleep_bubble_appendGfx); diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index 869d7d3d5b..bd40aa9793 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -106,7 +106,7 @@ void small_gold_sparkle_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void small_gold_sparkle_appendGfx(void* effect) { diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c index 4ee861cb52..2e731cbf92 100644 --- a/src/effects/smoke_burst.c +++ b/src/effects/smoke_burst.c @@ -20,7 +20,7 @@ void smoke_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/smoke_burst", smoke_burst_appendGfx); diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c index fb9a9c496f..46d65111d3 100644 --- a/src/effects/smoke_impact.c +++ b/src/effects/smoke_impact.c @@ -20,7 +20,7 @@ void smoke_impact_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/smoke_impact", smoke_impact_appendGfx); diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index 8503f8b75d..1f45156aa5 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -20,7 +20,7 @@ void snaking_static_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00AE544(void) { diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c index aa8ec577fe..d4754eaa46 100644 --- a/src/effects/snowfall.c +++ b/src/effects/snowfall.c @@ -24,7 +24,7 @@ void snowfall_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/snowfall", snowfall_appendGfx); diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c index a0c3a813e1..aa23f8f0af 100644 --- a/src/effects/snowflake.c +++ b/src/effects/snowflake.c @@ -114,7 +114,7 @@ void snowflake_render(EffectInstance* effect) { renderTaskPtr->renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(renderTaskPtr); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void snowflake_appendGfx(void* effect) { diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index c345693090..dc40b919d6 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -20,7 +20,7 @@ void snowman_doll_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00C0758(void) { diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c index d86ad909b5..eb7bdfca93 100644 --- a/src/effects/something_rotating.c +++ b/src/effects/something_rotating.c @@ -20,7 +20,7 @@ void something_rotating_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/something_rotating", func_E01166E8); diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c index 1e6839431b..ae1274f8de 100644 --- a/src/effects/spiky_white_aura.c +++ b/src/effects/spiky_white_aura.c @@ -20,7 +20,7 @@ void spiky_white_aura_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/spiky_white_aura", spiky_white_aura_appendGfx); diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c index 0aeb3adbf1..ef950a467b 100644 --- a/src/effects/spirit_card.c +++ b/src/effects/spirit_card.c @@ -20,7 +20,7 @@ void spirit_card_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/spirit_card", func_E0112330); diff --git a/src/effects/squirt.c b/src/effects/squirt.c index e2fa3589f2..4ea20612c7 100644 --- a/src/effects/squirt.c +++ b/src/effects/squirt.c @@ -22,7 +22,7 @@ void squirt_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00B24A8(void) { diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c index 503b314420..adaadd1353 100644 --- a/src/effects/star_outline.c +++ b/src/effects/star_outline.c @@ -20,7 +20,7 @@ void star_outline_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/star_outline", star_outline_appendGfx); diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index b9ba3379a6..96c64020cb 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -20,7 +20,7 @@ void star_spirits_energy_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/star_spirits_energy", star_spirits_energy_appendGfx); diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index 6349265157..328197fabb 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -20,7 +20,7 @@ void stars_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_appendGfx); diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c index 972b1113d7..c95a0783dd 100644 --- a/src/effects/stars_spread.c +++ b/src/effects/stars_spread.c @@ -20,7 +20,7 @@ void stars_spread_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/stars_spread", stars_spread_appendGfx); diff --git a/src/effects/static_status.c b/src/effects/static_status.c index 2add0a3a60..09139cf979 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -20,7 +20,7 @@ void static_status_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_SURFACE_OPA; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00E651C(void) { diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c index f66b70fcc3..9826cb5930 100644 --- a/src/effects/steam_burst.c +++ b/src/effects/steam_burst.c @@ -20,7 +20,7 @@ void steam_burst_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/steam_burst", steam_burst_appendGfx); diff --git a/src/effects/sun.c b/src/effects/sun.c index e27049accb..224b848615 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -20,7 +20,7 @@ void sun_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/sun", sun_appendGfx); diff --git a/src/effects/sweat.c b/src/effects/sweat.c index 21dc37dd6f..b3b99f8602 100644 --- a/src/effects/sweat.c +++ b/src/effects/sweat.c @@ -20,7 +20,7 @@ void sweat_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/sweat", sweat_appendGfx); diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index 153278068a..0196ea203c 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -178,7 +178,7 @@ void throw_spiny_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00C844C(void) { diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index a5a8e34e8b..351088a77f 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -20,7 +20,7 @@ void tubba_heart_attack_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00CC9C8(void) { diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index 69eb142292..7d39b075a4 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -89,7 +89,7 @@ void walking_dust_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_28; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void walking_dust_appendGfx(void* effect) { diff --git a/src/effects/water_block.c b/src/effects/water_block.c index dbae2a2375..bb7734dd95 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -22,7 +22,7 @@ void water_block_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00B4574(void) { diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index 7fa37fcec6..2d8bbbb735 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -28,7 +28,7 @@ void water_fountain_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00B8200(void) { diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index 5bf4bea41e..ce32d52e8f 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -20,7 +20,7 @@ void whirlwind_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } void func_E00CE470(void) { diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c index 5262a0eafa..c2cf0dd53b 100644 --- a/src/effects/windy_leaves.c +++ b/src/effects/windy_leaves.c @@ -20,7 +20,7 @@ void windy_leaves_render(EffectInstance* effect) { renderTask.renderMode = RENDER_MODE_2D; retTask = shim_queue_render_task(&renderTask); - retTask->renderMode |= RENDER_MODE_2; + retTask->renderMode |= RENDER_TASK_FLAG_2; } INCLUDE_ASM(s32, "effects/windy_leaves", windy_leaves_appendGfx); diff --git a/src/entity/103CD0.c b/src/entity/103CD0.c deleted file mode 100644 index de10e1c2c2..0000000000 --- a/src/entity/103CD0.c +++ /dev/null @@ -1,66 +0,0 @@ -#include "common.h" - -void entity_shattering_setupGfx(s32 entityIndex); - -void entity_BrickBlock_idle(Entity* entity) { - entity_base_block_idle(entity); -} - -INCLUDE_ASM(void, "entity/103CD0", entity_shattering_init_pieces, Entity* entity, void* arg1, void* arg2); - -INCLUDE_ASM(void, "entity/103CD0", entity_shattering_idle, Entity* entity); - -#ifdef NON_EQUIVALENT -// display list issues -void entity_shattering_setupGfx(s32 entityIndex) { - Gfx* temp_s2; - SwitchData* data; - struct802E2BA4* phi_fp; - Matrix4f subroutine_arg6; - Matrix4f subroutine_arg16; - Matrix4f subroutine_arg36; - Matrix4f subroutine_arg48; - s32 i; - f32 x_inv; - f32 y_inv; - f32 z_inv; - Entity* entity; - f32 threeSixty; - f32 someFloat; - f32 one; - s16 temp; - - temp_s2 = gMasterGfxPos; - threeSixty = 360.0f; - someFloat = 0.00390625f; - entity = get_entity_by_index(entityIndex); - data = entity->dataBuf.swtch; - x_inv = -entity->position.x; - y_inv = -entity->position.y; - z_inv = -entity->position.z; - phi_fp = data->renderYaw; - for (i = 0; i < 24; i++) { - if (data->unk_3C.s == 0xFF) { - gDPSetRenderMode(temp_s2++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); - gDPSetCombineMode(temp_s2++, G_CC_MODULATEIA, G_CC_MODULATEIA); - } else { - gDPSetCombineLERP(temp_s2++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); - gDPSetPrimColor(temp_s2++, 0, 0, 0x00, 0x00, 0x00, data->unk_3C.b[1]) - } - guTranslateF(&subroutine_arg6, x_inv, y_inv, z_inv); - guRotateF(&subroutine_arg36, data->unk_8B[i] * threeSixty * someFloat, 1.0f, 0.0f, 0.0f); - guRotateF(&subroutine_arg48, data->unk_A4[i] * threeSixty * someFloat, 0.0f, 1.0f, 0.0f); - guMtxCatF(&subroutine_arg36, &subroutine_arg48, &subroutine_arg48); - guMtxCatF(&subroutine_arg48, &subroutine_arg6, &subroutine_arg6); - guTranslateF(&subroutine_arg16, data->unk_C0[i], data->unk_124[i], data->unk_188[i]); - guMtxCatF(&subroutine_arg6, &subroutine_arg16, &subroutine_arg16); - guMtxF2L(&subroutine_arg16, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(temp_s2++, &gDisplayContext->matrixStack[++gMatrixListPos], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(temp_s2++, entity->vertexData + phi_fp->unk_02[i][0]); - gSPPopMatrix(temp_s2++, G_MTX_MODELVIEW); - } - gMasterGfxPos = temp_s2; -} -#else -INCLUDE_ASM(s32, "entity/103CD0", entity_shattering_setupGfx); -#endif diff --git a/src/entity/104730.c b/src/entity/104730.c deleted file mode 100644 index 5bd087f5a6..0000000000 --- a/src/entity/104730.c +++ /dev/null @@ -1,343 +0,0 @@ -#include "common.h" -#include "ld_addrs.h" - -void entity_shattering_block_init(Entity* entity); - -extern UNK_TYPE D_802E9170; -extern UNK_TYPE D_802E91F0; -extern UNK_TYPE D_802E9270; -extern UNK_TYPE D_802E92B0; - -extern UNK_TYPE D_0A000740; -extern UNK_TYPE D_0A000EE8; -extern UNK_TYPE D_0A000EF8; -extern UNK_TYPE D_0A001218; -extern UNK_TYPE D_0A0014D8; -extern UNK_TYPE D_0A001508; -extern UNK_TYPE D_0A002318; -extern UNK_TYPE D_0A002F78; -extern UNK_TYPE D_0A0031B0; -extern UNK_TYPE D_0A0031E0; -extern UNK_TYPE D_0A003508; -extern UNK_TYPE D_0A003F70; - -Gfx D_802E96F0[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPPipeSync(), - gsDPSetTexturePersp(G_TP_PERSP), - gsDPSetTextureDetail(G_TD_CLAMP), - gsDPSetTextureLOD(G_TL_TILE), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureFilter(G_TF_BILERP), - gsDPSetTextureConvert(G_TC_FILT), - gsSPEndDisplayList(), -}; - -Gfx D_802E9738[] = { - gsSPDisplayList(D_802E96F0), - gsDPSetTextureLUT(G_TT_NONE), - gsDPLoadTextureTile_4b(&D_802E9170, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), - gsSPEndDisplayList(), -}; - -Gfx D_802E9788[] = { - gsSPDisplayList(D_802E96F0), - gsDPSetTextureLUT(G_TT_NONE), - gsDPLoadTextureTile_4b(&D_802E91F0, G_IM_FMT_I, 16, 0, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), - gsSPEndDisplayList(), -}; - -Gfx D_802E97B0[] = { - gsSPDisplayList(D_802E9738), - gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), - gsSPVertex(&D_802E92B0, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -Gfx D_802E97D8[] = { - gsSPDisplayList(D_802E9788), - gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), - gsSPVertex(&D_802E9270, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -Gfx D_802E9828[] = { - gsSPEndDisplayList(), -}; - -// Entity "script" data; unknown if it's used or not. -s32 D_802E9830[8] = { - 0x00000001, 0x0000003C, (s32)D_802E9828, 0x00000002, - 0x00000000, 0x00000000, 0x00000000, 0x00000000 -}; - -s32 D_802E9850[9] = { - 0x00000005, 0x00000800, 0x00000004, 0x00000020, - 0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002, - 0x00000000 -}; - -s32 D_802E9874[9] = { - 0x00000005, 0x00000800, 0x00000004, 0x00000020, - 0x00000001, 0x0000003C, (s32)D_802E97D8, 0x00000002, - 0x00000000 -}; -s32 D_802E9898[9] = { - 0x00000005, 0x00000800, 0x00000004, 0x00000020, - 0x00000001, 0x0000003C, (s32)D_802E97B0, 0x00000002, - 0x00000000, -}; - -ShadowBlueprint CircularShadowA = { - .flags = SHADOW_FLAGS_20, - .renderCommandList = D_802E9850, - .animModelNode = NULL, - .onCreateCallback = entity_Shadow_init, - .entityType = ENTITY_TYPE_SHADOW, - .aabbSize = { 25, 10, 25 } -}; - -ShadowBlueprint CircularShadowB = { - .flags = SHADOW_FLAGS_20, - .renderCommandList = D_802E9874, - .animModelNode = NULL, - .onCreateCallback = entity_Shadow_init, - .entityType = ENTITY_TYPE_SHADOW, - .aabbSize = { 25, 10, 25 } -}; - -ShadowBlueprint SquareShadow = { - .flags = SHADOW_FLAGS_20, - .renderCommandList = D_802E9898, - .animModelNode = NULL, - .onCreateCallback = entity_Shadow_init, - .entityType = ENTITY_TYPE_SHADOW, - .aabbSize = { 25, 10, 25 } -}; - -s32 D_802E9928[2] = { - 0x00000000, 0x00000000 -}; - -s32 D_802E9930[51] = { - 0x00000003, 0x00000000, (s32)entity_SaveBlock_idle, 0x00000009, - 0x0000014E, 0x00000002, (s32)entity_SaveBlock_pause_game, 0x00000002, - (s32)entity_block_hit_init_scale, 0x00000003, 0x00000006, (s32)entity_block_hit_animate_scale, - 0x00000003, 0x00000002, 0x00000000, 0x00000002, - (s32)entity_SaveBlock_show_tutorial_message, 0x00000003, 0x00000000, (s32)entity_SaveBlock_wait_for_close_tutorial, - 0x00000003, 0x0000000E, 0x00000000, 0x00000002, - (s32)entity_SaveBlock_show_choice_message, 0x00000003, 0x00000000, (s32)entity_SaveBlock_wait_for_close_choice, - 0x00000002, (s32)entity_SaveBlock_save_data, 0x00000002, (s32)entity_SaveBlock_show_result_message, - 0x00000003, 0x00000000, (s32)entity_SaveBlock_wait_for_close_result, 0x00000002, - (s32)entity_SaveBlock_resume_game, 0x00000003, 0x0000000C, 0x00000000, - 0x00000004, 0x00000000, 0x00000000, 0x00000002, - (s32)entity_SaveBlock_resume_game, 0x00000003, 0x00000002, 0x00000000, - 0x00000001, (s32)D_802E9930, 0x00000000, -}; - -s32 D_802E99FC[7] = { - 0x00000004, 0x00000022, 0x00000001, 0x0000003C, - &D_0A003508, 0x00000002, 0x00000000, -}; - -EntityBlueprint Entity_SavePoint = { - 0x4200, 0x0020, &D_802E99FC, {0, 0, 0, 0}, entity_SaveBlock_init, &D_802E9930, entity_block_handle_collision, E4B2E0_ROM_START, E4B2E0_ROM_END, 32, {0x19, 0x19, 0x19} -}; - -// potential file split(?) -s32 D_802E9A3C[1] = { - 0x00000000 -}; - -s32 D_802E9A40[18] = { - 0x00000003, 0x00000000, (s32)entity_small_switch_idle, 0x00000009, - 0x00000152, 0x00000002, (s32)entity_base_switch_start_bound_script, 0x00000002, - (s32)entity_base_switch_anim_init, 0x00000003, 0x00000000, (s32)entity_RedSwitch_animate_scale, - 0x00000003, 0x00000000, (s32)entity_RedSwitch_wait_and_reset, 0x00000004, - 0x00000000, 0x00000000, -}; - -s32 D_802E9A88[15] = { - 0x00000003, 0x00000000, (s32)entity_HugeBlueSwitch_idle, 0x00000009, - 0x00000152, 0x00000002, (s32)entity_base_switch_start_bound_script, 0x00000002, - (s32)entity_base_switch_anim_init, 0x00000003, 0x00000000, (s32)entity_base_switch_animate_scale, - 0x00000007, 0x20000000, 0x00000000 -}; - -s32 D_802E9AC4[15] = { - 0x00000003, 0x00000000, (s32)entity_small_switch_idle, 0x00000009, - 0x00000152, 0x00000002, (s32)entity_base_switch_start_bound_script, 0x00000002, - (s32)entity_base_switch_anim_init, 0x00000003, 0x00000000, (s32)entity_base_switch_animate_scale, - 0x00000007, 0x20000000, 0x00000000 -}; - -s32 D_802E9B00[16] = { - 0x00000003, 0x00000000, (s32)entity_GreenStompSwitch_idle, 0x00000003, - 0x00000000, (s32)entity_GreenStompSwitch_retract, 0x00000009, 0x00000152, - 0x00000003, 0x00000080, 0x00000000, 0x00000003, - 0x00000000, (s32)entity_GreenStompSwitch_extend, 0x00000004, 0x00000000, -}; - -s32 D_802E9B40[7] = { - 0x00000004, 0x00000011, 0x00000001, 0x0000003C, - &D_0A000EF8, 0x00000002, 0x00000000, -}; - -s32 D_802E9B5C[7] = { - 0x00000004, 0x00000011, 0x00000001, 0x0000003C, - (s32) &D_0A000EF8, 0x00000002, 0x00000000, -}; - -s32 D_802E9B78[7] = { - 0x00000004, 0x00000011, 0x00000001, 0x0000003C, - (s32) &D_0A000EE8, 0x00000002, 0x00000000 -}; - -s32 D_802E9B94[7] = { - 0x00000004, 0x00000001, 0x00000001, 0x0000003C, - (s32) &D_0A000740, 0x00000002, 0x00000000, -}; - -EntityBlueprint Entity_RedSwitch = { - 0xA000, 0x002C, &D_802E9B78, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9A40, NULL, E62AC0_ROM_START, E62AC0_ROM_END, ENTITY_TYPE_RED_SWITCH, {0x16, 0x17, 0x16} -}; -EntityBlueprint Entity_BlueSwitch = { - 0xAA04, 0x002C, &D_802E9B40, {0, 0, 0, 0}, entity_BlueSwitch_init, &D_802E9AC4, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_BLUE_SWITCH, {0x16, 0x17, 0x16} -}; -EntityBlueprint Entity_HugeBlueSwitch = { - 0xAA04, 0x002C, &D_802E9B5C, {0, 0, 0, 0}, entity_HugeBlueSwitch_init, &D_802E9A88, NULL, E639C0_ROM_START, E639C0_ROM_END, ENTITY_TYPE_HUGE_BLUE_SWITCH, {0x42, 0x4B, 0x42} -}; -EntityBlueprint Entity_GreenStompSwitch = { - 0xC000, 0x002C, &D_802E9B94, {0, 0, 0, 0}, entity_base_switch_init, &D_802E9B00, NULL, E62370_ROM_START, E62370_ROM_END, ENTITY_TYPE_GREEN_STOMP_SWITCH, {0x32, 0x0F, 0x32} -}; - -s32 D_802E9C40[12] = { - 0x00000007, 0x00000020, 0x00000003, 0x00000000, - entity_shattering_idle, 0x00000007, 0x00000001, 0x00000007, - 0x20000000, 0x00000000, 0x00000000, 0x00000000 -}; - -s32 D_802E9C70[7] = { - 0x00000004, 0x00000011, 0x00000001, 0x0000003C, - (s32) &D_802E9828, 0x00000002, 0x00000000 -}; - -EntityBlueprint Entity_ShatteringHammer1Block = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK, {0x10, 0x10, 0x10} -}; -EntityBlueprint Entity_ShatteringHammer2Block = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK, {0x10, 0x10, 0x10} -}; -EntityBlueprint Entity_ShatteringHammer3Block = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK, {0x10, 0x10, 0x10} -}; -EntityBlueprint Entity_ShatteringHammer1BlockTiny = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E32420_ROM_START, E32420_ROM_END, ENTITY_TYPE_HAMMER1_BLOCK_TINY, {0x08, 0x08, 0x08} -}; -EntityBlueprint Entity_ShatteringHammer2BlockTiny = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E35670_ROM_START, E35670_ROM_END, ENTITY_TYPE_HAMMER2_BLOCK_TINY, {0x08, 0x08, 0x08} -}; -EntityBlueprint Entity_ShatteringHammer3BlockTiny = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E38890_ROM_START, E38890_ROM_END, ENTITY_TYPE_HAMMER3_BLOCK_TINY, {0x08, 0x08, 0x08} -}; -EntityBlueprint Entity_ShatteringBrickBlock = { - 0x0000, 0x0250, &D_802E9C70, {0, 0, 0, 0}, entity_shattering_block_init, &D_802E9C40, NULL, E3E260_ROM_START, E3E260_ROM_END, ENTITY_TYPE_BRICK_BLOCK, {0x08, 0x08, 0x08} -}; - -void entity_shattering_block_init(Entity* entity) { - u32 type; - void* a2 = NULL; - void* a1 = NULL; - - //TODO must be HAMMER BLOCK TYPE! - entity->dataBuf.swtch->unk_38 = entity->position.y; - type = get_entity_type((u8)entity->listIndex); - - if (type == ENTITY_TYPE_HAMMER1_BLOCK_TINY || - type == ENTITY_TYPE_HAMMER2_BLOCK_TINY || - type == ENTITY_TYPE_HAMMER3_BLOCK_TINY) - { - entity->scale.x = 0.5f; - entity->scale.y = 0.5f; - entity->scale.z = 0.5f; - } - - switch (type) { - case ENTITY_TYPE_HAMMER1_BLOCK: - case ENTITY_TYPE_HAMMER1_BLOCK_TINY: - a1 = &D_0A0031E0; - a2 = &D_0A001508; - break; - case ENTITY_TYPE_HAMMER2_BLOCK: - case ENTITY_TYPE_HAMMER2_BLOCK_TINY: - a1 = &D_0A0031B0; - a2 = &D_0A0014D8; - break; - case ENTITY_TYPE_HAMMER3_BLOCK: - case ENTITY_TYPE_HAMMER3_BLOCK_TINY: - a1 = &D_0A002F78; - a2 = &D_0A001218; - break; - case ENTITY_TYPE_BRICK_BLOCK: - sfx_play_sound_at_position(SOUND_158, 0, entity->position.x, entity->position.y, entity->position.z); - a1 = &D_0A003F70; - a2 = &D_0A002318; - break; - case ENTITY_TYPE_MULTI_COIN_BRICK: - case ENTITY_TYPE_YELLOW_BLOCK: - case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: - case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: - case ENTITY_TYPE_HIDDEN_RED_BLOCK: - case ENTITY_TYPE_INACTIVE_BLOCK: - break; - } - - if (a2 == NULL) { - return; - } - - entity_shattering_init_pieces(entity, a1, a2); -} - -void entity_breakable_block_create_shattering_entity(Entity* entity) { - EntityBlueprint* bp = NULL; - - switch (get_entity_type(entity->listIndex)) { - case ENTITY_TYPE_HAMMER1_BLOCK: - bp = &Entity_ShatteringHammer1Block; - break; - case ENTITY_TYPE_HAMMER1_BLOCK_TINY: - bp = &Entity_ShatteringHammer1BlockTiny; - break; - case ENTITY_TYPE_HAMMER2_BLOCK: - bp = &Entity_ShatteringHammer2Block; - break; - case ENTITY_TYPE_HAMMER2_BLOCK_TINY: - bp = &Entity_ShatteringHammer2BlockTiny; - break; - case ENTITY_TYPE_HAMMER3_BLOCK: - bp = &Entity_ShatteringHammer3Block; - break; - case ENTITY_TYPE_HAMMER3_BLOCK_TINY: - bp = &Entity_ShatteringHammer3BlockTiny; - break; - case ENTITY_TYPE_BRICK_BLOCK: - bp = &Entity_ShatteringBrickBlock; - break; - case ENTITY_TYPE_MULTI_COIN_BRICK: - case ENTITY_TYPE_YELLOW_BLOCK: - case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: - case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: - case ENTITY_TYPE_HIDDEN_RED_BLOCK: - case ENTITY_TYPE_INACTIVE_BLOCK: - break; - } - - if (bp == NULL) { - return; - } - - create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0, MAKE_ENTITY_END); -} diff --git a/src/entity/Block.c b/src/entity/Block.c index 1dcfb9ff04..45264fc0bd 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -1,10 +1,32 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "entity.h" -extern s32 D_802E9E54; +extern Gfx Entity_InertYellowBlock_Render[]; +extern Gfx Entity_InertRedBlock_Render[]; +extern Gfx Entity_BrickBlock_Render[]; +extern Gfx Entity_Hammer1Block_Render[]; +extern Gfx Entity_Hammer2Block_Render[]; +extern Gfx Entity_Hammer3Block_Render[]; +extern Gfx Entity_PushBlock_Render[]; +extern Gfx Entity_PowBlock_Render[]; + +extern EntityScript Entity_CreatedInertBlock_Script; +extern EntityScript Entity_BreakingBlock_Script; + +extern EntityBlueprint Entity_ShatteringHammer1Block; +extern EntityBlueprint Entity_ShatteringHammer2Block; +extern EntityBlueprint Entity_ShatteringHammer3Block; +extern EntityBlueprint Entity_ShatteringHammer1BlockTiny; +extern EntityBlueprint Entity_ShatteringHammer2BlockTiny; +extern EntityBlueprint Entity_ShatteringHammer3BlockTiny; +extern EntityBlueprint Entity_ShatteringBrickBlock; + +void entity_BrickBlock_idle(Entity* entity); +void entity_breakable_block_create_shattering_entity(Entity* entity); void entity_MulticoinBlock_update_timer(Entity* entity); -void entity_base_block_update_slow_sinking(Entity* entity); #define MULTICOIN_BLOCK_MAX_COINS 10 @@ -31,7 +53,8 @@ void entity_base_block_play_vanish_effect(Entity* entity) { } f32 entity_block_hit_init_scale(Entity* entity) { - if ((get_entity_type(entity->listIndex) - 24) < 3) { + s32 type = get_entity_type(entity->listIndex); + if (type == ENTITY_TYPE_HAMMER1_BLOCK_TINY || type == ENTITY_TYPE_HAMMER2_BLOCK_TINY || type == ENTITY_TYPE_HAMMER3_BLOCK_TINY) { entity->scale.y = 0.23f; entity->scale.x = 1.04f; entity->scale.z = 1.04f; @@ -45,7 +68,8 @@ f32 entity_block_hit_init_scale(Entity* entity) { } void entity_block_hit_animate_scale(Entity* entity) { - if ((get_entity_type(entity->listIndex) - 24) < 3) { + s32 type = get_entity_type(entity->listIndex); + if (type == ENTITY_TYPE_HAMMER1_BLOCK_TINY || type == ENTITY_TYPE_HAMMER2_BLOCK_TINY || type == ENTITY_TYPE_HAMMER3_BLOCK_TINY) { entity->scale.x -= 0.09; entity->scale.z -= 0.09; entity->scale.y += 0.045; @@ -59,7 +83,95 @@ void entity_block_hit_animate_scale(Entity* entity) { entity_base_block_idle(entity); } -INCLUDE_ASM(s32, "entity/Block", entity_base_block_update_slow_sinking); +void entity_base_block_update_slow_sinking(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; + BlockData* data = entity->dataBuf.block; + f32 deltaY; + + if (entity->alpha < 255) { + entity->flags &= ~ENTITY_FLAGS_200000; + return; + } + + if (!(data->sinkingTimer & 0x8000)) { + if (data->sinkingTimer < 150) { + data->sinkingTimer++; + return; + } + + if (entity->position.y < data->initialY - 25.0f) { + deltaY = (entity->position.y - data->initialY + 50.0f) * 0.125f; + } else { + deltaY = (data->initialY - entity->position.y) * 0.125f; + } + + if (deltaY > 1.2) { + deltaY = 1.2f; + } + if (deltaY < 0.3) { + deltaY = 0.3f; + } + + entity->position.y += deltaY; + + if (data->initialY < entity->position.y) { + entity->position.y = data->initialY; + data->sinkingTimer = -1; + entity->flags &= ~ENTITY_FLAGS_200000; + } + } else { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) { + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_JUMPING)) { + Shadow* shadow = get_shadow_by_index(entity->shadowIndex); + if (shadow != NULL) { + f32 temp2 = entity->position.y - shadow->position.y; + + if (entity->position.y - temp2 <= playerStatus->colliderHeight + 1) { + entity->position.y = playerStatus->colliderHeight + 1; + data->sinkingTimer = 1; + } + } + } else { + data->sinkingTimer = 1; + return; + } + do {} while (0); // needed to match + } else { + Shadow* shadow = get_shadow_by_index(entity->shadowIndex); + if (shadow != NULL) { + if (entity->position.y <= shadow->position.y) { + entity->position.y = shadow->position.y; + data->sinkingTimer = 1; + } + } + } + + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) { + data->sinkingTimer = 1; + return; + } + + if (entity->position.y < data->initialY - 25.0f) { + deltaY = (entity->position.y - data->initialY + 50.0f) * 0.125f; + } else { + deltaY = (data->initialY - entity->position.y) * 0.125f; + } + + if (deltaY > 1.2) { + deltaY = 1.2f; + } + if (deltaY < 0.3) { + deltaY = 0.3f; + } + + entity->position.y -= deltaY; + + if (entity->position.y < data->initialY - 50.0f) { + entity->position.y = data->initialY - 50.0f; + data->sinkingTimer = 1; + } + } +} s32 entity_base_block_idle(Entity* entity) { BlockData* data = entity->dataBuf.block; @@ -69,8 +181,8 @@ s32 entity_base_block_idle(Entity* entity) { if (entity->flags & ENTITY_FLAGS_200000) { ret = 1; entity_base_block_update_slow_sinking(entity); - if (data->itemEntityIndex != -1) { - ItemEntity* itemEntity = get_item_entity(data->itemEntityIndex); + if (data->item != -1) { + ItemEntity* itemEntity = get_item_entity(data->item); itemEntity->position.y = entity->position.y + 4.0f; } } @@ -82,9 +194,9 @@ s32 entity_base_block_idle(Entity* entity) { void entity_base_block_init(Entity* entity) { BlockData* data = entity->dataBuf.block; - data->itemEntityIndex = -1; + data->item = -1; data->initialY = entity->position.y; - data->unk_0E = -1; + data->sinkingTimer = -1; entity->flags &= ~ENTITY_FLAGS_200000; } @@ -153,8 +265,8 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { if ((data->coinsLeft == 0) || (data->timeLeft == 0)) { data->empty = TRUE; set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, - entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END)), &D_802E9E54); - entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END)), Entity_CreatedInertBlock_Script); + entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -175,15 +287,15 @@ void entity_MulticoinBlock_update_timer(Entity* entity) { void entity_MulticoinBlock_idle(Entity* entity) { BlockData* data = entity->dataBuf.block; - if ((entity->collisionFlags & ENTITY_COLLISION_BLOCK_HIT) != 0) { + if (entity->collisionFlags & ENTITY_COLLISION_PARTNER) { exec_entity_commandlist(entity); return; } entity_MulticoinBlock_update_timer(entity); entity_base_block_idle(entity); if (data->empty) { - create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); - entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + create_entity(&Entity_InertYellowBlock, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); + entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } @@ -192,145 +304,475 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) { if (data->gameFlagIndex != 0xFFFF) { if (get_global_flag(data->gameFlagIndex) != 0) { - create_entity(&Entity_InertYellowBlock, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); - entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + create_entity(&Entity_InertYellowBlock, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); + entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); } } } -extern s32 D_802E9E80; - -#ifdef NON_EQUIVALENT -// tail merge + rodata s32 entity_block_handle_collision(Entity* entity) { - u8 bVar1; - s32 bVar2; - s32 iVar3; - s32 uVar4; + s32 breakBlock; PlayerStatus* playerStatus = &gPlayerStatus; - if ((entity->alpha == 0) && ((entity->unk_06 & 1) != 0)) { - return 0; + if (entity->alpha == 0 && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { + return FALSE; } - bVar1 = entity->unk_06; - if (bVar1 & 4) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) { s32 type = get_entity_type(entity->listIndex); - if (type == 0xC) { - return 0; + switch (type) { + case ENTITY_TYPE_PUSH_BLOCK: + case ENTITY_TYPE_HAMMER1_BLOCK: + case ENTITY_TYPE_HAMMER2_BLOCK: + case ENTITY_TYPE_HAMMER3_BLOCK: + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: + return FALSE; } - if (type >= 0xC) { - if (type < 0x1b) { - if (type > 0x14) { - return 0; - } - } + if (playerStatus->flags & PLAYER_STATUS_FLAGS_JUMPING) { + exec_entity_commandlist(entity); } - - if (!(playerStatus->flags & 2)) { - return 1; - } - exec_entity_commandlist(entity); - return 1; + return TRUE; } - if (bVar1 & 0x80) { + if (entity->collisionFlags & ENTITY_COLLISION_PARTNER) { exec_entity_commandlist(entity); - return 1; + return TRUE; } - bVar2 = FALSE; - if (bVar1 & 1) { - if ((playerStatus->actionState == 0xd) || (playerStatus->actionState == 0x0f)) { - return 0; + breakBlock = FALSE; + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + if (playerStatus->actionState == ACTION_STATE_SPIN_JUMP || playerStatus->actionState == ACTION_STATE_ULTRA_JUMP) { + return FALSE; } - if ((playerStatus->actionState == 0x0e) || (playerStatus->actionState == 0x10)) { - bVar2 = TRUE; + if (playerStatus->actionState == ACTION_STATE_GROUND_POUND || playerStatus->actionState == ACTION_STATE_ULTRA_POUND) { + breakBlock = TRUE; } else { - return 1; + return TRUE; } } else { - if (!(bVar1 & 0x40)) { - return 1; + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_HAMMER)) { + return TRUE; } - if ((playerStatus->flags & 0x1000000) == 0) { - return 1; + if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_1000000)) { + return TRUE; } } switch (get_entity_type(entity->listIndex)) { - case 0x15: - case 0x18: - if (bVar2) { + case ENTITY_TYPE_BRICK_BLOCK: + case ENTITY_TYPE_MULTI_COIN_BRICK: + case ENTITY_TYPE_YELLOW_BLOCK: + case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: + case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: + case ENTITY_TYPE_HIDDEN_RED_BLOCK: + case ENTITY_TYPE_RED_BLOCK: + exec_entity_commandlist(entity); + break; + case ENTITY_TYPE_HAMMER1_BLOCK: + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: + if (breakBlock) { if (gPlayerData.bootsLevel < 1) { - bVar2 = FALSE; + breakBlock = FALSE; } } else { if (gPlayerData.hammerLevel > -1) { - bVar2 = TRUE; + breakBlock = TRUE; } } - if (!bVar2) { - return 1; + if (!breakBlock) { + return TRUE; } - set_entity_commandlist(entity, &D_802E9E80); + set_entity_commandlist(entity, Entity_BreakingBlock_Script); sfx_play_sound_at_position(SOUND_14F, 0, entity->position.x, entity->position.y, entity->position.z); break; - case 0x16: - case 0x19: - if (bVar2) { + case ENTITY_TYPE_HAMMER2_BLOCK: + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: + if (breakBlock) { if (gPlayerData.bootsLevel < 2) { - bVar2 = FALSE; + breakBlock = FALSE; } } else if (gPlayerData.hammerLevel > 0) { - bVar2 = TRUE; + breakBlock = TRUE; } - if (!bVar2) { - return 1; + if (!breakBlock) { + return TRUE; } - set_entity_commandlist(entity, &D_802E9E80); + set_entity_commandlist(entity, Entity_BreakingBlock_Script); sfx_play_sound_at_position(SOUND_150, 0, entity->position.x, entity->position.y, entity->position.z); break; - case 0x17: - case 0x1a: - if (gPlayerData.hammerLevel < '\x02') { - return 1; + case ENTITY_TYPE_HAMMER3_BLOCK: + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: + if (gPlayerData.hammerLevel < 2) { + return TRUE; } - set_entity_commandlist(entity, &D_802E9E80); + set_entity_commandlist(entity, Entity_BreakingBlock_Script); sfx_play_sound_at_position(SOUND_151, 0, entity->position.x, entity->position.y, entity->position.z); break; - case 0x1b: - case 0x1c: - case 0x1d: - case 0x1e: - case 0x1f: + case ENTITY_TYPE_MULTI_TRIGGER_BLOCK: + case ENTITY_TYPE_HEALING_BLOCK: + case ENTITY_TYPE_1C: + case ENTITY_TYPE_1D: + case ENTITY_TYPE_1E: + case ENTITY_TYPE_HEALING_BLOCK_FRAME: entity_start_script(entity); exec_entity_commandlist(entity); - return 1; - case 0xb: + break; + case ENTITY_TYPE_PUSH_BLOCK: entity_start_script(entity); break; + case ENTITY_TYPE_INACTIVE_BLOCK: + break; } - return 1; + + return TRUE; } -#else -INCLUDE_ASM(s32, "entity/Block", entity_block_handle_collision, Entity* entity); -#endif void entity_init_Hammer1Block_normal(Entity* entity) { entity_base_block_init(entity); entity->renderSetupFunc = entity_base_block_setupGfx; } -s32 entity_init_HammerBlock_small(Entity* entity) { +void entity_init_HammerBlock_small(Entity* entity) { BlockData* data = entity->dataBuf.block; - data->itemEntityIndex = -1; + data->item = -1; data->initialY = entity->position.y; - data->unk_0E = -1; + data->sinkingTimer = -1; entity->flags &= ~ENTITY_FLAGS_200000; entity->scale.x = 0.5f; entity->scale.y = 0.5f; entity->scale.z = 0.5f; } + +EntityScript Entity_PowBlock_Script = { + es_SetCallback(entity_base_block_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_block_hit_init_scale) + es_SetCallback(entity_block_hit_animate_scale, 6) + es_Call(entity_start_script) + es_Restart + es_End +}; +EntityScript Entity_BaseBlock_Script = { + es_SetCallback(entity_base_block_idle, 0) + es_Call(entity_start_script) + es_Restart + es_End +}; +EntityScript D_802E9DEC = { + es_SetCallback(entity_base_block_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Restart + es_End +}; +EntityScript Entity_InertBlock_Script = { + es_SetCallback(entity_base_block_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_inactive_block_hit_init) + es_Call(entity_start_script) + es_SetCallback(entity_inactive_block_hit_anim, 0) + es_SetCallback(entity_inactive_block_recoil_anim, 0) + es_Restart + es_End +}; +EntityScript Entity_CreatedInertBlock_Script = { + es_Call(entity_inactive_block_hit_init) + es_SetCallback(entity_inactive_block_hit_anim, 0) + es_SetCallback(entity_inactive_block_recoil_anim, 0) + es_Jump(Entity_InertBlock_Script) + es_End +}; +EntityScript Entity_BreakingBlock_Script = { + es_RestartBoundScript + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_Call(entity_breakable_block_create_shattering_entity) + es_SetCallback(NULL, 1) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; +EntityScript Entity_BrickBlock_Script = { + es_SetCallback(entity_BrickBlock_idle, 0) + es_Call(entity_start_script) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_Call(entity_breakable_block_create_shattering_entity) + es_PlaySound(SOUND_HIT_BLOCK) + es_SetCallback(NULL, 2) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; +EntityScript Entity_Hammer1Block_Script = { + es_SetCallback(entity_base_block_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_start_script) + es_Restart + es_End +}; +EntityScript Entity_MulticoinBlock_Script = { + es_Call(entity_MulticoinBlock_check_if_inactive) + es_Label(1) + es_SetCallback(entity_MulticoinBlock_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_MulticoinBlock_spawn_coin) + es_Call(entity_inactive_block_hit_init) + es_SetCallback(entity_inactive_block_hit_anim, 0) + es_SetCallback(entity_inactive_block_recoil_anim, 0) + es_Goto(1) + es_End +}; + +EntityModelScript Entity_InertYellowBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_InertYellowBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_InertRedBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_InertRedBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_MulticoinBrick_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_BrickBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_Hammer1Block_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Hammer1Block_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_Hammer2Block_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Hammer2Block_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_Hammer3Block_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Hammer3Block_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_PushBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PushBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_BrickBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_BrickBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityModelScript Entity_PowBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PowBlock_Render, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_InertYellowBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_InertYellowBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_Hammer1Block_normal, + .updateEntityScript = Entity_InertBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(InertYellowBlock) }, + .entityType = ENTITY_TYPE_MULTI_TRIGGER_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_InertRedBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_InertRedBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_Hammer1Block_normal, + .updateEntityScript = Entity_InertBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(InertRedBlock) }, + .entityType = ENTITY_TYPE_INACTIVE_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_BrickBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_BrickBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BrickBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(BrickBlock) }, + .entityType = ENTITY_TYPE_BRICK_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_MulticoinBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_MulticoinBrick_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_MulticoinBlock_init, + .updateEntityScript = Entity_MulticoinBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(BrickBlock) }, + .entityType = ENTITY_TYPE_MULTI_COIN_BRICK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_Hammer1Block = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer1Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_Hammer1Block_normal, + .updateEntityScript = Entity_Hammer1Block_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK, + .aabbSize = { 50, 50, 50 } +}; + +EntityBlueprint Entity_Hammer1Block_WideHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer1Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_Hammer1Block_normal, + .updateEntityScript = Entity_Hammer1Block_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK, + .aabbSize = { 100, 50, 50 } +}; + +EntityBlueprint Entity_Hammer1Block_TallHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer1Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_Hammer1Block_normal, + .updateEntityScript = Entity_Hammer1Block_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK, + .aabbSize = { 50, 50, 100 } +}; + +EntityBlueprint Entity_Hammer1BlockTiny = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer1Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_HammerBlock_small, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK_TINY, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_Hammer2Block = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer2Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK, + .aabbSize = { 50, 50, 50 } +}; + +EntityBlueprint Entity_Hammer2Block_WideHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer2Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK, + .aabbSize = { 100, 50, 50 } +}; + +EntityBlueprint Entity_Hammer2Block_TallHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer2Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK, + .aabbSize = { 50, 50, 100 } +}; + +EntityBlueprint Entity_Hammer2BlockTiny = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer2Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_HammerBlock_small, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK_TINY, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_Hammer3Block = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer3Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK, + .aabbSize = { 50, 50, 50 } +}; + +EntityBlueprint Entity_Hammer3Block_WideHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer3Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK, + .aabbSize = { 100, 50, 50 } +}; + +EntityBlueprint Entity_Hammer3Block_TallHitbox = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer3Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK, + .aabbSize = { 50, 50, 100 } +}; + +EntityBlueprint Entity_Hammer3BlockTiny = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_Hammer3Block_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_HammerBlock_small, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(Hammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK_TINY, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_PushBlock = { + .flags = ENTITY_FLAGS_4000, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_PushBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_BaseBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(PushBlock) }, + .entityType = ENTITY_TYPE_PUSH_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_PowBlock = { + .flags = ENTITY_FLAGS_4000, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_PowBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_PowBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(PowBlock) }, + .entityType = ENTITY_TYPE_POW_BLOCK, + .aabbSize = { 30, 25, 25 }, +}; diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 6a16974680..3e6533658b 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -1,8 +1,13 @@ #include "common.h" #include "npc.h" #include "sprite.h" +#include "ld_addrs.h" +#include "entity.h" -void entity_BlueWarpPipe_setupGfx(void* renderData); +extern Gfx Entity_BlueWarpPipe_RenderPipe[]; +extern Gfx Entity_BlueWarpPipe_RenderBase[]; + +void entity_BlueWarpPipe_setupGfx(s32 entityIndex); void entity_BlueWarpPipe_check_if_active(Entity* entity) { BlueWarpPipeData* pipeData; @@ -138,9 +143,24 @@ void entity_BlueWarpPipe_start_bound_script(Entity* entity) { entity_start_script(entity); } -INCLUDE_ASM(s32, "entity/BlueWarpPipe", entity_BlueWarpPipe_setupGfx); +void entity_BlueWarpPipe_setupGfx(s32 entityIndex) { + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + BlueWarpPipeData* data = entity->dataBuf.bluePipe; + Matrix4f sp10; + Matrix4f sp50; -f32 entity_init_BlueWarpPipe(Entity* entity) { + guScaleF(sp10, entity->scale.x, entity->scale.y, entity->scale.z); + guTranslateF(sp50, entity->position.x, data->finalPosY + 1.0f, entity->position.z); + guMtxCatF(sp10, sp50, sp50); + guMtxF2L(sp50, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxPos++, Entity_BlueWarpPipe_RenderBase); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + gMasterGfxPos = gfxPos; +} + +void entity_init_BlueWarpPipe(Entity* entity) { BlueWarpPipeData* data; s32 entryID = CreateEntityVarArgBuffer[0]; EvtScript* enterPipeEvt = (EvtScript*)CreateEntityVarArgBuffer[1]; @@ -157,3 +177,31 @@ f32 entity_init_BlueWarpPipe(Entity* entity) { entity->position.y -= (data->isRaised ? 15.0 : 52.0); } + +EntityScript Entity_BlueWarpPipe_Script = { + es_SetCallback(entity_BlueWarpPipe_check_if_active, 0) + es_SetCallback(entity_BlueWarpPipe_rise_up, 0) + es_SetCallback(entity_BlueWarpPipe_wait_for_player_to_get_off, 0) + es_SetCallback(entity_BlueWarpPipe_idle, 0) + es_Call(entity_BlueWarpPipe_set_player_move_to_center) + es_SetCallback(entity_BlueWarpPipe_wait_player_move_to_center, 0) + es_Call(entity_BlueWarpPipe_enter_pipe_init) + es_SetCallback(entity_BlueWarpPipe_enter_pipe_update, 0) + es_Call(entity_BlueWarpPipe_start_bound_script) + es_End +}; + +EntityModelScript Entity_BlueWarpPipe_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_BlueWarpPipe_RenderPipe, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_BlueWarpPipe = { + .flags = 0, + .typeDataSize = sizeof(BlueWarpPipeData), + .renderCommandList = Entity_BlueWarpPipe_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_BlueWarpPipe, + .updateEntityScript = Entity_BlueWarpPipe_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BlueWarpPipe) }, + .entityType = ENTITY_TYPE_BLUE_WARP_PIPE, + .aabbSize = { 40, 50, 40} +}; diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 52f82ebfaf..d44e6ce4c9 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -1,43 +1,111 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "entity.h" -void entity_Chest_open(Entity* entity); +extern EntityScript Entity_Chest_ScriptOpened; -#define CHEST_POST_ANIM_DELAY_TIME 10 +extern Gfx Entity_Chest_RenderBox[]; +extern Gfx Entity_Chest_RenderLid[]; +extern Mtx Entity_Chest_lidMtx; -extern s32 D_802EAD7C; -// requires data migration -#ifdef NON_MATCHING -extern Script D_802EAB30; -extern Script D_802EAC40; -extern Script D_802EAC84; +EvtScript Entity_Chest_AdjustCam_ISK = { + EVT_THREAD + EVT_CALL(GetPlayerPos, LW(0), LW(1), LW(2)) + EVT_CALL(UseSettingsFrom, 0, -195, -358, -555) + EVT_CALL(SetPanTarget, 0, LW(0), LW(1), LW(2)) + EVT_CALL(SetCamDistance, 0, EVT_FLOAT(290.0)) + EVT_CALL(SetCamPitch, 0, EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, 0, EVT_FLOAT(8.0)) + EVT_CALL(PanToTarget, 0, 0, 1) + EVT_CALL(WaitForCam, 0, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; -void entity_Chest_adjust_camera(void) { - Areas areaID; - Script* script; +EvtScript Entity_Chest_ResetCam_ISK = { + EVT_THREAD + EVT_CALL(ResetCam, 0, 3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript Entity_Chest_AdjustCam_TIK = { + EVT_THREAD + EVT_CALL(AdjustCam, 0, EVT_FLOAT(8.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.5), EVT_FLOAT(-9.5)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript Entity_Chest_AdjustCam_KZN = { + EVT_THREAD + EVT_CALL(AdjustCam, 0, EVT_FLOAT(8.0), 0, EVT_FLOAT(210.0), EVT_FLOAT(21.0), EVT_FLOAT(-16.0)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript Entity_Chest_ResetCam_Default = { + EVT_THREAD + EVT_CALL(ResetCam, 0, 3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +void entity_Chest_adjust_camera(Entity* entity) { + s16 areaID; + EvtScript* script; areaID = gGameStatusPtr->areaID; script = NULL; if (areaID == AREA_ISK) { - script = &D_802EAB30; + script = &Entity_Chest_AdjustCam_ISK; } else if (areaID == AREA_TIK) { - script = &D_802EAC40; + script = &Entity_Chest_AdjustCam_TIK; } else if (areaID == AREA_KZN) { - script = &D_802EAC84; + script = &Entity_Chest_AdjustCam_KZN; } if (script != NULL) { - start_script(script, 10, 32); + start_script(script, EVT_PRIORITY_A, EVT_FLAG_20); } } -#else -INCLUDE_ASM(s32, "entity/Chest", entity_Chest_adjust_camera); -#endif -// requires data migration -INCLUDE_ASM(s32, "entity/Chest", entity_Chest_reset_camera); +void entity_Chest_reset_camera(Entity* entity) { + s16 areaID; + EvtScript* script; -s32 entity_Chest_setupGfx(void); -INCLUDE_ASM(s32, "entity/Chest", entity_Chest_setupGfx); + areaID = gGameStatusPtr->areaID; + script = NULL; + if (areaID == AREA_ISK) { + script = &Entity_Chest_ResetCam_ISK; + } else { + script = &Entity_Chest_ResetCam_Default; + } + start_script(script, EVT_PRIORITY_A, EVT_FLAG_20); +} + +void entity_Chest_setupGfx(s32 entityIndex) { + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + ChestData* data = entity->dataBuf.chest; + Matrix4f sp18; + Matrix4f sp58; + Gfx* gfx; + + guRotateF(sp58, data->lidAngle, 1.0f, 0.0f, 0.0f); + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_Chest_lidMtx)); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gfx = ENTITY_ADDR(entity, Gfx*, Entity_Chest_RenderLid); + gSPDisplayList(gfxPos++, gfx); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + gMasterGfxPos = gfxPos; +} void entity_Chest_check_opened(Entity* entity) { ChestData* data = entity->dataBuf.chest; @@ -45,7 +113,7 @@ void entity_Chest_check_opened(Entity* entity) { entity->flags |= ENTITY_FLAGS_4000; data->itemID = -1; data->lidAngle = -28.7f; - set_entity_commandlist(entity, &D_802EAD7C); + set_entity_commandlist(entity, Entity_Chest_ScriptOpened); } } @@ -78,14 +146,69 @@ void entity_Chest_idle(Entity* entity) { void entity_Chest_begin_opening(Entity* entity) { ChestData* data = entity->dataBuf.chest; - data->postLidAnimDelay = CHEST_POST_ANIM_DELAY_TIME; + data->postLidAnimDelay = 10; data->lidAngle = 0.0f; - data->unk_05 = 0; + data->openState = 0; data->giveItemTimer = 40; sfx_play_sound(467); } -INCLUDE_ASM(s32, "entity/Chest", entity_Chest_open); +void entity_Chest_open(Entity* entity) { + ChestData* data = entity->dataBuf.chest; + f32 temp; + + switch (data->openState) { + case 0: + data->postLidAnimDelay--; + data->lidAngle -= 1.0f; + if (data->lidAngle < -2.0f) { + data->lidAngle = -2.0f; + } + + if (data->postLidAnimDelay == 0) { + data->postLidAnimDelay = 8; + data->openState++; + } + break; + case 1: + data->postLidAnimDelay--; + if (data->postLidAnimDelay == 0) { + data->lidAnimInterpPhase = 0.0f; + data->openState++; + } + break; + case 2: + data->lidAnimInterpPhase += 4.0f; + if (data->lidAnimInterpPhase >= 180.0f) { + data->openState++; + } + temp = sin_rad(data->lidAnimInterpPhase * TAU / 360.0f) * 3.0f; + data->lidAngle -= temp; + break; + case 3: + data->lidAnimInterpPhase += 1.0f; + if (data->lidAnimInterpPhase >= 190.0f) { + data->postLidAnimDelay = 10; + data->openState++; + } + temp = sin_rad(data->lidAnimInterpPhase * TAU / 360.0f) * 2.0f; + data->lidAngle -= temp; + break; + case 4: + data->postLidAnimDelay--; + if (data->postLidAnimDelay == 0) { + if (data->unk_07 != 0) { + exec_entity_commandlist(entity); + } else { + data->openState++; + } + } + break; + case 5: + break; + + } +} void entity_Chest_close(Entity* entity) { ChestData* data = entity->dataBuf.chest; @@ -109,7 +232,7 @@ void entity_Chest_close(Entity* entity) { data->lidAnimInterpPhase += 1.0f; if (data->lidAnimInterpPhase >= 185.0f) { data->lidAnimInterpPhase = 185.0f; - data->postLidAnimDelay = CHEST_POST_ANIM_DELAY_TIME; + data->postLidAnimDelay = 10; data->state++; } delta = 2.0f * sin_rad(data->lidAnimInterpPhase * TAU / 360.0f); @@ -127,7 +250,14 @@ void entity_Chest_close(Entity* entity) { } } -INCLUDE_ASM(s32, "entity/Chest", entity_GiantChest_hide_effect); +void entity_GiantChest_hide_effect(Entity* entity) { + ChestData* chest = entity->dataBuf.chest; + EffectInstance* effect = chest->gotItemEffect; + + if (effect != NULL) { + ((GotItemOutlineFXData*)effect->data)->unk_14 = 10; + } +} void entity_GiantChest_open(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -298,7 +428,7 @@ void entity_Chest_clear_item_id(Entity* entity) { void entity_Chest_readargs(Entity* entity) { ChestData* data = entity->dataBuf.chest; - data->itemID = *CreateEntityVarArgBuffer; + data->itemID = CreateEntityVarArgBuffer[0]; data->gameFlagIndex = 0xFFFF; } @@ -316,3 +446,64 @@ void entity_Chest_init(Entity* entity) { entity->scale.y = 0.56f; entity->scale.z = 0.56f; } + +EntityScript Entity_GiantChest_Script = { + es_Call(entity_Chest_check_opened) + es_SetCallback(entity_Chest_idle, 0) + es_Call(entity_Chest_adjust_camera) + es_Call(entity_GiantChest_give_equipment) + es_Call(entity_Chest_begin_opening) + es_SetCallback(entity_GiantChest_open, 0) + es_Call(entity_Chest_start_bound_script) + es_SetCallback(entity_GiantChest_await_got_item, 0) + es_Call(entity_GiantChest_hide_effect) + es_Call(entity_Chest_reset_camera) + es_SetCallback(entity_Chest_close, 0) + es_SetCallback(NULL, 0) + es_Restart + es_End +}; + +EntityScript Entity_Chest_ScriptOpened = { + es_SetCallback(NULL, 0) + es_End +}; +EntityScript Entity_Chest_Script = { + es_Call(entity_Chest_check_opened) + es_SetCallback(entity_Chest_idle, 0) + es_Call(entity_Chest_begin_opening) + es_Call(entity_Chest_start_bound_script) + es_Call(entity_Chest_clear_item_id) + es_SetCallback(entity_Chest_open, 0) + es_Call(entity_Chest_enable_player_input) + es_SetCallback(entity_Chest_close, 0) + es_SetCallback(NULL, 0) + es_Restart + es_End +}; +EntityModelScript Entity_Chest_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Chest_RenderBox, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_GiantChest = { + .flags = ENTITY_FLAGS_4000, + .typeDataSize = sizeof(ChestData), + .renderCommandList = Entity_Chest_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_GiantChest_init, + .updateEntityScript = Entity_GiantChest_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(Chest) }, + .entityType = ENTITY_TYPE_CHEST, + .aabbSize = { 50, 45, 46 } +}; +EntityBlueprint Entity_Chest = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000, + .typeDataSize = sizeof(ChestData), + .renderCommandList = Entity_Chest_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_Chest_init, + .updateEntityScript = Entity_Chest_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(Chest) }, + .entityType = ENTITY_TYPE_CHEST, + .aabbSize = { 28, 26, 23 } +}; diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index fd32904011..f84b1dd1a7 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -1,11 +1,20 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "entity.h" -extern u32* D_802EA728; -extern u32* D_802EA760; -extern EntityBlueprint Entity_HeartBlockContent; extern u32 HeartBlockPrinterClosed; -extern s32 D_802EA744; // + +extern EntityModelScript Entity_HeartBlockContent_RenderScriptIdle; +extern EntityModelScript Entity_HeartBlockContent_RenderScriptAfterHit; +extern EntityModelScript Entity_HeartBlockContent_RenderScriptHit; + +extern EntityBlueprint Entity_HeartBlockContent; + +extern Gfx Entity_HeartBlock_Render[]; +extern Gfx Entity_HeartBlockContent_RenderHeartSleeping[]; +extern Gfx Entity_HeartBlockContent_RenderHeartAwake[]; +extern Gfx Entity_HeartBlockContent_RenderHeartHappy[]; f32 entity_HeartBlockContent_get_previous_yaw(HeartBlockContentData* data, s32 lagTime) { s32 bufIdx = data->yawBufferPos - lagTime; @@ -15,10 +24,56 @@ f32 entity_HeartBlockContent_get_previous_yaw(HeartBlockContentData* data, s32 l return data->yawBuffer[bufIdx]; } -INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent__setupGfx); +void entity_HeartBlockContent__setupGfx(s32 entityIndex, Gfx* arg1) { + Entity* entity = get_entity_by_index(entityIndex); + HeartBlockContentData* data = entity->dataBuf.heartBlockContent; + Gfx* gfxPos = gMasterGfxPos; + s32 alpha; + Matrix4f sp18; + Gfx* dlist; + + dlist = ENTITY_ADDR(entity, Gfx*, arg1); + + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, entity->alpha); + + alpha = 92; + if (entity->alpha < alpha) { + alpha = entity->alpha; + } + + guRotateF(sp18, entity_HeartBlockContent_get_previous_yaw(data, 2), 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &data->unk_58); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_58; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gSPDisplayList(gfxPos++, dlist); + gDPPipeSync(gfxPos++); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + alpha = 72; + if (entity->alpha < alpha) { + alpha = entity->alpha; + } + + guRotateF(sp18, entity_HeartBlockContent_get_previous_yaw(data, 3), 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &data->unk_98); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_98; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gSPDisplayList(gfxPos++, dlist); + gDPPipeSync(gfxPos++); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + gMasterGfxPos = gfxPos; +} void entity_HeartBlockContent_setupGfx(s32 entityIndex) { - entity_HeartBlockContent__setupGfx(entityIndex, &D_0A000808); + entity_HeartBlockContent__setupGfx(entityIndex, Entity_HeartBlockContent_RenderHeartHappy); } void entity_HeartBlockContent_set_initial_pos(Entity* entity) { @@ -32,13 +87,13 @@ void entity_HeartBlockContent_set_initial_pos(Entity* entity) { void entity_HeartBlockContent__reset(Entity* entity) { HeartBlockContentData* data; - Entity* someEntity; + Entity* blockEntity; entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; entity->alpha = 255; data = entity->dataBuf.heartBlockContent; entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA; - someEntity = get_entity_by_index(data->parentEntityIndex); + blockEntity = get_entity_by_index(data->parentEntityIndex); if (data->unk_09 == 0) { data->unk_09 = 1; @@ -108,10 +163,10 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { } } -void func_802E4DE0(Entity* entity) { - HeartBlockContentData* temp = entity->dataBuf.heartBlockContent; +void entity_HeartBlockContent_reset_data(Entity* entity) { + HeartBlockContentData* data = entity->dataBuf.heartBlockContent; - temp->state = 0; + data->state = 0; entity->scale.x = 1.0f; entity->scale.y = 1.0f; entity->scale.z = 1.0f; @@ -137,7 +192,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { data->state++; entity->flags &= ~ENTITY_FLAGS_ALWAYS_FACE_CAMERA; data->rotationRate = -10.0f; - entity_set_render_script(entity, &D_802EA744); + entity_set_render_script(entity, Entity_HeartBlockContent_RenderScriptHit); entity->renderSetupFunc = &entity_HeartBlockContent_setupGfx; } break; @@ -233,7 +288,51 @@ void entity_HeartBlock_idle(Entity* entity) { entity_base_block_idle(entity); } -INCLUDE_ASM(s32, "entity/HeartBlock", entity_HeartBlockContent_anim_beating); +void entity_HeartBlockContent_anim_beating(Entity* entity) { + HeartBlockContentData* data = entity->dataBuf.heartBlockContent; + + entity_HeartBlockContent_set_initial_pos(entity); + + if (entity->scale.x < 1.0) { + return; + } + + switch (data->heartbeatTimer) { + case 0: + entity->scale.x += 0.1; + data->heartbeatTimer++; + break; + case 1: + entity->scale.x -= 0.02; + if (entity->scale.x <= 1.0) { + entity->scale.x = 1.0f; + data->heartbeatTimer++; + } + break; + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + data->heartbeatTimer++; + break; + default: + data->heartbeatTimer = 0; + break; + } + + entity->scale.y = entity->scale.x; +} void entity_HeartBlockContent_init(Entity* entity) { entity_HeartBlockContent_set_initial_pos(entity); @@ -241,7 +340,7 @@ void entity_HeartBlockContent_init(Entity* entity) { void entity_HeartBlockContent_reset(Entity* entity) { entity_HeartBlockContent__reset(entity); - entity_set_render_script(entity, (u32*)&D_802EA728); + entity_set_render_script(entity, Entity_HeartBlockContent_RenderScriptIdle); } void entity_HeartBlockContent_idle(Entity* entity) { @@ -254,11 +353,11 @@ void entity_HeartBlockContent_anim_heal(Entity* entity) { } void entity_HeartBlock_change_render_script(Entity* entity) { - entity_set_render_script(entity, (u32*)&D_802EA760); + entity_set_render_script(entity, Entity_HeartBlockContent_RenderScriptAfterHit); } void entity_HeartBlock_show_tutorial_message(Entity* entity) { - if ((!gPlayerData.partners[1].enabled) && get_global_flag(EVT_SAVE_FLAG(96)) == 0) { + if ((!gPlayerData.partners[PARTNER_GOOMBARIO].enabled) && get_global_flag(EVT_SAVE_FLAG(96)) == 0) { HeartBlockPrinterClosed = FALSE; msg_get_printer_for_msg(0x1D0001, &HeartBlockPrinterClosed); set_time_freeze_mode(TIME_FREEZE_PARTIAL); @@ -285,7 +384,7 @@ s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* bp) { HeartBlockContentData* data; entity_base_block_init(entity); - childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, 0.0f, MAKE_ENTITY_END)); + childEntity = get_entity_by_index(create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, 0, MAKE_ENTITY_END)); data = childEntity->dataBuf.heartBlockContent; data->parentEntityIndex = entity->listIndex; @@ -299,3 +398,71 @@ s8 entity_HeartBlock_create_child_entity(Entity* entity, EntityBlueprint* bp) { void entity_HeartBlock_init(Entity* entity) { entity_HeartBlock_create_child_entity(entity, &Entity_HeartBlockContent); } + +extern EntityScript Entity_InertBlock_Script; + +EntityScript Entity_HeartBlockContent_Script = { + es_Call(entity_HeartBlockContent_reset) + es_SetCallback(entity_HeartBlockContent_idle, 0) + es_Call(entity_HeartBlockContent_reset_data) + es_Call(entity_HeartBlock_change_render_script) + es_SetCallback(entity_HeartBlockContent_anim_heal, 0) + es_Call(entity_HeartBlock_show_tutorial_message) + es_SetCallback(entity_HeartBlock_wait_for_close_tutorial, 0) + es_SetCallback(NULL, 60) + es_Restart + es_End +}; +EntityScript Entity_HeartBlock_Script = { + es_SetCallback(entity_HeartBlock_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_start_script) + es_Call(entity_block_hit_init_scale) + es_SetCallback(entity_block_hit_animate_scale, 6) + es_Restart + es_End +}; + +EntityModelScript Entity_HeartBlockContent_RenderScriptIdle = STANDARD_ENTITY_MODEL_SCRIPT(Entity_HeartBlockContent_RenderHeartSleeping, RENDER_MODE_ALPHATEST); +EntityModelScript Entity_HeartBlockContent_RenderScriptHit = STANDARD_ENTITY_MODEL_SCRIPT(Entity_HeartBlockContent_RenderHeartAwake, RENDER_MODE_SURFACE_XLU_LAYER2); +EntityModelScript Entity_HeartBlockContent_RenderScriptAfterHit = STANDARD_ENTITY_MODEL_SCRIPT(Entity_HeartBlockContent_RenderHeartHappy, RENDER_MODE_SURFACE_XLU_LAYER2); +EntityModelScript Entity_HeartBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_HeartBlock_Render, RENDER_MODE_SURFACE_XLU_LAYER3); + +EntityBlueprint Entity_HeartBlockFrame = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HeartBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_block_init, + .updateEntityScript = Entity_InertBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(HeartBlock) }, + .entityType = ENTITY_TYPE_HEALING_BLOCK_FRAME, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HeartBlockContent = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .typeDataSize = sizeof(HeartBlockContentData), + .renderCommandList = Entity_HeartBlockContent_RenderScriptIdle, + .modelAnimationNodes = 0, + .fpInit = entity_HeartBlockContent_init, + .updateEntityScript = Entity_HeartBlockContent_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(HeartBlockContent) }, + .entityType = ENTITY_TYPE_HEALING_BLOCK_CONTENT, + .aabbSize = { 18, 6, 18 } +}; + +EntityBlueprint Entity_HeartBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HeartBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_HeartBlock_init, + .updateEntityScript = Entity_HeartBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(HeartBlock) }, + .entityType = ENTITY_TYPE_HEALING_BLOCK, + .aabbSize = { 25, 25, 25 } +}; diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c new file mode 100644 index 0000000000..f41f657c0c --- /dev/null +++ b/src/entity/HiddenPanel.c @@ -0,0 +1,372 @@ +#include "common.h" +#include "ld_addrs.h" +#include "entity.h" + +s32 entity_HiddenPanel_is_item_on_top(Entity*); +void entity_HiddenPanel_flip_over(Entity*); + +void mdl_project_tex_coords(s32 modelID, Gfx* destGfx, Matrix4f destMtx, void* destVertices); +s32 npc_find_standing_on_entity(s32 entityIndex); + +extern s32 Entity_HiddenPanel_RenderScript2[]; + +extern Gfx Entity_HiddenPanel_RenderTop[]; +extern Gfx Entity_HiddenPanel_RenderTop2[]; +extern Gfx Entity_HiddenPanel_RenderBottomDark[]; +extern Gfx Entity_HiddenPanel_Render[]; +extern Gfx Entity_HiddenPanel_Render2[]; + +void entity_HiddenPanel_setupGfx(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + Matrix4f sp10; + Matrix4f sp50; + + if (entity->position.y != data->initialY) { + guMtxIdentF(sp10); + guTranslateF(sp50, entity->position.x, data->initialY + 1.0f, entity->position.z); + guMtxCatF(sp50, sp10, sp50); + guMtxF2L(sp50, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, ENTITY_ADDR(entity, Gfx*, Entity_HiddenPanel_RenderBottomDark)); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } + mdl_project_tex_coords(data->modelID, data->renderDList, data->entityMatrix, entity->gfxBaseAddr); + mdl_draw_hidden_panel_surface(&gMasterGfxPos, data->modelID); +} + +void entity_HiddenPanel_set_ispy_notification(Entity* entity) { + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + + if (is_ability_active(ABILITY_I_SPY) && !get_global_flag(data->pickupVar) && !D_8015A578.unk_02) { + D_8015A578.unk_02 = TRUE; + } +} + +void entity_HiddenPanel_hide(Entity* entity) { + entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAGS_HIDDEN; +} + +void entity_HiddenPanel_idle(Entity* entity) { + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + s32 distToPlayer; + + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + if (!data->unk_04) { + data->unk_04 = TRUE; + func_800EF3D4(1); + } + } else { + data->unk_04 = FALSE; + } + + data->standingNpcIndex = -1; + data->npcFlags = 0; + + if (D_8015A578.unk_00 && fabs(D_8015A578.unk_08 - entity->position.y) <= 10.0) { + data->state = 10; + distToPlayer = get_xz_dist_to_player(entity->position.x, entity->position.z); + if (distToPlayer <= 100) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + data->riseVelocity = 0.5f; + exec_entity_commandlist(entity); + } else if (entity_HiddenPanel_is_item_on_top(entity)) { + data->riseVelocity = 0.5f; + exec_entity_commandlist(entity); + } else { + s32 npcIndex = npc_find_standing_on_entity(entity->listIndex); + if (npcIndex >= 0) { + Npc* npc = get_npc_by_index(npcIndex); + dist2D(entity->position.x, entity->position.z, npc->pos.x, npc->pos.z); + data->standingNpcIndex = npcIndex; + data->npcFlags = npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT); + npc->flags &= ~NPC_FLAG_ENABLE_HIT_SCRIPT; + npc->flags |= NPC_FLAG_GRAVITY; + data->riseVelocity = 0.5f; + exec_entity_commandlist(entity); + } else { + entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + if (distToPlayer > 60) { + data->riseVelocity = 0.5f; + exec_entity_commandlist(entity); + } else { + data->state = 0; + data->riseVelocity = 10.0f; + exec_entity_commandlist(entity); + } + } + } + } + } +} + +void entity_HiddenPanel_flip_over(Entity* entity) { + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + f32 yaw; + f32 rotAngle; + s32 flipAxis; + + yaw = clamp_angle(gCameras[CAM_DEFAULT].currentYaw + 45.0f); + if (yaw < 90.0f || yaw >= 180.0f && yaw < 270.0f) { + rotAngle = entity->rotation.z; + flipAxis = 1; + } else { + rotAngle = entity->rotation.x; + flipAxis = 0; + } + + switch (data->state) { + case 0: + sfx_play_sound(SOUND_20AB); + data->state = 1; + data->unk_02 = TRUE; + data->riseInterpPhase = 90.0f; + data->rotationSpeed = 65.0f; + set_time_freeze_mode(TIME_FREEZE_PARTIAL); + disable_player_static_collisions(); + gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_800; + if (data->needSpawnItem) { + data->needSpawnItem = FALSE; + data->spawnedItemIndex = make_item_entity_nodelay(data->itemID, entity->position.x, entity->position.y + 2.0, entity->position.z, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, data->pickupVar); + } + entity->flags &= ~ENTITY_FLAGS_HIDDEN; + break; + case 1: + entity->position.y += data->riseVelocity * sin_rad(data->riseInterpPhase * TAU / 360.0f); + if (entity->position.y <= data->initialY) { + entity->position.y = data->initialY; + entity->rotation.x = 0.0f; + entity->rotation.z = 0.0f; + rotAngle = 0.0f; + data->timer = 10; + } + + data->riseInterpPhase += 10.0f; + if (data->riseInterpPhase >= 180.0f) { + data->riseInterpPhase = 180.0f; + data->timer = 7; + data->state++; + } + + if (data->riseInterpPhase > 110.0f) { + rotAngle += data->rotationSpeed; + if (rotAngle >= 360.0f) { + rotAngle -= 360.0f; + } + } + break; + case 2: + data->rotationSpeed -= 2.0f; + if (data->rotationSpeed <= 0.0f) { + data->rotationSpeed = 0.0f; + } + + rotAngle += data->rotationSpeed; + if (rotAngle >= 360.0f) { + rotAngle -= 360.0f; + } + + if (--data->timer <= 0) { + data->state++; + } + break; + case 3: + data->rotationSpeed -= 5.0f; + if (data->rotationSpeed <= 0.0f) { + data->rotationSpeed = 0.0f; + } + + rotAngle += data->rotationSpeed; + if (rotAngle >= 360.0f) { + rotAngle = 360.0f; + } + + entity->position.y += data->riseVelocity * sin_rad(data->riseInterpPhase * TAU / 360.0f); + data->riseInterpPhase += 10.0f; + if (data->riseInterpPhase > 270.0f) { + data->riseInterpPhase = 270.0f; + } + + if (entity->position.y <= data->initialY) { + data->state++; + + entity->position.y = data->initialY; + entity->rotation.x = 0.0f; + entity->rotation.z = 0.0f; + rotAngle = 0.0f; + data->timer = 10; + exec_ShakeCamX(CAM_DEFAULT, CAM_SHAKE_DECAYING_VERTICAL, 1, 0.2f); + sfx_play_sound(SOUND_20AC); + } + break; + case 4: + data->state++; + break; + case 5: + data->state = 11; + entity->position.y += 2.0f; + break; + case 10: + entity->flags &= ~ENTITY_FLAGS_HIDDEN; + data->unk_02 = FALSE; + data->state++; + entity->position.y += 6.0f; + break; + case 11: + entity->position.y -= 1.0f; + if (entity->position.y <= data->initialY) { + entity->position.y = data->initialY; + data->timer = 1; + data->state++; + entity->flags |= ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DISABLE_COLLISION; + if (data->unk_02) { + enable_player_static_collisions(); + } + } + break; + case 12: + data->timer--; + if (data->timer < 0) { + data->state = 0; + exec_entity_commandlist(entity); + if (data->unk_02) { + set_time_freeze_mode(TIME_FREEZE_NORMAL); + gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_800; + } + entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; + if (data->standingNpcIndex >= 0) { + Npc* npc = get_npc_by_index(data->standingNpcIndex); + npc->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT); + npc->flags |= data->npcFlags; + } + } + break; + } + + if (flipAxis == 0) { + entity->rotation.x = rotAngle; + } else { + entity->rotation.z = rotAngle; + } + + if (data->spawnedItemIndex >= 0) { + ItemEntity* itemEntity = get_item_entity(data->spawnedItemIndex); + if (itemEntity != NULL) { + if (itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + data->spawnedItemPos.x = itemEntity->position.x; + data->spawnedItemPos.y = itemEntity->position.y; + data->spawnedItemPos.z = itemEntity->position.z; + } else { + data->spawnedItemPos.x = 0x8000; + data->spawnedItemPos.y = 0x8000; + data->spawnedItemPos.z = 0x8000; + } + } else { + data->spawnedItemIndex = -1; + } + } +} + +s32 entity_HiddenPanel_is_item_on_top(Entity* entity) { + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + + if (data->spawnedItemIndex >= 0) { + ItemEntity* itemEntity = get_item_entity(data->spawnedItemIndex); + if (itemEntity != NULL) { + if (itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + if (fabs(entity->position.x - data->spawnedItemPos.x) <= 34.0) { + if (fabs(entity->position.z - data->spawnedItemPos.z) <= 34.0) { + return TRUE; + } + } + } + } + } + + return FALSE; +} + +void entity_HiddenPanel_init(Entity* entity) { + HiddenPanelData* data = entity->dataBuf.hiddenPanel; + Matrix4f sp18; + Matrix4f sp58; + Gfx* dlist; + + mem_clear(&D_8015A578, sizeof(D_8015A578)); + entity->renderSetupFunc = entity_HiddenPanel_setupGfx; + data->pickupVar = 0xFFFF; + data->initialY = entity->position.y; + data->modelID = CreateEntityVarArgBuffer[0]; + data->itemID = CreateEntityVarArgBuffer[1]; + data->needSpawnItem = TRUE; + data->spawnedItemIndex = -1; + + if (data->itemID == 0) { + data->itemID = ITEM_STAR_PIECE; + } + + guMtxIdentF(data->entityMatrix); + guTranslateF(sp18, entity->position.x, entity->position.y, entity->position.z); + guRotateF(sp58, entity->rotation.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, entity->rotation.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, entity->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guScaleF(sp58, entity->scale.x, entity->scale.y, entity->scale.z); + guMtxCatF(sp58, sp18, data->entityMatrix); + + if (D_8015A578.unk_01 & 1) { + dlist = Entity_HiddenPanel_RenderTop2; + entity_set_render_script(entity, Entity_HiddenPanel_RenderScript2); + } else { + dlist = Entity_HiddenPanel_RenderTop; + } + data->renderDList = ENTITY_ADDR(entity, Gfx*, dlist); + + mdl_project_tex_coords(data->modelID, data->renderDList, data->entityMatrix, entity->gfxBaseAddr); + D_8015A578.unk_01++; +} + +EntityScript Entity_HiddenPanel_Script = { + es_Call(entity_HiddenPanel_set_ispy_notification) + es_Label(1) + es_Call(entity_HiddenPanel_hide) + es_SetCallback(entity_HiddenPanel_idle, 0) + es_SetCallback(entity_HiddenPanel_flip_over, 0) + es_Goto(1) + es_End +}; + +EntityModelScript Entity_HiddenPanel_RenderScript = { + ems_SetRenderMode(RENDER_MODE_SURFACE_OPA) + ems_SetFlags(ENTITY_MODEL_FLAGS_10000) + ems_Draw(Entity_HiddenPanel_Render, 60) + ems_Restart + ems_End +}; + +EntityModelScript Entity_HiddenPanel_RenderScript2 = { + ems_SetRenderMode(RENDER_MODE_SURFACE_OPA) + ems_SetFlags(ENTITY_MODEL_FLAGS_10000) + ems_Draw(Entity_HiddenPanel_Render2, 60) + ems_Restart + ems_End +}; + +EntityBlueprint Entity_HiddenPanel = { + .flags = ENTITY_FLAGS_HIDDEN, + .typeDataSize = sizeof(HiddenPanelData), + .renderCommandList = Entity_HiddenPanel_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_HiddenPanel_init, + .updateEntityScript = Entity_HiddenPanel_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(HiddenPanel) }, + .entityType = ENTITY_TYPE_HIDDEN_PANEL, + .aabbSize = { 60, 0, 60 } +}; + +//TODO remove this +static const f32 rodata_alignment[] = {0.0f, 0.0f}; diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 658248d7ab..04c9364a3c 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -1,5 +1,27 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "animation_script.h" +#include "entity.h" + +extern Gfx Entity_YellowBlock_Render[]; +extern Gfx Entity_RedBlock_Render[]; +extern AnimScript Entity_HitYellowBlock_AnimationHit; +extern AnimScript Entity_HitYellowBlock_AnimationIdle; +extern StaticAnimatorNode* Entity_HitYellowBlock_Mesh[]; +extern AnimScript Entity_HitFloatingYellowBlock_AnimationIdle; +extern StaticAnimatorNode* Entity_HitFloatingYellowBlock_Mesh[]; +extern AnimScript Entity_HitRedBlock_AnimationHit; +extern StaticAnimatorNode* Entity_HitRedBlock_Mesh[]; + +extern EntityBlueprint Entity_HitGroundedYellowBlock; +extern EntityBlueprint Entity_HitFloatingYellowBlock; +extern EntityBlueprint Entity_HitRedBlock; + +f32 player_get_camera_facing_angle(void); +void entity_inactive_block_hit_init(Entity*); +void entity_inactive_block_hit_anim(Entity*); +void entity_inactive_block_recoil_anim(Entity*); void entity_ItemBlock_idle(Entity* entity) { entity_base_block_idle(entity); @@ -8,7 +30,7 @@ void entity_ItemBlock_idle(Entity* entity) { void entity_HiddenItemBlock_idle(Entity* entity) { s32 alpha = entity->alpha; - if (gPlayerStatus.animFlags & 1) { + if (gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT) { alpha += 32; if (alpha > 192) { alpha = 192; @@ -23,9 +45,34 @@ void entity_HiddenItemBlock_idle(Entity* entity) { } } -INCLUDE_ASM(s32, "entity/ItemBlock", entity_HitItemBlock_appear); +void entity_HitItemBlock_appear(Entity* entity) { + if (entity->alpha < 255) { + entity->alpha += (entity->alpha == 0 ? 31 : 32); + } +} -INCLUDE_ASM(void, "entity/ItemBlock", entity_ItemBlock_spawn_item, Entity* entity); +void entity_ItemBlock_spawn_item(Entity* entity) { + BlockData* data = entity->dataBuf.block; + s32 facingAngle; + + if (data->item == 0 || (entity->flags & ENTITY_FLAGS_100000)) { + return; + } + + facingAngle = player_get_camera_facing_angle(); + entity->flags |= ENTITY_FLAGS_100000; + + if (data->item == ITEM_COIN) { + make_item_entity(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, + ITEM_SPAWN_MODE_ITEM_BLOCK_COIN, 0, facingAngle, data->gameFlagIndex); + } else { + facingAngle += 360; + make_item_entity(data->item, entity->position.x, entity->position.y + 20.0, entity->position.z, + (gItemTable[data->item].typeFlags & ITEM_TYPE_FLAG_BADGE) ? ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE : ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM, + 0, facingAngle, data->gameFlagIndex); + } + +} void entity_TriggerBlock_start_bound_script_2(Entity* entity) { entity_start_script(entity); @@ -39,36 +86,36 @@ void entity_HitItemBlock_play_anim(Entity* entity) { s32 entityType = get_entity_type(entity->listIndex); if (entityType == ENTITY_TYPE_HIDDEN_RED_BLOCK || entityType == ENTITY_TYPE_RED_BLOCK) { - play_model_animation(entity->virtualModelIndex, &D_00000094); + play_model_animation(entity->virtualModelIndex, Entity_HitRedBlock_AnimationHit); } else { - play_model_animation(entity->virtualModelIndex, &D_00000094_2); + play_model_animation(entity->virtualModelIndex, Entity_HitYellowBlock_AnimationHit); } } void entity_HitItemBlock_show_inactive(Entity* entity) { Entity* inertEntity; Shadow* inertShadow; - ItemBlockData* data = entity->dataBuf.itemBlock; + BlockData* data = entity->dataBuf.block; inertEntity = get_entity_by_index(data->childEntityIndex); inertEntity->flags &= ~ENTITY_FLAGS_HIDDEN; inertShadow = get_shadow_by_index(inertEntity->shadowIndex); - inertShadow->flags &= ~SHADOW_FLAGS_HIDDEN; + inertShadow->flags &= ~ENTITY_FLAGS_HIDDEN; } void entity_ItemBlock_check_if_inactive(Entity* entity) { - ItemBlockData* data = entity->dataBuf.itemBlock; + BlockData* data = entity->dataBuf.block; if ((data->gameFlagIndex != 0xFFFF) && get_global_flag(data->gameFlagIndex)) { - UNK_PTR bp; + EntityBlueprint* bp; if (get_entity_type(entity->listIndex) != ENTITY_TYPE_RED_BLOCK) { bp = &Entity_InertYellowBlock; } else { bp = &Entity_InertRedBlock; } - create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); - set_entity_commandlist(entity, &D_802EA310); + create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); + set_entity_commandlist(entity, D_802EA310); } else { exec_entity_commandlist(entity); } @@ -82,7 +129,7 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { s32 childEntityIndex; s32 isBlockOnGround; s32 parentEntityType; - ItemBlockData* childData; + BlockData* childData; Entity* childEntity; Shadow* shadow; @@ -94,7 +141,7 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { } // this child entity is the inert block - childEntityIndex = create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END); + childEntityIndex = create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); childEntity = get_entity_by_index(childEntityIndex); childEntity->flags |= ENTITY_FLAGS_HIDDEN; @@ -107,7 +154,7 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { } shadow = get_shadow_by_index(childEntity->shadowIndex); - shadow->flags |= (SHADOW_FLAGS_POSITION_DIRTY | SHADOW_FLAGS_HIDDEN); + shadow->flags |= (ENTITY_FLAGS_SHADOW_POS_DIRTY | ENTITY_FLAGS_HIDDEN); isBlockOnGround = is_block_on_ground(entity); parentEntityType = get_entity_type(entity->listIndex); @@ -120,34 +167,34 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { } // child entity is now the animated block which appears before it turns inert - childEntity = get_entity_by_index(create_entity(bp, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, MAKE_ENTITY_END)); + childEntity = get_entity_by_index(create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END)); childEntity->alpha = entity->alpha; - if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) { - childEntity->alpha = 0x20; + if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 255)) { + childEntity->alpha = 32; } if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; } - childData = childEntity->dataBuf.itemBlock; + childData = childEntity->dataBuf.block; childData->childEntityIndex = childEntityIndex; if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; } - entity->flags &= ~ENTITY_FLAGS_100; + entity->flags &= ~ENTITY_FLAGS_HAS_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= (SHADOW_FLAGS_FADING_AWAY | SHADOW_FLAGS_HIDDEN); + shadow->flags |= (ENTITY_FLAGS_FADING_AWAY | ENTITY_FLAGS_HIDDEN); shadow = get_shadow_by_index(childEntity->shadowIndex); - shadow->flags |= SHADOW_FLAGS_POSITION_DIRTY; + shadow->flags |= ENTITY_FLAGS_SHADOW_POS_DIRTY; } void entity_HitItemBlock_hide(Entity* entity) { entity->flags |= ENTITY_FLAGS_HIDDEN; - entity->flags &= ~ENTITY_FLAGS_100; - get_shadow_by_index(entity->shadowIndex)->flags |= (SHADOW_FLAGS_HIDDEN | SHADOW_FLAGS_FADING_AWAY); + entity->flags &= ~ENTITY_FLAGS_HAS_SHADOW; + get_shadow_by_index(entity->shadowIndex)->flags |= (ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_FADING_AWAY); } s32 entity_TriggerBlock_start_bound_script(Entity* entity) { @@ -162,7 +209,7 @@ void entity_TriggerBlock_disable_player_input(void) { disable_player_input(); gPlayerStatus.currentSpeed = 0.0f; gPlayerStatus.flags |= PLAYER_STATUS_FLAGS_800000; - set_action_state(8); + set_action_state(ACTION_STATE_FALLING); gravity_use_fall_parms(); } @@ -189,11 +236,11 @@ void entity_ItemBlock_setupGfx(s32 entityIndex) { } void entity_ItemBlock_init(Entity* entity) { - ItemBlockData* data; + BlockData* data; entity_base_block_init(entity); - data = entity->dataBuf.itemBlock; - data->itemID = *CreateEntityVarArgBuffer; + data = entity->dataBuf.block; + data->item = CreateEntityVarArgBuffer[0]; data->gameFlagIndex = 0xFFFF; entity->renderSetupFunc = entity_ItemBlock_setupGfx; } @@ -212,3 +259,177 @@ void entity_ItemlessBlock_init(Entity* entity) { animator->renderMode = 0x11; animator->flags |= 0x10000; } + +EntityScript D_802EA310 = { + es_SetCallback(NULL, 2) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_ItemBlock_Script = { + es_Call(entity_ItemBlock_check_if_inactive) + es_SetCallback(NULL, 0) + es_SetCallback(entity_ItemBlock_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_ItemBlock_spawn_item) + es_Call(entity_ItemBlock_replace_with_inactive) + es_SetCallback(NULL, 1) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 2) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; +EntityScript Entity_HiddenItemBlock_Script = { + es_Call(entity_ItemBlock_check_if_inactive) + es_SetCallback(NULL, 0) + es_SetCallback(entity_HiddenItemBlock_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_ItemBlock_spawn_item) + es_Call(entity_ItemBlock_replace_with_inactive) + es_SetCallback(NULL, 1) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 2) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; +EntityScript Entity_HitBlock_Script = { + es_SetCallback(NULL, 1) + es_Call(entity_HitItemBlock_play_anim) + es_SetCallback(entity_HitItemBlock_appear, 10) + es_Call(entity_HitItemBlock_hide) + es_Call(entity_HitItemBlock_show_inactive) + es_SetCallback(NULL, 1) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_PENDING_FULL_DELETE) + es_End +}; +EntityScript Entity_TriggerBlock_Script = { + es_SetCallback(entity_ItemBlock_idle, 0) + es_Call(entity_TriggerBlock_disable_player_input) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_TriggerBlock_play_vanish_effect) + es_Call(entity_inactive_block_hit_init) + es_SetCallback(entity_inactive_block_hit_anim, 0) + es_SetCallback(entity_inactive_block_recoil_anim, 0) + es_Call(entity_TriggerBlock_start_bound_script) + es_Call(entity_TriggerBlock_enable_player_input) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_Call(entity_TriggerBlock_start_bound_script_2) + es_SetCallback(NULL, 2) + es_SetFlags(ENTITY_FLAGS_PENDING_FULL_DELETE) + es_End +}; + +DmaEntry Entity_HitYellowBlock_dma[] = { ENTITY_ROM(HitYellowBlock_gfx), ENTITY_ROM(HitYellowBlock_anim) }; +DmaEntry Entity_HitFloatinYellowBlock_dma[] = { ENTITY_ROM(HitFloatingYellowBlock_gfx), ENTITY_ROM(HitFloatingYellowBlock_anim) }; +DmaEntry Entity_HitRedBlock_dma[] = { ENTITY_ROM(HitRedBlock_gfx), ENTITY_ROM(HitRedBlock_anim) }; + +EntityModelScript Entity_YellowBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_YellowBlock_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_HiddenYellowBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_YellowBlock_Render, RENDER_MODE_SURFACE_XLU_LAYER2); +EntityModelScript Entity_RedBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RedBlock_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_HiddenRedBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RedBlock_Render, RENDER_MODE_SURFACE_XLU_LAYER2); + +EntityBlueprint Entity_YellowBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_YellowBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_ItemBlock_init, + .updateEntityScript = Entity_ItemBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(YellowBlock) }, + .entityType = ENTITY_TYPE_YELLOW_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HiddenYellowBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HiddenYellowBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_HiddenItemBlock_init, + .updateEntityScript = Entity_HiddenItemBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(YellowBlock) }, + .entityType = ENTITY_TYPE_HIDDEN_YELLOW_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_RedBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_RedBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_ItemBlock_init, + .updateEntityScript = Entity_ItemBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(RedBlock) }, + .entityType = ENTITY_TYPE_RED_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HiddenRedBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HiddenRedBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_HiddenItemBlock_init, + .updateEntityScript = Entity_HiddenItemBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(RedBlock) }, + .entityType = ENTITY_TYPE_HIDDEN_RED_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_TriggerBlock = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HitYellowBlock_AnimationIdle, + .modelAnimationNodes = Entity_HitYellowBlock_Mesh, + .fpInit = entity_ItemlessBlock_init, + .updateEntityScript = Entity_TriggerBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dmaList = Entity_HitYellowBlock_dma }, + .entityType = ENTITY_TYPE_SINGLE_TRIGGER_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HitGroundedYellowBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HitYellowBlock_AnimationIdle, + .modelAnimationNodes = Entity_HitYellowBlock_Mesh, + .fpInit = entity_ItemlessBlock_init, + .updateEntityScript = Entity_HitBlock_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_HitYellowBlock_dma }, + .entityType = ENTITY_TYPE_YELLOW_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HitFloatingYellowBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HitFloatingYellowBlock_AnimationIdle, + .modelAnimationNodes = Entity_HitFloatingYellowBlock_Mesh, + .fpInit = entity_ItemlessBlock_init, + .updateEntityScript = Entity_HitBlock_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_HitFloatinYellowBlock_dma }, + .entityType = ENTITY_TYPE_YELLOW_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_HitRedBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_HitRedBlock_AnimationHit, + .modelAnimationNodes = Entity_HitRedBlock_Mesh, + .fpInit = entity_ItemlessBlock_init, + .updateEntityScript = Entity_HitBlock_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_HitRedBlock_dma }, + .entityType = ENTITY_TYPE_RED_BLOCK, + .aabbSize = { 25, 25, 25 } +}; diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 7dccbfc56f..028fa24f9d 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -1,23 +1,52 @@ #include "common.h" #include "fio.h" +#include "ld_addrs.h" +#include "entity.h" -void entity_SaveBlock_setupGfx(); +extern Mtx Entity_SaveBlock_Mtx; +extern Gfx Entity_SaveBlock_RenderContent[]; +extern Gfx Entity_SaveBlock_RenderBlock[]; +extern Gfx Entity_SaveBlock_RenderNone[]; -void entity_Shadow_init(Shadow* shadow) { - shadow->scale.x = 0.1f; - shadow->scale.y = 0.1f; - shadow->scale.z = 0.1f; +extern s32 Entity_SaveBlock_ScriptResume[]; + +void entity_SaveBlock_setupGfx(s32 index) { + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(index); + SaveBlockData* blockData = entity->dataBuf.saveBlock; + Matrix4f sp18; + Matrix4f sp58; + Gfx* dlist; + + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_SaveBlock_Mtx)); + sp18[3][1] += 12.5f; + guRotateF(sp58, blockData->angle, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp58); + guMtxF2L(sp58, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128); + gSPDisplayList(gfxPos++, Entity_SaveBlock_RenderContent); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + dlist = ENTITY_ADDR(entity, Gfx*, Entity_SaveBlock_RenderBlock); + guMtxL2F(sp58, ENTITY_ADDR(entity, Mtx*, &Entity_SaveBlock_Mtx)); + sp58[3][1] += 12.5f; + gDPPipeSync(gfxPos++); + guMtxF2L(sp58, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, G_RM_AA_XLU_SURF | Z_CMP, G_RM_AA_XLU_SURF2 | Z_CMP); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128); + gSPDisplayList(gfxPos++, dlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + gMasterGfxPos = gfxPos; } -s32 entity_can_collide_with_jumping_player(Entity* entity) { - if ((entity->collisionFlags & 4) && (gPlayerStatus.flags & 2)) { - return TRUE; - } - return FALSE; -} - -INCLUDE_ASM(s32, "entity/SaveBlock", entity_SaveBlock_setupGfx); - void entity_SaveBlock_idle(Entity* entity) { SaveBlockData* data; @@ -83,7 +112,7 @@ void entity_SaveBlock_wait_for_close_result(Entity* entity) { void entity_SaveBlock_wait_for_close_choice(Entity* entity) { if (SaveBlockTutorialPrinterClosed) { if (SaveBlockTutorialPrinter->currentOption == 1) { - set_entity_commandlist(entity, &D_802E99DC); + set_entity_commandlist(entity, Entity_SaveBlock_ScriptResume); } else { exec_entity_commandlist(entity); } @@ -98,3 +127,45 @@ void entity_SaveBlock_init(Entity* entity) { entity->renderSetupFunc = entity_SaveBlock_setupGfx; data->angle = 8; } + +EntityScript Entity_SaveBlock_Script = { + es_SetCallback(entity_SaveBlock_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_SaveBlock_pause_game) + es_Call(entity_block_hit_init_scale) + es_SetCallback(entity_block_hit_animate_scale, 6) + es_SetCallback(NULL, 2) + es_Call(entity_SaveBlock_show_tutorial_message) + es_SetCallback(entity_SaveBlock_wait_for_close_tutorial, 0) + es_SetCallback(NULL, 14) + es_Call(entity_SaveBlock_show_choice_message) + es_SetCallback(entity_SaveBlock_wait_for_close_choice, 0) + es_Call(entity_SaveBlock_save_data) + es_Call(entity_SaveBlock_show_result_message) + es_SetCallback(entity_SaveBlock_wait_for_close_result, 0) + es_Call(entity_SaveBlock_resume_game) + es_SetCallback(NULL, 12) + es_Restart + es_End +}; +EntityScript Entity_SaveBlock_ScriptResume = { + es_Call(entity_SaveBlock_resume_game) + es_SetCallback(NULL, 2) + es_Jump(Entity_SaveBlock_Script) + es_End +}; + +EntityModelScript Entity_SaveBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_SaveBlock_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER3); + +EntityBlueprint Entity_SavePoint = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(SaveBlockData), + .renderCommandList = Entity_SaveBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_SaveBlock_init, + .updateEntityScript = Entity_SaveBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(SaveBlock) }, + .entityType = ENTITY_TYPE_SAVE_POINT, + .aabbSize = { 25, 25, 25 } +}; diff --git a/src/entity/Shadow.c b/src/entity/Shadow.c new file mode 100644 index 0000000000..3cef3b4f14 --- /dev/null +++ b/src/entity/Shadow.c @@ -0,0 +1,129 @@ +#include "common.h" +#include "entity.h" + +void entity_Shadow_init(Shadow* shadow) { + shadow->scale.x = 0.1f; + shadow->scale.y = 0.1f; + shadow->scale.z = 0.1f; +} + +s32 entity_can_collide_with_jumping_player(Entity* entity) { + if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) && + (gPlayerStatus.flags & PLAYER_STATUS_FLAGS_JUMPING)) { + return TRUE; + } + return FALSE; +} + +#include "entity/shadow/square.png.inc.c" +#include "entity/shadow/circle.png.inc.c" +#include "entity/vtx/shadow1.vtx.inc.c" +#include "entity/vtx/shadow2.vtx.inc.c" +#include "entity/shadow/square_big.png.inc.c" +#include "entity/shadow/circle_big.png.inc.c" + +Gfx Entity_Shadow_GfxCommon[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Gfx Entity_Shadow_LoadTexSquare[] = { + gsSPDisplayList(Entity_Shadow_GfxCommon), + gsDPSetTextureLUT(G_TT_NONE), + gsDPLoadTextureTile_4b(D_802E9170, G_IM_FMT_I, 16, 16, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + +Gfx Entity_Shadow_LoadTexCircle[] = { + gsSPDisplayList(Entity_Shadow_GfxCommon), + gsDPSetTextureLUT(G_TT_NONE), + gsDPLoadTextureTile_4b(D_802E91F0, G_IM_FMT_I, 16, 16, 0, 0, 15, 15, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + +Gfx Entity_RenderSquareShadow[] = { + gsSPDisplayList(Entity_Shadow_LoadTexSquare), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(D_802E92B0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RenderCircularShadow[] = { + gsSPDisplayList(Entity_Shadow_LoadTexCircle), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(D_802E9270, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RenderNone[] = { + gsSPEndDisplayList(), +}; + +EntityModelScript Entity_RenderNone_Script = { + ems_Draw(Entity_RenderNone, 60) + ems_Restart + ems_End +}; + +//TODO split files +s32 D_802E9844_padding[] = { 0, 0, 0}; + +EntityModelScript Entity_CircularShadowA_Render = { + ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetRenderMode(RENDER_MODE_SHADOW) + ems_Draw(Entity_RenderCircularShadow, 60) + ems_Restart + ems_End +}; + +EntityModelScript Entity_CircularShadowB_Render = { + ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetRenderMode(RENDER_MODE_SHADOW) + ems_Draw(Entity_RenderCircularShadow, 60) + ems_Restart + ems_End +}; + +EntityModelScript Entity_SquareShadow_Render = { + ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetRenderMode(RENDER_MODE_SHADOW) + ems_Draw(Entity_RenderSquareShadow, 60) + ems_Restart + ems_End +}; + +ShadowBlueprint CircularShadowA = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .renderCommandList = Entity_CircularShadowA_Render, + .animModelNode = NULL, + .onCreateCallback = entity_Shadow_init, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } +}; + +ShadowBlueprint CircularShadowB = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .renderCommandList = Entity_CircularShadowB_Render, + .animModelNode = NULL, + .onCreateCallback = entity_Shadow_init, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } +}; + +ShadowBlueprint SquareShadow = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .renderCommandList = Entity_SquareShadow_Render, + .animModelNode = NULL, + .onCreateCallback = entity_Shadow_init, + .entityType = ENTITY_TYPE_SHADOW, + .aabbSize = { 25, 10, 25 } +}; diff --git a/src/entity/ShatteringBlock.c b/src/entity/ShatteringBlock.c new file mode 100644 index 0000000000..f757d220c9 --- /dev/null +++ b/src/entity/ShatteringBlock.c @@ -0,0 +1,206 @@ +#include "common.h" +#include "ld_addrs.h" +#include "entity.h" + +extern Mtx Entity_ShatteringHammer1Block_FragmentsMatrices[]; +extern Gfx* Entity_ShatteringHammer1Block_FragmentsRender[]; +extern Mtx Entity_ShatteringHammer2Block_FragmentsMatrices[]; +extern Gfx* Entity_ShatteringHammer2Block_FragmentsRender[]; +extern Mtx Entity_ShatteringHammer3Block_FragmentsMatrices[]; +extern Gfx* Entity_ShatteringHammer3Block_FragmentsRender[]; +extern Mtx Entity_ShatteringBrickBlock_FragmentsMatrices[]; +extern Gfx* Entity_ShatteringBrickBlock_FragmentsRender[]; + +extern Gfx Entity_RenderNone[]; +extern EntityScript Entity_ShatteringBlock_Script; + +void entity_shattering_init_pieces(Entity* entity, Gfx** dlists, Mtx* matrices); +void entity_shattering_block_init(Entity* entity); + +EntityModelScript Entity_ShatteringBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityBlueprint Entity_ShatteringHammer1Block = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK, + .aabbSize = {16, 16, 16} +}; + +EntityBlueprint Entity_ShatteringHammer2Block = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK, + .aabbSize = {16, 16, 16} +}; + +EntityBlueprint Entity_ShatteringHammer3Block = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK, + .aabbSize = {16, 16, 16} +}; + +EntityBlueprint Entity_ShatteringHammer1BlockTiny = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer1Block) }, + .entityType = ENTITY_TYPE_HAMMER1_BLOCK_TINY, + .aabbSize = {8, 8, 8} +}; + +EntityBlueprint Entity_ShatteringHammer2BlockTiny = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer2Block) }, + .entityType = ENTITY_TYPE_HAMMER2_BLOCK_TINY, + .aabbSize = {8, 8, 8} +}; + +EntityBlueprint Entity_ShatteringHammer3BlockTiny = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringHammer3Block) }, + .entityType = ENTITY_TYPE_HAMMER3_BLOCK_TINY, + .aabbSize = {8, 8, 8} +}; + +EntityBlueprint Entity_ShatteringBrickBlock = { + .flags = 0, + .typeDataSize = sizeof(ShatteringBlockData), + .renderCommandList = Entity_ShatteringBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_shattering_block_init, + .updateEntityScript = Entity_ShatteringBlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(ShatteringBrickBlock) }, + .entityType = ENTITY_TYPE_BRICK_BLOCK, + .aabbSize = {8, 8, 8} +}; + +void entity_shattering_block_init(Entity* entity) { + u32 type; + Mtx* fragmentMatrices = NULL; + Gfx** fragmentDisplayLists = NULL; + + entity->dataBuf.shatteringBlock->originalPosY = entity->position.y; + type = get_entity_type(entity->listIndex); + + if (type == ENTITY_TYPE_HAMMER1_BLOCK_TINY || + type == ENTITY_TYPE_HAMMER2_BLOCK_TINY || + type == ENTITY_TYPE_HAMMER3_BLOCK_TINY) + { + entity->scale.x = 0.5f; + entity->scale.y = 0.5f; + entity->scale.z = 0.5f; + } + + switch (type) { + case ENTITY_TYPE_HAMMER1_BLOCK: + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: + fragmentDisplayLists = Entity_ShatteringHammer1Block_FragmentsRender; + fragmentMatrices = Entity_ShatteringHammer1Block_FragmentsMatrices; + break; + case ENTITY_TYPE_HAMMER2_BLOCK: + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: + fragmentDisplayLists = Entity_ShatteringHammer2Block_FragmentsRender; + fragmentMatrices = Entity_ShatteringHammer2Block_FragmentsMatrices; + break; + case ENTITY_TYPE_HAMMER3_BLOCK: + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: + fragmentDisplayLists = Entity_ShatteringHammer3Block_FragmentsRender; + fragmentMatrices = Entity_ShatteringHammer3Block_FragmentsMatrices; + break; + case ENTITY_TYPE_BRICK_BLOCK: + sfx_play_sound_at_position(SOUND_158, 0, entity->position.x, entity->position.y, entity->position.z); + fragmentDisplayLists = Entity_ShatteringBrickBlock_FragmentsRender; + fragmentMatrices = Entity_ShatteringBrickBlock_FragmentsMatrices; + break; + case ENTITY_TYPE_MULTI_COIN_BRICK: + case ENTITY_TYPE_YELLOW_BLOCK: + case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: + case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: + case ENTITY_TYPE_HIDDEN_RED_BLOCK: + case ENTITY_TYPE_INACTIVE_BLOCK: + break; + } + + if (fragmentMatrices == NULL) { + return; + } + + entity_shattering_init_pieces(entity, fragmentDisplayLists, fragmentMatrices); +} + +void entity_breakable_block_create_shattering_entity(Entity* entity) { + EntityBlueprint* bp = NULL; + + switch (get_entity_type(entity->listIndex)) { + case ENTITY_TYPE_HAMMER1_BLOCK: + bp = &Entity_ShatteringHammer1Block; + break; + case ENTITY_TYPE_HAMMER1_BLOCK_TINY: + bp = &Entity_ShatteringHammer1BlockTiny; + break; + case ENTITY_TYPE_HAMMER2_BLOCK: + bp = &Entity_ShatteringHammer2Block; + break; + case ENTITY_TYPE_HAMMER2_BLOCK_TINY: + bp = &Entity_ShatteringHammer2BlockTiny; + break; + case ENTITY_TYPE_HAMMER3_BLOCK: + bp = &Entity_ShatteringHammer3Block; + break; + case ENTITY_TYPE_HAMMER3_BLOCK_TINY: + bp = &Entity_ShatteringHammer3BlockTiny; + break; + case ENTITY_TYPE_BRICK_BLOCK: + bp = &Entity_ShatteringBrickBlock; + break; + case ENTITY_TYPE_MULTI_COIN_BRICK: + case ENTITY_TYPE_YELLOW_BLOCK: + case ENTITY_TYPE_SINGLE_TRIGGER_BLOCK: + case ENTITY_TYPE_HIDDEN_YELLOW_BLOCK: + case ENTITY_TYPE_HIDDEN_RED_BLOCK: + case ENTITY_TYPE_INACTIVE_BLOCK: + break; + } + + if (bp == NULL) { + return; + } + + create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, 0, MAKE_ENTITY_END); +} diff --git a/src/entity/ShatteringBlock_common.c b/src/entity/ShatteringBlock_common.c new file mode 100644 index 0000000000..8e37dc39ea --- /dev/null +++ b/src/entity/ShatteringBlock_common.c @@ -0,0 +1,206 @@ +#include "common.h" +#include "entity.h" + +void entity_shattering_setupGfx(s32 entityIndex); + +void entity_BrickBlock_idle(Entity* entity) { + entity_base_block_idle(entity); +} + +void entity_shattering_init_pieces(Entity* entity, Gfx** dlists, Mtx* matrices) { + ShatteringBlockData* data = entity->dataBuf.shatteringBlock; + s32 s7; + s32 i; + Matrix4f mtxFragment; + Matrix4f mtxTrans; + s32 rotSpeed; + f32 fallSpeed; + + data->fragmentDisplayLists = ENTITY_ADDR(entity, Gfx**, dlists); + entity->renderSetupFunc = entity_shattering_setupGfx; + entity->alpha = 255; + entity->position.y = data->originalPosY; + guTranslateF(mtxTrans, entity->position.x, entity->position.y, entity->position.z); + + s7 = 2; + if (!is_block_on_ground(entity)) { + s7 = 1; + } + + data->fadeOutCounter = 0; + data->alpha = 255; + + for (i = 0; i < 24; i++) { + guMtxL2F(mtxFragment, ENTITY_ADDR(entity, Mtx*, matrices++)); + guMtxCatF(mtxTrans, mtxFragment, mtxFragment); + data->fragmentPosX[i] = mtxFragment[3][0]; + data->fragmentPosY[i] = mtxFragment[3][1]; + data->fragmentPosZ[i] = mtxFragment[3][2]; + data->fragmentMoveAngle[i] = -rand_int(255); + + if (s7 == 1) { + rotSpeed = 20; + fallSpeed = 6.4f; + data->fragmentFlags[i] |= 1; + } else { + rotSpeed = 40; + fallSpeed = 8.6f; + data->fragmentFlags[i] |= 2; + } + rotSpeed += rand_int(10); + data->fragmentRotSpeed[i] = rotSpeed; + if ((i % 2) == 0) { + data->fragmentRotSpeed[i] = -rotSpeed; + } + + data->fragmentFallSpeed[i] = fallSpeed + (f32)(rand_float() * 2.7); + data->fragmentRebounds[i] = 0; + data->fragmentRotX[i] = 0; + data->fragmentRotY[i] = 0; + } +} + +void entity_shattering_idle(Entity* entity) { + ShatteringBlockData* data = entity->dataBuf.shatteringBlock; + f32 rotSpeed = 0.0f; + f32 reboundSpeed = 0.0f; + f32 lateralSpeed = 0.0f; + f32 angle; + s32 i; + f32 sinTheta; + f32 cosTheta; + f32 hitX, hitY, hitZ, hitDepth; + + for (i = 0; i < 24; i++) { + switch (data->fragmentRebounds[i]) { + case 0: + if (data->fragmentFlags[i] & 1) { + lateralSpeed = 1.5f; + } else { + lateralSpeed = 2.4f; + } + reboundSpeed = 6.0f; + rotSpeed = data->fragmentRotSpeed[i]; + break; + case 1: + lateralSpeed = 1.2f; + reboundSpeed = 3.0f; + rotSpeed = data->fragmentRotSpeed[i] >> 2; + break; + case 2: + lateralSpeed = 1.0f; + reboundSpeed = 2.0f; + rotSpeed = data->fragmentRotSpeed[i] >> 2; + if (data->alpha == 0) { + data->fragmentRebounds[i]++; + } + break; + case 3: + data->fragmentPosY[i] -= 0.3; + continue; + } + + data->fragmentFallSpeed[i] -= 1.2; + if (data->fragmentFallSpeed[i] < -12.2) { + data->fragmentFallSpeed[i] = -12.2f; + } + data->fragmentPosY[i] += data->fragmentFallSpeed[i]; + + angle = data->fragmentMoveAngle[i] * 360.0 / 256; + sin_cos_rad(angle * TAU / 360.0f, &sinTheta, &cosTheta); + data->fragmentPosX[i] += lateralSpeed * sinTheta; + data->fragmentPosZ[i] += lateralSpeed * cosTheta; + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + if (npc_test_move_taller_with_slipping(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, lateralSpeed, angle, 8.0f, 8.0f)) { + data->fragmentPosX[i] = hitX; + data->fragmentPosY[i] = hitY; + data->fragmentPosZ[i] = hitZ; + data->fragmentMoveAngle[i] += 0x80; // inverse yaw + + sin_cos_rad(data->fragmentMoveAngle[i] * 360.0 / 256 * TAU / 360.0f, &sinTheta, &cosTheta); + lateralSpeed = 8.0f; + data->fragmentPosX[i] += lateralSpeed * sinTheta; + data->fragmentPosZ[i] += lateralSpeed * cosTheta; + } + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + hitDepth = fabsf(data->fragmentFallSpeed[i]); + if (npc_raycast_down_sides(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, &hitDepth) || hitY < data->originalPosY - 200.0f) { + data->fragmentRebounds[i]++; + data->fragmentPosY[i] = hitY + fabsf(data->fragmentFallSpeed[i]) * 1.2f; + data->fragmentFallSpeed[i] = reboundSpeed; + } + + data->fragmentRotX[i] += rotSpeed; + data->fragmentRotY[i] -= rotSpeed; + } + + data->fadeOutCounter++; + if (data->fadeOutCounter >= 10) { + data->fadeOutCounter = 10; + data->alpha -= 8; + if (data->alpha <= 0) { + data->alpha = 0; + exec_entity_commandlist(entity); + } + } +} + +void entity_shattering_setupGfx(s32 entityIndex) { + s32 i; + Matrix4f mtxTransInv; + Matrix4f mtx; + Matrix4f mtxRotX; + Matrix4f mtxRotY; + f32 x_inv; + f32 y_inv; + f32 z_inv; + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + ShatteringBlockData* data = entity->dataBuf.shatteringBlock; + Gfx* fragmentDlist; + Gfx** gfx = data->fragmentDisplayLists; + + x_inv = -entity->position.x; + y_inv = -entity->position.y; + z_inv = -entity->position.z; + + for (i = 0; i < 24; i++) { + if (data->alpha == 255) { + gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + } else { + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->alpha); + } + + guTranslateF(mtxTransInv, x_inv, y_inv, z_inv); + guRotateF(mtxRotX, data->fragmentRotX[i] * 360.0f * 0.00390625f, 1.0f, 0.0f, 0.0f); + guRotateF(mtxRotY, data->fragmentRotY[i] * 360.0f * 0.00390625f, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxRotX, mtxRotY, mtxRotY); + guMtxCatF(mtxRotY, mtxTransInv, mtxTransInv); + guTranslateF(mtx, data->fragmentPosX[i], data->fragmentPosY[i], data->fragmentPosZ[i]); + guMtxCatF(mtxTransInv, mtx, mtx); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + fragmentDlist = ENTITY_ADDR(entity, Gfx*, *gfx++); + gSPDisplayList(gfxPos++, fragmentDlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + } + + gMasterGfxPos = gfxPos; +} + +EntityScript Entity_ShatteringBlock_Script = { + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetCallback(entity_shattering_idle, 0) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; diff --git a/src/entity/Signpost.c b/src/entity/Signpost.c index 6023352e36..379d503e76 100644 --- a/src/entity/Signpost.c +++ b/src/entity/Signpost.c @@ -1,13 +1,17 @@ #include "common.h" +#include "ld_addrs.h" +#include "entity.h" + +extern Gfx Entity_Signpost_Render[]; void entity_Signpost_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if (!(playerStatus->animFlags & 1) && !(entity->collisionFlags & 1) && (val <= 40.0f || val >= 320.0f)) { + if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT) && !(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && (val <= 40.0f || val >= 320.0f)) { entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & 8)) { + if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { entity_start_script(entity); } } else { @@ -15,3 +19,23 @@ void entity_Signpost_idle(Entity* entity) { playerStatus->interactingWithID = -1; } } + +EntityScript Entity_Signpost_Script = { + es_SetCallback(entity_Signpost_idle, 0) + es_End +}; + +EntityModelScript Entity_Signpost_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Signpost_Render, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_Signpost = { + .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(SignpostData), + .renderCommandList = Entity_Signpost_RenderScript, + .modelAnimationNodes = 0x00000000, + .fpInit = NULL, + .updateEntityScript = Entity_Signpost_Script, + .fpHandleCollision = NULL, + {{ entity_model_Signpost_ROM_START, entity_model_Signpost_ROM_END }}, + .entityType = ENTITY_TYPE_SIGNPOST, + .aabbSize = { 40, 50, 20 } +}; diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index d38664d2e6..31e72edf02 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -1,144 +1,113 @@ #include "common.h" +#include "entity.h" +#include "animation_script.h" +#include "ld_addrs.h" -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_ScriptSpring_idle); +extern StaticAnimatorNode* Entity_ScriptSpring_Mesh[]; +extern AnimScript Entity_ScriptSpring_AnimLaunch; +extern AnimScript Entity_ScriptSpring_AnimIdle; +extern StaticAnimatorNode* Entity_SimpleSpring_Mesh[]; +extern AnimScript Entity_SimpleSpring_AnimLaunch; +extern AnimScript Entity_SimpleSpring_AnimIdle; -#ifdef NON_EQUIVALENT +void entity_ScriptSpring_idle(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; -void entity_SimpleSpring_idle(Entity* ent) { - int new_var; - s32 *new_var2; - s32 isRiding; - s32 isColliding; - - new_var2 = ent->dataBuf.unk; - new_var = gPlayerStatus.actionState != ACTION_STATE_RIDE && (ent->collisionFlags & 1) != 0; - if (new_var) { - if ((*new_var2) >= 0x46) { - gPlayerStatus.unk_C5 = 5; + if (playerStatus->actionState != ACTION_STATE_RIDE && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { + playerStatus->unk_C5 = 5; + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_FALLING; + playerStatus->flags |= PLAYER_STATUS_FLAGS_800000; + play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); + if (entity_start_script(entity)) { + set_action_state(ACTION_STATE_USE_SPRING); } - play_model_animation(ent->virtualModelIndex, 0x1E4); - entity_start_script(ent); - exec_entity_commandlist(ent); - sfx_play_sound_at_position(SOUND_2086, 0, ent->position.x, ent->position.y, ent->position.z); - disable_player_input(); - gPlayerStatus.currentSpeed = 0; + exec_entity_commandlist(entity); + sfx_play_sound_at_position(SOUND_2086, 0, entity->position.x, entity->position.y, entity->position.z); } } -#else +void entity_SimpleSpring_idle(Entity* entity) { + SimpleSpringData* data = entity->dataBuf.simpleSpring; + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_SimpleSpring_idle); + if (playerStatus->actionState != ACTION_STATE_RIDE && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { + if (data->launchVelocity >= 70) { + playerStatus->unk_C5 = 5; + } + play_model_animation(entity->virtualModelIndex, Entity_SimpleSpring_AnimLaunch); + entity_start_script(entity); + exec_entity_commandlist(entity); + sfx_play_sound_at_position(SOUND_2086, 0, entity->position.x, entity->position.y, entity->position.z); + disable_player_input(); + playerStatus->currentSpeed = 0; + } +} -#endif - -void entity_SimpleSpring_set_jump_params(Entity* ent) { - SimpleSpringData* data = ent->dataBuf.simpleSpring; +void entity_SimpleSpring_set_jump_params(Entity* entity) { + SimpleSpringData* data = entity->dataBuf.simpleSpring; set_action_state(ACTION_STATE_LAUNCH); - gPlayerStatus.gravityIntegrator[1] = 0; gPlayerStatus.gravityIntegrator[0] = 15.0f; - gPlayerStatus.gravityIntegrator[2] = (f32)data->launchVelocity; - gPlayerStatus.gravityIntegrator[3] = ent->position.y; + gPlayerStatus.gravityIntegrator[1] = 0; + gPlayerStatus.gravityIntegrator[2] = data->launchVelocity; + gPlayerStatus.gravityIntegrator[3] = entity->position.y; } void entity_SimpleSpring_enable_player_input(Entity* ent) { enable_player_input(); } -void entity_ScriptSpring_init(void) { +void entity_ScriptSpring_init(Entity* entity) { } -void entity_SimpleSpring_init(Entity* ent) { - ent->dataBuf.simpleSpring->launchVelocity = *CreateEntityVarArgBuffer; +void entity_SimpleSpring_init(Entity* entity) { + entity->dataBuf.simpleSpring->launchVelocity = CreateEntityVarArgBuffer[0]; } -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_setupGfx); +EntityScript Entity_ScriptSpring_Script = { + es_SetCallback(entity_ScriptSpring_idle, 0) + es_SetCallback(NULL, 10) + es_Restart + es_End +}; -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_set_ispy_notification); +EntityScript Entity_SimpleSpring_Script = { + es_SetCallback(entity_SimpleSpring_idle, 0) + es_SetCallback(NULL, 2) + es_Call(entity_SimpleSpring_set_jump_params) + es_SetCallback(NULL, 3) + es_Call(entity_SimpleSpring_enable_player_input) + es_SetCallback(NULL, 10) + es_Restart + es_End +}; -void entity_HiddenPanel_hide(Entity* ent) { - ent->flags = (ent->flags & ~0x20) | 1; -} +DmaEntry Entity_ScriptSpring_dma[] = { ENTITY_ROM(ScriptSpring_gfx), ENTITY_ROM(ScriptSpring_anim) }; -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_idle); +DmaEntry Entity_SimpleSpring_dma[] = { ENTITY_ROM(SimpleSpring_gfx), ENTITY_ROM(SimpleSpring_anim) }; -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_flip_over); +EntityBlueprint Entity_ScriptSpring = { + .flags = ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = 0, + .renderCommandList = Entity_ScriptSpring_AnimIdle, + .modelAnimationNodes = Entity_ScriptSpring_Mesh, + .fpInit = entity_ScriptSpring_init, + .updateEntityScript = Entity_ScriptSpring_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_ScriptSpring_dma }, + .entityType = ENTITY_TYPE_SCRIPT_SPRING, + .aabbSize = {40, 25, 40} +}; -#ifdef NON_EQUIVALENT - -s32 entity_HiddenPanel_is_item_on_top(Entity* entity) { - ItemEntity* temp_v0; - s32 entityIndex; - s32 *args; - s32 phi_v0; - - args = entity->dataBuf.unk; - entityIndex = args[5]; - phi_v0 = 0; - if ((entityIndex >= 0) && - ((temp_v0 = get_item_entity(entityIndex), (temp_v0 == 0)) - || (((temp_v0->flags & 0x10) != 0) && (fabs((f64) (entity->position.x - (f32) args[6])) <= 34.0) - && (phi_v0 = 1, !(fabs((f64) (entity->position.y - (f32)args[8])) <= 34.0))))) { - - } - return phi_v0; -} - -#else - -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_is_item_on_top); - -#endif - -#ifdef NON_EQUIVALENT - -void entity_HiddenPanel_init(Entity* ent) { - float sp58[4]; - float sp18[4]; - s32* temp_s1; - s32 temp_a1; - s32 temp_v1; - s32* data; - s32 phi_v0; - - data = ent->dataBuf.unk; - mem_clear(&D_8015A578, sizeof(D_8015A578)); - ent->unk3C = &entity_HiddenPanel_setupGfx; - data->unk6 = 0xFFFF; - data->unk24 = (?32) ent->unk4C; - data->unk74 = (u16) CreateEntityVarArgBuffer.unk2; - temp_v1 = CreateEntityVarArgBuffer[1]; - data->unk3 = 1; - data->unk14 = -1; - data->unk10 = temp_v1; - if (temp_v1 == 0) { - data->unk10 = 0x15C; - } - temp_s1 = data + 0x34; - guMtxIdentF(temp_s1); - guTranslateF(&sp18, ent->position.x, ent->position.y, ent->position.z); - guRotateF(&sp58, ent->rotation.y, 0.0f, 1.0f, 0.0f); - guMtxCatF(&sp58, &sp18, &sp18); - guRotateF(&sp58, ent->rotation.x, 1.0f, 0.0f, 0.0f); - guMtxCatF(&sp58, &sp18, &sp18); - guRotateF(&sp58, ent->rotation.z, 0.0f, 0.0f, 1.0f); - guMtxCatF(&sp58, &sp18, &sp18); - guScaleF(&sp58, ent->scale.x, ent->scale.y, ent->scale.z); - guMtxCatF(&sp58, &sp18, temp_s1); - if (D_8015A578.unk_01 & 1) { - entity_set_render_script(ent, &D_802EAAE0); - phi_v0 = 0xA0001B0 & 0xFFFF; - } else { - phi_v0 = 0xA000180 & 0xFFFF; - } - temp_a1 = ent->vertexData + phi_v0; - data->unk78 = temp_a1; - mdl_project_tex_coords(data->unk74, temp_a1, temp_s2 + 0x34, ent->unk44); - D_8015A578.unk_01++; -} - -#else - -INCLUDE_ASM(s32, "entity/SimpleSpring", entity_HiddenPanel_init); - -#endif +EntityBlueprint Entity_SimpleSpring = { + .flags = ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(SimpleSpringData), + .renderCommandList = Entity_SimpleSpring_AnimIdle, + .modelAnimationNodes = Entity_SimpleSpring_Mesh, + .fpInit = entity_SimpleSpring_init, + .updateEntityScript = Entity_SimpleSpring_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_SimpleSpring_dma }, + .entityType = ENTITY_TYPE_SIMPLE_SPRING, + .aabbSize = {40, 25, 40} +}; diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 1e31388f5a..5ad767e297 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -1,9 +1,20 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "entity.h" extern EntityBlueprint Entity_SuperBlockContent; -void entity_SuperBlockContent_setupGfx(); +extern Gfx Entity_SuperBlock_Render[]; +extern Gfx Entity_UltraBlock_Render[]; +extern Gfx Entity_SuperBlockContent_Render[]; +extern Gfx Entity_SuperBlockContent_Render2[]; +extern Gfx Entity_UltraBlockContent_Render[]; +extern Gfx Entity_UltraBlockContent_Render2[]; +extern unsigned char D_0A000200_E4A8A0[]; +extern unsigned char D_0A000220_E4A8C0[]; +extern unsigned char D_0A000240_E4A8E0[]; +extern unsigned char D_0A000260_E4A900[]; f32 entity_SuperBlockContent_get_previous_yaw(SuperBlockContentData* data, s32 lagTime) { s32 bufIdx = data->yawBufferPos - lagTime; @@ -21,7 +32,7 @@ void entity_upgrade_block_hide_content(s32 entityIndex) { if (data->childEntityIndex >= 0) { Entity* childEntity = get_entity_by_index(data->childEntityIndex); SuperBlockContentData* childEntityData = childEntity->dataBuf.superBlockContent; - childEntityData->unk_0A = 1; + childEntityData->isHidden = TRUE; } } @@ -36,7 +47,7 @@ void entity_upgrade_block_check_if_inactive(Entity* entity) { Entity* childEntity; SuperBlockContentData* childData; - parentData->childEntityIndex = create_entity(&Entity_SuperBlockContent, entity->position.x, entity->position.y, entity->position.z, 0.0f, MAKE_ENTITY_END); + parentData->childEntityIndex = create_entity(&Entity_SuperBlockContent, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, 0, MAKE_ENTITY_END); childEntity = get_entity_by_index(parentData->childEntityIndex); childData = childEntity->dataBuf.superBlockContent; childData->parentEntityIndex = entity->listIndex; @@ -69,14 +80,113 @@ void entity_SuperBlockContent_attach_to_parent(Entity* entity) { entity->position.z = parentEntity->position.z; } -// display list func -INCLUDE_ASM(s32, "entity/SuperBlock", entity_SuperBlockContent_setupGfx); +EntityScript Entity_SuperBlock_Script = { + es_Call(entity_upgrade_block_check_if_inactive) + es_Label(1) + es_SetCallback(entity_upgrade_block_idle, 0) + es_PlaySound(SOUND_HIT_BLOCK) + es_Call(entity_block_hit_init_scale) + es_SetCallback(entity_block_hit_animate_scale, 6) + es_Call(entity_start_script) + es_Goto(1) + es_End + es_End +}; + +unsigned char* Entity_SuperBlock_Palettes[] = { + D_0A000200_E4A8A0, + D_0A000220_E4A8C0, + D_0A000240_E4A8E0, + D_0A000260_E4A900 +}; + +s8 Entity_SuperBlock_PalData[] = { + 20, 0, + 2, 1, + 2, 2, + 20, 3, + 2, 2, + 1, 2, + -1, -1, +}; + +void entity_SuperBlockContent_setupGfx(s32 entityIndex) { + Gfx* gfxPos = gMasterGfxPos; + Gfx* dlist; + u8* palette; + Entity* entity = get_entity_by_index(entityIndex); + SuperBlockContentData* data = entity->dataBuf.superBlockContent; + s32 alpha; + Matrix4f sp18; + + if (data->paletteTimer == 0) { + s32 temp = data->paletteArrOffset; + temp += 2; + if (Entity_SuperBlock_PalData[temp] > 0) { + data->paletteTimer = Entity_SuperBlock_PalData[temp]; + data->paletteArrOffset = temp; + } else { + data->paletteTimer = Entity_SuperBlock_PalData[0]; + data->paletteArrOffset = 0; + } + } else { + data->paletteTimer--; + } + + palette = ENTITY_ADDR(entity, u8*, Entity_SuperBlock_Palettes[Entity_SuperBlock_PalData[data->paletteArrOffset + 1]]); + dlist = data->gfx2; + + gDPPipeSync(gfxPos++); + guRotateF(sp18, entity_SuperBlockContent_get_previous_yaw(data, 1), 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &data->unk_10); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_10; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPLoadTLUT_pal16(gfxPos++, 0, palette); + gSPDisplayList(gfxPos++, dlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + alpha = 120; + if (entity->alpha < alpha) { + alpha = entity->alpha; + } + + gDPPipeSync(gfxPos++); + guRotateF(sp18, entity_SuperBlockContent_get_previous_yaw(data, 6), 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &data->unk_50); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_50; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); + gSPDisplayList(gfxPos++, dlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + alpha = 80; + if (entity->alpha < alpha) { + alpha = entity->alpha; + } + + gDPPipeSync(gfxPos++); + guRotateF(sp18, entity_SuperBlockContent_get_previous_yaw(data, 10), 0.0f, 1.0f, 0.0f); + guMtxF2L(sp18, &data->unk_90); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_90; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gDPSetRenderMode(gfxPos++, AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha); + gSPDisplayList(gfxPos++, dlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + gMasterGfxPos = gfxPos; +} void entity_SuperBlockContent_idle(Entity* entity) { SuperBlockContentData* data = entity->dataBuf.superBlockContent; entity_SuperBlockContent_attach_to_parent(entity); - if (data->unk_0A != 0) { + if (data->isHidden) { entity->renderSetupFunc = NULL; } @@ -88,26 +198,94 @@ void entity_SuperBlockContent_idle(Entity* entity) { data->yawBufferPos = 0; } - if (data->unk_0A == 0 && gOverrideFlags == 0) { - if (--data->unk_02 <= 0) { - data->unk_02 = 50; + if (!data->isHidden && gOverrideFlags == 0) { + if (--data->effectTimer <= 0) { + data->effectTimer = 50; fx_stars_shimmer(3, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20); } } } -void entity_init_SuperBlockContent1(Entity* entity) { +void entity_init_SuperBlockContent(Entity* entity) { SuperBlockContentData* data = entity->dataBuf.superBlockContent; - data->unk_128 = &D_0A000328; - data->unk_12C = &D_0A000380; + data->gfx1 = Entity_SuperBlockContent_Render; + data->gfx2 = Entity_SuperBlockContent_Render2; entity->renderSetupFunc = entity_SuperBlockContent_setupGfx; } -void entity_init_SuperBlockContent2(Entity* entity) { +void entity_init_UltraBlockContent(Entity* entity) { SuperBlockContentData* data = entity->dataBuf.superBlockContent; - data->unk_128 = &D_0A000800; - data->unk_12C = &D_0A000750; + data->gfx1 = Entity_UltraBlockContent_Render; + data->gfx2 = Entity_UltraBlockContent_Render2; entity->renderSetupFunc = entity_SuperBlockContent_setupGfx; } + +extern Gfx Entity_RenderNone[]; + +EntityScript Entity_SuperBlockContent_Script = { + es_SetCallback(entity_SuperBlockContent_idle, 0) + es_End +}; +EntityScript Entity_UltraBlockContent_Script = { + es_SetCallback(entity_SuperBlockContent_idle, 0) + es_End +}; + +EntityModelScript Entity_SuperBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_SuperBlock_Render, RENDER_MODE_ALPHATEST); +EntityModelScript Entity_SuperBlockContent_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER2); +EntityModelScript Entity_UltraBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_UltraBlock_Render, RENDER_MODE_ALPHATEST); +EntityModelScript Entity_UltraBlockContent_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER2); + +EntityBlueprint Entity_SuperBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_SuperBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_SuperBlock_init, + .updateEntityScript = Entity_SuperBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(SuperBlock) }, + .entityType = ENTITY_TYPE_SUPER_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_SuperBlockContent = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .typeDataSize = sizeof(SuperBlockContentData), + .renderCommandList = Entity_SuperBlockContent_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_SuperBlockContent, + .updateEntityScript = Entity_SuperBlockContent_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(SuperBlockContent) }, + .entityType = ENTITY_TYPE_SUPER_BLOCK_HIT_EFFECT, + .aabbSize = { 18, 6, 18 } +}; + +EntityBlueprint Entity_UltraBlock = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(BlockData), + .renderCommandList = Entity_UltraBlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_UltraBlock_init, + .updateEntityScript = Entity_SuperBlock_Script, + .fpHandleCollision = entity_block_handle_collision, + { .dma = ENTITY_ROM(UltraBlock) }, + .entityType = ENTITY_TYPE_ULTRA_BLOCK, + .aabbSize = { 25, 25, 25 } +}; + +EntityBlueprint Entity_UltraBlockContent = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .typeDataSize = sizeof(SuperBlockContentData), + .renderCommandList = Entity_UltraBlockContent_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_init_UltraBlockContent, + .updateEntityScript = Entity_UltraBlockContent_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(UltraBlockContent) }, + .entityType = ENTITY_TYPE_ULTRA_BLOCK_HIT_EFFECT, + .aabbSize = { 18, 6, 18 } +}; diff --git a/src/entity/Switch.c b/src/entity/Switch.c index 5371f98804..8fa5cd5c2f 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -1,10 +1,14 @@ #include "common.h" #include "effects.h" +#include "ld_addrs.h" +#include "entity.h" #define REFLECTED_SWITCH_HIDDEN 1 #define REFLECTED_SWITCH_LINKED 2 -void entity_shattering_init_pieces(Entity* entity, void* arg1, void* arg2); +extern Gfx Entity_RedSwitch_Render[]; +extern Gfx Entity_BlueSwitch_Render[]; +extern Gfx Entity_GreenStompSwitch_Render[]; void entity_GreenStompSwitch_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -109,8 +113,8 @@ void entity_small_switch_idle(Entity* entity) { return; } - if (!(entity->collisionFlags & 1)) { - if (!(entity->collisionFlags & 0x80)) { + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { + if (!(entity->collisionFlags & ENTITY_COLLISION_PARTNER)) { return; } } @@ -125,34 +129,32 @@ void entity_small_switch_idle(Entity* entity) { } void entity_RedSwitch_wait_and_reset(Entity* entity) { - if (!(entity->collisionFlags & 1)) { + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { exec_entity_commandlist(entity); } } void entity_base_switch_anim_init(Entity* entity) { - SwitchData* temp = entity->dataBuf.swtch; + SwitchData* data = entity->dataBuf.swtch; - temp->fallVelocity = 1.0f; - temp->deltaScaleX = 0.1f; - temp->deltaScaleY = -0.1f; - temp->animStateScaleX = 0; - temp->animStateScaleY = 0; + data->fallVelocity = 1.0f; + data->deltaScaleX = 0.1f; + data->deltaScaleY = -0.1f; + data->animStateScaleX = 0; + data->animStateScaleY = 0; } s32 entity_RedSwitch_animate_scale(Entity* entity) { - f32 temp_f4; + f32 phi_f4; f32 temp_f6; SwitchData* data = entity->dataBuf.swtch; - f32 phi_f4; s32 phi_s2 = 0; switch (data->animStateScaleX) { case 0: temp_f6 = data->baseScale.z * 0.3; - temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleX += phi_f4; @@ -164,9 +166,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 1: temp_f6 = data->baseScale.z * -0.2; - temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleX += phi_f4; @@ -178,9 +179,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 2: temp_f6 = data->baseScale.z * 0.15; - temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 4.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleX += phi_f4; @@ -192,9 +192,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 3: temp_f6 = data->baseScale.z * -0.1; - temp_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.x + temp_f6) - entity->scale.x) / 6.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleX += phi_f4; @@ -205,9 +204,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { } break; case 4: - temp_f4 = (data->baseScale.x - entity->scale.x) / 4.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = (data->baseScale.x - entity->scale.x) / 4.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleX += phi_f4; @@ -228,9 +226,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { switch (data->animStateScaleY) { case 0: temp_f6 = data->baseScale.z * -0.5; - temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleY += phi_f4; @@ -242,9 +239,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 1: temp_f6 = data->baseScale.z * 0.1; - temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleY += phi_f4; @@ -256,9 +252,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 2: temp_f6 = data->baseScale.z * -0.3; - temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 5.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleY += phi_f4; @@ -270,9 +265,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { break; case 3: temp_f6 = data->baseScale.z * 0.0; - temp_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.y + temp_f6) - entity->scale.y) / 10.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleY += phi_f4; @@ -283,9 +277,8 @@ s32 entity_RedSwitch_animate_scale(Entity* entity) { } break; case 4: - temp_f4 = (data->baseScale.y - entity->scale.y) / 5.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = (data->baseScale.y - entity->scale.y) / 5.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleY += phi_f4; @@ -316,18 +309,16 @@ void entity_base_switch_start_bound_script(Entity* entity) { } void entity_base_switch_animate_scale(Entity* entity) { - f32 temp_f4; + f32 phi_f4; f32 scaleChange; SwitchData* data = entity->dataBuf.swtch; - f32 phi_f4; s32 phi_s2 = 0; switch (data->animStateScaleX) { case 0: scaleChange = data->baseScale.z * 0.3; - temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleX += phi_f4; @@ -337,12 +328,10 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleX++; } break; - case 1: scaleChange = (data->baseScale.z * -0.2); - temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleX += phi_f4; @@ -352,12 +341,10 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleX++; } break; - case 2: scaleChange = data->baseScale.z * 0.15; - temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 4.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleX += phi_f4; @@ -367,12 +354,10 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleX++; } break; - case 3: scaleChange = data->baseScale.z * -0.1; - temp_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.x + scaleChange) - entity->scale.x) / 6.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleX += phi_f4; @@ -382,7 +367,6 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleX++; } break; - case 4: phi_s2++; break; @@ -393,9 +377,8 @@ void entity_base_switch_animate_scale(Entity* entity) { switch (data->animStateScaleY) { case 0: scaleChange = data->baseScale.z * -0.5; - temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleY += phi_f4; @@ -405,12 +388,10 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleY++; } break; - case 1: scaleChange = data->baseScale.z * 0.1; - temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 10.0; - phi_f4 = temp_f4; - if (temp_f4 < 0.01) { + phi_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 10.0; + if (phi_f4 < 0.01) { phi_f4 = 0.01f; } data->deltaScaleY += phi_f4; @@ -420,12 +401,10 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleY++; } break; - case 2: scaleChange = data->baseScale.z * -0.3; - temp_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; - phi_f4 = temp_f4; - if (temp_f4 > -0.01) { + phi_f4 = ((data->baseScale.y + scaleChange) - entity->scale.y) / 5.0; + if (phi_f4 > -0.01) { phi_f4 = -0.01f; } data->deltaScaleY += phi_f4; @@ -435,7 +414,6 @@ void entity_base_switch_animate_scale(Entity* entity) { data->animStateScaleY++; } break; - case 3: phi_s2++; break; @@ -496,3 +474,103 @@ void entity_HugeBlueSwitch_init(Entity* entity) { data->baseScale.y = 3.0f; data->baseScale.z = 3.0f; } + +EntityScript Entity_RedSwitch_Script = { + es_SetCallback(entity_small_switch_idle, 0) + es_PlaySound(SOUND_152) + es_Call(entity_base_switch_start_bound_script) + es_Call(entity_base_switch_anim_init) + es_SetCallback(entity_RedSwitch_animate_scale, 0) + es_SetCallback(entity_RedSwitch_wait_and_reset, 0) + es_Restart + es_End +}; + +EntityScript Entity_HugeBlueSwitch_Script = { + es_SetCallback(entity_HugeBlueSwitch_idle, 0) + es_PlaySound(SOUND_152) + es_Call(entity_base_switch_start_bound_script) + es_Call(entity_base_switch_anim_init) + es_SetCallback(entity_base_switch_animate_scale, 0) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_BlueSwitch_Script = { + es_SetCallback(entity_small_switch_idle, 0) + es_PlaySound(SOUND_152) + es_Call(entity_base_switch_start_bound_script) + es_Call(entity_base_switch_anim_init) + es_SetCallback(entity_base_switch_animate_scale, 0) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_GreenStompSwitch_Script = { + es_SetCallback(entity_GreenStompSwitch_idle, 0) + es_SetCallback(entity_GreenStompSwitch_retract, 0) + es_PlaySound(SOUND_152) + es_SetCallback(NULL, 128) + es_SetCallback(entity_GreenStompSwitch_extend, 0) + es_Restart +}; + +EntityModelScript Entity_BlueSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_BlueSwitch_Render, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityModelScript Entity_HugeBlueSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_BlueSwitch_Render, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityModelScript Entity_RedSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RedSwitch_Render, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityModelScript Entity_GreenStompSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_GreenStompSwitch_Render, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_RedSwitch = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA, + .typeDataSize = sizeof(SwitchData), + .renderCommandList = Entity_RedSwitch_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_switch_init, + .updateEntityScript = Entity_RedSwitch_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(RedSwitch) }, + .entityType = ENTITY_TYPE_RED_SWITCH, + .aabbSize = {22, 23, 22} +}; + +EntityBlueprint Entity_BlueSwitch = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW, + .typeDataSize = sizeof(SwitchData), + .renderCommandList = Entity_BlueSwitch_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_BlueSwitch_init, + .updateEntityScript = Entity_BlueSwitch_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BlueSwitch) }, + .entityType = ENTITY_TYPE_BLUE_SWITCH, + .aabbSize = {22, 23, 22} +}; + +EntityBlueprint Entity_HugeBlueSwitch = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW, + .typeDataSize = sizeof(SwitchData), + .renderCommandList = Entity_HugeBlueSwitch_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_HugeBlueSwitch_init, + .updateEntityScript = Entity_HugeBlueSwitch_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BlueSwitch) }, + .entityType = ENTITY_TYPE_HUGE_BLUE_SWITCH, + .aabbSize = {66, 75, 66} +}; + +EntityBlueprint Entity_GreenStompSwitch = { + .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000, + .typeDataSize = sizeof(SwitchData), + .renderCommandList = Entity_GreenStompSwitch_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_base_switch_init, + .updateEntityScript = Entity_GreenStompSwitch_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(GreenStompSwitch) }, + .entityType = ENTITY_TYPE_GREEN_STOMP_SWITCH, + .aabbSize = {50, 15, 50} +}; diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index b86b641fc7..0bbc2aa89e 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -1,7 +1,50 @@ #include "common.h" #include "npc.h" +#include "ld_addrs.h" +#include "entity.h" -INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_init_fragments); +extern Gfx Entity_RenderNone[]; +extern Gfx Entity_WoodenCrate_Render[]; +extern Gfx* Entity_WoodenCrate_FragmentsRender[]; +extern Mtx Entity_WoodenCrate_FragmentsMatrices[]; + +void entity_WoodenCrate_setupGfx(s32); + +void entity_WoodenCrate_init_fragments(Entity* entity, Gfx** dlists, Mtx* matrices) { + WoodenCrateData* data = entity->dataBuf.crate; + Matrix4f mtxFragment; + Matrix4f mtxTrans; + s32 i; + s32 rotationSpeed; + + data->fragmentsGfx = ENTITY_ADDR(entity, Gfx**, dlists); + entity->renderSetupFunc = entity_WoodenCrate_setupGfx; + entity->alpha = 255; + entity->position.y = data->basePosY; + guTranslateF(mtxTrans, entity->position.x, entity->position.y, entity->position.z); + + for (i = 0; i < 35; i++) { + guMtxL2F(mtxFragment, ENTITY_ADDR(entity, Mtx*, matrices++)); + guMtxCatF(mtxTrans, mtxFragment, mtxFragment); + data->fragmentPosX[i] = mtxFragment[3][0]; + data->fragmentPosY[i] = mtxFragment[3][1]; + data->fragmentPosZ[i] = mtxFragment[3][2]; + data->fragmentMoveAngle[i] = -rand_int(255); + data->fragmentLateralSpeed[i] = 20; + + rotationSpeed = rand_int(5); + if (i % 2 != 0) { + data->fragmentRotationSpeed[i] = rotationSpeed + 10; + } else { + data->fragmentRotationSpeed[i] = -10 - rotationSpeed; + } + + data->fragmentFallSpeed[i] = 10.0f; + data->fragmentRebounds[i] = 0; + data->fragmentRotX[i] = 0; + data->fragmentRotY[i] = 0; + } +} void entity_WoodenCrate_init(Entity* entity) { WoodenCrateData* data = entity->dataBuf.crate; @@ -15,18 +58,168 @@ void entity_WoodenCrate_reset_fragments(Entity* entity) { WoodenCrateData* data = entity->dataBuf.crate; data->basePosY = entity->position.y; - entity_WoodenCrate_init_fragments(entity, &D_0A004350, &D_0A0026F0); + entity_WoodenCrate_init_fragments(entity, Entity_WoodenCrate_FragmentsRender, Entity_WoodenCrate_FragmentsMatrices); } -INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_update_fragments); +void entity_WoodenCrate_update_fragments(Entity* entity) { + WoodenCrateData* data = entity->dataBuf.crate; + f32 rotSpeed, lateralSpeed, reboundSpeed; + f32 moveAngle, yawRad; + s32 i; + s32 numFragmentsDisappeared; + f32 hitX, hitY, hitZ, hitDepth; -INCLUDE_ASM(s32, "entity/WoodenCrate", entity_WoodenCrate_setupGfx); + numFragmentsDisappeared = 0; + rotSpeed = 0.0f; + reboundSpeed = 0.0f; + lateralSpeed = 0.0f; + + for (i = 0; i < 35; i++) { + switch (data->fragmentRebounds[i]) { + case 0: + reboundSpeed = 2.0f; + rotSpeed = data->fragmentRotationSpeed[i]; + lateralSpeed = data->fragmentLateralSpeed[i] / 10.0f; + if (rotSpeed >= 0.0f) { + data->fragmentRotationSpeed[i] = rotSpeed - 0.4; + } else { + data->fragmentRotationSpeed[i] = rotSpeed + 0.5; + } + break; + case 1: + lateralSpeed = 1.0f; + reboundSpeed = 0.0f; + rotSpeed = data->fragmentRotationSpeed[i] * 0.25f; + break; + case 2: + data->fragmentRotationSpeed[i] += 1.0f; + if (data->fragmentRotationSpeed[i] > 20.0f) { + data->fragmentRotationSpeed[i] = 20.0f; + } + + data->fragmentPosY[i] -= data->fragmentRotationSpeed[i] / 70.0f; + + data->fragmentMoveAngle[i] -= 5; + if (data->fragmentMoveAngle[i] <= 5) { + data->fragmentMoveAngle[i] = 0; + data->fragmentRebounds[i]++; + } + break; + case 3: + numFragmentsDisappeared++; + break; + } + + if (data->fragmentRebounds[i] < 2) { + if (data->fragmentFallSpeed[i] >= 0.0f) { + data->fragmentFallSpeed[i] -= 0.8; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } else { + data->fragmentFallSpeed[i] -= 1.6; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } + + data->fragmentPosY[i] += data->fragmentFallSpeed[i]; + yawRad = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f; + moveAngle = yawRad * TAU / 360.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + if (npc_test_move_taller_with_slipping(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, lateralSpeed, yawRad, 8.0f, 8.0f)) { + data->fragmentPosX[i] = hitX; + data->fragmentPosY[i] = hitY; + data->fragmentPosZ[i] = hitZ; + data->fragmentMoveAngle[i] += 0x80; // inverse yaw + + moveAngle = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f * TAU / 360.0f; + lateralSpeed = 8.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + } + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i] + 8.0f; + hitZ = data->fragmentPosZ[i]; + hitDepth = fabsf(data->fragmentFallSpeed[i]); + if (npc_raycast_down_sides(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, &hitDepth) || hitY < data->basePosY - 200.0f) { + data->fragmentRebounds[i]++; + data->fragmentPosY[i] = hitY + fabsf(data->fragmentFallSpeed[i]); + data->fragmentFallSpeed[i] = reboundSpeed; + if (data->fragmentRebounds[i] == 2) { + data->fragmentMoveAngle[i] = 254; + data->fragmentRotationSpeed[i] = 0.0f; + } + } + + data->fragmentRotX[i] += rotSpeed; + data->fragmentRotY[i] -= rotSpeed; + } + } + + if (numFragmentsDisappeared >= 35) { + exec_entity_commandlist(entity); + } +} + +void entity_WoodenCrate_setupGfx(s32 entityIndex) { + s32 i; + Matrix4f mtxTransInv; + Matrix4f mtx; + Matrix4f mtxRotX; + Matrix4f mtxRotY; + f32 x_inv; + f32 y_inv; + f32 z_inv; + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + WoodenCrateData* data = entity->dataBuf.crate; + Gfx* fragmentDlist; + Gfx** gfx = data->fragmentsGfx; + + x_inv = -entity->position.x; + y_inv = -entity->position.y; + z_inv = -entity->position.z; + + for (i = 0; i < 35; i++) { + if (data->fragmentRebounds[i] < 2) { + gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + } else { + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); + } + + guTranslateF(mtxTransInv, x_inv, y_inv, z_inv); + guRotateF(mtxRotX, data->fragmentRotX[i] * 360.0f * 0.00390625f, 1.0f, 0.0f, 0.0f); + guRotateF(mtxRotY, data->fragmentRotY[i] * 360.0f * 0.00390625f, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxRotX, mtxRotY, mtxRotY); + guMtxCatF(mtxRotY, mtxTransInv, mtxTransInv); + guTranslateF(mtx, data->fragmentPosX[i], data->fragmentPosY[i], data->fragmentPosZ[i]); + guMtxCatF(mtxTransInv, mtx, mtx); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + fragmentDlist = ENTITY_ADDR(entity, Gfx*, *gfx++); + gSPDisplayList(gfxPos++, fragmentDlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + } + + gMasterGfxPos = gfxPos; +} s32 entity_WoodenCrate_idle(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; s32 shouldBreak = FALSE; - if (entity->collisionFlags & 1) { + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { set_action_state(ACTION_STATE_FALLING); @@ -36,7 +229,7 @@ s32 entity_WoodenCrate_idle(Entity* entity) { if (shouldBreak) { entity_WoodenCrate_reset_fragments(entity); - entity_set_render_script(entity, &D_802EAE7C); + entity_set_render_script(entity, Entity_WoodenCrate_RenderShatteredScript); entity_start_script(entity); exec_entity_commandlist(entity); sfx_play_sound(SOUND_20AE); @@ -51,7 +244,6 @@ void entity_WoodenCrate_shatter(Entity* entity, f32 arg1) { if (data->itemID != -1) { s32 flag = FALSE; - // can't do || here, or gcc realizes it can reuse the temp->unk_04 load if (data->globalFlagIndex == 0xFFFF) { flag = TRUE; } else if (!get_global_flag(data->globalFlagIndex)) { @@ -64,3 +256,29 @@ void entity_WoodenCrate_shatter(Entity* entity, f32 arg1) { } } } + +EntityModelScript Entity_WoodenCrate_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_WoodenCrate_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_WoodenCrate_RenderShatteredScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityScript Entity_WoodenCrate_Script = { + es_SetCallback(entity_WoodenCrate_idle, 0) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_Call(entity_WoodenCrate_shatter) + es_SetCallback(entity_WoodenCrate_update_fragments, 0) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityBlueprint Entity_WoodenCrate = { + .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(WoodenCrateData), + .renderCommandList = Entity_WoodenCrate_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_WoodenCrate_init, + .updateEntityScript = Entity_WoodenCrate_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(WoodenCrate) }, + .entityType = ENTITY_TYPE_WOODEN_CRATE, + .aabbSize = { 35, 30, 35 } +}; diff --git a/src/entity/default/BoardedFloor.c b/src/entity/default/BoardedFloor.c new file mode 100644 index 0000000000..40e90c108a --- /dev/null +++ b/src/entity/default/BoardedFloor.c @@ -0,0 +1,255 @@ +#include "common.h" +#include "ld_addrs.h" +#include "entity.h" + +extern Gfx Entity_RenderNone[]; +extern Gfx* Entity_BoardedFloor_FragmentsRender[]; +extern Mtx Entity_BoardedFloor_FragmentMatrices[]; + +void Entity_BoardedFloor_setupGfx(s32); + +void Entity_BoardedFloor_init_fragments(Entity* entity, Gfx** dlists, Mtx* matrices) { + BoardedFloorData* data = entity->dataBuf.boardedFloor; + Matrix4f mtxFragment; + Matrix4f mtxTrans; + s32 i; + s32 rotationSpeed; + + data->fragmentsGfx = ENTITY_ADDR(entity, Gfx**, dlists); + entity->renderSetupFunc = Entity_BoardedFloor_setupGfx; + entity->alpha = 255; + entity->position.y = data->inititalY; + guTranslateF(mtxTrans, entity->position.x, entity->position.y, entity->position.z); + + for (i = 0; i < 12; i++) { + guMtxL2F(mtxFragment, ENTITY_ADDR(entity, Mtx*, matrices++)); + guMtxCatF(mtxTrans, mtxFragment, mtxFragment); + data->fragmentPosX[i] = mtxFragment[3][0]; + data->fragmentPosY[i] = mtxFragment[3][1]; + data->fragmentPosZ[i] = mtxFragment[3][2]; + data->fragmentMoveAngle[i] = -rand_int(255); + data->fragmentLateralSpeed[i] = 20; + + rotationSpeed = rand_int(5); + if (i % 2 != 0) { + data->fragmentRotationSpeed[i] = rotationSpeed + 10; + } else { + data->fragmentRotationSpeed[i] = -10 - rotationSpeed; + } + + data->fragmentFallSpeed[i] = 10.0f; + data->fragmentRebounds[i] = 0; + data->fragmentRotX[i] = 0; + data->fragmentRotY[i] = 0; + } +} + +void Entity_BoardedFloor_init(Entity* entity) { + entity->dataBuf.boardedFloor->inititalY = entity->position.y; + Entity_BoardedFloor_init_fragments(entity, Entity_BoardedFloor_FragmentsRender, Entity_BoardedFloor_FragmentMatrices); +} + +void Entity_BoardedFloor_update_fragments(Entity* entity) { + BoardedFloorData* data = entity->dataBuf.boardedFloor; + f32 rotSpeed, lateralSpeed, reboundSpeed; + f32 moveAngle, yawRad; + s32 i; + s32 numFragmentsDisappeared; + f32 hitX, hitY, hitZ, hitDepth; + + numFragmentsDisappeared = 0; + rotSpeed = 0.0f; + reboundSpeed = 0.0f; + lateralSpeed = 0.0f; + + for (i = 0; i < 12; i++) { + switch (data->fragmentRebounds[i]) { + case 0: + reboundSpeed = 2.0f; + rotSpeed = data->fragmentRotationSpeed[i]; + lateralSpeed = data->fragmentLateralSpeed[i] / 10.0f; + if (rotSpeed >= 0.0f) { + data->fragmentRotationSpeed[i] = rotSpeed - 0.4; + } else { + data->fragmentRotationSpeed[i] = rotSpeed + 0.5; + } + break; + case 1: + lateralSpeed = 1.0f; + reboundSpeed = 0.0f; + rotSpeed = data->fragmentRotationSpeed[i] * 0.25f; + break; + case 2: + data->fragmentRotationSpeed[i] += 1.0f; + if (data->fragmentRotationSpeed[i] > 20.0f) { + data->fragmentRotationSpeed[i] = 20.0f; + } + + data->fragmentPosY[i] -= data->fragmentRotationSpeed[i] / 70.0f; + + data->fragmentMoveAngle[i] -= 5; + if (data->fragmentMoveAngle[i] <= 5) { + data->fragmentMoveAngle[i] = 0; + data->fragmentRebounds[i]++; + } + break; + case 3: + numFragmentsDisappeared++; + break; + } + + if (data->fragmentRebounds[i] < 2) { + if (data->fragmentFallSpeed[i] >= 0.0f) { + data->fragmentFallSpeed[i] -= 0.8; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } else { + data->fragmentFallSpeed[i] -= 1.6; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } + + data->fragmentPosY[i] += data->fragmentFallSpeed[i]; + yawRad = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f; + moveAngle = yawRad * TAU / 360.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + if (npc_test_move_taller_with_slipping(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, lateralSpeed, yawRad, 8.0f, 8.0f)) { + data->fragmentPosX[i] = hitX; + data->fragmentPosY[i] = hitY; + data->fragmentPosZ[i] = hitZ; + data->fragmentMoveAngle[i] += 0x80; // inverse yaw + + moveAngle = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f * TAU / 360.0f; + lateralSpeed = 8.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + } + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + hitDepth = fabsf(data->fragmentFallSpeed[i]); + if (npc_raycast_down_sides(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, &hitDepth) || hitY < data->inititalY - 200.0f) { + data->fragmentRebounds[i]++; + data->fragmentPosY[i] = hitY + fabsf(data->fragmentFallSpeed[i]); + data->fragmentFallSpeed[i] = reboundSpeed; + if (data->fragmentRebounds[i] == 2) { + data->fragmentMoveAngle[i] = 254; + data->fragmentRotationSpeed[i] = 0.0f; + } + } + + data->fragmentRotX[i] += rotSpeed; + data->fragmentRotY[i] -= rotSpeed; + } + } + + if (numFragmentsDisappeared >= 12) { + exec_entity_commandlist(entity); + } +} + +void Entity_BoardedFloor_setupGfx(s32 entityIndex) { + s32 i; + Matrix4f mtxTransInv; + Matrix4f mtx; + Matrix4f mtxRotX; + Matrix4f mtxRotY; + f32 x_inv; + f32 y_inv; + f32 z_inv; + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + BoardedFloorData* data = entity->dataBuf.boardedFloor; + Gfx* fragmentDlist; + Gfx** gfx = data->fragmentsGfx; + + x_inv = -entity->position.x; + y_inv = -entity->position.y; + z_inv = -entity->position.z; + + for (i = 0; i < 12; i++) { + if (data->fragmentRebounds[i] < 2) { + gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + } else { + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); + } + + guTranslateF(mtxTransInv, x_inv, y_inv, z_inv); + guRotateF(mtxRotX, data->fragmentRotX[i] * 360.0f * 0.00390625f, 1.0f, 0.0f, 0.0f); + guRotateF(mtxRotY, data->fragmentRotY[i] * 360.0f * 0.00390625f, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxRotX, mtxRotY, mtxRotY); + guMtxCatF(mtxRotY, mtxTransInv, mtxTransInv); + guTranslateF(mtx, data->fragmentPosX[i], data->fragmentPosY[i], data->fragmentPosZ[i]); + guMtxCatF(mtxTransInv, mtx, mtx); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + fragmentDlist = ENTITY_ADDR(entity, Gfx*, *gfx++); + gSPDisplayList(gfxPos++, fragmentDlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + } + + gMasterGfxPos = gfxPos; +} + +void Entity_BoardedFloor_idle(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + if (playerStatus->actionState == ACTION_STATE_GROUND_POUND + || playerStatus->actionState == ACTION_STATE_ULTRA_POUND) { + entity_start_script(entity); + exec_entity_commandlist(entity); + } + } +} + +EntityModelScript Entity_BoardedFloor_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_BoardedFloor_RenderScriptShattered = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER1); + +void Entity_BoardedFloor_shatter(Entity* entity) { + BoardedFloorData* data = entity->dataBuf.boardedFloor; + s32 i; + + for (i = 0; i < 12; i++) { + data->fragmentPosY[i] += 1.0f; + } + + entity_set_render_script(entity, Entity_BoardedFloor_RenderScriptShattered); +} + +EntityScript Entity_BoardedFloor_Script = { + es_ClearFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetCallback(Entity_BoardedFloor_idle, 0) + es_PlaySound(SOUND_2092) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_Call(Entity_BoardedFloor_shatter) + es_SetCallback(Entity_BoardedFloor_update_fragments, 0) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityBlueprint Entity_BoardedFloor = { + .flags = 0, + .typeDataSize = sizeof(BoardedFloorData), + .renderCommandList = Entity_BoardedFloor_RenderScript, + .modelAnimationNodes = 0, + .fpInit = Entity_BoardedFloor_init, + .updateEntityScript = Entity_BoardedFloor_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BoardedFloor) }, + .entityType = ENTITY_TYPE_BOARDED_FLOOR, + .aabbSize = { 60, 5, 60 } +}; diff --git a/src/entity/default/BombableRock.c b/src/entity/default/BombableRock.c new file mode 100644 index 0000000000..6d64d6dcae --- /dev/null +++ b/src/entity/default/BombableRock.c @@ -0,0 +1,274 @@ +#include "common.h" +#include "effects.h" +#include "entity.h" +#include "ld_addrs.h" + +extern Gfx Entity_RenderNone[]; +extern Gfx* Entity_BombableRock_FragmentsRender[]; +extern Mtx Entity_BombableRock_FragmentMatrices[]; + +void entity_BombableRock_setupGfx(s32); + +void entity_BombableRock_init_fragments(Entity* entity, Gfx** dlists, Mtx* matrices) { + BombableRockData* data = entity->dataBuf.bombableRock; + Matrix4f mtxFragment; + Matrix4f mtxTrans; + s32 i; + s32 rotationSpeed; + s32 moveAngle = 0; + s32 lateralSpeed = 0; + + data->fragmentsGfx = ENTITY_ADDR(entity, Gfx**, dlists); + entity->renderSetupFunc = entity_BombableRock_setupGfx; + entity->alpha = 255; + entity->position.y = data->inititalY; + guTranslateF(mtxTrans, entity->position.x, entity->position.y, entity->position.z); + + for (i = 0; i < 5; i++) { + guMtxL2F(mtxFragment, ENTITY_ADDR(entity, Mtx*, matrices++)); + guMtxCatF(mtxTrans, mtxFragment, mtxFragment); + data->fragmentPosX[i] = mtxFragment[3][0]; + data->fragmentPosY[i] = mtxFragment[3][1]; + data->fragmentPosZ[i] = mtxFragment[3][2]; + switch (i) { + case 0: + moveAngle = 192; + lateralSpeed = 0; + break; + case 1: + moveAngle = 96; + lateralSpeed = 20; + break; + case 2: + moveAngle = 32; + lateralSpeed = 20; + break; + case 3: + moveAngle = 160; + lateralSpeed = 20; + break; + case 4: + moveAngle = 224; + lateralSpeed = 20; + break; + } + data->fragmentMoveAngle[i] = moveAngle; + data->fragmentLateralSpeed[i] = lateralSpeed; + + rotationSpeed = rand_int(5); + if (i % 2 != 0) { + data->fragmentRotationSpeed[i] = rotationSpeed + 10; + } else { + data->fragmentRotationSpeed[i] = -10 - rotationSpeed; + } + + data->fragmentFallSpeed[i] = 10.0f; + data->fragmentRebounds[i] = 0; + data->fragmentRotX[i] = 0; + data->fragmentRotY[i] = 0; + } +} + +void entity_BombableRock_init(Entity* entity) { + entity->dataBuf.bombableRock->inititalY = entity->position.y; + entity_BombableRock_init_fragments(entity, Entity_BombableRock_FragmentsRender, Entity_BombableRock_FragmentMatrices); +} + +void entity_BombableRock_update_fragments(Entity* entity) { + BombableRockData* data = entity->dataBuf.bombableRock; + f32 rotSpeed, lateralSpeed, reboundSpeed; + f32 moveAngle, yawRad; + s32 i; + s32 numFragmentsDisappeared; + f32 hitX, hitY, hitZ, hitDepth; + + numFragmentsDisappeared = 0; + rotSpeed = 0.0f; + reboundSpeed = 0.0f; + lateralSpeed = 0.0f; + + for (i = 0; i < 5; i++) { + switch (data->fragmentRebounds[i]) { + case 0: + reboundSpeed = 2.0f; + rotSpeed = data->fragmentRotationSpeed[i]; + lateralSpeed = data->fragmentLateralSpeed[i] / 10.0f; + if (rotSpeed >= 0.0f) { + data->fragmentRotationSpeed[i] = rotSpeed - 0.4; + } else { + data->fragmentRotationSpeed[i] = rotSpeed + 0.5; + } + break; + case 1: + lateralSpeed = 1.0f; + reboundSpeed = 0.0f; + rotSpeed = data->fragmentRotationSpeed[i] * 0.25f; + break; + case 2: + data->fragmentRotationSpeed[i] += 1.0f; + if (data->fragmentRotationSpeed[i] > 20.0f) { + data->fragmentRotationSpeed[i] = 20.0f; + } + + data->fragmentPosY[i] -= data->fragmentRotationSpeed[i] / 70.0f; + + data->fragmentMoveAngle[i] -= 5; + if (data->fragmentMoveAngle[i] <= 5) { + data->fragmentMoveAngle[i] = 0; + data->fragmentRebounds[i]++; + } + break; + case 3: + numFragmentsDisappeared++; + break; + } + + if (data->fragmentRebounds[i] < 2) { + if (data->fragmentFallSpeed[i] >= 0.0f) { + data->fragmentFallSpeed[i] -= 0.8; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } else { + data->fragmentFallSpeed[i] -= 1.6; + if (data->fragmentFallSpeed[i] < -10.2) { + data->fragmentFallSpeed[i] = -10.2f; + } + } + + data->fragmentPosY[i] += data->fragmentFallSpeed[i]; + yawRad = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f; + moveAngle = yawRad * TAU / 360.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + if (npc_test_move_taller_with_slipping(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, lateralSpeed, yawRad, 8.0f, 8.0f)) { + data->fragmentPosX[i] = hitX; + data->fragmentPosY[i] = hitY; + data->fragmentPosZ[i] = hitZ; + data->fragmentMoveAngle[i] += 0x80; // inverse yaw + + moveAngle = data->fragmentMoveAngle[i] * 360.0f * 0.00390625f * TAU / 360.0f; + lateralSpeed = 8.0f; + data->fragmentPosX[i] += lateralSpeed * sin_rad(moveAngle); + data->fragmentPosZ[i] += lateralSpeed * cos_rad(moveAngle); + + } + + hitX = data->fragmentPosX[i]; + hitY = data->fragmentPosY[i]; + hitZ = data->fragmentPosZ[i]; + hitDepth = fabsf(data->fragmentFallSpeed[i]); + if (npc_raycast_down_sides(COLLISION_IGNORE_ENTITIES, &hitX, &hitY, &hitZ, &hitDepth) || hitY < data->inititalY - 200.0f) { + data->fragmentRebounds[i]++; + data->fragmentPosY[i] = hitY + fabsf(data->fragmentFallSpeed[i]); + data->fragmentFallSpeed[i] = reboundSpeed; + if (data->fragmentRebounds[i] == 2) { + data->fragmentMoveAngle[i] = 254; + data->fragmentRotationSpeed[i] = 0.0f; + } + } + + data->fragmentRotX[i] += rotSpeed; + data->fragmentRotY[i] -= rotSpeed; + } + } + + if (numFragmentsDisappeared >= 5) { + exec_entity_commandlist(entity); + } +} + +void entity_BombableRock_setupGfx(s32 entityIndex) { + s32 i; + Matrix4f mtxTransInv; + Matrix4f mtx; + Matrix4f mtxRotX; + Matrix4f mtxRotY; + f32 x_inv; + f32 y_inv; + f32 z_inv; + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + BombableRockData* data = entity->dataBuf.bombableRock; + Gfx* fragmentDlist; + Gfx** gfx = data->fragmentsGfx; + + x_inv = -entity->position.x; + y_inv = -entity->position.y; + z_inv = -entity->position.z; + + for (i = 0; i < 5; i++) { + if (data->fragmentRebounds[i] < 2) { + gDPSetRenderMode(gfxPos++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + } else { + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, SHADE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, data->fragmentMoveAngle[i]); + } + + guTranslateF(mtxTransInv, x_inv, y_inv, z_inv); + guRotateF(mtxRotX, data->fragmentRotX[i] * 360.0f * 0.00390625f, 1.0f, 0.0f, 0.0f); + guRotateF(mtxRotY, data->fragmentRotY[i] * 360.0f * 0.00390625f, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxRotX, mtxRotY, mtxRotY); + guMtxCatF(mtxRotY, mtxTransInv, mtxTransInv); + guTranslateF(mtx, data->fragmentPosX[i], data->fragmentPosY[i], data->fragmentPosZ[i]); + guMtxCatF(mtxTransInv, mtx, mtx); + guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + fragmentDlist = ENTITY_ADDR(entity, Gfx*, *gfx++); + gSPDisplayList(gfxPos++, fragmentDlist); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + } + + gMasterGfxPos = gfxPos; +} + +void entity_BombableRock_idle(Entity* entity) { + if (entity->collisionFlags & ENTITY_COLLISION_PARTNER) { + entity_start_script(entity); + exec_entity_commandlist(entity); + fx_big_smoke_puff(entity->position.x, entity->position.y + 25.0f, entity->position.z); + } +} + +EntityModelScript Entity_BombableRock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityScript Entity_BombableRock_Script = { + es_SetCallback(entity_BombableRock_idle, 0) + es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetCallback(entity_BombableRock_update_fragments, 0) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityBlueprint Entity_BombableRock = { + .flags = 0, + .typeDataSize = sizeof(BombableRockData), + .renderCommandList = Entity_BombableRock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_BombableRock_init, + .updateEntityScript = Entity_BombableRock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BombableRock) }, + .entityType = ENTITY_TYPE_BOMBABLE_ROCK, + .aabbSize = { 50, 50, 50 } +}; + +EntityBlueprint Entity_BombableRock2 = { + .flags = 0, + .typeDataSize = sizeof(BombableRockData), + .renderCommandList = Entity_BombableRock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_BombableRock_init, + .updateEntityScript = Entity_BombableRock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(BombableRock) }, + .entityType = ENTITY_TYPE_BOMBABLE_ROCK, + .aabbSize = { 50, 50, 100 } +}; diff --git a/src/entity/default/E2B530.c b/src/entity/default/E2B530.c deleted file mode 100644 index d1f742c936..0000000000 --- a/src/entity/default/E2B530.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BAE00_E2B530); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB044_E2B774); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB1E8_E2B918); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB62C_E2BD5C); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB664_E2BD94); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB69C_E2BDCC); - -INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB6D4_E2BE04); diff --git a/src/entity/default/E2BE40.c b/src/entity/default/E2BE40.c deleted file mode 100644 index c99033128c..0000000000 --- a/src/entity/default/E2BE40.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB710_E2BE40); - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB870_E2BFA0); - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB8A4_E2BFD4); - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BBE3C_E2C56C); - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BC148_E2C878); - -INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BC1A8_E2C8D8); diff --git a/src/entity/default/E2C930.c b/src/entity/default/E2C930.c deleted file mode 100644 index c209915b0a..0000000000 --- a/src/entity/default/E2C930.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "effects.h" - -INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC200_E2C930); - -INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC3A8_E2CAD8); - -INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC3DC_E2CB0C); - -INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC974_E2D0A4); - -void func_802BCC80_E2D3B0(Entity* entity) { - if (entity->collisionFlags & 0x80) { - entity_start_script(entity); - exec_entity_commandlist(entity); - fx_big_smoke_puff(entity->position.x, entity->position.y + 25.0f, entity->position.z); - } -} diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c new file mode 100644 index 0000000000..430712c2e0 --- /dev/null +++ b/src/entity/default/Padlock.c @@ -0,0 +1,289 @@ +#include "common.h" +#include "entity.h" +#include "effects.h" +#include "ld_addrs.h" + +extern Gfx Entity_Padlock_Render[]; +extern Gfx Entity_Padlock_RenderShackle[]; +extern Mtx Entity_Padlock_mtxShackle; +extern Gfx Entity_PadlockRedFrame_Render[]; +extern Gfx Entity_PadlockRedFrame_RenderShackle[]; +extern Mtx Entity_PadlockRedFrame_mtxShackle; +extern Gfx Entity_PadlockRedFace_Render[]; +extern Gfx Entity_PadlockRedFace_RenderShackle[]; +extern Mtx Entity_PadlockRedFace_mtxShackle; +extern Gfx Entity_PadlockBlueFace_Render[]; +extern Gfx Entity_PadlockBlueFace_RenderShackle[]; +extern Mtx Entity_PadlockBlueFace_mtxShackle; + +void entity_Padlock_setupGfx(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + PadlockData* data = entity->dataBuf.padlock; + Matrix4f sp18; + Matrix4f sp58; + Matrix4f sp98; + Matrix4f spD8; + + guMtxIdentF(sp58); + guMtxL2F(sp98, data->shackleMtx); + guMtxCatF(sp58, sp98, sp98); + sp98[3][0] += data->shacklePos; + guRotateF(spD8, entity->rotation.x, -1.0f, 0.0f, 0.0f); + guMtxCatF(spD8, sp98, sp98); + guRotateF(spD8, entity->rotation.z, 0.0f, 0.0f, 1.0f); + guRotateF(sp18, entity->rotation.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(spD8, sp18, sp18); + guRotateF(spD8, entity->rotation.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp18, spD8, spD8); + guMtxCatF(sp98, spD8, sp98); + guScaleF(sp18, entity->scale.x, entity->scale.y, entity->scale.z); + guMtxCatF(sp98, sp18, sp18); + guTranslateF(sp58, entity->position.x, entity->position.y, entity->position.z); + guMtxCatF(sp18, sp58, sp58); + guMtxF2L(sp58, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, data->shackleGfx); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void entity_Padlock_push_player(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; + PadlockData* data = entity->dataBuf.padlock; + f32 deltaX, deltaZ; + + if (playerStatus->colliderHeight < fabs(playerStatus->position.y - entity->position.y)) { + entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + } else { + entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; + } + + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + if (data->pushSpeed == 0.0f) { + suggest_player_anim_clearUnkFlag(0x10005); + } + + data->pushSpeed += 0.5; + + if (data->pushSpeed >= 2.5) { + data->pushSpeed = 2.5f; + } + + deltaX = data->pushSpeed * sin_rad((180.0f - entity->rotation.y) * TAU / 360.0f); + deltaZ = data->pushSpeed * cos_rad((180.0f - entity->rotation.y) * TAU / 360.0f); + + playerStatus->position.x += deltaX; + playerStatus->position.z -= deltaZ; + } else { + data->pushSpeed = 0.0f; + } +} + +void entity_Padlock_idle(Entity* entity) { + PadlockData* data = entity->dataBuf.padlock; + + switch (data->state) { + case 0: + entity_Padlock_push_player(entity); + if (entity->flags & ENTITY_FLAGS_100000) { + data->state++; + sfx_play_sound(SOUND_269); + } + break; + case 1: + data->shacklePos += 5.0f; + if (data->shacklePos >= 20.0f) { + data->shacklePos = 20.0f; + data->state++; + entity->rotation.z += 12.0; + data->fallSpeed = -2.0f; + data->rotationSpeed = 0.2f; + } + break; + case 2: + data->rotationSpeed += 0.2; + entity->rotation.x += data->rotationSpeed; + + data->fallSpeed -= 1.0; + entity->position.y += data->fallSpeed; + + if (entity->position.y <= entity->shadowPosY) { + entity->position.y = entity->shadowPosY; + data->fallSpeed = 5.0f; + data->rotationSpeed = 3.0f; + data->state++; + fx_sparkles(0, entity->position.x, entity->position.y + 25.0f, entity->position.z, 10.0f); + entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + } + break; + case 3: + data->rotationSpeed += 0.2; + entity->rotation.x += data->rotationSpeed; + + data->fallSpeed -= 2.0; + entity->position.y += data->fallSpeed; + + if (entity->position.y <= entity->shadowPosY) { + entity->position.y = entity->shadowPosY; + data->timer = 2; + data->fallSpeed = 10.0f; + data->rotationSpeed = 0.2f; + data->state++; + sfx_play_sound(SOUND_26A); + } + break; + case 4: + if (--data->timer <= 0) { + data->state++; + } + break; + case 5: + data->rotationSpeed *= 2.0f; + if (data->rotationSpeed > 30.0f) { + data->rotationSpeed = 30.0f; + } + entity->rotation.x += data->rotationSpeed; + if (entity->rotation.x >= 90.0) { + entity->rotation.x = 90.0f; + data->rotationSpeed = -20.0f; + data->state++; + sfx_play_sound(SOUND_26A); + } + break; + case 6: + data->rotationSpeed += 10.0f; + if (data->rotationSpeed > 30.0f) { + data->rotationSpeed = 30.0f; + } + entity->rotation.x += data->rotationSpeed; + if (entity->rotation.x >= 90.0) { + entity->rotation.x = 90.0f; + data->timer = 5; + data->state++; + sfx_play_sound(SOUND_26A); + } + break; + case 7: + if (--data->timer <= 0) { + data->state++; + entity_start_script(entity); + data->timer = 5; + } + break; + case 8: + if (--data->timer <= 0) { + data->state++; + entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HIDDEN; + exec_entity_commandlist(entity); + } + break; + } + + if (data->state == 2 || data->state == 3 || data->state == 4 || data->state == 5 || data->state == 6 || data->state == 7 || data->state == 8) { + data->blinkCounter++; + if (data->blinkCounter & 1) { + entity->flags |= ENTITY_FLAGS_HIDDEN; + } else { + entity->flags &= ~ENTITY_FLAGS_HIDDEN; + } + } +} + +void entity_Padlock_init(Entity* entity) { + PadlockData* data; + + entity->renderSetupFunc = entity_Padlock_setupGfx; + data = entity->dataBuf.padlock; + data->shackleMtx = ENTITY_ADDR(entity, Mtx*, &Entity_Padlock_mtxShackle); + data->shackleGfx = Entity_Padlock_RenderShackle; +} + +void entity_PadlockRedFrame_init(Entity* entity) { + PadlockData* data; + + entity->renderSetupFunc = entity_Padlock_setupGfx; + data = entity->dataBuf.padlock; + data->shackleMtx = ENTITY_ADDR(entity, Mtx*, &Entity_PadlockRedFrame_mtxShackle); + data->shackleGfx = Entity_PadlockRedFrame_RenderShackle; +} + +void entity_PadlockRedFace_init(Entity* entity) { + PadlockData* data; + + entity->renderSetupFunc = entity_Padlock_setupGfx; + data = entity->dataBuf.padlock; + data->shackleMtx = ENTITY_ADDR(entity, Mtx*, &Entity_PadlockRedFace_mtxShackle); + data->shackleGfx = Entity_PadlockRedFace_RenderShackle; +} + +void entity_PadlockBlueFace_init(Entity* entity) { + PadlockData* data; + + entity->renderSetupFunc = entity_Padlock_setupGfx; + data = entity->dataBuf.padlock; + data->shackleMtx = ENTITY_ADDR(entity, Mtx*, &Entity_PadlockBlueFace_mtxShackle); + data->shackleGfx = Entity_PadlockBlueFace_RenderShackle; +} + +EntityScript Entity_Padlock_Script = { + es_SetCallback(entity_Padlock_idle, 0) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityModelScript Entity_Padlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Padlock_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_PadlockRedFrame_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PadlockRedFrame_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_PadlockRedFace_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PadlockRedFace_Render, RENDER_MODE_SURFACE_OPA); +EntityModelScript Entity_PadlockBlueFace_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PadlockBlueFace_Render, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_Padlock = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .typeDataSize = sizeof(PadlockData), + .renderCommandList = Entity_Padlock_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_Padlock_init, + .updateEntityScript = Entity_Padlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(Padlock) }, + .entityType = ENTITY_TYPE_PADLOCK, + .aabbSize = { 30, 175, 10 } +}; + +EntityBlueprint Entity_PadlockRedFrame = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .typeDataSize = sizeof(PadlockData), + .renderCommandList = Entity_PadlockRedFrame_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_PadlockRedFrame_init, + .updateEntityScript = Entity_Padlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(PadlockRedFrame) }, + .entityType = ENTITY_TYPE_PADLOCK_RED_FRAME, + .aabbSize = { 30, 175, 10 } +}; + +EntityBlueprint Entity_PadlockRedFace = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .typeDataSize = sizeof(PadlockData), + .renderCommandList = Entity_PadlockRedFace_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_PadlockRedFace_init, + .updateEntityScript = Entity_Padlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(PadlockRedFace) }, + .entityType = ENTITY_TYPE_PADLOCK_RED_FACE, + .aabbSize = { 30, 175, 10 } + }; + +EntityBlueprint Entity_PadlockBlueFace = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .typeDataSize = sizeof(PadlockData), + .renderCommandList = Entity_PadlockBlueFace_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_PadlockBlueFace_init, + .updateEntityScript = Entity_Padlock_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(PadlockBlueFace) }, + .entityType = ENTITY_TYPE_PADLOCK_BLUE_FACE, + .aabbSize = { 30, 175, 10 } +}; diff --git a/src/entity/jan_iwa/ArrowSign.c b/src/entity/jan_iwa/ArrowSign.c new file mode 100644 index 0000000000..fa9a4ee062 --- /dev/null +++ b/src/entity/jan_iwa/ArrowSign.c @@ -0,0 +1,66 @@ +#include "common.h" +#include "entity.h" +#include "ld_addrs.h" + +extern Gfx Entity_ArrowSign_Render[]; +extern Gfx Entity_ArrowSign_RenderRotatedSign[]; +extern Mtx Entity_ArrowSign_mtxSign; + +void entity_ArrowSign_setupGfx(s32 entityIndex) { + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + ArrowSignData* data = entity->dataBuf.arrowSign; + Matrix4f sp18; + Matrix4f sp58; + Gfx* gfx; + + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_ArrowSign_mtxSign)); + guRotateF(sp58, clamp_angle(data->angle - 90.0f), 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gfx = ENTITY_ADDR(entity, Gfx*, Entity_ArrowSign_RenderRotatedSign); + gSPDisplayList(gfxPos++, gfx); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + gMasterGfxPos = gfxPos; +} + +void entity_ArrowSign_idle(void) { +} + +void entity_ArrowSign_init(Entity* entity) { + f32 angle = CreateEntityVarArgBuffer[0]; + ArrowSignData* data = entity->dataBuf.arrowSign; + + data->angle = angle; + data->unk_08 = angle; + entity->renderSetupFunc = entity_ArrowSign_setupGfx; +} + +s32 entity_ArrowSign_handle_collision(Entity* entity) { + if (!(gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT) && + (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { + entity_start_script(entity); + } +} + +EntityScript Entity_ArrowSign_Script = { + es_SetCallback(entity_ArrowSign_idle, 0) + es_End +}; + +EntityModelScript Entity_ArrowSign_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_ArrowSign_Render, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_ArrowSign = { + .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(ArrowSignData), + .renderCommandList = Entity_ArrowSign_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_ArrowSign_init, + .updateEntityScript = Entity_ArrowSign_Script, + .fpHandleCollision = entity_ArrowSign_handle_collision, + { .dma = ENTITY_ROM(ArrowSign) }, + .entityType = ENTITY_TYPE_RED_ARROW_SIGNS, + .aabbSize = { 18, 50, 10 } +}; diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c deleted file mode 100644 index 6441aeea72..0000000000 --- a/src/entity/jan_iwa/E2D730.c +++ /dev/null @@ -1,235 +0,0 @@ -#include "common.h" -#include "sprite.h" - -extern EntityBlueprint D_802BC7D0_E2F100; -extern f32 D_802BCE20; -// size unknown -typedef struct structE2D730 { - /* 0x00 */ u8 unk_00; - /* 0x01 */ s8 unk_01; - /* 0x02 */ s8 unk_02; - /* 0x04 */ union { // might be 2 different structs? - /* */ s16 index; - /* */ f32 f; - /* */ } unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ s8 unk_0C[8]; - /* 0x14 */ f32 unk_14; - /* 0x18 */ s8 unk_18[0x10]; - /* 0x28 */ s16 unk_28; - /* 0x2A */ s16 unk_2A; - /* 0x2C */ s16 unk_2C; -} structE2D730; - -s32 func_802BAE00_E2D730(void); -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BAE00_E2D730); - -extern u16 D_802BCE30; -extern u16 D_802BCE32; -extern u16 D_802BCE34; - -void func_802BB000_E2D930(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - PlayerStatus* playerStatus = &gPlayerStatus; - - if ((entity->collisionFlags & 1) && !is_picking_up_item()) { - if (playerStatus->actionState == ACTION_STATE_RIDE) { - playerStatus->animFlags |= 4; - } else if (playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER) { - D_802BCE34 = data->unk_28; - D_802BCE30 = data->unk_2A; - D_802BCE32 = data->unk_2C; - set_action_state(ACTION_STATE_USE_SPINNING_FLOWER); - } - } -} - -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB0A0_E2D9D0); - -void func_802BB228_E2DB58(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - - func_802BB000_E2D930(entity); - data->unk_14 += 2.0; - if (data->unk_14 > 40.0f) { - data->unk_14 = 40.0f; - } - data->unk_08 = clamp_angle(data->unk_08 + data->unk_14); -} - -void func_802BB298_E2DBC8(Entity* entity) { - s32 temp_a1; - s32 temp_a2; - s32 temp_v1; - structE2D730* data; - s32 x, y, z; - - data = (structE2D730*)entity->dataBuf.unk; - x = CreateEntityVarArgBuffer[0]; - y = CreateEntityVarArgBuffer[1]; - z = CreateEntityVarArgBuffer[2]; - if (!(x | y | z)) { - x = entity->position.x; - y = entity->position.y + 100.0f; - z = entity->position.z; - } - - data->unk_28 = x; - data->unk_2A = y; - data->unk_2C = z; - data->unk_02 = 0; - entity->renderSetupFunc = &func_802BAE00_E2D730; -} - -void func_802BB314_E2DC44(Entity* entity) { - sfx_play_sound_at_position(SOUND_8000006A, 0, entity->position.x, entity->position.y, entity->position.z); -} - -void func_802BB34C_E2DC7C(void) { - sfx_play_sound(SOUND_791); - func_80149A6C(0x391, 1); -} - -s32 func_802BB374_E2DCA4(void); -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB374_E2DCA4); - -// regalloc, play_model_animation weirdness -#ifdef NON_EQUIVALENT -void func_802BB648_E2DF78(Entity* entity) { - structE2D730* temp_a1_2; - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - - if ((gPlayerStatus.animFlags & 0x10) && (entity->collisionFlags & 0x48)) { - if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { - entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - temp_a1_2 = (structE2D730*)get_entity_by_index(data->unk_04)->dataBuf.unk; - if (temp_a1_2->unk_00 == 0) { - temp_a1_2->unk_00 = 1; - exec_entity_commandlist(entity); - play_model_animation(entity->virtualModelIndex, 0xF4); - } - } - } -} -#else -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB648_E2DF78); -#endif - -void func_802BB6E0_E2E010(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - Entity* newEntity; - s32 entityIndex; - - get_animator_by_index(entity->virtualModelIndex)->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - entityIndex = create_entity(&D_802BC7D0_E2F100, entity->position.x, entity->position.y, entity->position.z, 0, MAKE_ENTITY_END); - data->unk_04.index = entityIndex; - newEntity = get_entity_by_index(entityIndex); - data = (structE2D730*)newEntity->dataBuf.unk; - data->unk_04.index = entity->listIndex; - data->unk_08 = newEntity->rotation.y; -} - -void func_802BB778_E2E0A8(Entity* entity) { - entity->scale.x = 0.0f; - entity->renderSetupFunc = &func_802BB374_E2DCA4; -} - -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB78C_E2E0BC); - -void func_802BB8D4_E2E204(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - data->unk_08 = fabs(dist2D(entity->position.x - 2.0f, entity->position.z - 2.0f, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); - data->unk_04.f = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x - 2.0f, entity->position.z - 2.0f); -} - -void func_802BB98C_E2E2BC(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - gCameras[CAM_DEFAULT].targetPos.x = gPlayerStatus.position.x; - gCameras[CAM_DEFAULT].targetPos.y = gPlayerStatus.position.y; - gCameras[CAM_DEFAULT].targetPos.z = gPlayerStatus.position.z; - add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->unk_08, data->unk_04.f); -} - -#ifdef NON_EQUIVALENT // play_model_animation weirdness, branch likely in case 0 -void func_802BB9E0_E2E310(Entity* entity) { - structE2D730* data = (structE2D730*)entity->dataBuf.unk; - PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; - PlayerStatus* playerStatus = &gPlayerStatus; - f32 temp_f2; - f32 phi_f4; - - switch (data->unk_00) { - case 0: - if (entity->collisionFlags & 1) { - data->unk_01 = 0; - if (partnerActionStatus->actingPartner != 0) { - playerStatus->animFlags |= 4; - } - func_800EF300(partnerActionStatus); - playerStatus->animFlags |= 0x40000; - data->unk_02 = 4; - data->unk_01++; - data->unk_00++; - disable_player_input(); - set_action_state(0); - play_model_animation(entity->virtualModelIndex, 0x214); - sfx_play_sound(242); - func_802BB8D4_E2E204(entity); - } - break; - case 1: - playerStatus->animFlags |= 0x40000; - data->unk_02--; - if (data->unk_02 == 0) { - start_rumble(128, 10); - data->unk_02 = 30; - data->unk_00++; - temp_f2 = playerStatus->spriteFacingAngle; - playerStatus->spriteFacingAngle = 80.0f; - playerStatus->flags |= 0x100000; - D_802BCE20 = temp_f2; - } - func_802BB98C_E2E2BC(entity); - break; - case 2: - data->unk_02--; - if ((data->unk_02) == 0) { - data->unk_00++; - func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); - func_802DDFF8(0x10002, 5, 19, 1, 1, 0, 0); - } - break; - case 3: - data->unk_00++; - break; - case 4: - playerStatus->spriteFacingAngle = D_802BCE20; - phi_f4 = 270.0f; - if (D_802BCE20 != 0.0f) { - phi_f4 = 90.0f; - } - playerStatus->targetYaw = phi_f4; - data->unk_02 = 0x50; - data->unk_00++; - break; - case 5: - data->unk_02--; - if ((data->unk_02) == 0) { - data->unk_00++; - func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); - enable_player_input(); - playerStatus->flags &= ~0x100000; - } - break; - case 6: - if (!(entity->collisionFlags & 1) && (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE)) { - data->unk_00 = 0; - enable_partner_ai(); - phys_adjust_cam_on_landing(); - } - break; - } -} -#else -INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB9E0_E2E310); -#endif diff --git a/src/entity/jan_iwa/E2E5F0.c b/src/entity/jan_iwa/E2E5F0.c deleted file mode 100644 index 96111b41c7..0000000000 --- a/src/entity/jan_iwa/E2E5F0.c +++ /dev/null @@ -1,147 +0,0 @@ -#include "common.h" -#include "effects.h" - -extern EntityBlueprint D_802BCC44_E2F574; -extern EntityBlueprint D_802BCC68_E2F598; -extern EntityBlueprint D_802BCC8C_E2F5BC; -extern EntityBlueprint D_802BCCB0_E2F5E0; -extern EntityBlueprint D_802BCCD4_E2F604; -extern EntityBlueprint D_802BCCF8_E2F628; -extern EntityBlueprint D_802BCD1C_E2F64C; -extern EntityBlueprint D_802BCD40_E2F670; - -// size unknown -typedef struct structE2E5F0 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s8 unk_04[0x8]; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; -} structE2E5F0; - -INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBCC0_E2E5F0); - -INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBD1C_E2E64C); - -void func_802BBD78_E2E6A8(Entity* entity) { - f32 xOffset, zOffset, angle; - - angle = (clamp_angle(entity->rotation.y) * TAU) / 360.0f; - xOffset = cos_rad(angle) * -26.0; - zOffset = sin_rad(angle) * 6.0; - fx_stars_burst(0, entity->position.x + xOffset, entity->position.y + 62.0f, entity->position.z + zOffset, clamp_angle(entity->rotation.y - 90.0), 54.0f, 2); -} - -INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBE8C_E2E7BC); - -void func_802BC00C_E2E93C(Entity* entity) { - make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 30.0f, entity->position.z, 0x13, 0); -} - -void func_802BC050_E2E980(Entity* entity) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (entity->collisionFlags & 1) { - Entity* other; - gPlayerStatus.animFlags |= 4; - func_800EF300(); - other = get_entity_by_index(entity->dataBuf.unk[0]); - exec_entity_commandlist(entity); - exec_entity_commandlist(other); - } -} - -#ifdef NON_EQUIVALENT // play_model_animation weirdness -void func_802BC0B8_E2E9E8(Entity* entity) { - play_model_animation(entity->virtualModelIndex, 0x60); - disable_player_input(); - disable_player_shadow(); -} -#else -INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC0B8_E2E9E8); -#endif - -void func_802BC0F0_E2EA20(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; - data->unk_18 = fabs(dist2D(entity->position.x, entity->position.z, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); - data->unk_14 = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x, entity->position.z); -} - -void func_802BC17C_E2EAAC(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; - - gCameras[CAM_DEFAULT].targetPos.x = gPlayerStatus.position.x; - gCameras[CAM_DEFAULT].targetPos.y = gPlayerStatus.position.y; - gCameras[CAM_DEFAULT].targetPos.z = gPlayerStatus.position.z; - add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->unk_18, data->unk_14); -} - -s32 func_802BC1D0_E2EB00(Entity* entity, EntityBlueprint* EntityBlueprint) { - return create_entity(EntityBlueprint, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y); -} - -void func_802BC220_E2EB50(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; - data->unk_00 = func_802BC1D0_E2EB00(entity, &D_802BCC44_E2F574); -} - -void func_802BC250_E2EB80(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCC68_E2F598); -} - -void func_802BC274_E2EBA4(Entity* entity) { - subtract_hp(1); - func_802BC1D0_E2EB00(entity, &D_802BCC8C_E2F5BC); - set_action_state(ACTION_STATE_USE_SPRING); -} - -void func_802BC2B4_E2EBE4(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCCB0_E2F5E0); - gPlayerStatus.prevActionState = 0; - gPlayerStatus.actionState = 0; - gPlayerStatus.flags &= ~0x80000000; - suggest_player_anim_setUnkFlag(0x8001F); -} - -void func_802BC308_E2EC38(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCCD4_E2F604); -} - -void func_802BC32C_E2EC5C(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCCF8_E2F628); - enable_partner_ai(); -} - -void func_802BC358_E2EC88(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCD1C_E2F64C); -} - -void func_802BC37C_E2ECAC(Entity* entity) { - func_802BC1D0_E2EB00(entity, &D_802BCD40_E2F670); -} - -void func_802BC3A0_E2ECD0(void) { - enable_player_input(); - enable_player_shadow(); - set_action_state(ACTION_STATE_USE_MUNCHLESIA); -} - -void func_802BC3CC_E2ECFC(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; - data->unk_0C = gPlayerStatus.position.y; - data->unk_10 = 0; -} - -void func_802BC3E4_E2ED14(Entity* entity) { - structE2E5F0* data = (structE2E5F0*)entity->dataBuf.unk; - gPlayerStatus.position.y = data->unk_0C + (sin_rad((data->unk_10 * TAU) / 360.0f) * 3.0f); - - data->unk_10 += 24.0f; - if (data->unk_10 > 360.0f) { - data->unk_10 -= 360.0f; - } - if (data->unk_10 == 96.0f) { - sfx_play_sound(SOUND_392); - } -} diff --git a/src/entity/jan_iwa/E2EDE0.c b/src/entity/jan_iwa/E2EDE0.c deleted file mode 100644 index fa1113d4e6..0000000000 --- a/src/entity/jan_iwa/E2EDE0.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" - -typedef struct structE2EDE0 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; -} structE2EDE0; - -s32 func_802BC4B0_E2EDE0(void); -INCLUDE_ASM(s32, "entity/jan_iwa/E2EDE0", func_802BC4B0_E2EDE0); - -void func_802BC628_E2EF58(void) { -} - -void func_802BC630_E2EF60(Entity* entity) { - f32 temp_f0 = *CreateEntityVarArgBuffer; - structE2EDE0* data = (structE2EDE0*)entity->dataBuf.unk; - - data->unk_04 = temp_f0; - data->unk_08 = temp_f0; - entity->renderSetupFunc = &func_802BC4B0_E2EDE0; -} - -void func_802BC658_E2EF88(Entity* entity) { - if (!(gPlayerStatus.animFlags & 1) && (entity->collisionFlags & 8)) { - entity_start_script(entity); - } -} diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c new file mode 100644 index 0000000000..552f8d3de4 --- /dev/null +++ b/src/entity/jan_iwa/Plants1.c @@ -0,0 +1,431 @@ +#include "common.h" +#include "sprite.h" +#include "entity.h" +#include "animation_script.h" +#include "ld_addrs.h" + +extern Gfx Entity_RenderNone[]; +extern AnimScript Entity_CymbalPlant_AnimationIdle; +extern AnimScript Entity_CymbalPlant_AnimationGrab; +extern AnimScript Entity_PinkFlower_AnimationLightUp; +extern StaticAnimatorNode* Entity_CymbalPlant_Mesh[]; +extern EntityBlueprint Entity_PinkFlowerLight; +extern StaticAnimatorNode* Entity_PinkFlower_Mesh[]; +extern AnimScript Entity_PinkFlower_AnimationIdle; +extern Mtx D_0A001098_E9C598; +extern Gfx D_0A0013B8_E9C8B8[]; +extern Mtx D_0A000B70_E9D470; +extern Gfx D_0A000D18_E9D618[]; +extern Gfx Entity_SpinningFlower_Render[]; + +BSS f32 D_802BCE20; +BSS f32 D_802BCE24[3]; // unused +BSS u16 D_802BCE30; +BSS u16 D_802BCE32; +BSS u16 D_802BCE34; + +void entity_SpinningFlower_setupGfx(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + SpinningFlowerData* data = entity->dataBuf.spinningFlower; + Gfx* gfxPos = gMasterGfxPos; + Matrix4f sp18; + Matrix4f sp58; + Matrix4f sp98; + Gfx* gfx; + + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &D_0A000B70_E9D470)); + guRotateF(sp58, data->rotation.x, 1.0f, 0.0f, 0.0f); + guRotateF(sp98, data->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp58, sp98, sp98); + guRotateF(sp58, data->rotation.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp98, sp58, sp58); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &data->unk_30); + gDisplayContext->matrixStack[gMatrixListPos] = data->unk_30; + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gfx = ENTITY_ADDR(entity, Gfx*, D_0A000D18_E9D618); + gSPDisplayList(gfxPos++, gfx); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + gMasterGfxPos = gfxPos; +} + +void func_802BB000_E2D930(Entity* entity) { + SpinningFlowerData* data = entity->dataBuf.spinningFlower; + PlayerStatus* playerStatus = &gPlayerStatus; + + if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && !is_picking_up_item()) { + if (playerStatus->actionState == ACTION_STATE_RIDE) { + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; + } else if (playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER) { + D_802BCE34 = data->unk_28; + D_802BCE30 = data->unk_2A; + D_802BCE32 = data->unk_2C; + set_action_state(ACTION_STATE_USE_SPINNING_FLOWER); + } + } +} + +void func_802BB0A0_E2D9D0(Entity* entity) { + SpinningFlowerData* data = entity->dataBuf.spinningFlower; + PlayerStatus* playerStatus = &gPlayerStatus; + + func_802BB000_E2D930(entity); + switch (data->state) { + case 0: + data->unk_18 = 0; + data->unk_00 = 0; + data->state = 1; + data->rotation.x = 0.0f; + data->rotation.z = 0.0f; + break; + case 1: + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { + data->spinSpeed += 0.02; + if (data->spinSpeed > 2.0) { + if (data->spinSpeed > 2.0) { + data->spinSpeed -= 0.4; + } + } + } else { + data->spinSpeed += 0.8; + if (data->spinSpeed > 14.0f) { + data->spinSpeed = 14.0f; + } + } + break; + } + + data->rotation.y = clamp_angle(data->rotation.y + data->spinSpeed); + + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && + (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_SPINNING) && + fabs(dist2D(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z)) < 60.0) + { + exec_entity_commandlist(entity); + } +} + +void func_802BB228_E2DB58(Entity* entity) { + SpinningFlowerData* data = entity->dataBuf.spinningFlower; + + func_802BB000_E2D930(entity); + data->spinSpeed += 2.0; + if (data->spinSpeed > 40.0f) { + data->spinSpeed = 40.0f; + } + data->rotation.y = clamp_angle(data->rotation.y + data->spinSpeed); +} + +void entity_SpinningFlower_init(Entity* entity) { + SpinningFlowerData* data = entity->dataBuf.spinningFlower; + s32 x, y, z; + + x = CreateEntityVarArgBuffer[0]; + y = CreateEntityVarArgBuffer[1]; + z = CreateEntityVarArgBuffer[2]; + if (!(x | y | z)) { + x = entity->position.x; + y = entity->position.y + 100.0f; + z = entity->position.z; + } + + data->unk_28 = x; + data->unk_2A = y; + data->unk_2C = z; + data->state = 0; + entity->renderSetupFunc = entity_SpinningFlower_setupGfx; +} + +void func_802BB314_E2DC44(Entity* entity) { + sfx_play_sound_at_position(SOUND_8000006A, 0, entity->position.x, entity->position.y, entity->position.z); +} + +void func_802BB34C_E2DC7C(void) { + sfx_play_sound(SOUND_791); + func_80149A6C(0x391, 1); +} + +void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + PinkFlowerData* data = entity->dataBuf.pinkFlower; + Gfx* gfxPos = gMasterGfxPos; + Matrix4f sp18; + Matrix4f sp58; + f32 sinAngle, cosAngle; + + guRotateF(sp58, entity->rotation.y, 0.0f, 1.0f, 0.0f); + guScaleF(sp18, entity->scale.x, entity->scale.x, entity->scale.x); + guMtxCatF(sp18, sp58, sp58); + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &D_0A001098_E9C598)); + sin_cos_rad((gCameras[CAM_DEFAULT].currentYaw + 180.0f) * TAU / 360.0f, &sinAngle, &cosAngle); + sp18[3][1] += 10.0f; + sp18[3][2] -= 10.0f; + guMtxCatF(sp58, sp18, sp18); + guRotateF(sp58, entity->rotation.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(sp18, sp58, sp18); + guRotateF(sp58, data->initialRotY, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp18, sp58, sp18); + guTranslateF(sp58, entity->position.x + 16.0f * sinAngle, entity->position.y , entity->position.z - 16.0f * cosAngle); + guMtxCatF(sp18, sp58, sp18); + gDPSetCombineLERP(gfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, entity->alpha); + guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxPos++, D_0A0013B8_E9C8B8); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + gMasterGfxPos = gfxPos; +} + +void entity_PinkFlower_idle(Entity* entity) { + PinkFlowerData* data = entity->dataBuf.pinkFlower; + + if ((gPlayerStatus.animFlags & 0x10) && (entity->collisionFlags & 0x48)) { + if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { + entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + data = get_entity_by_index(data->linkedEntityIndex)->dataBuf.pinkFlower; + if (data->state == 0) { + data->state = 1; + exec_entity_commandlist(entity); + play_model_animation(entity->virtualModelIndex, Entity_PinkFlower_AnimationLightUp); + } + } + } +} + +void entity_PinkFlower_init(Entity* entity) { + PinkFlowerData* data = entity->dataBuf.pinkFlower; + Entity* newEntity; + s32 entityIndex; + + get_animator_by_index(entity->virtualModelIndex)->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; + entityIndex = create_entity(&Entity_PinkFlowerLight, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, 0, MAKE_ENTITY_END); + data->linkedEntityIndex = entityIndex; + newEntity = get_entity_by_index(entityIndex); + data = newEntity->dataBuf.pinkFlower; + data->linkedEntityIndex = entity->listIndex; + data->initialRotY = newEntity->rotation.y; +} + +void entity_PinkFlowerLight_init(Entity* entity) { + entity->scale.x = 0.0f; + entity->renderSetupFunc = entity_PinkFlowerLight_setupGfx; +} + +void entity_PinkFlowerLight_idle(Entity* entity) { + PinkFlowerData* data = entity->dataBuf.pinkFlower; + + switch (data->timer) { + case 0: + if (data->state != 0) { + data->state = 0; + data->timer++; + entity->rotation.z = -25.0f; + entity->scale.x = 1.8f; + entity->alpha = 255; + } + break; + case 1: + entity->rotation.z += 1.0f; + if (entity->rotation.z >= 8.0f) { + entity->rotation.z = 8.0f; + } + + entity->alpha -= 6; + if (entity->alpha < 6) { + entity->alpha = 6; + } + + entity->scale.x -= 0.03; + if (entity->scale.x <= 0.1) { + data->timer = 0; + entity->scale.x = 0.0f; + } + entity->scale.y = entity->scale.x; + entity->scale.z = entity->scale.x; + break; + } + + data->initialRotY = get_entity_by_index(data->linkedEntityIndex)->rotation.y; + entity->rotation.y = gCameras[CAM_DEFAULT].currentYaw; +} + +void func_802BB8D4_E2E204(Entity* entity) { + CymbalPlantData* data = entity->dataBuf.cymbalPlant; + data->dist = fabs(dist2D(entity->position.x - 2.0f, entity->position.z - 2.0f, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); + data->angle = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x - 2.0f, entity->position.z - 2.0f); +} + +void func_802BB98C_E2E2BC(Entity* entity) { + CymbalPlantData* data = entity->dataBuf.cymbalPlant; + gCameras[CAM_DEFAULT].targetPos.x = gPlayerStatus.position.x; + gCameras[CAM_DEFAULT].targetPos.y = gPlayerStatus.position.y; + gCameras[CAM_DEFAULT].targetPos.z = gPlayerStatus.position.z; + add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->dist, data->angle); +} + +void entity_CymbalPlant_idle(Entity* entity) { + CymbalPlantData* data = entity->dataBuf.cymbalPlant; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + PlayerStatus* playerStatus = &gPlayerStatus; + f32 yaw; + f32 targetYaw; + + switch (data->state) { + case 0: + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + if (partnerActionStatus->actingPartner != 0) { + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; + } + func_800EF300(); + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_40000; + data->timer = 4; + data->unk_01++; + data->state++; + disable_player_input(); + set_action_state(0); + play_model_animation(entity->virtualModelIndex, Entity_CymbalPlant_AnimationGrab); + sfx_play_sound(242); + func_802BB8D4_E2E204(entity); + } else { + data->unk_01 = 0; + } + break; + case 1: + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_40000; + if (--data->timer == 0) { + start_rumble(128, 10); + data->timer = 30; + data->state++; + yaw = playerStatus->spriteFacingAngle; + playerStatus->spriteFacingAngle = 80.0f; + playerStatus->flags |= PLAYER_STATUS_FLAGS_100000; + D_802BCE20 = yaw; + } + func_802BB98C_E2E2BC(entity); + break; + case 2: + if (--data->timer == 0) { + data->state++; + func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); + func_802DDFF8(0x10002, 5, 19, 1, 1, 0, 0); + } + break; + case 3: + data->state++; + break; + case 4: + playerStatus->spriteFacingAngle = D_802BCE20; + targetYaw = 270.0f; + if (D_802BCE20 != 0.0f) { + targetYaw = 90.0f; + } + playerStatus->targetYaw = targetYaw; + data->timer = 80; + data->state++; + break; + case 5: + if (--data->timer == 0) { + data->state++; + func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); + enable_player_input(); + playerStatus->flags &= ~PLAYER_STATUS_FLAGS_100000; + } + break; + case 6: + if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { + data->state = 0; + enable_partner_ai(); + phys_adjust_cam_on_landing(); + } + break; + } +} + +EntityScript Entity_SpinningFlower_Script = { + es_SetCallback(func_802BB0A0_E2D9D0, 0) + es_Call(func_802BB314_E2DC44) + es_SetCallback(func_802BB228_E2DB58, 70) + es_Call(func_802BB34C_E2DC7C) + es_Restart + es_End +}; + +EntityScript Entity_PinkFlower_Script = { + es_SetCallback(entity_PinkFlower_idle, 0) + es_PlaySound(SOUND_F4) + es_SetCallback(NULL, 50) + es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_Restart + es_End +}; + +EntityScript Entity_PinkFlowerLight_Script = { + es_SetCallback(entity_PinkFlowerLight_idle, 0) + es_Restart + es_End +}; + +EntityScript Entity_CymbalPlant_Update = { + es_SetCallback(entity_CymbalPlant_idle, 0) + es_End +}; + +EntityModelScript Entity_PinkFlowerLight_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER2); +EntityModelScript Entity_SpinningFlower_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_SpinningFlower_Render, RENDER_MODE_SURFACE_XLU_LAYER1); + +DmaEntry Entity_CymbalPlant_dma[] = { ENTITY_ROM(CymbalPlant_gfx), ENTITY_ROM(CymbalPlant_anim) }; +DmaEntry Entity_PinkFlower_dma[] = { ENTITY_ROM(PinkFlower_gfx), ENTITY_ROM(PinkFlower_anim) }; + +EntityBlueprint Entity_CymbalPlant = { + .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(CymbalPlantData), + .renderCommandList = Entity_CymbalPlant_AnimationIdle, + .modelAnimationNodes = Entity_CymbalPlant_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_CymbalPlant_Update, + .fpHandleCollision = NULL, + { .dmaList = Entity_CymbalPlant_dma }, + .entityType = ENTITY_TYPE_CYMBAL_PLANT, + .aabbSize = { 103, 30, 24 } +}; + +EntityBlueprint Entity_PinkFlower = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(PinkFlowerData), + .renderCommandList = Entity_PinkFlower_AnimationIdle, + .modelAnimationNodes = Entity_PinkFlower_Mesh, + .fpInit = entity_PinkFlower_init, + .updateEntityScript = Entity_PinkFlower_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_PinkFlower_dma }, + .entityType = ENTITY_TYPE_PINK_FLOWER, + .aabbSize = { 44, 100, 25 } +}; + +EntityBlueprint Entity_PinkFlowerLight = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_DISABLE_COLLISION, + .typeDataSize = sizeof(PinkFlowerData), + .renderCommandList = Entity_PinkFlowerLight_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_PinkFlowerLight_init, + .updateEntityScript = Entity_PinkFlowerLight_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(PinkFlower_gfx) }, + .entityType = ENTITY_TYPE_PINK_FLOWER, + .aabbSize = { 44, 100, 25 } +}; + +EntityBlueprint Entity_SpinningFlower = { + .flags = 0, + .typeDataSize = sizeof(SpinningFlowerData), + .renderCommandList = Entity_SpinningFlower_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_SpinningFlower_init, + .updateEntityScript = Entity_SpinningFlower_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(SpinningFlower) }, + .entityType = ENTITY_TYPE_SPINNING_FLOWER, + .aabbSize = { 45, 22, 42 } +}; + +static const f32 rodata_padding[] = {0.0f, 0.0f}; diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c new file mode 100644 index 0000000000..fa1953b424 --- /dev/null +++ b/src/entity/jan_iwa/Plants2.c @@ -0,0 +1,470 @@ +#include "common.h" +#include "effects.h" +#include "entity.h" +#include "animation_script.h" +#include "ld_addrs.h" + +extern EntityBlueprint Entity_MunchlesiaReset; +extern EntityBlueprint Entity_MunchlesiaGrab; +extern EntityBlueprint Entity_MunchlesiaEnvelop; +extern EntityBlueprint Entity_MunchlesiaBeginChew; +extern EntityBlueprint Entity_MunchlesiaChewing; +extern EntityBlueprint Entity_MunchlesiaSpitOut; +extern EntityBlueprint Entity_MunchlesiaReset1; +extern EntityBlueprint Entity_MunchlesiaReset2; + +extern EntityModelScript Entity_RenderNone_Script; + +extern AnimScript Entity_BellbellPlant_AnimationIdle; +extern AnimScript Entity_BellbellPlant_AnimationUse; +extern StaticAnimatorNode* Entity_BellbellPlant_Mesh[]; +extern AnimScript Entity_TrumpetPlant_AnimationIdle; +extern AnimScript Entity_TrumpetPlant_AnimationUse; +extern StaticAnimatorNode* Entity_TrumpetPlant_Mesh[]; +extern AnimScript Entity_MunchlesiaReset_AnimationIdle; +extern AnimScript Entity_MunchlesiaReset_AnimationReset; +extern StaticAnimatorNode* Entity_MunchlesiaReset_Mesh[]; +extern AnimScript Entity_MunchlesiaGrab_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaGrab_Mesh[]; +extern AnimScript Entity_MunchlesiaEnvelop_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaEnvelop_Mesh[]; +extern AnimScript Entity_MunchlesiaBeginChew_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaBeginChew_Mesh[]; +extern AnimScript Entity_MunchlesiaChewing_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaChewing_Mesh[]; +extern AnimScript Entity_MunchlesiaSpitOut_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaSpitOut_Mesh[]; +extern AnimScript Entity_MunchlesiaReset1_Animation; +extern StaticAnimatorNode* Entity_MunchlesiaReset1_Mesh[]; + +void entity_BellbellPlant_idle(Entity* entity) { + if ((gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && + (entity->collisionFlags & (ENTITY_COLLISION_PLAYER_HAMMER | ENTITY_COLLISION_PLAYER_TOUCH_WALL))) { + exec_entity_commandlist(entity); + play_model_animation(entity->virtualModelIndex, Entity_BellbellPlant_AnimationUse); + } +} + +void entity_TrumpetPlant_idle(Entity* entity) { + if ((gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && + (entity->collisionFlags & (ENTITY_COLLISION_PLAYER_HAMMER | ENTITY_COLLISION_PLAYER_TOUCH_WALL))) { + exec_entity_commandlist(entity); + play_model_animation(entity->virtualModelIndex, Entity_TrumpetPlant_AnimationUse); + } +} + +void entity_TrumpetPlant_create_effect(Entity* entity) { + f32 xOffset, zOffset, angle; + + angle = clamp_angle(entity->rotation.y) * TAU / 360.0f; + xOffset = -26.0 * cos_rad(angle); + zOffset = 6.0 * sin_rad(angle); + fx_stars_burst(0, entity->position.x + xOffset, entity->position.y + 62.0f, entity->position.z + zOffset, clamp_angle(entity->rotation.y - 90.0), 54.0f, 2); +} + +void entity_TrumpetPlant_spawn_coin(Entity* entity) { + TrumpetPlantData* data = entity->dataBuf.trumpetPlant; + + entity_TrumpetPlant_create_effect(entity); + if (data->numCoins < 3) { + f32 xOffset, zOffset, angle; + + angle = clamp_angle(entity->rotation.y) * TAU / 360.0f; + xOffset = -26.0 * cos_rad(angle); + zOffset = 6.0 * sin_rad(angle); + + if (rand_int(32) > 16) { + f32 facingAngle = entity->rotation.y - 110.0f + (data->numCoins % 3) * 30; + data->numCoins++; + make_item_entity(ITEM_COIN, + entity->position.x + xOffset, + entity->position.y + 62.0f, + entity->position.z + zOffset, + ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0, + facingAngle, 0); + } + } +} + +void entity_Munchlesia_init(Entity* entity) { + make_item_entity_nodelay(ITEM_COIN, entity->position.x, entity->position.y + 30.0f, entity->position.z, ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH, 0); +} + +void func_802BC050_E2E980(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { + Entity* resetMunchlesia; + gPlayerStatus.animFlags |= 4; + func_800EF300(); + resetMunchlesia = get_entity_by_index(entity->dataBuf.munchlesia->unk_00); + exec_entity_commandlist(entity); + exec_entity_commandlist(resetMunchlesia); + } +} + +void func_802BC0B8_E2E9E8(Entity* entity) { + play_model_animation(entity->virtualModelIndex, Entity_MunchlesiaReset_AnimationReset); + disable_player_input(); + disable_player_shadow(); +} + +void func_802BC0F0_E2EA20(Entity* entity) { + MunchlesiaData* data = entity->dataBuf.munchlesia; + data->unk_18 = fabs(dist2D(entity->position.x, entity->position.z, gPlayerStatus.position.x, gPlayerStatus.position.z) * 0.25); + data->unk_14 = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, entity->position.x, entity->position.z); +} + +void func_802BC17C_E2EAAC(Entity* entity) { + MunchlesiaData* data = entity->dataBuf.munchlesia; + + gCameras[CAM_DEFAULT].targetPos.x = gPlayerStatus.position.x; + gCameras[CAM_DEFAULT].targetPos.y = gPlayerStatus.position.y; + gCameras[CAM_DEFAULT].targetPos.z = gPlayerStatus.position.z; + add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->unk_18, data->unk_14); +} + +s32 entity_Munchlesia_create_child(Entity* entity, EntityBlueprint* EntityBlueprint) { + return create_entity(EntityBlueprint, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y); +} + +void func_802BC220_E2EB50(Entity* entity) { + MunchlesiaData* data = entity->dataBuf.munchlesia; + data->unk_00 = entity_Munchlesia_create_child(entity, &Entity_MunchlesiaReset); +} + +void func_802BC250_E2EB80(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaGrab); +} + +void func_802BC274_E2EBA4(Entity* entity) { + subtract_hp(1); + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaEnvelop); + set_action_state(ACTION_STATE_USE_SPRING); +} + +void func_802BC2B4_E2EBE4(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaBeginChew); + gPlayerStatus.prevActionState = 0; + gPlayerStatus.actionState = 0; + gPlayerStatus.flags &= ~PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED; + suggest_player_anim_setUnkFlag(0x8001F); +} + +void func_802BC308_E2EC38(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaChewing); +} + +void func_802BC32C_E2EC5C(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaSpitOut); + enable_partner_ai(); +} + +void entity_Munchlesia_create_child_reset1(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaReset1); +} + +void entity_Munchlesia_create_child_reset2(Entity* entity) { + entity_Munchlesia_create_child(entity, &Entity_MunchlesiaReset2); +} + +void func_802BC3A0_E2ECD0(void) { + enable_player_input(); + enable_player_shadow(); + set_action_state(ACTION_STATE_USE_MUNCHLESIA); +} + +void entity_MunchlesiaChewing_init(Entity* entity) { + MunchlesiaData* data = entity->dataBuf.munchlesia; + data->unk_0C = gPlayerStatus.position.y; + data->unk_10 = 0; +} + +void func_802BC3E4_E2ED14(Entity* entity) { + MunchlesiaData* data = entity->dataBuf.munchlesia; + gPlayerStatus.position.y = data->unk_0C + (sin_rad((data->unk_10 * TAU) / 360.0f) * 3.0f); + + data->unk_10 += 24.0f; + if (data->unk_10 > 360.0f) { + data->unk_10 -= 360.0f; + } + if (data->unk_10 == 96.0f) { + sfx_play_sound(SOUND_392); + } +} + +EntityScript Entity_BellbellPlant_Script = { + es_SetCallback(entity_BellbellPlant_idle, 0) + es_ClearFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_PlaySound(SOUND_F1) + es_SetCallback(NULL, 60) + es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_Restart + es_End +}; + +EntityScript Entity_TrumpetPlant_Script = { + es_SetCallback(entity_TrumpetPlant_idle, 0) + es_ClearFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_PlaySound(SOUND_F3) + es_SetCallback(NULL, 15) + es_Call(entity_TrumpetPlant_create_effect) + es_SetCallback(NULL, 3) + es_Call(entity_TrumpetPlant_create_effect) + es_SetCallback(NULL, 2) + es_Call(entity_TrumpetPlant_spawn_coin) + es_SetCallback(NULL, 3) + es_Call(entity_TrumpetPlant_create_effect) + es_SetCallback(NULL, 2) + es_Call(entity_TrumpetPlant_create_effect) + es_SetCallback(NULL, 3) + es_Call(entity_TrumpetPlant_create_effect) + es_SetCallback(NULL, 32) + es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_Restart + es_End +}; + +EntityScript Entity_Munchlesia_Script = { + es_Call(func_802BC220_E2EB50) + es_Label(1) + es_SetCallback(func_802BC050_E2E980, 0) + es_SetCallback(NULL, 80) + es_Goto(1) + es_End +}; + +EntityScript Entity_MunchlesiaReset_Script = { + es_SetCallback(NULL, 0) + es_Call(func_802BC0B8_E2E9E8) + es_SetCallback(NULL, 7) + es_Call(func_802BC250_E2EB80) + es_PlaySound(SOUND_209B) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaGrab_Script = { + es_SetCallback(NULL, 3) + es_Call(func_802BC0F0_E2EA20) + es_SetCallback(func_802BC17C_E2EAAC, 4) + es_Call(func_802BC274_E2EBA4) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaEnvelop_Script = { + es_SetCallback(NULL, 7) + es_Call(func_802BC2B4_E2EBE4) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaBeginChew_Script = { + es_SetCallback(NULL, 8) + es_Call(func_802BC308_E2EC38) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaChewing_Script = { + es_SetCallback(NULL, 1) + es_SetCallback(func_802BC3E4_E2ED14, 44) + es_SetCallback(NULL, 13) + es_Call(func_802BC32C_E2EC5C) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaSpitOut_Script = { + es_SetCallback(NULL, 4) + es_Call(func_802BC3A0_E2ECD0) + es_PlaySound(SOUND_393) + es_SetCallback(NULL, 4) + es_Call(entity_Munchlesia_create_child_reset1) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaReset1_Script = { + es_SetCallback(NULL, 8) + es_Call(entity_Munchlesia_create_child_reset2) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 3) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +EntityScript Entity_MunchlesiaReset2_Script = { + es_SetCallback(NULL, 9) + es_Call(func_802BC220_E2EB50) + es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetCallback(NULL, 10) + es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_End +}; + +DmaEntry Entity_MunchlesiaReset_dma[] = { ENTITY_ROM(MunchlesiaReset_gfx), ENTITY_ROM(MunchlesiaReset_anim) }; +DmaEntry Entity_MunchlesiaGrab_dma[] = { ENTITY_ROM(MunchlesiaGrab_gfx), ENTITY_ROM(MunchlesiaGrab_anim) }; +DmaEntry Entity_MunchlesiaEnvelop_dma[] = { ENTITY_ROM(MunchlesiaEnvelop_gfx), ENTITY_ROM(MunchlesiaEnvelop_anim) }; +DmaEntry Entity_MunchlesiaBeginChew_dma[] = { ENTITY_ROM(MunchlesiaBeginChew_gfx), ENTITY_ROM(MunchlesiaBeginChew_anim) }; +DmaEntry Entity_MunchlesiaChewing_dma[] = { ENTITY_ROM(MunchlesiaChewing_gfx), ENTITY_ROM(MunchlesiaChewing_anim) }; +DmaEntry Entity_MunchlesiaSpitOut_dma[] = { ENTITY_ROM(MunchlesiaSpitOut_gfx), ENTITY_ROM(MunchlesiaSpitOut_anim) }; +DmaEntry Entity_MunchlesiaReset1_dma[] = { ENTITY_ROM(MunchlesiaReset1_gfx), ENTITY_ROM(MunchlesiaReset1_anim) }; +DmaEntry Entity_BellbellPlant_dma[] = { ENTITY_ROM(BellbellPlant_gfx), ENTITY_ROM(BellbellPlant_anim) }; +DmaEntry Entity_TrumpetPlant_dma[] = { ENTITY_ROM(TrumpetPlant_gfx), ENTITY_ROM(TrumpetPlant_anim) }; + +EntityBlueprint Entity_BellbellPlant = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = 0, + .renderCommandList = Entity_BellbellPlant_AnimationIdle, + .modelAnimationNodes = Entity_BellbellPlant_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_BellbellPlant_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_BellbellPlant_dma }, + .entityType = ENTITY_TYPE_BELLBELL_PLANT, + .aabbSize = { 30, 40, 30 } +}; + +EntityBlueprint Entity_TrumpetPlant = { + .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(TrumpetPlantData), + .renderCommandList = Entity_TrumpetPlant_AnimationIdle, + .modelAnimationNodes = Entity_TrumpetPlant_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_TrumpetPlant_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_TrumpetPlant_dma }, + .entityType = ENTITY_TYPE_TRUMPET_PLANT, + .aabbSize = { 30, 40, 30 } +}; + +EntityBlueprint Entity_Munchlesia = { + .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_RenderNone_Script, + .modelAnimationNodes = 0, + .fpInit = entity_Munchlesia_init, + .updateEntityScript = Entity_Munchlesia_Script, + .fpHandleCollision = NULL, + { .dmaList = NULL }, + .entityType = ENTITY_TYPE_MUNCHLESIA, + .aabbSize = { 45, 20, 45 } +}; + +EntityBlueprint Entity_MunchlesiaReset = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaReset_AnimationIdle, + .modelAnimationNodes = Entity_MunchlesiaReset_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaReset_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaReset_dma }, + .entityType = ENTITY_TYPE_RESET_MUNCHLESIA, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaGrab = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaGrab_Animation, + .modelAnimationNodes = Entity_MunchlesiaGrab_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaGrab_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaGrab_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_GRAB, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaEnvelop = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaEnvelop_Animation, + .modelAnimationNodes = Entity_MunchlesiaEnvelop_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaEnvelop_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaEnvelop_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_ENVELOP, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaBeginChew = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaBeginChew_Animation, + .modelAnimationNodes = Entity_MunchlesiaBeginChew_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaBeginChew_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaBeginChew_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_BEGIN_CHEW, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaChewing = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaChewing_Animation, + .modelAnimationNodes = Entity_MunchlesiaChewing_Mesh, + .fpInit = entity_MunchlesiaChewing_init, + .updateEntityScript = Entity_MunchlesiaChewing_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaChewing_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_CHEWING, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaSpitOut = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaSpitOut_Animation, + .modelAnimationNodes = Entity_MunchlesiaSpitOut_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaSpitOut_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaSpitOut_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_SPIT_OUT, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaReset1 = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaReset1_Animation, + .modelAnimationNodes = Entity_MunchlesiaReset1_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaReset1_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaReset1_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_RESET1, + .aabbSize = { 40, 20, 40 } +}; + +EntityBlueprint Entity_MunchlesiaReset2 = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .typeDataSize = sizeof(MunchlesiaData), + .renderCommandList = Entity_MunchlesiaReset_AnimationIdle, + .modelAnimationNodes = Entity_MunchlesiaReset_Mesh, + .fpInit = NULL, + .updateEntityScript = Entity_MunchlesiaReset2_Script, + .fpHandleCollision = NULL, + { .dmaList = Entity_MunchlesiaReset_dma }, + .entityType = ENTITY_TYPE_MUNCHLESIA_RESET2, + .aabbSize = { 40, 20, 40 } +}; diff --git a/src/entity/model/ArrowSign.c b/src/entity/model/ArrowSign.c new file mode 100644 index 0000000000..f5dcedc643 --- /dev/null +++ b/src/entity/model/ArrowSign.c @@ -0,0 +1,89 @@ +#include "common.h" + +Vtx Entity_ArrowSign_vtxSign[] = { + {{{ -10, -10, 0 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, + {{{ 20, -10, 0 }, 0, { 2048, 0 }, { 255, 255, 255, 255 }}}, + {{{ 20, 10, 0 }, 0, { 2048, 1024 }, { 255, 255, 255, 255 }}}, + {{{ -10, 10, 0 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, +}; +Vtx Entity_ArrowSign_vtxPole[] = { + {{{ -2, 0, -1 }, 0, { 0, 0 }, { 25, 20, 0, 255 }}}, + {{{ 1, 0, -1 }, 0, { 0, 0 }, { 25, 20, 0, 255 }}}, + {{{ 1, 19, -1 }, 0, { 0, 0 }, { 25, 20, 0, 255 }}}, + {{{ -2, 19, -1 }, 0, { 0, 0 }, { 25, 20, 0, 255 }}}, +}; + +#include "entity/model/ArrowSign.png.inc.c" +#include "entity/model/ArrowSign.pal.inc.c" +Gfx Entity_ArrowSign_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000880_E5A780), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000080_E59F80, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_ArrowSign_mtxSign = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFF0014, 0x00010001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xD1B40000, 0x00000000 } + } +}; + +Gfx Entity_ArrowSign_RenderPole[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(Entity_ArrowSign_vtxPole, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ArrowSign_RenderPole_[] = { + gsSPDisplayList(Entity_ArrowSign_RenderPole), + gsSPEndDisplayList(), +}; + +Gfx Entity_ArrowSign_RenderRotatedSign[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_ArrowSign_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(Entity_ArrowSign_vtxSign, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ArrowSign_RenderSign[] = { + gsSPMatrix(&Entity_ArrowSign_mtxSign, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_ArrowSign_RenderRotatedSign), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_ArrowSign_RenderPole__[] = { + gsSPDisplayList(Entity_ArrowSign_RenderPole_), + gsSPEndDisplayList(), +}; + +Gfx Entity_ArrowSign_Render[] = { + gsSPDisplayList(Entity_ArrowSign_RenderPole__), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/BellbellPlant_anim.c b/src/entity/model/BellbellPlant_anim.c new file mode 100644 index 0000000000..2d2083e49a --- /dev/null +++ b/src/entity/model/BellbellPlant_anim.c @@ -0,0 +1,469 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_BellbellPlant_RenderNode1[]; +extern Gfx Entity_BellbellPlant_RenderNode2[]; +extern Gfx Entity_BellbellPlant_RenderNode3[]; +extern Gfx Entity_BellbellPlant_RenderNode4[]; +extern Gfx Entity_BellbellPlant_RenderNode5[]; + +StaticAnimatorNode Entity_BellbellPlant_Node5 = { + .displayList = Entity_BellbellPlant_RenderNode5, + .rot = { -1092, 0, 0 }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_BellbellPlant_Node4 = { + .displayList = Entity_BellbellPlant_RenderNode4, + .rot = { -2455, 0, 0 }, + .pos = { 15.0f, 39.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = &Entity_BellbellPlant_Node5, +}; + +StaticAnimatorNode Entity_BellbellPlant_Node3 = { + .displayList = Entity_BellbellPlant_RenderNode3, + .rot = { -1092, 0, 0 }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_BellbellPlant_Node2 = { + .displayList = Entity_BellbellPlant_RenderNode2, + .rot = { -2455, 0, 0 }, + .pos = { -15.0f, 30.0f, 0.0f }, + .sibling = &Entity_BellbellPlant_Node4, + .child = &Entity_BellbellPlant_Node3, +}; + +StaticAnimatorNode Entity_BellbellPlant_Node1 = { + .displayList = Entity_BellbellPlant_RenderNode1, + .rot = { -2457, 0, 0 }, + .sibling = ANIM_NULL, + .child = &Entity_BellbellPlant_Node2, +}; + +StaticAnimatorNode* Entity_BellbellPlant_Mesh[] = { + &Entity_BellbellPlant_Node1, + &Entity_BellbellPlant_Node2, + &Entity_BellbellPlant_Node3, + &Entity_BellbellPlant_Node4, + &Entity_BellbellPlant_Node5, + ANIM_NULL, +}; + +AnimScript Entity_BellbellPlant_AnimationUse = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, -15, 30, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 15, 39, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, -13.495, 0.0, 0.0) + as_SetRotation(2, -13.485, 0.0, 0.0) + as_SetRotation(3, -6.0, 0.0, 0.0) + as_SetRotation(4, -13.485, 0.0, 0.0) + as_SetRotation(5, -6.0, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -24.995, 0.0, 0.0) + as_SetRotation(2, -24.995, 0.0, 0.0) + as_SetRotation(3, -10.0, 0.0, 0.0) + as_SetRotation(4, -24.995, 0.0, 0.0) + as_SetRotation(5, -10.0, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -11.87, 0.0, 0.0) + as_SetRotation(2, 11.87, 0.0, 0.0) + as_SetRotation(3, -0.43, 0.0, 0.0) + as_SetRotation(4, 11.87, 0.0, 0.0) + as_SetRotation(5, -0.485, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 8.585, 0.0, 0.0) + as_SetRotation(2, 13.79, 0.0, 0.0) + as_SetRotation(3, 13.135, 0.0, 0.0) + as_SetRotation(4, 12.595, 0.0, 0.0) + as_SetRotation(5, 13.025, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 19.995, 0.0, 0.0) + as_SetRotation(2, 5.0, 0.0, 0.0) + as_SetRotation(3, 19.995, 0.0, 0.0) + as_SetRotation(4, 5.0, 0.0, 0.0) + as_SetRotation(5, 19.995, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 15.54, 0.0, 0.0) + as_SetRotation(2, -18.375, 0.0, 0.0) + as_SetRotation(3, 12.115, 0.0, 0.0) + as_SetRotation(4, -5.155, 0.0, 0.0) + as_SetRotation(5, 15.645, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 3.77, 0.0, 0.0) + as_SetRotation(2, -33.77, 0.0, 0.0) + as_SetRotation(3, -2.47, 0.0, 0.0) + as_SetRotation(4, -16.74, 0.0, 0.0) + as_SetRotation(5, 5.81, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -8.635, 0.0, 0.0) + as_SetRotation(2, -21.035, 0.0, 0.0) + as_SetRotation(3, -10.32, 0.0, 0.0) + as_SetRotation(4, -21.36, 0.0, 0.0) + as_SetRotation(5, -4.1, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -14.995, 0.0, 0.0) + as_SetRotation(2, 1.135, 0.0, 0.0) + as_SetRotation(3, -2.465, 0.0, 0.0) + as_SetRotation(4, -16.295, 0.0, 0.0) + as_SetRotation(5, -8.7, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -13.215, 0.0, 0.0) + as_SetRotation(2, 22.38, 0.0, 0.0) + as_SetRotation(3, 12.12, 0.0, 0.0) + as_SetRotation(4, -6.555, 0.0, 0.0) + as_SetRotation(5, -5.945, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -7.325, 0.0, 0.0) + as_SetRotation(2, 32.325, 0.0, 0.0) + as_SetRotation(3, 19.995, 0.0, 0.0) + as_SetRotation(4, 4.605, 0.0, 0.0) + as_SetRotation(5, 0.84, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.17, 0.0, 0.0) + as_SetRotation(2, 26.94, 0.0, 0.0) + as_SetRotation(3, 16.905, 0.0, 0.0) + as_SetRotation(4, 13.94, 0.0, 0.0) + as_SetRotation(5, 8.985, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 6.785, 0.0, 0.0) + as_SetRotation(2, 12.825, 0.0, 0.0) + as_SetRotation(3, 9.465, 0.0, 0.0) + as_SetRotation(4, 18.21, 0.0, 0.0) + as_SetRotation(5, 15.815, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 10.0, 0.0, 0.0) + as_SetRotation(2, -4.45, 0.0, 0.0) + as_SetRotation(3, 0.575, 0.0, 0.0) + as_SetRotation(4, 16.35, 0.0, 0.0) + as_SetRotation(5, 18.65, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 9.23, 0.0, 0.0) + as_SetRotation(2, -19.325, 0.0, 0.0) + as_SetRotation(3, -6.87, 0.0, 0.0) + as_SetRotation(4, 10.645, 0.0, 0.0) + as_SetRotation(5, 16.53, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 6.235, 0.0, 0.0) + as_SetRotation(2, -26.235, 0.0, 0.0) + as_SetRotation(3, -10.0, 0.0, 0.0) + as_SetRotation(4, 2.935, 0.0, 0.0) + as_SetRotation(5, 11.32, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 2.05, 0.0, 0.0) + as_SetRotation(2, -23.645, 0.0, 0.0) + as_SetRotation(3, -7.725, 0.0, 0.0) + as_SetRotation(4, -4.975, 0.0, 0.0) + as_SetRotation(5, 4.575, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -2.315, 0.0, 0.0) + as_SetRotation(2, -15.465, 0.0, 0.0) + as_SetRotation(3, -2.05, 0.0, 0.0) + as_SetRotation(4, -11.28, 0.0, 0.0) + as_SetRotation(5, -2.14, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -5.84, 0.0, 0.0) + as_SetRotation(2, -4.335, 0.0, 0.0) + as_SetRotation(3, 5.285, 0.0, 0.0) + as_SetRotation(4, -14.155, 0.0, 0.0) + as_SetRotation(5, -7.28, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -7.5, 0.0, 0.0) + as_SetRotation(2, 7.125, 0.0, 0.0) + as_SetRotation(3, 12.565, 0.0, 0.0) + as_SetRotation(4, -13.215, 0.0, 0.0) + as_SetRotation(5, -9.28, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -7.13, 0.0, 0.0) + as_SetRotation(2, 16.295, 0.0, 0.0) + as_SetRotation(3, 18.04, 0.0, 0.0) + as_SetRotation(4, -9.885, 0.0, 0.0) + as_SetRotation(5, -7.585, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -5.55, 0.0, 0.0) + as_SetRotation(2, 20.545, 0.0, 0.0) + as_SetRotation(3, 19.995, 0.0, 0.0) + as_SetRotation(4, -5.07, 0.0, 0.0) + as_SetRotation(5, -3.365, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -3.195, 0.0, 0.0) + as_SetRotation(2, 19.375, 0.0, 0.0) + as_SetRotation(3, 17.835, 0.0, 0.0) + as_SetRotation(4, 0.325, 0.0, 0.0) + as_SetRotation(5, 2.345, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -0.525, 0.0, 0.0) + as_SetRotation(2, 14.86, 0.0, 0.0) + as_SetRotation(3, 12.87, 0.0, 0.0) + as_SetRotation(4, 5.405, 0.0, 0.0) + as_SetRotation(5, 8.55, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 2.02, 0.0, 0.0) + as_SetRotation(2, 8.24, 0.0, 0.0) + as_SetRotation(3, 6.215, 0.0, 0.0) + as_SetRotation(4, 9.255, 0.0, 0.0) + as_SetRotation(5, 14.21, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 4.01, 0.0, 0.0) + as_SetRotation(2, 0.765, 0.0, 0.0) + as_SetRotation(3, -1.015, 0.0, 0.0) + as_SetRotation(4, 10.98, 0.0, 0.0) + as_SetRotation(5, 18.315, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 5.0, 0.0, 0.0) + as_SetRotation(2, -6.31, 0.0, 0.0) + as_SetRotation(3, -7.705, 0.0, 0.0) + as_SetRotation(4, 10.15, 0.0, 0.0) + as_SetRotation(5, 19.84, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 4.96, 0.0, 0.0) + as_SetRotation(2, -11.755, 0.0, 0.0) + as_SetRotation(3, -12.74, 0.0, 0.0) + as_SetRotation(4, 7.425, 0.0, 0.0) + as_SetRotation(5, 18.49, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 4.31, 0.0, 0.0) + as_SetRotation(2, -14.31, 0.0, 0.0) + as_SetRotation(3, -14.995, 0.0, 0.0) + as_SetRotation(4, 3.54, 0.0, 0.0) + as_SetRotation(5, 15.09, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 3.22, 0.0, 0.0) + as_SetRotation(2, -13.855, 0.0, 0.0) + as_SetRotation(3, -14.23, 0.0, 0.0) + as_SetRotation(4, -0.78, 0.0, 0.0) + as_SetRotation(5, 10.31, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 1.875, 0.0, 0.0) + as_SetRotation(2, -11.475, 0.0, 0.0) + as_SetRotation(3, -11.365, 0.0, 0.0) + as_SetRotation(4, -4.825, 0.0, 0.0) + as_SetRotation(5, 4.82, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.45, 0.0, 0.0) + as_SetRotation(2, -7.77, 0.0, 0.0) + as_SetRotation(3, -7.075, 0.0, 0.0) + as_SetRotation(4, -7.845, 0.0, 0.0) + as_SetRotation(5, -0.71, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -0.87, 0.0, 0.0) + as_SetRotation(2, -3.32, 0.0, 0.0) + as_SetRotation(3, -2.025, 0.0, 0.0) + as_SetRotation(4, -9.125, 0.0, 0.0) + as_SetRotation(5, -5.61, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -1.91, 0.0, 0.0) + as_SetRotation(2, 1.275, 0.0, 0.0) + as_SetRotation(3, 3.12, 0.0, 0.0) + as_SetRotation(4, -8.52, 0.0, 0.0) + as_SetRotation(5, -9.21, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -2.5, 0.0, 0.0) + as_SetRotation(2, 5.435, 0.0, 0.0) + as_SetRotation(3, 7.7, 0.0, 0.0) + as_SetRotation(4, -6.645, 0.0, 0.0) + as_SetRotation(5, -10.85, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -2.655, 0.0, 0.0) + as_SetRotation(2, 8.565, 0.0, 0.0) + as_SetRotation(3, 11.045, 0.0, 0.0) + as_SetRotation(4, -3.91, 0.0, 0.0) + as_SetRotation(5, -10.19, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -2.57, 0.0, 0.0) + as_SetRotation(2, 10.075, 0.0, 0.0) + as_SetRotation(3, 12.495, 0.0, 0.0) + as_SetRotation(4, -0.715, 0.0, 0.0) + as_SetRotation(5, -7.745, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -2.315, 0.0, 0.0) + as_SetRotation(2, 10.095, 0.0, 0.0) + as_SetRotation(3, 12.145, 0.0, 0.0) + as_SetRotation(4, 2.52, 0.0, 0.0) + as_SetRotation(5, -4.07, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -1.925, 0.0, 0.0) + as_SetRotation(2, 9.28, 0.0, 0.0) + as_SetRotation(3, 10.695, 0.0, 0.0) + as_SetRotation(4, 5.405, 0.0, 0.0) + as_SetRotation(5, 0.265, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -1.46, 0.0, 0.0) + as_SetRotation(2, 7.805, 0.0, 0.0) + as_SetRotation(3, 8.405, 0.0, 0.0) + as_SetRotation(4, 7.53, 0.0, 0.0) + as_SetRotation(5, 4.7, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -0.98, 0.0, 0.0) + as_SetRotation(2, 5.865, 0.0, 0.0) + as_SetRotation(3, 5.52, 0.0, 0.0) + as_SetRotation(4, 8.48, 0.0, 0.0) + as_SetRotation(5, 8.685, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -0.54, 0.0, 0.0) + as_SetRotation(2, 3.64, 0.0, 0.0) + as_SetRotation(3, 2.305, 0.0, 0.0) + as_SetRotation(4, 8.24, 0.0, 0.0) + as_SetRotation(5, 11.635, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, -0.19, 0.0, 0.0) + as_SetRotation(2, 1.32, 0.0, 0.0) + as_SetRotation(3, -0.995, 0.0, 0.0) + as_SetRotation(4, 7.19, 0.0, 0.0) + as_SetRotation(5, 13.005, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetRotation(2, -0.905, 0.0, 0.0) + as_SetRotation(3, -4.125, 0.0, 0.0) + as_SetRotation(4, 5.55, 0.0, 0.0) + as_SetRotation(5, 12.62, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.09, 0.0, 0.0) + as_SetRotation(2, -2.86, 0.0, 0.0) + as_SetRotation(3, -6.84, 0.0, 0.0) + as_SetRotation(4, 3.51, 0.0, 0.0) + as_SetRotation(5, 10.965, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.155, 0.0, 0.0) + as_SetRotation(2, -4.35, 0.0, 0.0) + as_SetRotation(3, -8.885, 0.0, 0.0) + as_SetRotation(4, 1.295, 0.0, 0.0) + as_SetRotation(5, 8.405, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.2, 0.0, 0.0) + as_SetRotation(2, -5.195, 0.0, 0.0) + as_SetRotation(3, -10.0, 0.0, 0.0) + as_SetRotation(4, -0.885, 0.0, 0.0) + as_SetRotation(5, 5.325, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.22, 0.0, 0.0) + as_SetRotation(2, -5.48, 0.0, 0.0) + as_SetRotation(3, -10.28, 0.0, 0.0) + as_SetRotation(4, -2.84, 0.0, 0.0) + as_SetRotation(5, 2.095, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.23, 0.0, 0.0) + as_SetRotation(2, -5.45, 0.0, 0.0) + as_SetRotation(3, -10.045, 0.0, 0.0) + as_SetRotation(4, -4.355, 0.0, 0.0) + as_SetRotation(5, -0.905, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.22, 0.0, 0.0) + as_SetRotation(2, -5.16, 0.0, 0.0) + as_SetRotation(3, -9.395, 0.0, 0.0) + as_SetRotation(4, -5.225, 0.0, 0.0) + as_SetRotation(5, -3.305, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.205, 0.0, 0.0) + as_SetRotation(2, -4.665, 0.0, 0.0) + as_SetRotation(3, -8.415, 0.0, 0.0) + as_SetRotation(4, -5.465, 0.0, 0.0) + as_SetRotation(5, -4.735, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.18, 0.0, 0.0) + as_SetRotation(2, -4.02, 0.0, 0.0) + as_SetRotation(3, -7.2, 0.0, 0.0) + as_SetRotation(4, -5.31, 0.0, 0.0) + as_SetRotation(5, -5.215, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.15, 0.0, 0.0) + as_SetRotation(2, -3.285, 0.0, 0.0) + as_SetRotation(3, -5.85, 0.0, 0.0) + as_SetRotation(4, -4.845, 0.0, 0.0) + as_SetRotation(5, -5.11, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.115, 0.0, 0.0) + as_SetRotation(2, -2.51, 0.0, 0.0) + as_SetRotation(3, -4.45, 0.0, 0.0) + as_SetRotation(4, -4.14, 0.0, 0.0) + as_SetRotation(5, -4.56, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.075, 0.0, 0.0) + as_SetRotation(2, -1.75, 0.0, 0.0) + as_SetRotation(3, -3.095, 0.0, 0.0) + as_SetRotation(4, -3.285, 0.0, 0.0) + as_SetRotation(5, -3.705, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.05, 0.0, 0.0) + as_SetRotation(2, -1.065, 0.0, 0.0) + as_SetRotation(3, -1.88, 0.0, 0.0) + as_SetRotation(4, -2.36, 0.0, 0.0) + as_SetRotation(5, -2.685, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.02, 0.0, 0.0) + as_SetRotation(2, -0.51, 0.0, 0.0) + as_SetRotation(3, -0.895, 0.0, 0.0) + as_SetRotation(4, -1.45, 0.0, 0.0) + as_SetRotation(5, -1.635, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.005, 0.0, 0.0) + as_SetRotation(2, -0.13, 0.0, 0.0) + as_SetRotation(3, -0.235, 0.0, 0.0) + as_SetRotation(4, -0.635, 0.0, 0.0) + as_SetRotation(5, -0.69, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, -15, 30, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 15, 39, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_BellbellPlant_AnimationIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, -15, 30, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 15, 39, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/BellbellPlant_gfx.c b/src/entity/model/BellbellPlant_gfx.c new file mode 100644 index 0000000000..c94db936c3 --- /dev/null +++ b/src/entity/model/BellbellPlant_gfx.c @@ -0,0 +1,176 @@ +#include "common.h" + +extern unsigned char D_0A001090_E6C240[]; + +#include "entity/model/BellbellPlant_1.vtx.inc.c" +#include "entity/model/BellbellPlant_2.vtx.inc.c" +#include "entity/model/BellbellPlant_3.vtx.inc.c" +#include "entity/model/BellbellPlant_4.vtx.inc.c" +#include "entity/model/BellbellPlant_5.vtx.inc.c" + +Gfx Entity_BellbellPlant_RenderNode5[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001090_E6C240, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000A10_E6BBC0, 14, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_BellbellPlant_RenderNode4[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001090_E6C240, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000720_E6B8D0, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 6, 7, 0, 3, 7, 0, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(11, 10, 12, 0, 5, 4, 13, 0), + gsSP2Triangles(5, 13, 14, 0, 14, 13, 15, 0), + gsSP2Triangles(14, 15, 16, 0, 5, 17, 6, 0), + gsSP2Triangles(5, 6, 3, 0, 6, 17, 18, 0), + gsSP2Triangles(6, 18, 8, 0, 8, 18, 19, 0), + gsSP2Triangles(8, 19, 10, 0, 10, 19, 12, 0), + gsSP2Triangles(16, 15, 20, 0, 16, 20, 21, 0), + gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0), + gsSP2Triangles(14, 24, 17, 0, 14, 17, 5, 0), + gsSP2Triangles(17, 24, 25, 0, 17, 25, 18, 0), + gsSP2Triangles(18, 25, 26, 0, 18, 26, 19, 0), + gsSP2Triangles(19, 26, 12, 0, 27, 28, 12, 0), + gsSP2Triangles(29, 30, 28, 0, 29, 28, 27, 0), + gsSP2Triangles(16, 31, 24, 0, 16, 24, 14, 0), + gsSPVertex(&D_0A000720_E6B8D0[32], 15, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 8, 7, 0), + gsSP2Triangles(11, 7, 12, 0, 12, 7, 1, 0), + gsSP2Triangles(12, 1, 13, 0, 1, 7, 10, 0), + gsSP2Triangles(1, 10, 2, 0, 2, 10, 14, 0), + gsSP2Triangles(2, 14, 4, 0, 4, 14, 6, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_BellbellPlant_RenderNode3[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001090_E6C240, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000640_E6B7F0, 14, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 5, 4, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_BellbellPlant_RenderNode2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001090_E6C240, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000390_E6B540, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0), + gsSP2Triangles(3, 1, 0, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 8, 0, 7, 6, 9, 0), + gsSP2Triangles(7, 9, 4, 0, 4, 9, 10, 0), + gsSP2Triangles(4, 10, 1, 0, 1, 10, 2, 0), + gsSP2Triangles(11, 7, 4, 0, 11, 4, 3, 0), + gsSP2Triangles(8, 7, 11, 0, 8, 11, 12, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0), + gsSP2Triangles(15, 14, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(18, 17, 19, 0, 18, 19, 20, 0), + gsSP2Triangles(20, 19, 2, 0, 21, 0, 2, 0), + gsSP2Triangles(22, 3, 0, 0, 22, 0, 21, 0), + gsSP2Triangles(23, 24, 14, 0, 23, 14, 13, 0), + gsSP2Triangles(14, 24, 25, 0, 14, 25, 17, 0), + gsSP2Triangles(17, 25, 26, 0, 17, 26, 19, 0), + gsSP2Triangles(19, 26, 2, 0, 27, 11, 3, 0), + gsSP2Triangles(27, 3, 22, 0, 12, 11, 27, 0), + gsSP2Triangles(12, 27, 28, 0, 28, 27, 24, 0), + gsSP2Triangles(28, 24, 23, 0, 24, 27, 22, 0), + gsSP2Triangles(24, 22, 25, 0, 25, 22, 21, 0), + gsSP2Triangles(25, 21, 26, 0, 26, 21, 2, 0), + gsSP2Triangles(16, 29, 30, 0, 16, 30, 13, 0), + gsSPVertex(&D_0A000390_E6B540[31], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_BellbellPlant_RenderNode1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001090_E6C240, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E6B1B0, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(0, 4, 1, 0, 5, 4, 6, 0), + gsSP2Triangles(2, 1, 7, 0, 1, 4, 5, 0), + gsSP2Triangles(1, 5, 7, 0, 6, 4, 3, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0), + gsSP2Triangles(19, 18, 20, 0, 19, 20, 13, 0), + gsSP2Triangles(13, 20, 21, 0, 13, 21, 9, 0), + gsSP2Triangles(9, 21, 22, 0, 9, 22, 10, 0), + gsSP2Triangles(23, 14, 17, 0, 23, 17, 24, 0), + gsSP2Triangles(25, 19, 13, 0, 25, 13, 12, 0), + gsSP2Triangles(15, 23, 24, 0, 15, 24, 16, 0), + gsSP2Triangles(16, 24, 25, 0, 16, 25, 18, 0), + gsSP2Triangles(18, 25, 12, 0, 18, 12, 20, 0), + gsSP2Triangles(20, 12, 8, 0, 20, 8, 21, 0), + gsSP2Triangles(21, 8, 11, 0, 21, 11, 22, 0), + gsSP2Triangles(26, 17, 19, 0, 24, 19, 25, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSP2Triangles(2, 31, 15, 0, 2, 15, 14, 0), + gsSPVertex(&D_0A000000_E6B1B0[32], 25, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 2, 4, 0), + gsSP2Triangles(4, 2, 5, 0, 4, 5, 6, 0), + gsSP2Triangles(6, 5, 7, 0, 6, 7, 8, 0), + gsSP2Triangles(8, 7, 9, 0, 8, 9, 10, 0), + gsSP2Triangles(10, 9, 11, 0, 10, 11, 12, 0), + gsSP2Triangles(13, 8, 10, 0, 13, 10, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 1, 0), + gsSP2Triangles(1, 17, 18, 0, 1, 18, 2, 0), + gsSP2Triangles(2, 18, 19, 0, 2, 19, 5, 0), + gsSP2Triangles(5, 19, 13, 0, 5, 13, 7, 0), + gsSP2Triangles(7, 13, 14, 0, 7, 14, 9, 0), + gsSP2Triangles(9, 14, 20, 0, 9, 20, 11, 0), + gsSP2Triangles(16, 21, 0, 0, 16, 0, 17, 0), + gsSP2Triangles(22, 23, 4, 0, 17, 4, 18, 0), + gsSP2Triangles(18, 4, 24, 0, 18, 6, 19, 0), + gsSP2Triangles(19, 6, 8, 0, 19, 8, 13, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/BellbellPlant.png.inc.c" diff --git a/src/entity/model/BlueSwitch.c b/src/entity/model/BlueSwitch.c new file mode 100644 index 0000000000..458191dc95 --- /dev/null +++ b/src/entity/model/BlueSwitch.c @@ -0,0 +1,202 @@ +#include "common.h" + +#include "entity/model/BlueSwitch_1.vtx.inc.c" +#include "entity/model/BlueSwitch_2.vtx.inc.c" +#include "entity/model/BlueSwitch_3.vtx.inc.c" +#include "entity/model/BlueSwitch_4.vtx.inc.c" + +#include "entity/model/BlueSwitch_tex.png.inc.c" +#include "entity/model/BlueSwitch_tex.pal.inc.c" +Gfx Entity_BlueSwitch_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0006D0_E64090), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0005D0_E63F90, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/BlueSwitch_exclamationMark.png.inc.c" +Gfx Entity_BlueSwitch_LoadExclMark[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000978_E64338, G_IM_FMT_IA, 16, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_BlueSwitch_mtxExclMark = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000006, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Mtx Entity_BlueSwitch_mtxBlueBubble = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFF0005, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xF9310000, 0x9BEF0000 } + } +}; + +Gfx Entity_BlueSwitch_RenderBlueBubble[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0003D0_E63D90, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0), + gsSP2Triangles(2, 7, 8, 0, 2, 8, 4, 0), + gsSP2Triangles(4, 8, 9, 0, 4, 9, 10, 0), + gsSP2Triangles(5, 4, 10, 0, 5, 10, 11, 0), + gsSP2Triangles(12, 13, 6, 0, 12, 6, 1, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 6, 0), + gsSP2Triangles(6, 15, 16, 0, 6, 16, 7, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 16, 0, 17, 16, 15, 0), + gsSP2Triangles(17, 15, 14, 0, 17, 14, 21, 0), + gsSP2Triangles(7, 16, 20, 0, 7, 20, 8, 0), + gsSP2Triangles(22, 12, 1, 0, 22, 1, 0, 0), + gsSP2Triangles(23, 24, 13, 0, 23, 13, 12, 0), + gsSP2Triangles(24, 21, 14, 0, 24, 14, 13, 0), + gsSP2Triangles(25, 23, 12, 0, 25, 12, 22, 0), + gsSP2Triangles(8, 20, 19, 0, 8, 19, 9, 0), + gsSP2Triangles(26, 27, 24, 0, 26, 24, 23, 0), + gsSP2Triangles(28, 29, 27, 0, 28, 27, 26, 0), + gsSP2Triangles(29, 18, 17, 0, 29, 17, 27, 0), + gsSP2Triangles(27, 17, 21, 0, 27, 21, 24, 0), + gsSP2Triangles(10, 9, 29, 0, 10, 29, 28, 0), + gsSP2Triangles(9, 19, 18, 0, 9, 18, 29, 0), + gsSPVertex(&D_0A0003D0_E63D90[10], 2, 0), + gsSPVertex(&D_0A0003D0_E63D90[23], 1, 2), + gsSPVertex(&D_0A0003D0_E63D90[25], 2, 3), + gsSPVertex(&D_0A0003D0_E63D90[28], 1, 5), + gsSPVertex(&D_0A0003D0_E63D90[30], 2, 6), + gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0), + gsSP2Triangles(7, 4, 2, 0, 7, 2, 3, 0), + gsSP2Triangles(1, 0, 5, 0, 1, 5, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderRotatedBlueBubble[] = { + gsSPMatrix(&Entity_BlueSwitch_mtxBlueBubble, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_BlueSwitch_RenderBlueBubble), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderExclMark[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_BlueSwitch_LoadExclMark), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000390_E63D50, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderRotatedExclMark[] = { + gsSPMatrix(&Entity_BlueSwitch_mtxExclMark, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_BlueSwitch_RenderExclMark), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderBase2[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000300_E63CC0, 9, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), + gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(2, 5, 6, 0, 7, 2, 6, 0), + gsSP2Triangles(8, 3, 2, 0, 7, 8, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderBase[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_BlueSwitch_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E639C0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0), + gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 17, 0, 20, 17, 16, 0), + gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0), + gsSP2Triangles(7, 6, 24, 0, 7, 24, 25, 0), + gsSP2Triangles(15, 14, 26, 0, 15, 26, 27, 0), + gsSP2Triangles(28, 29, 21, 0, 28, 21, 20, 0), + gsSPVertex(&D_0A000000_E639C0[4], 2, 0), + gsSPVertex(&D_0A000000_E639C0[12], 2, 2), + gsSPVertex(&D_0A000000_E639C0[22], 26, 4), + gsSP2Triangles(12, 24, 25, 0, 12, 25, 13, 0), + gsSP2Triangles(13, 25, 1, 0, 13, 1, 0, 0), + gsSP2Triangles(14, 26, 27, 0, 14, 27, 15, 0), + gsSP2Triangles(15, 27, 3, 0, 15, 3, 2, 0), + gsSP2Triangles(16, 28, 11, 0, 16, 11, 10, 0), + gsSP2Triangles(5, 4, 17, 0, 5, 17, 21, 0), + gsSP2Triangles(9, 8, 18, 0, 9, 18, 19, 0), + gsSP2Triangles(19, 18, 26, 0, 19, 26, 14, 0), + gsSP2Triangles(20, 29, 28, 0, 20, 28, 16, 0), + gsSP2Triangles(21, 17, 29, 0, 21, 29, 20, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 12, 0), + gsSP2Triangles(7, 6, 23, 0, 7, 23, 22, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderBaseMain[] = { + gsSPDisplayList(Entity_BlueSwitch_RenderBase), + gsSPDisplayList(Entity_BlueSwitch_RenderBase2), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_RenderMain[] = { + gsSPDisplayList(Entity_BlueSwitch_RenderBaseMain), + gsSPDisplayList(Entity_BlueSwitch_RenderRotatedExclMark), + gsSPDisplayList(Entity_BlueSwitch_RenderRotatedBlueBubble), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueSwitch_Render[] = { + gsSPDisplayList(Entity_BlueSwitch_RenderMain), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/BlueWarpPipe.c b/src/entity/model/BlueWarpPipe.c new file mode 100644 index 0000000000..492a1644eb --- /dev/null +++ b/src/entity/model/BlueWarpPipe.c @@ -0,0 +1,94 @@ +#include "common.h" + +#include "entity/model/BlueWarpPipe_1.vtx.inc.c" +#include "entity/model/BlueWarpPipe_2.vtx.inc.c" +#include "entity/model/BlueWarpPipe_3.vtx.inc.c" + +#include "entity/model/BlueWarpPipe_texBase.png.inc.c" +#include "entity/model/BlueWarpPipe_texBase.pal.inc.c" +Gfx Entity_BlueWarpPipe_LoadTextureBase[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000320_E58FF0, G_IM_FMT_CI, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A0003A0_E59070), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +#include "entity/model/BlueWarpPipe_texPipe.png.inc.c" +#include "entity/model/BlueWarpPipe_texPipe.pal.inc.c" +Gfx Entity_BlueWarpPipe_LoadTexturePipe[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000470_E59140, G_IM_FMT_CI, 32, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000570_E59240), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Mtx Entity_BlueWarpPipe_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0000FFC9, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_BlueWarpPipe_RenderBase[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_BlueWarpPipe_LoadTextureBase), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPClearGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A0002E0_E58FB0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BlueWarpPipe_RenderPipe[] = { + gsDPPipeSync(), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E58CD0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSPDisplayList(Entity_BlueWarpPipe_LoadTexturePipe), + gsSPVertex(D_0A000060_E58D30, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0), + gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0), + gsSP2Triangles(17, 16, 18, 0, 17, 18, 19, 0), + gsSP2Triangles(20, 21, 5, 0, 20, 5, 4, 0), + gsSP2Triangles(9, 8, 21, 0, 9, 21, 20, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0), + gsSP2Triangles(27, 26, 28, 0, 27, 28, 29, 0), + gsSPVertex(&D_0A000060_E58D30[10], 2, 0), + gsSPVertex(&D_0A000060_E58D30[22], 2, 2), + gsSPVertex(&D_0A000060_E58D30[30], 10, 4), + gsSP2Triangles(4, 9, 10, 0, 4, 10, 6, 0), + gsSP2Triangles(5, 11, 9, 0, 5, 9, 4, 0), + gsSP2Triangles(6, 10, 3, 0, 6, 3, 2, 0), + gsSP2Triangles(7, 12, 13, 0, 7, 13, 8, 0), + gsSP2Triangles(8, 13, 1, 0, 8, 1, 0, 0), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/BoardedFloor.c b/src/entity/model/BoardedFloor.c new file mode 100644 index 0000000000..d700d713de --- /dev/null +++ b/src/entity/model/BoardedFloor.c @@ -0,0 +1,473 @@ +#include "common.h" + +#include "entity/model/BoardedFloor_1.vtx.inc.c" +#include "entity/model/BoardedFloor_2.vtx.inc.c" +#include "entity/model/BoardedFloor_3.vtx.inc.c" +#include "entity/model/BoardedFloor_4.vtx.inc.c" +#include "entity/model/BoardedFloor_5.vtx.inc.c" +#include "entity/model/BoardedFloor_6.vtx.inc.c" +#include "entity/model/BoardedFloor_7.vtx.inc.c" +#include "entity/model/BoardedFloor_8.vtx.inc.c" +#include "entity/model/BoardedFloor_9.vtx.inc.c" +#include "entity/model/BoardedFloor_A.vtx.inc.c" +#include "entity/model/BoardedFloor_B.vtx.inc.c" +#include "entity/model/BoardedFloor_C.vtx.inc.c" + +#include "entity/model/BoardedFloor.png.inc.c" +Gfx D_0A002400_E50BF0[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001400_E4FBF0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_BoardedFloor_FragmentMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF30002, 0xFFF30001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xD5558000, 0x8E390000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00010002, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xD5558000, 0x8E390000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF50001, 0x00020001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xE65D8000, 0x046B0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000C0001, 0xFFF40001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x65928000, 0x7ED60000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000FFFFF, 0x00190001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF1FFFF, 0x00190001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000BFFFF, 0x000A0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x40008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEEFFFF, 0x000A0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x40008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEFFFFF, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80008000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000CFFFF, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80008000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFECFFFF, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0007FFFF, 0xFFE90001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80008000, 0x00000000 } + } + }, +}; + +Gfx D_0A002778_E50F68[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A001280_E4FA70, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A001280_E4FA70[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027E8_E50FD8[] = { + gsSPDisplayList(D_0A002778_E50F68), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027F8_E50FE8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A001180_E4F970, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 1, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPVertex(&D_0A001180_E4F970[10], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002858_E51048[] = { + gsSPDisplayList(D_0A0027F8_E50FE8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002868_E51058[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A001000_E4F7F0, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A001000_E4F7F0[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028D8_E510C8[] = { + gsSPDisplayList(D_0A002868_E51058), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028E8_E510D8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000E80_E4F670, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A000E80_E4F670[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002958_E51148[] = { + gsSPDisplayList(D_0A0028E8_E510D8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002968_E51158[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000C80_E4F470, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPVertex(&D_0A000C80_E4F470[20], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029F0_E511E0[] = { + gsSPDisplayList(D_0A002968_E51158), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A00_E511F0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000A80_E4F270, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPVertex(&D_0A000A80_E4F270[20], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 7, 0, 10, 7, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A88_E51278[] = { + gsSPDisplayList(D_0A002A00_E511F0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A98_E51288[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000900_E4F0F0, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A000900_E4F0F0[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B08_E512F8[] = { + gsSPDisplayList(D_0A002A98_E51288), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B18_E51308[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000780_E4EF70, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A000780_E4EF70[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B88_E51378[] = { + gsSPDisplayList(D_0A002B18_E51308), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B98_E51388[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0005A0_E4ED90, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSPVertex(&D_0A0005A0_E4ED90[6], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPVertex(&D_0A0005A0_E4ED90[18], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 6, 10, 0, 7, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C28_E51418[] = { + gsSPDisplayList(D_0A002B98_E51388), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C38_E51428[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0003C0_E4EBB0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPVertex(&D_0A0003C0_E4EBB0[4], 1, 0), + gsSPVertex(&D_0A0003C0_E4EBB0[7], 23, 1), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(12, 15, 16, 0, 12, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CC8_E514B8[] = { + gsSPDisplayList(D_0A002C38_E51428), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CD8_E514C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0001E0_E4E9D0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPVertex(&D_0A0001E0_E4E9D0[4], 1, 0), + gsSPVertex(&D_0A0001E0_E4E9D0[7], 23, 1), + gsSP2Triangles(2, 3, 0, 0, 2, 0, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(14, 16, 17, 0, 14, 17, 15, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D68_E51558[] = { + gsSPDisplayList(D_0A002CD8_E514C8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D78_E51568[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A002400_E50BF0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E4E7F0[0], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSPVertex(&D_0A000000_E4E7F0[6], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPVertex(&D_0A000000_E4E7F0[18], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 3, 0, 4, 3, 2, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E08_E515F8[] = { + gsSPDisplayList(D_0A002D78_E51568), + gsSPEndDisplayList(), +}; + +Gfx* Entity_BoardedFloor_FragmentsRender[] = { + D_0A002E08_E515F8, + D_0A002D68_E51558, + D_0A002CC8_E514B8, + D_0A002C28_E51418, + D_0A002B88_E51378, + D_0A002B08_E512F8, + D_0A002A88_E51278, + D_0A0029F0_E511E0, + D_0A002958_E51148, + D_0A0028D8_E510C8, + D_0A002858_E51048, + D_0A0027E8_E50FD8, +}; diff --git a/src/entity/model/BombableRock.c b/src/entity/model/BombableRock.c new file mode 100644 index 0000000000..8af40c69c8 --- /dev/null +++ b/src/entity/model/BombableRock.c @@ -0,0 +1,260 @@ +#include "common.h" + +#include "entity/model/BombableRock_1.vtx.inc.c" +#include "entity/model/BombableRock_2.vtx.inc.c" +#include "entity/model/BombableRock_3.vtx.inc.c" +#include "entity/model/BombableRock_4.vtx.inc.c" +#include "entity/model/BombableRock_5.vtx.inc.c" + +#include "entity/model/BombableRock.png.inc.c" +#include "entity/model/BombableRock.pal.inc.c" +Gfx D_0A001060_E9E6B0[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000840_E9DE90, G_IM_FMT_CI, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A001040_E9E690), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Mtx Entity_BombableRock_FragmentMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000023, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x000006D4, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00090012, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xA924647E, 0xBB9A0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100012, 0xFFF70001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xBB9A647E, 0x56DC0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00012, 0x00090001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x4466647E, 0xA9240000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF70012, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x56DC647E, 0x44660000 } + } + }, +}; + +Gfx D_0A001258_E9E8A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001060_E9E6B0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000720_E9DD70, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 2, 5, 0, 0), + gsSP2Triangles(2, 4, 6, 0, 2, 6, 5, 0), + gsSP2Triangles(4, 3, 6, 0, 6, 7, 8, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 5, 0), + gsSP2Triangles(10, 7, 6, 0, 10, 6, 3, 0), + gsSP2Triangles(5, 9, 11, 0, 5, 11, 0, 0), + gsSP2Triangles(7, 11, 9, 0, 7, 9, 8, 0), + gsSP2Triangles(3, 1, 12, 0, 3, 12, 13, 0), + gsSP2Triangles(13, 10, 3, 0, 7, 10, 14, 0), + gsSP2Triangles(7, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(13, 12, 14, 0, 13, 14, 10, 0), + gsSP2Triangles(14, 12, 1, 0, 0, 14, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0012F8_E9E948[] = { + gsSPDisplayList(D_0A001258_E9E8A8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001308_E9E958[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001060_E9E6B0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000600_E9DC50, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 2, 5, 0, 0), + gsSP2Triangles(2, 4, 6, 0, 2, 6, 5, 0), + gsSP2Triangles(4, 3, 6, 0, 6, 7, 8, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 5, 0), + gsSP2Triangles(10, 7, 6, 0, 10, 6, 3, 0), + gsSP2Triangles(5, 9, 11, 0, 5, 11, 0, 0), + gsSP2Triangles(7, 11, 9, 0, 7, 9, 8, 0), + gsSP2Triangles(3, 1, 12, 0, 3, 12, 13, 0), + gsSP2Triangles(13, 10, 3, 0, 7, 10, 14, 0), + gsSP2Triangles(7, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(13, 12, 14, 0, 13, 14, 10, 0), + gsSP2Triangles(14, 12, 1, 0, 0, 14, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0013A8_E9E9F8[] = { + gsSPDisplayList(D_0A001308_E9E958), + gsSPEndDisplayList(), +}; + +Gfx D_0A0013B8_E9EA08[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001060_E9E6B0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A0004A0_E9DAF0, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 2, 5, 0, 0), + gsSP2Triangles(2, 4, 6, 0, 2, 6, 5, 0), + gsSP2Triangles(4, 3, 6, 0, 6, 7, 8, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 5, 0), + gsSP2Triangles(10, 7, 6, 0, 10, 6, 3, 0), + gsSP2Triangles(5, 9, 11, 0, 5, 11, 0, 0), + gsSP2Triangles(7, 11, 9, 0, 7, 9, 8, 0), + gsSP2Triangles(3, 1, 12, 0, 3, 12, 13, 0), + gsSP2Triangles(13, 10, 3, 0, 7, 10, 14, 0), + gsSP2Triangles(7, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(14, 12, 1, 0, 0, 14, 1, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001458_E9EAA8[] = { + gsSPDisplayList(D_0A0013B8_E9EA08), + gsSPEndDisplayList(), +}; + +Gfx D_0A001468_E9EAB8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001060_E9E6B0), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000380_E9D9D0, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(1, 4, 2, 0, 2, 5, 0, 0), + gsSP2Triangles(2, 4, 6, 0, 2, 6, 5, 0), + gsSP2Triangles(4, 3, 6, 0, 6, 7, 8, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 5, 0), + gsSP2Triangles(10, 7, 6, 0, 10, 6, 3, 0), + gsSP2Triangles(5, 9, 11, 0, 5, 11, 0, 0), + gsSP2Triangles(7, 11, 9, 0, 7, 9, 8, 0), + gsSP2Triangles(3, 1, 12, 0, 3, 12, 13, 0), + gsSP2Triangles(13, 10, 3, 0, 7, 10, 14, 0), + gsSP2Triangles(7, 14, 11, 0, 15, 16, 17, 0), + gsSP2Triangles(13, 12, 14, 0, 13, 14, 10, 0), + gsSP2Triangles(14, 12, 1, 0, 0, 14, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001508_E9EB58[] = { + gsSPDisplayList(D_0A001468_E9EAB8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001518_E9EB68[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001060_E9E6B0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E9D650[0], 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP2Triangles(8, 6, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(8, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 12, 11, 0, 17, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(20, 23, 24, 0, 20, 24, 18, 0), + gsSP2Triangles(20, 18, 17, 0, 20, 17, 25, 0), + gsSP2Triangles(20, 25, 26, 0, 20, 26, 27, 0), + gsSP2Triangles(20, 27, 28, 0, 20, 28, 29, 0), + gsSPVertex(&D_0A000000_E9D650[26], 2, 0), + gsSPVertex(&D_0A000000_E9D650[30], 26, 2), + gsSP2Triangles(2, 1, 0, 0, 3, 9, 10, 0), + gsSP2Triangles(3, 10, 11, 0, 3, 11, 12, 0), + gsSP2Triangles(3, 12, 13, 0, 3, 13, 14, 0), + gsSP2Triangles(3, 14, 4, 0, 4, 15, 3, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 17, 18, 0), + gsSP2Triangles(5, 19, 20, 0, 5, 20, 21, 0), + gsSP2Triangles(5, 21, 22, 0, 5, 22, 23, 0), + gsSP2Triangles(5, 23, 24, 0, 5, 24, 6, 0), + gsSP2Triangles(6, 7, 5, 0, 7, 25, 26, 0), + gsSP1Triangle(8, 26, 27, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001610_E9EC60[] = { + gsSPDisplayList(D_0A001518_E9EB68), + gsSPEndDisplayList(), +}; + +Gfx D_0A001620_E9EC70[] = { + gsSPDisplayList(D_0A001610_E9EC60), + gsSPDisplayList(D_0A001508_E9EB58), + gsSPDisplayList(D_0A001458_E9EAA8), + gsSPDisplayList(D_0A0013A8_E9E9F8), + gsSPDisplayList(D_0A0012F8_E9E948), + gsSPEndDisplayList(), +}; + +Gfx D_0A001650_E9ECA0[] = { + gsSPDisplayList(D_0A001620_E9EC70), + gsSPEndDisplayList(), +}; + +Gfx* Entity_BombableRock_FragmentsRender[] = { + D_0A001610_E9EC60, + D_0A001508_E9EB58, + D_0A001458_E9EAA8, + D_0A0013A8_E9E9F8, + D_0A0012F8_E9E948, +}; diff --git a/src/entity/model/BrickBlock.c b/src/entity/model/BrickBlock.c new file mode 100644 index 0000000000..b9883fbd9c --- /dev/null +++ b/src/entity/model/BrickBlock.c @@ -0,0 +1,49 @@ +#include "common.h" + +#include "entity/model/BrickBlock.vtx.inc.c" + +#include "entity/model/BrickBlock_face.png.inc.c" +#include "entity/model/BrickBlock_face.pal.inc.c" +Gfx Entity_BrickBlock_LoadTexture[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000140_E3DEF0, G_IM_FMT_CI, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000340_E3E0F0), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Gfx Entity_BrickBlock_InitTexture[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_BrickBlock_LoadTexture), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPClearGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; + +Gfx Entity_BrickBlock_RenderFaces[] = { + gsSPDisplayList(Entity_BrickBlock_InitTexture), + gsSPVertex(D_0A000000_E3DDB0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(&D_0A000000_E3DDB0[4], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 2, 0, 10, 2, 1, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_BrickBlock_Render[] = { + gsSPDisplayList(Entity_BrickBlock_RenderFaces), + gsSPEndDisplayList(), +}; + diff --git a/src/entity/model/Chest.c b/src/entity/model/Chest.c new file mode 100644 index 0000000000..14d5f92e9e --- /dev/null +++ b/src/entity/model/Chest.c @@ -0,0 +1,159 @@ +#include "common.h" + +#include "entity/model/Chest_1.vtx.inc.c" +#include "entity/model/Chest_2.vtx.inc.c" +#include "entity/model/Chest_3.vtx.inc.c" +#include "entity/model/Chest_4.vtx.inc.c" + +#include "entity/model/Chest_tex1.png.inc.c" +Gfx Entity_Chest_LoadTexture1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000410_E64CE0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +#include "entity/model/Chest_tex2.png.inc.c" +#include "entity/model/Chest_tex2.pal.inc.c" +Gfx Entity_Chest_LoadTexture2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000898_E65168, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000998_E65268), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +#include "entity/model/Chest_lock.png.inc.c" +#include "entity/model/Chest_lock.pal.inc.c" +Gfx Entity_Chest_LoadTextureLock[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000A70_E65340, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000B70_E65440), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Mtx Entity_Chest_lidMtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0000001D, 0xFFE90001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_Chest_RenderLidLock[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Chest_LoadTextureLock), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000390_E64C60, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 4, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Chest_RenderLidWooden[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Chest_LoadTexture2), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000210_E64AE0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPClearGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000210_E64AE0[1], 2, 0), + gsSPVertex(&D_0A000210_E64AE0[4], 20, 2), + gsSP2Triangles(1, 2, 3, 0, 1, 3, 0, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(4, 8, 9, 0, 4, 9, 10, 0), + gsSP2Triangles(4, 10, 11, 0, 4, 11, 12, 0), + gsSP2Triangles(4, 12, 13, 0, 4, 13, 14, 0), + gsSP2Triangles(3, 15, 8, 0, 3, 8, 7, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(16, 19, 20, 0, 16, 20, 21, 0), + gsSP2Triangles(16, 21, 15, 0, 16, 15, 2, 0), + gsSP2Triangles(8, 15, 21, 0, 8, 21, 9, 0), + gsSP2Triangles(9, 21, 20, 0, 9, 20, 10, 0), + gsSP2Triangles(10, 20, 19, 0, 10, 19, 11, 0), + gsSP2Triangles(11, 19, 18, 0, 11, 18, 12, 0), + gsSP2Triangles(12, 18, 17, 0, 12, 17, 13, 0), + gsSP2Triangles(13, 17, 16, 0, 13, 16, 14, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Chest_RenderLid[] = { + gsSPDisplayList(Entity_Chest_RenderLidWooden), + gsSPDisplayList(Entity_Chest_RenderLidLock), + gsSPEndDisplayList(), +}; + +Gfx Entity_Chest_RenderBoxLock[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Chest_LoadTextureLock), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000190_E64A60, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(2, 1, 6, 0, 2, 6, 4, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 1, 0, 7, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Chest_RenderBoxWooden[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Chest_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E648D0, 25, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(9, 11, 12, 0, 9, 12, 13, 0), + gsSP2Triangles(14, 15, 10, 0, 14, 10, 16, 0), + gsSP2Triangles(12, 14, 16, 0, 12, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(21, 22, 23, 0, 21, 23, 24, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Chest_RenderBox[] = { + gsSPDisplayList(Entity_Chest_RenderBoxWooden), + gsSPDisplayList(Entity_Chest_RenderBoxLock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/CymbalPlant_anim.c b/src/entity/model/CymbalPlant_anim.c new file mode 100644 index 0000000000..2f43948793 --- /dev/null +++ b/src/entity/model/CymbalPlant_anim.c @@ -0,0 +1,385 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_CymbalPlant_RenderNode10[]; +extern Gfx Entity_CymbalPlant_RenderNode9[]; +extern Gfx Entity_CymbalPlant_RenderNode8[]; +extern Gfx Entity_CymbalPlant_RenderNode7[]; +extern Gfx Entity_CymbalPlant_RenderNode5[]; +extern Gfx Entity_CymbalPlant_RenderNode4[]; +extern Gfx Entity_CymbalPlant_RenderNode3[]; +extern Gfx Entity_CymbalPlant_RenderNode1[]; + +StaticAnimatorNode Entity_CymbalPlant_Node10 = { + .displayList = Entity_CymbalPlant_RenderNode10, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node9 = { + .displayList = Entity_CymbalPlant_RenderNode9, + .pos = { -2.0f, -26.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node8 = { + .displayList = Entity_CymbalPlant_RenderNode8, + .pos = { -2.0f, -26.0f, 0.0f }, + .sibling = &Entity_CymbalPlant_Node9, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node7 = { + .displayList = Entity_CymbalPlant_RenderNode7, + .pos = { -2.0f, -26.0f, 0.0f }, + .sibling = &Entity_CymbalPlant_Node8, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node6 = { + .displayList = ANIM_NULL, + .pos = { 2.0f, 26.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = &Entity_CymbalPlant_Node7, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node5 = { + .displayList = Entity_CymbalPlant_RenderNode5, + .pos = { 3.0f, -26.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node4 = { + .displayList = Entity_CymbalPlant_RenderNode4, + .pos = { 3.0f, -26.0f, 0.0f }, + .sibling = &Entity_CymbalPlant_Node5, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node3 = { + .displayList = Entity_CymbalPlant_RenderNode3, + .pos = { 3.0f, -26.0f, 0.0f }, + .sibling = &Entity_CymbalPlant_Node4, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node2 = { + .displayList = ANIM_NULL, + .pos = { -3.0f, 26.0f, 0.0f }, + .sibling = &Entity_CymbalPlant_Node6, + .child = &Entity_CymbalPlant_Node3, +}; + +StaticAnimatorNode Entity_CymbalPlant_Node1 = { + .displayList = Entity_CymbalPlant_RenderNode1, + .sibling = &Entity_CymbalPlant_Node10, + .child = &Entity_CymbalPlant_Node2, +}; + +StaticAnimatorNode Entity_CymbalPlant_NodeParent = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_CymbalPlant_Node1, +}; + +StaticAnimatorNode* Entity_CymbalPlant_Mesh[] = { + &Entity_CymbalPlant_NodeParent, + &Entity_CymbalPlant_Node1, + &Entity_CymbalPlant_Node2, + &Entity_CymbalPlant_Node3, + &Entity_CymbalPlant_Node4, + &Entity_CymbalPlant_Node5, + &Entity_CymbalPlant_Node6, + &Entity_CymbalPlant_Node7, + &Entity_CymbalPlant_Node8, + &Entity_CymbalPlant_Node9, + &Entity_CymbalPlant_Node10, + ANIM_NULL, +}; + +AnimScript Entity_CymbalPlant_AnimationGrab = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, -3, 26, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 3, -26, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 3, -26, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 3, -26, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 2, 26, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, -2, -26, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, -2, -26, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, -2, -26, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_SetRotation(11, 0.0, 0.0, 0.0) + as_SetPos(11, 0, 0, 0) + as_SetScale(11, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -9.36) + as_SetRotation(7, 0.0, 0.0, 9.355) + as_SetRotation(11, 0.0, 0.0, -0.225) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -31.685) + as_SetRotation(7, 0.0, 0.0, 31.68) + as_SetRotation(11, 0.0, 0.0, -0.68) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -58.33) + as_SetRotation(7, 0.0, 0.0, 58.315) + as_SetRotation(11, 0.0, 0.0, -1.025) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -80.64) + as_SetRotation(7, 0.0, 0.0, 80.635) + as_SetRotation(11, 0.0, 0.0, -0.91) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.995) + as_SetRotation(7, 0.0, 0.0, 89.995) + as_SetRotation(11, 0.0, 0.0, 0.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -84.995) + as_SetRotation(7, 0.0, 0.0, 85.0) + as_SetRotation(11, 0.0, 0.0, 5.67) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -80.0) + as_SetRotation(7, 0.0, 0.0, 80.0) + as_SetRotation(11, 0.0, 0.0, 10.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -84.985) + as_SetRotation(7, 0.0, 0.0, 85.0) + as_SetRotation(11, 0.0, 0.0, 2.435) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.995) + as_SetRotation(7, 0.0, 0.0, 89.995) + as_SetRotation(11, 0.0, 0.0, -5.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -87.51) + as_SetRotation(7, 0.0, 0.0, 87.5) + as_SetRotation(11, 0.0, 0.0, -2.93) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -85.0) + as_SetRotation(7, 0.0, 0.0, 85.0) + as_SetRotation(11, 0.0, 0.0, 2.02) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -87.49) + as_SetRotation(7, 0.0, 0.0, 87.5) + as_SetRotation(11, 0.0, 0.0, 5.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.995) + as_SetRotation(7, 0.0, 0.0, 89.995) + as_SetRotation(11, 0.0, 0.0, 4.075) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -88.75) + as_SetRotation(7, 0.0, 0.0, 88.745) + as_SetRotation(11, 0.0, 0.0, 1.565) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -87.5) + as_SetRotation(7, 0.0, 0.0, 87.5) + as_SetRotation(11, 0.0, 0.0, -1.105) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -88.75) + as_SetRotation(7, 0.0, 0.0, 88.745) + as_SetRotation(11, 0.0, 0.0, -2.5) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.995) + as_SetRotation(7, 0.0, 0.0, 89.995) + as_SetRotation(11, 0.0, 0.0, -2.175) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.985) + as_SetRotation(7, 0.0, 0.0, 90.015) + as_SetRotation(11, 0.0, 0.0, -0.995) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.975) + as_SetRotation(7, 0.0, 0.0, 90.025) + as_SetRotation(11, 0.0, 0.0, 0.52) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.97) + as_SetRotation(7, 0.0, 0.0, 90.03) + as_SetRotation(11, 0.0, 0.0, 1.86) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.965) + as_SetRotation(7, 0.0, 0.0, 90.025) + as_SetRotation(11, 0.0, 0.0, 2.5) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.96) + as_SetRotation(7, 0.0, 0.0, 90.015) + as_SetRotation(11, 0.0, 0.0, 2.315) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 90.005) + as_SetRotation(11, 0.0, 0.0, 1.67) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 89.99) + as_SetRotation(11, 0.0, 0.0, 0.78) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.965) + as_SetRotation(7, 0.0, 0.0, 89.975) + as_SetRotation(11, 0.0, 0.0, -0.135) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 89.96) + as_SetRotation(11, 0.0, 0.0, -0.885) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.97) + as_SetRotation(7, 0.0, 0.0, 89.94) + as_SetRotation(11, 0.0, 0.0, -1.245) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 89.925) + as_SetRotation(11, 0.0, 0.0, -1.19) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.975) + as_SetRotation(7, 0.0, 0.0, 89.92) + as_SetRotation(11, 0.0, 0.0, -0.885) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.98) + as_SetRotation(7, 0.0, 0.0, 89.915) + as_SetRotation(11, 0.0, 0.0, -0.415) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.985) + as_SetRotation(11, 0.0, 0.0, 0.11) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.99) + as_SetRotation(7, 0.0, 0.0, 89.92) + as_SetRotation(11, 0.0, 0.0, 0.625) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 89.935) + as_SetRotation(11, 0.0, 0.0, 1.04) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -89.995) + as_SetRotation(7, 0.0, 0.0, 89.965) + as_SetRotation(11, 0.0, 0.0, 1.245) + as_Wait(1) + as_SetRotation(7, 0.0, 0.0, 89.995) + as_SetRotation(11, 0.0, 0.0, 1.26) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -84.58) + as_SetRotation(7, 0.0, 0.0, 84.61) + as_SetRotation(11, 0.0, 0.0, 1.15) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -70.665) + as_SetRotation(7, 0.0, 0.0, 70.7) + as_SetRotation(11, 0.0, 0.0, 0.95) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -51.745) + as_SetRotation(7, 0.0, 0.0, 51.78) + as_SetRotation(11, 0.0, 0.0, 0.705) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -31.33) + as_SetRotation(7, 0.0, 0.0, 31.35) + as_SetRotation(11, 0.0, 0.0, 0.45) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, -12.915) + as_SetRotation(7, 0.0, 0.0, 12.92) + as_SetRotation(11, 0.0, 0.0, 0.225) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetRotation(11, 0.0, 0.0, 0.06) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, 5.06) + as_SetRotation(7, 0.0, 0.0, -5.06) + as_SetRotation(11, 0.0, 0.0, 0.0) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, 4.5) + as_SetRotation(7, 0.0, 0.0, -4.5) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, 1.685) + as_SetRotation(7, 0.0, 0.0, -1.685) + as_Wait(1) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, -3, 26, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 3, -26, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 3, -26, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 3, -26, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 2, 26, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, -2, -26, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, -2, -26, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, -2, -26, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_SetRotation(11, 0.0, 0.0, 0.0) + as_SetPos(11, 0, 0, 0) + as_SetScale(11, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_CymbalPlant_AnimationIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, -3, 26, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 3, -26, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 3, -26, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 3, -26, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 2, 26, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, -2, -26, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, -2, -26, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, -2, -26, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_SetRotation(11, 0.0, 0.0, 0.0) + as_SetPos(11, 0, 0, 0) + as_SetScale(11, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/CymbalPlant_gfx.c b/src/entity/model/CymbalPlant_gfx.c new file mode 100644 index 0000000000..86a31664cd --- /dev/null +++ b/src/entity/model/CymbalPlant_gfx.c @@ -0,0 +1,273 @@ +#include "common.h" + +#include "entity/model/CymbalPlant.png.inc.c" +#include "entity/model/CymbalPlant.pal.inc.c" +Gfx Entity_CymbalPlant_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000800_E99AF0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000000_E992F0, G_IM_FMT_CI, 64, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/CymbalPlant_1.vtx.inc.c" +#include "entity/model/CymbalPlant_2.vtx.inc.c" +#include "entity/model/CymbalPlant_3.vtx.inc.c" +#include "entity/model/CymbalPlant_4.vtx.inc.c" +#include "entity/model/CymbalPlant_5.vtx.inc.c" +#include "entity/model/CymbalPlant_6.vtx.inc.c" +#include "entity/model/CymbalPlant_7.vtx.inc.c" +#include "entity/model/CymbalPlant_8.vtx.inc.c" + +Mtx D_0A001078_E9A368 = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0002001A, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAB15AB15, 0x00000000 } + } +}; + +Mtx D_0A0010B8_E9A3A8 = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFD001A, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAB15AB15, 0x00000000 } + } +}; + +Gfx Entity_CymbalPlant_RenderNode3[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A0010B8_E9A3A8, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_CymbalPlant_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000F28_E9A218, 21, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(2, 6, 3, 0, 5, 6, 2, 0), + gsSP2Triangles(7, 6, 8, 0, 9, 6, 7, 0), + gsSP2Triangles(3, 6, 9, 0, 8, 6, 10, 0), + gsSP2Triangles(11, 6, 5, 0, 12, 6, 11, 0), + gsSP2Triangles(13, 6, 12, 0, 10, 6, 13, 0), + gsSP2Triangles(14, 0, 3, 0, 14, 3, 9, 0), + gsSP2Triangles(15, 14, 9, 0, 15, 9, 7, 0), + gsSP2Triangles(15, 7, 8, 0, 15, 8, 16, 0), + gsSP2Triangles(16, 8, 10, 0, 16, 10, 17, 0), + gsSP2Triangles(5, 4, 18, 0, 5, 18, 11, 0), + gsSP2Triangles(19, 17, 10, 0, 19, 10, 13, 0), + gsSP2Triangles(20, 19, 13, 0, 20, 13, 12, 0), + gsSP2Triangles(18, 20, 12, 0, 18, 12, 11, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode4[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A0010B8_E9A3A8, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_CymbalPlant_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000DB8_E9A0A8, 23, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(4, 6, 0, 0, 0, 6, 1, 0), + gsSP2Triangles(7, 6, 8, 0, 8, 6, 4, 0), + gsSP2Triangles(1, 6, 9, 0, 10, 6, 7, 0), + gsSP2Triangles(9, 6, 11, 0, 11, 6, 12, 0), + gsSP2Triangles(12, 6, 13, 0, 13, 6, 10, 0), + gsSP2Triangles(1, 9, 14, 0, 1, 14, 2, 0), + gsSP2Triangles(8, 4, 5, 0, 8, 5, 15, 0), + gsSP2Triangles(16, 7, 8, 0, 16, 8, 15, 0), + gsSP2Triangles(17, 10, 7, 0, 17, 7, 16, 0), + gsSP2Triangles(11, 18, 14, 0, 11, 14, 9, 0), + gsSP2Triangles(19, 10, 17, 0, 19, 17, 20, 0), + gsSP2Triangles(11, 21, 22, 0, 11, 22, 18, 0), + gsSP2Triangles(21, 19, 20, 0, 21, 20, 22, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode5[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A0010B8_E9A3A8, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A0009C8_E99CB8[8], 1, 0), + gsSPVertex(D_0A000D28_E9A018, 9, 1), + gsSP2Triangles(1, 0, 2, 0, 1, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(3, 2, 5, 0, 3, 5, 4, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_0A001308_E9A5F8[] = { + gsSPMatrix(&D_0A0010B8_E9A3A8, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_CymbalPlant_RenderNode5), + gsSPDisplayList(Entity_CymbalPlant_RenderNode4), + gsSPDisplayList(Entity_CymbalPlant_RenderNode3), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode7[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A001078_E9A368, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_CymbalPlant_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000BB8_E99EA8, 23, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(2, 6, 3, 0, 5, 6, 2, 0), + gsSP2Triangles(7, 6, 8, 0, 9, 6, 7, 0), + gsSP2Triangles(3, 6, 9, 0, 8, 6, 10, 0), + gsSP2Triangles(11, 6, 5, 0, 12, 6, 11, 0), + gsSP2Triangles(13, 6, 12, 0, 10, 6, 13, 0), + gsSP2Triangles(14, 0, 3, 0, 14, 3, 9, 0), + gsSP2Triangles(15, 14, 9, 0, 15, 9, 7, 0), + gsSP2Triangles(15, 7, 8, 0, 15, 8, 16, 0), + gsSP2Triangles(16, 8, 10, 0, 16, 10, 17, 0), + gsSP2Triangles(5, 4, 18, 0, 5, 18, 11, 0), + gsSP2Triangles(19, 17, 10, 0, 19, 10, 20, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 11, 0), + gsSP2Triangles(21, 19, 20, 0, 21, 20, 22, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode9[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A001078_E9A368, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_CymbalPlant_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000A68_E99D58, 21, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(4, 6, 0, 0, 0, 6, 1, 0), + gsSP2Triangles(7, 6, 8, 0, 8, 6, 4, 0), + gsSP2Triangles(1, 6, 9, 0, 10, 6, 7, 0), + gsSP2Triangles(9, 6, 11, 0, 11, 6, 12, 0), + gsSP2Triangles(12, 6, 13, 0, 13, 6, 10, 0), + gsSP2Triangles(1, 9, 14, 0, 1, 14, 2, 0), + gsSP2Triangles(8, 4, 5, 0, 8, 5, 15, 0), + gsSP2Triangles(16, 7, 8, 0, 16, 8, 15, 0), + gsSP2Triangles(17, 10, 7, 0, 17, 7, 16, 0), + gsSP2Triangles(11, 18, 14, 0, 11, 14, 9, 0), + gsSP2Triangles(13, 10, 17, 0, 13, 17, 19, 0), + gsSP2Triangles(12, 13, 19, 0, 12, 19, 20, 0), + gsSP2Triangles(11, 12, 20, 0, 11, 20, 18, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode8[] = { + gsDPPipeSync(), + gsSPMatrix(&D_0A001078_E9A368, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0009C8_E99CB8, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_0A001540_E9A830[] = { + gsSPMatrix(&D_0A001078_E9A368, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_CymbalPlant_RenderNode8), + gsSPDisplayList(Entity_CymbalPlant_RenderNode9), + gsSPDisplayList(Entity_CymbalPlant_RenderNode7), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx D_0A001570_E9A860[] = { + gsSPDisplayList(D_0A001540_E9A830), + gsSPDisplayList(D_0A001308_E9A5F8), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode10[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000968_E99C58, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(0, 4, 1, 0, 3, 5, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_CymbalPlant_RenderNode1[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0008C8_E99BB8, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPVertex(D_0A0008C8_E99BB8, 1, 0), + gsSPVertex(&D_0A0008C8_E99BB8[3], 7, 1), + gsSP2Triangles(0, 1, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001658_E9A948[] = { + gsSPDisplayList(Entity_CymbalPlant_RenderNode1), + gsSPDisplayList(Entity_CymbalPlant_RenderNode10), + gsSPEndDisplayList(), +}; + +Gfx D_0A001670_E9A960[] = { + gsSPDisplayList(D_0A001658_E9A948), + gsSPDisplayList(D_0A001570_E9A860), + gsSPEndDisplayList(), +}; + +Gfx D_0A001688_E9A978[] = { + gsSPDisplayList(D_0A001670_E9A960), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/GreenStompSwitch.c b/src/entity/model/GreenStompSwitch.c new file mode 100644 index 0000000000..26b21e01b6 --- /dev/null +++ b/src/entity/model/GreenStompSwitch.c @@ -0,0 +1,107 @@ +#include "common.h" + +#include "entity/model/GreenStompSwitch_1.vtx.inc.c" +#include "entity/model/GreenStompSwitch_2.vtx.inc.c" + +#include "entity/model/GreenStompSwitch_tex.png.inc.c" +#include "entity/model/GreenStompSwitch_tex.pal.inc.c" +Gfx Entity_GreenStompSwitch_LoadTexture[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000280_E625F0, G_IM_FMT_CI, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000300_E62670), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +#include "entity/model/GreenStompSwitch_exclamationMark.png.inc.c" +#include "entity/model/GreenStompSwitch_exclamationMark.pal.inc.c" +Gfx Entity_GreenStompSwitch_LoadExclMark[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A0003D8_E62748, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A0004D8_E62848), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Mtx Entity_GreenStompSwitch_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_GreenStompSwitch_RenderBase[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_GreenStompSwitch_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000080_E623F0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 4, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 13, 0, 14, 13, 12, 0), + gsSP2Triangles(7, 6, 15, 0, 7, 15, 14, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(17, 16, 20, 0, 17, 20, 21, 0), + gsSP2Triangles(21, 20, 22, 0, 21, 22, 23, 0), + gsSP2Triangles(19, 18, 24, 0, 19, 24, 25, 0), + gsSP2Triangles(25, 24, 26, 0, 25, 26, 27, 0), + gsSP2Triangles(28, 27, 26, 0, 28, 26, 29, 0), + gsSPVertex(&D_0A000080_E623F0[22], 2, 0), + gsSPVertex(&D_0A000080_E623F0[28], 4, 2), + gsSP2Triangles(1, 0, 4, 0, 1, 4, 5, 0), + gsSP2Triangles(5, 4, 2, 0, 5, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_GreenStompSwitch_RenderExclMark[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_GreenStompSwitch_LoadExclMark), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E62370, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_GreenStompSwitch_RenderMain[] = { + gsSPMatrix(&Entity_GreenStompSwitch_mtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_GreenStompSwitch_RenderExclMark), + gsSPDisplayList(Entity_GreenStompSwitch_RenderBase), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_GreenStompSwitch_Render[] = { + gsSPDisplayList(Entity_GreenStompSwitch_RenderMain), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/Hammer1Block.c b/src/entity/model/Hammer1Block.c new file mode 100644 index 0000000000..95b46db20a --- /dev/null +++ b/src/entity/model/Hammer1Block.c @@ -0,0 +1,50 @@ +#include "common.h" + +#include "entity/model/Hammer1Block.vtx.inc.c" + +#include "entity/model/Hammer1Block_face.png.inc.c" +#include "entity/model/Hammer1Block_face.pal.inc.c" +Gfx Entity_Hammer1Block_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000380_E318B0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000280_E317B0, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer1Block_RenderFaces[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_Hammer1Block_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E31530, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(22, 23, 4, 0, 22, 4, 5, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0), + gsSPVertex(&D_0A000000_E31530[28], 12, 0), + gsSP2Triangles(0, 2, 6, 0, 0, 6, 1, 0), + gsSP2Triangles(3, 7, 4, 0, 3, 4, 8, 0), + gsSP2Triangles(4, 5, 9, 0, 4, 9, 8, 0), + gsSP2Triangles(5, 10, 11, 0, 5, 11, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer1Block_RenderBlock[] = { + gsSPDisplayList(Entity_Hammer1Block_RenderFaces), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer1Block_Render[] = { + gsSPDisplayList(Entity_Hammer1Block_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/Hammer2Block.c b/src/entity/model/Hammer2Block.c new file mode 100644 index 0000000000..297a74a173 --- /dev/null +++ b/src/entity/model/Hammer2Block.c @@ -0,0 +1,50 @@ +#include "common.h" + +#include "entity/model/Hammer2Block.vtx.inc.c" + +#include "entity/model/Hammer2Block_face.png.inc.c" +#include "entity/model/Hammer2Block_face.pal.inc.c" +Gfx Entity_Hammer2Block_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000380_E31DB0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000280_E31CB0, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer2Block_RenderFaces[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_Hammer2Block_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E31A30, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(22, 23, 4, 0, 22, 4, 5, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0), + gsSPVertex(&D_0A000000_E31A30[28], 12, 0), + gsSP2Triangles(0, 2, 6, 0, 0, 6, 1, 0), + gsSP2Triangles(3, 7, 4, 0, 3, 4, 8, 0), + gsSP2Triangles(4, 5, 9, 0, 4, 9, 8, 0), + gsSP2Triangles(5, 10, 11, 0, 5, 11, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer2Block_RenderBlock[] = { + gsSPDisplayList(Entity_Hammer2Block_RenderFaces), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer2Block_Render[] = { + gsSPDisplayList(Entity_Hammer2Block_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/Hammer3Block.c b/src/entity/model/Hammer3Block.c new file mode 100644 index 0000000000..60d9deb494 --- /dev/null +++ b/src/entity/model/Hammer3Block.c @@ -0,0 +1,45 @@ +#include "common.h" + +#include "entity/model/Hammer3Block.vtx.inc.c" + +#include "entity/model/Hammer3Block_face.png.inc.c" +#include "entity/model/Hammer3Block_face.pal.inc.c" +Gfx Entity_Hammer3Block_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000380_E322B0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000280_E321B0, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer3Block_RenderBlock[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_Hammer3Block_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E31F30, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 0, 3, 0, 4, 3, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(16, 18, 19, 0, 16, 19, 17, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(22, 23, 4, 0, 22, 4, 5, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(26, 28, 29, 0, 26, 29, 27, 0), + gsSPVertex(&D_0A000000_E31F30[28], 12, 0), + gsSP2Triangles(0, 2, 6, 0, 0, 6, 1, 0), + gsSP2Triangles(3, 7, 4, 0, 3, 4, 8, 0), + gsSP2Triangles(4, 5, 9, 0, 4, 9, 8, 0), + gsSP2Triangles(5, 10, 11, 0, 5, 11, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Hammer3Block_Render[] = { + gsSPDisplayList(Entity_Hammer3Block_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/HeartBlock.c b/src/entity/model/HeartBlock.c new file mode 100644 index 0000000000..b374cd6d72 --- /dev/null +++ b/src/entity/model/HeartBlock.c @@ -0,0 +1,52 @@ +#include "common.h" + +#include "entity/model/HeartBlock.vtx.inc.c" + +#include "entity/model/HeartBlock_face.png.inc.c" +Gfx Entity_HeartBlock_LoadTexture[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0003C0_E435B0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlock_RenderBlock[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsSPDisplayList(Entity_HeartBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E431F0[4], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(&D_0A000000_E431F0[8], 28, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSPVertex(&D_0A000000_E431F0[36], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A000000_E431F0[52], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(&D_0A000000_E431F0[56], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlock_Render[] = { + gsSPDisplayList(Entity_HeartBlock_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/HeartBlockContent.c b/src/entity/model/HeartBlockContent.c new file mode 100644 index 0000000000..389dccd239 --- /dev/null +++ b/src/entity/model/HeartBlockContent.c @@ -0,0 +1,78 @@ +#include "common.h" + +//TODO make images +unsigned char D_0A000000_E49E40[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 80, 0, 0, 5, 85, 80, 0, 0, 0, 0, 0, 0, 0, 5, 85, 85, 85, 80, 5, 85, 85, 85, 80, 0, 0, 0, 0, 0, 0, 85, 84, 51, 69, 85, 85, 86, 68, 101, 85, 0, 0, 0, 0, 0, 0, 85, 50, 18, 51, 85, 85, 51, 52, 68, 85, 0, 0, 0, 0, 0, 5, 85, 33, 17, 35, 53, 83, 51, 51, 68, 85, 80, 0, 0, 0, 0, 5, 83, 33, 18, 35, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 33, 34, 51, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 50, 35, 51, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 56, 51, 51, 51, 51, 51, 51, 116, 69, 80, 0, 0, 0, 0, 5, 83, 56, 51, 51, 131, 56, 51, 51, 116, 69, 80, 0, 0, 0, 0, 5, 85, 56, 131, 56, 131, 56, 131, 55, 116, 85, 80, 0, 0, 0, 0, 0, 85, 51, 136, 136, 51, 51, 119, 119, 68, 85, 0, 0, 0, 0, 0, 0, 85, 83, 51, 51, 51, 51, 51, 68, 69, 85, 0, 0, 0, 0, 0, 0, 5, 83, 51, 51, 51, 51, 52, 68, 69, 80, 0, 0, 0, 0, 0, 0, 5, 85, 51, 51, 51, 51, 68, 68, 85, 80, 0, 0, 0, 0, 0, 0, 0, 85, 83, 51, 51, 68, 68, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 68, 68, 68, 68, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 84, 68, 68, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 84, 69, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +unsigned char D_0A000200_E4A040[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 80, 0, 0, 5, 85, 80, 0, 0, 0, 0, 0, 0, 0, 5, 85, 85, 85, 80, 5, 85, 85, 85, 80, 0, 0, 0, 0, 0, 0, 85, 84, 51, 69, 85, 85, 86, 68, 101, 85, 0, 0, 0, 0, 0, 0, 85, 50, 18, 51, 85, 85, 51, 52, 68, 85, 0, 0, 0, 0, 0, 5, 85, 33, 17, 35, 53, 83, 51, 51, 68, 85, 80, 0, 0, 0, 0, 5, 83, 33, 18, 35, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 33, 34, 51, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 50, 40, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 83, 51, 56, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 83, 51, 56, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 85, 51, 56, 135, 51, 51, 136, 115, 68, 85, 80, 0, 0, 0, 0, 0, 85, 51, 55, 119, 51, 51, 119, 116, 68, 85, 0, 0, 0, 0, 0, 0, 85, 83, 51, 51, 51, 51, 51, 68, 69, 85, 0, 0, 0, 0, 0, 0, 5, 83, 51, 51, 51, 51, 52, 68, 69, 80, 0, 0, 0, 0, 0, 0, 5, 85, 51, 51, 51, 51, 68, 68, 85, 80, 0, 0, 0, 0, 0, 0, 0, 85, 83, 51, 51, 68, 68, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 68, 68, 68, 68, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 84, 68, 68, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 84, 69, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +unsigned char D_0A000400_E4A240[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 80, 0, 0, 5, 85, 80, 0, 0, 0, 0, 0, 0, 0, 5, 85, 85, 85, 80, 5, 85, 85, 85, 80, 0, 0, 0, 0, 0, 0, 85, 84, 51, 69, 85, 85, 86, 68, 101, 85, 0, 0, 0, 0, 0, 0, 85, 50, 18, 51, 85, 85, 51, 52, 68, 85, 0, 0, 0, 0, 0, 5, 85, 33, 17, 35, 53, 83, 51, 51, 68, 85, 80, 0, 0, 0, 0, 5, 83, 33, 18, 35, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 33, 34, 51, 51, 51, 51, 51, 68, 69, 80, 0, 0, 0, 0, 5, 83, 50, 40, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 83, 51, 56, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 83, 51, 56, 135, 51, 51, 136, 115, 68, 69, 80, 0, 0, 0, 0, 5, 85, 51, 55, 119, 51, 51, 119, 115, 68, 85, 80, 0, 0, 0, 0, 0, 85, 51, 51, 51, 51, 51, 51, 52, 68, 85, 0, 0, 0, 0, 0, 0, 85, 83, 52, 187, 187, 187, 187, 100, 69, 85, 0, 0, 0, 0, 0, 0, 5, 83, 52, 187, 153, 170, 155, 100, 69, 80, 0, 0, 0, 0, 0, 0, 5, 85, 51, 187, 154, 170, 155, 68, 85, 80, 0, 0, 0, 0, 0, 0, 0, 85, 83, 59, 154, 169, 180, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 68, 187, 187, 100, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 84, 70, 100, 69, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 85, 84, 69, 85, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +unsigned char D_0A000600_E4A440[] = { + 41, 74, 228, 227, 211, 221, 202, 213, 185, 209, 144, 207, 153, 147, 144, 197, 152, 129, 185, 95, 194, 31, 136, 145, 0, 1, 0, 1, 0, 1, 0, 1, +}; + +Vtx Entity_HeartBlockContent_vtx[] = { + {{{ 13, 13, 0 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, 13, 0 }, 0, { 1024, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, -13, 0 }, 0, { 1024, 1024 }, { 255, 255, 255, 255 }}}, + {{{ 13, -13, 0 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, +}; + +Gfx Entity_HeartBlockContent_LoadPalette[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000600_E4A440), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlockContent_RenderImage[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_HeartBlockContent_LoadPalette), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(Entity_HeartBlockContent_vtx, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlockContent_RenderHeartSleeping[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTextureBlock_4b(D_0A000000_E49E40, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_HeartBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx D_0A000758_E4A598[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTextureBlock_4b(D_0A000200_E4A040, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_HeartBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlockContent_RenderHeartAwake[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), + gsDPLoadTextureBlock_4b(D_0A000200_E4A040, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_HeartBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_HeartBlockContent_RenderHeartHappy[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), + gsDPLoadTextureBlock_4b(D_0A000400_E4A240, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_HeartBlockContent_RenderImage), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/HiddenPanel.c b/src/entity/model/HiddenPanel.c new file mode 100644 index 0000000000..05944a5e60 --- /dev/null +++ b/src/entity/model/HiddenPanel.c @@ -0,0 +1,96 @@ +#include "common.h" + +Vtx Entity_HiddenPanel_vtxTopSide[] = { + {{{ -30, 1, -30 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, + {{{ -30, 1, 30 }, 0, { 1024, 1024 }, { 255, 255, 255, 255 }}}, + {{{ 30, 1, 30 }, 0, { 1024, 0 }, { 255, 255, 255, 255 }}}, + {{{ 30, 1, -30 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, +}; +Vtx Entity_HiddenPanel_vtxBottomSide[] = { + {{{ -30, -1, -30 }, 0, { 0, 1024 }, { 128, 128, 128, 255 }}}, + {{{ -30, -1, 30 }, 0, { 1024, 1024 }, { 128, 128, 128, 255 }}}, + {{{ 30, -1, 30 }, 0, { 1024, 0 }, { 128, 128, 128, 255 }}}, + {{{ 30, -1, -30 }, 0, { 0, 0 }, { 128, 128, 128, 255 }}}, +}; +Vtx Entity_HiddenPanel_vtxBottomSideDark[] = { + {{{ -30, 0, -30 }, 0, { 0, 1024 }, { 10, 10, 10, 128 }}}, + {{{ -30, 0, 30 }, 0, { 1024, 1024 }, { 10, 10, 10, 128 }}}, + {{{ 30, 0, 30 }, 0, { 1024, 0 }, { 10, 10, 10, 128 }}}, + {{{ 30, 0, -30 }, 0, { 0, 0 }, { 10, 10, 10, 128 }}}, +}; +Vtx Entity_HiddenPanel_vtxTopSide2[] = { + {{{ -30, 1, -30 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, + {{{ -30, 1, 30 }, 0, { 1024, 1024 }, { 255, 255, 255, 255 }}}, + {{{ 30, 1, 30 }, 0, { 1024, 0 }, { 255, 255, 255, 255 }}}, + {{{ 30, 1, -30 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, +}; +Vtx D_0A000016_E56BA0[] = { + {{{ -30, -1, -30 }, 0, { 0, 1024 }, { 128, 128, 128, 255 }}}, + {{{ -30, -1, 30 }, 0, { 1024, 1024 }, { 128, 128, 128, 255 }}}, + {{{ 30, -1, 30 }, 0, { 1024, 0 }, { 128, 128, 128, 255 }}}, + {{{ 30, -1, -30 }, 0, { 0, 0 }, { 128, 128, 128, 255 }}} +}; +Vtx D_0A000020_E56BA0[] = { + {{{ -30, 0, -30 }, 0, { 0, 1024 }, { 10, 10, 10, 128 }}}, + {{{ -30, 0, 30 }, 0, { 1024, 1024 }, { 10, 10, 10, 128 }}}, + {{{ 30, 0, 30 }, 0, { 1024, 0 }, { 10, 10, 10, 128 }}}, + {{{ 30, 0, -30 }, 0, { 0, 0 }, { 10, 10, 10, 128 }}}, +}; + +Gfx Entity_HiddenPanel_RenderTop[] = { + gsDPPipeSync(), + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK), + gsSPVertex(Entity_HiddenPanel_vtxTopSide, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HiddenPanel_RenderTop2[] = { + gsDPPipeSync(), + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK), + gsSPVertex(Entity_HiddenPanel_vtxTopSide2, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HiddenPanel_RenderBottom[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPVertex(Entity_HiddenPanel_vtxBottomSide, 4, 0), + gsSP2Triangles(0, 2, 1, 0, 0, 3, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HiddenPanel_RenderBottomDark[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING), + gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPVertex(Entity_HiddenPanel_vtxBottomSideDark, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_HiddenPanel_Render[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_HiddenPanel_RenderTop), + gsSPDisplayList(Entity_HiddenPanel_RenderBottom), + gsSPEndDisplayList(), +}; + +Gfx Entity_HiddenPanel_Render2[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_HiddenPanel_RenderTop2), + gsSPDisplayList(Entity_HiddenPanel_RenderBottom), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/HitFloatingYellowBlock_anim.c b/src/entity/model/HitFloatingYellowBlock_anim.c new file mode 100644 index 0000000000..6c4c5e9f00 --- /dev/null +++ b/src/entity/model/HitFloatingYellowBlock_anim.c @@ -0,0 +1,98 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_HitFloatingYellowBlock_RenderBlock2[]; +extern Gfx Entity_HitFloatingYellowBlock_RenderBlock1[]; + +StaticAnimatorNode Entity_HitFloatingYellowBlock_NodeBlock2 = { + .displayList = Entity_HitFloatingYellowBlock_RenderBlock2, + .pos = { 0.0f, 25.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitFloatingYellowBlock_NodeBlock1 = { + .displayList = Entity_HitFloatingYellowBlock_RenderBlock1, + .sibling = &Entity_HitFloatingYellowBlock_NodeBlock2, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitFloatingYellowBlock_NodeMain = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_HitFloatingYellowBlock_NodeBlock1, +}; + +StaticAnimatorNode* Entity_HitFloatingYellowBlock_Mesh[] = { + &Entity_HitFloatingYellowBlock_NodeMain, + &Entity_HitFloatingYellowBlock_NodeBlock1, + &Entity_HitFloatingYellowBlock_NodeBlock2, + ANIM_NULL, +}; + +AnimScript Entity_HitFloatingYellowBlock_AnimationHit = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 25, 0) + as_SetScale(3, 1.0, -1.0, 1.0) + as_Wait(1) + as_SetScale(2, 1.26, 0.815, 1.26) + as_SetPos(3, 0, 20, 0) + as_SetScale(3, 1.26, -0.815, 1.26) + as_Wait(1) + as_SetScale(2, 1.735, 0.405, 1.735) + as_SetPos(3, 0, 10, 0) + as_SetScale(3, 1.735, -0.405, 1.735) + as_Wait(1) + as_SetScale(2, 2.0, 0.0, 2.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 2.0, 0.0, 2.0) + as_Wait(1) + as_SetPos(2, 0, 8, 0) + as_SetScale(2, 1.805, -0.335, 1.805) + as_SetScale(3, 1.805, 0.335, 1.805) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetScale(2, 1.395, -0.675, 1.395) + as_SetScale(3, 1.395, 0.675, 1.395) + as_Wait(1) + as_SetPos(2, 0, 25, 0) + as_SetScale(2, 1.0, -1.0, 1.0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetPos(2, 0, 31, 0) + as_SetScale(2, 0.745, -1.245, 0.745) + as_SetScale(3, 0.745, 1.245, 0.745) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetScale(2, 0.875, -1.12, 0.875) + as_SetScale(3, 0.875, 1.12, 0.875) + as_Wait(1) + as_Loop + as_SetPos(2, 0, 25, 0) + as_SetScale(2, 1.0, -1.0, 1.0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_HitFloatingYellowBlock_AnimationIdle = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 25, 0) + as_SetScale(3, 1.0, -1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/HitFloatingYellowBlock_gfx.c b/src/entity/model/HitFloatingYellowBlock_gfx.c new file mode 100644 index 0000000000..602d554296 --- /dev/null +++ b/src/entity/model/HitFloatingYellowBlock_gfx.c @@ -0,0 +1,48 @@ +#include "common.h" + +#include "entity/model/HitFloatingYellowBlock_1.vtx.inc.c" +#include "entity/model/HitFloatingYellowBlock_2.vtx.inc.c" + +extern unsigned char D_0A000C40_E47CF0[]; +extern unsigned char D_0A000440_E474F0[]; + +Gfx Entity_HitFloatingYellowBlock_RenderBlock2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPLoadTextureBlock(D_0A000C40_E47CF0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000160_E47210, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_HitFloatingYellowBlock_RenderBlock1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPLoadTextureBlock(D_0A000440_E474F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E470B0, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/HitFloatingYellowBlock_face1.png.inc.c" +#include "entity/model/HitFloatingYellowBlock_face2.png.inc.c" diff --git a/src/entity/model/HitRedBlock_anim.c b/src/entity/model/HitRedBlock_anim.c new file mode 100644 index 0000000000..84501a28ff --- /dev/null +++ b/src/entity/model/HitRedBlock_anim.c @@ -0,0 +1,88 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_HitRedBlock_RenderBlock2[]; +extern Gfx Entity_HitRedBlock_RenderBlock1[]; + +StaticAnimatorNode Entity_HitRedBlock_NodeBlock2 = { + .displayList = Entity_HitRedBlock_RenderBlock2, + .pos = { 0.0f, 25.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitRedBlock_NodeBlock1 = { + .displayList = Entity_HitRedBlock_RenderBlock1, + .sibling = &Entity_HitRedBlock_NodeBlock2, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitRedBlock_NodeMain = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_HitRedBlock_NodeBlock1, +}; + +StaticAnimatorNode* Entity_HitRedBlock_Mesh[] = { + &Entity_HitRedBlock_NodeMain, + &Entity_HitRedBlock_NodeBlock1, + &Entity_HitRedBlock_NodeBlock2, + ANIM_NULL, +}; + +AnimScript Entity_HitRedBlock_AnimationHit = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 25, 0) + as_SetScale(3, -1.0, -1.0, -1.0) + as_Wait(1) + as_SetPos(2, 0, 9, 0) + as_SetScale(2, 1.62, 0.62, 1.62) + as_SetScale(3, -1.62, -0.62, -1.62) + as_Wait(1) + as_SetPos(2, 0, 25, 0) + as_SetScale(2, 2.0, 0.0, 2.0) + as_SetScale(3, -2.0, 0.0, -2.0) + as_Wait(1) + as_SetPos(2, 0, 40, 0) + as_SetScale(2, 1.62, -0.62, 1.62) + as_SetScale(3, -1.62, 0.62, -1.62) + as_Wait(1) + as_SetPos(2, 0, 50, 0) + as_SetScale(2, -1.0, -1.0, -1.0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetPos(2, 0, 43, 0) + as_SetScale(2, -1.36, -0.885, -1.36) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.36, 0.885, 1.36) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetScale(2, -1.245, -0.745, -1.245) + as_SetPos(3, 0, 16, 0) + as_SetScale(3, 1.245, 0.745, 1.245) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetScale(2, -1.18, -0.815, -1.18) + as_SetPos(3, 0, 9, 0) + as_SetScale(3, 1.18, 0.815, 1.18) + as_Wait(1) + as_SetPos(2, 0, 26, 0) + as_SetScale(2, -1.06, -0.935, -1.06) + as_SetPos(3, 0, 3, 0) + as_SetScale(3, 1.06, 0.935, 1.06) + as_Wait(1) + as_Loop + as_SetPos(2, 0, 25, 0) + as_SetScale(2, -1.0, -1.0, -1.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/HitRedBlock_gfx.c b/src/entity/model/HitRedBlock_gfx.c new file mode 100644 index 0000000000..89b1adcbe4 --- /dev/null +++ b/src/entity/model/HitRedBlock_gfx.c @@ -0,0 +1,56 @@ +#include "common.h" + +#include "entity/model/HitRedBlock_1.vtx.inc.c" +#include "entity/model/HitRedBlock_2.vtx.inc.c" + +extern unsigned char D_0A000C60_E493E0[]; +extern unsigned char D_0A000460_E48BE0[]; + +Gfx Entity_HitRedBlock_RenderBlock2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000C60_E493E0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000160_E488E0, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_HitRedBlock_RenderBlock1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000460_E48BE0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E48780, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/HitRedBlock_face1.png.inc.c" +#include "entity/model/HitRedBlock_face2.png.inc.c" diff --git a/src/entity/model/HitYellowBlock_anim.c b/src/entity/model/HitYellowBlock_anim.c new file mode 100644 index 0000000000..247cc57fc5 --- /dev/null +++ b/src/entity/model/HitYellowBlock_anim.c @@ -0,0 +1,99 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_HitYellowBlock_RenderBlock2[]; +extern Gfx Entity_HitYellowBlock_RenderBlock1[]; + +StaticAnimatorNode Entity_HitYellowBlock_NodeBlock2 = { + .displayList = Entity_HitYellowBlock_RenderBlock2, + .pos = { 0.0f, 25.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitYellowBlock_NodeBlock1 = { + .displayList = Entity_HitYellowBlock_RenderBlock1, + .sibling = &Entity_HitYellowBlock_NodeBlock2, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_HitYellowBlock_NodeMain = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_HitYellowBlock_NodeBlock1, +}; + +StaticAnimatorNode* Entity_HitYellowBlock_Mesh[] = { + &Entity_HitYellowBlock_NodeMain, + &Entity_HitYellowBlock_NodeBlock1, + &Entity_HitYellowBlock_NodeBlock2, + ANIM_NULL, +}; + +AnimScript Entity_HitYellowBlock_AnimationHit = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 25, 0) + as_SetScale(3, -1.0, -1.0, -1.0) + as_Wait(1) + as_SetPos(2, 0, 25, 0) + as_SetScale(2, 2.0, 0.0, 2.0) + as_SetScale(3, -2.0, 0.0, -2.0) + as_Wait(1) + as_SetPos(2, 0, 40, 0) + as_SetScale(2, 1.62, -0.62, 1.62) + as_SetScale(3, -1.62, 0.62, -1.62) + as_Wait(1) + as_SetPos(2, 0, 50, 0) + as_SetScale(2, -1.0, -1.0, -1.0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetPos(2, 0, 43, 0) + as_SetScale(2, -1.36, -0.885, -1.36) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.36, 0.885, 1.36) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetScale(2, -1.245, -0.745, -1.245) + as_SetPos(3, 0, 16, 0) + as_SetScale(3, 1.245, 0.745, 1.245) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetScale(2, -1.18, -0.815, -1.18) + as_SetPos(3, 0, 9, 0) + as_SetScale(3, 1.18, 0.815, 1.18) + as_Wait(1) + as_SetPos(2, 0, 26, 0) + as_SetScale(2, -1.06, -0.935, -1.06) + as_SetPos(3, 0, 3, 0) + as_SetScale(3, 1.06, 0.935, 1.06) + as_Wait(1) + as_Loop + as_SetPos(2, 0, 25, 0) + as_SetScale(2, -1.0, -1.0, -1.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Wait(1) + as_EndLoop + as_End +}; + +AnimScript Entity_HitYellowBlock_AnimationIdle = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 25, 0) + as_SetScale(3, -1.0, -1.0, -1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/HitYellowBlock_gfx.c b/src/entity/model/HitYellowBlock_gfx.c new file mode 100644 index 0000000000..457d8670f4 --- /dev/null +++ b/src/entity/model/HitYellowBlock_gfx.c @@ -0,0 +1,48 @@ +#include "common.h" + +#include "entity/model/HitYellowBlock_1.vtx.inc.c" +#include "entity/model/HitYellowBlock_2.vtx.inc.c" + +extern unsigned char D_0A000420_E45E10[]; +extern unsigned char D_0A000C20_E46610[]; + +Gfx Entity_HitYellowBlock_RenderBlock2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPLoadTextureBlock(D_0A000C20_E46610, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000160_E45B50, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_HitYellowBlock_RenderBlock1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPLoadTextureBlock(D_0A000420_E45E10, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(D_0A000000_E459F0, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 7, 6, 0, 20, 6, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/HitYellowBlock_face1.png.inc.c" +#include "entity/model/HitYellowBlock_face2.png.inc.c" diff --git a/src/entity/model/InertRedBlock.c b/src/entity/model/InertRedBlock.c new file mode 100644 index 0000000000..a485937778 --- /dev/null +++ b/src/entity/model/InertRedBlock.c @@ -0,0 +1,48 @@ +#include "common.h" + +#include "entity/model/InertRedBlock_1.vtx.inc.c" +#include "entity/model/InertRedBlock_2.vtx.inc.c" + +#include "entity/model/InertRedBlock_face.png.inc.c" +Gfx Entity_InertRedBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000180_E428C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertRedBlock_RenderTopBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_InertRedBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000100_E42840, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertRedBlock_RenderFaces[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_InertRedBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E42740, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertRedBlock_Render[] = { + gsSPDisplayList(Entity_InertRedBlock_RenderFaces), + gsSPDisplayList(Entity_InertRedBlock_RenderTopBottom), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/InertYellowBlock.c b/src/entity/model/InertYellowBlock.c new file mode 100644 index 0000000000..6610f3a175 --- /dev/null +++ b/src/entity/model/InertYellowBlock.c @@ -0,0 +1,50 @@ +#include "common.h" + +#include "entity/model/InertYellowBlock_1.vtx.inc.c" +#include "entity/model/InertYellowBlock_2.vtx.inc.c" + +#include "entity/model/InertYellowBlock_face.png.inc.c" +#include "entity/model/InertYellowBlock_face.pal.inc.c" +Gfx Entity_InertYellowBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000380_E425C0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000180_E423C0, G_IM_FMT_CI, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertYellowBlock_RenderTopBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000100_E42340, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertYellowBlock_RenderFaces[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_InertYellowBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000000_E42240, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_InertYellowBlock_Render[] = { + gsSPDisplayList(Entity_InertYellowBlock_RenderFaces), + gsSPDisplayList(Entity_InertYellowBlock_RenderTopBottom), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/MunchlesiaBeginChew_anim.c b/src/entity/model/MunchlesiaBeginChew_anim.c new file mode 100644 index 0000000000..3f3258282f --- /dev/null +++ b/src/entity/model/MunchlesiaBeginChew_anim.c @@ -0,0 +1,227 @@ +#include "common.h" +#include "animation_script.h" + +extern Vtx D_0A000000_E815F0[]; +extern Gfx Entity_MunchlesiaBeginChew_Render[]; + +AnimScript Entity_MunchlesiaBeginChew_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 0, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 0, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 0, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 0, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node9 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 7, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node8 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node9, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node7 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node6 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node5 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node4 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node3 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node2 = { + .displayList = Entity_MunchlesiaBeginChew_Render, + .sibling = &Entity_MunchlesiaBeginChew_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E815F0, +}; + +StaticAnimatorNode Entity_MunchlesiaBeginChew_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaBeginChew_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaBeginChew_Mesh[] = { + &Entity_MunchlesiaBeginChew_Node1, + &Entity_MunchlesiaBeginChew_Node2, + &Entity_MunchlesiaBeginChew_Node3, + &Entity_MunchlesiaBeginChew_Node4, + &Entity_MunchlesiaBeginChew_Node5, + &Entity_MunchlesiaBeginChew_Node6, + &Entity_MunchlesiaBeginChew_Node7, + &Entity_MunchlesiaBeginChew_Node8, + &Entity_MunchlesiaBeginChew_Node9, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaBeginChew_gfx.c b/src/entity/model/MunchlesiaBeginChew_gfx.c new file mode 100644 index 0000000000..6cbb9f8e8e --- /dev/null +++ b/src/entity/model/MunchlesiaBeginChew_gfx.c @@ -0,0 +1,3343 @@ +#include "common.h" + +extern unsigned char D_0A006840_E87E30[]; + +#include "entity/model/MunchlesiaBeginChew.vtx.inc.c" + +Vec3s Entity_MunchlesiaBeginChew_vertexArray[] = { + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 7 }, + { 10, 33, 14 }, + { 13, 27, 9 }, + { 9, 33, 4 }, + { -7, 39, 7 }, + { -14, 33, 10 }, + { -9, 27, 13 }, + { -4, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 7, 39, -8 }, + { 14, 33, -11 }, + { 9, 27, -14 }, + { 4, 33, -10 }, + { -11, 24, 16 }, + { -11, 33, 14 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -14, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 10 }, + { 14, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 3 }, + { -12, 25, 4 }, + { -14, 27, 9 }, + { -10, 33, 4 }, + { 11, 18, 8 }, + { 11, 25, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 3, 27, 9 }, + { 4, 25, 12 }, + { 9, 27, 14 }, + { 4, 33, 9 }, + { 8, 18, -11 }, + { 4, 25, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -3, 27, -9 }, + { -4, 25, -12 }, + { -9, 27, -14 }, + { -4, 33, -10 }, + { -8, 18, 11 }, + { -4, 25, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 3 }, + { 0, 29, 1 }, + { 0, 34, -1 }, + { 9, 33, 4 }, + { -10, 33, 4 }, + { -14, 27, 9 }, + { -11, 33, 14 }, + { -8, 39, 7 }, + { 4, 33, -10 }, + { 9, 27, -14 }, + { 4, 25, -11 }, + { 3, 27, -9 }, + { 4, 33, 9 }, + { 9, 27, 14 }, + { 14, 33, 10 }, + { 7, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -4, 33, 9 }, + { -9, 27, 13 }, + { -4, 25, 11 }, + { -3, 27, 8 }, + { -4, 33, -10 }, + { -9, 27, -14 }, + { -14, 33, -11 }, + { -7, 39, -8 }, + { -3, 27, -9 }, + { -1, 29, 0 }, + { -3, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 3, 27, -9 }, + { 1, 29, 0 }, + { -1, 34, 0 }, + { 4, 33, -10 }, + { 4, 33, -10 }, + { -1, 34, 0 }, + { 0, 39, 0 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { -1, 34, 0 }, + { 4, 33, 9 }, + { 4, 33, 9 }, + { -1, 34, 0 }, + { 3, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -4, 33, -10 }, + { 1, 34, 0 }, + { -1, 29, 0 }, + { -1, 29, 0 }, + { -3, 27, -9 }, + { -7, 39, -8 }, + { 0, 39, 0 }, + { 1, 34, 0 }, + { -4, 33, -10 }, + { -3, 27, 8 }, + { 1, 34, 0 }, + { -4, 33, 9 }, + { -4, 33, 9 }, + { 1, 34, 0 }, + { -7, 39, 7 }, + { -10, 33, 4 }, + { 0, 34, -1 }, + { 0, 29, 1 }, + { -9, 27, 3 }, + { -8, 39, 7 }, + { 0, 39, 0 }, + { 0, 34, -1 }, + { -10, 33, 4 }, + { 9, 33, 4 }, + { 0, 34, -1 }, + { 7, 39, 7 }, + { 9, 33, 4 }, + { 13, 27, 9 }, + { 11, 25, 4 }, + { 8, 27, 3 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 7, 39, -8 }, + { 0, 39, 0 }, + { 7, 39, 7 }, + { 3, 27, 9 }, + { 1, 29, 0 }, + { 3, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 4 }, + { 11, 25, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 25, -12 }, + { -4, 25, 11 }, + { -8, 18, 11 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 7 }, + { 0, 39, 0 }, + { -8, 39, 7 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { -7, 39, 7 }, + { 0, 39, 0 }, + { -7, 39, -8 }, + { -14, 33, 10 }, + { -14, 33, 10 }, + { -7, 39, -8 }, + { -14, 33, -11 }, + { 16, 24, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 14, 33, -11 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { 14, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 3, 27, -9 }, + { 3, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 11 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -14, 33, 10 }, + { -16, 24, 10 }, + { -14, 33, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 25, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 3 }, + { 11, 25, 4 }, + { -9, 27, 3 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -3, 27, 8 }, + { -4, 25, 11 }, + { -4, 25, -12 }, + { -3, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 8 }, + { 10, 33, 15 }, + { 13, 27, 9 }, + { 9, 33, 5 }, + { -8, 39, 7 }, + { -15, 33, 10 }, + { -9, 27, 13 }, + { -5, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 8, 39, -8 }, + { 15, 33, -11 }, + { 9, 27, -14 }, + { 5, 33, -10 }, + { -11, 24, 16 }, + { -11, 33, 15 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -15, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 10 }, + { 15, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 4 }, + { -12, 25, 4 }, + { -14, 27, 9 }, + { -10, 33, 5 }, + { 11, 18, 8 }, + { 11, 25, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 4, 27, 9 }, + { 4, 25, 12 }, + { 9, 27, 14 }, + { 5, 33, 9 }, + { 8, 18, -11 }, + { 4, 25, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 27, -9 }, + { -4, 25, -12 }, + { -9, 27, -14 }, + { -5, 33, -10 }, + { -8, 18, 11 }, + { -4, 25, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 4 }, + { 0, 30, 1 }, + { 0, 35, -1 }, + { 9, 33, 5 }, + { -10, 33, 5 }, + { -14, 27, 9 }, + { -11, 33, 15 }, + { -8, 39, 8 }, + { 5, 33, -10 }, + { 9, 27, -14 }, + { 4, 25, -11 }, + { 4, 27, -9 }, + { 5, 33, 9 }, + { 9, 27, 14 }, + { 15, 33, 10 }, + { 8, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -5, 33, 9 }, + { -9, 27, 13 }, + { -4, 25, 11 }, + { -4, 27, 8 }, + { -5, 33, -10 }, + { -9, 27, -14 }, + { -15, 33, -11 }, + { -8, 39, -8 }, + { -4, 27, -9 }, + { -1, 30, 0 }, + { -4, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 27, -9 }, + { 1, 30, 0 }, + { -1, 35, 0 }, + { 5, 33, -10 }, + { 5, 33, -10 }, + { -1, 35, 0 }, + { 0, 40, 0 }, + { 8, 39, -8 }, + { 8, 39, 7 }, + { -1, 35, 0 }, + { 5, 33, 9 }, + { 5, 33, 9 }, + { -1, 35, 0 }, + { 4, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -5, 33, -10 }, + { 1, 35, 0 }, + { -1, 30, 0 }, + { -1, 30, 0 }, + { -4, 27, -9 }, + { -8, 39, -8 }, + { 0, 40, 0 }, + { 1, 35, 0 }, + { -5, 33, -10 }, + { -4, 27, 8 }, + { 1, 35, 0 }, + { -5, 33, 9 }, + { -5, 33, 9 }, + { 1, 35, 0 }, + { -8, 39, 7 }, + { -10, 33, 5 }, + { 0, 35, -1 }, + { 0, 30, 1 }, + { -9, 27, 4 }, + { -8, 39, 8 }, + { 0, 40, 0 }, + { 0, 35, -1 }, + { -10, 33, 5 }, + { 9, 33, 5 }, + { 0, 35, -1 }, + { 7, 39, 8 }, + { 9, 33, 5 }, + { 13, 27, 9 }, + { 11, 25, 4 }, + { 8, 27, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 8, 39, -8 }, + { 0, 40, 0 }, + { 8, 39, 7 }, + { 4, 27, 9 }, + { 1, 30, 0 }, + { 4, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 4 }, + { 11, 25, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 25, -12 }, + { -4, 25, 11 }, + { -8, 18, 11 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 8 }, + { 0, 40, 0 }, + { -8, 39, 8 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { -8, 39, 7 }, + { 0, 40, 0 }, + { -8, 39, -8 }, + { -15, 33, 10 }, + { -15, 33, 10 }, + { -8, 39, -8 }, + { -15, 33, -11 }, + { 16, 24, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 15, 33, -11 }, + { 8, 39, -8 }, + { 8, 39, 7 }, + { 15, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 4, 27, -9 }, + { 4, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 11 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -15, 33, 10 }, + { -16, 24, 10 }, + { -15, 33, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 25, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 4 }, + { 11, 25, 4 }, + { -9, 27, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 27, 8 }, + { -4, 25, 11 }, + { -4, 25, -12 }, + { -4, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 9 }, + { 10, 33, 15 }, + { 13, 27, 10 }, + { 9, 34, 5 }, + { -9, 39, 7 }, + { -15, 33, 10 }, + { -10, 27, 13 }, + { -5, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 9, 39, -8 }, + { 15, 33, -11 }, + { 10, 27, -14 }, + { 5, 34, -10 }, + { -11, 24, 16 }, + { -11, 33, 15 }, + { -14, 27, 10 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -15, 33, -11 }, + { -10, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 11 }, + { 15, 33, 11 }, + { 10, 27, 14 }, + { 11, 21, 14 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 4 }, + { -12, 25, 5 }, + { -14, 27, 10 }, + { -10, 34, 5 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 13, 27, 10 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 14 }, + { 4, 27, 9 }, + { 5, 25, 12 }, + { 10, 27, 14 }, + { 5, 34, 9 }, + { 8, 18, -10 }, + { 5, 25, -11 }, + { 10, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 27, -9 }, + { -5, 25, -12 }, + { -10, 27, -14 }, + { -5, 34, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -10, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 4 }, + { 0, 30, 1 }, + { 0, 35, 0 }, + { 9, 34, 5 }, + { -10, 34, 5 }, + { -14, 27, 10 }, + { -11, 33, 15 }, + { -8, 39, 9 }, + { 5, 34, -10 }, + { 10, 27, -14 }, + { 5, 25, -11 }, + { 4, 27, -9 }, + { 5, 34, 9 }, + { 10, 27, 14 }, + { 15, 33, 11 }, + { 9, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -5, 34, 9 }, + { -10, 27, 13 }, + { -5, 25, 11 }, + { -4, 27, 8 }, + { -5, 34, -10 }, + { -10, 27, -14 }, + { -15, 33, -11 }, + { -9, 39, -8 }, + { -4, 27, -9 }, + { -1, 30, 0 }, + { -4, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 6, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 27, -9 }, + { 1, 30, 0 }, + { 0, 35, 0 }, + { 5, 34, -10 }, + { 5, 34, -10 }, + { 0, 35, 0 }, + { 1, 40, 0 }, + { 9, 39, -8 }, + { 9, 39, 7 }, + { 0, 35, 0 }, + { 5, 34, 9 }, + { 5, 34, 9 }, + { 0, 35, 0 }, + { 4, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -5, 34, -10 }, + { 0, 35, 0 }, + { -1, 30, 0 }, + { -1, 30, 0 }, + { -4, 27, -9 }, + { -9, 39, -8 }, + { -1, 40, 0 }, + { 0, 35, 0 }, + { -5, 34, -10 }, + { -4, 27, 8 }, + { 0, 35, 0 }, + { -5, 34, 9 }, + { -5, 34, 9 }, + { 0, 35, 0 }, + { -9, 39, 7 }, + { -10, 34, 5 }, + { 0, 35, 0 }, + { 0, 30, 1 }, + { -9, 27, 4 }, + { -8, 39, 9 }, + { 0, 40, 1 }, + { 0, 35, 0 }, + { -10, 34, 5 }, + { 9, 34, 5 }, + { 0, 35, 0 }, + { 7, 39, 9 }, + { 9, 34, 5 }, + { 13, 27, 10 }, + { 11, 25, 5 }, + { 8, 27, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 9, 39, -8 }, + { 1, 40, 0 }, + { 9, 39, 7 }, + { 4, 27, 9 }, + { 1, 30, 0 }, + { 4, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -10 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 9 }, + { 0, 40, 1 }, + { -8, 39, 9 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { -9, 39, 7 }, + { -1, 40, 0 }, + { -9, 39, -8 }, + { -15, 33, 10 }, + { -15, 33, 10 }, + { -9, 39, -8 }, + { -15, 33, -11 }, + { 16, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 15, 33, -11 }, + { 9, 39, -8 }, + { 9, 39, 7 }, + { 15, 33, 11 }, + { 11, 21, 14 }, + { 10, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -10 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 10, 27, -14 }, + { 4, 27, -9 }, + { 4, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -10, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -10, 27, 13 }, + { -15, 33, 10 }, + { -16, 24, 10 }, + { -15, 33, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 10 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 6, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 10 }, + { 8, 27, 4 }, + { 11, 25, 5 }, + { -9, 27, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 27, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -4, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 40, 10 }, + { 10, 32, 16 }, + { 14, 27, 10 }, + { 9, 34, 6 }, + { -10, 40, 7 }, + { -16, 32, 10 }, + { -10, 27, 13 }, + { -6, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 10, 40, -8 }, + { 16, 32, -11 }, + { 10, 27, -14 }, + { 6, 34, -10 }, + { -11, 24, 16 }, + { -11, 32, 16 }, + { -14, 27, 10 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -16, 32, -11 }, + { -10, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 11 }, + { 16, 32, 11 }, + { 10, 27, 14 }, + { 11, 21, 14 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 28, 4 }, + { -12, 25, 5 }, + { -14, 27, 10 }, + { -10, 34, 6 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 14, 27, 10 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 14 }, + { 4, 28, 9 }, + { 5, 25, 12 }, + { 10, 27, 14 }, + { 6, 34, 9 }, + { 8, 18, -11 }, + { 5, 25, -11 }, + { 10, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 28, -9 }, + { -5, 25, -12 }, + { -10, 27, -14 }, + { -6, 34, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -10, 27, 13 }, + { -11, 21, 13 }, + { 8, 28, 4 }, + { 0, 31, 2 }, + { 0, 36, 0 }, + { 9, 34, 6 }, + { -10, 34, 6 }, + { -14, 27, 10 }, + { -11, 32, 16 }, + { -8, 40, 10 }, + { 6, 34, -10 }, + { 10, 27, -14 }, + { 5, 25, -11 }, + { 4, 28, -9 }, + { 6, 34, 9 }, + { 10, 27, 14 }, + { 16, 32, 11 }, + { 10, 40, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -6, 34, 9 }, + { -10, 27, 13 }, + { -5, 25, 11 }, + { -4, 28, 8 }, + { -6, 34, -10 }, + { -10, 27, -14 }, + { -16, 32, -11 }, + { -10, 40, -8 }, + { -4, 28, -9 }, + { -2, 31, 0 }, + { -4, 28, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 6, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 28, -9 }, + { 2, 31, 0 }, + { 0, 36, 0 }, + { 6, 34, -10 }, + { 6, 34, -10 }, + { 0, 36, 0 }, + { 2, 41, 0 }, + { 10, 40, -8 }, + { 10, 40, 7 }, + { 0, 36, 0 }, + { 6, 34, 9 }, + { 6, 34, 9 }, + { 0, 36, 0 }, + { 4, 28, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -6, 34, -10 }, + { 0, 36, 0 }, + { -2, 31, 0 }, + { -2, 31, 0 }, + { -4, 28, -9 }, + { -10, 40, -8 }, + { -2, 41, 0 }, + { 0, 36, 0 }, + { -6, 34, -10 }, + { -4, 28, 8 }, + { 0, 36, 0 }, + { -6, 34, 9 }, + { -6, 34, 9 }, + { 0, 36, 0 }, + { -10, 40, 7 }, + { -10, 34, 6 }, + { 0, 36, 0 }, + { 0, 31, 2 }, + { -9, 28, 4 }, + { -8, 40, 10 }, + { 0, 41, 2 }, + { 0, 36, 0 }, + { -10, 34, 6 }, + { 9, 34, 6 }, + { 0, 36, 0 }, + { 7, 40, 10 }, + { 9, 34, 6 }, + { 14, 27, 10 }, + { 11, 25, 5 }, + { 8, 28, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 10, 40, -8 }, + { 2, 41, 0 }, + { 10, 40, 7 }, + { 4, 28, 9 }, + { 2, 31, 0 }, + { 4, 28, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 40, 10 }, + { 0, 41, 2 }, + { -8, 40, 10 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { -10, 40, 7 }, + { -2, 41, 0 }, + { -10, 40, -8 }, + { -16, 32, 10 }, + { -16, 32, 10 }, + { -10, 40, -8 }, + { -16, 32, -11 }, + { 16, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 16, 32, -11 }, + { 10, 40, -8 }, + { 10, 40, 7 }, + { 16, 32, 11 }, + { 11, 21, 14 }, + { 10, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 10, 27, -14 }, + { 4, 28, -9 }, + { 4, 28, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -10, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -10, 27, 13 }, + { -16, 32, 10 }, + { -16, 24, 10 }, + { -16, 32, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 10 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 6, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 14, 27, 10 }, + { 8, 28, 4 }, + { 11, 25, 5 }, + { -9, 28, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 28, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -4, 28, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 40, 11 }, + { 10, 32, 16 }, + { 13, 27, 10 }, + { 9, 34, 7 }, + { -11, 40, 7 }, + { -16, 32, 10 }, + { -10, 27, 13 }, + { -7, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 11, 40, -8 }, + { 16, 32, -11 }, + { 10, 27, -14 }, + { 7, 34, -10 }, + { -11, 24, 16 }, + { -11, 32, 16 }, + { -14, 27, 10 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -16, 32, -11 }, + { -10, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 11 }, + { 16, 32, 11 }, + { 10, 27, 14 }, + { 11, 21, 14 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 28, 4 }, + { -12, 25, 5 }, + { -14, 27, 10 }, + { -10, 34, 7 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 13, 27, 10 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 14 }, + { 4, 28, 9 }, + { 5, 25, 12 }, + { 10, 27, 14 }, + { 7, 34, 9 }, + { 8, 18, -11 }, + { 5, 25, -11 }, + { 10, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 28, -9 }, + { -5, 25, -12 }, + { -10, 27, -14 }, + { -7, 34, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -10, 27, 13 }, + { -11, 21, 13 }, + { 8, 28, 4 }, + { 0, 31, 2 }, + { 0, 37, 0 }, + { 9, 34, 7 }, + { -10, 34, 7 }, + { -14, 27, 10 }, + { -11, 32, 16 }, + { -8, 40, 11 }, + { 7, 34, -10 }, + { 10, 27, -14 }, + { 5, 25, -11 }, + { 4, 28, -9 }, + { 7, 34, 9 }, + { 10, 27, 14 }, + { 16, 32, 11 }, + { 11, 40, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -7, 34, 9 }, + { -10, 27, 13 }, + { -5, 25, 11 }, + { -4, 28, 8 }, + { -7, 34, -10 }, + { -10, 27, -14 }, + { -16, 32, -11 }, + { -11, 40, -8 }, + { -4, 28, -9 }, + { -2, 31, 0 }, + { -4, 28, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 6, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 28, -9 }, + { 2, 31, 0 }, + { 0, 37, 0 }, + { 7, 34, -10 }, + { 7, 34, -10 }, + { 0, 37, 0 }, + { 3, 41, 0 }, + { 11, 40, -8 }, + { 11, 40, 7 }, + { 0, 37, 0 }, + { 7, 34, 9 }, + { 7, 34, 9 }, + { 0, 37, 0 }, + { 4, 28, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -7, 34, -10 }, + { 0, 37, 0 }, + { -2, 31, 0 }, + { -2, 31, 0 }, + { -4, 28, -9 }, + { -11, 40, -8 }, + { -3, 41, 0 }, + { 0, 37, 0 }, + { -7, 34, -10 }, + { -4, 28, 8 }, + { 0, 37, 0 }, + { -7, 34, 9 }, + { -7, 34, 9 }, + { 0, 37, 0 }, + { -11, 40, 7 }, + { -10, 34, 7 }, + { 0, 37, 0 }, + { 0, 31, 2 }, + { -9, 28, 4 }, + { -8, 40, 11 }, + { 0, 41, 3 }, + { 0, 37, 0 }, + { -10, 34, 7 }, + { 9, 34, 7 }, + { 0, 37, 0 }, + { 7, 40, 11 }, + { 9, 34, 7 }, + { 13, 27, 10 }, + { 11, 25, 5 }, + { 8, 28, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 11, 40, -8 }, + { 3, 41, 0 }, + { 11, 40, 7 }, + { 4, 28, 9 }, + { 2, 31, 0 }, + { 4, 28, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 40, 11 }, + { 0, 41, 3 }, + { -8, 40, 11 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { -11, 40, 7 }, + { -3, 41, 0 }, + { -11, 40, -8 }, + { -16, 32, 10 }, + { -16, 32, 10 }, + { -11, 40, -8 }, + { -16, 32, -11 }, + { 16, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 16, 32, -11 }, + { 11, 40, -8 }, + { 11, 40, 7 }, + { 16, 32, 11 }, + { 11, 21, 14 }, + { 10, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 10, 27, -14 }, + { 4, 28, -9 }, + { 4, 28, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -10, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -10, 27, 13 }, + { -16, 32, 10 }, + { -16, 24, 10 }, + { -16, 32, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 10 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 6, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 10 }, + { 8, 28, 4 }, + { 11, 25, 5 }, + { -9, 28, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 28, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -4, 28, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 12 }, + { 10, 32, 17 }, + { 13, 27, 11 }, + { 9, 34, 7 }, + { -12, 39, 7 }, + { -17, 32, 10 }, + { -11, 27, 13 }, + { -7, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 12, 39, -8 }, + { 17, 32, -11 }, + { 11, 27, -14 }, + { 7, 34, -10 }, + { -11, 24, 17 }, + { -11, 32, 17 }, + { -14, 27, 11 }, + { -14, 20, 12 }, + { -17, 24, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -17, 24, -11 }, + { -17, 32, -11 }, + { -11, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 17, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 17, 24, 11 }, + { 17, 32, 10 }, + { 11, 27, 14 }, + { 12, 20, 14 }, + { 11, 24, 17 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 28, 5 }, + { -12, 25, 5 }, + { -14, 27, 11 }, + { -10, 34, 7 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 13, 27, 11 }, + { 14, 20, 12 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 5, 28, 9 }, + { 5, 25, 12 }, + { 11, 27, 14 }, + { 7, 34, 9 }, + { 8, 18, -11 }, + { 5, 25, -11 }, + { 11, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -5, 28, -9 }, + { -5, 25, -12 }, + { -11, 27, -14 }, + { -7, 34, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -11, 27, 13 }, + { -12, 20, 13 }, + { 8, 28, 5 }, + { 0, 32, 3 }, + { 0, 37, 1 }, + { 9, 34, 7 }, + { -10, 34, 7 }, + { -14, 27, 11 }, + { -11, 32, 17 }, + { -8, 39, 12 }, + { 7, 34, -10 }, + { 11, 27, -14 }, + { 5, 25, -11 }, + { 5, 28, -9 }, + { 7, 34, 9 }, + { 11, 27, 14 }, + { 17, 32, 10 }, + { 12, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -7, 34, 9 }, + { -11, 27, 13 }, + { -5, 25, 11 }, + { -5, 28, 8 }, + { -7, 34, -10 }, + { -11, 27, -14 }, + { -17, 32, -11 }, + { -12, 39, -8 }, + { -5, 28, -9 }, + { -3, 32, 0 }, + { -5, 28, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 5, 28, -9 }, + { 3, 32, 0 }, + { 1, 37, 0 }, + { 7, 34, -10 }, + { 7, 34, -10 }, + { 1, 37, 0 }, + { 4, 41, 0 }, + { 12, 39, -8 }, + { 12, 39, 7 }, + { 1, 37, 0 }, + { 7, 34, 9 }, + { 7, 34, 9 }, + { 1, 37, 0 }, + { 5, 28, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -7, 34, -10 }, + { -1, 37, 0 }, + { -3, 32, 0 }, + { -3, 32, 0 }, + { -5, 28, -9 }, + { -12, 39, -8 }, + { -4, 41, 0 }, + { -1, 37, 0 }, + { -7, 34, -10 }, + { -5, 28, 8 }, + { -1, 37, 0 }, + { -7, 34, 9 }, + { -7, 34, 9 }, + { -1, 37, 0 }, + { -12, 39, 7 }, + { -10, 34, 7 }, + { 0, 37, 1 }, + { 0, 32, 3 }, + { -9, 28, 5 }, + { -8, 39, 12 }, + { 0, 41, 4 }, + { 0, 37, 1 }, + { -10, 34, 7 }, + { 9, 34, 7 }, + { 0, 37, 1 }, + { 7, 39, 12 }, + { 9, 34, 7 }, + { 13, 27, 11 }, + { 11, 25, 5 }, + { 8, 28, 5 }, + { -17, 24, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -17, 24, 10 }, + { -11, 24, 17 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 17 }, + { 12, 39, -8 }, + { 4, 41, 0 }, + { 12, 39, 7 }, + { 5, 28, 9 }, + { 3, 32, 0 }, + { 5, 28, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 12 }, + { 0, 41, 4 }, + { -8, 39, 12 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { -12, 39, 7 }, + { -4, 41, 0 }, + { -12, 39, -8 }, + { -17, 32, 10 }, + { -17, 32, 10 }, + { -12, 39, -8 }, + { -17, 32, -11 }, + { 17, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 17, 24, -11 }, + { 17, 32, -11 }, + { 12, 39, -8 }, + { 12, 39, 7 }, + { 17, 32, 10 }, + { 12, 20, 14 }, + { 11, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 11, 27, -14 }, + { 5, 28, -9 }, + { 5, 28, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -12, 20, -14 }, + { -11, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -17, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -11, 27, 13 }, + { -17, 32, 10 }, + { -17, 24, 10 }, + { -17, 32, -11 }, + { -17, 24, -11 }, + { -14, 20, 12 }, + { -14, 27, 11 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 24, 17 }, + { 11, 24, 17 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 11 }, + { 8, 28, 5 }, + { 11, 25, 5 }, + { -9, 28, 5 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -5, 28, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -5, 28, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 12 }, + { 10, 32, 17 }, + { 13, 27, 11 }, + { 9, 34, 8 }, + { -12, 39, 7 }, + { -17, 32, 10 }, + { -11, 27, 13 }, + { -8, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 12, 39, -8 }, + { 17, 32, -11 }, + { 11, 27, -14 }, + { 8, 34, -10 }, + { -11, 24, 17 }, + { -11, 32, 17 }, + { -14, 27, 11 }, + { -14, 20, 12 }, + { -17, 24, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -17, 24, -11 }, + { -17, 32, -11 }, + { -11, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 17, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 17, 24, 11 }, + { 17, 32, 10 }, + { 11, 27, 14 }, + { 12, 20, 14 }, + { 11, 24, 17 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 29, 5 }, + { -12, 26, 6 }, + { -14, 27, 11 }, + { -10, 34, 8 }, + { 11, 18, 8 }, + { 11, 26, 6 }, + { 13, 27, 11 }, + { 14, 20, 12 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 5, 29, 9 }, + { 6, 26, 12 }, + { 11, 27, 14 }, + { 8, 34, 9 }, + { 8, 18, -11 }, + { 6, 26, -11 }, + { 11, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -5, 29, -9 }, + { -6, 26, -12 }, + { -11, 27, -14 }, + { -8, 34, -10 }, + { -8, 18, 10 }, + { -6, 26, 11 }, + { -11, 27, 13 }, + { -12, 20, 13 }, + { 8, 29, 5 }, + { 0, 32, 3 }, + { 0, 38, 2 }, + { 9, 34, 8 }, + { -10, 34, 8 }, + { -14, 27, 11 }, + { -11, 32, 17 }, + { -8, 39, 12 }, + { 8, 34, -10 }, + { 11, 27, -14 }, + { 6, 26, -11 }, + { 5, 29, -9 }, + { 8, 34, 9 }, + { 11, 27, 14 }, + { 17, 32, 10 }, + { 12, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -8, 34, 9 }, + { -11, 27, 13 }, + { -6, 26, 11 }, + { -5, 29, 8 }, + { -8, 34, -10 }, + { -11, 27, -14 }, + { -17, 32, -11 }, + { -12, 39, -8 }, + { -5, 29, -9 }, + { -3, 32, 0 }, + { -5, 29, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 5, 29, -9 }, + { 3, 32, 0 }, + { 2, 38, 0 }, + { 8, 34, -10 }, + { 8, 34, -10 }, + { 2, 38, 0 }, + { 5, 42, 0 }, + { 12, 39, -8 }, + { 12, 39, 7 }, + { 2, 38, 0 }, + { 8, 34, 9 }, + { 8, 34, 9 }, + { 2, 38, 0 }, + { 5, 29, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -8, 34, -10 }, + { -2, 38, 0 }, + { -3, 32, 0 }, + { -3, 32, 0 }, + { -5, 29, -9 }, + { -12, 39, -8 }, + { -5, 42, 0 }, + { -2, 38, 0 }, + { -8, 34, -10 }, + { -5, 29, 8 }, + { -2, 38, 0 }, + { -8, 34, 9 }, + { -8, 34, 9 }, + { -2, 38, 0 }, + { -12, 39, 7 }, + { -10, 34, 8 }, + { 0, 38, 2 }, + { 0, 32, 3 }, + { -9, 29, 5 }, + { -8, 39, 12 }, + { 0, 42, 5 }, + { 0, 38, 2 }, + { -10, 34, 8 }, + { 9, 34, 8 }, + { 0, 38, 2 }, + { 7, 39, 12 }, + { 9, 34, 8 }, + { 13, 27, 11 }, + { 11, 26, 6 }, + { 8, 29, 5 }, + { -17, 24, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -17, 24, 10 }, + { -11, 24, 17 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 17 }, + { 12, 39, -8 }, + { 5, 42, 0 }, + { 12, 39, 7 }, + { 5, 29, 9 }, + { 3, 32, 0 }, + { 5, 29, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 26, 6 }, + { 11, 26, 6 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -6, 26, -12 }, + { -6, 26, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 12 }, + { 0, 42, 5 }, + { -8, 39, 12 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { -12, 39, 7 }, + { -5, 42, 0 }, + { -12, 39, -8 }, + { -17, 32, 10 }, + { -17, 32, 10 }, + { -12, 39, -8 }, + { -17, 32, -11 }, + { 17, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 17, 24, -11 }, + { 17, 32, -11 }, + { 12, 39, -8 }, + { 12, 39, 7 }, + { 17, 32, 10 }, + { 12, 20, 14 }, + { 11, 27, 14 }, + { 6, 26, 12 }, + { 8, 18, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 6, 26, -11 }, + { 8, 18, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 11, 27, -14 }, + { 5, 29, -9 }, + { 5, 29, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -12, 20, -14 }, + { -11, 27, -14 }, + { -6, 26, -12 }, + { -8, 18, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -17, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -11, 27, 13 }, + { -17, 32, 10 }, + { -17, 24, 10 }, + { -17, 32, -11 }, + { -17, 24, -11 }, + { -14, 20, 12 }, + { -14, 27, 11 }, + { -12, 26, 6 }, + { -11, 18, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 24, 17 }, + { 11, 24, 17 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 11 }, + { 8, 29, 5 }, + { 11, 26, 6 }, + { -9, 29, 5 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -5, 29, 8 }, + { -6, 26, 11 }, + { -6, 26, -12 }, + { -5, 29, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 13 }, + { 10, 32, 17 }, + { 13, 27, 11 }, + { 9, 34, 8 }, + { -13, 39, 7 }, + { -17, 32, 10 }, + { -11, 27, 13 }, + { -8, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 13, 39, -8 }, + { 17, 32, -11 }, + { 11, 27, -14 }, + { 8, 34, -10 }, + { -11, 24, 17 }, + { -11, 32, 17 }, + { -14, 27, 11 }, + { -14, 20, 12 }, + { -17, 24, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -17, 24, -11 }, + { -17, 32, -11 }, + { -11, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 17, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 17, 24, 11 }, + { 17, 32, 10 }, + { 11, 27, 14 }, + { 12, 20, 14 }, + { 11, 24, 17 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 29, 5 }, + { -12, 26, 6 }, + { -14, 27, 11 }, + { -10, 34, 8 }, + { 11, 18, 8 }, + { 11, 26, 6 }, + { 13, 27, 11 }, + { 14, 20, 12 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 5, 29, 9 }, + { 6, 26, 12 }, + { 11, 27, 14 }, + { 8, 34, 9 }, + { 8, 18, -11 }, + { 6, 26, -11 }, + { 11, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -5, 29, -9 }, + { -6, 26, -12 }, + { -11, 27, -14 }, + { -8, 34, -10 }, + { -8, 18, 10 }, + { -6, 26, 11 }, + { -11, 27, 13 }, + { -12, 20, 13 }, + { 8, 29, 5 }, + { 0, 32, 3 }, + { 0, 38, 2 }, + { 9, 34, 8 }, + { -10, 34, 8 }, + { -14, 27, 11 }, + { -11, 32, 17 }, + { -8, 39, 13 }, + { 8, 34, -10 }, + { 11, 27, -14 }, + { 6, 26, -11 }, + { 5, 29, -9 }, + { 8, 34, 9 }, + { 11, 27, 14 }, + { 17, 32, 10 }, + { 13, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -8, 34, 9 }, + { -11, 27, 13 }, + { -6, 26, 11 }, + { -5, 29, 8 }, + { -8, 34, -10 }, + { -11, 27, -14 }, + { -17, 32, -11 }, + { -13, 39, -8 }, + { -5, 29, -9 }, + { -3, 32, 0 }, + { -5, 29, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 5, 29, -9 }, + { 3, 32, 0 }, + { 2, 38, 0 }, + { 8, 34, -10 }, + { 8, 34, -10 }, + { 2, 38, 0 }, + { 5, 42, 0 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 2, 38, 0 }, + { 8, 34, 9 }, + { 8, 34, 9 }, + { 2, 38, 0 }, + { 5, 29, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -8, 34, -10 }, + { -2, 38, 0 }, + { -3, 32, 0 }, + { -3, 32, 0 }, + { -5, 29, -9 }, + { -13, 39, -8 }, + { -5, 42, 0 }, + { -2, 38, 0 }, + { -8, 34, -10 }, + { -5, 29, 8 }, + { -2, 38, 0 }, + { -8, 34, 9 }, + { -8, 34, 9 }, + { -2, 38, 0 }, + { -13, 39, 7 }, + { -10, 34, 8 }, + { 0, 38, 2 }, + { 0, 32, 3 }, + { -9, 29, 5 }, + { -8, 39, 13 }, + { 0, 42, 5 }, + { 0, 38, 2 }, + { -10, 34, 8 }, + { 9, 34, 8 }, + { 0, 38, 2 }, + { 7, 39, 13 }, + { 9, 34, 8 }, + { 13, 27, 11 }, + { 11, 26, 6 }, + { 8, 29, 5 }, + { -17, 24, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -17, 24, 10 }, + { -11, 24, 17 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 17 }, + { 13, 39, -8 }, + { 5, 42, 0 }, + { 13, 39, 7 }, + { 5, 29, 9 }, + { 3, 32, 0 }, + { 5, 29, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 26, 6 }, + { 11, 26, 6 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -6, 26, -12 }, + { -6, 26, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 13 }, + { 0, 42, 5 }, + { -8, 39, 13 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { -13, 39, 7 }, + { -5, 42, 0 }, + { -13, 39, -8 }, + { -17, 32, 10 }, + { -17, 32, 10 }, + { -13, 39, -8 }, + { -17, 32, -11 }, + { 17, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 17, 24, -11 }, + { 17, 32, -11 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 17, 32, 10 }, + { 12, 20, 14 }, + { 11, 27, 14 }, + { 6, 26, 12 }, + { 8, 18, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 6, 26, -11 }, + { 8, 18, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 11, 27, -14 }, + { 5, 29, -9 }, + { 5, 29, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -12, 20, -14 }, + { -11, 27, -14 }, + { -6, 26, -12 }, + { -8, 18, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -17, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -11, 27, 13 }, + { -17, 32, 10 }, + { -17, 24, 10 }, + { -17, 32, -11 }, + { -17, 24, -11 }, + { -14, 20, 12 }, + { -14, 27, 11 }, + { -12, 26, 6 }, + { -11, 18, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 24, 17 }, + { 11, 24, 17 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 11 }, + { 8, 29, 5 }, + { 11, 26, 6 }, + { -9, 29, 5 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -5, 29, 8 }, + { -6, 26, 11 }, + { -6, 26, -12 }, + { -5, 29, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, +}; + +Gfx Entity_MunchlesiaBeginChew_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A006840_E87E30, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaBeginChew_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaBeginChew.png.inc.c" diff --git a/src/entity/model/MunchlesiaChewing_anim.c b/src/entity/model/MunchlesiaChewing_anim.c new file mode 100644 index 0000000000..cda0aa7211 --- /dev/null +++ b/src/entity/model/MunchlesiaChewing_anim.c @@ -0,0 +1,199 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_MunchlesiaChewing_Render[]; + +StaticAnimatorNode Entity_MunchlesiaChewing_Node1 = { + .displayList = Entity_MunchlesiaChewing_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaChewing_Mesh[] = { + &Entity_MunchlesiaChewing_Node1, + ANIM_NULL, +}; + +AnimScript Entity_MunchlesiaChewing_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 1.325, 0.0, 0.0) + as_SetScale(1, 1.065, 0.99, 0.935) + as_Wait(1) + as_SetRotation(1, 3.575, 0.0, 0.0) + as_SetScale(1, 1.185, 0.98, 0.83) + as_Wait(1) + as_SetRotation(1, 5.0, 0.0, 0.0) + as_SetScale(1, 1.245, 1.0, 0.745) + as_Wait(1) + as_SetRotation(1, 4.81, 0.0, 0.0) + as_SetScale(1, 1.205, 1.07, 0.72) + as_Wait(1) + as_SetRotation(1, 3.795, 0.0, 0.0) + as_SetScale(1, 1.1, 1.175, 0.72) + as_Wait(1) + as_SetRotation(1, 2.5, 0.0, 0.0) + as_SetScale(1, 1.0, 1.245, 0.745) + as_Wait(1) + as_SetRotation(1, 0.925, 0.0, 0.0) + as_SetScale(1, 0.905, 1.275, 0.815) + as_Wait(1) + as_SetRotation(1, -0.925, 0.0, 0.0) + as_SetScale(1, 0.815, 1.275, 0.905) + as_Wait(1) + as_SetRotation(1, -2.5, 0.0, 0.0) + as_SetScale(1, 0.745, 1.245, 1.0) + as_Wait(1) + as_SetRotation(1, -3.795, 0.0, 0.0) + as_SetScale(1, 0.72, 1.175, 1.1) + as_Wait(1) + as_SetRotation(1, -4.81, 0.0, 0.0) + as_SetScale(1, 0.72, 1.07, 1.205) + as_Wait(1) + as_SetRotation(1, -5.0, 0.0, 0.0) + as_SetScale(1, 0.745, 1.0, 1.245) + as_Wait(1) + as_SetRotation(1, -3.885, 0.0, 0.0) + as_SetScale(1, 0.815, 0.98, 1.205) + as_Wait(1) + as_SetRotation(1, -1.94, 0.0, 0.0) + as_SetScale(1, 0.905, 0.99, 1.1) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 1.94, 0.0, 0.0) + as_SetScale(1, 1.1, 0.99, 0.905) + as_Wait(1) + as_SetRotation(1, 3.885, 0.0, 0.0) + as_SetScale(1, 1.205, 0.98, 0.815) + as_Wait(1) + as_SetRotation(1, 5.0, 0.0, 0.0) + as_SetScale(1, 1.245, 1.0, 0.745) + as_Wait(1) + as_SetRotation(1, 4.81, 0.0, 0.0) + as_SetScale(1, 1.205, 1.07, 0.72) + as_Wait(1) + as_SetRotation(1, 3.795, 0.0, 0.0) + as_SetScale(1, 1.1, 1.175, 0.72) + as_Wait(1) + as_SetRotation(1, 2.5, 0.0, 0.0) + as_SetScale(1, 1.0, 1.245, 0.745) + as_Wait(1) + as_SetRotation(1, 0.925, 0.0, 0.0) + as_SetScale(1, 0.905, 1.275, 0.815) + as_Wait(1) + as_SetRotation(1, -0.925, 0.0, 0.0) + as_SetScale(1, 0.815, 1.275, 0.905) + as_Wait(1) + as_SetRotation(1, -2.5, 0.0, 0.0) + as_SetScale(1, 0.745, 1.245, 1.0) + as_Wait(1) + as_SetRotation(1, -3.795, 0.0, 0.0) + as_SetScale(1, 0.72, 1.175, 1.1) + as_Wait(1) + as_SetRotation(1, -4.81, 0.0, 0.0) + as_SetScale(1, 0.72, 1.07, 1.205) + as_Wait(1) + as_SetRotation(1, -5.0, 0.0, 0.0) + as_SetScale(1, 0.745, 1.0, 1.245) + as_Wait(1) + as_SetRotation(1, -3.885, 0.0, 0.0) + as_SetScale(1, 0.815, 0.98, 1.205) + as_Wait(1) + as_SetRotation(1, -1.94, 0.0, 0.0) + as_SetScale(1, 0.905, 0.99, 1.1) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 1.94, 0.0, 0.0) + as_SetScale(1, 1.1, 0.99, 0.905) + as_Wait(1) + as_SetRotation(1, 3.885, 0.0, 0.0) + as_SetScale(1, 1.205, 0.98, 0.815) + as_Wait(1) + as_SetRotation(1, 5.0, 0.0, 0.0) + as_SetScale(1, 1.245, 1.0, 0.745) + as_Wait(1) + as_SetRotation(1, 4.81, 0.0, 0.0) + as_SetScale(1, 1.205, 1.07, 0.72) + as_Wait(1) + as_SetRotation(1, 3.795, 0.0, 0.0) + as_SetScale(1, 1.1, 1.175, 0.72) + as_Wait(1) + as_SetRotation(1, 2.5, 0.0, 0.0) + as_SetScale(1, 1.0, 1.245, 0.745) + as_Wait(1) + as_SetRotation(1, 0.925, 0.0, 0.0) + as_SetScale(1, 0.905, 1.275, 0.815) + as_Wait(1) + as_SetRotation(1, -0.925, 0.0, 0.0) + as_SetScale(1, 0.815, 1.275, 0.905) + as_Wait(1) + as_SetRotation(1, -2.5, 0.0, 0.0) + as_SetScale(1, 0.745, 1.245, 1.0) + as_Wait(1) + as_SetRotation(1, -3.795, 0.0, 0.0) + as_SetScale(1, 0.72, 1.175, 1.1) + as_Wait(1) + as_SetRotation(1, -4.81, 0.0, 0.0) + as_SetScale(1, 0.72, 1.07, 1.205) + as_Wait(1) + as_SetRotation(1, -5.0, 0.0, 0.0) + as_SetScale(1, 0.745, 1.0, 1.245) + as_Wait(1) + as_SetRotation(1, -3.575, 0.0, 0.0) + as_SetScale(1, 0.83, 0.98, 1.185) + as_Wait(1) + as_SetRotation(1, -1.325, 0.0, 0.0) + as_SetScale(1, 0.935, 0.99, 1.065) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 0.24, 0.0, 0.0) + as_SetScale(1, 1.01, 1.0, 0.985) + as_Wait(1) + as_SetRotation(1, 0.41, 0.0, 0.0) + as_SetScale(1, 1.015, 1.0, 0.98) + as_Wait(1) + as_SetRotation(1, 0.535, 0.0, 0.0) + as_SetScale(1, 1.02, 1.0, 0.97) + as_Wait(1) + as_SetRotation(1, 0.595, 0.0, 0.0) + as_SetScale(1, 1.025, 1.0, 0.965) + as_Wait(1) + as_SetRotation(1, 0.615, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.6, 0.0, 0.0) + as_Wait(1) + as_SetRotation(1, 0.55, 0.0, 0.0) + as_SetScale(1, 1.025, 1.0, 0.97) + as_Wait(1) + as_SetRotation(1, 0.485, 0.0, 0.0) + as_SetScale(1, 1.02, 1.0, 0.97) + as_Wait(1) + as_SetRotation(1, 0.395, 0.0, 0.0) + as_SetScale(1, 1.015, 1.0, 0.98) + as_Wait(1) + as_SetRotation(1, 0.31, 0.0, 0.0) + as_SetScale(1, 1.01, 1.0, 0.985) + as_Wait(1) + as_SetRotation(1, 0.215, 0.0, 0.0) + as_SetScale(1, 1.01, 1.0, 0.99) + as_Wait(1) + as_SetRotation(1, 0.13, 0.0, 0.0) + as_SetScale(1, 1.005, 1.0, 0.99) + as_Wait(1) + as_SetRotation(1, 0.06, 0.0, 0.0) + as_SetScale(1, 1.0, 1.0, 0.995) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.015, 0.0, 0.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/MunchlesiaChewing_gfx.c b/src/entity/model/MunchlesiaChewing_gfx.c new file mode 100644 index 0000000000..8ff2a5251d --- /dev/null +++ b/src/entity/model/MunchlesiaChewing_gfx.c @@ -0,0 +1,148 @@ +#include "common.h" + +extern unsigned char D_0A001D70_E8A210[]; + +#include "entity/model/MunchlesiaChewing.vtx.inc.c" + +Gfx Entity_MunchlesiaChewing_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A001D70_E8A210, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(&D_0A000000_E884A0[0], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(&D_0A000000_E884A0[31], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(&D_0A000000_E884A0[63], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(&D_0A000000_E884A0[95], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(&D_0A000000_E884A0[127], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(&D_0A000000_E884A0[157], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(&D_0A000000_E884A0[187], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(&D_0A000000_E884A0[219], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(&D_0A000000_E884A0[249], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(&D_0A000000_E884A0[281], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(&D_0A000000_E884A0[311], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(&D_0A000000_E884A0[343], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(&D_0A000000_E884A0[375], 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaChewing.png.inc.c" diff --git a/src/entity/model/MunchlesiaEnvelop_anim.c b/src/entity/model/MunchlesiaEnvelop_anim.c new file mode 100644 index 0000000000..4435a6a986 --- /dev/null +++ b/src/entity/model/MunchlesiaEnvelop_anim.c @@ -0,0 +1,215 @@ +#include "common.h" +#include "animation_script.h" + +extern Vtx D_0A000000_E7B0E0[]; +extern Gfx Entity_MunchlesiaEnvelop_Render[]; + +AnimScript Entity_MunchlesiaEnvelop_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 0, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 0, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 0, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node8 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node7 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node6 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node5 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node4 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node3 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node2 = { + .displayList = Entity_MunchlesiaEnvelop_Render, + .sibling = &Entity_MunchlesiaEnvelop_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E7B0E0, +}; + +StaticAnimatorNode Entity_MunchlesiaEnvelop_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaEnvelop_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaEnvelop_Mesh[] = { + &Entity_MunchlesiaEnvelop_Node1, + &Entity_MunchlesiaEnvelop_Node2, + &Entity_MunchlesiaEnvelop_Node3, + &Entity_MunchlesiaEnvelop_Node4, + &Entity_MunchlesiaEnvelop_Node5, + &Entity_MunchlesiaEnvelop_Node6, + &Entity_MunchlesiaEnvelop_Node7, + &Entity_MunchlesiaEnvelop_Node8, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaEnvelop_gfx.c b/src/entity/model/MunchlesiaEnvelop_gfx.c new file mode 100644 index 0000000000..be487553ae --- /dev/null +++ b/src/entity/model/MunchlesiaEnvelop_gfx.c @@ -0,0 +1,2944 @@ +#include "common.h" + +extern unsigned char D_0A005EE8_E80FC8[]; + +#include "entity/model/MunchlesiaEnvelop.vtx.inc.c" + +Vec3s Entity_MunchlesiaEnvelop_vertexArray[] = { + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 13 }, + { 10, 32, 17 }, + { 13, 27, 11 }, + { 9, 34, 8 }, + { -13, 39, 7 }, + { -17, 32, 10 }, + { -11, 27, 13 }, + { -8, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 13, 39, -8 }, + { 17, 32, -11 }, + { 11, 27, -14 }, + { 8, 34, -10 }, + { -11, 23, 17 }, + { -11, 32, 17 }, + { -14, 27, 11 }, + { -14, 20, 12 }, + { -17, 23, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -17, 23, -11 }, + { -17, 32, -11 }, + { -11, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 17, 23, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 17, 23, 11 }, + { 17, 32, 10 }, + { 11, 27, 14 }, + { 12, 20, 14 }, + { 11, 23, 17 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 29, 5 }, + { -12, 26, 6 }, + { -14, 27, 11 }, + { -10, 34, 8 }, + { 11, 18, 8 }, + { 11, 26, 6 }, + { 13, 27, 11 }, + { 14, 20, 12 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 5, 29, 9 }, + { 6, 26, 12 }, + { 11, 27, 14 }, + { 8, 34, 9 }, + { 8, 18, -11 }, + { 6, 26, -11 }, + { 11, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -5, 29, -9 }, + { -6, 26, -12 }, + { -11, 27, -14 }, + { -8, 34, -10 }, + { -8, 18, 10 }, + { -6, 26, 11 }, + { -11, 27, 13 }, + { -12, 20, 13 }, + { 8, 29, 5 }, + { 0, 32, 3 }, + { 0, 38, 2 }, + { 9, 34, 8 }, + { -10, 34, 8 }, + { -14, 27, 11 }, + { -11, 32, 17 }, + { -8, 39, 13 }, + { 8, 34, -10 }, + { 11, 27, -14 }, + { 6, 26, -11 }, + { 5, 29, -9 }, + { 8, 34, 9 }, + { 11, 27, 14 }, + { 17, 32, 10 }, + { 13, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -8, 34, 9 }, + { -11, 27, 13 }, + { -6, 26, 11 }, + { -5, 29, 8 }, + { -8, 34, -10 }, + { -11, 27, -14 }, + { -17, 32, -11 }, + { -13, 39, -8 }, + { -5, 29, -9 }, + { -3, 32, 0 }, + { -5, 29, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 5, 29, -9 }, + { 3, 32, 0 }, + { 2, 38, 0 }, + { 8, 34, -10 }, + { 8, 34, -10 }, + { 2, 38, 0 }, + { 6, 42, 0 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 2, 38, 0 }, + { 8, 34, 9 }, + { 8, 34, 9 }, + { 2, 38, 0 }, + { 5, 29, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -8, 34, -10 }, + { -2, 38, 0 }, + { -3, 32, 0 }, + { -3, 32, 0 }, + { -5, 29, -9 }, + { -13, 39, -8 }, + { -6, 42, 0 }, + { -2, 38, 0 }, + { -8, 34, -10 }, + { -5, 29, 8 }, + { -2, 38, 0 }, + { -8, 34, 9 }, + { -8, 34, 9 }, + { -2, 38, 0 }, + { -13, 39, 7 }, + { -10, 34, 8 }, + { 0, 38, 2 }, + { 0, 32, 3 }, + { -9, 29, 5 }, + { -8, 39, 13 }, + { 0, 42, 6 }, + { 0, 38, 2 }, + { -10, 34, 8 }, + { 9, 34, 8 }, + { 0, 38, 2 }, + { 7, 39, 13 }, + { 9, 34, 8 }, + { 13, 27, 11 }, + { 11, 26, 6 }, + { 8, 29, 5 }, + { -17, 23, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -17, 23, 10 }, + { -11, 23, 17 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 23, 17 }, + { 13, 39, -8 }, + { 6, 42, 0 }, + { 13, 39, 7 }, + { 5, 29, 9 }, + { 3, 32, 0 }, + { 5, 29, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 26, 6 }, + { 11, 26, 6 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -6, 26, -12 }, + { -6, 26, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 13 }, + { 0, 42, 6 }, + { -8, 39, 13 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { -13, 39, 7 }, + { -6, 42, 0 }, + { -13, 39, -8 }, + { -17, 32, 10 }, + { -17, 32, 10 }, + { -13, 39, -8 }, + { -17, 32, -11 }, + { 17, 23, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 17, 23, -11 }, + { 17, 32, -11 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 17, 32, 10 }, + { 12, 20, 14 }, + { 11, 27, 14 }, + { 6, 26, 12 }, + { 8, 18, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 6, 26, -11 }, + { 8, 18, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 11, 27, -14 }, + { 5, 29, -9 }, + { 5, 29, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -12, 20, -14 }, + { -11, 27, -14 }, + { -6, 26, -12 }, + { -8, 18, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -17, 23, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -11, 27, 13 }, + { -17, 32, 10 }, + { -17, 23, 10 }, + { -17, 32, -11 }, + { -17, 23, -11 }, + { -14, 20, 12 }, + { -14, 27, 11 }, + { -12, 26, 6 }, + { -11, 18, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 23, 17 }, + { 11, 23, 17 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 11 }, + { 8, 29, 5 }, + { 11, 26, 6 }, + { -9, 29, 5 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -5, 29, 8 }, + { -6, 26, 11 }, + { -6, 26, -12 }, + { -5, 29, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 40, 11 }, + { 10, 32, 16 }, + { 13, 27, 10 }, + { 9, 34, 6 }, + { -11, 40, 7 }, + { -16, 32, 10 }, + { -10, 27, 13 }, + { -6, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 11, 40, -8 }, + { 16, 32, -11 }, + { 10, 27, -14 }, + { 6, 34, -10 }, + { -11, 24, 16 }, + { -11, 32, 16 }, + { -14, 27, 10 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -16, 32, -11 }, + { -10, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 11 }, + { 16, 32, 11 }, + { 10, 27, 14 }, + { 11, 21, 14 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 28, 4 }, + { -12, 25, 5 }, + { -14, 27, 10 }, + { -10, 34, 6 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 13, 27, 10 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 14 }, + { 4, 28, 9 }, + { 5, 25, 12 }, + { 10, 27, 14 }, + { 6, 34, 9 }, + { 8, 18, -11 }, + { 5, 25, -11 }, + { 10, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 28, -9 }, + { -5, 25, -12 }, + { -10, 27, -14 }, + { -6, 34, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -10, 27, 13 }, + { -11, 21, 13 }, + { 8, 28, 4 }, + { 0, 31, 2 }, + { 0, 36, 0 }, + { 9, 34, 6 }, + { -10, 34, 6 }, + { -14, 27, 10 }, + { -11, 32, 16 }, + { -8, 40, 11 }, + { 6, 34, -10 }, + { 10, 27, -14 }, + { 5, 25, -11 }, + { 4, 28, -9 }, + { 6, 34, 9 }, + { 10, 27, 14 }, + { 16, 32, 11 }, + { 11, 40, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -6, 34, 9 }, + { -10, 27, 13 }, + { -5, 25, 11 }, + { -4, 28, 8 }, + { -6, 34, -10 }, + { -10, 27, -14 }, + { -16, 32, -11 }, + { -11, 40, -8 }, + { -4, 28, -9 }, + { -2, 31, 0 }, + { -4, 28, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 6, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 28, -9 }, + { 2, 31, 0 }, + { 0, 36, 0 }, + { 6, 34, -10 }, + { 6, 34, -10 }, + { 0, 36, 0 }, + { 3, 41, 0 }, + { 11, 40, -8 }, + { 11, 40, 7 }, + { 0, 36, 0 }, + { 6, 34, 9 }, + { 6, 34, 9 }, + { 0, 36, 0 }, + { 4, 28, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -6, 34, -10 }, + { 0, 36, 0 }, + { -2, 31, 0 }, + { -2, 31, 0 }, + { -4, 28, -9 }, + { -11, 40, -8 }, + { -3, 41, 0 }, + { 0, 36, 0 }, + { -6, 34, -10 }, + { -4, 28, 8 }, + { 0, 36, 0 }, + { -6, 34, 9 }, + { -6, 34, 9 }, + { 0, 36, 0 }, + { -11, 40, 7 }, + { -10, 34, 6 }, + { 0, 36, 0 }, + { 0, 31, 2 }, + { -9, 28, 4 }, + { -8, 40, 11 }, + { 0, 41, 3 }, + { 0, 36, 0 }, + { -10, 34, 6 }, + { 9, 34, 6 }, + { 0, 36, 0 }, + { 7, 40, 11 }, + { 9, 34, 6 }, + { 13, 27, 10 }, + { 11, 25, 5 }, + { 8, 28, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 11, 40, -8 }, + { 3, 41, 0 }, + { 11, 40, 7 }, + { 4, 28, 9 }, + { 2, 31, 0 }, + { 4, 28, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 40, 11 }, + { 0, 41, 3 }, + { -8, 40, 11 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { -11, 40, 7 }, + { -3, 41, 0 }, + { -11, 40, -8 }, + { -16, 32, 10 }, + { -16, 32, 10 }, + { -11, 40, -8 }, + { -16, 32, -11 }, + { 16, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 16, 32, -11 }, + { 11, 40, -8 }, + { 11, 40, 7 }, + { 16, 32, 11 }, + { 11, 21, 14 }, + { 10, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 10, 27, -14 }, + { 4, 28, -9 }, + { 4, 28, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -10, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -10, 27, 13 }, + { -16, 32, 10 }, + { -16, 24, 10 }, + { -16, 32, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 10 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 32, 16 }, + { -11, 32, 16 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 6, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 10 }, + { 8, 28, 4 }, + { 11, 25, 5 }, + { -9, 28, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 28, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -4, 28, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 9 }, + { 10, 33, 15 }, + { 13, 27, 10 }, + { 9, 33, 5 }, + { -9, 39, 7 }, + { -15, 33, 10 }, + { -10, 27, 13 }, + { -5, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 9, 39, -8 }, + { 15, 33, -11 }, + { 10, 27, -14 }, + { 5, 33, -10 }, + { -11, 24, 16 }, + { -11, 33, 15 }, + { -14, 27, 10 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -15, 33, -11 }, + { -10, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 11 }, + { 15, 33, 11 }, + { 10, 27, 14 }, + { 11, 21, 14 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 4 }, + { -12, 25, 5 }, + { -14, 27, 10 }, + { -10, 33, 5 }, + { 11, 18, 8 }, + { 11, 25, 5 }, + { 13, 27, 10 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 14 }, + { 4, 27, 9 }, + { 5, 25, 12 }, + { 10, 27, 14 }, + { 5, 33, 9 }, + { 8, 18, -10 }, + { 5, 25, -11 }, + { 10, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 27, -9 }, + { -5, 25, -12 }, + { -10, 27, -14 }, + { -5, 33, -10 }, + { -8, 18, 10 }, + { -5, 25, 11 }, + { -10, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 4 }, + { 0, 30, 1 }, + { 0, 35, 0 }, + { 9, 33, 5 }, + { -10, 33, 5 }, + { -14, 27, 10 }, + { -11, 33, 15 }, + { -8, 39, 9 }, + { 5, 33, -10 }, + { 10, 27, -14 }, + { 5, 25, -11 }, + { 4, 27, -9 }, + { 5, 33, 9 }, + { 10, 27, 14 }, + { 15, 33, 11 }, + { 9, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -5, 33, 9 }, + { -10, 27, 13 }, + { -5, 25, 11 }, + { -4, 27, 8 }, + { -5, 33, -10 }, + { -10, 27, -14 }, + { -15, 33, -11 }, + { -9, 39, -8 }, + { -4, 27, -9 }, + { -1, 30, 0 }, + { -4, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 6, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 27, -9 }, + { 1, 30, 0 }, + { 0, 35, 0 }, + { 5, 33, -10 }, + { 5, 33, -10 }, + { 0, 35, 0 }, + { 1, 40, 0 }, + { 9, 39, -8 }, + { 9, 39, 7 }, + { 0, 35, 0 }, + { 5, 33, 9 }, + { 5, 33, 9 }, + { 0, 35, 0 }, + { 4, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -5, 33, -10 }, + { 0, 35, 0 }, + { -1, 30, 0 }, + { -1, 30, 0 }, + { -4, 27, -9 }, + { -9, 39, -8 }, + { -1, 40, 0 }, + { 0, 35, 0 }, + { -5, 33, -10 }, + { -4, 27, 8 }, + { 0, 35, 0 }, + { -5, 33, 9 }, + { -5, 33, 9 }, + { 0, 35, 0 }, + { -9, 39, 7 }, + { -10, 33, 5 }, + { 0, 35, 0 }, + { 0, 30, 1 }, + { -9, 27, 4 }, + { -8, 39, 9 }, + { 0, 40, 1 }, + { 0, 35, 0 }, + { -10, 33, 5 }, + { 9, 33, 5 }, + { 0, 35, 0 }, + { 7, 39, 9 }, + { 9, 33, 5 }, + { 13, 27, 10 }, + { 11, 25, 5 }, + { 8, 27, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 9, 39, -8 }, + { 1, 40, 0 }, + { 9, 39, 7 }, + { 4, 27, 9 }, + { 1, 30, 0 }, + { 4, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 5 }, + { 11, 25, 5 }, + { 11, 18, 8 }, + { 8, 18, -10 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -5, 25, -12 }, + { -5, 25, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 9 }, + { 0, 40, 1 }, + { -8, 39, 9 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { -9, 39, 7 }, + { -1, 40, 0 }, + { -9, 39, -8 }, + { -15, 33, 10 }, + { -15, 33, 10 }, + { -9, 39, -8 }, + { -15, 33, -11 }, + { 16, 24, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 15, 33, -11 }, + { 9, 39, -8 }, + { 9, 39, 7 }, + { 15, 33, 11 }, + { 11, 21, 14 }, + { 10, 27, 14 }, + { 5, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 14 }, + { 11, 17, 13 }, + { 5, 25, -11 }, + { 8, 18, -10 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 10, 27, -14 }, + { 4, 27, -9 }, + { 4, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -10, 27, -14 }, + { -5, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 10 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -10, 27, 13 }, + { -15, 33, 10 }, + { -16, 24, 10 }, + { -15, 33, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 10 }, + { -12, 25, 5 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 33, 15 }, + { -11, 33, 15 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 6, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 10 }, + { 8, 27, 4 }, + { 11, 25, 5 }, + { -9, 27, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 27, 8 }, + { -5, 25, 11 }, + { -5, 25, -12 }, + { -4, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 8 }, + { 10, 33, 14 }, + { 13, 27, 9 }, + { 9, 33, 4 }, + { -8, 39, 7 }, + { -14, 33, 10 }, + { -9, 27, 13 }, + { -4, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 8, 39, -8 }, + { 14, 33, -11 }, + { 9, 27, -14 }, + { 4, 33, -10 }, + { -11, 24, 16 }, + { -11, 33, 14 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 24, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 24, -11 }, + { -14, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 24, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 24, 10 }, + { 14, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 24, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 4 }, + { -12, 25, 4 }, + { -14, 27, 9 }, + { -10, 33, 4 }, + { 11, 18, 8 }, + { 11, 25, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 4, 27, 9 }, + { 4, 25, 12 }, + { 9, 27, 14 }, + { 4, 33, 9 }, + { 8, 18, -11 }, + { 4, 25, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -4, 27, -9 }, + { -4, 25, -12 }, + { -9, 27, -14 }, + { -4, 33, -10 }, + { -8, 18, 11 }, + { -4, 25, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 4 }, + { 0, 29, 1 }, + { 0, 34, -1 }, + { 9, 33, 4 }, + { -10, 33, 4 }, + { -14, 27, 9 }, + { -11, 33, 14 }, + { -8, 39, 8 }, + { 4, 33, -10 }, + { 9, 27, -14 }, + { 4, 25, -11 }, + { 4, 27, -9 }, + { 4, 33, 9 }, + { 9, 27, 14 }, + { 14, 33, 10 }, + { 8, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -4, 33, 9 }, + { -9, 27, 13 }, + { -4, 25, 11 }, + { -4, 27, 8 }, + { -4, 33, -10 }, + { -9, 27, -14 }, + { -14, 33, -11 }, + { -8, 39, -8 }, + { -4, 27, -9 }, + { -1, 29, 0 }, + { -4, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 27, -9 }, + { 1, 29, 0 }, + { -1, 34, 0 }, + { 4, 33, -10 }, + { 4, 33, -10 }, + { -1, 34, 0 }, + { 0, 39, 0 }, + { 8, 39, -8 }, + { 8, 39, 7 }, + { -1, 34, 0 }, + { 4, 33, 9 }, + { 4, 33, 9 }, + { -1, 34, 0 }, + { 4, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -4, 33, -10 }, + { 1, 34, 0 }, + { -1, 29, 0 }, + { -1, 29, 0 }, + { -4, 27, -9 }, + { -8, 39, -8 }, + { 0, 39, 0 }, + { 1, 34, 0 }, + { -4, 33, -10 }, + { -4, 27, 8 }, + { 1, 34, 0 }, + { -4, 33, 9 }, + { -4, 33, 9 }, + { 1, 34, 0 }, + { -8, 39, 7 }, + { -10, 33, 4 }, + { 0, 34, -1 }, + { 0, 29, 1 }, + { -9, 27, 4 }, + { -8, 39, 8 }, + { 0, 39, 0 }, + { 0, 34, -1 }, + { -10, 33, 4 }, + { 9, 33, 4 }, + { 0, 34, -1 }, + { 7, 39, 8 }, + { 9, 33, 4 }, + { 13, 27, 9 }, + { 11, 25, 4 }, + { 8, 27, 4 }, + { -16, 24, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 24, 10 }, + { -11, 24, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 24, 16 }, + { 8, 39, -8 }, + { 0, 39, 0 }, + { 8, 39, 7 }, + { 4, 27, 9 }, + { 1, 29, 0 }, + { 4, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 25, 4 }, + { 11, 25, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 25, -12 }, + { -4, 25, 11 }, + { -8, 18, 11 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 8 }, + { 0, 39, 0 }, + { -8, 39, 8 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { -8, 39, 7 }, + { 0, 39, 0 }, + { -8, 39, -8 }, + { -14, 33, 10 }, + { -14, 33, 10 }, + { -8, 39, -8 }, + { -14, 33, -11 }, + { 16, 24, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 24, -11 }, + { 14, 33, -11 }, + { 8, 39, -8 }, + { 8, 39, 7 }, + { 14, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 25, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 25, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 4, 27, -9 }, + { 4, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 25, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 24, -11 }, + { -8, 18, 11 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -14, 33, 10 }, + { -16, 24, 10 }, + { -14, 33, -11 }, + { -16, 24, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 25, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 24, 16 }, + { 11, 24, 16 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 4 }, + { 11, 25, 4 }, + { -9, 27, 4 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -4, 27, 8 }, + { -4, 25, 11 }, + { -4, 25, -12 }, + { -4, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 7 }, + { 10, 33, 14 }, + { 13, 27, 9 }, + { 9, 33, 4 }, + { -7, 39, 7 }, + { -14, 33, 10 }, + { -9, 27, 13 }, + { -4, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 7, 39, -8 }, + { 14, 33, -11 }, + { 9, 27, -14 }, + { 4, 33, -10 }, + { -11, 25, 16 }, + { -11, 33, 14 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 25, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 25, -11 }, + { -14, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 25, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 25, 10 }, + { 14, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 25, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 3 }, + { -12, 24, 4 }, + { -14, 27, 9 }, + { -10, 33, 4 }, + { 11, 18, 8 }, + { 11, 24, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 3, 27, 9 }, + { 4, 24, 12 }, + { 9, 27, 14 }, + { 4, 33, 10 }, + { 8, 18, -11 }, + { 4, 24, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -3, 27, -9 }, + { -4, 24, -12 }, + { -9, 27, -14 }, + { -4, 33, -10 }, + { -8, 18, 11 }, + { -4, 24, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 3 }, + { 0, 29, 1 }, + { 0, 34, -2 }, + { 9, 33, 4 }, + { -10, 33, 4 }, + { -14, 27, 9 }, + { -11, 33, 14 }, + { -8, 39, 7 }, + { 4, 33, -10 }, + { 9, 27, -14 }, + { 4, 24, -11 }, + { 3, 27, -9 }, + { 4, 33, 10 }, + { 9, 27, 14 }, + { 14, 33, 10 }, + { 7, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -4, 33, 9 }, + { -9, 27, 13 }, + { -4, 24, 11 }, + { -3, 27, 8 }, + { -4, 33, -10 }, + { -9, 27, -14 }, + { -14, 33, -11 }, + { -7, 39, -8 }, + { -3, 27, -9 }, + { -1, 29, 0 }, + { -3, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 3, 27, -9 }, + { 1, 29, 0 }, + { -2, 34, 0 }, + { 4, 33, -10 }, + { 4, 33, -10 }, + { -2, 34, 0 }, + { 0, 39, 0 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { -2, 34, 0 }, + { 4, 33, 10 }, + { 4, 33, 10 }, + { -2, 34, 0 }, + { 3, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -4, 33, -10 }, + { 2, 34, 0 }, + { -1, 29, 0 }, + { -1, 29, 0 }, + { -3, 27, -9 }, + { -7, 39, -8 }, + { 0, 39, 0 }, + { 2, 34, 0 }, + { -4, 33, -10 }, + { -3, 27, 8 }, + { 2, 34, 0 }, + { -4, 33, 9 }, + { -4, 33, 9 }, + { 2, 34, 0 }, + { -7, 39, 7 }, + { -10, 33, 4 }, + { 0, 34, -2 }, + { 0, 29, 1 }, + { -9, 27, 3 }, + { -8, 39, 7 }, + { 0, 39, 0 }, + { 0, 34, -2 }, + { -10, 33, 4 }, + { 9, 33, 4 }, + { 0, 34, -2 }, + { 7, 39, 7 }, + { 9, 33, 4 }, + { 13, 27, 9 }, + { 11, 24, 4 }, + { 8, 27, 3 }, + { -16, 25, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 25, 10 }, + { -11, 25, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 25, 16 }, + { 7, 39, -8 }, + { 0, 39, 0 }, + { 7, 39, 7 }, + { 3, 27, 9 }, + { 1, 29, 0 }, + { 3, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 24, 4 }, + { 11, 24, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 24, -12 }, + { -4, 24, 11 }, + { -8, 18, 11 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 7 }, + { 0, 39, 0 }, + { -8, 39, 7 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { -7, 39, 7 }, + { 0, 39, 0 }, + { -7, 39, -8 }, + { -14, 33, 10 }, + { -14, 33, 10 }, + { -7, 39, -8 }, + { -14, 33, -11 }, + { 16, 25, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 25, -11 }, + { 14, 33, -11 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { 14, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 24, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 24, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 3, 27, -9 }, + { 3, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 24, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 25, -11 }, + { -8, 18, 11 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -14, 33, 10 }, + { -16, 25, 10 }, + { -14, 33, -11 }, + { -16, 25, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 24, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 25, 16 }, + { 11, 25, 16 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 3 }, + { 11, 24, 4 }, + { -9, 27, 3 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -3, 27, 8 }, + { -4, 24, 11 }, + { -4, 24, -12 }, + { -3, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 7 }, + { 10, 33, 14 }, + { 13, 27, 9 }, + { 9, 33, 4 }, + { -7, 39, 7 }, + { -14, 33, 10 }, + { -9, 27, 13 }, + { -4, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 7, 39, -8 }, + { 14, 33, -11 }, + { 9, 27, -14 }, + { 4, 33, -10 }, + { -11, 25, 16 }, + { -11, 33, 14 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 25, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 25, -11 }, + { -14, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 25, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 25, 10 }, + { 14, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 25, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 3 }, + { -12, 24, 4 }, + { -14, 27, 9 }, + { -10, 33, 4 }, + { 11, 18, 8 }, + { 11, 24, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 3, 27, 9 }, + { 4, 24, 12 }, + { 9, 27, 14 }, + { 4, 33, 10 }, + { 8, 18, -11 }, + { 4, 24, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -3, 27, -9 }, + { -4, 24, -12 }, + { -9, 27, -14 }, + { -4, 33, -10 }, + { -8, 18, 10 }, + { -4, 24, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 3 }, + { 0, 29, 1 }, + { 0, 34, -2 }, + { 9, 33, 4 }, + { -10, 33, 4 }, + { -14, 27, 9 }, + { -11, 33, 14 }, + { -8, 39, 7 }, + { 4, 33, -10 }, + { 9, 27, -14 }, + { 4, 24, -11 }, + { 3, 27, -9 }, + { 4, 33, 10 }, + { 9, 27, 14 }, + { 14, 33, 10 }, + { 7, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -4, 33, 9 }, + { -9, 27, 13 }, + { -4, 24, 11 }, + { -3, 27, 8 }, + { -4, 33, -10 }, + { -9, 27, -14 }, + { -14, 33, -11 }, + { -7, 39, -8 }, + { -3, 27, -9 }, + { -1, 29, 0 }, + { -3, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 3, 27, -9 }, + { 1, 29, 0 }, + { -2, 34, 0 }, + { 4, 33, -10 }, + { 4, 33, -10 }, + { -2, 34, 0 }, + { 0, 39, 0 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { -2, 34, 0 }, + { 4, 33, 10 }, + { 4, 33, 10 }, + { -2, 34, 0 }, + { 3, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -4, 33, -10 }, + { 2, 34, 0 }, + { -1, 29, 0 }, + { -1, 29, 0 }, + { -3, 27, -9 }, + { -7, 39, -8 }, + { 0, 39, 0 }, + { 2, 34, 0 }, + { -4, 33, -10 }, + { -3, 27, 8 }, + { 2, 34, 0 }, + { -4, 33, 9 }, + { -4, 33, 9 }, + { 2, 34, 0 }, + { -7, 39, 7 }, + { -10, 33, 4 }, + { 0, 34, -2 }, + { 0, 29, 1 }, + { -9, 27, 3 }, + { -8, 39, 7 }, + { 0, 39, 0 }, + { 0, 34, -2 }, + { -10, 33, 4 }, + { 9, 33, 4 }, + { 0, 34, -2 }, + { 7, 39, 7 }, + { 9, 33, 4 }, + { 13, 27, 9 }, + { 11, 24, 4 }, + { 8, 27, 3 }, + { -16, 25, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 25, 10 }, + { -11, 25, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 25, 16 }, + { 7, 39, -8 }, + { 0, 39, 0 }, + { 7, 39, 7 }, + { 3, 27, 9 }, + { 1, 29, 0 }, + { 3, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 24, 4 }, + { 11, 24, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 24, -12 }, + { -4, 24, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 7 }, + { 0, 39, 0 }, + { -8, 39, 7 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { -7, 39, 7 }, + { 0, 39, 0 }, + { -7, 39, -8 }, + { -14, 33, 10 }, + { -14, 33, 10 }, + { -7, 39, -8 }, + { -14, 33, -11 }, + { 16, 25, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 25, -11 }, + { 14, 33, -11 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { 14, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 24, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 24, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 3, 27, -9 }, + { 3, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 24, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 25, -11 }, + { -8, 18, 10 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -14, 33, 10 }, + { -16, 25, 10 }, + { -14, 33, -11 }, + { -16, 25, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 24, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 25, 16 }, + { 11, 25, 16 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 3 }, + { 11, 24, 4 }, + { -9, 27, 3 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -3, 27, 8 }, + { -4, 24, 11 }, + { -4, 24, -12 }, + { -3, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 7 }, + { 10, 33, 14 }, + { 13, 27, 9 }, + { 9, 33, 4 }, + { -7, 39, 7 }, + { -14, 33, 10 }, + { -9, 27, 13 }, + { -4, 33, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 7, 39, -8 }, + { 14, 33, -11 }, + { 9, 27, -14 }, + { 4, 33, -10 }, + { -11, 25, 16 }, + { -11, 33, 14 }, + { -14, 27, 9 }, + { -14, 21, 11 }, + { -16, 25, 10 }, + { -9, 12, 14 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -16, 25, -11 }, + { -14, 33, -11 }, + { -9, 27, -14 }, + { -11, 21, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 16, 25, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 11, 21, -14 }, + { 16, 25, 10 }, + { 14, 33, 10 }, + { 9, 27, 14 }, + { 11, 21, 13 }, + { 11, 25, 16 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { -9, 27, 3 }, + { -12, 24, 4 }, + { -14, 27, 9 }, + { -10, 33, 4 }, + { 11, 18, 8 }, + { 11, 24, 4 }, + { 13, 27, 9 }, + { 14, 21, 11 }, + { -11, 18, 8 }, + { -11, 17, 7 }, + { -13, 17, 11 }, + { -14, 21, 11 }, + { 8, 18, 11 }, + { 7, 17, 11 }, + { 11, 17, 13 }, + { 11, 21, 13 }, + { 3, 27, 9 }, + { 4, 24, 12 }, + { 9, 27, 14 }, + { 4, 33, 10 }, + { 8, 18, -11 }, + { 4, 24, -11 }, + { 9, 27, -14 }, + { 11, 21, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -11, 21, -14 }, + { -3, 27, -9 }, + { -4, 24, -12 }, + { -9, 27, -14 }, + { -4, 33, -10 }, + { -8, 18, 11 }, + { -4, 24, 11 }, + { -9, 27, 13 }, + { -11, 21, 13 }, + { 8, 27, 3 }, + { 0, 29, 1 }, + { 0, 34, -2 }, + { 9, 33, 4 }, + { -10, 33, 4 }, + { -14, 27, 9 }, + { -11, 33, 14 }, + { -8, 39, 7 }, + { 4, 33, -10 }, + { 9, 27, -14 }, + { 4, 24, -11 }, + { 3, 27, -9 }, + { 4, 33, 10 }, + { 9, 27, 14 }, + { 14, 33, 10 }, + { 7, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -4, 33, 9 }, + { -9, 27, 13 }, + { -4, 24, 11 }, + { -3, 27, 8 }, + { -4, 33, -10 }, + { -9, 27, -14 }, + { -14, 33, -11 }, + { -7, 39, -8 }, + { -3, 27, -9 }, + { -1, 29, 0 }, + { -3, 27, 8 }, + { -7, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 7, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 3, 27, -9 }, + { 1, 29, 0 }, + { -2, 34, 0 }, + { 4, 33, -10 }, + { 4, 33, -10 }, + { -2, 34, 0 }, + { 0, 39, 0 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { -2, 34, 0 }, + { 4, 33, 10 }, + { 4, 33, 10 }, + { -2, 34, 0 }, + { 3, 27, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -4, 33, -10 }, + { 2, 34, 0 }, + { -1, 29, 0 }, + { -1, 29, 0 }, + { -3, 27, -9 }, + { -7, 39, -8 }, + { 0, 39, 0 }, + { 2, 34, 0 }, + { -4, 33, -10 }, + { -3, 27, 8 }, + { 2, 34, 0 }, + { -4, 33, 9 }, + { -4, 33, 9 }, + { 2, 34, 0 }, + { -7, 39, 7 }, + { -10, 33, 4 }, + { 0, 34, -2 }, + { 0, 29, 1 }, + { -9, 27, 3 }, + { -8, 39, 7 }, + { 0, 39, 0 }, + { 0, 34, -2 }, + { -10, 33, 4 }, + { 9, 33, 4 }, + { 0, 34, -2 }, + { 7, 39, 7 }, + { 9, 33, 4 }, + { 13, 27, 9 }, + { 11, 24, 4 }, + { 8, 27, 3 }, + { -16, 25, -11 }, + { -14, 12, -9 }, + { -9, 12, 14 }, + { -16, 25, 10 }, + { -11, 25, 16 }, + { -9, 12, 14 }, + { 14, 12, 10 }, + { 11, 25, 16 }, + { 7, 39, -8 }, + { 0, 39, 0 }, + { 7, 39, 7 }, + { 3, 27, 9 }, + { 1, 29, 0 }, + { 3, 27, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -9, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 24, 4 }, + { 11, 24, 4 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 7, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -4, 24, -12 }, + { -4, 24, 11 }, + { -8, 18, 11 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 7 }, + { 0, 39, 0 }, + { -8, 39, 7 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { -7, 39, 7 }, + { 0, 39, 0 }, + { -7, 39, -8 }, + { -14, 33, 10 }, + { -14, 33, 10 }, + { -7, 39, -8 }, + { -14, 33, -11 }, + { 16, 25, 10 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 16, 25, -11 }, + { 14, 33, -11 }, + { 7, 39, -8 }, + { 7, 39, 7 }, + { 14, 33, 10 }, + { 11, 21, 13 }, + { 9, 27, 14 }, + { 4, 24, 12 }, + { 8, 18, 11 }, + { 11, 21, 13 }, + { 11, 17, 13 }, + { 4, 24, -11 }, + { 8, 18, -11 }, + { 11, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 11, 21, -14 }, + { 9, 27, -14 }, + { 3, 27, -9 }, + { 3, 27, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -11, 21, -14 }, + { -9, 27, -14 }, + { -4, 24, -12 }, + { -8, 18, -11 }, + { -11, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -16, 25, -11 }, + { -8, 18, 11 }, + { -11, 17, 7 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -11, 21, 13 }, + { -13, 17, 11 }, + { -11, 21, 13 }, + { -9, 27, 13 }, + { -14, 33, 10 }, + { -16, 25, 10 }, + { -14, 33, -11 }, + { -16, 25, -11 }, + { -14, 21, 11 }, + { -14, 27, 9 }, + { -12, 24, 4 }, + { -11, 18, 8 }, + { -14, 21, 11 }, + { -13, 17, 11 }, + { -9, 12, 14 }, + { -11, 25, 16 }, + { 11, 25, 16 }, + { 10, 33, 14 }, + { -11, 33, 14 }, + { 11, 18, 8 }, + { 7, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 7 }, + { 14, 21, 11 }, + { 11, 17, 13 }, + { 14, 21, 11 }, + { 13, 27, 9 }, + { 8, 27, 3 }, + { 11, 24, 4 }, + { -9, 27, 3 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -3, 27, 8 }, + { -4, 24, 11 }, + { -4, 24, -12 }, + { -3, 27, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -9, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, +}; + +Gfx Entity_MunchlesiaEnvelop_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A005EE8_E80FC8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaEnvelop_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaEnvelop.png.inc.c" diff --git a/src/entity/model/MunchlesiaGrab_anim.c b/src/entity/model/MunchlesiaGrab_anim.c new file mode 100644 index 0000000000..a7729e4ca3 --- /dev/null +++ b/src/entity/model/MunchlesiaGrab_anim.c @@ -0,0 +1,220 @@ +#include "common.h" +#include "animation_script.h" + +extern Vtx D_0A000000_E74BD0[]; +extern Gfx Entity_MunchlesiaGrab_Render[]; + +AnimScript Entity_MunchlesiaGrab_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 4, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 3, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 2, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 2, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 1, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 0, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node8 = { + .displayList = Entity_MunchlesiaGrab_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node7 = { + .displayList = Entity_MunchlesiaGrab_Render, + .sibling = &Entity_MunchlesiaGrab_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node6 = { + .displayList = Entity_MunchlesiaGrab_Render, + .pos = { 0.0f, 1.0f, 0.0f }, + .sibling = &Entity_MunchlesiaGrab_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node5 = { + .displayList = Entity_MunchlesiaGrab_Render, + .pos = { 0.0f, 2.0f, 0.0f }, + .sibling = &Entity_MunchlesiaGrab_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node4 = { + .displayList = Entity_MunchlesiaGrab_Render, + .pos = { 0.0f, 2.0f, 0.0f }, + .sibling = &Entity_MunchlesiaGrab_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node3 = { + .displayList = Entity_MunchlesiaGrab_Render, + .pos = { 0.0f, 3.0f, 0.0f }, + .sibling = &Entity_MunchlesiaGrab_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node2 = { + .displayList = Entity_MunchlesiaGrab_Render, + .pos = { 0.0f, 4.0f, 0.0f }, + .sibling = &Entity_MunchlesiaGrab_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E74BD0, +}; + +StaticAnimatorNode Entity_MunchlesiaGrab_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaGrab_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaGrab_Mesh[] = { + &Entity_MunchlesiaGrab_Node1, + &Entity_MunchlesiaGrab_Node2, + &Entity_MunchlesiaGrab_Node3, + &Entity_MunchlesiaGrab_Node4, + &Entity_MunchlesiaGrab_Node5, + &Entity_MunchlesiaGrab_Node6, + &Entity_MunchlesiaGrab_Node7, + &Entity_MunchlesiaGrab_Node8, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaGrab_gfx.c b/src/entity/model/MunchlesiaGrab_gfx.c new file mode 100644 index 0000000000..fd4b11c614 --- /dev/null +++ b/src/entity/model/MunchlesiaGrab_gfx.c @@ -0,0 +1,2944 @@ +#include "common.h" + +extern unsigned char D_0A005EE8_E7AAB8[]; + +#include "entity/model/MunchlesiaGrab.vtx.inc.c" + +Vec3s Entity_MunchlesiaGrab_vertexArray[] = { + { 11, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -11 }, + { 8, 7, 25 }, + { 11, 9, 22 }, + { 14, 16, 23 }, + { 10, 12, 30 }, + { -25, 7, 8 }, + { -22, 9, 11 }, + { -23, 16, 14 }, + { -30, 12, 10 }, + { 9, 17, -33 }, + { 11, 21, -22 }, + { 14, 16, -23 }, + { 10, 12, -30 }, + { 25, 7, -8 }, + { 22, 9, -11 }, + { 23, 16, -14 }, + { 30, 12, -10 }, + { -11, 11, 19 }, + { -11, 9, 22 }, + { -14, 16, 23 }, + { -14, 16, 16 }, + { -19, 11, 11 }, + { -9, 10, 11 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -19, 11, -11 }, + { -22, 9, -11 }, + { -23, 16, -14 }, + { -16, 16, -14 }, + { -11, 11, -18 }, + { -11, 10, -10 }, + { -13, 15, -12 }, + { -14, 16, -16 }, + { 11, 11, -18 }, + { 11, 9, -21 }, + { 14, 16, -23 }, + { 14, 16, -16 }, + { 19, 11, -11 }, + { 10, 10, -11 }, + { 13, 15, -12 }, + { 16, 16, -14 }, + { 19, 11, 11 }, + { 22, 9, 10 }, + { 23, 16, 14 }, + { 16, 16, 14 }, + { 11, 11, 19 }, + { 11, 10, 10 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { -9, 18, 32 }, + { -12, 21, 22 }, + { -14, 16, 23 }, + { -9, 12, 30 }, + { 11, 20, 14 }, + { 11, 21, 22 }, + { 14, 16, 23 }, + { 14, 16, 16 }, + { -11, 20, 14 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 16, 16 }, + { 14, 20, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 16, 14 }, + { 32, 18, 9 }, + { 22, 21, 12 }, + { 23, 16, 14 }, + { 30, 12, 10 }, + { 14, 20, -11 }, + { 22, 21, -11 }, + { 23, 16, -14 }, + { 16, 16, -14 }, + { 11, 20, -15 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 16, -16 }, + { -11, 20, -15 }, + { -12, 21, -22 }, + { -14, 16, -23 }, + { -14, 16, -16 }, + { -14, 20, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 16, -14 }, + { -32, 18, -9 }, + { -22, 21, -12 }, + { -23, 16, -14 }, + { -30, 12, -9 }, + { -14, 20, 10 }, + { -22, 21, 12 }, + { -23, 16, 14 }, + { -16, 16, 14 }, + { 9, 18, 32 }, + { 0, 12, 37 }, + { 0, 7, 35 }, + { 10, 12, 30 }, + { -9, 12, 30 }, + { -14, 16, 23 }, + { -11, 9, 22 }, + { -8, 7, 25 }, + { 30, 12, -10 }, + { 23, 16, -14 }, + { 22, 21, -11 }, + { 32, 18, -9 }, + { 30, 12, 10 }, + { 23, 16, 14 }, + { 22, 9, 10 }, + { 25, 7, 8 }, + { -9, 12, -30 }, + { -14, 16, -23 }, + { -12, 21, -22 }, + { -9, 17, -33 }, + { 10, 12, -30 }, + { 14, 16, -23 }, + { 11, 9, -21 }, + { 8, 7, -25 }, + { -30, 12, 10 }, + { -23, 16, 14 }, + { -22, 21, 12 }, + { -32, 18, 9 }, + { -30, 12, -9 }, + { -23, 16, -14 }, + { -22, 9, -11 }, + { -25, 7, -7 }, + { -32, 18, -9 }, + { -37, 12, 0 }, + { -32, 18, 9 }, + { -11, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 11 }, + { -5, 20, -11 }, + { -11, 18, -10 }, + { -11, 20, -6 }, + { 6, 20, 11 }, + { 10, 18, 11 }, + { 11, 20, 5 }, + { -5, 20, -11 }, + { -11, 20, -6 }, + { -9, 24, -5 }, + { -5, 24, -9 }, + { 32, 18, -9 }, + { 37, 12, 0 }, + { 35, 7, 0 }, + { 30, 12, -10 }, + { 30, 12, -10 }, + { 35, 7, 0 }, + { 29, 5, 0 }, + { 25, 7, -8 }, + { 25, 7, 8 }, + { 35, 7, 0 }, + { 30, 12, 10 }, + { 30, 12, 10 }, + { 35, 7, 0 }, + { 32, 18, 9 }, + { 8, 7, -25 }, + { 0, 5, -29 }, + { 0, 6, -34 }, + { 0, 6, -34 }, + { 10, 12, -30 }, + { 10, 12, -30 }, + { 0, 6, -34 }, + { 0, 12, -37 }, + { 9, 17, -33 }, + { -9, 17, -33 }, + { 0, 6, -34 }, + { -9, 12, -30 }, + { -9, 12, -30 }, + { 0, 6, -34 }, + { -7, 7, -25 }, + { -30, 12, -9 }, + { -35, 7, 0 }, + { -37, 12, 0 }, + { -37, 12, 0 }, + { -32, 18, -9 }, + { -25, 7, -7 }, + { -29, 5, 0 }, + { -35, 7, 0 }, + { -30, 12, -9 }, + { -32, 18, 9 }, + { -35, 7, 0 }, + { -30, 12, 10 }, + { -30, 12, 10 }, + { -35, 7, 0 }, + { -25, 7, 8 }, + { -9, 12, 30 }, + { 0, 7, 35 }, + { 0, 12, 37 }, + { -9, 18, 32 }, + { -8, 7, 25 }, + { 0, 5, 29 }, + { 0, 7, 35 }, + { -9, 12, 30 }, + { 10, 12, 30 }, + { 0, 7, 35 }, + { 8, 7, 25 }, + { 10, 12, 30 }, + { 14, 16, 23 }, + { 11, 21, 22 }, + { 9, 18, 32 }, + { -19, 11, -11 }, + { -11, 10, -10 }, + { -9, 10, 11 }, + { -19, 11, 11 }, + { -11, 11, 19 }, + { -9, 10, 11 }, + { 11, 10, 10 }, + { 11, 11, 19 }, + { 25, 7, -8 }, + { 29, 5, 0 }, + { 25, 7, 8 }, + { 32, 18, 9 }, + { 37, 12, 0 }, + { 32, 18, -9 }, + { 9, 17, -33 }, + { 0, 12, -37 }, + { -9, 17, -33 }, + { -11, 9, -21 }, + { -14, 16, -23 }, + { -9, 12, -30 }, + { -7, 7, -25 }, + { 11, 11, -18 }, + { 10, 10, -11 }, + { -11, 10, -10 }, + { -11, 11, -18 }, + { -9, 10, 11 }, + { -11, 10, -10 }, + { 0, 0, 0 }, + { -9, 24, 4 }, + { -9, 24, -5 }, + { -11, 20, -6 }, + { -11, 20, 5 }, + { -5, 24, 9 }, + { -6, 20, 11 }, + { 4, 24, 9 }, + { 4, 24, 9 }, + { 6, 20, 11 }, + { 9, 24, 5 }, + { 4, 24, 9 }, + { 6, 20, 11 }, + { 11, 20, 5 }, + { 9, 24, -5 }, + { 11, 20, -6 }, + { 4, 24, -9 }, + { 5, 20, -11 }, + { -5, 24, -9 }, + { -5, 20, -11 }, + { -11, 20, 14 }, + { -12, 21, 22 }, + { 11, 21, 22 }, + { 11, 20, 14 }, + { 14, 20, -11 }, + { 11, 18, -10 }, + { 11, 20, -6 }, + { 11, 20, 5 }, + { 10, 18, 11 }, + { 14, 20, 11 }, + { 11, 20, -15 }, + { 11, 21, -22 }, + { -12, 21, -22 }, + { -11, 20, -15 }, + { -14, 20, -11 }, + { -22, 21, -12 }, + { -22, 21, 12 }, + { -14, 20, 10 }, + { -7, 7, -25 }, + { 0, 5, -29 }, + { 8, 7, -25 }, + { -11, 9, -21 }, + { 11, 9, -21 }, + { 8, 7, 25 }, + { 0, 5, 29 }, + { -8, 7, 25 }, + { 11, 9, 22 }, + { -11, 9, 22 }, + { -25, 7, 8 }, + { -29, 5, 0 }, + { -25, 7, -7 }, + { -22, 9, 11 }, + { -22, 9, 11 }, + { -25, 7, -7 }, + { -22, 9, -11 }, + { 19, 11, 11 }, + { 11, 10, 10 }, + { 10, 10, -11 }, + { 19, 11, -11 }, + { 22, 9, -11 }, + { 25, 7, -8 }, + { 25, 7, 8 }, + { 22, 9, 10 }, + { 16, 16, 14 }, + { 23, 16, 14 }, + { 22, 21, 12 }, + { 14, 20, 11 }, + { 16, 16, 14 }, + { 12, 15, 13 }, + { 22, 21, -11 }, + { 14, 20, -11 }, + { 16, 16, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 16, -14 }, + { 23, 16, -14 }, + { 32, 18, -9 }, + { 32, 18, 9 }, + { 14, 16, -16 }, + { 14, 16, -23 }, + { 11, 21, -22 }, + { 11, 20, -15 }, + { 14, 16, -16 }, + { 13, 15, -12 }, + { 10, 10, -11 }, + { 11, 11, -18 }, + { -11, 11, -18 }, + { -11, 9, -21 }, + { 11, 9, -21 }, + { -11, 20, -15 }, + { -11, 18, -10 }, + { -5, 20, -11 }, + { 5, 20, -11 }, + { 11, 18, -10 }, + { 11, 20, -15 }, + { -14, 16, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 16, -16 }, + { -14, 16, -23 }, + { -16, 16, -14 }, + { -23, 16, -14 }, + { -22, 21, -12 }, + { -14, 20, -11 }, + { -16, 16, -14 }, + { -13, 15, -12 }, + { -11, 10, -10 }, + { -19, 11, -11 }, + { -14, 20, 10 }, + { -11, 18, 10 }, + { -11, 20, 5 }, + { -11, 20, -6 }, + { -16, 16, 14 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -23, 16, 14 }, + { -22, 9, 11 }, + { -19, 11, 11 }, + { -22, 9, -11 }, + { -19, 11, -11 }, + { -14, 16, 16 }, + { -14, 16, 23 }, + { -12, 21, 22 }, + { -11, 20, 14 }, + { -14, 16, 16 }, + { -13, 15, 12 }, + { -9, 10, 11 }, + { -11, 11, 19 }, + { 11, 11, 19 }, + { 11, 9, 22 }, + { -11, 9, 22 }, + { 11, 20, 14 }, + { 10, 18, 11 }, + { 6, 20, 11 }, + { -6, 20, 11 }, + { -11, 18, 10 }, + { 14, 16, 16 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { 14, 16, 23 }, + { 9, 18, 32 }, + { 11, 21, 22 }, + { -9, 18, 32 }, + { -9, 17, -33 }, + { -12, 21, -22 }, + { 11, 21, -22 }, + { -9, 17, -33 }, + { 11, 21, -22 }, + { 9, 17, -33 }, + { -32, 18, 9 }, + { -22, 21, 12 }, + { -22, 21, -12 }, + { -32, 18, -9 }, + { 10, 10, -11 }, + { 11, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 11, 10, 10 }, + { -9, 10, 11 }, + { 0, 0, 0 }, + { -11, 10, -10 }, + { 10, 10, -11 }, + { -5, 24, 9 }, + { 4, 24, 9 }, + { 9, 24, 5 }, + { -9, 24, 4 }, + { 9, 24, -5 }, + { -9, 24, -5 }, + { 4, 24, -9 }, + { -5, 24, -9 }, + { 10, 20, -6 }, + { 11, 18, -9 }, + { 5, 20, -10 }, + { 8, 11, 29 }, + { 11, 12, 24 }, + { 14, 19, 22 }, + { 10, 18, 30 }, + { -29, 11, 8 }, + { -24, 12, 11 }, + { -22, 19, 14 }, + { -30, 18, 10 }, + { 9, 25, -30 }, + { 11, 24, -20 }, + { 14, 19, -22 }, + { 10, 18, -30 }, + { 29, 11, -8 }, + { 24, 12, -11 }, + { 22, 19, -14 }, + { 30, 18, -10 }, + { -10, 13, 20 }, + { -11, 12, 24 }, + { -14, 19, 22 }, + { -13, 17, 16 }, + { -20, 13, 11 }, + { -9, 10, 11 }, + { -13, 16, 12 }, + { -16, 17, 14 }, + { -20, 13, -11 }, + { -24, 12, -11 }, + { -22, 19, -14 }, + { -16, 17, -14 }, + { -10, 13, -20 }, + { -11, 10, -9 }, + { -12, 16, -12 }, + { -13, 18, -16 }, + { 11, 13, -20 }, + { 11, 12, -24 }, + { 14, 19, -22 }, + { 14, 18, -16 }, + { 20, 13, -11 }, + { 10, 10, -12 }, + { 13, 16, -12 }, + { 16, 17, -14 }, + { 20, 13, 11 }, + { 24, 12, 11 }, + { 22, 19, 14 }, + { 16, 17, 14 }, + { 11, 13, 20 }, + { 11, 10, 10 }, + { 12, 16, 13 }, + { 14, 17, 16 }, + { -9, 24, 30 }, + { -12, 24, 20 }, + { -14, 19, 22 }, + { -9, 18, 30 }, + { 11, 20, 13 }, + { 11, 24, 20 }, + { 14, 19, 22 }, + { 14, 17, 16 }, + { -11, 20, 13 }, + { -11, 18, 9 }, + { -13, 16, 12 }, + { -13, 17, 16 }, + { 13, 20, 11 }, + { 9, 18, 11 }, + { 12, 16, 13 }, + { 16, 17, 14 }, + { 30, 24, 9 }, + { 20, 24, 12 }, + { 22, 19, 14 }, + { 30, 18, 9 }, + { 13, 20, -11 }, + { 20, 24, -11 }, + { 22, 19, -14 }, + { 16, 17, -14 }, + { 11, 21, -13 }, + { 11, 18, -9 }, + { 13, 16, -12 }, + { 14, 18, -16 }, + { -11, 21, -13 }, + { -12, 24, -20 }, + { -14, 19, -22 }, + { -13, 18, -16 }, + { -13, 20, -11 }, + { -11, 18, -9 }, + { -12, 16, -12 }, + { -16, 17, -14 }, + { -30, 24, -9 }, + { -20, 24, -12 }, + { -22, 19, -14 }, + { -30, 18, -10 }, + { -13, 20, 11 }, + { -20, 24, 11 }, + { -22, 19, 14 }, + { -16, 17, 14 }, + { 9, 24, 30 }, + { 0, 22, 36 }, + { 0, 16, 37 }, + { 10, 18, 30 }, + { -9, 18, 30 }, + { -14, 19, 22 }, + { -11, 12, 24 }, + { -8, 11, 29 }, + { 30, 18, -10 }, + { 22, 19, -14 }, + { 20, 24, -11 }, + { 30, 24, -9 }, + { 30, 18, 9 }, + { 22, 19, 14 }, + { 24, 12, 11 }, + { 29, 11, 8 }, + { -9, 18, -30 }, + { -14, 19, -22 }, + { -12, 24, -20 }, + { -9, 25, -30 }, + { 10, 18, -30 }, + { 14, 19, -22 }, + { 11, 12, -24 }, + { 8, 12, -29 }, + { -30, 18, 10 }, + { -22, 19, 14 }, + { -20, 24, 11 }, + { -30, 24, 9 }, + { -30, 18, -10 }, + { -22, 19, -14 }, + { -24, 12, -11 }, + { -29, 11, -7 }, + { -30, 24, -9 }, + { -36, 22, 0 }, + { -30, 24, 9 }, + { -10, 20, 5 }, + { -11, 18, 9 }, + { -6, 20, 10 }, + { -5, 20, -10 }, + { -11, 18, -9 }, + { -10, 20, -6 }, + { 6, 20, 10 }, + { 9, 18, 11 }, + { 10, 20, 5 }, + { -5, 20, -10 }, + { -10, 20, -6 }, + { -8, 24, -5 }, + { -5, 24, -8 }, + { 30, 24, -9 }, + { 36, 22, 0 }, + { 37, 16, 0 }, + { 30, 18, -10 }, + { 30, 18, -10 }, + { 37, 16, 0 }, + { 34, 12, 0 }, + { 29, 11, -8 }, + { 29, 11, 8 }, + { 37, 16, 0 }, + { 30, 18, 9 }, + { 30, 18, 9 }, + { 37, 16, 0 }, + { 30, 24, 9 }, + { 8, 12, -29 }, + { 0, 12, -34 }, + { 0, 17, -37 }, + { 0, 17, -37 }, + { 10, 18, -30 }, + { 10, 18, -30 }, + { 0, 17, -37 }, + { 0, 22, -36 }, + { 9, 25, -30 }, + { -9, 25, -30 }, + { 0, 17, -37 }, + { -9, 18, -30 }, + { -9, 18, -30 }, + { 0, 17, -37 }, + { -7, 12, -29 }, + { -30, 18, -10 }, + { -37, 16, 0 }, + { -36, 22, 0 }, + { -36, 22, 0 }, + { -30, 24, -9 }, + { -29, 11, -7 }, + { -34, 12, 0 }, + { -37, 16, 0 }, + { -30, 18, -10 }, + { -30, 24, 9 }, + { -37, 16, 0 }, + { -30, 18, 10 }, + { -30, 18, 10 }, + { -37, 16, 0 }, + { -29, 11, 8 }, + { -9, 18, 30 }, + { 0, 16, 37 }, + { 0, 22, 36 }, + { -9, 24, 30 }, + { -8, 11, 29 }, + { 0, 12, 34 }, + { 0, 16, 37 }, + { -9, 18, 30 }, + { 10, 18, 30 }, + { 0, 16, 37 }, + { 8, 11, 29 }, + { 10, 18, 30 }, + { 14, 19, 22 }, + { 11, 24, 20 }, + { 9, 24, 30 }, + { -20, 13, -11 }, + { -11, 10, -9 }, + { -9, 10, 11 }, + { -20, 13, 11 }, + { -10, 13, 20 }, + { -9, 10, 11 }, + { 11, 10, 10 }, + { 11, 13, 20 }, + { 29, 11, -8 }, + { 34, 12, 0 }, + { 29, 11, 8 }, + { 30, 24, 9 }, + { 36, 22, 0 }, + { 30, 24, -9 }, + { 9, 25, -30 }, + { 0, 22, -36 }, + { -9, 25, -30 }, + { -11, 12, -24 }, + { -14, 19, -22 }, + { -9, 18, -30 }, + { -7, 12, -29 }, + { 11, 13, -20 }, + { 10, 10, -12 }, + { -11, 10, -9 }, + { -10, 13, -20 }, + { -9, 10, 11 }, + { -11, 10, -9 }, + { 0, 0, 0 }, + { -8, 24, 4 }, + { -8, 24, -5 }, + { -10, 20, -6 }, + { -10, 20, 5 }, + { -5, 24, 8 }, + { -6, 20, 10 }, + { 4, 24, 8 }, + { 4, 24, 8 }, + { 6, 20, 10 }, + { 8, 24, 5 }, + { 4, 24, 8 }, + { 6, 20, 10 }, + { 10, 20, 5 }, + { 8, 24, -5 }, + { 10, 20, -6 }, + { 4, 24, -8 }, + { 5, 20, -10 }, + { -5, 24, -8 }, + { -5, 20, -10 }, + { -11, 20, 13 }, + { -12, 24, 20 }, + { 11, 24, 20 }, + { 11, 20, 13 }, + { 13, 20, -11 }, + { 11, 18, -9 }, + { 10, 20, -6 }, + { 10, 20, 5 }, + { 9, 18, 11 }, + { 13, 20, 11 }, + { 11, 21, -13 }, + { 11, 24, -20 }, + { -12, 24, -20 }, + { -11, 21, -13 }, + { -13, 20, -11 }, + { -20, 24, -12 }, + { -20, 24, 11 }, + { -13, 20, 11 }, + { -7, 12, -29 }, + { 0, 12, -34 }, + { 8, 12, -29 }, + { -11, 12, -24 }, + { 11, 12, -24 }, + { 8, 11, 29 }, + { 0, 12, 34 }, + { -8, 11, 29 }, + { 11, 12, 24 }, + { -11, 12, 24 }, + { -29, 11, 8 }, + { -34, 12, 0 }, + { -29, 11, -7 }, + { -24, 12, 11 }, + { -24, 12, 11 }, + { -29, 11, -7 }, + { -24, 12, -11 }, + { 20, 13, 11 }, + { 11, 10, 10 }, + { 10, 10, -12 }, + { 20, 13, -11 }, + { 24, 12, -11 }, + { 29, 11, -8 }, + { 29, 11, 8 }, + { 24, 12, 11 }, + { 16, 17, 14 }, + { 22, 19, 14 }, + { 20, 24, 12 }, + { 13, 20, 11 }, + { 16, 17, 14 }, + { 12, 16, 13 }, + { 20, 24, -11 }, + { 13, 20, -11 }, + { 16, 17, -14 }, + { 13, 16, -12 }, + { 11, 18, -9 }, + { 16, 17, -14 }, + { 22, 19, -14 }, + { 30, 24, -9 }, + { 30, 24, 9 }, + { 14, 18, -16 }, + { 14, 19, -22 }, + { 11, 24, -20 }, + { 11, 21, -13 }, + { 14, 18, -16 }, + { 13, 16, -12 }, + { 10, 10, -12 }, + { 11, 13, -20 }, + { -10, 13, -20 }, + { -11, 12, -24 }, + { 11, 12, -24 }, + { -11, 21, -13 }, + { -11, 18, -9 }, + { -5, 20, -10 }, + { 5, 20, -10 }, + { 11, 18, -9 }, + { 11, 21, -13 }, + { -13, 18, -16 }, + { -12, 16, -12 }, + { -11, 18, -9 }, + { -13, 18, -16 }, + { -14, 19, -22 }, + { -16, 17, -14 }, + { -22, 19, -14 }, + { -20, 24, -12 }, + { -13, 20, -11 }, + { -16, 17, -14 }, + { -12, 16, -12 }, + { -11, 10, -9 }, + { -20, 13, -11 }, + { -13, 20, 11 }, + { -11, 18, 9 }, + { -10, 20, 5 }, + { -10, 20, -6 }, + { -16, 17, 14 }, + { -13, 16, 12 }, + { -16, 17, 14 }, + { -22, 19, 14 }, + { -24, 12, 11 }, + { -20, 13, 11 }, + { -24, 12, -11 }, + { -20, 13, -11 }, + { -13, 17, 16 }, + { -14, 19, 22 }, + { -12, 24, 20 }, + { -11, 20, 13 }, + { -13, 17, 16 }, + { -13, 16, 12 }, + { -9, 10, 11 }, + { -10, 13, 20 }, + { 11, 13, 20 }, + { 11, 12, 24 }, + { -11, 12, 24 }, + { 11, 20, 13 }, + { 9, 18, 11 }, + { 6, 20, 10 }, + { -6, 20, 10 }, + { -11, 18, 9 }, + { 14, 17, 16 }, + { 12, 16, 13 }, + { 14, 17, 16 }, + { 14, 19, 22 }, + { 9, 24, 30 }, + { 11, 24, 20 }, + { -9, 24, 30 }, + { -9, 25, -30 }, + { -12, 24, -20 }, + { 11, 24, -20 }, + { -9, 25, -30 }, + { 11, 24, -20 }, + { 9, 25, -30 }, + { -30, 24, 9 }, + { -20, 24, 11 }, + { -20, 24, -12 }, + { -30, 24, -9 }, + { 10, 10, -12 }, + { 11, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 11, 10, 10 }, + { -9, 10, 11 }, + { 0, 0, 0 }, + { -11, 10, -9 }, + { 10, 10, -12 }, + { -5, 24, 8 }, + { 4, 24, 8 }, + { 8, 24, 5 }, + { -8, 24, 4 }, + { 8, 24, -5 }, + { -8, 24, -5 }, + { 4, 24, -8 }, + { -5, 24, -8 }, + { 10, 20, -6 }, + { 11, 18, -9 }, + { 5, 20, -9 }, + { 8, 18, 31 }, + { 11, 16, 25 }, + { 13, 22, 21 }, + { 10, 24, 29 }, + { -31, 18, 8 }, + { -25, 16, 11 }, + { -21, 22, 14 }, + { -29, 24, 9 }, + { 9, 30, -24 }, + { 11, 26, -17 }, + { 14, 22, -21 }, + { 10, 25, -28 }, + { 31, 18, -8 }, + { 25, 16, -11 }, + { 21, 22, -14 }, + { 29, 24, -10 }, + { -10, 15, 20 }, + { -11, 16, 25 }, + { -14, 22, 21 }, + { -13, 18, 15 }, + { -20, 15, 11 }, + { -9, 10, 12 }, + { -13, 16, 12 }, + { -15, 18, 14 }, + { -20, 15, -11 }, + { -25, 16, -11 }, + { -21, 22, -14 }, + { -15, 18, -14 }, + { -10, 15, -20 }, + { -12, 10, -9 }, + { -13, 16, -12 }, + { -14, 19, -15 }, + { 11, 15, -20 }, + { 11, 17, -25 }, + { 14, 22, -21 }, + { 14, 19, -15 }, + { 20, 15, -11 }, + { 10, 10, -12 }, + { 13, 16, -12 }, + { 15, 18, -14 }, + { 20, 15, 11 }, + { 25, 16, 11 }, + { 21, 22, 14 }, + { 15, 18, 14 }, + { 11, 15, 20 }, + { 12, 10, 10 }, + { 12, 16, 13 }, + { 14, 18, 15 }, + { -9, 29, 25 }, + { -12, 26, 18 }, + { -14, 22, 21 }, + { -10, 24, 29 }, + { 11, 20, 12 }, + { 11, 26, 18 }, + { 13, 22, 21 }, + { 14, 18, 15 }, + { -11, 20, 12 }, + { -11, 18, 9 }, + { -13, 16, 12 }, + { -13, 18, 15 }, + { 12, 20, 11 }, + { 9, 18, 11 }, + { 12, 16, 13 }, + { 15, 18, 14 }, + { 25, 29, 9 }, + { 18, 26, 12 }, + { 21, 22, 14 }, + { 29, 24, 9 }, + { 12, 20, -11 }, + { 18, 26, -11 }, + { 21, 22, -14 }, + { 15, 18, -14 }, + { 11, 21, -11 }, + { 11, 18, -9 }, + { 13, 16, -12 }, + { 14, 19, -15 }, + { -11, 21, -11 }, + { -12, 26, -17 }, + { -14, 22, -21 }, + { -14, 19, -15 }, + { -12, 20, -11 }, + { -11, 18, -9 }, + { -13, 16, -12 }, + { -15, 18, -14 }, + { -25, 29, -9 }, + { -18, 26, -12 }, + { -21, 22, -14 }, + { -29, 24, -10 }, + { -12, 20, 11 }, + { -18, 26, 11 }, + { -21, 22, 14 }, + { -15, 18, 14 }, + { 8, 29, 25 }, + { 0, 30, 31 }, + { 0, 26, 35 }, + { 10, 24, 29 }, + { -10, 24, 29 }, + { -14, 22, 21 }, + { -11, 16, 25 }, + { -8, 18, 31 }, + { 29, 24, -10 }, + { 21, 22, -14 }, + { 18, 26, -11 }, + { 25, 29, -9 }, + { 29, 24, 9 }, + { 21, 22, 14 }, + { 25, 16, 11 }, + { 31, 18, 7 }, + { -10, 25, -28 }, + { -14, 22, -21 }, + { -12, 26, -17 }, + { -9, 30, -24 }, + { 10, 25, -28 }, + { 14, 22, -21 }, + { 11, 17, -25 }, + { 8, 19, -31 }, + { -29, 24, 9 }, + { -21, 22, 14 }, + { -18, 26, 11 }, + { -25, 29, 8 }, + { -29, 24, -10 }, + { -21, 22, -14 }, + { -25, 16, -11 }, + { -31, 18, -8 }, + { -25, 29, -9 }, + { -31, 30, 0 }, + { -25, 29, 8 }, + { -10, 20, 5 }, + { -11, 18, 9 }, + { -6, 20, 10 }, + { -6, 20, -9 }, + { -11, 18, -9 }, + { -10, 20, -6 }, + { 6, 20, 10 }, + { 9, 18, 11 }, + { 10, 20, 5 }, + { -6, 20, -9 }, + { -10, 20, -6 }, + { -7, 23, -5 }, + { -5, 23, -6 }, + { 25, 29, -9 }, + { 31, 30, 0 }, + { 35, 26, 0 }, + { 29, 24, -10 }, + { 29, 24, -10 }, + { 35, 26, 0 }, + { 35, 21, 0 }, + { 31, 18, -8 }, + { 31, 18, 7 }, + { 35, 26, 0 }, + { 29, 24, 9 }, + { 29, 24, 9 }, + { 35, 26, 0 }, + { 25, 29, 9 }, + { 8, 19, -31 }, + { 0, 23, -35 }, + { 0, 28, -35 }, + { 0, 28, -35 }, + { 10, 25, -28 }, + { 10, 25, -28 }, + { 0, 28, -35 }, + { 0, 32, -30 }, + { 9, 30, -24 }, + { -9, 30, -24 }, + { 0, 28, -35 }, + { -10, 25, -28 }, + { -10, 25, -28 }, + { 0, 28, -35 }, + { -8, 19, -31 }, + { -29, 24, -10 }, + { -35, 26, 0 }, + { -31, 30, 0 }, + { -31, 30, 0 }, + { -25, 29, -9 }, + { -31, 18, -8 }, + { -35, 21, 0 }, + { -35, 26, 0 }, + { -29, 24, -10 }, + { -25, 29, 8 }, + { -35, 26, 0 }, + { -29, 24, 9 }, + { -29, 24, 9 }, + { -35, 26, 0 }, + { -31, 18, 8 }, + { -10, 24, 29 }, + { 0, 26, 35 }, + { 0, 30, 31 }, + { -9, 29, 25 }, + { -8, 18, 31 }, + { 0, 21, 35 }, + { 0, 26, 35 }, + { -10, 24, 29 }, + { 10, 24, 29 }, + { 0, 26, 35 }, + { 8, 18, 31 }, + { 10, 24, 29 }, + { 13, 22, 21 }, + { 11, 26, 18 }, + { 8, 29, 25 }, + { -20, 15, -11 }, + { -12, 10, -9 }, + { -9, 10, 12 }, + { -20, 15, 11 }, + { -10, 15, 20 }, + { -9, 10, 12 }, + { 12, 10, 10 }, + { 11, 15, 20 }, + { 31, 18, -8 }, + { 35, 21, 0 }, + { 31, 18, 7 }, + { 25, 29, 9 }, + { 31, 30, 0 }, + { 25, 29, -9 }, + { 9, 30, -24 }, + { 0, 32, -30 }, + { -9, 30, -24 }, + { -10, 17, -25 }, + { -14, 22, -21 }, + { -10, 25, -28 }, + { -8, 19, -31 }, + { 11, 15, -20 }, + { 10, 10, -12 }, + { -12, 10, -9 }, + { -10, 15, -20 }, + { -9, 10, 12 }, + { -12, 10, -9 }, + { 0, 0, 0 }, + { -7, 23, 4 }, + { -7, 23, -5 }, + { -10, 20, -6 }, + { -10, 20, 5 }, + { -5, 23, 7 }, + { -6, 20, 10 }, + { 5, 23, 7 }, + { 5, 23, 7 }, + { 6, 20, 10 }, + { 7, 23, 5 }, + { 5, 23, 7 }, + { 6, 20, 10 }, + { 10, 20, 5 }, + { 7, 23, -5 }, + { 10, 20, -6 }, + { 4, 23, -6 }, + { 5, 20, -9 }, + { -5, 23, -6 }, + { -6, 20, -9 }, + { -11, 20, 12 }, + { -12, 26, 18 }, + { 11, 26, 18 }, + { 11, 20, 12 }, + { 12, 20, -11 }, + { 11, 18, -9 }, + { 10, 20, -6 }, + { 10, 20, 5 }, + { 9, 18, 11 }, + { 12, 20, 11 }, + { 11, 21, -11 }, + { 11, 26, -17 }, + { -12, 26, -17 }, + { -11, 21, -11 }, + { -12, 20, -11 }, + { -18, 26, -12 }, + { -18, 26, 11 }, + { -12, 20, 11 }, + { -8, 19, -31 }, + { 0, 23, -35 }, + { 8, 19, -31 }, + { -10, 17, -25 }, + { 11, 17, -25 }, + { 8, 18, 31 }, + { 0, 21, 35 }, + { -8, 18, 31 }, + { 11, 16, 25 }, + { -11, 16, 25 }, + { -31, 18, 8 }, + { -35, 21, 0 }, + { -31, 18, -8 }, + { -25, 16, 11 }, + { -25, 16, 11 }, + { -31, 18, -8 }, + { -25, 16, -11 }, + { 20, 15, 11 }, + { 12, 10, 10 }, + { 10, 10, -12 }, + { 20, 15, -11 }, + { 25, 16, -11 }, + { 31, 18, -8 }, + { 31, 18, 7 }, + { 25, 16, 11 }, + { 15, 18, 14 }, + { 21, 22, 14 }, + { 18, 26, 12 }, + { 12, 20, 11 }, + { 15, 18, 14 }, + { 12, 16, 13 }, + { 18, 26, -11 }, + { 12, 20, -11 }, + { 15, 18, -14 }, + { 13, 16, -12 }, + { 11, 18, -9 }, + { 15, 18, -14 }, + { 21, 22, -14 }, + { 25, 29, -9 }, + { 25, 29, 9 }, + { 14, 19, -15 }, + { 14, 22, -21 }, + { 11, 26, -17 }, + { 11, 21, -11 }, + { 14, 19, -15 }, + { 13, 16, -12 }, + { 10, 10, -12 }, + { 11, 15, -20 }, + { -10, 15, -20 }, + { -10, 17, -25 }, + { 11, 17, -25 }, + { -11, 21, -11 }, + { -11, 18, -9 }, + { -6, 20, -9 }, + { 5, 20, -9 }, + { 11, 18, -9 }, + { 11, 21, -11 }, + { -14, 19, -15 }, + { -13, 16, -12 }, + { -11, 18, -9 }, + { -14, 19, -15 }, + { -14, 22, -21 }, + { -15, 18, -14 }, + { -21, 22, -14 }, + { -18, 26, -12 }, + { -12, 20, -11 }, + { -15, 18, -14 }, + { -13, 16, -12 }, + { -12, 10, -9 }, + { -20, 15, -11 }, + { -12, 20, 11 }, + { -11, 18, 9 }, + { -10, 20, 5 }, + { -10, 20, -6 }, + { -15, 18, 14 }, + { -13, 16, 12 }, + { -15, 18, 14 }, + { -21, 22, 14 }, + { -25, 16, 11 }, + { -20, 15, 11 }, + { -25, 16, -11 }, + { -20, 15, -11 }, + { -13, 18, 15 }, + { -14, 22, 21 }, + { -12, 26, 18 }, + { -11, 20, 12 }, + { -13, 18, 15 }, + { -13, 16, 12 }, + { -9, 10, 12 }, + { -10, 15, 20 }, + { 11, 15, 20 }, + { 11, 16, 25 }, + { -11, 16, 25 }, + { 11, 20, 12 }, + { 9, 18, 11 }, + { 6, 20, 10 }, + { -6, 20, 10 }, + { -11, 18, 9 }, + { 14, 18, 15 }, + { 12, 16, 13 }, + { 14, 18, 15 }, + { 13, 22, 21 }, + { 8, 29, 25 }, + { 11, 26, 18 }, + { -9, 29, 25 }, + { -9, 30, -24 }, + { -12, 26, -17 }, + { 11, 26, -17 }, + { -9, 30, -24 }, + { 11, 26, -17 }, + { 9, 30, -24 }, + { -25, 29, 8 }, + { -18, 26, 11 }, + { -18, 26, -12 }, + { -25, 29, -9 }, + { 10, 10, -12 }, + { 12, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 12, 10, 10 }, + { -9, 10, 12 }, + { 0, 0, 0 }, + { -12, 10, -9 }, + { 10, 10, -12 }, + { -5, 23, 7 }, + { 5, 23, 7 }, + { 7, 23, 5 }, + { -7, 23, 4 }, + { 7, 23, -5 }, + { -7, 23, -5 }, + { 4, 23, -6 }, + { -5, 23, -6 }, + { 9, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -9 }, + { 8, 25, 30 }, + { 11, 20, 25 }, + { 14, 24, 19 }, + { 10, 30, 25 }, + { -30, 25, 7 }, + { -25, 20, 11 }, + { -19, 24, 13 }, + { -25, 30, 9 }, + { 8, 33, -17 }, + { 11, 27, -14 }, + { 14, 25, -18 }, + { 9, 31, -24 }, + { 30, 25, -8 }, + { 25, 20, -11 }, + { 19, 24, -14 }, + { 25, 30, -10 }, + { -11, 17, 20 }, + { -10, 20, 25 }, + { -14, 24, 19 }, + { -14, 19, 14 }, + { -20, 17, 11 }, + { -9, 10, 12 }, + { -13, 16, 12 }, + { -14, 19, 13 }, + { -20, 17, -11 }, + { -25, 20, -11 }, + { -19, 24, -14 }, + { -14, 19, -14 }, + { -11, 18, -20 }, + { -12, 10, -9 }, + { -13, 16, -12 }, + { -14, 20, -14 }, + { 11, 18, -20 }, + { 11, 22, -25 }, + { 14, 25, -18 }, + { 13, 20, -14 }, + { 20, 17, -11 }, + { 10, 11, -13 }, + { 13, 16, -12 }, + { 14, 19, -14 }, + { 20, 17, 11 }, + { 25, 20, 10 }, + { 19, 24, 14 }, + { 14, 19, 14 }, + { 11, 17, 20 }, + { 12, 10, 10 }, + { 12, 16, 13 }, + { 14, 19, 14 }, + { -9, 32, 19 }, + { -12, 27, 15 }, + { -14, 24, 19 }, + { -10, 30, 25 }, + { 10, 20, 10 }, + { 11, 27, 15 }, + { 14, 24, 19 }, + { 14, 19, 14 }, + { -11, 20, 10 }, + { -11, 18, 9 }, + { -13, 16, 12 }, + { -14, 19, 14 }, + { 10, 20, 11 }, + { 9, 18, 11 }, + { 12, 16, 13 }, + { 14, 19, 14 }, + { 19, 32, 9 }, + { 15, 27, 12 }, + { 19, 24, 14 }, + { 25, 30, 9 }, + { 10, 20, -11 }, + { 15, 27, -11 }, + { 19, 24, -14 }, + { 14, 19, -14 }, + { 10, 20, -10 }, + { 11, 17, -8 }, + { 13, 16, -12 }, + { 13, 20, -14 }, + { -11, 20, -10 }, + { -12, 27, -14 }, + { -14, 25, -18 }, + { -14, 20, -14 }, + { -10, 20, -11 }, + { -11, 17, -8 }, + { -13, 16, -12 }, + { -14, 19, -14 }, + { -19, 32, -9 }, + { -15, 27, -12 }, + { -19, 24, -14 }, + { -25, 30, -10 }, + { -10, 20, 10 }, + { -15, 27, 11 }, + { -19, 24, 13 }, + { -14, 19, 13 }, + { 8, 32, 19 }, + { 0, 36, 24 }, + { 0, 35, 29 }, + { 10, 30, 25 }, + { -10, 30, 25 }, + { -14, 24, 19 }, + { -10, 20, 25 }, + { -8, 25, 30 }, + { 25, 30, -10 }, + { 19, 24, -14 }, + { 15, 27, -11 }, + { 19, 32, -9 }, + { 25, 30, 9 }, + { 19, 24, 14 }, + { 25, 20, 10 }, + { 30, 25, 7 }, + { -10, 31, -24 }, + { -14, 25, -18 }, + { -12, 27, -14 }, + { -9, 33, -17 }, + { 9, 31, -24 }, + { 14, 25, -18 }, + { 11, 22, -25 }, + { 7, 27, -29 }, + { -25, 30, 9 }, + { -19, 24, 13 }, + { -15, 27, 11 }, + { -19, 32, 8 }, + { -25, 30, -10 }, + { -19, 24, -14 }, + { -25, 20, -11 }, + { -30, 25, -8 }, + { -19, 32, -9 }, + { -24, 36, 0 }, + { -19, 32, 8 }, + { -9, 20, 5 }, + { -11, 18, 9 }, + { -6, 20, 9 }, + { -5, 20, -9 }, + { -11, 17, -8 }, + { -9, 20, -6 }, + { 6, 20, 9 }, + { 9, 18, 11 }, + { 9, 20, 5 }, + { -5, 20, -9 }, + { -9, 20, -6 }, + { -6, 23, -5 }, + { -5, 23, -5 }, + { 19, 32, -9 }, + { 24, 36, 0 }, + { 29, 35, 0 }, + { 25, 30, -10 }, + { 25, 30, -10 }, + { 29, 35, 0 }, + { 32, 31, 0 }, + { 30, 25, -8 }, + { 30, 25, 7 }, + { 29, 35, 0 }, + { 25, 30, 9 }, + { 25, 30, 9 }, + { 29, 35, 0 }, + { 19, 32, 9 }, + { 7, 27, -29 }, + { 0, 33, -31 }, + { 0, 37, -27 }, + { 0, 37, -27 }, + { 9, 31, -24 }, + { 9, 31, -24 }, + { 0, 37, -27 }, + { 0, 37, -21 }, + { 8, 33, -17 }, + { -9, 33, -17 }, + { 0, 37, -27 }, + { -10, 31, -24 }, + { -10, 31, -24 }, + { 0, 37, -27 }, + { -8, 27, -29 }, + { -25, 30, -10 }, + { -29, 35, 0 }, + { -24, 36, 0 }, + { -24, 36, 0 }, + { -19, 32, -9 }, + { -30, 25, -8 }, + { -32, 31, 0 }, + { -29, 35, 0 }, + { -25, 30, -10 }, + { -19, 32, 8 }, + { -29, 35, 0 }, + { -25, 30, 9 }, + { -25, 30, 9 }, + { -29, 35, 0 }, + { -30, 25, 7 }, + { -10, 30, 25 }, + { 0, 35, 29 }, + { 0, 36, 24 }, + { -9, 32, 19 }, + { -8, 25, 30 }, + { 0, 31, 32 }, + { 0, 35, 29 }, + { -10, 30, 25 }, + { 10, 30, 25 }, + { 0, 35, 29 }, + { 8, 25, 30 }, + { 10, 30, 25 }, + { 14, 24, 19 }, + { 11, 27, 15 }, + { 8, 32, 19 }, + { -20, 17, -11 }, + { -12, 10, -9 }, + { -9, 10, 12 }, + { -20, 17, 11 }, + { -11, 17, 20 }, + { -9, 10, 12 }, + { 12, 10, 10 }, + { 11, 17, 20 }, + { 30, 25, -8 }, + { 32, 31, 0 }, + { 30, 25, 7 }, + { 19, 32, 9 }, + { 24, 36, 0 }, + { 19, 32, -9 }, + { 8, 33, -17 }, + { 0, 37, -21 }, + { -9, 33, -17 }, + { -11, 22, -25 }, + { -14, 25, -18 }, + { -10, 31, -24 }, + { -8, 27, -29 }, + { 11, 18, -20 }, + { 10, 11, -13 }, + { -12, 10, -9 }, + { -11, 18, -20 }, + { -9, 10, 12 }, + { -12, 10, -9 }, + { 0, 0, 0 }, + { -6, 23, 4 }, + { -6, 23, -5 }, + { -9, 20, -6 }, + { -9, 20, 5 }, + { -5, 23, 6 }, + { -6, 20, 9 }, + { 4, 23, 6 }, + { 4, 23, 6 }, + { 6, 20, 9 }, + { 6, 23, 5 }, + { 4, 23, 6 }, + { 6, 20, 9 }, + { 9, 20, 5 }, + { 6, 23, -5 }, + { 9, 20, -6 }, + { 4, 23, -5 }, + { 5, 20, -9 }, + { -5, 23, -5 }, + { -5, 20, -9 }, + { -11, 20, 10 }, + { -12, 27, 15 }, + { 11, 27, 15 }, + { 10, 20, 10 }, + { 10, 20, -11 }, + { 11, 17, -8 }, + { 9, 20, -6 }, + { 9, 20, 5 }, + { 9, 18, 11 }, + { 10, 20, 11 }, + { 10, 20, -10 }, + { 11, 27, -14 }, + { -12, 27, -14 }, + { -11, 20, -10 }, + { -10, 20, -11 }, + { -15, 27, -12 }, + { -15, 27, 11 }, + { -10, 20, 10 }, + { -8, 27, -29 }, + { 0, 33, -31 }, + { 7, 27, -29 }, + { -11, 22, -25 }, + { 11, 22, -25 }, + { 8, 25, 30 }, + { 0, 31, 32 }, + { -8, 25, 30 }, + { 11, 20, 25 }, + { -10, 20, 25 }, + { -30, 25, 7 }, + { -32, 31, 0 }, + { -30, 25, -8 }, + { -25, 20, 11 }, + { -25, 20, 11 }, + { -30, 25, -8 }, + { -25, 20, -11 }, + { 20, 17, 11 }, + { 12, 10, 10 }, + { 10, 11, -13 }, + { 20, 17, -11 }, + { 25, 20, -11 }, + { 30, 25, -8 }, + { 30, 25, 7 }, + { 25, 20, 10 }, + { 14, 19, 14 }, + { 19, 24, 14 }, + { 15, 27, 12 }, + { 10, 20, 11 }, + { 14, 19, 14 }, + { 12, 16, 13 }, + { 15, 27, -11 }, + { 10, 20, -11 }, + { 14, 19, -14 }, + { 13, 16, -12 }, + { 11, 17, -8 }, + { 14, 19, -14 }, + { 19, 24, -14 }, + { 19, 32, -9 }, + { 19, 32, 9 }, + { 13, 20, -14 }, + { 14, 25, -18 }, + { 11, 27, -14 }, + { 10, 20, -10 }, + { 13, 20, -14 }, + { 13, 16, -12 }, + { 10, 11, -13 }, + { 11, 18, -20 }, + { -11, 18, -20 }, + { -11, 22, -25 }, + { 11, 22, -25 }, + { -11, 20, -10 }, + { -11, 17, -8 }, + { -5, 20, -9 }, + { 5, 20, -9 }, + { 11, 17, -8 }, + { 10, 20, -10 }, + { -14, 20, -14 }, + { -13, 16, -12 }, + { -11, 17, -8 }, + { -14, 20, -14 }, + { -14, 25, -18 }, + { -14, 19, -14 }, + { -19, 24, -14 }, + { -15, 27, -12 }, + { -10, 20, -11 }, + { -14, 19, -14 }, + { -13, 16, -12 }, + { -12, 10, -9 }, + { -20, 17, -11 }, + { -10, 20, 10 }, + { -11, 18, 9 }, + { -9, 20, 5 }, + { -9, 20, -6 }, + { -14, 19, 13 }, + { -13, 16, 12 }, + { -14, 19, 13 }, + { -19, 24, 13 }, + { -25, 20, 11 }, + { -20, 17, 11 }, + { -25, 20, -11 }, + { -20, 17, -11 }, + { -14, 19, 14 }, + { -14, 24, 19 }, + { -12, 27, 15 }, + { -11, 20, 10 }, + { -14, 19, 14 }, + { -13, 16, 12 }, + { -9, 10, 12 }, + { -11, 17, 20 }, + { 11, 17, 20 }, + { 11, 20, 25 }, + { -10, 20, 25 }, + { 10, 20, 10 }, + { 9, 18, 11 }, + { 6, 20, 9 }, + { -6, 20, 9 }, + { -11, 18, 9 }, + { 14, 19, 14 }, + { 12, 16, 13 }, + { 14, 19, 14 }, + { 14, 24, 19 }, + { 8, 32, 19 }, + { 11, 27, 15 }, + { -9, 32, 19 }, + { -9, 33, -17 }, + { -12, 27, -14 }, + { 11, 27, -14 }, + { -9, 33, -17 }, + { 11, 27, -14 }, + { 8, 33, -17 }, + { -19, 32, 8 }, + { -15, 27, 11 }, + { -15, 27, -12 }, + { -19, 32, -9 }, + { 10, 11, -13 }, + { 12, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 12, 10, 10 }, + { -9, 10, 12 }, + { 0, 0, 0 }, + { -12, 10, -9 }, + { 10, 11, -13 }, + { -5, 23, 6 }, + { 4, 23, 6 }, + { 6, 23, 5 }, + { -6, 23, 4 }, + { 6, 23, -5 }, + { -6, 23, -5 }, + { 4, 23, -5 }, + { -5, 23, -5 }, + { 8, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -8 }, + { 7, 31, 27 }, + { 11, 25, 24 }, + { 13, 26, 17 }, + { 9, 33, 20 }, + { -27, 31, 7 }, + { -24, 25, 10 }, + { -17, 26, 13 }, + { -20, 33, 9 }, + { 8, 32, -12 }, + { 11, 27, -10 }, + { 13, 26, -16 }, + { 9, 34, -18 }, + { 27, 31, -8 }, + { 24, 25, -11 }, + { 17, 26, -14 }, + { 20, 33, -10 }, + { -11, 20, 20 }, + { -11, 25, 24 }, + { -14, 26, 17 }, + { -14, 20, 14 }, + { -20, 20, 10 }, + { -9, 11, 13 }, + { -13, 17, 12 }, + { -14, 20, 13 }, + { -20, 20, -11 }, + { -24, 25, -11 }, + { -17, 26, -14 }, + { -14, 20, -14 }, + { -11, 20, -19 }, + { -13, 11, -9 }, + { -13, 17, -12 }, + { -14, 20, -13 }, + { 11, 20, -19 }, + { 11, 26, -23 }, + { 13, 26, -16 }, + { 14, 20, -13 }, + { 20, 20, -11 }, + { 10, 11, -13 }, + { 13, 17, -12 }, + { 14, 20, -14 }, + { 20, 20, 11 }, + { 24, 25, 10 }, + { 17, 26, 14 }, + { 14, 20, 14 }, + { 11, 20, 20 }, + { 13, 11, 10 }, + { 12, 17, 13 }, + { 14, 20, 14 }, + { -9, 33, 14 }, + { -12, 27, 12 }, + { -14, 26, 17 }, + { -10, 33, 20 }, + { 10, 20, 9 }, + { 11, 27, 12 }, + { 13, 26, 17 }, + { 14, 20, 14 }, + { -11, 20, 9 }, + { -11, 17, 8 }, + { -13, 17, 12 }, + { -14, 20, 14 }, + { 9, 20, 11 }, + { 8, 17, 11 }, + { 12, 17, 13 }, + { 14, 20, 14 }, + { 14, 33, 9 }, + { 12, 27, 12 }, + { 17, 26, 14 }, + { 20, 33, 9 }, + { 9, 20, -11 }, + { 12, 27, -11 }, + { 17, 26, -14 }, + { 14, 20, -14 }, + { 10, 20, -9 }, + { 11, 17, -8 }, + { 13, 17, -12 }, + { 14, 20, -13 }, + { -11, 20, -9 }, + { -12, 27, -10 }, + { -14, 26, -16 }, + { -14, 20, -13 }, + { -9, 20, -11 }, + { -11, 17, -8 }, + { -13, 17, -12 }, + { -14, 20, -14 }, + { -14, 33, -9 }, + { -12, 27, -12 }, + { -17, 26, -14 }, + { -20, 33, -10 }, + { -9, 20, 10 }, + { -12, 27, 11 }, + { -17, 26, 13 }, + { -14, 20, 13 }, + { 8, 33, 14 }, + { 0, 37, 16 }, + { 0, 40, 21 }, + { 9, 33, 20 }, + { -10, 33, 20 }, + { -14, 26, 17 }, + { -11, 25, 24 }, + { -8, 31, 27 }, + { 20, 33, -10 }, + { 17, 26, -14 }, + { 12, 27, -11 }, + { 14, 33, -9 }, + { 20, 33, 9 }, + { 17, 26, 14 }, + { 24, 25, 10 }, + { 27, 31, 7 }, + { -10, 34, -18 }, + { -14, 26, -16 }, + { -12, 27, -10 }, + { -9, 32, -12 }, + { 9, 34, -18 }, + { 13, 26, -16 }, + { 11, 26, -23 }, + { 7, 34, -25 }, + { -20, 33, 9 }, + { -17, 26, 13 }, + { -12, 27, 11 }, + { -14, 33, 8 }, + { -20, 33, -10 }, + { -17, 26, -14 }, + { -24, 25, -11 }, + { -27, 31, -8 }, + { -14, 33, -9 }, + { -16, 37, 0 }, + { -14, 33, 8 }, + { -8, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 8 }, + { -6, 20, -8 }, + { -11, 17, -8 }, + { -8, 20, -6 }, + { 6, 20, 8 }, + { 8, 17, 11 }, + { 8, 20, 5 }, + { -6, 20, -8 }, + { -8, 20, -6 }, + { -5, 22, -5 }, + { -5, 22, -4 }, + { 14, 33, -9 }, + { 16, 37, 0 }, + { 21, 40, 0 }, + { 20, 33, -10 }, + { 20, 33, -10 }, + { 21, 40, 0 }, + { 26, 38, 0 }, + { 27, 31, -8 }, + { 27, 31, 7 }, + { 21, 40, 0 }, + { 20, 33, 9 }, + { 20, 33, 9 }, + { 21, 40, 0 }, + { 14, 33, 9 }, + { 7, 34, -25 }, + { 0, 40, -23 }, + { 0, 41, -17 }, + { 0, 41, -17 }, + { 9, 34, -18 }, + { 9, 34, -18 }, + { 0, 41, -17 }, + { 0, 37, -13 }, + { 8, 32, -12 }, + { -9, 32, -12 }, + { 0, 41, -17 }, + { -10, 34, -18 }, + { -10, 34, -18 }, + { 0, 41, -17 }, + { -8, 34, -25 }, + { -20, 33, -10 }, + { -21, 40, 0 }, + { -16, 37, 0 }, + { -16, 37, 0 }, + { -14, 33, -9 }, + { -27, 31, -8 }, + { -26, 38, 0 }, + { -21, 40, 0 }, + { -20, 33, -10 }, + { -14, 33, 8 }, + { -21, 40, 0 }, + { -20, 33, 9 }, + { -20, 33, 9 }, + { -21, 40, 0 }, + { -27, 31, 7 }, + { -10, 33, 20 }, + { 0, 40, 21 }, + { 0, 37, 16 }, + { -9, 33, 14 }, + { -8, 31, 27 }, + { 0, 38, 26 }, + { 0, 40, 21 }, + { -10, 33, 20 }, + { 9, 33, 20 }, + { 0, 40, 21 }, + { 7, 31, 27 }, + { 9, 33, 20 }, + { 13, 26, 17 }, + { 11, 27, 12 }, + { 8, 33, 14 }, + { -20, 20, -11 }, + { -13, 11, -9 }, + { -9, 11, 13 }, + { -20, 20, 10 }, + { -11, 20, 20 }, + { -9, 11, 13 }, + { 13, 11, 10 }, + { 11, 20, 20 }, + { 27, 31, -8 }, + { 26, 38, 0 }, + { 27, 31, 7 }, + { 14, 33, 9 }, + { 16, 37, 0 }, + { 14, 33, -9 }, + { 8, 32, -12 }, + { 0, 37, -13 }, + { -9, 32, -12 }, + { -11, 26, -23 }, + { -14, 26, -16 }, + { -10, 34, -18 }, + { -8, 34, -25 }, + { 11, 20, -19 }, + { 10, 11, -13 }, + { -13, 11, -9 }, + { -11, 20, -19 }, + { -9, 11, 13 }, + { -13, 11, -9 }, + { 0, 0, 0 }, + { -5, 22, 4 }, + { -5, 22, -5 }, + { -8, 20, -6 }, + { -8, 20, 5 }, + { -5, 22, 5 }, + { -6, 20, 8 }, + { 4, 22, 5 }, + { 4, 22, 5 }, + { 6, 20, 8 }, + { 5, 22, 5 }, + { 4, 22, 5 }, + { 6, 20, 8 }, + { 8, 20, 5 }, + { 5, 22, -5 }, + { 8, 20, -6 }, + { 4, 22, -4 }, + { 5, 20, -8 }, + { -5, 22, -4 }, + { -6, 20, -8 }, + { -11, 20, 9 }, + { -12, 27, 12 }, + { 11, 27, 12 }, + { 10, 20, 9 }, + { 9, 20, -11 }, + { 11, 17, -8 }, + { 8, 20, -6 }, + { 8, 20, 5 }, + { 8, 17, 11 }, + { 9, 20, 11 }, + { 10, 20, -9 }, + { 11, 27, -10 }, + { -12, 27, -10 }, + { -11, 20, -9 }, + { -9, 20, -11 }, + { -12, 27, -12 }, + { -12, 27, 11 }, + { -9, 20, 10 }, + { -8, 34, -25 }, + { 0, 40, -23 }, + { 7, 34, -25 }, + { -11, 26, -23 }, + { 11, 26, -23 }, + { 7, 31, 27 }, + { 0, 38, 26 }, + { -8, 31, 27 }, + { 11, 25, 24 }, + { -11, 25, 24 }, + { -27, 31, 7 }, + { -26, 38, 0 }, + { -27, 31, -8 }, + { -24, 25, 10 }, + { -24, 25, 10 }, + { -27, 31, -8 }, + { -24, 25, -11 }, + { 20, 20, 11 }, + { 13, 11, 10 }, + { 10, 11, -13 }, + { 20, 20, -11 }, + { 24, 25, -11 }, + { 27, 31, -8 }, + { 27, 31, 7 }, + { 24, 25, 10 }, + { 14, 20, 14 }, + { 17, 26, 14 }, + { 12, 27, 12 }, + { 9, 20, 11 }, + { 14, 20, 14 }, + { 12, 17, 13 }, + { 12, 27, -11 }, + { 9, 20, -11 }, + { 14, 20, -14 }, + { 13, 17, -12 }, + { 11, 17, -8 }, + { 14, 20, -14 }, + { 17, 26, -14 }, + { 14, 33, -9 }, + { 14, 33, 9 }, + { 14, 20, -13 }, + { 13, 26, -16 }, + { 11, 27, -10 }, + { 10, 20, -9 }, + { 14, 20, -13 }, + { 13, 17, -12 }, + { 10, 11, -13 }, + { 11, 20, -19 }, + { -11, 20, -19 }, + { -11, 26, -23 }, + { 11, 26, -23 }, + { -11, 20, -9 }, + { -11, 17, -8 }, + { -6, 20, -8 }, + { 5, 20, -8 }, + { 11, 17, -8 }, + { 10, 20, -9 }, + { -14, 20, -13 }, + { -13, 17, -12 }, + { -11, 17, -8 }, + { -14, 20, -13 }, + { -14, 26, -16 }, + { -14, 20, -14 }, + { -17, 26, -14 }, + { -12, 27, -12 }, + { -9, 20, -11 }, + { -14, 20, -14 }, + { -13, 17, -12 }, + { -13, 11, -9 }, + { -20, 20, -11 }, + { -9, 20, 10 }, + { -11, 17, 8 }, + { -8, 20, 5 }, + { -8, 20, -6 }, + { -14, 20, 13 }, + { -13, 17, 12 }, + { -14, 20, 13 }, + { -17, 26, 13 }, + { -24, 25, 10 }, + { -20, 20, 10 }, + { -24, 25, -11 }, + { -20, 20, -11 }, + { -14, 20, 14 }, + { -14, 26, 17 }, + { -12, 27, 12 }, + { -11, 20, 9 }, + { -14, 20, 14 }, + { -13, 17, 12 }, + { -9, 11, 13 }, + { -11, 20, 20 }, + { 11, 20, 20 }, + { 11, 25, 24 }, + { -11, 25, 24 }, + { 10, 20, 9 }, + { 8, 17, 11 }, + { 6, 20, 8 }, + { -6, 20, 8 }, + { -11, 17, 8 }, + { 14, 20, 14 }, + { 12, 17, 13 }, + { 14, 20, 14 }, + { 13, 26, 17 }, + { 8, 33, 14 }, + { 11, 27, 12 }, + { -9, 33, 14 }, + { -9, 32, -12 }, + { -12, 27, -10 }, + { 11, 27, -10 }, + { -9, 32, -12 }, + { 11, 27, -10 }, + { 8, 32, -12 }, + { -14, 33, 8 }, + { -12, 27, 11 }, + { -12, 27, -12 }, + { -14, 33, -9 }, + { 10, 11, -13 }, + { 13, 11, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 11, 10 }, + { -9, 11, 13 }, + { 0, 0, 0 }, + { -13, 11, -9 }, + { 10, 11, -13 }, + { -5, 22, 5 }, + { 4, 22, 5 }, + { 5, 22, 5 }, + { -5, 22, 4 }, + { 5, 22, -5 }, + { -5, 22, -5 }, + { 4, 22, -4 }, + { -5, 22, -4 }, + { 8, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -8 }, + { 7, 36, 22 }, + { 11, 28, 22 }, + { 13, 27, 14 }, + { 9, 35, 15 }, + { -22, 36, 7 }, + { -22, 28, 10 }, + { -14, 27, 13 }, + { -15, 35, 9 }, + { 8, 31, -8 }, + { 11, 27, -8 }, + { 13, 27, -13 }, + { 9, 35, -13 }, + { 22, 36, -8 }, + { 22, 28, -11 }, + { 14, 27, -14 }, + { 15, 35, -10 }, + { -11, 21, 19 }, + { -11, 28, 22 }, + { -14, 27, 14 }, + { -14, 20, 13 }, + { -19, 21, 10 }, + { -10, 11, 13 }, + { -13, 17, 12 }, + { -13, 20, 13 }, + { -19, 21, -11 }, + { -22, 28, -11 }, + { -14, 27, -14 }, + { -13, 20, -14 }, + { -11, 22, -18 }, + { -13, 11, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 22, -18 }, + { 11, 29, -21 }, + { 13, 27, -13 }, + { 14, 20, -12 }, + { 19, 21, -11 }, + { 10, 11, -13 }, + { 13, 17, -11 }, + { 13, 20, -14 }, + { 19, 21, 11 }, + { 22, 28, 10 }, + { 14, 27, 14 }, + { 13, 20, 14 }, + { 11, 21, 19 }, + { 13, 11, 10 }, + { 12, 17, 13 }, + { 14, 20, 13 }, + { -9, 32, 9 }, + { -12, 27, 9 }, + { -14, 27, 14 }, + { -10, 35, 15 }, + { 11, 19, 9 }, + { 11, 27, 9 }, + { 13, 27, 14 }, + { 14, 20, 13 }, + { -11, 19, 9 }, + { -11, 17, 8 }, + { -13, 17, 12 }, + { -14, 20, 13 }, + { 9, 19, 11 }, + { 8, 17, 11 }, + { 12, 17, 13 }, + { 13, 20, 14 }, + { 9, 32, 9 }, + { 9, 27, 12 }, + { 14, 27, 14 }, + { 15, 35, 9 }, + { 9, 19, -11 }, + { 9, 27, -11 }, + { 14, 27, -14 }, + { 13, 20, -14 }, + { 11, 19, -9 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 19, -9 }, + { -12, 27, -8 }, + { -14, 27, -13 }, + { -14, 20, -12 }, + { -9, 19, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -13, 20, -14 }, + { -9, 32, -9 }, + { -9, 27, -12 }, + { -14, 27, -14 }, + { -15, 35, -10 }, + { -9, 19, 10 }, + { -9, 27, 11 }, + { -14, 27, 13 }, + { -13, 20, 13 }, + { 8, 32, 9 }, + { 0, 36, 9 }, + { 0, 41, 12 }, + { 9, 35, 15 }, + { -10, 35, 15 }, + { -14, 27, 14 }, + { -11, 28, 22 }, + { -8, 36, 22 }, + { 15, 35, -10 }, + { 14, 27, -14 }, + { 9, 27, -11 }, + { 9, 32, -9 }, + { 15, 35, 9 }, + { 14, 27, 14 }, + { 22, 28, 10 }, + { 22, 36, 7 }, + { -10, 35, -13 }, + { -14, 27, -13 }, + { -12, 27, -8 }, + { -9, 31, -8 }, + { 9, 35, -13 }, + { 13, 27, -13 }, + { 11, 29, -21 }, + { 7, 38, -19 }, + { -15, 35, 9 }, + { -14, 27, 13 }, + { -9, 27, 11 }, + { -9, 32, 8 }, + { -15, 35, -10 }, + { -14, 27, -14 }, + { -22, 28, -11 }, + { -22, 36, -8 }, + { -9, 32, -9 }, + { -9, 36, 0 }, + { -9, 32, 8 }, + { -8, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 8 }, + { -6, 20, -8 }, + { -11, 17, -8 }, + { -8, 20, -6 }, + { 5, 20, 8 }, + { 8, 17, 11 }, + { 8, 20, 5 }, + { -6, 20, -8 }, + { -8, 20, -6 }, + { -4, 22, -5 }, + { -5, 22, -4 }, + { 9, 32, -9 }, + { 9, 36, 0 }, + { 12, 41, 0 }, + { 15, 35, -10 }, + { 15, 35, -10 }, + { 12, 41, 0 }, + { 18, 42, 0 }, + { 22, 36, -8 }, + { 22, 36, 7 }, + { 12, 41, 0 }, + { 15, 35, 9 }, + { 15, 35, 9 }, + { 12, 41, 0 }, + { 9, 32, 9 }, + { 7, 38, -19 }, + { 0, 43, -14 }, + { 0, 41, -9 }, + { 0, 41, -9 }, + { 9, 35, -13 }, + { 9, 35, -13 }, + { 0, 41, -9 }, + { 0, 35, -7 }, + { 8, 31, -8 }, + { -9, 31, -8 }, + { 0, 41, -9 }, + { -10, 35, -13 }, + { -10, 35, -13 }, + { 0, 41, -9 }, + { -8, 38, -19 }, + { -15, 35, -10 }, + { -12, 41, 0 }, + { -9, 36, 0 }, + { -9, 36, 0 }, + { -9, 32, -9 }, + { -22, 36, -8 }, + { -18, 42, 0 }, + { -12, 41, 0 }, + { -15, 35, -10 }, + { -9, 32, 8 }, + { -12, 41, 0 }, + { -15, 35, 9 }, + { -15, 35, 9 }, + { -12, 41, 0 }, + { -22, 36, 7 }, + { -10, 35, 15 }, + { 0, 41, 12 }, + { 0, 36, 9 }, + { -9, 32, 9 }, + { -8, 36, 22 }, + { 0, 42, 18 }, + { 0, 41, 12 }, + { -10, 35, 15 }, + { 9, 35, 15 }, + { 0, 41, 12 }, + { 7, 36, 22 }, + { 9, 35, 15 }, + { 13, 27, 14 }, + { 11, 27, 9 }, + { 8, 32, 9 }, + { -19, 21, -11 }, + { -13, 11, -9 }, + { -10, 11, 13 }, + { -19, 21, 10 }, + { -11, 21, 19 }, + { -10, 11, 13 }, + { 13, 11, 10 }, + { 11, 21, 19 }, + { 22, 36, -8 }, + { 18, 42, 0 }, + { 22, 36, 7 }, + { 9, 32, 9 }, + { 9, 36, 0 }, + { 9, 32, -9 }, + { 8, 31, -8 }, + { 0, 35, -7 }, + { -9, 31, -8 }, + { -11, 29, -21 }, + { -14, 27, -13 }, + { -10, 35, -13 }, + { -8, 38, -19 }, + { 11, 22, -18 }, + { 10, 11, -13 }, + { -13, 11, -9 }, + { -11, 22, -18 }, + { -10, 11, 13 }, + { -13, 11, -9 }, + { 0, 0, 0 }, + { -4, 22, 4 }, + { -4, 22, -5 }, + { -8, 20, -6 }, + { -8, 20, 5 }, + { -5, 22, 4 }, + { -6, 20, 8 }, + { 4, 22, 4 }, + { 4, 22, 4 }, + { 5, 20, 8 }, + { 4, 22, 5 }, + { 4, 22, 4 }, + { 5, 20, 8 }, + { 8, 20, 5 }, + { 4, 22, -5 }, + { 8, 20, -6 }, + { 4, 22, -4 }, + { 5, 20, -8 }, + { -5, 22, -4 }, + { -6, 20, -8 }, + { -11, 19, 9 }, + { -12, 27, 9 }, + { 11, 27, 9 }, + { 11, 19, 9 }, + { 9, 19, -11 }, + { 11, 17, -8 }, + { 8, 20, -6 }, + { 8, 20, 5 }, + { 8, 17, 11 }, + { 9, 19, 11 }, + { 11, 19, -9 }, + { 11, 27, -8 }, + { -12, 27, -8 }, + { -11, 19, -9 }, + { -9, 19, -11 }, + { -9, 27, -12 }, + { -9, 27, 11 }, + { -9, 19, 10 }, + { -8, 38, -19 }, + { 0, 43, -14 }, + { 7, 38, -19 }, + { -11, 29, -21 }, + { 11, 29, -21 }, + { 7, 36, 22 }, + { 0, 42, 18 }, + { -8, 36, 22 }, + { 11, 28, 22 }, + { -11, 28, 22 }, + { -22, 36, 7 }, + { -18, 42, 0 }, + { -22, 36, -8 }, + { -22, 28, 10 }, + { -22, 28, 10 }, + { -22, 36, -8 }, + { -22, 28, -11 }, + { 19, 21, 11 }, + { 13, 11, 10 }, + { 10, 11, -13 }, + { 19, 21, -11 }, + { 22, 28, -11 }, + { 22, 36, -8 }, + { 22, 36, 7 }, + { 22, 28, 10 }, + { 13, 20, 14 }, + { 14, 27, 14 }, + { 9, 27, 12 }, + { 9, 19, 11 }, + { 13, 20, 14 }, + { 12, 17, 13 }, + { 9, 27, -11 }, + { 9, 19, -11 }, + { 13, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 13, 20, -14 }, + { 14, 27, -14 }, + { 9, 32, -9 }, + { 9, 32, 9 }, + { 14, 20, -12 }, + { 13, 27, -13 }, + { 11, 27, -8 }, + { 11, 19, -9 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 11, -13 }, + { 11, 22, -18 }, + { -11, 22, -18 }, + { -11, 29, -21 }, + { 11, 29, -21 }, + { -11, 19, -9 }, + { -11, 17, -8 }, + { -6, 20, -8 }, + { 5, 20, -8 }, + { 11, 17, -8 }, + { 11, 19, -9 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -13 }, + { -13, 20, -14 }, + { -14, 27, -14 }, + { -9, 27, -12 }, + { -9, 19, -11 }, + { -13, 20, -14 }, + { -13, 17, -11 }, + { -13, 11, -9 }, + { -19, 21, -11 }, + { -9, 19, 10 }, + { -11, 17, 8 }, + { -8, 20, 5 }, + { -8, 20, -6 }, + { -13, 20, 13 }, + { -13, 17, 12 }, + { -13, 20, 13 }, + { -14, 27, 13 }, + { -22, 28, 10 }, + { -19, 21, 10 }, + { -22, 28, -11 }, + { -19, 21, -11 }, + { -14, 20, 13 }, + { -14, 27, 14 }, + { -12, 27, 9 }, + { -11, 19, 9 }, + { -14, 20, 13 }, + { -13, 17, 12 }, + { -10, 11, 13 }, + { -11, 21, 19 }, + { 11, 21, 19 }, + { 11, 28, 22 }, + { -11, 28, 22 }, + { 11, 19, 9 }, + { 8, 17, 11 }, + { 5, 20, 8 }, + { -6, 20, 8 }, + { -11, 17, 8 }, + { 14, 20, 13 }, + { 12, 17, 13 }, + { 14, 20, 13 }, + { 13, 27, 14 }, + { 8, 32, 9 }, + { 11, 27, 9 }, + { -9, 32, 9 }, + { -9, 31, -8 }, + { -12, 27, -8 }, + { 11, 27, -8 }, + { -9, 31, -8 }, + { 11, 27, -8 }, + { 8, 31, -8 }, + { -9, 32, 8 }, + { -9, 27, 11 }, + { -9, 27, -12 }, + { -9, 32, -9 }, + { 10, 11, -13 }, + { 13, 11, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 11, 10 }, + { -10, 11, 13 }, + { 0, 0, 0 }, + { -13, 11, -9 }, + { 10, 11, -13 }, + { -5, 22, 4 }, + { 4, 22, 4 }, + { 4, 22, 5 }, + { -4, 22, 4 }, + { 4, 22, -5 }, + { -4, 22, -5 }, + { 4, 22, -4 }, + { -5, 22, -4 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 17 }, + { 10, 30, 19 }, + { 13, 27, 12 }, + { 9, 35, 11 }, + { -17, 39, 7 }, + { -19, 30, 10 }, + { -12, 27, 13 }, + { -11, 35, 9 }, + { 8, 29, -6 }, + { 11, 26, -6 }, + { 13, 27, -12 }, + { 9, 35, -9 }, + { 17, 39, -8 }, + { 19, 30, -11 }, + { 12, 27, -14 }, + { 11, 35, -10 }, + { -11, 23, 18 }, + { -11, 30, 19 }, + { -14, 27, 12 }, + { -14, 20, 12 }, + { -18, 23, 10 }, + { -10, 11, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -18, 23, -11 }, + { -19, 30, -11 }, + { -12, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -13, 11, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 31, -18 }, + { 13, 27, -12 }, + { 14, 20, -12 }, + { 18, 23, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 18, 23, 11 }, + { 19, 30, 10 }, + { 12, 27, 14 }, + { 12, 20, 14 }, + { 11, 23, 18 }, + { 13, 11, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 30, 7 }, + { -12, 26, 7 }, + { -14, 27, 12 }, + { -10, 35, 11 }, + { 11, 19, 8 }, + { 11, 26, 7 }, + { 13, 27, 12 }, + { 14, 20, 12 }, + { -11, 19, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 19, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 7, 30, 9 }, + { 7, 26, 12 }, + { 12, 27, 14 }, + { 11, 35, 9 }, + { 8, 19, -11 }, + { 7, 26, -11 }, + { 12, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -12 }, + { -14, 20, -12 }, + { -8, 19, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -7, 30, -9 }, + { -7, 26, -12 }, + { -12, 27, -14 }, + { -11, 35, -10 }, + { -8, 19, 10 }, + { -7, 26, 11 }, + { -12, 27, 13 }, + { -12, 20, 13 }, + { 8, 30, 7 }, + { 0, 34, 5 }, + { 0, 40, 6 }, + { 9, 35, 11 }, + { -10, 35, 11 }, + { -14, 27, 12 }, + { -11, 30, 19 }, + { -8, 39, 17 }, + { 11, 35, -10 }, + { 12, 27, -14 }, + { 7, 26, -11 }, + { 7, 30, -9 }, + { 11, 35, 9 }, + { 12, 27, 14 }, + { 19, 30, 10 }, + { 17, 39, 7 }, + { -10, 35, -9 }, + { -14, 27, -12 }, + { -12, 26, -6 }, + { -9, 29, -6 }, + { 9, 35, -9 }, + { 13, 27, -12 }, + { 10, 31, -18 }, + { 7, 39, -15 }, + { -11, 35, 9 }, + { -12, 27, 13 }, + { -7, 26, 11 }, + { -7, 30, 8 }, + { -11, 35, -10 }, + { -12, 27, -14 }, + { -19, 30, -11 }, + { -17, 39, -8 }, + { -7, 30, -9 }, + { -5, 34, 0 }, + { -7, 30, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -4, 22, -5 }, + { -5, 21, -3 }, + { 7, 30, -9 }, + { 5, 34, 0 }, + { 6, 40, 0 }, + { 11, 35, -10 }, + { 11, 35, -10 }, + { 6, 40, 0 }, + { 10, 43, 0 }, + { 17, 39, -8 }, + { 17, 39, 7 }, + { 6, 40, 0 }, + { 11, 35, 9 }, + { 11, 35, 9 }, + { 6, 40, 0 }, + { 7, 30, 9 }, + { 7, 39, -15 }, + { 0, 42, -8 }, + { 0, 39, -4 }, + { 0, 39, -4 }, + { 9, 35, -9 }, + { 9, 35, -9 }, + { 0, 39, -4 }, + { 0, 33, -4 }, + { 8, 29, -6 }, + { -9, 29, -6 }, + { 0, 39, -4 }, + { -10, 35, -9 }, + { -10, 35, -9 }, + { 0, 39, -4 }, + { -8, 39, -15 }, + { -11, 35, -10 }, + { -6, 40, 0 }, + { -5, 34, 0 }, + { -5, 34, 0 }, + { -7, 30, -9 }, + { -17, 39, -8 }, + { -10, 43, 0 }, + { -6, 40, 0 }, + { -11, 35, -10 }, + { -7, 30, 8 }, + { -6, 40, 0 }, + { -11, 35, 9 }, + { -11, 35, 9 }, + { -6, 40, 0 }, + { -17, 39, 7 }, + { -10, 35, 11 }, + { 0, 40, 6 }, + { 0, 34, 5 }, + { -9, 30, 7 }, + { -8, 39, 17 }, + { 0, 43, 10 }, + { 0, 40, 6 }, + { -10, 35, 11 }, + { 9, 35, 11 }, + { 0, 40, 6 }, + { 7, 39, 17 }, + { 9, 35, 11 }, + { 13, 27, 12 }, + { 11, 26, 7 }, + { 8, 30, 7 }, + { -18, 23, -11 }, + { -13, 11, -9 }, + { -10, 11, 13 }, + { -18, 23, 10 }, + { -11, 23, 18 }, + { -10, 11, 13 }, + { 13, 11, 10 }, + { 11, 23, 18 }, + { 17, 39, -8 }, + { 10, 43, 0 }, + { 17, 39, 7 }, + { 7, 30, 9 }, + { 5, 34, 0 }, + { 7, 30, -9 }, + { 8, 29, -6 }, + { 0, 33, -4 }, + { -9, 29, -6 }, + { -11, 31, -18 }, + { -14, 27, -12 }, + { -10, 35, -9 }, + { -8, 39, -15 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -13, 11, -9 }, + { -11, 23, -17 }, + { -10, 11, 13 }, + { -13, 11, -9 }, + { 0, 0, 0 }, + { -4, 22, 4 }, + { -4, 22, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 22, 4 }, + { -6, 20, 7 }, + { 4, 22, 4 }, + { 4, 22, 4 }, + { 5, 20, 7 }, + { 4, 22, 5 }, + { 4, 22, 4 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 4, 22, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 19, 8 }, + { -12, 26, 7 }, + { 11, 26, 7 }, + { 11, 19, 8 }, + { 8, 19, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 19, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 19, -11 }, + { -7, 26, -12 }, + { -7, 26, 11 }, + { -8, 19, 10 }, + { -8, 39, -15 }, + { 0, 42, -8 }, + { 7, 39, -15 }, + { -11, 31, -18 }, + { 10, 31, -18 }, + { 7, 39, 17 }, + { 0, 43, 10 }, + { -8, 39, 17 }, + { 10, 30, 19 }, + { -11, 30, 19 }, + { -17, 39, 7 }, + { -10, 43, 0 }, + { -17, 39, -8 }, + { -19, 30, 10 }, + { -19, 30, 10 }, + { -17, 39, -8 }, + { -19, 30, -11 }, + { 18, 23, 11 }, + { 13, 11, 10 }, + { 10, 12, -14 }, + { 18, 23, -11 }, + { 19, 30, -11 }, + { 17, 39, -8 }, + { 17, 39, 7 }, + { 19, 30, 10 }, + { 12, 20, 14 }, + { 12, 27, 14 }, + { 7, 26, 12 }, + { 8, 19, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 7, 26, -11 }, + { 8, 19, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 12, 27, -14 }, + { 7, 30, -9 }, + { 7, 30, 9 }, + { 14, 20, -12 }, + { 13, 27, -12 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 31, -18 }, + { 10, 31, -18 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -12 }, + { -12, 20, -14 }, + { -12, 27, -14 }, + { -7, 26, -12 }, + { -8, 19, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -13, 11, -9 }, + { -18, 23, -11 }, + { -8, 19, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -12, 27, 13 }, + { -19, 30, 10 }, + { -18, 23, 10 }, + { -19, 30, -11 }, + { -18, 23, -11 }, + { -14, 20, 12 }, + { -14, 27, 12 }, + { -12, 26, 7 }, + { -11, 19, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 11, 13 }, + { -11, 23, 18 }, + { 11, 23, 18 }, + { 10, 30, 19 }, + { -11, 30, 19 }, + { 11, 19, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 12 }, + { 8, 30, 7 }, + { 11, 26, 7 }, + { -9, 30, 7 }, + { -9, 29, -6 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -6 }, + { 11, 26, -6 }, + { 8, 29, -6 }, + { -7, 30, 8 }, + { -7, 26, 11 }, + { -7, 26, -12 }, + { -7, 30, -9 }, + { 10, 12, -14 }, + { 13, 11, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 11, 10 }, + { -10, 11, 13 }, + { 0, 0, 0 }, + { -13, 11, -9 }, + { 10, 12, -14 }, + { -5, 22, 4 }, + { 4, 22, 4 }, + { 4, 22, 5 }, + { -4, 22, 4 }, + { 4, 22, -5 }, + { -4, 22, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, +}; + +Gfx Entity_MunchlesiaGrab_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A005EE8_E7AAB8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaGrab_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaGrab.png.inc.c" diff --git a/src/entity/model/MunchlesiaReset1_anim.c b/src/entity/model/MunchlesiaReset1_anim.c new file mode 100644 index 0000000000..ade32d523b --- /dev/null +++ b/src/entity/model/MunchlesiaReset1_anim.c @@ -0,0 +1,227 @@ +#include "common.h" +#include "animation_script.h" + +extern Vtx D_0A000000_E91890[]; +extern Gfx Entity_MunchlesiaReset1_Render[]; + +AnimScript Entity_MunchlesiaReset1_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 0, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 0, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 0, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 0, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node9 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 7, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node8 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node9, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node7 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node6 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node5 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node4 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node3 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node2 = { + .displayList = Entity_MunchlesiaReset1_Render, + .sibling = &Entity_MunchlesiaReset1_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E91890, +}; + +StaticAnimatorNode Entity_MunchlesiaReset1_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaReset1_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaReset1_Mesh[] = { + &Entity_MunchlesiaReset1_Node1, + &Entity_MunchlesiaReset1_Node2, + &Entity_MunchlesiaReset1_Node3, + &Entity_MunchlesiaReset1_Node4, + &Entity_MunchlesiaReset1_Node5, + &Entity_MunchlesiaReset1_Node6, + &Entity_MunchlesiaReset1_Node7, + &Entity_MunchlesiaReset1_Node8, + &Entity_MunchlesiaReset1_Node9, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaReset1_gfx.c b/src/entity/model/MunchlesiaReset1_gfx.c new file mode 100644 index 0000000000..49880462ef --- /dev/null +++ b/src/entity/model/MunchlesiaReset1_gfx.c @@ -0,0 +1,3343 @@ +#include "common.h" + +extern unsigned char D_0A006840_E980D0[]; + +#include "entity/model/MunchlesiaReset1.vtx.inc.c" + +Vec3s Entity_MunchlesiaReset1_vertexArray[] = { + { 13, 19, -6 }, + { 11, 17, -11 }, + { 5, 20, -13 }, + { 8, 13, 37 }, + { 11, 13, 30 }, + { 14, 20, 27 }, + { 9, 20, 38 }, + { -37, 13, 8 }, + { -30, 13, 11 }, + { -27, 20, 14 }, + { -38, 20, 9 }, + { 9, 27, -36 }, + { 11, 23, -22 }, + { 14, 20, -27 }, + { 10, 20, -37 }, + { 37, 13, -8 }, + { 30, 13, -11 }, + { 27, 20, -14 }, + { 38, 20, -10 }, + { -11, 11, 22 }, + { -11, 13, 30 }, + { -14, 20, 27 }, + { -14, 16, 19 }, + { -22, 11, 11 }, + { -10, 9, 12 }, + { -13, 14, 14 }, + { -19, 16, 14 }, + { -22, 11, -11 }, + { -30, 13, -11 }, + { -27, 20, -14 }, + { -19, 16, -14 }, + { -11, 11, -22 }, + { -12, 9, -10 }, + { -13, 15, -14 }, + { -14, 16, -19 }, + { 11, 11, -22 }, + { 11, 14, -29 }, + { 14, 20, -27 }, + { 14, 16, -19 }, + { 22, 11, -11 }, + { 10, 9, -12 }, + { 13, 15, -14 }, + { 19, 16, -14 }, + { 22, 11, 11 }, + { 30, 13, 11 }, + { 27, 20, 14 }, + { 19, 16, 14 }, + { 11, 11, 22 }, + { 12, 9, 10 }, + { 14, 14, 13 }, + { 14, 16, 19 }, + { -9, 26, 36 }, + { -12, 23, 22 }, + { -14, 20, 27 }, + { -10, 20, 38 }, + { 11, 19, 16 }, + { 11, 23, 22 }, + { 14, 20, 27 }, + { 14, 16, 19 }, + { -11, 19, 16 }, + { -11, 17, 11 }, + { -13, 14, 14 }, + { -14, 16, 19 }, + { 16, 19, 11 }, + { 11, 17, 11 }, + { 14, 14, 13 }, + { 19, 16, 14 }, + { 36, 26, 9 }, + { 22, 23, 12 }, + { 27, 20, 14 }, + { 38, 20, 9 }, + { 16, 19, -11 }, + { 22, 23, -11 }, + { 27, 20, -14 }, + { 19, 16, -14 }, + { 11, 19, -16 }, + { 11, 17, -11 }, + { 13, 15, -14 }, + { 14, 16, -19 }, + { -11, 19, -16 }, + { -12, 23, -22 }, + { -14, 20, -27 }, + { -14, 16, -19 }, + { -16, 19, -11 }, + { -11, 17, -11 }, + { -13, 15, -14 }, + { -19, 16, -14 }, + { -36, 26, -9 }, + { -22, 23, -12 }, + { -27, 20, -14 }, + { -38, 20, -10 }, + { -16, 19, 11 }, + { -22, 23, 11 }, + { -27, 20, 14 }, + { -19, 16, 14 }, + { 8, 26, 36 }, + { 0, 23, 45 }, + { 0, 17, 48 }, + { 9, 20, 38 }, + { -10, 20, 38 }, + { -14, 20, 27 }, + { -11, 13, 30 }, + { -8, 13, 37 }, + { 38, 20, -10 }, + { 27, 20, -14 }, + { 22, 23, -11 }, + { 36, 26, -9 }, + { 38, 20, 9 }, + { 27, 20, 14 }, + { 30, 13, 11 }, + { 37, 13, 7 }, + { -9, 20, -37 }, + { -14, 20, -27 }, + { -12, 23, -22 }, + { -9, 27, -36 }, + { 10, 20, -37 }, + { 14, 20, -27 }, + { 11, 14, -29 }, + { 8, 13, -36 }, + { -38, 20, 9 }, + { -27, 20, 14 }, + { -22, 23, 11 }, + { -36, 26, 8 }, + { -38, 20, -10 }, + { -27, 20, -14 }, + { -30, 13, -11 }, + { -37, 13, -8 }, + { -36, 26, -9 }, + { -45, 23, 0 }, + { -36, 26, 8 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -6, 20, -13 }, + { -11, 17, -11 }, + { -13, 19, -6 }, + { 5, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -6, 20, -13 }, + { -13, 19, -6 }, + { -11, 23, -5 }, + { -5, 23, -11 }, + { 36, 26, -9 }, + { 45, 23, 0 }, + { 48, 17, 0 }, + { 38, 20, -10 }, + { 38, 20, -10 }, + { 48, 17, 0 }, + { 43, 13, 0 }, + { 37, 13, -8 }, + { 37, 13, 7 }, + { 48, 17, 0 }, + { 38, 20, 9 }, + { 38, 20, 9 }, + { 48, 17, 0 }, + { 36, 26, 9 }, + { 8, 13, -36 }, + { 0, 13, -42 }, + { 0, 16, -47 }, + { 0, 16, -47 }, + { 10, 20, -37 }, + { 10, 20, -37 }, + { 0, 16, -47 }, + { 0, 23, -45 }, + { 9, 27, -36 }, + { -9, 27, -36 }, + { 0, 16, -47 }, + { -9, 20, -37 }, + { -9, 20, -37 }, + { 0, 16, -47 }, + { -7, 13, -36 }, + { -38, 20, -10 }, + { -48, 17, 0 }, + { -45, 23, 0 }, + { -45, 23, 0 }, + { -36, 26, -9 }, + { -37, 13, -8 }, + { -43, 13, 0 }, + { -48, 17, 0 }, + { -38, 20, -10 }, + { -36, 26, 8 }, + { -48, 17, 0 }, + { -38, 20, 9 }, + { -38, 20, 9 }, + { -48, 17, 0 }, + { -37, 13, 8 }, + { -10, 20, 38 }, + { 0, 17, 48 }, + { 0, 23, 45 }, + { -9, 26, 36 }, + { -8, 13, 37 }, + { 0, 13, 43 }, + { 0, 17, 48 }, + { -10, 20, 38 }, + { 9, 20, 38 }, + { 0, 17, 48 }, + { 8, 13, 37 }, + { 9, 20, 38 }, + { 14, 20, 27 }, + { 11, 23, 22 }, + { 8, 26, 36 }, + { -22, 11, -11 }, + { -12, 9, -10 }, + { -10, 9, 12 }, + { -22, 11, 11 }, + { -11, 11, 22 }, + { -10, 9, 12 }, + { 12, 9, 10 }, + { 11, 11, 22 }, + { 37, 13, -8 }, + { 43, 13, 0 }, + { 37, 13, 7 }, + { 36, 26, 9 }, + { 45, 23, 0 }, + { 36, 26, -9 }, + { 9, 27, -36 }, + { 0, 23, -45 }, + { -9, 27, -36 }, + { -11, 14, -29 }, + { -14, 20, -27 }, + { -9, 20, -37 }, + { -7, 13, -36 }, + { 11, 11, -22 }, + { 10, 9, -12 }, + { -12, 9, -10 }, + { -11, 11, -22 }, + { -10, 9, 12 }, + { -12, 9, -10 }, + { 0, 0, 0 }, + { -11, 23, 4 }, + { -11, 23, -5 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 11 }, + { -6, 19, 13 }, + { 4, 23, 11 }, + { 4, 23, 11 }, + { 5, 19, 13 }, + { 11, 23, 5 }, + { 4, 23, 11 }, + { 5, 19, 13 }, + { 13, 19, 5 }, + { 11, 23, -5 }, + { 13, 19, -6 }, + { 4, 23, -11 }, + { 5, 20, -13 }, + { -5, 23, -11 }, + { -6, 20, -13 }, + { -11, 19, 16 }, + { -12, 23, 22 }, + { 11, 23, 22 }, + { 11, 19, 16 }, + { 16, 19, -11 }, + { 11, 17, -11 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 16, 19, 11 }, + { 11, 19, -16 }, + { 11, 23, -22 }, + { -12, 23, -22 }, + { -11, 19, -16 }, + { -16, 19, -11 }, + { -22, 23, -12 }, + { -22, 23, 11 }, + { -16, 19, 11 }, + { -7, 13, -36 }, + { 0, 13, -42 }, + { 8, 13, -36 }, + { -11, 14, -29 }, + { 11, 14, -29 }, + { 8, 13, 37 }, + { 0, 13, 43 }, + { -8, 13, 37 }, + { 11, 13, 30 }, + { -11, 13, 30 }, + { -37, 13, 8 }, + { -43, 13, 0 }, + { -37, 13, -8 }, + { -30, 13, 11 }, + { -30, 13, 11 }, + { -37, 13, -8 }, + { -30, 13, -11 }, + { 22, 11, 11 }, + { 12, 9, 10 }, + { 10, 9, -12 }, + { 22, 11, -11 }, + { 30, 13, -11 }, + { 37, 13, -8 }, + { 37, 13, 7 }, + { 30, 13, 11 }, + { 19, 16, 14 }, + { 27, 20, 14 }, + { 22, 23, 12 }, + { 16, 19, 11 }, + { 19, 16, 14 }, + { 14, 14, 13 }, + { 22, 23, -11 }, + { 16, 19, -11 }, + { 19, 16, -14 }, + { 13, 15, -14 }, + { 11, 17, -11 }, + { 19, 16, -14 }, + { 27, 20, -14 }, + { 36, 26, -9 }, + { 36, 26, 9 }, + { 14, 16, -19 }, + { 14, 20, -27 }, + { 11, 23, -22 }, + { 11, 19, -16 }, + { 14, 16, -19 }, + { 13, 15, -14 }, + { 10, 9, -12 }, + { 11, 11, -22 }, + { -11, 11, -22 }, + { -11, 14, -29 }, + { 11, 14, -29 }, + { -11, 19, -16 }, + { -11, 17, -11 }, + { -6, 20, -13 }, + { 5, 20, -13 }, + { 11, 17, -11 }, + { 11, 19, -16 }, + { -14, 16, -19 }, + { -13, 15, -14 }, + { -11, 17, -11 }, + { -14, 16, -19 }, + { -14, 20, -27 }, + { -19, 16, -14 }, + { -27, 20, -14 }, + { -22, 23, -12 }, + { -16, 19, -11 }, + { -19, 16, -14 }, + { -13, 15, -14 }, + { -12, 9, -10 }, + { -22, 11, -11 }, + { -16, 19, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -19, 16, 14 }, + { -13, 14, 14 }, + { -19, 16, 14 }, + { -27, 20, 14 }, + { -30, 13, 11 }, + { -22, 11, 11 }, + { -30, 13, -11 }, + { -22, 11, -11 }, + { -14, 16, 19 }, + { -14, 20, 27 }, + { -12, 23, 22 }, + { -11, 19, 16 }, + { -14, 16, 19 }, + { -13, 14, 14 }, + { -10, 9, 12 }, + { -11, 11, 22 }, + { 11, 11, 22 }, + { 11, 13, 30 }, + { -11, 13, 30 }, + { 11, 19, 16 }, + { 11, 17, 11 }, + { 5, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 16, 19 }, + { 14, 14, 13 }, + { 14, 16, 19 }, + { 14, 20, 27 }, + { 8, 26, 36 }, + { 11, 23, 22 }, + { -9, 26, 36 }, + { -9, 27, -36 }, + { -12, 23, -22 }, + { 11, 23, -22 }, + { -9, 27, -36 }, + { 11, 23, -22 }, + { 9, 27, -36 }, + { -36, 26, 8 }, + { -22, 23, 11 }, + { -22, 23, -12 }, + { -36, 26, -9 }, + { 10, 9, -12 }, + { 12, 9, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 12, 9, 10 }, + { -10, 9, 12 }, + { 0, 0, 0 }, + { -12, 9, -10 }, + { 10, 9, -12 }, + { -5, 23, 11 }, + { 4, 23, 11 }, + { 11, 23, 5 }, + { -11, 23, 4 }, + { 11, 23, -5 }, + { -11, 23, -5 }, + { 4, 23, -11 }, + { -5, 23, -11 }, + { 13, 19, -6 }, + { 11, 17, -11 }, + { 5, 18, -13 }, + { 8, 5, 32 }, + { 11, 6, 26 }, + { 14, 14, 25 }, + { 10, 11, 34 }, + { -32, 5, 8 }, + { -26, 6, 11 }, + { -25, 14, 14 }, + { -34, 11, 10 }, + { 9, 16, -35 }, + { 11, 18, -24 }, + { 14, 13, -25 }, + { 10, 9, -34 }, + { 32, 5, -8 }, + { 26, 6, -11 }, + { 25, 14, -14 }, + { 34, 11, -10 }, + { -11, 8, 19 }, + { -11, 6, 26 }, + { -14, 14, 25 }, + { -14, 14, 18 }, + { -19, 8, 11 }, + { -10, 9, 10 }, + { -13, 14, 13 }, + { -18, 14, 14 }, + { -19, 8, -10 }, + { -26, 6, -11 }, + { -25, 14, -14 }, + { -18, 14, -13 }, + { -11, 7, -18 }, + { -10, 9, -10 }, + { -13, 13, -13 }, + { -14, 13, -18 }, + { 11, 7, -18 }, + { 11, 5, -25 }, + { 14, 13, -25 }, + { 14, 13, -18 }, + { 19, 8, -11 }, + { 10, 9, -10 }, + { 13, 13, -13 }, + { 18, 14, -14 }, + { 19, 8, 11 }, + { 26, 6, 11 }, + { 25, 14, 14 }, + { 18, 14, 14 }, + { 11, 8, 19 }, + { 10, 9, 10 }, + { 13, 14, 13 }, + { 14, 14, 18 }, + { -9, 18, 34 }, + { -12, 19, 23 }, + { -14, 14, 25 }, + { -10, 11, 34 }, + { 11, 18, 16 }, + { 11, 19, 23 }, + { 14, 14, 25 }, + { 14, 14, 18 }, + { -11, 18, 16 }, + { -11, 17, 11 }, + { -13, 14, 13 }, + { -14, 14, 18 }, + { 16, 18, 11 }, + { 11, 17, 11 }, + { 13, 14, 13 }, + { 18, 14, 14 }, + { 34, 18, 9 }, + { 23, 19, 12 }, + { 25, 14, 14 }, + { 34, 11, 10 }, + { 16, 18, -11 }, + { 23, 19, -11 }, + { 25, 14, -14 }, + { 18, 14, -14 }, + { 11, 17, -17 }, + { 11, 17, -11 }, + { 13, 13, -13 }, + { 14, 13, -18 }, + { -11, 17, -17 }, + { -12, 18, -24 }, + { -14, 13, -25 }, + { -14, 13, -18 }, + { -16, 18, -11 }, + { -11, 17, -11 }, + { -13, 13, -13 }, + { -18, 14, -13 }, + { -34, 18, -9 }, + { -23, 19, -12 }, + { -25, 14, -14 }, + { -34, 11, -10 }, + { -16, 18, 11 }, + { -23, 19, 11 }, + { -25, 14, 14 }, + { -18, 14, 14 }, + { 9, 18, 34 }, + { 0, 14, 41 }, + { 0, 7, 42 }, + { 10, 11, 34 }, + { -10, 11, 34 }, + { -14, 14, 25 }, + { -11, 6, 26 }, + { -8, 5, 32 }, + { 34, 11, -10 }, + { 25, 14, -14 }, + { 23, 19, -11 }, + { 34, 18, -9 }, + { 34, 11, 10 }, + { 25, 14, 14 }, + { 26, 6, 11 }, + { 32, 5, 8 }, + { -10, 9, -34 }, + { -14, 13, -25 }, + { -12, 18, -24 }, + { -9, 16, -35 }, + { 10, 9, -34 }, + { 14, 13, -25 }, + { 11, 5, -25 }, + { 8, 3, -31 }, + { -34, 11, 10 }, + { -25, 14, 14 }, + { -23, 19, 11 }, + { -34, 18, 9 }, + { -34, 11, -10 }, + { -25, 14, -14 }, + { -26, 6, -11 }, + { -32, 5, -8 }, + { -34, 18, -9 }, + { -41, 14, 0 }, + { -34, 18, 9 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -5, 18, -13 }, + { -11, 17, -11 }, + { -13, 19, -6 }, + { 6, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -5, 18, -13 }, + { -13, 19, -6 }, + { -12, 23, -5 }, + { -5, 23, -13 }, + { 34, 18, -9 }, + { 41, 14, 0 }, + { 42, 7, 0 }, + { 34, 11, -10 }, + { 34, 11, -10 }, + { 42, 7, 0 }, + { 37, 4, 0 }, + { 32, 5, -8 }, + { 32, 5, 8 }, + { 42, 7, 0 }, + { 34, 11, 10 }, + { 34, 11, 10 }, + { 42, 7, 0 }, + { 34, 18, 9 }, + { 8, 3, -31 }, + { 0, 2, -36 }, + { 0, 4, -41 }, + { 0, 4, -41 }, + { 10, 9, -34 }, + { 10, 9, -34 }, + { 0, 4, -41 }, + { 0, 11, -41 }, + { 9, 16, -35 }, + { -9, 16, -35 }, + { 0, 4, -41 }, + { -10, 9, -34 }, + { -10, 9, -34 }, + { 0, 4, -41 }, + { -8, 3, -31 }, + { -34, 11, -10 }, + { -42, 7, 0 }, + { -41, 14, 0 }, + { -41, 14, 0 }, + { -34, 18, -9 }, + { -32, 5, -8 }, + { -37, 4, 0 }, + { -42, 7, 0 }, + { -34, 11, -10 }, + { -34, 18, 9 }, + { -42, 7, 0 }, + { -34, 11, 10 }, + { -34, 11, 10 }, + { -42, 7, 0 }, + { -32, 5, 8 }, + { -10, 11, 34 }, + { 0, 7, 42 }, + { 0, 14, 41 }, + { -9, 18, 34 }, + { -8, 5, 32 }, + { 0, 4, 37 }, + { 0, 7, 42 }, + { -10, 11, 34 }, + { 10, 11, 34 }, + { 0, 7, 42 }, + { 8, 5, 32 }, + { 10, 11, 34 }, + { 14, 14, 25 }, + { 11, 19, 23 }, + { 9, 18, 34 }, + { -19, 8, -10 }, + { -10, 9, -10 }, + { -10, 9, 10 }, + { -19, 8, 11 }, + { -11, 8, 19 }, + { -10, 9, 10 }, + { 10, 9, 10 }, + { 11, 8, 19 }, + { 32, 5, -8 }, + { 37, 4, 0 }, + { 32, 5, 8 }, + { 34, 18, 9 }, + { 41, 14, 0 }, + { 34, 18, -9 }, + { 9, 16, -35 }, + { 0, 11, -41 }, + { -9, 16, -35 }, + { -11, 5, -25 }, + { -14, 13, -25 }, + { -10, 9, -34 }, + { -8, 3, -31 }, + { 11, 7, -18 }, + { 10, 9, -10 }, + { -10, 9, -10 }, + { -11, 7, -18 }, + { -10, 9, 10 }, + { -10, 9, -10 }, + { 0, 0, 0 }, + { -12, 23, 4 }, + { -12, 23, -5 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 12 }, + { -6, 19, 13 }, + { 4, 23, 12 }, + { 4, 23, 12 }, + { 6, 19, 13 }, + { 12, 23, 5 }, + { 4, 23, 12 }, + { 6, 19, 13 }, + { 13, 19, 5 }, + { 12, 23, -5 }, + { 13, 19, -6 }, + { 5, 23, -13 }, + { 5, 18, -13 }, + { -5, 23, -13 }, + { -5, 18, -13 }, + { -11, 18, 16 }, + { -12, 19, 23 }, + { 11, 19, 23 }, + { 11, 18, 16 }, + { 16, 18, -11 }, + { 11, 17, -11 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 16, 18, 11 }, + { 11, 17, -17 }, + { 11, 18, -24 }, + { -12, 18, -24 }, + { -11, 17, -17 }, + { -16, 18, -11 }, + { -23, 19, -12 }, + { -23, 19, 11 }, + { -16, 18, 11 }, + { -8, 3, -31 }, + { 0, 2, -36 }, + { 8, 3, -31 }, + { -11, 5, -25 }, + { 11, 5, -25 }, + { 8, 5, 32 }, + { 0, 4, 37 }, + { -8, 5, 32 }, + { 11, 6, 26 }, + { -11, 6, 26 }, + { -32, 5, 8 }, + { -37, 4, 0 }, + { -32, 5, -8 }, + { -26, 6, 11 }, + { -26, 6, 11 }, + { -32, 5, -8 }, + { -26, 6, -11 }, + { 19, 8, 11 }, + { 10, 9, 10 }, + { 10, 9, -10 }, + { 19, 8, -11 }, + { 26, 6, -11 }, + { 32, 5, -8 }, + { 32, 5, 8 }, + { 26, 6, 11 }, + { 18, 14, 14 }, + { 25, 14, 14 }, + { 23, 19, 12 }, + { 16, 18, 11 }, + { 18, 14, 14 }, + { 13, 14, 13 }, + { 23, 19, -11 }, + { 16, 18, -11 }, + { 18, 14, -14 }, + { 13, 13, -13 }, + { 11, 17, -11 }, + { 18, 14, -14 }, + { 25, 14, -14 }, + { 34, 18, -9 }, + { 34, 18, 9 }, + { 14, 13, -18 }, + { 14, 13, -25 }, + { 11, 18, -24 }, + { 11, 17, -17 }, + { 14, 13, -18 }, + { 13, 13, -13 }, + { 10, 9, -10 }, + { 11, 7, -18 }, + { -11, 7, -18 }, + { -11, 5, -25 }, + { 11, 5, -25 }, + { -11, 17, -17 }, + { -11, 17, -11 }, + { -5, 18, -13 }, + { 5, 18, -13 }, + { 11, 17, -11 }, + { 11, 17, -17 }, + { -14, 13, -18 }, + { -13, 13, -13 }, + { -11, 17, -11 }, + { -14, 13, -18 }, + { -14, 13, -25 }, + { -18, 14, -13 }, + { -25, 14, -14 }, + { -23, 19, -12 }, + { -16, 18, -11 }, + { -18, 14, -13 }, + { -13, 13, -13 }, + { -10, 9, -10 }, + { -19, 8, -10 }, + { -16, 18, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -18, 14, 14 }, + { -13, 14, 13 }, + { -18, 14, 14 }, + { -25, 14, 14 }, + { -26, 6, 11 }, + { -19, 8, 11 }, + { -26, 6, -11 }, + { -19, 8, -10 }, + { -14, 14, 18 }, + { -14, 14, 25 }, + { -12, 19, 23 }, + { -11, 18, 16 }, + { -14, 14, 18 }, + { -13, 14, 13 }, + { -10, 9, 10 }, + { -11, 8, 19 }, + { 11, 8, 19 }, + { 11, 6, 26 }, + { -11, 6, 26 }, + { 11, 18, 16 }, + { 11, 17, 11 }, + { 6, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 14, 18 }, + { 13, 14, 13 }, + { 14, 14, 18 }, + { 14, 14, 25 }, + { 9, 18, 34 }, + { 11, 19, 23 }, + { -9, 18, 34 }, + { -9, 16, -35 }, + { -12, 18, -24 }, + { 11, 18, -24 }, + { -9, 16, -35 }, + { 11, 18, -24 }, + { 9, 16, -35 }, + { -34, 18, 9 }, + { -23, 19, 11 }, + { -23, 19, -12 }, + { -34, 18, -9 }, + { 10, 9, -10 }, + { 10, 9, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 9, 10 }, + { -10, 9, 10 }, + { 0, 0, 0 }, + { -10, 9, -10 }, + { 10, 9, -10 }, + { -5, 23, 12 }, + { 4, 23, 12 }, + { 12, 23, 5 }, + { -12, 23, 4 }, + { 12, 23, -5 }, + { -12, 23, -5 }, + { 5, 23, -13 }, + { -5, 23, -13 }, + { 13, 18, -6 }, + { 11, 16, -11 }, + { 5, 18, -13 }, + { 8, 1, 27 }, + { 11, 3, 22 }, + { 14, 10, 23 }, + { 10, 7, 30 }, + { -27, 1, 8 }, + { -22, 3, 11 }, + { -23, 10, 14 }, + { -30, 7, 10 }, + { 9, 13, -31 }, + { 11, 15, -23 }, + { 14, 10, -23 }, + { 10, 7, -30 }, + { 27, 1, -8 }, + { 22, 3, -11 }, + { 23, 10, -14 }, + { 30, 7, -10 }, + { -11, 6, 16 }, + { -11, 3, 22 }, + { -14, 10, 23 }, + { -14, 12, 16 }, + { -16, 6, 11 }, + { -10, 9, 9 }, + { -13, 13, 12 }, + { -16, 12, 14 }, + { -16, 6, -11 }, + { -22, 3, -11 }, + { -23, 10, -14 }, + { -16, 12, -14 }, + { -11, 6, -16 }, + { -9, 9, -10 }, + { -13, 13, -12 }, + { -14, 12, -16 }, + { 11, 6, -16 }, + { 11, 3, -22 }, + { 14, 10, -23 }, + { 14, 12, -16 }, + { 16, 6, -11 }, + { 10, 9, -9 }, + { 13, 13, -12 }, + { 16, 12, -14 }, + { 16, 6, 11 }, + { 22, 3, 11 }, + { 23, 10, 14 }, + { 16, 12, 14 }, + { 11, 6, 16 }, + { 9, 9, 10 }, + { 12, 13, 13 }, + { 14, 12, 16 }, + { -9, 13, 31 }, + { -12, 15, 23 }, + { -14, 10, 23 }, + { -10, 7, 30 }, + { 11, 16, 16 }, + { 11, 15, 23 }, + { 14, 10, 23 }, + { 14, 12, 16 }, + { -11, 16, 16 }, + { -11, 16, 11 }, + { -13, 13, 12 }, + { -14, 12, 16 }, + { 16, 16, 11 }, + { 11, 16, 11 }, + { 12, 13, 13 }, + { 16, 12, 14 }, + { 31, 13, 9 }, + { 23, 15, 12 }, + { 23, 10, 14 }, + { 30, 7, 10 }, + { 16, 16, -11 }, + { 23, 15, -11 }, + { 23, 10, -14 }, + { 16, 12, -14 }, + { 11, 16, -16 }, + { 11, 16, -11 }, + { 13, 13, -12 }, + { 14, 12, -16 }, + { -11, 16, -16 }, + { -12, 15, -23 }, + { -14, 10, -23 }, + { -14, 12, -16 }, + { -16, 16, -11 }, + { -11, 16, -11 }, + { -13, 13, -12 }, + { -16, 12, -14 }, + { -31, 13, -9 }, + { -23, 15, -11 }, + { -23, 10, -14 }, + { -30, 7, -10 }, + { -16, 16, 11 }, + { -23, 15, 12 }, + { -23, 10, 14 }, + { -16, 12, 14 }, + { 9, 13, 31 }, + { 0, 9, 36 }, + { 0, 3, 36 }, + { 10, 7, 30 }, + { -10, 7, 30 }, + { -14, 10, 23 }, + { -11, 3, 22 }, + { -8, 1, 27 }, + { 30, 7, -10 }, + { 23, 10, -14 }, + { 23, 15, -11 }, + { 31, 13, -9 }, + { 30, 7, 10 }, + { 23, 10, 14 }, + { 22, 3, 11 }, + { 27, 1, 8 }, + { -10, 7, -30 }, + { -14, 10, -23 }, + { -12, 15, -23 }, + { -9, 13, -31 }, + { 10, 7, -30 }, + { 14, 10, -23 }, + { 11, 3, -22 }, + { 8, 1, -27 }, + { -30, 7, 10 }, + { -23, 10, 14 }, + { -23, 15, 12 }, + { -31, 13, 9 }, + { -30, 7, -10 }, + { -23, 10, -14 }, + { -22, 3, -11 }, + { -27, 1, -8 }, + { -31, 13, -9 }, + { -36, 9, 0 }, + { -31, 13, 9 }, + { -13, 18, 6 }, + { -11, 16, 11 }, + { -6, 18, 13 }, + { -5, 18, -13 }, + { -11, 16, -11 }, + { -13, 18, -5 }, + { 6, 18, 13 }, + { 11, 16, 11 }, + { 13, 18, 5 }, + { -5, 18, -13 }, + { -13, 18, -5 }, + { -13, 22, -5 }, + { -5, 22, -13 }, + { 31, 13, -9 }, + { 36, 9, 0 }, + { 36, 3, 0 }, + { 30, 7, -10 }, + { 30, 7, -10 }, + { 36, 3, 0 }, + { 32, 0, 0 }, + { 27, 1, -8 }, + { 27, 1, 8 }, + { 36, 3, 0 }, + { 30, 7, 10 }, + { 30, 7, 10 }, + { 36, 3, 0 }, + { 31, 13, 9 }, + { 8, 1, -27 }, + { 0, 0, -32 }, + { 0, 3, -36 }, + { 0, 3, -36 }, + { 10, 7, -30 }, + { 10, 7, -30 }, + { 0, 3, -36 }, + { 0, 9, -36 }, + { 9, 13, -31 }, + { -9, 13, -31 }, + { 0, 3, -36 }, + { -10, 7, -30 }, + { -10, 7, -30 }, + { 0, 3, -36 }, + { -8, 1, -27 }, + { -30, 7, -10 }, + { -36, 3, 0 }, + { -36, 9, 0 }, + { -36, 9, 0 }, + { -31, 13, -9 }, + { -27, 1, -8 }, + { -32, 0, 0 }, + { -36, 3, 0 }, + { -30, 7, -10 }, + { -31, 13, 9 }, + { -36, 3, 0 }, + { -30, 7, 10 }, + { -30, 7, 10 }, + { -36, 3, 0 }, + { -27, 1, 8 }, + { -10, 7, 30 }, + { 0, 3, 36 }, + { 0, 9, 36 }, + { -9, 13, 31 }, + { -8, 1, 27 }, + { 0, 0, 32 }, + { 0, 3, 36 }, + { -10, 7, 30 }, + { 10, 7, 30 }, + { 0, 3, 36 }, + { 8, 1, 27 }, + { 10, 7, 30 }, + { 14, 10, 23 }, + { 11, 15, 23 }, + { 9, 13, 31 }, + { -16, 6, -11 }, + { -9, 9, -10 }, + { -10, 9, 9 }, + { -16, 6, 11 }, + { -11, 6, 16 }, + { -10, 9, 9 }, + { 9, 9, 10 }, + { 11, 6, 16 }, + { 27, 1, -8 }, + { 32, 0, 0 }, + { 27, 1, 8 }, + { 31, 13, 9 }, + { 36, 9, 0 }, + { 31, 13, -9 }, + { 9, 13, -31 }, + { 0, 9, -36 }, + { -9, 13, -31 }, + { -11, 3, -22 }, + { -14, 10, -23 }, + { -10, 7, -30 }, + { -8, 1, -27 }, + { 11, 6, -16 }, + { 10, 9, -9 }, + { -9, 9, -10 }, + { -11, 6, -16 }, + { -10, 9, 9 }, + { -9, 9, -10 }, + { 0, 0, 0 }, + { -13, 22, 5 }, + { -13, 22, -5 }, + { -13, 18, -5 }, + { -13, 18, 6 }, + { -5, 22, 13 }, + { -6, 18, 13 }, + { 5, 22, 13 }, + { 5, 22, 13 }, + { 6, 18, 13 }, + { 13, 22, 5 }, + { 5, 22, 13 }, + { 6, 18, 13 }, + { 13, 18, 5 }, + { 13, 22, -5 }, + { 13, 18, -6 }, + { 5, 22, -13 }, + { 5, 18, -13 }, + { -5, 22, -13 }, + { -5, 18, -13 }, + { -11, 16, 16 }, + { -12, 15, 23 }, + { 11, 15, 23 }, + { 11, 16, 16 }, + { 16, 16, -11 }, + { 11, 16, -11 }, + { 13, 18, -6 }, + { 13, 18, 5 }, + { 11, 16, 11 }, + { 16, 16, 11 }, + { 11, 16, -16 }, + { 11, 15, -23 }, + { -12, 15, -23 }, + { -11, 16, -16 }, + { -16, 16, -11 }, + { -23, 15, -11 }, + { -23, 15, 12 }, + { -16, 16, 11 }, + { -8, 1, -27 }, + { 0, 0, -32 }, + { 8, 1, -27 }, + { -11, 3, -22 }, + { 11, 3, -22 }, + { 8, 1, 27 }, + { 0, 0, 32 }, + { -8, 1, 27 }, + { 11, 3, 22 }, + { -11, 3, 22 }, + { -27, 1, 8 }, + { -32, 0, 0 }, + { -27, 1, -8 }, + { -22, 3, 11 }, + { -22, 3, 11 }, + { -27, 1, -8 }, + { -22, 3, -11 }, + { 16, 6, 11 }, + { 9, 9, 10 }, + { 10, 9, -9 }, + { 16, 6, -11 }, + { 22, 3, -11 }, + { 27, 1, -8 }, + { 27, 1, 8 }, + { 22, 3, 11 }, + { 16, 12, 14 }, + { 23, 10, 14 }, + { 23, 15, 12 }, + { 16, 16, 11 }, + { 16, 12, 14 }, + { 12, 13, 13 }, + { 23, 15, -11 }, + { 16, 16, -11 }, + { 16, 12, -14 }, + { 13, 13, -12 }, + { 11, 16, -11 }, + { 16, 12, -14 }, + { 23, 10, -14 }, + { 31, 13, -9 }, + { 31, 13, 9 }, + { 14, 12, -16 }, + { 14, 10, -23 }, + { 11, 15, -23 }, + { 11, 16, -16 }, + { 14, 12, -16 }, + { 13, 13, -12 }, + { 10, 9, -9 }, + { 11, 6, -16 }, + { -11, 6, -16 }, + { -11, 3, -22 }, + { 11, 3, -22 }, + { -11, 16, -16 }, + { -11, 16, -11 }, + { -5, 18, -13 }, + { 5, 18, -13 }, + { 11, 16, -11 }, + { 11, 16, -16 }, + { -14, 12, -16 }, + { -13, 13, -12 }, + { -11, 16, -11 }, + { -14, 12, -16 }, + { -14, 10, -23 }, + { -16, 12, -14 }, + { -23, 10, -14 }, + { -23, 15, -11 }, + { -16, 16, -11 }, + { -16, 12, -14 }, + { -13, 13, -12 }, + { -9, 9, -10 }, + { -16, 6, -11 }, + { -16, 16, 11 }, + { -11, 16, 11 }, + { -13, 18, 6 }, + { -13, 18, -5 }, + { -16, 12, 14 }, + { -13, 13, 12 }, + { -16, 12, 14 }, + { -23, 10, 14 }, + { -22, 3, 11 }, + { -16, 6, 11 }, + { -22, 3, -11 }, + { -16, 6, -11 }, + { -14, 12, 16 }, + { -14, 10, 23 }, + { -12, 15, 23 }, + { -11, 16, 16 }, + { -14, 12, 16 }, + { -13, 13, 12 }, + { -10, 9, 9 }, + { -11, 6, 16 }, + { 11, 6, 16 }, + { 11, 3, 22 }, + { -11, 3, 22 }, + { 11, 16, 16 }, + { 11, 16, 11 }, + { 6, 18, 13 }, + { -6, 18, 13 }, + { -11, 16, 11 }, + { 14, 12, 16 }, + { 12, 13, 13 }, + { 14, 12, 16 }, + { 14, 10, 23 }, + { 9, 13, 31 }, + { 11, 15, 23 }, + { -9, 13, 31 }, + { -9, 13, -31 }, + { -12, 15, -23 }, + { 11, 15, -23 }, + { -9, 13, -31 }, + { 11, 15, -23 }, + { 9, 13, -31 }, + { -31, 13, 9 }, + { -23, 15, 12 }, + { -23, 15, -11 }, + { -31, 13, -9 }, + { 10, 9, -9 }, + { 9, 9, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 9, 9, 10 }, + { -10, 9, 9 }, + { 0, 0, 0 }, + { -9, 9, -10 }, + { 10, 9, -9 }, + { -5, 22, 13 }, + { 5, 22, 13 }, + { 13, 22, 5 }, + { -13, 22, 5 }, + { 13, 22, -5 }, + { -13, 22, -5 }, + { 5, 22, -13 }, + { -5, 22, -13 }, + { 13, 19, -6 }, + { 11, 17, -10 }, + { 5, 19, -12 }, + { 8, 4, 29 }, + { 11, 5, 23 }, + { 14, 13, 23 }, + { 10, 11, 30 }, + { -29, 4, 8 }, + { -23, 5, 11 }, + { -23, 13, 14 }, + { -30, 11, 10 }, + { 9, 19, -29 }, + { 11, 19, -21 }, + { 14, 13, -23 }, + { 10, 13, -30 }, + { 29, 4, -8 }, + { 23, 5, -11 }, + { 23, 13, -14 }, + { 30, 11, -10 }, + { -11, 8, 16 }, + { -11, 5, 23 }, + { -14, 13, 23 }, + { -14, 14, 16 }, + { -16, 8, 11 }, + { -10, 9, 9 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -16, 8, -11 }, + { -23, 5, -11 }, + { -23, 13, -14 }, + { -16, 14, -14 }, + { -11, 8, -17 }, + { -9, 9, -10 }, + { -13, 14, -12 }, + { -14, 14, -16 }, + { 11, 8, -17 }, + { 11, 6, -24 }, + { 14, 13, -23 }, + { 14, 14, -16 }, + { 16, 8, -11 }, + { 10, 9, -9 }, + { 13, 14, -12 }, + { 16, 14, -14 }, + { 16, 8, 11 }, + { 23, 5, 11 }, + { 23, 13, 14 }, + { 16, 14, 14 }, + { 11, 8, 16 }, + { 9, 9, 10 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { -9, 18, 29 }, + { -12, 18, 22 }, + { -14, 13, 23 }, + { -10, 11, 30 }, + { 11, 18, 16 }, + { 11, 18, 22 }, + { 14, 13, 23 }, + { 14, 14, 16 }, + { -11, 18, 16 }, + { -11, 17, 11 }, + { -13, 14, 12 }, + { -14, 14, 16 }, + { 16, 18, 11 }, + { 11, 17, 11 }, + { 12, 14, 13 }, + { 16, 14, 14 }, + { 29, 18, 9 }, + { 22, 18, 12 }, + { 23, 13, 14 }, + { 30, 11, 10 }, + { 16, 18, -11 }, + { 22, 18, -11 }, + { 23, 13, -14 }, + { 16, 14, -14 }, + { 11, 18, -15 }, + { 11, 17, -10 }, + { 13, 14, -12 }, + { 14, 14, -16 }, + { -11, 18, -15 }, + { -12, 19, -21 }, + { -14, 13, -23 }, + { -14, 14, -16 }, + { -16, 18, -11 }, + { -11, 17, -10 }, + { -13, 14, -12 }, + { -16, 14, -14 }, + { -29, 18, -9 }, + { -22, 18, -12 }, + { -23, 13, -14 }, + { -30, 11, -9 }, + { -16, 18, 11 }, + { -22, 18, 12 }, + { -23, 13, 14 }, + { -16, 14, 14 }, + { 9, 18, 29 }, + { 0, 16, 35 }, + { 0, 10, 37 }, + { 10, 11, 30 }, + { -10, 11, 30 }, + { -14, 13, 23 }, + { -11, 5, 23 }, + { -8, 4, 29 }, + { 30, 11, -10 }, + { 23, 13, -14 }, + { 22, 18, -11 }, + { 29, 18, -9 }, + { 30, 11, 10 }, + { 23, 13, 14 }, + { 23, 5, 11 }, + { 29, 4, 8 }, + { -10, 13, -30 }, + { -14, 13, -23 }, + { -12, 19, -21 }, + { -9, 19, -29 }, + { 10, 13, -30 }, + { 14, 13, -23 }, + { 11, 6, -24 }, + { 8, 6, -30 }, + { -30, 11, 10 }, + { -23, 13, 14 }, + { -22, 18, 12 }, + { -29, 18, 9 }, + { -30, 11, -9 }, + { -23, 13, -14 }, + { -23, 5, -11 }, + { -29, 4, -8 }, + { -29, 18, -9 }, + { -35, 16, 0 }, + { -29, 18, 9 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -5, 19, -12 }, + { -11, 17, -10 }, + { -13, 19, -6 }, + { 6, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -5, 19, -12 }, + { -13, 19, -6 }, + { -12, 23, -4 }, + { -5, 23, -12 }, + { 29, 18, -9 }, + { 35, 16, 0 }, + { 37, 10, 0 }, + { 30, 11, -10 }, + { 30, 11, -10 }, + { 37, 10, 0 }, + { 34, 6, 0 }, + { 29, 4, -8 }, + { 29, 4, 8 }, + { 37, 10, 0 }, + { 30, 11, 10 }, + { 30, 11, 10 }, + { 37, 10, 0 }, + { 29, 18, 9 }, + { 8, 6, -30 }, + { 0, 7, -35 }, + { 0, 12, -37 }, + { 0, 12, -37 }, + { 10, 13, -30 }, + { 10, 13, -30 }, + { 0, 12, -37 }, + { 0, 17, -34 }, + { 9, 19, -29 }, + { -9, 19, -29 }, + { 0, 12, -37 }, + { -10, 13, -30 }, + { -10, 13, -30 }, + { 0, 12, -37 }, + { -8, 6, -30 }, + { -30, 11, -9 }, + { -37, 10, 0 }, + { -35, 16, 0 }, + { -35, 16, 0 }, + { -29, 18, -9 }, + { -29, 4, -8 }, + { -34, 6, 0 }, + { -37, 10, 0 }, + { -30, 11, -9 }, + { -29, 18, 9 }, + { -37, 10, 0 }, + { -30, 11, 10 }, + { -30, 11, 10 }, + { -37, 10, 0 }, + { -29, 4, 8 }, + { -10, 11, 30 }, + { 0, 10, 37 }, + { 0, 16, 35 }, + { -9, 18, 29 }, + { -8, 4, 29 }, + { 0, 6, 34 }, + { 0, 10, 37 }, + { -10, 11, 30 }, + { 10, 11, 30 }, + { 0, 10, 37 }, + { 8, 4, 29 }, + { 10, 11, 30 }, + { 14, 13, 23 }, + { 11, 18, 22 }, + { 9, 18, 29 }, + { -16, 8, -11 }, + { -9, 9, -10 }, + { -10, 9, 9 }, + { -16, 8, 11 }, + { -11, 8, 16 }, + { -10, 9, 9 }, + { 9, 9, 10 }, + { 11, 8, 16 }, + { 29, 4, -8 }, + { 34, 6, 0 }, + { 29, 4, 8 }, + { 29, 18, 9 }, + { 35, 16, 0 }, + { 29, 18, -9 }, + { 9, 19, -29 }, + { 0, 17, -34 }, + { -9, 19, -29 }, + { -11, 6, -24 }, + { -14, 13, -23 }, + { -10, 13, -30 }, + { -8, 6, -30 }, + { 11, 8, -17 }, + { 10, 9, -9 }, + { -9, 9, -10 }, + { -11, 8, -17 }, + { -10, 9, 9 }, + { -9, 9, -10 }, + { 0, 0, 0 }, + { -12, 23, 5 }, + { -12, 23, -4 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 12 }, + { -6, 19, 13 }, + { 5, 23, 12 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 12, 23, 5 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 13, 19, 5 }, + { 12, 23, -5 }, + { 13, 19, -6 }, + { 5, 23, -12 }, + { 5, 19, -12 }, + { -5, 23, -12 }, + { -5, 19, -12 }, + { -11, 18, 16 }, + { -12, 18, 22 }, + { 11, 18, 22 }, + { 11, 18, 16 }, + { 16, 18, -11 }, + { 11, 17, -10 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 16, 18, 11 }, + { 11, 18, -15 }, + { 11, 19, -21 }, + { -12, 19, -21 }, + { -11, 18, -15 }, + { -16, 18, -11 }, + { -22, 18, -12 }, + { -22, 18, 12 }, + { -16, 18, 11 }, + { -8, 6, -30 }, + { 0, 7, -35 }, + { 8, 6, -30 }, + { -11, 6, -24 }, + { 11, 6, -24 }, + { 8, 4, 29 }, + { 0, 6, 34 }, + { -8, 4, 29 }, + { 11, 5, 23 }, + { -11, 5, 23 }, + { -29, 4, 8 }, + { -34, 6, 0 }, + { -29, 4, -8 }, + { -23, 5, 11 }, + { -23, 5, 11 }, + { -29, 4, -8 }, + { -23, 5, -11 }, + { 16, 8, 11 }, + { 9, 9, 10 }, + { 10, 9, -9 }, + { 16, 8, -11 }, + { 23, 5, -11 }, + { 29, 4, -8 }, + { 29, 4, 8 }, + { 23, 5, 11 }, + { 16, 14, 14 }, + { 23, 13, 14 }, + { 22, 18, 12 }, + { 16, 18, 11 }, + { 16, 14, 14 }, + { 12, 14, 13 }, + { 22, 18, -11 }, + { 16, 18, -11 }, + { 16, 14, -14 }, + { 13, 14, -12 }, + { 11, 17, -10 }, + { 16, 14, -14 }, + { 23, 13, -14 }, + { 29, 18, -9 }, + { 29, 18, 9 }, + { 14, 14, -16 }, + { 14, 13, -23 }, + { 11, 19, -21 }, + { 11, 18, -15 }, + { 14, 14, -16 }, + { 13, 14, -12 }, + { 10, 9, -9 }, + { 11, 8, -17 }, + { -11, 8, -17 }, + { -11, 6, -24 }, + { 11, 6, -24 }, + { -11, 18, -15 }, + { -11, 17, -10 }, + { -5, 19, -12 }, + { 5, 19, -12 }, + { 11, 17, -10 }, + { 11, 18, -15 }, + { -14, 14, -16 }, + { -13, 14, -12 }, + { -11, 17, -10 }, + { -14, 14, -16 }, + { -14, 13, -23 }, + { -16, 14, -14 }, + { -23, 13, -14 }, + { -22, 18, -12 }, + { -16, 18, -11 }, + { -16, 14, -14 }, + { -13, 14, -12 }, + { -9, 9, -10 }, + { -16, 8, -11 }, + { -16, 18, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -16, 14, 14 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -23, 13, 14 }, + { -23, 5, 11 }, + { -16, 8, 11 }, + { -23, 5, -11 }, + { -16, 8, -11 }, + { -14, 14, 16 }, + { -14, 13, 23 }, + { -12, 18, 22 }, + { -11, 18, 16 }, + { -14, 14, 16 }, + { -13, 14, 12 }, + { -10, 9, 9 }, + { -11, 8, 16 }, + { 11, 8, 16 }, + { 11, 5, 23 }, + { -11, 5, 23 }, + { 11, 18, 16 }, + { 11, 17, 11 }, + { 6, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 14, 16 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { 14, 13, 23 }, + { 9, 18, 29 }, + { 11, 18, 22 }, + { -9, 18, 29 }, + { -9, 19, -29 }, + { -12, 19, -21 }, + { 11, 19, -21 }, + { -9, 19, -29 }, + { 11, 19, -21 }, + { 9, 19, -29 }, + { -29, 18, 9 }, + { -22, 18, 12 }, + { -22, 18, -12 }, + { -29, 18, -9 }, + { 10, 9, -9 }, + { 9, 9, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 9, 9, 10 }, + { -10, 9, 9 }, + { 0, 0, 0 }, + { -9, 9, -10 }, + { 10, 9, -9 }, + { -5, 23, 12 }, + { 5, 23, 12 }, + { 12, 23, 5 }, + { -12, 23, 5 }, + { 12, 23, -5 }, + { -12, 23, -4 }, + { 5, 23, -12 }, + { -5, 23, -12 }, + { 12, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -12 }, + { 8, 12, 32 }, + { 11, 10, 26 }, + { 14, 17, 23 }, + { 10, 18, 30 }, + { -32, 12, 7 }, + { -26, 10, 11 }, + { -23, 17, 14 }, + { -30, 18, 9 }, + { 9, 24, -27 }, + { 11, 21, -20 }, + { 14, 17, -23 }, + { 10, 18, -30 }, + { 32, 12, -8 }, + { 26, 10, -11 }, + { 23, 17, -14 }, + { 30, 18, -10 }, + { -11, 10, 18 }, + { -11, 10, 26 }, + { -14, 17, 23 }, + { -14, 16, 16 }, + { -18, 10, 11 }, + { -10, 10, 10 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -18, 10, -11 }, + { -26, 10, -11 }, + { -23, 17, -14 }, + { -16, 16, -14 }, + { -11, 10, -18 }, + { -10, 10, -10 }, + { -13, 15, -12 }, + { -14, 16, -16 }, + { 11, 10, -18 }, + { 11, 10, -26 }, + { 14, 17, -23 }, + { 14, 16, -16 }, + { 18, 10, -11 }, + { 10, 10, -10 }, + { 13, 15, -12 }, + { 16, 16, -14 }, + { 18, 10, 11 }, + { 26, 10, 11 }, + { 23, 17, 14 }, + { 16, 16, 14 }, + { 11, 10, 18 }, + { 10, 10, 10 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { -9, 24, 27 }, + { -12, 21, 20 }, + { -14, 17, 23 }, + { -10, 18, 30 }, + { 11, 19, 15 }, + { 11, 21, 20 }, + { 14, 17, 23 }, + { 14, 16, 16 }, + { -11, 19, 15 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 16, 16 }, + { 15, 19, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 16, 14 }, + { 27, 24, 9 }, + { 20, 21, 12 }, + { 23, 17, 14 }, + { 30, 18, 9 }, + { 15, 19, -11 }, + { 20, 21, -11 }, + { 23, 17, -14 }, + { 16, 16, -14 }, + { 11, 19, -15 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 16, -16 }, + { -11, 19, -15 }, + { -12, 21, -20 }, + { -14, 17, -23 }, + { -14, 16, -16 }, + { -15, 19, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 16, -14 }, + { -27, 24, -9 }, + { -20, 21, -12 }, + { -23, 17, -14 }, + { -30, 18, -10 }, + { -15, 19, 11 }, + { -20, 21, 12 }, + { -23, 17, 14 }, + { -16, 16, 14 }, + { 9, 24, 27 }, + { 0, 24, 32 }, + { 0, 20, 37 }, + { 10, 18, 30 }, + { -10, 18, 30 }, + { -14, 17, 23 }, + { -11, 10, 26 }, + { -8, 12, 32 }, + { 30, 18, -10 }, + { 23, 17, -14 }, + { 20, 21, -11 }, + { 27, 24, -9 }, + { 30, 18, 9 }, + { 23, 17, 14 }, + { 26, 10, 11 }, + { 32, 12, 7 }, + { -10, 18, -30 }, + { -14, 17, -23 }, + { -12, 21, -20 }, + { -9, 24, -27 }, + { 10, 18, -30 }, + { 14, 17, -23 }, + { 11, 10, -26 }, + { 8, 12, -32 }, + { -30, 18, 9 }, + { -23, 17, 14 }, + { -20, 21, 12 }, + { -27, 24, 9 }, + { -30, 18, -10 }, + { -23, 17, -14 }, + { -26, 10, -11 }, + { -32, 12, -8 }, + { -27, 24, -9 }, + { -32, 24, 0 }, + { -27, 24, 9 }, + { -12, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 12 }, + { -5, 20, -12 }, + { -11, 18, -10 }, + { -12, 20, -6 }, + { 6, 20, 12 }, + { 10, 18, 11 }, + { 12, 20, 5 }, + { -5, 20, -12 }, + { -12, 20, -6 }, + { -11, 24, -4 }, + { -5, 24, -11 }, + { 27, 24, -9 }, + { 32, 24, 0 }, + { 37, 20, 0 }, + { 30, 18, -10 }, + { 30, 18, -10 }, + { 37, 20, 0 }, + { 36, 15, 0 }, + { 32, 12, -8 }, + { 32, 12, 7 }, + { 37, 20, 0 }, + { 30, 18, 9 }, + { 30, 18, 9 }, + { 37, 20, 0 }, + { 27, 24, 9 }, + { 8, 12, -32 }, + { 0, 15, -36 }, + { 0, 20, -37 }, + { 0, 20, -37 }, + { 10, 18, -30 }, + { 10, 18, -30 }, + { 0, 20, -37 }, + { 0, 24, -32 }, + { 9, 24, -27 }, + { -9, 24, -27 }, + { 0, 20, -37 }, + { -10, 18, -30 }, + { -10, 18, -30 }, + { 0, 20, -37 }, + { -8, 12, -32 }, + { -30, 18, -10 }, + { -37, 20, 0 }, + { -32, 24, 0 }, + { -32, 24, 0 }, + { -27, 24, -9 }, + { -32, 12, -8 }, + { -36, 15, 0 }, + { -37, 20, 0 }, + { -30, 18, -10 }, + { -27, 24, 9 }, + { -37, 20, 0 }, + { -30, 18, 9 }, + { -30, 18, 9 }, + { -37, 20, 0 }, + { -32, 12, 7 }, + { -10, 18, 30 }, + { 0, 20, 37 }, + { 0, 24, 32 }, + { -9, 24, 27 }, + { -8, 12, 32 }, + { 0, 15, 36 }, + { 0, 20, 37 }, + { -10, 18, 30 }, + { 10, 18, 30 }, + { 0, 20, 37 }, + { 8, 12, 32 }, + { 10, 18, 30 }, + { 14, 17, 23 }, + { 11, 21, 20 }, + { 9, 24, 27 }, + { -18, 10, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -18, 10, 11 }, + { -11, 10, 18 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 10, 18 }, + { 32, 12, -8 }, + { 36, 15, 0 }, + { 32, 12, 7 }, + { 27, 24, 9 }, + { 32, 24, 0 }, + { 27, 24, -9 }, + { 9, 24, -27 }, + { 0, 24, -32 }, + { -9, 24, -27 }, + { -11, 10, -26 }, + { -14, 17, -23 }, + { -10, 18, -30 }, + { -8, 12, -32 }, + { 11, 10, -18 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 10, -18 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -11, 24, 5 }, + { -11, 24, -4 }, + { -12, 20, -6 }, + { -12, 20, 5 }, + { -5, 24, 11 }, + { -6, 20, 12 }, + { 5, 24, 11 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 11, 24, 5 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 12, 20, 5 }, + { 11, 24, -5 }, + { 12, 20, -6 }, + { 5, 24, -11 }, + { 5, 20, -12 }, + { -5, 24, -11 }, + { -5, 20, -12 }, + { -11, 19, 15 }, + { -12, 21, 20 }, + { 11, 21, 20 }, + { 11, 19, 15 }, + { 15, 19, -11 }, + { 11, 18, -10 }, + { 12, 20, -6 }, + { 12, 20, 5 }, + { 10, 18, 11 }, + { 15, 19, 11 }, + { 11, 19, -15 }, + { 11, 21, -20 }, + { -12, 21, -20 }, + { -11, 19, -15 }, + { -15, 19, -11 }, + { -20, 21, -12 }, + { -20, 21, 12 }, + { -15, 19, 11 }, + { -8, 12, -32 }, + { 0, 15, -36 }, + { 8, 12, -32 }, + { -11, 10, -26 }, + { 11, 10, -26 }, + { 8, 12, 32 }, + { 0, 15, 36 }, + { -8, 12, 32 }, + { 11, 10, 26 }, + { -11, 10, 26 }, + { -32, 12, 7 }, + { -36, 15, 0 }, + { -32, 12, -8 }, + { -26, 10, 11 }, + { -26, 10, 11 }, + { -32, 12, -8 }, + { -26, 10, -11 }, + { 18, 10, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 18, 10, -11 }, + { 26, 10, -11 }, + { 32, 12, -8 }, + { 32, 12, 7 }, + { 26, 10, 11 }, + { 16, 16, 14 }, + { 23, 17, 14 }, + { 20, 21, 12 }, + { 15, 19, 11 }, + { 16, 16, 14 }, + { 12, 15, 13 }, + { 20, 21, -11 }, + { 15, 19, -11 }, + { 16, 16, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 16, -14 }, + { 23, 17, -14 }, + { 27, 24, -9 }, + { 27, 24, 9 }, + { 14, 16, -16 }, + { 14, 17, -23 }, + { 11, 21, -20 }, + { 11, 19, -15 }, + { 14, 16, -16 }, + { 13, 15, -12 }, + { 10, 10, -10 }, + { 11, 10, -18 }, + { -11, 10, -18 }, + { -11, 10, -26 }, + { 11, 10, -26 }, + { -11, 19, -15 }, + { -11, 18, -10 }, + { -5, 20, -12 }, + { 5, 20, -12 }, + { 11, 18, -10 }, + { 11, 19, -15 }, + { -14, 16, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 16, -16 }, + { -14, 17, -23 }, + { -16, 16, -14 }, + { -23, 17, -14 }, + { -20, 21, -12 }, + { -15, 19, -11 }, + { -16, 16, -14 }, + { -13, 15, -12 }, + { -10, 10, -10 }, + { -18, 10, -11 }, + { -15, 19, 11 }, + { -11, 18, 10 }, + { -12, 20, 5 }, + { -12, 20, -6 }, + { -16, 16, 14 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -23, 17, 14 }, + { -26, 10, 11 }, + { -18, 10, 11 }, + { -26, 10, -11 }, + { -18, 10, -11 }, + { -14, 16, 16 }, + { -14, 17, 23 }, + { -12, 21, 20 }, + { -11, 19, 15 }, + { -14, 16, 16 }, + { -13, 15, 12 }, + { -10, 10, 10 }, + { -11, 10, 18 }, + { 11, 10, 18 }, + { 11, 10, 26 }, + { -11, 10, 26 }, + { 11, 19, 15 }, + { 10, 18, 11 }, + { 6, 20, 12 }, + { -6, 20, 12 }, + { -11, 18, 10 }, + { 14, 16, 16 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { 14, 17, 23 }, + { 9, 24, 27 }, + { 11, 21, 20 }, + { -9, 24, 27 }, + { -9, 24, -27 }, + { -12, 21, -20 }, + { 11, 21, -20 }, + { -9, 24, -27 }, + { 11, 21, -20 }, + { 9, 24, -27 }, + { -27, 24, 9 }, + { -20, 21, 12 }, + { -20, 21, -12 }, + { -27, 24, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 11 }, + { 5, 24, 11 }, + { 11, 24, 5 }, + { -11, 24, 5 }, + { 11, 24, -5 }, + { -11, 24, -4 }, + { 5, 24, -11 }, + { -5, 24, -11 }, + { 12, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -12 }, + { 8, 11, 32 }, + { 11, 10, 26 }, + { 14, 16, 23 }, + { 10, 18, 31 }, + { -32, 11, 7 }, + { -26, 10, 11 }, + { -23, 16, 14 }, + { -31, 18, 9 }, + { 9, 23, -28 }, + { 11, 21, -20 }, + { 14, 16, -23 }, + { 10, 17, -31 }, + { 32, 11, -8 }, + { 26, 10, -11 }, + { 23, 16, -14 }, + { 31, 18, -10 }, + { -11, 10, 18 }, + { -11, 10, 26 }, + { -14, 16, 23 }, + { -14, 16, 16 }, + { -18, 10, 11 }, + { -10, 10, 10 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -18, 10, -11 }, + { -26, 10, -11 }, + { -23, 16, -14 }, + { -16, 16, -14 }, + { -11, 9, -18 }, + { -10, 10, -10 }, + { -13, 15, -12 }, + { -14, 15, -16 }, + { 11, 9, -18 }, + { 11, 9, -26 }, + { 14, 16, -23 }, + { 14, 15, -16 }, + { 18, 10, -11 }, + { 10, 10, -10 }, + { 13, 15, -12 }, + { 16, 16, -14 }, + { 18, 10, 11 }, + { 26, 10, 11 }, + { 23, 16, 14 }, + { 16, 16, 14 }, + { 11, 10, 18 }, + { 10, 10, 10 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { -9, 23, 27 }, + { -12, 21, 20 }, + { -14, 16, 23 }, + { -10, 18, 31 }, + { 11, 19, 15 }, + { 11, 21, 20 }, + { 14, 16, 23 }, + { 14, 16, 16 }, + { -11, 19, 15 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 16, 16 }, + { 15, 19, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 16, 14 }, + { 27, 23, 9 }, + { 20, 21, 12 }, + { 23, 16, 14 }, + { 31, 18, 10 }, + { 15, 19, -11 }, + { 20, 21, -11 }, + { 23, 16, -14 }, + { 16, 16, -14 }, + { 11, 19, -15 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 15, -16 }, + { -11, 19, -15 }, + { -12, 21, -20 }, + { -14, 16, -23 }, + { -14, 15, -16 }, + { -15, 19, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 16, -14 }, + { -27, 23, -9 }, + { -20, 21, -12 }, + { -23, 16, -14 }, + { -31, 18, -10 }, + { -15, 19, 11 }, + { -20, 21, 12 }, + { -23, 16, 14 }, + { -16, 16, 14 }, + { 9, 23, 27 }, + { 0, 24, 33 }, + { 0, 20, 37 }, + { 10, 18, 31 }, + { -10, 18, 31 }, + { -14, 16, 23 }, + { -11, 10, 26 }, + { -8, 11, 32 }, + { 31, 18, -10 }, + { 23, 16, -14 }, + { 20, 21, -11 }, + { 27, 23, -9 }, + { 31, 18, 10 }, + { 23, 16, 14 }, + { 26, 10, 11 }, + { 32, 11, 7 }, + { -10, 17, -31 }, + { -14, 16, -23 }, + { -12, 21, -20 }, + { -9, 23, -28 }, + { 10, 17, -31 }, + { 14, 16, -23 }, + { 11, 9, -26 }, + { 8, 11, -32 }, + { -31, 18, 9 }, + { -23, 16, 14 }, + { -20, 21, 12 }, + { -27, 23, 9 }, + { -31, 18, -10 }, + { -23, 16, -14 }, + { -26, 10, -11 }, + { -32, 11, -8 }, + { -27, 23, -9 }, + { -33, 24, 0 }, + { -27, 23, 9 }, + { -12, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 12 }, + { -5, 20, -12 }, + { -11, 18, -10 }, + { -12, 20, -6 }, + { 6, 20, 12 }, + { 10, 18, 11 }, + { 12, 20, 5 }, + { -5, 20, -12 }, + { -12, 20, -6 }, + { -11, 24, -4 }, + { -5, 24, -11 }, + { 27, 23, -9 }, + { 33, 24, 0 }, + { 37, 20, 0 }, + { 31, 18, -10 }, + { 31, 18, -10 }, + { 37, 20, 0 }, + { 37, 14, 0 }, + { 32, 11, -8 }, + { 32, 11, 7 }, + { 37, 20, 0 }, + { 31, 18, 10 }, + { 31, 18, 10 }, + { 37, 20, 0 }, + { 27, 23, 9 }, + { 8, 11, -32 }, + { 0, 14, -36 }, + { 0, 19, -37 }, + { 0, 19, -37 }, + { 10, 17, -31 }, + { 10, 17, -31 }, + { 0, 19, -37 }, + { 0, 23, -33 }, + { 9, 23, -28 }, + { -9, 23, -28 }, + { 0, 19, -37 }, + { -10, 17, -31 }, + { -10, 17, -31 }, + { 0, 19, -37 }, + { -8, 11, -32 }, + { -31, 18, -10 }, + { -37, 20, 0 }, + { -33, 24, 0 }, + { -33, 24, 0 }, + { -27, 23, -9 }, + { -32, 11, -8 }, + { -37, 14, 0 }, + { -37, 20, 0 }, + { -31, 18, -10 }, + { -27, 23, 9 }, + { -37, 20, 0 }, + { -31, 18, 9 }, + { -31, 18, 9 }, + { -37, 20, 0 }, + { -32, 11, 7 }, + { -10, 18, 31 }, + { 0, 20, 37 }, + { 0, 24, 33 }, + { -9, 23, 27 }, + { -8, 11, 32 }, + { 0, 14, 37 }, + { 0, 20, 37 }, + { -10, 18, 31 }, + { 10, 18, 31 }, + { 0, 20, 37 }, + { 8, 11, 32 }, + { 10, 18, 31 }, + { 14, 16, 23 }, + { 11, 21, 20 }, + { 9, 23, 27 }, + { -18, 10, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -18, 10, 11 }, + { -11, 10, 18 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 10, 18 }, + { 32, 11, -8 }, + { 37, 14, 0 }, + { 32, 11, 7 }, + { 27, 23, 9 }, + { 33, 24, 0 }, + { 27, 23, -9 }, + { 9, 23, -28 }, + { 0, 23, -33 }, + { -9, 23, -28 }, + { -11, 9, -26 }, + { -14, 16, -23 }, + { -10, 17, -31 }, + { -8, 11, -32 }, + { 11, 9, -18 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 9, -18 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -11, 24, 5 }, + { -11, 24, -4 }, + { -12, 20, -6 }, + { -12, 20, 5 }, + { -5, 24, 11 }, + { -6, 20, 12 }, + { 5, 24, 11 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 11, 24, 5 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 12, 20, 5 }, + { 11, 24, -5 }, + { 12, 20, -6 }, + { 5, 24, -11 }, + { 5, 20, -12 }, + { -5, 24, -11 }, + { -5, 20, -12 }, + { -11, 19, 15 }, + { -12, 21, 20 }, + { 11, 21, 20 }, + { 11, 19, 15 }, + { 15, 19, -11 }, + { 11, 18, -10 }, + { 12, 20, -6 }, + { 12, 20, 5 }, + { 10, 18, 11 }, + { 15, 19, 11 }, + { 11, 19, -15 }, + { 11, 21, -20 }, + { -12, 21, -20 }, + { -11, 19, -15 }, + { -15, 19, -11 }, + { -20, 21, -12 }, + { -20, 21, 12 }, + { -15, 19, 11 }, + { -8, 11, -32 }, + { 0, 14, -36 }, + { 8, 11, -32 }, + { -11, 9, -26 }, + { 11, 9, -26 }, + { 8, 11, 32 }, + { 0, 14, 37 }, + { -8, 11, 32 }, + { 11, 10, 26 }, + { -11, 10, 26 }, + { -32, 11, 7 }, + { -37, 14, 0 }, + { -32, 11, -8 }, + { -26, 10, 11 }, + { -26, 10, 11 }, + { -32, 11, -8 }, + { -26, 10, -11 }, + { 18, 10, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 18, 10, -11 }, + { 26, 10, -11 }, + { 32, 11, -8 }, + { 32, 11, 7 }, + { 26, 10, 11 }, + { 16, 16, 14 }, + { 23, 16, 14 }, + { 20, 21, 12 }, + { 15, 19, 11 }, + { 16, 16, 14 }, + { 12, 15, 13 }, + { 20, 21, -11 }, + { 15, 19, -11 }, + { 16, 16, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 16, -14 }, + { 23, 16, -14 }, + { 27, 23, -9 }, + { 27, 23, 9 }, + { 14, 15, -16 }, + { 14, 16, -23 }, + { 11, 21, -20 }, + { 11, 19, -15 }, + { 14, 15, -16 }, + { 13, 15, -12 }, + { 10, 10, -10 }, + { 11, 9, -18 }, + { -11, 9, -18 }, + { -11, 9, -26 }, + { 11, 9, -26 }, + { -11, 19, -15 }, + { -11, 18, -10 }, + { -5, 20, -12 }, + { 5, 20, -12 }, + { 11, 18, -10 }, + { 11, 19, -15 }, + { -14, 15, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 15, -16 }, + { -14, 16, -23 }, + { -16, 16, -14 }, + { -23, 16, -14 }, + { -20, 21, -12 }, + { -15, 19, -11 }, + { -16, 16, -14 }, + { -13, 15, -12 }, + { -10, 10, -10 }, + { -18, 10, -11 }, + { -15, 19, 11 }, + { -11, 18, 10 }, + { -12, 20, 5 }, + { -12, 20, -6 }, + { -16, 16, 14 }, + { -13, 15, 12 }, + { -16, 16, 14 }, + { -23, 16, 14 }, + { -26, 10, 11 }, + { -18, 10, 11 }, + { -26, 10, -11 }, + { -18, 10, -11 }, + { -14, 16, 16 }, + { -14, 16, 23 }, + { -12, 21, 20 }, + { -11, 19, 15 }, + { -14, 16, 16 }, + { -13, 15, 12 }, + { -10, 10, 10 }, + { -11, 10, 18 }, + { 11, 10, 18 }, + { 11, 10, 26 }, + { -11, 10, 26 }, + { 11, 19, 15 }, + { 10, 18, 11 }, + { 6, 20, 12 }, + { -6, 20, 12 }, + { -11, 18, 10 }, + { 14, 16, 16 }, + { 12, 15, 13 }, + { 14, 16, 16 }, + { 14, 16, 23 }, + { 9, 23, 27 }, + { 11, 21, 20 }, + { -9, 23, 27 }, + { -9, 23, -28 }, + { -12, 21, -20 }, + { 11, 21, -20 }, + { -9, 23, -28 }, + { 11, 21, -20 }, + { 9, 23, -28 }, + { -27, 23, 9 }, + { -20, 21, 12 }, + { -20, 21, -12 }, + { -27, 23, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 11 }, + { 5, 24, 11 }, + { 11, 24, 5 }, + { -11, 24, 5 }, + { 11, 24, -5 }, + { -11, 24, -4 }, + { 5, 24, -11 }, + { -5, 24, -11 }, + { 12, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -12 }, + { 8, 9, 32 }, + { 11, 8, 26 }, + { 14, 15, 23 }, + { 10, 16, 31 }, + { -32, 9, 8 }, + { -26, 8, 11 }, + { -23, 15, 14 }, + { -31, 16, 10 }, + { 9, 21, -29 }, + { 11, 20, -21 }, + { 14, 15, -23 }, + { 10, 16, -31 }, + { 32, 9, -8 }, + { 26, 8, -11 }, + { 23, 15, -14 }, + { 31, 16, -10 }, + { -11, 9, 18 }, + { -11, 8, 26 }, + { -14, 15, 23 }, + { -14, 15, 16 }, + { -18, 9, 11 }, + { -10, 10, 10 }, + { -13, 15, 12 }, + { -16, 15, 14 }, + { -18, 9, -11 }, + { -26, 8, -11 }, + { -23, 15, -14 }, + { -16, 15, -14 }, + { -11, 9, -18 }, + { -10, 10, -10 }, + { -13, 15, -12 }, + { -14, 15, -16 }, + { 11, 9, -18 }, + { 11, 8, -26 }, + { 14, 15, -23 }, + { 14, 15, -16 }, + { 18, 9, -11 }, + { 10, 10, -10 }, + { 13, 15, -12 }, + { 16, 15, -14 }, + { 18, 9, 11 }, + { 26, 8, 11 }, + { 23, 15, 14 }, + { 16, 15, 14 }, + { 11, 9, 18 }, + { 10, 10, 10 }, + { 12, 15, 13 }, + { 14, 15, 16 }, + { -9, 22, 29 }, + { -12, 20, 21 }, + { -14, 15, 23 }, + { -10, 16, 31 }, + { 11, 19, 15 }, + { 11, 20, 21 }, + { 14, 15, 23 }, + { 14, 15, 16 }, + { -11, 19, 15 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 15, 16 }, + { 15, 19, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 15, 14 }, + { 29, 22, 9 }, + { 21, 20, 12 }, + { 23, 15, 14 }, + { 31, 16, 10 }, + { 15, 19, -11 }, + { 21, 20, -11 }, + { 23, 15, -14 }, + { 16, 15, -14 }, + { 11, 19, -15 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 15, -16 }, + { -11, 19, -15 }, + { -12, 20, -21 }, + { -14, 15, -23 }, + { -14, 15, -16 }, + { -15, 19, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 15, -14 }, + { -29, 22, -9 }, + { -21, 20, -12 }, + { -23, 15, -14 }, + { -31, 16, -10 }, + { -15, 19, 11 }, + { -21, 20, 12 }, + { -23, 15, 14 }, + { -16, 15, 14 }, + { 9, 22, 29 }, + { 0, 21, 35 }, + { 0, 17, 38 }, + { 10, 16, 31 }, + { -10, 16, 31 }, + { -14, 15, 23 }, + { -11, 8, 26 }, + { -8, 9, 32 }, + { 31, 16, -10 }, + { 23, 15, -14 }, + { 21, 20, -11 }, + { 29, 22, -9 }, + { 31, 16, 10 }, + { 23, 15, 14 }, + { 26, 8, 11 }, + { 32, 9, 8 }, + { -10, 16, -31 }, + { -14, 15, -23 }, + { -12, 20, -21 }, + { -9, 21, -29 }, + { 10, 16, -31 }, + { 14, 15, -23 }, + { 11, 8, -26 }, + { 8, 9, -32 }, + { -31, 16, 10 }, + { -23, 15, 14 }, + { -21, 20, 12 }, + { -29, 22, 9 }, + { -31, 16, -10 }, + { -23, 15, -14 }, + { -26, 8, -11 }, + { -32, 9, -8 }, + { -29, 22, -9 }, + { -35, 21, 0 }, + { -29, 22, 9 }, + { -12, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 12 }, + { -5, 20, -12 }, + { -11, 18, -10 }, + { -12, 20, -6 }, + { 6, 20, 12 }, + { 10, 18, 11 }, + { 12, 20, 5 }, + { -5, 20, -12 }, + { -12, 20, -6 }, + { -11, 24, -5 }, + { -5, 24, -11 }, + { 29, 22, -9 }, + { 35, 21, 0 }, + { 38, 17, 0 }, + { 31, 16, -10 }, + { 31, 16, -10 }, + { 38, 17, 0 }, + { 37, 11, 0 }, + { 32, 9, -8 }, + { 32, 9, 8 }, + { 38, 17, 0 }, + { 31, 16, 10 }, + { 31, 16, 10 }, + { 38, 17, 0 }, + { 29, 22, 9 }, + { 8, 9, -32 }, + { 0, 11, -37 }, + { 0, 16, -38 }, + { 0, 16, -38 }, + { 10, 16, -31 }, + { 10, 16, -31 }, + { 0, 16, -38 }, + { 0, 21, -35 }, + { 9, 21, -29 }, + { -9, 21, -29 }, + { 0, 16, -38 }, + { -10, 16, -31 }, + { -10, 16, -31 }, + { 0, 16, -38 }, + { -8, 9, -32 }, + { -31, 16, -10 }, + { -38, 17, 0 }, + { -35, 21, 0 }, + { -35, 21, 0 }, + { -29, 22, -9 }, + { -32, 9, -8 }, + { -37, 11, 0 }, + { -38, 17, 0 }, + { -31, 16, -10 }, + { -29, 22, 9 }, + { -38, 17, 0 }, + { -31, 16, 10 }, + { -31, 16, 10 }, + { -38, 17, 0 }, + { -32, 9, 8 }, + { -10, 16, 31 }, + { 0, 17, 38 }, + { 0, 21, 35 }, + { -9, 22, 29 }, + { -8, 9, 32 }, + { 0, 11, 37 }, + { 0, 17, 38 }, + { -10, 16, 31 }, + { 10, 16, 31 }, + { 0, 17, 38 }, + { 8, 9, 32 }, + { 10, 16, 31 }, + { 14, 15, 23 }, + { 11, 20, 21 }, + { 9, 22, 29 }, + { -18, 9, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -18, 9, 11 }, + { -11, 9, 18 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 9, 18 }, + { 32, 9, -8 }, + { 37, 11, 0 }, + { 32, 9, 8 }, + { 29, 22, 9 }, + { 35, 21, 0 }, + { 29, 22, -9 }, + { 9, 21, -29 }, + { 0, 21, -35 }, + { -9, 21, -29 }, + { -11, 8, -26 }, + { -14, 15, -23 }, + { -10, 16, -31 }, + { -8, 9, -32 }, + { 11, 9, -18 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 9, -18 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -11, 24, 5 }, + { -11, 24, -5 }, + { -12, 20, -6 }, + { -12, 20, 5 }, + { -5, 24, 11 }, + { -6, 20, 12 }, + { 5, 24, 11 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 11, 24, 5 }, + { 5, 24, 11 }, + { 6, 20, 12 }, + { 12, 20, 5 }, + { 11, 24, -5 }, + { 12, 20, -6 }, + { 5, 24, -11 }, + { 5, 20, -12 }, + { -5, 24, -11 }, + { -5, 20, -12 }, + { -11, 19, 15 }, + { -12, 20, 21 }, + { 11, 20, 21 }, + { 11, 19, 15 }, + { 15, 19, -11 }, + { 11, 18, -10 }, + { 12, 20, -6 }, + { 12, 20, 5 }, + { 10, 18, 11 }, + { 15, 19, 11 }, + { 11, 19, -15 }, + { 11, 20, -21 }, + { -12, 20, -21 }, + { -11, 19, -15 }, + { -15, 19, -11 }, + { -21, 20, -12 }, + { -21, 20, 12 }, + { -15, 19, 11 }, + { -8, 9, -32 }, + { 0, 11, -37 }, + { 8, 9, -32 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { 8, 9, 32 }, + { 0, 11, 37 }, + { -8, 9, 32 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { -32, 9, 8 }, + { -37, 11, 0 }, + { -32, 9, -8 }, + { -26, 8, 11 }, + { -26, 8, 11 }, + { -32, 9, -8 }, + { -26, 8, -11 }, + { 18, 9, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 18, 9, -11 }, + { 26, 8, -11 }, + { 32, 9, -8 }, + { 32, 9, 8 }, + { 26, 8, 11 }, + { 16, 15, 14 }, + { 23, 15, 14 }, + { 21, 20, 12 }, + { 15, 19, 11 }, + { 16, 15, 14 }, + { 12, 15, 13 }, + { 21, 20, -11 }, + { 15, 19, -11 }, + { 16, 15, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 15, -14 }, + { 23, 15, -14 }, + { 29, 22, -9 }, + { 29, 22, 9 }, + { 14, 15, -16 }, + { 14, 15, -23 }, + { 11, 20, -21 }, + { 11, 19, -15 }, + { 14, 15, -16 }, + { 13, 15, -12 }, + { 10, 10, -10 }, + { 11, 9, -18 }, + { -11, 9, -18 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { -11, 19, -15 }, + { -11, 18, -10 }, + { -5, 20, -12 }, + { 5, 20, -12 }, + { 11, 18, -10 }, + { 11, 19, -15 }, + { -14, 15, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 15, -16 }, + { -14, 15, -23 }, + { -16, 15, -14 }, + { -23, 15, -14 }, + { -21, 20, -12 }, + { -15, 19, -11 }, + { -16, 15, -14 }, + { -13, 15, -12 }, + { -10, 10, -10 }, + { -18, 9, -11 }, + { -15, 19, 11 }, + { -11, 18, 10 }, + { -12, 20, 5 }, + { -12, 20, -6 }, + { -16, 15, 14 }, + { -13, 15, 12 }, + { -16, 15, 14 }, + { -23, 15, 14 }, + { -26, 8, 11 }, + { -18, 9, 11 }, + { -26, 8, -11 }, + { -18, 9, -11 }, + { -14, 15, 16 }, + { -14, 15, 23 }, + { -12, 20, 21 }, + { -11, 19, 15 }, + { -14, 15, 16 }, + { -13, 15, 12 }, + { -10, 10, 10 }, + { -11, 9, 18 }, + { 11, 9, 18 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { 11, 19, 15 }, + { 10, 18, 11 }, + { 6, 20, 12 }, + { -6, 20, 12 }, + { -11, 18, 10 }, + { 14, 15, 16 }, + { 12, 15, 13 }, + { 14, 15, 16 }, + { 14, 15, 23 }, + { 9, 22, 29 }, + { 11, 20, 21 }, + { -9, 22, 29 }, + { -9, 21, -29 }, + { -12, 20, -21 }, + { 11, 20, -21 }, + { -9, 21, -29 }, + { 11, 20, -21 }, + { 9, 21, -29 }, + { -29, 22, 9 }, + { -21, 20, 12 }, + { -21, 20, -12 }, + { -29, 22, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 11 }, + { 5, 24, 11 }, + { 11, 24, 5 }, + { -11, 24, 5 }, + { 11, 24, -5 }, + { -11, 24, -5 }, + { 5, 24, -11 }, + { -5, 24, -11 }, + { 13, 20, -6 }, + { 11, 18, -11 }, + { 5, 20, -13 }, + { 8, 8, 32 }, + { 11, 8, 26 }, + { 14, 15, 24 }, + { 10, 15, 32 }, + { -32, 8, 8 }, + { -26, 8, 11 }, + { -24, 15, 14 }, + { -32, 15, 10 }, + { 9, 21, -30 }, + { 11, 20, -22 }, + { 14, 15, -24 }, + { 10, 15, -32 }, + { 32, 8, -8 }, + { 26, 8, -11 }, + { 24, 15, -14 }, + { 32, 15, -10 }, + { -11, 9, 18 }, + { -11, 8, 26 }, + { -14, 15, 24 }, + { -14, 15, 17 }, + { -18, 9, 11 }, + { -10, 10, 10 }, + { -13, 15, 13 }, + { -17, 15, 14 }, + { -18, 9, -11 }, + { -26, 8, -11 }, + { -24, 15, -14 }, + { -17, 15, -14 }, + { -11, 9, -18 }, + { -10, 10, -10 }, + { -13, 15, -13 }, + { -14, 15, -17 }, + { 11, 9, -18 }, + { 11, 8, -26 }, + { 14, 15, -24 }, + { 14, 15, -17 }, + { 18, 9, -11 }, + { 10, 10, -10 }, + { 13, 15, -13 }, + { 17, 15, -14 }, + { 18, 9, 11 }, + { 26, 8, 11 }, + { 24, 15, 14 }, + { 17, 15, 14 }, + { 11, 9, 18 }, + { 10, 10, 10 }, + { 13, 15, 13 }, + { 14, 15, 17 }, + { -9, 21, 30 }, + { -12, 20, 22 }, + { -14, 15, 24 }, + { -10, 15, 32 }, + { 11, 19, 16 }, + { 11, 20, 22 }, + { 14, 15, 24 }, + { 14, 15, 17 }, + { -11, 19, 16 }, + { -11, 18, 11 }, + { -13, 15, 13 }, + { -14, 15, 17 }, + { 15, 19, 11 }, + { 11, 18, 11 }, + { 13, 15, 13 }, + { 17, 15, 14 }, + { 30, 21, 9 }, + { 22, 20, 12 }, + { 24, 15, 14 }, + { 32, 15, 10 }, + { 16, 19, -11 }, + { 22, 20, -11 }, + { 24, 15, -14 }, + { 17, 15, -14 }, + { 11, 19, -16 }, + { 11, 18, -11 }, + { 13, 15, -13 }, + { 14, 15, -17 }, + { -11, 19, -16 }, + { -12, 20, -22 }, + { -14, 15, -24 }, + { -14, 15, -17 }, + { -16, 19, -11 }, + { -11, 18, -11 }, + { -13, 15, -13 }, + { -17, 15, -14 }, + { -30, 21, -9 }, + { -22, 20, -12 }, + { -24, 15, -14 }, + { -32, 15, -10 }, + { -16, 19, 11 }, + { -22, 20, 12 }, + { -24, 15, 14 }, + { -17, 15, 14 }, + { 9, 21, 30 }, + { 0, 20, 36 }, + { 0, 15, 39 }, + { 10, 15, 32 }, + { -10, 15, 32 }, + { -14, 15, 24 }, + { -11, 8, 26 }, + { -8, 8, 32 }, + { 32, 15, -10 }, + { 24, 15, -14 }, + { 22, 20, -11 }, + { 30, 21, -9 }, + { 32, 15, 10 }, + { 24, 15, 14 }, + { 26, 8, 11 }, + { 32, 8, 8 }, + { -10, 15, -32 }, + { -14, 15, -24 }, + { -12, 20, -22 }, + { -9, 21, -30 }, + { 10, 15, -32 }, + { 14, 15, -24 }, + { 11, 8, -26 }, + { 8, 8, -32 }, + { -32, 15, 10 }, + { -24, 15, 14 }, + { -22, 20, 12 }, + { -30, 21, 9 }, + { -32, 15, -10 }, + { -24, 15, -14 }, + { -26, 8, -11 }, + { -32, 8, -8 }, + { -30, 21, -9 }, + { -36, 20, 0 }, + { -30, 21, 9 }, + { -13, 20, 5 }, + { -11, 18, 11 }, + { -6, 20, 13 }, + { -5, 20, -13 }, + { -11, 18, -11 }, + { -13, 20, -6 }, + { 6, 20, 13 }, + { 11, 18, 11 }, + { 13, 20, 5 }, + { -5, 20, -13 }, + { -13, 20, -6 }, + { -12, 24, -5 }, + { -5, 24, -12 }, + { 30, 21, -9 }, + { 36, 20, 0 }, + { 39, 15, 0 }, + { 32, 15, -10 }, + { 32, 15, -10 }, + { 39, 15, 0 }, + { 37, 10, 0 }, + { 32, 8, -8 }, + { 32, 8, 8 }, + { 39, 15, 0 }, + { 32, 15, 10 }, + { 32, 15, 10 }, + { 39, 15, 0 }, + { 30, 21, 9 }, + { 8, 8, -32 }, + { 0, 10, -37 }, + { 0, 15, -39 }, + { 0, 15, -39 }, + { 10, 15, -32 }, + { 10, 15, -32 }, + { 0, 15, -39 }, + { 0, 20, -36 }, + { 9, 21, -30 }, + { -9, 21, -30 }, + { 0, 15, -39 }, + { -10, 15, -32 }, + { -10, 15, -32 }, + { 0, 15, -39 }, + { -8, 8, -32 }, + { -32, 15, -10 }, + { -39, 15, 0 }, + { -36, 20, 0 }, + { -36, 20, 0 }, + { -30, 21, -9 }, + { -32, 8, -8 }, + { -37, 10, 0 }, + { -39, 15, 0 }, + { -32, 15, -10 }, + { -30, 21, 9 }, + { -39, 15, 0 }, + { -32, 15, 10 }, + { -32, 15, 10 }, + { -39, 15, 0 }, + { -32, 8, 8 }, + { -10, 15, 32 }, + { 0, 15, 39 }, + { 0, 20, 36 }, + { -9, 21, 30 }, + { -8, 8, 32 }, + { 0, 10, 37 }, + { 0, 15, 39 }, + { -10, 15, 32 }, + { 10, 15, 32 }, + { 0, 15, 39 }, + { 8, 8, 32 }, + { 10, 15, 32 }, + { 14, 15, 24 }, + { 11, 20, 22 }, + { 9, 21, 30 }, + { -18, 9, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -18, 9, 11 }, + { -11, 9, 18 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 9, 18 }, + { 32, 8, -8 }, + { 37, 10, 0 }, + { 32, 8, 8 }, + { 30, 21, 9 }, + { 36, 20, 0 }, + { 30, 21, -9 }, + { 9, 21, -30 }, + { 0, 20, -36 }, + { -9, 21, -30 }, + { -11, 8, -26 }, + { -14, 15, -24 }, + { -10, 15, -32 }, + { -8, 8, -32 }, + { 11, 9, -18 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 9, -18 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -12, 24, 5 }, + { -12, 24, -5 }, + { -13, 20, -6 }, + { -13, 20, 5 }, + { -5, 24, 12 }, + { -6, 20, 13 }, + { 5, 24, 12 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 11, 24, 5 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 13, 20, 5 }, + { 11, 24, -5 }, + { 13, 20, -6 }, + { 5, 24, -12 }, + { 5, 20, -13 }, + { -5, 24, -12 }, + { -5, 20, -13 }, + { -11, 19, 16 }, + { -12, 20, 22 }, + { 11, 20, 22 }, + { 11, 19, 16 }, + { 16, 19, -11 }, + { 11, 18, -11 }, + { 13, 20, -6 }, + { 13, 20, 5 }, + { 11, 18, 11 }, + { 15, 19, 11 }, + { 11, 19, -16 }, + { 11, 20, -22 }, + { -12, 20, -22 }, + { -11, 19, -16 }, + { -16, 19, -11 }, + { -22, 20, -12 }, + { -22, 20, 12 }, + { -16, 19, 11 }, + { -8, 8, -32 }, + { 0, 10, -37 }, + { 8, 8, -32 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { 8, 8, 32 }, + { 0, 10, 37 }, + { -8, 8, 32 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { -32, 8, 8 }, + { -37, 10, 0 }, + { -32, 8, -8 }, + { -26, 8, 11 }, + { -26, 8, 11 }, + { -32, 8, -8 }, + { -26, 8, -11 }, + { 18, 9, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 18, 9, -11 }, + { 26, 8, -11 }, + { 32, 8, -8 }, + { 32, 8, 8 }, + { 26, 8, 11 }, + { 17, 15, 14 }, + { 24, 15, 14 }, + { 22, 20, 12 }, + { 15, 19, 11 }, + { 17, 15, 14 }, + { 13, 15, 13 }, + { 22, 20, -11 }, + { 16, 19, -11 }, + { 17, 15, -14 }, + { 13, 15, -13 }, + { 11, 18, -11 }, + { 17, 15, -14 }, + { 24, 15, -14 }, + { 30, 21, -9 }, + { 30, 21, 9 }, + { 14, 15, -17 }, + { 14, 15, -24 }, + { 11, 20, -22 }, + { 11, 19, -16 }, + { 14, 15, -17 }, + { 13, 15, -13 }, + { 10, 10, -10 }, + { 11, 9, -18 }, + { -11, 9, -18 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { -11, 19, -16 }, + { -11, 18, -11 }, + { -5, 20, -13 }, + { 5, 20, -13 }, + { 11, 18, -11 }, + { 11, 19, -16 }, + { -14, 15, -17 }, + { -13, 15, -13 }, + { -11, 18, -11 }, + { -14, 15, -17 }, + { -14, 15, -24 }, + { -17, 15, -14 }, + { -24, 15, -14 }, + { -22, 20, -12 }, + { -16, 19, -11 }, + { -17, 15, -14 }, + { -13, 15, -13 }, + { -10, 10, -10 }, + { -18, 9, -11 }, + { -16, 19, 11 }, + { -11, 18, 11 }, + { -13, 20, 5 }, + { -13, 20, -6 }, + { -17, 15, 14 }, + { -13, 15, 13 }, + { -17, 15, 14 }, + { -24, 15, 14 }, + { -26, 8, 11 }, + { -18, 9, 11 }, + { -26, 8, -11 }, + { -18, 9, -11 }, + { -14, 15, 17 }, + { -14, 15, 24 }, + { -12, 20, 22 }, + { -11, 19, 16 }, + { -14, 15, 17 }, + { -13, 15, 13 }, + { -10, 10, 10 }, + { -11, 9, 18 }, + { 11, 9, 18 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { 11, 19, 16 }, + { 11, 18, 11 }, + { 6, 20, 13 }, + { -6, 20, 13 }, + { -11, 18, 11 }, + { 14, 15, 17 }, + { 13, 15, 13 }, + { 14, 15, 17 }, + { 14, 15, 24 }, + { 9, 21, 30 }, + { 11, 20, 22 }, + { -9, 21, 30 }, + { -9, 21, -30 }, + { -12, 20, -22 }, + { 11, 20, -22 }, + { -9, 21, -30 }, + { 11, 20, -22 }, + { 9, 21, -30 }, + { -30, 21, 9 }, + { -22, 20, 12 }, + { -22, 20, -12 }, + { -30, 21, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 12 }, + { 5, 24, 12 }, + { 11, 24, 5 }, + { -12, 24, 5 }, + { 11, 24, -5 }, + { -12, 24, -5 }, + { 5, 24, -12 }, + { -5, 24, -12 }, +}; + +Gfx Entity_MunchlesiaReset1_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A006840_E980D0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset1_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaReset1.png.inc.c" diff --git a/src/entity/model/MunchlesiaReset_anim.c b/src/entity/model/MunchlesiaReset_anim.c new file mode 100644 index 0000000000..2d8be0e6c6 --- /dev/null +++ b/src/entity/model/MunchlesiaReset_anim.c @@ -0,0 +1,234 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_MunchlesiaReset_Render[]; +extern Vtx D_0A000000_E6E660[]; + +AnimScript Entity_MunchlesiaReset_AnimationIdle = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_Restart + as_End +}; + +AnimScript Entity_MunchlesiaReset_AnimationReset = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 2, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 4, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 5, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 4, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 4, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node8 = { + .displayList = Entity_MunchlesiaReset_Render, + .pos = { 0.0f, 4.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node7 = { + .displayList = Entity_MunchlesiaReset_Render, + .pos = { 0.0f, 4.0f, 0.0f }, + .sibling = &Entity_MunchlesiaReset_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node6 = { + .displayList = Entity_MunchlesiaReset_Render, + .pos = { 0.0f, 5.0f, 0.0f }, + .sibling = &Entity_MunchlesiaReset_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node5 = { + .displayList = Entity_MunchlesiaReset_Render, + .pos = { 0.0f, 4.0f, 0.0f }, + .sibling = &Entity_MunchlesiaReset_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node4 = { + .displayList = Entity_MunchlesiaReset_Render, + .pos = { 0.0f, 2.0f, 0.0f }, + .sibling = &Entity_MunchlesiaReset_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node3 = { + .displayList = Entity_MunchlesiaReset_Render, + .sibling = &Entity_MunchlesiaReset_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node2 = { + .displayList = Entity_MunchlesiaReset_Render, + .sibling = &Entity_MunchlesiaReset_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E6E660, +}; + +StaticAnimatorNode Entity_MunchlesiaReset_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaReset_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaReset_Mesh[] = { + &Entity_MunchlesiaReset_Node1, + &Entity_MunchlesiaReset_Node2, + &Entity_MunchlesiaReset_Node3, + &Entity_MunchlesiaReset_Node4, + &Entity_MunchlesiaReset_Node5, + &Entity_MunchlesiaReset_Node6, + &Entity_MunchlesiaReset_Node7, + &Entity_MunchlesiaReset_Node8, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaReset_gfx.c b/src/entity/model/MunchlesiaReset_gfx.c new file mode 100644 index 0000000000..b8f5fb9408 --- /dev/null +++ b/src/entity/model/MunchlesiaReset_gfx.c @@ -0,0 +1,2944 @@ +#include "common.h" + +extern unsigned char D_0A005EE8_E74548[]; + +#include "entity/model/MunchlesiaReset.vtx.inc.c" + +Vec3s Entity_MunchlesiaReset_vertexArray[] = { + { 13, 20, -6 }, + { 11, 18, -11 }, + { 5, 20, -13 }, + { 8, 8, 32 }, + { 11, 8, 26 }, + { 14, 15, 24 }, + { 10, 15, 32 }, + { -32, 8, 8 }, + { -26, 8, 11 }, + { -24, 15, 14 }, + { -32, 15, 10 }, + { 9, 21, -30 }, + { 11, 20, -22 }, + { 14, 15, -24 }, + { 10, 15, -32 }, + { 32, 8, -8 }, + { 26, 8, -11 }, + { 24, 15, -14 }, + { 32, 15, -10 }, + { -11, 9, 18 }, + { -11, 8, 26 }, + { -14, 15, 24 }, + { -14, 15, 17 }, + { -18, 9, 11 }, + { -10, 10, 10 }, + { -13, 15, 13 }, + { -17, 15, 14 }, + { -18, 9, -11 }, + { -26, 8, -11 }, + { -24, 15, -14 }, + { -17, 15, -14 }, + { -11, 9, -18 }, + { -10, 10, -10 }, + { -13, 15, -13 }, + { -14, 15, -17 }, + { 11, 9, -18 }, + { 11, 8, -26 }, + { 14, 15, -24 }, + { 14, 15, -17 }, + { 18, 9, -11 }, + { 10, 10, -10 }, + { 13, 15, -13 }, + { 17, 15, -14 }, + { 18, 9, 11 }, + { 26, 8, 11 }, + { 24, 15, 14 }, + { 17, 15, 14 }, + { 11, 9, 18 }, + { 10, 10, 10 }, + { 13, 15, 13 }, + { 14, 15, 17 }, + { -9, 21, 30 }, + { -12, 20, 22 }, + { -14, 15, 24 }, + { -10, 15, 32 }, + { 11, 19, 16 }, + { 11, 20, 22 }, + { 14, 15, 24 }, + { 14, 15, 17 }, + { -11, 19, 16 }, + { -11, 18, 11 }, + { -13, 15, 13 }, + { -14, 15, 17 }, + { 15, 19, 11 }, + { 11, 18, 11 }, + { 13, 15, 13 }, + { 17, 15, 14 }, + { 30, 21, 9 }, + { 22, 20, 12 }, + { 24, 15, 14 }, + { 32, 15, 10 }, + { 16, 19, -11 }, + { 22, 20, -11 }, + { 24, 15, -14 }, + { 17, 15, -14 }, + { 11, 19, -16 }, + { 11, 18, -11 }, + { 13, 15, -13 }, + { 14, 15, -17 }, + { -11, 19, -16 }, + { -12, 20, -22 }, + { -14, 15, -24 }, + { -14, 15, -17 }, + { -16, 19, -11 }, + { -11, 18, -11 }, + { -13, 15, -13 }, + { -17, 15, -14 }, + { -30, 21, -9 }, + { -22, 20, -12 }, + { -24, 15, -14 }, + { -32, 15, -10 }, + { -16, 19, 11 }, + { -22, 20, 12 }, + { -24, 15, 14 }, + { -17, 15, 14 }, + { 9, 21, 30 }, + { 0, 20, 36 }, + { 0, 15, 39 }, + { 10, 15, 32 }, + { -10, 15, 32 }, + { -14, 15, 24 }, + { -11, 8, 26 }, + { -8, 8, 32 }, + { 32, 15, -10 }, + { 24, 15, -14 }, + { 22, 20, -11 }, + { 30, 21, -9 }, + { 32, 15, 10 }, + { 24, 15, 14 }, + { 26, 8, 11 }, + { 32, 8, 8 }, + { -10, 15, -32 }, + { -14, 15, -24 }, + { -12, 20, -22 }, + { -9, 21, -30 }, + { 10, 15, -32 }, + { 14, 15, -24 }, + { 11, 8, -26 }, + { 8, 8, -32 }, + { -32, 15, 10 }, + { -24, 15, 14 }, + { -22, 20, 12 }, + { -30, 21, 9 }, + { -32, 15, -10 }, + { -24, 15, -14 }, + { -26, 8, -11 }, + { -32, 8, -8 }, + { -30, 21, -9 }, + { -36, 20, 0 }, + { -30, 21, 9 }, + { -13, 20, 5 }, + { -11, 18, 11 }, + { -6, 20, 13 }, + { -5, 20, -13 }, + { -11, 18, -11 }, + { -13, 20, -6 }, + { 6, 20, 13 }, + { 11, 18, 11 }, + { 13, 20, 5 }, + { -5, 20, -13 }, + { -13, 20, -6 }, + { -12, 24, -5 }, + { -5, 24, -12 }, + { 30, 21, -9 }, + { 36, 20, 0 }, + { 39, 15, 0 }, + { 32, 15, -10 }, + { 32, 15, -10 }, + { 39, 15, 0 }, + { 37, 10, 0 }, + { 32, 8, -8 }, + { 32, 8, 8 }, + { 39, 15, 0 }, + { 32, 15, 10 }, + { 32, 15, 10 }, + { 39, 15, 0 }, + { 30, 21, 9 }, + { 8, 8, -32 }, + { 0, 10, -37 }, + { 0, 15, -39 }, + { 0, 15, -39 }, + { 10, 15, -32 }, + { 10, 15, -32 }, + { 0, 15, -39 }, + { 0, 20, -36 }, + { 9, 21, -30 }, + { -9, 21, -30 }, + { 0, 15, -39 }, + { -10, 15, -32 }, + { -10, 15, -32 }, + { 0, 15, -39 }, + { -8, 8, -32 }, + { -32, 15, -10 }, + { -39, 15, 0 }, + { -36, 20, 0 }, + { -36, 20, 0 }, + { -30, 21, -9 }, + { -32, 8, -8 }, + { -37, 10, 0 }, + { -39, 15, 0 }, + { -32, 15, -10 }, + { -30, 21, 9 }, + { -39, 15, 0 }, + { -32, 15, 10 }, + { -32, 15, 10 }, + { -39, 15, 0 }, + { -32, 8, 8 }, + { -10, 15, 32 }, + { 0, 15, 39 }, + { 0, 20, 36 }, + { -9, 21, 30 }, + { -8, 8, 32 }, + { 0, 10, 37 }, + { 0, 15, 39 }, + { -10, 15, 32 }, + { 10, 15, 32 }, + { 0, 15, 39 }, + { 8, 8, 32 }, + { 10, 15, 32 }, + { 14, 15, 24 }, + { 11, 20, 22 }, + { 9, 21, 30 }, + { -18, 9, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -18, 9, 11 }, + { -11, 9, 18 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 9, 18 }, + { 32, 8, -8 }, + { 37, 10, 0 }, + { 32, 8, 8 }, + { 30, 21, 9 }, + { 36, 20, 0 }, + { 30, 21, -9 }, + { 9, 21, -30 }, + { 0, 20, -36 }, + { -9, 21, -30 }, + { -11, 8, -26 }, + { -14, 15, -24 }, + { -10, 15, -32 }, + { -8, 8, -32 }, + { 11, 9, -18 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 9, -18 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -12, 24, 5 }, + { -12, 24, -5 }, + { -13, 20, -6 }, + { -13, 20, 5 }, + { -5, 24, 12 }, + { -6, 20, 13 }, + { 5, 24, 12 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 11, 24, 5 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 13, 20, 5 }, + { 11, 24, -5 }, + { 13, 20, -6 }, + { 5, 24, -12 }, + { 5, 20, -13 }, + { -5, 24, -12 }, + { -5, 20, -13 }, + { -11, 19, 16 }, + { -12, 20, 22 }, + { 11, 20, 22 }, + { 11, 19, 16 }, + { 16, 19, -11 }, + { 11, 18, -11 }, + { 13, 20, -6 }, + { 13, 20, 5 }, + { 11, 18, 11 }, + { 15, 19, 11 }, + { 11, 19, -16 }, + { 11, 20, -22 }, + { -12, 20, -22 }, + { -11, 19, -16 }, + { -16, 19, -11 }, + { -22, 20, -12 }, + { -22, 20, 12 }, + { -16, 19, 11 }, + { -8, 8, -32 }, + { 0, 10, -37 }, + { 8, 8, -32 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { 8, 8, 32 }, + { 0, 10, 37 }, + { -8, 8, 32 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { -32, 8, 8 }, + { -37, 10, 0 }, + { -32, 8, -8 }, + { -26, 8, 11 }, + { -26, 8, 11 }, + { -32, 8, -8 }, + { -26, 8, -11 }, + { 18, 9, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 18, 9, -11 }, + { 26, 8, -11 }, + { 32, 8, -8 }, + { 32, 8, 8 }, + { 26, 8, 11 }, + { 17, 15, 14 }, + { 24, 15, 14 }, + { 22, 20, 12 }, + { 15, 19, 11 }, + { 17, 15, 14 }, + { 13, 15, 13 }, + { 22, 20, -11 }, + { 16, 19, -11 }, + { 17, 15, -14 }, + { 13, 15, -13 }, + { 11, 18, -11 }, + { 17, 15, -14 }, + { 24, 15, -14 }, + { 30, 21, -9 }, + { 30, 21, 9 }, + { 14, 15, -17 }, + { 14, 15, -24 }, + { 11, 20, -22 }, + { 11, 19, -16 }, + { 14, 15, -17 }, + { 13, 15, -13 }, + { 10, 10, -10 }, + { 11, 9, -18 }, + { -11, 9, -18 }, + { -11, 8, -26 }, + { 11, 8, -26 }, + { -11, 19, -16 }, + { -11, 18, -11 }, + { -5, 20, -13 }, + { 5, 20, -13 }, + { 11, 18, -11 }, + { 11, 19, -16 }, + { -14, 15, -17 }, + { -13, 15, -13 }, + { -11, 18, -11 }, + { -14, 15, -17 }, + { -14, 15, -24 }, + { -17, 15, -14 }, + { -24, 15, -14 }, + { -22, 20, -12 }, + { -16, 19, -11 }, + { -17, 15, -14 }, + { -13, 15, -13 }, + { -10, 10, -10 }, + { -18, 9, -11 }, + { -16, 19, 11 }, + { -11, 18, 11 }, + { -13, 20, 5 }, + { -13, 20, -6 }, + { -17, 15, 14 }, + { -13, 15, 13 }, + { -17, 15, 14 }, + { -24, 15, 14 }, + { -26, 8, 11 }, + { -18, 9, 11 }, + { -26, 8, -11 }, + { -18, 9, -11 }, + { -14, 15, 17 }, + { -14, 15, 24 }, + { -12, 20, 22 }, + { -11, 19, 16 }, + { -14, 15, 17 }, + { -13, 15, 13 }, + { -10, 10, 10 }, + { -11, 9, 18 }, + { 11, 9, 18 }, + { 11, 8, 26 }, + { -11, 8, 26 }, + { 11, 19, 16 }, + { 11, 18, 11 }, + { 6, 20, 13 }, + { -6, 20, 13 }, + { -11, 18, 11 }, + { 14, 15, 17 }, + { 13, 15, 13 }, + { 14, 15, 17 }, + { 14, 15, 24 }, + { 9, 21, 30 }, + { 11, 20, 22 }, + { -9, 21, 30 }, + { -9, 21, -30 }, + { -12, 20, -22 }, + { 11, 20, -22 }, + { -9, 21, -30 }, + { 11, 20, -22 }, + { 9, 21, -30 }, + { -30, 21, 9 }, + { -22, 20, 12 }, + { -22, 20, -12 }, + { -30, 21, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 12 }, + { 5, 24, 12 }, + { 11, 24, 5 }, + { -12, 24, 5 }, + { 11, 24, -5 }, + { -12, 24, -5 }, + { 5, 24, -12 }, + { -5, 24, -12 }, + { 13, 19, -6 }, + { 11, 17, -11 }, + { 5, 19, -13 }, + { 8, 5, 29 }, + { 11, 6, 24 }, + { 14, 13, 23 }, + { 10, 11, 31 }, + { -29, 5, 8 }, + { -24, 6, 11 }, + { -23, 13, 14 }, + { -31, 11, 9 }, + { 9, 18, -31 }, + { 11, 19, -22 }, + { 14, 13, -23 }, + { 10, 12, -31 }, + { 29, 5, -8 }, + { 24, 6, -11 }, + { 23, 13, -14 }, + { 31, 11, -10 }, + { -11, 8, 17 }, + { -11, 6, 24 }, + { -14, 13, 23 }, + { -14, 14, 16 }, + { -17, 8, 11 }, + { -10, 10, 9 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -17, 8, -11 }, + { -24, 6, -11 }, + { -23, 13, -14 }, + { -16, 14, -14 }, + { -11, 8, -17 }, + { -9, 10, -10 }, + { -13, 14, -12 }, + { -14, 14, -16 }, + { 11, 8, -17 }, + { 11, 6, -24 }, + { 14, 13, -23 }, + { 14, 14, -16 }, + { 17, 8, -11 }, + { 10, 10, -9 }, + { 13, 14, -12 }, + { 16, 14, -14 }, + { 17, 8, 11 }, + { 24, 6, 11 }, + { 23, 13, 14 }, + { 16, 14, 14 }, + { 11, 8, 17 }, + { 9, 10, 10 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { -9, 18, 31 }, + { -12, 19, 22 }, + { -14, 13, 23 }, + { -10, 11, 31 }, + { 11, 18, 16 }, + { 11, 19, 22 }, + { 14, 13, 23 }, + { 14, 14, 16 }, + { -11, 18, 16 }, + { -11, 17, 11 }, + { -13, 14, 12 }, + { -14, 14, 16 }, + { 16, 18, 11 }, + { 11, 17, 11 }, + { 12, 14, 13 }, + { 16, 14, 14 }, + { 31, 18, 9 }, + { 22, 19, 12 }, + { 23, 13, 14 }, + { 31, 11, 9 }, + { 16, 18, -11 }, + { 22, 19, -11 }, + { 23, 13, -14 }, + { 16, 14, -14 }, + { 11, 18, -16 }, + { 11, 17, -11 }, + { 13, 14, -12 }, + { 14, 14, -16 }, + { -11, 18, -16 }, + { -12, 19, -22 }, + { -14, 13, -23 }, + { -14, 14, -16 }, + { -16, 18, -11 }, + { -11, 17, -11 }, + { -13, 14, -12 }, + { -16, 14, -14 }, + { -31, 18, -9 }, + { -22, 19, -12 }, + { -23, 13, -14 }, + { -31, 11, -10 }, + { -16, 18, 11 }, + { -22, 19, 12 }, + { -23, 13, 14 }, + { -16, 14, 14 }, + { 9, 18, 31 }, + { 0, 15, 37 }, + { 0, 9, 38 }, + { 10, 11, 31 }, + { -10, 11, 31 }, + { -14, 13, 23 }, + { -11, 6, 24 }, + { -8, 5, 29 }, + { 31, 11, -10 }, + { 23, 13, -14 }, + { 22, 19, -11 }, + { 31, 18, -9 }, + { 31, 11, 9 }, + { 23, 13, 14 }, + { 24, 6, 11 }, + { 29, 5, 8 }, + { -10, 12, -31 }, + { -14, 13, -23 }, + { -12, 19, -22 }, + { -9, 18, -31 }, + { 10, 12, -31 }, + { 14, 13, -23 }, + { 11, 6, -24 }, + { 8, 5, -29 }, + { -31, 11, 9 }, + { -23, 13, 14 }, + { -22, 19, 12 }, + { -31, 18, 9 }, + { -31, 11, -10 }, + { -23, 13, -14 }, + { -24, 6, -11 }, + { -29, 5, -8 }, + { -31, 18, -9 }, + { -37, 15, 0 }, + { -31, 18, 9 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -5, 19, -13 }, + { -11, 17, -11 }, + { -13, 19, -6 }, + { 6, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -5, 19, -13 }, + { -13, 19, -6 }, + { -12, 23, -5 }, + { -5, 23, -12 }, + { 31, 18, -9 }, + { 37, 15, 0 }, + { 38, 9, 0 }, + { 31, 11, -10 }, + { 31, 11, -10 }, + { 38, 9, 0 }, + { 34, 5, 0 }, + { 29, 5, -8 }, + { 29, 5, 8 }, + { 38, 9, 0 }, + { 31, 11, 9 }, + { 31, 11, 9 }, + { 38, 9, 0 }, + { 31, 18, 9 }, + { 8, 5, -29 }, + { 0, 5, -34 }, + { 0, 9, -38 }, + { 0, 9, -38 }, + { 10, 12, -31 }, + { 10, 12, -31 }, + { 0, 9, -38 }, + { 0, 15, -37 }, + { 9, 18, -31 }, + { -9, 18, -31 }, + { 0, 9, -38 }, + { -10, 12, -31 }, + { -10, 12, -31 }, + { 0, 9, -38 }, + { -8, 5, -29 }, + { -31, 11, -10 }, + { -38, 9, 0 }, + { -37, 15, 0 }, + { -37, 15, 0 }, + { -31, 18, -9 }, + { -29, 5, -8 }, + { -34, 5, 0 }, + { -38, 9, 0 }, + { -31, 11, -10 }, + { -31, 18, 9 }, + { -38, 9, 0 }, + { -31, 11, 9 }, + { -31, 11, 9 }, + { -38, 9, 0 }, + { -29, 5, 8 }, + { -10, 11, 31 }, + { 0, 9, 38 }, + { 0, 15, 37 }, + { -9, 18, 31 }, + { -8, 5, 29 }, + { 0, 5, 34 }, + { 0, 9, 38 }, + { -10, 11, 31 }, + { 10, 11, 31 }, + { 0, 9, 38 }, + { 8, 5, 29 }, + { 10, 11, 31 }, + { 14, 13, 23 }, + { 11, 19, 22 }, + { 9, 18, 31 }, + { -17, 8, -11 }, + { -9, 10, -10 }, + { -10, 10, 9 }, + { -17, 8, 11 }, + { -11, 8, 17 }, + { -10, 10, 9 }, + { 9, 10, 10 }, + { 11, 8, 17 }, + { 29, 5, -8 }, + { 34, 5, 0 }, + { 29, 5, 8 }, + { 31, 18, 9 }, + { 37, 15, 0 }, + { 31, 18, -9 }, + { 9, 18, -31 }, + { 0, 15, -37 }, + { -9, 18, -31 }, + { -11, 6, -24 }, + { -14, 13, -23 }, + { -10, 12, -31 }, + { -8, 5, -29 }, + { 11, 8, -17 }, + { 10, 10, -9 }, + { -9, 10, -10 }, + { -11, 8, -17 }, + { -10, 10, 9 }, + { -9, 10, -10 }, + { 0, 0, 0 }, + { -12, 23, 5 }, + { -12, 23, -5 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 12 }, + { -6, 19, 13 }, + { 5, 23, 12 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 12, 23, 5 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 13, 19, 5 }, + { 12, 23, -5 }, + { 13, 19, -6 }, + { 5, 23, -12 }, + { 5, 19, -13 }, + { -5, 23, -12 }, + { -5, 19, -13 }, + { -11, 18, 16 }, + { -12, 19, 22 }, + { 11, 19, 22 }, + { 11, 18, 16 }, + { 16, 18, -11 }, + { 11, 17, -11 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 16, 18, 11 }, + { 11, 18, -16 }, + { 11, 19, -22 }, + { -12, 19, -22 }, + { -11, 18, -16 }, + { -16, 18, -11 }, + { -22, 19, -12 }, + { -22, 19, 12 }, + { -16, 18, 11 }, + { -8, 5, -29 }, + { 0, 5, -34 }, + { 8, 5, -29 }, + { -11, 6, -24 }, + { 11, 6, -24 }, + { 8, 5, 29 }, + { 0, 5, 34 }, + { -8, 5, 29 }, + { 11, 6, 24 }, + { -11, 6, 24 }, + { -29, 5, 8 }, + { -34, 5, 0 }, + { -29, 5, -8 }, + { -24, 6, 11 }, + { -24, 6, 11 }, + { -29, 5, -8 }, + { -24, 6, -11 }, + { 17, 8, 11 }, + { 9, 10, 10 }, + { 10, 10, -9 }, + { 17, 8, -11 }, + { 24, 6, -11 }, + { 29, 5, -8 }, + { 29, 5, 8 }, + { 24, 6, 11 }, + { 16, 14, 14 }, + { 23, 13, 14 }, + { 22, 19, 12 }, + { 16, 18, 11 }, + { 16, 14, 14 }, + { 12, 14, 13 }, + { 22, 19, -11 }, + { 16, 18, -11 }, + { 16, 14, -14 }, + { 13, 14, -12 }, + { 11, 17, -11 }, + { 16, 14, -14 }, + { 23, 13, -14 }, + { 31, 18, -9 }, + { 31, 18, 9 }, + { 14, 14, -16 }, + { 14, 13, -23 }, + { 11, 19, -22 }, + { 11, 18, -16 }, + { 14, 14, -16 }, + { 13, 14, -12 }, + { 10, 10, -9 }, + { 11, 8, -17 }, + { -11, 8, -17 }, + { -11, 6, -24 }, + { 11, 6, -24 }, + { -11, 18, -16 }, + { -11, 17, -11 }, + { -5, 19, -13 }, + { 5, 19, -13 }, + { 11, 17, -11 }, + { 11, 18, -16 }, + { -14, 14, -16 }, + { -13, 14, -12 }, + { -11, 17, -11 }, + { -14, 14, -16 }, + { -14, 13, -23 }, + { -16, 14, -14 }, + { -23, 13, -14 }, + { -22, 19, -12 }, + { -16, 18, -11 }, + { -16, 14, -14 }, + { -13, 14, -12 }, + { -9, 10, -10 }, + { -17, 8, -11 }, + { -16, 18, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -16, 14, 14 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -23, 13, 14 }, + { -24, 6, 11 }, + { -17, 8, 11 }, + { -24, 6, -11 }, + { -17, 8, -11 }, + { -14, 14, 16 }, + { -14, 13, 23 }, + { -12, 19, 22 }, + { -11, 18, 16 }, + { -14, 14, 16 }, + { -13, 14, 12 }, + { -10, 10, 9 }, + { -11, 8, 17 }, + { 11, 8, 17 }, + { 11, 6, 24 }, + { -11, 6, 24 }, + { 11, 18, 16 }, + { 11, 17, 11 }, + { 6, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 14, 16 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { 14, 13, 23 }, + { 9, 18, 31 }, + { 11, 19, 22 }, + { -9, 18, 31 }, + { -9, 18, -31 }, + { -12, 19, -22 }, + { 11, 19, -22 }, + { -9, 18, -31 }, + { 11, 19, -22 }, + { 9, 18, -31 }, + { -31, 18, 9 }, + { -22, 19, 12 }, + { -22, 19, -12 }, + { -31, 18, -9 }, + { 10, 10, -9 }, + { 9, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 9, 10, 10 }, + { -10, 10, 9 }, + { 0, 0, 0 }, + { -9, 10, -10 }, + { 10, 10, -9 }, + { -5, 23, 12 }, + { 5, 23, 12 }, + { 12, 23, 5 }, + { -12, 23, 5 }, + { 12, 23, -5 }, + { -12, 23, -5 }, + { 5, 23, -12 }, + { -5, 23, -12 }, + { 13, 19, -6 }, + { 11, 17, -11 }, + { 5, 19, -13 }, + { 8, 2, 23 }, + { 11, 5, 20 }, + { 14, 11, 23 }, + { 10, 6, 29 }, + { -23, 2, 8 }, + { -20, 5, 11 }, + { -23, 11, 14 }, + { -29, 6, 10 }, + { 9, 11, -32 }, + { 11, 17, -23 }, + { 14, 11, -23 }, + { 10, 6, -29 }, + { 23, 2, -8 }, + { 20, 5, -11 }, + { 23, 11, -14 }, + { 29, 6, -10 }, + { -11, 8, 16 }, + { -11, 5, 20 }, + { -14, 11, 23 }, + { -14, 14, 16 }, + { -16, 8, 11 }, + { -10, 10, 9 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -16, 8, -11 }, + { -20, 5, -11 }, + { -23, 11, -14 }, + { -16, 14, -14 }, + { -11, 8, -16 }, + { -9, 10, -10 }, + { -13, 14, -12 }, + { -14, 14, -16 }, + { 11, 8, -16 }, + { 11, 5, -20 }, + { 14, 11, -23 }, + { 14, 14, -16 }, + { 16, 8, -11 }, + { 10, 10, -9 }, + { 13, 14, -12 }, + { 16, 14, -14 }, + { 16, 8, 11 }, + { 20, 5, 11 }, + { 23, 11, 14 }, + { 16, 14, 14 }, + { 11, 8, 16 }, + { 9, 10, 10 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { -9, 11, 32 }, + { -12, 16, 23 }, + { -14, 11, 23 }, + { -10, 6, 29 }, + { 11, 18, 17 }, + { 11, 16, 23 }, + { 14, 11, 23 }, + { 14, 14, 16 }, + { -11, 18, 17 }, + { -11, 17, 11 }, + { -13, 14, 12 }, + { -14, 14, 16 }, + { 17, 18, 11 }, + { 11, 17, 11 }, + { 12, 14, 13 }, + { 16, 14, 14 }, + { 32, 11, 9 }, + { 23, 16, 12 }, + { 23, 11, 14 }, + { 29, 6, 10 }, + { 17, 18, -11 }, + { 23, 16, -11 }, + { 23, 11, -14 }, + { 16, 14, -14 }, + { 11, 18, -16 }, + { 11, 17, -11 }, + { 13, 14, -12 }, + { 14, 14, -16 }, + { -11, 18, -16 }, + { -12, 17, -23 }, + { -14, 11, -23 }, + { -14, 14, -16 }, + { -17, 18, -11 }, + { -11, 17, -11 }, + { -13, 14, -12 }, + { -16, 14, -14 }, + { -32, 11, -9 }, + { -23, 16, -11 }, + { -23, 11, -14 }, + { -29, 6, -10 }, + { -17, 18, 11 }, + { -23, 16, 12 }, + { -23, 11, 14 }, + { -16, 14, 14 }, + { 9, 11, 32 }, + { 0, 4, 35 }, + { 0, 0, 32 }, + { 10, 6, 29 }, + { -10, 6, 29 }, + { -14, 11, 23 }, + { -11, 5, 20 }, + { -8, 2, 23 }, + { 29, 6, -10 }, + { 23, 11, -14 }, + { 23, 16, -11 }, + { 32, 11, -9 }, + { 29, 6, 10 }, + { 23, 11, 14 }, + { 20, 5, 11 }, + { 23, 2, 8 }, + { -10, 6, -29 }, + { -14, 11, -23 }, + { -12, 17, -23 }, + { -9, 11, -32 }, + { 10, 6, -29 }, + { 14, 11, -23 }, + { 11, 5, -20 }, + { 8, 2, -23 }, + { -29, 6, 10 }, + { -23, 11, 14 }, + { -23, 16, 12 }, + { -32, 11, 9 }, + { -29, 6, -10 }, + { -23, 11, -14 }, + { -20, 5, -11 }, + { -23, 2, -8 }, + { -32, 11, -9 }, + { -35, 4, 0 }, + { -32, 11, 9 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -5, 19, -13 }, + { -11, 17, -11 }, + { -13, 19, -6 }, + { 6, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -5, 19, -13 }, + { -13, 19, -6 }, + { -12, 23, -5 }, + { -5, 23, -12 }, + { 32, 11, -9 }, + { 35, 4, 0 }, + { 32, 0, 0 }, + { 29, 6, -10 }, + { 29, 6, -10 }, + { 32, 0, 0 }, + { 26, 0, 0 }, + { 23, 2, -8 }, + { 23, 2, 8 }, + { 32, 0, 0 }, + { 29, 6, 10 }, + { 29, 6, 10 }, + { 32, 0, 0 }, + { 32, 11, 9 }, + { 8, 2, -23 }, + { 0, 0, -27 }, + { 0, 0, -32 }, + { 0, 0, -32 }, + { 10, 6, -29 }, + { 10, 6, -29 }, + { 0, 0, -32 }, + { 0, 5, -36 }, + { 9, 11, -32 }, + { -9, 11, -32 }, + { 0, 0, -32 }, + { -10, 6, -29 }, + { -10, 6, -29 }, + { 0, 0, -32 }, + { -8, 2, -23 }, + { -29, 6, -10 }, + { -32, 0, 0 }, + { -35, 4, 0 }, + { -35, 4, 0 }, + { -32, 11, -9 }, + { -23, 2, -8 }, + { -26, 0, 0 }, + { -32, 0, 0 }, + { -29, 6, -10 }, + { -32, 11, 9 }, + { -32, 0, 0 }, + { -29, 6, 10 }, + { -29, 6, 10 }, + { -32, 0, 0 }, + { -23, 2, 8 }, + { -10, 6, 29 }, + { 0, 0, 32 }, + { 0, 4, 35 }, + { -9, 11, 32 }, + { -8, 2, 23 }, + { 0, 0, 26 }, + { 0, 0, 32 }, + { -10, 6, 29 }, + { 10, 6, 29 }, + { 0, 0, 32 }, + { 8, 2, 23 }, + { 10, 6, 29 }, + { 14, 11, 23 }, + { 11, 16, 23 }, + { 9, 11, 32 }, + { -16, 8, -11 }, + { -9, 10, -10 }, + { -10, 10, 9 }, + { -16, 8, 11 }, + { -11, 8, 16 }, + { -10, 10, 9 }, + { 9, 10, 10 }, + { 11, 8, 16 }, + { 23, 2, -8 }, + { 26, 0, 0 }, + { 23, 2, 8 }, + { 32, 11, 9 }, + { 35, 4, 0 }, + { 32, 11, -9 }, + { 9, 11, -32 }, + { 0, 5, -36 }, + { -9, 11, -32 }, + { -11, 5, -20 }, + { -14, 11, -23 }, + { -10, 6, -29 }, + { -8, 2, -23 }, + { 11, 8, -16 }, + { 10, 10, -9 }, + { -9, 10, -10 }, + { -11, 8, -16 }, + { -10, 10, 9 }, + { -9, 10, -10 }, + { 0, 0, 0 }, + { -12, 23, 4 }, + { -12, 23, -5 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 12 }, + { -6, 19, 13 }, + { 5, 23, 12 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 12, 23, 5 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 13, 19, 5 }, + { 12, 23, -5 }, + { 13, 19, -6 }, + { 5, 23, -12 }, + { 5, 19, -13 }, + { -5, 23, -12 }, + { -5, 19, -13 }, + { -11, 18, 17 }, + { -12, 16, 23 }, + { 11, 16, 23 }, + { 11, 18, 17 }, + { 17, 18, -11 }, + { 11, 17, -11 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 17, 18, 11 }, + { 11, 18, -16 }, + { 11, 17, -23 }, + { -12, 17, -23 }, + { -11, 18, -16 }, + { -17, 18, -11 }, + { -23, 16, -11 }, + { -23, 16, 12 }, + { -17, 18, 11 }, + { -8, 2, -23 }, + { 0, 0, -27 }, + { 8, 2, -23 }, + { -11, 5, -20 }, + { 11, 5, -20 }, + { 8, 2, 23 }, + { 0, 0, 26 }, + { -8, 2, 23 }, + { 11, 5, 20 }, + { -11, 5, 20 }, + { -23, 2, 8 }, + { -26, 0, 0 }, + { -23, 2, -8 }, + { -20, 5, 11 }, + { -20, 5, 11 }, + { -23, 2, -8 }, + { -20, 5, -11 }, + { 16, 8, 11 }, + { 9, 10, 10 }, + { 10, 10, -9 }, + { 16, 8, -11 }, + { 20, 5, -11 }, + { 23, 2, -8 }, + { 23, 2, 8 }, + { 20, 5, 11 }, + { 16, 14, 14 }, + { 23, 11, 14 }, + { 23, 16, 12 }, + { 17, 18, 11 }, + { 16, 14, 14 }, + { 12, 14, 13 }, + { 23, 16, -11 }, + { 17, 18, -11 }, + { 16, 14, -14 }, + { 13, 14, -12 }, + { 11, 17, -11 }, + { 16, 14, -14 }, + { 23, 11, -14 }, + { 32, 11, -9 }, + { 32, 11, 9 }, + { 14, 14, -16 }, + { 14, 11, -23 }, + { 11, 17, -23 }, + { 11, 18, -16 }, + { 14, 14, -16 }, + { 13, 14, -12 }, + { 10, 10, -9 }, + { 11, 8, -16 }, + { -11, 8, -16 }, + { -11, 5, -20 }, + { 11, 5, -20 }, + { -11, 18, -16 }, + { -11, 17, -11 }, + { -5, 19, -13 }, + { 5, 19, -13 }, + { 11, 17, -11 }, + { 11, 18, -16 }, + { -14, 14, -16 }, + { -13, 14, -12 }, + { -11, 17, -11 }, + { -14, 14, -16 }, + { -14, 11, -23 }, + { -16, 14, -14 }, + { -23, 11, -14 }, + { -23, 16, -11 }, + { -17, 18, -11 }, + { -16, 14, -14 }, + { -13, 14, -12 }, + { -9, 10, -10 }, + { -16, 8, -11 }, + { -17, 18, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -16, 14, 14 }, + { -13, 14, 12 }, + { -16, 14, 14 }, + { -23, 11, 14 }, + { -20, 5, 11 }, + { -16, 8, 11 }, + { -20, 5, -11 }, + { -16, 8, -11 }, + { -14, 14, 16 }, + { -14, 11, 23 }, + { -12, 16, 23 }, + { -11, 18, 17 }, + { -14, 14, 16 }, + { -13, 14, 12 }, + { -10, 10, 9 }, + { -11, 8, 16 }, + { 11, 8, 16 }, + { 11, 5, 20 }, + { -11, 5, 20 }, + { 11, 18, 17 }, + { 11, 17, 11 }, + { 6, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 14, 16 }, + { 12, 14, 13 }, + { 14, 14, 16 }, + { 14, 11, 23 }, + { 9, 11, 32 }, + { 11, 16, 23 }, + { -9, 11, 32 }, + { -9, 11, -32 }, + { -12, 17, -23 }, + { 11, 17, -23 }, + { -9, 11, -32 }, + { 11, 17, -23 }, + { 9, 11, -32 }, + { -32, 11, 9 }, + { -23, 16, 12 }, + { -23, 16, -11 }, + { -32, 11, -9 }, + { 10, 10, -9 }, + { 9, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 9, 10, 10 }, + { -10, 10, 9 }, + { 0, 0, 0 }, + { -9, 10, -10 }, + { 10, 10, -9 }, + { -5, 23, 12 }, + { 5, 23, 12 }, + { 12, 23, 5 }, + { -12, 23, 4 }, + { 12, 23, -5 }, + { -12, 23, -5 }, + { 5, 23, -12 }, + { -5, 23, -12 }, + { 13, 19, -6 }, + { 11, 17, -11 }, + { 5, 19, -13 }, + { 8, 2, 17 }, + { 11, 5, 16 }, + { 14, 9, 22 }, + { 10, 2, 24 }, + { -17, 2, 8 }, + { -16, 5, 11 }, + { -22, 9, 14 }, + { -24, 2, 10 }, + { 9, 5, -31 }, + { 11, 15, -24 }, + { 14, 10, -22 }, + { 10, 2, -25 }, + { 17, 2, -7 }, + { 16, 5, -11 }, + { 22, 9, -14 }, + { 24, 2, -9 }, + { -11, 8, 15 }, + { -11, 5, 16 }, + { -14, 9, 22 }, + { -14, 13, 16 }, + { -15, 8, 11 }, + { -10, 10, 9 }, + { -13, 14, 12 }, + { -16, 13, 14 }, + { -15, 8, -11 }, + { -16, 5, -11 }, + { -22, 9, -14 }, + { -16, 13, -14 }, + { -11, 8, -15 }, + { -9, 10, -10 }, + { -13, 14, -12 }, + { -14, 14, -16 }, + { 11, 8, -15 }, + { 11, 5, -17 }, + { 14, 10, -22 }, + { 14, 14, -16 }, + { 15, 8, -11 }, + { 10, 10, -9 }, + { 13, 14, -12 }, + { 16, 13, -14 }, + { 15, 8, 11 }, + { 16, 5, 11 }, + { 22, 9, 14 }, + { 16, 13, 14 }, + { 11, 8, 15 }, + { 9, 10, 10 }, + { 12, 14, 13 }, + { 14, 13, 16 }, + { -9, 4, 30 }, + { -12, 14, 24 }, + { -14, 9, 22 }, + { -10, 2, 24 }, + { 11, 17, 17 }, + { 11, 14, 24 }, + { 14, 9, 22 }, + { 14, 13, 16 }, + { -11, 17, 17 }, + { -11, 17, 11 }, + { -13, 14, 12 }, + { -14, 13, 16 }, + { 17, 17, 11 }, + { 11, 17, 11 }, + { 12, 14, 13 }, + { 16, 13, 14 }, + { 30, 4, 9 }, + { 24, 14, 12 }, + { 22, 9, 14 }, + { 24, 2, 10 }, + { 17, 17, -11 }, + { 24, 14, -11 }, + { 22, 9, -14 }, + { 16, 13, -14 }, + { 11, 18, -17 }, + { 11, 17, -11 }, + { 13, 14, -12 }, + { 14, 14, -16 }, + { -11, 18, -17 }, + { -12, 15, -24 }, + { -14, 10, -22 }, + { -14, 14, -16 }, + { -17, 17, -11 }, + { -11, 17, -11 }, + { -13, 14, -12 }, + { -16, 13, -14 }, + { -30, 4, -9 }, + { -24, 14, -12 }, + { -22, 9, -14 }, + { -24, 2, -9 }, + { -17, 17, 11 }, + { -24, 14, 12 }, + { -22, 9, 14 }, + { -16, 13, 14 }, + { 9, 4, 30 }, + { 0, -3, 29 }, + { 0, -4, 23 }, + { 10, 2, 24 }, + { -10, 2, 24 }, + { -14, 9, 22 }, + { -11, 5, 16 }, + { -8, 2, 17 }, + { 24, 2, -9 }, + { 22, 9, -14 }, + { 24, 14, -11 }, + { 30, 4, -8 }, + { 24, 2, 10 }, + { 22, 9, 14 }, + { 16, 5, 11 }, + { 17, 2, 8 }, + { -10, 2, -25 }, + { -14, 10, -22 }, + { -12, 15, -24 }, + { -9, 5, -31 }, + { 10, 2, -25 }, + { 14, 10, -22 }, + { 11, 5, -17 }, + { 8, 2, -18 }, + { -24, 2, 10 }, + { -22, 9, 14 }, + { -24, 14, 12 }, + { -30, 4, 9 }, + { -24, 2, -9 }, + { -22, 9, -14 }, + { -16, 5, -11 }, + { -17, 2, -8 }, + { -30, 4, -9 }, + { -29, -3, 0 }, + { -30, 4, 9 }, + { -13, 19, 5 }, + { -11, 17, 11 }, + { -6, 19, 13 }, + { -5, 19, -13 }, + { -11, 17, -11 }, + { -13, 19, -6 }, + { 6, 19, 13 }, + { 11, 17, 11 }, + { 13, 19, 5 }, + { -5, 19, -13 }, + { -13, 19, -6 }, + { -12, 23, -5 }, + { -5, 23, -12 }, + { 30, 4, -8 }, + { 29, -3, 0 }, + { 23, -4, 0 }, + { 24, 2, -9 }, + { 24, 2, -9 }, + { 23, -4, 0 }, + { 19, 0, 0 }, + { 17, 2, -7 }, + { 17, 2, 8 }, + { 23, -4, 0 }, + { 24, 2, 10 }, + { 24, 2, 10 }, + { 23, -4, 0 }, + { 30, 4, 9 }, + { 8, 2, -18 }, + { 0, 0, -20 }, + { 0, -4, -24 }, + { 0, -4, -24 }, + { 10, 2, -25 }, + { 10, 2, -25 }, + { 0, -4, -24 }, + { 0, -2, -29 }, + { 9, 5, -31 }, + { -9, 5, -31 }, + { 0, -4, -24 }, + { -10, 2, -25 }, + { -10, 2, -25 }, + { 0, -4, -24 }, + { -8, 2, -18 }, + { -24, 2, -9 }, + { -23, -4, 0 }, + { -29, -3, 0 }, + { -29, -3, 0 }, + { -30, 4, -9 }, + { -17, 2, -8 }, + { -19, 0, 0 }, + { -23, -4, 0 }, + { -24, 2, -9 }, + { -30, 4, 9 }, + { -23, -4, 0 }, + { -24, 2, 10 }, + { -24, 2, 10 }, + { -23, -4, 0 }, + { -17, 2, 8 }, + { -10, 2, 24 }, + { 0, -4, 23 }, + { 0, -3, 29 }, + { -9, 4, 30 }, + { -8, 2, 17 }, + { 0, 0, 19 }, + { 0, -4, 23 }, + { -10, 2, 24 }, + { 10, 2, 24 }, + { 0, -4, 23 }, + { 8, 2, 17 }, + { 10, 2, 24 }, + { 14, 9, 22 }, + { 11, 14, 24 }, + { 9, 4, 30 }, + { -15, 8, -11 }, + { -9, 10, -10 }, + { -10, 10, 9 }, + { -15, 8, 11 }, + { -11, 8, 15 }, + { -10, 10, 9 }, + { 9, 10, 10 }, + { 11, 8, 15 }, + { 17, 2, -7 }, + { 19, 0, 0 }, + { 17, 2, 8 }, + { 30, 4, 9 }, + { 29, -3, 0 }, + { 30, 4, -8 }, + { 9, 5, -31 }, + { 0, -2, -29 }, + { -9, 5, -31 }, + { -11, 5, -17 }, + { -14, 10, -22 }, + { -10, 2, -25 }, + { -8, 2, -18 }, + { 11, 8, -15 }, + { 10, 10, -9 }, + { -9, 10, -10 }, + { -11, 8, -15 }, + { -10, 10, 9 }, + { -9, 10, -10 }, + { 0, 0, 0 }, + { -12, 23, 4 }, + { -12, 23, -5 }, + { -13, 19, -6 }, + { -13, 19, 5 }, + { -5, 23, 12 }, + { -6, 19, 13 }, + { 5, 23, 12 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 12, 23, 5 }, + { 5, 23, 12 }, + { 6, 19, 13 }, + { 13, 19, 5 }, + { 12, 23, -5 }, + { 13, 19, -6 }, + { 5, 23, -12 }, + { 5, 19, -13 }, + { -5, 23, -12 }, + { -5, 19, -13 }, + { -11, 17, 17 }, + { -12, 14, 24 }, + { 11, 14, 24 }, + { 11, 17, 17 }, + { 17, 17, -11 }, + { 11, 17, -11 }, + { 13, 19, -6 }, + { 13, 19, 5 }, + { 11, 17, 11 }, + { 17, 17, 11 }, + { 11, 18, -17 }, + { 11, 15, -24 }, + { -12, 15, -24 }, + { -11, 18, -17 }, + { -17, 17, -11 }, + { -24, 14, -12 }, + { -24, 14, 12 }, + { -17, 17, 11 }, + { -8, 2, -18 }, + { 0, 0, -20 }, + { 8, 2, -18 }, + { -11, 5, -17 }, + { 11, 5, -17 }, + { 8, 2, 17 }, + { 0, 0, 19 }, + { -8, 2, 17 }, + { 11, 5, 16 }, + { -11, 5, 16 }, + { -17, 2, 8 }, + { -19, 0, 0 }, + { -17, 2, -8 }, + { -16, 5, 11 }, + { -16, 5, 11 }, + { -17, 2, -8 }, + { -16, 5, -11 }, + { 15, 8, 11 }, + { 9, 10, 10 }, + { 10, 10, -9 }, + { 15, 8, -11 }, + { 16, 5, -11 }, + { 17, 2, -7 }, + { 17, 2, 8 }, + { 16, 5, 11 }, + { 16, 13, 14 }, + { 22, 9, 14 }, + { 24, 14, 12 }, + { 17, 17, 11 }, + { 16, 13, 14 }, + { 12, 14, 13 }, + { 24, 14, -11 }, + { 17, 17, -11 }, + { 16, 13, -14 }, + { 13, 14, -12 }, + { 11, 17, -11 }, + { 16, 13, -14 }, + { 22, 9, -14 }, + { 30, 4, -8 }, + { 30, 4, 9 }, + { 14, 14, -16 }, + { 14, 10, -22 }, + { 11, 15, -24 }, + { 11, 18, -17 }, + { 14, 14, -16 }, + { 13, 14, -12 }, + { 10, 10, -9 }, + { 11, 8, -15 }, + { -11, 8, -15 }, + { -11, 5, -17 }, + { 11, 5, -17 }, + { -11, 18, -17 }, + { -11, 17, -11 }, + { -5, 19, -13 }, + { 5, 19, -13 }, + { 11, 17, -11 }, + { 11, 18, -17 }, + { -14, 14, -16 }, + { -13, 14, -12 }, + { -11, 17, -11 }, + { -14, 14, -16 }, + { -14, 10, -22 }, + { -16, 13, -14 }, + { -22, 9, -14 }, + { -24, 14, -12 }, + { -17, 17, -11 }, + { -16, 13, -14 }, + { -13, 14, -12 }, + { -9, 10, -10 }, + { -15, 8, -11 }, + { -17, 17, 11 }, + { -11, 17, 11 }, + { -13, 19, 5 }, + { -13, 19, -6 }, + { -16, 13, 14 }, + { -13, 14, 12 }, + { -16, 13, 14 }, + { -22, 9, 14 }, + { -16, 5, 11 }, + { -15, 8, 11 }, + { -16, 5, -11 }, + { -15, 8, -11 }, + { -14, 13, 16 }, + { -14, 9, 22 }, + { -12, 14, 24 }, + { -11, 17, 17 }, + { -14, 13, 16 }, + { -13, 14, 12 }, + { -10, 10, 9 }, + { -11, 8, 15 }, + { 11, 8, 15 }, + { 11, 5, 16 }, + { -11, 5, 16 }, + { 11, 17, 17 }, + { 11, 17, 11 }, + { 6, 19, 13 }, + { -6, 19, 13 }, + { -11, 17, 11 }, + { 14, 13, 16 }, + { 12, 14, 13 }, + { 14, 13, 16 }, + { 14, 9, 22 }, + { 9, 4, 30 }, + { 11, 14, 24 }, + { -9, 4, 30 }, + { -9, 5, -31 }, + { -12, 15, -24 }, + { 11, 15, -24 }, + { -9, 5, -31 }, + { 11, 15, -24 }, + { 9, 5, -31 }, + { -30, 4, 9 }, + { -24, 14, 12 }, + { -24, 14, -12 }, + { -30, 4, -9 }, + { 10, 10, -9 }, + { 9, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 9, 10, 10 }, + { -10, 10, 9 }, + { 0, 0, 0 }, + { -9, 10, -10 }, + { 10, 10, -9 }, + { -5, 23, 12 }, + { 5, 23, 12 }, + { 12, 23, 5 }, + { -12, 23, 4 }, + { 12, 23, -5 }, + { -12, 23, -5 }, + { 5, 23, -12 }, + { -5, 23, -12 }, + { 13, 20, -6 }, + { 11, 18, -11 }, + { 5, 20, -13 }, + { 8, 3, 16 }, + { 11, 6, 16 }, + { 14, 9, 22 }, + { 10, 2, 23 }, + { -16, 3, 8 }, + { -16, 6, 11 }, + { -22, 9, 14 }, + { -23, 2, 10 }, + { 9, 3, -29 }, + { 11, 14, -24 }, + { 14, 9, -22 }, + { 10, 2, -23 }, + { 16, 3, -8 }, + { 16, 6, -11 }, + { 22, 9, -14 }, + { 23, 2, -9 }, + { -11, 8, 15 }, + { -11, 6, 16 }, + { -14, 9, 22 }, + { -14, 14, 16 }, + { -15, 8, 11 }, + { -10, 10, 10 }, + { -13, 15, 13 }, + { -16, 14, 14 }, + { -15, 8, -11 }, + { -16, 6, -11 }, + { -22, 9, -14 }, + { -16, 14, -14 }, + { -11, 8, -15 }, + { -10, 10, -10 }, + { -13, 15, -13 }, + { -14, 14, -16 }, + { 11, 8, -15 }, + { 11, 6, -16 }, + { 14, 9, -22 }, + { 14, 14, -16 }, + { 15, 8, -11 }, + { 10, 10, -10 }, + { 13, 15, -13 }, + { 16, 14, -14 }, + { 15, 8, 11 }, + { 16, 6, 11 }, + { 22, 9, 14 }, + { 16, 14, 14 }, + { 11, 8, 15 }, + { 10, 10, 10 }, + { 13, 15, 13 }, + { 14, 14, 16 }, + { -9, 3, 29 }, + { -12, 14, 24 }, + { -14, 9, 22 }, + { -10, 2, 23 }, + { 11, 18, 17 }, + { 11, 14, 24 }, + { 14, 9, 22 }, + { 14, 14, 16 }, + { -11, 18, 17 }, + { -11, 18, 11 }, + { -13, 15, 13 }, + { -14, 14, 16 }, + { 17, 18, 11 }, + { 11, 18, 11 }, + { 13, 15, 13 }, + { 16, 14, 14 }, + { 29, 3, 9 }, + { 24, 14, 12 }, + { 22, 9, 14 }, + { 23, 2, 10 }, + { 17, 18, -11 }, + { 24, 14, -11 }, + { 22, 9, -14 }, + { 16, 14, -14 }, + { 11, 18, -17 }, + { 11, 18, -11 }, + { 13, 15, -13 }, + { 14, 14, -16 }, + { -11, 18, -17 }, + { -12, 14, -24 }, + { -14, 9, -22 }, + { -14, 14, -16 }, + { -17, 18, -11 }, + { -11, 18, -11 }, + { -13, 15, -13 }, + { -16, 14, -14 }, + { -29, 3, -9 }, + { -24, 14, -12 }, + { -22, 9, -14 }, + { -23, 2, -9 }, + { -17, 18, 11 }, + { -24, 14, 12 }, + { -22, 9, 14 }, + { -16, 14, 14 }, + { 9, 3, 29 }, + { 0, -4, 26 }, + { 0, -3, 20 }, + { 10, 2, 23 }, + { -10, 2, 23 }, + { -14, 9, 22 }, + { -11, 6, 16 }, + { -8, 3, 16 }, + { 23, 2, -9 }, + { 22, 9, -14 }, + { 24, 14, -11 }, + { 29, 3, -9 }, + { 23, 2, 10 }, + { 22, 9, 14 }, + { 16, 6, 11 }, + { 16, 3, 8 }, + { -10, 2, -23 }, + { -14, 9, -22 }, + { -12, 14, -24 }, + { -9, 3, -29 }, + { 10, 2, -23 }, + { 14, 9, -22 }, + { 11, 6, -16 }, + { 8, 3, -16 }, + { -23, 2, 10 }, + { -22, 9, 14 }, + { -24, 14, 12 }, + { -29, 3, 9 }, + { -23, 2, -9 }, + { -22, 9, -14 }, + { -16, 6, -11 }, + { -16, 3, -8 }, + { -29, 3, -9 }, + { -26, -4, 0 }, + { -29, 3, 9 }, + { -13, 20, 5 }, + { -11, 18, 11 }, + { -6, 20, 13 }, + { -5, 20, -13 }, + { -11, 18, -11 }, + { -13, 20, -6 }, + { 6, 20, 13 }, + { 11, 18, 11 }, + { 13, 20, 5 }, + { -5, 20, -13 }, + { -13, 20, -6 }, + { -12, 24, -5 }, + { -5, 24, -12 }, + { 29, 3, -9 }, + { 26, -4, 0 }, + { 20, -3, 0 }, + { 23, 2, -9 }, + { 23, 2, -9 }, + { 20, -3, 0 }, + { 17, 0, 0 }, + { 16, 3, -8 }, + { 16, 3, 8 }, + { 20, -3, 0 }, + { 23, 2, 10 }, + { 23, 2, 10 }, + { 20, -3, 0 }, + { 29, 3, 9 }, + { 8, 3, -16 }, + { 0, 0, -17 }, + { 0, -3, -20 }, + { 0, -3, -20 }, + { 10, 2, -23 }, + { 10, 2, -23 }, + { 0, -3, -20 }, + { 0, -4, -26 }, + { 9, 3, -29 }, + { -9, 3, -29 }, + { 0, -3, -20 }, + { -10, 2, -23 }, + { -10, 2, -23 }, + { 0, -3, -20 }, + { -8, 3, -16 }, + { -23, 2, -9 }, + { -20, -3, 0 }, + { -26, -4, 0 }, + { -26, -4, 0 }, + { -29, 3, -9 }, + { -16, 3, -8 }, + { -17, 0, 0 }, + { -20, -3, 0 }, + { -23, 2, -9 }, + { -29, 3, 9 }, + { -20, -3, 0 }, + { -23, 2, 10 }, + { -23, 2, 10 }, + { -20, -3, 0 }, + { -16, 3, 8 }, + { -10, 2, 23 }, + { 0, -3, 20 }, + { 0, -4, 26 }, + { -9, 3, 29 }, + { -8, 3, 16 }, + { 0, 0, 17 }, + { 0, -3, 20 }, + { -10, 2, 23 }, + { 10, 2, 23 }, + { 0, -3, 20 }, + { 8, 3, 16 }, + { 10, 2, 23 }, + { 14, 9, 22 }, + { 11, 14, 24 }, + { 9, 3, 29 }, + { -15, 8, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -15, 8, 11 }, + { -11, 8, 15 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 8, 15 }, + { 16, 3, -8 }, + { 17, 0, 0 }, + { 16, 3, 8 }, + { 29, 3, 9 }, + { 26, -4, 0 }, + { 29, 3, -9 }, + { 9, 3, -29 }, + { 0, -4, -26 }, + { -9, 3, -29 }, + { -11, 6, -16 }, + { -14, 9, -22 }, + { -10, 2, -23 }, + { -8, 3, -16 }, + { 11, 8, -15 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 8, -15 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -12, 24, 5 }, + { -12, 24, -5 }, + { -13, 20, -6 }, + { -13, 20, 5 }, + { -5, 24, 12 }, + { -6, 20, 13 }, + { 5, 24, 12 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 11, 24, 5 }, + { 5, 24, 12 }, + { 6, 20, 13 }, + { 13, 20, 5 }, + { 11, 24, -5 }, + { 13, 20, -6 }, + { 5, 24, -12 }, + { 5, 20, -13 }, + { -5, 24, -12 }, + { -5, 20, -13 }, + { -11, 18, 17 }, + { -12, 14, 24 }, + { 11, 14, 24 }, + { 11, 18, 17 }, + { 17, 18, -11 }, + { 11, 18, -11 }, + { 13, 20, -6 }, + { 13, 20, 5 }, + { 11, 18, 11 }, + { 17, 18, 11 }, + { 11, 18, -17 }, + { 11, 14, -24 }, + { -12, 14, -24 }, + { -11, 18, -17 }, + { -17, 18, -11 }, + { -24, 14, -12 }, + { -24, 14, 12 }, + { -17, 18, 11 }, + { -8, 3, -16 }, + { 0, 0, -17 }, + { 8, 3, -16 }, + { -11, 6, -16 }, + { 11, 6, -16 }, + { 8, 3, 16 }, + { 0, 0, 17 }, + { -8, 3, 16 }, + { 11, 6, 16 }, + { -11, 6, 16 }, + { -16, 3, 8 }, + { -17, 0, 0 }, + { -16, 3, -8 }, + { -16, 6, 11 }, + { -16, 6, 11 }, + { -16, 3, -8 }, + { -16, 6, -11 }, + { 15, 8, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 15, 8, -11 }, + { 16, 6, -11 }, + { 16, 3, -8 }, + { 16, 3, 8 }, + { 16, 6, 11 }, + { 16, 14, 14 }, + { 22, 9, 14 }, + { 24, 14, 12 }, + { 17, 18, 11 }, + { 16, 14, 14 }, + { 13, 15, 13 }, + { 24, 14, -11 }, + { 17, 18, -11 }, + { 16, 14, -14 }, + { 13, 15, -13 }, + { 11, 18, -11 }, + { 16, 14, -14 }, + { 22, 9, -14 }, + { 29, 3, -9 }, + { 29, 3, 9 }, + { 14, 14, -16 }, + { 14, 9, -22 }, + { 11, 14, -24 }, + { 11, 18, -17 }, + { 14, 14, -16 }, + { 13, 15, -13 }, + { 10, 10, -10 }, + { 11, 8, -15 }, + { -11, 8, -15 }, + { -11, 6, -16 }, + { 11, 6, -16 }, + { -11, 18, -17 }, + { -11, 18, -11 }, + { -5, 20, -13 }, + { 5, 20, -13 }, + { 11, 18, -11 }, + { 11, 18, -17 }, + { -14, 14, -16 }, + { -13, 15, -13 }, + { -11, 18, -11 }, + { -14, 14, -16 }, + { -14, 9, -22 }, + { -16, 14, -14 }, + { -22, 9, -14 }, + { -24, 14, -12 }, + { -17, 18, -11 }, + { -16, 14, -14 }, + { -13, 15, -13 }, + { -10, 10, -10 }, + { -15, 8, -11 }, + { -17, 18, 11 }, + { -11, 18, 11 }, + { -13, 20, 5 }, + { -13, 20, -6 }, + { -16, 14, 14 }, + { -13, 15, 13 }, + { -16, 14, 14 }, + { -22, 9, 14 }, + { -16, 6, 11 }, + { -15, 8, 11 }, + { -16, 6, -11 }, + { -15, 8, -11 }, + { -14, 14, 16 }, + { -14, 9, 22 }, + { -12, 14, 24 }, + { -11, 18, 17 }, + { -14, 14, 16 }, + { -13, 15, 13 }, + { -10, 10, 10 }, + { -11, 8, 15 }, + { 11, 8, 15 }, + { 11, 6, 16 }, + { -11, 6, 16 }, + { 11, 18, 17 }, + { 11, 18, 11 }, + { 6, 20, 13 }, + { -6, 20, 13 }, + { -11, 18, 11 }, + { 14, 14, 16 }, + { 13, 15, 13 }, + { 14, 14, 16 }, + { 14, 9, 22 }, + { 9, 3, 29 }, + { 11, 14, 24 }, + { -9, 3, 29 }, + { -9, 3, -29 }, + { -12, 14, -24 }, + { 11, 14, -24 }, + { -9, 3, -29 }, + { 11, 14, -24 }, + { 9, 3, -29 }, + { -29, 3, 9 }, + { -24, 14, 12 }, + { -24, 14, -12 }, + { -29, 3, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 12 }, + { 5, 24, 12 }, + { 11, 24, 5 }, + { -12, 24, 5 }, + { 11, 24, -5 }, + { -12, 24, -5 }, + { 5, 24, -12 }, + { -5, 24, -12 }, + { 12, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -12 }, + { 8, 3, 18 }, + { 11, 6, 17 }, + { 14, 11, 22 }, + { 10, 4, 25 }, + { -18, 3, 8 }, + { -17, 6, 11 }, + { -22, 11, 14 }, + { -25, 4, 10 }, + { 9, 5, -31 }, + { 11, 16, -24 }, + { 14, 11, -22 }, + { 10, 3, -25 }, + { 18, 3, -8 }, + { 17, 6, -11 }, + { 22, 11, -14 }, + { 25, 4, -10 }, + { -11, 8, 16 }, + { -11, 6, 17 }, + { -14, 11, 22 }, + { -14, 14, 16 }, + { -16, 8, 11 }, + { -10, 10, 10 }, + { -13, 15, 12 }, + { -16, 14, 14 }, + { -16, 8, -11 }, + { -17, 6, -11 }, + { -22, 11, -14 }, + { -16, 14, -14 }, + { -11, 8, -15 }, + { -10, 10, -9 }, + { -13, 15, -12 }, + { -14, 14, -16 }, + { 11, 8, -15 }, + { 11, 6, -17 }, + { 14, 11, -22 }, + { 14, 14, -16 }, + { 16, 8, -11 }, + { 10, 10, -10 }, + { 13, 15, -12 }, + { 16, 14, -14 }, + { 16, 8, 11 }, + { 17, 6, 11 }, + { 22, 11, 14 }, + { 16, 14, 14 }, + { 11, 8, 16 }, + { 10, 10, 10 }, + { 12, 15, 13 }, + { 14, 14, 16 }, + { -9, 6, 31 }, + { -12, 16, 24 }, + { -14, 11, 22 }, + { -10, 4, 25 }, + { 11, 18, 17 }, + { 11, 16, 24 }, + { 14, 11, 22 }, + { 14, 14, 16 }, + { -11, 18, 17 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 14, 16 }, + { 17, 18, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 14, 14 }, + { 31, 6, 9 }, + { 24, 16, 12 }, + { 22, 11, 14 }, + { 25, 4, 10 }, + { 17, 18, -11 }, + { 24, 16, -11 }, + { 22, 11, -14 }, + { 16, 14, -14 }, + { 11, 18, -17 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 14, -16 }, + { -11, 18, -17 }, + { -12, 16, -24 }, + { -14, 11, -22 }, + { -14, 14, -16 }, + { -17, 18, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 14, -14 }, + { -31, 6, -8 }, + { -24, 16, -12 }, + { -22, 11, -14 }, + { -25, 4, -9 }, + { -17, 18, 11 }, + { -24, 16, 12 }, + { -22, 11, 14 }, + { -16, 14, 14 }, + { 9, 6, 31 }, + { 0, -1, 30 }, + { 0, -2, 24 }, + { 10, 4, 25 }, + { -10, 4, 25 }, + { -14, 11, 22 }, + { -11, 6, 17 }, + { -8, 3, 18 }, + { 25, 4, -10 }, + { 22, 11, -14 }, + { 24, 16, -11 }, + { 31, 6, -9 }, + { 25, 4, 10 }, + { 22, 11, 14 }, + { 17, 6, 11 }, + { 18, 3, 8 }, + { -10, 3, -25 }, + { -14, 11, -22 }, + { -12, 16, -24 }, + { -9, 5, -31 }, + { 10, 3, -25 }, + { 14, 11, -22 }, + { 11, 6, -17 }, + { 8, 3, -18 }, + { -25, 4, 10 }, + { -22, 11, 14 }, + { -24, 16, 12 }, + { -31, 6, 9 }, + { -25, 4, -9 }, + { -22, 11, -14 }, + { -17, 6, -11 }, + { -18, 3, -7 }, + { -31, 6, -8 }, + { -30, -1, 0 }, + { -31, 6, 9 }, + { -12, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 12 }, + { -5, 20, -12 }, + { -11, 18, -10 }, + { -12, 20, -6 }, + { 6, 20, 12 }, + { 10, 18, 11 }, + { 12, 20, 5 }, + { -5, 20, -12 }, + { -12, 20, -6 }, + { -11, 24, -5 }, + { -5, 24, -11 }, + { 31, 6, -9 }, + { 30, -1, 0 }, + { 24, -2, 0 }, + { 25, 4, -10 }, + { 25, 4, -10 }, + { 24, -2, 0 }, + { 20, 0, 0 }, + { 18, 3, -8 }, + { 18, 3, 8 }, + { 24, -2, 0 }, + { 25, 4, 10 }, + { 25, 4, 10 }, + { 24, -2, 0 }, + { 31, 6, 9 }, + { 8, 3, -18 }, + { 0, 1, -19 }, + { 0, -2, -23 }, + { 0, -2, -23 }, + { 10, 3, -25 }, + { 10, 3, -25 }, + { 0, -2, -23 }, + { 0, -2, -29 }, + { 9, 5, -31 }, + { -9, 5, -31 }, + { 0, -2, -23 }, + { -10, 3, -25 }, + { -10, 3, -25 }, + { 0, -2, -23 }, + { -8, 3, -18 }, + { -25, 4, -9 }, + { -24, -2, 0 }, + { -30, -1, 0 }, + { -30, -1, 0 }, + { -31, 6, -8 }, + { -18, 3, -7 }, + { -20, 0, 0 }, + { -24, -2, 0 }, + { -25, 4, -9 }, + { -31, 6, 9 }, + { -24, -2, 0 }, + { -25, 4, 10 }, + { -25, 4, 10 }, + { -24, -2, 0 }, + { -18, 3, 8 }, + { -10, 4, 25 }, + { 0, -2, 24 }, + { 0, -1, 30 }, + { -9, 6, 31 }, + { -8, 3, 18 }, + { 0, 0, 20 }, + { 0, -2, 24 }, + { -10, 4, 25 }, + { 10, 4, 25 }, + { 0, -2, 24 }, + { 8, 3, 18 }, + { 10, 4, 25 }, + { 14, 11, 22 }, + { 11, 16, 24 }, + { 9, 6, 31 }, + { -16, 8, -11 }, + { -10, 10, -9 }, + { -10, 10, 10 }, + { -16, 8, 11 }, + { -11, 8, 16 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 8, 16 }, + { 18, 3, -8 }, + { 20, 0, 0 }, + { 18, 3, 8 }, + { 31, 6, 9 }, + { 30, -1, 0 }, + { 31, 6, -9 }, + { 9, 5, -31 }, + { 0, -2, -29 }, + { -9, 5, -31 }, + { -11, 6, -17 }, + { -14, 11, -22 }, + { -10, 3, -25 }, + { -8, 3, -18 }, + { 11, 8, -15 }, + { 10, 10, -10 }, + { -10, 10, -9 }, + { -11, 8, -15 }, + { -10, 10, 10 }, + { -10, 10, -9 }, + { 0, 0, 0 }, + { -11, 24, 4 }, + { -11, 24, -5 }, + { -12, 20, -6 }, + { -12, 20, 5 }, + { -5, 24, 11 }, + { -6, 20, 12 }, + { 4, 24, 11 }, + { 4, 24, 11 }, + { 6, 20, 12 }, + { 11, 24, 5 }, + { 4, 24, 11 }, + { 6, 20, 12 }, + { 12, 20, 5 }, + { 11, 24, -5 }, + { 12, 20, -6 }, + { 4, 24, -11 }, + { 5, 20, -12 }, + { -5, 24, -11 }, + { -5, 20, -12 }, + { -11, 18, 17 }, + { -12, 16, 24 }, + { 11, 16, 24 }, + { 11, 18, 17 }, + { 17, 18, -11 }, + { 11, 18, -10 }, + { 12, 20, -6 }, + { 12, 20, 5 }, + { 10, 18, 11 }, + { 17, 18, 11 }, + { 11, 18, -17 }, + { 11, 16, -24 }, + { -12, 16, -24 }, + { -11, 18, -17 }, + { -17, 18, -11 }, + { -24, 16, -12 }, + { -24, 16, 12 }, + { -17, 18, 11 }, + { -8, 3, -18 }, + { 0, 1, -19 }, + { 8, 3, -18 }, + { -11, 6, -17 }, + { 11, 6, -17 }, + { 8, 3, 18 }, + { 0, 0, 20 }, + { -8, 3, 18 }, + { 11, 6, 17 }, + { -11, 6, 17 }, + { -18, 3, 8 }, + { -20, 0, 0 }, + { -18, 3, -7 }, + { -17, 6, 11 }, + { -17, 6, 11 }, + { -18, 3, -7 }, + { -17, 6, -11 }, + { 16, 8, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 16, 8, -11 }, + { 17, 6, -11 }, + { 18, 3, -8 }, + { 18, 3, 8 }, + { 17, 6, 11 }, + { 16, 14, 14 }, + { 22, 11, 14 }, + { 24, 16, 12 }, + { 17, 18, 11 }, + { 16, 14, 14 }, + { 12, 15, 13 }, + { 24, 16, -11 }, + { 17, 18, -11 }, + { 16, 14, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 14, -14 }, + { 22, 11, -14 }, + { 31, 6, -9 }, + { 31, 6, 9 }, + { 14, 14, -16 }, + { 14, 11, -22 }, + { 11, 16, -24 }, + { 11, 18, -17 }, + { 14, 14, -16 }, + { 13, 15, -12 }, + { 10, 10, -10 }, + { 11, 8, -15 }, + { -11, 8, -15 }, + { -11, 6, -17 }, + { 11, 6, -17 }, + { -11, 18, -17 }, + { -11, 18, -10 }, + { -5, 20, -12 }, + { 5, 20, -12 }, + { 11, 18, -10 }, + { 11, 18, -17 }, + { -14, 14, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 14, -16 }, + { -14, 11, -22 }, + { -16, 14, -14 }, + { -22, 11, -14 }, + { -24, 16, -12 }, + { -17, 18, -11 }, + { -16, 14, -14 }, + { -13, 15, -12 }, + { -10, 10, -9 }, + { -16, 8, -11 }, + { -17, 18, 11 }, + { -11, 18, 10 }, + { -12, 20, 5 }, + { -12, 20, -6 }, + { -16, 14, 14 }, + { -13, 15, 12 }, + { -16, 14, 14 }, + { -22, 11, 14 }, + { -17, 6, 11 }, + { -16, 8, 11 }, + { -17, 6, -11 }, + { -16, 8, -11 }, + { -14, 14, 16 }, + { -14, 11, 22 }, + { -12, 16, 24 }, + { -11, 18, 17 }, + { -14, 14, 16 }, + { -13, 15, 12 }, + { -10, 10, 10 }, + { -11, 8, 16 }, + { 11, 8, 16 }, + { 11, 6, 17 }, + { -11, 6, 17 }, + { 11, 18, 17 }, + { 10, 18, 11 }, + { 6, 20, 12 }, + { -6, 20, 12 }, + { -11, 18, 10 }, + { 14, 14, 16 }, + { 12, 15, 13 }, + { 14, 14, 16 }, + { 14, 11, 22 }, + { 9, 6, 31 }, + { 11, 16, 24 }, + { -9, 6, 31 }, + { -9, 5, -31 }, + { -12, 16, -24 }, + { 11, 16, -24 }, + { -9, 5, -31 }, + { 11, 16, -24 }, + { 9, 5, -31 }, + { -31, 6, 9 }, + { -24, 16, 12 }, + { -24, 16, -12 }, + { -31, 6, -8 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -9 }, + { 10, 10, -10 }, + { -5, 24, 11 }, + { 4, 24, 11 }, + { 11, 24, 5 }, + { -11, 24, 4 }, + { 11, 24, -5 }, + { -11, 24, -5 }, + { 4, 24, -11 }, + { -5, 24, -11 }, + { 12, 20, -6 }, + { 11, 18, -10 }, + { 5, 20, -12 }, + { 8, 4, 21 }, + { 11, 7, 19 }, + { 14, 13, 23 }, + { 10, 7, 28 }, + { -21, 4, 8 }, + { -19, 7, 11 }, + { -23, 13, 14 }, + { -28, 7, 10 }, + { 9, 10, -32 }, + { 11, 18, -24 }, + { 14, 13, -23 }, + { 10, 7, -28 }, + { 21, 4, -8 }, + { 19, 7, -11 }, + { 23, 13, -13 }, + { 28, 7, -9 }, + { -11, 9, 17 }, + { -11, 7, 19 }, + { -14, 13, 23 }, + { -14, 15, 16 }, + { -17, 9, 11 }, + { -10, 10, 10 }, + { -13, 15, 12 }, + { -16, 15, 13 }, + { -17, 9, -11 }, + { -19, 7, -10 }, + { -23, 13, -13 }, + { -16, 15, -14 }, + { -11, 9, -17 }, + { -10, 10, -10 }, + { -13, 15, -12 }, + { -14, 15, -16 }, + { 11, 9, -17 }, + { 11, 7, -19 }, + { 14, 13, -23 }, + { 14, 15, -16 }, + { 17, 9, -11 }, + { 10, 10, -10 }, + { 13, 15, -12 }, + { 16, 15, -14 }, + { 17, 9, 11 }, + { 19, 7, 11 }, + { 23, 13, 14 }, + { 16, 15, 14 }, + { 11, 9, 17 }, + { 10, 10, 10 }, + { 12, 15, 13 }, + { 14, 15, 16 }, + { -8, 11, 33 }, + { -12, 18, 24 }, + { -14, 13, 23 }, + { -9, 7, 28 }, + { 11, 19, 16 }, + { 11, 18, 24 }, + { 14, 13, 23 }, + { 14, 15, 16 }, + { -11, 19, 16 }, + { -11, 18, 10 }, + { -13, 15, 12 }, + { -14, 15, 16 }, + { 16, 19, 11 }, + { 10, 18, 11 }, + { 12, 15, 13 }, + { 16, 15, 14 }, + { 33, 11, 9 }, + { 24, 18, 12 }, + { 23, 13, 14 }, + { 28, 7, 10 }, + { 16, 19, -11 }, + { 24, 18, -11 }, + { 23, 13, -13 }, + { 16, 15, -14 }, + { 11, 19, -16 }, + { 11, 18, -10 }, + { 13, 15, -12 }, + { 14, 15, -16 }, + { -11, 19, -16 }, + { -12, 18, -24 }, + { -14, 13, -23 }, + { -14, 15, -16 }, + { -16, 19, -11 }, + { -11, 18, -10 }, + { -13, 15, -12 }, + { -16, 15, -14 }, + { -33, 11, -9 }, + { -24, 18, -12 }, + { -23, 13, -13 }, + { -28, 7, -9 }, + { -16, 19, 10 }, + { -24, 18, 12 }, + { -23, 13, 14 }, + { -16, 15, 13 }, + { 9, 11, 33 }, + { 0, 4, 34 }, + { 0, 0, 30 }, + { 10, 7, 28 }, + { -9, 7, 28 }, + { -14, 13, 23 }, + { -11, 7, 19 }, + { -8, 4, 21 }, + { 28, 7, -9 }, + { 23, 13, -13 }, + { 24, 18, -11 }, + { 33, 11, -9 }, + { 28, 7, 10 }, + { 23, 13, 14 }, + { 19, 7, 11 }, + { 21, 4, 8 }, + { -9, 7, -28 }, + { -14, 13, -23 }, + { -12, 18, -24 }, + { -9, 10, -32 }, + { 10, 7, -28 }, + { 14, 13, -23 }, + { 11, 7, -19 }, + { 8, 4, -21 }, + { -28, 7, 10 }, + { -23, 13, 14 }, + { -24, 18, 12 }, + { -33, 11, 9 }, + { -28, 7, -9 }, + { -23, 13, -13 }, + { -19, 7, -10 }, + { -21, 4, -7 }, + { -33, 11, -9 }, + { -34, 4, 0 }, + { -33, 11, 9 }, + { -12, 20, 5 }, + { -11, 18, 10 }, + { -6, 20, 12 }, + { -6, 20, -12 }, + { -11, 18, -10 }, + { -12, 20, -6 }, + { 5, 20, 12 }, + { 10, 18, 11 }, + { 12, 20, 5 }, + { -6, 20, -12 }, + { -12, 20, -6 }, + { -10, 24, -5 }, + { -5, 24, -10 }, + { 33, 11, -9 }, + { 34, 4, 0 }, + { 30, 0, 0 }, + { 28, 7, -9 }, + { 28, 7, -9 }, + { 30, 0, 0 }, + { 24, 2, 0 }, + { 21, 4, -8 }, + { 21, 4, 8 }, + { 30, 0, 0 }, + { 28, 7, 10 }, + { 28, 7, 10 }, + { 30, 0, 0 }, + { 33, 11, 9 }, + { 8, 4, -21 }, + { 0, 2, -23 }, + { 0, 0, -28 }, + { 0, 0, -28 }, + { 10, 7, -28 }, + { 10, 7, -28 }, + { 0, 0, -28 }, + { 0, 3, -33 }, + { 9, 10, -32 }, + { -9, 10, -32 }, + { 0, 0, -28 }, + { -9, 7, -28 }, + { -9, 7, -28 }, + { 0, 0, -28 }, + { -7, 4, -21 }, + { -28, 7, -9 }, + { -30, 0, 0 }, + { -34, 4, 0 }, + { -34, 4, 0 }, + { -33, 11, -9 }, + { -21, 4, -7 }, + { -24, 2, 0 }, + { -30, 0, 0 }, + { -28, 7, -9 }, + { -33, 11, 9 }, + { -30, 0, 0 }, + { -28, 7, 10 }, + { -28, 7, 10 }, + { -30, 0, 0 }, + { -21, 4, 8 }, + { -9, 7, 28 }, + { 0, 0, 30 }, + { 0, 4, 34 }, + { -8, 11, 33 }, + { -8, 4, 21 }, + { 0, 2, 24 }, + { 0, 0, 30 }, + { -9, 7, 28 }, + { 10, 7, 28 }, + { 0, 0, 30 }, + { 8, 4, 21 }, + { 10, 7, 28 }, + { 14, 13, 23 }, + { 11, 18, 24 }, + { 9, 11, 33 }, + { -17, 9, -11 }, + { -10, 10, -10 }, + { -10, 10, 10 }, + { -17, 9, 11 }, + { -11, 9, 17 }, + { -10, 10, 10 }, + { 10, 10, 10 }, + { 11, 9, 17 }, + { 21, 4, -8 }, + { 24, 2, 0 }, + { 21, 4, 8 }, + { 33, 11, 9 }, + { 34, 4, 0 }, + { 33, 11, -9 }, + { 9, 10, -32 }, + { 0, 3, -33 }, + { -9, 10, -32 }, + { -11, 7, -19 }, + { -14, 13, -23 }, + { -9, 7, -28 }, + { -7, 4, -21 }, + { 11, 9, -17 }, + { 10, 10, -10 }, + { -10, 10, -10 }, + { -11, 9, -17 }, + { -10, 10, 10 }, + { -10, 10, -10 }, + { 0, 0, 0 }, + { -10, 24, 4 }, + { -10, 24, -5 }, + { -12, 20, -6 }, + { -12, 20, 5 }, + { -5, 24, 10 }, + { -6, 20, 12 }, + { 5, 24, 10 }, + { 5, 24, 10 }, + { 5, 20, 12 }, + { 10, 24, 5 }, + { 5, 24, 10 }, + { 5, 20, 12 }, + { 12, 20, 5 }, + { 10, 24, -5 }, + { 12, 20, -6 }, + { 5, 24, -10 }, + { 5, 20, -12 }, + { -5, 24, -10 }, + { -6, 20, -12 }, + { -11, 19, 16 }, + { -12, 18, 24 }, + { 11, 18, 24 }, + { 11, 19, 16 }, + { 16, 19, -11 }, + { 11, 18, -10 }, + { 12, 20, -6 }, + { 12, 20, 5 }, + { 10, 18, 11 }, + { 16, 19, 11 }, + { 11, 19, -16 }, + { 11, 18, -24 }, + { -12, 18, -24 }, + { -11, 19, -16 }, + { -16, 19, -11 }, + { -24, 18, -12 }, + { -24, 18, 12 }, + { -16, 19, 10 }, + { -7, 4, -21 }, + { 0, 2, -23 }, + { 8, 4, -21 }, + { -11, 7, -19 }, + { 11, 7, -19 }, + { 8, 4, 21 }, + { 0, 2, 24 }, + { -8, 4, 21 }, + { 11, 7, 19 }, + { -11, 7, 19 }, + { -21, 4, 8 }, + { -24, 2, 0 }, + { -21, 4, -7 }, + { -19, 7, 11 }, + { -19, 7, 11 }, + { -21, 4, -7 }, + { -19, 7, -10 }, + { 17, 9, 11 }, + { 10, 10, 10 }, + { 10, 10, -10 }, + { 17, 9, -11 }, + { 19, 7, -11 }, + { 21, 4, -8 }, + { 21, 4, 8 }, + { 19, 7, 11 }, + { 16, 15, 14 }, + { 23, 13, 14 }, + { 24, 18, 12 }, + { 16, 19, 11 }, + { 16, 15, 14 }, + { 12, 15, 13 }, + { 24, 18, -11 }, + { 16, 19, -11 }, + { 16, 15, -14 }, + { 13, 15, -12 }, + { 11, 18, -10 }, + { 16, 15, -14 }, + { 23, 13, -13 }, + { 33, 11, -9 }, + { 33, 11, 9 }, + { 14, 15, -16 }, + { 14, 13, -23 }, + { 11, 18, -24 }, + { 11, 19, -16 }, + { 14, 15, -16 }, + { 13, 15, -12 }, + { 10, 10, -10 }, + { 11, 9, -17 }, + { -11, 9, -17 }, + { -11, 7, -19 }, + { 11, 7, -19 }, + { -11, 19, -16 }, + { -11, 18, -10 }, + { -6, 20, -12 }, + { 5, 20, -12 }, + { 11, 18, -10 }, + { 11, 19, -16 }, + { -14, 15, -16 }, + { -13, 15, -12 }, + { -11, 18, -10 }, + { -14, 15, -16 }, + { -14, 13, -23 }, + { -16, 15, -14 }, + { -23, 13, -13 }, + { -24, 18, -12 }, + { -16, 19, -11 }, + { -16, 15, -14 }, + { -13, 15, -12 }, + { -10, 10, -10 }, + { -17, 9, -11 }, + { -16, 19, 10 }, + { -11, 18, 10 }, + { -12, 20, 5 }, + { -12, 20, -6 }, + { -16, 15, 13 }, + { -13, 15, 12 }, + { -16, 15, 13 }, + { -23, 13, 14 }, + { -19, 7, 11 }, + { -17, 9, 11 }, + { -19, 7, -10 }, + { -17, 9, -11 }, + { -14, 15, 16 }, + { -14, 13, 23 }, + { -12, 18, 24 }, + { -11, 19, 16 }, + { -14, 15, 16 }, + { -13, 15, 12 }, + { -10, 10, 10 }, + { -11, 9, 17 }, + { 11, 9, 17 }, + { 11, 7, 19 }, + { -11, 7, 19 }, + { 11, 19, 16 }, + { 10, 18, 11 }, + { 5, 20, 12 }, + { -6, 20, 12 }, + { -11, 18, 10 }, + { 14, 15, 16 }, + { 12, 15, 13 }, + { 14, 15, 16 }, + { 14, 13, 23 }, + { 9, 11, 33 }, + { 11, 18, 24 }, + { -8, 11, 33 }, + { -9, 10, -32 }, + { -12, 18, -24 }, + { 11, 18, -24 }, + { -9, 10, -32 }, + { 11, 18, -24 }, + { 9, 10, -32 }, + { -33, 11, 9 }, + { -24, 18, 12 }, + { -24, 18, -12 }, + { -33, 11, -9 }, + { 10, 10, -10 }, + { 10, 10, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 10, 10, 10 }, + { -10, 10, 10 }, + { 0, 0, 0 }, + { -10, 10, -10 }, + { 10, 10, -10 }, + { -5, 24, 10 }, + { 5, 24, 10 }, + { 10, 24, 5 }, + { -10, 24, 4 }, + { 10, 24, -5 }, + { -10, 24, -5 }, + { 5, 24, -10 }, + { -5, 24, -10 }, +}; + +Gfx Entity_MunchlesiaReset_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A005EE8_E74548, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaReset_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaReset.png.inc.c" diff --git a/src/entity/model/MunchlesiaSpitOut_anim.c b/src/entity/model/MunchlesiaSpitOut_anim.c new file mode 100644 index 0000000000..a6421caab9 --- /dev/null +++ b/src/entity/model/MunchlesiaSpitOut_anim.c @@ -0,0 +1,227 @@ +#include "common.h" +#include "animation_script.h" + +extern Vtx D_0A000000_E8A9E0[]; +extern Gfx Entity_MunchlesiaSpitOut_Render[]; + +AnimScript Entity_MunchlesiaSpitOut_Animation = { + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 0, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 0, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 0, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 0, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_Loop + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 0, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_Restart + as_End +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node9 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = ANIM_NULL, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 7, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node8 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node9, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 6, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node7 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node8, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 5, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node6 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node7, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 4, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node5 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node6, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 3, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node4 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node5, + .child = ANIM_NULL, + .vertexStartOffset = 399 * 2, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node3 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node4, + .child = ANIM_NULL, + .vertexStartOffset = 399, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node2 = { + .displayList = Entity_MunchlesiaSpitOut_Render, + .sibling = &Entity_MunchlesiaSpitOut_Node3, + .child = ANIM_NULL, + .vtxList = D_0A000000_E8A9E0, +}; + +StaticAnimatorNode Entity_MunchlesiaSpitOut_Node1 = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_MunchlesiaSpitOut_Node2, + .vertexStartOffset = (s32)ANIM_NULL, + .vtxList = ANIM_NULL, +}; + +StaticAnimatorNode* Entity_MunchlesiaSpitOut_Mesh[] = { + &Entity_MunchlesiaSpitOut_Node1, + &Entity_MunchlesiaSpitOut_Node2, + &Entity_MunchlesiaSpitOut_Node3, + &Entity_MunchlesiaSpitOut_Node4, + &Entity_MunchlesiaSpitOut_Node5, + &Entity_MunchlesiaSpitOut_Node6, + &Entity_MunchlesiaSpitOut_Node7, + &Entity_MunchlesiaSpitOut_Node8, + &Entity_MunchlesiaSpitOut_Node9, + ANIM_NULL, +}; diff --git a/src/entity/model/MunchlesiaSpitOut_gfx.c b/src/entity/model/MunchlesiaSpitOut_gfx.c new file mode 100644 index 0000000000..cc4be97ce3 --- /dev/null +++ b/src/entity/model/MunchlesiaSpitOut_gfx.c @@ -0,0 +1,3343 @@ +#include "common.h" + +extern unsigned char D_0A006840_E91220[]; + +#include "entity/model/MunchlesiaSpitOut.vtx.inc.c" + +Vec3s Entity_MunchlesiaSpitOut_vertexArray[] = { + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 39, 13 }, + { 10, 32, 17 }, + { 13, 27, 11 }, + { 9, 34, 8 }, + { -13, 39, 7 }, + { -17, 32, 10 }, + { -11, 27, 13 }, + { -8, 34, 9 }, + { 8, 29, -5 }, + { 11, 26, -6 }, + { 13, 27, -11 }, + { 9, 34, -8 }, + { 13, 39, -8 }, + { 17, 32, -11 }, + { 11, 27, -14 }, + { 8, 34, -10 }, + { -11, 23, 17 }, + { -11, 32, 17 }, + { -14, 27, 11 }, + { -14, 20, 12 }, + { -17, 23, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -17, 23, -11 }, + { -17, 32, -11 }, + { -11, 27, -14 }, + { -12, 20, -14 }, + { -11, 23, -17 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 20, -12 }, + { 11, 23, -17 }, + { 10, 32, -17 }, + { 13, 27, -11 }, + { 14, 20, -12 }, + { 17, 23, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 20, -14 }, + { 17, 23, 11 }, + { 17, 32, 10 }, + { 11, 27, 14 }, + { 12, 20, 14 }, + { 11, 23, 17 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { -9, 29, 5 }, + { -12, 26, 6 }, + { -14, 27, 11 }, + { -10, 34, 8 }, + { 11, 18, 8 }, + { 11, 26, 6 }, + { 13, 27, 11 }, + { 14, 20, 12 }, + { -11, 18, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 20, 12 }, + { 8, 18, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 20, 14 }, + { 5, 29, 9 }, + { 6, 26, 12 }, + { 11, 27, 14 }, + { 8, 34, 9 }, + { 8, 18, -11 }, + { 6, 26, -11 }, + { 11, 27, -14 }, + { 12, 20, -14 }, + { 11, 18, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 20, -12 }, + { -11, 18, -8 }, + { -12, 26, -6 }, + { -14, 27, -11 }, + { -14, 20, -12 }, + { -8, 18, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 20, -14 }, + { -5, 29, -9 }, + { -6, 26, -12 }, + { -11, 27, -14 }, + { -8, 34, -10 }, + { -8, 18, 10 }, + { -6, 26, 11 }, + { -11, 27, 13 }, + { -12, 20, 13 }, + { 8, 29, 5 }, + { 0, 32, 3 }, + { 0, 38, 2 }, + { 9, 34, 8 }, + { -10, 34, 8 }, + { -14, 27, 11 }, + { -11, 32, 17 }, + { -8, 39, 13 }, + { 8, 34, -10 }, + { 11, 27, -14 }, + { 6, 26, -11 }, + { 5, 29, -9 }, + { 8, 34, 9 }, + { 11, 27, 14 }, + { 17, 32, 10 }, + { 13, 39, 7 }, + { -10, 34, -8 }, + { -14, 27, -11 }, + { -12, 26, -6 }, + { -9, 29, -5 }, + { 9, 34, -8 }, + { 13, 27, -11 }, + { 10, 32, -17 }, + { 7, 39, -13 }, + { -8, 34, 9 }, + { -11, 27, 13 }, + { -6, 26, 11 }, + { -5, 29, 8 }, + { -8, 34, -10 }, + { -11, 27, -14 }, + { -17, 32, -11 }, + { -13, 39, -8 }, + { -5, 29, -9 }, + { -3, 32, 0 }, + { -5, 29, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 5, 29, -9 }, + { 3, 32, 0 }, + { 2, 38, 0 }, + { 8, 34, -10 }, + { 8, 34, -10 }, + { 2, 38, 0 }, + { 6, 42, 0 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 2, 38, 0 }, + { 8, 34, 9 }, + { 8, 34, 9 }, + { 2, 38, 0 }, + { 5, 29, 9 }, + { 7, 39, -13 }, + { 0, 42, -6 }, + { 0, 38, -2 }, + { 0, 38, -2 }, + { 9, 34, -8 }, + { 9, 34, -8 }, + { 0, 38, -2 }, + { 0, 32, -3 }, + { 8, 29, -5 }, + { -9, 29, -5 }, + { 0, 38, -2 }, + { -10, 34, -8 }, + { -10, 34, -8 }, + { 0, 38, -2 }, + { -8, 39, -13 }, + { -8, 34, -10 }, + { -2, 38, 0 }, + { -3, 32, 0 }, + { -3, 32, 0 }, + { -5, 29, -9 }, + { -13, 39, -8 }, + { -6, 42, 0 }, + { -2, 38, 0 }, + { -8, 34, -10 }, + { -5, 29, 8 }, + { -2, 38, 0 }, + { -8, 34, 9 }, + { -8, 34, 9 }, + { -2, 38, 0 }, + { -13, 39, 7 }, + { -10, 34, 8 }, + { 0, 38, 2 }, + { 0, 32, 3 }, + { -9, 29, 5 }, + { -8, 39, 13 }, + { 0, 42, 6 }, + { 0, 38, 2 }, + { -10, 34, 8 }, + { 9, 34, 8 }, + { 0, 38, 2 }, + { 7, 39, 13 }, + { 9, 34, 8 }, + { 13, 27, 11 }, + { 11, 26, 6 }, + { 8, 29, 5 }, + { -17, 23, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -17, 23, 10 }, + { -11, 23, 17 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 23, 17 }, + { 13, 39, -8 }, + { 6, 42, 0 }, + { 13, 39, 7 }, + { 5, 29, 9 }, + { 3, 32, 0 }, + { 5, 29, -9 }, + { 8, 29, -5 }, + { 0, 32, -3 }, + { -9, 29, -5 }, + { -11, 32, -17 }, + { -14, 27, -11 }, + { -10, 34, -8 }, + { -8, 39, -13 }, + { 11, 23, -17 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -17 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 18, 8 }, + { -12, 26, 6 }, + { 11, 26, 6 }, + { 11, 18, 8 }, + { 8, 18, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 18, 11 }, + { 11, 18, -8 }, + { 11, 26, -6 }, + { -12, 26, -6 }, + { -11, 18, -8 }, + { -8, 18, -11 }, + { -6, 26, -12 }, + { -6, 26, 11 }, + { -8, 18, 10 }, + { -8, 39, -13 }, + { 0, 42, -6 }, + { 7, 39, -13 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { 7, 39, 13 }, + { 0, 42, 6 }, + { -8, 39, 13 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { -13, 39, 7 }, + { -6, 42, 0 }, + { -13, 39, -8 }, + { -17, 32, 10 }, + { -17, 32, 10 }, + { -13, 39, -8 }, + { -17, 32, -11 }, + { 17, 23, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 17, 23, -11 }, + { 17, 32, -11 }, + { 13, 39, -8 }, + { 13, 39, 7 }, + { 17, 32, 10 }, + { 12, 20, 14 }, + { 11, 27, 14 }, + { 6, 26, 12 }, + { 8, 18, 11 }, + { 12, 20, 14 }, + { 11, 17, 13 }, + { 6, 26, -11 }, + { 8, 18, -11 }, + { 12, 20, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 20, -14 }, + { 11, 27, -14 }, + { 5, 29, -9 }, + { 5, 29, 9 }, + { 14, 20, -12 }, + { 13, 27, -11 }, + { 11, 26, -6 }, + { 11, 18, -8 }, + { 14, 20, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -17 }, + { -11, 23, -17 }, + { -11, 32, -17 }, + { 10, 32, -17 }, + { -11, 18, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 18, -8 }, + { -14, 20, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 20, -12 }, + { -14, 27, -11 }, + { -12, 20, -14 }, + { -11, 27, -14 }, + { -6, 26, -12 }, + { -8, 18, -11 }, + { -12, 20, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -17, 23, -11 }, + { -8, 18, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 20, 13 }, + { -13, 17, 11 }, + { -12, 20, 13 }, + { -11, 27, 13 }, + { -17, 32, 10 }, + { -17, 23, 10 }, + { -17, 32, -11 }, + { -17, 23, -11 }, + { -14, 20, 12 }, + { -14, 27, 11 }, + { -12, 26, 6 }, + { -11, 18, 8 }, + { -14, 20, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 23, 17 }, + { 11, 23, 17 }, + { 10, 32, 17 }, + { -11, 32, 17 }, + { 11, 18, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 20, 12 }, + { 11, 17, 13 }, + { 14, 20, 12 }, + { 13, 27, 11 }, + { 8, 29, 5 }, + { 11, 26, 6 }, + { -9, 29, 5 }, + { -9, 29, -5 }, + { -12, 26, -6 }, + { 11, 26, -6 }, + { -9, 29, -5 }, + { 11, 26, -6 }, + { 8, 29, -5 }, + { -5, 29, 8 }, + { -6, 26, 11 }, + { -6, 26, -12 }, + { -5, 29, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 6, 20, -6 }, + { 11, 17, -7 }, + { 5, 20, -6 }, + { 7, 37, 10 }, + { 11, 31, 15 }, + { 14, 26, 10 }, + { 9, 31, 6 }, + { -10, 37, 7 }, + { -15, 31, 10 }, + { -10, 26, 13 }, + { -6, 31, 9 }, + { 8, 25, -4 }, + { 11, 23, -5 }, + { 14, 26, -9 }, + { 9, 31, -6 }, + { 10, 37, -8 }, + { 15, 31, -11 }, + { 10, 26, -14 }, + { 6, 31, -10 }, + { -11, 23, 16 }, + { -11, 31, 15 }, + { -14, 26, 10 }, + { -14, 20, 11 }, + { -16, 23, 10 }, + { -9, 12, 13 }, + { -13, 17, 10 }, + { -11, 20, 13 }, + { -16, 23, -11 }, + { -15, 31, -11 }, + { -10, 26, -14 }, + { -11, 20, -14 }, + { -11, 23, -16 }, + { -13, 12, -9 }, + { -13, 17, -10 }, + { -14, 20, -11 }, + { 11, 23, -16 }, + { 11, 31, -15 }, + { 14, 26, -9 }, + { 14, 20, -11 }, + { 16, 23, -11 }, + { 10, 12, -13 }, + { 13, 17, -10 }, + { 11, 20, -14 }, + { 16, 23, 11 }, + { 15, 31, 10 }, + { 10, 26, 14 }, + { 11, 20, 14 }, + { 11, 23, 16 }, + { 13, 12, 10 }, + { 10, 17, 13 }, + { 14, 20, 11 }, + { -9, 25, 4 }, + { -12, 23, 5 }, + { -14, 26, 10 }, + { -10, 31, 6 }, + { 11, 18, 7 }, + { 11, 23, 5 }, + { 14, 26, 10 }, + { 14, 20, 11 }, + { -11, 18, 7 }, + { -11, 17, 7 }, + { -13, 17, 10 }, + { -14, 20, 11 }, + { 7, 18, 11 }, + { 7, 17, 11 }, + { 10, 17, 13 }, + { 11, 20, 14 }, + { 4, 25, 9 }, + { 5, 23, 12 }, + { 10, 26, 14 }, + { 6, 31, 10 }, + { 7, 18, -11 }, + { 5, 23, -11 }, + { 10, 26, -14 }, + { 11, 20, -14 }, + { 11, 18, -7 }, + { 11, 17, -7 }, + { 13, 17, -10 }, + { 14, 20, -11 }, + { -11, 18, -7 }, + { -12, 23, -5 }, + { -14, 26, -9 }, + { -14, 20, -11 }, + { -7, 18, -11 }, + { -11, 17, -7 }, + { -13, 17, -10 }, + { -11, 20, -14 }, + { -4, 25, -9 }, + { -5, 23, -12 }, + { -10, 26, -14 }, + { -6, 31, -10 }, + { -7, 18, 10 }, + { -5, 23, 11 }, + { -10, 26, 13 }, + { -11, 20, 13 }, + { 8, 25, 4 }, + { 0, 27, 3 }, + { 0, 32, 1 }, + { 9, 31, 6 }, + { -10, 31, 6 }, + { -14, 26, 10 }, + { -11, 31, 15 }, + { -8, 37, 10 }, + { 6, 31, -10 }, + { 10, 26, -14 }, + { 5, 23, -11 }, + { 4, 25, -9 }, + { 6, 31, 10 }, + { 10, 26, 14 }, + { 15, 31, 10 }, + { 10, 37, 7 }, + { -10, 31, -6 }, + { -14, 26, -9 }, + { -12, 23, -5 }, + { -9, 25, -4 }, + { 9, 31, -6 }, + { 14, 26, -9 }, + { 11, 31, -15 }, + { 7, 37, -9 }, + { -6, 31, 9 }, + { -10, 26, 13 }, + { -5, 23, 11 }, + { -4, 25, 8 }, + { -6, 31, -10 }, + { -10, 26, -14 }, + { -15, 31, -11 }, + { -10, 37, -8 }, + { -4, 25, -9 }, + { -3, 27, 0 }, + { -4, 25, 8 }, + { -6, 20, 5 }, + { -11, 17, 7 }, + { -6, 20, 6 }, + { -5, 20, -6 }, + { -11, 17, -7 }, + { -6, 20, -6 }, + { 6, 20, 6 }, + { 7, 17, 11 }, + { 6, 20, 5 }, + { -5, 20, -6 }, + { -6, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 4, 25, -9 }, + { 3, 27, 0 }, + { 1, 32, 0 }, + { 6, 31, -10 }, + { 6, 31, -10 }, + { 1, 32, 0 }, + { 3, 37, 0 }, + { 10, 37, -8 }, + { 10, 37, 7 }, + { 1, 32, 0 }, + { 6, 31, 10 }, + { 6, 31, 10 }, + { 1, 32, 0 }, + { 4, 25, 9 }, + { 7, 37, -9 }, + { 0, 37, -3 }, + { 0, 32, -1 }, + { 0, 32, -1 }, + { 9, 31, -6 }, + { 9, 31, -6 }, + { 0, 32, -1 }, + { 0, 27, -2 }, + { 8, 25, -4 }, + { -9, 25, -4 }, + { 0, 32, -1 }, + { -10, 31, -6 }, + { -10, 31, -6 }, + { 0, 32, -1 }, + { -8, 37, -9 }, + { -6, 31, -10 }, + { -1, 32, 0 }, + { -3, 27, 0 }, + { -3, 27, 0 }, + { -4, 25, -9 }, + { -10, 37, -8 }, + { -3, 37, 0 }, + { -1, 32, 0 }, + { -6, 31, -10 }, + { -4, 25, 8 }, + { -1, 32, 0 }, + { -6, 31, 9 }, + { -6, 31, 9 }, + { -1, 32, 0 }, + { -10, 37, 7 }, + { -10, 31, 6 }, + { 0, 32, 1 }, + { 0, 27, 3 }, + { -9, 25, 4 }, + { -8, 37, 10 }, + { 0, 37, 3 }, + { 0, 32, 1 }, + { -10, 31, 6 }, + { 9, 31, 6 }, + { 0, 32, 1 }, + { 7, 37, 10 }, + { 9, 31, 6 }, + { 14, 26, 10 }, + { 11, 23, 5 }, + { 8, 25, 4 }, + { -16, 23, -11 }, + { -13, 12, -9 }, + { -9, 12, 13 }, + { -16, 23, 10 }, + { -11, 23, 16 }, + { -9, 12, 13 }, + { 13, 12, 10 }, + { 11, 23, 16 }, + { 10, 37, -8 }, + { 3, 37, 0 }, + { 10, 37, 7 }, + { 4, 25, 9 }, + { 3, 27, 0 }, + { 4, 25, -9 }, + { 8, 25, -4 }, + { 0, 27, -2 }, + { -9, 25, -4 }, + { -11, 31, -15 }, + { -14, 26, -9 }, + { -10, 31, -6 }, + { -8, 37, -9 }, + { 11, 23, -16 }, + { 10, 12, -13 }, + { -13, 12, -9 }, + { -11, 23, -16 }, + { -9, 12, 13 }, + { -13, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -6, 20, -6 }, + { -6, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 6 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 6, 20, 6 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 6, 20, 6 }, + { 6, 20, 5 }, + { 3, 21, -5 }, + { 6, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -6 }, + { -5, 21, -3 }, + { -5, 20, -6 }, + { -11, 18, 7 }, + { -12, 23, 5 }, + { 11, 23, 5 }, + { 11, 18, 7 }, + { 7, 18, -11 }, + { 11, 17, -7 }, + { 6, 20, -6 }, + { 6, 20, 5 }, + { 7, 17, 11 }, + { 7, 18, 11 }, + { 11, 18, -7 }, + { 11, 23, -5 }, + { -12, 23, -5 }, + { -11, 18, -7 }, + { -7, 18, -11 }, + { -5, 23, -12 }, + { -5, 23, 11 }, + { -7, 18, 10 }, + { -8, 37, -9 }, + { 0, 37, -3 }, + { 7, 37, -9 }, + { -11, 31, -15 }, + { 11, 31, -15 }, + { 7, 37, 10 }, + { 0, 37, 3 }, + { -8, 37, 10 }, + { 11, 31, 15 }, + { -11, 31, 15 }, + { -10, 37, 7 }, + { -3, 37, 0 }, + { -10, 37, -8 }, + { -15, 31, 10 }, + { -15, 31, 10 }, + { -10, 37, -8 }, + { -15, 31, -11 }, + { 16, 23, 11 }, + { 13, 12, 10 }, + { 10, 12, -13 }, + { 16, 23, -11 }, + { 15, 31, -11 }, + { 10, 37, -8 }, + { 10, 37, 7 }, + { 15, 31, 10 }, + { 11, 20, 14 }, + { 10, 26, 14 }, + { 5, 23, 12 }, + { 7, 18, 11 }, + { 11, 20, 14 }, + { 10, 17, 13 }, + { 5, 23, -11 }, + { 7, 18, -11 }, + { 11, 20, -14 }, + { 13, 17, -10 }, + { 11, 17, -7 }, + { 11, 20, -14 }, + { 10, 26, -14 }, + { 4, 25, -9 }, + { 4, 25, 9 }, + { 14, 20, -11 }, + { 14, 26, -9 }, + { 11, 23, -5 }, + { 11, 18, -7 }, + { 14, 20, -11 }, + { 13, 17, -10 }, + { 10, 12, -13 }, + { 11, 23, -16 }, + { -11, 23, -16 }, + { -11, 31, -15 }, + { 11, 31, -15 }, + { -11, 18, -7 }, + { -11, 17, -7 }, + { -5, 20, -6 }, + { 5, 20, -6 }, + { 11, 17, -7 }, + { 11, 18, -7 }, + { -14, 20, -11 }, + { -13, 17, -10 }, + { -11, 17, -7 }, + { -14, 20, -11 }, + { -14, 26, -9 }, + { -11, 20, -14 }, + { -10, 26, -14 }, + { -5, 23, -12 }, + { -7, 18, -11 }, + { -11, 20, -14 }, + { -13, 17, -10 }, + { -13, 12, -9 }, + { -16, 23, -11 }, + { -7, 18, 10 }, + { -11, 17, 7 }, + { -6, 20, 5 }, + { -6, 20, -6 }, + { -11, 20, 13 }, + { -13, 17, 10 }, + { -11, 20, 13 }, + { -10, 26, 13 }, + { -15, 31, 10 }, + { -16, 23, 10 }, + { -15, 31, -11 }, + { -16, 23, -11 }, + { -14, 20, 11 }, + { -14, 26, 10 }, + { -12, 23, 5 }, + { -11, 18, 7 }, + { -14, 20, 11 }, + { -13, 17, 10 }, + { -9, 12, 13 }, + { -11, 23, 16 }, + { 11, 23, 16 }, + { 11, 31, 15 }, + { -11, 31, 15 }, + { 11, 18, 7 }, + { 7, 17, 11 }, + { 6, 20, 6 }, + { -6, 20, 6 }, + { -11, 17, 7 }, + { 14, 20, 11 }, + { 10, 17, 13 }, + { 14, 20, 11 }, + { 14, 26, 10 }, + { 8, 25, 4 }, + { 11, 23, 5 }, + { -9, 25, 4 }, + { -9, 25, -4 }, + { -12, 23, -5 }, + { 11, 23, -5 }, + { -9, 25, -4 }, + { 11, 23, -5 }, + { 8, 25, -4 }, + { -4, 25, 8 }, + { -5, 23, 11 }, + { -5, 23, -12 }, + { -4, 25, -9 }, + { 10, 12, -13 }, + { 13, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 12, 10 }, + { -9, 12, 13 }, + { 0, 0, 0 }, + { -13, 12, -9 }, + { 10, 12, -13 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 6, 19, -6 }, + { 11, 17, -7 }, + { 5, 19, -6 }, + { 7, 35, 8 }, + { 10, 31, 13 }, + { 14, 25, 9 }, + { 9, 29, 5 }, + { -8, 35, 7 }, + { -13, 31, 10 }, + { -9, 25, 13 }, + { -5, 29, 9 }, + { 9, 23, -3 }, + { 11, 21, -5 }, + { 14, 25, -9 }, + { 9, 29, -5 }, + { 8, 35, -8 }, + { 13, 31, -11 }, + { 9, 25, -14 }, + { 5, 29, -10 }, + { -11, 22, 16 }, + { -11, 31, 13 }, + { -14, 25, 9 }, + { -14, 20, 11 }, + { -16, 22, 10 }, + { -9, 12, 13 }, + { -13, 17, 10 }, + { -11, 20, 13 }, + { -16, 22, -11 }, + { -13, 31, -11 }, + { -9, 25, -14 }, + { -11, 20, -14 }, + { -11, 22, -16 }, + { -13, 12, -9 }, + { -13, 17, -10 }, + { -14, 20, -11 }, + { 11, 22, -16 }, + { 10, 31, -13 }, + { 14, 25, -9 }, + { 14, 20, -11 }, + { 16, 22, -11 }, + { 10, 12, -13 }, + { 13, 17, -10 }, + { 11, 20, -14 }, + { 16, 22, 11 }, + { 13, 31, 10 }, + { 9, 25, 13 }, + { 11, 20, 14 }, + { 11, 22, 16 }, + { 13, 12, 10 }, + { 10, 17, 13 }, + { 14, 20, 11 }, + { -9, 23, 3 }, + { -12, 21, 5 }, + { -14, 25, 9 }, + { -10, 29, 5 }, + { 11, 18, 7 }, + { 11, 21, 5 }, + { 14, 25, 9 }, + { 14, 20, 11 }, + { -11, 18, 7 }, + { -11, 17, 7 }, + { -13, 17, 10 }, + { -14, 20, 11 }, + { 7, 18, 11 }, + { 7, 17, 11 }, + { 10, 17, 13 }, + { 11, 20, 14 }, + { 3, 23, 9 }, + { 5, 21, 11 }, + { 9, 25, 13 }, + { 5, 29, 10 }, + { 7, 18, -11 }, + { 5, 21, -12 }, + { 9, 25, -14 }, + { 11, 20, -14 }, + { 11, 18, -7 }, + { 11, 17, -7 }, + { 13, 17, -10 }, + { 14, 20, -11 }, + { -11, 18, -7 }, + { -12, 21, -5 }, + { -14, 25, -9 }, + { -14, 20, -11 }, + { -7, 18, -11 }, + { -11, 17, -7 }, + { -13, 17, -10 }, + { -11, 20, -14 }, + { -3, 23, -9 }, + { -5, 21, -12 }, + { -9, 25, -14 }, + { -5, 29, -10 }, + { -7, 18, 10 }, + { -5, 21, 11 }, + { -9, 25, 13 }, + { -11, 20, 13 }, + { 8, 23, 3 }, + { 0, 25, 2 }, + { 0, 30, 0 }, + { 9, 29, 5 }, + { -10, 29, 5 }, + { -14, 25, 9 }, + { -11, 31, 13 }, + { -8, 35, 8 }, + { 5, 29, -10 }, + { 9, 25, -14 }, + { 5, 21, -12 }, + { 3, 23, -9 }, + { 5, 29, 10 }, + { 9, 25, 13 }, + { 13, 31, 10 }, + { 8, 35, 7 }, + { -10, 29, -5 }, + { -14, 25, -9 }, + { -12, 21, -5 }, + { -9, 23, -3 }, + { 9, 29, -5 }, + { 14, 25, -9 }, + { 10, 31, -13 }, + { 7, 35, -8 }, + { -5, 29, 9 }, + { -9, 25, 13 }, + { -5, 21, 11 }, + { -3, 23, 8 }, + { -5, 29, -10 }, + { -9, 25, -14 }, + { -13, 31, -11 }, + { -8, 35, -8 }, + { -3, 23, -9 }, + { -2, 25, 0 }, + { -3, 23, 8 }, + { -6, 19, 5 }, + { -11, 17, 7 }, + { -6, 19, 6 }, + { -5, 19, -6 }, + { -11, 17, -7 }, + { -6, 19, -6 }, + { 6, 19, 6 }, + { 7, 17, 11 }, + { 6, 19, 5 }, + { -5, 19, -6 }, + { -6, 19, -6 }, + { -2, 21, -5 }, + { -5, 21, -2 }, + { 3, 23, -9 }, + { 2, 25, 0 }, + { 0, 30, 0 }, + { 5, 29, -10 }, + { 5, 29, -10 }, + { 0, 30, 0 }, + { 2, 35, 0 }, + { 8, 35, -8 }, + { 8, 35, 7 }, + { 0, 30, 0 }, + { 5, 29, 10 }, + { 5, 29, 10 }, + { 0, 30, 0 }, + { 3, 23, 9 }, + { 7, 35, -8 }, + { 0, 35, -2 }, + { 0, 30, 0 }, + { 0, 30, 0 }, + { 9, 29, -5 }, + { 9, 29, -5 }, + { 0, 30, 0 }, + { 0, 25, -2 }, + { 9, 23, -3 }, + { -9, 23, -3 }, + { 0, 30, 0 }, + { -10, 29, -5 }, + { -10, 29, -5 }, + { 0, 30, 0 }, + { -8, 35, -8 }, + { -5, 29, -10 }, + { 0, 30, 0 }, + { -2, 25, 0 }, + { -2, 25, 0 }, + { -3, 23, -9 }, + { -8, 35, -8 }, + { -2, 35, 0 }, + { 0, 30, 0 }, + { -5, 29, -10 }, + { -3, 23, 8 }, + { 0, 30, 0 }, + { -5, 29, 9 }, + { -5, 29, 9 }, + { 0, 30, 0 }, + { -8, 35, 7 }, + { -10, 29, 5 }, + { 0, 30, 0 }, + { 0, 25, 2 }, + { -9, 23, 3 }, + { -8, 35, 8 }, + { 0, 35, 2 }, + { 0, 30, 0 }, + { -10, 29, 5 }, + { 9, 29, 5 }, + { 0, 30, 0 }, + { 7, 35, 8 }, + { 9, 29, 5 }, + { 14, 25, 9 }, + { 11, 21, 5 }, + { 8, 23, 3 }, + { -16, 22, -11 }, + { -13, 12, -9 }, + { -9, 12, 13 }, + { -16, 22, 10 }, + { -11, 22, 16 }, + { -9, 12, 13 }, + { 13, 12, 10 }, + { 11, 22, 16 }, + { 8, 35, -8 }, + { 2, 35, 0 }, + { 8, 35, 7 }, + { 3, 23, 9 }, + { 2, 25, 0 }, + { 3, 23, -9 }, + { 9, 23, -3 }, + { 0, 25, -2 }, + { -9, 23, -3 }, + { -11, 31, -13 }, + { -14, 25, -9 }, + { -10, 29, -5 }, + { -8, 35, -8 }, + { 11, 22, -16 }, + { 10, 12, -13 }, + { -13, 12, -9 }, + { -11, 22, -16 }, + { -9, 12, 13 }, + { -13, 12, -9 }, + { 0, 0, 0 }, + { -2, 21, 4 }, + { -2, 21, -5 }, + { -6, 19, -6 }, + { -6, 19, 5 }, + { -5, 21, 2 }, + { -6, 19, 6 }, + { 4, 21, 2 }, + { 4, 21, 2 }, + { 6, 19, 6 }, + { 2, 21, 5 }, + { 4, 21, 2 }, + { 6, 19, 6 }, + { 6, 19, 5 }, + { 2, 21, -5 }, + { 6, 19, -6 }, + { 4, 21, -2 }, + { 5, 19, -6 }, + { -5, 21, -2 }, + { -5, 19, -6 }, + { -11, 18, 7 }, + { -12, 21, 5 }, + { 11, 21, 5 }, + { 11, 18, 7 }, + { 7, 18, -11 }, + { 11, 17, -7 }, + { 6, 19, -6 }, + { 6, 19, 5 }, + { 7, 17, 11 }, + { 7, 18, 11 }, + { 11, 18, -7 }, + { 11, 21, -5 }, + { -12, 21, -5 }, + { -11, 18, -7 }, + { -7, 18, -11 }, + { -5, 21, -12 }, + { -5, 21, 11 }, + { -7, 18, 10 }, + { -8, 35, -8 }, + { 0, 35, -2 }, + { 7, 35, -8 }, + { -11, 31, -13 }, + { 10, 31, -13 }, + { 7, 35, 8 }, + { 0, 35, 2 }, + { -8, 35, 8 }, + { 10, 31, 13 }, + { -11, 31, 13 }, + { -8, 35, 7 }, + { -2, 35, 0 }, + { -8, 35, -8 }, + { -13, 31, 10 }, + { -13, 31, 10 }, + { -8, 35, -8 }, + { -13, 31, -11 }, + { 16, 22, 11 }, + { 13, 12, 10 }, + { 10, 12, -13 }, + { 16, 22, -11 }, + { 13, 31, -11 }, + { 8, 35, -8 }, + { 8, 35, 7 }, + { 13, 31, 10 }, + { 11, 20, 14 }, + { 9, 25, 13 }, + { 5, 21, 11 }, + { 7, 18, 11 }, + { 11, 20, 14 }, + { 10, 17, 13 }, + { 5, 21, -12 }, + { 7, 18, -11 }, + { 11, 20, -14 }, + { 13, 17, -10 }, + { 11, 17, -7 }, + { 11, 20, -14 }, + { 9, 25, -14 }, + { 3, 23, -9 }, + { 3, 23, 9 }, + { 14, 20, -11 }, + { 14, 25, -9 }, + { 11, 21, -5 }, + { 11, 18, -7 }, + { 14, 20, -11 }, + { 13, 17, -10 }, + { 10, 12, -13 }, + { 11, 22, -16 }, + { -11, 22, -16 }, + { -11, 31, -13 }, + { 10, 31, -13 }, + { -11, 18, -7 }, + { -11, 17, -7 }, + { -5, 19, -6 }, + { 5, 19, -6 }, + { 11, 17, -7 }, + { 11, 18, -7 }, + { -14, 20, -11 }, + { -13, 17, -10 }, + { -11, 17, -7 }, + { -14, 20, -11 }, + { -14, 25, -9 }, + { -11, 20, -14 }, + { -9, 25, -14 }, + { -5, 21, -12 }, + { -7, 18, -11 }, + { -11, 20, -14 }, + { -13, 17, -10 }, + { -13, 12, -9 }, + { -16, 22, -11 }, + { -7, 18, 10 }, + { -11, 17, 7 }, + { -6, 19, 5 }, + { -6, 19, -6 }, + { -11, 20, 13 }, + { -13, 17, 10 }, + { -11, 20, 13 }, + { -9, 25, 13 }, + { -13, 31, 10 }, + { -16, 22, 10 }, + { -13, 31, -11 }, + { -16, 22, -11 }, + { -14, 20, 11 }, + { -14, 25, 9 }, + { -12, 21, 5 }, + { -11, 18, 7 }, + { -14, 20, 11 }, + { -13, 17, 10 }, + { -9, 12, 13 }, + { -11, 22, 16 }, + { 11, 22, 16 }, + { 10, 31, 13 }, + { -11, 31, 13 }, + { 11, 18, 7 }, + { 7, 17, 11 }, + { 6, 19, 6 }, + { -6, 19, 6 }, + { -11, 17, 7 }, + { 14, 20, 11 }, + { 10, 17, 13 }, + { 14, 20, 11 }, + { 14, 25, 9 }, + { 8, 23, 3 }, + { 11, 21, 5 }, + { -9, 23, 3 }, + { -9, 23, -3 }, + { -12, 21, -5 }, + { 11, 21, -5 }, + { -9, 23, -3 }, + { 11, 21, -5 }, + { 9, 23, -3 }, + { -3, 23, 8 }, + { -5, 21, 11 }, + { -5, 21, -12 }, + { -3, 23, -9 }, + { 10, 12, -13 }, + { 13, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 12, 10 }, + { -9, 12, 13 }, + { 0, 0, 0 }, + { -13, 12, -9 }, + { 10, 12, -13 }, + { -5, 21, 2 }, + { 4, 21, 2 }, + { 2, 21, 5 }, + { -2, 21, 4 }, + { 2, 21, -5 }, + { -2, 21, -5 }, + { 4, 21, -2 }, + { -5, 21, -2 }, + { 7, 20, -6 }, + { 11, 17, -8 }, + { 5, 20, -7 }, + { 7, 38, 12 }, + { 10, 32, 15 }, + { 13, 27, 9 }, + { 9, 34, 6 }, + { -12, 38, 7 }, + { -15, 32, 10 }, + { -9, 27, 13 }, + { -6, 34, 9 }, + { 8, 31, -2 }, + { 11, 23, -6 }, + { 13, 27, -10 }, + { 9, 35, -7 }, + { 12, 38, -8 }, + { 15, 32, -11 }, + { 9, 27, -14 }, + { 6, 34, -10 }, + { -11, 23, 18 }, + { -11, 32, 15 }, + { -14, 27, 9 }, + { -14, 21, 12 }, + { -18, 23, 10 }, + { -10, 12, 14 }, + { -13, 17, 11 }, + { -12, 21, 13 }, + { -18, 23, -11 }, + { -15, 32, -11 }, + { -9, 27, -14 }, + { -12, 21, -14 }, + { -11, 23, -18 }, + { -14, 12, -9 }, + { -13, 17, -11 }, + { -14, 21, -12 }, + { 11, 23, -18 }, + { 10, 31, -16 }, + { 13, 27, -10 }, + { 14, 21, -12 }, + { 18, 23, -11 }, + { 10, 12, -14 }, + { 13, 17, -11 }, + { 12, 21, -14 }, + { 18, 23, 11 }, + { 15, 32, 11 }, + { 9, 27, 14 }, + { 12, 21, 14 }, + { 11, 23, 18 }, + { 14, 12, 10 }, + { 11, 17, 13 }, + { 14, 21, 12 }, + { -9, 29, 2 }, + { -12, 23, 6 }, + { -14, 27, 9 }, + { -10, 34, 6 }, + { 11, 19, 8 }, + { 11, 23, 6 }, + { 13, 27, 9 }, + { 14, 21, 12 }, + { -11, 19, 8 }, + { -11, 17, 8 }, + { -13, 17, 11 }, + { -14, 21, 12 }, + { 8, 19, 11 }, + { 8, 17, 11 }, + { 11, 17, 13 }, + { 12, 21, 14 }, + { 2, 29, 9 }, + { 6, 23, 12 }, + { 9, 27, 14 }, + { 6, 34, 9 }, + { 8, 19, -11 }, + { 6, 23, -11 }, + { 9, 27, -14 }, + { 12, 21, -14 }, + { 11, 19, -8 }, + { 11, 17, -8 }, + { 13, 17, -11 }, + { 14, 21, -12 }, + { -11, 19, -8 }, + { -12, 23, -6 }, + { -14, 27, -10 }, + { -14, 21, -12 }, + { -8, 19, -11 }, + { -11, 17, -8 }, + { -13, 17, -11 }, + { -12, 21, -14 }, + { -2, 29, -9 }, + { -6, 23, -12 }, + { -9, 27, -14 }, + { -6, 34, -10 }, + { -8, 19, 10 }, + { -6, 23, 11 }, + { -9, 27, 13 }, + { -12, 21, 13 }, + { 8, 29, 2 }, + { 0, 34, 0 }, + { 0, 40, 2 }, + { 9, 34, 6 }, + { -10, 34, 6 }, + { -14, 27, 9 }, + { -11, 32, 15 }, + { -8, 38, 12 }, + { 6, 34, -10 }, + { 9, 27, -14 }, + { 6, 23, -11 }, + { 2, 29, -9 }, + { 6, 34, 9 }, + { 9, 27, 14 }, + { 15, 32, 11 }, + { 12, 38, 7 }, + { -10, 35, -7 }, + { -14, 27, -10 }, + { -12, 23, -6 }, + { -9, 31, -2 }, + { 9, 35, -7 }, + { 13, 27, -10 }, + { 10, 31, -16 }, + { 7, 37, -14 }, + { -6, 34, 9 }, + { -9, 27, 13 }, + { -6, 23, 11 }, + { -2, 29, 8 }, + { -6, 34, -10 }, + { -9, 27, -14 }, + { -15, 32, -11 }, + { -12, 38, -8 }, + { -2, 29, -9 }, + { 0, 34, 0 }, + { -2, 29, 8 }, + { -7, 20, 5 }, + { -11, 17, 8 }, + { -6, 20, 7 }, + { -6, 20, -7 }, + { -11, 17, -8 }, + { -7, 20, -6 }, + { 5, 20, 7 }, + { 8, 17, 11 }, + { 7, 20, 5 }, + { -6, 20, -7 }, + { -7, 20, -6 }, + { -3, 21, -5 }, + { -5, 21, -3 }, + { 2, 29, -9 }, + { 0, 34, 0 }, + { 2, 40, 0 }, + { 6, 34, -10 }, + { 6, 34, -10 }, + { 2, 40, 0 }, + { 7, 42, 0 }, + { 12, 38, -8 }, + { 12, 38, 7 }, + { 2, 40, 0 }, + { 6, 34, 9 }, + { 6, 34, 9 }, + { 2, 40, 0 }, + { 2, 29, 9 }, + { 7, 37, -14 }, + { 0, 42, -9 }, + { 0, 41, -4 }, + { 0, 41, -4 }, + { 9, 35, -7 }, + { 9, 35, -7 }, + { 0, 41, -4 }, + { 0, 36, -1 }, + { 8, 31, -2 }, + { -9, 31, -2 }, + { 0, 41, -4 }, + { -10, 35, -7 }, + { -10, 35, -7 }, + { 0, 41, -4 }, + { -8, 37, -14 }, + { -6, 34, -10 }, + { -2, 40, 0 }, + { 0, 34, 0 }, + { 0, 34, 0 }, + { -2, 29, -9 }, + { -12, 38, -8 }, + { -7, 42, 0 }, + { -2, 40, 0 }, + { -6, 34, -10 }, + { -2, 29, 8 }, + { -2, 40, 0 }, + { -6, 34, 9 }, + { -6, 34, 9 }, + { -2, 40, 0 }, + { -12, 38, 7 }, + { -10, 34, 6 }, + { 0, 40, 2 }, + { 0, 34, 0 }, + { -9, 29, 2 }, + { -8, 38, 12 }, + { 0, 42, 7 }, + { 0, 40, 2 }, + { -10, 34, 6 }, + { 9, 34, 6 }, + { 0, 40, 2 }, + { 7, 38, 12 }, + { 9, 34, 6 }, + { 13, 27, 9 }, + { 11, 23, 6 }, + { 8, 29, 2 }, + { -18, 23, -11 }, + { -14, 12, -9 }, + { -10, 12, 14 }, + { -18, 23, 10 }, + { -11, 23, 18 }, + { -10, 12, 14 }, + { 14, 12, 10 }, + { 11, 23, 18 }, + { 12, 38, -8 }, + { 7, 42, 0 }, + { 12, 38, 7 }, + { 2, 29, 9 }, + { 0, 34, 0 }, + { 2, 29, -9 }, + { 8, 31, -2 }, + { 0, 36, -1 }, + { -9, 31, -2 }, + { -11, 31, -16 }, + { -14, 27, -10 }, + { -10, 35, -7 }, + { -8, 37, -14 }, + { 11, 23, -18 }, + { 10, 12, -14 }, + { -14, 12, -9 }, + { -11, 23, -18 }, + { -10, 12, 14 }, + { -14, 12, -9 }, + { 0, 0, 0 }, + { -3, 21, 4 }, + { -3, 21, -5 }, + { -7, 20, -6 }, + { -7, 20, 5 }, + { -5, 21, 3 }, + { -6, 20, 7 }, + { 4, 21, 3 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 3, 21, 5 }, + { 4, 21, 3 }, + { 5, 20, 7 }, + { 7, 20, 5 }, + { 3, 21, -5 }, + { 7, 20, -6 }, + { 4, 21, -3 }, + { 5, 20, -7 }, + { -5, 21, -3 }, + { -6, 20, -7 }, + { -11, 19, 8 }, + { -12, 23, 6 }, + { 11, 23, 6 }, + { 11, 19, 8 }, + { 8, 19, -11 }, + { 11, 17, -8 }, + { 7, 20, -6 }, + { 7, 20, 5 }, + { 8, 17, 11 }, + { 8, 19, 11 }, + { 11, 19, -8 }, + { 11, 23, -6 }, + { -12, 23, -6 }, + { -11, 19, -8 }, + { -8, 19, -11 }, + { -6, 23, -12 }, + { -6, 23, 11 }, + { -8, 19, 10 }, + { -8, 37, -14 }, + { 0, 42, -9 }, + { 7, 37, -14 }, + { -11, 31, -16 }, + { 10, 31, -16 }, + { 7, 38, 12 }, + { 0, 42, 7 }, + { -8, 38, 12 }, + { 10, 32, 15 }, + { -11, 32, 15 }, + { -12, 38, 7 }, + { -7, 42, 0 }, + { -12, 38, -8 }, + { -15, 32, 10 }, + { -15, 32, 10 }, + { -12, 38, -8 }, + { -15, 32, -11 }, + { 18, 23, 11 }, + { 14, 12, 10 }, + { 10, 12, -14 }, + { 18, 23, -11 }, + { 15, 32, -11 }, + { 12, 38, -8 }, + { 12, 38, 7 }, + { 15, 32, 11 }, + { 12, 21, 14 }, + { 9, 27, 14 }, + { 6, 23, 12 }, + { 8, 19, 11 }, + { 12, 21, 14 }, + { 11, 17, 13 }, + { 6, 23, -11 }, + { 8, 19, -11 }, + { 12, 21, -14 }, + { 13, 17, -11 }, + { 11, 17, -8 }, + { 12, 21, -14 }, + { 9, 27, -14 }, + { 2, 29, -9 }, + { 2, 29, 9 }, + { 14, 21, -12 }, + { 13, 27, -10 }, + { 11, 23, -6 }, + { 11, 19, -8 }, + { 14, 21, -12 }, + { 13, 17, -11 }, + { 10, 12, -14 }, + { 11, 23, -18 }, + { -11, 23, -18 }, + { -11, 31, -16 }, + { 10, 31, -16 }, + { -11, 19, -8 }, + { -11, 17, -8 }, + { -6, 20, -7 }, + { 5, 20, -7 }, + { 11, 17, -8 }, + { 11, 19, -8 }, + { -14, 21, -12 }, + { -13, 17, -11 }, + { -11, 17, -8 }, + { -14, 21, -12 }, + { -14, 27, -10 }, + { -12, 21, -14 }, + { -9, 27, -14 }, + { -6, 23, -12 }, + { -8, 19, -11 }, + { -12, 21, -14 }, + { -13, 17, -11 }, + { -14, 12, -9 }, + { -18, 23, -11 }, + { -8, 19, 10 }, + { -11, 17, 8 }, + { -7, 20, 5 }, + { -7, 20, -6 }, + { -12, 21, 13 }, + { -13, 17, 11 }, + { -12, 21, 13 }, + { -9, 27, 13 }, + { -15, 32, 10 }, + { -18, 23, 10 }, + { -15, 32, -11 }, + { -18, 23, -11 }, + { -14, 21, 12 }, + { -14, 27, 9 }, + { -12, 23, 6 }, + { -11, 19, 8 }, + { -14, 21, 12 }, + { -13, 17, 11 }, + { -10, 12, 14 }, + { -11, 23, 18 }, + { 11, 23, 18 }, + { 10, 32, 15 }, + { -11, 32, 15 }, + { 11, 19, 8 }, + { 8, 17, 11 }, + { 5, 20, 7 }, + { -6, 20, 7 }, + { -11, 17, 8 }, + { 14, 21, 12 }, + { 11, 17, 13 }, + { 14, 21, 12 }, + { 13, 27, 9 }, + { 8, 29, 2 }, + { 11, 23, 6 }, + { -9, 29, 2 }, + { -9, 31, -2 }, + { -12, 23, -6 }, + { 11, 23, -6 }, + { -9, 31, -2 }, + { 11, 23, -6 }, + { 8, 31, -2 }, + { -2, 29, 8 }, + { -6, 23, 11 }, + { -6, 23, -12 }, + { -2, 29, -9 }, + { 10, 12, -14 }, + { 14, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 14, 12, 10 }, + { -10, 12, 14 }, + { 0, 0, 0 }, + { -14, 12, -9 }, + { 10, 12, -14 }, + { -5, 21, 3 }, + { 4, 21, 3 }, + { 3, 21, 5 }, + { -3, 21, 4 }, + { 3, 21, -5 }, + { -3, 21, -5 }, + { 4, 21, -3 }, + { -5, 21, -3 }, + { 9, 20, -6 }, + { 11, 17, -9 }, + { 5, 20, -9 }, + { 7, 43, 18 }, + { 11, 34, 17 }, + { 13, 31, 11 }, + { 9, 44, 11 }, + { -18, 43, 7 }, + { -17, 34, 10 }, + { -11, 31, 13 }, + { -11, 44, 9 }, + { 8, 43, -7 }, + { 11, 27, -8 }, + { 13, 32, -11 }, + { 9, 43, -14 }, + { 18, 43, -8 }, + { 17, 34, -11 }, + { 11, 31, -14 }, + { 11, 44, -10 }, + { -11, 25, 20 }, + { -11, 34, 17 }, + { -14, 31, 11 }, + { -14, 22, 14 }, + { -20, 25, 10 }, + { -10, 12, 15 }, + { -13, 18, 13 }, + { -14, 22, 13 }, + { -20, 25, -11 }, + { -17, 34, -11 }, + { -11, 31, -14 }, + { -14, 22, -14 }, + { -11, 25, -20 }, + { -15, 12, -9 }, + { -13, 18, -13 }, + { -14, 22, -14 }, + { 10, 25, -20 }, + { 11, 33, -18 }, + { 13, 32, -11 }, + { 14, 22, -14 }, + { 20, 25, -11 }, + { 10, 12, -15 }, + { 13, 18, -13 }, + { 14, 22, -14 }, + { 20, 25, 11 }, + { 17, 34, 10 }, + { 11, 31, 14 }, + { 14, 22, 14 }, + { 10, 25, 20 }, + { 15, 12, 10 }, + { 13, 18, 13 }, + { 14, 22, 14 }, + { -9, 41, 5 }, + { -12, 27, 8 }, + { -14, 31, 11 }, + { -10, 44, 11 }, + { 11, 20, 10 }, + { 11, 27, 8 }, + { 13, 31, 11 }, + { 14, 22, 14 }, + { -11, 20, 10 }, + { -11, 17, 9 }, + { -13, 18, 13 }, + { -14, 22, 14 }, + { 10, 20, 11 }, + { 9, 17, 11 }, + { 13, 18, 13 }, + { 14, 22, 14 }, + { 5, 41, 8 }, + { 8, 27, 12 }, + { 11, 31, 14 }, + { 11, 44, 9 }, + { 10, 20, -11 }, + { 8, 27, -11 }, + { 11, 31, -14 }, + { 14, 22, -14 }, + { 11, 20, -10 }, + { 11, 17, -9 }, + { 13, 18, -13 }, + { 14, 22, -14 }, + { -11, 20, -10 }, + { -12, 27, -8 }, + { -14, 32, -11 }, + { -14, 22, -14 }, + { -10, 20, -11 }, + { -11, 17, -9 }, + { -13, 18, -13 }, + { -14, 22, -14 }, + { -5, 41, -9 }, + { -8, 27, -12 }, + { -11, 31, -14 }, + { -11, 44, -10 }, + { -10, 20, 10 }, + { -8, 27, 11 }, + { -11, 31, 13 }, + { -14, 22, 13 }, + { 8, 41, 5 }, + { 0, 52, 8 }, + { 0, 56, 14 }, + { 9, 44, 11 }, + { -10, 44, 11 }, + { -14, 31, 11 }, + { -11, 34, 17 }, + { -8, 43, 18 }, + { 11, 44, -10 }, + { 11, 31, -14 }, + { 8, 27, -11 }, + { 5, 41, -9 }, + { 11, 44, 9 }, + { 11, 31, 14 }, + { 17, 34, 10 }, + { 18, 43, 7 }, + { -10, 43, -14 }, + { -14, 32, -11 }, + { -12, 27, -8 }, + { -9, 43, -7 }, + { 9, 43, -14 }, + { 13, 32, -11 }, + { 11, 33, -18 }, + { 7, 40, -20 }, + { -11, 44, 9 }, + { -11, 31, 13 }, + { -8, 27, 11 }, + { -5, 41, 8 }, + { -11, 44, -10 }, + { -11, 31, -14 }, + { -17, 34, -11 }, + { -18, 43, -8 }, + { -5, 41, -9 }, + { -8, 52, 0 }, + { -5, 41, 8 }, + { -9, 20, 5 }, + { -11, 17, 9 }, + { -6, 20, 9 }, + { -6, 20, -9 }, + { -11, 17, -9 }, + { -9, 20, -6 }, + { 5, 20, 9 }, + { 9, 17, 11 }, + { 9, 20, 5 }, + { -6, 20, -9 }, + { -9, 20, -6 }, + { -5, 22, -5 }, + { -5, 22, -5 }, + { 5, 41, -9 }, + { 8, 52, 0 }, + { 14, 56, 0 }, + { 11, 44, -10 }, + { 11, 44, -10 }, + { 14, 56, 0 }, + { 18, 51, 0 }, + { 18, 43, -8 }, + { 18, 43, 7 }, + { 14, 56, 0 }, + { 11, 44, 9 }, + { 11, 44, 9 }, + { 14, 56, 0 }, + { 5, 41, 8 }, + { 7, 40, -20 }, + { 0, 47, -22 }, + { 0, 53, -21 }, + { 0, 53, -21 }, + { 9, 43, -14 }, + { 9, 43, -14 }, + { 0, 53, -21 }, + { 0, 52, -13 }, + { 8, 43, -7 }, + { -9, 43, -7 }, + { 0, 53, -21 }, + { -10, 43, -14 }, + { -10, 43, -14 }, + { 0, 53, -21 }, + { -8, 40, -20 }, + { -11, 44, -10 }, + { -14, 56, 0 }, + { -8, 52, 0 }, + { -8, 52, 0 }, + { -5, 41, -9 }, + { -18, 43, -8 }, + { -18, 51, 0 }, + { -14, 56, 0 }, + { -11, 44, -10 }, + { -5, 41, 8 }, + { -14, 56, 0 }, + { -11, 44, 9 }, + { -11, 44, 9 }, + { -14, 56, 0 }, + { -18, 43, 7 }, + { -10, 44, 11 }, + { 0, 56, 14 }, + { 0, 52, 8 }, + { -9, 41, 5 }, + { -8, 43, 18 }, + { 0, 51, 18 }, + { 0, 56, 14 }, + { -10, 44, 11 }, + { 9, 44, 11 }, + { 0, 56, 14 }, + { 7, 43, 18 }, + { 9, 44, 11 }, + { 13, 31, 11 }, + { 11, 27, 8 }, + { 8, 41, 5 }, + { -20, 25, -11 }, + { -15, 12, -9 }, + { -10, 12, 15 }, + { -20, 25, 10 }, + { -11, 25, 20 }, + { -10, 12, 15 }, + { 15, 12, 10 }, + { 10, 25, 20 }, + { 18, 43, -8 }, + { 18, 51, 0 }, + { 18, 43, 7 }, + { 5, 41, 8 }, + { 8, 52, 0 }, + { 5, 41, -9 }, + { 8, 43, -7 }, + { 0, 52, -13 }, + { -9, 43, -7 }, + { -11, 33, -18 }, + { -14, 32, -11 }, + { -10, 43, -14 }, + { -8, 40, -20 }, + { 10, 25, -20 }, + { 10, 12, -15 }, + { -15, 12, -9 }, + { -11, 25, -20 }, + { -10, 12, 15 }, + { -15, 12, -9 }, + { 0, 0, 0 }, + { -5, 22, 4 }, + { -5, 22, -5 }, + { -9, 20, -6 }, + { -9, 20, 5 }, + { -5, 22, 5 }, + { -6, 20, 9 }, + { 4, 22, 5 }, + { 4, 22, 5 }, + { 5, 20, 9 }, + { 5, 22, 5 }, + { 4, 22, 5 }, + { 5, 20, 9 }, + { 9, 20, 5 }, + { 5, 22, -4 }, + { 9, 20, -6 }, + { 4, 22, -5 }, + { 5, 20, -9 }, + { -5, 22, -5 }, + { -6, 20, -9 }, + { -11, 20, 10 }, + { -12, 27, 8 }, + { 11, 27, 8 }, + { 11, 20, 10 }, + { 10, 20, -11 }, + { 11, 17, -9 }, + { 9, 20, -6 }, + { 9, 20, 5 }, + { 9, 17, 11 }, + { 10, 20, 11 }, + { 11, 20, -10 }, + { 11, 27, -8 }, + { -12, 27, -8 }, + { -11, 20, -10 }, + { -10, 20, -11 }, + { -8, 27, -12 }, + { -8, 27, 11 }, + { -10, 20, 10 }, + { -8, 40, -20 }, + { 0, 47, -22 }, + { 7, 40, -20 }, + { -11, 33, -18 }, + { 11, 33, -18 }, + { 7, 43, 18 }, + { 0, 51, 18 }, + { -8, 43, 18 }, + { 11, 34, 17 }, + { -11, 34, 17 }, + { -18, 43, 7 }, + { -18, 51, 0 }, + { -18, 43, -8 }, + { -17, 34, 10 }, + { -17, 34, 10 }, + { -18, 43, -8 }, + { -17, 34, -11 }, + { 20, 25, 11 }, + { 15, 12, 10 }, + { 10, 12, -15 }, + { 20, 25, -11 }, + { 17, 34, -11 }, + { 18, 43, -8 }, + { 18, 43, 7 }, + { 17, 34, 10 }, + { 14, 22, 14 }, + { 11, 31, 14 }, + { 8, 27, 12 }, + { 10, 20, 11 }, + { 14, 22, 14 }, + { 13, 18, 13 }, + { 8, 27, -11 }, + { 10, 20, -11 }, + { 14, 22, -14 }, + { 13, 18, -13 }, + { 11, 17, -9 }, + { 14, 22, -14 }, + { 11, 31, -14 }, + { 5, 41, -9 }, + { 5, 41, 8 }, + { 14, 22, -14 }, + { 13, 32, -11 }, + { 11, 27, -8 }, + { 11, 20, -10 }, + { 14, 22, -14 }, + { 13, 18, -13 }, + { 10, 12, -15 }, + { 10, 25, -20 }, + { -11, 25, -20 }, + { -11, 33, -18 }, + { 11, 33, -18 }, + { -11, 20, -10 }, + { -11, 17, -9 }, + { -6, 20, -9 }, + { 5, 20, -9 }, + { 11, 17, -9 }, + { 11, 20, -10 }, + { -14, 22, -14 }, + { -13, 18, -13 }, + { -11, 17, -9 }, + { -14, 22, -14 }, + { -14, 32, -11 }, + { -14, 22, -14 }, + { -11, 31, -14 }, + { -8, 27, -12 }, + { -10, 20, -11 }, + { -14, 22, -14 }, + { -13, 18, -13 }, + { -15, 12, -9 }, + { -20, 25, -11 }, + { -10, 20, 10 }, + { -11, 17, 9 }, + { -9, 20, 5 }, + { -9, 20, -6 }, + { -14, 22, 13 }, + { -13, 18, 13 }, + { -14, 22, 13 }, + { -11, 31, 13 }, + { -17, 34, 10 }, + { -20, 25, 10 }, + { -17, 34, -11 }, + { -20, 25, -11 }, + { -14, 22, 14 }, + { -14, 31, 11 }, + { -12, 27, 8 }, + { -11, 20, 10 }, + { -14, 22, 14 }, + { -13, 18, 13 }, + { -10, 12, 15 }, + { -11, 25, 20 }, + { 10, 25, 20 }, + { 11, 34, 17 }, + { -11, 34, 17 }, + { 11, 20, 10 }, + { 9, 17, 11 }, + { 5, 20, 9 }, + { -6, 20, 9 }, + { -11, 17, 9 }, + { 14, 22, 14 }, + { 13, 18, 13 }, + { 14, 22, 14 }, + { 13, 31, 11 }, + { 8, 41, 5 }, + { 11, 27, 8 }, + { -9, 41, 5 }, + { -9, 43, -7 }, + { -12, 27, -8 }, + { 11, 27, -8 }, + { -9, 43, -7 }, + { 11, 27, -8 }, + { 8, 43, -7 }, + { -5, 41, 8 }, + { -8, 27, 11 }, + { -8, 27, -12 }, + { -5, 41, -9 }, + { 10, 12, -15 }, + { 15, 12, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 15, 12, 10 }, + { -10, 12, 15 }, + { 0, 0, 0 }, + { -15, 12, -9 }, + { 10, 12, -15 }, + { -5, 22, 5 }, + { 4, 22, 5 }, + { 5, 22, 5 }, + { -5, 22, 4 }, + { 5, 22, -4 }, + { -5, 22, -5 }, + { 4, 22, -5 }, + { -5, 22, -5 }, + { 11, 21, -6 }, + { 11, 17, -11 }, + { 5, 21, -11 }, + { 7, 47, 26 }, + { 11, 38, 19 }, + { 13, 37, 13 }, + { 9, 53, 21 }, + { -26, 47, 7 }, + { -19, 38, 10 }, + { -13, 37, 13 }, + { -21, 53, 9 }, + { 8, 54, -13 }, + { 11, 31, -9 }, + { 13, 37, -13 }, + { 9, 53, -21 }, + { 26, 47, -8 }, + { 19, 38, -11 }, + { 13, 37, -14 }, + { 21, 53, -10 }, + { -11, 27, 22 }, + { -11, 38, 19 }, + { -14, 37, 13 }, + { -14, 24, 16 }, + { -22, 27, 10 }, + { -10, 12, 17 }, + { -13, 18, 15 }, + { -16, 24, 13 }, + { -22, 27, -11 }, + { -19, 38, -11 }, + { -13, 37, -14 }, + { -16, 24, -14 }, + { -11, 27, -22 }, + { -17, 12, -10 }, + { -13, 18, -15 }, + { -14, 24, -16 }, + { 11, 27, -22 }, + { 11, 38, -19 }, + { 13, 37, -13 }, + { 14, 24, -16 }, + { 22, 27, -11 }, + { 10, 12, -17 }, + { 13, 18, -15 }, + { 16, 24, -14 }, + { 22, 27, 10 }, + { 19, 38, 10 }, + { 13, 37, 13 }, + { 16, 24, 14 }, + { 11, 27, 22 }, + { 17, 12, 9 }, + { 15, 18, 13 }, + { 14, 24, 16 }, + { -9, 54, 13 }, + { -12, 31, 9 }, + { -14, 37, 13 }, + { -10, 53, 21 }, + { 11, 22, 13 }, + { 11, 31, 9 }, + { 13, 37, 13 }, + { 14, 24, 16 }, + { -11, 22, 13 }, + { -11, 17, 11 }, + { -13, 18, 15 }, + { -14, 24, 16 }, + { 13, 22, 11 }, + { 11, 17, 11 }, + { 15, 18, 13 }, + { 16, 24, 14 }, + { 13, 54, 8 }, + { 9, 31, 11 }, + { 13, 37, 13 }, + { 21, 53, 9 }, + { 13, 22, -11 }, + { 9, 31, -12 }, + { 13, 37, -14 }, + { 16, 24, -14 }, + { 11, 22, -13 }, + { 11, 17, -11 }, + { 13, 18, -15 }, + { 14, 24, -16 }, + { -11, 22, -13 }, + { -12, 31, -9 }, + { -14, 37, -13 }, + { -14, 24, -16 }, + { -13, 22, -11 }, + { -11, 17, -11 }, + { -13, 18, -15 }, + { -16, 24, -14 }, + { -13, 54, -9 }, + { -9, 31, -12 }, + { -13, 37, -14 }, + { -21, 53, -10 }, + { -13, 22, 10 }, + { -9, 31, 11 }, + { -13, 37, 13 }, + { -16, 24, 13 }, + { 8, 54, 13 }, + { 0, 63, 29 }, + { 0, 61, 39 }, + { 9, 53, 21 }, + { -10, 53, 21 }, + { -14, 37, 13 }, + { -11, 38, 19 }, + { -8, 47, 26 }, + { 21, 53, -10 }, + { 13, 37, -14 }, + { 9, 31, -12 }, + { 13, 54, -9 }, + { 21, 53, 9 }, + { 13, 37, 13 }, + { 19, 38, 10 }, + { 26, 47, 7 }, + { -10, 53, -21 }, + { -14, 37, -13 }, + { -12, 31, -9 }, + { -9, 54, -13 }, + { 9, 53, -21 }, + { 13, 37, -13 }, + { 11, 38, -19 }, + { 7, 47, -26 }, + { -21, 53, 9 }, + { -13, 37, 13 }, + { -9, 31, 11 }, + { -13, 54, 8 }, + { -21, 53, -10 }, + { -13, 37, -14 }, + { -19, 38, -11 }, + { -26, 47, -8 }, + { -13, 54, -9 }, + { -29, 63, 0 }, + { -13, 54, 8 }, + { -11, 21, 5 }, + { -11, 17, 11 }, + { -6, 21, 11 }, + { -5, 21, -11 }, + { -11, 17, -11 }, + { -11, 21, -6 }, + { 6, 21, 11 }, + { 11, 17, 11 }, + { 11, 21, 5 }, + { -5, 21, -11 }, + { -11, 21, -6 }, + { -7, 22, -5 }, + { -5, 22, -7 }, + { 13, 54, -9 }, + { 29, 63, 0 }, + { 39, 61, 0 }, + { 21, 53, -10 }, + { 21, 53, -10 }, + { 39, 61, 0 }, + { 34, 55, 0 }, + { 26, 47, -8 }, + { 26, 47, 7 }, + { 39, 61, 0 }, + { 21, 53, 9 }, + { 21, 53, 9 }, + { 39, 61, 0 }, + { 13, 54, 8 }, + { 7, 47, -26 }, + { 0, 55, -34 }, + { 0, 61, -39 }, + { 0, 61, -39 }, + { 9, 53, -21 }, + { 9, 53, -21 }, + { 0, 61, -39 }, + { 0, 63, -29 }, + { 8, 54, -13 }, + { -9, 54, -13 }, + { 0, 61, -39 }, + { -10, 53, -21 }, + { -10, 53, -21 }, + { 0, 61, -39 }, + { -8, 47, -26 }, + { -21, 53, -10 }, + { -39, 61, 0 }, + { -29, 63, 0 }, + { -29, 63, 0 }, + { -13, 54, -9 }, + { -26, 47, -8 }, + { -34, 55, 0 }, + { -39, 61, 0 }, + { -21, 53, -10 }, + { -13, 54, 8 }, + { -39, 61, 0 }, + { -21, 53, 9 }, + { -21, 53, 9 }, + { -39, 61, 0 }, + { -26, 47, 7 }, + { -10, 53, 21 }, + { 0, 61, 39 }, + { 0, 63, 29 }, + { -9, 54, 13 }, + { -8, 47, 26 }, + { 0, 55, 34 }, + { 0, 61, 39 }, + { -10, 53, 21 }, + { 9, 53, 21 }, + { 0, 61, 39 }, + { 7, 47, 26 }, + { 9, 53, 21 }, + { 13, 37, 13 }, + { 11, 31, 9 }, + { 8, 54, 13 }, + { -22, 27, -11 }, + { -17, 12, -10 }, + { -10, 12, 17 }, + { -22, 27, 10 }, + { -11, 27, 22 }, + { -10, 12, 17 }, + { 17, 12, 9 }, + { 11, 27, 22 }, + { 26, 47, -8 }, + { 34, 55, 0 }, + { 26, 47, 7 }, + { 13, 54, 8 }, + { 29, 63, 0 }, + { 13, 54, -9 }, + { 8, 54, -13 }, + { 0, 63, -29 }, + { -9, 54, -13 }, + { -11, 38, -19 }, + { -14, 37, -13 }, + { -10, 53, -21 }, + { -8, 47, -26 }, + { 11, 27, -22 }, + { 10, 12, -17 }, + { -17, 12, -10 }, + { -11, 27, -22 }, + { -10, 12, 17 }, + { -17, 12, -10 }, + { 0, 0, 0 }, + { -7, 22, 4 }, + { -7, 22, -5 }, + { -11, 21, -6 }, + { -11, 21, 5 }, + { -5, 22, 7 }, + { -6, 21, 11 }, + { 4, 22, 7 }, + { 4, 22, 7 }, + { 6, 21, 11 }, + { 7, 22, 5 }, + { 4, 22, 7 }, + { 6, 21, 11 }, + { 11, 21, 5 }, + { 7, 22, -4 }, + { 11, 21, -6 }, + { 4, 22, -7 }, + { 5, 21, -11 }, + { -5, 22, -7 }, + { -5, 21, -11 }, + { -11, 22, 13 }, + { -12, 31, 9 }, + { 11, 31, 9 }, + { 11, 22, 13 }, + { 13, 22, -11 }, + { 11, 17, -11 }, + { 11, 21, -6 }, + { 11, 21, 5 }, + { 11, 17, 11 }, + { 13, 22, 11 }, + { 11, 22, -13 }, + { 11, 31, -9 }, + { -12, 31, -9 }, + { -11, 22, -13 }, + { -13, 22, -11 }, + { -9, 31, -12 }, + { -9, 31, 11 }, + { -13, 22, 10 }, + { -8, 47, -26 }, + { 0, 55, -34 }, + { 7, 47, -26 }, + { -11, 38, -19 }, + { 11, 38, -19 }, + { 7, 47, 26 }, + { 0, 55, 34 }, + { -8, 47, 26 }, + { 11, 38, 19 }, + { -11, 38, 19 }, + { -26, 47, 7 }, + { -34, 55, 0 }, + { -26, 47, -8 }, + { -19, 38, 10 }, + { -19, 38, 10 }, + { -26, 47, -8 }, + { -19, 38, -11 }, + { 22, 27, 10 }, + { 17, 12, 9 }, + { 10, 12, -17 }, + { 22, 27, -11 }, + { 19, 38, -11 }, + { 26, 47, -8 }, + { 26, 47, 7 }, + { 19, 38, 10 }, + { 16, 24, 14 }, + { 13, 37, 13 }, + { 9, 31, 11 }, + { 13, 22, 11 }, + { 16, 24, 14 }, + { 15, 18, 13 }, + { 9, 31, -12 }, + { 13, 22, -11 }, + { 16, 24, -14 }, + { 13, 18, -15 }, + { 11, 17, -11 }, + { 16, 24, -14 }, + { 13, 37, -14 }, + { 13, 54, -9 }, + { 13, 54, 8 }, + { 14, 24, -16 }, + { 13, 37, -13 }, + { 11, 31, -9 }, + { 11, 22, -13 }, + { 14, 24, -16 }, + { 13, 18, -15 }, + { 10, 12, -17 }, + { 11, 27, -22 }, + { -11, 27, -22 }, + { -11, 38, -19 }, + { 11, 38, -19 }, + { -11, 22, -13 }, + { -11, 17, -11 }, + { -5, 21, -11 }, + { 5, 21, -11 }, + { 11, 17, -11 }, + { 11, 22, -13 }, + { -14, 24, -16 }, + { -13, 18, -15 }, + { -11, 17, -11 }, + { -14, 24, -16 }, + { -14, 37, -13 }, + { -16, 24, -14 }, + { -13, 37, -14 }, + { -9, 31, -12 }, + { -13, 22, -11 }, + { -16, 24, -14 }, + { -13, 18, -15 }, + { -17, 12, -10 }, + { -22, 27, -11 }, + { -13, 22, 10 }, + { -11, 17, 11 }, + { -11, 21, 5 }, + { -11, 21, -6 }, + { -16, 24, 13 }, + { -13, 18, 15 }, + { -16, 24, 13 }, + { -13, 37, 13 }, + { -19, 38, 10 }, + { -22, 27, 10 }, + { -19, 38, -11 }, + { -22, 27, -11 }, + { -14, 24, 16 }, + { -14, 37, 13 }, + { -12, 31, 9 }, + { -11, 22, 13 }, + { -14, 24, 16 }, + { -13, 18, 15 }, + { -10, 12, 17 }, + { -11, 27, 22 }, + { 11, 27, 22 }, + { 11, 38, 19 }, + { -11, 38, 19 }, + { 11, 22, 13 }, + { 11, 17, 11 }, + { 6, 21, 11 }, + { -6, 21, 11 }, + { -11, 17, 11 }, + { 14, 24, 16 }, + { 15, 18, 13 }, + { 14, 24, 16 }, + { 13, 37, 13 }, + { 8, 54, 13 }, + { 11, 31, 9 }, + { -9, 54, 13 }, + { -9, 54, -13 }, + { -12, 31, -9 }, + { 11, 31, -9 }, + { -9, 54, -13 }, + { 11, 31, -9 }, + { 8, 54, -13 }, + { -13, 54, 8 }, + { -9, 31, 11 }, + { -9, 31, -12 }, + { -13, 54, -9 }, + { 10, 12, -17 }, + { 17, 12, 9 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 17, 12, 9 }, + { -10, 12, 17 }, + { 0, 0, 0 }, + { -17, 12, -10 }, + { 10, 12, -17 }, + { -5, 22, 7 }, + { 4, 22, 7 }, + { 7, 22, 5 }, + { -7, 22, 4 }, + { 7, 22, -4 }, + { -7, 22, -5 }, + { 4, 22, -7 }, + { -5, 22, -7 }, + { 12, 21, -6 }, + { 11, 17, -11 }, + { 5, 21, -11 }, + { 7, 37, 34 }, + { 11, 32, 27 }, + { 14, 33, 20 }, + { 9, 44, 31 }, + { -34, 37, 7 }, + { -27, 32, 10 }, + { -20, 33, 13 }, + { -31, 44, 9 }, + { 8, 49, -19 }, + { 11, 30, -12 }, + { 14, 34, -16 }, + { 9, 46, -25 }, + { 34, 37, -8 }, + { 27, 32, -11 }, + { 20, 33, -14 }, + { 31, 44, -10 }, + { -11, 22, 24 }, + { -11, 32, 27 }, + { -14, 33, 20 }, + { -14, 22, 18 }, + { -24, 22, 10 }, + { -9, 10, 15 }, + { -13, 17, 15 }, + { -18, 22, 13 }, + { -24, 22, -11 }, + { -27, 32, -11 }, + { -20, 33, -14 }, + { -18, 22, -14 }, + { -11, 24, -23 }, + { -15, 10, -9 }, + { -13, 18, -15 }, + { -13, 23, -17 }, + { 11, 24, -23 }, + { 10, 34, -23 }, + { 14, 34, -16 }, + { 14, 23, -17 }, + { 24, 22, -11 }, + { 10, 11, -16 }, + { 13, 18, -15 }, + { 18, 22, -14 }, + { 24, 22, 10 }, + { 27, 32, 10 }, + { 20, 33, 13 }, + { 18, 22, 13 }, + { 11, 22, 24 }, + { 15, 10, 9 }, + { 15, 17, 13 }, + { 14, 22, 18 }, + { -9, 48, 25 }, + { -12, 31, 15 }, + { -14, 33, 20 }, + { -10, 44, 31 }, + { 10, 21, 14 }, + { 11, 31, 15 }, + { 14, 33, 20 }, + { 14, 22, 18 }, + { -11, 21, 14 }, + { -11, 17, 11 }, + { -13, 17, 15 }, + { -14, 22, 18 }, + { 14, 21, 11 }, + { 11, 17, 11 }, + { 15, 17, 13 }, + { 18, 22, 13 }, + { 25, 48, 8 }, + { 15, 31, 11 }, + { 20, 33, 13 }, + { 31, 44, 9 }, + { 14, 21, -11 }, + { 15, 31, -12 }, + { 20, 33, -14 }, + { 18, 22, -14 }, + { 11, 21, -13 }, + { 11, 17, -11 }, + { 13, 18, -15 }, + { 14, 23, -17 }, + { -11, 21, -13 }, + { -12, 30, -12 }, + { -14, 34, -16 }, + { -13, 23, -17 }, + { -14, 21, -11 }, + { -11, 17, -11 }, + { -13, 18, -15 }, + { -18, 22, -14 }, + { -25, 48, -9 }, + { -15, 31, -12 }, + { -20, 33, -14 }, + { -31, 44, -10 }, + { -14, 21, 10 }, + { -15, 31, 11 }, + { -20, 33, 13 }, + { -18, 22, 13 }, + { 8, 48, 25 }, + { 0, 52, 40 }, + { 0, 47, 47 }, + { 9, 44, 31 }, + { -10, 44, 31 }, + { -14, 33, 20 }, + { -11, 32, 27 }, + { -8, 37, 34 }, + { 31, 44, -10 }, + { 20, 33, -14 }, + { 15, 31, -12 }, + { 25, 48, -9 }, + { 31, 44, 9 }, + { 20, 33, 13 }, + { 27, 32, 10 }, + { 34, 37, 7 }, + { -10, 46, -25 }, + { -14, 34, -16 }, + { -12, 30, -12 }, + { -9, 49, -19 }, + { 9, 46, -25 }, + { 14, 34, -16 }, + { 10, 34, -23 }, + { 7, 40, -29 }, + { -31, 44, 9 }, + { -20, 33, 13 }, + { -15, 31, 11 }, + { -25, 48, 8 }, + { -31, 44, -10 }, + { -20, 33, -14 }, + { -27, 32, -11 }, + { -34, 37, -8 }, + { -25, 48, -9 }, + { -40, 52, 0 }, + { -25, 48, 8 }, + { -12, 21, 5 }, + { -11, 17, 11 }, + { -6, 21, 12 }, + { -5, 21, -11 }, + { -11, 17, -11 }, + { -12, 21, -6 }, + { 5, 21, 12 }, + { 11, 17, 11 }, + { 12, 21, 5 }, + { -5, 21, -11 }, + { -12, 21, -6 }, + { -8, 23, -5 }, + { -5, 22, -7 }, + { 25, 48, -9 }, + { 40, 52, 0 }, + { 47, 47, 0 }, + { 31, 44, -10 }, + { 31, 44, -10 }, + { 47, 47, 0 }, + { 43, 42, 0 }, + { 34, 37, -8 }, + { 34, 37, 7 }, + { 47, 47, 0 }, + { 31, 44, 9 }, + { 31, 44, 9 }, + { 47, 47, 0 }, + { 25, 48, 8 }, + { 7, 40, -29 }, + { 0, 45, -37 }, + { 0, 51, -41 }, + { 0, 51, -41 }, + { 9, 46, -25 }, + { 9, 46, -25 }, + { 0, 51, -41 }, + { 0, 55, -33 }, + { 8, 49, -19 }, + { -9, 49, -19 }, + { 0, 51, -41 }, + { -10, 46, -25 }, + { -10, 46, -25 }, + { 0, 51, -41 }, + { -8, 40, -29 }, + { -31, 44, -10 }, + { -47, 47, 0 }, + { -40, 52, 0 }, + { -40, 52, 0 }, + { -25, 48, -9 }, + { -34, 37, -8 }, + { -43, 42, 0 }, + { -47, 47, 0 }, + { -31, 44, -10 }, + { -25, 48, 8 }, + { -47, 47, 0 }, + { -31, 44, 9 }, + { -31, 44, 9 }, + { -47, 47, 0 }, + { -34, 37, 7 }, + { -10, 44, 31 }, + { 0, 47, 47 }, + { 0, 52, 40 }, + { -9, 48, 25 }, + { -8, 37, 34 }, + { 0, 42, 43 }, + { 0, 47, 47 }, + { -10, 44, 31 }, + { 9, 44, 31 }, + { 0, 47, 47 }, + { 7, 37, 34 }, + { 9, 44, 31 }, + { 14, 33, 20 }, + { 11, 31, 15 }, + { 8, 48, 25 }, + { -24, 22, -11 }, + { -15, 10, -9 }, + { -9, 10, 15 }, + { -24, 22, 10 }, + { -11, 22, 24 }, + { -9, 10, 15 }, + { 15, 10, 9 }, + { 11, 22, 24 }, + { 34, 37, -8 }, + { 43, 42, 0 }, + { 34, 37, 7 }, + { 25, 48, 8 }, + { 40, 52, 0 }, + { 25, 48, -9 }, + { 8, 49, -19 }, + { 0, 55, -33 }, + { -9, 49, -19 }, + { -11, 34, -23 }, + { -14, 34, -16 }, + { -10, 46, -25 }, + { -8, 40, -29 }, + { 11, 24, -23 }, + { 10, 11, -16 }, + { -15, 10, -9 }, + { -11, 24, -23 }, + { -9, 10, 15 }, + { -15, 10, -9 }, + { 0, 0, 0 }, + { -8, 23, 4 }, + { -8, 23, -5 }, + { -12, 21, -6 }, + { -12, 21, 5 }, + { -5, 23, 8 }, + { -6, 21, 12 }, + { 4, 23, 8 }, + { 4, 23, 8 }, + { 5, 21, 12 }, + { 8, 23, 5 }, + { 4, 23, 8 }, + { 5, 21, 12 }, + { 12, 21, 5 }, + { 8, 23, -4 }, + { 12, 21, -6 }, + { 4, 22, -7 }, + { 5, 21, -11 }, + { -5, 22, -7 }, + { -5, 21, -11 }, + { -11, 21, 14 }, + { -12, 31, 15 }, + { 11, 31, 15 }, + { 10, 21, 14 }, + { 14, 21, -11 }, + { 11, 17, -11 }, + { 12, 21, -6 }, + { 12, 21, 5 }, + { 11, 17, 11 }, + { 14, 21, 11 }, + { 11, 21, -13 }, + { 11, 30, -12 }, + { -12, 30, -12 }, + { -11, 21, -13 }, + { -14, 21, -11 }, + { -15, 31, -12 }, + { -15, 31, 11 }, + { -14, 21, 10 }, + { -8, 40, -29 }, + { 0, 45, -37 }, + { 7, 40, -29 }, + { -11, 34, -23 }, + { 10, 34, -23 }, + { 7, 37, 34 }, + { 0, 42, 43 }, + { -8, 37, 34 }, + { 11, 32, 27 }, + { -11, 32, 27 }, + { -34, 37, 7 }, + { -43, 42, 0 }, + { -34, 37, -8 }, + { -27, 32, 10 }, + { -27, 32, 10 }, + { -34, 37, -8 }, + { -27, 32, -11 }, + { 24, 22, 10 }, + { 15, 10, 9 }, + { 10, 11, -16 }, + { 24, 22, -11 }, + { 27, 32, -11 }, + { 34, 37, -8 }, + { 34, 37, 7 }, + { 27, 32, 10 }, + { 18, 22, 13 }, + { 20, 33, 13 }, + { 15, 31, 11 }, + { 14, 21, 11 }, + { 18, 22, 13 }, + { 15, 17, 13 }, + { 15, 31, -12 }, + { 14, 21, -11 }, + { 18, 22, -14 }, + { 13, 18, -15 }, + { 11, 17, -11 }, + { 18, 22, -14 }, + { 20, 33, -14 }, + { 25, 48, -9 }, + { 25, 48, 8 }, + { 14, 23, -17 }, + { 14, 34, -16 }, + { 11, 30, -12 }, + { 11, 21, -13 }, + { 14, 23, -17 }, + { 13, 18, -15 }, + { 10, 11, -16 }, + { 11, 24, -23 }, + { -11, 24, -23 }, + { -11, 34, -23 }, + { 10, 34, -23 }, + { -11, 21, -13 }, + { -11, 17, -11 }, + { -5, 21, -11 }, + { 5, 21, -11 }, + { 11, 17, -11 }, + { 11, 21, -13 }, + { -13, 23, -17 }, + { -13, 18, -15 }, + { -11, 17, -11 }, + { -13, 23, -17 }, + { -14, 34, -16 }, + { -18, 22, -14 }, + { -20, 33, -14 }, + { -15, 31, -12 }, + { -14, 21, -11 }, + { -18, 22, -14 }, + { -13, 18, -15 }, + { -15, 10, -9 }, + { -24, 22, -11 }, + { -14, 21, 10 }, + { -11, 17, 11 }, + { -12, 21, 5 }, + { -12, 21, -6 }, + { -18, 22, 13 }, + { -13, 17, 15 }, + { -18, 22, 13 }, + { -20, 33, 13 }, + { -27, 32, 10 }, + { -24, 22, 10 }, + { -27, 32, -11 }, + { -24, 22, -11 }, + { -14, 22, 18 }, + { -14, 33, 20 }, + { -12, 31, 15 }, + { -11, 21, 14 }, + { -14, 22, 18 }, + { -13, 17, 15 }, + { -9, 10, 15 }, + { -11, 22, 24 }, + { 11, 22, 24 }, + { 11, 32, 27 }, + { -11, 32, 27 }, + { 10, 21, 14 }, + { 11, 17, 11 }, + { 5, 21, 12 }, + { -6, 21, 12 }, + { -11, 17, 11 }, + { 14, 22, 18 }, + { 15, 17, 13 }, + { 14, 22, 18 }, + { 14, 33, 20 }, + { 8, 48, 25 }, + { 11, 31, 15 }, + { -9, 48, 25 }, + { -9, 49, -19 }, + { -12, 30, -12 }, + { 11, 30, -12 }, + { -9, 49, -19 }, + { 11, 30, -12 }, + { 8, 49, -19 }, + { -25, 48, 8 }, + { -15, 31, 11 }, + { -15, 31, -12 }, + { -25, 48, -9 }, + { 10, 11, -16 }, + { 15, 10, 9 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 15, 10, 9 }, + { -9, 10, 15 }, + { 0, 0, 0 }, + { -15, 10, -9 }, + { 10, 11, -16 }, + { -5, 23, 8 }, + { 4, 23, 8 }, + { 8, 23, 5 }, + { -8, 23, 4 }, + { 8, 23, -4 }, + { -8, 23, -5 }, + { 4, 22, -7 }, + { -5, 22, -7 }, + { 13, 20, -6 }, + { 11, 17, -11 }, + { 5, 20, -12 }, + { 7, 25, 38 }, + { 11, 22, 31 }, + { 14, 27, 25 }, + { 9, 32, 37 }, + { -38, 25, 7 }, + { -31, 22, 10 }, + { -25, 27, 13 }, + { -37, 32, 9 }, + { 8, 40, -30 }, + { 11, 28, -17 }, + { 14, 29, -23 }, + { 9, 35, -34 }, + { 38, 25, -8 }, + { 31, 22, -11 }, + { 25, 27, -14 }, + { 37, 32, -10 }, + { -11, 16, 24 }, + { -10, 22, 31 }, + { -14, 27, 25 }, + { -14, 19, 19 }, + { -24, 16, 10 }, + { -9, 9, 13 }, + { -13, 16, 15 }, + { -19, 19, 13 }, + { -24, 16, -11 }, + { -31, 22, -11 }, + { -25, 27, -14 }, + { -19, 19, -14 }, + { -11, 18, -24 }, + { -13, 9, -9 }, + { -13, 16, -15 }, + { -14, 20, -18 }, + { 11, 18, -24 }, + { 11, 25, -28 }, + { 14, 29, -23 }, + { 14, 20, -18 }, + { 24, 16, -11 }, + { 10, 10, -14 }, + { 13, 16, -15 }, + { 19, 19, -14 }, + { 24, 16, 10 }, + { 31, 22, 11 }, + { 25, 27, 13 }, + { 19, 19, 14 }, + { 11, 16, 24 }, + { 13, 9, 10 }, + { 15, 16, 13 }, + { 14, 19, 19 }, + { -9, 37, 33 }, + { -12, 28, 19 }, + { -14, 27, 25 }, + { -10, 32, 37 }, + { 10, 20, 15 }, + { 11, 28, 19 }, + { 14, 27, 25 }, + { 14, 19, 19 }, + { -11, 20, 15 }, + { -11, 17, 11 }, + { -13, 16, 15 }, + { -14, 19, 19 }, + { 15, 20, 11 }, + { 11, 17, 11 }, + { 15, 16, 13 }, + { 19, 19, 14 }, + { 33, 37, 9 }, + { 19, 28, 11 }, + { 25, 27, 13 }, + { 37, 32, 9 }, + { 15, 20, -11 }, + { 19, 28, -12 }, + { 25, 27, -14 }, + { 19, 19, -14 }, + { 10, 21, -14 }, + { 11, 17, -11 }, + { 13, 16, -15 }, + { 14, 20, -18 }, + { -11, 21, -14 }, + { -12, 28, -17 }, + { -14, 29, -23 }, + { -14, 20, -18 }, + { -15, 20, -11 }, + { -11, 17, -11 }, + { -13, 16, -15 }, + { -19, 19, -14 }, + { -33, 37, -9 }, + { -19, 28, -12 }, + { -25, 27, -14 }, + { -37, 32, -10 }, + { -15, 20, 10 }, + { -19, 28, 11 }, + { -25, 27, 13 }, + { -19, 19, 13 }, + { 8, 37, 33 }, + { 0, 37, 45 }, + { 0, 31, 50 }, + { 9, 32, 37 }, + { -10, 32, 37 }, + { -14, 27, 25 }, + { -10, 22, 31 }, + { -8, 25, 38 }, + { 37, 32, -10 }, + { 25, 27, -14 }, + { 19, 28, -12 }, + { 33, 37, -9 }, + { 37, 32, 9 }, + { 25, 27, 13 }, + { 31, 22, 11 }, + { 38, 25, 7 }, + { -10, 35, -34 }, + { -14, 29, -23 }, + { -12, 28, -17 }, + { -9, 40, -30 }, + { 9, 35, -34 }, + { 14, 29, -23 }, + { 11, 25, -28 }, + { 7, 28, -35 }, + { -37, 32, 9 }, + { -25, 27, 13 }, + { -19, 28, 11 }, + { -33, 37, 8 }, + { -37, 32, -10 }, + { -25, 27, -14 }, + { -31, 22, -11 }, + { -38, 25, -8 }, + { -33, 37, -9 }, + { -45, 37, 0 }, + { -33, 37, 8 }, + { -13, 20, 5 }, + { -11, 17, 11 }, + { -6, 20, 13 }, + { -6, 20, -12 }, + { -11, 17, -11 }, + { -13, 20, -6 }, + { 6, 20, 13 }, + { 11, 17, 11 }, + { 13, 20, 5 }, + { -6, 20, -12 }, + { -13, 20, -6 }, + { -10, 23, -5 }, + { -5, 23, -9 }, + { 33, 37, -9 }, + { 45, 37, 0 }, + { 50, 31, 0 }, + { 37, 32, -10 }, + { 37, 32, -10 }, + { 50, 31, 0 }, + { 46, 27, 0 }, + { 38, 25, -8 }, + { 38, 25, 7 }, + { 50, 31, 0 }, + { 37, 32, 9 }, + { 37, 32, 9 }, + { 50, 31, 0 }, + { 33, 37, 9 }, + { 7, 28, -35 }, + { 0, 30, -42 }, + { 0, 35, -47 }, + { 0, 35, -47 }, + { 9, 35, -34 }, + { 9, 35, -34 }, + { 0, 35, -47 }, + { 0, 41, -42 }, + { 8, 40, -30 }, + { -9, 40, -30 }, + { 0, 35, -47 }, + { -10, 35, -34 }, + { -10, 35, -34 }, + { 0, 35, -47 }, + { -8, 28, -35 }, + { -37, 32, -10 }, + { -50, 31, 0 }, + { -45, 37, 0 }, + { -45, 37, 0 }, + { -33, 37, -9 }, + { -38, 25, -8 }, + { -46, 27, 0 }, + { -50, 31, 0 }, + { -37, 32, -10 }, + { -33, 37, 8 }, + { -50, 31, 0 }, + { -37, 32, 9 }, + { -37, 32, 9 }, + { -50, 31, 0 }, + { -38, 25, 7 }, + { -10, 32, 37 }, + { 0, 31, 50 }, + { 0, 37, 45 }, + { -9, 37, 33 }, + { -8, 25, 38 }, + { 0, 27, 46 }, + { 0, 31, 50 }, + { -10, 32, 37 }, + { 9, 32, 37 }, + { 0, 31, 50 }, + { 7, 25, 38 }, + { 9, 32, 37 }, + { 14, 27, 25 }, + { 11, 28, 19 }, + { 8, 37, 33 }, + { -24, 16, -11 }, + { -13, 9, -9 }, + { -9, 9, 13 }, + { -24, 16, 10 }, + { -11, 16, 24 }, + { -9, 9, 13 }, + { 13, 9, 10 }, + { 11, 16, 24 }, + { 38, 25, -8 }, + { 46, 27, 0 }, + { 38, 25, 7 }, + { 33, 37, 9 }, + { 45, 37, 0 }, + { 33, 37, -9 }, + { 8, 40, -30 }, + { 0, 41, -42 }, + { -9, 40, -30 }, + { -10, 25, -28 }, + { -14, 29, -23 }, + { -10, 35, -34 }, + { -8, 28, -35 }, + { 11, 18, -24 }, + { 10, 10, -14 }, + { -13, 9, -9 }, + { -11, 18, -24 }, + { -9, 9, 13 }, + { -13, 9, -9 }, + { 0, 0, 0 }, + { -10, 23, 4 }, + { -10, 23, -5 }, + { -13, 20, -6 }, + { -13, 20, 5 }, + { -5, 23, 10 }, + { -6, 20, 13 }, + { 4, 23, 10 }, + { 4, 23, 10 }, + { 6, 20, 13 }, + { 10, 23, 5 }, + { 4, 23, 10 }, + { 6, 20, 13 }, + { 13, 20, 5 }, + { 10, 23, -4 }, + { 13, 20, -6 }, + { 4, 23, -9 }, + { 5, 20, -12 }, + { -5, 23, -9 }, + { -6, 20, -12 }, + { -11, 20, 15 }, + { -12, 28, 19 }, + { 11, 28, 19 }, + { 10, 20, 15 }, + { 15, 20, -11 }, + { 11, 17, -11 }, + { 13, 20, -6 }, + { 13, 20, 5 }, + { 11, 17, 11 }, + { 15, 20, 11 }, + { 10, 21, -14 }, + { 11, 28, -17 }, + { -12, 28, -17 }, + { -11, 21, -14 }, + { -15, 20, -11 }, + { -19, 28, -12 }, + { -19, 28, 11 }, + { -15, 20, 10 }, + { -8, 28, -35 }, + { 0, 30, -42 }, + { 7, 28, -35 }, + { -10, 25, -28 }, + { 11, 25, -28 }, + { 7, 25, 38 }, + { 0, 27, 46 }, + { -8, 25, 38 }, + { 11, 22, 31 }, + { -10, 22, 31 }, + { -38, 25, 7 }, + { -46, 27, 0 }, + { -38, 25, -8 }, + { -31, 22, 10 }, + { -31, 22, 10 }, + { -38, 25, -8 }, + { -31, 22, -11 }, + { 24, 16, 10 }, + { 13, 9, 10 }, + { 10, 10, -14 }, + { 24, 16, -11 }, + { 31, 22, -11 }, + { 38, 25, -8 }, + { 38, 25, 7 }, + { 31, 22, 11 }, + { 19, 19, 14 }, + { 25, 27, 13 }, + { 19, 28, 11 }, + { 15, 20, 11 }, + { 19, 19, 14 }, + { 15, 16, 13 }, + { 19, 28, -12 }, + { 15, 20, -11 }, + { 19, 19, -14 }, + { 13, 16, -15 }, + { 11, 17, -11 }, + { 19, 19, -14 }, + { 25, 27, -14 }, + { 33, 37, -9 }, + { 33, 37, 9 }, + { 14, 20, -18 }, + { 14, 29, -23 }, + { 11, 28, -17 }, + { 10, 21, -14 }, + { 14, 20, -18 }, + { 13, 16, -15 }, + { 10, 10, -14 }, + { 11, 18, -24 }, + { -11, 18, -24 }, + { -10, 25, -28 }, + { 11, 25, -28 }, + { -11, 21, -14 }, + { -11, 17, -11 }, + { -6, 20, -12 }, + { 5, 20, -12 }, + { 11, 17, -11 }, + { 10, 21, -14 }, + { -14, 20, -18 }, + { -13, 16, -15 }, + { -11, 17, -11 }, + { -14, 20, -18 }, + { -14, 29, -23 }, + { -19, 19, -14 }, + { -25, 27, -14 }, + { -19, 28, -12 }, + { -15, 20, -11 }, + { -19, 19, -14 }, + { -13, 16, -15 }, + { -13, 9, -9 }, + { -24, 16, -11 }, + { -15, 20, 10 }, + { -11, 17, 11 }, + { -13, 20, 5 }, + { -13, 20, -6 }, + { -19, 19, 13 }, + { -13, 16, 15 }, + { -19, 19, 13 }, + { -25, 27, 13 }, + { -31, 22, 10 }, + { -24, 16, 10 }, + { -31, 22, -11 }, + { -24, 16, -11 }, + { -14, 19, 19 }, + { -14, 27, 25 }, + { -12, 28, 19 }, + { -11, 20, 15 }, + { -14, 19, 19 }, + { -13, 16, 15 }, + { -9, 9, 13 }, + { -11, 16, 24 }, + { 11, 16, 24 }, + { 11, 22, 31 }, + { -10, 22, 31 }, + { 10, 20, 15 }, + { 11, 17, 11 }, + { 6, 20, 13 }, + { -6, 20, 13 }, + { -11, 17, 11 }, + { 14, 19, 19 }, + { 15, 16, 13 }, + { 14, 19, 19 }, + { 14, 27, 25 }, + { 8, 37, 33 }, + { 11, 28, 19 }, + { -9, 37, 33 }, + { -9, 40, -30 }, + { -12, 28, -17 }, + { 11, 28, -17 }, + { -9, 40, -30 }, + { 11, 28, -17 }, + { 8, 40, -30 }, + { -33, 37, 8 }, + { -19, 28, 11 }, + { -19, 28, -12 }, + { -33, 37, -9 }, + { 10, 10, -14 }, + { 13, 9, 10 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 13, 9, 10 }, + { -9, 9, 13 }, + { 0, 0, 0 }, + { -13, 9, -9 }, + { 10, 10, -14 }, + { -5, 23, 10 }, + { 4, 23, 10 }, + { 10, 23, 5 }, + { -10, 23, 4 }, + { 10, 23, -4 }, + { -10, 23, -5 }, + { 4, 23, -9 }, + { -5, 23, -9 }, +}; + +Gfx Entity_MunchlesiaSpitOut_Render[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_AVERAGE), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A006840_E91220, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPClearGeometryMode(G_LIGHTING), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(23, 25, 26, 0, 27, 28, 29, 0), + gsSP1Triangle(27, 29, 30, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 22, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 17, 0, 27, 17, 29, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 8, 0), + gsSP2Triangles(9, 7, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 1, 0, 12, 1, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 18, 25, 0, 24, 25, 26, 0), + gsSP2Triangles(27, 28, 21, 0, 27, 21, 29, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 5, 0, 8, 5, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(19, 20, 21, 0, 19, 21, 22, 0), + gsSP2Triangles(23, 24, 25, 0, 3, 2, 14, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 11, 14, 0), + gsSP2Triangles(15, 14, 16, 0, 17, 15, 16, 0), + gsSP2Triangles(18, 16, 19, 0, 20, 21, 22, 0), + gsSP2Triangles(20, 22, 23, 0, 24, 20, 23, 0), + gsSP2Triangles(24, 23, 25, 0, 26, 24, 25, 0), + gsSP2Triangles(26, 25, 27, 0, 28, 26, 27, 0), + gsSP1Triangle(28, 27, 29, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(18, 19, 20, 0, 21, 18, 20, 0), + gsSP2Triangles(21, 20, 22, 0, 23, 24, 25, 0), + gsSP2Triangles(26, 23, 25, 0, 26, 25, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 31, 28, 30, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(7, 9, 10, 0, 11, 12, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 15, 16, 4, 0), + gsSP2Triangles(15, 4, 3, 0, 14, 13, 17, 0), + gsSP2Triangles(14, 17, 18, 0, 19, 20, 21, 0), + gsSP2Triangles(19, 21, 18, 0, 22, 23, 7, 0), + gsSP2Triangles(22, 7, 6, 0, 6, 7, 10, 0), + gsSP2Triangles(6, 10, 3, 0, 24, 17, 13, 0), + gsSP2Triangles(24, 13, 25, 0, 26, 27, 28, 0), + gsSP1Triangle(26, 28, 29, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 3, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 7, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 7, 0), + gsSP2Triangles(16, 17, 5, 0, 16, 5, 4, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 8, 21, 0, 29, 21, 26, 0), + gsSP2Triangles(30, 31, 27, 0, 30, 27, 26, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 13, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(20, 21, 9, 0, 20, 9, 17, 0), + gsSP2Triangles(22, 23, 18, 0, 22, 18, 17, 0), + gsSP2Triangles(24, 25, 15, 0, 24, 15, 14, 0), + gsSP2Triangles(26, 27, 8, 0, 26, 8, 28, 0), + gsSP1Triangle(29, 30, 31, 0), + gsSPVertex(Entity_MunchlesiaSpitOut_vertexArray, 24, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 6, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(18, 20, 21, 0, 18, 21, 19, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/MunchlesiaSpitOut.png.inc.c" diff --git a/src/entity/model/Padlock.c b/src/entity/model/Padlock.c new file mode 100644 index 0000000000..4b8d9a6693 --- /dev/null +++ b/src/entity/model/Padlock.c @@ -0,0 +1,177 @@ +#include "common.h" + +#include "entity/model/Padlock_1.vtx.inc.c" +#include "entity/model/Padlock_2.vtx.inc.c" +#include "entity/model/Padlock_3.vtx.inc.c" +#include "entity/model/Padlock_4.vtx.inc.c" + +#include "entity/model/Padlock_face.png.inc.c" +#include "entity/model/Padlock_face.pal.inc.c" +Gfx Entity_Padlock_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000B00_E5B650), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000700_E5B250, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/Padlock_keyhole.png.inc.c" +#include "entity/model/Padlock_keyhole.pal.inc.c" +Gfx Entity_Padlock_LoadTextureKeyhole[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0015A8_E5C0F8), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000DA8_E5B8F8, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/Padlock_body.png.inc.c" +#include "entity/model/Padlock_body.pal.inc.c" +Gfx Entity_Padlock_LoadTextureBody[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001C50_E5C7A0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001850_E5C3A0, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_Padlock_mtxShackle = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000016, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x00000000 } + } +}; + +Gfx Entity_Padlock_RenderShackleMain[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000660_E5B1B0, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0), + gsSP2Triangles(8, 9, 6, 0, 8, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Padlock_RenderShackle[] = { + gsSPDisplayList(Entity_Padlock_RenderShackleMain), + gsSPEndDisplayList(), +}; + +Gfx Entity_Padlock_RenderKeyhole[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2), + gsSPDisplayList(Entity_Padlock_LoadTextureKeyhole), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000620_E5B170, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Padlock_RenderFace[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Padlock_LoadTextureFace), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0005C0_E5B110, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Padlock_RenderBody[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_Padlock_LoadTextureBody), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E5AB50, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 12, 0, 16, 12, 18, 0), + gsSP2Triangles(14, 19, 20, 0, 14, 20, 21, 0), + gsSP2Triangles(14, 21, 22, 0, 14, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(24, 27, 28, 0, 24, 28, 29, 0), + gsSPVertex(&D_0A000000_E5AB50[1], 1, 1), + gsSPVertex(&D_0A000000_E5AB50[17], 1, 2), + gsSPVertex(&D_0A000000_E5AB50[23], 1, 3), + gsSPVertex(&D_0A000000_E5AB50[27], 2, 4), + gsSPVertex(&D_0A000000_E5AB50[30], 11, 6), + gsSPVertex(&D_0A000000_E5AB50[54], 13, 17), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP2Triangles(7, 9, 10, 0, 7, 10, 17, 0), + gsSP2Triangles(10, 14, 18, 0, 10, 18, 19, 0), + gsSP2Triangles(10, 19, 8, 0, 10, 8, 17, 0), + gsSP2Triangles(11, 20, 1, 0, 11, 1, 0, 0), + gsSP2Triangles(12, 21, 22, 0, 12, 22, 2, 0), + gsSP2Triangles(13, 12, 23, 0, 13, 23, 24, 0), + gsSP2Triangles(9, 25, 26, 0, 9, 26, 27, 0), + gsSP2Triangles(14, 27, 15, 0, 14, 15, 18, 0), + gsSP2Triangles(15, 28, 5, 0, 15, 5, 19, 0), + gsSP2Triangles(16, 13, 29, 0, 16, 29, 3, 0), + gsSPVertex(&D_0A000000_E5AB50[6], 1, 0), + gsSPVertex(&D_0A000000_E5AB50[9], 1, 1), + gsSPVertex(&D_0A000000_E5AB50[19], 4, 2), + gsSPVertex(&D_0A000000_E5AB50[24], 3, 6), + gsSPVertex(&D_0A000000_E5AB50[29], 1, 9), + gsSPVertex(&D_0A000000_E5AB50[41], 9, 10), + gsSPVertex(&D_0A000000_E5AB50[67], 13, 19), + gsSP2Triangles(10, 19, 11, 0, 10, 11, 20, 0), + gsSP2Triangles(11, 17, 21, 0, 11, 21, 20, 0), + gsSP2Triangles(12, 22, 0, 0, 12, 0, 1, 0), + gsSP2Triangles(2, 13, 23, 0, 2, 23, 3, 0), + gsSP2Triangles(4, 14, 24, 0, 4, 24, 5, 0), + gsSP2Triangles(6, 9, 15, 0, 6, 15, 25, 0), + gsSP2Triangles(7, 16, 26, 0, 7, 26, 8, 0), + gsSP2Triangles(17, 27, 28, 0, 17, 28, 21, 0), + gsSP2Triangles(18, 29, 30, 0, 18, 30, 31, 0), + gsSPVertex(&D_0A000000_E5AB50[50], 4, 0), + gsSPVertex(&D_0A000000_E5AB50[80], 12, 4), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0), + gsSP2Triangles(1, 7, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 12, 0), + gsSP2Triangles(3, 13, 14, 0, 3, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Padlock_Render[] = { + gsSPDisplayList(Entity_Padlock_RenderBody), + gsSPDisplayList(Entity_Padlock_RenderFace), + gsSPDisplayList(Entity_Padlock_RenderKeyhole), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PadlockBlueFace.c b/src/entity/model/PadlockBlueFace.c new file mode 100644 index 0000000000..f7d78a6497 --- /dev/null +++ b/src/entity/model/PadlockBlueFace.c @@ -0,0 +1,181 @@ +#include "common.h" + +#include "entity/model/PadlockBlueFace_1.vtx.inc.c" +#include "entity/model/PadlockBlueFace_2.vtx.inc.c" +#include "entity/model/PadlockBlueFace_3.vtx.inc.c" +#include "entity/model/PadlockBlueFace_4.vtx.inc.c" + +#include "entity/model/PadlockBlueFace_face.png.inc.c" +Gfx Entity_PadlockBlueFace_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000700_E60C50, G_IM_FMT_I, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PadlockBlueFace_keyhole.png.inc.c" +#include "entity/model/PadlockBlueFace_keyhole.pal.inc.c" +Gfx Entity_PadlockBlueFace_LoadTextureKeyhole[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001178_E616C8), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000978_E60EC8, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PadlockBlueFace_body.png.inc.c" +#include "entity/model/PadlockBlueFace_body.pal.inc.c" +Gfx Entity_PadlockBlueFace_LoadTextureBody[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001820_E61D70), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001420_E61970, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_PadlockBlueFace_mtxShackle = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000016, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x00000000 } + } +}; + +Gfx Entity_PadlockBlueFace_RenderShackleMain[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000660_E60BB0, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0), + gsSP2Triangles(8, 9, 6, 0, 8, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_RenderShackle[] = { + gsSPDisplayList(Entity_PadlockBlueFace_RenderShackleMain), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_RenderKeyhole[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2), + gsSPDisplayList(Entity_PadlockBlueFace_LoadTextureKeyhole), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000620_E60B70, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_RenderFace[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PadlockBlueFace_LoadTextureFace), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0005C0_E60B10, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_RenderBody[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PadlockBlueFace_LoadTextureBody), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E60550, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 12, 0, 16, 12, 18, 0), + gsSP2Triangles(14, 19, 20, 0, 14, 20, 21, 0), + gsSP2Triangles(14, 21, 22, 0, 14, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(24, 27, 28, 0, 24, 28, 29, 0), + gsSPVertex(&D_0A000000_E60550[1], 1, 1), + gsSPVertex(&D_0A000000_E60550[17], 1, 2), + gsSPVertex(&D_0A000000_E60550[23], 1, 3), + gsSPVertex(&D_0A000000_E60550[27], 2, 4), + gsSPVertex(&D_0A000000_E60550[30], 11, 6), + gsSPVertex(&D_0A000000_E60550[54], 13, 17), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP2Triangles(7, 9, 10, 0, 7, 10, 17, 0), + gsSP2Triangles(10, 14, 18, 0, 10, 18, 19, 0), + gsSP2Triangles(10, 19, 8, 0, 10, 8, 17, 0), + gsSP2Triangles(11, 20, 1, 0, 11, 1, 0, 0), + gsSP2Triangles(12, 21, 22, 0, 12, 22, 2, 0), + gsSP2Triangles(13, 12, 23, 0, 13, 23, 24, 0), + gsSP2Triangles(9, 25, 26, 0, 9, 26, 27, 0), + gsSP2Triangles(14, 27, 15, 0, 14, 15, 18, 0), + gsSP2Triangles(15, 28, 5, 0, 15, 5, 19, 0), + gsSP2Triangles(16, 13, 29, 0, 16, 29, 3, 0), + gsSPVertex(&D_0A000000_E60550[6], 1, 0), + gsSPVertex(&D_0A000000_E60550[9], 1, 1), + gsSPVertex(&D_0A000000_E60550[19], 4, 2), + gsSPVertex(&D_0A000000_E60550[24], 3, 6), + gsSPVertex(&D_0A000000_E60550[29], 1, 9), + gsSPVertex(&D_0A000000_E60550[41], 9, 10), + gsSPVertex(&D_0A000000_E60550[67], 13, 19), + gsSP2Triangles(10, 19, 11, 0, 10, 11, 20, 0), + gsSP2Triangles(11, 17, 21, 0, 11, 21, 20, 0), + gsSP2Triangles(12, 22, 0, 0, 12, 0, 1, 0), + gsSP2Triangles(2, 13, 23, 0, 2, 23, 3, 0), + gsSP2Triangles(4, 14, 24, 0, 4, 24, 5, 0), + gsSP2Triangles(6, 9, 15, 0, 6, 15, 25, 0), + gsSP2Triangles(7, 16, 26, 0, 7, 26, 8, 0), + gsSP2Triangles(17, 27, 28, 0, 17, 28, 21, 0), + gsSP2Triangles(18, 29, 30, 0, 18, 30, 31, 0), + gsSPVertex(&D_0A000000_E60550[50], 4, 0), + gsSPVertex(&D_0A000000_E60550[80], 12, 4), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0), + gsSP2Triangles(1, 7, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 12, 0), + gsSP2Triangles(3, 13, 14, 0, 3, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_RenderMain[] = { + gsSPDisplayList(Entity_PadlockBlueFace_RenderBody), + gsSPDisplayList(Entity_PadlockBlueFace_RenderFace), + gsSPDisplayList(Entity_PadlockBlueFace_RenderKeyhole), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockBlueFace_Render[] = { + gsSPDisplayList(Entity_PadlockBlueFace_RenderMain), + gsSPDisplayList(Entity_PadlockBlueFace_RenderShackle), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PadlockRedFace.c b/src/entity/model/PadlockRedFace.c new file mode 100644 index 0000000000..e8d5369ca0 --- /dev/null +++ b/src/entity/model/PadlockRedFace.c @@ -0,0 +1,181 @@ +#include "common.h" + +#include "entity/model/PadlockRedFace_1.vtx.inc.c" +#include "entity/model/PadlockRedFace_2.vtx.inc.c" +#include "entity/model/PadlockRedFace_3.vtx.inc.c" +#include "entity/model/PadlockRedFace_4.vtx.inc.c" + +#include "entity/model/PadlockRedFace_face.png.inc.c" +Gfx Entity_PadlockRedFace_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000700_E5EE30, G_IM_FMT_I, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PadlockRedFace_keyhole.png.inc.c" +#include "entity/model/PadlockRedFace_keyhole.pal.inc.c" +Gfx Entity_PadlockRedFace_LoadTextureKeyhole[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001178_E5F8A8), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000978_E5F0A8, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PadlockRedFace_body.png.inc.c" +#include "entity/model/PadlockRedFace_body.pal.inc.c" +Gfx Entity_PadlockRedFace_LoadTextureBody[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001820_E5FF50), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001420_E5FB50, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_PadlockRedFace_mtxShackle = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000016, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x00000000 } + } +}; + +Gfx Entity_PadlockRedFace_RenderShackleMain[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000660_E5ED90, 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(6, 0, 3, 0, 6, 3, 7, 0), + gsSP2Triangles(8, 9, 6, 0, 8, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_RenderShackle[] = { + gsSPDisplayList(Entity_PadlockRedFace_RenderShackleMain), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_RenderKeyhole[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2), + gsSPDisplayList(Entity_PadlockRedFace_LoadTextureKeyhole), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000620_E5ED50, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_RenderFace[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PadlockRedFace_LoadTextureFace), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0005C0_E5ECF0, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_RenderBody[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PadlockRedFace_LoadTextureBody), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E5E730, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 12, 0, 16, 12, 18, 0), + gsSP2Triangles(14, 19, 20, 0, 14, 20, 21, 0), + gsSP2Triangles(14, 21, 22, 0, 14, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(24, 27, 28, 0, 24, 28, 29, 0), + gsSPVertex(&D_0A000000_E5E730[1], 1, 1), + gsSPVertex(&D_0A000000_E5E730[17], 1, 2), + gsSPVertex(&D_0A000000_E5E730[23], 1, 3), + gsSPVertex(&D_0A000000_E5E730[27], 2, 4), + gsSPVertex(&D_0A000000_E5E730[30], 11, 6), + gsSPVertex(&D_0A000000_E5E730[54], 13, 17), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP2Triangles(7, 9, 10, 0, 7, 10, 17, 0), + gsSP2Triangles(10, 14, 18, 0, 10, 18, 19, 0), + gsSP2Triangles(10, 19, 8, 0, 10, 8, 17, 0), + gsSP2Triangles(11, 20, 1, 0, 11, 1, 0, 0), + gsSP2Triangles(12, 21, 22, 0, 12, 22, 2, 0), + gsSP2Triangles(13, 12, 23, 0, 13, 23, 24, 0), + gsSP2Triangles(9, 25, 26, 0, 9, 26, 27, 0), + gsSP2Triangles(14, 27, 15, 0, 14, 15, 18, 0), + gsSP2Triangles(15, 28, 5, 0, 15, 5, 19, 0), + gsSP2Triangles(16, 13, 29, 0, 16, 29, 3, 0), + gsSPVertex(&D_0A000000_E5E730[6], 1, 0), + gsSPVertex(&D_0A000000_E5E730[9], 1, 1), + gsSPVertex(&D_0A000000_E5E730[19], 4, 2), + gsSPVertex(&D_0A000000_E5E730[24], 3, 6), + gsSPVertex(&D_0A000000_E5E730[29], 1, 9), + gsSPVertex(&D_0A000000_E5E730[41], 9, 10), + gsSPVertex(&D_0A000000_E5E730[67], 13, 19), + gsSP2Triangles(10, 19, 11, 0, 10, 11, 20, 0), + gsSP2Triangles(11, 17, 21, 0, 11, 21, 20, 0), + gsSP2Triangles(12, 22, 0, 0, 12, 0, 1, 0), + gsSP2Triangles(2, 13, 23, 0, 2, 23, 3, 0), + gsSP2Triangles(4, 14, 24, 0, 4, 24, 5, 0), + gsSP2Triangles(6, 9, 15, 0, 6, 15, 25, 0), + gsSP2Triangles(7, 16, 26, 0, 7, 26, 8, 0), + gsSP2Triangles(17, 27, 28, 0, 17, 28, 21, 0), + gsSP2Triangles(18, 29, 30, 0, 18, 30, 31, 0), + gsSPVertex(&D_0A000000_E5E730[50], 4, 0), + gsSPVertex(&D_0A000000_E5E730[80], 12, 4), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0), + gsSP2Triangles(1, 7, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 12, 0), + gsSP2Triangles(3, 13, 14, 0, 3, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_RenderMain[] = { + gsSPDisplayList(Entity_PadlockRedFace_RenderBody), + gsSPDisplayList(Entity_PadlockRedFace_RenderFace), + gsSPDisplayList(Entity_PadlockRedFace_RenderKeyhole), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFace_Render[] = { + gsSPDisplayList(Entity_PadlockRedFace_RenderMain), + gsSPDisplayList(Entity_PadlockRedFace_RenderShackle), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PadlockRedFrame.c b/src/entity/model/PadlockRedFrame.c new file mode 100644 index 0000000000..e743d65649 --- /dev/null +++ b/src/entity/model/PadlockRedFrame.c @@ -0,0 +1,161 @@ +#include "common.h" + +#include "entity/model/PadlockRedFrame_1.vtx.inc.c" +#include "entity/model/PadlockRedFrame_2.vtx.inc.c" +#include "entity/model/PadlockRedFrame_3.vtx.inc.c" +#include "entity/model/PadlockRedFrame_4.vtx.inc.c" + +#include "entity/model/PadlockRedFrame_keyhole.png.inc.c" +#include "entity/model/PadlockRedFrame_keyhole.pal.inc.c" +Gfx Entity_PadlockRedFrame_LoadTextureKeyhole[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000D40_E5DAC0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000540_E5D2C0, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PadlockRedFrame_face.png.inc.c" +#include "entity/model/PadlockRedFrame_face.pal.inc.c" +Gfx Entity_PadlockRedFrame_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0013E8_E5E168), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000FE8_E5DD68, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_PadlockRedFrame_mtxShackle = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_PadlockRedFrame_RenderShackleMain[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000280_E5D000, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(2, 4, 7, 0, 2, 7, 8, 0), + gsSP2Triangles(3, 2, 8, 0, 3, 8, 9, 0), + gsSP2Triangles(10, 9, 11, 0, 10, 11, 12, 0), + gsSP2Triangles(13, 3, 9, 0, 13, 9, 10, 0), + gsSP2Triangles(8, 7, 14, 0, 8, 14, 15, 0), + gsSP2Triangles(11, 15, 16, 0, 11, 16, 17, 0), + gsSP2Triangles(15, 14, 18, 0, 15, 18, 16, 0), + gsSP2Triangles(12, 11, 17, 0, 12, 17, 19, 0), + gsSP2Triangles(14, 20, 21, 0, 14, 21, 18, 0), + gsSP2Triangles(7, 6, 20, 0, 7, 20, 14, 0), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000280_E5D000[22], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000280_E5D000, 3, 0), + gsSPVertex(&D_0A000280_E5D000[4], 2, 3), + gsSPVertex(&D_0A000280_E5D000[8], 2, 5), + gsSPVertex(&D_0A000280_E5D000[11], 1, 7), + gsSPVertex(&D_0A000280_E5D000[15], 1, 8), + gsSPVertex(&D_0A000280_E5D000[26], 18, 9), + gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0), + gsSP2Triangles(13, 14, 10, 0, 13, 10, 9, 0), + gsSP2Triangles(10, 15, 16, 0, 10, 16, 11, 0), + gsSP2Triangles(14, 17, 15, 0, 14, 15, 10, 0), + gsSP2Triangles(12, 11, 0, 0, 12, 0, 18, 0), + gsSP2Triangles(11, 16, 1, 0, 11, 1, 0, 0), + gsSP2Triangles(16, 19, 20, 0, 16, 20, 1, 0), + gsSP2Triangles(19, 21, 22, 0, 19, 22, 20, 0), + gsSP2Triangles(15, 23, 19, 0, 15, 19, 16, 0), + gsSP2Triangles(23, 24, 21, 0, 23, 21, 19, 0), + gsSP2Triangles(20, 22, 4, 0, 20, 4, 3, 0), + gsSP2Triangles(1, 20, 3, 0, 1, 3, 2, 0), + gsSP2Triangles(17, 25, 23, 0, 17, 23, 15, 0), + gsSP2Triangles(25, 26, 24, 0, 25, 24, 23, 0), + gsSP2Triangles(6, 5, 8, 0, 6, 8, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_RenderShackle[] = { + gsSPDisplayList(Entity_PadlockRedFrame_RenderShackleMain), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_RenderKeyhole[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_DECAL, G_RM_AA_ZB_XLU_DECAL2), + gsSPDisplayList(Entity_PadlockRedFrame_LoadTextureKeyhole), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000240_E5CFC0, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_RenderFace[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PadlockRedFrame_LoadTextureFace), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000200_E5CF80, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_RenderBody[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000000_E5CD80, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 6, 0), + gsSP2Triangles(7, 8, 2, 0, 7, 2, 9, 0), + gsSP2Triangles(4, 10, 11, 0, 4, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_RenderMain[] = { + gsSPDisplayList(Entity_PadlockRedFrame_RenderBody), + gsSPDisplayList(Entity_PadlockRedFrame_RenderFace), + gsSPDisplayList(Entity_PadlockRedFrame_RenderKeyhole), + gsSPEndDisplayList(), +}; + +Gfx Entity_PadlockRedFrame_Render[] = { + gsSPDisplayList(Entity_PadlockRedFrame_RenderMain), + gsSPDisplayList(Entity_PadlockRedFrame_RenderShackle), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PinkFlower_anim.c b/src/entity/model/PinkFlower_anim.c new file mode 100644 index 0000000000..cfc03a20a6 --- /dev/null +++ b/src/entity/model/PinkFlower_anim.c @@ -0,0 +1,356 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_PinkFlower_RenderNode1[]; +extern Gfx Entity_PinkFlower_RenderNode2[]; +extern Gfx Entity_PinkFlower_RenderNode3[]; +extern Gfx Entity_PinkFlower_RenderNode5[]; + +StaticAnimatorNode Entity_PinkFlower_Node5 = { + .displayList = Entity_PinkFlower_RenderNode5, + .pos = { 0.0f, -30.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_PinkFlower_Node4 = { + .displayList = ANIM_NULL, + .pos = { 0.0f, 30.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = &Entity_PinkFlower_Node5, +}; + +StaticAnimatorNode Entity_PinkFlower_Node3 = { + .displayList = Entity_PinkFlower_RenderNode3, + .sibling = &Entity_PinkFlower_Node4, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_PinkFlower_Node2 = { + .displayList = Entity_PinkFlower_RenderNode2, + .sibling = &Entity_PinkFlower_Node3, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_PinkFlower_Node1 = { + .displayList = Entity_PinkFlower_RenderNode1, + .sibling = ANIM_NULL, + .child = &Entity_PinkFlower_Node2, +}; + +StaticAnimatorNode* Entity_PinkFlower_Mesh[] = { + &Entity_PinkFlower_Node1, + &Entity_PinkFlower_Node2, + &Entity_PinkFlower_Node3, + &Entity_PinkFlower_Node4, + &Entity_PinkFlower_Node5, + ANIM_NULL, +}; + +AnimScript Entity_PinkFlower_AnimationLightUp = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 30, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, -30, 0) + as_SetScale(5, 1.2, 1.2, 1.2) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -14.995) + as_SetRotation(2, 0.0, 0.0, -30.0) + as_SetRotation(3, 0.0, 0.0, 30.0) + as_SetRotation(4, 0.0, 0.0, -30.0) + as_SetScale(4, 1.245, 1.245, 1.245) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -15.3) + as_SetRotation(2, 0.0, 0.0, -23.75) + as_SetRotation(3, 0.0, 0.0, 23.75) + as_SetRotation(4, 0.0, 0.0, -40.495) + as_SetScale(4, 0.98, 0.98, 0.98) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -15.355) + as_SetRotation(2, 0.0, 0.0, -14.995) + as_SetRotation(3, 0.0, 0.0, 14.995) + as_SetRotation(4, 0.0, 0.0, -44.995) + as_SetScale(4, 0.745, 0.745, 0.745) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -15.19) + as_SetRotation(2, 0.0, 0.0, -18.725) + as_SetRotation(3, 0.0, 0.0, 18.725) + as_SetRotation(4, 0.0, 0.0, -46.33) + as_SetScale(4, 0.875, 0.875, 0.875) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -14.825) + as_SetRotation(2, 0.0, 0.0, -25.79) + as_SetRotation(3, 0.0, 0.0, 25.79) + as_SetRotation(4, 0.0, 0.0, -45.665) + as_SetScale(4, 1.11, 1.11, 1.11) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -14.285) + as_SetRotation(2, 0.0, 0.0, -30.0) + as_SetRotation(3, 0.0, 0.0, 30.0) + as_SetRotation(4, 0.0, 0.0, -44.995) + as_SetScale(4, 1.245, 1.245, 1.245) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -13.585) + as_SetRotation(2, 0.0, 0.0, -30.675) + as_SetRotation(3, 0.0, 0.0, 30.675) + as_SetRotation(4, 0.0, 0.0, -45.13) + as_SetScale(4, 1.25, 1.25, 1.25) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -12.745) + as_SetRotation(2, 0.0, 0.0, -31.285) + as_SetRotation(3, 0.0, 0.0, 31.285) + as_SetRotation(4, 0.0, 0.0, -45.44) + as_SetScale(4, 1.235, 1.235, 1.235) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -11.79) + as_SetRotation(2, 0.0, 0.0, -31.81) + as_SetRotation(3, 0.0, 0.0, 31.81) + as_SetRotation(4, 0.0, 0.0, -45.83) + as_SetScale(4, 1.2, 1.2, 1.2) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -10.74) + as_SetRotation(2, 0.0, 0.0, -32.275) + as_SetRotation(3, 0.0, 0.0, 32.275) + as_SetRotation(4, 0.0, 0.0, -46.18) + as_SetScale(4, 1.155, 1.155, 1.155) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -9.62) + as_SetRotation(2, 0.0, 0.0, -32.65) + as_SetRotation(3, 0.0, 0.0, 32.65) + as_SetRotation(4, 0.0, 0.0, -46.385) + as_SetScale(4, 1.1, 1.1, 1.1) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -8.45) + as_SetRotation(2, 0.0, 0.0, -32.955) + as_SetRotation(3, 0.0, 0.0, 32.955) + as_SetRotation(4, 0.0, 0.0, -46.33) + as_SetScale(4, 1.055, 1.055, 1.055) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -7.24) + as_SetRotation(2, 0.0, 0.0, -33.18) + as_SetRotation(3, 0.0, 0.0, 33.18) + as_SetRotation(4, 0.0, 0.0, -45.9) + as_SetScale(4, 1.015, 1.015, 1.015) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -6.025) + as_SetRotation(2, 0.0, 0.0, -33.325) + as_SetRotation(3, 0.0, 0.0, 33.325) + as_SetRotation(4, 0.0, 0.0, -44.995) + as_SetScale(4, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -4.825) + as_SetRotation(2, 0.0, 0.0, -33.385) + as_SetRotation(3, 0.0, 0.0, 33.385) + as_SetRotation(4, 0.0, 0.0, -43.745) + as_SetScale(4, 0.99, 0.99, 0.99) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -3.655) + as_SetRotation(2, 0.0, 0.0, -33.355) + as_SetRotation(3, 0.0, 0.0, 33.355) + as_SetRotation(4, 0.0, 0.0, -42.36) + as_SetScale(4, 0.985, 0.985, 0.985) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -2.53) + as_SetRotation(2, 0.0, 0.0, -33.25) + as_SetRotation(3, 0.0, 0.0, 33.25) + as_SetRotation(4, 0.0, 0.0, -40.86) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -1.495) + as_SetRotation(2, 0.0, 0.0, -33.055) + as_SetRotation(3, 0.0, 0.0, 33.055) + as_SetRotation(4, 0.0, 0.0, -39.255) + as_SetScale(4, 0.98, 0.98, 0.98) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, -0.545) + as_SetRotation(2, 0.0, 0.0, -32.775) + as_SetRotation(3, 0.0, 0.0, 32.775) + as_SetRotation(4, 0.0, 0.0, -37.55) + as_SetScale(4, 0.97, 0.97, 0.97) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.275) + as_SetRotation(2, 0.0, 0.0, -32.4) + as_SetRotation(3, 0.0, 0.0, 32.4) + as_SetRotation(4, 0.0, 0.0, -35.775) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.965) + as_SetRotation(2, 0.0, 0.0, -31.94) + as_SetRotation(3, 0.0, 0.0, 31.94) + as_SetRotation(4, 0.0, 0.0, -33.915) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.5) + as_SetRotation(2, 0.0, 0.0, -31.385) + as_SetRotation(3, 0.0, 0.0, 31.385) + as_SetRotation(4, 0.0, 0.0, -32.01) + as_SetScale(4, 0.965, 0.965, 0.965) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.85) + as_SetRotation(2, 0.0, 0.0, -30.74) + as_SetRotation(3, 0.0, 0.0, 30.74) + as_SetRotation(4, 0.0, 0.0, -30.055) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 2.0) + as_SetRotation(2, 0.0, 0.0, -30.0) + as_SetRotation(3, 0.0, 0.0, 30.0) + as_SetRotation(4, 0.0, 0.0, -28.065) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 2.02) + as_SetRotation(2, 0.0, 0.0, -29.065) + as_SetRotation(3, 0.0, 0.0, 29.065) + as_SetRotation(4, 0.0, 0.0, -26.06) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 2.005) + as_SetRotation(2, 0.0, 0.0, -27.88) + as_SetRotation(3, 0.0, 0.0, 27.88) + as_SetRotation(4, 0.0, 0.0, -24.04) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.96) + as_SetRotation(2, 0.0, 0.0, -26.46) + as_SetRotation(3, 0.0, 0.0, 26.46) + as_SetRotation(4, 0.0, 0.0, -22.03) + as_SetScale(4, 0.965, 0.97, 0.97) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.895) + as_SetRotation(2, 0.0, 0.0, -24.855) + as_SetRotation(3, 0.0, 0.0, 24.855) + as_SetRotation(4, 0.0, 0.0, -20.03) + as_SetScale(4, 0.97, 0.97, 0.97) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.795) + as_SetRotation(2, 0.0, 0.0, -23.09) + as_SetRotation(3, 0.0, 0.0, 23.09) + as_SetRotation(4, 0.0, 0.0, -18.055) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.685) + as_SetRotation(2, 0.0, 0.0, -21.2) + as_SetRotation(3, 0.0, 0.0, 21.2) + as_SetRotation(4, 0.0, 0.0, -16.125) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.555) + as_SetRotation(2, 0.0, 0.0, -19.21) + as_SetRotation(3, 0.0, 0.0, 19.21) + as_SetRotation(4, 0.0, 0.0, -14.245) + as_SetScale(4, 0.98, 0.98, 0.98) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.41) + as_SetRotation(2, 0.0, 0.0, -17.16) + as_SetRotation(3, 0.0, 0.0, 17.16) + as_SetRotation(4, 0.0, 0.0, -12.425) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.26) + as_SetRotation(2, 0.0, 0.0, -15.09) + as_SetRotation(3, 0.0, 0.0, 15.09) + as_SetRotation(4, 0.0, 0.0, -10.685) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 1.1) + as_SetRotation(2, 0.0, 0.0, -13.025) + as_SetRotation(3, 0.0, 0.0, 13.025) + as_SetRotation(4, 0.0, 0.0, -9.03) + as_SetScale(4, 0.985, 0.985, 0.985) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.94) + as_SetRotation(2, 0.0, 0.0, -11.0) + as_SetRotation(3, 0.0, 0.0, 11.0) + as_SetRotation(4, 0.0, 0.0, -7.475) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.78) + as_SetRotation(2, 0.0, 0.0, -9.04) + as_SetRotation(3, 0.0, 0.0, 9.04) + as_SetRotation(4, 0.0, 0.0, -6.035) + as_SetScale(4, 0.99, 0.99, 0.99) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.625) + as_SetRotation(2, 0.0, 0.0, -7.19) + as_SetRotation(3, 0.0, 0.0, 7.19) + as_SetRotation(4, 0.0, 0.0, -4.72) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.48) + as_SetRotation(2, 0.0, 0.0, -5.48) + as_SetRotation(3, 0.0, 0.0, 5.48) + as_SetRotation(4, 0.0, 0.0, -3.54) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.345) + as_SetRotation(2, 0.0, 0.0, -3.945) + as_SetRotation(3, 0.0, 0.0, 3.945) + as_SetRotation(4, 0.0, 0.0, -2.51) + as_SetScale(4, 0.995, 0.995, 0.995) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.23) + as_SetRotation(2, 0.0, 0.0, -2.61) + as_SetRotation(3, 0.0, 0.0, 2.61) + as_SetRotation(4, 0.0, 0.0, -1.635) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.13) + as_SetRotation(2, 0.0, 0.0, -1.515) + as_SetRotation(3, 0.0, 0.0, 1.515) + as_SetRotation(4, 0.0, 0.0, -0.94) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.06) + as_SetRotation(2, 0.0, 0.0, -0.7) + as_SetRotation(3, 0.0, 0.0, 0.7) + as_SetRotation(4, 0.0, 0.0, -0.425) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.01) + as_SetRotation(2, 0.0, 0.0, -0.175) + as_SetRotation(3, 0.0, 0.0, 0.175) + as_SetRotation(4, 0.0, 0.0, -0.105) + as_SetScale(4, 0.995, 1.0, 1.0) + as_Wait(1) + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 30, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, -30, 0) + as_SetScale(5, 1.2, 1.2, 1.2) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_PinkFlower_AnimationIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 0, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 0, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 30, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, -30, 0) + as_SetScale(5, 1.2, 1.2, 1.2) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/PinkFlower_gfx.c b/src/entity/model/PinkFlower_gfx.c new file mode 100644 index 0000000000..c3f1ef3277 --- /dev/null +++ b/src/entity/model/PinkFlower_gfx.c @@ -0,0 +1,161 @@ +#include "common.h" + +#include "entity/model/PinkFlower_1.vtx.inc.c" +#include "entity/model/PinkFlower_2.vtx.inc.c" +#include "entity/model/PinkFlower_3.vtx.inc.c" +#include "entity/model/PinkFlower_4.vtx.inc.c" +#include "entity/model/PinkFlower_5.vtx.inc.c" + +#include "entity/model/PinkFlower_light.png.inc.c" +Gfx D_0A0007B0_E9BCB0[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0005B0_E9BAB0, G_IM_FMT_IA, G_IM_SIZ_16b, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/PinkFlower_tex.png.inc.c" +Gfx D_0A001020_E9C520[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000820_E9BD20, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx D_0A001098_E9C598 = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF60019, 0x000D0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_PinkFlower_RenderNode3[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A0004B0_E9B9B0, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 0, 0, 5, 6, 1, 0), + gsSP2Triangles(5, 1, 0, 0, 3, 0, 2, 0), + gsSP2Triangles(4, 7, 5, 0, 7, 6, 5, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(8, 11, 12, 0, 11, 13, 12, 0), + gsSP2Triangles(10, 14, 13, 0, 10, 13, 11, 0), + gsSP2Triangles(9, 15, 10, 0, 15, 14, 10, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PinkFlower_RenderNode2[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A0003B0_E9B8B0, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(2, 5, 6, 0, 2, 6, 3, 0), + gsSP2Triangles(5, 7, 6, 0, 5, 4, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(10, 12, 13, 0, 10, 13, 11, 0), + gsSP2Triangles(10, 9, 14, 0, 10, 14, 12, 0), + gsSP2Triangles(12, 15, 13, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PinkFlower_RenderNode1[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000290_E9B790, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(15, 14, 16, 0, 15, 16, 17, 0), + gsSP2Triangles(11, 10, 13, 0, 11, 13, 12, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PinkFlower_RenderNode5[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(D_0A001020_E9C520), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000040_E9B540, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 3, 5, 0, 6, 5, 7, 0), + gsSP2Triangles(8, 0, 3, 0, 8, 3, 6, 0), + gsSP2Triangles(2, 9, 10, 0, 2, 10, 4, 0), + gsSP2Triangles(1, 11, 9, 0, 1, 9, 2, 0), + gsSP2Triangles(5, 4, 12, 0, 5, 12, 13, 0), + gsSP2Triangles(4, 10, 14, 0, 4, 14, 12, 0), + gsSP2Triangles(7, 5, 13, 0, 7, 13, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(16, 19, 20, 0, 19, 18, 21, 0), + gsSP2Triangles(19, 21, 11, 0, 20, 19, 11, 0), + gsSP2Triangles(20, 11, 1, 0, 22, 20, 1, 0), + gsSP2Triangles(22, 1, 0, 0, 23, 20, 22, 0), + gsSP2Triangles(11, 21, 24, 0, 11, 24, 9, 0), + gsSP2Triangles(9, 24, 25, 0, 9, 25, 10, 0), + gsSP2Triangles(10, 25, 26, 0, 10, 26, 14, 0), + gsSP2Triangles(27, 22, 0, 0, 27, 0, 8, 0), + gsSP2Triangles(23, 27, 28, 0, 23, 22, 27, 0), + gsSP2Triangles(28, 27, 8, 0, 28, 8, 29, 0), + gsSPVertex(&D_0A000040_E9B540[6], 3, 0), + gsSPVertex(&D_0A000040_E9B540[15], 1, 3), + gsSPVertex(&D_0A000040_E9B540[17], 2, 4), + gsSPVertex(&D_0A000040_E9B540[21], 1, 6), + gsSPVertex(&D_0A000040_E9B540[24], 3, 7), + gsSPVertex(&D_0A000040_E9B540[29], 8, 10), + gsSP2Triangles(10, 2, 0, 0, 10, 0, 11, 0), + gsSP2Triangles(11, 0, 1, 0, 11, 1, 12, 0), + gsSP2Triangles(12, 1, 3, 0, 12, 3, 16, 0), + gsSP2Triangles(6, 13, 14, 0, 6, 14, 7, 0), + gsSP2Triangles(7, 14, 15, 0, 7, 15, 8, 0), + gsSP2Triangles(8, 15, 17, 0, 8, 17, 9, 0), + gsSP2Triangles(5, 4, 13, 0, 5, 13, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0013B8_E9C8B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsSPDisplayList(D_0A0007B0_E9BCB0), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E9B500, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PowBlock.c b/src/entity/model/PowBlock.c new file mode 100644 index 0000000000..e69a40ead3 --- /dev/null +++ b/src/entity/model/PowBlock.c @@ -0,0 +1,76 @@ +#include "common.h" + +#include "entity/model/PowBlock.vtx.inc.c" + +#include "entity/model/PowBlock_face.png.inc.c" +#include "entity/model/PowBlock_face.pal.inc.c" +Gfx Entity_PowBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000900_E44420), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000100_E43C20, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_PowBlock_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_PowBlock_RenderTopBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PowBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000000_E43B20, 4, 0), + gsSPVertex(&D_0A000000_E43B20[8], 4, 4), + gsSP2Triangles(3, 4, 7, 0, 3, 7, 0, 0), + gsSP2Triangles(1, 6, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PowBlock_RenderSides[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PowBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000000_E43B20, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PowBlock_RenderFaces[] = { + gsSPDisplayList(Entity_PowBlock_RenderSides), + gsSPDisplayList(Entity_PowBlock_RenderTopBottom), + gsSPEndDisplayList(), +}; + +Gfx Entity_PowBlock_RenderBlock[] = { + gsSPDisplayList(Entity_PowBlock_RenderFaces), + gsSPEndDisplayList(), +}; + +Gfx Entity_PowBlock_Render[] = { + gsSPDisplayList(Entity_PowBlock_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/PushBlock.c b/src/entity/model/PushBlock.c new file mode 100644 index 0000000000..a3b792a27d --- /dev/null +++ b/src/entity/model/PushBlock.c @@ -0,0 +1,60 @@ +#include "common.h" + +#include "entity/model/PushBlock.vtx.inc.c" + +#include "entity/model/PushBlock_face.png.inc.c" +#include "entity/model/PushBlock_face.pal.inc.c" +Gfx Entity_PushBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A0001A0_E3DC00), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000120_E3DB80, G_IM_FMT_CI, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_PushBlock_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_PushBlock_RenderFaces[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_PushBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E3DA60, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(3, 6, 7, 0, 3, 7, 4, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(14, 13, 16, 0, 14, 16, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_PushBlock_RenderBlock[] = { + gsSPMatrix(&Entity_PushBlock_mtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_PushBlock_RenderFaces), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_PushBlock_Render[] = { + gsSPDisplayList(Entity_PushBlock_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/RedBlock.c b/src/entity/model/RedBlock.c new file mode 100644 index 0000000000..201fc055af --- /dev/null +++ b/src/entity/model/RedBlock.c @@ -0,0 +1,47 @@ +#include "common.h" + +#include "entity/model/RedBlock.vtx.inc.c" + +#include "entity/model/RedBlock_face.png.inc.c" +Gfx Entity_RedBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000180_E3C4A0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedBlock_RenderTopBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_RedBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E3C320[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedBlock_RenderSides[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_RedBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E3C320, 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedBlock_Render[] = { + gsSPDisplayList(Entity_RedBlock_RenderSides), + gsSPDisplayList(Entity_RedBlock_RenderTopBottom), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/RedSwitch.c b/src/entity/model/RedSwitch.c new file mode 100644 index 0000000000..e59776c0e1 --- /dev/null +++ b/src/entity/model/RedSwitch.c @@ -0,0 +1,196 @@ +#include "common.h" + +#include "entity/model/RedSwitch_1.vtx.inc.c" +#include "entity/model/RedSwitch_2.vtx.inc.c" +#include "entity/model/RedSwitch_3.vtx.inc.c" + +#include "entity/model/RedSwitch_tex.png.inc.c" +#include "entity/model/RedSwitch_tex.pal.inc.c" +Gfx Entity_RedSwitch_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0006D0_E63190), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0005D0_E63090, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/RedSwitch_exclamationMark.png.inc.c" +Gfx Entity_RedSwitch_LoadExclMark[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000978_E63438, G_IM_FMT_IA, 16, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_RedSwitch_mtxExclMark = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000006, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Mtx Entity_RedSwitch_mtxRedBubble = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFF0005, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xF9310000, 0x9BEF0000 } + } +}; + +Gfx Entity_RedSwitch_RenderRedBubble[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0003D0_E62E90, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0), + gsSP2Triangles(2, 7, 8, 0, 2, 8, 4, 0), + gsSP2Triangles(4, 8, 9, 0, 4, 9, 10, 0), + gsSP2Triangles(5, 4, 10, 0, 5, 10, 11, 0), + gsSP2Triangles(12, 13, 6, 0, 12, 6, 1, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 6, 0), + gsSP2Triangles(6, 15, 16, 0, 6, 16, 7, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 16, 0, 17, 16, 15, 0), + gsSP2Triangles(17, 15, 14, 0, 17, 14, 21, 0), + gsSP2Triangles(7, 16, 20, 0, 7, 20, 8, 0), + gsSP2Triangles(22, 12, 1, 0, 22, 1, 0, 0), + gsSP2Triangles(23, 24, 13, 0, 23, 13, 12, 0), + gsSP2Triangles(24, 21, 14, 0, 24, 14, 13, 0), + gsSP2Triangles(25, 23, 12, 0, 25, 12, 22, 0), + gsSP2Triangles(8, 20, 19, 0, 8, 19, 9, 0), + gsSP2Triangles(26, 27, 24, 0, 26, 24, 23, 0), + gsSP2Triangles(28, 29, 27, 0, 28, 27, 26, 0), + gsSP2Triangles(29, 18, 17, 0, 29, 17, 27, 0), + gsSP2Triangles(27, 17, 21, 0, 27, 21, 24, 0), + gsSP2Triangles(10, 9, 29, 0, 10, 29, 28, 0), + gsSP2Triangles(9, 19, 18, 0, 9, 18, 29, 0), + gsSPVertex(&D_0A0003D0_E62E90[10], 2, 0), + gsSPVertex(&D_0A0003D0_E62E90[23], 1, 2), + gsSPVertex(&D_0A0003D0_E62E90[25], 2, 3), + gsSPVertex(&D_0A0003D0_E62E90[28], 1, 5), + gsSPVertex(&D_0A0003D0_E62E90[30], 2, 6), + gsSP2Triangles(6, 5, 4, 0, 6, 4, 7, 0), + gsSP2Triangles(7, 4, 2, 0, 7, 2, 3, 0), + gsSP2Triangles(1, 0, 5, 0, 1, 5, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderRotatedRedBubble[] = { + gsSPMatrix(&Entity_RedSwitch_mtxRedBubble, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_RedSwitch_RenderRedBubble), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderExclMark[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_RedSwitch_LoadExclMark), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000390_E62E50, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderRotatedExclMark[] = { + gsSPMatrix(&Entity_RedSwitch_mtxExclMark, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_RedSwitch_RenderExclMark), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderBase[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_RedSwitch_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E62AC0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(3, 2, 6, 0, 3, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 9, 0, 12, 9, 8, 0), + gsSP2Triangles(11, 10, 14, 0, 11, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 17, 0, 20, 17, 16, 0), + gsSP2Triangles(19, 18, 22, 0, 19, 22, 23, 0), + gsSP2Triangles(7, 6, 24, 0, 7, 24, 25, 0), + gsSP2Triangles(15, 14, 26, 0, 15, 26, 27, 0), + gsSP2Triangles(23, 22, 28, 0, 23, 28, 29, 0), + gsSPVertex(&D_0A000000_E62AC0[4], 2, 0), + gsSPVertex(&D_0A000000_E62AC0[12], 2, 2), + gsSPVertex(&D_0A000000_E62AC0[20], 2, 4), + gsSPVertex(&D_0A000000_E62AC0[24], 4, 6), + gsSPVertex(&D_0A000000_E62AC0[30], 13, 10), + gsSPVertex(&D_0A000000_E62AC0[44], 9, 23), + gsSP2Triangles(7, 6, 10, 0, 7, 10, 25, 0), + gsSP2Triangles(11, 26, 5, 0, 11, 5, 4, 0), + gsSP2Triangles(12, 19, 27, 0, 12, 27, 13, 0), + gsSP2Triangles(13, 27, 28, 0, 13, 28, 14, 0), + gsSP2Triangles(14, 28, 3, 0, 14, 3, 2, 0), + gsSP2Triangles(15, 24, 29, 0, 15, 29, 16, 0), + gsSP2Triangles(16, 29, 26, 0, 16, 26, 11, 0), + gsSP2Triangles(17, 30, 31, 0, 17, 31, 18, 0), + gsSP2Triangles(18, 31, 1, 0, 18, 1, 0, 0), + gsSP2Triangles(9, 8, 19, 0, 9, 19, 12, 0), + gsSP2Triangles(20, 21, 23, 0, 21, 22, 23, 0), + gsSP2Triangles(25, 10, 30, 0, 25, 30, 17, 0), + gsSPVertex(&D_0A000000_E62AC0[28], 2, 0), + gsSPVertex(&D_0A000000_E62AC0[35], 1, 2), + gsSPVertex(&D_0A000000_E62AC0[40], 1, 3), + gsSPVertex(&D_0A000000_E62AC0[42], 4, 4), + gsSPVertex(&D_0A000000_E62AC0[53], 4, 8), + gsSP2Triangles(4, 8, 6, 0, 5, 6, 11, 0), + gsSP2Triangles(6, 9, 11, 0, 6, 10, 9, 0), + gsSP2Triangles(6, 8, 10, 0, 5, 3, 6, 0), + gsSP2Triangles(1, 0, 7, 0, 1, 7, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderBaseMain[] = { + gsSPDisplayList(Entity_RedSwitch_RenderBase), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_RenderMain[] = { + gsSPDisplayList(Entity_RedSwitch_RenderBaseMain), + gsSPDisplayList(Entity_RedSwitch_RenderRotatedExclMark), + gsSPDisplayList(Entity_RedSwitch_RenderRotatedRedBubble), + gsSPEndDisplayList(), +}; + +Gfx Entity_RedSwitch_Render[] = { + gsSPDisplayList(Entity_RedSwitch_RenderMain), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/SaveBlock.c b/src/entity/model/SaveBlock.c new file mode 100644 index 0000000000..f2681ac501 --- /dev/null +++ b/src/entity/model/SaveBlock.c @@ -0,0 +1,152 @@ +#include "common.h" + +#include "entity/model/SaveBlock_1.vtx.inc.c" +#include "entity/model/SaveBlock_2.vtx.inc.c" +#include "entity/model/SaveBlock_3.vtx.inc.c" + +#include "entity/model/SaveBlock_star.png.inc.c" +Gfx Entity_SaveBlock_LoadTextureStar[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000900_E4BBE0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/SaveBlock_face.png.inc.c" +Gfx Entity_SaveBlock_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001170_E4C450, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/SaveBlock_letterS.png.inc.c" +Gfx Entity_SaveBlock_LoadTextureLetterS[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0021E8_E4D4C8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_SaveBlock_Mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_SaveBlock_RenderLetterS[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SaveBlock_LoadTextureLetterS), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0006C0_E4B9A0, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0), + gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0), + gsSP2Triangles(8, 4, 3, 0, 8, 3, 7, 0), + gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0), + gsSP2Triangles(13, 14, 9, 0, 13, 9, 12, 0), + gsSP2Triangles(12, 11, 15, 0, 12, 15, 16, 0), + gsSP2Triangles(17, 13, 12, 0, 17, 12, 16, 0), + gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), + gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0), + gsSP2Triangles(24, 25, 21, 0, 24, 21, 23, 0), + gsSP2Triangles(25, 26, 18, 0, 25, 18, 21, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSPVertex(&D_0A0006C0_E4B9A0[28], 8, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 1, 0), + gsSP2Triangles(4, 6, 5, 0, 4, 5, 1, 0), + gsSP2Triangles(5, 7, 2, 0, 5, 2, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SaveBlock_RenderFaces[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000370_E4B650, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 4, 5, 0, 2, 5, 3, 0), + gsSP2Triangles(1, 6, 7, 0, 1, 7, 2, 0), + gsSP2Triangles(7, 8, 4, 0, 7, 4, 2, 0), + gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0), + gsSP2Triangles(11, 13, 14, 0, 11, 14, 12, 0), + gsSP2Triangles(15, 16, 12, 0, 15, 12, 14, 0), + gsSP2Triangles(16, 17, 9, 0, 16, 9, 12, 0), + gsSP2Triangles(18, 16, 19, 0, 18, 19, 20, 0), + gsSP2Triangles(16, 21, 22, 0, 16, 22, 19, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 19, 0), + gsSP2Triangles(24, 25, 20, 0, 24, 20, 19, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSPVertex(&D_0A000370_E4B650[27], 26, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 1, 0), + gsSP2Triangles(4, 14, 5, 0, 4, 5, 1, 0), + gsSP2Triangles(5, 15, 2, 0, 5, 2, 1, 0), + gsSP2Triangles(6, 16, 7, 0, 6, 7, 8, 0), + gsSP2Triangles(7, 17, 18, 0, 7, 18, 8, 0), + gsSP2Triangles(8, 18, 19, 0, 8, 19, 20, 0), + gsSP2Triangles(9, 6, 8, 0, 9, 8, 20, 0), + gsSP2Triangles(10, 21, 22, 0, 10, 22, 23, 0), + gsSP2Triangles(11, 24, 10, 0, 11, 10, 23, 0), + gsSP2Triangles(12, 13, 23, 0, 12, 23, 22, 0), + gsSP2Triangles(13, 25, 11, 0, 13, 11, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SaveBlock_RenderStar[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SaveBlock_LoadTextureStar), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000000_E4B2E0, 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 5, 1, 0), + gsSP2Triangles(0, 4, 6, 0, 1, 7, 2, 0), + gsSP2Triangles(2, 8, 3, 0, 3, 9, 4, 0), + gsSP2Triangles(10, 11, 12, 0, 11, 13, 14, 0), + gsSP2Triangles(11, 14, 15, 0, 11, 15, 12, 0), + gsSP2Triangles(11, 16, 13, 0, 15, 17, 12, 0), + gsSP2Triangles(13, 18, 14, 0, 14, 19, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SaveBlock_RenderContent[] = { + gsSPDisplayList(Entity_SaveBlock_RenderStar), + gsSPEndDisplayList(), +}; + +Gfx Entity_SaveBlock_RenderBlock[] = { + gsSPDisplayList(Entity_SaveBlock_RenderFaces), + gsSPDisplayList(Entity_SaveBlock_RenderLetterS), + gsSPEndDisplayList(), +}; + +Gfx Entity_SaveBlock_RenderNone[] = { + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/ScriptSpring_anim.c b/src/entity/model/ScriptSpring_anim.c new file mode 100644 index 0000000000..9f2a34eb49 --- /dev/null +++ b/src/entity/model/ScriptSpring_anim.c @@ -0,0 +1,610 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_ScriptSpring_RenderPart1[]; +extern Gfx Entity_ScriptSpring_RenderPart2[]; +extern Gfx Entity_ScriptSpring_RenderPart3[]; +extern Gfx Entity_ScriptSpring_RenderPart4[]; +extern Gfx Entity_ScriptSpring_RenderPart5[]; +extern Gfx Entity_ScriptSpring_RenderPart6[]; +extern Gfx Entity_ScriptSpring_RenderPart7[]; + +StaticAnimatorNode Entity_ScriptSpring_NodePart9 = { + .displayList = ANIM_NULL, + .pos = { 0.0f, 5.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart8 = { + .displayList = ANIM_NULL, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart9, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart7 = { + .displayList = Entity_ScriptSpring_RenderPart7, + .sibling = &Entity_ScriptSpring_NodePart8, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart6 = { + .displayList = Entity_ScriptSpring_RenderPart6, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart7, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart5 = { + .displayList = Entity_ScriptSpring_RenderPart5, + .pos = { 0.0f, 8.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart6, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart4 = { + .displayList = Entity_ScriptSpring_RenderPart4, + .pos = { 0.0f, 12.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart5, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart3 = { + .displayList = Entity_ScriptSpring_RenderPart3, + .pos = { 0.0f, 16.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart4, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart2 = { + .displayList = Entity_ScriptSpring_RenderPart2, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart3, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_NodePart1 = { + .displayList = Entity_ScriptSpring_RenderPart1, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_ScriptSpring_NodePart2, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_ScriptSpring_ParentNode = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_ScriptSpring_NodePart1, +}; + +StaticAnimatorNode* Entity_ScriptSpring_Mesh[] = { + &Entity_ScriptSpring_ParentNode, + &Entity_ScriptSpring_NodePart1, + &Entity_ScriptSpring_NodePart2, + &Entity_ScriptSpring_NodePart3, + &Entity_ScriptSpring_NodePart4, + &Entity_ScriptSpring_NodePart5, + &Entity_ScriptSpring_NodePart6, + &Entity_ScriptSpring_NodePart7, + &Entity_ScriptSpring_NodePart8, + &Entity_ScriptSpring_NodePart9, + ANIM_NULL, +}; + +AnimScript Entity_ScriptSpring_AnimLaunch = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetPos(2, 0, 11, 0) + as_SetPos(3, 0, 12, 0) + as_SetPos(4, 0, 9, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 11, 0) + as_SetPos(9, 0, 11, 0) + as_Wait(1) + as_SetPos(2, 0, 5, 0) + as_SetPos(3, 0, 6, 0) + as_SetPos(4, 0, 5, 0) + as_SetPos(5, 0, 5, 0) + as_SetPos(6, 0, 5, 0) + as_SetPos(7, 0, 5, 0) + as_SetPos(9, 0, 5, 0) + as_Wait(1) + as_SetPos(2, 0, 14, 0) + as_SetPos(3, 0, 15, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 14, 0) + as_SetPos(9, 0, 14, 0) + as_Wait(1) + as_SetPos(2, 0, 29, 0) + as_SetPos(3, 0, 30, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 29, 0) + as_SetPos(9, 0, 29, 0) + as_Wait(1) + as_SetPos(2, 0, 44, 0) + as_SetPos(3, 0, 45, 0) + as_SetPos(4, 0, 34, 0) + as_SetPos(5, 0, 24, 0) + as_SetPos(6, 0, 14, 0) + as_SetPos(7, 0, 44, 0) + as_SetPos(9, 0, 44, 0) + as_Wait(1) + as_SetPos(2, 0, 55, 0) + as_SetPos(3, 0, 56, 0) + as_SetPos(4, 0, 42, 0) + as_SetPos(5, 0, 30, 0) + as_SetPos(6, 0, 17, 0) + as_SetPos(7, 0, 55, 0) + as_SetPos(9, 0, 55, 0) + as_Wait(1) + as_SetPos(2, 0, 59, 0) + as_SetPos(3, 0, 60, 0) + as_SetPos(4, 0, 45, 0) + as_SetPos(5, 0, 32, 0) + as_SetPos(6, 0, 18, 0) + as_SetPos(7, 0, 59, 0) + as_SetPos(9, 0, 59, 0) + as_Wait(1) + as_SetPos(2, 0, 60, 0) + as_SetPos(3, 0, 61, 0) + as_SetPos(4, 0, 46, 0) + as_SetPos(7, 0, 60, 0) + as_SetPos(9, 0, 60, 0) + as_Wait(1) + as_SetPos(2, 0, 59, 0) + as_SetPos(3, 0, 60, 0) + as_SetPos(4, 0, 45, 0) + as_SetPos(7, 0, 59, 0) + as_SetPos(9, 0, 59, 0) + as_Wait(1) + as_SetPos(2, 0, 55, 0) + as_SetPos(3, 0, 56, 0) + as_SetPos(4, 0, 42, 0) + as_SetPos(5, 0, 30, 0) + as_SetPos(6, 0, 17, 0) + as_SetPos(7, 0, 55, 0) + as_SetPos(9, 0, 55, 0) + as_Wait(1) + as_SetPos(2, 0, 45, 0) + as_SetPos(3, 0, 46, 0) + as_SetPos(4, 0, 35, 0) + as_SetPos(5, 0, 25, 0) + as_SetPos(6, 0, 15, 0) + as_SetPos(7, 0, 45, 0) + as_SetPos(9, 0, 45, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 24, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 10, 0) + as_SetPos(3, 0, 11, 0) + as_SetPos(4, 0, 8, 0) + as_SetPos(5, 0, 7, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 10, 0) + as_SetPos(9, 0, 10, 0) + as_Wait(1) + as_SetPos(2, 0, 12, 0) + as_SetPos(3, 0, 13, 0) + as_SetPos(4, 0, 10, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(7, 0, 12, 0) + as_SetPos(9, 0, 12, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 24, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 39, 0) + as_SetPos(3, 0, 40, 0) + as_SetPos(4, 0, 30, 0) + as_SetPos(5, 0, 22, 0) + as_SetPos(6, 0, 13, 0) + as_SetPos(7, 0, 39, 0) + as_SetPos(9, 0, 39, 0) + as_Wait(1) + as_SetPos(2, 0, 43, 0) + as_SetPos(3, 0, 44, 0) + as_SetPos(4, 0, 33, 0) + as_SetPos(5, 0, 24, 0) + as_SetPos(6, 0, 14, 0) + as_SetPos(7, 0, 43, 0) + as_SetPos(9, 0, 43, 0) + as_Wait(1) + as_SetPos(2, 0, 40, 0) + as_SetPos(3, 0, 41, 0) + as_SetPos(4, 0, 31, 0) + as_SetPos(5, 0, 22, 0) + as_SetPos(6, 0, 13, 0) + as_SetPos(7, 0, 40, 0) + as_SetPos(9, 0, 40, 0) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetPos(3, 0, 36, 0) + as_SetPos(4, 0, 27, 0) + as_SetPos(5, 0, 20, 0) + as_SetPos(6, 0, 12, 0) + as_SetPos(7, 0, 35, 0) + as_SetPos(9, 0, 35, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 21, 0) + as_SetPos(3, 0, 22, 0) + as_SetPos(4, 0, 17, 0) + as_SetPos(5, 0, 13, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 21, 0) + as_SetPos(9, 0, 21, 0) + as_Wait(1) + as_SetPos(2, 0, 15, 0) + as_SetPos(3, 0, 16, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 15, 0) + as_SetPos(9, 0, 15, 0) + as_Wait(1) + as_SetPos(2, 0, 12, 0) + as_SetPos(3, 0, 13, 0) + as_SetPos(4, 0, 10, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 12, 0) + as_SetPos(9, 0, 12, 0) + as_Wait(1) + as_SetPos(2, 0, 13, 0) + as_SetPos(3, 0, 14, 0) + as_SetPos(4, 0, 11, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 13, 0) + as_SetPos(9, 0, 13, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 23, 0) + as_SetPos(3, 0, 24, 0) + as_SetPos(4, 0, 18, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 23, 0) + as_SetPos(9, 0, 23, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 33, 0) + as_SetPos(3, 0, 34, 0) + as_SetPos(4, 0, 26, 0) + as_SetPos(5, 0, 19, 0) + as_SetPos(6, 0, 12, 0) + as_SetPos(7, 0, 33, 0) + as_SetPos(9, 0, 33, 0) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetPos(3, 0, 36, 0) + as_SetPos(4, 0, 27, 0) + as_SetPos(5, 0, 20, 0) + as_SetPos(7, 0, 35, 0) + as_SetPos(9, 0, 35, 0) + as_Wait(1) + as_SetPos(2, 0, 33, 0) + as_SetPos(3, 0, 34, 0) + as_SetPos(4, 0, 26, 0) + as_SetPos(5, 0, 19, 0) + as_SetPos(7, 0, 33, 0) + as_SetPos(9, 0, 33, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 25, 0) + as_SetPos(3, 0, 26, 0) + as_SetPos(4, 0, 20, 0) + as_SetPos(5, 0, 15, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 25, 0) + as_SetPos(9, 0, 25, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 14, 0) + as_SetPos(3, 0, 15, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(7, 0, 14, 0) + as_SetPos(9, 0, 14, 0) + as_Wait(1) + as_SetPos(2, 0, 15, 0) + as_SetPos(3, 0, 16, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(7, 0, 15, 0) + as_SetPos(9, 0, 15, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 21, 0) + as_SetPos(3, 0, 22, 0) + as_SetPos(4, 0, 17, 0) + as_SetPos(5, 0, 13, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 21, 0) + as_SetPos(9, 0, 21, 0) + as_Wait(1) + as_SetPos(2, 0, 24, 0) + as_SetPos(3, 0, 25, 0) + as_SetPos(4, 0, 19, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(7, 0, 24, 0) + as_SetPos(9, 0, 24, 0) + as_Wait(1) + as_SetPos(2, 0, 27, 0) + as_SetPos(3, 0, 28, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 27, 0) + as_SetPos(9, 0, 27, 0) + as_Wait(1) + as_SetPos(2, 0, 29, 0) + as_SetPos(3, 0, 30, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 29, 0) + as_SetPos(9, 0, 29, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 26, 0) + as_SetPos(3, 0, 27, 0) + as_SetPos(4, 0, 21, 0) + as_SetPos(5, 0, 15, 0) + as_SetPos(7, 0, 26, 0) + as_SetPos(9, 0, 26, 0) + as_Wait(1) + as_SetPos(2, 0, 23, 0) + as_SetPos(3, 0, 24, 0) + as_SetPos(4, 0, 19, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 23, 0) + as_SetPos(9, 0, 23, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 18, 0) + as_SetPos(3, 0, 19, 0) + as_SetPos(4, 0, 15, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(7, 0, 18, 0) + as_SetPos(9, 0, 18, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_Wait(1) + as_SetPos(2, 0, 18, 0) + as_SetPos(3, 0, 19, 0) + as_SetPos(4, 0, 15, 0) + as_SetPos(7, 0, 18, 0) + as_SetPos(9, 0, 18, 0) + as_Wait(1) + as_SetPos(2, 0, 19, 0) + as_SetPos(3, 0, 20, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(7, 0, 19, 0) + as_SetPos(9, 0, 19, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_ScriptSpring_AnimIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/ScriptSpring_gfx.c b/src/entity/model/ScriptSpring_gfx.c new file mode 100644 index 0000000000..1c11fd80d9 --- /dev/null +++ b/src/entity/model/ScriptSpring_gfx.c @@ -0,0 +1,176 @@ +#include "common.h" + +#include "entity/model/ScriptSpring_1.vtx.inc.c" +#include "entity/model/ScriptSpring_2.vtx.inc.c" +#include "entity/model/ScriptSpring_3.vtx.inc.c" +#include "entity/model/ScriptSpring_4.vtx.inc.c" +#include "entity/model/ScriptSpring_5.vtx.inc.c" +#include "entity/model/ScriptSpring_6.vtx.inc.c" +#include "entity/model/ScriptSpring_7.vtx.inc.c" + +#include "entity/model/ScriptSpring_tex1.png.inc.c" +#include "entity/model/ScriptSpring_tex1.pal.inc.c" +Gfx Entity_ScriptSpring_LoadTexture1[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000960_E66100), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000860_E66000, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/ScriptSpring_tex2.png.inc.c" +#include "entity/model/ScriptSpring_tex2.pal.inc.c" +Gfx Entity_ScriptSpring_LoadTexture2[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A000D08_E664A8), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000C08_E663A8, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/ScriptSpring_star.png.inc.c" +#include "entity/model/ScriptSpring_star.pal.inc.c" +Gfx Entity_ScriptSpring_LoadTextureStar[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0013B0_E66B50), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000FB0_E66750, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart2[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_ScriptSpring_LoadTextureStar), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A0007E0_E65F80, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart6[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_ScriptSpring_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000680_E65E20, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 2, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart1[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_ScriptSpring_LoadTexture2), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000400_E65BA0, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(7, 6, 15, 0, 7, 15, 14, 0), + gsSPVertex(&D_0A000400_E65BA0[18], 22, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart3[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000380_E65B20, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart4[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000300_E65AA0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart5[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000280_E65A20, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_ScriptSpring_RenderPart7[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_ScriptSpring_LoadTexture2), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E657A0, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(7, 6, 15, 0, 7, 15, 14, 0), + gsSPVertex(&D_0A000000_E657A0[18], 22, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0), + gsSP2Triangles(5, 6, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/ShatteringBrickBlock.c b/src/entity/model/ShatteringBrickBlock.c new file mode 100644 index 0000000000..1d991c7557 --- /dev/null +++ b/src/entity/model/ShatteringBrickBlock.c @@ -0,0 +1,1287 @@ +#include "common.h" + +#include "entity/model/ShatteringBrickBlock.vtx.inc.c" + +#include "entity/model/ShatteringBrickBlock_texture.png.inc.c" +Gfx D_0A0022A0_E40500[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001AA0_E3FD00, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_ShatteringBrickBlock_FragmentsMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080014, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555D556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000014, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000D556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80014, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABD556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080014, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555D556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000014, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000D556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80014, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABD556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080014, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555D556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000014, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000D556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80014, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABD556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0008000C, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55558000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0000000C, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF8000C, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB8000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0008000C, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55558000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF8000C, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB8000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0008000C, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55558000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0000000C, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF8000C, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB8000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080004, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55552AAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000004, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00002AAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80004, 0x00080001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB2AAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080004, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55552AAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000004, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00002AAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80004, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB2AAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00080004, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55552AAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000004, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00002AAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF80004, 0xFFF80001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB2AAB, 0xAAAB0000 } + } + }, +}; + +Gfx D_0A002998_E40BF8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[310], 1, 0), + gsSPVertex(&D_0A000000_E3E260[313], 1, 1), + gsSPVertex(&D_0A000000_E3E260[335], 2, 2), + gsSPVertex(&D_0A000000_E3E260[339], 2, 4), + gsSPVertex(&D_0A000000_E3E260[400], 2, 6), + gsSPVertex(&D_0A000000_E3E260[418], 8, 8), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 1, 0), + gsSP2Triangles(8, 2, 3, 0, 8, 3, 9, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A20_E40C80[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[410], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A68_E40CC8[] = { + gsSPDisplayList(D_0A002A20_E40C80), + gsSPDisplayList(D_0A002998_E40BF8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A80_E40CE0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[302], 1, 0), + gsSPVertex(&D_0A000000_E3E260[305], 1, 1), + gsSPVertex(&D_0A000000_E3E260[310], 1, 2), + gsSPVertex(&D_0A000000_E3E260[313], 1, 3), + gsSPVertex(&D_0A000000_E3E260[315], 2, 4), + gsSPVertex(&D_0A000000_E3E260[319], 2, 6), + gsSPVertex(&D_0A000000_E3E260[398], 12, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(12, 4, 5, 0, 12, 5, 13, 0), + gsSP2Triangles(14, 6, 7, 0, 14, 7, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B18_E40D78[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[394], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B58_E40DB8[] = { + gsSPDisplayList(D_0A002B18_E40D78), + gsSPDisplayList(D_0A002A80_E40CE0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B70_E40DD0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[168], 1, 0), + gsSPVertex(&D_0A000000_E3E260[171], 1, 1), + gsSPVertex(&D_0A000000_E3E260[246], 2, 2), + gsSPVertex(&D_0A000000_E3E260[286], 1, 4), + gsSPVertex(&D_0A000000_E3E260[289], 1, 5), + gsSPVertex(&D_0A000000_E3E260[295], 2, 6), + gsSPVertex(&D_0A000000_E3E260[386], 8, 8), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 8, 9, 0, 4, 9, 5, 0), + gsSP2Triangles(10, 6, 7, 0, 10, 7, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C00_E40E60[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[378], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C48_E40EA8[] = { + gsSPDisplayList(D_0A002C00_E40E60), + gsSPDisplayList(D_0A002B70_E40DD0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C60_E40EC0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[311], 2, 0), + gsSPVertex(&D_0A000000_E3E260[330], 5, 2), + gsSPVertex(&D_0A000000_E3E260[337], 2, 7), + gsSPVertex(&D_0A000000_E3E260[341], 1, 9), + gsSPVertex(&D_0A000000_E3E260[356], 2, 10), + gsSPVertex(&D_0A000000_E3E260[370], 8, 12), + gsSP2Triangles(10, 0, 1, 0, 10, 1, 11, 0), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(6, 12, 13, 0, 6, 13, 7, 0), + gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CF0_E40F50[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[366], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D30_E40F90[] = { + gsSPDisplayList(D_0A002CF0_E40F50), + gsSPDisplayList(D_0A002C60_E40EC0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D48_E40FA8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[303], 2, 0), + gsSPVertex(&D_0A000000_E3E260[306], 4, 2), + gsSPVertex(&D_0A000000_E3E260[311], 2, 6), + gsSPVertex(&D_0A000000_E3E260[314], 1, 8), + gsSPVertex(&D_0A000000_E3E260[317], 2, 9), + gsSPVertex(&D_0A000000_E3E260[321], 1, 11), + gsSPVertex(&D_0A000000_E3E260[354], 12, 12), + gsSP2Triangles(12, 0, 1, 0, 12, 1, 13, 0), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(14, 6, 7, 0, 14, 7, 15, 0), + gsSP2Triangles(8, 16, 17, 0, 8, 17, 9, 0), + gsSP2Triangles(10, 18, 19, 0, 10, 19, 11, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DE8_E41048[] = { + gsSPDisplayList(D_0A002D48_E40FA8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DF8_E41058[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[169], 2, 0), + gsSPVertex(&D_0A000000_E3E260[214], 2, 2), + gsSPVertex(&D_0A000000_E3E260[287], 2, 4), + gsSPVertex(&D_0A000000_E3E260[290], 5, 6), + gsSPVertex(&D_0A000000_E3E260[297], 1, 11), + gsSPVertex(&D_0A000000_E3E260[346], 8, 12), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(12, 4, 5, 0, 12, 5, 13, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 14, 15, 0, 10, 15, 11, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E88_E410E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[342], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EC8_E41128[] = { + gsSPDisplayList(D_0A002E88_E410E8), + gsSPDisplayList(D_0A002DF8_E41058), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EE0_E41140[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[310], 4, 0), + gsSPVertex(&D_0A000000_E3E260[330], 12, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F48_E411A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[322], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F90_E411F0[] = { + gsSPDisplayList(D_0A002F48_E411A8), + gsSPDisplayList(D_0A002EE0_E41140), + gsSPEndDisplayList(), +}; + +Gfx D_0A002FA8_E41208[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[302], 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003010_E41270[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[298], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003050_E412B0[] = { + gsSPDisplayList(D_0A003010_E41270), + gsSPDisplayList(D_0A002FA8_E41208), + gsSPEndDisplayList(), +}; + +Gfx D_0A003068_E412C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[168], 4, 0), + gsSPVertex(&D_0A000000_E3E260[286], 12, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0030D0_E41330[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[278], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003118_E41378[] = { + gsSPDisplayList(D_0A0030D0_E41330), + gsSPDisplayList(D_0A003068_E412C8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003130_E41390[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[188], 1, 0), + gsSPVertex(&D_0A000000_E3E260[191], 1, 1), + gsSPVertex(&D_0A000000_E3E260[193], 2, 2), + gsSPVertex(&D_0A000000_E3E260[197], 2, 4), + gsSPVertex(&D_0A000000_E3E260[260], 10, 6), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 1, 0), + gsSP2Triangles(8, 2, 3, 0, 8, 3, 9, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0031B0_E41410[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[270], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0031F8_E41458[] = { + gsSPDisplayList(D_0A0031B0_E41410), + gsSPDisplayList(D_0A003130_E41390), + gsSPEndDisplayList(), +}; + +Gfx D_0A003210_E41470[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[180], 1, 0), + gsSPVertex(&D_0A000000_E3E260[183], 1, 1), + gsSPVertex(&D_0A000000_E3E260[188], 1, 2), + gsSPVertex(&D_0A000000_E3E260[191], 1, 3), + gsSPVertex(&D_0A000000_E3E260[193], 2, 4), + gsSPVertex(&D_0A000000_E3E260[197], 2, 6), + gsSPVertex(&D_0A000000_E3E260[258], 12, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(12, 4, 5, 0, 12, 5, 13, 0), + gsSP2Triangles(14, 6, 7, 0, 14, 7, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0032A8_E41508[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[254], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0032E8_E41548[] = { + gsSPDisplayList(D_0A0032A8_E41508), + gsSPDisplayList(D_0A003210_E41470), + gsSPEndDisplayList(), +}; + +Gfx D_0A003300_E41560[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[160], 1, 0), + gsSPVertex(&D_0A000000_E3E260[163], 1, 1), + gsSPVertex(&D_0A000000_E3E260[168], 1, 2), + gsSPVertex(&D_0A000000_E3E260[171], 1, 3), + gsSPVertex(&D_0A000000_E3E260[173], 2, 4), + gsSPVertex(&D_0A000000_E3E260[244], 10, 6), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 1, 0), + gsSP2Triangles(2, 8, 9, 0, 2, 9, 3, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003388_E415E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[236], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0033D0_E41630[] = { + gsSPDisplayList(D_0A003388_E415E8), + gsSPDisplayList(D_0A003300_E41560), + gsSPEndDisplayList(), +}; + +Gfx D_0A0033E8_E41648[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[184], 4, 0), + gsSPVertex(&D_0A000000_E3E260[189], 2, 4), + gsSPVertex(&D_0A000000_E3E260[192], 1, 6), + gsSPVertex(&D_0A000000_E3E260[195], 2, 7), + gsSPVertex(&D_0A000000_E3E260[199], 1, 9), + gsSPVertex(&D_0A000000_E3E260[226], 10, 10), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(6, 12, 13, 0, 6, 13, 7, 0), + gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003478_E416D8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[222], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0034B8_E41718[] = { + gsSPDisplayList(D_0A003478_E416D8), + gsSPDisplayList(D_0A0033E8_E41648), + gsSPEndDisplayList(), +}; + +Gfx D_0A0034D0_E41730[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[161], 2, 0), + gsSPVertex(&D_0A000000_E3E260[164], 4, 2), + gsSPVertex(&D_0A000000_E3E260[169], 2, 6), + gsSPVertex(&D_0A000000_E3E260[172], 1, 8), + gsSPVertex(&D_0A000000_E3E260[175], 1, 9), + gsSPVertex(&D_0A000000_E3E260[212], 10, 10), + gsSP2Triangles(10, 0, 1, 0, 10, 1, 11, 0), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(12, 6, 7, 0, 12, 7, 13, 0), + gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003560_E417C0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[208], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0035A0_E41800[] = { + gsSPDisplayList(D_0A003560_E417C0), + gsSPDisplayList(D_0A0034D0_E41730), + gsSPEndDisplayList(), +}; + +Gfx D_0A0035B8_E41818[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[184], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003618_E41878[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[200], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003660_E418C0[] = { + gsSPDisplayList(D_0A003618_E41878), + gsSPDisplayList(D_0A0035B8_E41818), + gsSPEndDisplayList(), +}; + +Gfx D_0A003678_E418D8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[180], 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0036E0_E41940[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[176], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003720_E41980[] = { + gsSPDisplayList(D_0A0036E0_E41940), + gsSPDisplayList(D_0A003678_E418D8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003738_E41998[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[160], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003798_E419F8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[152], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0037E0_E41A40[] = { + gsSPDisplayList(D_0A003798_E419F8), + gsSPDisplayList(D_0A003738_E41998), + gsSPEndDisplayList(), +}; + +Gfx D_0A0037F8_E41A58[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[60], 1, 0), + gsSPVertex(&D_0A000000_E3E260[63], 1, 1), + gsSPVertex(&D_0A000000_E3E260[65], 2, 2), + gsSPVertex(&D_0A000000_E3E260[69], 2, 4), + gsSPVertex(&D_0A000000_E3E260[134], 10, 6), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 1, 0), + gsSP2Triangles(8, 2, 3, 0, 8, 3, 9, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003878_E41AD8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[144], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0038C0_E41B20[] = { + gsSPDisplayList(D_0A003878_E41AD8), + gsSPDisplayList(D_0A0037F8_E41A58), + gsSPEndDisplayList(), +}; + +Gfx D_0A0038D8_E41B38[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[52], 1, 0), + gsSPVertex(&D_0A000000_E3E260[55], 1, 1), + gsSPVertex(&D_0A000000_E3E260[60], 1, 2), + gsSPVertex(&D_0A000000_E3E260[63], 1, 3), + gsSPVertex(&D_0A000000_E3E260[65], 2, 4), + gsSPVertex(&D_0A000000_E3E260[69], 2, 6), + gsSPVertex(&D_0A000000_E3E260[132], 12, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(12, 4, 5, 0, 12, 5, 13, 0), + gsSP2Triangles(14, 6, 7, 0, 14, 7, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003970_E41BD0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[128], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0039B0_E41C10[] = { + gsSPDisplayList(D_0A003970_E41BD0), + gsSPDisplayList(D_0A0038D8_E41B38), + gsSPEndDisplayList(), +}; + +Gfx D_0A0039C8_E41C28[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[32], 1, 0), + gsSPVertex(&D_0A000000_E3E260[35], 1, 1), + gsSPVertex(&D_0A000000_E3E260[40], 1, 2), + gsSPVertex(&D_0A000000_E3E260[43], 1, 3), + gsSPVertex(&D_0A000000_E3E260[45], 2, 4), + gsSPVertex(&D_0A000000_E3E260[118], 10, 6), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 1, 0), + gsSP2Triangles(2, 8, 9, 0, 2, 9, 3, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A50_E41CB0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[110], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A98_E41CF8[] = { + gsSPDisplayList(D_0A003A50_E41CB0), + gsSPDisplayList(D_0A0039C8_E41C28), + gsSPEndDisplayList(), +}; + +Gfx D_0A003AB0_E41D10[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[56], 4, 0), + gsSPVertex(&D_0A000000_E3E260[61], 2, 4), + gsSPVertex(&D_0A000000_E3E260[64], 1, 6), + gsSPVertex(&D_0A000000_E3E260[67], 2, 7), + gsSPVertex(&D_0A000000_E3E260[71], 1, 9), + gsSPVertex(&D_0A000000_E3E260[96], 10, 10), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(10, 4, 5, 0, 10, 5, 11, 0), + gsSP2Triangles(6, 12, 13, 0, 6, 13, 7, 0), + gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B40_E41DA0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[106], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B80_E41DE0[] = { + gsSPDisplayList(D_0A003B40_E41DA0), + gsSPDisplayList(D_0A003AB0_E41D10), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B98_E41DF8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[53], 2, 0), + gsSPVertex(&D_0A000000_E3E260[56], 4, 2), + gsSPVertex(&D_0A000000_E3E260[61], 2, 6), + gsSPVertex(&D_0A000000_E3E260[64], 1, 8), + gsSPVertex(&D_0A000000_E3E260[67], 2, 9), + gsSPVertex(&D_0A000000_E3E260[71], 1, 11), + gsSPVertex(&D_0A000000_E3E260[94], 12, 12), + gsSP2Triangles(12, 0, 1, 0, 12, 1, 13, 0), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(14, 6, 7, 0, 14, 7, 15, 0), + gsSP2Triangles(8, 16, 17, 0, 8, 17, 9, 0), + gsSP2Triangles(10, 18, 19, 0, 10, 19, 11, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C38_E41E98[] = { + gsSPDisplayList(D_0A003B98_E41DF8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C48_E41EA8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[33], 2, 0), + gsSPVertex(&D_0A000000_E3E260[36], 4, 2), + gsSPVertex(&D_0A000000_E3E260[41], 2, 6), + gsSPVertex(&D_0A000000_E3E260[44], 1, 8), + gsSPVertex(&D_0A000000_E3E260[47], 1, 9), + gsSPVertex(&D_0A000000_E3E260[84], 10, 10), + gsSP2Triangles(10, 0, 1, 0, 10, 1, 11, 0), + gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(12, 6, 7, 0, 12, 7, 13, 0), + gsSP2Triangles(8, 14, 15, 0, 8, 15, 9, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003CD8_E41F38[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[80], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D18_E41F78[] = { + gsSPDisplayList(D_0A003CD8_E41F38), + gsSPDisplayList(D_0A003C48_E41EA8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D30_E41F90[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[56], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D90_E41FF0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[72], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003DD8_E42038[] = { + gsSPDisplayList(D_0A003D90_E41FF0), + gsSPDisplayList(D_0A003D30_E41F90), + gsSPEndDisplayList(), +}; + +Gfx D_0A003DF0_E42050[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[52], 20, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E58_E420B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[48], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E98_E420F8[] = { + gsSPDisplayList(D_0A003E58_E420B8), + gsSPDisplayList(D_0A003DF0_E42050), + gsSPEndDisplayList(), +}; + +Gfx D_0A003EB0_E42110[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[32], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F10_E42170[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A0022A0_E40500), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E3E260[24], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F58_E421B8[] = { + gsSPDisplayList(D_0A003F10_E42170), + gsSPDisplayList(D_0A003EB0_E42110), + gsSPEndDisplayList(), +}; + +Gfx* Entity_ShatteringBrickBlock_FragmentsRender[] = { + D_0A003F58_E421B8, + D_0A003E98_E420F8, + D_0A003DD8_E42038, + D_0A003D18_E41F78, + D_0A003C38_E41E98, + D_0A003B80_E41DE0, + D_0A003A98_E41CF8, + D_0A0039B0_E41C10, + D_0A0038C0_E41B20, + D_0A0037E0_E41A40, + D_0A003720_E41980, + D_0A003660_E418C0, + D_0A0035A0_E41800, + D_0A0034B8_E41718, + D_0A0033D0_E41630, + D_0A0032E8_E41548, + D_0A0031F8_E41458, + D_0A003118_E41378, + D_0A003050_E412B0, + D_0A002F90_E411F0, + D_0A002EC8_E41128, + D_0A002DE8_E41048, + D_0A002D30_E40F90, + D_0A002C48_E40EA8, + D_0A002B58_E40DB8, + D_0A002A68_E40CC8, +}; diff --git a/src/entity/model/ShatteringHammer1Block.c b/src/entity/model/ShatteringHammer1Block.c new file mode 100644 index 0000000000..3595ac999e --- /dev/null +++ b/src/entity/model/ShatteringHammer1Block.c @@ -0,0 +1,1311 @@ +#include "common.h" + +#include "entity/model/ShatteringHammer1Block.vtx.inc.c" + +#include "entity/model/ShatteringHammer1Block_texture.png.inc.c" +#include "entity/model/ShatteringHammer1Block_texture.pal.inc.c" +Gfx D_0A001460_E33880[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001260_E33680), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001060_E33480, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_ShatteringHammer1Block_FragmentsMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x55550000 } + } + }, +}; + +Gfx D_0A001B88_E33FA8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[137], 2, 0), + gsSPVertex(&D_0A000000_E32420[145], 2, 2), + gsSPVertex(&D_0A000000_E32420[160], 4, 4), + gsSPVertex(&D_0A000000_E32420[180], 2, 8), + gsSPVertex(&D_0A000000_E32420[186], 2, 10), + gsSP2Triangles(8, 0, 1, 0, 8, 1, 9, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C00_E34020[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[216], 1, 0), + gsSPVertex(&D_0A000000_E32420[219], 1, 1), + gsSPVertex(&D_0A000000_E32420[252], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C60_E34080[] = { + gsSPDisplayList(D_0A001C00_E34020), + gsSPDisplayList(D_0A001B88_E33FA8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C78_E34098[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 1, 0), + gsSPVertex(&D_0A000000_E32420[127], 1, 1), + gsSPVertex(&D_0A000000_E32420[137], 2, 2), + gsSPVertex(&D_0A000000_E32420[145], 2, 4), + gsSPVertex(&D_0A000000_E32420[160], 4, 6), + gsSPVertex(&D_0A000000_E32420[176], 2, 10), + gsSPVertex(&D_0A000000_E32420[180], 2, 12), + gsSPVertex(&D_0A000000_E32420[186], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D10_E34130[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[208], 1, 0), + gsSPVertex(&D_0A000000_E32420[211], 1, 1), + gsSPVertex(&D_0A000000_E32420[246], 6, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D68_E34188[] = { + gsSPDisplayList(D_0A001D10_E34130), + gsSPDisplayList(D_0A001C78_E34098), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D80_E341A0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 1, 0), + gsSPVertex(&D_0A000000_E32420[127], 1, 1), + gsSPVertex(&D_0A000000_E32420[137], 2, 2), + gsSPVertex(&D_0A000000_E32420[160], 4, 4), + gsSPVertex(&D_0A000000_E32420[176], 2, 8), + gsSPVertex(&D_0A000000_E32420[180], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E00_E34220[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[196], 1, 0), + gsSPVertex(&D_0A000000_E32420[199], 1, 1), + gsSPVertex(&D_0A000000_E32420[236], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E60_E34280[] = { + gsSPDisplayList(D_0A001E00_E34220), + gsSPDisplayList(D_0A001D80_E341A0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E78_E34298[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[128], 4, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 4), + gsSPVertex(&D_0A000000_E32420[144], 4, 8), + gsSPVertex(&D_0A000000_E32420[160], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001EF0_E34310[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[216], 4, 0), + gsSPVertex(&D_0A000000_E32420[232], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F40_E34360[] = { + gsSPDisplayList(D_0A001EF0_E34310), + gsSPDisplayList(D_0A001E78_E34298), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F58_E34378[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 8, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 8), + gsSPVertex(&D_0A000000_E32420[144], 4, 12), + gsSPVertex(&D_0A000000_E32420[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001FD8_E343F8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[208], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002018_E34438[] = { + gsSPDisplayList(D_0A001FD8_E343F8), + gsSPDisplayList(D_0A001F58_E34378), + gsSPEndDisplayList(), +}; + +Gfx D_0A002030_E34450[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 8, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 8), + gsSPVertex(&D_0A000000_E32420[160], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020A0_E344C0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[196], 4, 0), + gsSPVertex(&D_0A000000_E32420[228], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020F0_E34510[] = { + gsSPDisplayList(D_0A0020A0_E344C0), + gsSPDisplayList(D_0A002030_E34450), + gsSPEndDisplayList(), +}; + +Gfx D_0A002108_E34528[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[128], 4, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 4), + gsSPVertex(&D_0A000000_E32420[144], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002170_E34590[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[216], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0021C0_E345E0[] = { + gsSPDisplayList(D_0A002170_E34590), + gsSPDisplayList(D_0A002108_E34528), + gsSPEndDisplayList(), +}; + +Gfx D_0A0021D8_E345F8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 8, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 8), + gsSPVertex(&D_0A000000_E32420[144], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002248_E34668[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[208], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002290_E346B0[] = { + gsSPDisplayList(D_0A002248_E34668), + gsSPDisplayList(D_0A0021D8_E345F8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0022A8_E346C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 8, 0), + gsSPVertex(&D_0A000000_E32420[136], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002308_E34728[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[196], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002358_E34778[] = { + gsSPDisplayList(D_0A002308_E34728), + gsSPDisplayList(D_0A0022A8_E346C8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002370_E34790[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[132], 1, 0), + gsSPVertex(&D_0A000000_E32420[135], 1, 1), + gsSPVertex(&D_0A000000_E32420[137], 2, 2), + gsSPVertex(&D_0A000000_E32420[145], 2, 4), + gsSPVertex(&D_0A000000_E32420[160], 4, 6), + gsSPVertex(&D_0A000000_E32420[178], 4, 10), + gsSPVertex(&D_0A000000_E32420[186], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002400_E34820[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[188], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002448_E34868[] = { + gsSPDisplayList(D_0A002400_E34820), + gsSPDisplayList(D_0A002370_E34790), + gsSPEndDisplayList(), +}; + +Gfx D_0A002460_E34880[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 1, 0), + gsSPVertex(&D_0A000000_E32420[127], 1, 1), + gsSPVertex(&D_0A000000_E32420[132], 1, 2), + gsSPVertex(&D_0A000000_E32420[135], 1, 3), + gsSPVertex(&D_0A000000_E32420[137], 2, 4), + gsSPVertex(&D_0A000000_E32420[145], 2, 6), + gsSPVertex(&D_0A000000_E32420[160], 4, 8), + gsSPVertex(&D_0A000000_E32420[176], 6, 12), + gsSPVertex(&D_0A000000_E32420[186], 2, 18), + gsSP2Triangles(0, 12, 13, 0, 0, 13, 1, 0), + gsSP2Triangles(2, 14, 15, 0, 2, 15, 3, 0), + gsSP2Triangles(16, 4, 5, 0, 16, 5, 17, 0), + gsSP2Triangles(18, 6, 7, 0, 18, 7, 19, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002508_E34928[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[182], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002548_E34968[] = { + gsSPDisplayList(D_0A002508_E34928), + gsSPDisplayList(D_0A002460_E34880), + gsSPEndDisplayList(), +}; + +Gfx D_0A002560_E34980[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 1, 0), + gsSPVertex(&D_0A000000_E32420[127], 1, 1), + gsSPVertex(&D_0A000000_E32420[132], 1, 2), + gsSPVertex(&D_0A000000_E32420[135], 1, 3), + gsSPVertex(&D_0A000000_E32420[137], 2, 4), + gsSPVertex(&D_0A000000_E32420[160], 4, 6), + gsSPVertex(&D_0A000000_E32420[176], 6, 10), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0025F0_E34A10[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[168], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002638_E34A58[] = { + gsSPDisplayList(D_0A0025F0_E34A10), + gsSPDisplayList(D_0A002560_E34980), + gsSPEndDisplayList(), +}; + +Gfx D_0A002650_E34A70[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[128], 12, 0), + gsSPVertex(&D_0A000000_E32420[144], 4, 12), + gsSPVertex(&D_0A000000_E32420[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0026C8_E34AE8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[164], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002708_E34B28[] = { + gsSPDisplayList(D_0A0026C8_E34AE8), + gsSPDisplayList(D_0A002650_E34A70), + gsSPEndDisplayList(), +}; + +Gfx D_0A002720_E34B40[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 16, 0), + gsSPVertex(&D_0A000000_E32420[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002790_E34BB0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[156], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027D0_E34BF0[] = { + gsSPDisplayList(D_0A002790_E34BB0), + gsSPDisplayList(D_0A002720_E34B40), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027E8_E34C08[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[128], 12, 0), + gsSPVertex(&D_0A000000_E32420[144], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002850_E34C70[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[148], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002898_E34CB8[] = { + gsSPDisplayList(D_0A002850_E34C70), + gsSPDisplayList(D_0A0027E8_E34C08), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028B0_E34CD0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 16, 0), + gsSPVertex(&D_0A000000_E32420[144], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002920_E34D40[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[140], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002960_E34D80[] = { + gsSPDisplayList(D_0A002920_E34D40), + gsSPDisplayList(D_0A0028B0_E34CD0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002978_E34D98[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[124], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029D8_E34DF8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[116], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A20_E34E40[] = { + gsSPDisplayList(D_0A0029D8_E34DF8), + gsSPDisplayList(D_0A002978_E34D98), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A38_E34E58[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 1, 0), + gsSPVertex(&D_0A000000_E32420[39], 1, 1), + gsSPVertex(&D_0A000000_E32420[57], 2, 2), + gsSPVertex(&D_0A000000_E32420[76], 4, 4), + gsSPVertex(&D_0A000000_E32420[94], 2, 8), + gsSPVertex(&D_0A000000_E32420[104], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002AB8_E34ED8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[61], 2, 0), + gsSPVertex(&D_0A000000_E32420[106], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B10_E34F30[] = { + gsSPDisplayList(D_0A002AB8_E34ED8), + gsSPDisplayList(D_0A002A38_E34E58), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B28_E34F48[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 1, 0), + gsSPVertex(&D_0A000000_E32420[39], 1, 1), + gsSPVertex(&D_0A000000_E32420[44], 1, 2), + gsSPVertex(&D_0A000000_E32420[47], 1, 3), + gsSPVertex(&D_0A000000_E32420[57], 2, 4), + gsSPVertex(&D_0A000000_E32420[76], 4, 6), + gsSPVertex(&D_0A000000_E32420[94], 4, 10), + gsSPVertex(&D_0A000000_E32420[104], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002BC0_E34FE0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[49], 2, 0), + gsSPVertex(&D_0A000000_E32420[98], 6, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C10_E35030[] = { + gsSPDisplayList(D_0A002BC0_E34FE0), + gsSPDisplayList(D_0A002B28_E34F48), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C28_E35048[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 1, 0), + gsSPVertex(&D_0A000000_E32420[39], 1, 1), + gsSPVertex(&D_0A000000_E32420[44], 1, 2), + gsSPVertex(&D_0A000000_E32420[47], 1, 3), + gsSPVertex(&D_0A000000_E32420[76], 4, 4), + gsSPVertex(&D_0A000000_E32420[94], 4, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CA8_E350C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[25], 2, 0), + gsSPVertex(&D_0A000000_E32420[84], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D00_E35120[] = { + gsSPDisplayList(D_0A002CA8_E350C8), + gsSPDisplayList(D_0A002C28_E35048), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D18_E35138[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 8, 0), + gsSPVertex(&D_0A000000_E32420[56], 4, 8), + gsSPVertex(&D_0A000000_E32420[76], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D88_E351A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[60], 4, 0), + gsSPVertex(&D_0A000000_E32420[80], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DD8_E351F8[] = { + gsSPDisplayList(D_0A002D88_E351A8), + gsSPDisplayList(D_0A002D18_E35138), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DF0_E35210[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 12, 0), + gsSPVertex(&D_0A000000_E32420[56], 4, 12), + gsSPVertex(&D_0A000000_E32420[76], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E68_E35288[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[48], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EA8_E352C8[] = { + gsSPDisplayList(D_0A002E68_E35288), + gsSPDisplayList(D_0A002DF0_E35210), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EC0_E352E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 12, 0), + gsSPVertex(&D_0A000000_E32420[76], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F28_E35348[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[24], 4, 0), + gsSPVertex(&D_0A000000_E32420[72], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F78_E35398[] = { + gsSPDisplayList(D_0A002F28_E35348), + gsSPDisplayList(D_0A002EC0_E352E0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F90_E353B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 8, 0), + gsSPVertex(&D_0A000000_E32420[56], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002FF0_E35410[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[60], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003040_E35460[] = { + gsSPDisplayList(D_0A002FF0_E35410), + gsSPDisplayList(D_0A002F90_E353B0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003058_E35478[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 12, 0), + gsSPVertex(&D_0A000000_E32420[56], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0030C0_E354E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[48], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003108_E35528[] = { + gsSPDisplayList(D_0A0030C0_E354E0), + gsSPDisplayList(D_0A003058_E35478), + gsSPEndDisplayList(), +}; + +Gfx D_0A003120_E35540[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[36], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003178_E35598[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E33880), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E32420[24], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0031C8_E355E8[] = { + gsSPDisplayList(D_0A003178_E35598), + gsSPDisplayList(D_0A003120_E35540), + gsSPEndDisplayList(), +}; + +Gfx* Entity_ShatteringHammer1Block_FragmentsRender[] = { + D_0A0031C8_E355E8, + D_0A003108_E35528, + D_0A003040_E35460, + D_0A002F78_E35398, + D_0A002EA8_E352C8, + D_0A002DD8_E351F8, + D_0A002D00_E35120, + D_0A002C10_E35030, + D_0A002B10_E34F30, + D_0A002A20_E34E40, + D_0A002960_E34D80, + D_0A002898_E34CB8, + D_0A0027D0_E34BF0, + D_0A002708_E34B28, + D_0A002638_E34A58, + D_0A002548_E34968, + D_0A002448_E34868, + D_0A002358_E34778, + D_0A002290_E346B0, + D_0A0021C0_E345E0, + D_0A0020F0_E34510, + D_0A002018_E34438, + D_0A001F40_E34360, + D_0A001E60_E34280, + D_0A001D68_E34188, + D_0A001C60_E34080, +}; diff --git a/src/entity/model/ShatteringHammer2Block.c b/src/entity/model/ShatteringHammer2Block.c new file mode 100644 index 0000000000..5e78bac273 --- /dev/null +++ b/src/entity/model/ShatteringHammer2Block.c @@ -0,0 +1,1311 @@ +#include "common.h" + +#include "entity/model/ShatteringHammer2Block.vtx.inc.c" + +#include "entity/model/ShatteringHammer2Block_texture.png.inc.c" +Gfx D_0A001460_E36AD0[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A001060_E366D0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_ShatteringHammer2Block_FragmentsMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x55550000 } + } + }, +}; + +Gfx D_0A001B58_E371C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[137], 2, 0), + gsSPVertex(&D_0A000000_E35670[145], 2, 2), + gsSPVertex(&D_0A000000_E35670[160], 4, 4), + gsSPVertex(&D_0A000000_E35670[180], 2, 8), + gsSPVertex(&D_0A000000_E35670[186], 2, 10), + gsSP2Triangles(8, 0, 1, 0, 8, 1, 9, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001BD0_E37240[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[216], 1, 0), + gsSPVertex(&D_0A000000_E35670[219], 1, 1), + gsSPVertex(&D_0A000000_E35670[252], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C30_E372A0[] = { + gsSPDisplayList(D_0A001BD0_E37240), + gsSPDisplayList(D_0A001B58_E371C8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C48_E372B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 1, 0), + gsSPVertex(&D_0A000000_E35670[127], 1, 1), + gsSPVertex(&D_0A000000_E35670[137], 2, 2), + gsSPVertex(&D_0A000000_E35670[145], 2, 4), + gsSPVertex(&D_0A000000_E35670[160], 4, 6), + gsSPVertex(&D_0A000000_E35670[176], 2, 10), + gsSPVertex(&D_0A000000_E35670[180], 2, 12), + gsSPVertex(&D_0A000000_E35670[186], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001CE0_E37350[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[208], 1, 0), + gsSPVertex(&D_0A000000_E35670[211], 1, 1), + gsSPVertex(&D_0A000000_E35670[246], 6, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D38_E373A8[] = { + gsSPDisplayList(D_0A001CE0_E37350), + gsSPDisplayList(D_0A001C48_E372B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D50_E373C0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 1, 0), + gsSPVertex(&D_0A000000_E35670[127], 1, 1), + gsSPVertex(&D_0A000000_E35670[137], 2, 2), + gsSPVertex(&D_0A000000_E35670[160], 4, 4), + gsSPVertex(&D_0A000000_E35670[176], 2, 8), + gsSPVertex(&D_0A000000_E35670[180], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001DD0_E37440[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[196], 1, 0), + gsSPVertex(&D_0A000000_E35670[199], 1, 1), + gsSPVertex(&D_0A000000_E35670[236], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E30_E374A0[] = { + gsSPDisplayList(D_0A001DD0_E37440), + gsSPDisplayList(D_0A001D50_E373C0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E48_E374B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[128], 4, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 4), + gsSPVertex(&D_0A000000_E35670[144], 4, 8), + gsSPVertex(&D_0A000000_E35670[160], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001EC0_E37530[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[216], 4, 0), + gsSPVertex(&D_0A000000_E35670[232], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F10_E37580[] = { + gsSPDisplayList(D_0A001EC0_E37530), + gsSPDisplayList(D_0A001E48_E374B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F28_E37598[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 8, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 8), + gsSPVertex(&D_0A000000_E35670[144], 4, 12), + gsSPVertex(&D_0A000000_E35670[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001FA8_E37618[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[208], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001FE8_E37658[] = { + gsSPDisplayList(D_0A001FA8_E37618), + gsSPDisplayList(D_0A001F28_E37598), + gsSPEndDisplayList(), +}; + +Gfx D_0A002000_E37670[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 8, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 8), + gsSPVertex(&D_0A000000_E35670[160], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002070_E376E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[196], 4, 0), + gsSPVertex(&D_0A000000_E35670[228], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020C0_E37730[] = { + gsSPDisplayList(D_0A002070_E376E0), + gsSPDisplayList(D_0A002000_E37670), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020D8_E37748[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[128], 4, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 4), + gsSPVertex(&D_0A000000_E35670[144], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002140_E377B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[216], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002190_E37800[] = { + gsSPDisplayList(D_0A002140_E377B0), + gsSPDisplayList(D_0A0020D8_E37748), + gsSPEndDisplayList(), +}; + +Gfx D_0A0021A8_E37818[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 8, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 8), + gsSPVertex(&D_0A000000_E35670[144], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002218_E37888[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[208], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002260_E378D0[] = { + gsSPDisplayList(D_0A002218_E37888), + gsSPDisplayList(D_0A0021A8_E37818), + gsSPEndDisplayList(), +}; + +Gfx D_0A002278_E378E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 8, 0), + gsSPVertex(&D_0A000000_E35670[136], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0022D8_E37948[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[196], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002328_E37998[] = { + gsSPDisplayList(D_0A0022D8_E37948), + gsSPDisplayList(D_0A002278_E378E8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002340_E379B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[132], 1, 0), + gsSPVertex(&D_0A000000_E35670[135], 1, 1), + gsSPVertex(&D_0A000000_E35670[137], 2, 2), + gsSPVertex(&D_0A000000_E35670[145], 2, 4), + gsSPVertex(&D_0A000000_E35670[160], 4, 6), + gsSPVertex(&D_0A000000_E35670[178], 4, 10), + gsSPVertex(&D_0A000000_E35670[186], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0023D0_E37A40[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[188], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002418_E37A88[] = { + gsSPDisplayList(D_0A0023D0_E37A40), + gsSPDisplayList(D_0A002340_E379B0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002430_E37AA0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 1, 0), + gsSPVertex(&D_0A000000_E35670[127], 1, 1), + gsSPVertex(&D_0A000000_E35670[132], 1, 2), + gsSPVertex(&D_0A000000_E35670[135], 1, 3), + gsSPVertex(&D_0A000000_E35670[137], 2, 4), + gsSPVertex(&D_0A000000_E35670[145], 2, 6), + gsSPVertex(&D_0A000000_E35670[160], 4, 8), + gsSPVertex(&D_0A000000_E35670[176], 6, 12), + gsSPVertex(&D_0A000000_E35670[186], 2, 18), + gsSP2Triangles(0, 12, 13, 0, 0, 13, 1, 0), + gsSP2Triangles(2, 14, 15, 0, 2, 15, 3, 0), + gsSP2Triangles(16, 4, 5, 0, 16, 5, 17, 0), + gsSP2Triangles(18, 6, 7, 0, 18, 7, 19, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0024D8_E37B48[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[182], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002518_E37B88[] = { + gsSPDisplayList(D_0A0024D8_E37B48), + gsSPDisplayList(D_0A002430_E37AA0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002530_E37BA0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 1, 0), + gsSPVertex(&D_0A000000_E35670[127], 1, 1), + gsSPVertex(&D_0A000000_E35670[132], 1, 2), + gsSPVertex(&D_0A000000_E35670[135], 1, 3), + gsSPVertex(&D_0A000000_E35670[137], 2, 4), + gsSPVertex(&D_0A000000_E35670[160], 4, 6), + gsSPVertex(&D_0A000000_E35670[176], 6, 10), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0025C0_E37C30[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[168], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002608_E37C78[] = { + gsSPDisplayList(D_0A0025C0_E37C30), + gsSPDisplayList(D_0A002530_E37BA0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002620_E37C90[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[128], 12, 0), + gsSPVertex(&D_0A000000_E35670[144], 4, 12), + gsSPVertex(&D_0A000000_E35670[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002698_E37D08[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[164], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0026D8_E37D48[] = { + gsSPDisplayList(D_0A002698_E37D08), + gsSPDisplayList(D_0A002620_E37C90), + gsSPEndDisplayList(), +}; + +Gfx D_0A0026F0_E37D60[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 16, 0), + gsSPVertex(&D_0A000000_E35670[160], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002760_E37DD0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[156], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027A0_E37E10[] = { + gsSPDisplayList(D_0A002760_E37DD0), + gsSPDisplayList(D_0A0026F0_E37D60), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027B8_E37E28[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[128], 12, 0), + gsSPVertex(&D_0A000000_E35670[144], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002820_E37E90[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[148], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002868_E37ED8[] = { + gsSPDisplayList(D_0A002820_E37E90), + gsSPDisplayList(D_0A0027B8_E37E28), + gsSPEndDisplayList(), +}; + +Gfx D_0A002880_E37EF0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 16, 0), + gsSPVertex(&D_0A000000_E35670[144], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028F0_E37F60[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[140], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002930_E37FA0[] = { + gsSPDisplayList(D_0A0028F0_E37F60), + gsSPDisplayList(D_0A002880_E37EF0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002948_E37FB8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[124], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029A8_E38018[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[116], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029F0_E38060[] = { + gsSPDisplayList(D_0A0029A8_E38018), + gsSPDisplayList(D_0A002948_E37FB8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A08_E38078[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 1, 0), + gsSPVertex(&D_0A000000_E35670[39], 1, 1), + gsSPVertex(&D_0A000000_E35670[57], 2, 2), + gsSPVertex(&D_0A000000_E35670[76], 4, 4), + gsSPVertex(&D_0A000000_E35670[94], 2, 8), + gsSPVertex(&D_0A000000_E35670[104], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A88_E380F8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[61], 2, 0), + gsSPVertex(&D_0A000000_E35670[106], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002AE0_E38150[] = { + gsSPDisplayList(D_0A002A88_E380F8), + gsSPDisplayList(D_0A002A08_E38078), + gsSPEndDisplayList(), +}; + +Gfx D_0A002AF8_E38168[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 1, 0), + gsSPVertex(&D_0A000000_E35670[39], 1, 1), + gsSPVertex(&D_0A000000_E35670[44], 1, 2), + gsSPVertex(&D_0A000000_E35670[47], 1, 3), + gsSPVertex(&D_0A000000_E35670[57], 2, 4), + gsSPVertex(&D_0A000000_E35670[76], 4, 6), + gsSPVertex(&D_0A000000_E35670[94], 4, 10), + gsSPVertex(&D_0A000000_E35670[104], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B90_E38200[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[49], 2, 0), + gsSPVertex(&D_0A000000_E35670[98], 6, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002BE0_E38250[] = { + gsSPDisplayList(D_0A002B90_E38200), + gsSPDisplayList(D_0A002AF8_E38168), + gsSPEndDisplayList(), +}; + +Gfx D_0A002BF8_E38268[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 1, 0), + gsSPVertex(&D_0A000000_E35670[39], 1, 1), + gsSPVertex(&D_0A000000_E35670[44], 1, 2), + gsSPVertex(&D_0A000000_E35670[47], 1, 3), + gsSPVertex(&D_0A000000_E35670[76], 4, 4), + gsSPVertex(&D_0A000000_E35670[94], 4, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C78_E382E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[25], 2, 0), + gsSPVertex(&D_0A000000_E35670[84], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CD0_E38340[] = { + gsSPDisplayList(D_0A002C78_E382E8), + gsSPDisplayList(D_0A002BF8_E38268), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CE8_E38358[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 8, 0), + gsSPVertex(&D_0A000000_E35670[56], 4, 8), + gsSPVertex(&D_0A000000_E35670[76], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D58_E383C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[60], 4, 0), + gsSPVertex(&D_0A000000_E35670[80], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DA8_E38418[] = { + gsSPDisplayList(D_0A002D58_E383C8), + gsSPDisplayList(D_0A002CE8_E38358), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DC0_E38430[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 12, 0), + gsSPVertex(&D_0A000000_E35670[56], 4, 12), + gsSPVertex(&D_0A000000_E35670[76], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E38_E384A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[48], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E78_E384E8[] = { + gsSPDisplayList(D_0A002E38_E384A8), + gsSPDisplayList(D_0A002DC0_E38430), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E90_E38500[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 12, 0), + gsSPVertex(&D_0A000000_E35670[76], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EF8_E38568[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[24], 4, 0), + gsSPVertex(&D_0A000000_E35670[72], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F48_E385B8[] = { + gsSPDisplayList(D_0A002EF8_E38568), + gsSPDisplayList(D_0A002E90_E38500), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F60_E385D0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 8, 0), + gsSPVertex(&D_0A000000_E35670[56], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002FC0_E38630[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[60], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003010_E38680[] = { + gsSPDisplayList(D_0A002FC0_E38630), + gsSPDisplayList(D_0A002F60_E385D0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003028_E38698[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 12, 0), + gsSPVertex(&D_0A000000_E35670[56], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003090_E38700[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[48], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0030D8_E38748[] = { + gsSPDisplayList(D_0A003090_E38700), + gsSPDisplayList(D_0A003028_E38698), + gsSPEndDisplayList(), +}; + +Gfx D_0A0030F0_E38760[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[36], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003148_E387B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001460_E36AD0), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E35670[24], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003198_E38808[] = { + gsSPDisplayList(D_0A003148_E387B8), + gsSPDisplayList(D_0A0030F0_E38760), + gsSPEndDisplayList(), +}; + +Gfx* Entity_ShatteringHammer2Block_FragmentsRender[] = { + D_0A003198_E38808, + D_0A0030D8_E38748, + D_0A003010_E38680, + D_0A002F48_E385B8, + D_0A002E78_E384E8, + D_0A002DA8_E38418, + D_0A002CD0_E38340, + D_0A002BE0_E38250, + D_0A002AE0_E38150, + D_0A0029F0_E38060, + D_0A002930_E37FA0, + D_0A002868_E37ED8, + D_0A0027A0_E37E10, + D_0A0026D8_E37D48, + D_0A002608_E37C78, + D_0A002518_E37B88, + D_0A002418_E37A88, + D_0A002328_E37998, + D_0A002260_E378D0, + D_0A002190_E37800, + D_0A0020C0_E37730, + D_0A001FE8_E37658, + D_0A001F10_E37580, + D_0A001E30_E374A0, + D_0A001D38_E373A8, + D_0A001C30_E372A0, +}; + + diff --git a/src/entity/model/ShatteringHammer3Block.c b/src/entity/model/ShatteringHammer3Block.c new file mode 100644 index 0000000000..284586c8d6 --- /dev/null +++ b/src/entity/model/ShatteringHammer3Block.c @@ -0,0 +1,1328 @@ +#include "common.h" + +#include "entity/model/ShatteringHammer3Block.vtx.inc.c" + +#include "entity/model/ShatteringHammer3Block_texture.png.inc.c" +#include "entity/model/ShatteringHammer3Block_texture.pal.inc.c" +Gfx D_0A001170_E39A00[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A001150_E399E0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A001050_E398E0, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_ShatteringHammer3Block_FragmentsMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAABAAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00029, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x5555AAAB, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB0000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00019, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55550000, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00100001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0xAAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00100008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xAAAB5556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00005556, 0x55550000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF00008, 0xFFF00001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x55555556, 0x55550000 } + } + }, +}; + +Gfx D_0A001898_E3A128[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[135], 1, 0), + gsSPVertex(&D_0A000000_E38890[142], 1, 1), + gsSPVertex(&D_0A000000_E38890[144], 2, 2), + gsSPVertex(&D_0A000000_E38890[159], 4, 4), + gsSPVertex(&D_0A000000_E38890[179], 2, 8), + gsSPVertex(&D_0A000000_E38890[185], 2, 10), + gsSP2Triangles(8, 0, 1, 0, 8, 1, 9, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001918_E3A1A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[215], 1, 0), + gsSPVertex(&D_0A000000_E38890[218], 1, 1), + gsSPVertex(&D_0A000000_E38890[251], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001978_E3A208[] = { + gsSPDisplayList(D_0A001918_E3A1A8), + gsSPDisplayList(D_0A001898_E3A128), + gsSPEndDisplayList(), +}; + +Gfx D_0A001990_E3A220[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 1, 0), + gsSPVertex(&D_0A000000_E38890[125], 1, 1), + gsSPVertex(&D_0A000000_E38890[135], 1, 2), + gsSPVertex(&D_0A000000_E38890[142], 1, 3), + gsSPVertex(&D_0A000000_E38890[144], 2, 4), + gsSPVertex(&D_0A000000_E38890[159], 4, 6), + gsSPVertex(&D_0A000000_E38890[175], 2, 10), + gsSPVertex(&D_0A000000_E38890[179], 2, 12), + gsSPVertex(&D_0A000000_E38890[185], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001A30_E3A2C0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[207], 1, 0), + gsSPVertex(&D_0A000000_E38890[210], 1, 1), + gsSPVertex(&D_0A000000_E38890[245], 6, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001A88_E3A318[] = { + gsSPDisplayList(D_0A001A30_E3A2C0), + gsSPDisplayList(D_0A001990_E3A220), + gsSPEndDisplayList(), +}; + +Gfx D_0A001AA0_E3A330[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 1, 0), + gsSPVertex(&D_0A000000_E38890[125], 1, 1), + gsSPVertex(&D_0A000000_E38890[135], 1, 2), + gsSPVertex(&D_0A000000_E38890[142], 1, 3), + gsSPVertex(&D_0A000000_E38890[159], 4, 4), + gsSPVertex(&D_0A000000_E38890[175], 2, 8), + gsSPVertex(&D_0A000000_E38890[179], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001B28_E3A3B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[195], 1, 0), + gsSPVertex(&D_0A000000_E38890[198], 1, 1), + gsSPVertex(&D_0A000000_E38890[235], 10, 2), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001B88_E3A418[] = { + gsSPDisplayList(D_0A001B28_E3A3B8), + gsSPDisplayList(D_0A001AA0_E3A330), + gsSPEndDisplayList(), +}; + +Gfx D_0A001BA0_E3A430[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[126], 4, 0), + gsSPVertex(&D_0A000000_E38890[134], 2, 4), + gsSPVertex(&D_0A000000_E38890[137], 1, 6), + gsSPVertex(&D_0A000000_E38890[142], 5, 7), + gsSPVertex(&D_0A000000_E38890[159], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 7, 0, 4, 7, 6, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C20_E3A4B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[215], 4, 0), + gsSPVertex(&D_0A000000_E38890[231], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C70_E3A500[] = { + gsSPDisplayList(D_0A001C20_E3A4B0), + gsSPDisplayList(D_0A001BA0_E3A430), + gsSPEndDisplayList(), +}; + +Gfx D_0A001C88_E3A518[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 8, 0), + gsSPVertex(&D_0A000000_E38890[134], 2, 8), + gsSPVertex(&D_0A000000_E38890[137], 1, 10), + gsSPVertex(&D_0A000000_E38890[142], 5, 11), + gsSPVertex(&D_0A000000_E38890[159], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 11, 0, 8, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D10_E3A5A0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[207], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D50_E3A5E0[] = { + gsSPDisplayList(D_0A001D10_E3A5A0), + gsSPDisplayList(D_0A001C88_E3A518), + gsSPEndDisplayList(), +}; + +Gfx D_0A001D68_E3A5F8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 8, 0), + gsSPVertex(&D_0A000000_E38890[134], 2, 8), + gsSPVertex(&D_0A000000_E38890[137], 1, 10), + gsSPVertex(&D_0A000000_E38890[142], 1, 11), + gsSPVertex(&D_0A000000_E38890[159], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 11, 0, 8, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001DE8_E3A678[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[195], 4, 0), + gsSPVertex(&D_0A000000_E38890[227], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E38_E3A6C8[] = { + gsSPDisplayList(D_0A001DE8_E3A678), + gsSPDisplayList(D_0A001D68_E3A5F8), + gsSPEndDisplayList(), +}; + +Gfx D_0A001E50_E3A6E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[126], 4, 0), + gsSPVertex(&D_0A000000_E38890[134], 2, 4), + gsSPVertex(&D_0A000000_E38890[137], 1, 6), + gsSPVertex(&D_0A000000_E38890[142], 5, 7), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 7, 0, 4, 7, 6, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001EC0_E3A750[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[215], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F10_E3A7A0[] = { + gsSPDisplayList(D_0A001EC0_E3A750), + gsSPDisplayList(D_0A001E50_E3A6E0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001F28_E3A7B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 8, 0), + gsSPVertex(&D_0A000000_E38890[134], 2, 8), + gsSPVertex(&D_0A000000_E38890[137], 1, 10), + gsSPVertex(&D_0A000000_E38890[142], 5, 11), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 11, 0, 8, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001FA0_E3A830[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[207], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001FE8_E3A878[] = { + gsSPDisplayList(D_0A001FA0_E3A830), + gsSPDisplayList(D_0A001F28_E3A7B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002000_E3A890[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 8, 0), + gsSPVertex(&D_0A000000_E38890[134], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002060_E3A8F0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[195], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020B0_E3A940[] = { + gsSPDisplayList(D_0A002060_E3A8F0), + gsSPDisplayList(D_0A002000_E3A890), + gsSPEndDisplayList(), +}; + +Gfx D_0A0020C8_E3A958[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[130], 1, 0), + gsSPVertex(&D_0A000000_E38890[133], 1, 1), + gsSPVertex(&D_0A000000_E38890[135], 1, 2), + gsSPVertex(&D_0A000000_E38890[142], 1, 3), + gsSPVertex(&D_0A000000_E38890[144], 2, 4), + gsSPVertex(&D_0A000000_E38890[159], 4, 6), + gsSPVertex(&D_0A000000_E38890[177], 4, 10), + gsSPVertex(&D_0A000000_E38890[185], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(12, 2, 3, 0, 12, 3, 13, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002160_E3A9F0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[187], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0021A8_E3AA38[] = { + gsSPDisplayList(D_0A002160_E3A9F0), + gsSPDisplayList(D_0A0020C8_E3A958), + gsSPEndDisplayList(), +}; + +Gfx D_0A0021C0_E3AA50[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 1, 0), + gsSPVertex(&D_0A000000_E38890[125], 1, 1), + gsSPVertex(&D_0A000000_E38890[130], 1, 2), + gsSPVertex(&D_0A000000_E38890[133], 1, 3), + gsSPVertex(&D_0A000000_E38890[135], 1, 4), + gsSPVertex(&D_0A000000_E38890[142], 1, 5), + gsSPVertex(&D_0A000000_E38890[144], 2, 6), + gsSPVertex(&D_0A000000_E38890[159], 4, 8), + gsSPVertex(&D_0A000000_E38890[175], 6, 12), + gsSPVertex(&D_0A000000_E38890[185], 2, 18), + gsSP2Triangles(0, 12, 13, 0, 0, 13, 1, 0), + gsSP2Triangles(2, 14, 15, 0, 2, 15, 3, 0), + gsSP2Triangles(16, 4, 5, 0, 16, 5, 17, 0), + gsSP2Triangles(18, 6, 7, 0, 18, 7, 19, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002270_E3AB00[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[181], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0022B0_E3AB40[] = { + gsSPDisplayList(D_0A002270_E3AB00), + gsSPDisplayList(D_0A0021C0_E3AA50), + gsSPEndDisplayList(), +}; + +Gfx D_0A0022C8_E3AB58[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 1, 0), + gsSPVertex(&D_0A000000_E38890[125], 1, 1), + gsSPVertex(&D_0A000000_E38890[130], 1, 2), + gsSPVertex(&D_0A000000_E38890[133], 1, 3), + gsSPVertex(&D_0A000000_E38890[135], 1, 4), + gsSPVertex(&D_0A000000_E38890[142], 1, 5), + gsSPVertex(&D_0A000000_E38890[159], 4, 6), + gsSPVertex(&D_0A000000_E38890[175], 6, 10), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002360_E3ABF0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[167], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0023A8_E3AC38[] = { + gsSPDisplayList(D_0A002360_E3ABF0), + gsSPDisplayList(D_0A0022C8_E3AB58), + gsSPEndDisplayList(), +}; + +Gfx D_0A0023C0_E3AC50[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[126], 10, 0), + gsSPVertex(&D_0A000000_E38890[137], 1, 10), + gsSPVertex(&D_0A000000_E38890[142], 5, 11), + gsSPVertex(&D_0A000000_E38890[159], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 11, 0, 8, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002440_E3ACD0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[163], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002480_E3AD10[] = { + gsSPDisplayList(D_0A002440_E3ACD0), + gsSPDisplayList(D_0A0023C0_E3AC50), + gsSPEndDisplayList(), +}; + +Gfx D_0A002498_E3AD28[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 14, 0), + gsSPVertex(&D_0A000000_E38890[137], 1, 14), + gsSPVertex(&D_0A000000_E38890[142], 1, 15), + gsSPVertex(&D_0A000000_E38890[159], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 15, 0, 12, 15, 14, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002518_E3ADA8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[155], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002558_E3ADE8[] = { + gsSPDisplayList(D_0A002518_E3ADA8), + gsSPDisplayList(D_0A002498_E3AD28), + gsSPEndDisplayList(), +}; + +Gfx D_0A002570_E3AE00[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[126], 10, 0), + gsSPVertex(&D_0A000000_E38890[137], 1, 10), + gsSPVertex(&D_0A000000_E38890[142], 5, 11), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 11, 0, 8, 11, 10, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0025E0_E3AE70[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[147], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002628_E3AEB8[] = { + gsSPDisplayList(D_0A0025E0_E3AE70), + gsSPDisplayList(D_0A002570_E3AE00), + gsSPEndDisplayList(), +}; + +Gfx D_0A002640_E3AED0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 14, 0), + gsSPVertex(&D_0A000000_E38890[137], 1, 14), + gsSPVertex(&D_0A000000_E38890[142], 5, 15), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 15, 0, 12, 15, 14, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0026B8_E3AF48[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[138], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0026F8_E3AF88[] = { + gsSPDisplayList(D_0A0026B8_E3AF48), + gsSPDisplayList(D_0A002640_E3AED0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002710_E3AFA0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[122], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002770_E3B000[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[114], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027B8_E3B048[] = { + gsSPDisplayList(D_0A002770_E3B000), + gsSPDisplayList(D_0A002710_E3AFA0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0027D0_E3B060[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 1, 0), + gsSPVertex(&D_0A000000_E38890[37], 1, 1), + gsSPVertex(&D_0A000000_E38890[55], 2, 2), + gsSPVertex(&D_0A000000_E38890[74], 4, 4), + gsSPVertex(&D_0A000000_E38890[92], 2, 8), + gsSPVertex(&D_0A000000_E38890[102], 2, 10), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(10, 2, 3, 0, 10, 3, 11, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002850_E3B0E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[59], 2, 0), + gsSPVertex(&D_0A000000_E38890[104], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028A8_E3B138[] = { + gsSPDisplayList(D_0A002850_E3B0E0), + gsSPDisplayList(D_0A0027D0_E3B060), + gsSPEndDisplayList(), +}; + +Gfx D_0A0028C0_E3B150[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 1, 0), + gsSPVertex(&D_0A000000_E38890[37], 1, 1), + gsSPVertex(&D_0A000000_E38890[42], 1, 2), + gsSPVertex(&D_0A000000_E38890[45], 1, 3), + gsSPVertex(&D_0A000000_E38890[55], 2, 4), + gsSPVertex(&D_0A000000_E38890[74], 4, 6), + gsSPVertex(&D_0A000000_E38890[92], 4, 10), + gsSPVertex(&D_0A000000_E38890[102], 2, 14), + gsSP2Triangles(0, 10, 11, 0, 0, 11, 1, 0), + gsSP2Triangles(2, 12, 13, 0, 2, 13, 3, 0), + gsSP2Triangles(14, 4, 5, 0, 14, 5, 15, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002958_E3B1E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[47], 2, 0), + gsSPVertex(&D_0A000000_E38890[96], 6, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029A8_E3B238[] = { + gsSPDisplayList(D_0A002958_E3B1E8), + gsSPDisplayList(D_0A0028C0_E3B150), + gsSPEndDisplayList(), +}; + +Gfx D_0A0029C0_E3B250[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 1, 0), + gsSPVertex(&D_0A000000_E38890[37], 1, 1), + gsSPVertex(&D_0A000000_E38890[42], 1, 2), + gsSPVertex(&D_0A000000_E38890[45], 1, 3), + gsSPVertex(&D_0A000000_E38890[74], 4, 4), + gsSPVertex(&D_0A000000_E38890[92], 4, 8), + gsSP2Triangles(0, 8, 9, 0, 0, 9, 1, 0), + gsSP2Triangles(2, 10, 11, 0, 2, 11, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A40_E3B2D0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[23], 2, 0), + gsSPVertex(&D_0A000000_E38890[82], 10, 2), + gsSP2Triangles(2, 0, 1, 0, 2, 1, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002A98_E3B328[] = { + gsSPDisplayList(D_0A002A40_E3B2D0), + gsSPDisplayList(D_0A0029C0_E3B250), + gsSPEndDisplayList(), +}; + +Gfx D_0A002AB0_E3B340[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 8, 0), + gsSPVertex(&D_0A000000_E38890[54], 4, 8), + gsSPVertex(&D_0A000000_E38890[74], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B20_E3B3B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[58], 4, 0), + gsSPVertex(&D_0A000000_E38890[78], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B70_E3B400[] = { + gsSPDisplayList(D_0A002B20_E3B3B0), + gsSPDisplayList(D_0A002AB0_E3B340), + gsSPEndDisplayList(), +}; + +Gfx D_0A002B88_E3B418[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 12, 0), + gsSPVertex(&D_0A000000_E38890[54], 4, 12), + gsSPVertex(&D_0A000000_E38890[74], 4, 16), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C00_E3B490[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[46], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C40_E3B4D0[] = { + gsSPDisplayList(D_0A002C00_E3B490), + gsSPDisplayList(D_0A002B88_E3B418), + gsSPEndDisplayList(), +}; + +Gfx D_0A002C58_E3B4E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 12, 0), + gsSPVertex(&D_0A000000_E38890[74], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002CC0_E3B550[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[22], 4, 0), + gsSPVertex(&D_0A000000_E38890[70], 4, 4), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D10_E3B5A0[] = { + gsSPDisplayList(D_0A002CC0_E3B550), + gsSPDisplayList(D_0A002C58_E3B4E8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D28_E3B5B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 8, 0), + gsSPVertex(&D_0A000000_E38890[54], 4, 8), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002D88_E3B618[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[58], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DD8_E3B668[] = { + gsSPDisplayList(D_0A002D88_E3B618), + gsSPDisplayList(D_0A002D28_E3B5B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A002DF0_E3B680[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 12, 0), + gsSPVertex(&D_0A000000_E38890[54], 4, 12), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002E58_E3B6E8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[46], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EA0_E3B730[] = { + gsSPDisplayList(D_0A002E58_E3B6E8), + gsSPDisplayList(D_0A002DF0_E3B680), + gsSPEndDisplayList(), +}; + +Gfx D_0A002EB8_E3B748[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[34], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F10_E3B7A0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(D_0A001170_E39A00), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E38890[22], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A002F60_E3B7F0[] = { + gsSPDisplayList(D_0A002F10_E3B7A0), + gsSPDisplayList(D_0A002EB8_E3B748), + gsSPEndDisplayList(), +}; + +Gfx* Entity_ShatteringHammer3Block_FragmentsRender[] = { + D_0A002F60_E3B7F0, + D_0A002EA0_E3B730, + D_0A002DD8_E3B668, + D_0A002D10_E3B5A0, + D_0A002C40_E3B4D0, + D_0A002B70_E3B400, + D_0A002A98_E3B328, + D_0A0029A8_E3B238, + D_0A0028A8_E3B138, + D_0A0027B8_E3B048, + D_0A0026F8_E3AF88, + D_0A002628_E3AEB8, + D_0A002558_E3ADE8, + D_0A002480_E3AD10, + D_0A0023A8_E3AC38, + D_0A0022B0_E3AB40, + D_0A0021A8_E3AA38, + D_0A0020B0_E3A940, + D_0A001FE8_E3A878, + D_0A001F10_E3A7A0, + D_0A001E38_E3A6C8, + D_0A001D50_E3A5E0, + D_0A001C70_E3A500, + D_0A001B88_E3A418, + D_0A001A88_E3A318, + D_0A001978_E3A208, +}; diff --git a/src/entity/model/Signpost.c b/src/entity/model/Signpost.c new file mode 100644 index 0000000000..636d816fad --- /dev/null +++ b/src/entity/model/Signpost.c @@ -0,0 +1,101 @@ +#include "common.h" + +#include "entity/model/Signpost_1.vtx.inc.c" +#include "entity/model/Signpost_2.vtx.inc.c" + +#include "entity/model/Signpost.png.inc.c" +#include "entity/model/Signpost.pal.inc.c" +Gfx Entity_Signpost_LoadTexture[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000580_E59A00, G_IM_FMT_CI, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000780_E59C00), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Gfx Entity_Signpost_RenderSign[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_Signpost_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000120_E595A0, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(2, 1, 4, 0, 2, 4, 5, 0), + gsSP2Triangles(4, 1, 0, 0, 4, 0, 6, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(10, 9, 11, 0, 10, 11, 12, 0), + gsSP2Triangles(13, 14, 15, 0, 13, 15, 16, 0), + gsSP2Triangles(15, 14, 17, 0, 15, 17, 18, 0), + gsSP2Triangles(14, 13, 19, 0, 14, 19, 17, 0), + gsSP2Triangles(20, 0, 3, 0, 20, 3, 21, 0), + gsSP2Triangles(22, 23, 20, 0, 22, 20, 21, 0), + gsSP2Triangles(20, 23, 24, 0, 20, 24, 25, 0), + gsSP2Triangles(24, 23, 22, 0, 24, 22, 26, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSPVertex(&D_0A000120_E595A0[7], 2, 0), + gsSPVertex(&D_0A000120_E595A0[13], 1, 2), + gsSPVertex(&D_0A000120_E595A0[16], 1, 3), + gsSPVertex(&D_0A000120_E595A0[19], 1, 4), + gsSPVertex(&D_0A000120_E595A0[31], 9, 5), + gsSP2Triangles(1, 0, 5, 0, 1, 5, 9, 0), + gsSP2Triangles(2, 6, 10, 0, 2, 10, 4, 0), + gsSP2Triangles(6, 11, 8, 0, 6, 8, 10, 0), + gsSP2Triangles(6, 2, 3, 0, 6, 3, 12, 0), + gsSP2Triangles(7, 11, 6, 0, 7, 6, 12, 0), + gsSP2Triangles(8, 11, 7, 0, 8, 7, 13, 0), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000120_E595A0[40], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000120_E595A0, 1, 0), + gsSPVertex(&D_0A000120_E595A0[6], 1, 1), + gsSPVertex(&D_0A000120_E595A0[20], 1, 2), + gsSPVertex(&D_0A000120_E595A0[25], 1, 3), + gsSPVertex(&D_0A000120_E595A0[27], 2, 4), + gsSPVertex(&D_0A000120_E595A0[44], 14, 6), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 1, 0), + gsSP2Triangles(6, 4, 7, 0, 6, 7, 8, 0), + gsSP2Triangles(6, 8, 9, 0, 6, 9, 10, 0), + gsSP2Triangles(6, 10, 11, 0, 6, 11, 12, 0), + gsSP2Triangles(5, 13, 14, 0, 5, 14, 15, 0), + gsSP2Triangles(5, 15, 16, 0, 5, 16, 17, 0), + gsSP2Triangles(5, 17, 18, 0, 5, 18, 19, 0), + gsSPClearGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000120_E595A0[58], 12, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Signpost_RenderPole[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_Signpost_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E59480, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(7, 10, 11, 0, 7, 11, 8, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 11, 10, 0, 16, 10, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Signpost_RenderMain[] = { + gsSPDisplayList(Entity_Signpost_RenderPole), + gsSPDisplayList(Entity_Signpost_RenderSign), + gsSPEndDisplayList(), +}; + +Gfx Entity_Signpost_Render[] = { + gsSPDisplayList(Entity_Signpost_RenderMain), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/SimpleSpring_anim.c b/src/entity/model/SimpleSpring_anim.c new file mode 100644 index 0000000000..b1d8c92a1b --- /dev/null +++ b/src/entity/model/SimpleSpring_anim.c @@ -0,0 +1,610 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_SimpleSpring_RenderPart1[]; +extern Gfx Entity_SimpleSpring_RenderPart2[]; +extern Gfx Entity_SimpleSpring_RenderPart3[]; +extern Gfx Entity_SimpleSpring_RenderPart4[]; +extern Gfx Entity_SimpleSpring_RenderPart5[]; +extern Gfx Entity_SimpleSpring_RenderPart6[]; +extern Gfx Entity_SimpleSpring_RenderPart7[]; + +StaticAnimatorNode Entity_SimpleSpring_NodePart9 = { + .displayList = ANIM_NULL, + .pos = { 0.0f, 5.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart8 = { + .displayList = ANIM_NULL, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart9, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart7 = { + .displayList = Entity_SimpleSpring_RenderPart7, + .sibling = &Entity_SimpleSpring_NodePart8, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart6 = { + .displayList = Entity_SimpleSpring_RenderPart6, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart7, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart5 = { + .displayList = Entity_SimpleSpring_RenderPart5, + .pos = { 0.0f, 8.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart6, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart4 = { + .displayList = Entity_SimpleSpring_RenderPart4, + .pos = { 0.0f, 12.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart5, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart3 = { + .displayList = Entity_SimpleSpring_RenderPart3, + .pos = { 0.0f, 16.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart4, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart2 = { + .displayList = Entity_SimpleSpring_RenderPart2, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart3, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_NodePart1 = { + .displayList = Entity_SimpleSpring_RenderPart1, + .pos = { 0.0f, 20.0f, 0.0f }, + .sibling = &Entity_SimpleSpring_NodePart2, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_SimpleSpring_ParentNode = { + .displayList = ANIM_NULL, + .sibling = ANIM_NULL, + .child = &Entity_SimpleSpring_NodePart1, +}; + +StaticAnimatorNode* Entity_SimpleSpring_Mesh[] = { + &Entity_SimpleSpring_ParentNode, + &Entity_SimpleSpring_NodePart1, + &Entity_SimpleSpring_NodePart2, + &Entity_SimpleSpring_NodePart3, + &Entity_SimpleSpring_NodePart4, + &Entity_SimpleSpring_NodePart5, + &Entity_SimpleSpring_NodePart6, + &Entity_SimpleSpring_NodePart7, + &Entity_SimpleSpring_NodePart8, + &Entity_SimpleSpring_NodePart9, + ANIM_NULL, +}; + +AnimScript Entity_SimpleSpring_AnimLaunch = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetPos(2, 0, 11, 0) + as_SetPos(3, 0, 12, 0) + as_SetPos(4, 0, 9, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 11, 0) + as_SetPos(9, 0, 11, 0) + as_Wait(1) + as_SetPos(2, 0, 5, 0) + as_SetPos(3, 0, 6, 0) + as_SetPos(4, 0, 5, 0) + as_SetPos(5, 0, 5, 0) + as_SetPos(6, 0, 5, 0) + as_SetPos(7, 0, 5, 0) + as_SetPos(9, 0, 5, 0) + as_Wait(1) + as_SetPos(2, 0, 14, 0) + as_SetPos(3, 0, 15, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 14, 0) + as_SetPos(9, 0, 14, 0) + as_Wait(1) + as_SetPos(2, 0, 29, 0) + as_SetPos(3, 0, 30, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 29, 0) + as_SetPos(9, 0, 29, 0) + as_Wait(1) + as_SetPos(2, 0, 44, 0) + as_SetPos(3, 0, 45, 0) + as_SetPos(4, 0, 34, 0) + as_SetPos(5, 0, 24, 0) + as_SetPos(6, 0, 14, 0) + as_SetPos(7, 0, 44, 0) + as_SetPos(9, 0, 44, 0) + as_Wait(1) + as_SetPos(2, 0, 55, 0) + as_SetPos(3, 0, 56, 0) + as_SetPos(4, 0, 42, 0) + as_SetPos(5, 0, 30, 0) + as_SetPos(6, 0, 17, 0) + as_SetPos(7, 0, 55, 0) + as_SetPos(9, 0, 55, 0) + as_Wait(1) + as_SetPos(2, 0, 59, 0) + as_SetPos(3, 0, 60, 0) + as_SetPos(4, 0, 45, 0) + as_SetPos(5, 0, 32, 0) + as_SetPos(6, 0, 18, 0) + as_SetPos(7, 0, 59, 0) + as_SetPos(9, 0, 59, 0) + as_Wait(1) + as_SetPos(2, 0, 60, 0) + as_SetPos(3, 0, 61, 0) + as_SetPos(4, 0, 46, 0) + as_SetPos(7, 0, 60, 0) + as_SetPos(9, 0, 60, 0) + as_Wait(1) + as_SetPos(2, 0, 59, 0) + as_SetPos(3, 0, 60, 0) + as_SetPos(4, 0, 45, 0) + as_SetPos(7, 0, 59, 0) + as_SetPos(9, 0, 59, 0) + as_Wait(1) + as_SetPos(2, 0, 55, 0) + as_SetPos(3, 0, 56, 0) + as_SetPos(4, 0, 42, 0) + as_SetPos(5, 0, 30, 0) + as_SetPos(6, 0, 17, 0) + as_SetPos(7, 0, 55, 0) + as_SetPos(9, 0, 55, 0) + as_Wait(1) + as_SetPos(2, 0, 45, 0) + as_SetPos(3, 0, 46, 0) + as_SetPos(4, 0, 35, 0) + as_SetPos(5, 0, 25, 0) + as_SetPos(6, 0, 15, 0) + as_SetPos(7, 0, 45, 0) + as_SetPos(9, 0, 45, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 24, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 10, 0) + as_SetPos(3, 0, 11, 0) + as_SetPos(4, 0, 8, 0) + as_SetPos(5, 0, 7, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 10, 0) + as_SetPos(9, 0, 10, 0) + as_Wait(1) + as_SetPos(2, 0, 12, 0) + as_SetPos(3, 0, 13, 0) + as_SetPos(4, 0, 10, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(7, 0, 12, 0) + as_SetPos(9, 0, 12, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 24, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 39, 0) + as_SetPos(3, 0, 40, 0) + as_SetPos(4, 0, 30, 0) + as_SetPos(5, 0, 22, 0) + as_SetPos(6, 0, 13, 0) + as_SetPos(7, 0, 39, 0) + as_SetPos(9, 0, 39, 0) + as_Wait(1) + as_SetPos(2, 0, 43, 0) + as_SetPos(3, 0, 44, 0) + as_SetPos(4, 0, 33, 0) + as_SetPos(5, 0, 24, 0) + as_SetPos(6, 0, 14, 0) + as_SetPos(7, 0, 43, 0) + as_SetPos(9, 0, 43, 0) + as_Wait(1) + as_SetPos(2, 0, 40, 0) + as_SetPos(3, 0, 41, 0) + as_SetPos(4, 0, 31, 0) + as_SetPos(5, 0, 22, 0) + as_SetPos(6, 0, 13, 0) + as_SetPos(7, 0, 40, 0) + as_SetPos(9, 0, 40, 0) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetPos(3, 0, 36, 0) + as_SetPos(4, 0, 27, 0) + as_SetPos(5, 0, 20, 0) + as_SetPos(6, 0, 12, 0) + as_SetPos(7, 0, 35, 0) + as_SetPos(9, 0, 35, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 21, 0) + as_SetPos(3, 0, 22, 0) + as_SetPos(4, 0, 17, 0) + as_SetPos(5, 0, 13, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 21, 0) + as_SetPos(9, 0, 21, 0) + as_Wait(1) + as_SetPos(2, 0, 15, 0) + as_SetPos(3, 0, 16, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 15, 0) + as_SetPos(9, 0, 15, 0) + as_Wait(1) + as_SetPos(2, 0, 12, 0) + as_SetPos(3, 0, 13, 0) + as_SetPos(4, 0, 10, 0) + as_SetPos(5, 0, 8, 0) + as_SetPos(6, 0, 6, 0) + as_SetPos(7, 0, 12, 0) + as_SetPos(9, 0, 12, 0) + as_Wait(1) + as_SetPos(2, 0, 13, 0) + as_SetPos(3, 0, 14, 0) + as_SetPos(4, 0, 11, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 13, 0) + as_SetPos(9, 0, 13, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 23, 0) + as_SetPos(3, 0, 24, 0) + as_SetPos(4, 0, 18, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 23, 0) + as_SetPos(9, 0, 23, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 33, 0) + as_SetPos(3, 0, 34, 0) + as_SetPos(4, 0, 26, 0) + as_SetPos(5, 0, 19, 0) + as_SetPos(6, 0, 12, 0) + as_SetPos(7, 0, 33, 0) + as_SetPos(9, 0, 33, 0) + as_Wait(1) + as_SetPos(2, 0, 35, 0) + as_SetPos(3, 0, 36, 0) + as_SetPos(4, 0, 27, 0) + as_SetPos(5, 0, 20, 0) + as_SetPos(7, 0, 35, 0) + as_SetPos(9, 0, 35, 0) + as_Wait(1) + as_SetPos(2, 0, 33, 0) + as_SetPos(3, 0, 34, 0) + as_SetPos(4, 0, 26, 0) + as_SetPos(5, 0, 19, 0) + as_SetPos(7, 0, 33, 0) + as_SetPos(9, 0, 33, 0) + as_Wait(1) + as_SetPos(2, 0, 30, 0) + as_SetPos(3, 0, 31, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 30, 0) + as_SetPos(9, 0, 30, 0) + as_Wait(1) + as_SetPos(2, 0, 25, 0) + as_SetPos(3, 0, 26, 0) + as_SetPos(4, 0, 20, 0) + as_SetPos(5, 0, 15, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 25, 0) + as_SetPos(9, 0, 25, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 14, 0) + as_SetPos(3, 0, 15, 0) + as_SetPos(4, 0, 12, 0) + as_SetPos(5, 0, 9, 0) + as_SetPos(7, 0, 14, 0) + as_SetPos(9, 0, 14, 0) + as_Wait(1) + as_SetPos(2, 0, 15, 0) + as_SetPos(3, 0, 16, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(7, 0, 15, 0) + as_SetPos(9, 0, 15, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 21, 0) + as_SetPos(3, 0, 22, 0) + as_SetPos(4, 0, 17, 0) + as_SetPos(5, 0, 13, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 21, 0) + as_SetPos(9, 0, 21, 0) + as_Wait(1) + as_SetPos(2, 0, 24, 0) + as_SetPos(3, 0, 25, 0) + as_SetPos(4, 0, 19, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(7, 0, 24, 0) + as_SetPos(9, 0, 24, 0) + as_Wait(1) + as_SetPos(2, 0, 27, 0) + as_SetPos(3, 0, 28, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 27, 0) + as_SetPos(9, 0, 27, 0) + as_Wait(1) + as_SetPos(2, 0, 29, 0) + as_SetPos(3, 0, 30, 0) + as_SetPos(4, 0, 23, 0) + as_SetPos(5, 0, 17, 0) + as_SetPos(6, 0, 11, 0) + as_SetPos(7, 0, 29, 0) + as_SetPos(9, 0, 29, 0) + as_Wait(1) + as_SetPos(2, 0, 28, 0) + as_SetPos(3, 0, 29, 0) + as_SetPos(4, 0, 22, 0) + as_SetPos(5, 0, 16, 0) + as_SetPos(6, 0, 10, 0) + as_SetPos(7, 0, 28, 0) + as_SetPos(9, 0, 28, 0) + as_Wait(1) + as_SetPos(2, 0, 26, 0) + as_SetPos(3, 0, 27, 0) + as_SetPos(4, 0, 21, 0) + as_SetPos(5, 0, 15, 0) + as_SetPos(7, 0, 26, 0) + as_SetPos(9, 0, 26, 0) + as_Wait(1) + as_SetPos(2, 0, 23, 0) + as_SetPos(3, 0, 24, 0) + as_SetPos(4, 0, 19, 0) + as_SetPos(5, 0, 14, 0) + as_SetPos(6, 0, 9, 0) + as_SetPos(7, 0, 23, 0) + as_SetPos(9, 0, 23, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_SetPos(2, 0, 18, 0) + as_SetPos(3, 0, 19, 0) + as_SetPos(4, 0, 15, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(7, 0, 18, 0) + as_SetPos(9, 0, 18, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_SetPos(2, 0, 16, 0) + as_SetPos(3, 0, 17, 0) + as_SetPos(4, 0, 13, 0) + as_SetPos(5, 0, 10, 0) + as_SetPos(6, 0, 7, 0) + as_SetPos(7, 0, 16, 0) + as_SetPos(9, 0, 16, 0) + as_Wait(1) + as_SetPos(2, 0, 17, 0) + as_SetPos(3, 0, 18, 0) + as_SetPos(4, 0, 14, 0) + as_SetPos(5, 0, 11, 0) + as_SetPos(6, 0, 8, 0) + as_SetPos(7, 0, 17, 0) + as_SetPos(9, 0, 17, 0) + as_Wait(1) + as_Wait(1) + as_SetPos(2, 0, 18, 0) + as_SetPos(3, 0, 19, 0) + as_SetPos(4, 0, 15, 0) + as_SetPos(7, 0, 18, 0) + as_SetPos(9, 0, 18, 0) + as_Wait(1) + as_SetPos(2, 0, 19, 0) + as_SetPos(3, 0, 20, 0) + as_SetPos(4, 0, 16, 0) + as_SetPos(5, 0, 12, 0) + as_SetPos(7, 0, 19, 0) + as_SetPos(9, 0, 19, 0) + as_Wait(1) + as_SetPos(2, 0, 20, 0) + as_SetPos(3, 0, 21, 0) + as_SetPos(7, 0, 20, 0) + as_SetPos(9, 0, 20, 0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_SimpleSpring_AnimIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 0.0) + as_SetPos(2, 0, 20, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_SetRotation(3, 0.0, 0.0, 0.0) + as_SetPos(3, 0, 21, 0) + as_SetScale(3, 1.0, 1.0, 1.0) + as_SetRotation(4, 0.0, 0.0, 0.0) + as_SetPos(4, 0, 16, 0) + as_SetScale(4, 1.0, 1.0, 1.0) + as_SetRotation(5, 0.0, 0.0, 0.0) + as_SetPos(5, 0, 12, 0) + as_SetScale(5, 1.0, 1.0, 1.0) + as_SetRotation(6, 0.0, 0.0, 0.0) + as_SetPos(6, 0, 8, 0) + as_SetScale(6, 1.0, 1.0, 1.0) + as_SetRotation(7, 0.0, 0.0, 0.0) + as_SetPos(7, 0, 20, 0) + as_SetScale(7, 1.0, 1.0, 1.0) + as_SetRotation(8, 0.0, 0.0, 0.0) + as_SetPos(8, 0, 0, 0) + as_SetScale(8, 1.0, 1.0, 1.0) + as_SetRotation(9, 0.0, 0.0, 0.0) + as_SetPos(9, 0, 20, 0) + as_SetScale(9, 1.0, 1.0, 1.0) + as_SetRotation(10, 0.0, 0.0, 0.0) + as_SetPos(10, 0, 5, 0) + as_SetScale(10, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/SimpleSpring_gfx.c b/src/entity/model/SimpleSpring_gfx.c new file mode 100644 index 0000000000..4b0aec5267 --- /dev/null +++ b/src/entity/model/SimpleSpring_gfx.c @@ -0,0 +1,173 @@ +#include "common.h" + +#include "entity/model/SimpleSpring_1.vtx.inc.c" +#include "entity/model/SimpleSpring_2.vtx.inc.c" +#include "entity/model/SimpleSpring_3.vtx.inc.c" +#include "entity/model/SimpleSpring_4.vtx.inc.c" +#include "entity/model/SimpleSpring_5.vtx.inc.c" +#include "entity/model/SimpleSpring_6.vtx.inc.c" + +#include "entity/model/SimpleSpring_tex1.png.inc.c" +#include "entity/model/SimpleSpring_tex1.pal.inc.c" +Gfx Entity_SimpleSpring_LoadTexture1[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A0008E0_E68E60), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0007E0_E68D60, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/SimpleSpring_tex2.png.inc.c" +Gfx Entity_SimpleSpring_LoadTexture2[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000B88_E69108, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/SimpleSpring_star.png.inc.c" +#include "entity/model/SimpleSpring_star.pal.inc.c" +Gfx Entity_SimpleSpring_LoadTextureStar[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal256(D_0A001200_E69780), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000E00_E69380, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart2[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_SimpleSpring_LoadTextureStar), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000760_E68CE0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart6[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_SimpleSpring_LoadTexture2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000600_E68B80, 22, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 2, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart1[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_SimpleSpring_LoadTexture1), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000380_E68900, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(7, 6, 15, 0, 7, 15, 14, 0), + gsSPVertex(&D_0A000380_E68900[18], 22, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart3[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000280_E68800, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart4[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000300_E68880, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart5[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000280_E68800, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SimpleSpring_RenderPart7[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_SimpleSpring_LoadTexture1), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E68580, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(8, 9, 1, 0, 8, 1, 0, 0), + gsSP2Triangles(10, 11, 9, 0, 10, 9, 8, 0), + gsSP2Triangles(12, 13, 11, 0, 12, 11, 10, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSP2Triangles(7, 6, 15, 0, 7, 15, 14, 0), + gsSPVertex(&D_0A000000_E68580[18], 22, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 1, 0), + gsSP2Triangles(5, 6, 7, 0, 8, 9, 7, 0), + gsSP2Triangles(10, 11, 12, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 19, 20, 21, 0), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/SpinningFlower.c b/src/entity/model/SpinningFlower.c new file mode 100644 index 0000000000..e7c4c3e971 --- /dev/null +++ b/src/entity/model/SpinningFlower.c @@ -0,0 +1,121 @@ +#include "common.h" + +#include "entity/model/SpinningFlower_1.vtx.inc.c" +#include "entity/model/SpinningFlower_2.vtx.inc.c" +#include "entity/model/SpinningFlower_3.vtx.inc.c" +#include "entity/model/SpinningFlower_4.vtx.inc.c" + +#include "entity/model/SpinningFlower_img1.png.inc.c" +Gfx D_0A000280_E9CB80[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000180_E9CA80, G_IM_FMT_IA, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/SpinningFlower_petal.png.inc.c" +Gfx D_0A000AF8_E9D3F8[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0002F8_E9CBF8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx D_0A000B70_E9D470 = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000014, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx D_0A000BB0_E9D4B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(D_0A000280_E9CB80), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000120_E9CA20, 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C00_E9D500[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPTexture(0x0080, 0x0080, 0, G_TX_RENDERTILE, G_OFF), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A0000A0_E9C9A0, 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSP2Triangles(6, 7, 5, 0, 6, 5, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C60_E9D560[] = { + gsSPDisplayList(D_0A000C00_E9D500), + gsSPDisplayList(D_0A000BB0_E9D4B0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C78_E9D578[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(D_0A000AF8_E9D3F8), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000050_E9C950, 5, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), + gsSP2Triangles(1, 4, 2, 0, 1, 3, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000CC8_E9D5C8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(D_0A000AF8_E9D3F8), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E9C900, 5, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), + gsSP2Triangles(2, 3, 4, 0, 0, 2, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000D18_E9D618[] = { + gsSPDisplayList(D_0A000CC8_E9D5C8), + gsSPDisplayList(D_0A000C78_E9D578), + gsSPEndDisplayList(), +}; + +Gfx D_0A000D30_E9D630[] = { + gsSPDisplayList(D_0A000C60_E9D560), + gsSPEndDisplayList(), +}; + +Gfx Entity_SpinningFlower_Render[] = { + gsSPDisplayList(D_0A000D30_E9D630), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/StarBoxLauncher.c b/src/entity/model/StarBoxLauncher.c new file mode 100644 index 0000000000..89cc41c314 --- /dev/null +++ b/src/entity/model/StarBoxLauncher.c @@ -0,0 +1,129 @@ +#include "common.h" + +#include "entity/model/StarBoxLauncher_1.vtx.inc.c" +#include "entity/model/StarBoxLauncher_2.vtx.inc.c" +#include "entity/model/StarBoxLauncher_3.vtx.inc.c" +#include "entity/model/StarBoxLauncher_4.vtx.inc.c" + +#include "entity/model/StarBoxLauncher_link.png.inc.c" +Gfx Entity_StarBoxLauncher_LoadTextureLink[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000290_E55CD0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/StarBoxLauncher_face.png.inc.c" +#include "entity/model/StarBoxLauncher_face.pal.inc.c" +Gfx Entity_StarBoxLauncher_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000D08_E56748), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000508_E55F48, G_IM_FMT_CI, 128, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 7, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/StarBoxLauncher_box.png.inc.c" +#include "entity/model/StarBoxLauncher_box.pal.inc.c" +Gfx Entity_StarBoxLauncher_LoadTextureBox[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000ED0_E56910), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000DD0_E56810, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_StarBoxLauncher_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_StarBoxLauncher_RenderChain[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPDisplayList(Entity_StarBoxLauncher_LoadTextureLink), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(D_0A000250_E55C90, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_StarBoxLauncher_RenderFace[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000210_E55C50, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_StarBoxLauncher_RenderBoxCover[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_StarBoxLauncher_LoadTextureBox), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A0000F0_E55B30, 18, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 6, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 10, 12, 13, 0), + gsSP2Triangles(14, 15, 16, 0, 14, 16, 17, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_StarBoxLauncher_RenderTop[] = { + gsSPDisplayList(Entity_StarBoxLauncher_RenderFace), + gsSPDisplayList(Entity_StarBoxLauncher_RenderBoxCover), + gsSPDisplayList(Entity_StarBoxLauncher_RenderChain), + gsSPEndDisplayList(), +}; + +Gfx Entity_StarBoxLauncher_RenderBox[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPDisplayList(Entity_StarBoxLauncher_LoadTextureBox), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E55A40, 15, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 8, 9, 0, 7, 9, 10, 0), + gsSP2Triangles(11, 12, 13, 0, 11, 13, 14, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_StarBoxLauncher_RenderBottom[] = { + gsSPDisplayList(Entity_StarBoxLauncher_RenderBox), + gsSPEndDisplayList(), +}; + diff --git a/src/entity/model/SuperBlock.c b/src/entity/model/SuperBlock.c new file mode 100644 index 0000000000..7d89d79e04 --- /dev/null +++ b/src/entity/model/SuperBlock.c @@ -0,0 +1,135 @@ +#include "common.h" + +#include "entity/model/SuperBlock.vtx.inc.c" + +#include "entity/model/SuperBlock_tex.png.inc.c" +#include "entity/model/SuperBlock_tex.pal.inc.c" +Gfx Entity_SuperBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000580_E44D80), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000480_E44C80, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_SuperBlock_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_SuperBlock_RenderTop[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[24], 1, 0), + gsSPVertex(&D_0A000000_E44800[28], 1, 1), + gsSPVertex(&D_0A000000_E44800[35], 1, 2), + gsSPVertex(&D_0A000000_E44800[39], 1, 3), + gsSPVertex(&D_0A000000_E44800[43], 1, 4), + gsSPVertex(&D_0A000000_E44800[47], 2, 5), + gsSPVertex(&D_0A000000_E44800[52], 1, 7), + gsSPVertex(&D_0A000000_E44800[56], 16, 8), + gsSP2Triangles(8, 9, 0, 0, 8, 0, 5, 0), + gsSP2Triangles(10, 11, 2, 0, 10, 2, 1, 0), + gsSP2Triangles(6, 3, 12, 0, 6, 12, 13, 0), + gsSP2Triangles(4, 7, 14, 0, 4, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderRightFrontEdge[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[48], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderLeftFrontEdge[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[40], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderRightBackEdge[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[32], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderLeftBackEdge[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[24], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E44800[0], 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_RenderBlock[] = { + gsSPMatrix(&Entity_SuperBlock_mtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_SuperBlock_RenderBottom), + gsSPDisplayList(Entity_SuperBlock_RenderLeftBackEdge), + gsSPDisplayList(Entity_SuperBlock_RenderRightBackEdge), + gsSPDisplayList(Entity_SuperBlock_RenderLeftFrontEdge), + gsSPDisplayList(Entity_SuperBlock_RenderRightFrontEdge), + gsSPDisplayList(Entity_SuperBlock_RenderTop), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlock_Render[] = { + gsSPDisplayList(Entity_SuperBlock_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/SuperBlockContent.c b/src/entity/model/SuperBlockContent.c new file mode 100644 index 0000000000..f709622dd7 --- /dev/null +++ b/src/entity/model/SuperBlockContent.c @@ -0,0 +1,49 @@ +#include "common.h" + +#include "entity/model/SuperBlockContent.png.inc.c" +#include "entity/model/SuperBlockContent.pal.inc.c" +#include "entity/model/SuperBlockContent.pal2.pal.inc.c" +#include "entity/model/SuperBlockContent.pal3.pal.inc.c" +#include "entity/model/SuperBlockContent.pal4.pal.inc.c" + +Vtx Entity_SuperBlockContent_vtx[] = { + {{{ 13, 13, 0 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, 13, 0 }, 0, { 1024, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, -13, 0 }, 0, { 1024, 1024 }, { 255, 255, 255, 255 }}}, + {{{ 13, -13, 0 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, +}; + +Gfx Entity_SuperBlockContent_Prepare[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlockContent_RenderImage[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_SuperBlockContent_Prepare), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(Entity_SuperBlockContent_vtx, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlockContent_Render[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), + gsDPLoadTextureBlock_4b(D_0A000000_E4A6A0, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_SuperBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_SuperBlockContent_Render2[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2), + gsDPLoadTextureBlock_4b(D_0A000000_E4A6A0, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_SuperBlockContent_RenderImage), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/TrumpetPlant_anim.c b/src/entity/model/TrumpetPlant_anim.c new file mode 100644 index 0000000000..38eed7a909 --- /dev/null +++ b/src/entity/model/TrumpetPlant_anim.c @@ -0,0 +1,145 @@ +#include "common.h" +#include "animation_script.h" + +extern Gfx Entity_TrumpetPlant_RenderNode1[]; +extern Gfx Entity_TrumpetPlant_RenderNode2[]; + +StaticAnimatorNode Entity_TrumpetPlant_Node2 = { + .displayList = Entity_TrumpetPlant_RenderNode2, + .rot = { 0, 0, 5461 }, + .pos = { 0.0f, 15.0f, 0.0f }, + .sibling = ANIM_NULL, + .child = ANIM_NULL, +}; + +StaticAnimatorNode Entity_TrumpetPlant_Node1 = { + .displayList = Entity_TrumpetPlant_RenderNode1, + .sibling = ANIM_NULL, + .child = &Entity_TrumpetPlant_Node2, +}; + +StaticAnimatorNode* Entity_TrumpetPlant_Mesh[] = { + &Entity_TrumpetPlant_Node1, + &Entity_TrumpetPlant_Node2, + ANIM_NULL, +}; + +AnimScript Entity_TrumpetPlant_AnimationUse = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 30.0) + as_SetPos(2, 0, 15, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetScale(2, 1.055, 0.94, 1.055) + as_Wait(1) + as_SetScale(2, 1.2, 0.795, 1.2) + as_Wait(1) + as_SetScale(2, 1.355, 0.635, 1.355) + as_Wait(1) + as_SetScale(2, 1.48, 0.515, 1.48) + as_Wait(1) + as_SetScale(2, 1.5, 0.5, 1.5) + as_Wait(1) + as_SetScale(2, 1.37, 0.625, 1.37) + as_Wait(1) + as_SetScale(2, 1.13, 0.86, 1.13) + as_Wait(1) + as_SetScale(2, 0.855, 1.135, 0.855) + as_Wait(1) + as_SetScale(2, 0.62, 1.375, 0.62) + as_Wait(1) + as_SetScale(2, 0.5, 1.5, 0.5) + as_Wait(1) + as_SetScale(2, 0.455, 1.54, 0.455) + as_Wait(1) + as_SetScale(2, 0.425, 1.57, 0.425) + as_Wait(1) + as_SetScale(2, 0.395, 1.6, 0.395) + as_Wait(1) + as_SetScale(2, 0.375, 1.62, 0.375) + as_Wait(1) + as_SetScale(2, 0.355, 1.635, 0.355) + as_Wait(1) + as_SetScale(2, 0.345, 1.65, 0.345) + as_Wait(1) + as_SetScale(2, 0.34, 1.655, 0.34) + as_Wait(1) + as_Wait(1) + as_Wait(1) + as_SetScale(2, 0.35, 1.645, 0.35) + as_Wait(1) + as_SetScale(2, 0.355, 1.635, 0.355) + as_Wait(1) + as_SetScale(2, 0.375, 1.62, 0.375) + as_Wait(1) + as_SetScale(2, 0.39, 1.605, 0.39) + as_Wait(1) + as_SetScale(2, 0.405, 1.59, 0.405) + as_Wait(1) + as_SetScale(2, 0.43, 1.565, 0.43) + as_Wait(1) + as_SetScale(2, 0.45, 1.545, 0.45) + as_Wait(1) + as_SetScale(2, 0.47, 1.52, 0.47) + as_Wait(1) + as_SetScale(2, 0.5, 1.5, 0.5) + as_Wait(1) + as_SetScale(2, 0.71, 1.285, 0.71) + as_Wait(1) + as_SetScale(2, 1.0, 1.0, 1.0) + as_Wait(1) + as_SetScale(2, 1.175, 0.82, 1.175) + as_Wait(1) + as_SetScale(2, 1.245, 0.745, 1.245) + as_Wait(1) + as_SetScale(2, 1.13, 0.84, 1.13) + as_Wait(1) + as_SetScale(2, 0.95, 1.0, 0.95) + as_Wait(1) + as_SetScale(2, 0.845, 1.1, 0.845) + as_Wait(1) + as_SetScale(2, 0.885, 1.095, 0.885) + as_Wait(1) + as_SetScale(2, 0.985, 1.045, 0.985) + as_Wait(1) + as_SetScale(2, 1.09, 0.985, 1.09) + as_Wait(1) + as_SetScale(2, 1.15, 0.945, 1.15) + as_Wait(1) + as_SetScale(2, 1.145, 0.945, 1.145) + as_Wait(1) + as_SetScale(2, 1.105, 0.955, 1.105) + as_Wait(1) + as_SetScale(2, 1.06, 0.97, 1.06) + as_Wait(1) + as_SetScale(2, 1.015, 0.99, 1.015) + as_Wait(1) + as_SetScale(2, 1.0, 1.0, 1.0) + as_Wait(1) + as_Loop + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 30.0) + as_SetPos(2, 0, 15, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; + +AnimScript Entity_TrumpetPlant_AnimationIdle = { + as_DisableMirroring + as_SetRotation(1, 0.0, 0.0, 0.0) + as_SetPos(1, 0, 0, 0) + as_SetScale(1, 1.0, 1.0, 1.0) + as_SetRotation(2, 0.0, 0.0, 30.0) + as_SetPos(2, 0, 15, 0) + as_SetScale(2, 1.0, 1.0, 1.0) + as_Wait(1) + as_Restart + as_End +}; diff --git a/src/entity/model/TrumpetPlant_gfx.c b/src/entity/model/TrumpetPlant_gfx.c new file mode 100644 index 0000000000..100f58d719 --- /dev/null +++ b/src/entity/model/TrumpetPlant_gfx.c @@ -0,0 +1,116 @@ +#include "common.h" + +extern unsigned char D_0A000D40_E6E0D0[]; + +#include "entity/model/TrumpetPlant_1.vtx.inc.c" +#include "entity/model/TrumpetPlant_2.vtx.inc.c" + +Gfx Entity_TrumpetPlant_RenderNode2[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A000D40_E6E0D0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPVertex(D_0A000240_E6D5D0, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 1, 0, 3, 0), + gsSP2Triangles(1, 3, 4, 0, 4, 3, 5, 0), + gsSP2Triangles(4, 5, 6, 0, 6, 5, 7, 0), + gsSP2Triangles(6, 7, 8, 0, 8, 7, 9, 0), + gsSP2Triangles(8, 9, 10, 0, 10, 9, 11, 0), + gsSP2Triangles(10, 11, 12, 0, 12, 11, 13, 0), + gsSP2Triangles(12, 13, 14, 0, 15, 0, 2, 0), + gsSP2Triangles(0, 15, 16, 0, 0, 16, 3, 0), + gsSP2Triangles(3, 16, 17, 0, 3, 17, 5, 0), + gsSP2Triangles(5, 17, 18, 0, 5, 18, 7, 0), + gsSP2Triangles(7, 18, 19, 0, 7, 19, 9, 0), + gsSP2Triangles(9, 19, 20, 0, 9, 20, 11, 0), + gsSP2Triangles(11, 20, 21, 0, 11, 21, 13, 0), + gsSP2Triangles(22, 15, 2, 0, 15, 22, 23, 0), + gsSP2Triangles(15, 23, 16, 0, 16, 23, 24, 0), + gsSP2Triangles(16, 24, 17, 0, 17, 24, 25, 0), + gsSP2Triangles(17, 25, 18, 0, 18, 25, 26, 0), + gsSP2Triangles(18, 26, 19, 0, 19, 26, 27, 0), + gsSP2Triangles(19, 27, 20, 0, 20, 27, 28, 0), + gsSP2Triangles(20, 28, 21, 0, 29, 22, 2, 0), + gsSP2Triangles(22, 29, 30, 0, 22, 30, 23, 0), + gsSP2Triangles(23, 30, 31, 0, 23, 31, 24, 0), + gsSPVertex(&D_0A000240_E6D5D0[32], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 11, 10, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 14, 13, 15, 0), + gsSP2Triangles(14, 15, 16, 0, 16, 15, 17, 0), + gsSP2Triangles(16, 17, 18, 0, 18, 17, 19, 0), + gsSP2Triangles(18, 19, 20, 0, 20, 19, 21, 0), + gsSP2Triangles(20, 21, 22, 0, 22, 21, 23, 0), + gsSP2Triangles(22, 23, 24, 0, 25, 26, 27, 0), + gsSP2Triangles(25, 27, 28, 0, 29, 10, 12, 0), + gsSP2Triangles(10, 29, 30, 0, 10, 30, 13, 0), + gsSP2Triangles(13, 30, 31, 0, 13, 31, 15, 0), + gsSPVertex(&D_0A000240_E6D5D0[64], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(10, 11, 12, 0, 11, 10, 13, 0), + gsSP2Triangles(11, 13, 14, 0, 14, 13, 15, 0), + gsSP2Triangles(14, 15, 1, 0, 1, 15, 16, 0), + gsSP2Triangles(1, 16, 2, 0, 2, 16, 17, 0), + gsSP2Triangles(2, 17, 4, 0, 4, 17, 18, 0), + gsSP2Triangles(4, 18, 6, 0, 6, 18, 19, 0), + gsSP2Triangles(6, 19, 8, 0, 20, 10, 12, 0), + gsSP2Triangles(10, 20, 21, 0, 10, 21, 13, 0), + gsSP2Triangles(13, 21, 22, 0, 13, 22, 15, 0), + gsSP2Triangles(15, 22, 23, 0, 15, 23, 16, 0), + gsSP2Triangles(16, 23, 24, 0, 16, 24, 17, 0), + gsSP2Triangles(17, 24, 25, 0, 17, 25, 18, 0), + gsSP2Triangles(18, 25, 26, 0, 18, 26, 19, 0), + gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0), + gsSPVertex(&D_0A000240_E6D5D0[95], 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 5, 6, 7, 0), + gsSP2Triangles(7, 6, 8, 0, 7, 8, 9, 0), + gsSP2Triangles(9, 8, 10, 0, 9, 10, 11, 0), + gsSP2Triangles(11, 10, 12, 0, 11, 12, 13, 0), + gsSP2Triangles(13, 12, 14, 0, 13, 14, 15, 0), + gsSP2Triangles(16, 13, 15, 0, 16, 15, 17, 0), + gsSP2Triangles(18, 11, 13, 0, 18, 13, 16, 0), + gsSP2Triangles(19, 9, 11, 0, 19, 11, 18, 0), + gsSP2Triangles(20, 7, 9, 0, 20, 9, 19, 0), + gsSP2Triangles(21, 5, 7, 0, 21, 7, 20, 0), + gsSP2Triangles(22, 3, 5, 0, 22, 5, 21, 0), + gsSP2Triangles(23, 0, 3, 0, 23, 3, 22, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +Gfx Entity_TrumpetPlant_RenderNode1[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPLoadTextureBlock(D_0A000D40_E6E0D0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPVertex(D_0A000000_E6D390, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 0, 0), + gsSP2Triangles(4, 5, 0, 0, 0, 5, 1, 0), + gsSP2Triangles(6, 7, 8, 0, 9, 10, 6, 0), + gsSP2Triangles(10, 11, 6, 0, 6, 11, 7, 0), + gsSP2Triangles(12, 13, 14, 0, 15, 16, 17, 0), + gsSP2Triangles(15, 17, 18, 0, 18, 17, 19, 0), + gsSP2Triangles(18, 19, 20, 0, 13, 21, 14, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(26, 27, 28, 0, 26, 28, 29, 0), + gsSP2Triangles(29, 28, 30, 0, 29, 30, 31, 0), + gsSP1Triangle(21, 12, 14, 0), + gsSPVertex(&D_0A000000_E6D390[32], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsDPPipeSync(), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF), + gsSPEndDisplayList(), +}; + +#include "entity/model/TrumpetPlant.png.inc.c" diff --git a/src/entity/model/Tweester.c b/src/entity/model/Tweester.c new file mode 100644 index 0000000000..b9a574497f --- /dev/null +++ b/src/entity/model/Tweester.c @@ -0,0 +1,239 @@ +#include "common.h" + +#include "entity/model/Tweester_1.vtx.inc.c" +#include "entity/model/Tweester_2.vtx.inc.c" +#include "entity/model/Tweester_3.vtx.inc.c" +#include "entity/model/Tweester_4.vtx.inc.c" + +#include "entity/model/Tweester_img1.png.inc.c" +#include "entity/model/Tweester_img2.png.inc.c" +Gfx Entity_Tweester_LoadTextures[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000BF0_E57A50), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadTile(G_TX_LOADTILE, 0, 0, 0x007C, 0x007C), + gsDPPipeSync(), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD), + gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C), + gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000FF0_E57E50), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD), + gsDPLoadSync(), + gsDPLoadTile(G_TX_LOADTILE, 0, 0, 0x007C, 0x007C), + gsDPPipeSync(), + gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD), + gsDPSetTileSize(1, 0, 0, 0x007C, 0x007C), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/Tweester_img3.png.inc.c" +#include "entity/model/Tweester_img3.pal.inc.c" +Gfx Entity_Tweester_LoadTextureFace[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A0018A0_E58700), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A0014A0_E58300, G_IM_FMT_CI, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_Tweester_mtxInnerWhirl = { + .m = { + { 0x0000FFFF, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0xFFF6FB88, 0x00000000, + 0x0478FFF6, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Mtx Entity_Tweester_mtxOuterWhirl = { + .m = { + { 0x00010000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x33330000, 0x00000000, + 0x0000E666, 0x00000000 }, + { 0x00000000, 0x33330000, + 0x00000000, 0x00000000 } + } +}; + +Gfx D_0A0019E8_E58848[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsSPDisplayList(Entity_Tweester_LoadTextures), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000860_E576C0, 30, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 1, 4, 0), + gsSP2Triangles(5, 1, 6, 0, 7, 1, 8, 0), + gsSP2Triangles(9, 1, 10, 0, 11, 1, 12, 0), + gsSP2Triangles(13, 1, 14, 0, 15, 1, 16, 0), + gsSP2Triangles(17, 18, 2, 0, 17, 2, 19, 0), + gsSP2Triangles(20, 21, 17, 0, 20, 17, 19, 0), + gsSP2Triangles(22, 23, 24, 0, 22, 24, 25, 0), + gsSP2Triangles(24, 26, 14, 0, 24, 14, 25, 0), + gsSP2Triangles(27, 28, 12, 0, 27, 12, 29, 0), + gsSPVertex(&D_0A000860_E576C0[4], 1, 0), + gsSPVertex(&D_0A000860_E576C0[6], 1, 1), + gsSPVertex(&D_0A000860_E576C0[8], 1, 2), + gsSPVertex(&D_0A000860_E576C0[16], 1, 3), + gsSPVertex(&D_0A000860_E576C0[27], 1, 4), + gsSPVertex(&D_0A000860_E576C0[29], 27, 5), + gsSP2Triangles(6, 17, 3, 0, 6, 3, 18, 0), + gsSP2Triangles(7, 19, 6, 0, 7, 6, 18, 0), + gsSP2Triangles(8, 20, 4, 0, 8, 4, 5, 0), + gsSP2Triangles(9, 21, 10, 0, 9, 10, 22, 0), + gsSP2Triangles(10, 23, 0, 0, 10, 0, 22, 0), + gsSP2Triangles(11, 24, 12, 0, 11, 12, 25, 0), + gsSP2Triangles(12, 26, 1, 0, 12, 1, 25, 0), + gsSP2Triangles(13, 27, 2, 0, 13, 2, 28, 0), + gsSP2Triangles(14, 29, 13, 0, 14, 13, 28, 0), + gsSP2Triangles(15, 30, 16, 0, 15, 16, 31, 0), + gsSPVertex(&D_0A000860_E576C0[10], 1, 0), + gsSPVertex(&D_0A000860_E576C0[40], 1, 1), + gsSPVertex(&D_0A000860_E576C0[55], 2, 2), + gsSP2Triangles(1, 3, 0, 0, 1, 0, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001B10_E58970[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(D_0A000820_E57680, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001B50_E589B0[] = { + gsSPDisplayList(D_0A001B10_E58970), + gsSPDisplayList(D_0A0019E8_E58848), + gsSPEndDisplayList(), +}; + +Gfx Entity_Tweester_RenderOuterWhirl[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000410_E57270, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 0, 3, 0), + gsSP2Triangles(5, 3, 6, 0, 7, 8, 5, 0), + gsSP2Triangles(7, 5, 6, 0, 9, 7, 10, 0), + gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0), + gsSP2Triangles(12, 14, 15, 0, 13, 16, 14, 0), + gsSP2Triangles(10, 12, 15, 0, 10, 15, 11, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0), + gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 26, 28, 0), + gsSP2Triangles(29, 28, 30, 0, 22, 29, 30, 0), + gsSP1Triangle(22, 30, 23, 0), + gsSPVertex(&D_0A000410_E57270[9], 1, 0), + gsSPVertex(&D_0A000410_E57270[21], 1, 1), + gsSPVertex(&D_0A000410_E57270[24], 2, 2), + gsSPVertex(&D_0A000410_E57270[31], 14, 4), + gsSPVertex(&D_0A000410_E57270[47], 14, 18), + gsSP2Triangles(1, 4, 13, 0, 1, 13, 18, 0), + gsSP2Triangles(2, 5, 19, 0, 2, 19, 3, 0), + gsSP2Triangles(5, 20, 19, 0, 6, 0, 16, 0), + gsSP2Triangles(6, 16, 21, 0, 7, 8, 22, 0), + gsSP2Triangles(7, 22, 23, 0, 8, 9, 24, 0), + gsSP2Triangles(8, 24, 22, 0, 9, 25, 24, 0), + gsSP2Triangles(4, 10, 7, 0, 4, 7, 23, 0), + gsSP2Triangles(10, 6, 17, 0, 10, 17, 26, 0), + gsSP2Triangles(11, 12, 27, 0, 11, 27, 28, 0), + gsSP2Triangles(12, 29, 27, 0, 13, 11, 28, 0), + gsSP2Triangles(13, 28, 18, 0, 14, 30, 31, 0), + gsSPVertex(&D_0A000410_E57270[41], 6, 0), + gsSPVertex(&D_0A000410_E57270[50], 1, 6), + gsSPVertex(&D_0A000410_E57270[55], 1, 7), + gsSPVertex(&D_0A000410_E57270[60], 5, 8), + gsSP2Triangles(1, 0, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 1, 9, 0, 2, 9, 6, 0), + gsSP2Triangles(3, 4, 10, 0, 3, 10, 7, 0), + gsSP2Triangles(4, 5, 11, 0, 4, 11, 10, 0), + gsSP1Triangle(5, 12, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A001CD0_E58B30[] = { + gsSPMatrix(&Entity_Tweester_mtxOuterWhirl, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_Tweester_RenderOuterWhirl), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_Tweester_RenderInnerWhirl[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_2CYCLE), + gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(D_0A000000_E56E60, 31, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 2, 0, 5, 0, 3, 0), + gsSP2Triangles(5, 3, 6, 0, 7, 8, 5, 0), + gsSP2Triangles(7, 5, 6, 0, 9, 7, 10, 0), + gsSP2Triangles(9, 10, 11, 0, 12, 13, 14, 0), + gsSP2Triangles(12, 14, 15, 0, 13, 16, 14, 0), + gsSP2Triangles(10, 12, 15, 0, 10, 15, 11, 0), + gsSP2Triangles(17, 18, 19, 0, 17, 19, 20, 0), + gsSP2Triangles(18, 21, 22, 0, 18, 22, 23, 0), + gsSP2Triangles(19, 24, 25, 0, 19, 25, 20, 0), + gsSP2Triangles(26, 27, 28, 0, 29, 26, 28, 0), + gsSP2Triangles(29, 28, 30, 0, 22, 29, 30, 0), + gsSP1Triangle(22, 30, 23, 0), + gsSPVertex(&D_0A000000_E56E60[9], 1, 0), + gsSPVertex(&D_0A000000_E56E60[21], 1, 1), + gsSPVertex(&D_0A000000_E56E60[24], 2, 2), + gsSPVertex(&D_0A000000_E56E60[31], 14, 4), + gsSPVertex(&D_0A000000_E56E60[47], 14, 18), + gsSP2Triangles(1, 4, 13, 0, 1, 13, 18, 0), + gsSP2Triangles(2, 5, 19, 0, 2, 19, 3, 0), + gsSP2Triangles(5, 20, 19, 0, 6, 0, 16, 0), + gsSP2Triangles(6, 16, 21, 0, 7, 8, 22, 0), + gsSP2Triangles(7, 22, 23, 0, 8, 9, 24, 0), + gsSP2Triangles(8, 24, 22, 0, 9, 25, 24, 0), + gsSP2Triangles(4, 10, 7, 0, 4, 7, 23, 0), + gsSP2Triangles(10, 6, 17, 0, 10, 17, 26, 0), + gsSP2Triangles(11, 12, 27, 0, 11, 27, 28, 0), + gsSP2Triangles(12, 29, 27, 0, 13, 11, 28, 0), + gsSP2Triangles(13, 28, 18, 0, 14, 30, 31, 0), + gsSPVertex(&D_0A000000_E56E60[41], 6, 0), + gsSPVertex(&D_0A000000_E56E60[50], 1, 6), + gsSPVertex(&D_0A000000_E56E60[55], 1, 7), + gsSPVertex(&D_0A000000_E56E60[60], 5, 8), + gsSP2Triangles(1, 0, 8, 0, 1, 8, 9, 0), + gsSP2Triangles(2, 1, 9, 0, 2, 9, 6, 0), + gsSP2Triangles(3, 4, 10, 0, 3, 10, 7, 0), + gsSP2Triangles(4, 5, 11, 0, 4, 11, 10, 0), + gsSP1Triangle(5, 12, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_Tweester_Render[] = { + gsSPDisplayList(D_0A001B50_E589B0), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/UltraBlock.c b/src/entity/model/UltraBlock.c new file mode 100644 index 0000000000..9a051a542c --- /dev/null +++ b/src/entity/model/UltraBlock.c @@ -0,0 +1,129 @@ +#include "common.h" + +#include "entity/model/UltraBlock.vtx.inc.c" + +#include "entity/model/UltraBlock_tex.png.inc.c" +#include "entity/model/UltraBlock_tex.pal.inc.c" +Gfx Entity_UltraBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000580_E45690), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000480_E45590, G_IM_FMT_CI, 16, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_UltraBlock_mtx = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx Entity_UltraBlock_RenderTop[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[24], 1, 0), + gsSPVertex(&D_0A000000_E45110[28], 1, 1), + gsSPVertex(&D_0A000000_E45110[35], 1, 2), + gsSPVertex(&D_0A000000_E45110[39], 1, 3), + gsSPVertex(&D_0A000000_E45110[43], 1, 4), + gsSPVertex(&D_0A000000_E45110[47], 2, 5), + gsSPVertex(&D_0A000000_E45110[52], 1, 7), + gsSPVertex(&D_0A000000_E45110[56], 16, 8), + gsSP2Triangles(8, 9, 0, 0, 8, 0, 5, 0), + gsSP2Triangles(10, 11, 2, 0, 10, 2, 1, 0), + gsSP2Triangles(6, 3, 12, 0, 6, 12, 13, 0), + gsSP2Triangles(4, 7, 14, 0, 4, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderRightFrontEdge[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[48], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderLeftFrontEdge[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[40], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderRightBackEdge[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[32], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderLeftBackEdge[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[24], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderBottom[] = { + gsDPPipeSync(), + gsSPDisplayList(Entity_UltraBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E45110[0], 24, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_RenderBlock[] = { + gsSPMatrix(&Entity_UltraBlock_mtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW), + gsSPDisplayList(Entity_UltraBlock_RenderBottom), + gsSPDisplayList(Entity_UltraBlock_RenderLeftBackEdge), + gsSPDisplayList(Entity_UltraBlock_RenderRightBackEdge), + gsSPDisplayList(Entity_UltraBlock_RenderLeftFrontEdge), + gsSPDisplayList(Entity_UltraBlock_RenderRightFrontEdge), + gsSPDisplayList(Entity_UltraBlock_RenderTop), + gsSPPopMatrix(G_MTX_MODELVIEW), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlock_Render[] = { + gsSPDisplayList(Entity_UltraBlock_RenderBlock), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/UltraBlockContent.c b/src/entity/model/UltraBlockContent.c new file mode 100644 index 0000000000..3487f4412f --- /dev/null +++ b/src/entity/model/UltraBlockContent.c @@ -0,0 +1,73 @@ +#include "common.h" + +unsigned char D_0A000000_E4AA80[] = { +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 17, 34, 34, 34, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 18, 102, 102, 102, 102, 34, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 102, 0, 0, 0, 0, 102, 39, 112, 0, 0, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 0, 0, 7, 113, 96, 0, 0, 0, 0, 0, 0, 6, 39, 112, 0, 0, 0, 0, 119, 22, 0, 0, 0, 0, 0, 0, 0, 0, 98, 119, 0, 0, 0, 7, 118, 102, 0, 0, 0, 0, 0, 0, 0, 0, 102, 39, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 0, 2, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 16, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 7, 118, 34, 0, 0, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 0, 0, 33, 103, 112, 0, 0, 0, 7, 118, 32, 0, 0, 0, 0, 0, 0, 0, 22, 119, 0, 0, 0, 0, 0, 119, 98, 0, 0, 0, 0, 0, 0, 1, 103, 112, 0, 0, 0, 0, 0, 7, 118, 34, 0, 0, 0, 0, 2, 22, 119, 0, 0, 0, 0, 0, 0, 0, 119, 98, 17, 17, 18, 34, 34, 103, 112, 0, 0, 0, 0, 0, 0, 0, 7, 118, 102, 102, 102, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 119, 119, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 119, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +unsigned char D_0A000200_E4AC80[] = { +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 221, 221, 221, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 221, 221, 216, 136, 136, 153, 160, 0, 0, 0, 0, 0, 0, 0, 0, 221, 221, 216, 136, 137, 154, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 221, 210, 42, 136, 137, 34, 170, 170, 0, 0, 0, 0, 0, 0, 0, 13, 221, 210, 36, 169, 138, 34, 74, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 209, 36, 169, 138, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 13, 221, 129, 36, 170, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 154, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 221, 129, 36, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 141, 129, 20, 186, 170, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 8, 136, 130, 18, 75, 162, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 9, 136, 130, 17, 36, 65, 18, 75, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 137, 33, 17, 17, 36, 187, 170, 160, 0, 0, 0, 0, 0, 0, 0, 152, 153, 148, 34, 36, 75, 186, 170, 0, 0, 0, 0, 0, 0, 0, 0, 9, 153, 154, 171, 187, 187, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 170, 170, 170, 170, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 153, 154, 170, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +unsigned char D_0A000400_E4AE80[] = { +0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 17, 18, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 114, 102, 102, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 38, 221, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 221, 150, 39, 112, 0, 0, 0, 0, 0, 0, 0, 0, 119, 22, 221, 221, 136, 137, 98, 119, 0, 0, 0, 0, 0, 0, 0, 7, 113, 109, 221, 152, 137, 170, 166, 39, 112, 0, 0, 0, 0, 0, 0, 119, 38, 221, 210, 169, 138, 42, 170, 98, 119, 0, 0, 0, 0, 0, 7, 114, 109, 221, 209, 74, 138, 20, 170, 166, 103, 112, 0, 0, 0, 0, 119, 98, 221, 221, 209, 74, 138, 20, 186, 170, 38, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 154, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 141, 221, 129, 74, 170, 20, 186, 170, 22, 119, 0, 0, 0, 0, 119, 98, 152, 221, 130, 20, 164, 20, 186, 170, 22, 119, 0, 0, 0, 0, 7, 118, 41, 141, 132, 33, 17, 68, 186, 161, 103, 112, 0, 0, 0, 0, 0, 119, 98, 152, 137, 66, 36, 75, 170, 22, 119, 0, 0, 0, 0, 0, 0, 7, 118, 41, 137, 171, 187, 186, 161, 103, 112, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 170, 170, 22, 119, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 41, 153, 153, 146, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 98, 153, 153, 38, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 118, 33, 18, 103, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 102, 102, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 119, 119, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +unsigned char D_0A000600_E4B080[] = { +89, 138, 247, 171, 231, 69, 49, 193, 196, 193, 230, 231, 204, 145, 89, 139, 83, 183, 59, 47, 42, 101, 0, 209, 93, 119, 92, 183, 0, 1, 0, 1, }; + + +Vtx Entity_UltraBlockContent_vtx[] = { + {{{ 13, 13, 0 }, 0, { 0, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, 13, 0 }, 0, { 1024, 0 }, { 255, 255, 255, 255 }}}, + {{{ -13, -13, 0 }, 0, { 1024, 1024 }, { 255, 255, 255, 255 }}}, + {{{ 13, -13, 0 }, 0, { 0, 1024 }, { 255, 255, 255, 255 }}}, +}; + +Gfx Entity_UltraBlockContent_LoadPalette[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000600_E4B080), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlockContent_RenderImage[] = { + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_UltraBlockContent_LoadPalette), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(Entity_UltraBlockContent_vtx, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlockContent_Render4[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTextureBlock_4b(D_0A000400_E4AE80, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_UltraBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlockContent_Render2[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPLoadTextureBlock_4b(D_0A000400_E4AE80, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_UltraBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlockContent_Render3[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), + gsDPLoadTextureBlock_4b(D_0A000200_E4AC80, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_UltraBlockContent_RenderImage), + gsSPEndDisplayList(), +}; + +Gfx Entity_UltraBlockContent_Render[] = { + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPLoadTextureBlock_4b(D_0A000200_E4AC80, G_IM_FMT_CI, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsSPDisplayList(Entity_UltraBlockContent_RenderImage), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/UnusedBlock.c b/src/entity/model/UnusedBlock.c new file mode 100644 index 0000000000..b3d449b55a --- /dev/null +++ b/src/entity/model/UnusedBlock.c @@ -0,0 +1,157 @@ +#include "common.h" + +#include "entity/model/UnusedBlock.vtx.inc.c" + +#include "entity/model/UnusedBlock_img1.png.inc.c" +Gfx D_0A0007C0_E3D590[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A0003C0_E3D190, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_NONE), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +#include "entity/model/UnusedBlock_img2.png.inc.c" +#include "entity/model/UnusedBlock_img2.pal.inc.c" +Gfx D_0A000968_E3D738[] = { + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A000848_E3D618, G_IM_FMT_CI, 16, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A000948_E3D718), + gsDPSetTextureFilter(G_TF_BILERP), + gsDPSetTextureConvert(G_TC_FILT), + gsSPEndDisplayList(), +}; + +Mtx D_0A000A20_E3D7F0 = { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00000000, 0x00000001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 } + } +}; + +Gfx D_0A000A60_E3D830[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsSPDisplayList(D_0A0007C0_E3D590), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E3CDD0[4], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000AA8_E3D878[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsSPDisplayList(D_0A0007C0_E3D590), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx D_0A000AE0_E3D8B0[] = { + gsSPDisplayList(D_0A000AA8_E3D878), + gsSPVertex(&D_0A000000_E3CDD0[8], 28, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSPVertex(&D_0A000000_E3CDD0[36], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000B28_E3D8F8[] = { + gsSPDisplayList(D_0A000AA8_E3D878), + gsSPVertex(&D_0A000000_E3CDD0[8], 28, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSPVertex(&D_0A000000_E3CDD0[56], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(&D_0A000000_E3CDD0[36], 16, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000B78_E3D948[] = { + gsSPDisplayList(D_0A000AA8_E3D878), + gsSPVertex(&D_0A000000_E3CDD0[8], 28, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPVertex(&D_0A000000_E3CDD0[36], 16, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000BC0_E3D990[] = { + gsSPDisplayList(D_0A000AA8_E3D878), + gsSPVertex(&D_0A000000_E3CDD0[8], 28, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(20, 21, 22, 0, 20, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSPVertex(&D_0A000000_E3CDD0[56], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPVertex(&D_0A000000_E3CDD0[36], 16, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C10_E3D9E0[] = { + gsSPDisplayList(D_0A000AA8_E3D878), + gsSPVertex(&D_0A000000_E3CDD0[52], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C30_E3DA00[] = { + gsSPDisplayList(D_0A000A60_E3D830), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C40_E3DA10[] = { + gsSPDisplayList(D_0A000C10_E3D9E0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C50_E3DA20[] = { + gsSPDisplayList(D_0A000AE0_E3D8B0), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C60_E3DA30[] = { + gsSPDisplayList(D_0A000B28_E3D8F8), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C70_E3DA40[] = { + gsSPDisplayList(D_0A000BC0_E3D990), + gsSPEndDisplayList(), +}; + +Gfx D_0A000C80_E3DA50[] = { + gsSPDisplayList(D_0A000B78_E3D948), + gsSPEndDisplayList(), +}; diff --git a/src/entity/model/WoodenCrate.c b/src/entity/model/WoodenCrate.c new file mode 100644 index 0000000000..be2cd223bc --- /dev/null +++ b/src/entity/model/WoodenCrate.c @@ -0,0 +1,1434 @@ +#include "common.h" + +#include "entity/model/WoodenCrate.vtx.inc.c" + +#include "entity/model/WoodenCrate_img1.png.inc.c" +#include "entity/model/WoodenCrate_img1.pal.inc.c" +Gfx Entity_WoodenCrate_LoadTexture1[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A001D60_E533A0), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A001560_E52BA0, G_IM_FMT_CI, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +#include "entity/model/WoodenCrate_img2.png.inc.c" +#include "entity/model/WoodenCrate_img2.pal.inc.c" +Gfx Entity_WoodenCrate_LoadTexture2[] = { + gsDPSetTextureLUT(G_TT_RGBA16), + gsDPLoadTLUT_pal16(0, D_0A002628_E53C68), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock_4b(D_0A001E28_E53468, G_IM_FMT_CI, 64, 64, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Mtx Entity_WoodenCrate_FragmentsMatrices[] = { + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF5001E, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC000A000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0006001E, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x4000A000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF40015, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC71CE000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00050015, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x471CE000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF6000A, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xEAABD555, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0006000B, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x92F7F1C7, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFE0002, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80008000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF50023, 0xFFF10001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC0000000, 0x60000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00060023, 0xFFF10001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x40000000, 0x60000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF40023, 0xFFFA0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC71C0000, 0x20000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00050023, 0xFFFA0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x471C0000, 0x20000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF60023, 0x00040001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xEAAB0000, 0x2AAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00060023, 0x00030001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x92F70000, 0x0E390000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFE0023, 0x000C0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80000000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC001E, 0xFFF50001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000A000, 0xC0000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC001E, 0x00060001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000A000, 0x40000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC0015, 0xFFF40001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000E000, 0xC71C0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC0015, 0x00050001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000E000, 0x471C0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC000A, 0xFFF60001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000D555, 0xEAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC000B, 0x00060001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000F1C7, 0x92F70000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC0002, 0xFFFE0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F001E, 0xFFF50001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000A000, 0xC0000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F001E, 0x00060001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000A000, 0x40000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F0015, 0xFFF40001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000E000, 0xC71C0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F0015, 0x00050001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000E000, 0x471C0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F000A, 0xFFF60001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000D555, 0xEAAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F000B, 0x00060001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x0000F1C7, 0x92F70000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F0002, 0xFFFE0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x00008000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF5001E, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC000A000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0006001E, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x4000A000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF40015, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC71CE000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00050015, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x471CE000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF6000A, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xEAABD555, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x0006000B, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x92F7F1C7, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFE0002, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80008000, 0x00000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF50000, 0xFFF10001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC0000000, 0x60000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00060000, 0xFFF10001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x40000000, 0x60000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF40000, 0xFFFA0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC71C0000, 0x20000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00050000, 0xFFFA0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x471C0000, 0x20000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFF60000, 0x00040001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xEAAB0000, 0x2AAB0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x00060000, 0x00030001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x92F70000, 0x0E390000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFFE0000, 0x000C0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x80000000, 0x80000000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC0011, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC7B18000, 0x384F0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F0011, 0x000F0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x384F8000, 0x384F0000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0x000F0011, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0x384F8000, 0xC7B10000 } + } + }, + { + .m = { + { 0x00010000, 0x00000000, + 0x00000001, 0x00000000 }, + { 0x00000000, 0x00010000, + 0xFFEC0011, 0xFFEC0001 }, + { 0x00000000, 0x00000000, + 0x00000000, 0x00000000 }, + { 0x00000000, 0x00000000, + 0xC7B18000, 0xC7B10000 } + } + }, +}; + +Gfx D_0A003270_E548B0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[274], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0032B0_E548F0[] = { + gsSPDisplayList(D_0A003270_E548B0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0032C0_E54900[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[265], 9, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP1Triangle(4, 8, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003318_E54958[] = { + gsSPDisplayList(D_0A0032C0_E54900), + gsSPEndDisplayList(), +}; + +Gfx D_0A003328_E54968[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[255], 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 4, 3, 5, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(7, 6, 5, 0, 7, 5, 8, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003388_E549C8[] = { + gsSPDisplayList(D_0A003328_E54968), + gsSPEndDisplayList(), +}; + +Gfx D_0A003398_E549D8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[249], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0033E0_E54A20[] = { + gsSPDisplayList(D_0A003398_E549D8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0033F0_E54A30[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[243], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003438_E54A78[] = { + gsSPDisplayList(D_0A0033F0_E54A30), + gsSPEndDisplayList(), +}; + +Gfx D_0A003448_E54A88[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[239], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003488_E54AC8[] = { + gsSPDisplayList(D_0A003448_E54A88), + gsSPEndDisplayList(), +}; + +Gfx D_0A003498_E54AD8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[235], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0034D8_E54B18[] = { + gsSPDisplayList(D_0A003498_E54AD8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0034E8_E54B28[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[145], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003528_E54B68[] = { + gsSPDisplayList(D_0A0034E8_E54B28), + gsSPEndDisplayList(), +}; + +Gfx D_0A003538_E54B78[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[136], 9, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(2, 5, 4, 0, 2, 4, 1, 0), + gsSP2Triangles(5, 8, 7, 0, 5, 7, 6, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003590_E54BD0[] = { + gsSPDisplayList(D_0A003538_E54B78), + gsSPEndDisplayList(), +}; + +Gfx D_0A0035A0_E54BE0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[126], 10, 0), + gsSP2Triangles(4, 3, 2, 0, 4, 2, 1, 0), + gsSP2Triangles(4, 1, 0, 0, 0, 1, 7, 0), + gsSP2Triangles(0, 7, 6, 0, 0, 6, 5, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 9, 0), + gsSP1Triangle(5, 9, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003600_E54C40[] = { + gsSPDisplayList(D_0A0035A0_E54BE0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003610_E54C50[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[120], 6, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(2, 5, 4, 0, 2, 4, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003658_E54C98[] = { + gsSPDisplayList(D_0A003610_E54C50), + gsSPEndDisplayList(), +}; + +Gfx D_0A003668_E54CA8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[114], 6, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(0, 1, 5, 0, 0, 5, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0036B0_E54CF0[] = { + gsSPDisplayList(D_0A003668_E54CA8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0036C0_E54D00[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[110], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003700_E54D40[] = { + gsSPDisplayList(D_0A0036C0_E54D00), + gsSPEndDisplayList(), +}; + +Gfx D_0A003710_E54D50[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[106], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003750_E54D90[] = { + gsSPDisplayList(D_0A003710_E54D50), + gsSPEndDisplayList(), +}; + +Gfx D_0A003760_E54DA0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[231], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0037A0_E54DE0[] = { + gsSPDisplayList(D_0A003760_E54DA0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0037B0_E54DF0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[222], 9, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(2, 5, 4, 0, 2, 4, 1, 0), + gsSP2Triangles(5, 8, 7, 0, 5, 7, 6, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003808_E54E48[] = { + gsSPDisplayList(D_0A0037B0_E54DF0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003818_E54E58[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[212], 10, 0), + gsSP2Triangles(4, 3, 2, 0, 4, 2, 1, 0), + gsSP2Triangles(4, 1, 0, 0, 0, 1, 7, 0), + gsSP2Triangles(0, 7, 6, 0, 0, 6, 5, 0), + gsSP2Triangles(5, 6, 7, 0, 5, 7, 9, 0), + gsSP1Triangle(5, 9, 8, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003878_E54EB8[] = { + gsSPDisplayList(D_0A003818_E54E58), + gsSPEndDisplayList(), +}; + +Gfx D_0A003888_E54EC8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[206], 6, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(2, 5, 4, 0, 2, 4, 1, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0038D0_E54F10[] = { + gsSPDisplayList(D_0A003888_E54EC8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0038E0_E54F20[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[200], 6, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSP2Triangles(0, 1, 5, 0, 0, 5, 4, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003928_E54F68[] = { + gsSPDisplayList(D_0A0038E0_E54F20), + gsSPEndDisplayList(), +}; + +Gfx D_0A003938_E54F78[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[196], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003978_E54FB8[] = { + gsSPDisplayList(D_0A003938_E54F78), + gsSPEndDisplayList(), +}; + +Gfx D_0A003988_E54FC8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[192], 4, 0), + gsSP2Triangles(3, 2, 1, 0, 3, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0039C8_E55008[] = { + gsSPDisplayList(D_0A003988_E54FC8), + gsSPEndDisplayList(), +}; + +Gfx D_0A0039D8_E55018[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[231], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A18_E55058[] = { + gsSPDisplayList(D_0A0039D8_E55018), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A28_E55068[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[222], 9, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP1Triangle(4, 8, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A80_E550C0[] = { + gsSPDisplayList(D_0A003A28_E55068), + gsSPEndDisplayList(), +}; + +Gfx D_0A003A90_E550D0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[212], 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP1Triangle(8, 6, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003AF0_E55130[] = { + gsSPDisplayList(D_0A003A90_E550D0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B00_E55140[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[206], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B48_E55188[] = { + gsSPDisplayList(D_0A003B00_E55140), + gsSPEndDisplayList(), +}; + +Gfx D_0A003B58_E55198[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[200], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003BA0_E551E0[] = { + gsSPDisplayList(D_0A003B58_E55198), + gsSPEndDisplayList(), +}; + +Gfx D_0A003BB0_E551F0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[196], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003BF0_E55230[] = { + gsSPDisplayList(D_0A003BB0_E551F0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C00_E55240[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[192], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C40_E55280[] = { + gsSPDisplayList(D_0A003C00_E55240), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C50_E55290[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[188], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003C90_E552D0[] = { + gsSPDisplayList(D_0A003C50_E55290), + gsSPEndDisplayList(), +}; + +Gfx D_0A003CA0_E552E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[179], 9, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP1Triangle(4, 8, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003CF8_E55338[] = { + gsSPDisplayList(D_0A003CA0_E552E0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D08_E55348[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[169], 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP1Triangle(8, 6, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D68_E553A8[] = { + gsSPDisplayList(D_0A003D08_E55348), + gsSPEndDisplayList(), +}; + +Gfx D_0A003D78_E553B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[163], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003DC0_E55400[] = { + gsSPDisplayList(D_0A003D78_E553B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003DD0_E55410[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[157], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E18_E55458[] = { + gsSPDisplayList(D_0A003DD0_E55410), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E28_E55468[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[153], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E68_E554A8[] = { + gsSPDisplayList(D_0A003E28_E55468), + gsSPEndDisplayList(), +}; + +Gfx D_0A003E78_E554B8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[149], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003EB8_E554F8[] = { + gsSPDisplayList(D_0A003E78_E554B8), + gsSPEndDisplayList(), +}; + +Gfx D_0A003EC8_E55508[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[145], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F08_E55548[] = { + gsSPDisplayList(D_0A003EC8_E55508), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F18_E55558[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[136], 9, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSP2Triangles(4, 6, 7, 0, 4, 7, 8, 0), + gsSP1Triangle(4, 8, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F70_E555B0[] = { + gsSPDisplayList(D_0A003F18_E55558), + gsSPEndDisplayList(), +}; + +Gfx D_0A003F80_E555C0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[126], 10, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 5, 6, 7, 0), + gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0), + gsSP2Triangles(8, 9, 7, 0, 8, 7, 6, 0), + gsSP1Triangle(8, 6, 5, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003FE0_E55620[] = { + gsSPDisplayList(D_0A003F80_E555C0), + gsSPEndDisplayList(), +}; + +Gfx D_0A003FF0_E55630[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[120], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A004038_E55678[] = { + gsSPDisplayList(D_0A003FF0_E55630), + gsSPEndDisplayList(), +}; + +Gfx D_0A004048_E55688[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[114], 6, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 1, 0, 4, 1, 0, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A004090_E556D0[] = { + gsSPDisplayList(D_0A004048_E55688), + gsSPEndDisplayList(), +}; + +Gfx D_0A0040A0_E556E0[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[110], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0040E0_E55720[] = { + gsSPDisplayList(D_0A0040A0_E556E0), + gsSPEndDisplayList(), +}; + +Gfx D_0A0040F0_E55730[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING), + gsSPSetGeometryMode(G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[106], 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A004130_E55770[] = { + gsSPDisplayList(D_0A0040F0_E55730), + gsSPEndDisplayList(), +}; + +Gfx D_0A004140_E55780[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture2), + gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E51640[9], 3, 0), + gsSPVertex(&D_0A000000_E51640[24], 1, 3), + gsSPVertex(&D_0A000000_E51640[30], 2, 4), + gsSPVertex(&D_0A000000_E51640[48], 25, 6), + gsSP2Triangles(0, 6, 7, 0, 2, 1, 7, 0), + gsSP2Triangles(2, 7, 8, 0, 9, 10, 3, 0), + gsSP2Triangles(11, 9, 5, 0, 11, 5, 4, 0), + gsSP2Triangles(12, 11, 13, 0, 14, 15, 9, 0), + gsSP2Triangles(14, 9, 11, 0, 13, 11, 16, 0), + gsSP2Triangles(17, 10, 9, 0, 18, 10, 17, 0), + gsSP2Triangles(19, 20, 21, 0, 21, 22, 19, 0), + gsSP2Triangles(23, 22, 21, 0, 22, 24, 25, 0), + gsSP2Triangles(22, 25, 26, 0, 27, 28, 24, 0), + gsSP2Triangles(27, 24, 22, 0, 29, 30, 24, 0), + gsSPVertex(&D_0A000000_E51640[49], 2, 0), + gsSPVertex(&D_0A000000_E51640[66], 1, 2), + gsSPVertex(&D_0A000000_E51640[72], 14, 3), + gsSPVertex(&D_0A000000_E51640[88], 15, 17), + gsSP2Triangles(2, 3, 4, 0, 5, 17, 18, 0), + gsSP2Triangles(6, 19, 20, 0, 7, 10, 21, 0), + gsSP2Triangles(7, 21, 22, 0, 8, 23, 10, 0), + gsSP2Triangles(9, 24, 10, 0, 9, 10, 7, 0), + gsSP2Triangles(10, 23, 25, 0, 11, 26, 12, 0), + gsSP2Triangles(12, 7, 11, 0, 11, 7, 27, 0), + gsSP2Triangles(13, 28, 29, 0, 14, 1, 16, 0), + gsSP2Triangles(1, 0, 15, 0, 1, 15, 30, 0), + gsSP1Triangle(16, 1, 31, 0), + gsSPVertex(&D_0A000000_E51640[48], 2, 0), + gsSPVertex(&D_0A000000_E51640[86], 2, 2), + gsSPVertex(&D_0A000000_E51640[103], 3, 4), + gsSP2Triangles(1, 0, 2, 0, 2, 0, 4, 0), + gsSP1Triangle(3, 5, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_0A004268_E558A8[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_WoodenCrate_LoadTexture1), + gsSPClearGeometryMode(G_LIGHTING | G_SHADING_SMOOTH), + gsSPSetGeometryMode(G_CULL_BACK), + gsSPVertex(&D_0A000000_E51640[0], 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), + gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(8, 11, 12, 0, 8, 12, 13, 0), + gsSP2Triangles(8, 13, 14, 0, 8, 14, 15, 0), + gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0), + gsSP2Triangles(16, 19, 20, 0, 16, 20, 21, 0), + gsSP2Triangles(16, 21, 22, 0, 16, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 27, 0), + gsSP2Triangles(24, 27, 28, 0, 24, 28, 29, 0), + gsSP2Triangles(24, 29, 30, 0, 24, 30, 31, 0), + gsSPVertex(&D_0A000000_E51640[32], 16, 0), + gsSP2Triangles(0, 2, 3, 0, 0, 3, 4, 0), + gsSP2Triangles(0, 4, 5, 0, 0, 5, 6, 0), + gsSP2Triangles(0, 6, 7, 0, 0, 7, 8, 0), + gsSP2Triangles(1, 9, 10, 0, 1, 10, 11, 0), + gsSP2Triangles(1, 11, 12, 0, 1, 12, 13, 0), + gsSP2Triangles(1, 13, 14, 0, 1, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_WoodenCrate_Render[] = { + gsSPDisplayList(D_0A004268_E558A8), + gsSPDisplayList(D_0A004140_E55780), + gsSPEndDisplayList(), +}; + +Gfx* Entity_WoodenCrate_FragmentsRender[] = { + D_0A004130_E55770, + D_0A0040E0_E55720, + D_0A004090_E556D0, + D_0A004038_E55678, + D_0A003FE0_E55620, + D_0A003F70_E555B0, + D_0A003F08_E55548, + D_0A003EB8_E554F8, + D_0A003E68_E554A8, + D_0A003E18_E55458, + D_0A003DC0_E55400, + D_0A003D68_E553A8, + D_0A003CF8_E55338, + D_0A003C90_E552D0, + D_0A003C40_E55280, + D_0A003BF0_E55230, + D_0A003BA0_E551E0, + D_0A003B48_E55188, + D_0A003AF0_E55130, + D_0A003A80_E550C0, + D_0A003A18_E55058, + D_0A0039C8_E55008, + D_0A003978_E54FB8, + D_0A003928_E54F68, + D_0A0038D0_E54F10, + D_0A003878_E54EB8, + D_0A003808_E54E48, + D_0A0037A0_E54DE0, + D_0A003750_E54D90, + D_0A003700_E54D40, + D_0A0036B0_E54CF0, + D_0A003658_E54C98, + D_0A003600_E54C40, + D_0A003590_E54BD0, + D_0A003528_E54B68, + D_0A0034D8_E54B18, + D_0A003488_E54AC8, + D_0A003438_E54A78, + D_0A0033E0_E54A20, + D_0A003388_E549C8, + D_0A003318_E54958, + D_0A0032B0_E548F0, +}; diff --git a/src/entity/model/YellowBlock.c b/src/entity/model/YellowBlock.c new file mode 100644 index 0000000000..08de503ec3 --- /dev/null +++ b/src/entity/model/YellowBlock.c @@ -0,0 +1,47 @@ +#include "common.h" + +#include "entity/model/YellowBlock.vtx.inc.c" + +#include "entity/model/YellowBlock_face.png.inc.c" +Gfx Entity_YellowBlock_LoadTexture[] = { + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetTextureDetail(G_TD_CLAMP), + gsDPSetTextureLOD(G_TL_TILE), + gsDPLoadTextureBlock(D_0A000180_E3B9F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), + gsDPSetTexturePersp(G_TP_PERSP), + gsDPSetTextureFilter(G_TF_BILERP), + gsSPEndDisplayList(), +}; + +Gfx Entity_YellowBlock_RenderTopBottom[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_YellowBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E3B870[16], 8, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_YellowBlock_RenderSides[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_1CYCLE), + gsSPDisplayList(Entity_YellowBlock_LoadTexture), + gsSPClearGeometryMode(G_LIGHTING), + gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH), + gsSPVertex(&D_0A000000_E3B870[0], 16, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), + gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), + gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0), + gsSPEndDisplayList(), +}; + +Gfx Entity_YellowBlock_Render[] = { + gsSPDisplayList(Entity_YellowBlock_RenderSides), + gsSPDisplayList(Entity_YellowBlock_RenderTopBottom), + gsSPEndDisplayList(), +}; diff --git a/src/entity/sbk_omo/E2F750.c b/src/entity/sbk_omo/E2F750.c deleted file mode 100644 index c894458525..0000000000 --- a/src/entity/sbk_omo/E2F750.c +++ /dev/null @@ -1,93 +0,0 @@ -#include "common.h" - -extern u8 D_802BCA30_E31380[]; -// size unknown -typedef struct structE2F750 { - /* 0x00 */ s8 unk_00; - /* 0x01 */ s8 unk_01; - /* 0x02 */ s8 unk_02; - /* 0x03 */ s8 unk_03; - /* 0x04 */ char unk_04[0x9C]; - /* 0xA0 */ s32 unk_A0; - /* 0xA4 */ s16 unk_A4; - /* 0xA6 */ s16 unk_A6; - /* 0xA8 */ s16 unk_A8; - /* 0xAA */ char unk_AA[14]; - /* 0xB8 */ f32 unk_B8; -} structE2F750; - -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BAE00_E2F750); - -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BAF84_E2F8D4); - -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB108_E2FA58); - -s32 func_802BB3B8_E2FD08(void); -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB3B8_E2FD08); - -void func_802BB704_E30054(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf.unk; - s32 i; - - data->unk_02--; - if (data->unk_02 <= 0) { - i = data->unk_01; - if (D_802BCA30_E31380[i] == 0xFF) { - i = 0; - } - data->unk_03 = D_802BCA30_E31380[i++]; - data->unk_02 = D_802BCA30_E31380[i++]; - data->unk_01 = i; - } -} - -s32 func_802BB76C_E300BC(Entity* entity); -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB76C_E300BC); - -s32 func_802BB7E0_E30130(Entity* entity); -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB7E0_E30130); - -void func_802BB8E4_E30234(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf.unk; - f32 temp_f20_2; - - f32 temp_f4 = (atan2(entity->position.x, entity->position.z, data->unk_A4, data->unk_A8) - data->unk_B8) * 0.03125f; - if (temp_f4 >= 0.0f && temp_f4 < 0.01) { - temp_f4 = 0.01f; - } - if (temp_f4 < 0.0f && temp_f4 > -0.01) { - temp_f4 = -0.01f; - } - - data->unk_B8 = clamp_angle(data->unk_B8 + temp_f4); - temp_f20_2 = data->unk_B8 * TAU / 360.0f; - entity->position.x += sin_rad(temp_f20_2); - entity->position.z -= cos_rad(temp_f20_2); - - if (func_802BB76C_E300BC(entity) != 0) { - func_802BB7E0_E30130(entity); - } -} - -INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BBA60_E303B0); - -void func_802BBDB8_E30708(Entity* entity) { - entity->scale.x += 0.1; - if (entity->scale.x >= 1.0) { - entity->scale.x = 1.0f; - } - - entity->scale.z = entity->scale.y = entity->scale.x; -} - -void func_802BBE14_E30764(Entity* entity) { - structE2F750* data = (structE2F750*)entity->dataBuf.unk; - - data->unk_A0 = *CreateEntityVarArgBuffer; - func_802BB7E0_E30130(entity); - data->unk_03 = 0; - entity->renderSetupFunc = &func_802BB3B8_E2FD08; - entity->scale.x = 0; - entity->scale.y = 0; - entity->scale.z = 0; -} diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c deleted file mode 100644 index 5dfc1632ec..0000000000 --- a/src/entity/sbk_omo/E307C0.c +++ /dev/null @@ -1,108 +0,0 @@ -#include "common.h" -#include "effects.h" - -// size unknown -typedef struct structE307C0 { - /* 0x00 */ s8 unk_00; - /* 0x01 */ u8 unk_01; - /* 0x02 */ s8 unk_02; - /* 0x03 */ s8 unk_03; - /* 0x04 */ s8 unk_04; - /* 0x05 */ s8 unk_05; - /* 0x08 */ Vec3f position; -} structE307C0; - -extern u8 D_802BCAA0_E313F0[]; - -s32 func_802BBE70_E307C0(void); -INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BBE70_E307C0); - -void func_802BC2BC_E30C0C(Entity* entity) { - u16 currentFloor = gCollisionStatus.currentFloor; - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - PlayerStatus* playerStatus = &gPlayerStatus; - s32 actionState = playerStatus->actionState; - f32 x,y,z,sp2C; - s32 result = 0; - - if ((currentFloor & COLLISION_WITH_ENTITY_BIT) && ((currentFloor & 0xFF) == entity->listIndex) && (actionState == ACTION_STATE_HAMMER)) { - x = playerStatus->position.x; - y = playerStatus->position.y + 5.0f; - z = playerStatus->position.z; - sp2C = 10.0f; - - add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); - if (npc_raycast_down_sides(0x10000, &x, &y, &z, &sp2C) != 0) { - if (D_8010C978 & COLLISION_WITH_ENTITY_BIT) { - result = get_entity_type(D_8010C978) == ENTITY_TYPE_STAR_BOX_LAUCHER; - } - } - } else if ((entity->collisionFlags & 1) && ((actionState == ACTION_STATE_GROUND_POUND) || (actionState == ACTION_STATE_ULTRA_POUND))) { - result = 1; - } else if (entity->collisionFlags & 0x40) { - result = -1; - } - - if (result != 0) { - data->unk_02 &= ~1; - fx_damage_stars(3, entity->position.x, entity->position.y + 35.0f, entity->position.z, 0, -1.0f, 0, 3); - if (result > 0) { - data->unk_02 |= 1; - } - entity->position.y -= 2.0f; - exec_entity_commandlist(entity); - data->unk_01 = 4; - disable_player_static_collisions(); - playerStatus->unk_C5 = 5; - } -} - -void func_802BC4B8_E30E08(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - s32 i; - - data->unk_04--; - if (data->unk_04 <= 0) { - i = data->unk_03; - if (D_802BCAA0_E313F0[i] != 0xFF) { - data->unk_05 = D_802BCAA0_E313F0[i++]; - data->unk_04 = D_802BCAA0_E313F0[i++]; - data->unk_03 = i; - } - } -} - -void func_802BC514_E30E64(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - entity->position.x = data->position.x + (data->unk_01 & 1 ? 1.0f : -1.0f); - data->unk_01 -= 1; -} - -void func_802BC558_E30EA8(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - entity->position.x = data->position.x; - entity->position.z = data->position.y; -} - -INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC570_E30EC0); - -void func_802BC99C_E312EC(Entity* entity) { - if (!(entity->flags & ENTITY_FLAGS_2000000)) { - exec_entity_commandlist(entity); - } -} - -void func_802BC9CC_E3131C(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - if (data->unk_02 & 1) { - entity_start_script(entity); - } -} - -void func_802BC9FC_E3134C(Entity* entity) { - structE307C0* data = (structE307C0*)entity->dataBuf.unk; - entity->renderSetupFunc = &func_802BBE70_E307C0; - data->position.x = entity->position.x; - data->position.z = entity->position.y; - data->position.y = entity->position.z; -} diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c new file mode 100644 index 0000000000..7384848695 --- /dev/null +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -0,0 +1,276 @@ +#include "common.h" +#include "effects.h" +#include "entity.h" +#include "ld_addrs.h" + +extern Gfx Entity_StarBoxLauncher_RenderBottom[]; +extern Gfx Entity_StarBoxLauncher_RenderTop[]; +extern unsigned char D_0A000D08_E56748[]; +extern unsigned char D_0A000508_E55F48[]; + +u8 D_802BCAA0_E313F0[] = { + 0x00, 0x02, + 0xE0, 0x02, + 0xC0, 0x02, + 0xA0, 0x02, + 0x00, 0x02, + 0xE0, 0x02, + 0xC0, 0x02, + 0xA0, 0x02, + 0x00, 0x02, + 0xE0, 0x02, + 0xC0, 0x02, + 0xA0, 0x02, + 0x00, 0x02, + 0xE0, 0x02, + 0xC0, 0x02, + 0xA0, 0x02, + 0x00, 0x02, + 0xFF, 0x00 +}; + +void entity_StarBoxLauncher_setupGfx(s32 entityIndex) { + Gfx* gfxPos = gMasterGfxPos; + Entity* entity = get_entity_by_index(entityIndex); + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + Matrix4f sp10; + Matrix4f sp50; + + guMtxIdentF(sp10); + guTranslateF(sp50, entity->position.x, data->basePosY, entity->position.z); + guMtxCatF(sp50, sp10, sp50); + guMtxF2L(sp50, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxPos++, ENTITY_ADDR(entity, Gfx*, Entity_StarBoxLauncher_RenderBottom)); + gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW); + + gDPPipeSync(gfxPos++); + gDPSetTextureLUT(gfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gfxPos++, 0, D_0A000D08_E56748); + gSPTexture(gfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCombineMode(gfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetTextureDetail(gfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gfxPos++, G_TL_TILE); + gDPLoadTextureBlock_4b(gfxPos++, D_0A000508_E55F48, G_IM_FMT_CI, 128, 32, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 7, 5, G_TX_NOLOD, G_TX_NOLOD); + gDPSetTexturePersp(gfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gfxPos++, G_TF_BILERP); + gDPSetTileSize(gfxPos++, G_TX_RENDERTILE, data->faceTexOffset * 4, 0, (data->faceTexOffset + 124) * 4, 31 * 4); + + gMasterGfxPos = gfxPos; +} + +void entity_StarBoxLauncher_check_launch(Entity* entity) { + u16 currentFloor = gCollisionStatus.currentFloor; + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + PlayerStatus* playerStatus = &gPlayerStatus; + s32 actionState = playerStatus->actionState; + f32 x,y,z,hitDepth; + s32 result = 0; + + if ((currentFloor & COLLISION_WITH_ENTITY_BIT) && (currentFloor & 0xFF) == entity->listIndex && actionState == ACTION_STATE_HAMMER) { + x = playerStatus->position.x; + y = playerStatus->position.y + 5.0f; + z = playerStatus->position.z; + hitDepth = 10.0f; + + add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); + if (npc_raycast_down_sides(0x10000, &x, &y, &z, &hitDepth) != 0) { + if (D_8010C978 & COLLISION_WITH_ENTITY_BIT) { + result = get_entity_type(D_8010C978) == ENTITY_TYPE_STAR_BOX_LAUCHER; + } + } + } else if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && (actionState == ACTION_STATE_GROUND_POUND || actionState == ACTION_STATE_ULTRA_POUND)) { + result = 1; + } else if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_HAMMER) { + result = -1; + } + + if (result != 0) { + data->flags &= ~1; + fx_damage_stars(3, entity->position.x, entity->position.y + 35.0f, entity->position.z, 0, -1.0f, 0, 3); + if (result > 0) { + data->flags |= 1; + } + entity->position.y -= 2.0f; + exec_entity_commandlist(entity); + data->timer = 4; + disable_player_static_collisions(); + playerStatus->unk_C5 = 5; + } +} + +void entity_StarBoxLauncher_update_face_anim(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + s32 i; + + data->faceAnimTimer--; + if (data->faceAnimTimer <= 0) { + i = data->faceDataIndex; + if (D_802BCAA0_E313F0[i] != 0xFF) { + data->faceTexOffset = D_802BCAA0_E313F0[i++]; + data->faceAnimTimer = D_802BCAA0_E313F0[i++]; + data->faceDataIndex = i; + } + } +} + +void entity_StarBoxLauncher_shake_box(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + entity->position.x = data->basePosX + (data->timer & 1 ? 1.0f : -1.0f); + data->timer--; +} + +void entity_StarBoxLauncher_restore_pos(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + entity->position.x = data->basePosX; + entity->position.z = data->basePosZ; +} + +void entity_StarBoxLauncher_launch(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + f64 temp; + + switch (data->state) { + case 0: + data->faceAnimTimer = 0; + data->faceDataIndex = 0; + data->state++; + data->riseSpeedPhase = 90.0f; + data->faceTexOffset = D_802BCAA0_E313F0[0]; + data->faceAnimTimer = D_802BCAA0_E313F0[1]; + sfx_play_sound(SOUND_2085); + /* fallthrough */ + case 1: + temp = entity->position.y; + entity->position.y = temp + 8.0 * sin_rad(data->riseSpeedPhase * TAU / 360.0f); + data->riseSpeedPhase += 2.0f; + if (data->riseSpeedPhase >= 180.0f) { + data->riseSpeedPhase = 180.0f; + } + + if (entity->position.y > data->basePosY + 50.0f) { + entity->position.y = data->basePosY + 50.0f; + data->maxRotationZ = 2.0f; + data->state++; + data->riseVelocity = 3.0f; + data->rotationZPhase = 90.0f; + } + break; + case 2: + entity->rotation.z = data->maxRotationZ * sin_rad(data->rotationZPhase * TAU / 360.0f); + clamp_angle(entity->rotation.z); + data->rotationZPhase += 30.0f; + if (data->rotationZPhase >= 360.0f) { + data->rotationZPhase -= 360.0f; + } + + entity->position.y += data->riseVelocity * cos_rad(data->riseSpeedPhase * TAU / 360.0f); + data->riseSpeedPhase += 30.0f; + if (data->riseSpeedPhase >= 360.0f) { + data->riseSpeedPhase -= 360.0f; + } + + data->riseVelocity -= 0.08; + if (data->riseVelocity < 2.8) { + data->state++; + } + break; + case 3: + data->maxRotationZ -= 0.1; + if (data->maxRotationZ <= 0.0f) { + data->maxRotationZ = 0.0f; + } + + entity->rotation.z = data->maxRotationZ * sin_rad(data->rotationZPhase * TAU / 360.0f); + clamp_angle(entity->rotation.z); + data->rotationZPhase += 30.0f; + if (data->rotationZPhase >= 360.0f) { + data->rotationZPhase -= 360.0f; + } + + entity_StarBoxLauncher_update_face_anim(entity); + + entity->position.y += data->riseVelocity * cos_rad(data->riseSpeedPhase * TAU / 360.0f); + data->riseSpeedPhase += 30.0f; + if (data->riseSpeedPhase >= 360.0f) { + data->riseSpeedPhase -= 360.0f; + } + + data->riseVelocity -= 0.08; + if (data->riseVelocity <= 0.0f) { + data->riseVelocity = 0.0f; + data->timer = 8; + data->state++; + entity->rotation.z = 0.0f; + } + break; + case 4: + if (--data->timer == 0) { + data->state++; + } + break; + case 5: + entity->position.y -= 8.0f; + if (entity->position.y <= data->basePosY) { + entity->position.y = data->basePosY; + data->state++; + } + break; + case 6: + exec_entity_commandlist(entity); + data->state = 0; + enable_player_static_collisions(); + break; + } +} + +void func_802BC99C_E312EC(Entity* entity) { + if (!(entity->flags & ENTITY_FLAGS_2000000)) { + exec_entity_commandlist(entity); + } +} + +void entity_StarBoxLauncher_start_script(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + if (data->flags & 1) { + entity_start_script(entity); + } +} + +void entity_StarBoxLauncher_init(Entity* entity) { + StarBoxLauncherData* data = entity->dataBuf.starBoxLauncher; + entity->renderSetupFunc = entity_StarBoxLauncher_setupGfx; + data->basePosX = entity->position.x; + data->basePosY = entity->position.y; + data->basePosZ = entity->position.z; +} + + + +EntityScript Entity_StarBoxLauncher_Script = { + es_SetCallback(entity_StarBoxLauncher_check_launch, 0) + es_SetCallback(entity_StarBoxLauncher_shake_box, 4) + es_Call(entity_StarBoxLauncher_restore_pos) + es_SetCallback(NULL, 3) + es_Call(entity_StarBoxLauncher_start_script) + es_SetCallback(NULL, 1) + es_SetCallback(entity_StarBoxLauncher_launch, 0) + es_SetCallback(func_802BC99C_E312EC, 0) + es_Restart + es_End +}; + +EntityModelScript Entity_StarBoxLauncher_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_StarBoxLauncher_RenderTop, RENDER_MODE_SURFACE_OPA); + +EntityBlueprint Entity_StarBoxLauncher = { + .flags = ENTITY_FLAGS_8000, + .typeDataSize = sizeof(StarBoxLauncherData), + .renderCommandList = Entity_StarBoxLauncher_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_StarBoxLauncher_init, + .updateEntityScript = Entity_StarBoxLauncher_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(StarBoxLauncher) }, + .entityType = ENTITY_TYPE_STAR_BOX_LAUCHER, + .aabbSize = { 35, 35, 35 } +}; diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c new file mode 100644 index 0000000000..b21c10aa5e --- /dev/null +++ b/src/entity/sbk_omo/Tweester.c @@ -0,0 +1,329 @@ +#include "common.h" +#include "entity.h" +#include "ld_addrs.h" + +u8 Entity_Tweester_FaceAnimationData[] = { + 0, 2, + 32, 2, + 0, 3, + 32, 2, + 0, 80, + 255, 0 +}; + +extern unsigned char D_0A000BF0_E57A50[]; +extern unsigned char D_0A000FF0_E57E50[]; +extern unsigned char D_0A0018A0_E58700[]; +extern unsigned char D_0A0014A0_E58300[]; +extern Mtx Entity_Tweester_mtxInnerWhirl; +extern Mtx Entity_Tweester_mtxOuterWhirl; +extern Gfx Entity_Tweester_RenderInnerWhirl[]; +extern Gfx Entity_Tweester_RenderOuterWhirl[]; +extern Gfx Entity_Tweester_Render[]; + + +void entity_Tweester_render_inner_whirl(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + TweesterData* data = entity->dataBuf.tweester; + Matrix4f sp18; + Matrix4f sp58; + Gfx* gfx; + + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_Tweester_mtxInnerWhirl)); + guRotateF(sp58, data->innerWhirlRotY, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &data->mtxInnerWhirl); + gDisplayContext->matrixStack[gMatrixListPos] = data->mtxInnerWhirl; + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gfx = ENTITY_ADDR(entity, Gfx*, Entity_Tweester_RenderInnerWhirl); + gSPDisplayList(gMasterGfxPos++, gfx); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void entity_Tweester_render_outer_whirl(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + TweesterData* data = entity->dataBuf.tweester; + Matrix4f sp18; + Matrix4f sp58; + Gfx* gfx; + + guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_Tweester_mtxOuterWhirl)); + guRotateF(sp58, data->outerWhirlRotY, 0.0f, 1.0f, 0.0f); + guMtxCatF(sp58, sp18, sp18); + guMtxF2L(sp18, &data->mtxOuterWhirl); + gDisplayContext->matrixStack[gMatrixListPos] = data->mtxOuterWhirl; + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gfx = ENTITY_ADDR(entity, Gfx*, Entity_Tweester_RenderOuterWhirl); + gSPDisplayList(gMasterGfxPos++, gfx); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +void entity_Tweester_render_face(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + TweesterData* data = entity->dataBuf.tweester; + + gDPPipeSync(gMasterGfxPos++); + gDPSetTextureLUT(gMasterGfxPos++, G_TT_RGBA16); + gDPLoadTLUT_pal16(gMasterGfxPos++, 0, D_0A0018A0_E58700); + gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPLoadTextureBlock_4b(gMasterGfxPos++, D_0A0014A0_E58300, G_IM_FMT_CI, 64, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->faceAnimTexOffset * 4, 0, (data->faceAnimTexOffset + 124) * 4, 31 * 4); +} + +void entity_Tweester_setupGfx(s32 entityIndex) { + Entity* entity = get_entity_by_index(entityIndex); + TweesterData* data = entity->dataBuf.tweester; + + gDPPipeSync(gMasterGfxPos++); + gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); + gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); + gDPSetCombineLERP(gMasterGfxPos++, TEXEL1, 0, TEXEL0, 0, TEXEL1, 0, TEXEL0, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000BF0_E57A50); + gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPLoadSync(gMasterGfxPos++); + gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); + gDPPipeSync(gMasterGfxPos++); + gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C); + gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 32, D_0A000FF0_E57E50); + gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPLoadSync(gMasterGfxPos++); + gDPLoadTile(gMasterGfxPos++, G_TX_LOADTILE, 0, 0, 0x007C, 0x007C); + gDPPipeSync(gMasterGfxPos++); + gDPSetTile(gMasterGfxPos++, G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0080, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD); + gDPSetTileSize(gMasterGfxPos++, 1, 0, 0, 0x007C, 0x007C); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->innerWhirlTexOffsetX, data->innerWhirlTexOffsetY, data->innerWhirlTexOffsetX + 124, data->innerWhirlTexOffsetY + 124); + entity_Tweester_render_inner_whirl(entityIndex); + gDPPipeSync(gMasterGfxPos++); + gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, data->outerWhirlTexOffsetX, data->outerWhirlTexOffsetY, data->outerWhirlTexOffsetX + 124, data->outerWhirlTexOffsetY + 124); + entity_Tweester_render_outer_whirl(entityIndex); + entity_Tweester_render_face(entityIndex); +} + + +void entity_Tweester_update_face_anim(Entity* entity) { + TweesterData* data = entity->dataBuf.tweester; + s32 i; + + data->faceAnimTimer--; + if (data->faceAnimTimer <= 0) { + i = data->faceAnimState; + if (Entity_Tweester_FaceAnimationData[i] == 255) { + i = 0; + } + data->faceAnimTexOffset = Entity_Tweester_FaceAnimationData[i++]; + data->faceAnimTimer = Entity_Tweester_FaceAnimationData[i++]; + data->faceAnimState = i; + } +} + +s32 entity_Tweester_has_reached_target(Entity* entity) { + TweesterData* data = entity->dataBuf.tweester; + s32 count = 0; + f32 deltaX = fabsf(data->targetX - entity->position.x); + f32 deltaZ = fabsf(data->targetZ - entity->position.z); + + if (deltaX <= 10.0f) { + count++; + } + if (deltaZ <= 10.0f) { + count++; + } + + return count >= 2; +} + +void entity_Tweester_select_target_point(Entity* entity) { + TweesterData* data = entity->dataBuf.tweester; + s32 pathOffset; + s32** paths; + s32 i, j; + s32* pathPtr; + + pathOffset = data->pathOffset; + paths = data->paths; + + if (pathOffset == 0) { + for (i = 0; (s32)*paths != -1; paths++, i++) { + } + j = rand_int(i * 10 - 1) / 10; + paths = data->paths; + data->currentPath = paths[j]; + } + pathPtr = &data->currentPath[pathOffset]; + if (*pathPtr != 0x80000000) { + pathOffset += 3; + if (*pathPtr == 0x80000001){ + pathOffset = 0; + pathPtr = data->currentPath; + data->targetX = *pathPtr++; + data->targetY = *pathPtr++; + data->targetZ = *pathPtr++; + } else { + data->targetX = *pathPtr++; + data->targetY = *pathPtr++; + data->targetZ = *pathPtr++; + } + } + data->pathOffset = pathOffset; +} + +void entity_Tweester_move(Entity* entity) { + TweesterData* data = entity->dataBuf.tweester; + f32 yawRad; + + f32 temp_f4 = (atan2(entity->position.x, entity->position.z, data->targetX, data->targetZ) - data->yaw) * 0.03125f; + if (temp_f4 >= 0.0f && temp_f4 < 0.01) { + temp_f4 = 0.01f; + } + if (temp_f4 < 0.0f && temp_f4 > -0.01) { + temp_f4 = -0.01f; + } + + data->yaw = clamp_angle(data->yaw + temp_f4); + yawRad = data->yaw * TAU / 360.0f; + entity->position.x += sin_rad(yawRad); + entity->position.z -= cos_rad(yawRad); + + if (entity_Tweester_has_reached_target(entity)) { + entity_Tweester_select_target_point(entity); + } +} + +void entity_Tweester_idle(Entity* entity) { + PlayerStatus* playerStatus = &gPlayerStatus; + PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; + PlayerData* playerData = &gPlayerData; + TweesterData* data = entity->dataBuf.tweester; + f32 delta; + f32 targetRotationSpeed; + + if (get_time_freeze_mode() == TIME_FREEZE_NORMAL && + !is_picking_up_item() && + !(playerStatus->flags & PLAYER_STATUS_FLAGS_20) && + (playerData->currentPartner != PARTNER_GOOMBARIO || + playerStatus->inputEnabledCounter == 0 || + playerStatus->actionState == ACTION_STATE_USE_TWEESTER + )) { + entity_Tweester_move(entity); + } + + entity_Tweester_update_face_anim(entity); + data->frameCounter++; + + if (data->frameCounter < 100) { + targetRotationSpeed = 3.5f; + delta = (targetRotationSpeed - data->rotationSpeed) / 28.0f; + if (delta < 0.02) { + delta = 0.02f; + } + data->rotationSpeed += delta; + if (data->rotationSpeed >= targetRotationSpeed){ + data->rotationSpeed = targetRotationSpeed; + } + } else { + targetRotationSpeed = 1.3f; + delta = (targetRotationSpeed - data->rotationSpeed) * 0.0625f; + if (delta > -0.02) { + delta = -0.02f; + } + data->rotationSpeed += delta; + if (data->rotationSpeed <= targetRotationSpeed){ + data->rotationSpeed = targetRotationSpeed; + data->frameCounter = 0; + } + } + + data->innerWhirlRotY += data->rotationSpeed; + if (data->innerWhirlRotY > 360.0f) { + data->innerWhirlRotY = 0.0f; + } + + delta = data->innerWhirlRotY - data->outerWhirlRotY; + if (delta < 0.0f) { + delta += 360.0f; + } + delta *= 0.25; + data->outerWhirlRotY += delta; + if (data->outerWhirlRotY > 360.0f) { + data->outerWhirlRotY = 0.0f; + } + + data->innerWhirlTexOffsetX += 4; + data->innerWhirlTexOffsetY -= 8; + data->outerWhirlTexOffsetX += 4; + data->outerWhirlTexOffsetY -= 16; + + entity->rotation.y = -gCameras[CAM_DEFAULT].currentYaw; + + if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE || partnerActionStatus->actingPartner != PARTNER_BOW) { + if (playerStatus->actionState == ACTION_STATE_USE_TWEESTER) { + Npc* npc = npc_find_closest_simple(entity->position.x, entity->position.y, entity->position.z, 50.0f); + if (npc != NULL && (npc->flags & NPC_FLAG_PARTICLE)) { + TweesterTouchingPartner = entity; + } + } + + if (!is_picking_up_item() && + !(playerStatus->flags & PLAYER_STATUS_FLAGS_20) && + playerStatus->actionState != ACTION_STATE_USE_TWEESTER && + playerStatus->blinkTimer == 0 && + fabs(dist2D(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z)) <= 50.0 + ) { + TweesterTouchingPlayer = entity; + playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_4; + set_action_state(ACTION_STATE_USE_TWEESTER); + } + } +} + +void entity_Tweester_anim_scale(Entity* entity) { + entity->scale.x += 0.1; + if (entity->scale.x >= 1.0) { + entity->scale.x = 1.0f; + } + entity->scale.z = entity->scale.y = entity->scale.x; +} + +void entity_Tweester_init(Entity* entity) { + TweesterData* data = entity->dataBuf.tweester; + + data->paths = (s32**)CreateEntityVarArgBuffer[0]; + entity_Tweester_select_target_point(entity); + data->faceAnimTexOffset = 0; + entity->renderSetupFunc = entity_Tweester_setupGfx; + entity->scale.x = 0; + entity->scale.y = 0; + entity->scale.z = 0; +} + +EntityScript Entity_Tweester_Script ={ + es_SetCallback(entity_Tweester_anim_scale, 20) + es_SetCallback(entity_Tweester_idle, 0) + es_End +}; + +EntityModelScript Entity_Tweester_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Tweester_Render, RENDER_MODE_SURFACE_XLU_LAYER1); + +EntityBlueprint Entity_Tweester = { + .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .typeDataSize = sizeof(TweesterData), + .renderCommandList = Entity_Tweester_RenderScript, + .modelAnimationNodes = 0, + .fpInit = entity_Tweester_init, + .updateEntityScript = Entity_Tweester_Script, + .fpHandleCollision = NULL, + { .dma = ENTITY_ROM(Tweester) }, + .entityType = ENTITY_TYPE_TWEESTER, + .aabbSize = { 50, 70, 50 } +}; + diff --git a/src/entity.c b/src/entity_model.c similarity index 99% rename from src/entity.c rename to src/entity_model.c index c0e98c0413..fd40d5de31 100644 --- a/src/entity.c +++ b/src/entity_model.c @@ -368,7 +368,7 @@ void appendGfx_entity_model(EntityModel* model) { gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMasterGfxPos++); - if (!(model->flags & ENTITY_MODEL_FLAGS_200)) { + if (!(model->flags & ENTITY_MODEL_FLAGS_REFLECT)) { return; } @@ -498,7 +498,7 @@ void draw_entity_model_C(s32 modelIdx, Mtx* transformMtx) { if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { if (!(model->flags & ENTITY_MODEL_FLAGS_40) && (model->flags & (1 << gCurrentCamID))) { - model->flags |= ENTITY_MODEL_FLAGS_200; + model->flags |= ENTITY_MODEL_FLAGS_REFLECT; model->transform = *transformMtx; model->vertexArray = NULL; rtPtr->renderMode = model->renderMode; @@ -528,7 +528,7 @@ void draw_entity_model_D(s32 modelIdx, Mtx* transformMtx, s32 arg2, Vec3s* verte if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { if (model->flags & (1 << gCurrentCamID)) { - model->flags |= ENTITY_MODEL_FLAGS_200; + model->flags |= ENTITY_MODEL_FLAGS_REFLECT; model->transform = *transformMtx; D_80154374 = arg2; model->vertexArray = vertexArray; @@ -677,7 +677,7 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMasterGfxPos++); - if (!(model->flags & ENTITY_MODEL_FLAGS_200)) { + if (!(model->flags & ENTITY_MODEL_FLAGS_REFLECT)) { return; } diff --git a/src/npc.c b/src/npc.c index cef2c03de5..78bef5e69e 100644 --- a/src/npc.c +++ b/src/npc.c @@ -566,9 +566,9 @@ void update_npcs(void) { Shadow* shadow = get_shadow_by_index(npc->shadowIndex); EntityModel* entityModel = get_entity_model(shadow->entityModelID); - entityModel->flags &= ~ENTITY_MODEL_FLAGS_200; + entityModel->flags &= ~ENTITY_MODEL_FLAGS_REFLECT; if (npc->flags & NPC_FLAG_REFLECT_WALL) { - entityModel->flags |= ENTITY_MODEL_FLAGS_200; + entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; } x = npc->pos.x; @@ -919,7 +919,7 @@ void enable_npc_shadow(Npc* npc) { if (!(npc->flags & NPC_FLAG_HAS_SHADOW)) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags &= ~SHADOW_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAGS_HIDDEN; npc->flags = npc->flags | (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW); } } @@ -929,7 +929,7 @@ void disable_npc_shadow(Npc* npc) { if (npc->flags & NPC_FLAG_HAS_SHADOW) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags |= SHADOW_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAGS_HIDDEN; npc->flags &= ~NPC_FLAG_HAS_SHADOW; npc->flags &= ~NPC_FLAG_DIRTY_SHADOW; } diff --git a/src/state_battle.c b/src/state_battle.c index 494e82c684..2f0dfdca36 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -146,7 +146,7 @@ void state_step_end_battle(void) { init_item_entity_list(); init_script_list(); init_npc_list(); - func_80110E58(); + init_entity_data(); init_trigger_list(); if (gGameStatusPtr->demoFlags & 1) { diff --git a/src/state_file_select.c b/src/state_file_select.c index c72500dc29..b1160e3c24 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -284,7 +284,7 @@ void state_step_exit_language_select(void) { init_item_entity_list(); init_script_list(); init_npc_list(); - func_80110E58(); + init_entity_data(); init_trigger_list(); mapShape = load_asset_by_name(&wMapShapeName, &mapShapeSize); decode_yay0(mapShape, &D_80210000); diff --git a/src/state_pause.c b/src/state_pause.c index 5e7013c903..152cd74b87 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -156,7 +156,7 @@ void state_step_unpause(void) { init_item_entity_list(); init_script_list(); init_npc_list(); - func_80110E58(); + init_entity_data(); init_trigger_list(); func_801497FC(D_800A0924); bgm_reset_max_volume(); diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 521b9a6c80..562acfbedb 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -314,7 +314,7 @@ void func_802B6820_E256F0(void) { collisionStatus->lastWallHammered = result; if (result >= 0) { if (result & COLLISION_WITH_ENTITY_BIT) { - get_entity_by_index(result)->unk_07 = 0; + get_entity_by_index(result)->collisionTimer = 0; } } } @@ -345,7 +345,7 @@ void func_802B6820_E256F0(void) { collisionStatus->lastWallHammered = result; if (result >= 0) { if (result & COLLISION_WITH_ENTITY_BIT) { - get_entity_by_index(result)->unk_07 = 0; + get_entity_by_index(result)->collisionTimer = 0; } } } @@ -370,14 +370,14 @@ void func_802B6820_E256F0(void) { action_hammer_play_hit_fx(HammerHit->hitID); if (collisionStatus->lastWallHammered >= 0 && (collisionStatus->lastWallHammered & COLLISION_WITH_ENTITY_BIT)) { - get_entity_by_index(collisionStatus->lastWallHammered)->unk_07 = 0; + get_entity_by_index(collisionStatus->lastWallHammered)->collisionTimer = 0; playerStatus->flags |= PLAYER_STATUS_FLAGS_1000000; } else if (HammerHit->hitID < 0) { playerStatus->flags |= PLAYER_STATUS_FLAGS_1000000; } if (HammerHit->hitID < 0 && gPlayerData.hammerLevel >= 2) { - D_8015A578.unk_00 = 1; + D_8015A578.unk_00 = TRUE; D_8015A578.unk_08 = playerStatus->position.y; } } diff --git a/src/world/action/super_boots.c b/src/world/action/super_boots.c index 02f0fd0848..3b6eb04cf2 100644 --- a/src/world/action/super_boots.c +++ b/src/world/action/super_boots.c @@ -95,7 +95,7 @@ void func_802B6000_E26DE0(void) { if (sp10 >= 0) { if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT && (entityType = get_entity_type(collisionStatus->currentFloor), entityType == ENTITY_TYPE_RED_SWITCH || entityType == ENTITY_TYPE_BLUE_SWITCH)) { - get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= 1; + get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= ENTITY_COLLISION_PLAYER_TOUCH_FLOOR; playerStatus->fallState = 0xB; playerStatus->flags &= ~0x8; break; @@ -126,7 +126,7 @@ void func_802B6000_E26DE0(void) { sfx_play_sound_at_player(SOUND_149, 0); start_rumble(0x80, 0x19); tempStruct = &D_8015A578; - tempStruct->unk_00 = 1; + tempStruct->unk_00 = TRUE; tempStruct->unk_08 = playerStatus->position.y; playerStatus->flags |= 0x400; } diff --git a/src/world/action/ultra_boots.c b/src/world/action/ultra_boots.c index 1f23874668..30fd1a3b44 100644 --- a/src/world/action/ultra_boots.c +++ b/src/world/action/ultra_boots.c @@ -67,7 +67,7 @@ void func_802B6000_E26710(void) { if (sp10 >= 0 && collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT ) { entityType = get_entity_type(collisionStatus->currentFloor); if (entityType == ENTITY_TYPE_BLUE_SWITCH || entityType == ENTITY_TYPE_RED_SWITCH) { - get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= 1; + get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= ENTITY_COLLISION_PLAYER_TOUCH_FLOOR; disable_player_input(); playerStatus->fallState = 0xB; break; @@ -113,7 +113,7 @@ void func_802B6000_E26710(void) { sfx_play_sound_at_player(SOUND_14A, 0); start_rumble(0x100, 0x32); - D_8015A578.unk_00 = 1; + D_8015A578.unk_00 = TRUE; D_8015A578.unk_08 = playerStatus->position.y; playerStatus->flags |= 0x400; return; @@ -140,7 +140,7 @@ void func_802B6000_E26710(void) { sfx_play_sound_at_player(SOUND_14A, 0); start_rumble(0x100, 0x32); - D_8015A578.unk_00 = 1; + D_8015A578.unk_00 = TRUE; D_8015A578.unk_08 = playerStatus->position.y; playerStatus->flags |= 0x400; } diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index b3e3e235af..8e8637f593 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -2,7 +2,6 @@ #include "../partners.h" #include "npc.h" -extern Entity* TweesterTouchingPlayer; extern struct TweesterPhysics* PlayerTweesterPhysics; void func_802B6000_E2A340(void) { diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c index 6f5ad103d3..e40ba71739 100644 --- a/src/world/area_arn/arn_02/events.c +++ b/src/world/area_arn/arn_02/events.c @@ -2,6 +2,7 @@ #include "sprite/npc/cleft.h" #include "sprite/npc/goomba.h" #include "effects.h" +#include "entity.h" EvtScript N(exitWalk_802410F0) = EXIT_WALK_SCRIPT(60, 0, "arn_05", 1); @@ -37,11 +38,11 @@ static s32 N(pad_12C4)[] = { EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_DIZZY_DIAL, -248, 193, 45, 17, EVT_SAVE_FLAG(1005)) EVT_CALL(MakeItemEntity, ITEM_LETTER07, 536, 260, 227, 17, EVT_SAVE_FLAG(1006)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), -350, 172, 170, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -350, 172, 170, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1002)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 225, 265, 30, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 225, 265, 30, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1003)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 275, 265, 150, 0, 151, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 275, 265, 150, 0, 151, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1004)) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index 08012fbb42..dce0b71eed 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -1,7 +1,9 @@ #include "arn_03.h" +#include "entity.h" #include "sprite/npc/boo.h" #include "sprite/npc/world_bow.h" + static s32 N(KeyItemChoiceList)[112]; EvtScript N(exitWalk_80241830) = EXIT_WALK_SCRIPT(60, 0, "arn_07", 1); @@ -975,7 +977,7 @@ static s32 N(pad_47DC) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 300, 237, 60, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 300, 237, 60, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1007)) EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 250, 237, 125, 0, MAKE_ENTITY_END) EVT_RETURN diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 6068b5f44c..53dbab1576 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -3,6 +3,7 @@ #include "sprite/npc/goomba.h" #include "sprite/npc/cleft.h" #include "effects.h" +#include "entity.h" EvtScript N(exitWalk_80243480) = EXIT_WALK_SCRIPT(60, 0, "arn_02", 1); @@ -281,11 +282,11 @@ static s32 N(pad_403C)[] = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 450, 285, 120, 0, 140, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 450, 285, 120, 0, 140, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1008)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 720, 333, 75, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 720, 333, 75, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1009)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA0E8), 600, 290, 200, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 600, 290, 200, 0, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1010)) EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 540, 230, 13, 17, EVT_SAVE_FLAG(1019)) EVT_RETURN diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 6c2bfd4428..61c5300b60 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -1,4 +1,5 @@ #include "arn_05.h" +#include "entity.h" #include "sprite/npc/boo.h" #include "sprite/npc/world_bow.h" #include "sprite/npc/world_tubba.h" diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index b6838e6ae7..58636ba088 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -1,4 +1,5 @@ #include "arn_07.h" +#include "entity.h" #include "sprite/npc/world_tubba.h" #include "sprite/npc/paragoomba.h" #include "sprite/npc/world_skolar.h" @@ -87,7 +88,7 @@ EvtScript N(80243B28) = { EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -24) - EVT_CALL(MakeEntity, 0x802BCD68, 10, 30, -155, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 10, 30, -155, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243B28))) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_END_IF diff --git a/src/world/area_arn/arn_08/events.c b/src/world/area_arn/arn_08/events.c index 65ad9895a0..e819b6e487 100644 --- a/src/world/area_arn/arn_08/events.c +++ b/src/world/area_arn/arn_08/events.c @@ -2,6 +2,7 @@ #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/yakkey.h" #include "world/partners.h" +#include "entity.h" enum { NPC_TUBBAS_HEART, @@ -434,7 +435,7 @@ static s32 N(pad_184C) = { EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -23) - EVT_CALL(MakeEntity, 0x802BCE84, 0, 30, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 0, 30, 0, 0, MAKE_ENTITY_END) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_09/events.c b/src/world/area_arn/arn_09/events.c index 97f5a228a4..a6f51f1082 100644 --- a/src/world/area_arn/arn_09/events.c +++ b/src/world/area_arn/arn_09/events.c @@ -1,7 +1,8 @@ #include "arn_09.h" +#include "entity.h" #include "sprite/npc/tubbas_heart.h" -extern s32 D_000001E4; +extern s16 Entity_ScriptSpring_AnimLaunch[]; EvtScript N(80240140) = { EVT_SET_GROUP(EVT_GROUP_1B) @@ -81,7 +82,7 @@ EvtScript N(802403A0) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EAA30), 0, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 0, 0, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802403A0))) EVT_RETURN EVT_END @@ -201,6 +202,6 @@ ApiStatus N(func_80240000_BF6060)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - play_model_animation(entity->virtualModelIndex, &D_000001E4); + play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); return ApiStatus_DONE2; } diff --git a/src/world/area_arn/arn_10/events.c b/src/world/area_arn/arn_10/events.c index 77a3444a15..24ee80c880 100644 --- a/src/world/area_arn/arn_10/events.c +++ b/src/world/area_arn/arn_10/events.c @@ -1,4 +1,5 @@ #include "arn_10.h" +#include "entity.h" #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/goomba.h" @@ -262,7 +263,7 @@ EvtScript N(80240BE0) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAFDC, 200, 0, -40, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BE0))) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_12/arn_12.h b/src/world/area_arn/arn_12/arn_12.h index 41f46d396d..e4a7672e31 100644 --- a/src/world/area_arn/arn_12/arn_12.h +++ b/src/world/area_arn/arn_12/arn_12.h @@ -7,8 +7,6 @@ #define NAMESPACE arn_12 -extern s32 D_802EAFDC; - extern EvtScript N(main); extern EvtScript N(80240060); extern NpcGroupList N(npcGroupList_80240BBC); diff --git a/src/world/area_arn/arn_12/events.c b/src/world/area_arn/arn_12/events.c index 91684fa354..49724b3687 100644 --- a/src/world/area_arn/arn_12/events.c +++ b/src/world/area_arn/arn_12/events.c @@ -1,4 +1,5 @@ #include "arn_12.h" +#include "entity.h" #include "sprite/npc/tubbas_heart.h" #include "sprite/npc/goomba.h" @@ -258,7 +259,7 @@ EvtScript N(80240BE0) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802EAFDC), 200, 0, -40, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BE0))) EVT_RETURN EVT_END diff --git a/src/world/area_arn/arn_13/arn_13.h b/src/world/area_arn/arn_13/arn_13.h index 2573011625..344062f98a 100644 --- a/src/world/area_arn/arn_13/arn_13.h +++ b/src/world/area_arn/arn_13/arn_13.h @@ -7,8 +7,6 @@ #define NAMESPACE arn_13 -extern s32 D_802EAFDC; - extern EvtScript N(main); extern EvtScript N(80240060); extern NpcGroupList N(npcGroupList_80240BCC); diff --git a/src/world/area_arn/arn_13/events.c b/src/world/area_arn/arn_13/events.c index 43869a0944..f228f78745 100644 --- a/src/world/area_arn/arn_13/events.c +++ b/src/world/area_arn/arn_13/events.c @@ -1,4 +1,5 @@ #include "arn_13.h" +#include "entity.h" #include "sprite/npc/goomba.h" #include "sprite/npc/tubbas_heart.h" @@ -259,7 +260,7 @@ EvtScript N(80240BF0) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802EAFDC), 200, 0, -40, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 200, 0, -40, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240BF0))) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_00/BFA100.c b/src/world/area_dgb/dgb_00/BFA100.c index ad331b10da..356a258105 100644 --- a/src/world/area_dgb/dgb_00/BFA100.c +++ b/src/world/area_dgb/dgb_00/BFA100.c @@ -1,4 +1,5 @@ #include "dgb_00.h" +#include "entity.h" #include "sprite/npc/boo.h" #include "sprite/npc/sentinel.h" #include "sprite/npc/world_bombette.h" @@ -7,6 +8,7 @@ #include "sprite/npc/world_kooper.h" #include "sprite/npc/world_parakarry.h" + enum { NPC_BOO0, NPC_BOO1, diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 3c6a08ad0d..f3b365ba17 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -3,6 +3,7 @@ #include "sprite/npc/world_tubba.h" #include "message_ids.h" #include "effects.h" +#include "entity.h" #include "world/partners.h" EntryList N(entryList) = { @@ -470,7 +471,7 @@ EvtScript N(80244C38) = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1040), 0) - EVT_CALL(MakeEntity, 0x802BCD68, 490, 8, 0, -80, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 490, 8, 0, -80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80244C38))) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_END_IF diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 4915727369..922ff39ead 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -1,6 +1,7 @@ #include "dgb_03.h" #include "sprite/npc/world_clubba.h" #include "message_ids.h" +#include "entity.h" enum { NPC_WORLD_CLUBBA0, @@ -379,7 +380,7 @@ EvtScript N(802438A8) = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1043), 0) - EVT_CALL(MakeEntity, 0x802BCD68, -355, 218, 75, 80, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -355, 218, 75, 80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802438A8))) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_END_IF diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 37cb3d369b..9842cd95a8 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -3,6 +3,7 @@ #include "world/partners.h" #include "sprite/npc/sentinel.h" #include "message_ids.h" +#include "entity.h" enum { NPC_SENTINEL, @@ -274,7 +275,7 @@ NpcGroupList N(npcGroupList_80243D18) = { #include "world/common/atomic/SuperBlockData.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EA910, 500, -360, 110, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 500, -360, 110, 0, MAKE_ENTITY_END) EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index ad874df5ef..d100d2e5d2 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -1,6 +1,7 @@ #include "dgb_05.h" #include "sprite/npc/world_clubba.h" #include "message_ids.h" +#include "entity.h" enum { NPC_WORLD_CLUBBA0, @@ -108,7 +109,7 @@ static s32 N(pad_1868)[] = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1047), 0) - EVT_CALL(MakeEntity, 0x802BCE84, 510, -210, 100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 510, -210, 100, 0, MAKE_ENTITY_END) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 9f95fb2a52..44ef66c82e 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -1,4 +1,5 @@ #include "dgb_06.h" +#include "entity.h" #include "sprite/npc/boo.h" #include "message_ids.h" @@ -90,7 +91,7 @@ EvtScript N(main) = { #include "world/common/atomic/Chest.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAE30, -300, 50, -200, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_Chest, -300, 50, -200, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(CHEST_FLAG)) EVT_CALL(AssignScript, EVT_PTR(N(EVS_Chest_Interact))) EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -125, 60, 175, 0, MAKE_ENTITY_END) diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 0e1c0d4d23..4e887f9941 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -1,5 +1,6 @@ #include "dgb_07.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/world_clubba.h" enum { @@ -85,8 +86,8 @@ EvtScript N(main) = { EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, -220, 75, -210, 17, EVT_SAVE_FLAG(1050)) - EVT_CALL(MakeEntity, 0x802EAED4, -370, 0, -200, 0, -1, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, 0x802EAED4, -410, 0, -200, 0, -1, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_WoodenCrate, -370, 0, -200, 0, -1, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_WoodenCrate, -410, 0, -200, 0, -1, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_dgb/dgb_10/C4C390.c b/src/world/area_dgb/dgb_10/C4C390.c index 594570a482..9521557250 100644 --- a/src/world/area_dgb/dgb_10/C4C390.c +++ b/src/world/area_dgb/dgb_10/C4C390.c @@ -1,5 +1,6 @@ #include "dgb_10.h" #include "message_ids.h" +#include "entity.h" EntryList N(entryList) = { { 300.0f, 0.0f, -50.0f, 0.0f }, @@ -282,15 +283,15 @@ EvtScript N(80240F20) = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1052), 0) - EVT_CALL(MakeEntity, 0x802BCE84, 500, 0, -100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 500, 0, -100, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240EE0))) EVT_END_IF EVT_IF_EQ(EVT_SAVE_FLAG(1053), 0) - EVT_CALL(MakeEntity, 0x802BCE84, 500, 0, -250, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 500, 0, -250, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240F00))) EVT_END_IF EVT_IF_EQ(EVT_SAVE_FLAG(1054), 0) - EVT_CALL(MakeEntity, 0x802BCE84, 375, 0, -250, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BoardedFloor), 375, 0, -250, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80240F20))) EVT_END_IF EVT_RETURN diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index 4291d43af1..0511cfd84b 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -1,7 +1,8 @@ #include "dgb_11.h" +#include "entity.h" #include "message_ids.h" -extern s32 D_000001E4; +extern s16 Entity_ScriptSpring_AnimLaunch[]; EntryList N(entryList) = { { 450.0f, 0.0f, -40.0f, 0.0f }, @@ -207,7 +208,7 @@ EvtScript N(8024062C) = { EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_D_DOWN_JUMP, 250, 75, -100, 17, EVT_SAVE_FLAG(1055)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EAA30), 375, 0, -250, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 375, 0, -250, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(8024062C))) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_RETURN @@ -221,7 +222,7 @@ ApiStatus N(func_80240000_C4D3E0)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - play_model_animation(entity->virtualModelIndex, &D_000001E4); + play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); return ApiStatus_DONE2; } diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 4cdf53ca23..ead6ba2b93 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -1,6 +1,7 @@ #include "dgb_12.h" #include "message_ids.h" #include "common.h" +#include "entity.h" EntryList N(entryList) = { { -500.0f, 0.0f, -40.0f, 0.0f }, @@ -135,7 +136,7 @@ static s32 N(pad_868)[] = { #include "world/common/atomic/Chest.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAE30, -225, 0, -245, 0, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_Chest, -225, 0, -245, 0, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(1057)) EVT_CALL(AssignScript, EVT_PTR(N(EVS_Chest_Interact))) EVT_RETURN diff --git a/src/world/area_dgb/dgb_14/C4F030.c b/src/world/area_dgb/dgb_14/C4F030.c index 4e96a7012d..196c1a7ec0 100644 --- a/src/world/area_dgb/dgb_14/C4F030.c +++ b/src/world/area_dgb/dgb_14/C4F030.c @@ -1,5 +1,6 @@ #include "dgb_14.h" #include "message_ids.h" +#include "entity.h" EntryList N(entryList) = { { 575.0f, 0.0f, 180.0f, 270.0f }, @@ -108,7 +109,7 @@ static s32 N(pad_47C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 500, 60, 75, 0, 163, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 500, 60, 75, 0, 163, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1065)) EVT_RETURN EVT_END diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index e7f842f51c..bf72bdd038 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -1,6 +1,7 @@ #include "dgb_15.h" #include "message_ids.h" #include "sprite/npc/world_tubba.h" +#include "entity.h" enum { NPC_WORLD_TUBBA, @@ -456,7 +457,7 @@ EvtScript N(80242C38) = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1066), 0) - EVT_CALL(MakeEntity, 0x802BCD68, 130, 8, 175, -80, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 130, 8, 175, -80, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80242C38))) EVT_SET(EVT_MAP_VAR(0), EVT_VAR(0)) EVT_END_IF diff --git a/src/world/area_dgb/dgb_17/C55A60.c b/src/world/area_dgb/dgb_17/C55A60.c index 0cb60ffcf2..543c591366 100644 --- a/src/world/area_dgb/dgb_17/C55A60.c +++ b/src/world/area_dgb/dgb_17/C55A60.c @@ -1,5 +1,6 @@ #include "dgb_17.h" #include "message_ids.h" +#include "entity.h" EntryList N(entryList) = { { -570.0f, 0.0f, 180.0f, 90.0f }, diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index da0052f5a7..ea484f32b0 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -1,5 +1,6 @@ #include "dgb_18.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/world_bombette.h" #include "sprite/npc/world_bow.h" #include "sprite/npc/world_goombario.h" @@ -693,7 +694,7 @@ EvtScript N(8024382C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAE30, 845, 0, 145, -35, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_Chest, 845, 0, 145, -35, 0, MAKE_ENTITY_END) EVT_CALL(AssignChestFlag, EVT_SAVE_FLAG(1071)) EVT_CALL(AssignScript, EVT_PTR(N(8024382C))) EVT_RETURN diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 74b932f899..e3e1e57150 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -2,6 +2,7 @@ #include "effects.h" #include "script_api/battle.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/artist_toad.h" #include "sprite/npc/chuck_quizmo.h" #include "sprite/npc/dryite.h" @@ -1993,7 +1994,7 @@ EvtScript N(makeEntities) = { EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(MakeEntity, 0x802EAF80, 430, 0, -120, 0, 2, EVT_PTR(N(8024D2B0)), 1939, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_BlueWarpPipe, 430, 0, -120, 0, 2, EVT_PTR(N(8024D2B0)), 1939, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 8ec8bb038b..faf14866b1 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -2,6 +2,7 @@ #include "effects.h" #include "script_api/battle.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/archeologist.h" #include "sprite/npc/chuck_quizmo.h" #include "sprite/npc/disguised_moustafa.h" @@ -116,7 +117,7 @@ static s32 N(pad_3BC8)[] = { EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_LETTER08, -135, 160, -245, 17, EVT_SAVE_FLAG(757)) - EVT_CALL(MakeEntity, 0x802EAB04, 180, 173, -200, 0, 32, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_HiddenPanel, 180, 173, -200, 0, 32, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(756)) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index cc399c5cb5..93fd07540b 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -2,6 +2,7 @@ #include "script_api/common.h" #include "message_ids.h" #include "effects.h" +#include "entity.h" #include "sprite/npc/bubulb.h" #include "sprite/npc/lakilulu.h" #include "sprite/npc/tolielup.h" @@ -9,6 +10,7 @@ #include "sprite/npc/world_lakilester.h" #include "sprite/npc/world_parakarry.h" + enum { NPC_BUBULB0, NPC_BUBULB1, diff --git a/src/world/area_flo/flo_03/CA72E0.c b/src/world/area_flo/flo_03/CA72E0.c index e0e84e2104..a283b270c8 100644 --- a/src/world/area_flo/flo_03/CA72E0.c +++ b/src/world/area_flo/flo_03/CA72E0.c @@ -1,5 +1,6 @@ #include "flo_03.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/dayzee.h" #include "sprite/npc/monty_mole.h" #include "sprite/npc/petunia.h" @@ -1206,7 +1207,7 @@ EvtScript N(80244ED0) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAB04, -175, 0, 150, 0, 8, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_HiddenPanel, -175, 0, 150, 0, 8, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(1404)) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 8fb9e5e376..70305977d8 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -3,6 +3,7 @@ #include "sprite/npc/dayzee.h" #include "sprite/npc/gate_flower.h" #include "effects.h" +#include "entity.h" enum { NPC_GATE_FLOWER, @@ -50,7 +51,7 @@ EvtScript N(80241F40) = { #include "world/common/atomic/SuperBlockData.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EA910, -780, 120, -110, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), -780, 120, -110, 0, MAKE_ENTITY_END) EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 510, 0, -90, 17, EVT_SAVE_FLAG(1381)) EVT_RETURN diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c index 0cc5009856..08b80f4197 100644 --- a/src/world/area_flo/flo_11/CBDCD0.c +++ b/src/world/area_flo/flo_11/CBDCD0.c @@ -1,6 +1,7 @@ #include "flo_11.h" #include "message_ids.h" #include "sprite/npc/lakitu.h" +#include "entity.h" enum { NPC_LAKITU0, @@ -644,7 +645,7 @@ static s32 N(pad_30EC) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA0E8), -220, 60, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), -220, 60, -75, 0, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1384)) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index ccfeb4b941..b2e35aeaf0 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -1,5 +1,6 @@ #include "flo_13.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/lakilulu.h" #include "sprite/npc/lakitu.h" #include "sprite/npc/spiny.h" @@ -104,7 +105,7 @@ EvtScript N(makeEntities) = { EVT_CALL(MakeItemEntity, ITEM_MEGA_SMASH, -61, 60, -85, 17, EVT_SAVE_FLAG(1385)) EVT_CALL(MakeItemEntity, ITEM_SHOOTING_STAR, 128, 0, 157, 17, EVT_SAVE_FLAG(1386)) EVT_IF_EQ(EVT_SAVE_FLAG(1385), 0) - EVT_CALL(MakeEntity, 0x802BCF00, -160, 160, -90, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), -160, 160, -90, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243950))) EVT_ELSE EVT_CALL(ModifyColliderFlags, 0, 14, 0x7FFFFE00) diff --git a/src/world/area_flo/flo_15/CD06C0.c b/src/world/area_flo/flo_15/CD06C0.c index 988e3c09d2..77cba69c24 100644 --- a/src/world/area_flo/flo_15/CD06C0.c +++ b/src/world/area_flo/flo_15/CD06C0.c @@ -1,5 +1,6 @@ #include "flo_15.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/sun.h" enum { @@ -357,7 +358,7 @@ EvtScript N(802412E0) = { EvtScript N(makeEntities) = { EVT_IF_EQ(EVT_SAVE_FLAG(1401), 0) - EVT_CALL(MakeEntity, 0x802BCF00, -180, 0, -18, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), -180, 0, -18, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802412E0))) EVT_END_IF EVT_RETURN diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 0437d33044..04c19a5863 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -1,5 +1,6 @@ #include "flo_16.h" #include "message_ids.h" +#include "entity.h" EntryList N(entryList) = { { -720.0f, 0.0f, 0.0f, 90.0f }, @@ -287,9 +288,9 @@ EvtScript N(80243E80) = { EvtScript N(makeEntities) = { EVT_SET(EVT_AREA_FLAG(39), 0) EVT_BIND_TRIGGER(N(80243E80), TRIGGER_FLOOR_TOUCH, 20, 1, 0) - EVT_CALL(MakeEntity, 0x802EA910, 350, 240, -100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 350, 240, -100, 0, MAKE_ENTITY_END) EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EAA30), 472, 100, -100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 472, 100, -100, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243DB0))) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 76ffb6d61b..245c6dc196 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -1,5 +1,6 @@ #include "flo_17.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/lakitu.h" #include "sprite/npc/spiny.h" @@ -618,7 +619,7 @@ static s32 N(pad_527C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA588), 660, 60, -115, 0, 130, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 660, 60, -115, 0, 130, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1390)) EVT_CALL(MakeItemEntity, ITEM_LETTER09, -245, 0, 105, 17, EVT_SAVE_FLAG(1389)) EVT_RETURN diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 9279413da3..caab4c2e62 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -3,6 +3,7 @@ #include "sprite/npc/gate_flower.h" #include "sprite/npc/spiny.h" #include "effects.h" +#include "entity.h" enum { NPC_SPINY0, @@ -454,12 +455,12 @@ static s32 N(pad_2598)[] = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(D_802EA0C4), 100, 60, 5, 0, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA588), 100, 145, 0, 0, 131, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 100, 60, 5, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 100, 145, 0, 0, 131, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1409)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA588), 25, 60, 0, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 25, 60, 0, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1408)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EAA54), -50, 0, 0, 90, 60, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), -50, 0, 0, 90, 60, MAKE_ENTITY_END) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_23/flo_23.h b/src/world/area_flo/flo_23/flo_23.h index 7490d5ae9f..086e8b6fc1 100644 --- a/src/world/area_flo/flo_23/flo_23.h +++ b/src/world/area_flo/flo_23/flo_23.h @@ -6,8 +6,6 @@ #define NAMESPACE flo_23 -extern s32 D_802EA0C4; - ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall); ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 723f9fa118..cfd276009d 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -1,5 +1,6 @@ #include "flo_24.h" #include "message_ids.h" +#include "entity.h" EntryList N(entryList) = { { -455.0f, 0.0f, 0.0f, 90.0f }, @@ -408,11 +409,11 @@ static s32 N(pad_21A4)[] = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), -325, 60, -140, 0, 154, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -325, 60, -140, 0, 154, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1393)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA588), 325, 60, -140, 0, 163, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 325, 60, -140, 0, 163, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(1394)) - EVT_CALL(MakeEntity, 0x802EAB04, 335, 0, -160, 0, 8, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_HiddenPanel, 335, 0, -160, 0, 8, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(1406)) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index d1e44bbe9e..62c3272047 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -1,5 +1,6 @@ #include "flo_25.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/bzzap.h" #include "sprite/npc/gate_flower.h" #include "sprite/npc/tuff_puff.h" @@ -503,7 +504,7 @@ static s32 N(pad_3C8C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, 0x802EAB04, -390, 0, 0, 0, 8, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_HiddenPanel, -390, 0, 0, 0, 8, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(1407)) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 3d847332fc..32036a9a3e 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -1,6 +1,6 @@ #include "kmr_03.h" #include "sprite/npc/goompa.h" -#include "variables.h" +#include "entity.h" enum { NPC_GOOMPA, @@ -271,28 +271,28 @@ EvtScript N(802414C8) = { EvtScript N(makeEntities) = { EVT_IF_LT(EVT_SAVE_VAR(0), -117) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA10C), 45, 0, 70, 15, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 45, 0, 70, 15, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80241470))) EVT_ELSE EVT_CALL(ModifyColliderFlags, 0, 9, 0x7FFFFE00) EVT_END_IF EVT_IF_EQ(EVT_SAVE_FLAG(54), 0) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA19C), 230, 0, 310, 15, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), 230, 0, 310, 15, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(802414A8))) EVT_END_IF - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA588), 230, 60, 310, 15, 151, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 230, 60, 310, 15, 151, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(52)) - EVT_CALL(MakeEntity, EVT_PTR(D_802EA0C4), 230, 50, -160, 15, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, EVT_PTR(D_802EA0C4), 165, 0, 380, 20, MAKE_ENTITY_END) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), -170, 0, 370, 43, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 230, 50, -160, 15, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 165, 0, 380, 20, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -170, 0, 370, 43, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(50)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EAA54), 345, 75, -250, 0, 100, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 345, 75, -250, 0, 100, MAKE_ENTITY_END) EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 205, -250, 17, EVT_SAVE_FLAG(56)) EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 230, -250, 17, EVT_SAVE_FLAG(57)) EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 255, -250, 17, EVT_SAVE_FLAG(58)) EVT_CALL(MakeItemEntity, ITEM_COIN, 345, 280, -250, 17, EVT_SAVE_FLAG(59)) EVT_CALL(MakeItemEntity, ITEM_FIRE_FLOWER, 229, 250, -156, 17, EVT_SAVE_FLAG(49)) - EVT_CALL(MakeEntity, 0x802EAB04, 300, 0, 150, 0, 18, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, &Entity_HiddenPanel, 300, 0, 150, 0, 18, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, EVT_SAVE_FLAG(88)) EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 130, 60, 0, 0, MAKE_ENTITY_END) EVT_RETURN diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 225290da3c..aa48976569 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -17,5 +17,3 @@ extern EvtScript N(80242340); extern EvtScript N(802406C0); extern EvtScript N(main); extern EvtScript N(makeEntities); - -extern s32 D_802EA0C4; diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c index 9d9da6f7af..6e6730095b 100644 --- a/src/world/area_kmr/kmr_12/events.c +++ b/src/world/area_kmr/kmr_12/events.c @@ -1,5 +1,6 @@ #include "kmr_12.h" #include "message_ids.h" +#include "entity.h" #include "sprite/npc/goomba.h" EvtScript N(ExitWest) = EXIT_WALK_SCRIPT(60, 0, "kmr_07", 1); @@ -219,7 +220,7 @@ EvtScript N(ReadEastSign) = { }; EvtScript N(MakeEntities) = { - EVT_CALL(MakeEntity, EVT_ADDR(D_802EAFDC), 436, 0, -42, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_ADDR(Entity_Signpost), 436, 0, -42, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_ADDR(N(ReadEastSign))) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h index d558ca818e..de401fb184 100644 --- a/src/world/area_kmr/kmr_12/kmr_12.h +++ b/src/world/area_kmr/kmr_12/kmr_12.h @@ -17,5 +17,3 @@ extern EvtScript N(PlayMusic); extern EvtScript N(MakeEntities); extern EvtScript N(ReadWestSign); extern NpcGroupList N(npcGroupList); - -extern s32 D_802EAFDC; diff --git a/src/world/area_mgm/mgm_01/E12930.c b/src/world/area_mgm/mgm_01/E12930.c index 1ff39f40b3..16c6303e5e 100644 --- a/src/world/area_mgm/mgm_01/E12930.c +++ b/src/world/area_mgm/mgm_01/E12930.c @@ -1,6 +1,7 @@ #include "mgm_01.h" #include "hud_element.h" #include "effects.h" +#include "entity.h" void delete_entity(s32 entityIndex); void set_message_images(MessageImageData* images); @@ -67,8 +68,6 @@ typedef struct JumpGameData { /* 0x074 */ JumpGamePanel panels[NUM_BLOCKS]; } JumpGameData; /* size = 0x468 */ -extern EntityBlueprint D_802EA0C4; - extern s32 MessagePlural; extern s32 MessageSingular; extern MessageImageData N(MsgImgs_Panels); @@ -119,7 +118,7 @@ void N(draw_score_display) (void* renderData) { } } } - + if (data->scoreWindowPosX < SCREEN_WIDTH + 1) { draw_box(0, 9, data->scoreWindowPosX, 28, 0, 72, 20, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); hudElemID = data->hudElemID; @@ -227,7 +226,7 @@ ApiStatus N(InitPanelEmergeFromBlock)(Evt* script, s32 isInitialCall) { data->panels[index].endPos.z = data->panels[index].curPos.z; data->panels[index].curAngle = 0; - + data->panels[index].endScale = 2.0; data->panels[index].curScale = 1.0; data->panels[index].startScale = 1.0; @@ -565,7 +564,7 @@ ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { data->type[indexA] = temp; } } - + script->functionTemp[0] = 0; script->functionTemp[1] = 0; } @@ -573,7 +572,7 @@ ApiStatus N(CreateBlockEntities)(Evt* script, s32 isInitialCall) { script->functionTemp[0]--; if (script->functionTemp[0] <= 0) { curBlockIdx = script->functionTemp[1]; - entityIndex = create_entity(&D_802EA0C4, + entityIndex = create_entity(&Entity_BrickBlock, N(BlockPosX)[curBlockIdx], N(BlockPosY)[curBlockIdx], N(BlockPosZ)[curBlockIdx], diff --git a/src/world/area_mgm/mgm_02/E15D80.c b/src/world/area_mgm/mgm_02/E15D80.c index 2c88554b89..daba1b542c 100644 --- a/src/world/area_mgm/mgm_02/E15D80.c +++ b/src/world/area_mgm/mgm_02/E15D80.c @@ -2,6 +2,7 @@ #include "hud_element.h" #include "effects.h" #include "model.h" +#include "entity.h" #include "sprite/npc/bob_omb.h" #include "sprite/npc/fuzzy.h" @@ -37,7 +38,6 @@ extern s32 D_80248600[NUM_PANELS]; //TODO set name: mgm_02_PanelModelsAssigned extern s32 mgm_02_PeachPanelImg; extern s32 mgm_02_PeachPanelPal; -extern EntityBlueprint D_802EAFDC; // SIGNPOST extern EvtScript D_80242A3C_E187BC; // EVT_ReadSign typedef enum SmashGameBoxCotent { @@ -235,7 +235,7 @@ ApiStatus N(DestroySignpost)(Evt* script, s32 isInitialCall) { ApiStatus N(CreateSignpost)(void) { SmashGameData* data = get_enemy(SCOREKEEPER_ENEMY_IDX)->varTablePtr[SMASH_DATA_VAR_IDX]; - s32 entityIndex = create_entity(&D_802EAFDC, 355, 20, -180, 0, 0, 0, 0, MAKE_ENTITY_END); + s32 entityIndex = create_entity(&Entity_Signpost, 355, 20, -180, 0, 0, 0, 0, MAKE_ENTITY_END); data->signpostEntity = entityIndex; get_entity_by_index(entityIndex)->boundScriptBytecode = &D_80242A3C_E187BC; diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c index cc6dd3037f..d249545034 100644 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ b/src/world/area_sbk/sbk_00/9292B0.c @@ -1,5 +1,6 @@ #include "sbk_00.h" #include "sprite/npc/pokey.h" +#include "entity.h" #include "world/common/SetNpcB5_3.inc.c" @@ -117,9 +118,9 @@ static s32 N(pad_78C) = { }; EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), -230, 0, 155, 0, 152, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -230, 0, 155, 0, 152, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(797)) - EVT_CALL(MakeEntity, EVT_PTR(Entity_D_802EA564), 160, 0, 205, 0, 343, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 160, 0, 205, 0, 343, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, EVT_SAVE_FLAG(798)) EVT_RETURN EVT_END diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 1509d225aa..e779e07cad 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -13,7 +13,7 @@ #include "world/common/CheckItemFlags40.inc.c" -extern s32 D_000001E4; +extern s16 Entity_ScriptSpring_AnimLaunch[]; ApiStatus func_8024093C_8756FC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -23,7 +23,7 @@ ApiStatus func_8024093C_8756FC(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - play_model_animation(entity->virtualModelIndex, &D_000001E4); + play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); return ApiStatus_DONE2; } diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c index 59feeb60a9..a932f963fd 100644 --- a/src/world/area_tst/tst_13/B1D760.c +++ b/src/world/area_tst/tst_13/B1D760.c @@ -37,7 +37,7 @@ void func_8024013C_B1D89C(void) { guScaleF(sp50, x, y, z); guMtxCatF(sp50, sp10, sp10); guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); - mdl_project_tex_coords(1, D_80242860_B1FFC0, &sp10, NULL); + mdl_project_tex_coords(1, D_80242860_B1FFC0, sp10, NULL); gDPPipeSync(gMasterGfxPos++); gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); diff --git a/src/world/common/atomic/Quizmo.inc.c b/src/world/common/atomic/Quizmo.inc.c index 9284964d0d..ecfb0d7684 100644 --- a/src/world/common/atomic/Quizmo.inc.c +++ b/src/world/common/atomic/Quizmo.inc.c @@ -150,8 +150,8 @@ ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = get_item_entity(i); - if (itemEntity != NULL && itemEntity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX) { - itemEntity->flags |= ENTITY_FLAGS_8000000; + if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + itemEntity->flags |= ITEM_ENTITY_FLAGS_8000000; } } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 87da680b38..870bbbba66 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -51,7 +51,7 @@ s32 func_802BD17C_31B19C(Npc* kooper) { } else { D_802BEC6C = 1; gOverrideFlags |= GLOBAL_OVERRIDES_40; - set_item_entity_flags(D_802BEC68, ENTITY_FLAGS_200000); + set_item_entity_flags(D_802BEC68, ITEM_ENTITY_FLAGS_200000); return 1; } } diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index 0f8a34684a..73b596e6a1 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -1,8 +1,8 @@ #include "common.h" +#include "entity.h" extern PushBlockGrid* D_802DBC88[]; //TODO determine length extern EvtScript D_80285674_7E64F4; -extern EntityBlueprint D_802EA2BC; #define BLOCK_GRID_SIZE 25 @@ -113,7 +113,7 @@ ApiStatus SetPushBlock(Evt* script, s32 isInitialCall) { s32 posX = blockGrid->centerPos[0] + (gridX * BLOCK_GRID_SIZE) + (BLOCK_GRID_SIZE / 2); s32 posY = blockGrid->centerPos[1]; s32 posZ = blockGrid->centerPos[2] + (gridZ * BLOCK_GRID_SIZE) + (BLOCK_GRID_SIZE / 2); - blockEntityID = create_entity(&D_802EA2BC, posX, posY, posZ, 0, 0, 0, 0, MAKE_ENTITY_END); + blockEntityID = create_entity(&Entity_PushBlock, posX, posY, posZ, 0, 0, 0, 0, MAKE_ENTITY_END); bind_trigger_1(&D_80285674_7E64F4, TRIGGER_WALL_PUSH, blockEntityID + EVT_ENTITY_ID_BIT, (s32)blockGrid, blockEntityID, 3); script->varTable[0] = blockEntityID; } diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 3a429c982b..a3d7f424b2 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = aa71299594b8f864f9af9c22823c64a9c9189706 - parent = d0b02e98a6bf6773e3c4f4ca7f1e203c86aaf6df + commit = fd9cbc3a16ce6e7a4ba81ca36c1ee35472d9c0c2 + parent = 70aeffbdc06b9b84e4e848a412afc5c6e9cde4bd method = merge cmdver = 0.4.3 diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index 859d462374..e561dce15b 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -1,5 +1,8 @@ # splat Release Notes +### 0.9.1 +* Fixed a bug in which local labels and jump table labels could replace raw words in data blobs during data disassembly + ## 0.9.0: The Big Update ### Introducing [spimdisasm](https://github.com/Decompollaborate/spimdisasm)! * Thanks to [AngheloAlf](https://github.com/AngheloAlf), we now have a much better MIPS disassembler in splat! spimdisasm has much better hi/lo matching, much lower ram usage, and plenty of other goodies. diff --git a/tools/splat/segtypes/common/data.py b/tools/splat/segtypes/common/data.py index 62873f3c7c..07e625bb48 100644 --- a/tools/splat/segtypes/common/data.py +++ b/tools/splat/segtypes/common/data.py @@ -307,7 +307,7 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup): byte_str = f"0x{bits:X}" elif slen == 4 and bits >= 0x80000000: sym = self.get_symbol(bits, reference=True) - if sym: + if sym and sym.type not in ["label", "jtbl"]: byte_str = sym.name else: byte_str = "0x{0:0{1}X}".format(bits, 2 * slen) diff --git a/tools/splat/segtypes/n64/ia16.py b/tools/splat/segtypes/n64/ia16.py index eb9f6ef4e9..8fd1e4c833 100644 --- a/tools/splat/segtypes/n64/ia16.py +++ b/tools/splat/segtypes/n64/ia16.py @@ -1,9 +1,18 @@ from segtypes.n64.ia4 import N64SegIa4 +from util import iter class N64SegIa16(N64SegIa4): - def parse_image(self, data): - return data + @staticmethod + def parse_image(data, width, height, flip_h=False, flip_v=False): + img = bytearray() + + for x, y, i in iter.iter_image_indexes(width, height, 2, 1, flip_h, flip_v): + i1 = data[i] + a1 = data[i + 1] + img += bytes((i1, a1)) + + return img def max_length(self): return self.width * self.height * 2 diff --git a/ver/us/asm/data/10A9F0.data.s b/ver/us/asm/data/10A9F0.data.s deleted file mode 100644 index 4248c0d3fa..0000000000 --- a/ver/us/asm/data/10A9F0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802E9170 -.word 0x00000000, 0x00000000, 0x01111111, 0x11111111, 0x01333333, 0x33333333, 0x01355555, 0x55555555, 0x01357777, 0x77777777, 0x01357999, 0x99999999, 0x013579BB, 0xBBBBBBBB, 0x013579BD, 0xDDDDDDDD, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF, 0x013579BD, 0xFFFFFFFF - -dlabel D_802E91F0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x00000000, 0x00112222, 0x00000000, 0x11223344, 0x00000001, 0x22344555, 0x00000012, 0x34456666, 0x00000123, 0x45667788, 0x00001234, 0x56788999, 0x00012345, 0x67899AAB, 0x00012456, 0x789ABBCC, 0x00123467, 0x89ABCDDD, 0x00124568, 0x9ABCDEEF, 0x00234678, 0x9BCDEFFF, 0x00235679, 0xABDEFFFF, 0x01245689, 0xACDEFFFF, 0x01245689, 0xBCDFFFFF diff --git a/ver/us/asm/data/10AAF0.data.s b/ver/us/asm/data/10AAF0.data.s deleted file mode 100644 index e9da74a611..0000000000 --- a/ver/us/asm/data/10AAF0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802E9270 -.word 0x007D0000, 0x007D0000, 0x04000000, 0xFFFFFF4B, 0x007D0000, 0xFF830000, 0x04000400, 0xFFFFFF4B, 0xFF830000, 0xFF830000, 0x00000400, 0xFFFFFF4B, 0xFF830000, 0x007D0000, 0x00000000, 0xFFFFFF4B - -dlabel D_802E92B0 -.word 0xFF830000, 0xFF830000, 0x00000400, 0xFFFFFF4B, 0xFF830000, 0x007D0000, 0x00000000, 0xFFFFFF4B, 0x007D0000, 0x007D0000, 0x04000000, 0xFFFFFF4B, 0x007D0000, 0xFF830000, 0x04000400, 0xFFFFFF4B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01111111, 0x11111111, 0x11111111, 0x11111110, 0x01353333, 0x33333333, 0x33333333, 0x33335310, 0x01355555, 0x55555555, 0x55555555, 0x55555310, 0x01357777, 0x77777777, 0x77777777, 0x77775310, 0x01357999, 0x99999999, 0x99999999, 0x99975310, 0x013579BB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBB975310, 0x013579CC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCC975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xBC975310, 0x013579BC, 0xDDEEFFFF, 0xFFFFEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579BC, 0xDDEEEEEE, 0xEEEEEEDD, 0xCB975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579DD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDD975310, 0x013579CC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCC975310, 0x013579BB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBB975310, 0x01357999, 0x99999999, 0x99999999, 0x99975310, 0x01357777, 0x77777777, 0x77777777, 0x77775310, 0x01355555, 0x55555555, 0x55555555, 0x55555310, 0x01353333, 0x33333333, 0x33333333, 0x33335310, 0x01111111, 0x11111111, 0x11111111, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001111, 0x11110000, 0x00000000, 0x00000000, 0x00113333, 0x33331100, 0x00000000, 0x00000000, 0x01335555, 0x55553310, 0x00000000, 0x00000000, 0x13555555, 0x55555531, 0x00000000, 0x00000013, 0x35555888, 0x88855553, 0x31000000, 0x00000135, 0x55588CCC, 0xCCC88555, 0x53100000, 0x00001355, 0x588CDDDD, 0xDDDDC885, 0x55301000, 0x00013555, 0x8CDDDDDD, 0xDDDDDDC8, 0x55531000, 0x00013558, 0xDDDDDDDD, 0xDDDDDDDC, 0x85531000, 0x00135558, 0xDDDDDDDD, 0xDDDDDDDC, 0x85553100, 0x0013558C, 0xDDDDDDDD, 0xDDDDDDDC, 0x85553100, 0x0135558C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8555310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013558CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC855310, 0x013598CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC895310, 0x013598CD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDC895310, 0x0135598C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8955310, 0x0013598C, 0xDDDDDDDD, 0xDDDDDDDD, 0xC8953100, 0x00135598, 0xCDDDDDDD, 0xDDDDDDDC, 0x89553100, 0x00013598, 0xCDDDDDDD, 0xDDDDDDDC, 0x89531000, 0x00011359, 0x8CDDDDDD, 0xDDDDDDC8, 0x95531000, 0x00001355, 0x988CCDDD, 0xDDDCC889, 0x55310000, 0x00001135, 0x59988CCC, 0xCCC88995, 0x53100000, 0x00000011, 0x35599888, 0x88899953, 0x11000000, 0x00000000, 0x11355999, 0x99995531, 0x00000000, 0x00000000, 0x01135555, 0x55553110, 0x00000000, 0x00000000, 0x00013333, 0x33331000, 0x00000000, 0x00000000, 0x00001111, 0x11110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/10B610.data.s b/ver/us/asm/data/10B610.data.s deleted file mode 100644 index 225ef5b831..0000000000 --- a/ver/us/asm/data/10B610.data.s +++ /dev/null @@ -1,327 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802E9D90 -.word 0x00000003, 0x00000000, entity_base_block_idle, 0x00000009, 0x0000014E, 0x00000002, entity_block_hit_init_scale, 0x00000003, 0x00000006, entity_block_hit_animate_scale, 0x00000002, entity_start_script, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802E9DCC -.word 0x00000003, 0x00000000, entity_base_block_idle, 0x00000002, entity_start_script, 0x00000004, 0x00000000, 0x00000000, 0x00000003, 0x00000000, entity_base_block_idle, 0x00000009, 0x0000014E, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802E9E0C -.word 0x00000003, 0x00000000, entity_base_block_idle, 0x00000009, 0x0000014E, 0x00000002, entity_inactive_block_hit_init, 0x00000002, entity_start_script, 0x00000003, 0x00000000, entity_inactive_block_hit_anim, 0x00000003, 0x00000000, entity_inactive_block_recoil_anim, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802E9E54 -.word 0x00000002, entity_inactive_block_hit_init, 0x00000003, 0x00000000, entity_inactive_block_hit_anim, 0x00000003, 0x00000000, entity_inactive_block_recoil_anim, 0x00000001, D_802E9E0C, 0x00000000 - -dlabel D_802E9E80 -.word 0x00000006, 0x00000007, 0x00000001, 0x00000007, 0x00000020, 0x00000002, entity_breakable_block_create_shattering_entity, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802E9EB4 -.word 0x00000003, 0x00000000, entity_BrickBlock_idle, 0x00000002, entity_start_script, 0x00000007, 0x00000001, 0x00000007, 0x00000020, 0x00000002, entity_breakable_block_create_shattering_entity, 0x00000009, 0x0000014E, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802E9F00 -.word 0x00000003, 0x00000000, entity_base_block_idle, 0x00000009, 0x0000014E, 0x00000002, entity_start_script, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802E9F28 -.word 0x00000002, entity_MulticoinBlock_check_if_inactive, 0x00000005, 0x00000001, 0x00000003, 0x00000000, entity_MulticoinBlock_idle, 0x00000009, 0x0000014E, 0x00000002, entity_MulticoinBlock_spawn_coin, 0x00000002, entity_inactive_block_hit_init, 0x00000003, 0x00000000, entity_inactive_block_hit_anim, 0x00000003, 0x00000000, entity_inactive_block_recoil_anim, 0x00000004, 0x00000001, 0x00000000 - -dlabel D_802E9F80 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004E0, 0x00000002, 0x00000000 - -dlabel D_802E9F9C -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000 - -dlabel D_802E9FB8 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004A0, 0x00000002, 0x00000000 - -dlabel D_802E9FD4 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004F0, 0x00000002, 0x00000000 - -dlabel D_802E9FF0 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004F0, 0x00000002, 0x00000000 - -dlabel D_802EA00C -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004E0, 0x00000002, 0x00000000 - -dlabel D_802EA028 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000338, 0x00000002, 0x00000000 - -dlabel D_802EA044 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0004A0, 0x00000002, 0x00000000 - -dlabel D_802EA060 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000CC8, 0x00000002, 0x00000000 - -dlabel Entity_InertYellowBlock -.word 0x42000020, D_802E9F80, 0x00000000, entity_init_Hammer1Block_normal, D_802E9E0C, entity_block_handle_collision, 0x00E42240, 0x00E42740, 0x0B191919 - -dlabel Entity_InertRedBlock -.word 0x42000020, D_802E9F9C, 0x00000000, entity_init_Hammer1Block_normal, D_802E9E0C, entity_block_handle_collision, 0x00E42740, 0x00E431F0, 0x13191919 - -dlabel D_802EA0C4 -.word 0x42800020, D_802EA044, 0x00000000, entity_base_block_init, D_802E9EB4, entity_block_handle_collision, 0x00E3DDB0, 0x00E3E260, 0x0D191919 - -dlabel Entity_D_802EA0E8 -.word 0x42000020, D_802E9FB8, 0x00000000, entity_MulticoinBlock_init, D_802E9F28, entity_block_handle_collision, 0x00E3DDB0, 0x00E3E260, 0x0E191919 - -dlabel Entity_D_802EA10C -.word 0x42800020, D_802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, D_802E9F00, entity_block_handle_collision, 0x00E31530, 0x00E31A30, 0x15323232 - -dlabel Entity_D_802EA130 -.word 0x42800020, D_802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, D_802E9F00, entity_block_handle_collision, 0x00E31530, 0x00E31A30, 0x15643232 - -dlabel Entity_D_802EA154 -.word 0x42800020, D_802E9FD4, 0x00000000, entity_init_Hammer1Block_normal, D_802E9F00, entity_block_handle_collision, 0x00E31530, 0x00E31A30, 0x15323264 - -dlabel Entity_D_802EA178 -.word 0x42800020, D_802E9FD4, 0x00000000, entity_init_HammerBlock_small, D_802E9DCC, entity_block_handle_collision, 0x00E31530, 0x00E31A30, 0x18191919 - -dlabel Entity_D_802EA19C -.word 0x42800020, D_802E9FF0, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31A30, 0x00E31F30, 0x16323232 - -dlabel D_802EA1C0 -.word 0x42800020, D_802E9FF0, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31A30, 0x00E31F30, 0x16643232 - -dlabel D_802EA1E4 -.word 0x42800020, D_802E9FF0, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31A30, 0x00E31F30, 0x16323264 - -dlabel D_802EA208 -.word 0x42800020, D_802E9FF0, 0x00000000, entity_init_HammerBlock_small, D_802E9DCC, entity_block_handle_collision, 0x00E31A30, 0x00E31F30, 0x19191919 - -dlabel D_802EA22C -.word 0x42800020, D_802EA00C, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31F30, 0x00E32420, 0x17323232 - -dlabel D_802EA250 -.word 0x42800020, D_802EA00C, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31F30, 0x00E32420, 0x17643232 - -dlabel D_802EA274 -.word 0x42800020, D_802EA00C, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E31F30, 0x00E32420, 0x17323264 - -dlabel D_802EA298 -.word 0x42800020, D_802EA00C, 0x00000000, entity_init_HammerBlock_small, D_802E9DCC, entity_block_handle_collision, 0x00E31F30, 0x00E32420, 0x1A191919 - -dlabel D_802EA2BC -.word 0x40000020, D_802EA028, 0x00000000, entity_base_block_init, D_802E9DCC, entity_block_handle_collision, 0x00E3DA60, 0x00E3DDB0, 0x0C191919 - -dlabel Entity_D_802EA2E0 -.word 0x40000020, D_802EA060, 0x00000000, entity_base_block_init, D_802E9D90, entity_block_handle_collision, 0x00E43B20, 0x00E44800, 0x211E1919, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EA310 -.word 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802EA328 -.word 0x00000002, entity_ItemBlock_check_if_inactive, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, entity_ItemBlock_idle, 0x00000009, 0x0000014E, 0x00000002, entity_ItemBlock_spawn_item, 0x00000002, entity_ItemBlock_replace_with_inactive, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802EA38C -.word 0x00000002, entity_ItemBlock_check_if_inactive, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, entity_HiddenItemBlock_idle, 0x00000009, 0x0000014E, 0x00000002, entity_ItemBlock_spawn_item, 0x00000002, entity_ItemBlock_replace_with_inactive, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802EA3F0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000002, entity_HitItemBlock_play_anim, 0x00000003, 0x0000000A, entity_HitItemBlock_appear, 0x00000002, entity_HitItemBlock_hide, 0x00000002, entity_HitItemBlock_show_inactive, 0x00000003, 0x00000001, 0x00000000, 0x00000007, 0x00000001, 0x00000007, 0x04000000, 0x00000000 - -dlabel D_802EA440 -.word 0x00000003, 0x00000000, entity_ItemBlock_idle, 0x00000002, entity_TriggerBlock_disable_player_input, 0x00000009, 0x0000014E, 0x00000002, entity_TriggerBlock_play_vanish_effect, 0x00000002, entity_inactive_block_hit_init, 0x00000003, 0x00000000, entity_inactive_block_hit_anim, 0x00000003, 0x00000000, entity_inactive_block_recoil_anim, 0x00000002, entity_TriggerBlock_start_bound_script, 0x00000002, entity_TriggerBlock_enable_player_input, 0x00000007, 0x00000001, 0x00000007, 0x00000020, 0x00000002, entity_TriggerBlock_start_bound_script_2, 0x00000003, 0x00000002, 0x00000000, 0x00000007, 0x04000000, 0x00000000 - -dlabel D_802EA4C4 -.word 0x00E459F0, 0x00E46E10, 0x00E46E10, 0x00E470B0 - -dlabel D_802EA4D4 -.word 0x00E470B0, 0x00E484F0, 0x00E484F0, 0x00E48780 - -dlabel D_802EA4E4 -.word 0x00E48780, 0x00E49BE0, 0x00E49BE0, 0x00E49E40 - -dlabel D_802EA4F4 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000 - -dlabel D_802EA510 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000 - -dlabel D_802EA52C -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000 - -dlabel D_802EA548 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000A90, 0x00000002, 0x00000000 - -dlabel Entity_D_802EA564 -.word 0x42000020, D_802EA4F4, 0x00000000, entity_ItemBlock_init, D_802EA328, entity_block_handle_collision, 0x00E3B870, 0x00E3C320, 0x0F191919 - -dlabel Entity_D_802EA588 -.word 0x42000020, D_802EA510, 0x00000000, entity_HiddenItemBlock_init, D_802EA38C, entity_block_handle_collision, 0x00E3B870, 0x00E3C320, 0x11191919 - -dlabel Entity_D_802EA5AC -.word 0x42000020, D_802EA52C, 0x00000000, entity_ItemBlock_init, D_802EA328, entity_block_handle_collision, 0x00E3C320, 0x00E3CDD0, 0x14191919 - -dlabel Entity_D_802EA5D0 -.word 0x42000020, D_802EA548, 0x00000000, entity_HiddenItemBlock_init, D_802EA38C, entity_block_handle_collision, 0x00E3C320, 0x00E3CDD0, 0x12191919 - -dlabel Entity_D_802EA5F4 -.word 0xC2080020, 0x0000023C, 0x00000084, entity_ItemlessBlock_init, D_802EA440, entity_block_handle_collision, D_802EA4C4, 0x00000000, 0x10191919 - -dlabel Entity_HitGroundedYellowBlock -.word 0x42080020, 0x0000023C, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4C4, 0x00000000, 0x0F191919 - -dlabel Entity_HitFloatingYellowBlock -.word 0x42080020, 0x0000022C, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4D4, 0x00000000, 0x0F191919 - -dlabel Entity_HitRedBlock -.word 0x42080020, 0x00000094, 0x00000084, entity_ItemlessBlock_init, D_802EA3F0, 0x00000000, D_802EA4E4, 0x00000000, 0x14191919, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EA690 -.word 0x00000002, entity_HeartBlockContent_reset, 0x00000003, 0x00000000, entity_HeartBlockContent_idle, 0x00000002, func_802E4DE0, 0x00000002, entity_HeartBlock_change_render_script, 0x00000003, 0x00000000, entity_HeartBlockContent_anim_heal, 0x00000002, entity_HeartBlock_show_tutorial_message, 0x00000003, 0x00000000, entity_HeartBlock_wait_for_close_tutorial, 0x00000003, 0x0000003C, 0x00000000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802EA6EC -.word 0x00000003, 0x00000000, entity_HeartBlock_idle, 0x00000009, 0x0000014E, 0x00000002, entity_start_script, 0x00000002, entity_block_hit_init_scale, 0x00000003, 0x00000006, entity_block_hit_animate_scale, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802EA728 -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, 0x0A000700, 0x00000002, 0x00000000 - -dlabel D_802EA744 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A0007B0, 0x00000002, 0x00000000 - -dlabel D_802EA760 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, 0x0A000808, 0x00000002, 0x00000000 - -dlabel D_802EA77C -.word 0x00000004, 0x00000022, 0x00000001, 0x0000003C, 0x0A000918, 0x00000002, 0x00000000 - -dlabel D_802EA798 -.word 0x42000020, D_802EA77C, 0x00000000, entity_base_block_init, D_802E9E0C, entity_block_handle_collision, 0x00E431F0, 0x00E43B20, 0x1F191919 - -dlabel Entity_HeartBlockContent -.word 0x002000D8, D_802EA728, 0x00000000, entity_HeartBlockContent_init, D_802EA690, 0x00000000, 0x00E49E40, 0x00E4A6A0, 0x3F120612 - -dlabel Entity_HeartBlock -.word 0x42000020, D_802EA77C, 0x00000000, entity_HeartBlock_init, D_802EA6EC, entity_block_handle_collision, 0x00E431F0, 0x00E43B20, 0x1B191919 - -dlabel Padding_D_802EA804 -.word 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EA810 #incorrect, needs fixing -.short 0x0000, 0x0002, 0x802E, 0x56EC, 0x0000, 0x0005, 0x0000, 0x0001, 0x0000, 0x0003, 0x0000, 0x0000, 0x802E, 0x56D0, 0x0000, 0x0009, 0x0000, 0x014E, 0x0000, 0x0002, 0x802E, 0x31EC, 0x0000, 0x0003, 0x0000, 0x0006, 0x802E, 0x328C, 0x0000, 0x0002, 0x8011, 0x0678, 0x0000, 0x0004, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0A00 - -dlabel D_802EA862 #incorrect, needs fixing -.short 0x0200, 0x0A00, 0x0220, 0x0A00, 0x0240, 0x0A00, 0x0260 - -dlabel D_802EA870 -.byte 0x14 - -dlabel D_802EA871 -.byte 0x00, 0x02, 0x01, 0x02, 0x02, 0x14, 0x03, 0x02, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x00, 0x00 - -dlabel D_802EA880 -.word 0x00000003, 0x00000000, entity_SuperBlockContent_idle, 0x00000000 - -dlabel D_802EA890 -.word 0x00000003, 0x00000000, entity_SuperBlockContent_idle, 0x00000000 - -dlabel D_802EA8A0 -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, 0x0A0008F8, 0x00000002, 0x00000000 - -dlabel D_802EA8BC -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802EA8D8 -.word 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, 0x0A0008C8, 0x00000002, 0x00000000 - -dlabel D_802EA8F4 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802EA910 -.word 0x42000020, D_802EA8A0, 0x00000000, entity_SuperBlock_init, D_802EA810, entity_block_handle_collision, 0x00E44800, 0x00E45110, 0x22191919 - -dlabel Entity_SuperBlockContent -.word 0x00200130, D_802EA8BC, 0x00000000, entity_init_SuperBlockContent1, D_802EA880, 0x00000000, 0x00E4A6A0, 0x00E4AA80, 0x41120612 - -dlabel D_802EA958 -.word 0x42000020, D_802EA8D8, 0x00000000, entity_UltraBlock_init, D_802EA810, entity_block_handle_collision, 0x00E45110, 0x00E459F0, 0x23191919 - -dlabel D_802EA97C -.word 0x00200130, D_802EA8F4, 0x00000000, entity_init_SuperBlockContent2, D_802EA890, 0x00000000, 0x00E4AA80, 0x00E4B2E0, 0x42120612 - -dlabel D_802EA9A0 -.word 0x00000003, 0x00000000, entity_ScriptSpring_idle, 0x00000003, 0x0000000A, 0x00000000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802EA9C4 -.word 0x00000003, 0x00000000, entity_SimpleSpring_idle, 0x00000003, 0x00000002, 0x00000000, 0x00000002, entity_SimpleSpring_set_jump_params, 0x00000003 - -dlabel D_802EA9E8 -.word 0x00000003, 0x00000000, 0x00000002, entity_SimpleSpring_enable_player_input, 0x00000003, 0x0000000A, 0x00000000, 0x00000004, 0x00000000 - -dlabel Padding_D_802EAA0C -.word 0x00000000 - -dlabel D_802EAA10 -.word 0x00E657A0, 0x00E67120, 0x00E67120, 0x00E68580 - -dlabel D_802EAA20 -.word 0x00E68580, 0x00E69D50, 0x00E69D50, 0x00E6B1B0 - -dlabel Entity_D_802EAA30 -.word 0x20080000, 0x0000131C, 0x000001B8, entity_ScriptSpring_init, D_802EA9A0, 0x00000000, D_802EAA10, 0x00000000, 0x2F281928 - -dlabel Entity_D_802EAA54 -.word 0x20080004, 0x0000131C, 0x000001B8, entity_SimpleSpring_init, D_802EA9C4, 0x00000000, D_802EAA20, 0x00000000, 0x2E281928 - -dlabel Padding_D_802EAA78 -.word 0x00000000, 0x00000000 - -dlabel D_802EAA80 -.word 0x00000002, entity_HiddenPanel_set_ispy_notification, 0x00000005, 0x00000001, 0x00000002, entity_HiddenPanel_hide, 0x00000003, 0x00000000, entity_HiddenPanel_idle, 0x00000003, 0x00000000, entity_HiddenPanel_flip_over, 0x00000004, 0x00000001, 0x00000000 - -dlabel D_802EAABC -.word 0x00000004, 0x00000001, 0x00000005, 0x00010000, 0x00000001, 0x0000003C, 0x0A000280, 0x00000002, 0x00000000 - -dlabel D_802EAAE0 -.word 0x00000004, 0x00000001, 0x00000005, 0x00010000, 0x00000001, 0x0000003C, 0x0A0002A0, 0x00000002, 0x00000000, 0x0001007C, D_802EAABC, 0x00000000, entity_HiddenPanel_init, D_802EAA80, 0x00000000, 0x00E56BA0, 0x00E56E60, 0x303C003C, 0x00000000, 0x00000000 - -dlabel D_802EAB30 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF3D, 0xFFFFFE9A, 0xFFFFFDD5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F0280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802EAC0C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802EAC40 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0xF24F2A80, 0xF24AC080, 0xF24A5480, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802EAC84 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A9A80, 0x00000000, 0xF24DC280, 0xF24ACE80, 0xF24A3A80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802EACC8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802EACFC -.word 0x00000002, entity_Chest_check_opened, 0x00000003, 0x00000000, entity_Chest_idle, 0x00000002, entity_Chest_adjust_camera, 0x00000002, entity_GiantChest_give_equipment, 0x00000002, entity_Chest_begin_opening, 0x00000003, 0x00000000, entity_GiantChest_open, 0x00000002, entity_Chest_start_bound_script, 0x00000003, 0x00000000, entity_GiantChest_await_got_item, 0x00000002, entity_GiantChest_hide_effect, 0x00000002, entity_Chest_reset_camera, 0x00000003, 0x00000000, entity_Chest_close, 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802EAD7C -.word 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EAD8C -.word 0x00000002, entity_Chest_check_opened, 0x00000003, 0x00000000, entity_Chest_idle, 0x00000002, entity_Chest_begin_opening, 0x00000002, entity_Chest_start_bound_script, 0x00000002, entity_Chest_clear_item_id, 0x00000003, 0x00000000, entity_Chest_open, 0x00000002, entity_Chest_enable_player_input, 0x00000003, 0x00000000, entity_Chest_close, 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802EADF0 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000EB8, 0x00000002, 0x00000000, 0x40000038, D_802EADF0, 0x00000000, entity_GiantChest_init, D_802EACFC, 0x00000000, 0x00E648D0, 0x00E657A0, 0x32322D2E, 0xC0000038, D_802EADF0, 0x00000000, entity_Chest_init, D_802EAD8C, 0x00000000, 0x00E648D0, 0x00E657A0, 0x321C1A17, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EAE60 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A004338, 0x00000002, 0x00000000 - -dlabel D_802EAE7C -.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802EAE98 -.word 0x00000003, 0x00000000, entity_WoodenCrate_idle, 0x00000007, 0x00000020, 0x00000002, entity_WoodenCrate_shatter, 0x00000003, 0x00000000, entity_WoodenCrate_update_fragments, 0x00000007, 0x00000001, 0x00000007, 0x20000000, 0x00000000, 0x42000394, D_802EAE60, 0x00000000, entity_WoodenCrate_init, D_802EAE98, 0x00000000, 0x00E51640, 0x00E55A40, 0x24231E23, 0x00000000, 0x00000000 - -dlabel D_802EAF00 -.word 0x00000003, 0x00000000, entity_BlueWarpPipe_check_if_active, 0x00000003, 0x00000000, entity_BlueWarpPipe_rise_up, 0x00000003, 0x00000000, entity_BlueWarpPipe_wait_for_player_to_get_off, 0x00000003, 0x00000000, entity_BlueWarpPipe_idle, 0x00000002, entity_BlueWarpPipe_set_player_move_to_center, 0x00000003, 0x00000000, entity_BlueWarpPipe_wait_player_move_to_center, 0x00000002, entity_BlueWarpPipe_enter_pipe_init, 0x00000003, 0x00000000, entity_BlueWarpPipe_enter_pipe_update, 0x00000002, entity_BlueWarpPipe_start_bound_script, 0x00000000 - -dlabel D_802EAF64 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0006B8, 0x00000002, 0x00000000, 0x0000001C, D_802EAF64, 0x00000000, entity_init_BlueWarpPipe, D_802EAF00, 0x00000000, 0x00E58CD0, 0x00E59480, 0x2B283228, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802EAFB0 -.word 0x00000003, 0x00000000, entity_Signpost_idle, 0x00000000 - -dlabel D_802EAFC0 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000A68, 0x00000002, 0x00000000 - -dlabel D_802EAFDC -.word 0x0E000008, D_802EAFC0, 0x00000000, 0x00000000, D_802EAFB0, 0x00000000, 0x00E59480, 0x00E59F00, 0x33283214 diff --git a/ver/us/asm/data/battle/area_kkj/6DC340.data.s b/ver/us/asm/data/battle/area_kkj/6DC340.data.s index 2326049703..696dd443cd 100644 --- a/ver/us/asm/data/battle/area_kkj/6DC340.data.s +++ b/ver/us/asm/data/battle/area_kkj/6DC340.data.s @@ -36,7 +36,7 @@ dlabel D_80218824_6DC5C4 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000038, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0061000D, 0x00000046, 0x00000001, DoNormalHit, 0x00000046, 0x00000001, D_802195B8_6DD358, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00610005, 0x00000046, 0x00000001, DoImmune, 0x00000046, 0x00000001, D_802195B8_6DD358, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000020, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0061000D, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80219980_6DD720, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802189A0_6DC740 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000100, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000000E, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207A, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000050, 0x0000005F, 0x0000000F, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207B, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA10C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000001, func_80218220_6DBFC0, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8021833C_6DC0DC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207C, 0x00000043, 0x00000005, b_area_kkj_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFB0, 0x00000025, 0x00000005, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000100, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802183EC_6DC18C, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207D, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C85, 0x000000C8, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C80, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000005, b_area_kkj_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C81, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8021849C_6DC23C, 0x00000058, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 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, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x10000010, 0x00000000, 0x00000000, 0x00000004, 0x00000020, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetLastDamage, 0x00000100, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000045, 0x0000000E, 0xFFFFFFEE, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000003E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x0000000A, 0x00000005, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000006, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ActorSpeak, 0x0013009A, 0xFFFFFF81, 0x00000001, 0x00610006, 0x00610005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000100, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000000E, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610007, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207A, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000050, 0x0000005F, 0x0000000F, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207B, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0xF24A7E80, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000001, func_80218220_6DBFC0, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8021833C_6DC0DC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207C, 0x00000043, 0x00000005, b_area_kkj_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFB0, 0x00000025, 0x00000005, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000100, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, AddBattleCamZoom, 0x00000064, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802183EC_6DC18C, 0x00000059, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000207D, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C85, 0x000000C8, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C80, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000005, b_area_kkj_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0xFE363C81, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, b_area_kkj_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8021849C_6DC23C, 0x00000058, 0x00000000, 0x00000043, 0x00000002, StartRumble, 0x00000005, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A9280, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A8E80, 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, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000002, 0xF24A7B4D, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00610005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x10000010, 0x00000000, 0x00000000, 0x00000004, 0x00000020, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, GetLastDamage, 0x00000100, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000045, 0x0000000E, 0xFFFFFFEE, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000003E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x0000000A, 0x00000005, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000006, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, ActorSpeak, 0x0013009A, 0xFFFFFF81, 0x00000001, 0x00610006, 0x00610005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, FreezeBattleCam, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80219334_6DD0D4 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0x00000045, 0x0000000E, 0xFFFFFFEE, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000003E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, ActorSpeak, 0x00130093, 0xFFFFFF81, 0x00000001, 0x00610006, 0x00610005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFC8, 0xFFFFFFF7, 0xFFFFFFEE, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000003E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ActorSpeak, 0x00130094, 0x00000100, 0x00000001, 0x0020000D, 0x00200008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFFFFFFBE, 0xFFFFFFF7, 0xFFFFFFEE, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000003E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, ActorSpeak, 0x00130095, 0x00000000, 0x00000001, 0x000C0007, 0x000C0008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000004, AddActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x0000000C, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/entity/default/E2D410.data.s b/ver/us/asm/data/entity/default/E2D410.data.s deleted file mode 100644 index c77ddd39b0..0000000000 --- a/ver/us/asm/data/entity/default/E2D410.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802BCCE0_E2D410 -.word 0x00000003, 0x00000000, func_802BB1E8_E2B918, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCCF8_E2D428 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A002210, 0x00000002, 0x00000000 - -dlabel D_802BCD14_E2D444 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A001990, 0x00000002, 0x00000000 - -dlabel D_802BCD30_E2D460 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A001E00, 0x00000002, 0x00000000 - -dlabel D_802BCD4C_E2D47C -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A001E00, 0x00000002, 0x00000000, 0x1500001C, D_802BCCF8_E2D428, 0x00000000, func_802BB62C_E2BD5C, D_802BCCE0_E2D410, 0x00000000, 0x00E5AB50, 0x00E5CD80, 0x031EAF0A, 0x1500001C, D_802BCD14_E2D444, 0x00000000, func_802BB664_E2BD94, D_802BCCE0_E2D410, 0x00000000, 0x00E5CD80, 0x00E5E730, 0x041EAF0A, 0x1500001C, D_802BCD30_E2D460, 0x00000000, func_802BB69C_E2BDCC, D_802BCCE0_E2D410, 0x00000000, 0x00E5E730, 0x00E60550, 0x051EAF0A, 0x1500001C, D_802BCD4C_E2D47C, 0x00000000, func_802BB6D4_E2BE04, D_802BCCE0_E2D410, 0x00000000, 0x00E60550, 0x00E62370, 0x061EAF0A, 0x00000000, 0x00000000 - -dlabel D_802BCE00_E2D530 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802BCE1C_E2D54C -.word 0x00000004 - -dlabel D_802BCE20 -.word 0x00000011, 0x00000001, 0x0000003C, D_802E9828 - -dlabel D_802BCE30 -.short 0x0000 - -dlabel D_802BCE32 -.short 0x0002 - -dlabel D_802BCE34 -.word 0x00000000 - -dlabel D_802BCE38_E2D568 -.word 0x00000008, 0x00000020, 0x00000003, 0x00000000, func_802BC148_E2C878, 0x00000009, 0x00002092, 0x00000007, 0x00000020, 0x00000002, func_802BC1A8_E2C8D8, 0x00000003, 0x00000000, func_802BB8A4_E2BFD4, 0x00000007, 0x00000001, 0x00000007, 0x20000000, 0x00000000, 0x00000150, D_802BCE00_E2D530, 0x00000000, func_802BB870_E2BFA0, D_802BCE38_E2D568, 0x00000000, 0x00E4E7F0, 0x00E51640, 0x253C053C, 0x00000000, 0x00000000 - -dlabel D_802BCEB0_E2D5E0 -.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802BCECC_E2D5FC -.word 0x00000003, 0x00000000, func_802BCC80_E2D3B0, 0x00000007, 0x00000020, 0x00000003, 0x00000000, func_802BC3DC_E2CB0C, 0x00000007, 0x00000001, 0x00000007, 0x20000000, 0x00000000, 0x000000A0, D_802BCEB0_E2D5E0, 0x00000000, func_802BC3A8_E2CAD8, D_802BCECC_E2D5FC, 0x00000000, 0x00E9D650, 0x00E9ECD0, 0x26323232, 0x000000A0, D_802BCEB0_E2D5E0, 0x00000000, func_802BC3A8_E2CAD8, D_802BCECC_E2D5FC, 0x00000000, 0x00E9D650, 0x00E9ECD0, 0x26323264, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s b/ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s deleted file mode 100644 index 8016343a4b..0000000000 --- a/ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s +++ /dev/null @@ -1,120 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802BC6A0_E2EFD0 -.word 0x00000003, 0x00000000, func_802BB0A0_E2D9D0, 0x00000002, func_802BB314_E2DC44, 0x00000003, 0x00000046, func_802BB228_E2DB58, 0x00000002, func_802BB34C_E2DC7C, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BC6D4_E2F004 -.word 0x00000003, 0x00000000, func_802BB648_E2DF78, 0x00000009, 0x000000F4, 0x00000003, 0x00000032, 0x00000000, 0x00000007, 0x00001000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BC708_E2F038 -.word 0x00000003, 0x00000000, func_802BB78C_E2E0BC, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BC720_E2F050 -.word 0x00000003, 0x00000000, func_802BB9E0_E2E310, 0x00000000 - -dlabel D_802BC730_E2F060 -.word 0x00000004, 0x00000016, 0x00000001, 0x0000003C, D_802E9828, 0x00000002, 0x00000000 - -dlabel D_802BC74C_E2F07C -.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, 0x0A000D40, 0x00000002, 0x00000000 - -dlabel D_802BC768_E2F098 -.word 0x00E992F0, 0x00E9A990, 0x00E98740, 0x00E992F0 - -dlabel D_802BC778_E2F0A8 -.word 0x00E9B500, 0x00E9C900, 0x00E9A990, 0x00E9B500, 0x0E08000C, 0x00000A50, 0x000001E4, 0x00000000, D_802BC720_E2F050, 0x00000000, D_802BC768_E2F098, 0x00000000, 0x38671E18, 0x1E08000C, 0x00000AD0, 0x000000DC, func_802BB6E0_E2E010, D_802BC6D4_E2F004, 0x00000000, D_802BC778_E2F0A8, 0x00000000, 0x392C6419 - -dlabel D_802BC7D0_E2F100 -.word 0x1020000C, D_802BC730_E2F060, 0x00000000, func_802BB778_E2E0A8, D_802BC708_E2F038, 0x00000000, 0x00E9B500, 0x00E9C900, 0x392C6419, 0x00000070, D_802BC74C_E2F07C, 0x00000000, func_802BB298_E2DBC8, D_802BC6A0_E2EFD0, 0x00000000, 0x00E9C900, 0x00E9D650, 0x3A2D162A, 0x00000000, 0x00000000 - -dlabel D_802BC820_E2F150 -.word 0x00000003, 0x00000000, func_802BBCC0_E2E5F0, 0x00000008, 0x00001000, 0x00000009, 0x000000F1, 0x00000003, 0x0000003C, 0x00000000, 0x00000007, 0x00001000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BC85C_E2F18C -.word 0x00000003, 0x00000000, func_802BBD1C_E2E64C, 0x00000008, 0x00001000, 0x00000009, 0x000000F3, 0x00000003, 0x0000000F, 0x00000000, 0x00000002, func_802BBD78_E2E6A8, 0x00000003, 0x00000003, 0x00000000, 0x00000002, func_802BBD78_E2E6A8, 0x00000003, 0x00000002, 0x00000000, 0x00000002, func_802BBE8C_E2E7BC, 0x00000003, 0x00000003, 0x00000000, 0x00000002, func_802BBD78_E2E6A8, 0x00000003, 0x00000002, 0x00000000, 0x00000002, func_802BBD78_E2E6A8, 0x00000003, 0x00000003, 0x00000000, 0x00000002, func_802BBD78_E2E6A8, 0x00000003, 0x00000020, 0x00000000, 0x00000007, 0x00001000, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BC910_E2F240 -.word 0x00000002, func_802BC220_E2EB50, 0x00000005, 0x00000001, 0x00000003, 0x00000000, func_802BC050_E2E980, 0x00000003, 0x00000050, 0x00000000, 0x00000004, 0x00000001, 0x00000000 - -dlabel D_802BC944_E2F274 -.word 0x00000003, 0x00000000, 0x00000000, 0x00000002, func_802BC0B8_E2E9E8, 0x00000003, 0x00000007, 0x00000000, 0x00000002, func_802BC250_E2EB80, 0x00000009, 0x0000209B, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BC994_E2F2C4 -.word 0x00000003, 0x00000003, 0x00000000, 0x00000002, func_802BC0F0_E2EA20, 0x00000003, 0x00000004, func_802BC17C_E2EAAC, 0x00000002, func_802BC274_E2EBA4, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BC9DC_E2F30C -.word 0x00000003, 0x00000007, 0x00000000, 0x00000002, func_802BC2B4_E2EBE4, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCA10_E2F340 -.word 0x00000003, 0x00000008, 0x00000000, 0x00000002, func_802BC308_E2EC38, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCA44_E2F374 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x0000002C, func_802BC3E4_E2ED14, 0x00000003, 0x0000000D, 0x00000000, 0x00000002, func_802BC32C_E2EC5C, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCA90_E2F3C0 -.word 0x00000003, 0x00000004, 0x00000000, 0x00000002, func_802BC3A0_E2ECD0, 0x00000009, 0x00000393, 0x00000003, 0x00000004, 0x00000000, 0x00000002, func_802BC358_E2EC88, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCAE0_E2F410 -.word 0x00000003, 0x00000008, 0x00000000, 0x00000002, func_802BC37C_E2ECAC, 0x00000007, 0x00000001, 0x00000003, 0x00000003, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCB14_E2F444 -.word 0x00000003, 0x00000009, 0x00000000, 0x00000002, func_802BC220_E2EB50, 0x00000007, 0x00000001, 0x00000003, 0x0000000A, 0x00000000, 0x00000007, 0x20000000, 0x00000000 - -dlabel D_802BCB48_E2F478 -.word 0x00E6E660, 0x00E74750, 0x00E74750, 0x00E74BD0 - -dlabel D_802BCB58_E2F488 -.word 0x00E74BD0, 0x00E7ACC0, 0x00E7ACC0, 0x00E7B0E0 - -dlabel D_802BCB68_E2F498 -.word 0x00E7B0E0, 0x00E811D0, 0x00E811D0, 0x00E815F0 - -dlabel D_802BCB78_E2F4A8 -.word 0x00E815F0, 0x00E88030, 0x00E88030, 0x00E884A0 - -dlabel D_802BCB88_E2F4B8 -.word 0x00E884A0, 0x00E8A410, 0x00E8A410, 0x00E8A9E0 - -dlabel D_802BCB98_E2F4C8 -.word 0x00E8A9E0, 0x00E91420, 0x00E91420, 0x00E91890 - -dlabel D_802BCBA8_E2F4D8 -.word 0x00E91890, 0x00E982D0, 0x00E982D0, 0x00E98740 - -dlabel D_802BCBB8_E2F4E8 -.word 0x00E6B1B0, 0x00E6C440, 0x00E6C440, 0x00E6D390 - -dlabel D_802BCBC8_E2F4F8 -.word 0x00E6D390, 0x00E6E2D0, 0x00E6E2D0, 0x00E6E660, 0x1E080000, 0x00000EA4, 0x000000DC, 0x00000000, D_802BC820_E2F150, 0x00000000, D_802BCBB8_E2F4E8, 0x00000000, 0x351E281E, 0x10080004, 0x00000340, 0x00000058, 0x00000000, D_802BC85C_E2F18C, 0x00000000, D_802BCBC8_E2F4F8, 0x00000000, 0x361E281E, 0x0E00001C, D_802E9830, 0x00000000, func_802BC00C_E2E93C, D_802BC910_E2F240, 0x00000000, 0x00000000, 0x00000000, 0x372D142D - -dlabel D_802BCC44_E2F574 -.word 0x0028001C, 0x00000000, 0x0000045C, 0x00000000, D_802BC944_E2F274, 0x00000000, D_802BCB48_E2F478, 0x00000000, 0x43281428 - -dlabel D_802BCC68_E2F598 -.word 0x0028001C, 0x00000000, 0x000003FC, 0x00000000, D_802BC994_E2F2C4, 0x00000000, D_802BCB58_E2F488, 0x00000000, 0x44281428 - -dlabel D_802BCC8C_E2F5BC -.word 0x0028001C, 0x00000000, 0x000003FC, 0x00000000, D_802BC9DC_E2F30C, 0x00000000, D_802BCB68_E2F498, 0x00000000, 0x45281428 - -dlabel D_802BCCB0_E2F5E0 -.word 0x0028001C, 0x00000000, 0x00000444, 0x00000000, D_802BCA10_E2F340, 0x00000000, D_802BCB78_E2F4A8, 0x00000000, 0x46281428 - -dlabel D_802BCCD4_E2F604 -.word 0x0028001C, 0x00000034, 0x0000002C, func_802BC3CC_E2ECFC, D_802BCA44_E2F374, 0x00000000, D_802BCB88_E2F4B8, 0x00000000, 0x47281428 - -dlabel D_802BCCF8_E2F628 -.word 0x0028001C, 0x00000000, 0x00000444, 0x00000000, D_802BCA90_E2F3C0, 0x00000000, D_802BCB98_E2F4C8, 0x00000000, 0x48281428 - -dlabel D_802BCD1C_E2F64C -.word 0x0028001C, 0x00000000, 0x00000444, 0x00000000, D_802BCAE0_E2F410, 0x00000000, D_802BCBA8_E2F4D8, 0x00000000, 0x49281428 - -dlabel D_802BCD40_E2F670 -.word 0x0028001C, 0x00000000, 0x0000045C, 0x00000000, D_802BCB14_E2F444, 0x00000000, D_802BCB48_E2F478, 0x00000000, 0x4A281428, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802BCD70_E2F6A0 -.word 0x00000003, 0x00000000, func_802BC628_E2EF58, 0x00000000 - -dlabel D_802BCD80_E2F6B0 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A000C40, 0x00000002, 0x00000000, 0x0E000010, D_802BCD80_E2F6B0, 0x00000000, func_802BC630_E2EF60, D_802BCD70_E2F6A0, func_802BC658_E2EF88, 0x00E59F00, 0x00E5AB50, 0x3412320A diff --git a/ver/us/asm/data/entity/sbk_omo/E31380.data.s b/ver/us/asm/data/entity/sbk_omo/E31380.data.s deleted file mode 100644 index a5848856bb..0000000000 --- a/ver/us/asm/data/entity/sbk_omo/E31380.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802BCA30_E31380 -.byte 0x00, 0x02, 0x20, 0x02, 0x00, 0x03, 0x20, 0x02, 0x00, 0x50, 0xFF, 0x00 - -dlabel D_802BCA3C_E3138C -.word 0x00000003, 0x00000014, func_802BBDB8_E30708, 0x00000003, 0x00000000, func_802BBA60_E303B0, 0x00000000 - -dlabel D_802BCA58_E313A8 -.word 0x00000004, 0x00000011, 0x00000001, 0x0000003C, 0x0A001E58, 0x00000002, 0x00000000, 0x002000C0, D_802BCA58_E313A8, 0x00000000, func_802BBE14_E30764, D_802BCA3C_E3138C, 0x00000000, 0x00E56E60, 0x00E58CD0, 0x3C324632, 0x00000000, 0x00000000 - -dlabel D_802BCAA0_E313F0 -.byte 0x00, 0x02, 0xE0, 0x02, 0xC0, 0x02, 0xA0, 0x02, 0x00, 0x02, 0xE0, 0x02, 0xC0, 0x02, 0xA0, 0x02, 0x00, 0x02, 0xE0, 0x02, 0xC0, 0x02, 0xA0, 0x02, 0x00, 0x02, 0xE0, 0x02, 0xC0, 0x02, 0xA0, 0x02, 0x00, 0x02, 0xFF, 0x00 - -dlabel D_802BCAC4_E31414 -.word 0x00000003, 0x00000000, func_802BC2BC_E30C0C, 0x00000003, 0x00000004, func_802BC514_E30E64, 0x00000002, func_802BC558_E30EA8, 0x00000003, 0x00000003, 0x00000000, 0x00000002, func_802BC9CC_E3131C, 0x00000003, 0x00000001, 0x00000000, 0x00000003, 0x00000000, func_802BC570_E30EC0, 0x00000003, 0x00000000, func_802BC99C_E312EC, 0x00000004, 0x00000000, 0x00000000 - -dlabel D_802BCB28_E31478 -.word 0x00000004, 0x00000001, 0x00000001, 0x0000003C, 0x0A0010C8, 0x00000002, 0x00000000, 0x80000024, D_802BCB28_E31478, 0x00000000, func_802BC9FC_E3134C, D_802BCAC4_E31414, 0x00000000, 0x00E55A40, 0x00E56BA0, 0x31232323, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s b/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s index 8ddad73315..e0d7f8d4c1 100644 --- a/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s +++ b/ver/us/asm/data/world/area_hos/hos_00/A0E520.data.s @@ -6,7 +6,7 @@ dlabel D_80242830_A0E520 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016E, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242878_A0E568 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016D, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000001C2, 0x0000000A, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242830_A0E520, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x00000357, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242878_A0E568, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000017C, 0xFFFFFFF6, 0x00000019, 0x00000000, 0x00000010, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016D, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x000001C2, 0x0000000A, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242830_A0E520, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x00000357, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242878_A0E568, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x0000017C, 0xFFFFFFF6, 0x00000019, 0x00000000, 0x00000010, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel hos_00_varStash .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_01/A15860.data.s b/ver/us/asm/data/world/area_hos/hos_01/A15860.data.s index 507c02897c..c88cbff14c 100644 --- a/ver/us/asm/data/world/area_hos/hos_01/A15860.data.s +++ b/ver/us/asm/data/world/area_hos/hos_01/A15860.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80244FE0_A15860 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF2E, 0x0000001E, 0x0000011D, 0x00000000, 0x00000013, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9B, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFEA2, 0x00000000, 0xFFFFFEED, 0x00000011, 0xF8405DA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF2E, 0x0000001E, 0x0000011D, 0x00000000, 0x00000013, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9B, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFEA2, 0x00000000, 0xFFFFFEED, 0x00000011, 0xF8405DA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3BA40.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3BA40.data.s index 908f8c28e3..5b272cb457 100644 --- a/ver/us/asm/data/world/area_hos/hos_06/A3BA40.data.s +++ b/ver/us/asm/data/world/area_hos/hos_06/A3BA40.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242560_A3BA40 -.word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A50, D_80242560_A3BA40, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190022, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFFCE, 0x00000000, 0x0000015E, 0xFFFFFFA6, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A50, D_80242560_A3BA40, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190022, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFFCE, 0x00000000, 0x0000015E, 0xFFFFFFA6, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405D9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_02/979390.data.s b/ver/us/asm/data/world/area_isk/isk_02/979390.data.s index 64736190b4..0c026c8550 100644 --- a/ver/us/asm/data/world/area_isk/isk_02/979390.data.s +++ b/ver/us/asm/data/world/area_isk/isk_02/979390.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240C80_979390 -.word 0x0000000A, 0x00000002, 0xF8405EE6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000110, 0x0000003C, 0x000001E6, 0x0000012C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405EE6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000110, 0x0000003C, 0x000001E6, 0x0000012C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s b/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s index c87c997dcb..c2342f93db 100644 --- a/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s +++ b/ver/us/asm/data/world/area_isk/isk_04/97CA70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241440_97CA70 -.word 0x0000000A, 0x00000002, 0xF8405EE9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000258, 0xFFFFFEB6, 0x00000064, 0x000000A0, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F8, 0xFFFFFF3F, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFF3F, 0xFFFFFF80, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405EE9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000258, 0xFFFFFEB6, 0x00000064, 0x000000A0, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F8, 0xFFFFFF3F, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E6, 0xFFFFFF3F, 0xFFFFFF80, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s b/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s index 3ce453f009..2d673b0886 100644 --- a/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_05/97FCE0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242210_97FCE0 -.word 0x00000024, 0x00000002, 0xF8405EFE, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000016, 0x0000013C, 0x00000052, 0xFFFFFE1F, 0x00000000, 0xF8405EF2, 0x0000000A, 0x00000002, 0xF8405EFE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA1C0, 0x000001AF, 0x00000000, 0xFFFFFE22, 0x0000002D, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242210_97FCE0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x000000C4, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000122, 0x000000C4, 0xFFFFFE65, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x00000042, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405EFE, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000016, 0x0000013C, 0x00000052, 0xFFFFFE1F, 0x00000000, 0xF8405EF2, 0x0000000A, 0x00000002, 0xF8405EFE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideHitbox, 0x000001AF, 0x00000000, 0xFFFFFE22, 0x0000002D, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242210_97FCE0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x000000C4, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000122, 0x000000C4, 0xFFFFFE65, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0x00000042, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982860.data.s b/ver/us/asm/data/world/area_isk/isk_07/982860.data.s index 5532342c32..4aec0989d4 100644 --- a/ver/us/asm/data/world/area_isk/isk_07/982860.data.s +++ b/ver/us/asm/data/world/area_isk/isk_07/982860.data.s @@ -6,4 +6,4 @@ dlabel D_80240420_982860 .word 0x00000024, 0x00000002, 0xF8405EF6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240440_982880 -.word 0x00000024, 0x00000002, 0xF8405EFF, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EED, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFED4, 0xFFFFFE84, 0x00000212, 0x00000032, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EFF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA1C0, 0x000001D6, 0xFFFFFF06, 0x0000010E, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240440_982880, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA5F4, 0xFFFFFF06, 0xFFFFFEB6, 0x00000221, 0xFFFFFFE7, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240420_982860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFE7A, 0x00000221, 0x00000000, 0xF8405EEB, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFF3F, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFF3F, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFF3F, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFF3F, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFF3F, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFEBD, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFEBD, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFEBD, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFEBD, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFEBD, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000053, 0x000001EA, 0xFFFFFF06, 0x000000D7, 0x00000011, 0xF8405EF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405EFF, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EED, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFED4, 0xFFFFFE84, 0x00000212, 0x00000032, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EFF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideHitbox, 0x000001D6, 0xFFFFFF06, 0x0000010E, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240440_982880, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EF6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0xFFFFFF06, 0xFFFFFEB6, 0x00000221, 0xFFFFFFE7, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240420_982860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFE7A, 0x00000221, 0x00000000, 0xF8405EEB, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFF3F, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFF3F, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFF3F, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFF3F, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFF3F, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFEBD, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFEBD, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFEBD, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFEBD, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2A, 0xFFFFFEBD, 0x000001CB, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000053, 0x000001EA, 0xFFFFFF06, 0x000000D7, 0x00000011, 0xF8405EF4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s index 04b9367bf0..c6002283b3 100644 --- a/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_09/986BD0.data.s @@ -24,4 +24,4 @@ dlabel D_80240A5C_986F3C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405F05, 0x00000001, 0x00000046, 0x00000001, D_8024075C_986C3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AA8_986F88 -.word 0x00000024, 0x00000002, 0xF8405F00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF62, 0xFFFFFE9A, 0xFFFFFDCE, 0x0000011B, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F04, 0x00000044, 0x00000001, D_802408BC_986D9C, 0x0000000A, 0x00000002, 0xF8405F00, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA19C, 0xFFFFFEEE, 0xFFFFFE7A, 0xFFFFFDFB, 0x00000073, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240AA8_986F88, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000032, 0xFFFFFF10, 0xFFFFFDE9, 0x000000DE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F05, 0x00000043, 0x00000002, AssignScript, D_80240A5C_986F3C, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFEBD, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFEBD, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFEBD, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFEBD, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFEBD, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFF3F, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFF3F, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFF3F, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFF3F, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFF3F, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFF3F, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFFC1, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFFC1, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFFC1, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFFC1, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFFC1, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFFC1, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F00, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFF62, 0xFFFFFE9A, 0xFFFFFDCE, 0x0000011B, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F04, 0x00000044, 0x00000001, D_802408BC_986D9C, 0x0000000A, 0x00000002, 0xF8405F00, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFEEE, 0xFFFFFE7A, 0xFFFFFDFB, 0x00000073, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240AA8_986F88, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000032, 0xFFFFFF10, 0xFFFFFDE9, 0x000000DE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F05, 0x00000043, 0x00000002, AssignScript, D_80240A5C_986F3C, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFEBD, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFEBD, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFEBD, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFEBD, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFEBD, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFEBD, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFF3F, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFF3F, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFF3F, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFF3F, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFF3F, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFF3F, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE09, 0xFFFFFFC1, 0xFFFFFFD4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE1F, 0xFFFFFFC1, 0xFFFFFF7E, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE63, 0xFFFFFFC1, 0xFFFFFEDE, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFFC1, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF2D, 0xFFFFFFC1, 0xFFFFFE35, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7E, 0xFFFFFFC1, 0xFFFFFE1A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s index f77b130d85..d116da1020 100644 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s @@ -42,4 +42,4 @@ dlabel D_80241748_98A2A8 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418E0_98A440 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFDDA, 0xFFFFFD30, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F07, 0x00000043, 0x00000002, AssignScript, D_802412C8_989E28, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D38_989898, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDFC, 0xFFFFFCF4, 0xFFFFFFB9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241748_98A2A8, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFE3B, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFD37, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFDDA, 0xFFFFFD30, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F07, 0x00000043, 0x00000002, AssignScript, D_802412C8_989E28, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D38_989898, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFDFC, 0xFFFFFCF4, 0xFFFFFFB9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241748_98A2A8, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFE3B, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE02, 0xFFFFFD37, 0x0000002B, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s b/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s index 44e9258b00..43af6998cb 100644 --- a/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s +++ b/ver/us/asm/data/world/area_isk/isk_11/98B330.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240920_98B330 -.word 0x0000000A, 0x00000002, 0xF8405EF8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000163, 0xFFFFFE34, 0x000001AE, 0xFFFFFFD8, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7D, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFE3B, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFDB9, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFDB9, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFD37, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFD37, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFCB5, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFCB5, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFFB5, 0xFFFFFD30, 0x00000271, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405EF8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000163, 0xFFFFFE34, 0x000001AE, 0xFFFFFFD8, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFF7D, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFE3B, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000123, 0xFFFFFE3B, 0x0000019F, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFDB9, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFDB9, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFD37, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFD37, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFFD4, 0xFFFFFCB5, 0x000001F9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x00000083, 0xFFFFFCB5, 0x000001E9, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFFB5, 0xFFFFFD30, 0x00000271, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s b/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s index 4a29be3ab1..3958905423 100644 --- a/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s +++ b/ver/us/asm/data/world/area_isk/isk_12/98DA70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240430_98DA70 -.word 0x00000024, 0x00000002, 0xF8405F01, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F01, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA19C, 0x00000273, 0xFFFFFCB8, 0x00000087, 0x0000004B, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240430_98DA70, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFE3B, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFD7D, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFD7D, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001A1, 0xFFFFFD7D, 0x000000C4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001BC, 0xFFFFFD7D, 0x00000078, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0x000001CD, 0xFFFFFD08, 0x0000006D, 0x00000000, 0xF8405EF7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F01, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F01, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0x00000273, 0xFFFFFCB8, 0x00000087, 0x0000004B, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240430_98DA70, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFE3B, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFD7D, 0x00000123, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001F9, 0xFFFFFD7D, 0x0000002C, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001A1, 0xFFFFFD7D, 0x000000C4, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001BC, 0xFFFFFD7D, 0x00000078, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0x000001CD, 0xFFFFFD08, 0x0000006D, 0x00000000, 0xF8405EF7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s index bdb4a8a7b6..6defbfa76d 100644 --- a/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s +++ b/ver/us/asm/data/world/area_isk/isk_13/991A90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802422B0_991A90 -.word 0x00000024, 0x00000002, 0xF8405F02, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000015, 0x000001CC, 0xFFFFFDC8, 0xFFFFFEAA, 0x00000000, 0xF8405EF1, 0x0000000A, 0x00000002, 0xF8405F02, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA1C0, 0x00000238, 0xFFFFFD76, 0xFFFFFED2, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_991A90, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFDB9, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFE3B, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFDB9, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F02, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000015, 0x000001CC, 0xFFFFFDC8, 0xFFFFFEAA, 0x00000000, 0xF8405EF1, 0x0000000A, 0x00000002, 0xF8405F02, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideHitbox, 0x00000238, 0xFFFFFD76, 0xFFFFFED2, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_991A90, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFE3B, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x0000019F, 0xFFFFFDB9, 0xFFFFFEDD, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFE3B, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0x000001E9, 0xFFFFFDB9, 0xFFFFFF7D, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242460_991C40 .word 0x00000043, 0x00000001, isk_13_UnkFunc53, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s b/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s index 457b7f302c..3d236ecad2 100644 --- a/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_14/9946D0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241FA0_9946D0 -.word 0x00000024, 0x00000002, 0xF8405F03, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000017, 0xFFFFFE7B, 0xFFFFFD46, 0xFFFFFE58, 0x00000000, 0xF8405EF3, 0x0000000A, 0x00000002, 0xF8405F03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA1C0, 0xFFFFFE05, 0xFFFFFCF4, 0xFFFFFE74, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241FA0_9946D0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFDB9, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFDB9, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFD37, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F03, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000017, 0xFFFFFE7B, 0xFFFFFD46, 0xFFFFFE58, 0x00000000, 0xF8405EF3, 0x0000000A, 0x00000002, 0xF8405F03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_WideHitbox, 0xFFFFFE05, 0xFFFFFCF4, 0xFFFFFE74, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241FA0_9946D0, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFDB9, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE9A, 0xFFFFFDB9, 0xFFFFFE9A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000020, 0x00000001, 0xFFFFFE35, 0xFFFFFD37, 0xFFFFFF2A, 0xF24A7BB4, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s index 036c67c74e..2614a45f0d 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_00/90CF20.data.s @@ -24,7 +24,7 @@ dlabel D_80240620_90D260 .word 0x00000024, 0x00000002, 0xF8405E4F, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240640_90D280 -.word 0x0000000A, 0x00000002, 0xF8405E4F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA154, 0x00000384, 0xFFFFFFE2, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240620_90D260, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000195, 0x00000019, 0x00000019, 0x00000011, 0xF8405E33, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000001D1, 0x00000035, 0x00000019, 0x00000011, 0xF8405E34, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000203, 0x0000005C, 0x00000019, 0x00000011, 0xF8405E35, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000004EC, 0x0000001E, 0x0000008C, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E4B, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x0000003A, 0xFFFFFFFB, 0xFFFFFFB7, 0xFFFFFFE2, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x0000039E, 0x00000046, 0xFFFFFFD3, 0x00000016, 0x0000005A, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405E4F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block_TallHitbox, 0x00000384, 0xFFFFFFE2, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240620_90D260, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000195, 0x00000019, 0x00000019, 0x00000011, 0xF8405E33, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000001D1, 0x00000035, 0x00000019, 0x00000011, 0xF8405E34, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000203, 0x0000005C, 0x00000019, 0x00000011, 0xF8405E35, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000004EC, 0x0000001E, 0x0000008C, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E4B, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x0000003A, 0xFFFFFFFB, 0xFFFFFFB7, 0xFFFFFFE2, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x0000039E, 0x00000046, 0xFFFFFFD3, 0x00000016, 0x0000005A, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240790_90D3D0 .word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s b/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s index 349bba2043..4e160b2c57 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_01/912990.data.s @@ -30,4 +30,4 @@ dlabel D_80243708_912DB8 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000008, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245DB0, 0x00000046, 0x00000001, D_802438B0_912F60, 0x00000044, 0x00000001, D_802434D0_912B80, 0x00000044, 0x00000001, D_80243568_912C18, 0x00000046, 0x00000001, 0x80243EC8, 0x00000044, 0x00000001, 0x802462F0, 0x00000044, 0x00000001, 0x80246290, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000016, 0x00000000, 0x00000008, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000000D, 0x00000001, 0xFFFFFDC6, 0xFFFFFF4C, 0x000001A9, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000000E, 0x00000001, 0x000002E4, 0xFFFFFF56, 0x0000014A, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80243688_912D38, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243688_912D38, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802438B0_912F60 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFD76, 0x0000007B, 0x00000177, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFE09, 0x0000003F, 0x000000E1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000339, 0x000000AA, 0x00000073, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E8, 0x000000A0, 0x0000007D, 0x0000007D, 0x00000011, 0xF8405E2E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000036, 0x0000019A, 0x0000008C, 0x00000087, 0x00000000, 0xF8405E41, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000002D, 0x0000000A, 0x0000003C, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E4D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFD76, 0x0000007B, 0x00000177, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0xFFFFFE09, 0x0000003F, 0x000000E1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x00000339, 0x000000AA, 0x00000073, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E8, 0x000000A0, 0x0000007D, 0x0000007D, 0x00000011, 0xF8405E2E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000036, 0x0000019A, 0x0000008C, 0x00000087, 0x00000000, 0xF8405E41, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x0000002D, 0x0000000A, 0x0000003C, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E4D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_02/917170.data.s b/ver/us/asm/data/world/area_iwa/iwa_02/917170.data.s index d47777bca4..78659f29f4 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_02/917170.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_02/917170.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241400_917170 -.word 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000040, 0x00000000, 0x0000005F, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000133, 0x00000043, 0x00000063, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x000002BC, 0x000000EE, 0x0000000F, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000023, 0x000000A7, 0x00000078, 0x00000011, 0xF8405E2F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x00000040, 0x00000000, 0x0000005F, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x00000133, 0x00000043, 0x00000063, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x000002BC, 0x000000EE, 0x0000000F, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000023, 0x000000A7, 0x00000078, 0x00000011, 0xF8405E2F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s index 8de1a6603e..a79bcc1c48 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_03/919F00.data.s @@ -33,4 +33,4 @@ dlabel D_802417F0_91A3A0 .word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E31, 0x00000001, 0x00000046, 0x00000001, D_8024159C_91A14C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024183C_91A3EC -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802402BC_918E6C, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFF9D4, 0x00000017, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416E0_91A290, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFF911, 0x00000198, 0xFFFFFF88, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3E, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFD94, 0xFFFFFFF1, 0xFFFFFFBB, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3F, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFBBE, 0x00000198, 0xFFFFFF7E, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E40, 0x00000043, 0x00000007, MakeItemEntity, 0x00000054, 0xFFFFFFEC, 0x0000005F, 0xFFFFFFAB, 0x00000011, 0xF8405E42, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFF8B7, 0x00000017, 0x00000014, 0x00000011, 0xF8405E30, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8E9, 0x00000017, 0x00000014, 0x00000011, 0xF8405E38, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF885, 0x00000017, 0x00000014, 0x00000011, 0xF8405E39, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3B, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x00000000, 0x00000011, 0xF8405E36, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x0000003C, 0x00000011, 0xF8405E37, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFF94B, 0x0000005D, 0xFFFFFF81, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E31, 0x00000043, 0x00000002, AssignScript, D_802417F0_91A3A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802402BC_918E6C, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFF9D4, 0x00000017, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416E0_91A290, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFF911, 0x00000198, 0xFFFFFF88, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3E, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFD94, 0xFFFFFFF1, 0xFFFFFFBB, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E3F, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFBBE, 0x00000198, 0xFFFFFF7E, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E40, 0x00000043, 0x00000007, MakeItemEntity, 0x00000054, 0xFFFFFFEC, 0x0000005F, 0xFFFFFFAB, 0x00000011, 0xF8405E42, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFF8B7, 0x00000017, 0x00000014, 0x00000011, 0xF8405E30, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8E9, 0x00000017, 0x00000014, 0x00000011, 0xF8405E38, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF885, 0x00000017, 0x00000014, 0x00000011, 0xF8405E39, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0x0000003F, 0x00000011, 0xF8405E3B, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF8D0, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF89E, 0x00000017, 0xFFFFFFE9, 0x00000011, 0xF8405E3D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x00000000, 0x00000011, 0xF8405E36, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFF955, 0xFFFFFFC4, 0x0000003C, 0x00000011, 0xF8405E37, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFF94B, 0x0000005D, 0xFFFFFF81, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E31, 0x00000043, 0x00000002, AssignScript, D_802417F0_91A3A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_04/91CA50.data.s b/ver/us/asm/data/world/area_iwa/iwa_04/91CA50.data.s index 0d1c722db9..19129f65a2 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_04/91CA50.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_04/91CA50.data.s @@ -18,4 +18,4 @@ dlabel D_80241484_91CD64 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_80241420_91CD00, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD0, 0xFFFFFF06, 0x000000BE, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD0, 0x00000000, 0x0000005A, 0x00000028, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241594_91CE74 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_91B8E0, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDCF, 0xFFFFFF06, 0x00000079, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241484_91CD64, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFDFF, 0x00000000, 0xFFFFFF9F, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000258, 0x00000000, 0x000000C8, 0x00000000, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x00000150, 0xFFFFFF74, 0x000000CB, 0x00000000, 0x00000046, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0x000002DA, 0xFFFFFF06, 0xFFFFFFA1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000040, 0xFFFFFEED, 0xFFFFFF06, 0x00000096, 0x00000011, 0xF8405E43, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240000_91B8E0, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFDCF, 0xFFFFFF06, 0x00000079, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241484_91CD64, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0xFFFFFDFF, 0x00000000, 0xFFFFFF9F, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x00000258, 0x00000000, 0x000000C8, 0x00000000, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x00000150, 0xFFFFFF74, 0x000000CB, 0x00000000, 0x00000046, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0x000002DA, 0xFFFFFF06, 0xFFFFFFA1, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000040, 0xFFFFFEED, 0xFFFFFF06, 0x00000096, 0x00000011, 0xF8405E43, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index caeeca6b70..9fb614ecc9 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -21,4 +21,4 @@ dlabel D_80245C28_924198 .word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_SuperBlock_StartGlowEffect, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802460A8_924618 -.word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block_TallHitbox, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_ArrowSign, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s index 3a683fa472..ef25119325 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s @@ -117,4 +117,4 @@ dlabel D_8024561C_B25B5C .word 0x00000007, D_8024239C_B228DC, 0x430F0000, 0x00000000, 0x43820000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000003, D_8024488C_B24DCC, 0x00000000, 0x00000001, D_80244E5C_B2539C, 0x00000000, 0x00000001, D_8024504C_B2558C, 0x00000000, 0x00000001, D_8024523C_B2577C, 0x00000000, 0x00000001, D_8024542C_B2596C, 0x00000000, 0x00000001, D_8024561C_B25B5C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80245860_B25DA0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x00000064, 0x0000019F, 0x00000011, 0xF8406040, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x0000007D, 0x0000019F, 0x00000011, 0xF8406041, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0x00000172, 0x00000000, 0xFFFFFF2E, 0x00000011, 0xF8406043, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80245860_B25DA0, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7F4, 0x0000000F, 0x00000000, 0x0000019F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x00000064, 0x0000019F, 0x00000011, 0xF8406040, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x0000007D, 0x0000019F, 0x00000011, 0xF8406041, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0x00000172, 0x00000000, 0xFFFFFF2E, 0x00000011, 0xF8406043, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80245860_B25DA0, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SpinningFlower, 0x0000000F, 0x00000000, 0x0000019F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_01/B2B430.data.s b/ver/us/asm/data/world/area_jan/jan_01/B2B430.data.s index 900cb54544..26c9d08f70 100644 --- a/ver/us/asm/data/world/area_jan/jan_01/B2B430.data.s +++ b/ver/us/asm/data/world/area_jan/jan_01/B2B430.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243400_B2B430 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000041, 0xFFFFFF92, 0x0000005A, 0xFFFFFF1A, 0x00000011, 0xF8406046, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0xFFFFFE89, 0xFFFFFFFD, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFEB1, 0x00000039, 0xFFFFFFC9, 0x00000000, 0x00000097, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840605E, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x000000B4, 0xFFFFFFFD, 0xFFFFFF8D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x0000008C, 0x00000039, 0xFFFFFFAB, 0x00000000, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840605F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000154, 0x00000064, 0xFFFFFFA6, 0x00000011, 0xF8406045, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000154, 0x0000007D, 0xFFFFFFA6, 0x00000011, 0xF840607D, 0x00000043, 0x00000007, MakeEntity, 0x802BC7F4, 0x00000154, 0x00000000, 0xFFFFFFA6, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000041, 0xFFFFFF92, 0x0000005A, 0xFFFFFF1A, 0x00000011, 0xF8406046, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0xFFFFFE89, 0xFFFFFFFD, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFEB1, 0x00000039, 0xFFFFFFC9, 0x00000000, 0x00000097, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840605E, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0x000000B4, 0xFFFFFFFD, 0xFFFFFF8D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000008C, 0x00000039, 0xFFFFFFAB, 0x00000000, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840605F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000154, 0x00000064, 0xFFFFFFA6, 0x00000011, 0xF8406045, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000154, 0x0000007D, 0xFFFFFFA6, 0x00000011, 0xF840607D, 0x00000043, 0x00000007, MakeEntity, Entity_SpinningFlower, 0x00000154, 0x00000000, 0xFFFFFFA6, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B33E00.data.s b/ver/us/asm/data/world/area_jan/jan_02/B33E00.data.s index 0270267685..d637f6bac3 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B33E00.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B33E00.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80247990_B33E00 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000019, 0x0000000F, 0xFFFFFFC4, 0x00000000, 0x0000001A, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406075, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000019, 0x0000000F, 0xFFFFFFC4, 0x00000000, 0x0000001A, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406075, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s b/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s index c601bbe920..4c1e280ecf 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B435D0.data.s @@ -9,4 +9,4 @@ dlabel D_8024EA30_B43600 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024EA98_B43668 -.word 0x00000043, 0x00000001, func_80242FA0_B37B70, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA30_B43600, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7AE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD4, 0x0000012C, 0xFFFFFF3D, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFD8A, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump2, 0xFFFFFDA7, 0x00000178, 0xFFFFFF97, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406315, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406315, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFDE4, 0x00000000, 0x000000C3, 0x0000001E, 0x00000003, D_8024EA00_B435D0, 0x00000795, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000064, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFDD4, 0x00000000, 0xFFFFFF3D, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EA98_B43668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, func_80242FA0_B37B70, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_8024EA30_B43600, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7AE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDD4, 0x0000012C, 0xFFFFFF3D, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, func_802D2884, 0xFFFFFD8A, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump2, 0xFFFFFDA7, 0x00000178, 0xFFFFFF97, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406315, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406315, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFDE4, 0x00000000, 0x000000C3, 0x0000001E, 0x00000003, D_8024EA00_B435D0, 0x00000795, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000064, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFDD4, 0x00000000, 0xFFFFFF3D, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EA98_B43668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s index 5d29210519..032fb94d53 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s @@ -27,4 +27,4 @@ dlabel D_8024194C_B460BC .word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF840604C, 0x00000001, 0x00000046, 0x00000001, D_8024186C_B45FDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241998_B46108 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000026, 0x0000005F, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840604C, 0x00000043, 0x00000002, AssignScript, D_8024194C_B460BC, 0x00000023, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000012C, 0x00000000, 0xFFFFFF1F, 0x00000011, 0xF840604D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000026, 0x0000005F, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840604C, 0x00000043, 0x00000002, AssignScript, D_8024194C_B460BC, 0x00000023, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000012C, 0x00000000, 0xFFFFFF1F, 0x00000011, 0xF840604D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s index 26c97eb60a..194a3cb3b0 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s @@ -9,4 +9,4 @@ dlabel D_80244998_B49108 .word 0x41200000, 0x43020000, 0xC1A00000, 0x40A00000, 0x42960000, 0xC1A00000, 0x00000000, 0x00000000, 0xC1A00000 dlabel D_802449BC_B4912C -.word 0x00000000, 0x00000000, 0xC1A00000, 0x00000000, 0x41F00000, 0xC1000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000302, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000A, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, 0x802EAE30, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240BE8_B45358, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x00000046, D_80244950_B490C0, 0x00000006, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, GotoMap, 0x802462E8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, 0x802EAE30, 0x00000000, 0x00000A5A, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D0C_B4547C, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x0000000C, D_80244998_B49108, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x0000000A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x0000015E, 0x0000015E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_802449BC_B4912C, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024134C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x00000000, 0xC1A00000, 0x00000000, 0x41F00000, 0xC1000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000302, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000A, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, Entity_Chest, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240BE8_B45358, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x00000046, D_80244950_B490C0, 0x00000006, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, GotoMap, 0x802462E8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, Entity_Chest, 0x00000000, 0x00000A5A, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D0C_B4547C, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x0000000C, D_80244998_B49108, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x0000000A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x0000015E, 0x0000015E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_802449BC_B4912C, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024134C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s b/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s index 5f93108dcc..d3f8c507eb 100644 --- a/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80247970_B523E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000117, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406056, 0x00000043, 0x00000007, MakeEntity, 0x802BC788, 0x000000CD, 0x00000000, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE7E, 0x00000000, 0xFFFFFF2A, 0x000000A0, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000117, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406056, 0x00000043, 0x00000007, MakeEntity, Entity_CymbalPlant, 0x000000CD, 0x00000000, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_TrumpetPlant, 0xFFFFFE7E, 0x00000000, 0xFFFFFF2A, 0x000000A0, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s b/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s index d7f0ad480d..ad62e89364 100644 --- a/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80244A90_B572C0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000054, 0x00000000, 0xFFFFFEC0, 0x00000005, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000011D, 0xFFFFFFC4, 0x000000DC, 0x00000011, 0xF8406058, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000054, 0x00000000, 0xFFFFFEC0, 0x00000005, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000011D, 0xFFFFFFC4, 0x000000DC, 0x00000011, 0xF8406058, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s index 44d4bf836c..8f4cf62ec4 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s @@ -18,4 +18,4 @@ dlabel D_80243E64_B62114 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_SuperBlock_GatherEnergyFX, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_HideBlockContent, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_AnimateEnergyOrbs, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FC8_B62278 -.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_SuperBlock_StartGlowEffect, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, jan_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_SuperBlock_StartGlowEffect, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, jan_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, Entity_TrumpetPlant, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s index 17785a47f4..c8b8ab97a4 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80246500_B6BFB0 -.word 0x00000043, 0x0000000A, MakeEntity, 0x802BC7F4, 0x0000001E, 0x00000000, 0xFFFFFF06, 0x00000000, 0xFFFFFFDF, 0x0000005A, 0xFFFFFEA5, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCC20, 0x0000010F, 0x00000000, 0x00000150, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x0000000A, MakeEntity, Entity_SpinningFlower, 0x0000001E, 0x00000000, 0xFFFFFF06, 0x00000000, 0xFFFFFFDF, 0x0000005A, 0xFFFFFEA5, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Munchlesia, 0x0000010F, 0x00000000, 0x00000150, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s index a2e0045b33..5ec8a27422 100644 --- a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s +++ b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242C80_B75D30 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000082, 0x00000000, 0xFFFFFF92, 0x000000AA, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0xFFFFFEA2, 0x0000001E, 0xFFFFFFC9, 0x00000019, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFECA, 0x0000005A, 0xFFFFFFE7, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406062, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000082, 0x00000000, 0xFFFFFF92, 0x000000AA, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0xFFFFFEA2, 0x0000001E, 0xFFFFFFC9, 0x00000019, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFECA, 0x0000005A, 0xFFFFFFE7, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406062, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF dlabel D_80242D38_B75DE8 .word 0x00420000, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s b/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s index 94dd870df9..2a02c9cdb2 100644 --- a/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802437F0_B79FA0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFF57, 0x00000000, 0xFFFFFF8D, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFF47, 0x00000055, 0xFFFFFFDD, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406063, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF57, 0x00000000, 0xFFFFFF8D, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF47, 0x00000055, 0xFFFFFFDD, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406063, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s index 9745249906..2b6bf4c7dd 100644 --- a/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s +++ b/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242660_B7FF80 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000181, 0x00000000, 0xFFFFFFB5, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406076, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000181, 0x00000000, 0xFFFFFFB5, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406076, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s b/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s index 9defbb28d9..7229e35759 100644 --- a/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s +++ b/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242C70_B82C70 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFF90, 0x00000000, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFE3B, 0x00000000, 0x000000BC, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF90, 0x00000000, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFE3B, 0x00000000, 0x000000BC, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s b/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s index 5e645e82b5..fd79abbb03 100644 --- a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240360_B83B20 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFFC3, 0x00000000, 0xFFFFFFF9, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFFC3, 0x00000000, 0xFFFFFFF9, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s b/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s index 4514b01e0f..0c1ac8d812 100644 --- a/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s +++ b/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402B0_B84110 -.word 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFF66, 0x00000000, 0xFFFFFFEC, 0x00000096, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0x00000091, 0x000001C2, 0x00000032, 0x00000078, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF66, 0x00000000, 0xFFFFFFEC, 0x00000096, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000091, 0x000001C2, 0x00000032, 0x00000078, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s index 9c6a16eb96..1a1b2f2a9c 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s @@ -192,4 +192,4 @@ dlabel D_8024969C_B8D81C .word 0x00000004, D_80247F2C_B8C0AC, 0x00000000, 0x00000006, D_802488DC_B8CA5C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802496C0_B8D840 -.word 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000433, 0x00000096, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x00000154, 0x00000000, 0xFFFFFFB5, 0x00000011, 0xF8406059, 0x00000043, 0x00000007, MakeEntity, 0x802BC7AC, 0xFFFFFF95, 0x00000000, 0xFFFFFF9F, 0xFFFFFFF1, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000433, 0x00000096, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x00000154, 0x00000000, 0xFFFFFFB5, 0x00000011, 0xF8406059, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF95, 0x00000000, 0xFFFFFF9F, 0xFFFFFFF1, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s b/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s index dd4a799d11..f6dadf5003 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_10/ACC510.data.s @@ -6,4 +6,4 @@ dlabel D_802419F0_ACC510 .word 0x0000006A, 0x00000000 dlabel D_802419F8_ACC518 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_10_SetEntityFlags100000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D76, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x0000003A, 0x0000000A, 0x00000002, 0xF8405D76, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419F8_ACC518, 0x00000100, 0x00004000, D_802419F0_ACC510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_10_SetEntityFlags100000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D76, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x0000003A, 0x0000000A, 0x00000002, 0xF8405D76, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419F8_ACC518, 0x00000100, 0x00004000, D_802419F0_ACC510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241160_ACBC80, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s b/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s index 23fd4cdd34..bfc155cf76 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_11/ACFD40.data.s @@ -6,4 +6,4 @@ dlabel D_80241C00_ACFD40 .word 0x0000006A, 0x00000000 dlabel D_80241C08_ACFD48 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_11_SetEntityFlags100000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D74, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x00000006, 0x0000000A, 0x00000002, 0xF8405D74, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C08_ACFD48, 0x00000100, 0x00004000, D_80241C00_ACFD40, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x00000000, 0x0000000A, 0x000001EA, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kkj_11_SetEntityFlags100000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8405D74, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0x00000006, 0x0000000A, 0x00000002, 0xF8405D74, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000000, 0x0000000A, 0x000001EA, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C08_ACFD48, 0x00000100, 0x00004000, D_80241C00_ACFD40, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802411A0_ACF2E0, 0x00000100, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s index 69e6767499..3c2731a3a2 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_20/AFE3C0.data.s @@ -9,4 +9,4 @@ dlabel D_80240884_AFE3C4 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802409CC_AFE50C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000111, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D67, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D67, 0x00000043, 0x00000002, AssignScript, D_802409CC_AFE50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000111, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000046, 0x00000001, D_80240884_AFE3C4, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D67, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000005F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D67, 0x00000043, 0x00000002, AssignScript, D_802409CC_AFE50C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s index 89b1a81840..8f3285cdac 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B0F280.data.s @@ -21,4 +21,4 @@ dlabel D_8024ADF8_B117F8 .word 0x00000190, 0xFFFFFFF6, 0x00000190, 0x00000014, 0x0000015E, 0xFFFFFFCE, 0x00000172, 0x00000019, 0x0000012C, 0xFFFFFFE2, 0x00000154, 0x00000019, 0x0000015E, 0xFFFFFFD8, 0x00000136, 0x00000014, 0x0000012C, 0xFFFFFFB0, 0x00000118, 0x00000014, 0x00000118, 0xFFFFFFC4, 0x000000FA, 0x00000014, 0x0000012C, 0xFFFFFFCE, 0x000000DC, 0x00000014, 0x000000FA, 0xFFFFFF9C, 0x000000BE, 0x00000014, 0x00000118, 0xFFFFFFBA, 0x000000A0, 0x00000014, 0x000000FA, 0xFFFFFFCE, 0x00000082, 0x00000014, 0x000000E6, 0xFFFFFF9C, 0x00000064, 0x00000014 dlabel D_8024AEA8_B118A8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_802CDE68, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, func_802CDE68, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignAreaFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x000002BC, 0xFFFFFFCE, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF8F8, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000011, 0xF24A7AE7, 0x00000043, 0x00000006, NpcJump0, 0x00000011, 0x00000258, 0xFFFFFF06, 0x000003E8, 0x00000064, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000011, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFE52, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000073, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000007E, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x000000A8, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000030, 0x00000001, D_8024ADF8_B117F8, 0x00000005, 0x00000001, 0x0000000B, 0x00000034, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000001C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A8280, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000044, 0x00000001, D_8024AA8C_B1148C, 0x00000043, 0x00000004, SetPlayerPos, 0x00000096, 0x00000000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x0000000A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000006E, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0x00000003, 0x00000043, 0x00000001, func_80240EB8_B078B8, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, func_80240F2C_B0792C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000096, 0x00000043, 0x00000002, ClearAmbientSounds, 0x00000096, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006F, 0x00000000, 0x00000008, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000E6, 0x00000012, 0x00000000, 0x00000019, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x000000BE, 0x00000012, 0x00000000, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0006000C, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000013, 0x00000096, 0x0000003C, 0x00000000, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000033, 0x0000000E, 0x00000096, 0x0000003C, 0x00000000, 0x00000001, 0x0000014A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000136, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300AA, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, PlaySound, 0x0000022D, 0x00000043, 0x00000002, RemoveNpc, 0x00000013, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00010009, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00020010, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0003000F, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00040007, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x0005000A, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00060006, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C81, 0x00070006, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x0008000D, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000007, 0x0000001D, 0x00000001, 0x00000009, 0x00000008, 0x00000001, 0x0000001E, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AB, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000010, 0x000000C8, 0x00000000, 0x00000055, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000A0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000012, 0x000000E6, 0x0000001E, 0x00000055, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x000C0000, 0x000A0001, 0x00000000, 0x001300AC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000010, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000010, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A7480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002EE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000000DC, 0xFFFFFFD5, 0x0000015E, 0xF24A9A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000002, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8B, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000010, 0x000C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000012, 0x0020000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000F, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x0000000F, 0x0000012C, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000F, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x001300AD, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x00000172, 0xFFFFFFF6, 0x000000B4, 0xF24A9280, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000010, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000012, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A8E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000F, 0x000001C2, 0x00000000, 0x0000008C, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000004, 0x00000008, 0x00000001, 0x0000009B, 0x00000043, 0x00000005, GetNpcPos, 0x0000000F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5080, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300AE, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000015E, 0x00000032, 0xFFFFFF9C, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000005, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000007, SpeakToNpc, 0x00000011, 0x00610006, 0x00610004, 0x00000200, 0x0000000F, 0x001300AF, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000203C, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x0000023A, 0x00000000, 0x00000064, 0xF24A8A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000006, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, SpeakToNpc, 0x0000000F, 0x00800006, 0x00800002, 0x00000200, 0x00000011, 0x001300B0, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, StopSound, 0x000003BC, 0x00000043, 0x00000006, PlaySoundAt, 0x00000230, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0x000001F4, 0x00000000, 0x00000064, 0xF24A9A80, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x0080000D, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001300B1, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240D30_B07730, 0x00000043, 0x00000005, TranslateGroup, 0x000000AD, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0x00000012, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000044C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00800002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000011, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_802CDE68, 0x0000000F, 0x00000022, 0x00000043, 0x00000003, func_802CDE68, 0x00000011, 0x0000000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240E54_B07854, 0x00000057, 0x00000000, 0x00000046, 0x00000001, D_8024AEA8_B118A8, 0x00000043, 0x00000003, GotoMap, 0x8024C718, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D7C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignSwitchFlag, 0x0000001A, 0x00000047, 0x00000005, 0x802463F4, 0x00020000, 0xF971889A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s b/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s index ae6ee48d2c..2969fcd53a 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_00/8B0010.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80244080_8B0010 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BD6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BD6, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s index efa8876d8a..cfce0f8f02 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s @@ -6,4 +6,4 @@ dlabel D_802549D0_8C4A40 .word 0x00000043, 0x00000003, GotoMap, 0x80257F00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80254A00_8C4A70 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA10C, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA130, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block_WideHitbox, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s b/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s index 9911728a5c..e513056e93 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_04/8CB160.data.s @@ -39,4 +39,4 @@ dlabel D_8024186C_8CC16C .word 0x00000001, D_802415E8_8CBEE8, 0xC2680000, 0x00000000, 0x43020000, 0x00200100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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, D_8024167C_8CBF7C, 0x02020000, 0x00000001, D_8024186C_8CC16C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241A80_8CC380 -.word 0x00000024, 0x00000002, 0xF8405BC7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA10C, 0xFFFFFFB0, 0x00000000, 0x00000190, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A80_8CC380, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFE48, 0x0000003C, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000003C, 0x00000000, 0x00000172, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000000, 0x0000018B, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000064, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BC6, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405BC7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BC7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0xFFFFFFB0, 0x00000000, 0x00000190, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A80_8CC380, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF1A, 0x0000003C, 0xFFFFFF74, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE48, 0x0000003C, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000003C, 0x00000000, 0x00000172, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000055, 0x00000000, 0x0000018B, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000064, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BC6, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s b/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s index f8d9fc0d21..478d81ab1d 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_06/8D3AC0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802425B0_8D3AC0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000320, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x000000DC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000112, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000320, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x000000DC, 0x0000003C, 0x0000000A, 0x00000000, 0x00000112, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s index ed3e5b7c41..56aff67cd0 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_07/8D49A0.data.s @@ -51,4 +51,4 @@ dlabel D_80241DF8_8D5BB8 .word 0x00000002, D_80241A18_8D57D8, 0x01000002, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241E10_8D5BD0 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000136, 0x00000000, 0x0000002D, 0x00000000, 0x00000041, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001FE, 0x0000003C, 0x0000006E, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000136, 0x00000000, 0x0000002D, 0x00000000, 0x00000041, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001FE, 0x0000003C, 0x0000006E, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_09/8D83B0.data.s b/ver/us/asm/data/world/area_kmr/kmr_09/8D83B0.data.s index b13b9f3dd6..7859d8e5fa 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_09/8D83B0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_09/8D83B0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802425B0_8D83B0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000190, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BCD, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000001C2, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000001F4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BCE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000190, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BCD, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000001C2, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000001F4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BCE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s index 7336b8ea78..4802a88954 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_10/8D90F0.data.s @@ -21,7 +21,7 @@ dlabel D_80240F84_8D9454 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000045, 0x00000002, D_80240F1C_8D93EC, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7F4D, 0x00000043, 0x00000005, PlayerJump, 0x000001C8, 0x0000008E, 0x00000063, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024103C_8D950C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000107, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405BD4, 0x00000001, 0x00000046, 0x00000001, D_80240C8C_8D915C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF42, 0x0000004B, 0x000000DC, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD5, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000279, 0x0000008E, 0x00000077, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405BD4, 0x00000043, 0x00000002, AssignScript, D_8024103C_8D950C, 0x0000000A, 0x00000002, 0xF8405BEE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x00000073, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x00000172, 0x0000000A, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000107, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405BD4, 0x00000001, 0x00000046, 0x00000001, D_80240C8C_8D915C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF42, 0x0000004B, 0x000000DC, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD5, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000279, 0x0000008E, 0x00000077, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405BD4, 0x00000043, 0x00000002, AssignScript, D_8024103C_8D950C, 0x0000000A, 0x00000002, 0xF8405BEE, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x00000172, 0x00000073, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x00000172, 0x0000000A, 0x00000014, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F84_8D9454, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411B0_8D9680 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s index c268a45763..439bce675d 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8DFBB0.data.s @@ -9,4 +9,4 @@ dlabel D_80245C0C_8DFD0C .word 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFD050F80, 0x00000043, 0x00000001, func_80240EC0_8DAFC0, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFE87, 0xFFFFFFF8, 0x00000051, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x01000000, 0x00000001, 0x00000045, 0x00000002, D_80245C0C_8DFD0C, 0xFE363C8B, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE43, 0x00000000, 0x0000005C, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFE2B, 0x00000001, 0x0000005C, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE2B, 0x00000000, 0x0000005C, 0x00000007, 0x00000049, 0x00000001, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DCC_8DFECC -.word 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000299, 0x00000023, 0x00000046, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000299, 0x00000030, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2B, 0x00000000, 0x00000099, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000271, 0xFFFFFFE7, 0x0000006E, 0x0000002D, 0x80000000, 0x0000000A, 0x00000002, 0xF8405BD1, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245DCC_8DFECC, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000226, 0x00000000, 0xFFFFFDDA, 0x00000000, 0x00000042, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BDA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000299, 0x00000023, 0x00000046, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000299, 0x00000030, 0x00000046, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF91, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2B, 0x00000000, 0x00000099, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, 0x80242CF4, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245AB0_8DFBB0, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000271, 0xFFFFFFE7, 0x0000006E, 0x0000002D, 0x80000000, 0x0000000A, 0x00000002, 0xF8405BD1, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245DCC_8DFECC, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000299, 0x00000023, 0x00000046, 0x0000002D, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405BD1, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000226, 0x00000000, 0xFFFFFDDA, 0x00000000, 0x00000042, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405BDA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s index 9776236daf..961f65371e 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s @@ -24,4 +24,4 @@ dlabel D_80245BF0_8F1A10 .word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_802459A0_8F17C0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C30_8F1A50 -.word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80245AA8_8F18C8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFF6A, 0xFFFFFFB0, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245848_8F1668, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000007, MakeEntity, 0x802BCF00, 0x0000012C, 0x00000000, 0x00000096, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BC0_8F19E0, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000018, 0x00000001, 0x00000007, 0x00000018, 0x00000001, 0x00000027, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0x0000012C, 0x00000000, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BF0_8F1A10, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000012C, 0x0000005A, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245C30_8F1A50, 0x00000018, 0x00000001, 0x00000060, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80245AA8_8F18C8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFF6A, 0xFFFFFFB0, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245848_8F1668, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock, 0x0000012C, 0x00000000, 0x00000096, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BC0_8F19E0, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000018, 0x00000001, 0x00000007, 0x00000018, 0x00000001, 0x00000027, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000012C, 0x00000000, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BF0_8F1A10, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000012C, 0x0000005A, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245C30_8F1A50, 0x00000018, 0x00000001, 0x00000060, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s index c18efe01e2..f765f4ed03 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802415A0_A48500 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000DC, 0x000000D0, 0xFFFFFF83, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406189, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000DC, 0x000000D0, 0xFFFFFF83, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406189, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s index 5d671e0356..c17c00a629 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s @@ -102,4 +102,4 @@ dlabel D_80243600_A4BBC0 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243690_A4BC50 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEED, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE05, 0xFFFFFEE0, 0xFFFFFF61, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7EE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE0C, 0x00000000, 0xFFFFFF6A, 0x00000028, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241E50_A4A410, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFE70, 0xFFFFFED4, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243690_A4BC50, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000026C, 0xFFFFFFBF, 0xFFFFFF38, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEED, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE05, 0xFFFFFEE0, 0xFFFFFF61, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7EE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE0C, 0x00000000, 0xFFFFFF6A, 0x00000028, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241E50_A4A410, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFE70, 0xFFFFFED4, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243690_A4BC50, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000026C, 0xFFFFFFBF, 0xFFFFFF38, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s index 83cd9d60a6..d2ec931d8e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s @@ -36,4 +36,4 @@ dlabel D_80240E98_A52818 .word 0x00000003, D_802408C8_A52248, 0x00000003, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240EB0_A52830 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s index f8ba8263c4..6b8ecc0f79 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802414C0_A53D80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x00000011, 0xF840618D, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x00000011, 0xF840618D, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s index 21de6969fb..debd107184 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802431B0_A9C740 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000CD, 0x0000003C, 0x0000006E, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AD, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000005, 0x0000003C, 0x0000006E, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AE, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000CD, 0x0000003C, 0x0000006E, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AD, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000005, 0x0000003C, 0x0000006E, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AE, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s index fd6686df14..1ed3b0edd2 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s @@ -9,4 +9,4 @@ dlabel D_80240E38_A9DA68 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241CE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EDC_A9DB0C -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000269, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_113_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061AF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000001A2, 0x0000000A, 0x00000064, 0x00000118, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80240EDC_A9DB0C, 0x00000100, 0x00004000, D_80240E30_A9DA60, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000177, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000269, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_113_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061AF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000001A2, 0x0000000A, 0x00000064, 0x00000118, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80240EDC_A9DB0C, 0x00000100, 0x00004000, D_80240E30_A9DA60, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000177, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s index 12a84d7490..e8c609a5b9 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s @@ -15,4 +15,4 @@ dlabel D_80240220_A9EBA0 .word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802401D8_A9EB58, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802401D8_A9EB58, 0x00000044, 0x00000001, EnterWalkShort, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240350_A9ECD0, 0x00000044, 0x00000001, 0x802400B0, 0x00000044, 0x00000001, D_80240220_A9EBA0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240350_A9ECD0 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFF06, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFF06, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s index ee7667d7eb..74b4051552 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240CB0_A56BD0 -.word 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000011D, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000003A7, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000011D, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000003A7, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s index 55ddd4d117..7bcc47e863 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240E10_AA8290 -.word 0x0000000A, 0x00000002, 0xF84061B3, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000003C, 0x00000073, 0x0000000A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000008, 0x00000043, 0x00000002, AssignScript, D_80241540_AA89C0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000073, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0x00000096, 0xFFFFFF97, 0x0000005A, 0x0000003C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80240F44_AA83C4, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFEA2, 0x000000D7, 0xFFFFFFCE, 0x00000000, 0xF84061B2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84061B3, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000003C, 0x00000073, 0x0000000A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000008, 0x00000043, 0x00000002, AssignScript, D_80241540_AA89C0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0x00000073, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0x00000096, 0xFFFFFF97, 0x0000005A, 0x0000003C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80240F44_AA83C4, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFEA2, 0x000000D7, 0xFFFFFFCE, 0x00000000, 0xF84061B2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F44_AA83C4 .word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000073, 0x0000000E, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000096, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001EF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000017, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802403C0_AA7840, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000096, 0x00000096, 0xFFFFFF97, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000073, 0x00000000, 0x00000011, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s index 5357056e7a..15c262eb62 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s @@ -9,4 +9,4 @@ dlabel D_80243598_AAC538 .word 0x0000001A, 0x00000000 dlabel D_802435A0_AAC540 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061B5, 0x00000001, 0x00000043, 0x00000005, kpa_134_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_134_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000002E7, 0x0000000A, 0x00000073, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_802435A0_AAC540, 0x00000100, 0x00004000, D_80243598_AAC538, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFF20, 0x00000163, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF20, 0x0000014A, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243410_AAC3B0, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000001DB, 0x00000000, 0xFFFFFFEC, 0x0000005A, 0x0000003C, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000C3, 0x0000012C, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061B5, 0x00000001, 0x00000043, 0x00000005, kpa_134_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_134_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000002E7, 0x0000000A, 0x00000073, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_802435A0_AAC540, 0x00000100, 0x00004000, D_80243598_AAC538, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFF20, 0x00000163, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF20, 0x0000014A, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243410_AAC3B0, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x000001DB, 0x00000000, 0xFFFFFFEC, 0x0000005A, 0x0000003C, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C3, 0x0000012C, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s index 204c6d93bb..0a8f055377 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_14/A58DB0.data.s @@ -9,4 +9,4 @@ dlabel D_8024196C_A58E1C .word 0x0000001A, 0x00000000 dlabel D_80241974_A58E24 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406190, 0x00000001, 0x00000043, 0x00000005, kpa_14_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_14_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406190, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000007CB, 0x00000028, 0xFFFFFF5E, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241974_A58E24, 0x00000100, 0x00004000, D_8024196C_A58E1C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000096, 0x0000015E, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406191, 0x00000043, 0x00000007, MakeItemEntity, 0x00000082, 0x00000320, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406192, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406190, 0x00000001, 0x00000043, 0x00000005, kpa_14_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_14_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406190, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000007CB, 0x00000028, 0xFFFFFF5E, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241974_A58E24, 0x00000100, 0x00004000, D_8024196C_A58E1C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80240A88, 0x00000100, 0x00000058, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000096, 0x0000015E, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406191, 0x00000043, 0x00000007, MakeItemEntity, 0x00000082, 0x00000320, 0x0000001E, 0xFFFFFF6A, 0x00000011, 0xF8406192, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s index 066708d89e..cd5c0251c4 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_15/A59E30.data.s @@ -12,4 +12,4 @@ dlabel D_80240B0C_A59E9C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80240AA4_A59E34, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BEC_A59F7C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406193, 0x00000001, 0x00000046, 0x00000001, D_80240B0C_A59E9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000DC, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406193, 0x00000043, 0x00000002, AssignScript, D_80240BEC_A59F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406193, 0x00000001, 0x00000046, 0x00000001, D_80240B0C_A59E9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000DC, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406193, 0x00000043, 0x00000002, AssignScript, D_80240BEC_A59F7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s index 8781d2e438..5e2f4f7d24 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s @@ -33,4 +33,4 @@ dlabel D_80240E5C_A5AE8C .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8406195, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802429BC, 0x00000046, 0x00000001, D_802410F0_A5B120, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000FC, 0x00000000, 0x00000044, 0x00000001, D_80240744_A5A774, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002F, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000082, 0x00000000, 0x00000044, 0x00000001, D_802405D0_A5A600, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802405A4_A5A5D4, 0x00000044, 0x00000001, D_802403F0_A5A420, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000036, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000032, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240E1C_A5AE4C, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802410F0_A5B120 -.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000001D6, 0x000000E6, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000001D6, 0x000000E6, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s b/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s index 250467646f..3cfacffc2e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_17/A5CB00.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802400E0_A5CB00 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000003E8, 0x0000005A, 0xFFFFFDC1, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x00000334, 0x0000003C, 0xFFFFFDCB, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x00000334, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000089, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406197, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x00000357, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406198, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000003E8, 0x0000005A, 0xFFFFFDC1, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000334, 0x0000003C, 0xFFFFFDCB, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000334, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000089, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406197, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x00000357, 0x0000001E, 0xFFFFFDCB, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8406198, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s index 2a8119c7f1..1f844ebddd 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_52/A68510.data.s @@ -6,4 +6,4 @@ dlabel D_80241410_A68510 .word 0x0000001A, 0x00000000 dlabel D_80241418_A68518 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406199, 0x00000001, 0x00000043, 0x00000005, kpa_52_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_52_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406199, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000160, 0x0000000A, 0xFFFFFFE7, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241418_A68518, 0x00000100, 0x00004000, D_80241410_A68510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF8406199, 0x00000001, 0x00000043, 0x00000005, kpa_52_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_52_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406199, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000160, 0x0000000A, 0xFFFFFFE7, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80241418_A68518, 0x00000100, 0x00004000, D_80241410_A68510, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802416B4, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s b/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s index e398beeec5..fbaca7fa04 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_53/A6CA80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241DE0_A6CA80 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFE61, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFE61, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s index debbbe947a..bc75845fd8 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s @@ -12,7 +12,7 @@ dlabel D_80240518_A6D018 .word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF840619C, 0x00000001, 0x00000043, 0x00000005, kpa_60_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_60_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240668_A6D168 -.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240518_A6D018, 0x00000100, 0x00004000, D_80240510_A6D010, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240518_A6D018, 0x00000100, 0x00004000, D_80240510_A6D010, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240740_A6D240 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s index 15022cc17a..e61f01148c 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_61/A71FC0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243BE0_A71FC0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF1F, 0xFFFFFF9C, 0x000000AF, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619F, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000003C, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000023F, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A1, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x0000042E, 0xFFFFFFD8, 0x00000140, 0x00000011, 0xF84061A2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0xFFFFFF9C, 0x000000AF, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619F, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000003C, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000023F, 0xFFFFFF9C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061A1, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x0000042E, 0xFFFFFFD8, 0x00000140, 0x00000011, 0xF84061A2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s b/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s index b0fbd072a4..af27f72de6 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s @@ -9,7 +9,7 @@ dlabel D_80240528_A72748 .word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF840619C, 0x00000001, 0x00000043, 0x00000005, kpa_62_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_62_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240678_A72898 -.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240528_A72748, 0x00000100, 0x00004000, D_80240520_A72740, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240528_A72748, 0x00000100, 0x00004000, D_80240520_A72740, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240750_A72970 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s index de6486e60a..5b28c9b7b8 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s @@ -6,4 +6,4 @@ dlabel D_802457E0_A8C230 .word 0x0000007A, 0x00000000 dlabel D_802457E8_A8C238 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A5, 0x00000001, 0x00000043, 0x00000005, kpa_91_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_91_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802457E8_A8C238, 0x00000100, 0x00004000, D_802457E0_A8C230, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A6, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0x0000003C, 0x00000000, 0x00000037, 0x00000011, 0xF84061A7, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A5, 0x00000001, 0x00000043, 0x00000005, kpa_91_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_91_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802457E8_A8C238, 0x00000100, 0x00004000, D_802457E0_A8C230, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A6, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0x0000003C, 0x00000000, 0x00000037, 0x00000011, 0xF84061A7, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s index a01c8834ab..11ee0de87c 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s @@ -6,4 +6,4 @@ dlabel D_802419D0_A8E450 .word 0x0000007A, 0x00000000 dlabel D_802419D8_A8E458 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A8, 0x00000001, 0x00000043, 0x00000005, kpa_95_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_95_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419D8_A8E458, 0x00000100, 0x00004000, D_802419D0_A8E450, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A9, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFFFFFFBA, 0x00000000, 0x00000037, 0x00000011, 0xF84061AA, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A8, 0x00000001, 0x00000043, 0x00000005, kpa_95_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_95_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419D8_A8E458, 0x00000100, 0x00004000, D_802419D0_A8E450, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A9, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFFFFFFBA, 0x00000000, 0x00000037, 0x00000011, 0xF84061AA, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s index efb40cb09e..562fc76451 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C66FC0.data.s @@ -15,4 +15,4 @@ dlabel D_802464F8_C67208 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, kzn_03_UnsetCamera0MoveFlag1, 0x00000045, 0x00000002, D_802462B0_C66FC0, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE2A, 0x0000029E, 0x00000047, 0x00000012, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE80, 0x00000366, 0xFFFFFFEA, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000001, kzn_03_SetCamera0MoveFlag1, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024663C_C6734C -.word 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x0000016D, 0x00000212, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000EC, 0x0000004B, 0x00000122, 0x000000EB, 0x00000011, 0xF84060B2, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D7, 0x000002E9, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000055, 0x00000302, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000090, 0x00000055, 0x0000031B, 0xFFFFFF97, 0x0000000D, 0xF84060B3, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000023, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B4, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFF1, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B5, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFBF, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B6, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF8D, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B7, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0x000001EA, 0x000001D6, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024663C_C6734C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000000A0, 0x0000001E, 0x0000015E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246314_C67024, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000014F, 0x00000109, 0x00000168, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246410_C67120, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242D38_C63A48, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFE66, 0x00000285, 0x00000078, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802464F8_C67208, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x0000016D, 0x00000212, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000EC, 0x0000004B, 0x00000122, 0x000000EB, 0x00000011, 0xF84060B2, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000D7, 0x000002E9, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000055, 0x00000302, 0xFFFFFF97, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000090, 0x00000055, 0x0000031B, 0xFFFFFF97, 0x0000000D, 0xF84060B3, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000023, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B4, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFF1, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B5, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFBF, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B6, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF8D, 0x000002DA, 0xFFFFFF97, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B7, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x000001EA, 0x000001D6, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024663C_C6734C, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000001D, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x000000A0, 0x0000001E, 0x0000015E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246314_C67024, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000014F, 0x00000109, 0x00000168, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246410_C67120, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242D38_C63A48, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFE66, 0x00000285, 0x00000078, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802464F8_C67208, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s index d305bf1aa5..b812a9408a 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s @@ -18,4 +18,4 @@ dlabel D_80241CA4_C69DD4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_04_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E08_C69F38 -.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x00000212, 0x00000230, 0x00000019, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s b/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s index 17467256d9..942672b747 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s @@ -36,7 +36,7 @@ dlabel D_80241190_C6DAB0 .word 0x00000024, 0x00000002, 0xF84060A1, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411B0_C6DAD0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000145, 0x000000CD, 0xFFFFFFE2, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060A0, 0x0000000A, 0x00000002, 0xF84060A1, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA274, 0x00000181, 0x00000005, 0x000000B4, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241190_C6DAB0, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001B, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFEB6, 0x00000091, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240310_C6CC30, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000006, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFEB6, 0x00000078, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000009, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000A, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000145, 0x000000CD, 0xFFFFFFE2, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060A0, 0x0000000A, 0x00000002, 0xF84060A1, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block_TallHitbox, 0x00000181, 0x00000005, 0x000000B4, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241190_C6DAB0, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000001B, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFEB6, 0x00000091, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240310_C6CC30, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000006, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000C, 0x00000001, 0xFFFFFEB6, 0x00000078, 0xFFFFFFA6, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000009, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000A, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241370_C6DC90 .word 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s b/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s index 838ab4e97f..0c98673310 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_07/C70C60.data.s @@ -9,4 +9,4 @@ dlabel D_802429A0_C70CD0 .word 0x0000000A, 0x00000002, 0xF84060A3, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF84060A3, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024239C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0186, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_802407F4_C6EB24, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000001C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A50_C70D80 -.word 0x00000024, 0x00000002, 0xF84060A2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x00000000, 0x0000002D, 0xFFFFFEDE, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060A3, 0x00000044, 0x00000001, D_802429A0_C70CD0, 0x0000000A, 0x00000002, 0xF84060A2, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA274, 0x000000AF, 0x00000023, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A50_C70D80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000F, 0x00000005, 0xFFFFFFC2, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240720_C6EA50, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF84060A2, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0x00000000, 0x0000002D, 0xFFFFFEDE, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060A3, 0x00000044, 0x00000001, D_802429A0_C70CD0, 0x0000000A, 0x00000002, 0xF84060A2, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block_TallHitbox, 0x000000AF, 0x00000023, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A50_C70D80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000000F, 0x00000005, 0xFFFFFFC2, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetPushBlockFallEffect, 0x00000000, func_80240720_C6EA50, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000B, 0x00000004, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s index fcc6fbf9a8..d716b20c21 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C76030.data.s @@ -12,7 +12,7 @@ dlabel D_80244C1C_C7609C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80244BB4_C76034, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CFC_C7617C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, D_80244C1C_C7609C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, D_80244CFC_C7617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x000000EF, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF84060AC, 0x00000001, 0x00000046, 0x00000001, D_80244C1C_C7609C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000078, 0x00000064, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF84060AC, 0x00000043, 0x00000002, AssignScript, D_80244CFC_C7617C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel kzn_08_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s index 65bad5a3b8..58ba3fbfb4 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s @@ -18,4 +18,4 @@ dlabel D_80243D64_C7AA44 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, kzn_09_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EC8_C7ABA8 -.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s index 47a0be749a..c022ac5cba 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s @@ -48,4 +48,4 @@ dlabel D_8024370C_C891BC .word 0x00000024, 0x00000002, 0xF84060AA, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024372C_C891DC -.word 0x0000000A, 0x00000002, 0xF84060A4, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFF3D, 0x00000032, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024364C_C890FC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFF0B, 0x0000003C, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024366C_C8911C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFED9, 0x00000046, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024368C_C8913C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFEA7, 0x00000050, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436AC_C8915C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFE75, 0x0000005A, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436CC_C8917C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFE43, 0x00000064, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436EC_C8919C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFE11, 0x0000006E, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024370C_C891BC, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000001D, 0x00000002, 0xFFFFFF89, 0xFFFFFFFD, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000001C, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060A4, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFF3D, 0x00000032, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024364C_C890FC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFF0B, 0x0000003C, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024366C_C8911C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFED9, 0x00000046, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024368C_C8913C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A7, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFEA7, 0x00000050, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436AC_C8915C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFE75, 0x0000005A, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436CC_C8917C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A9, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFE43, 0x00000064, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802436EC_C8919C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFE11, 0x0000006E, 0x0000001B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024370C_C891BC, 0x00000013, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x0000001D, 0x00000002, 0xFFFFFF89, 0xFFFFFFFD, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000001C, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s index df1409f22b..bb7a66e583 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s @@ -66,4 +66,4 @@ dlabel D_80241A4C_C8DAEC .word 0x00000001, D_8024166C_C8D70C, 0x00000000, 0x00000001, D_8024185C_C8D8FC, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241A70_C8DB10 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000FA, 0x000000FA, 0xFFFFFF1F, 0x00000000, 0x00000017, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFE5C, 0x00000055, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000015E, 0x00000136, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x000000FA, 0x000000FA, 0xFFFFFF1F, 0x00000000, 0x00000017, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFE5C, 0x00000055, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x0000015E, 0x00000136, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_19/C95E70.data.s b/ver/us/asm/data/world/area_kzn/kzn_19/C95E70.data.s index 651165cc28..5d5213b2e2 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_19/C95E70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_19/C95E70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802482C0_C95E70 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF56, 0x00000136, 0xFFFFFEAC, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B8, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFBA, 0x00000136, 0xFFFFFEAC, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B9, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF56, 0x00000136, 0xFFFFFEAC, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B8, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFBA, 0x00000136, 0xFFFFFEAC, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B9, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s index c253020641..4916015b0e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s @@ -33,4 +33,4 @@ dlabel D_80240D30_C9AF30 .word 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, SetSpriteShading, 0x000A000F, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802420C0, 0x00000046, 0x00000001, D_80240EE0_C9B0E0, 0x00000024, 0x00000002, 0xFE363C80, D_80240790_C9A990, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802403E0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240D30_C9AF30, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_802407BC_C9A9BC, 0x00000044, 0x00000001, D_802408A8_C9AAA8, 0x00000044, 0x00000001, D_80240A34_C9AC34, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, D_802404EC_C9A6EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, D_80240608_C9A808, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EE0_C9B0E0 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_23/C9D020.data.s b/ver/us/asm/data/world/area_kzn/kzn_23/C9D020.data.s index 6e1bcc149f..ff35dfaeac 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_23/C9D020.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_23/C9D020.data.s @@ -39,7 +39,7 @@ dlabel D_802410F4_C9D3F4 .word 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, D_80241028_C9D328, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240F40_C9D240, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_80240F70_C9D270, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240F94_C9D294, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_80240FD0_C9D2D0, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, func_80240478_C9C778, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, func_802D7B10, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241418_C9D718 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, kzn_23_UnsetCamera0MoveFlag1, 0x00000044, 0x00000001, D_80240E98_C9D198, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_C9D3F4, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, MakeEntity, 0x802EAE30, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_C9C820, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kzn_23_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kzn_23_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, GotoMap, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, kzn_23_UnsetCamera0MoveFlag1, 0x00000044, 0x00000001, D_80240E98_C9D198, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802410F4_C9D3F4, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, MakeEntity, Entity_Chest, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_C9C820, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kzn_23_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kzn_23_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, GotoMap, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417AC_C9DAAC .word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241418_C9D718, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s index f2154d38b8..2bfccdc045 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s @@ -51,7 +51,7 @@ dlabel D_80245260_7EFF70 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802452A8_7EFFB8 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000221, 0x00000014, 0x000000CD, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CA7, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFE5C, 0x00000014, 0x0000019A, 0x00000011, 0xF8405CAD, 0x00000047, 0x00000005, D_80245260_7EFF70, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000221, 0x00000014, 0x000000CD, 0x00000000, 0x00000023, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CA7, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFE5C, 0x00000014, 0x0000019A, 0x00000011, 0xF8405CAD, 0x00000047, 0x00000005, D_80245260_7EFF70, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245330_7F0040 .word 0x00000043, 0x00000006, RotateModel, 0x0000008F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s index c9fd03d3ec..2e19657868 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s @@ -12,7 +12,7 @@ dlabel D_80245D60_829020 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DA8_829068 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0171, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000A, 0x00000002, 0xF8405C03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFE2A, 0x0000001E, 0xFFFFFF65, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80245C58_828F18, 0x00000100, 0x00004000, D_80245C50_828F10, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000006B, 0xFFFFFE64, 0x00000014, 0xFFFFFEC0, 0x00000011, 0xF8405C04, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000190, 0x00000000, 0x00000064, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CA9, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFE89, 0x00000000, 0x000000BE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245D60_829020, 0x00000047, 0x00000005, D_80245DA8_829068, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0171, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000A, 0x00000002, 0xF8405C03, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFE2A, 0x0000001E, 0xFFFFFF65, 0x000000B4, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80245C58_828F18, 0x00000100, 0x00004000, D_80245C50_828F10, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000006B, 0xFFFFFE64, 0x00000014, 0xFFFFFEC0, 0x00000011, 0xF8405C04, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000190, 0x00000000, 0x00000064, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CA9, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFE89, 0x00000000, 0x000000BE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245D60_829020, 0x00000047, 0x00000005, D_80245DA8_829068, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F40_829200 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 diff --git a/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s b/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s index 51e6c466d1..f355e87762 100644 --- a/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s +++ b/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s @@ -9,4 +9,4 @@ dlabel D_8024DD20_83F520 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0175, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DD68_83F568 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0172, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCF00, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD00_83F500, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000020D, 0x00000000, 0x000000AF, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAA, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x000000B9, 0x00000014, 0xFFFFFEA2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD20_83F520, 0x00000047, 0x00000005, D_8024DD68_83F568, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0172, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD00_83F500, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x0000020D, 0x00000000, 0x000000AF, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAA, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x000000B9, 0x00000014, 0xFFFFFEA2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD20_83F520, 0x00000047, 0x00000005, D_8024DD68_83F568, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_04/851410.data.s b/ver/us/asm/data/world/area_mac/mac_04/851410.data.s index b434c736e0..e0ee58110e 100644 --- a/ver/us/asm/data/world/area_mac/mac_04/851410.data.s +++ b/ver/us/asm/data/world/area_mac/mac_04/851410.data.s @@ -33,4 +33,4 @@ dlabel D_8024F018_851BE8 .word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0x0000009B, 0x00000030, 0xFFFFFE20, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, mac_04_SetEntityFlags100000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000127, 0xFFFFFE34, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x000000E6, 0xFFFFFE20, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x000000C8, 0x0000001E, 0xFFFFFDF4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x0000001E, 0xFFFFFDF4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00880004, 0x00880001, 0x00000000, 0x00060005, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, mac_04_SetEntityFlags100000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024F278_851E48 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0173, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x0000009B, 0x00000030, 0xFFFFFE20, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFF4_851BC4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000003, 0x0000004E, 0x00000006, D_8024F018_851BE8, 0x00000100, 0x00004000, D_8024F010_851BE0, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020021, 0x00000032, 0x00000028, 0xFFFFFE52, 0x00000000, 0xF8405CA1, 0x00000056, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA1, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020081, 0x00000032, 0x00000028, 0xFFFFFECA, 0x00000011, 0xF8405CAF, 0x00000043, 0x00000007, MakeItemEntity, 0x0002008B, 0x00000032, 0x00000028, 0xFFFFFE8E, 0x00000011, 0xF8405CB0, 0x00000043, 0x00000007, MakeItemEntity, 0x0002009A, 0x00000032, 0x00000028, 0xFFFFFE16, 0x00000011, 0xF8405CB1, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFE20, 0x00000014, 0xFFFFFFA6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFAC_851B7C, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000002, 0x00000047, 0x00000005, D_8024F278_851E48, 0x00000100, 0x00000043, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0173, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x0000009B, 0x00000030, 0xFFFFFE20, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFF4_851BC4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000003, 0x0000004E, 0x00000006, D_8024F018_851BE8, 0x00000100, 0x00004000, D_8024F010_851BE0, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020021, 0x00000032, 0x00000028, 0xFFFFFE52, 0x00000000, 0xF8405CA1, 0x00000056, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405CA1, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFFA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00020081, 0x00000032, 0x00000028, 0xFFFFFECA, 0x00000011, 0xF8405CAF, 0x00000043, 0x00000007, MakeItemEntity, 0x0002008B, 0x00000032, 0x00000028, 0xFFFFFE8E, 0x00000011, 0xF8405CB0, 0x00000043, 0x00000007, MakeItemEntity, 0x0002009A, 0x00000032, 0x00000028, 0xFFFFFE16, 0x00000011, 0xF8405CB1, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFE20, 0x00000014, 0xFFFFFFA6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024EFAC_851B7C, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000002, 0x00000047, 0x00000005, D_8024F278_851E48, 0x00000100, 0x00000043, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s b/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s index 5686eee67d..fbb22a27f5 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/8564E0.data.s @@ -6,4 +6,4 @@ dlabel D_80244370_8564E0 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0174, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443B8_856528 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016C, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF6A, 0x0000003C, 0xFFFFFE89, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFFCE, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAC, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFE16, 0x00000082, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405CB2, 0x00000047, 0x00000005, D_80244370_8564E0, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443B8_856528, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D016C, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF6A, 0x0000003C, 0xFFFFFE89, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFFCE, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAC, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFE16, 0x00000082, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405CB2, 0x00000047, 0x00000005, D_80244370_8564E0, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802443B8_856528, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s b/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s index e45a2404c3..264c176a00 100644 --- a/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s +++ b/ver/us/asm/data/world/area_mac/machi/7E7A30.data.s @@ -30,4 +30,4 @@ dlabel D_80240CF0_7E8090 .word 0x00000043, 0x00000001, func_80240000_7E73A0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240E20_7E81C0, 0x00000047, 0x00000005, D_80240C00_7E7FA0, 0x00000040, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C30_7E7FD0, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C60_7E8000, 0x00000040, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C90_7E8030, 0x00000040, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240CC0_7E8060, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242F6C, 0x00000046, 0x00000001, 0x802410D0, 0x00000044, 0x00000001, 0x802435B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E20_7E81C0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x00000116, 0x00000000, 0xFFFFFEC2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x00000044, 0x00000000, 0xFFFFFFA4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000077, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000A9, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA588, 0x00000000, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000028, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000050, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000078, 0x00000068, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000A0, 0x0000006C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000C8, 0x0000006E, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000F0, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFF32, 0x00000000, 0xFFFFFE8B, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF7D, 0x00000000, 0xFFFFFE99, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000046, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000005E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000076, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000008E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x000000A6, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x00000116, 0x00000000, 0xFFFFFEC2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0x00000044, 0x00000000, 0xFFFFFFA4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000077, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000A9, 0x00000000, 0xFFFFFF5A, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HiddenYellowBlock, 0x00000000, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000028, 0x0000003C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000050, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000078, 0x00000068, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000A0, 0x0000006C, 0xFFFFFEBA, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000C8, 0x0000006E, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000F0, 0x00000064, 0xFFFFFEBA, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFF32, 0x00000000, 0xFFFFFE8B, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFF7D, 0x00000000, 0xFFFFFE99, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000046, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000005E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x00000076, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x0000008E, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0x000000A6, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s index e2e4743808..fc272d8101 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s @@ -81,4 +81,4 @@ dlabel D_80242A38_E15198 .word 0x00000000, D_80241A70_E141D0, 0x00000000, 0x00000000, 0xC1A00000, 0x00002D01, D_80242998_E150F8, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0061, 0x00000001, D_80242A38_E15198, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242C40_E153A0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0008003B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFFC9, 0xFFFFFFFE, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242C40_E153A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, mgm_01_SetMsgImgs_Panels, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0008003B, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFFC9, 0xFFFFFFFE, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242C40_E153A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s index 038bdd4e3c..330fe526a8 100644 --- a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s @@ -21,4 +21,4 @@ dlabel D_802422B0_B956F0 .word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017E, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242354_B95794 -.word 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFED4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_B956F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFED4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_B956F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s index 59fc8f8eb9..a43946ff67 100644 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s +++ b/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241590_BAB6D0 -.word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x00000118, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241590_BAB6D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x00000118, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241590_BAB6D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s index fccee4f7c2..805988093e 100644 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s +++ b/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802434F0_BB0E30 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000000, 0x0000005D, 0x00000000, 0x0000002D, 0x000000E7, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000005D, 0x00000000, 0x0000002D, 0x000000E7, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s index 0347b6d91a..6f2f8d5b76 100644 --- a/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s +++ b/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241330_BB4130 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000000, 0x0000005C, 0x00000000, 0x0000002D, 0x000000F8, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000005C, 0x00000000, 0x0000002D, 0x000000F8, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s b/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s index 8d6e01fca0..498d0d1225 100644 --- a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s +++ b/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243110_BBA180 -.word 0x00000043, 0x00000003, GotoMap, 0x80244300, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFEED, 0x00000000, 0xFFFFFF1F, 0x0000010E, 0x00000003, D_80243110_BBA180, 0x00000794, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000000, 0x0000003C, 0xFFFFFED4, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000DC, 0x0000003C, 0xFFFFFFB0, 0x0000002D, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFEE6, 0x0000003C, 0x0000020A, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F27, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, GotoMap, 0x80244300, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFEED, 0x00000000, 0xFFFFFF1F, 0x0000010E, 0x00000003, D_80243110_BBA180, 0x00000794, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000000, 0x0000003C, 0xFFFFFED4, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000DC, 0x0000003C, 0xFFFFFFB0, 0x0000002D, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFEE6, 0x0000003C, 0x0000020A, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F27, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s b/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s index ad950fd1a7..4cf61202c0 100644 --- a/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s +++ b/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s @@ -9,4 +9,4 @@ dlabel D_80240640_BBB9C0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802406C0_BBBA40 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80240640_BBB9C0, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802406C0_BBBA40, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F25, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80240640_BBB9C0, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802406C0_BBBA40, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F25, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s index 6ae3613912..c23bf7b03d 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C8920.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243540_9C8920 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000014, 0x0000003C, 0x00000172, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF8405DB7, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024A758, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001A9, 0x0000003C, 0x0000007D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000096, 0x00000000, 0x0000015E, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DDE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000014, 0x0000003C, 0x00000172, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF8405DB7, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024A758, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001A9, 0x0000003C, 0x0000007D, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000096, 0x00000000, 0x0000015E, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DDE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DCD20.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DCD20.data.s index 8edfc05773..2dff68f59f 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DCD20.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DCD20.data.s @@ -6,4 +6,4 @@ dlabel D_80245D00_9DCD20 .word 0x00000043, 0x00000007, nok_02_ItemEntityJumpToPos, 0xFD050F8A, 0xF24E0680, 0xF24A7A80, 0xF24E5680, 0x00000014, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245D34_9DCD54 -.word 0x00000043, 0x00000003, GotoMap, 0x80254610, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000097, 0x00000051, 0x000000FB, 0x00000000, 0x80000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFA4, 0x0000000A, 0x00000002, 0xF8405DBC, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024B488, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFFA4, 0x0000000A, 0x00000002, 0xF8405DC3, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245D00_9DCD20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000096, 0x0000006A, 0x000000FA, 0x00000011, 0xF8405DC3, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000005, 0x00000005, 0x00000058, 0xFFFFFFFC, 0x000000BC, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8406312, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF8406312, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x0000016D, 0x00000000, 0x0000005A, 0x0000001E, 0x00000002, D_80245D34_9DCD54, 0x00000792, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, GotoMap, 0x80254610, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000097, 0x00000051, 0x000000FB, 0x00000000, 0x80000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFA4, 0x0000000A, 0x00000002, 0xF8405DBC, 0x00000000, 0x00000043, 0x00000002, AssignScript, 0x8024B488, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFFA4, 0x0000000A, 0x00000002, 0xF8405DC3, 0x00000000, 0x00000043, 0x00000002, AssignScript, D_80245D00_9DCD20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000096, 0x0000006A, 0x000000FA, 0x00000011, 0xF8405DC3, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000005, 0x00000005, 0x00000058, 0xFFFFFFFC, 0x000000BC, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8406312, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF8406312, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x0000016D, 0x00000000, 0x0000005A, 0x0000001E, 0x00000002, D_80245D34_9DCD54, 0x00000792, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_11/9F6A50.data.s b/ver/us/asm/data/world/area_nok/nok_11/9F6A50.data.s index 5c33195771..2d9376c969 100644 --- a/ver/us/asm/data/world/area_nok/nok_11/9F6A50.data.s +++ b/ver/us/asm/data/world/area_nok/nok_11/9F6A50.data.s @@ -18,4 +18,4 @@ dlabel D_80242400_9F6E40 .word 0x00000047, 0x00000005, D_80242010_9F6A50, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242088_9F6AC8, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000020, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406330, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB5, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245CAC, 0x00000012, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000029, 0x0000000A, 0x00000002, 0xF8405DE2, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245CC4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245C7C, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245C7C, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802425F0_9F7030, 0x00000044, 0x00000001, D_802420D8_9F6B18, 0x00000044, 0x00000001, D_80242240_9F6C80, 0x00000044, 0x00000001, 0x80241FB0, 0x00000043, 0x00000002, PlaySound, 0x8000005B, 0x00000024, 0x00000002, 0xFE363C80, D_80242400_9F6E40, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802425F0_9F7030 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000001E, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000006E, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD2, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000014A, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x0000017C, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x0000011D, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD3, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000028A, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000002BC, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000002EE, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000098, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000001E, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000006E, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD2, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000014A, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x0000017C, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x0000011D, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD3, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000028A, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000002BC, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000002EE, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000098, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s b/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s index cb967ba8d0..f0b2968156 100644 --- a/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s +++ b/ver/us/asm/data/world/area_nok/nok_12/9FC970.data.s @@ -27,4 +27,4 @@ dlabel D_80242870_9FD060 .word 0x00000043, 0x00000004, func_80240180_9FA970, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000008, 0x00000001, 0x0000000F, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000005F, 0x00000000, 0x0000000C, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, nok_12_SetEntityPosition, 0xFD050F80, 0xFFFFFE2A, 0xFE363C80, 0xFFFFFF6A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFE2A, 0xFE363C80, 0xFFFFFF6A, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A00_9FD1F0 -.word 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2A, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFDD0, 0x0000003C, 0xFFFFFF88, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD5, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF5B, 0x0000003C, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242870_9FD060, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000208, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000253, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000002D0, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000334, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF24, 0xFFFFFFCE, 0x0000009B, 0x00000011, 0xF8405DC4, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008F, 0x00000188, 0x00000019, 0xFFFFFF6F, 0x00000011, 0xF8405DE7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF9D, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFE2A, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFDD0, 0x0000003C, 0xFFFFFF88, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD5, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF5B, 0x0000003C, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242870_9FD060, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000208, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000253, 0x0000006E, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000002D0, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000334, 0x00000087, 0xFFFFFF4C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF24, 0xFFFFFFCE, 0x0000009B, 0x00000011, 0xF8405DC4, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008F, 0x00000188, 0x00000019, 0xFFFFFF6F, 0x00000011, 0xF8405DE7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_13/A02040.data.s b/ver/us/asm/data/world/area_nok/nok_13/A02040.data.s index d06046e9bf..bece2a803e 100644 --- a/ver/us/asm/data/world/area_nok/nok_13/A02040.data.s +++ b/ver/us/asm/data/world/area_nok/nok_13/A02040.data.s @@ -9,7 +9,7 @@ dlabel D_80241A78_A02078 .word 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AB0_A020B0 -.word 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000028, 0x00000049, 0xFFFFFEE3, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x0000005A, 0x00000146, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD6, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0x00000028, 0x00000049, 0xFFFFFEE3, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x0000005A, 0x00000146, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD6, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B94_A02194 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0178, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFE52, 0x00000096, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241B94_A02194, 0x0000000A, 0x00000002, 0xF8405DD6, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000046, 0x00000000, 0xFFFFFF06, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A40_A02040, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000046, 0x00000000, 0xFFFFFEC0, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A78_A02078, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFF6, 0x00000000, 0xFFFFFEE3, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241AB0_A020B0, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000046, 0x00000000, 0xFFFFFF06, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000046, 0x00000000, 0xFFFFFEC0, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFF6, 0x00000000, 0xFFFFFEE3, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x0000005A, 0x00000146, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD6, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF01, 0x00000096, 0xFFFFFF9C, 0x0000005A, 0x00000068, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE0, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A4, 0xFFFFFF65, 0x00000096, 0xFFFFFF7E, 0x00000011, 0xF8405DE8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0178, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFE52, 0x00000096, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241B94_A02194, 0x0000000A, 0x00000002, 0xF8405DD6, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000046, 0x00000000, 0xFFFFFF06, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A40_A02040, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000046, 0x00000000, 0xFFFFFEC0, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241A78_A02078, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFF6, 0x00000000, 0xFFFFFEE3, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241AB0_A020B0, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000046, 0x00000000, 0xFFFFFF06, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000046, 0x00000000, 0xFFFFFEC0, 0x0000005A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFF6, 0x00000000, 0xFFFFFEE3, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000028, 0x0000003C, 0xFFFFFEE3, 0x0000005A, 0x00000146, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD6, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF01, 0x00000096, 0xFFFFFF9C, 0x0000005A, 0x00000068, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE0, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A4, 0xFFFFFF65, 0x00000096, 0xFFFFFF7E, 0x00000011, 0xF8405DE8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s b/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s index 6e7b24a4bc..daac7865e5 100644 --- a/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_14/A052F0.data.s @@ -6,4 +6,4 @@ dlabel D_80242AB0_A052F0 .word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0179, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B54_A05394 -.word 0x0000000A, 0x00000002, 0xF8405DC5, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFEA7, 0x0000004B, 0xFFFFFF8B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8080, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFEA7, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFEE8, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFE66, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0xFFFFFF6A, 0x00000000, 0xFFFFFF51, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AB0_A052F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000064, 0x00000000, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD71, 0x0000004B, 0xFFFFFFDD, 0x00000011, 0xF8405DC6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DCA, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFEA7, 0x0000004D, 0xFFFFFF8B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B54_A05394, 0x00000043, 0x00000007, MakeItemEntity, 0x00000084, 0xFFFFFEA7, 0x00000066, 0xFFFFFF8B, 0x00000011, 0xF8405DC5, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000C8, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000FA, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD7, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000012C, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFD76, 0x0000004B, 0xFFFFFFCE, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405DC5, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetItemPos, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFEA7, 0x0000004B, 0xFFFFFF8B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8080, 0x0000000E, 0x00000002, 0xFE363C80, 0xFFFFFEA7, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFEE8, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFE66, 0x00000000, 0xFFFFFF90, 0x00000014, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFF6A, 0x00000000, 0xFFFFFF51, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AB0_A052F0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000064, 0x00000000, 0xFFFFFF47, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD71, 0x0000004B, 0xFFFFFFDD, 0x00000011, 0xF8405DC6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DC8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFEC, 0x00000011, 0xF8405DC9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD62, 0x0000004B, 0xFFFFFFCE, 0x00000011, 0xF8405DCA, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFEA7, 0x0000004D, 0xFFFFFF8B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B54_A05394, 0x00000043, 0x00000007, MakeItemEntity, 0x00000084, 0xFFFFFEA7, 0x00000066, 0xFFFFFF8B, 0x00000011, 0xF8405DC5, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000C8, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000FA, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405DD7, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000012C, 0x0000003C, 0xFFFFFF60, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFD76, 0x0000004B, 0xFFFFFFCE, 0x00000000, 0x00000008, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405DE1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_15/A0AB50.data.s b/ver/us/asm/data/world/area_nok/nok_15/A0AB50.data.s index 4a2a5919cc..bde096778a 100644 --- a/ver/us/asm/data/world/area_nok/nok_15/A0AB50.data.s +++ b/ver/us/asm/data/world/area_nok/nok_15/A0AB50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80243C50_A0AB50 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EA7E0, 0xFFFFFFCE, 0x0000003C, 0xFFFFFCC7, 0x00000023, 0x00000006, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HeartBlock, 0xFFFFFFCE, 0x0000003C, 0xFFFFFCC7, 0x00000023, 0x00000006, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s index 444a9eb892..cbc7a07c30 100644 --- a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s @@ -87,4 +87,4 @@ dlabel D_80245234_BC23D4 .word 0x00000002, D_8024407C_BC121C, 0x43EC8000, 0xC2F40000, 0x43770000, 0x00000B01, D_80244B34_BC1CD4, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80245424_BC25C4 -.word 0x00000003, D_80244050_BC11F0, 0x43D30000, 0xC3480000, 0x42E00000, 0x00000901, D_80244DA4_BC1F44, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000001A6, 0xFFFFFF38, 0x00000070, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001A6, 0xFFFFFF38, 0x00000070, 0x0000001E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x001A00A6, 0x00000004, D_80244050_BC11F0, 0x43C68000, 0xC3CD0000, 0x43B00000, 0x00000901, D_80244DFC_BC1F9C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000018D, 0xFFFFFE66, 0x00000160, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000018D, 0xFFFFFE66, 0x00000160, 0x00000050, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x001A00A7, 0x00000001, D_80244E54_BC1FF4, 0x00000000, 0x00000001, D_80245044_BC21E4, 0x00000000, 0x00000001, D_80245234_BC23D4, 0x00000000, 0x00000002, D_80245424_BC25C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000002A3, 0xFFFFFE5C, 0x0000019F, 0x000000B4, 0x0000002F, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F41, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000003, D_80244050_BC11F0, 0x43D30000, 0xC3480000, 0x42E00000, 0x00000901, D_80244DA4_BC1F44, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000001A6, 0xFFFFFF38, 0x00000070, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001A6, 0xFFFFFF38, 0x00000070, 0x0000001E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x001A00A6, 0x00000004, D_80244050_BC11F0, 0x43C68000, 0xC3CD0000, 0x43B00000, 0x00000901, D_80244DFC_BC1F9C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000018D, 0xFFFFFE66, 0x00000160, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000018D, 0xFFFFFE66, 0x00000160, 0x00000050, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x001A00A7, 0x00000001, D_80244E54_BC1FF4, 0x00000000, 0x00000001, D_80245044_BC21E4, 0x00000000, 0x00000001, D_80245234_BC23D4, 0x00000000, 0x00000002, D_80245424_BC25C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x000002A3, 0xFFFFFE5C, 0x0000019F, 0x000000B4, 0x0000002F, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F41, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s b/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s index d8307cc4fe..20aac78819 100644 --- a/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s +++ b/ver/us/asm/data/world/area_obk/obk_02/BC3F60.data.s @@ -6,4 +6,4 @@ dlabel D_802414D0_BC3F60 .word 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212A, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFB0, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000032, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212B, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8080, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, PlaySoundAt, 0x0000212C, 0x00000000, 0x00000004, 0x0000001A, 0xFFFFFFF4, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFB0, 0x00000000, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000032, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001F, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF8405F42, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416FC_BC418C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802414D0_BC3F60, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F43, 0x00000043, 0x00000002, AssignScript, D_802416FC_BC418C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802414D0_BC3F60, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F43, 0x00000043, 0x00000002, AssignScript, D_802416FC_BC418C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x00000000, 0x00000006, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s b/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s index 8d2ba33185..ff4c6e3eb1 100644 --- a/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s +++ b/ver/us/asm/data/world/area_obk/obk_03/BC5A00.data.s @@ -15,10 +15,10 @@ dlabel D_80241B9C_BC5E1C .word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000018A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x000001D6, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0xFFFFFF79, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFC2, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001F, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0x00000160, 0xFFFFFF2E, 0xFFFFFFFB, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CD8_BC5F58 -.word 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000168, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000043, 0x00000002, AssignScript, D_80241DB4_BC6034, 0x00000044, 0x00000001, D_80241A60_BC5CE0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x00000005, 0x00000046, 0x00000001, D_80241780_BC5A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000168, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000006, 0x00000043, 0x00000002, AssignScript, D_80241DB4_BC6034, 0x00000044, 0x00000001, D_80241A60_BC5CE0, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x00000005, 0x00000046, 0x00000001, D_80241780_BC5A00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DB4_BC6034 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x000001B8, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000007, 0x00000043, 0x00000002, AssignScript, D_80241E90_BC6110, 0x00000044, 0x00000001, D_80241B9C_BC5E1C, 0x00000024, 0x00000002, 0xFE363C82, 0x000001B8, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x0000001E, 0x00000046, 0x00000001, D_802418F0_BC5B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HugeBlueSwitch, 0x000001B8, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000007, 0x00000043, 0x00000002, AssignScript, D_80241E90_BC6110, 0x00000044, 0x00000001, D_80241B9C_BC5E1C, 0x00000024, 0x00000002, 0xFE363C82, 0x000001B8, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF2E, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C88, 0x0000001E, 0x00000046, 0x00000001, D_802418F0_BC5B70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E90_BC6110 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000044, 0x00000001, 0x80242320, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000012C, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000043, 0x00000002, AssignScript, D_80241CD8_BC5F58, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF7E, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F45, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x0000009B, 0x00000000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000044, 0x00000001, 0x80242320, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000012C, 0xFFFFFF2E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000005, 0x00000043, 0x00000002, AssignScript, D_80241CD8_BC5F58, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFF7E, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F45, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x0000009B, 0x00000000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFF5B, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s b/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s index 948141a6cb..1f1e02b7f6 100644 --- a/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_04/BC8DE0.data.s @@ -6,4 +6,4 @@ dlabel D_80240F80_BC8DE0 .word 0x00000024, 0x00000002, 0xF8405F48, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405F49, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FC0_BC8E20 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405F47, 0x00000001, 0x00000044, 0x00000001, 0x802441AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000B4, 0x00000000, 0xFFFFFF51, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F47, 0x00000043, 0x00000002, AssignScript, D_80240FC0_BC8E20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000016A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC7E60, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xF8405F48, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F80_BC8DE0, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x00000000, 0xFFFFFF42, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F4A, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFC4, 0x0000001E, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFFEC, 0x00000000, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF51, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405F47, 0x00000001, 0x00000044, 0x00000001, 0x802441AC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0x000000B4, 0x00000000, 0xFFFFFF51, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F47, 0x00000043, 0x00000002, AssignScript, D_80240FC0_BC8E20, 0x00000043, 0x00000007, MakeItemEntity, 0x0000016A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC7E60, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xF8405F48, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240F80_BC8DE0, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFFC4, 0x00000000, 0xFFFFFF42, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F4A, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFFC4, 0x0000001E, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFFEC, 0x00000000, 0xFFFFFF42, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF51, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_05/BCE040.data.s b/ver/us/asm/data/world/area_obk/obk_05/BCE040.data.s index 7679884a01..bfc3c65541 100644 --- a/ver/us/asm/data/world/area_obk/obk_05/BCE040.data.s +++ b/ver/us/asm/data/world/area_obk/obk_05/BCE040.data.s @@ -21,4 +21,4 @@ dlabel D_80241108_BCE168 .word 0x00000000, D_80240FE0_BCE040, 0x4402C000, 0xC30B0000, 0x43410000, 0x00000F01, D_802410C0_BCE120, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240FE0_BCE040, 0x43EC8000, 0xC2F40000, 0x43770000, 0x00000F01, D_802410E4_BCE144, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241108_BCE168, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241500_BCE560 -.word 0x00000024, 0x00000002, 0xF8405F4D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F4D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241500_BCE560, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x000000C8, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000094, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x000000C8, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0x000000A5, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000094, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF97, 0x00000000, 0xFFFFFFC9, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405F4D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F4D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241500_BCE560, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x000000C8, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000094, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x000000C8, 0x0000001E, 0xFFFFFF9C, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0x000000A5, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000094, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFF97, 0x00000000, 0xFFFFFFC9, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_06/BCEAD0.data.s b/ver/us/asm/data/world/area_obk/obk_06/BCEAD0.data.s index 5781faaaec..3fb8d43559 100644 --- a/ver/us/asm/data/world/area_obk/obk_06/BCEAD0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_06/BCEAD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240440_BCEAD0 -.word 0x0000000A, 0x00000002, 0xF8405F4F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001D, 0x000000E6, 0x0000007D, 0xFFFFFF29, 0x00000011, 0xF8405F4F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F4F, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF92, 0x0000001E, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAED4, 0xFFFFFF92, 0x00000000, 0x00000032, 0x00000000, 0x0000015C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405F4F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001D, 0x000000E6, 0x0000007D, 0xFFFFFF29, 0x00000011, 0xF8405F4F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF8405F4F, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFF92, 0x0000001E, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_WoodenCrate, 0xFFFFFF92, 0x00000000, 0x00000032, 0x00000000, 0x0000015C, 0x80000000, 0x00000043, 0x00000002, AssignCrateFlag, 0xF8405F50, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s index 4d1c5eced8..de789c9274 100644 --- a/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_07/BD0BA0.data.s @@ -12,4 +12,4 @@ dlabel D_8024201C_BD0C0C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241FB4_BD0BA4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420FC_BD0CEC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD6, 0x00000024, 0x00000002, 0xF8405F52, 0x00000001, 0x00000046, 0x00000001, D_8024201C_BD0C0C, 0x00000046, 0x00000001, 0x8024493C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000AA, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F52, 0x00000043, 0x00000002, AssignScript, D_802420FC_BD0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD6, 0x00000024, 0x00000002, 0xF8405F52, 0x00000001, 0x00000046, 0x00000001, D_8024201C_BD0C0C, 0x00000046, 0x00000001, 0x8024493C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000AA, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405F52, 0x00000043, 0x00000002, AssignScript, D_802420FC_BD0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_08/BD64D0.data.s b/ver/us/asm/data/world/area_obk/obk_08/BD64D0.data.s index d2ed0b4cdf..a5c280b76b 100644 --- a/ver/us/asm/data/world/area_obk/obk_08/BD64D0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_08/BD64D0.data.s @@ -6,4 +6,4 @@ dlabel D_80242C60_BD64D0 .word 0x00000043, 0x00000003, PlaySoundWithVolume, 0xB0000011, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C82, 0xB0000011, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C83, 0x0000000F, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000014, 0x00000014, 0x00000008, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0xFE363C83, 0x00000005, 0x00000008, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000004, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000023, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundWithVolume, 0xB0000012, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C82, 0xB0000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242FA8_BD6818 -.word 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C83, 0x0000000F, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000014, 0x00000011, 0x00000008, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0xFE363C83, 0x00000008, 0x00000008, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000004, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000023, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFE7A, 0x00000096, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000029, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000035, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000030, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000024, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0xFFFFFE7A, 0x000000AA, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFD4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000022, 0x00000000, 0x00000000, 0xFFFFFFEC, 0x00000011, 0xF8405F53, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000022, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240870_BD40E0, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F54, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C83, 0x0000005A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C83, 0x0000000F, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000014, 0x00000011, 0x00000008, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0xFE363C83, 0x00000008, 0x00000008, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240840_BD40B0, 0x00000005, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000004, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000023, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x00000000, 0x0000000F, 0x00000001, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFE7A, 0x00000096, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000029, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000035, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000030, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000024, 0x00000044, 0x00000001, D_80242C60_BD64D0, 0x00000008, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000044, 0x00000001, D_80242FA8_BD6818, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0xFFFFFE7A, 0x000000AA, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFD4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000022, 0x00000000, 0x00000000, 0xFFFFFFEC, 0x00000011, 0xF8405F53, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000022, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240870_BD40E0, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F54, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s index 92649ced5c..a5d09f2912 100644 --- a/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s +++ b/ver/us/asm/data/world/area_omo/omo_01/D9D250.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242360_D9D250 -.word 0x0000000A, 0x00000002, 0xF8405FD5, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000030, 0xFFFFFFA3, 0x00000000, 0x00000023, 0x00000011, 0xF8405FD4, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD6, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFE2, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000098, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405FD5, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000030, 0xFFFFFFA3, 0x00000000, 0x00000023, 0x00000011, 0xF8405FD4, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000096, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD6, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFE2, 0x0000003C, 0xFFFFFF15, 0x00000000, 0x00000098, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s index 4f2942b8b6..e5f3c26f93 100644 --- a/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s +++ b/ver/us/asm/data/world/area_omo/omo_02/DA0300.data.s @@ -6,4 +6,4 @@ dlabel D_80242E30_DA0300 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E98_DA0368 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, omo_02_UnsetCamera0MoveFlag1, 0x00000045, 0x00000002, D_80242E30_DA0300, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFEDE, 0x00000055, 0xFFFFFFB2, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000012C, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDA, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDB, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFB0, 0x00000059, 0xFFFFFFB2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0xFFFFFFB0, 0x00000072, 0xFFFFFFB2, 0x0000000D, 0xF8405FDC, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFE9A, 0x00000000, 0xFFFFFFAE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242E98_DA0368, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, omo_02_UnsetCamera0MoveFlag1, 0x00000045, 0x00000002, D_80242E30_DA0300, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFEDE, 0x00000055, 0xFFFFFFB2, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000001, omo_02_SetCamera0MoveFlag1, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008F, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDA, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDB, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB0, 0x00000059, 0xFFFFFFB2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0xFFFFFFB0, 0x00000072, 0xFFFFFFB2, 0x0000000D, 0xF8405FDC, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFE9A, 0x00000000, 0xFFFFFFAE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242E98_DA0368, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s index d9946d61cf..a8f819fdbf 100644 --- a/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s +++ b/ver/us/asm/data/world/area_omo/omo_03/DA6050.data.s @@ -18,7 +18,7 @@ dlabel D_802415E0_DA6820 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241648_DA6888 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000001, omo_03_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GotoMap, 0x80248180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF0B, 0x0000010E, 0x000000FA, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFA1, 0x00000000, 0x000000FA, 0x00000019, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000025, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF92, 0x00000000, 0x000000BE, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000019, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0xFFFFFF6A, 0x00000000, 0x000000FA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241648_DA6888, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x000000CB, 0x00000000, 0x000000C8, 0x00000000, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406026, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000190, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000001, omo_03_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GotoMap, 0x80248180, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF0B, 0x0000010E, 0x000000FA, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFA1, 0x00000000, 0x000000FA, 0x00000019, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802415E0_DA6820, 0xFE363C8A, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000009, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000025, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFF92, 0x00000000, 0x000000BE, 0x00000014, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x00000019, 0x000000FA, 0x00000019, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFF6A, 0x00000000, 0x000000FA, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241648_DA6888, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x000000CB, 0x00000000, 0x000000C8, 0x00000000, 0x00000019, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406026, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000190, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FDD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AA0_DA6CE0 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s index b826d4fc46..e5a557da63 100644 --- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s @@ -60,7 +60,7 @@ dlabel D_80242AF0_DAFEF0 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000046, 0x00000001, D_802428B0_DAFCB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B1C_DAFF1C -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000047E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FDF, 0x00000043, 0x00000002, AssignScript, D_8024277C_DAFB7C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFC84, 0x00000000, 0xFFFFFF83, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E8_DAFDE8, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFCB1, 0x00000000, 0x00000062, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A14_DAFE14, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD2E, 0x00000000, 0xFFFFFFB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A40_DAFE40, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFD79, 0x00000050, 0x0000003E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A6C_DAFE6C, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFDA1, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A98_DAFE98, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFE2D, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC4_DAFEC4, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0x000002C8, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AF0_DAFEF0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000023F, 0x0000003C, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000002F9, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE1, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000375, 0x0000008C, 0xFFFFFF92, 0x00000000, 0x00000084, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE2, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x0000006E, 0xFFFFFF84, 0x00000011, 0xF8405FE3, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000082, 0xFFFFFF84, 0x00000011, 0xF8405FE4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000096, 0xFFFFFF84, 0x00000011, 0xF8405FE5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD83, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FE6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD9A, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDAE, 0x000000DC, 0x0000003E, 0x00000011, 0xF8405FE8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDC2, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDD6, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FEA, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000078, 0x000000B4, 0xFFFFFFB0, 0x00000011, 0xF8405FEC, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFFA6, 0x00000000, 0xFFFFFF83, 0x00000011, 0xF8405FED, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000047E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FDF, 0x00000043, 0x00000002, AssignScript, D_8024277C_DAFB7C, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFC84, 0x00000000, 0xFFFFFF83, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E8_DAFDE8, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFCB1, 0x00000000, 0x00000062, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A14_DAFE14, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFD2E, 0x00000000, 0xFFFFFFB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A40_DAFE40, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFD79, 0x00000050, 0x0000003E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A6C_DAFE6C, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFDA1, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A98_DAFE98, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFE2D, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC4_DAFEC4, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0x000002C8, 0x00000000, 0x00000085, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AF0_DAFEF0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000023F, 0x0000003C, 0x0000003C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000002F9, 0x0000003C, 0xFFFFFFAB, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE1, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000375, 0x0000008C, 0xFFFFFF92, 0x00000000, 0x00000084, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FE2, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x0000006E, 0xFFFFFF84, 0x00000011, 0xF8405FE3, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000082, 0xFFFFFF84, 0x00000011, 0xF8405FE4, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFC84, 0x00000096, 0xFFFFFF84, 0x00000011, 0xF8405FE5, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD83, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FE6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD9A, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE7, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDAE, 0x000000DC, 0x0000003E, 0x00000011, 0xF8405FE8, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDC2, 0x000000D2, 0x0000003E, 0x00000011, 0xF8405FE9, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFDD6, 0x000000BE, 0x0000003E, 0x00000011, 0xF8405FEA, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000078, 0x000000B4, 0xFFFFFFB0, 0x00000011, 0xF8405FEC, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFFA6, 0x00000000, 0xFFFFFF83, 0x00000011, 0xF8405FED, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel omo_04_FlyingAI_JumpVels .float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 diff --git a/ver/us/asm/data/world/area_omo/omo_05/DB7410.data.s b/ver/us/asm/data/world/area_omo/omo_05/DB7410.data.s index 4785502829..fe5c4793d6 100644 --- a/ver/us/asm/data/world/area_omo/omo_05/DB7410.data.s +++ b/ver/us/asm/data/world/area_omo/omo_05/DB7410.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80245150_DB7410 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000190, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FEE, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000226, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FEF, 0x0000000A, 0x00000002, 0xF8405FD2, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000043, 0x00000007, MakeItemEntity, 0x00000029, 0xFFFFFF06, 0x00000000, 0x00000078, 0x00000000, 0xF8405FD2, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000001DB, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x0000009A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFDE4, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x0000009B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000190, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FEE, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000226, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FEF, 0x0000000A, 0x00000002, 0xF8405FD2, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000043, 0x00000007, MakeItemEntity, 0x00000029, 0xFFFFFF06, 0x00000000, 0x00000078, 0x00000000, 0xF8405FD2, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000001DB, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x0000009A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF0, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFDE4, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x0000009B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s index 76040f493d..306cbcf1b9 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DBCFD0.data.s @@ -12,4 +12,4 @@ dlabel D_8024572C_DBD03C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802456C4_DBCFD4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024580C_DBD11C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000069, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF2, 0x00000001, 0x00000046, 0x00000001, D_8024572C_DBD03C, 0x00000024, 0x00000002, 0xF8405C8D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFEE8, 0x0000003C, 0xFFFFFEDE, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF3, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000190, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF2, 0x00000043, 0x00000002, AssignScript, D_8024580C_DBD11C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000064, 0x00000000, 0x00000190, 0x00000000, 0x00000028, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406027, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s index a09b433990..3172a6ce65 100644 --- a/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_07/DC30B0.data.s @@ -36,4 +36,4 @@ dlabel D_80246268_DC3518 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246294_DC3544 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000046A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF6, 0x00000043, 0x00000002, AssignScript, D_80245F4C_DC31FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFC72, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF7, 0x00000043, 0x00000002, AssignScript, D_80245FA8_DC3258, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000002EE, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF8, 0x00000043, 0x00000002, AssignScript, D_80245FF4_DC32A4, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000028A, 0x0000003C, 0xFFFFFFE2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF5, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEB6, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024623C_DC34EC, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFEFC, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246268_DC3518, 0x00000043, 0x00000007, MakeEntity, 0x802BCB44, 0xFFFFFF40, 0x00000050, 0xFFFFFF7C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246294_DC3544, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000046, 0x00000001, D_802460CC_DC337C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000046A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF6, 0x00000043, 0x00000002, AssignScript, D_80245F4C_DC31FC, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFC72, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF7, 0x00000043, 0x00000002, AssignScript, D_80245FA8_DC3258, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000002EE, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FF8, 0x00000043, 0x00000002, AssignScript, D_80245FF4_DC32A4, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000028A, 0x0000003C, 0xFFFFFFE2, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF5, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFEB6, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024623C_DC34EC, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFEFC, 0x00000000, 0x0000007F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246268_DC3518, 0x00000043, 0x00000007, MakeEntity, Entity_StarBoxLauncher, 0xFFFFFF40, 0x00000050, 0xFFFFFF7C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80246294_DC3544, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s index 18333a311a..9384a01c67 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s @@ -84,4 +84,4 @@ dlabel D_802470F4_DCB4C4 .word 0x00000003, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0006, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x0000000A, 0x00000002, 0xF8405FCD, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0041, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470E8_DCB4B8, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246918_DCACE8, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0006, 0x008C0002, 0x00000000, 0x000F0016, 0x0000001B, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0007, 0x00000043, 0x00000002, ShowChoice, 0x001E003F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000001, CloseMessage, 0x00000030, 0x00000001, D_802470F4_DCB4C4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0xFE363C81, 0x00000046, 0x00000001, D_80246778_DCAB48, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0004, 0x008C0001, 0x00000000, 0x000F0008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247438_DCB808 -.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80246558_DCA928, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80246E30_DCB200, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246B08_DCAED8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFEA2, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x0000015E, 0x0000003C, 0x0000003C, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF9, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF38, 0x00000000, 0x000000C8, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xF2486D98, 0xF247316B, 0xF24C1E84, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80246558_DCA928, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80246E30_DCB200, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80246B08_DCAED8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, D_80247438_DCB808, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000044, 0x00000001, D_80243D30_DC8100, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFEA2, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000015E, 0x0000003C, 0x0000003C, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405FF9, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF38, 0x00000000, 0x000000C8, 0x00000000, 0x00000014, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406028, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s index 84b4ab404c..df4676c2b8 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD3520.data.s @@ -27,4 +27,4 @@ dlabel D_8024707C_DD3D4C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80247014_DD3CE4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024715C_DD3E2C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFB, 0x00000001, 0x00000046, 0x00000001, D_8024707C_DD3D4C, 0x00000024, 0x00000002, 0xF8405C73, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD08, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFE, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD44, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFF, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000000A, 0x00000000, 0x00000011, 0xF8406000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE48, 0x0000000A, 0x00000064, 0x00000011, 0xF8406001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE84, 0x0000000A, 0x00000064, 0x00000011, 0xF8406002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFEC0, 0x0000000A, 0x00000064, 0x00000011, 0xF8406003, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000708, 0x00000019, 0x00000000, 0x00000011, 0xF8406016, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406008, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406009, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006D6, 0x00000019, 0x00000000, 0x00000011, 0xF840600D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000073A, 0x00000019, 0x00000000, 0x00000011, 0xF840600E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0x00000032, 0x00000011, 0xF8406012, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0x00000032, 0x00000011, 0xF8406013, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000505, 0x000000E6, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406017, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000079E, 0x00000096, 0xFFFFFFE1, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FFB, 0x00000043, 0x00000002, AssignScript, D_8024715C_DD3E2C, 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFD, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000025, 0x0000008E, 0x0000000A, 0xFFFFFFA0, 0x00000011, 0xF8405FFD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFB, 0x00000001, 0x00000046, 0x00000001, D_8024707C_DD3D4C, 0x00000024, 0x00000002, 0xF8405C73, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD08, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFE, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD44, 0x0000000A, 0x00000000, 0x00000011, 0xF8405FFF, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFD80, 0x0000000A, 0x00000000, 0x00000011, 0xF8406000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE48, 0x0000000A, 0x00000064, 0x00000011, 0xF8406001, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFE84, 0x0000000A, 0x00000064, 0x00000011, 0xF8406002, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFFFFFEC0, 0x0000000A, 0x00000064, 0x00000011, 0xF8406003, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000708, 0x00000019, 0x00000000, 0x00000011, 0xF8406016, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406008, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0xFFFFFFCE, 0x00000011, 0xF8406009, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006D6, 0x00000019, 0x00000000, 0x00000011, 0xF840600D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000073A, 0x00000019, 0x00000000, 0x00000011, 0xF840600E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x000006EF, 0x00000019, 0x00000032, 0x00000011, 0xF8406012, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000721, 0x00000019, 0x00000032, 0x00000011, 0xF8406013, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000505, 0x000000E6, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406017, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000079E, 0x00000096, 0xFFFFFFE1, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405FFB, 0x00000043, 0x00000002, AssignScript, D_8024715C_DD3E2C, 0x0000000A, 0x00000002, 0xF8405FFC, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FFD, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000025, 0x0000008E, 0x0000000A, 0xFFFFFFA0, 0x00000011, 0xF8405FFD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s b/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s index bae112eec6..2e8918d8ea 100644 --- a/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s +++ b/ver/us/asm/data/world/area_omo/omo_10/DDC720.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80244D70_DDC720 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFEA2, 0x0000003C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406018, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000000FA, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000096, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000020, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406029, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFEA2, 0x0000003C, 0x0000003C, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406018, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000000FA, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000096, 0x0000003C, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000020, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406029, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s index 402d279968..090f4e3a74 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s @@ -63,4 +63,4 @@ dlabel D_80242008_DDE838 .word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, omo_11_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, omo_11_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242488_DDECB8 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s index 25260c06ae..0e6cfef08e 100644 --- a/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_13/DE5100.data.s @@ -12,4 +12,4 @@ dlabel D_80242CDC_DE516C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80242C74_DE5104, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242DBC_DE524C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840601F, 0x00000001, 0x00000046, 0x00000001, D_80242CDC_DE516C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000006E, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840601F, 0x00000043, 0x00000002, AssignScript, D_80242DBC_DE524C, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFE89, 0x0000003C, 0xFFFFFFA1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406020, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000001D6, 0x0000003C, 0xFFFFFFC4, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000013C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840601F, 0x00000001, 0x00000046, 0x00000001, D_80242CDC_DE516C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000006E, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840601F, 0x00000043, 0x00000002, AssignScript, D_80242DBC_DE524C, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFE89, 0x0000003C, 0xFFFFFFA1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406020, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000001D6, 0x0000003C, 0xFFFFFFC4, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_17/DF6380.data.s b/ver/us/asm/data/world/area_omo/omo_17/DF6380.data.s index c9b925ca63..4923894f2a 100644 --- a/ver/us/asm/data/world/area_omo/omo_17/DF6380.data.s +++ b/ver/us/asm/data/world/area_omo/omo_17/DF6380.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802474E0_DF6380 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFB5, 0x00000078, 0x00000087, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406022, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFCE, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406023, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000000, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406024, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFFE7, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406025, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFB5, 0x00000078, 0x00000087, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406022, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFCE, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406023, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406024, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFFE7, 0x00000046, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406025, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s b/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s index 8eeca74d5a..4c7be4d07f 100644 --- a/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s +++ b/ver/us/asm/data/world/area_osr/osr_02/AB2B00.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240990_AB2B00 -.word 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000B4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061EB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D7D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000B4, 0x0000003C, 0xFFFFFFF1, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061EB, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s index 3bb7dbc9db..6cfd73f23e 100644 --- a/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_02/D52DE0.data.s @@ -27,4 +27,4 @@ dlabel D_80243564_D53554 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000033, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8406157, 0x00000001, 0x00000047, 0x00000005, D_80241CE8_D51CD8, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241ED0_D51EC0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F82, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024378C_D5377C -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000034, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8406158, 0x00000001, 0x00000047, 0x00000005, D_80241DDC_D51DCC, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FC4_D51FB4, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C82, 0x00004000, 0x0000000A, 0x00000002, 0xF8406157, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000003DB, 0x00000008, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000003DB, 0x00000008, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406158, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000003DB, 0x00000102, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000003DB, 0x00000102, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802434C4_D534B4, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x0000002B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000034, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8406158, 0x00000001, 0x00000047, 0x00000005, D_80241DDC_D51DCC, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FC4_D51FB4, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, dup_pra_02_GetEntityPosition, 0xFD050F84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000043, 0x00000001, pra_02_SetEntityFlags100000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F84, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C82, 0x00004000, 0x0000000A, 0x00000002, 0xF8406157, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000008, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000008, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000004E, 0x00000006, D_80243564_D53554, 0x00000100, 0xFE363C82, D_80242DF0_D52DE0, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406158, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000102, 0x00000054, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000003DB, 0x00000102, 0xFFFFFFAC, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024347C_D5346C, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x0000004E, 0x00000006, D_8024378C_D5377C, 0x00000100, 0xFE363C82, D_80242DF8_D52DE8, 0x00000000, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802434C4_D534B4, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x0000002B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000032, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s b/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s index 9fed07d7a5..b82010b0b6 100644 --- a/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_03/D543C0.data.s @@ -6,4 +6,4 @@ dlabel D_80240710_D543C0 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407A0_D54450 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D53D5C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D53CD0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D53DE8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000007C, 0xFFFFFF38, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802407A0_D54450, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D53D5C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240710_D543C0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D53CD0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D53DE8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000007C, 0xFFFFFF38, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802407A0_D54450, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF38, 0x0000003C, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s b/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s index be835e4abe..305daa6394 100644 --- a/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_04/D554E0.data.s @@ -9,4 +9,4 @@ dlabel D_80240EE0_D55570 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240E50_D554E0, 0xFE363C8A, 0x00000043, 0x00000001, func_802400AC_D5473C, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240E50_D554E0, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D546B0, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241074_D55704 -.word 0x00000024, 0x00000002, 0xF8406159, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000000A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D547C8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000007C, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EE0_D55570, 0x0000000A, 0x00000002, 0xF8406159, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x0000007C, 0x00000000, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241074_D55704, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF38, 0x0000003C, 0x0000004B, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840615A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8406159, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000000A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240138_D547C8, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000007C, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EE0_D55570, 0x0000000A, 0x00000002, 0xF8406159, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x0000007C, 0x00000000, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241074_D55704, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x0000003C, 0x0000004B, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840615A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s index f2f9f42ac0..676f295f08 100644 --- a/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s +++ b/ver/us/asm/data/world/area_pra/pra_05/D56E20.data.s @@ -30,4 +30,4 @@ dlabel D_802417CC_D5737C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000034, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406155, 0x00000001, 0x00000046, 0x00000001, D_802416EC_D5729C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241818_D573C8 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406155, 0x00000043, 0x00000002, AssignScript, D_802417CC_D5737C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406155, 0x00000043, 0x00000002, AssignScript, D_802417CC_D5737C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s index 3f62a3347b..3eba463aa3 100644 --- a/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s +++ b/ver/us/asm/data/world/area_pra/pra_11/D62B10.data.s @@ -12,4 +12,4 @@ dlabel D_8024167C_D62B7C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241614_D62B14, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024175C_D62C5C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406154, 0x00000001, 0x00000046, 0x00000001, D_8024167C_D62B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406154, 0x00000043, 0x00000002, AssignScript, D_8024175C_D62C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000033, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406154, 0x00000001, 0x00000046, 0x00000001, D_8024167C_D62B7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406154, 0x00000043, 0x00000002, AssignScript, D_8024175C_D62C5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s index 2ec5c46a70..140daf80fa 100644 --- a/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_12/D63FB0.data.s @@ -30,4 +30,4 @@ dlabel D_802417FC_D6450C .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000116, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840615D, 0x00000001, 0x00000046, 0x00000001, D_8024171C_D6442C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241848_D64558 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840615D, 0x00000043, 0x00000002, AssignScript, D_802417FC_D6450C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840615D, 0x00000043, 0x00000002, AssignScript, D_802417FC_D6450C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s b/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s index dac617bd83..69ba467884 100644 --- a/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s +++ b/ver/us/asm/data/world/area_pra/pra_14/D69630.data.s @@ -6,4 +6,4 @@ dlabel pra_14_varStash .word 0x00000000 dlabel D_80241934_D69634 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241934_D69634, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001BD, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406160, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001BD, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406161, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241934_D69634, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001BD, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406160, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001BD, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406161, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s b/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s index f28af9d835..ac9654338a 100644 --- a/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s +++ b/ver/us/asm/data/world/area_pra/pra_21/D78540.data.s @@ -6,4 +6,4 @@ dlabel D_80240620_D78540 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802406B0_D785D0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D77F40, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802400AC_D77FCC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000016E, 0xFFFFFF38, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802406B0_D785D0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000037, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406165, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000032, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000011, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406166, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x00000043, 0x00000001, func_80240020_D77F40, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240620_D78540, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802400AC_D77FCC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000016E, 0xFFFFFF38, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802406B0_D785D0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000037, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406165, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000032, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x00000011, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406166, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s b/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s index e3eb50d3f9..3adee6f8c1 100644 --- a/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s +++ b/ver/us/asm/data/world/area_pra/pra_22/D796B0.data.s @@ -6,4 +6,4 @@ dlabel D_80240E30_D796B0 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240EC0_D79740 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x00000043, 0x00000001, func_802401D0_D78A50, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8024025C_D78ADC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x0000016E, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EC0_D79740, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000037, 0x00000050, 0x0000004B, 0x00000000, 0x000000A2, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406167, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000032, 0x00000000, 0x0000004B, 0x00000000, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406168, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF51, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x00000043, 0x00000001, func_802401D0_D78A50, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80240E30_D796B0, 0xFE363C8A, 0x0000000A, 0x00000002, 0xF5DE029E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000154, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000019A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000013, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C89, 0xFE363C82, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_8024025C_D78ADC, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x0000016E, 0xFFFFFF38, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240EC0_D79740, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000037, 0x00000050, 0x0000004B, 0x00000000, 0x000000A2, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406167, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000032, 0x00000000, 0x0000004B, 0x00000000, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406168, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s index 31166fa725..2ee7725818 100644 --- a/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s +++ b/ver/us/asm/data/world/area_pra/pra_27/D7B080.data.s @@ -12,4 +12,4 @@ dlabel D_802416FC_D7B0EC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7B084, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417DC_D7B1CC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406169, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7B0EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406169, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7B1CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF8406169, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7B0EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8406169, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7B1CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s index d063bb73fb..13ad5d7598 100644 --- a/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s +++ b/ver/us/asm/data/world/area_pra/pra_28/D7C930.data.s @@ -12,4 +12,4 @@ dlabel D_802416FC_D7C99C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241694_D7C934, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417DC_D7CA7C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000113, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616A, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7C99C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616A, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7CA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000113, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616A, 0x00000001, 0x00000046, 0x00000001, D_802416FC_D7C99C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000000C8, 0x00000014, 0x0000005E, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616A, 0x00000043, 0x00000002, AssignScript, D_802417DC_D7CA7C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s index 04ab7c41cb..163573743b 100644 --- a/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s +++ b/ver/us/asm/data/world/area_pra/pra_29/D7DE90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241340_D7DE90 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0x0000004D, 0x00000000, 0x00000001, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000053, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000002, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_BlueSwitch, 0x0000014A, 0x00000000, 0x0000004D, 0x00000000, 0x00000001, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414E0_D7E030 .word 0x0000003E, 0x00000002, 0x00000010, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, pra_29_ReflectWall, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_29_ReflectFloor, 0xFE363C80, 0x00000043, 0x00000002, pra_29_ReflectPartner, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_34/D8D130.data.s b/ver/us/asm/data/world/area_pra/pra_34/D8D130.data.s index 22a4af0b94..57d89384a8 100644 --- a/ver/us/asm/data/world/area_pra/pra_34/D8D130.data.s +++ b/ver/us/asm/data/world/area_pra/pra_34/D8D130.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241D80_D8D130 -.word 0x00000024, 0x00000002, 0xF8406170, 0x00000001, 0x00000047, 0x00000005, D_80241510_D8C8C0, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415F4_D8C9A4, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406170, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000000F0, 0x00000008, 0xFFFFFFB5, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D80_D8D130, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x000000F0, 0x00000008, 0x0000004B, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D80_D8D130, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8406170, 0x00000001, 0x00000047, 0x00000005, D_80241510_D8C8C0, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802415F4_D8C9A4, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406170, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000000F0, 0x00000008, 0xFFFFFFB5, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D80_D8D130, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000000F0, 0x00000008, 0x0000004B, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D80_D8D130, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s index 22153bcf9d..4fc106cabc 100644 --- a/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s +++ b/ver/us/asm/data/world/area_pra/pra_35/D91030.data.s @@ -12,4 +12,4 @@ dlabel D_80243E4C_D9109C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80243DE4_D91034, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F2C_D9117C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000106, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616D, 0x00000001, 0x00000046, 0x00000001, D_80243E4C_D9109C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x000001B3, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616D, 0x00000043, 0x00000002, AssignScript, D_80243F2C_D9117C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000106, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840616D, 0x00000001, 0x00000046, 0x00000001, D_80243E4C_D9109C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x000001B3, 0x00000000, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840616D, 0x00000043, 0x00000002, AssignScript, D_80243F2C_D9117C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s b/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s index 189fbb3c3c..74c5cfcd7c 100644 --- a/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s +++ b/ver/us/asm/data/world/area_pra/pra_40/D9AE80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802414D0_D9AE80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000A5, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000055, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000A5, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000055, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s index 566cf75e6a..01268fe821 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D05460.data.s @@ -12,4 +12,4 @@ dlabel D_8024D95C_D054CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_8024D8F4_D05464, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DA3C_D055AC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000147, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840611B, 0x00000001, 0x00000046, 0x00000001, D_8024D95C_D054CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000005F, 0x00000000, 0xFFFFFF4C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840611B, 0x00000043, 0x00000002, AssignScript, D_8024DA3C_D055AC, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015D, 0xFFFFFEBB, 0x00000000, 0xFFFFFF10, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000031, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF92, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF840611C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000147, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF840611B, 0x00000001, 0x00000046, 0x00000001, D_8024D95C_D054CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000005F, 0x00000000, 0xFFFFFF4C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840611B, 0x00000043, 0x00000002, AssignScript, D_8024DA3C_D055AC, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015D, 0xFFFFFEBB, 0x00000000, 0xFFFFFF10, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000031, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF92, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF840611C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_04/D18720.data.s b/ver/us/asm/data/world/area_sam/sam_04/D18720.data.s index 3e4510dc7a..87de226f64 100644 --- a/ver/us/asm/data/world/area_sam/sam_04/D18720.data.s +++ b/ver/us/asm/data/world/area_sam/sam_04/D18720.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80245150_D18720 -.word 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000028, 0x00000000, 0x00000190, 0x00000000, 0x0000000F, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406125, 0x00000043, 0x00000007, MakeItemEntity, 0x0000003A, 0xFFFFFEDE, 0x00000046, 0x0000006E, 0x00000011, 0xF8406126, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000097, 0x000001AA, 0x00000000, 0xFFFFFF54, 0x00000011, 0xF8406127, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000028, 0x00000000, 0x00000190, 0x00000000, 0x0000000F, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406125, 0x00000043, 0x00000007, MakeItemEntity, 0x0000003A, 0xFFFFFEDE, 0x00000046, 0x0000006E, 0x00000011, 0xF8406126, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000007, MakeItemEntity, 0x00000097, 0x000001AA, 0x00000000, 0xFFFFFF54, 0x00000011, 0xF8406127, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_05/D1A890.data.s b/ver/us/asm/data/world/area_sam/sam_05/D1A890.data.s index b9ee8f7014..0ab42f9c27 100644 --- a/ver/us/asm/data/world/area_sam/sam_05/D1A890.data.s +++ b/ver/us/asm/data/world/area_sam/sam_05/D1A890.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802420B0_D1A890 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000003B, 0x00000064, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406129, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000001EA, 0x0000008C, 0xFFFFFFB5, 0x00000000, 0x00000092, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840612A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000003B, 0x00000064, 0x00000000, 0xFFFFFF9C, 0x00000011, 0xF8406129, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000001EA, 0x0000008C, 0xFFFFFFB5, 0x00000000, 0x00000092, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840612A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s b/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s index aa0374bf44..93a1fa8c3a 100644 --- a/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_07/D2E0B0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242380_D2E0B0 -.word 0x0000000A, 0x00000002, 0xF840612F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0xFFFFFF4D, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0x00000001, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000032A, 0x0000014A, 0xFFFFFF88, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x0000032A, 0x00000168, 0xFFFFFF88, 0x0000005A, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406130, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFABA, 0xFFFFFFC4, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840612F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0xFFFFFF4D, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_GreenStompSwitch, 0xFFFFFC4F, 0x00000001, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, 0x80242784, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000032A, 0x0000014A, 0xFFFFFF88, 0x0000005A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000032A, 0x00000168, 0xFFFFFF88, 0x0000005A, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406130, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFABA, 0xFFFFFFC4, 0xFFFFFF88, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index f4ed8b4cdf..55b0e0958c 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -30,4 +30,4 @@ dlabel D_80241CA8_D31928 .word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_SuperBlock_StartGlowEffect, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sam_08_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242128_D31DA8 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s index bc670546d3..e601e76ed1 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D38840.data.s @@ -3,7 +3,7 @@ .section .data dlabel sam_10_varStash -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000307, 0x0000021C, 0xFFFFFFCE, 0x00000000, 0x00000123, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406137, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF60, 0x0000012C, 0xFFFFFF92, 0x00000011, 0xF8406138, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004D, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x0000006C, 0xFFFFFF8B, 0x000000B3, 0xFFFFFFC9, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402BC_D37ABC, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF06, 0x00000366, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000302, 0x000004B0, 0xFFFFFF1F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802411F0_D389F0 .word 0x00000028, 0xFFFFFF38, 0x0000002B, 0xFFFFFF1A, 0x0000002E, 0xFFFFFEFC, 0x00000031, 0xFFFFFEDE, 0x00000034, 0xFFFFFEC0, 0x00000037, 0xFFFFFEA2, 0x0000003A, 0xFFFFFE84, 0x0000003D, 0xFFFFFE66, 0x00000040, 0xFFFFFE48, 0x00000043, 0xFFFFFE2A, 0x00000046, 0xFFFFFDEE, 0x00000049, 0xFFFFFDD0, 0x0000004C, 0xFFFFFDB2, 0x0000004F, 0xFFFFFD94, 0x00000052, 0xFFFFFD76, 0x00000055, 0xFFFFFD58, 0x00000058, 0xFFFFFD3A, 0x0000005B, 0xFFFFFD1C, 0x0000005E, 0xFFFFFCFE, 0x00000061, 0xFFFFFCE0, 0x00000064, 0xFFFFFCA4, 0x00000067, 0xFFFFFC86, 0x0000006A, 0xFFFFFC68, 0x0000006D, 0xFFFFFC4A, 0x00000070, 0xFFFFFC2C, 0x00000073, 0xFFFFFC0E, 0x00000076, 0xFFFFFBF0, 0x00000079, 0xFFFFFBD2, 0x0000007C, 0xFFFFFBB4, 0x0000007F, 0xFFFFFB96 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s index eb1fd14c95..b9df271bb1 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s @@ -93,7 +93,7 @@ dlabel D_80244B14_D3F0E4 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x0000000A, 0x00000002, 0xFD050F87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x000001F4, 0x00000045, 0x00000002, D_80243E24_D3E3F4, 0xFE363C8A, 0x00000046, 0x00000001, D_80243DFC_D3E3CC, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000005, PlayerJump, 0x000000AF, 0x00000181, 0xFFFFFECA, 0x00000023, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000044, 0x00000001, D_80244964_D3EF34, 0x00000046, 0x00000001, D_80243D24_D3E2F4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000000AF, 0x00000045, 0x00000002, D_80243E24_D3E3F4, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0x000000A0, 0x00000096, 0xFFFFFECA, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFD050F87, 0x00000001, 0x00000046, 0x00000001, D_80243B40_D3E110, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244CBC_D3F28C -.word 0x00000046, 0x00000001, D_80243A38_D3E008, 0x00000024, 0x00000002, 0xF840613B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840613B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000099, 0x00000008, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244CBC_D3F28C, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C80, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240754_D3AD24, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EAA30, 0x000000E0, 0x00000096, 0xFFFFFEB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244B14_D3F0E4, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000047, 0x00000005, D_80243EB4_D3E484, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802442D8_D3E8A8, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000079, 0x00000000, 0xFFFFFFC4, 0x000000DC, 0x00000000, 0xF840613A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000046, 0x00000001, D_80243A38_D3E008, 0x00000024, 0x00000002, 0xF840613B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840613B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000099, 0x00000008, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244CBC_D3F28C, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C80, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240754_D3AD24, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0x000000E0, 0x00000096, 0xFFFFFEB8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244B14_D3F0E4, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000047, 0x00000005, D_80243EB4_D3E484, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802442D8_D3E8A8, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000079, 0x00000000, 0xFFFFFFC4, 0x000000DC, 0x00000000, 0xF840613A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244E20_D3F3F0 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 diff --git a/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s b/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s index c73fa26fc6..f86142503d 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_02/92F830.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80245580_92F830 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000008, MakeEntity, 0x802EA7E0, 0xFFFFFF10, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x00000006, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC2, 0x00000043, 0x00000008, MakeEntity, Entity_HeartBlock, 0xFFFFFF10, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x00000006, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s b/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s index 9356baf791..ee67f4919e 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s @@ -21,4 +21,4 @@ dlabel D_80241534_933AF4 .word D_80241504_933AC4, D_8024150C_933ACC, D_80241514_933AD4, 0x00000000, 0x00000000 dlabel D_80241548_933B08 -.word 0x43640000, 0x00000000, 0xC3990000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241534_933AF4, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00100000, D_80241548_933B08, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000087, 0x0000003C, 0xFFFFFF33, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB0, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFEC, 0x0000003C, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000DC, 0x0000003C, 0x00000041, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000005A, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFBA, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFE8E, 0x0000003C, 0x00000096, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x43640000, 0x00000000, 0xC3990000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241534_933AF4, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00100000, D_80241548_933B08, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000087, 0x0000003C, 0xFFFFFF33, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB0, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFEC, 0x0000003C, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000DC, 0x0000003C, 0x00000041, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000005A, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFBA, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE8E, 0x0000003C, 0x00000096, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s index 09c6741e62..63beb84813 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240350_933FD0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x0000013B, 0x0000005D, 0x0000003C, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E9F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000013B, 0x0000005D, 0x0000003C, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E9F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s b/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s index f5b66fcb6d..31a3518ebf 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s @@ -9,4 +9,4 @@ dlabel D_80240474_936B54 .word D_80240440_936B20, 0xFFFFFFFF dlabel D_8024047C_936B5C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802405E0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCA74, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_80240474_936B54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024047C_936B5C, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB1, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF10, 0x00000000, 0x000000D7, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA0, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000DC, 0x00000000, 0x00000096, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802405E0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_80240474_936B54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024047C_936B5C, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB1, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF10, 0x00000000, 0x000000D7, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000DC, 0x00000000, 0x00000096, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s index 12390a81c0..9b5ef8e852 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240460_9389F0 -.word 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFB0, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF4C, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF7E, 0x00000049, 0xFFFFFF6A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0xFFFFFF7E, 0x00000000, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240460_9389F0, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFB0, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF4C, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF7E, 0x00000049, 0xFFFFFF6A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0xFFFFFF7E, 0x00000000, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240460_9389F0, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s b/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s index 2da806bfd0..58904195ca 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240CE0_93A610 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF1F, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA5, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF1F, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA6, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000E1, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA7, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000E1, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA8, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA9, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA5, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA6, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000E1, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA7, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000E1, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA8, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA9, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s b/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s index 8d6b04a54a..b71fe56156 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s @@ -9,4 +9,4 @@ dlabel D_802403F4_93AB54 .word D_802403C0_93AB20, 0xFFFFFFFF dlabel D_802403FC_93AB5C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCA74, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_93AB54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_93AB5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_93AB54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_93AB5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s index 8dea7bf4e6..80c03ab1b8 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s @@ -12,4 +12,4 @@ dlabel D_80240858_93B488 .word 0x00000043, 0x00000002, BasicAI_Main, D_80240828_93B458, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240878_93B4A8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240790_93B3C0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240858_93B488, EnemyNpcHit, 0x00000000, D_80240878_93B4A8, 0x00000000, 0x00000000, 0x00090005, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5D0, 0x00000154, 0x0000003C, 0xFFFFFF56, 0x00000000, 0x00000103, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240790_93B3C0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240858_93B488, EnemyNpcHit, 0x00000000, D_80240878_93B4A8, 0x00000000, 0x00000000, 0x00090005, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000154, 0x0000003C, 0xFFFFFF56, 0x00000000, 0x00000103, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s index d43474ac5c..0d4d21e74a 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241900_93DB80 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB2, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000078, 0x0000003C, 0x000000B9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB3, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFED4, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF10, 0x0000003C, 0x000000E6, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFB5, 0x0000003C, 0x00000127, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFB5, 0x0000003C, 0xFFFFFE98, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000010E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB2, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000078, 0x0000003C, 0x000000B9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB3, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFED4, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF10, 0x0000003C, 0x000000E6, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB5, 0x0000003C, 0x00000127, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB5, 0x0000003C, 0xFFFFFE98, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000010E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s b/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s index b7b71a085e..aaef425ce6 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s @@ -12,4 +12,4 @@ dlabel D_802400F4_945AC4 .word D_802400C0_945A90, 0xFFFFFFFF dlabel D_802400FC_945ACC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404D0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x00000000, 0x00000000, 0x000000E1, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E9C, 0x00000043, 0x00000008, MakeEntity, 0x802BCA74, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802400F4_945AC4, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802400FC_945ACC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404D0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x000000E1, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E9C, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802400F4_945AC4, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802400FC_945ACC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s b/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s index 0807b9f382..a409a713c1 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s @@ -129,4 +129,4 @@ dlabel D_802411B8_94B018 .word 0x43DB0000, 0x00000000, 0x42CA0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240FA4_94AE04, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80240FB8_94AE18, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240FF8_94AE58, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_8024100C_94AE6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024102C_94AE8C, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241040_94AEA0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241060_94AEC0, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241074_94AED4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241094_94AEF4, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802410A8_94AF08, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802410E8_94AF48, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802410FC_94AF5C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024111C_94AF7C, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241130_94AF90, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241150_94AFB0, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241164_94AFC4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802411A4_94B004, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802411B8_94B018, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241460_94B2C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017A, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EAFDC, 0x0000019A, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241460_94B2C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017A, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x0000019A, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241460_94B2C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s b/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s index 67318c98d8..4fee42eb7b 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240BD0_94BF70 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB4, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000A5, 0x0000003C, 0xFFFFFED4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x0000006E, 0x0000003C, 0x00000082, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF92, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB4, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000A5, 0x0000003C, 0xFFFFFED4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000006E, 0x0000003C, 0x00000082, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF92, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s b/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s index 645aaa17ac..3cea3c5598 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s @@ -9,4 +9,4 @@ dlabel D_802403F4_94C434 .word D_802403C0_94C400, 0xFFFFFFFF dlabel D_802403FC_94C43C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCA74, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_94C434, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_94C43C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_94C434, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_94C43C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s b/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s index dca40681cf..ef0c8ff6e7 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802403C0_94D530 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s index e6f032fa69..6010043e64 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240440_94E8E0 -.word 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF01, 0x00000037, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFE89, 0x00000050, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0xFFFFFE89, 0x00000069, 0xFFFFFF6F, 0x0000000D, 0xF8405EC3, 0x00000043, 0x00000007, MakeItemEntity, 0x0000011C, 0x000000C1, 0x0000004F, 0xFFFFFEA7, 0x00000011, 0xF8405EC2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF01, 0x00000037, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE89, 0x00000050, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0xFFFFFE89, 0x00000069, 0xFFFFFF6F, 0x0000000D, 0xF8405EC3, 0x00000043, 0x00000007, MakeItemEntity, 0x0000011C, 0x000000C1, 0x0000004F, 0xFFFFFEA7, 0x00000011, 0xF8405EC2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s index a37a0126ad..45ef6bfa88 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241BD0_950570 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAC, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000000, 0x00000055, 0x00000000, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAC, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000000, 0x00000055, 0x00000000, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s b/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s index e4539e7386..6f3f17d0e0 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802403C0_951A30 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB5, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000050, 0x0000003C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF2E, 0x0000003C, 0x000000A5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB5, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000050, 0x0000003C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF2E, 0x0000003C, 0x000000A5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s b/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s index 3b783071e7..dd2a7c2228 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s @@ -9,4 +9,4 @@ dlabel D_802403F4_952974 .word D_802403C0_952940, 0xFFFFFFFF dlabel D_802403FC_95297C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCA74, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_952974, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_95297C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_952974, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_95297C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s b/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s index fcbb80588c..caf6491e44 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s @@ -21,4 +21,4 @@ dlabel D_80241464_953EB4 .word D_80241434_953E84, D_8024143C_953E8C, D_80241444_953E94, 0x00000000, 0x00000000 dlabel D_80241478_953EC8 -.word 0x429A0000, 0x00000000, 0xC2FC0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241464_953EB4, 0x00000047, 0x00000005, D_80240E30_953880, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E30_953880, 0x00100000, D_80241478_953EC8, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000089, 0x000001A4, 0x00000000, 0x000000A8, 0x00000011, 0xF8405EC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x429A0000, 0x00000000, 0xC2FC0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241464_953EB4, 0x00000047, 0x00000005, D_80240E30_953880, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E30_953880, 0x00100000, D_80241478_953EC8, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000089, 0x000001A4, 0x00000000, 0x000000A8, 0x00000011, 0xF8405EC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s index ace86112dc..64d41bb876 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s @@ -18,7 +18,7 @@ dlabel D_80241494_955454 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415F8_9555B8 -.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E60_955E20 .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s index 29b398bb6e..221d6a10cc 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240350_9572E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5D0, 0x00000000, 0x0000005A, 0x00000000, 0x000000B4, 0x00000148, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000000, 0x0000005A, 0x00000000, 0x000000B4, 0x00000148, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s index 77804e91be..c5c4705088 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240350_9588E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s index c4f75ee3ad..bead87e63c 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802420A0_95AD50 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB7, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000050, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB8, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000000A0, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB9, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFF60, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBA, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0xFFFFFFC4, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBB, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000003C, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB7, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000050, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB8, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000000A0, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB9, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFF60, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBA, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFFC4, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBB, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x0000003C, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s b/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s index 13ed749e86..7d805488f9 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402E0_95B190 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000091, 0x0000003C, 0xFFFFFE89, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000058, 0x0000003C, 0xFFFFFEBC, 0x00000028, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000091, 0x0000003C, 0xFFFFFE89, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000058, 0x0000003C, 0xFFFFFEBC, 0x00000028, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s b/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s index 8b73cce5de..935f48e568 100644 --- a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s +++ b/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s @@ -18,7 +18,7 @@ dlabel D_8024290C_86BDBC .word 0x00000043, 0x00000003, GotoMap, 0x80243280, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024293C_86BDEC -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630D, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA19C, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242874_86BD24, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF840630D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000003, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000047, 0x00000005, D_8024293C_86BDEC, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0x0000007D, 0xFFFFFFF6, 0x00000019, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000096, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000002, D_802428AC_86BD5C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x00000032, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000003, D_802428DC_86BD8C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFCE, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000004, D_8024290C_86BDBC, 0x0000078D, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630D, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242874_86BD24, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF840630D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000003, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000047, 0x00000005, D_8024293C_86BDEC, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0x0000007D, 0xFFFFFFF6, 0x00000019, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000096, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000002, D_802428AC_86BD5C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000032, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000003, D_802428DC_86BD8C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFFCE, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000004, D_8024290C_86BDBC, 0x0000078D, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B50_86C000 .short 0x0000, 0x0000, 0x0018, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x0000, 0x0000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s index 913247fa52..b689ff57c7 100644 --- a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s @@ -12,7 +12,7 @@ dlabel D_8024112C_86D86C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802410C4_86D804, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024120C_86D94C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000012F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D0F, 0x00000001, 0x00000046, 0x00000001, D_8024112C_86D86C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D0F, 0x00000043, 0x00000002, AssignScript, D_8024120C_86D94C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000012F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D0F, 0x00000001, 0x00000046, 0x00000001, D_8024112C_86D86C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D0F, 0x00000043, 0x00000002, AssignScript, D_8024120C_86D94C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802412B0_86D9F0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/871730.data.s b/ver/us/asm/data/world/area_tik/tik_03/871730.data.s index 2f80fff228..2989b7c66b 100644 --- a/ver/us/asm/data/world/area_tik/tik_03/871730.data.s +++ b/ver/us/asm/data/world/area_tik/tik_03/871730.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242C30_871730 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D10, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x0000008C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D11, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000104, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D12, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D10, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000008C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D11, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000104, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D12, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s index ed0362f048..9e19dcf917 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s @@ -15,4 +15,4 @@ dlabel D_8024194C_87670C .word 0x0000000A, 0x00000002, 0xF8405D28, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D28, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0x0000004B, 0x00000069, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFF6, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024093C_8756FC, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B34_8768F4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000124, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D13, 0x00000001, 0x00000046, 0x00000001, D_8024186C_87662C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFF47, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D13, 0x00000043, 0x00000002, AssignScript, D_80241B34_8768F4, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000019, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024194C_87670C, 0x0000000A, 0x00000002, 0xF8405D28, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000019, 0x0000004B, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFDD, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000124, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D13, 0x00000001, 0x00000046, 0x00000001, D_8024186C_87662C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFF47, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D13, 0x00000043, 0x00000002, AssignScript, D_80241B34_8768F4, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000019, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024194C_87670C, 0x0000000A, 0x00000002, 0xF8405D28, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000019, 0x0000004B, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFFDD, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_06/879860.data.s b/ver/us/asm/data/world/area_tik/tik_06/879860.data.s index 3b66f311c4..93c661981d 100644 --- a/ver/us/asm/data/world/area_tik/tik_06/879860.data.s +++ b/ver/us/asm/data/world/area_tik/tik_06/879860.data.s @@ -12,4 +12,4 @@ dlabel D_80242AC8_8799A8 .word 0x00000024, 0x00000002, 0xF8405D07, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242B00_8799E0 -.word 0x00000024, 0x00000002, 0xF8405D08, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000078, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D06, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0xFFFFFE99, 0xFFFFFFF6, 0xFFFFFFF7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A9C_87997C, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242980_879860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D07, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA10C, 0x000000BE, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC8_8799A8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D08, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA19C, 0xFFFFFDE4, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B00_8799E0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405D08, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000078, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000008, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF8405D06, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0xFFFFFE99, 0xFFFFFFF6, 0xFFFFFFF7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242A9C_87997C, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242980_879860, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D07, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0x000000BE, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242AC8_8799A8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D08, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFDE4, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242B00_8799E0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index 5f685d5581..5850b7a497 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -18,7 +18,7 @@ dlabel D_80243A54_87D634 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BB8_87D798 -.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_07_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_07_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440C0_87DCA0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s b/ver/us/asm/data/world/area_tik/tik_08/881770.data.s index 4d5a5ff608..3e1b7810fc 100644 --- a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s +++ b/ver/us/asm/data/world/area_tik/tik_08/881770.data.s @@ -9,4 +9,4 @@ dlabel D_80242A7C_88186C .word 0x00000043, 0x00000003, GotoMap, 0x802433C8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242AAC_88189C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_80242AAC_88189C, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFFFFFFF6, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0x0000005F, 0xFFFFFFF6, 0xFFFFFFA8, 0x00000000, 0x00000004, D_80242A7C_88186C, 0x0000078E, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_80242AAC_88189C, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFFFFFFF6, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x0000005F, 0xFFFFFFF6, 0xFFFFFFA8, 0x00000000, 0x00000004, D_80242A7C_88186C, 0x0000078E, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s b/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s index edd0a35b05..e5aeaea26d 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s @@ -9,4 +9,4 @@ dlabel D_8024375C_88591C .word 0x00000043, 0x00000003, GotoMap, 0x80244190, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024378C_88594C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000005, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_8024378C_88594C, 0x00020000, 0xF9718885, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000001, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, 0x802EAF80, 0xFFFFFFE2, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x00000002, D_8024375C_88591C, 0x0000078F, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000005, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_8024378C_88594C, 0x00020000, 0xF9718885, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000001, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFFE2, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x00000002, D_8024375C_88591C, 0x0000078F, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s index 530456289f..39743691a8 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s @@ -18,4 +18,4 @@ dlabel D_80242094_888454 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421F8_8885B8 -.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 6cb5b18ec0..9c42a900ed 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -27,7 +27,7 @@ dlabel D_802442F4_88CEC4 .word 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244314_88CEE4 -.word 0x00000024, 0x00000002, 0xF8405D0C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000F0, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D33, 0x00000043, 0x00000002, AssignScript, D_80243E74_88CA44, 0x0000000A, 0x00000002, 0xF8405D0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802442F4_88CEC4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0x0000008C, 0xFFFFFF79, 0x00000069, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244314_88CEE4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405D0C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000000F0, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D33, 0x00000043, 0x00000002, AssignScript, D_80243E74_88CA44, 0x0000000A, 0x00000002, 0xF8405D0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000008C, 0xFFFFFF79, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802442F4_88CEC4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000008C, 0xFFFFFF79, 0x00000069, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244314_88CEE4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244430_88D000 .word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s index 1615ba3788..169230349d 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s @@ -18,4 +18,4 @@ dlabel D_80241484_893EA4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415E8_894008 -.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_17_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_17_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/897450.data.s b/ver/us/asm/data/world/area_tik/tik_18/897450.data.s index 598514a09b..897b1bd590 100644 --- a/ver/us/asm/data/world/area_tik/tik_18/897450.data.s +++ b/ver/us/asm/data/world/area_tik/tik_18/897450.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241D70_897450 -.word 0x00000043, 0x00000001, func_80240680_895D60, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D18, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x00000000, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D19, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF9C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFFCE, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000032, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000064, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000FA, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000096, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D70_897450, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, func_80240680_895D60, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D18, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D19, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF9C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFCE, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000032, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000064, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000FA, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000096, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D70_897450, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s index 62f774adf4..36a7fa0337 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s @@ -18,4 +18,4 @@ dlabel D_80242714_899CF4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242878_899E58 -.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_19_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_19_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s index 1304a02aaf..27a0baf14b 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s @@ -15,4 +15,4 @@ dlabel D_80242F7C_89D2CC .word 0x00000000, D_80242F50_89D2A0, 0xC2480000, 0xC1A00000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000064, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000 dlabel D_8024316C_89D4BC -.word 0x00000001, D_80242F50_89D2A0, 0x437A0000, 0xC1A00000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242F7C_89D2CC, 0x1A040004, 0x00000001, D_8024316C_89D4BC, 0x1A050004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x000001DB, 0x00000046, 0xFFFFFF9C, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000001, D_80242F50_89D2A0, 0x437A0000, 0xC1A00000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00020000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242F7C_89D2CC, 0x1A040004, 0x00000001, D_8024316C_89D4BC, 0x1A050004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000001DB, 0x00000046, 0xFFFFFF9C, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s b/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s index 9e8fdc4588..a71bc47a10 100644 --- a/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s +++ b/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802425D0_89FD70 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF63, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1B, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFAE, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1C, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFF9, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1D, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000044, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1E, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x0000008E, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF63, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1B, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFAE, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFF9, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1D, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000044, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1E, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000008E, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s index b2c7f22746..2c280b0b19 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s @@ -51,4 +51,4 @@ dlabel D_80242DD0_8A51A0 .word 0x00000024, 0x00000002, 0xF8405D0D, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242E08_8A51D8 -.word 0x0000000A, 0x00000002, 0xF8405D0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA19C, 0xFFFFFEE8, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242DD0_8A51A0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFFB5, 0x00000028, 0xFFFFFF88, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D20, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000AF, 0x00000028, 0x00000000, 0x00000000, 0x00000092, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D21, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0xFFFFFF06, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D22, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFF38, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D23, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFEE8, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242DD0_8A51A0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFB5, 0x00000028, 0xFFFFFF88, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D20, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000AF, 0x00000028, 0x00000000, 0x00000000, 0x00000092, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D21, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF06, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D22, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D23, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s index c33f97c891..01a2ba4002 100644 --- a/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241D90_8A7810 -.word 0x00000024, 0x00000002, 0xF8405D0E, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA22C, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D90_8A7810, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000032, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D24, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFFCE, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D25, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000096, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D26, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF9C, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000000, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000064, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000C8, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405D0E, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D90_8A7810, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000032, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D24, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFCE, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D25, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000096, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D26, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF9C, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000000, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000064, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000C8, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s index d14b5aae60..f0520ea6d3 100644 --- a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s @@ -9,4 +9,4 @@ dlabel D_802414F0_8A9470 .word 0x0000000A, 0x00000002, 0xF8405D29, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D29, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x000000D2, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416D8_8A9658 -.word 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF88, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x0000000A, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F81, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0xFFFFFEF2, 0xFFFFFFA6, 0x00000000, 0x0000005A, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D27, 0x00000044, 0x00000001, D_80241450_8A93D0, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x000000D2, 0xFFFFFFB5, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802414F0_8A9470, 0x0000000A, 0x00000002, 0xF8405D29, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x000000D2, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0x00000096, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0xFFFFFF88, 0xFFFFFFD3, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D8_8A9658, 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFF88, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAA54, 0xFFFFFFC4, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF88, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x0000000A, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240770_8A86F0, 0xFD050F81, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFEF2, 0xFFFFFFA6, 0x00000000, 0x0000005A, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D27, 0x00000044, 0x00000001, D_80241450_8A93D0, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000D2, 0xFFFFFFB5, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802414F0_8A9470, 0x0000000A, 0x00000002, 0xF8405D29, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x000000D2, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF88, 0xFFFFFFD3, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D8_8A9658, 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFF88, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFFC4, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s index badeb7dad2..dafa896c3f 100644 --- a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s @@ -15,4 +15,4 @@ dlabel D_8024148C_99B0FC .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000104, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E01, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414D8_99B148 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s b/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s index 382a92ca4b..f31fe81ef9 100644 --- a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s +++ b/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s @@ -6,4 +6,4 @@ dlabel D_80242FD0_99F960 .word 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000140, 0x00000000, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000DC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, GetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497A80, 0xFE363C81, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000140, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000010, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0A, 0x00000001, 0x00000043, 0x00000005, trd_01_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_01_SetEntityFlags100000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024328C_99FC1C -.word 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x0000013B, 0x00000008, 0x00000000, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024328C_99FC1C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0x000000DC, 0x000000FF, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000109, 0xFFFFFEF4, 0x00000290, 0xFFFFFFD8, 0x00000011, 0xF8405DFE, 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000000FE, 0x00000000, 0x0000001E, 0x00000000, 0xF8405E05, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x0000013B, 0x00000008, 0x00000000, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024328C_99FC1C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0x000000DC, 0x000000FF, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000109, 0xFFFFFEF4, 0x00000290, 0xFFFFFFD8, 0x00000011, 0xF8405DFE, 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000000FE, 0x00000000, 0x0000001E, 0x00000000, 0xF8405E05, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s index 86d4b1a540..96d902c7ba 100644 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s +++ b/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s @@ -6,4 +6,4 @@ dlabel D_80242890_9A3870 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0B, 0x00000001, 0x00000043, 0x00000005, trd_02_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_02_SetEntityFlags100000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429E4_9A39C4 -.word 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E4_9A39C4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000000A, 0x000000BB, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E4_9A39C4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000000A, 0x000000BB, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s index 0dc7ebcd41..5183c522fc 100644 --- a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s +++ b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s @@ -51,4 +51,4 @@ dlabel D_8024516C_9AD55C .word 0x00000047, 0x00000005, D_80243B64_9ABF54, 0x00000100, 0x00000016, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0xFFFFFF4C, 0x000000AF, 0xFFFFFFDD, 0x00000043, 0x00000005, MakeLerp, 0x000000AF, 0x00000000, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0xFE363C80, 0xFFFFFFDD, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024540C_9AD7FC -.word 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0x00000109, 0x00000008, 0x0000005A, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245140_9AD530, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024516C_9AD55C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000109, 0x00000008, 0x0000005A, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245140_9AD530, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024516C_9AD55C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s b/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s index 0438f05cf6..c04a860f4f 100644 --- a/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802410C0_9AF7C0 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA5F4, 0xFFFFFFBA, 0x0000012C, 0xFFFFFFF1, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80241810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0xFFFFFFBA, 0x0000012C, 0xFFFFFFF1, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80241810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s index db401aaeaa..13aae34a1d 100644 --- a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s +++ b/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s @@ -12,4 +12,4 @@ dlabel D_80244880_9B6010 .word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00660118, 0x00660118, 0x00000000, 0x000C010C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000003, GotoMap, 0x802451D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244998_9B6128 -.word 0x00000010, D_80244880_9B6010, 0x42700000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_80244880_9B6010, 0x42700000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_80244880_9B6010, 0xC1200000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_80244880_9B6010, 0x00000000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244998_9B6128, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA7E0, 0xFFFFFF6A, 0x0000003C, 0x00000064, 0x00000000, 0x00000006, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000010, D_80244880_9B6010, 0x42700000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_80244880_9B6010, 0x42700000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_80244880_9B6010, 0xC1200000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_80244880_9B6010, 0x00000000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244998_9B6128, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HeartBlock, 0xFFFFFF6A, 0x0000003C, 0x00000064, 0x00000000, 0x00000006, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s index e556cf0ac6..6d425e495a 100644 --- a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s +++ b/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240720_9BDD80 -.word 0x00000024, 0x00000002, 0xF8405E16, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E16, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCF24, 0xFFFFFE2A, 0xFFFFFFB5, 0x0000008B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240720_9BDD80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x00000578, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000005D2, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0xFFFFFDE4, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xF8405E16, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E16, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock2, 0xFFFFFE2A, 0xFFFFFFB5, 0x0000008B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240720_9BDD80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000578, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000005D2, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFDE4, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s b/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s index 9f9af436d9..7892b3f285 100644 --- a/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s +++ b/ver/us/asm/data/world/area_tst/tst_01/B1AB20.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240220_B1AB20 -.word 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA564, 0x00000088, 0x00000050, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA564, 0x000000BE, 0x00000000, 0x0000003F, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000C9, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x000000E6, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5D0, 0x00000102, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA5AC, 0x0000013B, 0x0000003C, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000088, 0x00000050, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_YellowBlock, 0x000000BE, 0x00000000, 0x0000003F, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C9, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000E6, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x00000156, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000102, 0x0000003C, 0xFFFFFFEC, 0x00000000, 0x0000015B, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x0000013B, 0x0000003C, 0x0000003F, 0x00000000, 0x0000015B, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s b/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s index 7294189636..4c4e4ef529 100644 --- a/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s +++ b/ver/us/asm/data/world/area_tst/tst_02/B1AE50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240220_B1AE50 -.word 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000005A, 0x00000046, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x00000082, 0x00000050, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000AA, 0x0000005A, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000D2, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000FA, 0x0000006E, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE0C, 0x000000C1, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAE30, 0x00000082, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000005A, 0x00000046, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x00000082, 0x00000050, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000AA, 0x0000005A, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000D2, 0x00000064, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x000000FA, 0x0000006E, 0xFFFFFF2E, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0x000000C1, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000082, 0x00000000, 0xFFFFFFDA, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s index ce5a6a9ceb..6b638e0b70 100644 --- a/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s +++ b/ver/us/asm/data/world/area_tst/tst_03/B1B240.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802402C0_B1B240 -.word 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA5AC, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA5D0, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA0C4, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA564, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA5F4, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_D_802EA588, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA178, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_D_802EA178, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA208, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, D_802EA298, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA2E0, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCE84, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, 0x802EAED4, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_RedBlock, 0x00000237, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HiddenRedBlock, 0x0000026F, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0x0000012C, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000168, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000001A4, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_YellowBlock, 0x000001E0, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0x0000021C, 0x00000050, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000258, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x0000012C, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x000001A4, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000001E0, 0x0000003C, 0x000000A0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PowBlock, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1BlockTiny, 0x000001CC, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1BlockTiny, 0x000001CC, 0x00000019, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2BlockTiny, 0x000001EA, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3BlockTiny, 0x00000208, 0x00000000, 0x00000032, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PowBlock, 0x00000284, 0x0000003C, 0x00000076, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BoardedFloor, 0x000001A0, 0x00000000, 0x000000E8, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x00000150, 0x00000000, 0x000000E8, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x0000010E, 0x00000000, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000043, 0x00000009, MakeEntity, Entity_WoodenCrate, 0x0000010E, 0x0000001E, 0x000000E8, 0x00000000, 0x0000008A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s b/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s index d66f6fa270..44eff38b55 100644 --- a/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s +++ b/ver/us/asm/data/world/area_tst/tst_10/B1C540.data.s @@ -30,4 +30,4 @@ dlabel D_80240450_B1C990 .word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001, D_80240450_B1C990, D_80240450_B1C990, D_80240450_B1C990, D_80240450_B1C990, 0xFFFFFFFF dlabel D_80240498_B1C9D8 -.word 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFFF3, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0xFFFFFF91, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000003, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFFF3, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0xFFFFFF91, 0x00000000, 0xFFFFFFC9, 0x00000000, 0x00000003, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s deleted file mode 100644 index 8b2711a4c5..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s +++ /dev/null @@ -1,118 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_entity_data -/* A73B8 80110CB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A73BC 80110CBC 3C058007 */ lui $a1, %hi(gGameStatusPtr) -/* A73C0 80110CC0 24A5419C */ addiu $a1, $a1, %lo(gGameStatusPtr) -/* A73C4 80110CC4 AFBF0014 */ sw $ra, 0x14($sp) -/* A73C8 80110CC8 AFB00010 */ sw $s0, 0x10($sp) -/* A73CC 80110CCC 8CA20000 */ lw $v0, ($a1) -/* A73D0 80110CD0 24030001 */ addiu $v1, $zero, 1 -/* A73D4 80110CD4 3C018015 */ lui $at, %hi(D_801516FC) -/* A73D8 80110CD8 AC2316FC */ sw $v1, %lo(D_801516FC)($at) -/* A73DC 80110CDC 3C018015 */ lui $at, %hi(D_801512C0) -/* A73E0 80110CE0 AC2012C0 */ sw $zero, %lo(D_801512C0)($at) -/* A73E4 80110CE4 3C018015 */ lui $at, %hi(D_80151324) -/* A73E8 80110CE8 AC201324 */ sw $zero, %lo(D_80151324)($at) -/* A73EC 80110CEC 3C018015 */ lui $at, %hi(D_80151330) -/* A73F0 80110CF0 AC201330 */ sw $zero, %lo(D_80151330)($at) -/* A73F4 80110CF4 3C018015 */ lui $at, %hi(D_80151304) -/* A73F8 80110CF8 AC201304 */ sw $zero, %lo(D_80151304)($at) -/* A73FC 80110CFC 80420070 */ lb $v0, 0x70($v0) -/* A7400 80110D00 14400003 */ bnez $v0, .L80110D10 -/* A7404 80110D04 00000000 */ nop -/* A7408 80110D08 3C018015 */ lui $at, %hi(gEntityHideMode) -/* A740C 80110D0C AC201310 */ sw $zero, %lo(gEntityHideMode)($at) -.L80110D10: -/* A7410 80110D10 3C028016 */ lui $v0, %hi(D_8015A578) -/* A7414 80110D14 2442A578 */ addiu $v0, $v0, %lo(D_8015A578) -/* A7418 80110D18 3C018015 */ lui $at, %hi(D_8015132C) -/* A741C 80110D1C AC20132C */ sw $zero, %lo(D_8015132C)($at) -/* A7420 80110D20 A0400001 */ sb $zero, 1($v0) -/* A7424 80110D24 14800003 */ bnez $a0, .L80110D34 -/* A7428 80110D28 A0400002 */ sb $zero, 2($v0) -/* A742C 80110D2C 3C018015 */ lui $at, %hi(D_80151344) -/* A7430 80110D30 AC201344 */ sw $zero, %lo(D_80151344)($at) -.L80110D34: -/* A7434 80110D34 8CA20000 */ lw $v0, ($a1) -/* A7438 80110D38 240300FF */ addiu $v1, $zero, 0xff -/* A743C 80110D3C 3C018015 */ lui $at, %hi(D_8014AFB0) -/* A7440 80110D40 AC23AFB0 */ sw $v1, %lo(D_8014AFB0)($at) -/* A7444 80110D44 80420070 */ lb $v0, 0x70($v0) -/* A7448 80110D48 1440000C */ bnez $v0, .L80110D7C -/* A744C 80110D4C 24040003 */ addiu $a0, $zero, 3 -/* A7450 80110D50 3C018015 */ lui $at, %hi(wEntityBlueprintSize) -/* A7454 80110D54 AC20165C */ sw $zero, %lo(wEntityBlueprintSize)($at) -/* A7458 80110D58 2404001D */ addiu $a0, $zero, 0x1d -/* A745C 80110D5C 3C028015 */ lui $v0, %hi(D_801516DC) -/* A7460 80110D60 244216DC */ addiu $v0, $v0, %lo(D_801516DC) -.L80110D64: -/* A7464 80110D64 AC400000 */ sw $zero, ($v0) -/* A7468 80110D68 2484FFFF */ addiu $a0, $a0, -1 -/* A746C 80110D6C 0481FFFD */ bgez $a0, .L80110D64 -/* A7470 80110D70 2442FFFC */ addiu $v0, $v0, -4 -/* A7474 80110D74 08044367 */ j .L80110D9C -/* A7478 80110D78 00000000 */ nop -.L80110D7C: -/* A747C 80110D7C 3C018015 */ lui $at, %hi(bEntityBlueprintSize) -/* A7480 80110D80 AC201660 */ sw $zero, %lo(bEntityBlueprintSize)($at) -/* A7484 80110D84 3C028015 */ lui $v0, %hi(bEntityBlueprint + 0xC) -/* A7488 80110D88 244216F4 */ addiu $v0, $v0, %lo(bEntityBlueprint + 0xC) -.L80110D8C: -/* A748C 80110D8C AC400000 */ sw $zero, ($v0) -/* A7490 80110D90 2484FFFF */ addiu $a0, $a0, -1 -/* A7494 80110D94 0481FFFD */ bgez $a0, .L80110D8C -/* A7498 80110D98 2442FFFC */ addiu $v0, $v0, -4 -.L80110D9C: -/* A749C 80110D9C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A74A0 80110DA0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A74A4 80110DA4 80420070 */ lb $v0, 0x70($v0) -/* A74A8 80110DA8 14400009 */ bnez $v0, .L80110DD0 -/* A74AC 80110DAC 3C028025 */ lui $v0, 0x8025 -/* A74B0 80110DB0 3C038026 */ lui $v1, 0x8026 -/* A74B4 80110DB4 34637FF0 */ ori $v1, $v1, 0x7ff0 -/* A74B8 80110DB8 3C018015 */ lui $at, %hi(D_80151300) -/* A74BC 80110DBC AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A74C0 80110DC0 3C018015 */ lui $at, %hi(gEntityHeapBase) -/* A74C4 80110DC4 AC2312C4 */ sw $v1, %lo(gEntityHeapBase)($at) -/* A74C8 80110DC8 0804437B */ j .L80110DEC -/* A74CC 80110DCC 00000000 */ nop -.L80110DD0: -/* A74D0 80110DD0 3C02801A */ lui $v0, %hi(D_801A7000) -/* A74D4 80110DD4 24427000 */ addiu $v0, $v0, %lo(D_801A7000) -/* A74D8 80110DD8 3C018015 */ lui $at, %hi(D_80151300) -/* A74DC 80110DDC AC221300 */ sw $v0, %lo(D_80151300)($at) -/* A74E0 80110DE0 24423000 */ addiu $v0, $v0, 0x3000 -/* A74E4 80110DE4 3C018015 */ lui $at, %hi(gEntityHeapBase) -/* A74E8 80110DE8 AC2212C4 */ sw $v0, %lo(gEntityHeapBase)($at) -.L80110DEC: -/* A74EC 80110DEC 0C044188 */ jal get_entity_list -/* A74F0 80110DF0 00000000 */ nop -/* A74F4 80110DF4 3C108015 */ lui $s0, %hi(gCurrentEntityListPtr) -/* A74F8 80110DF8 26101470 */ addiu $s0, $s0, %lo(gCurrentEntityListPtr) -/* A74FC 80110DFC 0C044193 */ jal get_shadow_list -/* A7500 80110E00 AE020000 */ sw $v0, ($s0) -/* A7504 80110E04 8E030000 */ lw $v1, ($s0) -/* A7508 80110E08 2404001D */ addiu $a0, $zero, 0x1d -/* A750C 80110E0C 3C018015 */ lui $at, %hi(gCurrentShadowListPtr) -/* A7510 80110E10 AC221658 */ sw $v0, %lo(gCurrentShadowListPtr)($at) -/* A7514 80110E14 24630074 */ addiu $v1, $v1, 0x74 -.L80110E18: -/* A7518 80110E18 AC600000 */ sw $zero, ($v1) -/* A751C 80110E1C 2484FFFF */ addiu $a0, $a0, -1 -/* A7520 80110E20 0481FFFD */ bgez $a0, .L80110E18 -/* A7524 80110E24 2463FFFC */ addiu $v1, $v1, -4 -/* A7528 80110E28 3C028015 */ lui $v0, %hi(gCurrentShadowListPtr) -/* A752C 80110E2C 8C421658 */ lw $v0, %lo(gCurrentShadowListPtr)($v0) -/* A7530 80110E30 2404003B */ addiu $a0, $zero, 0x3b -/* A7534 80110E34 244200EC */ addiu $v0, $v0, 0xec -.L80110E38: -/* A7538 80110E38 AC400000 */ sw $zero, ($v0) -/* A753C 80110E3C 2484FFFF */ addiu $a0, $a0, -1 -/* A7540 80110E40 0481FFFD */ bgez $a0, .L80110E38 -/* A7544 80110E44 2442FFFC */ addiu $v0, $v0, -4 -/* A7548 80110E48 8FBF0014 */ lw $ra, 0x14($sp) -/* A754C 80110E4C 8FB00010 */ lw $s0, 0x10($sp) -/* A7550 80110E50 03E00008 */ jr $ra -/* A7554 80110E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s deleted file mode 100644 index 2cbbd489e2..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s +++ /dev/null @@ -1,222 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8014F878 -.word .L80111B80_A8280, .L80111B80_A8280, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B8C_A828C, .L80111B80_A8280, .L80111B80_A8280, .L80111B8C_A828C, .L80111B80_A8280, 0 - -.section .text - -glabel create_entity -/* A7FC4 801118C4 AFA40000 */ sw $a0, ($sp) -/* A7FC8 801118C8 AFA50004 */ sw $a1, 4($sp) -/* A7FCC 801118CC AFA60008 */ sw $a2, 8($sp) -/* A7FD0 801118D0 AFA7000C */ sw $a3, 0xc($sp) -/* A7FD4 801118D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A7FD8 801118D8 AFBF001C */ sw $ra, 0x1c($sp) -/* A7FDC 801118DC AFB20018 */ sw $s2, 0x18($sp) -/* A7FE0 801118E0 AFB10014 */ sw $s1, 0x14($sp) -/* A7FE4 801118E4 AFB00010 */ sw $s0, 0x10($sp) -/* A7FE8 801118E8 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* A7FEC 801118EC F7B80030 */ sdc1 $f24, 0x30($sp) -/* A7FF0 801118F0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A7FF4 801118F4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A7FF8 801118F8 0C044305 */ jal load_area_specific_entity_data -/* A7FFC 801118FC AFA40040 */ sw $a0, 0x40($sp) -/* A8000 80111900 27A40054 */ addiu $a0, $sp, 0x54 -/* A8004 80111904 3C038016 */ lui $v1, %hi(CreateEntityVarArgBuffer + 0x8) -/* A8008 80111908 2463C7D8 */ addiu $v1, $v1, %lo(CreateEntityVarArgBuffer + 0x8) -/* A800C 8011190C C7B60044 */ lwc1 $f22, 0x44($sp) -/* A8010 80111910 4680B5A0 */ cvt.s.w $f22, $f22 -/* A8014 80111914 C7B80048 */ lwc1 $f24, 0x48($sp) -/* A8018 80111918 4680C620 */ cvt.s.w $f24, $f24 -/* A801C 8011191C C7BA004C */ lwc1 $f26, 0x4c($sp) -/* A8020 80111920 4680D6A0 */ cvt.s.w $f26, $f26 -/* A8024 80111924 C7B40050 */ lwc1 $f20, 0x50($sp) -/* A8028 80111928 4680A520 */ cvt.s.w $f20, $f20 -/* A802C 8011192C AC600000 */ sw $zero, ($v1) -/* A8030 80111930 2463FFFC */ addiu $v1, $v1, -4 -/* A8034 80111934 AC600000 */ sw $zero, ($v1) -/* A8038 80111938 2463FFFC */ addiu $v1, $v1, -4 -/* A803C 8011193C 24110003 */ addiu $s1, $zero, 3 -/* A8040 80111940 3C058000 */ lui $a1, 0x8000 -/* A8044 80111944 AC600000 */ sw $zero, ($v1) -.L80111948: -/* A8048 80111948 24840004 */ addiu $a0, $a0, 4 -/* A804C 8011194C 8C82FFFC */ lw $v0, -4($a0) -/* A8050 80111950 10450004 */ beq $v0, $a1, .L80111964 -/* A8054 80111954 2631FFFF */ addiu $s1, $s1, -1 -/* A8058 80111958 AC620000 */ sw $v0, ($v1) -/* A805C 8011195C 1E20FFFA */ bgtz $s1, .L80111948 -/* A8060 80111960 24630004 */ addiu $v1, $v1, 4 -.L80111964: -/* A8064 80111964 0000882D */ daddu $s1, $zero, $zero -/* A8068 80111968 3C128015 */ lui $s2, %hi(gCurrentEntityListPtr) -/* A806C 8011196C 26521470 */ addiu $s2, $s2, %lo(gCurrentEntityListPtr) -/* A8070 80111970 8E430000 */ lw $v1, ($s2) -.L80111974: -/* A8074 80111974 8C620000 */ lw $v0, ($v1) -/* A8078 80111978 10400006 */ beqz $v0, .L80111994 -/* A807C 8011197C 2A22001E */ slti $v0, $s1, 0x1e -/* A8080 80111980 26310001 */ addiu $s1, $s1, 1 -/* A8084 80111984 2A22001E */ slti $v0, $s1, 0x1e -/* A8088 80111988 1440FFFA */ bnez $v0, .L80111974 -/* A808C 8011198C 24630004 */ addiu $v1, $v1, 4 -/* A8090 80111990 2A22001E */ slti $v0, $s1, 0x1e -.L80111994: -/* A8094 80111994 10400086 */ beqz $v0, .L80111BB0 -/* A8098 80111998 2402FFFF */ addiu $v0, $zero, -1 -/* A809C 8011199C 0C00AB39 */ jal heap_malloc -/* A80A0 801119A0 240400F8 */ addiu $a0, $zero, 0xf8 -/* A80A4 801119A4 0040802D */ daddu $s0, $v0, $zero -/* A80A8 801119A8 0200202D */ daddu $a0, $s0, $zero -/* A80AC 801119AC 240500F8 */ addiu $a1, $zero, 0xf8 -/* A80B0 801119B0 8E420000 */ lw $v0, ($s2) -/* A80B4 801119B4 00111880 */ sll $v1, $s1, 2 -/* A80B8 801119B8 00621821 */ addu $v1, $v1, $v0 -/* A80BC 801119BC 0C00A580 */ jal mem_clear -/* A80C0 801119C0 AC700000 */ sw $s0, ($v1) -/* A80C4 801119C4 8FA30040 */ lw $v1, 0x40($sp) -/* A80C8 801119C8 AE000040 */ sw $zero, 0x40($s0) -/* A80CC 801119CC 94620002 */ lhu $v0, 2($v1) -/* A80D0 801119D0 10400008 */ beqz $v0, .L801119F4 -/* A80D4 801119D4 00000000 */ nop -/* A80D8 801119D8 0C00AB39 */ jal heap_malloc -/* A80DC 801119DC 0040202D */ daddu $a0, $v0, $zero -/* A80E0 801119E0 8FA30040 */ lw $v1, 0x40($sp) -/* A80E4 801119E4 AE020040 */ sw $v0, 0x40($s0) -/* A80E8 801119E8 94650002 */ lhu $a1, 2($v1) -/* A80EC 801119EC 0C00A580 */ jal mem_clear -/* A80F0 801119F0 0040202D */ daddu $a0, $v0, $zero -.L801119F4: -/* A80F4 801119F4 8FA20040 */ lw $v0, 0x40($sp) -/* A80F8 801119F8 90420020 */ lbu $v0, 0x20($v0) -/* A80FC 801119FC A2110004 */ sb $s1, 4($s0) -/* A8100 80111A00 A202000A */ sb $v0, 0xa($s0) -/* A8104 80111A04 8FA20040 */ lw $v0, 0x40($sp) -/* A8108 80111A08 AE000024 */ sw $zero, 0x24($s0) -/* A810C 80111A0C AE000020 */ sw $zero, 0x20($s0) -/* A8110 80111A10 AE020038 */ sw $v0, 0x38($s0) -/* A8114 80111A14 8C430010 */ lw $v1, 0x10($v0) -/* A8118 80111A18 3C013F80 */ lui $at, 0x3f80 -/* A811C 80111A1C 44810000 */ mtc1 $at, $f0 -/* A8120 80111A20 0003102B */ sltu $v0, $zero, $v1 -/* A8124 80111A24 A2020009 */ sb $v0, 9($s0) -/* A8128 80111A28 8FA40040 */ lw $a0, 0x40($sp) -/* A812C 80111A2C AE030018 */ sw $v1, 0x18($s0) -/* A8130 80111A30 8C820010 */ lw $v0, 0x10($a0) -/* A8134 80111A34 AE00001C */ sw $zero, 0x1c($s0) -/* A8138 80111A38 AE02002C */ sw $v0, 0x2c($s0) -/* A813C 80111A3C 94840000 */ lhu $a0, ($a0) -/* A8140 80111A40 3C028000 */ lui $v0, 0x8000 -/* A8144 80111A44 A2000006 */ sb $zero, 6($s0) -/* A8148 80111A48 A2000007 */ sb $zero, 7($s0) -/* A814C 80111A4C AE00003C */ sw $zero, 0x3c($s0) -/* A8150 80111A50 E6160048 */ swc1 $f22, 0x48($s0) -/* A8154 80111A54 E618004C */ swc1 $f24, 0x4c($s0) -/* A8158 80111A58 E61A0050 */ swc1 $f26, 0x50($s0) -/* A815C 80111A5C AE000060 */ sw $zero, 0x60($s0) -/* A8160 80111A60 E6140064 */ swc1 $f20, 0x64($s0) -/* A8164 80111A64 AE000068 */ sw $zero, 0x68($s0) -/* A8168 80111A68 E6000054 */ swc1 $f0, 0x54($s0) -/* A816C 80111A6C E6000058 */ swc1 $f0, 0x58($s0) -/* A8170 80111A70 E600005C */ swc1 $f0, 0x5c($s0) -/* A8174 80111A74 8FA30040 */ lw $v1, 0x40($sp) -/* A8178 80111A78 00822025 */ or $a0, $a0, $v0 -/* A817C 80111A7C AE040000 */ sw $a0, ($s0) -/* A8180 80111A80 90620021 */ lbu $v0, 0x21($v1) -/* A8184 80111A84 A602000C */ sh $v0, 0xc($s0) -/* A8188 80111A88 90620022 */ lbu $v0, 0x22($v1) -/* A818C 80111A8C A602000E */ sh $v0, 0xe($s0) -/* A8190 80111A90 90630023 */ lbu $v1, 0x23($v1) -/* A8194 80111A94 24020001 */ addiu $v0, $zero, 1 -/* A8198 80111A98 A2020005 */ sb $v0, 5($s0) -/* A819C 80111A9C 240200FF */ addiu $v0, $zero, 0xff -/* A81A0 80111AA0 A2020008 */ sb $v0, 8($s0) -/* A81A4 80111AA4 A202000B */ sb $v0, 0xb($s0) -/* A81A8 80111AA8 8FA50040 */ lw $a1, 0x40($sp) -/* A81AC 80111AAC 2402FFFF */ addiu $v0, $zero, -1 -/* A81B0 80111AB0 A6020014 */ sh $v0, 0x14($s0) -/* A81B4 80111AB4 A6020016 */ sh $v0, 0x16($s0) -/* A81B8 80111AB8 AE000044 */ sw $zero, 0x44($s0) -/* A81BC 80111ABC A6030010 */ sh $v1, 0x10($s0) -/* A81C0 80111AC0 94A20000 */ lhu $v0, ($a1) -/* A81C4 80111AC4 30420008 */ andi $v0, $v0, 8 -/* A81C8 80111AC8 14400012 */ bnez $v0, .L80111B14 -/* A81CC 80111ACC 0200202D */ daddu $a0, $s0, $zero -/* A81D0 80111AD0 8CA20018 */ lw $v0, 0x18($a1) -/* A81D4 80111AD4 10400003 */ beqz $v0, .L80111AE4 -/* A81D8 80111AD8 00000000 */ nop -/* A81DC 80111ADC 0C0444A9 */ jal load_simple_entity_data -/* A81E0 80111AE0 0220302D */ daddu $a2, $s1, $zero -.L80111AE4: -/* A81E4 80111AE4 8FA20040 */ lw $v0, 0x40($sp) -/* A81E8 80111AE8 8C440004 */ lw $a0, 4($v0) -/* A81EC 80111AEC 1080000C */ beqz $a0, .L80111B20 -/* A81F0 80111AF0 00000000 */ nop -/* A81F4 80111AF4 0C048338 */ jal load_entity_model -/* A81F8 80111AF8 00000000 */ nop -/* A81FC 80111AFC A6020014 */ sh $v0, 0x14($s0) -/* A8200 80111B00 00021400 */ sll $v0, $v0, 0x10 -/* A8204 80111B04 0C0483C1 */ jal exec_entity_model_commandlist -/* A8208 80111B08 00022403 */ sra $a0, $v0, 0x10 -/* A820C 80111B0C 080446C7 */ j .L80111B1C -/* A8210 80111B10 00000000 */ nop -.L80111B14: -/* A8214 80111B14 0C044502 */ jal load_split_entity_data -/* A8218 80111B18 0220302D */ daddu $a2, $s1, $zero -.L80111B1C: -/* A821C 80111B1C 8FA20040 */ lw $v0, 0x40($sp) -.L80111B20: -/* A8220 80111B20 90430020 */ lbu $v1, 0x20($v0) -/* A8224 80111B24 24020001 */ addiu $v0, $zero, 1 -/* A8228 80111B28 1062000A */ beq $v1, $v0, .L80111B54 -/* A822C 80111B2C 00000000 */ nop -/* A8230 80111B30 8E020000 */ lw $v0, ($s0) -/* A8234 80111B34 30420300 */ andi $v0, $v0, 0x300 -/* A8238 80111B38 10400006 */ beqz $v0, .L80111B54 -/* A823C 80111B3C 00000000 */ nop -/* A8240 80111B40 4405B000 */ mfc1 $a1, $f22 -/* A8244 80111B44 4406C000 */ mfc1 $a2, $f24 -/* A8248 80111B48 4407D000 */ mfc1 $a3, $f26 -/* A824C 80111B4C 0C044873 */ jal create_entity_shadow -/* A8250 80111B50 0200202D */ daddu $a0, $s0, $zero -.L80111B54: -/* A8254 80111B54 8FA20040 */ lw $v0, 0x40($sp) -/* A8258 80111B58 90420020 */ lbu $v0, 0x20($v0) -/* A825C 80111B5C 2443FFF9 */ addiu $v1, $v0, -7 -/* A8260 80111B60 2C62002B */ sltiu $v0, $v1, 0x2b -/* A8264 80111B64 10400009 */ beqz $v0, .L80111B8C_A828C -/* A8268 80111B68 00031080 */ sll $v0, $v1, 2 -/* A826C 80111B6C 3C018015 */ lui $at, %hi(jtbl_8014F878) -/* A8270 80111B70 00220821 */ addu $at, $at, $v0 -/* A8274 80111B74 8C22F878 */ lw $v0, %lo(jtbl_8014F878)($at) -/* A8278 80111B78 00400008 */ jr $v0 -/* A827C 80111B7C 00000000 */ nop -.L80111B80_A8280: -/* A8280 80111B80 8E020000 */ lw $v0, ($s0) -/* A8284 80111B84 34424000 */ ori $v0, $v0, 0x4000 -/* A8288 80111B88 AE020000 */ sw $v0, ($s0) -.L80111B8C_A828C: -/* A828C 80111B8C 8FA20040 */ lw $v0, 0x40($sp) -/* A8290 80111B90 8C42000C */ lw $v0, 0xc($v0) -/* A8294 80111B94 10400003 */ beqz $v0, .L80111BA4 -/* A8298 80111B98 00000000 */ nop -/* A829C 80111B9C 0040F809 */ jalr $v0 -/* A82A0 80111BA0 0200202D */ daddu $a0, $s0, $zero -.L80111BA4: -/* A82A4 80111BA4 0C04408B */ jal update_entity_transform_matrix -/* A82A8 80111BA8 0200202D */ daddu $a0, $s0, $zero -/* A82AC 80111BAC 92020004 */ lbu $v0, 4($s0) -.L80111BB0: -/* A82B0 80111BB0 8FBF001C */ lw $ra, 0x1c($sp) -/* A82B4 80111BB4 8FB20018 */ lw $s2, 0x18($sp) -/* A82B8 80111BB8 8FB10014 */ lw $s1, 0x14($sp) -/* A82BC 80111BBC 8FB00010 */ lw $s0, 0x10($sp) -/* A82C0 80111BC0 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* A82C4 80111BC4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* A82C8 80111BC8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A82CC 80111BCC D7B40020 */ ldc1 $f20, 0x20($sp) -/* A82D0 80111BD0 03E00008 */ jr $ra -/* A82D4 80111BD4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_anim_make_vertex_pointers.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_anim_make_vertex_pointers.s deleted file mode 100644 index 46acdee24f..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_anim_make_vertex_pointers.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_anim_make_vertex_pointers -/* A77B4 801110B4 2407FFFF */ addiu $a3, $zero, -1 -/* A77B8 801110B8 3C08000F */ lui $t0, 0xf -/* A77BC 801110BC 8C820008 */ lw $v0, 8($a0) -/* A77C0 801110C0 3508FFFF */ ori $t0, $t0, 0xffff -/* A77C4 801110C4 00A22021 */ addu $a0, $a1, $v0 -.L801110C8: -/* A77C8 801110C8 8C820000 */ lw $v0, ($a0) -/* A77CC 801110CC 14470003 */ bne $v0, $a3, .L801110DC -/* A77D0 801110D0 3042FFFF */ andi $v0, $v0, 0xffff -/* A77D4 801110D4 03E00008 */ jr $ra -/* A77D8 801110D8 AC800000 */ sw $zero, ($a0) -.L801110DC: -/* A77DC 801110DC 00A21821 */ addu $v1, $a1, $v0 -/* A77E0 801110E0 AC830000 */ sw $v1, ($a0) -/* A77E4 801110E4 8C620000 */ lw $v0, ($v1) -/* A77E8 801110E8 10470005 */ beq $v0, $a3, .L80111100 -/* A77EC 801110EC 24840004 */ addiu $a0, $a0, 4 -/* A77F0 801110F0 3042FFFF */ andi $v0, $v0, 0xffff -/* A77F4 801110F4 00C21021 */ addu $v0, $a2, $v0 -/* A77F8 801110F8 08044441 */ j .L80111104 -/* A77FC 801110FC AC620000 */ sw $v0, ($v1) -.L80111100: -/* A7800 80111100 AC600000 */ sw $zero, ($v1) -.L80111104: -/* A7804 80111104 8C620018 */ lw $v0, 0x18($v1) -/* A7808 80111108 10470004 */ beq $v0, $a3, .L8011111C -/* A780C 8011110C 3042FFFF */ andi $v0, $v0, 0xffff -/* A7810 80111110 00A21021 */ addu $v0, $a1, $v0 -/* A7814 80111114 08044448 */ j .L80111120 -/* A7818 80111118 AC620018 */ sw $v0, 0x18($v1) -.L8011111C: -/* A781C 8011111C AC600018 */ sw $zero, 0x18($v1) -.L80111120: -/* A7820 80111120 8C62001C */ lw $v0, 0x1c($v1) -/* A7824 80111124 10470004 */ beq $v0, $a3, .L80111138 -/* A7828 80111128 3042FFFF */ andi $v0, $v0, 0xffff -/* A782C 8011112C 00A21021 */ addu $v0, $a1, $v0 -/* A7830 80111130 0804444F */ j .L8011113C -/* A7834 80111134 AC62001C */ sw $v0, 0x1c($v1) -.L80111138: -/* A7838 80111138 AC60001C */ sw $zero, 0x1c($v1) -.L8011113C: -/* A783C 8011113C 8C620024 */ lw $v0, 0x24($v1) -/* A7840 80111140 10470004 */ beq $v0, $a3, .L80111154 -/* A7844 80111144 00481024 */ and $v0, $v0, $t0 -/* A7848 80111148 00C21021 */ addu $v0, $a2, $v0 -/* A784C 8011114C 08044432 */ j .L801110C8 -/* A7850 80111150 AC620024 */ sw $v0, 0x24($v1) -.L80111154: -/* A7854 80111154 08044432 */ j .L801110C8 -/* A7858 80111158 AC600024 */ sw $zero, 0x24($v1) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s deleted file mode 100644 index 4aef3d1541..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_free_static_data.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_free_static_data -/* A7EDC 801117DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A7EE0 801117E0 0080382D */ daddu $a3, $a0, $zero -/* A7EE4 801117E4 0000182D */ daddu $v1, $zero, $zero -/* A7EE8 801117E8 3C068015 */ lui $a2, %hi(wEntityBlueprint) -/* A7EEC 801117EC 24C61668 */ addiu $a2, $a2, %lo(wEntityBlueprint) -/* A7EF0 801117F0 00C0282D */ daddu $a1, $a2, $zero -/* A7EF4 801117F4 AFBF0018 */ sw $ra, 0x18($sp) -/* A7EF8 801117F8 AFB10014 */ sw $s1, 0x14($sp) -/* A7EFC 801117FC AFB00010 */ sw $s0, 0x10($sp) -.L80111800: -/* A7F00 80111800 8CA40000 */ lw $a0, ($a1) -/* A7F04 80111804 10800006 */ beqz $a0, .L80111820 -/* A7F08 80111808 2862001E */ slti $v0, $v1, 0x1e -/* A7F0C 8011180C 24630001 */ addiu $v1, $v1, 1 -/* A7F10 80111810 2862001E */ slti $v0, $v1, 0x1e -/* A7F14 80111814 1440FFFA */ bnez $v0, .L80111800 -/* A7F18 80111818 24A50004 */ addiu $a1, $a1, 4 -/* A7F1C 8011181C 2862001E */ slti $v0, $v1, 0x1e -.L80111820: -/* A7F20 80111820 10400023 */ beqz $v0, .L801118B0 -/* A7F24 80111824 2462FFFF */ addiu $v0, $v1, -1 -/* A7F28 80111828 00021080 */ sll $v0, $v0, 2 -/* A7F2C 8011182C 00468821 */ addu $s1, $v0, $a2 -/* A7F30 80111830 8E240000 */ lw $a0, ($s1) -/* A7F34 80111834 1487001E */ bne $a0, $a3, .L801118B0 -/* A7F38 80111838 00000000 */ nop -/* A7F3C 8011183C 94820000 */ lhu $v0, ($a0) -/* A7F40 80111840 30420008 */ andi $v0, $v0, 8 -/* A7F44 80111844 1040000C */ beqz $v0, .L80111878 -/* A7F48 80111848 00000000 */ nop -/* A7F4C 8011184C 8C830018 */ lw $v1, 0x18($a0) -/* A7F50 80111850 8C650004 */ lw $a1, 4($v1) -/* A7F54 80111854 8C620000 */ lw $v0, ($v1) -/* A7F58 80111858 00A22823 */ subu $a1, $a1, $v0 -/* A7F5C 8011185C 8C62000C */ lw $v0, 0xc($v1) -/* A7F60 80111860 8C630008 */ lw $v1, 8($v1) -/* A7F64 80111864 00058083 */ sra $s0, $a1, 2 -/* A7F68 80111868 00431023 */ subu $v0, $v0, $v1 -/* A7F6C 8011186C 00021083 */ sra $v0, $v0, 2 -/* A7F70 80111870 08044622 */ j .L80111888 -/* A7F74 80111874 02028021 */ addu $s0, $s0, $v0 -.L80111878: -/* A7F78 80111878 8C82001C */ lw $v0, 0x1c($a0) -/* A7F7C 8011187C 8C830018 */ lw $v1, 0x18($a0) -/* A7F80 80111880 00431023 */ subu $v0, $v0, $v1 -/* A7F84 80111884 00028083 */ sra $s0, $v0, 2 -.L80111888: -/* A7F88 80111888 0C0445E4 */ jal func_80111790 -/* A7F8C 8011188C 00000000 */ nop -/* A7F90 80111890 14400007 */ bnez $v0, .L801118B0 -/* A7F94 80111894 00000000 */ nop -/* A7F98 80111898 3C038015 */ lui $v1, %hi(wEntityBlueprintSize) -/* A7F9C 8011189C 2463165C */ addiu $v1, $v1, %lo(wEntityBlueprintSize) -/* A7FA0 801118A0 8C620000 */ lw $v0, ($v1) -/* A7FA4 801118A4 AE200000 */ sw $zero, ($s1) -/* A7FA8 801118A8 00501023 */ subu $v0, $v0, $s0 -/* A7FAC 801118AC AC620000 */ sw $v0, ($v1) -.L801118B0: -/* A7FB0 801118B0 8FBF0018 */ lw $ra, 0x18($sp) -/* A7FB4 801118B4 8FB10014 */ lw $s1, 0x14($sp) -/* A7FB8 801118B8 8FB00010 */ lw $s0, 0x10($sp) -/* A7FBC 801118BC 03E00008 */ jr $ra -/* A7FC0 801118C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s deleted file mode 100644 index 63e1d7cd94..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/execute_render_tasks.s +++ /dev/null @@ -1,337 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel execute_render_tasks -/* B40B8 8011D9B8 27BDFB88 */ addiu $sp, $sp, -0x478 -/* B40BC 8011D9BC 3C048015 */ lui $a0, %hi(mdl_renderTaskCount) -/* B40C0 8011D9C0 248433B0 */ addiu $a0, $a0, %lo(mdl_renderTaskCount) -/* B40C4 8011D9C4 AFBF0470 */ sw $ra, 0x470($sp) -/* B40C8 8011D9C8 AFB7046C */ sw $s7, 0x46c($sp) -/* B40CC 8011D9CC AFB60468 */ sw $s6, 0x468($sp) -/* B40D0 8011D9D0 AFB50464 */ sw $s5, 0x464($sp) -/* B40D4 8011D9D4 AFB40460 */ sw $s4, 0x460($sp) -/* B40D8 8011D9D8 AFB3045C */ sw $s3, 0x45c($sp) -/* B40DC 8011D9DC AFB20458 */ sw $s2, 0x458($sp) -/* B40E0 8011D9E0 AFB10454 */ sw $s1, 0x454($sp) -/* B40E4 8011D9E4 AFB00450 */ sw $s0, 0x450($sp) -/* B40E8 8011D9E8 8C820000 */ lw $v0, ($a0) -/* B40EC 8011D9EC 10400118 */ beqz $v0, .L8011DE50 -/* B40F0 8011D9F0 0000982D */ daddu $s3, $zero, $zero -/* B40F4 8011D9F4 18400009 */ blez $v0, .L8011DA1C -/* B40F8 8011D9F8 0260A82D */ daddu $s5, $s3, $zero -/* B40FC 8011D9FC 27A30010 */ addiu $v1, $sp, 0x10 -.L8011DA00: -/* B4100 8011DA00 AC730000 */ sw $s3, ($v1) -/* B4104 8011DA04 24630004 */ addiu $v1, $v1, 4 -/* B4108 8011DA08 8C820000 */ lw $v0, ($a0) -/* B410C 8011DA0C 26730001 */ addiu $s3, $s3, 1 -/* B4110 8011DA10 0262102A */ slt $v0, $s3, $v0 -/* B4114 8011DA14 1440FFFA */ bnez $v0, .L8011DA00 -/* B4118 8011DA18 26B50001 */ addiu $s5, $s5, 1 -.L8011DA1C: -/* B411C 8011DA1C 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) -/* B4120 8011DA20 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) -/* B4124 8011DA24 00021080 */ sll $v0, $v0, 2 -/* B4128 8011DA28 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) -/* B412C 8011DA2C 0282A021 */ addu $s4, $s4, $v0 -/* B4130 8011DA30 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) -/* B4134 8011DA34 26A2FFFF */ addiu $v0, $s5, -1 -/* B4138 8011DA38 1840001F */ blez $v0, .L8011DAB8 -/* B413C 8011DA3C 0000982D */ daddu $s3, $zero, $zero -/* B4140 8011DA40 0040602D */ daddu $t4, $v0, $zero -/* B4144 8011DA44 27AB0010 */ addiu $t3, $sp, 0x10 -/* B4148 8011DA48 0160502D */ daddu $t2, $t3, $zero -.L8011DA4C: -/* B414C 8011DA4C 26650001 */ addiu $a1, $s3, 1 -/* B4150 8011DA50 00B5102A */ slt $v0, $a1, $s5 -/* B4154 8011DA54 50400015 */ beql $v0, $zero, .L8011DAAC -/* B4158 8011DA58 26730001 */ addiu $s3, $s3, 1 -/* B415C 8011DA5C 0140482D */ daddu $t1, $t2, $zero -/* B4160 8011DA60 00051080 */ sll $v0, $a1, 2 -/* B4164 8011DA64 004B3821 */ addu $a3, $v0, $t3 -.L8011DA68: -/* B4168 8011DA68 8D280000 */ lw $t0, ($t1) -/* B416C 8011DA6C 8CE60000 */ lw $a2, ($a3) -/* B4170 8011DA70 00081100 */ sll $v0, $t0, 4 -/* B4174 8011DA74 02828021 */ addu $s0, $s4, $v0 -/* B4178 8011DA78 00061100 */ sll $v0, $a2, 4 -/* B417C 8011DA7C 02822021 */ addu $a0, $s4, $v0 -/* B4180 8011DA80 8E030004 */ lw $v1, 4($s0) -/* B4184 8011DA84 8C820004 */ lw $v0, 4($a0) -/* B4188 8011DA88 0043102A */ slt $v0, $v0, $v1 -/* B418C 8011DA8C 10400003 */ beqz $v0, .L8011DA9C -/* B4190 8011DA90 24A50001 */ addiu $a1, $a1, 1 -/* B4194 8011DA94 AD260000 */ sw $a2, ($t1) -/* B4198 8011DA98 ACE80000 */ sw $t0, ($a3) -.L8011DA9C: -/* B419C 8011DA9C 00B5102A */ slt $v0, $a1, $s5 -/* B41A0 8011DAA0 1440FFF1 */ bnez $v0, .L8011DA68 -/* B41A4 8011DAA4 24E70004 */ addiu $a3, $a3, 4 -/* B41A8 8011DAA8 26730001 */ addiu $s3, $s3, 1 -.L8011DAAC: -/* B41AC 8011DAAC 026C102A */ slt $v0, $s3, $t4 -/* B41B0 8011DAB0 1440FFE6 */ bnez $v0, .L8011DA4C -/* B41B4 8011DAB4 254A0004 */ addiu $t2, $t2, 4 -.L8011DAB8: -/* B41B8 8011DAB8 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) -/* B41BC 8011DABC 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) -/* B41C0 8011DAC0 00021080 */ sll $v0, $v0, 2 -/* B41C4 8011DAC4 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) -/* B41C8 8011DAC8 0282A021 */ addu $s4, $s4, $v0 -/* B41CC 8011DACC 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) -/* B41D0 8011DAD0 26A2FFFF */ addiu $v0, $s5, -1 -/* B41D4 8011DAD4 18400027 */ blez $v0, .L8011DB74 -/* B41D8 8011DAD8 0000982D */ daddu $s3, $zero, $zero -/* B41DC 8011DADC 3C0D002D */ lui $t5, 0x2d -/* B41E0 8011DAE0 35ADC6BF */ ori $t5, $t5, 0xc6bf -/* B41E4 8011DAE4 0040602D */ daddu $t4, $v0, $zero -/* B41E8 8011DAE8 27AB0010 */ addiu $t3, $sp, 0x10 -/* B41EC 8011DAEC 0160502D */ daddu $t2, $t3, $zero -.L8011DAF0: -/* B41F0 8011DAF0 8D420000 */ lw $v0, ($t2) -/* B41F4 8011DAF4 00021100 */ sll $v0, $v0, 4 -/* B41F8 8011DAF8 02828021 */ addu $s0, $s4, $v0 -/* B41FC 8011DAFC 8E020004 */ lw $v0, 4($s0) -/* B4200 8011DB00 01A2102A */ slt $v0, $t5, $v0 -/* B4204 8011DB04 50400018 */ beql $v0, $zero, .L8011DB68 -/* B4208 8011DB08 26730001 */ addiu $s3, $s3, 1 -/* B420C 8011DB0C 26650001 */ addiu $a1, $s3, 1 -/* B4210 8011DB10 00B5102A */ slt $v0, $a1, $s5 -/* B4214 8011DB14 10400013 */ beqz $v0, .L8011DB64 -/* B4218 8011DB18 00051080 */ sll $v0, $a1, 2 -/* B421C 8011DB1C 0140482D */ daddu $t1, $t2, $zero -/* B4220 8011DB20 004B3821 */ addu $a3, $v0, $t3 -.L8011DB24: -/* B4224 8011DB24 8D280000 */ lw $t0, ($t1) -/* B4228 8011DB28 8CE60000 */ lw $a2, ($a3) -/* B422C 8011DB2C 00081100 */ sll $v0, $t0, 4 -/* B4230 8011DB30 02828021 */ addu $s0, $s4, $v0 -/* B4234 8011DB34 00061100 */ sll $v0, $a2, 4 -/* B4238 8011DB38 02822021 */ addu $a0, $s4, $v0 -/* B423C 8011DB3C 8E020004 */ lw $v0, 4($s0) -/* B4240 8011DB40 8C830004 */ lw $v1, 4($a0) -/* B4244 8011DB44 0043102A */ slt $v0, $v0, $v1 -/* B4248 8011DB48 10400003 */ beqz $v0, .L8011DB58 -/* B424C 8011DB4C 24A50001 */ addiu $a1, $a1, 1 -/* B4250 8011DB50 AD260000 */ sw $a2, ($t1) -/* B4254 8011DB54 ACE80000 */ sw $t0, ($a3) -.L8011DB58: -/* B4258 8011DB58 00B5102A */ slt $v0, $a1, $s5 -/* B425C 8011DB5C 1440FFF1 */ bnez $v0, .L8011DB24 -/* B4260 8011DB60 24E70004 */ addiu $a3, $a3, 4 -.L8011DB64: -/* B4264 8011DB64 26730001 */ addiu $s3, $s3, 1 -.L8011DB68: -/* B4268 8011DB68 026C102A */ slt $v0, $s3, $t4 -/* B426C 8011DB6C 1440FFE0 */ bnez $v0, .L8011DAF0 -/* B4270 8011DB70 254A0004 */ addiu $t2, $t2, 4 -.L8011DB74: -/* B4274 8011DB74 3C028015 */ lui $v0, %hi(mdl_renderTaskMode) -/* B4278 8011DB78 8C4233AC */ lw $v0, %lo(mdl_renderTaskMode)($v0) -/* B427C 8011DB7C 00021080 */ sll $v0, $v0, 2 -/* B4280 8011DB80 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) -/* B4284 8011DB84 0282A021 */ addu $s4, $s4, $v0 -/* B4288 8011DB88 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) -/* B428C 8011DB8C 26A2FFFF */ addiu $v0, $s5, -1 -/* B4290 8011DB90 1840002A */ blez $v0, .L8011DC3C -/* B4294 8011DB94 0000982D */ daddu $s3, $zero, $zero -/* B4298 8011DB98 3C0B000C */ lui $t3, 0xc -/* B429C 8011DB9C 356B3500 */ ori $t3, $t3, 0x3500 -/* B42A0 8011DBA0 0040682D */ daddu $t5, $v0, $zero -/* B42A4 8011DBA4 27AC0010 */ addiu $t4, $sp, 0x10 -/* B42A8 8011DBA8 0180502D */ daddu $t2, $t4, $zero -.L8011DBAC: -/* B42AC 8011DBAC 8D420000 */ lw $v0, ($t2) -/* B42B0 8011DBB0 00021100 */ sll $v0, $v0, 4 -/* B42B4 8011DBB4 02828021 */ addu $s0, $s4, $v0 -/* B42B8 8011DBB8 8E020004 */ lw $v0, 4($s0) -/* B42BC 8011DBBC 0162102A */ slt $v0, $t3, $v0 -/* B42C0 8011DBC0 1440001E */ bnez $v0, .L8011DC3C -/* B42C4 8011DBC4 00000000 */ nop -/* B42C8 8011DBC8 26650001 */ addiu $a1, $s3, 1 -/* B42CC 8011DBCC 00B5102A */ slt $v0, $a1, $s5 -/* B42D0 8011DBD0 10400016 */ beqz $v0, .L8011DC2C -/* B42D4 8011DBD4 00051080 */ sll $v0, $a1, 2 -/* B42D8 8011DBD8 0140482D */ daddu $t1, $t2, $zero -/* B42DC 8011DBDC 004C3821 */ addu $a3, $v0, $t4 -.L8011DBE0: -/* B42E0 8011DBE0 8CE80000 */ lw $t0, ($a3) -/* B42E4 8011DBE4 8D260000 */ lw $a2, ($t1) -/* B42E8 8011DBE8 00081100 */ sll $v0, $t0, 4 -/* B42EC 8011DBEC 02822021 */ addu $a0, $s4, $v0 -/* B42F0 8011DBF0 00061100 */ sll $v0, $a2, 4 -/* B42F4 8011DBF4 8C830004 */ lw $v1, 4($a0) -/* B42F8 8011DBF8 02828021 */ addu $s0, $s4, $v0 -/* B42FC 8011DBFC 0163102A */ slt $v0, $t3, $v1 -/* B4300 8011DC00 5440000B */ bnel $v0, $zero, .L8011DC30 -/* B4304 8011DC04 26730001 */ addiu $s3, $s3, 1 -/* B4308 8011DC08 8E020004 */ lw $v0, 4($s0) -/* B430C 8011DC0C 0043102A */ slt $v0, $v0, $v1 -/* B4310 8011DC10 10400003 */ beqz $v0, .L8011DC20 -/* B4314 8011DC14 24A50001 */ addiu $a1, $a1, 1 -/* B4318 8011DC18 AD280000 */ sw $t0, ($t1) -/* B431C 8011DC1C ACE60000 */ sw $a2, ($a3) -.L8011DC20: -/* B4320 8011DC20 00B5102A */ slt $v0, $a1, $s5 -/* B4324 8011DC24 1440FFEE */ bnez $v0, .L8011DBE0 -/* B4328 8011DC28 24E70004 */ addiu $a3, $a3, 4 -.L8011DC2C: -/* B432C 8011DC2C 26730001 */ addiu $s3, $s3, 1 -.L8011DC30: -/* B4330 8011DC30 026D102A */ slt $v0, $s3, $t5 -/* B4334 8011DC34 1440FFDD */ bnez $v0, .L8011DBAC -/* B4338 8011DC38 254A0004 */ addiu $t2, $t2, 4 -.L8011DC3C: -/* B433C 8011DC3C 3C038015 */ lui $v1, %hi(mdl_renderTaskMode) -/* B4340 8011DC40 8C6333AC */ lw $v1, %lo(mdl_renderTaskMode)($v1) -/* B4344 8011DC44 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* B4348 8011DC48 8C42A650 */ lw $v0, %lo(gOverrideFlags)($v0) -/* B434C 8011DC4C 3C018015 */ lui $at, %hi(D_8014B7F0) -/* B4350 8011DC50 AC35B7F0 */ sw $s5, %lo(D_8014B7F0)($at) -/* B4354 8011DC54 00031880 */ sll $v1, $v1, 2 -/* B4358 8011DC58 30420080 */ andi $v0, $v0, 0x80 -/* B435C 8011DC5C 3C148015 */ lui $s4, %hi(mdl_renderTaskLists) -/* B4360 8011DC60 0283A021 */ addu $s4, $s4, $v1 -/* B4364 8011DC64 8E9433A0 */ lw $s4, %lo(mdl_renderTaskLists)($s4) -/* B4368 8011DC68 10400061 */ beqz $v0, .L8011DDF0 -/* B436C 8011DC6C 0000B02D */ daddu $s6, $zero, $zero -/* B4370 8011DC70 27B00410 */ addiu $s0, $sp, 0x410 -/* B4374 8011DC74 0200202D */ daddu $a0, $s0, $zero -/* B4378 8011DC78 3C120001 */ lui $s2, 1 -/* B437C 8011DC7C 3C013F80 */ lui $at, 0x3f80 -/* B4380 8011DC80 44810000 */ mtc1 $at, $f0 -/* B4384 8011DC84 36521630 */ ori $s2, $s2, 0x1630 -/* B4388 8011DC88 44050000 */ mfc1 $a1, $f0 -/* B438C 8011DC8C 3C06BF80 */ lui $a2, 0xbf80 -/* B4390 8011DC90 0C019DF0 */ jal guScaleF -/* B4394 8011DC94 00A0382D */ daddu $a3, $a1, $zero -/* B4398 8011DC98 0200202D */ daddu $a0, $s0, $zero -/* B439C 8011DC9C 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* B43A0 8011DCA0 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* B43A4 8011DCA4 3C11800A */ lui $s1, %hi(gDisplayContext) -/* B43A8 8011DCA8 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* B43AC 8011DCAC 96050000 */ lhu $a1, ($s0) -/* B43B0 8011DCB0 8E220000 */ lw $v0, ($s1) -/* B43B4 8011DCB4 00052980 */ sll $a1, $a1, 6 -/* B43B8 8011DCB8 00B22821 */ addu $a1, $a1, $s2 -/* B43BC 8011DCBC 0C019D40 */ jal guMtxF2L -/* B43C0 8011DCC0 00452821 */ addu $a1, $v0, $a1 -/* B43C4 8011DCC4 96020000 */ lhu $v0, ($s0) -/* B43C8 8011DCC8 02C0982D */ daddu $s3, $s6, $zero -/* B43CC 8011DCCC 24430001 */ addiu $v1, $v0, 1 -/* B43D0 8011DCD0 3042FFFF */ andi $v0, $v0, 0xffff -/* B43D4 8011DCD4 00021180 */ sll $v0, $v0, 6 -/* B43D8 8011DCD8 A6030000 */ sh $v1, ($s0) -/* B43DC 8011DCDC 8E230000 */ lw $v1, ($s1) -/* B43E0 8011DCE0 00521021 */ addu $v0, $v0, $s2 -/* B43E4 8011DCE4 1AA00050 */ blez $s5, .L8011DE28 -/* B43E8 8011DCE8 0062B821 */ addu $s7, $v1, $v0 -/* B43EC 8011DCEC 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* B43F0 8011DCF0 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) -/* B43F4 8011DCF4 3C12DE00 */ lui $s2, 0xde00 -/* B43F8 8011DCF8 00131080 */ sll $v0, $s3, 2 -.L8011DCFC: -/* B43FC 8011DCFC 03A21021 */ addu $v0, $sp, $v0 -/* B4400 8011DD00 8C420010 */ lw $v0, 0x10($v0) -/* B4404 8011DD04 00021100 */ sll $v0, $v0, 4 -/* B4408 8011DD08 02828021 */ addu $s0, $s4, $v0 -/* B440C 8011DD0C 8E020000 */ lw $v0, ($s0) -/* B4410 8011DD10 8E03000C */ lw $v1, 0xc($s0) -/* B4414 8011DD14 30420002 */ andi $v0, $v0, 2 -/* B4418 8011DD18 10400004 */ beqz $v0, .L8011DD2C -/* B441C 8011DD1C 00000000 */ nop -/* B4420 8011DD20 8E360000 */ lw $s6, ($s1) -/* B4424 8011DD24 26C20008 */ addiu $v0, $s6, 8 -/* B4428 8011DD28 AE220000 */ sw $v0, ($s1) -.L8011DD2C: -/* B442C 8011DD2C 0060F809 */ jalr $v1 -/* B4430 8011DD30 8E040008 */ lw $a0, 8($s0) -/* B4434 8011DD34 8E020000 */ lw $v0, ($s0) -/* B4438 8011DD38 30420002 */ andi $v0, $v0, 2 -/* B443C 8011DD3C 10400027 */ beqz $v0, .L8011DDDC -/* B4440 8011DD40 26730001 */ addiu $s3, $s3, 1 -/* B4444 8011DD44 3C05DA38 */ lui $a1, 0xda38 -/* B4448 8011DD48 34A50005 */ ori $a1, $a1, 5 -/* B444C 8011DD4C 3C06DA38 */ lui $a2, 0xda38 -/* B4450 8011DD50 8E230000 */ lw $v1, ($s1) -/* B4454 8011DD54 3C02DF00 */ lui $v0, 0xdf00 -/* B4458 8011DD58 0060202D */ daddu $a0, $v1, $zero -/* B445C 8011DD5C 24630008 */ addiu $v1, $v1, 8 -/* B4460 8011DD60 AE230000 */ sw $v1, ($s1) -/* B4464 8011DD64 AC820000 */ sw $v0, ($a0) -/* B4468 8011DD68 3C02DE01 */ lui $v0, 0xde01 -/* B446C 8011DD6C AC800004 */ sw $zero, 4($a0) -/* B4470 8011DD70 AEC20000 */ sw $v0, ($s6) -/* B4474 8011DD74 24620008 */ addiu $v0, $v1, 8 -/* B4478 8011DD78 26C40008 */ addiu $a0, $s6, 8 -/* B447C 8011DD7C AEC30004 */ sw $v1, 4($s6) -/* B4480 8011DD80 AE220000 */ sw $v0, ($s1) -/* B4484 8011DD84 24620010 */ addiu $v0, $v1, 0x10 -/* B4488 8011DD88 AC720000 */ sw $s2, ($v1) -/* B448C 8011DD8C AC640004 */ sw $a0, 4($v1) -/* B4490 8011DD90 AE220000 */ sw $v0, ($s1) -/* B4494 8011DD94 24620018 */ addiu $v0, $v1, 0x18 -/* B4498 8011DD98 AC650008 */ sw $a1, 8($v1) -/* B449C 8011DD9C AC77000C */ sw $s7, 0xc($v1) -/* B44A0 8011DDA0 AE220000 */ sw $v0, ($s1) -/* B44A4 8011DDA4 AC640014 */ sw $a0, 0x14($v1) -/* B44A8 8011DDA8 3C04800A */ lui $a0, %hi(gCurrentCamID) -/* B44AC 8011DDAC 8484A634 */ lh $a0, %lo(gCurrentCamID)($a0) -/* B44B0 8011DDB0 24620020 */ addiu $v0, $v1, 0x20 -/* B44B4 8011DDB4 AC720010 */ sw $s2, 0x10($v1) -/* B44B8 8011DDB8 AE220000 */ sw $v0, ($s1) -/* B44BC 8011DDBC 3C02800A */ lui $v0, %hi(gDisplayContext) -/* B44C0 8011DDC0 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* B44C4 8011DDC4 34C60007 */ ori $a2, $a2, 7 -/* B44C8 8011DDC8 AC660018 */ sw $a2, 0x18($v1) -/* B44CC 8011DDCC 00042180 */ sll $a0, $a0, 6 -/* B44D0 8011DDD0 24840030 */ addiu $a0, $a0, 0x30 -/* B44D4 8011DDD4 00441021 */ addu $v0, $v0, $a0 -/* B44D8 8011DDD8 AC62001C */ sw $v0, 0x1c($v1) -.L8011DDDC: -/* B44DC 8011DDDC 0275102A */ slt $v0, $s3, $s5 -/* B44E0 8011DDE0 1440FFC6 */ bnez $v0, .L8011DCFC -/* B44E4 8011DDE4 00131080 */ sll $v0, $s3, 2 -/* B44E8 8011DDE8 0804778A */ j .L8011DE28 -/* B44EC 8011DDEC 00000000 */ nop -.L8011DDF0: -/* B44F0 8011DDF0 1AA0000D */ blez $s5, .L8011DE28 -/* B44F4 8011DDF4 0000982D */ daddu $s3, $zero, $zero -/* B44F8 8011DDF8 27B10010 */ addiu $s1, $sp, 0x10 -.L8011DDFC: -/* B44FC 8011DDFC 8E220000 */ lw $v0, ($s1) -/* B4500 8011DE00 26310004 */ addiu $s1, $s1, 4 -/* B4504 8011DE04 00021100 */ sll $v0, $v0, 4 -/* B4508 8011DE08 02828021 */ addu $s0, $s4, $v0 -/* B450C 8011DE0C 8E03000C */ lw $v1, 0xc($s0) -/* B4510 8011DE10 8E040008 */ lw $a0, 8($s0) -/* B4514 8011DE14 0060F809 */ jalr $v1 -/* B4518 8011DE18 26730001 */ addiu $s3, $s3, 1 -/* B451C 8011DE1C 0275102A */ slt $v0, $s3, $s5 -/* B4520 8011DE20 1440FFF6 */ bnez $v0, .L8011DDFC -/* B4524 8011DE24 00000000 */ nop -.L8011DE28: -/* B4528 8011DE28 3C038015 */ lui $v1, %hi(mdl_renderTaskMode) -/* B452C 8011DE2C 246333AC */ addiu $v1, $v1, %lo(mdl_renderTaskMode) -/* B4530 8011DE30 8C620000 */ lw $v0, ($v1) -/* B4534 8011DE34 24420001 */ addiu $v0, $v0, 1 -/* B4538 8011DE38 AC620000 */ sw $v0, ($v1) -/* B453C 8011DE3C 28420003 */ slti $v0, $v0, 3 -/* B4540 8011DE40 50400001 */ beql $v0, $zero, .L8011DE48 -/* B4544 8011DE44 AC600000 */ sw $zero, ($v1) -.L8011DE48: -/* B4548 8011DE48 3C018015 */ lui $at, %hi(mdl_renderTaskCount) -/* B454C 8011DE4C AC2033B0 */ sw $zero, %lo(mdl_renderTaskCount)($at) -.L8011DE50: -/* B4550 8011DE50 8FBF0470 */ lw $ra, 0x470($sp) -/* B4554 8011DE54 8FB7046C */ lw $s7, 0x46c($sp) -/* B4558 8011DE58 8FB60468 */ lw $s6, 0x468($sp) -/* B455C 8011DE5C 8FB50464 */ lw $s5, 0x464($sp) -/* B4560 8011DE60 8FB40460 */ lw $s4, 0x460($sp) -/* B4564 8011DE64 8FB3045C */ lw $s3, 0x45c($sp) -/* B4568 8011DE68 8FB20458 */ lw $s2, 0x458($sp) -/* B456C 8011DE6C 8FB10454 */ lw $s1, 0x454($sp) -/* B4570 8011DE70 8FB00450 */ lw $s0, 0x450($sp) -/* B4574 8011DE74 03E00008 */ jr $ra -/* B4578 8011DE78 27BD0478 */ addiu $sp, $sp, 0x478 -/* B457C 8011DE7C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s deleted file mode 100644 index 136da420b8..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s +++ /dev/null @@ -1,115 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80110F10 -/* A7610 80110F10 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A7614 80110F14 AFB3001C */ sw $s3, 0x1c($sp) -/* A7618 80110F18 0000982D */ daddu $s3, $zero, $zero -/* A761C 80110F1C AFB50024 */ sw $s5, 0x24($sp) -/* A7620 80110F20 0260A82D */ daddu $s5, $s3, $zero -/* A7624 80110F24 AFB60028 */ sw $s6, 0x28($sp) -/* A7628 80110F28 3C168015 */ lui $s6, %hi(D_80151300) -/* A762C 80110F2C 26D61300 */ addiu $s6, $s6, %lo(D_80151300) -/* A7630 80110F30 AFB7002C */ sw $s7, 0x2c($sp) -/* A7634 80110F34 3C178015 */ lui $s7, %hi(gEntityHeapBase) -/* A7638 80110F38 26F712C4 */ addiu $s7, $s7, %lo(gEntityHeapBase) -/* A763C 80110F3C AFB40020 */ sw $s4, 0x20($sp) -/* A7640 80110F40 3C148015 */ lui $s4, %hi(wEntityBlueprint) -/* A7644 80110F44 26941668 */ addiu $s4, $s4, %lo(wEntityBlueprint) -/* A7648 80110F48 AFBF0030 */ sw $ra, 0x30($sp) -/* A764C 80110F4C AFB20018 */ sw $s2, 0x18($sp) -/* A7650 80110F50 AFB10014 */ sw $s1, 0x14($sp) -/* A7654 80110F54 AFB00010 */ sw $s0, 0x10($sp) -.L80110F58: -/* A7658 80110F58 8E910000 */ lw $s1, ($s4) -/* A765C 80110F5C 1220004A */ beqz $s1, .L80111088 -/* A7660 80110F60 00000000 */ nop -/* A7664 80110F64 96220000 */ lhu $v0, ($s1) -/* A7668 80110F68 30420008 */ andi $v0, $v0, 8 -/* A766C 80110F6C 1440000F */ bnez $v0, .L80110FAC -/* A7670 80110F70 24030043 */ addiu $v1, $zero, 0x43 -/* A7674 80110F74 8E25001C */ lw $a1, 0x1c($s1) -/* A7678 80110F78 8E240018 */ lw $a0, 0x18($s1) -/* A767C 80110F7C 3C038015 */ lui $v1, %hi(gEntityHeapBase) -/* A7680 80110F80 8C6312C4 */ lw $v1, %lo(gEntityHeapBase)($v1) -/* A7684 80110F84 00A41023 */ subu $v0, $a1, $a0 -/* A7688 80110F88 00023083 */ sra $a2, $v0, 2 -/* A768C 80110F8C 00131080 */ sll $v0, $s3, 2 -/* A7690 80110F90 00621823 */ subu $v1, $v1, $v0 -/* A7694 80110F94 00063080 */ sll $a2, $a2, 2 -/* A7698 80110F98 0C00A5CF */ jal dma_copy -/* A769C 80110F9C 00663023 */ subu $a2, $v1, $a2 -/* A76A0 80110FA0 00021082 */ srl $v0, $v0, 2 -/* A76A4 80110FA4 0804441E */ j .L80111078 -/* A76A8 80110FA8 02629821 */ addu $s3, $s3, $v0 -.L80110FAC: -/* A76AC 80110FAC 92220020 */ lbu $v0, 0x20($s1) -/* A76B0 80110FB0 14430012 */ bne $v0, $v1, .L80110FFC -/* A76B4 80110FB4 8E300018 */ lw $s0, 0x18($s1) -/* A76B8 80110FB8 8ED20000 */ lw $s2, ($s6) -/* A76BC 80110FBC 8E040000 */ lw $a0, ($s0) -/* A76C0 80110FC0 8E050004 */ lw $a1, 4($s0) -/* A76C4 80110FC4 0C00A5CF */ jal dma_copy -/* A76C8 80110FC8 0240302D */ daddu $a2, $s2, $zero -/* A76CC 80110FCC 8E040008 */ lw $a0, 8($s0) -/* A76D0 80110FD0 8E05000C */ lw $a1, 0xc($s0) -/* A76D4 80110FD4 00028082 */ srl $s0, $v0, 2 -/* A76D8 80110FD8 8EC60000 */ lw $a2, ($s6) -/* A76DC 80110FDC 00108080 */ sll $s0, $s0, 2 -/* A76E0 80110FE0 0C00A5CF */ jal dma_copy -/* A76E4 80110FE4 00D03021 */ addu $a2, $a2, $s0 -/* A76E8 80110FE8 0220202D */ daddu $a0, $s1, $zero -/* A76EC 80110FEC 8EC50000 */ lw $a1, ($s6) -/* A76F0 80110FF0 0240302D */ daddu $a2, $s2, $zero -/* A76F4 80110FF4 0804441C */ j .L80111070 -/* A76F8 80110FF8 00B02821 */ addu $a1, $a1, $s0 -.L80110FFC: -/* A76FC 80110FFC 8E050004 */ lw $a1, 4($s0) -/* A7700 80111000 8E040000 */ lw $a0, ($s0) -/* A7704 80111004 8EE30000 */ lw $v1, ($s7) -/* A7708 80111008 00A41023 */ subu $v0, $a1, $a0 -/* A770C 8011100C 00023083 */ sra $a2, $v0, 2 -/* A7710 80111010 00131080 */ sll $v0, $s3, 2 -/* A7714 80111014 00621823 */ subu $v1, $v1, $v0 -/* A7718 80111018 00061080 */ sll $v0, $a2, 2 -/* A771C 8011101C 00629023 */ subu $s2, $v1, $v0 -/* A7720 80111020 0C00A5CF */ jal dma_copy -/* A7724 80111024 0240302D */ daddu $a2, $s2, $zero -/* A7728 80111028 00021082 */ srl $v0, $v0, 2 -/* A772C 8011102C 02629821 */ addu $s3, $s3, $v0 -/* A7730 80111030 8E05000C */ lw $a1, 0xc($s0) -/* A7734 80111034 8E040008 */ lw $a0, 8($s0) -/* A7738 80111038 8EE30000 */ lw $v1, ($s7) -/* A773C 8011103C 00A41023 */ subu $v0, $a1, $a0 -/* A7740 80111040 00023083 */ sra $a2, $v0, 2 -/* A7744 80111044 00131080 */ sll $v0, $s3, 2 -/* A7748 80111048 00621823 */ subu $v1, $v1, $v0 -/* A774C 8011104C 00061080 */ sll $v0, $a2, 2 -/* A7750 80111050 00628023 */ subu $s0, $v1, $v0 -/* A7754 80111054 0C00A5CF */ jal dma_copy -/* A7758 80111058 0200302D */ daddu $a2, $s0, $zero -/* A775C 8011105C 00021082 */ srl $v0, $v0, 2 -/* A7760 80111060 02629821 */ addu $s3, $s3, $v0 -/* A7764 80111064 0220202D */ daddu $a0, $s1, $zero -/* A7768 80111068 0200282D */ daddu $a1, $s0, $zero -/* A776C 8011106C 0240302D */ daddu $a2, $s2, $zero -.L80111070: -/* A7770 80111070 0C04442D */ jal entity_anim_make_vertex_pointers -/* A7774 80111074 00000000 */ nop -.L80111078: -/* A7778 80111078 26B50001 */ addiu $s5, $s5, 1 -/* A777C 8011107C 2AA2001E */ slti $v0, $s5, 0x1e -/* A7780 80111080 1440FFB5 */ bnez $v0, .L80110F58 -/* A7784 80111084 26940004 */ addiu $s4, $s4, 4 -.L80111088: -/* A7788 80111088 8FBF0030 */ lw $ra, 0x30($sp) -/* A778C 8011108C 8FB7002C */ lw $s7, 0x2c($sp) -/* A7790 80111090 8FB60028 */ lw $s6, 0x28($sp) -/* A7794 80111094 8FB50024 */ lw $s5, 0x24($sp) -/* A7798 80111098 8FB40020 */ lw $s4, 0x20($sp) -/* A779C 8011109C 8FB3001C */ lw $s3, 0x1c($sp) -/* A77A0 801110A0 8FB20018 */ lw $s2, 0x18($sp) -/* A77A4 801110A4 8FB10014 */ lw $s1, 0x14($sp) -/* A77A8 801110A8 8FB00010 */ lw $s0, 0x10($sp) -/* A77AC 801110AC 03E00008 */ jr $ra -/* A77B0 801110B0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s deleted file mode 100644 index b5bd310537..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel is_entity_data_loaded -/* A785C 8011115C ACC00000 */ sw $zero, ($a2) -/* A7860 80111160 ACE00000 */ sw $zero, ($a3) -/* A7864 80111164 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A7868 80111168 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A786C 8011116C 80420070 */ lb $v0, 0x70($v0) -/* A7870 80111170 3C098015 */ lui $t1, %hi(bEntityBlueprint) -/* A7874 80111174 252916E8 */ addiu $t1, $t1, %lo(bEntityBlueprint) -/* A7878 80111178 14400003 */ bnez $v0, .L80111188 -/* A787C 8011117C 0000582D */ daddu $t3, $zero, $zero -/* A7880 80111180 3C098015 */ lui $t1, %hi(wEntityBlueprint) -/* A7884 80111184 25291668 */ addiu $t1, $t1, %lo(wEntityBlueprint) -.L80111188: -/* A7888 80111188 0000502D */ daddu $t2, $zero, $zero -.L8011118C: -/* A788C 8011118C 8D240000 */ lw $a0, ($t1) -/* A7890 80111190 1480000A */ bnez $a0, .L801111BC -/* A7894 80111194 00000000 */ nop -/* A7898 80111198 AD250000 */ sw $a1, ($t1) -/* A789C 8011119C AD200004 */ sw $zero, 4($t1) -/* A78A0 801111A0 94A20000 */ lhu $v0, ($a1) -/* A78A4 801111A4 30420008 */ andi $v0, $v0, 8 -/* A78A8 801111A8 1040003C */ beqz $v0, .L8011129C -/* A78AC 801111AC 240B0001 */ addiu $t3, $zero, 1 -/* A78B0 801111B0 8CA30018 */ lw $v1, 0x18($a1) -/* A78B4 801111B4 08044481 */ j .L80111204 -/* A78B8 801111B8 00000000 */ nop -.L801111BC: -/* A78BC 801111BC 8C880018 */ lw $t0, 0x18($a0) -/* A78C0 801111C0 8CA30018 */ lw $v1, 0x18($a1) -/* A78C4 801111C4 15030009 */ bne $t0, $v1, .L801111EC -/* A78C8 801111C8 00000000 */ nop -/* A78CC 801111CC 94A20000 */ lhu $v0, ($a1) -/* A78D0 801111D0 30420008 */ andi $v0, $v0, 8 -/* A78D4 801111D4 10400031 */ beqz $v0, .L8011129C -/* A78D8 801111D8 00000000 */ nop -/* A78DC 801111DC 8D020004 */ lw $v0, 4($t0) -/* A78E0 801111E0 8D030000 */ lw $v1, ($t0) -/* A78E4 801111E4 08044484 */ j .L80111210 -/* A78E8 801111E8 00431023 */ subu $v0, $v0, $v1 -.L801111EC: -/* A78EC 801111EC 1485000D */ bne $a0, $a1, .L80111224 -/* A78F0 801111F0 00000000 */ nop -/* A78F4 801111F4 94820000 */ lhu $v0, ($a0) -/* A78F8 801111F8 30420008 */ andi $v0, $v0, 8 -/* A78FC 801111FC 10400027 */ beqz $v0, .L8011129C -/* A7900 80111200 00000000 */ nop -.L80111204: -/* A7904 80111204 8C620004 */ lw $v0, 4($v1) -/* A7908 80111208 8C630000 */ lw $v1, ($v1) -/* A790C 8011120C 00431023 */ subu $v0, $v0, $v1 -.L80111210: -/* A7910 80111210 8CC30000 */ lw $v1, ($a2) -/* A7914 80111214 00021083 */ sra $v0, $v0, 2 -/* A7918 80111218 00621821 */ addu $v1, $v1, $v0 -/* A791C 8011121C 080444A7 */ j .L8011129C -/* A7920 80111220 ACE30000 */ sw $v1, ($a3) -.L80111224: -/* A7924 80111224 94820000 */ lhu $v0, ($a0) -/* A7928 80111228 30420008 */ andi $v0, $v0, 8 -/* A792C 8011122C 10400011 */ beqz $v0, .L80111274 -/* A7930 80111230 00000000 */ nop -/* A7934 80111234 8D030004 */ lw $v1, 4($t0) -/* A7938 80111238 8D020000 */ lw $v0, ($t0) -/* A793C 8011123C 00621823 */ subu $v1, $v1, $v0 -/* A7940 80111240 8CC20000 */ lw $v0, ($a2) -/* A7944 80111244 00031883 */ sra $v1, $v1, 2 -/* A7948 80111248 00431021 */ addu $v0, $v0, $v1 -/* A794C 8011124C ACC20000 */ sw $v0, ($a2) -/* A7950 80111250 ACE20000 */ sw $v0, ($a3) -/* A7954 80111254 8D03000C */ lw $v1, 0xc($t0) -/* A7958 80111258 8D020008 */ lw $v0, 8($t0) -/* A795C 8011125C 00621823 */ subu $v1, $v1, $v0 -/* A7960 80111260 8CC20000 */ lw $v0, ($a2) -/* A7964 80111264 00031883 */ sra $v1, $v1, 2 -/* A7968 80111268 00431021 */ addu $v0, $v0, $v1 -/* A796C 8011126C 080444A3 */ j .L8011128C -/* A7970 80111270 ACC20000 */ sw $v0, ($a2) -.L80111274: -/* A7974 80111274 8C82001C */ lw $v0, 0x1c($a0) -/* A7978 80111278 8CC30000 */ lw $v1, ($a2) -/* A797C 8011127C 00481023 */ subu $v0, $v0, $t0 -/* A7980 80111280 00021083 */ sra $v0, $v0, 2 -/* A7984 80111284 00621821 */ addu $v1, $v1, $v0 -/* A7988 80111288 ACC30000 */ sw $v1, ($a2) -.L8011128C: -/* A798C 8011128C 254A0001 */ addiu $t2, $t2, 1 -/* A7990 80111290 2942001E */ slti $v0, $t2, 0x1e -/* A7994 80111294 1440FFBD */ bnez $v0, .L8011118C -/* A7998 80111298 25290004 */ addiu $t1, $t1, 4 -.L8011129C: -/* A799C 8011129C 03E00008 */ jr $ra -/* A79A0 801112A0 0160102D */ daddu $v0, $t3, $zero diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s deleted file mode 100644 index e8c7020913..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s +++ /dev/null @@ -1,255 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8014F858 -.word .L80111478_A7B78, .L80111480_A7B80, .L80111478_A7B78, .L80111480_A7B80, .L80111478_A7B78, .L80111480_A7B80, .L80111478_A7B78, .L80111480_A7B80 - -.section .text - -glabel load_split_entity_data -/* A7B08 80111408 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A7B0C 8011140C AFB40028 */ sw $s4, 0x28($sp) -/* A7B10 80111410 0080A02D */ daddu $s4, $a0, $zero -/* A7B14 80111414 AFB60030 */ sw $s6, 0x30($sp) -/* A7B18 80111418 00A0B02D */ daddu $s6, $a1, $zero -/* A7B1C 8011141C AFBF0034 */ sw $ra, 0x34($sp) -/* A7B20 80111420 AFB5002C */ sw $s5, 0x2c($sp) -/* A7B24 80111424 AFB30024 */ sw $s3, 0x24($sp) -/* A7B28 80111428 AFB20020 */ sw $s2, 0x20($sp) -/* A7B2C 8011142C AFB1001C */ sw $s1, 0x1c($sp) -/* A7B30 80111430 AFB00018 */ sw $s0, 0x18($sp) -/* A7B34 80111434 96C20000 */ lhu $v0, ($s6) -/* A7B38 80111438 30420008 */ andi $v0, $v0, 8 -/* A7B3C 8011143C 104000A8 */ beqz $v0, .L801116E0 -/* A7B40 80111440 0000A82D */ daddu $s5, $zero, $zero -/* A7B44 80111444 8ED30018 */ lw $s3, 0x18($s6) -/* A7B48 80111448 2402000A */ addiu $v0, $zero, 0xa -/* A7B4C 8011144C A6820012 */ sh $v0, 0x12($s4) -/* A7B50 80111450 92C20020 */ lbu $v0, 0x20($s6) -/* A7B54 80111454 2443FFBD */ addiu $v1, $v0, -0x43 -/* A7B58 80111458 2C620008 */ sltiu $v0, $v1, 8 -/* A7B5C 8011145C 1040000A */ beqz $v0, .L80111488 -/* A7B60 80111460 00031080 */ sll $v0, $v1, 2 -/* A7B64 80111464 3C018015 */ lui $at, %hi(jtbl_8014F858) -/* A7B68 80111468 00220821 */ addu $at, $at, $v0 -/* A7B6C 8011146C 8C22F858 */ lw $v0, %lo(jtbl_8014F858)($at) -/* A7B70 80111470 00400008 */ jr $v0 -/* A7B74 80111474 00000000 */ nop -.L80111478_A7B78: -/* A7B78 80111478 08044523 */ j .L8011148C -/* A7B7C 8011147C 24121000 */ addiu $s2, $zero, 0x1000 -.L80111480_A7B80: -/* A7B80 80111480 08044523 */ j .L8011148C -/* A7B84 80111484 24122BC0 */ addiu $s2, $zero, 0x2bc0 -.L80111488: -/* A7B88 80111488 0000902D */ daddu $s2, $zero, $zero -.L8011148C: -/* A7B8C 8011148C 12400020 */ beqz $s2, .L80111510 -/* A7B90 80111490 24020043 */ addiu $v0, $zero, 0x43 -/* A7B94 80111494 92C30020 */ lbu $v1, 0x20($s6) -/* A7B98 80111498 54620007 */ bnel $v1, $v0, .L801114B8 -/* A7B9C 8011149C 2652F000 */ addiu $s2, $s2, -0x1000 -/* A7BA0 801114A0 0280202D */ daddu $a0, $s4, $zero -/* A7BA4 801114A4 02C0282D */ daddu $a1, $s6, $zero -/* A7BA8 801114A8 27A60010 */ addiu $a2, $sp, 0x10 -/* A7BAC 801114AC 0C044457 */ jal is_entity_data_loaded -/* A7BB0 801114B0 27A70014 */ addiu $a3, $sp, 0x14 -/* A7BB4 801114B4 2652F000 */ addiu $s2, $s2, -0x1000 -.L801114B8: -/* A7BB8 801114B8 3C118015 */ lui $s1, %hi(D_80151300) -/* A7BBC 801114BC 26311300 */ addiu $s1, $s1, %lo(D_80151300) -/* A7BC0 801114C0 00129080 */ sll $s2, $s2, 2 -/* A7BC4 801114C4 8E640000 */ lw $a0, ($s3) -/* A7BC8 801114C8 8E260000 */ lw $a2, ($s1) -/* A7BCC 801114CC 8E650004 */ lw $a1, 4($s3) -/* A7BD0 801114D0 0C00A5CF */ jal dma_copy -/* A7BD4 801114D4 00D23021 */ addu $a2, $a2, $s2 -/* A7BD8 801114D8 00028082 */ srl $s0, $v0, 2 -/* A7BDC 801114DC 8E260000 */ lw $a2, ($s1) -/* A7BE0 801114E0 00108080 */ sll $s0, $s0, 2 -/* A7BE4 801114E4 00D23021 */ addu $a2, $a2, $s2 -/* A7BE8 801114E8 AE860044 */ sw $a2, 0x44($s4) -/* A7BEC 801114EC 8E640008 */ lw $a0, 8($s3) -/* A7BF0 801114F0 8E65000C */ lw $a1, 0xc($s3) -/* A7BF4 801114F4 0C00A5CF */ jal dma_copy -/* A7BF8 801114F8 00D03021 */ addu $a2, $a2, $s0 -/* A7BFC 801114FC 8E220000 */ lw $v0, ($s1) -/* A7C00 80111500 24150001 */ addiu $s5, $zero, 1 -/* A7C04 80111504 00521021 */ addu $v0, $v0, $s2 -/* A7C08 80111508 080445C4 */ j .L80111710 -/* A7C0C 8011150C 00508021 */ addu $s0, $v0, $s0 -.L80111510: -/* A7C10 80111510 0280202D */ daddu $a0, $s4, $zero -/* A7C14 80111514 02C0282D */ daddu $a1, $s6, $zero -/* A7C18 80111518 27A60010 */ addiu $a2, $sp, 0x10 -/* A7C1C 8011151C 0C044457 */ jal is_entity_data_loaded -/* A7C20 80111520 27A70014 */ addiu $a3, $sp, 0x14 -/* A7C24 80111524 10400055 */ beqz $v0, .L8011167C -/* A7C28 80111528 00000000 */ nop -/* A7C2C 8011152C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A7C30 80111530 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A7C34 80111534 80420070 */ lb $v0, 0x70($v0) -/* A7C38 80111538 14400005 */ bnez $v0, .L80111550 -/* A7C3C 8011153C 00000000 */ nop -/* A7C40 80111540 3C128015 */ lui $s2, %hi(wEntityBlueprintSize) -/* A7C44 80111544 8E52165C */ lw $s2, %lo(wEntityBlueprintSize)($s2) -/* A7C48 80111548 08044556 */ j .L80111558 -/* A7C4C 8011154C 00000000 */ nop -.L80111550: -/* A7C50 80111550 3C128015 */ lui $s2, %hi(bEntityBlueprintSize) -/* A7C54 80111554 8E521660 */ lw $s2, %lo(bEntityBlueprintSize)($s2) -.L80111558: -/* A7C58 80111558 8E620004 */ lw $v0, 4($s3) -/* A7C5C 8011155C 8E630000 */ lw $v1, ($s3) -/* A7C60 80111560 00431023 */ subu $v0, $v0, $v1 -/* A7C64 80111564 00021083 */ sra $v0, $v0, 2 -/* A7C68 80111568 02421021 */ addu $v0, $s2, $v0 -/* A7C6C 8011156C 2C425FFD */ sltiu $v0, $v0, 0x5ffd -/* A7C70 80111570 14400005 */ bnez $v0, .L80111588 -/* A7C74 80111574 00000000 */ nop -/* A7C78 80111578 0C0441A9 */ jal get_entity_type -/* A7C7C 8011157C 92840004 */ lbu $a0, 4($s4) -.L80111580: -/* A7C80 80111580 08044560 */ j .L80111580 -/* A7C84 80111584 00000000 */ nop -.L80111588: -/* A7C88 80111588 8E62000C */ lw $v0, 0xc($s3) -/* A7C8C 8011158C 8E630008 */ lw $v1, 8($s3) -/* A7C90 80111590 00431023 */ subu $v0, $v0, $v1 -/* A7C94 80111594 00021083 */ sra $v0, $v0, 2 -/* A7C98 80111598 02421021 */ addu $v0, $s2, $v0 -/* A7C9C 8011159C 2C425FFD */ sltiu $v0, $v0, 0x5ffd -/* A7CA0 801115A0 14400006 */ bnez $v0, .L801115BC -/* A7CA4 801115A4 00128080 */ sll $s0, $s2, 2 -/* A7CA8 801115A8 92840004 */ lbu $a0, 4($s4) -/* A7CAC 801115AC 0C0441A9 */ jal get_entity_type -/* A7CB0 801115B0 00000000 */ nop -.L801115B4: -/* A7CB4 801115B4 0804456D */ j .L801115B4 -/* A7CB8 801115B8 00000000 */ nop -.L801115BC: -/* A7CBC 801115BC 3C118015 */ lui $s1, %hi(gEntityHeapBase) -/* A7CC0 801115C0 263112C4 */ addiu $s1, $s1, %lo(gEntityHeapBase) -/* A7CC4 801115C4 8E640000 */ lw $a0, ($s3) -/* A7CC8 801115C8 8E260000 */ lw $a2, ($s1) -/* A7CCC 801115CC 8E650004 */ lw $a1, 4($s3) -/* A7CD0 801115D0 00D03023 */ subu $a2, $a2, $s0 -/* A7CD4 801115D4 00C53023 */ subu $a2, $a2, $a1 -/* A7CD8 801115D8 00063083 */ sra $a2, $a2, 2 -/* A7CDC 801115DC 00063080 */ sll $a2, $a2, 2 -/* A7CE0 801115E0 0C00A5CF */ jal dma_copy -/* A7CE4 801115E4 00863021 */ addu $a2, $a0, $a2 -/* A7CE8 801115E8 00021082 */ srl $v0, $v0, 2 -/* A7CEC 801115EC 02429021 */ addu $s2, $s2, $v0 -/* A7CF0 801115F0 8E260000 */ lw $a2, ($s1) -/* A7CF4 801115F4 00021080 */ sll $v0, $v0, 2 -/* A7CF8 801115F8 00D08023 */ subu $s0, $a2, $s0 -/* A7CFC 801115FC 02028023 */ subu $s0, $s0, $v0 -/* A7D00 80111600 AE900044 */ sw $s0, 0x44($s4) -/* A7D04 80111604 00128080 */ sll $s0, $s2, 2 -/* A7D08 80111608 00D03023 */ subu $a2, $a2, $s0 -/* A7D0C 8011160C 8E65000C */ lw $a1, 0xc($s3) -/* A7D10 80111610 8E640008 */ lw $a0, 8($s3) -/* A7D14 80111614 00C53023 */ subu $a2, $a2, $a1 -/* A7D18 80111618 00063083 */ sra $a2, $a2, 2 -/* A7D1C 8011161C 00063080 */ sll $a2, $a2, 2 -/* A7D20 80111620 0C00A5CF */ jal dma_copy -/* A7D24 80111624 00863021 */ addu $a2, $a0, $a2 -/* A7D28 80111628 00021082 */ srl $v0, $v0, 2 -/* A7D2C 8011162C 02429021 */ addu $s2, $s2, $v0 -/* A7D30 80111630 00021080 */ sll $v0, $v0, 2 -/* A7D34 80111634 8E230000 */ lw $v1, ($s1) -/* A7D38 80111638 92840004 */ lbu $a0, 4($s4) -/* A7D3C 8011163C 00701823 */ subu $v1, $v1, $s0 -/* A7D40 80111640 0C0441A9 */ jal get_entity_type -/* A7D44 80111644 00628023 */ subu $s0, $v1, $v0 -/* A7D48 80111648 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A7D4C 8011164C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A7D50 80111650 80420070 */ lb $v0, 0x70($v0) -/* A7D54 80111654 14400005 */ bnez $v0, .L8011166C -/* A7D58 80111658 24150001 */ addiu $s5, $zero, 1 -/* A7D5C 8011165C 3C018015 */ lui $at, %hi(wEntityBlueprintSize) -/* A7D60 80111660 AC32165C */ sw $s2, %lo(wEntityBlueprintSize)($at) -/* A7D64 80111664 080445C4 */ j .L80111710 -/* A7D68 80111668 00000000 */ nop -.L8011166C: -/* A7D6C 8011166C 3C018015 */ lui $at, %hi(bEntityBlueprintSize) -/* A7D70 80111670 AC321660 */ sw $s2, %lo(bEntityBlueprintSize)($at) -/* A7D74 80111674 080445C4 */ j .L80111710 -/* A7D78 80111678 00000000 */ nop -.L8011167C: -/* A7D7C 8011167C 8E620004 */ lw $v0, 4($s3) -/* A7D80 80111680 8E630000 */ lw $v1, ($s3) -/* A7D84 80111684 3C058015 */ lui $a1, %hi(gEntityHeapBase) -/* A7D88 80111688 8CA512C4 */ lw $a1, %lo(gEntityHeapBase)($a1) -/* A7D8C 8011168C 00431023 */ subu $v0, $v0, $v1 -/* A7D90 80111690 00021883 */ sra $v1, $v0, 2 -/* A7D94 80111694 8FA20010 */ lw $v0, 0x10($sp) -/* A7D98 80111698 00031880 */ sll $v1, $v1, 2 -/* A7D9C 8011169C 00021080 */ sll $v0, $v0, 2 -/* A7DA0 801116A0 00A21023 */ subu $v0, $a1, $v0 -/* A7DA4 801116A4 00431023 */ subu $v0, $v0, $v1 -/* A7DA8 801116A8 AE820044 */ sw $v0, 0x44($s4) -/* A7DAC 801116AC 8E63000C */ lw $v1, 0xc($s3) -/* A7DB0 801116B0 8E620008 */ lw $v0, 8($s3) -/* A7DB4 801116B4 92840004 */ lbu $a0, 4($s4) -/* A7DB8 801116B8 00621823 */ subu $v1, $v1, $v0 -/* A7DBC 801116BC 8FA20014 */ lw $v0, 0x14($sp) -/* A7DC0 801116C0 00031883 */ sra $v1, $v1, 2 -/* A7DC4 801116C4 00021080 */ sll $v0, $v0, 2 -/* A7DC8 801116C8 00A22823 */ subu $a1, $a1, $v0 -/* A7DCC 801116CC 00031080 */ sll $v0, $v1, 2 -/* A7DD0 801116D0 0C0441A9 */ jal get_entity_type -/* A7DD4 801116D4 00A28023 */ subu $s0, $a1, $v0 -/* A7DD8 801116D8 080445C4 */ j .L80111710 -/* A7DDC 801116DC 00000000 */ nop -.L801116E0: -/* A7DE0 801116E0 0C04792E */ jal create_model_animator -/* A7DE4 801116E4 8EC40004 */ lw $a0, 4($s6) -/* A7DE8 801116E8 A6820014 */ sh $v0, 0x14($s4) -/* A7DEC 801116EC 00021400 */ sll $v0, $v0, 0x10 -/* A7DF0 801116F0 8EC50008 */ lw $a1, 8($s6) -/* A7DF4 801116F4 0C0480EB */ jal load_model_animator_tree -/* A7DF8 801116F8 00022403 */ sra $a0, $v0, 0x10 -/* A7DFC 801116FC 86840014 */ lh $a0, 0x14($s4) -/* A7E00 80111700 0C047A2F */ jal update_model_animator -/* A7E04 80111704 00000000 */ nop -/* A7E08 80111708 080445DA */ j .L80111768 -/* A7E0C 8011170C 00000000 */ nop -.L80111710: -/* A7E10 80111710 8EC20008 */ lw $v0, 8($s6) -/* A7E14 80111714 8ED10004 */ lw $s1, 4($s6) -/* A7E18 80111718 12A00005 */ beqz $s5, .L80111730 -/* A7E1C 8011171C 02029021 */ addu $s2, $s0, $v0 -/* A7E20 80111720 02C0202D */ daddu $a0, $s6, $zero -/* A7E24 80111724 8E860044 */ lw $a2, 0x44($s4) -/* A7E28 80111728 0C04442D */ jal entity_anim_make_vertex_pointers -/* A7E2C 8011172C 0200282D */ daddu $a1, $s0, $zero -.L80111730: -/* A7E30 80111730 0220202D */ daddu $a0, $s1, $zero -/* A7E34 80111734 0C047978 */ jal create_mesh_animator -/* A7E38 80111738 0200282D */ daddu $a1, $s0, $zero -/* A7E3C 8011173C 00022400 */ sll $a0, $v0, 0x10 -/* A7E40 80111740 00042403 */ sra $a0, $a0, 0x10 -/* A7E44 80111744 0240282D */ daddu $a1, $s2, $zero -/* A7E48 80111748 0C04811D */ jal load_mesh_animator_tree -/* A7E4C 8011174C A6820014 */ sh $v0, 0x14($s4) -/* A7E50 80111750 86840014 */ lh $a0, 0x14($s4) -/* A7E54 80111754 0C047A2F */ jal update_model_animator -/* A7E58 80111758 00000000 */ nop -/* A7E5C 8011175C 8E820000 */ lw $v0, ($s4) -/* A7E60 80111760 34420008 */ ori $v0, $v0, 8 -/* A7E64 80111764 AE820000 */ sw $v0, ($s4) -.L80111768: -/* A7E68 80111768 8FBF0034 */ lw $ra, 0x34($sp) -/* A7E6C 8011176C 8FB60030 */ lw $s6, 0x30($sp) -/* A7E70 80111770 8FB5002C */ lw $s5, 0x2c($sp) -/* A7E74 80111774 8FB40028 */ lw $s4, 0x28($sp) -/* A7E78 80111778 8FB30024 */ lw $s3, 0x24($sp) -/* A7E7C 8011177C 8FB20020 */ lw $s2, 0x20($sp) -/* A7E80 80111780 8FB1001C */ lw $s1, 0x1c($sp) -/* A7E84 80111784 8FB00018 */ lw $s0, 0x18($sp) -/* A7E88 80111788 03E00008 */ jr $ra -/* A7E8C 8011178C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_commandlist.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_commandlist.s deleted file mode 100644 index 517dac9297..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_commandlist.s +++ /dev/null @@ -1,124 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8014F740 -.word .L8010FC18_A6318, .L8010FC30_A6330, .L8010FC50_A6350, .L8010FC6C_A636C, .L8010FC90_A6390, .L8010FCAC_A63AC, .L8010FCCC_A63CC, .L8010FCE8_A63E8, .L8010FD08_A6408, .L8010FD2C_A642C - -.section .text - -glabel step_entity_commandlist -/* A62D8 8010FBD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A62DC 8010FBDC AFB10014 */ sw $s1, 0x14($sp) -/* A62E0 8010FBE0 0080882D */ daddu $s1, $a0, $zero -/* A62E4 8010FBE4 AFBF0018 */ sw $ra, 0x18($sp) -/* A62E8 8010FBE8 AFB00010 */ sw $s0, 0x10($sp) -/* A62EC 8010FBEC 8E300018 */ lw $s0, 0x18($s1) -/* A62F0 8010FBF0 8E030000 */ lw $v1, ($s0) -/* A62F4 8010FBF4 2C62000A */ sltiu $v0, $v1, 0xa -/* A62F8 8010FBF8 10400052 */ beqz $v0, .L8010FD44 -/* A62FC 8010FBFC 26100004 */ addiu $s0, $s0, 4 -/* A6300 8010FC00 00031080 */ sll $v0, $v1, 2 -/* A6304 8010FC04 3C018015 */ lui $at, %hi(jtbl_8014F740) -/* A6308 8010FC08 00220821 */ addu $at, $at, $v0 -/* A630C 8010FC0C 8C22F740 */ lw $v0, %lo(jtbl_8014F740)($at) -/* A6310 8010FC10 00400008 */ jr $v0 -/* A6314 8010FC14 00000000 */ nop -.L8010FC18_A6318: -/* A6318 8010FC18 0000202D */ daddu $a0, $zero, $zero -/* A631C 8010FC1C 240200FF */ addiu $v0, $zero, 0xff -/* A6320 8010FC20 A2220009 */ sb $v0, 9($s1) -/* A6324 8010FC24 AE20001C */ sw $zero, 0x1c($s1) -/* A6328 8010FC28 08043F54 */ j .L8010FD50 -/* A632C 8010FC2C AE200018 */ sw $zero, 0x18($s1) -.L8010FC30_A6330: -/* A6330 8010FC30 8E020000 */ lw $v0, ($s0) -/* A6334 8010FC34 24040001 */ addiu $a0, $zero, 1 -/* A6338 8010FC38 AE220018 */ sw $v0, 0x18($s1) -/* A633C 8010FC3C 0040182D */ daddu $v1, $v0, $zero -/* A6340 8010FC40 0080102D */ daddu $v0, $a0, $zero -/* A6344 8010FC44 A2220009 */ sb $v0, 9($s1) -/* A6348 8010FC48 08043F54 */ j .L8010FD50 -/* A634C 8010FC4C AE23002C */ sw $v1, 0x2c($s1) -.L8010FC50_A6350: -/* A6350 8010FC50 8E020000 */ lw $v0, ($s0) -/* A6354 8010FC54 26100004 */ addiu $s0, $s0, 4 -/* A6358 8010FC58 0220202D */ daddu $a0, $s1, $zero -/* A635C 8010FC5C 0040F809 */ jalr $v0 -/* A6360 8010FC60 AC900018 */ sw $s0, 0x18($a0) -/* A6364 8010FC64 08043F54 */ j .L8010FD50 -/* A6368 8010FC68 24040001 */ addiu $a0, $zero, 1 -.L8010FC6C_A636C: -/* A636C 8010FC6C 92020003 */ lbu $v0, 3($s0) -/* A6370 8010FC70 26100004 */ addiu $s0, $s0, 4 -/* A6374 8010FC74 0000202D */ daddu $a0, $zero, $zero -/* A6378 8010FC78 A2220009 */ sb $v0, 9($s1) -/* A637C 8010FC7C 8E020000 */ lw $v0, ($s0) -/* A6380 8010FC80 26100004 */ addiu $s0, $s0, 4 -/* A6384 8010FC84 AE300018 */ sw $s0, 0x18($s1) -/* A6388 8010FC88 08043F54 */ j .L8010FD50 -/* A638C 8010FC8C AE22001C */ sw $v0, 0x1c($s1) -.L8010FC90_A6390: -/* A6390 8010FC90 8E020000 */ lw $v0, ($s0) -/* A6394 8010FC94 00021080 */ sll $v0, $v0, 2 -/* A6398 8010FC98 02221021 */ addu $v0, $s1, $v0 -/* A639C 8010FC9C 8C42002C */ lw $v0, 0x2c($v0) -/* A63A0 8010FCA0 24040001 */ addiu $a0, $zero, 1 -/* A63A4 8010FCA4 08043F54 */ j .L8010FD50 -/* A63A8 8010FCA8 AE220018 */ sw $v0, 0x18($s1) -.L8010FCAC_A63AC: -/* A63AC 8010FCAC 8E020000 */ lw $v0, ($s0) -/* A63B0 8010FCB0 26100004 */ addiu $s0, $s0, 4 -/* A63B4 8010FCB4 24040001 */ addiu $a0, $zero, 1 -/* A63B8 8010FCB8 00021080 */ sll $v0, $v0, 2 -/* A63BC 8010FCBC 02221021 */ addu $v0, $s1, $v0 -/* A63C0 8010FCC0 AC50002C */ sw $s0, 0x2c($v0) -/* A63C4 8010FCC4 08043F54 */ j .L8010FD50 -/* A63C8 8010FCC8 AE300018 */ sw $s0, 0x18($s1) -.L8010FCCC_A63CC: -/* A63CC 8010FCCC 8E220028 */ lw $v0, 0x28($s1) -/* A63D0 8010FCD0 1040001D */ beqz $v0, .L8010FD48 -/* A63D4 8010FCD4 3C030100 */ lui $v1, 0x100 -/* A63D8 8010FCD8 8E220000 */ lw $v0, ($s1) -/* A63DC 8010FCDC 00431025 */ or $v0, $v0, $v1 -/* A63E0 8010FCE0 08043F52 */ j .L8010FD48 -/* A63E4 8010FCE4 AE220000 */ sw $v0, ($s1) -.L8010FCE8_A63E8: -/* A63E8 8010FCE8 8E030000 */ lw $v1, ($s0) -/* A63EC 8010FCEC 26100004 */ addiu $s0, $s0, 4 -/* A63F0 8010FCF0 8E220000 */ lw $v0, ($s1) -/* A63F4 8010FCF4 24040001 */ addiu $a0, $zero, 1 -/* A63F8 8010FCF8 AE300018 */ sw $s0, 0x18($s1) -/* A63FC 8010FCFC 00431025 */ or $v0, $v0, $v1 -/* A6400 8010FD00 08043F54 */ j .L8010FD50 -/* A6404 8010FD04 AE220000 */ sw $v0, ($s1) -.L8010FD08_A6408: -/* A6408 8010FD08 8E030000 */ lw $v1, ($s0) -/* A640C 8010FD0C 26100004 */ addiu $s0, $s0, 4 -/* A6410 8010FD10 8E220000 */ lw $v0, ($s1) -/* A6414 8010FD14 24040001 */ addiu $a0, $zero, 1 -/* A6418 8010FD18 AE300018 */ sw $s0, 0x18($s1) -/* A641C 8010FD1C 00031827 */ nor $v1, $zero, $v1 -/* A6420 8010FD20 00431024 */ and $v0, $v0, $v1 -/* A6424 8010FD24 08043F54 */ j .L8010FD50 -/* A6428 8010FD28 AE220000 */ sw $v0, ($s1) -.L8010FD2C_A642C: -/* A642C 8010FD2C 8E040000 */ lw $a0, ($s0) -/* A6430 8010FD30 0C05272D */ jal sfx_play_sound -/* A6434 8010FD34 26100004 */ addiu $s0, $s0, 4 -/* A6438 8010FD38 24040001 */ addiu $a0, $zero, 1 -/* A643C 8010FD3C 08043F54 */ j .L8010FD50 -/* A6440 8010FD40 AE300018 */ sw $s0, 0x18($s1) -.L8010FD44: -/* A6444 8010FD44 26100004 */ addiu $s0, $s0, 4 -.L8010FD48: -/* A6448 8010FD48 AE300018 */ sw $s0, 0x18($s1) -/* A644C 8010FD4C 24040001 */ addiu $a0, $zero, 1 -.L8010FD50: -/* A6450 8010FD50 8FBF0018 */ lw $ra, 0x18($sp) -/* A6454 8010FD54 8FB10014 */ lw $s1, 0x14($sp) -/* A6458 8010FD58 8FB00010 */ lw $s0, 0x10($sp) -/* A645C 8010FD5C 0080102D */ daddu $v0, $a0, $zero -/* A6460 8010FD60 03E00008 */ jr $ra -/* A6464 8010FD64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_idle.s b/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_idle.s deleted file mode 100644 index cca4ff90d6..0000000000 --- a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_idle.s +++ /dev/null @@ -1,386 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802EB138 -.double 360.0 - -dlabel D_802EB140 -.double 0.3 - -dlabel D_802EB148 -.double 1.2 - -dlabel D_802EB150 -.double -12.2 - -dlabel D_802EB158 -.double 6.283180236816406 - -.section .text - -glabel entity_shattering_idle -/* 103EBC 802E263C 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 103EC0 802E2640 F7B80078 */ sdc1 $f24, 0x78($sp) -/* 103EC4 802E2644 4480C000 */ mtc1 $zero, $f24 -/* 103EC8 802E2648 F7BC0088 */ sdc1 $f28, 0x88($sp) -/* 103ECC 802E264C 3C01802F */ lui $at, %hi(D_802EB138) -/* 103ED0 802E2650 D43CB138 */ ldc1 $f28, %lo(D_802EB138)($at) -/* 103ED4 802E2654 AFB40050 */ sw $s4, 0x50($sp) -/* 103ED8 802E2658 0000A02D */ daddu $s4, $zero, $zero -/* 103EDC 802E265C F7BE0090 */ sdc1 $f30, 0x90($sp) -/* 103EE0 802E2660 3C014F00 */ lui $at, 0x4f00 -/* 103EE4 802E2664 4481F000 */ mtc1 $at, $f30 -/* 103EE8 802E2668 27A80020 */ addiu $t0, $sp, 0x20 -/* 103EEC 802E266C AFBE0060 */ sw $fp, 0x60($sp) -/* 103EF0 802E2670 27BE0024 */ addiu $fp, $sp, 0x24 -/* 103EF4 802E2674 AFB7005C */ sw $s7, 0x5c($sp) -/* 103EF8 802E2678 27B70028 */ addiu $s7, $sp, 0x28 -/* 103EFC 802E267C AFB60058 */ sw $s6, 0x58($sp) -/* 103F00 802E2680 27B6002C */ addiu $s6, $sp, 0x2c -/* 103F04 802E2684 AFB50054 */ sw $s5, 0x54($sp) -/* 103F08 802E2688 27B50030 */ addiu $s5, $sp, 0x30 -/* 103F0C 802E268C AFBF0064 */ sw $ra, 0x64($sp) -/* 103F10 802E2690 AFB3004C */ sw $s3, 0x4c($sp) -/* 103F14 802E2694 AFB20048 */ sw $s2, 0x48($sp) -/* 103F18 802E2698 AFB10044 */ sw $s1, 0x44($sp) -/* 103F1C 802E269C AFB00040 */ sw $s0, 0x40($sp) -/* 103F20 802E26A0 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* 103F24 802E26A4 F7B60070 */ sdc1 $f22, 0x70($sp) -/* 103F28 802E26A8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 103F2C 802E26AC AFA40098 */ sw $a0, 0x98($sp) -/* 103F30 802E26B0 AFA80038 */ sw $t0, 0x38($sp) -/* 103F34 802E26B4 8C920040 */ lw $s2, 0x40($a0) -/* 103F38 802E26B8 4600C686 */ mov.s $f26, $f24 -/* 103F3C 802E26BC 4600C586 */ mov.s $f22, $f24 -/* 103F40 802E26C0 0240882D */ daddu $s1, $s2, $zero -/* 103F44 802E26C4 0240802D */ daddu $s0, $s2, $zero -/* 103F48 802E26C8 0240982D */ daddu $s3, $s2, $zero -.L802E26CC: -/* 103F4C 802E26CC 24020001 */ addiu $v0, $zero, 1 -/* 103F50 802E26D0 82230040 */ lb $v1, 0x40($s1) -/* 103F54 802E26D4 92240040 */ lbu $a0, 0x40($s1) -/* 103F58 802E26D8 1062001D */ beq $v1, $v0, .L802E2750 -/* 103F5C 802E26DC 28620002 */ slti $v0, $v1, 2 -/* 103F60 802E26E0 50400005 */ beql $v0, $zero, .L802E26F8 -/* 103F64 802E26E4 24020002 */ addiu $v0, $zero, 2 -/* 103F68 802E26E8 10600009 */ beqz $v1, .L802E2710 -/* 103F6C 802E26EC 00000000 */ nop -/* 103F70 802E26F0 080B89F7 */ j .L802E27DC -/* 103F74 802E26F4 00000000 */ nop -.L802E26F8: -/* 103F78 802E26F8 10620021 */ beq $v1, $v0, .L802E2780 -/* 103F7C 802E26FC 24020003 */ addiu $v0, $zero, 3 -/* 103F80 802E2700 1062002E */ beq $v1, $v0, .L802E27BC -/* 103F84 802E2704 00000000 */ nop -/* 103F88 802E2708 080B89F7 */ j .L802E27DC -/* 103F8C 802E270C 00000000 */ nop -.L802E2710: -/* 103F90 802E2710 96620000 */ lhu $v0, ($s3) -/* 103F94 802E2714 3C014019 */ lui $at, 0x4019 -/* 103F98 802E2718 3421999A */ ori $at, $at, 0x999a -/* 103F9C 802E271C 4481B000 */ mtc1 $at, $f22 -/* 103FA0 802E2720 30420001 */ andi $v0, $v0, 1 -/* 103FA4 802E2724 10400003 */ beqz $v0, .L802E2734 -/* 103FA8 802E2728 00000000 */ nop -/* 103FAC 802E272C 3C013FC0 */ lui $at, 0x3fc0 -/* 103FB0 802E2730 4481B000 */ mtc1 $at, $f22 -.L802E2734: -/* 103FB4 802E2734 82220059 */ lb $v0, 0x59($s1) -/* 103FB8 802E2738 3C0140C0 */ lui $at, 0x40c0 -/* 103FBC 802E273C 4481D000 */ mtc1 $at, $f26 -/* 103FC0 802E2740 4482C000 */ mtc1 $v0, $f24 -/* 103FC4 802E2744 00000000 */ nop -/* 103FC8 802E2748 080B89F7 */ j .L802E27DC -/* 103FCC 802E274C 4680C620 */ cvt.s.w $f24, $f24 -.L802E2750: -/* 103FD0 802E2750 3C013F99 */ lui $at, 0x3f99 -/* 103FD4 802E2754 3421999A */ ori $at, $at, 0x999a -/* 103FD8 802E2758 4481B000 */ mtc1 $at, $f22 -/* 103FDC 802E275C 92220059 */ lbu $v0, 0x59($s1) -/* 103FE0 802E2760 3C014040 */ lui $at, 0x4040 -/* 103FE4 802E2764 4481D000 */ mtc1 $at, $f26 -/* 103FE8 802E2768 00021600 */ sll $v0, $v0, 0x18 -/* 103FEC 802E276C 00021683 */ sra $v0, $v0, 0x1a -/* 103FF0 802E2770 4482C000 */ mtc1 $v0, $f24 -/* 103FF4 802E2774 00000000 */ nop -/* 103FF8 802E2778 080B89F7 */ j .L802E27DC -/* 103FFC 802E277C 4680C620 */ cvt.s.w $f24, $f24 -.L802E2780: -/* 104000 802E2780 3C013F80 */ lui $at, 0x3f80 -/* 104004 802E2784 4481B000 */ mtc1 $at, $f22 -/* 104008 802E2788 92220059 */ lbu $v0, 0x59($s1) -/* 10400C 802E278C 3C014000 */ lui $at, 0x4000 -/* 104010 802E2790 4481D000 */ mtc1 $at, $f26 -/* 104014 802E2794 8643003C */ lh $v1, 0x3c($s2) -/* 104018 802E2798 00021600 */ sll $v0, $v0, 0x18 -/* 10401C 802E279C 00021683 */ sra $v0, $v0, 0x1a -/* 104020 802E27A0 4482C000 */ mtc1 $v0, $f24 -/* 104024 802E27A4 00000000 */ nop -/* 104028 802E27A8 4680C620 */ cvt.s.w $f24, $f24 -/* 10402C 802E27AC 1460000B */ bnez $v1, .L802E27DC -/* 104030 802E27B0 24820001 */ addiu $v0, $a0, 1 -/* 104034 802E27B4 080B89F7 */ j .L802E27DC -/* 104038 802E27B8 A2220040 */ sb $v0, 0x40($s1) -.L802E27BC: -/* 10403C 802E27BC C6000124 */ lwc1 $f0, 0x124($s0) -/* 104040 802E27C0 3C01802F */ lui $at, %hi(D_802EB140) -/* 104044 802E27C4 D422B140 */ ldc1 $f2, %lo(D_802EB140)($at) -/* 104048 802E27C8 46000021 */ cvt.d.s $f0, $f0 -/* 10404C 802E27CC 46220001 */ sub.d $f0, $f0, $f2 -/* 104050 802E27D0 46200020 */ cvt.s.d $f0, $f0 -/* 104054 802E27D4 080B8ABF */ j .L802E2AFC -/* 104058 802E27D8 E6000124 */ swc1 $f0, 0x124($s0) -.L802E27DC: -/* 10405C 802E27DC C60001EC */ lwc1 $f0, 0x1ec($s0) -/* 104060 802E27E0 3C01802F */ lui $at, %hi(D_802EB148) -/* 104064 802E27E4 D422B148 */ ldc1 $f2, %lo(D_802EB148)($at) -/* 104068 802E27E8 46000021 */ cvt.d.s $f0, $f0 -/* 10406C 802E27EC 46220001 */ sub.d $f0, $f0, $f2 -/* 104070 802E27F0 3C01802F */ lui $at, %hi(D_802EB150) -/* 104074 802E27F4 D424B150 */ ldc1 $f4, %lo(D_802EB150)($at) -/* 104078 802E27F8 46200020 */ cvt.s.d $f0, $f0 -/* 10407C 802E27FC 460000A1 */ cvt.d.s $f2, $f0 -/* 104080 802E2800 4624103C */ c.lt.d $f2, $f4 -/* 104084 802E2804 00000000 */ nop -/* 104088 802E2808 45000006 */ bc1f .L802E2824 -/* 10408C 802E280C E60001EC */ swc1 $f0, 0x1ec($s0) -/* 104090 802E2810 3C01C143 */ lui $at, 0xc143 -/* 104094 802E2814 34213333 */ ori $at, $at, 0x3333 -/* 104098 802E2818 44810000 */ mtc1 $at, $f0 -/* 10409C 802E281C 00000000 */ nop -/* 1040A0 802E2820 E60001EC */ swc1 $f0, 0x1ec($s0) -.L802E2824: -/* 1040A4 802E2824 C6000124 */ lwc1 $f0, 0x124($s0) -/* 1040A8 802E2828 C60201EC */ lwc1 $f2, 0x1ec($s0) -/* 1040AC 802E282C 46020000 */ add.s $f0, $f0, $f2 -/* 1040B0 802E2830 E6000124 */ swc1 $f0, 0x124($s0) -/* 1040B4 802E2834 92220072 */ lbu $v0, 0x72($s1) -/* 1040B8 802E2838 4482A000 */ mtc1 $v0, $f20 -/* 1040BC 802E283C 00000000 */ nop -/* 1040C0 802E2840 4680A521 */ cvt.d.w $f20, $f20 -/* 1040C4 802E2844 463CA502 */ mul.d $f20, $f20, $f28 -/* 1040C8 802E2848 00000000 */ nop -/* 1040CC 802E284C 3C013F70 */ lui $at, 0x3f70 -/* 1040D0 802E2850 44814800 */ mtc1 $at, $f9 -/* 1040D4 802E2854 44804000 */ mtc1 $zero, $f8 -/* 1040D8 802E2858 00000000 */ nop -/* 1040DC 802E285C 4628A502 */ mul.d $f20, $f20, $f8 -/* 1040E0 802E2860 00000000 */ nop -/* 1040E4 802E2864 3C0140C9 */ lui $at, 0x40c9 -/* 1040E8 802E2868 34210FD0 */ ori $at, $at, 0xfd0 -/* 1040EC 802E286C 44816000 */ mtc1 $at, $f12 -/* 1040F0 802E2870 4620A520 */ cvt.s.d $f20, $f20 -/* 1040F4 802E2874 460CA302 */ mul.s $f12, $f20, $f12 -/* 1040F8 802E2878 00000000 */ nop -/* 1040FC 802E287C 03C0302D */ daddu $a2, $fp, $zero -/* 104100 802E2880 3C0143B4 */ lui $at, 0x43b4 -/* 104104 802E2884 44810000 */ mtc1 $at, $f0 -/* 104108 802E2888 8FA50038 */ lw $a1, 0x38($sp) -/* 10410C 802E288C 0C00A82D */ jal sin_cos_rad -/* 104110 802E2890 46006303 */ div.s $f12, $f12, $f0 -/* 104114 802E2894 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 104118 802E2898 4600B002 */ mul.s $f0, $f22, $f0 -/* 10411C 802E289C 00000000 */ nop -/* 104120 802E28A0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 104124 802E28A4 4602B082 */ mul.s $f2, $f22, $f2 -/* 104128 802E28A8 00000000 */ nop -/* 10412C 802E28AC C60400C0 */ lwc1 $f4, 0xc0($s0) -/* 104130 802E28B0 46002100 */ add.s $f4, $f4, $f0 -/* 104134 802E28B4 C6000188 */ lwc1 $f0, 0x188($s0) -/* 104138 802E28B8 46020000 */ add.s $f0, $f0, $f2 -/* 10413C 802E28BC 3C040004 */ lui $a0, 4 -/* 104140 802E28C0 02E0282D */ daddu $a1, $s7, $zero -/* 104144 802E28C4 E6000188 */ swc1 $f0, 0x188($s0) -/* 104148 802E28C8 C6000124 */ lwc1 $f0, 0x124($s0) -/* 10414C 802E28CC C6020188 */ lwc1 $f2, 0x188($s0) -/* 104150 802E28D0 02C0302D */ daddu $a2, $s6, $zero -/* 104154 802E28D4 E60400C0 */ swc1 $f4, 0xc0($s0) -/* 104158 802E28D8 E7A40028 */ swc1 $f4, 0x28($sp) -/* 10415C 802E28DC E7A0002C */ swc1 $f0, 0x2c($sp) -/* 104160 802E28E0 E7A20030 */ swc1 $f2, 0x30($sp) -/* 104164 802E28E4 3C014100 */ lui $at, 0x4100 -/* 104168 802E28E8 44814000 */ mtc1 $at, $f8 -/* 10416C 802E28EC 02A0382D */ daddu $a3, $s5, $zero -/* 104170 802E28F0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 104174 802E28F4 E7B40014 */ swc1 $f20, 0x14($sp) -/* 104178 802E28F8 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10417C 802E28FC 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* 104180 802E2900 E7A8001C */ swc1 $f8, 0x1c($sp) -/* 104184 802E2904 1040002D */ beqz $v0, .L802E29BC -/* 104188 802E2908 03C0302D */ daddu $a2, $fp, $zero -/* 10418C 802E290C C7A00028 */ lwc1 $f0, 0x28($sp) -/* 104190 802E2910 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 104194 802E2914 C7A40030 */ lwc1 $f4, 0x30($sp) -/* 104198 802E2918 E60000C0 */ swc1 $f0, 0xc0($s0) -/* 10419C 802E291C E6020124 */ swc1 $f2, 0x124($s0) -/* 1041A0 802E2920 E6040188 */ swc1 $f4, 0x188($s0) -/* 1041A4 802E2924 92220072 */ lbu $v0, 0x72($s1) -/* 1041A8 802E2928 24420080 */ addiu $v0, $v0, 0x80 -/* 1041AC 802E292C A2220072 */ sb $v0, 0x72($s1) -/* 1041B0 802E2930 304200FF */ andi $v0, $v0, 0xff -/* 1041B4 802E2934 44826000 */ mtc1 $v0, $f12 -/* 1041B8 802E2938 00000000 */ nop -/* 1041BC 802E293C 46806321 */ cvt.d.w $f12, $f12 -/* 1041C0 802E2940 463C6302 */ mul.d $f12, $f12, $f28 -/* 1041C4 802E2944 00000000 */ nop -/* 1041C8 802E2948 3C013F70 */ lui $at, 0x3f70 -/* 1041CC 802E294C 44814800 */ mtc1 $at, $f9 -/* 1041D0 802E2950 44804000 */ mtc1 $zero, $f8 -/* 1041D4 802E2954 00000000 */ nop -/* 1041D8 802E2958 46286302 */ mul.d $f12, $f12, $f8 -/* 1041DC 802E295C 00000000 */ nop -/* 1041E0 802E2960 3C01802F */ lui $at, %hi(D_802EB158) -/* 1041E4 802E2964 D420B158 */ ldc1 $f0, %lo(D_802EB158)($at) -/* 1041E8 802E2968 46206302 */ mul.d $f12, $f12, $f0 -/* 1041EC 802E296C 00000000 */ nop -/* 1041F0 802E2970 8FA50038 */ lw $a1, 0x38($sp) -/* 1041F4 802E2974 463C6303 */ div.d $f12, $f12, $f28 -/* 1041F8 802E2978 0C00A82D */ jal sin_cos_rad -/* 1041FC 802E297C 46206320 */ cvt.s.d $f12, $f12 -/* 104200 802E2980 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 104204 802E2984 3C014100 */ lui $at, 0x4100 -/* 104208 802E2988 4481B000 */ mtc1 $at, $f22 -/* 10420C 802E298C 00000000 */ nop -/* 104210 802E2990 46160002 */ mul.s $f0, $f0, $f22 -/* 104214 802E2994 00000000 */ nop -/* 104218 802E2998 C7A40024 */ lwc1 $f4, 0x24($sp) -/* 10421C 802E299C 46162102 */ mul.s $f4, $f4, $f22 -/* 104220 802E29A0 00000000 */ nop -/* 104224 802E29A4 C60200C0 */ lwc1 $f2, 0xc0($s0) -/* 104228 802E29A8 46001080 */ add.s $f2, $f2, $f0 -/* 10422C 802E29AC C6000188 */ lwc1 $f0, 0x188($s0) -/* 104230 802E29B0 46040000 */ add.s $f0, $f0, $f4 -/* 104234 802E29B4 E60200C0 */ swc1 $f2, 0xc0($s0) -/* 104238 802E29B8 E6000188 */ swc1 $f0, 0x188($s0) -.L802E29BC: -/* 10423C 802E29BC 3C040004 */ lui $a0, 4 -/* 104240 802E29C0 02E0282D */ daddu $a1, $s7, $zero -/* 104244 802E29C4 02C0302D */ daddu $a2, $s6, $zero -/* 104248 802E29C8 02A0382D */ daddu $a3, $s5, $zero -/* 10424C 802E29CC 27A20034 */ addiu $v0, $sp, 0x34 -/* 104250 802E29D0 C60200C0 */ lwc1 $f2, 0xc0($s0) -/* 104254 802E29D4 C6040124 */ lwc1 $f4, 0x124($s0) -/* 104258 802E29D8 C60001EC */ lwc1 $f0, 0x1ec($s0) -/* 10425C 802E29DC C6060188 */ lwc1 $f6, 0x188($s0) -/* 104260 802E29E0 46000005 */ abs.s $f0, $f0 -/* 104264 802E29E4 E7A20028 */ swc1 $f2, 0x28($sp) -/* 104268 802E29E8 E7A4002C */ swc1 $f4, 0x2c($sp) -/* 10426C 802E29EC E7A60030 */ swc1 $f6, 0x30($sp) -/* 104270 802E29F0 E7A00034 */ swc1 $f0, 0x34($sp) -/* 104274 802E29F4 0C0372DF */ jal npc_raycast_down_sides -/* 104278 802E29F8 AFA20010 */ sw $v0, 0x10($sp) -/* 10427C 802E29FC 1440000B */ bnez $v0, .L802E2A2C -/* 104280 802E2A00 00000000 */ nop -/* 104284 802E2A04 C6400038 */ lwc1 $f0, 0x38($s2) -/* 104288 802E2A08 3C014348 */ lui $at, 0x4348 -/* 10428C 802E2A0C 44811000 */ mtc1 $at, $f2 -/* 104290 802E2A10 00000000 */ nop -/* 104294 802E2A14 46020001 */ sub.s $f0, $f0, $f2 -/* 104298 802E2A18 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 10429C 802E2A1C 4600103C */ c.lt.s $f2, $f0 -/* 1042A0 802E2A20 00000000 */ nop -/* 1042A4 802E2A24 4500000F */ bc1f .L802E2A64 -/* 1042A8 802E2A28 00000000 */ nop -.L802E2A2C: -/* 1042AC 802E2A2C 92220040 */ lbu $v0, 0x40($s1) -/* 1042B0 802E2A30 24420001 */ addiu $v0, $v0, 1 -/* 1042B4 802E2A34 A2220040 */ sb $v0, 0x40($s1) -/* 1042B8 802E2A38 C60201EC */ lwc1 $f2, 0x1ec($s0) -/* 1042BC 802E2A3C 3C013F99 */ lui $at, 0x3f99 -/* 1042C0 802E2A40 3421999A */ ori $at, $at, 0x999a -/* 1042C4 802E2A44 44810000 */ mtc1 $at, $f0 -/* 1042C8 802E2A48 46001085 */ abs.s $f2, $f2 -/* 1042CC 802E2A4C 46001082 */ mul.s $f2, $f2, $f0 -/* 1042D0 802E2A50 00000000 */ nop -/* 1042D4 802E2A54 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 1042D8 802E2A58 46020000 */ add.s $f0, $f0, $f2 -/* 1042DC 802E2A5C E61A01EC */ swc1 $f26, 0x1ec($s0) -/* 1042E0 802E2A60 E6000124 */ swc1 $f0, 0x124($s0) -.L802E2A64: -/* 1042E4 802E2A64 9222008B */ lbu $v0, 0x8b($s1) -/* 1042E8 802E2A68 44820000 */ mtc1 $v0, $f0 -/* 1042EC 802E2A6C 00000000 */ nop -/* 1042F0 802E2A70 46800020 */ cvt.s.w $f0, $f0 -/* 1042F4 802E2A74 46180000 */ add.s $f0, $f0, $f24 -/* 1042F8 802E2A78 4600F03E */ c.le.s $f30, $f0 -/* 1042FC 802E2A7C 00000000 */ nop -/* 104300 802E2A80 45010005 */ bc1t .L802E2A98 -/* 104304 802E2A84 2623008B */ addiu $v1, $s1, 0x8b -/* 104308 802E2A88 4600020D */ trunc.w.s $f8, $f0 -/* 10430C 802E2A8C 44024000 */ mfc1 $v0, $f8 -/* 104310 802E2A90 080B8AAC */ j .L802E2AB0 -/* 104314 802E2A94 A0620000 */ sb $v0, ($v1) -.L802E2A98: -/* 104318 802E2A98 461E0001 */ sub.s $f0, $f0, $f30 -/* 10431C 802E2A9C 4600020D */ trunc.w.s $f8, $f0 -/* 104320 802E2AA0 44024000 */ mfc1 $v0, $f8 -/* 104324 802E2AA4 3C088000 */ lui $t0, 0x8000 -/* 104328 802E2AA8 00481025 */ or $v0, $v0, $t0 -/* 10432C 802E2AAC A0620000 */ sb $v0, ($v1) -.L802E2AB0: -/* 104330 802E2AB0 922200A4 */ lbu $v0, 0xa4($s1) -/* 104334 802E2AB4 44820000 */ mtc1 $v0, $f0 -/* 104338 802E2AB8 00000000 */ nop -/* 10433C 802E2ABC 46800020 */ cvt.s.w $f0, $f0 -/* 104340 802E2AC0 46180001 */ sub.s $f0, $f0, $f24 -/* 104344 802E2AC4 4600F03E */ c.le.s $f30, $f0 -/* 104348 802E2AC8 00000000 */ nop -/* 10434C 802E2ACC 45010005 */ bc1t .L802E2AE4 -/* 104350 802E2AD0 262300A4 */ addiu $v1, $s1, 0xa4 -/* 104354 802E2AD4 4600020D */ trunc.w.s $f8, $f0 -/* 104358 802E2AD8 44024000 */ mfc1 $v0, $f8 -/* 10435C 802E2ADC 080B8ABF */ j .L802E2AFC -/* 104360 802E2AE0 A0620000 */ sb $v0, ($v1) -.L802E2AE4: -/* 104364 802E2AE4 461E0001 */ sub.s $f0, $f0, $f30 -/* 104368 802E2AE8 4600020D */ trunc.w.s $f8, $f0 -/* 10436C 802E2AEC 44024000 */ mfc1 $v0, $f8 -/* 104370 802E2AF0 3C088000 */ lui $t0, 0x8000 -/* 104374 802E2AF4 00481025 */ or $v0, $v0, $t0 -/* 104378 802E2AF8 A0620000 */ sb $v0, ($v1) -.L802E2AFC: -/* 10437C 802E2AFC 26310001 */ addiu $s1, $s1, 1 -/* 104380 802E2B00 26100004 */ addiu $s0, $s0, 4 -/* 104384 802E2B04 26940001 */ addiu $s4, $s4, 1 -/* 104388 802E2B08 2A820018 */ slti $v0, $s4, 0x18 -/* 10438C 802E2B0C 1440FEEF */ bnez $v0, .L802E26CC -/* 104390 802E2B10 26730002 */ addiu $s3, $s3, 2 -/* 104394 802E2B14 9642003E */ lhu $v0, 0x3e($s2) -/* 104398 802E2B18 24420001 */ addiu $v0, $v0, 1 -/* 10439C 802E2B1C A642003E */ sh $v0, 0x3e($s2) -/* 1043A0 802E2B20 00021400 */ sll $v0, $v0, 0x10 -/* 1043A4 802E2B24 00021403 */ sra $v0, $v0, 0x10 -/* 1043A8 802E2B28 2842000A */ slti $v0, $v0, 0xa -/* 1043AC 802E2B2C 1440000B */ bnez $v0, .L802E2B5C -/* 1043B0 802E2B30 2403000A */ addiu $v1, $zero, 0xa -/* 1043B4 802E2B34 9642003C */ lhu $v0, 0x3c($s2) -/* 1043B8 802E2B38 A643003E */ sh $v1, 0x3e($s2) -/* 1043BC 802E2B3C 2442FFF8 */ addiu $v0, $v0, -8 -/* 1043C0 802E2B40 A642003C */ sh $v0, 0x3c($s2) -/* 1043C4 802E2B44 00021400 */ sll $v0, $v0, 0x10 -/* 1043C8 802E2B48 1C400004 */ bgtz $v0, .L802E2B5C -/* 1043CC 802E2B4C 00000000 */ nop -/* 1043D0 802E2B50 A640003C */ sh $zero, 0x3c($s2) -/* 1043D4 802E2B54 0C043F5A */ jal exec_entity_commandlist -/* 1043D8 802E2B58 8FA40098 */ lw $a0, 0x98($sp) -.L802E2B5C: -/* 1043DC 802E2B5C 8FBF0064 */ lw $ra, 0x64($sp) -/* 1043E0 802E2B60 8FBE0060 */ lw $fp, 0x60($sp) -/* 1043E4 802E2B64 8FB7005C */ lw $s7, 0x5c($sp) -/* 1043E8 802E2B68 8FB60058 */ lw $s6, 0x58($sp) -/* 1043EC 802E2B6C 8FB50054 */ lw $s5, 0x54($sp) -/* 1043F0 802E2B70 8FB40050 */ lw $s4, 0x50($sp) -/* 1043F4 802E2B74 8FB3004C */ lw $s3, 0x4c($sp) -/* 1043F8 802E2B78 8FB20048 */ lw $s2, 0x48($sp) -/* 1043FC 802E2B7C 8FB10044 */ lw $s1, 0x44($sp) -/* 104400 802E2B80 8FB00040 */ lw $s0, 0x40($sp) -/* 104404 802E2B84 D7BE0090 */ ldc1 $f30, 0x90($sp) -/* 104408 802E2B88 D7BC0088 */ ldc1 $f28, 0x88($sp) -/* 10440C 802E2B8C D7BA0080 */ ldc1 $f26, 0x80($sp) -/* 104410 802E2B90 D7B80078 */ ldc1 $f24, 0x78($sp) -/* 104414 802E2B94 D7B60070 */ ldc1 $f22, 0x70($sp) -/* 104418 802E2B98 D7B40068 */ ldc1 $f20, 0x68($sp) -/* 10441C 802E2B9C 03E00008 */ jr $ra -/* 104420 802E2BA0 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_init_pieces.s b/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_init_pieces.s deleted file mode 100644 index a03f68f008..0000000000 --- a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_init_pieces.s +++ /dev/null @@ -1,132 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802EB130 -.double 2.7 - -.section .text - -glabel entity_shattering_init_pieces -/* 103CEC 802E246C 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 103CF0 802E2470 AFB500A4 */ sw $s5, 0xa4($sp) -/* 103CF4 802E2474 0080A82D */ daddu $s5, $a0, $zero -/* 103CF8 802E2478 AFB600A8 */ sw $s6, 0xa8($sp) -/* 103CFC 802E247C 00C0B02D */ daddu $s6, $a2, $zero -/* 103D00 802E2480 27A40050 */ addiu $a0, $sp, 0x50 -/* 103D04 802E2484 30A5FFFF */ andi $a1, $a1, 0xffff -/* 103D08 802E2488 AFBF00B0 */ sw $ra, 0xb0($sp) -/* 103D0C 802E248C AFB700AC */ sw $s7, 0xac($sp) -/* 103D10 802E2490 AFB400A0 */ sw $s4, 0xa0($sp) -/* 103D14 802E2494 AFB3009C */ sw $s3, 0x9c($sp) -/* 103D18 802E2498 AFB20098 */ sw $s2, 0x98($sp) -/* 103D1C 802E249C AFB10094 */ sw $s1, 0x94($sp) -/* 103D20 802E24A0 AFB00090 */ sw $s0, 0x90($sp) -/* 103D24 802E24A4 F7B400B8 */ sdc1 $f20, 0xb8($sp) -/* 103D28 802E24A8 8EA20044 */ lw $v0, 0x44($s5) -/* 103D2C 802E24AC 8EB00040 */ lw $s0, 0x40($s5) -/* 103D30 802E24B0 00451021 */ addu $v0, $v0, $a1 -/* 103D34 802E24B4 AE020034 */ sw $v0, 0x34($s0) -/* 103D38 802E24B8 3C02802E */ lui $v0, %hi(entity_shattering_setupGfx) -/* 103D3C 802E24BC 24422BA4 */ addiu $v0, $v0, %lo(entity_shattering_setupGfx) -/* 103D40 802E24C0 AEA2003C */ sw $v0, 0x3c($s5) -/* 103D44 802E24C4 240200FF */ addiu $v0, $zero, 0xff -/* 103D48 802E24C8 A2A2000B */ sb $v0, 0xb($s5) -/* 103D4C 802E24CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 103D50 802E24D0 8EA50048 */ lw $a1, 0x48($s5) -/* 103D54 802E24D4 8EA70050 */ lw $a3, 0x50($s5) -/* 103D58 802E24D8 44060000 */ mfc1 $a2, $f0 -/* 103D5C 802E24DC 24170002 */ addiu $s7, $zero, 2 -/* 103D60 802E24E0 0C019E40 */ jal guTranslateF -/* 103D64 802E24E4 AEA6004C */ sw $a2, 0x4c($s5) -/* 103D68 802E24E8 0C044AC8 */ jal is_block_on_ground -/* 103D6C 802E24EC 02A0202D */ daddu $a0, $s5, $zero -/* 103D70 802E24F0 50400001 */ beql $v0, $zero, .L802E24F8 -/* 103D74 802E24F4 24170001 */ addiu $s7, $zero, 1 -.L802E24F8: -/* 103D78 802E24F8 0000A02D */ daddu $s4, $zero, $zero -/* 103D7C 802E24FC 0200902D */ daddu $s2, $s0, $zero -/* 103D80 802E2500 0240882D */ daddu $s1, $s2, $zero -/* 103D84 802E2504 0240982D */ daddu $s3, $s2, $zero -/* 103D88 802E2508 240200FF */ addiu $v0, $zero, 0xff -/* 103D8C 802E250C A640003E */ sh $zero, 0x3e($s2) -/* 103D90 802E2510 A642003C */ sh $v0, 0x3c($s2) -.L802E2514: -/* 103D94 802E2514 32C2FFFF */ andi $v0, $s6, 0xffff -/* 103D98 802E2518 26D60040 */ addiu $s6, $s6, 0x40 -/* 103D9C 802E251C 8EA50044 */ lw $a1, 0x44($s5) -/* 103DA0 802E2520 27A40010 */ addiu $a0, $sp, 0x10 -/* 103DA4 802E2524 0C019D60 */ jal guMtxL2F -/* 103DA8 802E2528 00A22821 */ addu $a1, $a1, $v0 -/* 103DAC 802E252C 27A40050 */ addiu $a0, $sp, 0x50 -/* 103DB0 802E2530 27A50010 */ addiu $a1, $sp, 0x10 -/* 103DB4 802E2534 0C019D80 */ jal guMtxCatF -/* 103DB8 802E2538 00A0302D */ daddu $a2, $a1, $zero -/* 103DBC 802E253C C7A00040 */ lwc1 $f0, 0x40($sp) -/* 103DC0 802E2540 E64000C0 */ swc1 $f0, 0xc0($s2) -/* 103DC4 802E2544 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 103DC8 802E2548 E6400124 */ swc1 $f0, 0x124($s2) -/* 103DCC 802E254C C7A00048 */ lwc1 $f0, 0x48($sp) -/* 103DD0 802E2550 240400FF */ addiu $a0, $zero, 0xff -/* 103DD4 802E2554 0C00A67F */ jal rand_int -/* 103DD8 802E2558 E6400188 */ swc1 $f0, 0x188($s2) -/* 103DDC 802E255C 00021023 */ negu $v0, $v0 -/* 103DE0 802E2560 A2220072 */ sb $v0, 0x72($s1) -/* 103DE4 802E2564 24020001 */ addiu $v0, $zero, 1 -/* 103DE8 802E2568 16E20008 */ bne $s7, $v0, .L802E258C -/* 103DEC 802E256C 24100028 */ addiu $s0, $zero, 0x28 -/* 103DF0 802E2570 24100014 */ addiu $s0, $zero, 0x14 -/* 103DF4 802E2574 96620000 */ lhu $v0, ($s3) -/* 103DF8 802E2578 3C0140CC */ lui $at, 0x40cc -/* 103DFC 802E257C 3421CCCD */ ori $at, $at, 0xcccd -/* 103E00 802E2580 4481A000 */ mtc1 $at, $f20 -/* 103E04 802E2584 080B8968 */ j .L802E25A0 -/* 103E08 802E2588 34420001 */ ori $v0, $v0, 1 -.L802E258C: -/* 103E0C 802E258C 96620000 */ lhu $v0, ($s3) -/* 103E10 802E2590 3C014109 */ lui $at, 0x4109 -/* 103E14 802E2594 3421999A */ ori $at, $at, 0x999a -/* 103E18 802E2598 4481A000 */ mtc1 $at, $f20 -/* 103E1C 802E259C 34420002 */ ori $v0, $v0, 2 -.L802E25A0: -/* 103E20 802E25A0 A6620000 */ sh $v0, ($s3) -/* 103E24 802E25A4 0C00A67F */ jal rand_int -/* 103E28 802E25A8 2404000A */ addiu $a0, $zero, 0xa -/* 103E2C 802E25AC 02028021 */ addu $s0, $s0, $v0 -/* 103E30 802E25B0 32820001 */ andi $v0, $s4, 1 -/* 103E34 802E25B4 14400003 */ bnez $v0, .L802E25C4 -/* 103E38 802E25B8 A2300059 */ sb $s0, 0x59($s1) -/* 103E3C 802E25BC 00101023 */ negu $v0, $s0 -/* 103E40 802E25C0 A2220059 */ sb $v0, 0x59($s1) -.L802E25C4: -/* 103E44 802E25C4 0C00A64D */ jal rand_float -/* 103E48 802E25C8 26730002 */ addiu $s3, $s3, 2 -/* 103E4C 802E25CC 3C01802F */ lui $at, %hi(D_802EB130) -/* 103E50 802E25D0 D422B130 */ ldc1 $f2, %lo(D_802EB130)($at) -/* 103E54 802E25D4 46000021 */ cvt.d.s $f0, $f0 -/* 103E58 802E25D8 46220002 */ mul.d $f0, $f0, $f2 -/* 103E5C 802E25DC 00000000 */ nop -/* 103E60 802E25E0 46200020 */ cvt.s.d $f0, $f0 -/* 103E64 802E25E4 4600A000 */ add.s $f0, $f20, $f0 -/* 103E68 802E25E8 26940001 */ addiu $s4, $s4, 1 -/* 103E6C 802E25EC 2A820018 */ slti $v0, $s4, 0x18 -/* 103E70 802E25F0 E64001EC */ swc1 $f0, 0x1ec($s2) -/* 103E74 802E25F4 26520004 */ addiu $s2, $s2, 4 -/* 103E78 802E25F8 A2200040 */ sb $zero, 0x40($s1) -/* 103E7C 802E25FC A220008B */ sb $zero, 0x8b($s1) -/* 103E80 802E2600 A22000A4 */ sb $zero, 0xa4($s1) -/* 103E84 802E2604 1440FFC3 */ bnez $v0, .L802E2514 -/* 103E88 802E2608 26310001 */ addiu $s1, $s1, 1 -/* 103E8C 802E260C 8FBF00B0 */ lw $ra, 0xb0($sp) -/* 103E90 802E2610 8FB700AC */ lw $s7, 0xac($sp) -/* 103E94 802E2614 8FB600A8 */ lw $s6, 0xa8($sp) -/* 103E98 802E2618 8FB500A4 */ lw $s5, 0xa4($sp) -/* 103E9C 802E261C 8FB400A0 */ lw $s4, 0xa0($sp) -/* 103EA0 802E2620 8FB3009C */ lw $s3, 0x9c($sp) -/* 103EA4 802E2624 8FB20098 */ lw $s2, 0x98($sp) -/* 103EA8 802E2628 8FB10094 */ lw $s1, 0x94($sp) -/* 103EAC 802E262C 8FB00090 */ lw $s0, 0x90($sp) -/* 103EB0 802E2630 D7B400B8 */ ldc1 $f20, 0xb8($sp) -/* 103EB4 802E2634 03E00008 */ jr $ra -/* 103EB8 802E2638 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_setupGfx.s b/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_setupGfx.s deleted file mode 100644 index 49b07e7833..0000000000 --- a/ver/us/asm/nonmatchings/entity/103CD0/entity_shattering_setupGfx.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_shattering_setupGfx -/* 104424 802E2BA4 27BDFE80 */ addiu $sp, $sp, -0x180 -/* 104428 802E2BA8 AFB20130 */ sw $s2, 0x130($sp) -/* 10442C 802E2BAC 3C12800A */ lui $s2, %hi(gMasterGfxPos) -/* 104430 802E2BB0 8E52A66C */ lw $s2, %lo(gMasterGfxPos)($s2) -/* 104434 802E2BB4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* 104438 802E2BB8 3C0143B4 */ lui $at, 0x43b4 -/* 10443C 802E2BBC 4481D000 */ mtc1 $at, $f26 -/* 104440 802E2BC0 AFB70144 */ sw $s7, 0x144($sp) -/* 104444 802E2BC4 0000B82D */ daddu $s7, $zero, $zero -/* 104448 802E2BC8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* 10444C 802E2BCC 3C013B80 */ lui $at, 0x3b80 -/* 104450 802E2BD0 4481C000 */ mtc1 $at, $f24 -/* 104454 802E2BD4 27A80098 */ addiu $t0, $sp, 0x98 -/* 104458 802E2BD8 AFB60140 */ sw $s6, 0x140($sp) -/* 10445C 802E2BDC 27B600D8 */ addiu $s6, $sp, 0xd8 -/* 104460 802E2BE0 AFB5013C */ sw $s5, 0x13c($sp) -/* 104464 802E2BE4 27B50058 */ addiu $s5, $sp, 0x58 -/* 104468 802E2BE8 AFA80120 */ sw $t0, 0x120($sp) -/* 10446C 802E2BEC 3C080001 */ lui $t0, 1 -/* 104470 802E2BF0 F7B60158 */ sdc1 $f22, 0x158($sp) -/* 104474 802E2BF4 3C013F80 */ lui $at, 0x3f80 -/* 104478 802E2BF8 4481B000 */ mtc1 $at, $f22 -/* 10447C 802E2BFC 35081630 */ ori $t0, $t0, 0x1630 -/* 104480 802E2C00 AFBF014C */ sw $ra, 0x14c($sp) -/* 104484 802E2C04 AFBE0148 */ sw $fp, 0x148($sp) -/* 104488 802E2C08 AFB40138 */ sw $s4, 0x138($sp) -/* 10448C 802E2C0C AFB30134 */ sw $s3, 0x134($sp) -/* 104490 802E2C10 AFB1012C */ sw $s1, 0x12c($sp) -/* 104494 802E2C14 AFB00128 */ sw $s0, 0x128($sp) -/* 104498 802E2C18 F7BE0178 */ sdc1 $f30, 0x178($sp) -/* 10449C 802E2C1C F7BC0170 */ sdc1 $f28, 0x170($sp) -/* 1044A0 802E2C20 F7B40150 */ sdc1 $f20, 0x150($sp) -/* 1044A4 802E2C24 0C04417A */ jal get_entity_by_index -/* 1044A8 802E2C28 AFA80124 */ sw $t0, 0x124($sp) -/* 1044AC 802E2C2C AFA2011C */ sw $v0, 0x11c($sp) -/* 1044B0 802E2C30 8C540040 */ lw $s4, 0x40($v0) -/* 1044B4 802E2C34 4480A000 */ mtc1 $zero, $f20 -/* 1044B8 802E2C38 C4400048 */ lwc1 $f0, 0x48($v0) -/* 1044BC 802E2C3C 0280982D */ daddu $s3, $s4, $zero -/* 1044C0 802E2C40 2651FFFC */ addiu $s1, $s2, -4 -/* 1044C4 802E2C44 46000007 */ neg.s $f0, $f0 -/* 1044C8 802E2C48 E7A00118 */ swc1 $f0, 0x118($sp) -/* 1044CC 802E2C4C C440004C */ lwc1 $f0, 0x4c($v0) -/* 1044D0 802E2C50 C4420050 */ lwc1 $f2, 0x50($v0) -/* 1044D4 802E2C54 8E9E0034 */ lw $fp, 0x34($s4) -/* 1044D8 802E2C58 46000787 */ neg.s $f30, $f0 -/* 1044DC 802E2C5C 46001707 */ neg.s $f28, $f2 -.L802E2C60: -/* 1044E0 802E2C60 8683003C */ lh $v1, 0x3c($s4) -/* 1044E4 802E2C64 240200FF */ addiu $v0, $zero, 0xff -/* 1044E8 802E2C68 1462000F */ bne $v1, $v0, .L802E2CA8 -/* 1044EC 802E2C6C 26310008 */ addiu $s1, $s1, 8 -/* 1044F0 802E2C70 3C03E200 */ lui $v1, 0xe200 -/* 1044F4 802E2C74 3463001C */ ori $v1, $v1, 0x1c -/* 1044F8 802E2C78 3C020055 */ lui $v0, 0x55 -/* 1044FC 802E2C7C 34422078 */ ori $v0, $v0, 0x2078 -/* 104500 802E2C80 AE23FFFC */ sw $v1, -4($s1) -/* 104504 802E2C84 AE220000 */ sw $v0, ($s1) -/* 104508 802E2C88 26310008 */ addiu $s1, $s1, 8 -/* 10450C 802E2C8C 26520010 */ addiu $s2, $s2, 0x10 -/* 104510 802E2C90 3C03FC12 */ lui $v1, 0xfc12 -/* 104514 802E2C94 34631824 */ ori $v1, $v1, 0x1824 -/* 104518 802E2C98 3C02FF33 */ lui $v0, 0xff33 -/* 10451C 802E2C9C 3442FFFF */ ori $v0, $v0, 0xffff -/* 104520 802E2CA0 080B8B35 */ j .L802E2CD4 -/* 104524 802E2CA4 AE23FFFC */ sw $v1, -4($s1) -.L802E2CA8: -/* 104528 802E2CA8 3C03FCFF */ lui $v1, 0xfcff -/* 10452C 802E2CAC 3463C3FF */ ori $v1, $v1, 0xc3ff -/* 104530 802E2CB0 3C02FF30 */ lui $v0, 0xff30 -/* 104534 802E2CB4 3442FE7F */ ori $v0, $v0, 0xfe7f -/* 104538 802E2CB8 AE23FFFC */ sw $v1, -4($s1) -/* 10453C 802E2CBC AE220000 */ sw $v0, ($s1) -/* 104540 802E2CC0 26310008 */ addiu $s1, $s1, 8 -/* 104544 802E2CC4 3C02FA00 */ lui $v0, 0xfa00 -/* 104548 802E2CC8 AE22FFFC */ sw $v0, -4($s1) -/* 10454C 802E2CCC 9282003D */ lbu $v0, 0x3d($s4) -/* 104550 802E2CD0 26520010 */ addiu $s2, $s2, 0x10 -.L802E2CD4: -/* 104554 802E2CD4 AE220000 */ sw $v0, ($s1) -/* 104558 802E2CD8 8FA50118 */ lw $a1, 0x118($sp) -/* 10455C 802E2CDC 4406F000 */ mfc1 $a2, $f30 -/* 104560 802E2CE0 4407E000 */ mfc1 $a3, $f28 -/* 104564 802E2CE4 0C019E40 */ jal guTranslateF -/* 104568 802E2CE8 27A40018 */ addiu $a0, $sp, 0x18 -/* 10456C 802E2CEC 02978021 */ addu $s0, $s4, $s7 -/* 104570 802E2CF0 9202008B */ lbu $v0, 0x8b($s0) -/* 104574 802E2CF4 44820000 */ mtc1 $v0, $f0 -/* 104578 802E2CF8 00000000 */ nop -/* 10457C 802E2CFC 46800020 */ cvt.s.w $f0, $f0 -/* 104580 802E2D00 461A0002 */ mul.s $f0, $f0, $f26 -/* 104584 802E2D04 00000000 */ nop -/* 104588 802E2D08 46180002 */ mul.s $f0, $f0, $f24 -/* 10458C 802E2D0C 00000000 */ nop -/* 104590 802E2D10 4406B000 */ mfc1 $a2, $f22 -/* 104594 802E2D14 4407A000 */ mfc1 $a3, $f20 -/* 104598 802E2D18 8FA40120 */ lw $a0, 0x120($sp) -/* 10459C 802E2D1C 44050000 */ mfc1 $a1, $f0 -/* 1045A0 802E2D20 0C019EC8 */ jal guRotateF -/* 1045A4 802E2D24 E7B40010 */ swc1 $f20, 0x10($sp) -/* 1045A8 802E2D28 920200A4 */ lbu $v0, 0xa4($s0) -/* 1045AC 802E2D2C 44820000 */ mtc1 $v0, $f0 -/* 1045B0 802E2D30 00000000 */ nop -/* 1045B4 802E2D34 46800020 */ cvt.s.w $f0, $f0 -/* 1045B8 802E2D38 461A0002 */ mul.s $f0, $f0, $f26 -/* 1045BC 802E2D3C 00000000 */ nop -/* 1045C0 802E2D40 26310008 */ addiu $s1, $s1, 8 -/* 1045C4 802E2D44 46180002 */ mul.s $f0, $f0, $f24 -/* 1045C8 802E2D48 00000000 */ nop -/* 1045CC 802E2D4C 26520018 */ addiu $s2, $s2, 0x18 -/* 1045D0 802E2D50 26F70001 */ addiu $s7, $s7, 1 -/* 1045D4 802E2D54 4406A000 */ mfc1 $a2, $f20 -/* 1045D8 802E2D58 4407B000 */ mfc1 $a3, $f22 -/* 1045DC 802E2D5C 44050000 */ mfc1 $a1, $f0 -/* 1045E0 802E2D60 02C0202D */ daddu $a0, $s6, $zero -/* 1045E4 802E2D64 0C019EC8 */ jal guRotateF -/* 1045E8 802E2D68 E7B40010 */ swc1 $f20, 0x10($sp) -/* 1045EC 802E2D6C 02C0282D */ daddu $a1, $s6, $zero -/* 1045F0 802E2D70 8FA40120 */ lw $a0, 0x120($sp) -/* 1045F4 802E2D74 0C019D80 */ jal guMtxCatF -/* 1045F8 802E2D78 02C0302D */ daddu $a2, $s6, $zero -/* 1045FC 802E2D7C 02C0202D */ daddu $a0, $s6, $zero -/* 104600 802E2D80 27A50018 */ addiu $a1, $sp, 0x18 -/* 104604 802E2D84 0C019D80 */ jal guMtxCatF -/* 104608 802E2D88 00A0302D */ daddu $a2, $a1, $zero -/* 10460C 802E2D8C 02A0202D */ daddu $a0, $s5, $zero -/* 104610 802E2D90 8E6500C0 */ lw $a1, 0xc0($s3) -/* 104614 802E2D94 8E660124 */ lw $a2, 0x124($s3) -/* 104618 802E2D98 8E670188 */ lw $a3, 0x188($s3) -/* 10461C 802E2D9C 0C019E40 */ jal guTranslateF -/* 104620 802E2DA0 26730004 */ addiu $s3, $s3, 4 -/* 104624 802E2DA4 27A40018 */ addiu $a0, $sp, 0x18 -/* 104628 802E2DA8 02A0282D */ daddu $a1, $s5, $zero -/* 10462C 802E2DAC 0C019D80 */ jal guMtxCatF -/* 104630 802E2DB0 02A0302D */ daddu $a2, $s5, $zero -/* 104634 802E2DB4 02A0202D */ daddu $a0, $s5, $zero -/* 104638 802E2DB8 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* 10463C 802E2DBC 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* 104640 802E2DC0 3C02800A */ lui $v0, %hi(gDisplayContext) -/* 104644 802E2DC4 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* 104648 802E2DC8 8FA80124 */ lw $t0, 0x124($sp) -/* 10464C 802E2DCC 00052980 */ sll $a1, $a1, 6 -/* 104650 802E2DD0 00A82821 */ addu $a1, $a1, $t0 -/* 104654 802E2DD4 0C019D40 */ jal guMtxF2L -/* 104658 802E2DD8 00452821 */ addu $a1, $v0, $a1 -/* 10465C 802E2DDC 3C05D838 */ lui $a1, 0xd838 -/* 104660 802E2DE0 34A50002 */ ori $a1, $a1, 2 -/* 104664 802E2DE4 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 104668 802E2DE8 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* 10466C 802E2DEC 3C03DA38 */ lui $v1, 0xda38 -/* 104670 802E2DF0 AE23FFFC */ sw $v1, -4($s1) -/* 104674 802E2DF4 8FA80124 */ lw $t0, 0x124($sp) -/* 104678 802E2DF8 24430001 */ addiu $v1, $v0, 1 -/* 10467C 802E2DFC 3042FFFF */ andi $v0, $v0, 0xffff -/* 104680 802E2E00 00021180 */ sll $v0, $v0, 6 -/* 104684 802E2E04 3C018007 */ lui $at, %hi(gMatrixListPos) -/* 104688 802E2E08 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) -/* 10468C 802E2E0C 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 104690 802E2E10 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 104694 802E2E14 00481021 */ addu $v0, $v0, $t0 -/* 104698 802E2E18 00621821 */ addu $v1, $v1, $v0 -/* 10469C 802E2E1C AE230000 */ sw $v1, ($s1) -/* 1046A0 802E2E20 97C40002 */ lhu $a0, 2($fp) -/* 1046A4 802E2E24 27DE0004 */ addiu $fp, $fp, 4 -/* 1046A8 802E2E28 8FA8011C */ lw $t0, 0x11c($sp) -/* 1046AC 802E2E2C 26310008 */ addiu $s1, $s1, 8 -/* 1046B0 802E2E30 8D030044 */ lw $v1, 0x44($t0) -/* 1046B4 802E2E34 3C02DE00 */ lui $v0, 0xde00 -/* 1046B8 802E2E38 AE22FFFC */ sw $v0, -4($s1) -/* 1046BC 802E2E3C 24020040 */ addiu $v0, $zero, 0x40 -/* 1046C0 802E2E40 00641821 */ addu $v1, $v1, $a0 -/* 1046C4 802E2E44 AE230000 */ sw $v1, ($s1) -/* 1046C8 802E2E48 26310008 */ addiu $s1, $s1, 8 -/* 1046CC 802E2E4C AE220000 */ sw $v0, ($s1) -/* 1046D0 802E2E50 2AE20018 */ slti $v0, $s7, 0x18 -/* 1046D4 802E2E54 1440FF82 */ bnez $v0, .L802E2C60 -/* 1046D8 802E2E58 AE25FFFC */ sw $a1, -4($s1) -/* 1046DC 802E2E5C 8FBF014C */ lw $ra, 0x14c($sp) -/* 1046E0 802E2E60 8FBE0148 */ lw $fp, 0x148($sp) -/* 1046E4 802E2E64 8FB70144 */ lw $s7, 0x144($sp) -/* 1046E8 802E2E68 8FB60140 */ lw $s6, 0x140($sp) -/* 1046EC 802E2E6C 8FB5013C */ lw $s5, 0x13c($sp) -/* 1046F0 802E2E70 8FB40138 */ lw $s4, 0x138($sp) -/* 1046F4 802E2E74 8FB30134 */ lw $s3, 0x134($sp) -/* 1046F8 802E2E78 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* 1046FC 802E2E7C AC32A66C */ sw $s2, %lo(gMasterGfxPos)($at) -/* 104700 802E2E80 8FB20130 */ lw $s2, 0x130($sp) -/* 104704 802E2E84 8FB1012C */ lw $s1, 0x12c($sp) -/* 104708 802E2E88 8FB00128 */ lw $s0, 0x128($sp) -/* 10470C 802E2E8C D7BE0178 */ ldc1 $f30, 0x178($sp) -/* 104710 802E2E90 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* 104714 802E2E94 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* 104718 802E2E98 D7B80160 */ ldc1 $f24, 0x160($sp) -/* 10471C 802E2E9C D7B60158 */ ldc1 $f22, 0x158($sp) -/* 104720 802E2EA0 D7B40150 */ ldc1 $f20, 0x150($sp) -/* 104724 802E2EA4 03E00008 */ jr $ra -/* 104728 802E2EA8 27BD0180 */ addiu $sp, $sp, 0x180 -/* 10472C 802E2EAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/Block/entity_base_block_update_slow_sinking.s b/ver/us/asm/nonmatchings/entity/Block/entity_base_block_update_slow_sinking.s deleted file mode 100644 index b0e875d19b..0000000000 --- a/ver/us/asm/nonmatchings/entity/Block/entity_base_block_update_slow_sinking.s +++ /dev/null @@ -1,220 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802EB1F0 -.double 1.2 - -dlabel D_802EB1F8 -.double 0.3 - -dlabel D_802EB200 -.double 1.2 - -dlabel D_802EB208 -.double 0.3 - -.section .text - -glabel entity_base_block_update_slow_sinking -/* 104BF0 802E3370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 104BF4 802E3374 AFB00010 */ sw $s0, 0x10($sp) -/* 104BF8 802E3378 0080802D */ daddu $s0, $a0, $zero -/* 104BFC 802E337C 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 104C00 802E3380 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 104C04 802E3384 AFB20018 */ sw $s2, 0x18($sp) -/* 104C08 802E3388 AFBF001C */ sw $ra, 0x1c($sp) -/* 104C0C 802E338C AFB10014 */ sw $s1, 0x14($sp) -/* 104C10 802E3390 9202000B */ lbu $v0, 0xb($s0) -/* 104C14 802E3394 8E110040 */ lw $s1, 0x40($s0) -/* 104C18 802E3398 2C4200FF */ sltiu $v0, $v0, 0xff -/* 104C1C 802E339C 10400003 */ beqz $v0, .L802E33AC -/* 104C20 802E33A0 00A0902D */ daddu $s2, $a1, $zero -/* 104C24 802E33A4 080B8D29 */ j .L802E34A4 -/* 104C28 802E33A8 3C03FFDF */ lui $v1, 0xffdf -.L802E33AC: -/* 104C2C 802E33AC 8624000E */ lh $a0, 0xe($s1) -/* 104C30 802E33B0 9623000E */ lhu $v1, 0xe($s1) -/* 104C34 802E33B4 30828000 */ andi $v0, $a0, 0x8000 -/* 104C38 802E33B8 1440003F */ bnez $v0, .L802E34B8 -/* 104C3C 802E33BC 28820096 */ slti $v0, $a0, 0x96 -/* 104C40 802E33C0 1440009C */ bnez $v0, .L802E3634 -/* 104C44 802E33C4 24620001 */ addiu $v0, $v1, 1 -/* 104C48 802E33C8 C6220014 */ lwc1 $f2, 0x14($s1) -/* 104C4C 802E33CC 3C0141C8 */ lui $at, 0x41c8 -/* 104C50 802E33D0 44810000 */ mtc1 $at, $f0 -/* 104C54 802E33D4 00000000 */ nop -/* 104C58 802E33D8 46001001 */ sub.s $f0, $f2, $f0 -/* 104C5C 802E33DC C604004C */ lwc1 $f4, 0x4c($s0) -/* 104C60 802E33E0 4600203C */ c.lt.s $f4, $f0 -/* 104C64 802E33E4 00000000 */ nop -/* 104C68 802E33E8 4502000A */ bc1fl .L802E3414 -/* 104C6C 802E33EC 46041081 */ sub.s $f2, $f2, $f4 -/* 104C70 802E33F0 46022001 */ sub.s $f0, $f4, $f2 -/* 104C74 802E33F4 3C014248 */ lui $at, 0x4248 -/* 104C78 802E33F8 44811000 */ mtc1 $at, $f2 -/* 104C7C 802E33FC 00000000 */ nop -/* 104C80 802E3400 46020000 */ add.s $f0, $f0, $f2 -/* 104C84 802E3404 3C013E00 */ lui $at, 0x3e00 -/* 104C88 802E3408 44811000 */ mtc1 $at, $f2 -/* 104C8C 802E340C 080B8D08 */ j .L802E3420 -/* 104C90 802E3410 00000000 */ nop -.L802E3414: -/* 104C94 802E3414 3C013E00 */ lui $at, 0x3e00 -/* 104C98 802E3418 44810000 */ mtc1 $at, $f0 -/* 104C9C 802E341C 00000000 */ nop -.L802E3420: -/* 104CA0 802E3420 46001102 */ mul.s $f4, $f2, $f0 -/* 104CA4 802E3424 00000000 */ nop -/* 104CA8 802E3428 3C01802F */ lui $at, %hi(D_802EB1F0) -/* 104CAC 802E342C D422B1F0 */ ldc1 $f2, %lo(D_802EB1F0)($at) -/* 104CB0 802E3430 46002021 */ cvt.d.s $f0, $f4 -/* 104CB4 802E3434 4620103C */ c.lt.d $f2, $f0 -/* 104CB8 802E3438 00000000 */ nop -/* 104CBC 802E343C 45000004 */ bc1f .L802E3450 -/* 104CC0 802E3440 00000000 */ nop -/* 104CC4 802E3444 3C013F99 */ lui $at, 0x3f99 -/* 104CC8 802E3448 3421999A */ ori $at, $at, 0x999a -/* 104CCC 802E344C 44812000 */ mtc1 $at, $f4 -.L802E3450: -/* 104CD0 802E3450 3C01802F */ lui $at, %hi(D_802EB1F8) -/* 104CD4 802E3454 D422B1F8 */ ldc1 $f2, %lo(D_802EB1F8)($at) -/* 104CD8 802E3458 46002021 */ cvt.d.s $f0, $f4 -/* 104CDC 802E345C 4622003C */ c.lt.d $f0, $f2 -/* 104CE0 802E3460 00000000 */ nop -/* 104CE4 802E3464 45000004 */ bc1f .L802E3478 -/* 104CE8 802E3468 00000000 */ nop -/* 104CEC 802E346C 3C013E99 */ lui $at, 0x3e99 -/* 104CF0 802E3470 3421999A */ ori $at, $at, 0x999a -/* 104CF4 802E3474 44812000 */ mtc1 $at, $f4 -.L802E3478: -/* 104CF8 802E3478 C600004C */ lwc1 $f0, 0x4c($s0) -/* 104CFC 802E347C 46040000 */ add.s $f0, $f0, $f4 -/* 104D00 802E3480 E600004C */ swc1 $f0, 0x4c($s0) -/* 104D04 802E3484 C6220014 */ lwc1 $f2, 0x14($s1) -/* 104D08 802E3488 4600103C */ c.lt.s $f2, $f0 -/* 104D0C 802E348C 00000000 */ nop -/* 104D10 802E3490 45000069 */ bc1f .L802E3638 -/* 104D14 802E3494 3C03FFDF */ lui $v1, 0xffdf -/* 104D18 802E3498 2402FFFF */ addiu $v0, $zero, -1 -/* 104D1C 802E349C E602004C */ swc1 $f2, 0x4c($s0) -/* 104D20 802E34A0 A622000E */ sh $v0, 0xe($s1) -.L802E34A4: -/* 104D24 802E34A4 8E020000 */ lw $v0, ($s0) -/* 104D28 802E34A8 3463FFFF */ ori $v1, $v1, 0xffff -/* 104D2C 802E34AC 00431024 */ and $v0, $v0, $v1 -/* 104D30 802E34B0 080B8D8E */ j .L802E3638 -/* 104D34 802E34B4 AE020000 */ sw $v0, ($s0) -.L802E34B8: -/* 104D38 802E34B8 92020006 */ lbu $v0, 6($s0) -/* 104D3C 802E34BC 30420004 */ andi $v0, $v0, 4 -/* 104D40 802E34C0 10400014 */ beqz $v0, .L802E3514 -/* 104D44 802E34C4 00000000 */ nop -/* 104D48 802E34C8 8CA20000 */ lw $v0, ($a1) -/* 104D4C 802E34CC 30420002 */ andi $v0, $v0, 2 -/* 104D50 802E34D0 14400058 */ bnez $v0, .L802E3634 -/* 104D54 802E34D4 24020001 */ addiu $v0, $zero, 1 -/* 104D58 802E34D8 86040016 */ lh $a0, 0x16($s0) -/* 104D5C 802E34DC 0C044181 */ jal get_shadow_by_index -/* 104D60 802E34E0 00000000 */ nop -/* 104D64 802E34E4 10400017 */ beqz $v0, .L802E3544 -/* 104D68 802E34E8 00000000 */ nop -/* 104D6C 802E34EC C600004C */ lwc1 $f0, 0x4c($s0) -/* 104D70 802E34F0 C4420014 */ lwc1 $f2, 0x14($v0) -/* 104D74 802E34F4 46020081 */ sub.s $f2, $f0, $f2 -/* 104D78 802E34F8 864200B0 */ lh $v0, 0xb0($s2) -/* 104D7C 802E34FC 46020001 */ sub.s $f0, $f0, $f2 -/* 104D80 802E3500 24420001 */ addiu $v0, $v0, 1 -/* 104D84 802E3504 44821000 */ mtc1 $v0, $f2 -/* 104D88 802E3508 00000000 */ nop -/* 104D8C 802E350C 080B8D4B */ j .L802E352C -/* 104D90 802E3510 468010A0 */ cvt.s.w $f2, $f2 -.L802E3514: -/* 104D94 802E3514 0C044181 */ jal get_shadow_by_index -/* 104D98 802E3518 86040016 */ lh $a0, 0x16($s0) -/* 104D9C 802E351C 10400009 */ beqz $v0, .L802E3544 -/* 104DA0 802E3520 00000000 */ nop -/* 104DA4 802E3524 C600004C */ lwc1 $f0, 0x4c($s0) -/* 104DA8 802E3528 C4420014 */ lwc1 $f2, 0x14($v0) -.L802E352C: -/* 104DAC 802E352C 4602003E */ c.le.s $f0, $f2 -/* 104DB0 802E3530 00000000 */ nop -/* 104DB4 802E3534 45000003 */ bc1f .L802E3544 -/* 104DB8 802E3538 24020001 */ addiu $v0, $zero, 1 -/* 104DBC 802E353C E602004C */ swc1 $f2, 0x4c($s0) -/* 104DC0 802E3540 A622000E */ sh $v0, 0xe($s1) -.L802E3544: -/* 104DC4 802E3544 92020006 */ lbu $v0, 6($s0) -/* 104DC8 802E3548 30420004 */ andi $v0, $v0, 4 -/* 104DCC 802E354C 14400039 */ bnez $v0, .L802E3634 -/* 104DD0 802E3550 24020001 */ addiu $v0, $zero, 1 -/* 104DD4 802E3554 C6220014 */ lwc1 $f2, 0x14($s1) -/* 104DD8 802E3558 3C0141C8 */ lui $at, 0x41c8 -/* 104DDC 802E355C 44810000 */ mtc1 $at, $f0 -/* 104DE0 802E3560 00000000 */ nop -/* 104DE4 802E3564 46001001 */ sub.s $f0, $f2, $f0 -/* 104DE8 802E3568 C604004C */ lwc1 $f4, 0x4c($s0) -/* 104DEC 802E356C 4600203C */ c.lt.s $f4, $f0 -/* 104DF0 802E3570 00000000 */ nop -/* 104DF4 802E3574 4502000A */ bc1fl .L802E35A0 -/* 104DF8 802E3578 46041081 */ sub.s $f2, $f2, $f4 -/* 104DFC 802E357C 46022001 */ sub.s $f0, $f4, $f2 -/* 104E00 802E3580 3C014248 */ lui $at, 0x4248 -/* 104E04 802E3584 44811000 */ mtc1 $at, $f2 -/* 104E08 802E3588 00000000 */ nop -/* 104E0C 802E358C 46020000 */ add.s $f0, $f0, $f2 -/* 104E10 802E3590 3C013E00 */ lui $at, 0x3e00 -/* 104E14 802E3594 44811000 */ mtc1 $at, $f2 -/* 104E18 802E3598 080B8D6B */ j .L802E35AC -/* 104E1C 802E359C 00000000 */ nop -.L802E35A0: -/* 104E20 802E35A0 3C013E00 */ lui $at, 0x3e00 -/* 104E24 802E35A4 44810000 */ mtc1 $at, $f0 -/* 104E28 802E35A8 00000000 */ nop -.L802E35AC: -/* 104E2C 802E35AC 46001102 */ mul.s $f4, $f2, $f0 -/* 104E30 802E35B0 00000000 */ nop -/* 104E34 802E35B4 3C01802F */ lui $at, %hi(D_802EB200) -/* 104E38 802E35B8 D422B200 */ ldc1 $f2, %lo(D_802EB200)($at) -/* 104E3C 802E35BC 46002021 */ cvt.d.s $f0, $f4 -/* 104E40 802E35C0 4620103C */ c.lt.d $f2, $f0 -/* 104E44 802E35C4 00000000 */ nop -/* 104E48 802E35C8 45000004 */ bc1f .L802E35DC -/* 104E4C 802E35CC 00000000 */ nop -/* 104E50 802E35D0 3C013F99 */ lui $at, 0x3f99 -/* 104E54 802E35D4 3421999A */ ori $at, $at, 0x999a -/* 104E58 802E35D8 44812000 */ mtc1 $at, $f4 -.L802E35DC: -/* 104E5C 802E35DC 3C01802F */ lui $at, %hi(D_802EB208) -/* 104E60 802E35E0 D422B208 */ ldc1 $f2, %lo(D_802EB208)($at) -/* 104E64 802E35E4 46002021 */ cvt.d.s $f0, $f4 -/* 104E68 802E35E8 4622003C */ c.lt.d $f0, $f2 -/* 104E6C 802E35EC 00000000 */ nop -/* 104E70 802E35F0 45000004 */ bc1f .L802E3604 -/* 104E74 802E35F4 00000000 */ nop -/* 104E78 802E35F8 3C013E99 */ lui $at, 0x3e99 -/* 104E7C 802E35FC 3421999A */ ori $at, $at, 0x999a -/* 104E80 802E3600 44812000 */ mtc1 $at, $f4 -.L802E3604: -/* 104E84 802E3604 C600004C */ lwc1 $f0, 0x4c($s0) -/* 104E88 802E3608 46040001 */ sub.s $f0, $f0, $f4 -/* 104E8C 802E360C 3C014248 */ lui $at, 0x4248 -/* 104E90 802E3610 44811000 */ mtc1 $at, $f2 -/* 104E94 802E3614 E600004C */ swc1 $f0, 0x4c($s0) -/* 104E98 802E3618 C6240014 */ lwc1 $f4, 0x14($s1) -/* 104E9C 802E361C 46022101 */ sub.s $f4, $f4, $f2 -/* 104EA0 802E3620 4604003C */ c.lt.s $f0, $f4 -/* 104EA4 802E3624 00000000 */ nop -/* 104EA8 802E3628 45000003 */ bc1f .L802E3638 -/* 104EAC 802E362C 24020001 */ addiu $v0, $zero, 1 -/* 104EB0 802E3630 E604004C */ swc1 $f4, 0x4c($s0) -.L802E3634: -/* 104EB4 802E3634 A622000E */ sh $v0, 0xe($s1) -.L802E3638: -/* 104EB8 802E3638 8FBF001C */ lw $ra, 0x1c($sp) -/* 104EBC 802E363C 8FB20018 */ lw $s2, 0x18($sp) -/* 104EC0 802E3640 8FB10014 */ lw $s1, 0x14($sp) -/* 104EC4 802E3644 8FB00010 */ lw $s0, 0x10($sp) -/* 104EC8 802E3648 03E00008 */ jr $ra -/* 104ECC 802E364C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/Block/entity_block_handle_collision.s b/ver/us/asm/nonmatchings/entity/Block/entity_block_handle_collision.s deleted file mode 100644 index 0a7ade0efb..0000000000 --- a/ver/us/asm/nonmatchings/entity/Block/entity_block_handle_collision.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802EB210 -.word .L802E3DCC_10564C, .L802E3DDC_10565C, .L802E3C34_1054B4, .L802E3C34_1054B4, .L802E3C34_1054B4, .L802E3C34_1054B4, .L802E3C34_1054B4, .L802E3C34_1054B4, .L802E3DE4_105664, .L802E3C34_1054B4, .L802E3CD8_105558, .L802E3D2C_1055AC, .L802E3D84_105604, .L802E3CD8_105558, .L802E3D2C_1055AC, .L802E3D84_105604, .L802E3DCC_10564C, .L802E3DCC_10564C, .L802E3DCC_10564C, .L802E3DCC_10564C, .L802E3DCC_10564C, 0, 0, 0 - -.section .text - -glabel entity_block_handle_collision -/* 105424 802E3BA4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 105428 802E3BA8 AFB1001C */ sw $s1, 0x1c($sp) -/* 10542C 802E3BAC 0080882D */ daddu $s1, $a0, $zero -/* 105430 802E3BB0 AFBF0024 */ sw $ra, 0x24($sp) -/* 105434 802E3BB4 AFB20020 */ sw $s2, 0x20($sp) -/* 105438 802E3BB8 AFB00018 */ sw $s0, 0x18($sp) -/* 10543C 802E3BBC 9222000B */ lbu $v0, 0xb($s1) -/* 105440 802E3BC0 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 105444 802E3BC4 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 105448 802E3BC8 14400005 */ bnez $v0, .L802E3BE0 -/* 10544C 802E3BCC 00000000 */ nop -/* 105450 802E3BD0 92220006 */ lbu $v0, 6($s1) -/* 105454 802E3BD4 30420001 */ andi $v0, $v0, 1 -/* 105458 802E3BD8 14400083 */ bnez $v0, .L802E3DE8 -/* 10545C 802E3BDC 0000102D */ daddu $v0, $zero, $zero -.L802E3BE0: -/* 105460 802E3BE0 92230006 */ lbu $v1, 6($s1) -/* 105464 802E3BE4 30620004 */ andi $v0, $v1, 4 -/* 105468 802E3BE8 10400016 */ beqz $v0, .L802E3C44 -/* 10546C 802E3BEC 30620080 */ andi $v0, $v1, 0x80 -/* 105470 802E3BF0 92240004 */ lbu $a0, 4($s1) -/* 105474 802E3BF4 0C0441A9 */ jal get_entity_type -/* 105478 802E3BF8 00000000 */ nop -/* 10547C 802E3BFC 0040182D */ daddu $v1, $v0, $zero -/* 105480 802E3C00 2402000C */ addiu $v0, $zero, 0xc -/* 105484 802E3C04 10620019 */ beq $v1, $v0, .L802E3C6C -/* 105488 802E3C08 0062102A */ slt $v0, $v1, $v0 -/* 10548C 802E3C0C 14400005 */ bnez $v0, .L802E3C24 -/* 105490 802E3C10 2862001B */ slti $v0, $v1, 0x1b -/* 105494 802E3C14 10400003 */ beqz $v0, .L802E3C24 -/* 105498 802E3C18 28620015 */ slti $v0, $v1, 0x15 -/* 10549C 802E3C1C 10400072 */ beqz $v0, .L802E3DE8 -/* 1054A0 802E3C20 0000102D */ daddu $v0, $zero, $zero -.L802E3C24: -/* 1054A4 802E3C24 8E420000 */ lw $v0, ($s2) -/* 1054A8 802E3C28 30420002 */ andi $v0, $v0, 2 -/* 1054AC 802E3C2C 1040006E */ beqz $v0, .L802E3DE8 -/* 1054B0 802E3C30 24020001 */ addiu $v0, $zero, 1 -.L802E3C34: -.L802E3C34_1054B4: -/* 1054B4 802E3C34 0C043F5A */ jal exec_entity_commandlist -/* 1054B8 802E3C38 0220202D */ daddu $a0, $s1, $zero -/* 1054BC 802E3C3C 080B8F7A */ j .L802E3DE8 -/* 1054C0 802E3C40 24020001 */ addiu $v0, $zero, 1 -.L802E3C44: -/* 1054C4 802E3C44 1440FFFB */ bnez $v0, .L802E3C34 -/* 1054C8 802E3C48 30620001 */ andi $v0, $v1, 1 -/* 1054CC 802E3C4C 1040000F */ beqz $v0, .L802E3C8C -/* 1054D0 802E3C50 0000802D */ daddu $s0, $zero, $zero -/* 1054D4 802E3C54 824300B4 */ lb $v1, 0xb4($s2) -/* 1054D8 802E3C58 2402000D */ addiu $v0, $zero, 0xd -/* 1054DC 802E3C5C 10620003 */ beq $v1, $v0, .L802E3C6C -/* 1054E0 802E3C60 2402000F */ addiu $v0, $zero, 0xf -/* 1054E4 802E3C64 14620003 */ bne $v1, $v0, .L802E3C74 -/* 1054E8 802E3C68 2402000E */ addiu $v0, $zero, 0xe -.L802E3C6C: -/* 1054EC 802E3C6C 080B8F7A */ j .L802E3DE8 -/* 1054F0 802E3C70 0000102D */ daddu $v0, $zero, $zero -.L802E3C74: -/* 1054F4 802E3C74 10620003 */ beq $v1, $v0, .L802E3C84 -/* 1054F8 802E3C78 24020010 */ addiu $v0, $zero, 0x10 -/* 1054FC 802E3C7C 1462005A */ bne $v1, $v0, .L802E3DE8 -/* 105500 802E3C80 24020001 */ addiu $v0, $zero, 1 -.L802E3C84: -/* 105504 802E3C84 080B8F2A */ j .L802E3CA8 -/* 105508 802E3C88 24100001 */ addiu $s0, $zero, 1 -.L802E3C8C: -/* 10550C 802E3C8C 30620040 */ andi $v0, $v1, 0x40 -/* 105510 802E3C90 10400054 */ beqz $v0, .L802E3DE4 -/* 105514 802E3C94 3C030100 */ lui $v1, 0x100 -/* 105518 802E3C98 8E420000 */ lw $v0, ($s2) -/* 10551C 802E3C9C 00431024 */ and $v0, $v0, $v1 -/* 105520 802E3CA0 10400051 */ beqz $v0, .L802E3DE8 -/* 105524 802E3CA4 24020001 */ addiu $v0, $zero, 1 -.L802E3CA8: -/* 105528 802E3CA8 92240004 */ lbu $a0, 4($s1) -/* 10552C 802E3CAC 0C0441A9 */ jal get_entity_type -/* 105530 802E3CB0 00000000 */ nop -/* 105534 802E3CB4 2443FFF5 */ addiu $v1, $v0, -0xb -/* 105538 802E3CB8 2C620015 */ sltiu $v0, $v1, 0x15 -/* 10553C 802E3CBC 10400049 */ beqz $v0, .L802E3DE4 -/* 105540 802E3CC0 00031080 */ sll $v0, $v1, 2 -/* 105544 802E3CC4 3C01802F */ lui $at, %hi(jtbl_802EB210) -/* 105548 802E3CC8 00220821 */ addu $at, $at, $v0 -/* 10554C 802E3CCC 8C22B210 */ lw $v0, %lo(jtbl_802EB210)($at) -/* 105550 802E3CD0 00400008 */ jr $v0 -/* 105554 802E3CD4 00000000 */ nop -.L802E3CD8_105558: -/* 105558 802E3CD8 12000007 */ beqz $s0, .L802E3CF8 -/* 10555C 802E3CDC 00000000 */ nop -/* 105560 802E3CE0 3C028011 */ lui $v0, %hi(gPlayerData) -/* 105564 802E3CE4 8042F290 */ lb $v0, %lo(gPlayerData)($v0) -/* 105568 802E3CE8 58400007 */ blezl $v0, .L802E3D08 -/* 10556C 802E3CEC 0000802D */ daddu $s0, $zero, $zero -/* 105570 802E3CF0 080B8F42 */ j .L802E3D08 -/* 105574 802E3CF4 00000000 */ nop -.L802E3CF8: -/* 105578 802E3CF8 3C028011 */ lui $v0, %hi(gPlayerData+0x1) -/* 10557C 802E3CFC 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) -/* 105580 802E3D00 04430001 */ bgezl $v0, .L802E3D08 -/* 105584 802E3D04 24100001 */ addiu $s0, $zero, 1 -.L802E3D08: -/* 105588 802E3D08 12000037 */ beqz $s0, .L802E3DE8 -/* 10558C 802E3D0C 24020001 */ addiu $v0, $zero, 1 -/* 105590 802E3D10 3C05802F */ lui $a1, %hi(D_802E9E80) -/* 105594 802E3D14 24A59E80 */ addiu $a1, $a1, %lo(D_802E9E80) -/* 105598 802E3D18 0C043EF0 */ jal set_entity_commandlist -/* 10559C 802E3D1C 0220202D */ daddu $a0, $s1, $zero -/* 1055A0 802E3D20 C6200050 */ lwc1 $f0, 0x50($s1) -/* 1055A4 802E3D24 080B8F6C */ j .L802E3DB0 -/* 1055A8 802E3D28 2404014F */ addiu $a0, $zero, 0x14f -.L802E3D2C_1055AC: -/* 1055AC 802E3D2C 12000008 */ beqz $s0, .L802E3D50 -/* 1055B0 802E3D30 00000000 */ nop -/* 1055B4 802E3D34 3C028011 */ lui $v0, %hi(gPlayerData) -/* 1055B8 802E3D38 8042F290 */ lb $v0, %lo(gPlayerData)($v0) -/* 1055BC 802E3D3C 28420002 */ slti $v0, $v0, 2 -/* 1055C0 802E3D40 54400007 */ bnel $v0, $zero, .L802E3D60 -/* 1055C4 802E3D44 0000802D */ daddu $s0, $zero, $zero -/* 1055C8 802E3D48 080B8F58 */ j .L802E3D60 -/* 1055CC 802E3D4C 00000000 */ nop -.L802E3D50: -/* 1055D0 802E3D50 3C028011 */ lui $v0, %hi(gPlayerData+0x1) -/* 1055D4 802E3D54 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) -/* 1055D8 802E3D58 5C400001 */ bgtzl $v0, .L802E3D60 -/* 1055DC 802E3D5C 24100001 */ addiu $s0, $zero, 1 -.L802E3D60: -/* 1055E0 802E3D60 12000021 */ beqz $s0, .L802E3DE8 -/* 1055E4 802E3D64 24020001 */ addiu $v0, $zero, 1 -/* 1055E8 802E3D68 3C05802F */ lui $a1, %hi(D_802E9E80) -/* 1055EC 802E3D6C 24A59E80 */ addiu $a1, $a1, %lo(D_802E9E80) -/* 1055F0 802E3D70 0C043EF0 */ jal set_entity_commandlist -/* 1055F4 802E3D74 0220202D */ daddu $a0, $s1, $zero -/* 1055F8 802E3D78 C6200050 */ lwc1 $f0, 0x50($s1) -/* 1055FC 802E3D7C 080B8F6C */ j .L802E3DB0 -/* 105600 802E3D80 24040150 */ addiu $a0, $zero, 0x150 -.L802E3D84_105604: -/* 105604 802E3D84 3C028011 */ lui $v0, %hi(gPlayerData+0x1) -/* 105608 802E3D88 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) -/* 10560C 802E3D8C 28420002 */ slti $v0, $v0, 2 -/* 105610 802E3D90 14400015 */ bnez $v0, .L802E3DE8 -/* 105614 802E3D94 24020001 */ addiu $v0, $zero, 1 -/* 105618 802E3D98 3C05802F */ lui $a1, %hi(D_802E9E80) -/* 10561C 802E3D9C 24A59E80 */ addiu $a1, $a1, %lo(D_802E9E80) -/* 105620 802E3DA0 0C043EF0 */ jal set_entity_commandlist -/* 105624 802E3DA4 0220202D */ daddu $a0, $s1, $zero -/* 105628 802E3DA8 C6200050 */ lwc1 $f0, 0x50($s1) -/* 10562C 802E3DAC 24040151 */ addiu $a0, $zero, 0x151 -.L802E3DB0: -/* 105630 802E3DB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 105634 802E3DB4 8E260048 */ lw $a2, 0x48($s1) -/* 105638 802E3DB8 8E27004C */ lw $a3, 0x4c($s1) -/* 10563C 802E3DBC 0C052757 */ jal sfx_play_sound_at_position -/* 105640 802E3DC0 0000282D */ daddu $a1, $zero, $zero -/* 105644 802E3DC4 080B8F7A */ j .L802E3DE8 -/* 105648 802E3DC8 24020001 */ addiu $v0, $zero, 1 -.L802E3DCC_10564C: -/* 10564C 802E3DCC 0C04419E */ jal entity_start_script -/* 105650 802E3DD0 0220202D */ daddu $a0, $s1, $zero -/* 105654 802E3DD4 080B8F0D */ j .L802E3C34 -/* 105658 802E3DD8 00000000 */ nop -.L802E3DDC_10565C: -/* 10565C 802E3DDC 0C04419E */ jal entity_start_script -/* 105660 802E3DE0 0220202D */ daddu $a0, $s1, $zero -.L802E3DE4: -.L802E3DE4_105664: -/* 105664 802E3DE4 24020001 */ addiu $v0, $zero, 1 -.L802E3DE8: -/* 105668 802E3DE8 8FBF0024 */ lw $ra, 0x24($sp) -/* 10566C 802E3DEC 8FB20020 */ lw $s2, 0x20($sp) -/* 105670 802E3DF0 8FB1001C */ lw $s1, 0x1c($sp) -/* 105674 802E3DF4 8FB00018 */ lw $s0, 0x18($sp) -/* 105678 802E3DF8 03E00008 */ jr $ra -/* 10567C 802E3DFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/BlueWarpPipe/entity_BlueWarpPipe_setupGfx.s b/ver/us/asm/nonmatchings/entity/BlueWarpPipe/entity_BlueWarpPipe_setupGfx.s deleted file mode 100644 index bb5a6f2b98..0000000000 --- a/ver/us/asm/nonmatchings/entity/BlueWarpPipe/entity_BlueWarpPipe_setupGfx.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_BlueWarpPipe_setupGfx -/* 10A6CC 802E8E4C 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10A6D0 802E8E50 AFB3009C */ sw $s3, 0x9c($sp) -/* 10A6D4 802E8E54 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* 10A6D8 802E8E58 2673A66C */ addiu $s3, $s3, %lo(gMasterGfxPos) -/* 10A6DC 802E8E5C AFBF00A4 */ sw $ra, 0xa4($sp) -/* 10A6E0 802E8E60 AFB400A0 */ sw $s4, 0xa0($sp) -/* 10A6E4 802E8E64 AFB20098 */ sw $s2, 0x98($sp) -/* 10A6E8 802E8E68 AFB10094 */ sw $s1, 0x94($sp) -/* 10A6EC 802E8E6C AFB00090 */ sw $s0, 0x90($sp) -/* 10A6F0 802E8E70 8E710000 */ lw $s1, ($s3) -/* 10A6F4 802E8E74 0C04417A */ jal get_entity_by_index -/* 10A6F8 802E8E78 3C140001 */ lui $s4, 1 -/* 10A6FC 802E8E7C 27A40010 */ addiu $a0, $sp, 0x10 -/* 10A700 802E8E80 0040802D */ daddu $s0, $v0, $zero -/* 10A704 802E8E84 8E050054 */ lw $a1, 0x54($s0) -/* 10A708 802E8E88 8E060058 */ lw $a2, 0x58($s0) -/* 10A70C 802E8E8C 8E07005C */ lw $a3, 0x5c($s0) -/* 10A710 802E8E90 8E120040 */ lw $s2, 0x40($s0) -/* 10A714 802E8E94 0C019DF0 */ jal guScaleF -/* 10A718 802E8E98 36941630 */ ori $s4, $s4, 0x1630 -/* 10A71C 802E8E9C C6420018 */ lwc1 $f2, 0x18($s2) -/* 10A720 802E8EA0 3C013F80 */ lui $at, 0x3f80 -/* 10A724 802E8EA4 44810000 */ mtc1 $at, $f0 -/* 10A728 802E8EA8 8E050048 */ lw $a1, 0x48($s0) -/* 10A72C 802E8EAC 46001080 */ add.s $f2, $f2, $f0 -/* 10A730 802E8EB0 8E070050 */ lw $a3, 0x50($s0) -/* 10A734 802E8EB4 27B00050 */ addiu $s0, $sp, 0x50 -/* 10A738 802E8EB8 44061000 */ mfc1 $a2, $f2 -/* 10A73C 802E8EBC 0C019E40 */ jal guTranslateF -/* 10A740 802E8EC0 0200202D */ daddu $a0, $s0, $zero -/* 10A744 802E8EC4 27A40010 */ addiu $a0, $sp, 0x10 -/* 10A748 802E8EC8 0200282D */ daddu $a1, $s0, $zero -/* 10A74C 802E8ECC 0C019D80 */ jal guMtxCatF -/* 10A750 802E8ED0 0200302D */ daddu $a2, $s0, $zero -/* 10A754 802E8ED4 0200202D */ daddu $a0, $s0, $zero -/* 10A758 802E8ED8 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 10A75C 802E8EDC 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 10A760 802E8EE0 3C12800A */ lui $s2, %hi(gDisplayContext) -/* 10A764 802E8EE4 2652A674 */ addiu $s2, $s2, %lo(gDisplayContext) -/* 10A768 802E8EE8 96050000 */ lhu $a1, ($s0) -/* 10A76C 802E8EEC 8E420000 */ lw $v0, ($s2) -/* 10A770 802E8EF0 00052980 */ sll $a1, $a1, 6 -/* 10A774 802E8EF4 00B42821 */ addu $a1, $a1, $s4 -/* 10A778 802E8EF8 0C019D40 */ jal guMtxF2L -/* 10A77C 802E8EFC 00452821 */ addu $a1, $v0, $a1 -/* 10A780 802E8F00 0220202D */ daddu $a0, $s1, $zero -/* 10A784 802E8F04 26310008 */ addiu $s1, $s1, 8 -/* 10A788 802E8F08 3C03DA38 */ lui $v1, 0xda38 -/* 10A78C 802E8F0C 34630002 */ ori $v1, $v1, 2 -/* 10A790 802E8F10 0220282D */ daddu $a1, $s1, $zero -/* 10A794 802E8F14 26310008 */ addiu $s1, $s1, 8 -/* 10A798 802E8F18 0220302D */ daddu $a2, $s1, $zero -/* 10A79C 802E8F1C 26310008 */ addiu $s1, $s1, 8 -/* 10A7A0 802E8F20 3C07D838 */ lui $a3, 0xd838 -/* 10A7A4 802E8F24 96020000 */ lhu $v0, ($s0) -/* 10A7A8 802E8F28 34E70002 */ ori $a3, $a3, 2 -/* 10A7AC 802E8F2C AC830000 */ sw $v1, ($a0) -/* 10A7B0 802E8F30 AE710000 */ sw $s1, ($s3) -/* 10A7B4 802E8F34 24430001 */ addiu $v1, $v0, 1 -/* 10A7B8 802E8F38 3042FFFF */ andi $v0, $v0, 0xffff -/* 10A7BC 802E8F3C 00021180 */ sll $v0, $v0, 6 -/* 10A7C0 802E8F40 A6030000 */ sh $v1, ($s0) -/* 10A7C4 802E8F44 8E430000 */ lw $v1, ($s2) -/* 10A7C8 802E8F48 00541021 */ addu $v0, $v0, $s4 -/* 10A7CC 802E8F4C 00621821 */ addu $v1, $v1, $v0 -/* 10A7D0 802E8F50 3C02DE00 */ lui $v0, 0xde00 -/* 10A7D4 802E8F54 AC830004 */ sw $v1, 4($a0) -/* 10A7D8 802E8F58 ACA20000 */ sw $v0, ($a1) -/* 10A7DC 802E8F5C 3C020A00 */ lui $v0, 0xa00 -/* 10A7E0 802E8F60 24420680 */ addiu $v0, $v0, 0x680 -/* 10A7E4 802E8F64 ACA20004 */ sw $v0, 4($a1) -/* 10A7E8 802E8F68 24020040 */ addiu $v0, $zero, 0x40 -/* 10A7EC 802E8F6C ACC70000 */ sw $a3, ($a2) -/* 10A7F0 802E8F70 ACC20004 */ sw $v0, 4($a2) -/* 10A7F4 802E8F74 8FBF00A4 */ lw $ra, 0xa4($sp) -/* 10A7F8 802E8F78 8FB400A0 */ lw $s4, 0xa0($sp) -/* 10A7FC 802E8F7C 8FB3009C */ lw $s3, 0x9c($sp) -/* 10A800 802E8F80 8FB20098 */ lw $s2, 0x98($sp) -/* 10A804 802E8F84 8FB10094 */ lw $s1, 0x94($sp) -/* 10A808 802E8F88 8FB00090 */ lw $s0, 0x90($sp) -/* 10A80C 802E8F8C 03E00008 */ jr $ra -/* 10A810 802E8F90 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_adjust_camera.s b/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_adjust_camera.s deleted file mode 100644 index a26117d1e9..0000000000 --- a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_adjust_camera.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_Chest_adjust_camera -/* 1086A0 802E6E20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1086A4 802E6E24 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 1086A8 802E6E28 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 1086AC 802E6E2C AFBF0010 */ sw $ra, 0x10($sp) -/* 1086B0 802E6E30 84430086 */ lh $v1, 0x86($v0) -/* 1086B4 802E6E34 2402000B */ addiu $v0, $zero, 0xb -/* 1086B8 802E6E38 14620004 */ bne $v1, $v0, .L802E6E4C -/* 1086BC 802E6E3C 0000202D */ daddu $a0, $zero, $zero -/* 1086C0 802E6E40 3C04802F */ lui $a0, %hi(D_802EAB30) -/* 1086C4 802E6E44 080B9B9D */ j .L802E6E74 -/* 1086C8 802E6E48 2484AB30 */ addiu $a0, $a0, %lo(D_802EAB30) -.L802E6E4C: -/* 1086CC 802E6E4C 24020002 */ addiu $v0, $zero, 2 -/* 1086D0 802E6E50 14620004 */ bne $v1, $v0, .L802E6E64 -/* 1086D4 802E6E54 24020012 */ addiu $v0, $zero, 0x12 -/* 1086D8 802E6E58 3C04802F */ lui $a0, %hi(D_802EAC40) -/* 1086DC 802E6E5C 080B9B9D */ j .L802E6E74 -/* 1086E0 802E6E60 2484AC40 */ addiu $a0, $a0, %lo(D_802EAC40) -.L802E6E64: -/* 1086E4 802E6E64 14620003 */ bne $v1, $v0, .L802E6E74 -/* 1086E8 802E6E68 00000000 */ nop -/* 1086EC 802E6E6C 3C04802F */ lui $a0, %hi(D_802EAC84) -/* 1086F0 802E6E70 2484AC84 */ addiu $a0, $a0, %lo(D_802EAC84) -.L802E6E74: -/* 1086F4 802E6E74 10800003 */ beqz $a0, .L802E6E84 -/* 1086F8 802E6E78 2405000A */ addiu $a1, $zero, 0xa -/* 1086FC 802E6E7C 0C0B0CF8 */ jal start_script -/* 108700 802E6E80 24060020 */ addiu $a2, $zero, 0x20 -.L802E6E84: -/* 108704 802E6E84 8FBF0010 */ lw $ra, 0x10($sp) -/* 108708 802E6E88 03E00008 */ jr $ra -/* 10870C 802E6E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_open.s b/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_open.s deleted file mode 100644 index f1b6f244fe..0000000000 --- a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_open.s +++ /dev/null @@ -1,150 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802EB2F0 -.word .L802E7264_108AE4, .L802E72B4_108B34, .L802E72D8_108B58, .L802E7358_108BD8, .L802E73DC_108C5C, .L802E741C_108C9C - -.section .text - -glabel entity_Chest_open -/* 108AB0 802E7230 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 108AB4 802E7234 AFBF0014 */ sw $ra, 0x14($sp) -/* 108AB8 802E7238 AFB00010 */ sw $s0, 0x10($sp) -/* 108ABC 802E723C 8C900040 */ lw $s0, 0x40($a0) -/* 108AC0 802E7240 92030005 */ lbu $v1, 5($s0) -/* 108AC4 802E7244 2C620006 */ sltiu $v0, $v1, 6 -/* 108AC8 802E7248 10400074 */ beqz $v0, .L802E741C_108C9C -/* 108ACC 802E724C 00031080 */ sll $v0, $v1, 2 -/* 108AD0 802E7250 3C01802F */ lui $at, %hi(jtbl_802EB2F0) -/* 108AD4 802E7254 00220821 */ addu $at, $at, $v0 -/* 108AD8 802E7258 8C22B2F0 */ lw $v0, %lo(jtbl_802EB2F0)($at) -/* 108ADC 802E725C 00400008 */ jr $v0 -/* 108AE0 802E7260 00000000 */ nop -.L802E7264_108AE4: -/* 108AE4 802E7264 C6020008 */ lwc1 $f2, 8($s0) -/* 108AE8 802E7268 3C013F80 */ lui $at, 0x3f80 -/* 108AEC 802E726C 44810000 */ mtc1 $at, $f0 -/* 108AF0 802E7270 92020006 */ lbu $v0, 6($s0) -/* 108AF4 802E7274 46001081 */ sub.s $f2, $f2, $f0 -/* 108AF8 802E7278 3C01C000 */ lui $at, 0xc000 -/* 108AFC 802E727C 44810000 */ mtc1 $at, $f0 -/* 108B00 802E7280 2442FFFF */ addiu $v0, $v0, -1 -/* 108B04 802E7284 A2020006 */ sb $v0, 6($s0) -/* 108B08 802E7288 4600103C */ c.lt.s $f2, $f0 -/* 108B0C 802E728C 00000000 */ nop -/* 108B10 802E7290 45000002 */ bc1f .L802E729C -/* 108B14 802E7294 E6020008 */ swc1 $f2, 8($s0) -/* 108B18 802E7298 E6000008 */ swc1 $f0, 8($s0) -.L802E729C: -/* 108B1C 802E729C 82020006 */ lb $v0, 6($s0) -/* 108B20 802E72A0 1440005E */ bnez $v0, .L802E741C_108C9C -/* 108B24 802E72A4 24030008 */ addiu $v1, $zero, 8 -/* 108B28 802E72A8 92020005 */ lbu $v0, 5($s0) -/* 108B2C 802E72AC 080B9D05 */ j .L802E7414 -/* 108B30 802E72B0 A2030006 */ sb $v1, 6($s0) -.L802E72B4_108B34: -/* 108B34 802E72B4 92020006 */ lbu $v0, 6($s0) -/* 108B38 802E72B8 2442FFFF */ addiu $v0, $v0, -1 -/* 108B3C 802E72BC A2020006 */ sb $v0, 6($s0) -/* 108B40 802E72C0 00021600 */ sll $v0, $v0, 0x18 -/* 108B44 802E72C4 14400055 */ bnez $v0, .L802E741C_108C9C -/* 108B48 802E72C8 00000000 */ nop -/* 108B4C 802E72CC 92020005 */ lbu $v0, 5($s0) -/* 108B50 802E72D0 080B9D05 */ j .L802E7414 -/* 108B54 802E72D4 AE00000C */ sw $zero, 0xc($s0) -.L802E72D8_108B58: -/* 108B58 802E72D8 C600000C */ lwc1 $f0, 0xc($s0) -/* 108B5C 802E72DC 3C014080 */ lui $at, 0x4080 -/* 108B60 802E72E0 44811000 */ mtc1 $at, $f2 -/* 108B64 802E72E4 00000000 */ nop -/* 108B68 802E72E8 46020000 */ add.s $f0, $f0, $f2 -/* 108B6C 802E72EC 3C014334 */ lui $at, 0x4334 -/* 108B70 802E72F0 44811000 */ mtc1 $at, $f2 -/* 108B74 802E72F4 00000000 */ nop -/* 108B78 802E72F8 4600103E */ c.le.s $f2, $f0 -/* 108B7C 802E72FC 00000000 */ nop -/* 108B80 802E7300 45000004 */ bc1f .L802E7314 -/* 108B84 802E7304 E600000C */ swc1 $f0, 0xc($s0) -/* 108B88 802E7308 92020005 */ lbu $v0, 5($s0) -/* 108B8C 802E730C 24420001 */ addiu $v0, $v0, 1 -/* 108B90 802E7310 A2020005 */ sb $v0, 5($s0) -.L802E7314: -/* 108B94 802E7314 C60C000C */ lwc1 $f12, 0xc($s0) -/* 108B98 802E7318 3C0140C9 */ lui $at, 0x40c9 -/* 108B9C 802E731C 34210FD0 */ ori $at, $at, 0xfd0 -/* 108BA0 802E7320 44810000 */ mtc1 $at, $f0 -/* 108BA4 802E7324 00000000 */ nop -/* 108BA8 802E7328 46006302 */ mul.s $f12, $f12, $f0 -/* 108BAC 802E732C 00000000 */ nop -/* 108BB0 802E7330 3C0143B4 */ lui $at, 0x43b4 -/* 108BB4 802E7334 44810000 */ mtc1 $at, $f0 -/* 108BB8 802E7338 0C00A85B */ jal sin_rad -/* 108BBC 802E733C 46006303 */ div.s $f12, $f12, $f0 -/* 108BC0 802E7340 3C014040 */ lui $at, 0x4040 -/* 108BC4 802E7344 44811000 */ mtc1 $at, $f2 -/* 108BC8 802E7348 00000000 */ nop -/* 108BCC 802E734C 46020082 */ mul.s $f2, $f0, $f2 -/* 108BD0 802E7350 080B9CF3 */ j .L802E73CC -/* 108BD4 802E7354 00000000 */ nop -.L802E7358_108BD8: -/* 108BD8 802E7358 C600000C */ lwc1 $f0, 0xc($s0) -/* 108BDC 802E735C 3C013F80 */ lui $at, 0x3f80 -/* 108BE0 802E7360 44811000 */ mtc1 $at, $f2 -/* 108BE4 802E7364 00000000 */ nop -/* 108BE8 802E7368 46020000 */ add.s $f0, $f0, $f2 -/* 108BEC 802E736C 3C01433E */ lui $at, 0x433e -/* 108BF0 802E7370 44811000 */ mtc1 $at, $f2 -/* 108BF4 802E7374 00000000 */ nop -/* 108BF8 802E7378 4600103E */ c.le.s $f2, $f0 -/* 108BFC 802E737C 00000000 */ nop -/* 108C00 802E7380 45000006 */ bc1f .L802E739C -/* 108C04 802E7384 E600000C */ swc1 $f0, 0xc($s0) -/* 108C08 802E7388 92020005 */ lbu $v0, 5($s0) -/* 108C0C 802E738C 2403000A */ addiu $v1, $zero, 0xa -/* 108C10 802E7390 A2030006 */ sb $v1, 6($s0) -/* 108C14 802E7394 24420001 */ addiu $v0, $v0, 1 -/* 108C18 802E7398 A2020005 */ sb $v0, 5($s0) -.L802E739C: -/* 108C1C 802E739C C60C000C */ lwc1 $f12, 0xc($s0) -/* 108C20 802E73A0 3C0140C9 */ lui $at, 0x40c9 -/* 108C24 802E73A4 34210FD0 */ ori $at, $at, 0xfd0 -/* 108C28 802E73A8 44810000 */ mtc1 $at, $f0 -/* 108C2C 802E73AC 00000000 */ nop -/* 108C30 802E73B0 46006302 */ mul.s $f12, $f12, $f0 -/* 108C34 802E73B4 00000000 */ nop -/* 108C38 802E73B8 3C0143B4 */ lui $at, 0x43b4 -/* 108C3C 802E73BC 44810000 */ mtc1 $at, $f0 -/* 108C40 802E73C0 0C00A85B */ jal sin_rad -/* 108C44 802E73C4 46006303 */ div.s $f12, $f12, $f0 -/* 108C48 802E73C8 46000080 */ add.s $f2, $f0, $f0 -.L802E73CC: -/* 108C4C 802E73CC C6000008 */ lwc1 $f0, 8($s0) -/* 108C50 802E73D0 46020001 */ sub.s $f0, $f0, $f2 -/* 108C54 802E73D4 080B9D07 */ j .L802E741C_108C9C -/* 108C58 802E73D8 E6000008 */ swc1 $f0, 8($s0) -.L802E73DC_108C5C: -/* 108C5C 802E73DC 92020006 */ lbu $v0, 6($s0) -/* 108C60 802E73E0 2442FFFF */ addiu $v0, $v0, -1 -/* 108C64 802E73E4 A2020006 */ sb $v0, 6($s0) -/* 108C68 802E73E8 00021600 */ sll $v0, $v0, 0x18 -/* 108C6C 802E73EC 1440000B */ bnez $v0, .L802E741C_108C9C -/* 108C70 802E73F0 00000000 */ nop -/* 108C74 802E73F4 82020007 */ lb $v0, 7($s0) -/* 108C78 802E73F8 10400005 */ beqz $v0, .L802E7410 -/* 108C7C 802E73FC 00000000 */ nop -/* 108C80 802E7400 0C043F5A */ jal exec_entity_commandlist -/* 108C84 802E7404 00000000 */ nop -/* 108C88 802E7408 080B9D07 */ j .L802E741C_108C9C -/* 108C8C 802E740C 00000000 */ nop -.L802E7410: -/* 108C90 802E7410 92020005 */ lbu $v0, 5($s0) -.L802E7414: -/* 108C94 802E7414 24420001 */ addiu $v0, $v0, 1 -/* 108C98 802E7418 A2020005 */ sb $v0, 5($s0) -.L802E741C_108C9C: -/* 108C9C 802E741C 8FBF0014 */ lw $ra, 0x14($sp) -/* 108CA0 802E7420 8FB00010 */ lw $s0, 0x10($sp) -/* 108CA4 802E7424 03E00008 */ jr $ra -/* 108CA8 802E7428 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_reset_camera.s b/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_reset_camera.s deleted file mode 100644 index 3c7a0f30e9..0000000000 --- a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_reset_camera.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_Chest_reset_camera -/* 108710 802E6E90 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 108714 802E6E94 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 108718 802E6E98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10871C 802E6E9C AFBF0010 */ sw $ra, 0x10($sp) -/* 108720 802E6EA0 84430086 */ lh $v1, 0x86($v0) -/* 108724 802E6EA4 2402000B */ addiu $v0, $zero, 0xb -/* 108728 802E6EA8 14620004 */ bne $v1, $v0, .L802E6EBC -/* 10872C 802E6EAC 2405000A */ addiu $a1, $zero, 0xa -/* 108730 802E6EB0 3C04802F */ lui $a0, %hi(D_802EAC0C) -/* 108734 802E6EB4 080B9BB1 */ j .L802E6EC4 -/* 108738 802E6EB8 2484AC0C */ addiu $a0, $a0, %lo(D_802EAC0C) -.L802E6EBC: -/* 10873C 802E6EBC 3C04802F */ lui $a0, %hi(D_802EACC8) -/* 108740 802E6EC0 2484ACC8 */ addiu $a0, $a0, %lo(D_802EACC8) -.L802E6EC4: -/* 108744 802E6EC4 0C0B0CF8 */ jal start_script -/* 108748 802E6EC8 24060020 */ addiu $a2, $zero, 0x20 -/* 10874C 802E6ECC 8FBF0010 */ lw $ra, 0x10($sp) -/* 108750 802E6ED0 03E00008 */ jr $ra -/* 108754 802E6ED4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_setupGfx.s b/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_setupGfx.s deleted file mode 100644 index 2b52ba9e9c..0000000000 --- a/ver/us/asm/nonmatchings/entity/Chest/entity_Chest_setupGfx.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_Chest_setupGfx -/* 108758 802E6ED8 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 10875C 802E6EDC AFB500AC */ sw $s5, 0xac($sp) -/* 108760 802E6EE0 3C15800A */ lui $s5, %hi(gMasterGfxPos) -/* 108764 802E6EE4 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) -/* 108768 802E6EE8 AFBF00B0 */ sw $ra, 0xb0($sp) -/* 10876C 802E6EEC AFB400A8 */ sw $s4, 0xa8($sp) -/* 108770 802E6EF0 AFB300A4 */ sw $s3, 0xa4($sp) -/* 108774 802E6EF4 AFB200A0 */ sw $s2, 0xa0($sp) -/* 108778 802E6EF8 AFB1009C */ sw $s1, 0x9c($sp) -/* 10877C 802E6EFC AFB00098 */ sw $s0, 0x98($sp) -/* 108780 802E6F00 8EB00000 */ lw $s0, ($s5) -/* 108784 802E6F04 0C04417A */ jal get_entity_by_index -/* 108788 802E6F08 3C140001 */ lui $s4, 1 -/* 10878C 802E6F0C 27B10058 */ addiu $s1, $sp, 0x58 -/* 108790 802E6F10 0220202D */ daddu $a0, $s1, $zero -/* 108794 802E6F14 0040902D */ daddu $s2, $v0, $zero -/* 108798 802E6F18 3C063F80 */ lui $a2, 0x3f80 -/* 10879C 802E6F1C 8E420040 */ lw $v0, 0x40($s2) -/* 1087A0 802E6F20 44800000 */ mtc1 $zero, $f0 -/* 1087A4 802E6F24 00000000 */ nop -/* 1087A8 802E6F28 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1087AC 802E6F2C 8C450008 */ lw $a1, 8($v0) -/* 1087B0 802E6F30 44070000 */ mfc1 $a3, $f0 -/* 1087B4 802E6F34 0C019EC8 */ jal guRotateF -/* 1087B8 802E6F38 36941630 */ ori $s4, $s4, 0x1630 -/* 1087BC 802E6F3C 27A40018 */ addiu $a0, $sp, 0x18 -/* 1087C0 802E6F40 3C050A00 */ lui $a1, 0xa00 -/* 1087C4 802E6F44 24A50C48 */ addiu $a1, $a1, 0xc48 -/* 1087C8 802E6F48 8E420044 */ lw $v0, 0x44($s2) -/* 1087CC 802E6F4C 30A5FFFF */ andi $a1, $a1, 0xffff -/* 1087D0 802E6F50 0C019D60 */ jal guMtxL2F -/* 1087D4 802E6F54 00452821 */ addu $a1, $v0, $a1 -/* 1087D8 802E6F58 0220202D */ daddu $a0, $s1, $zero -/* 1087DC 802E6F5C 27A50018 */ addiu $a1, $sp, 0x18 -/* 1087E0 802E6F60 0C019D80 */ jal guMtxCatF -/* 1087E4 802E6F64 00A0302D */ daddu $a2, $a1, $zero -/* 1087E8 802E6F68 27A40018 */ addiu $a0, $sp, 0x18 -/* 1087EC 802E6F6C 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* 1087F0 802E6F70 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* 1087F4 802E6F74 3C13800A */ lui $s3, %hi(gDisplayContext) -/* 1087F8 802E6F78 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) -/* 1087FC 802E6F7C 96250000 */ lhu $a1, ($s1) -/* 108800 802E6F80 8E620000 */ lw $v0, ($s3) -/* 108804 802E6F84 00052980 */ sll $a1, $a1, 6 -/* 108808 802E6F88 00B42821 */ addu $a1, $a1, $s4 -/* 10880C 802E6F8C 0C019D40 */ jal guMtxF2L -/* 108810 802E6F90 00452821 */ addu $a1, $v0, $a1 -/* 108814 802E6F94 0200202D */ daddu $a0, $s0, $zero -/* 108818 802E6F98 26100008 */ addiu $s0, $s0, 8 -/* 10881C 802E6F9C 0200282D */ daddu $a1, $s0, $zero -/* 108820 802E6FA0 26100008 */ addiu $s0, $s0, 8 -/* 108824 802E6FA4 0200302D */ daddu $a2, $s0, $zero -/* 108828 802E6FA8 26100008 */ addiu $s0, $s0, 8 -/* 10882C 802E6FAC 3C07D838 */ lui $a3, 0xd838 -/* 108830 802E6FB0 34E70002 */ ori $a3, $a3, 2 -/* 108834 802E6FB4 96220000 */ lhu $v0, ($s1) -/* 108838 802E6FB8 3C03DA38 */ lui $v1, 0xda38 -/* 10883C 802E6FBC AC830000 */ sw $v1, ($a0) -/* 108840 802E6FC0 AEB00000 */ sw $s0, ($s5) -/* 108844 802E6FC4 24430001 */ addiu $v1, $v0, 1 -/* 108848 802E6FC8 3042FFFF */ andi $v0, $v0, 0xffff -/* 10884C 802E6FCC 00021180 */ sll $v0, $v0, 6 -/* 108850 802E6FD0 A6230000 */ sh $v1, ($s1) -/* 108854 802E6FD4 8E630000 */ lw $v1, ($s3) -/* 108858 802E6FD8 00541021 */ addu $v0, $v0, $s4 -/* 10885C 802E6FDC 00621821 */ addu $v1, $v1, $v0 -/* 108860 802E6FE0 AC830004 */ sw $v1, 4($a0) -/* 108864 802E6FE4 8E430044 */ lw $v1, 0x44($s2) -/* 108868 802E6FE8 3C02DE00 */ lui $v0, 0xde00 -/* 10886C 802E6FEC ACA20000 */ sw $v0, ($a1) -/* 108870 802E6FF0 3C020A00 */ lui $v0, 0xa00 -/* 108874 802E6FF4 24420DC0 */ addiu $v0, $v0, 0xdc0 -/* 108878 802E6FF8 3042FFFF */ andi $v0, $v0, 0xffff -/* 10887C 802E6FFC 00621821 */ addu $v1, $v1, $v0 -/* 108880 802E7000 24020040 */ addiu $v0, $zero, 0x40 -/* 108884 802E7004 ACA30004 */ sw $v1, 4($a1) -/* 108888 802E7008 ACC70000 */ sw $a3, ($a2) -/* 10888C 802E700C ACC20004 */ sw $v0, 4($a2) -/* 108890 802E7010 8FBF00B0 */ lw $ra, 0xb0($sp) -/* 108894 802E7014 8FB500AC */ lw $s5, 0xac($sp) -/* 108898 802E7018 8FB400A8 */ lw $s4, 0xa8($sp) -/* 10889C 802E701C 8FB300A4 */ lw $s3, 0xa4($sp) -/* 1088A0 802E7020 8FB200A0 */ lw $s2, 0xa0($sp) -/* 1088A4 802E7024 8FB1009C */ lw $s1, 0x9c($sp) -/* 1088A8 802E7028 8FB00098 */ lw $s0, 0x98($sp) -/* 1088AC 802E702C 03E00008 */ jr $ra -/* 1088B0 802E7030 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/entity/Chest/entity_GiantChest_hide_effect.s b/ver/us/asm/nonmatchings/entity/Chest/entity_GiantChest_hide_effect.s deleted file mode 100644 index 5fe8634d02..0000000000 --- a/ver/us/asm/nonmatchings/entity/Chest/entity_GiantChest_hide_effect.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_GiantChest_hide_effect -/* 108E40 802E75C0 8C820040 */ lw $v0, 0x40($a0) -/* 108E44 802E75C4 8C420034 */ lw $v0, 0x34($v0) -/* 108E48 802E75C8 10400004 */ beqz $v0, .L802E75DC -/* 108E4C 802E75CC 00000000 */ nop -/* 108E50 802E75D0 8C43000C */ lw $v1, 0xc($v0) -/* 108E54 802E75D4 2402000A */ addiu $v0, $zero, 0xa -/* 108E58 802E75D8 AC620014 */ sw $v0, 0x14($v1) -.L802E75DC: -/* 108E5C 802E75DC 03E00008 */ jr $ra -/* 108E60 802E75E0 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent__setupGfx.s b/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent__setupGfx.s deleted file mode 100644 index c686937781..0000000000 --- a/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent__setupGfx.s +++ /dev/null @@ -1,247 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HeartBlockContent__setupGfx -/* 105FB0 802E4730 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 105FB4 802E4734 AFB00060 */ sw $s0, 0x60($sp) -/* 105FB8 802E4738 00A0802D */ daddu $s0, $a1, $zero -/* 105FBC 802E473C AFBF0084 */ sw $ra, 0x84($sp) -/* 105FC0 802E4740 AFBE0080 */ sw $fp, 0x80($sp) -/* 105FC4 802E4744 AFB7007C */ sw $s7, 0x7c($sp) -/* 105FC8 802E4748 AFB60078 */ sw $s6, 0x78($sp) -/* 105FCC 802E474C AFB50074 */ sw $s5, 0x74($sp) -/* 105FD0 802E4750 AFB40070 */ sw $s4, 0x70($sp) -/* 105FD4 802E4754 AFB3006C */ sw $s3, 0x6c($sp) -/* 105FD8 802E4758 AFB20068 */ sw $s2, 0x68($sp) -/* 105FDC 802E475C 0C04417A */ jal get_entity_by_index -/* 105FE0 802E4760 AFB10064 */ sw $s1, 0x64($sp) -/* 105FE4 802E4764 3C04FCFF */ lui $a0, 0xfcff -/* 105FE8 802E4768 3484B3FF */ ori $a0, $a0, 0xb3ff -/* 105FEC 802E476C 3C03FF2C */ lui $v1, 0xff2c -/* 105FF0 802E4770 3463FE7F */ ori $v1, $v1, 0xfe7f -/* 105FF4 802E4774 2415005C */ addiu $s5, $zero, 0x5c -/* 105FF8 802E4778 0040882D */ daddu $s1, $v0, $zero -/* 105FFC 802E477C 3210FFFF */ andi $s0, $s0, 0xffff -/* 106000 802E4780 3C12800A */ lui $s2, %hi(gMasterGfxPos) -/* 106004 802E4784 8E52A66C */ lw $s2, %lo(gMasterGfxPos)($s2) -/* 106008 802E4788 8E330040 */ lw $s3, 0x40($s1) -/* 10600C 802E478C 8E250044 */ lw $a1, 0x44($s1) -/* 106010 802E4790 0240102D */ daddu $v0, $s2, $zero -/* 106014 802E4794 26520008 */ addiu $s2, $s2, 8 -/* 106018 802E4798 AC430004 */ sw $v1, 4($v0) -/* 10601C 802E479C 0240182D */ daddu $v1, $s2, $zero -/* 106020 802E47A0 AC440000 */ sw $a0, ($v0) -/* 106024 802E47A4 3C02FA00 */ lui $v0, 0xfa00 -/* 106028 802E47A8 AC620000 */ sw $v0, ($v1) -/* 10602C 802E47AC 9222000B */ lbu $v0, 0xb($s1) -/* 106030 802E47B0 26520008 */ addiu $s2, $s2, 8 -/* 106034 802E47B4 AC620004 */ sw $v0, 4($v1) -/* 106038 802E47B8 9223000B */ lbu $v1, 0xb($s1) -/* 10603C 802E47BC 0075102A */ slt $v0, $v1, $s5 -/* 106040 802E47C0 10400002 */ beqz $v0, .L802E47CC -/* 106044 802E47C4 00B0F021 */ addu $fp, $a1, $s0 -/* 106048 802E47C8 0060A82D */ daddu $s5, $v1, $zero -.L802E47CC: -/* 10604C 802E47CC 0260202D */ daddu $a0, $s3, $zero -/* 106050 802E47D0 0C0B91C4 */ jal entity_HeartBlockContent_get_previous_yaw -/* 106054 802E47D4 24050002 */ addiu $a1, $zero, 2 -/* 106058 802E47D8 44050000 */ mfc1 $a1, $f0 -/* 10605C 802E47DC 44800000 */ mtc1 $zero, $f0 -/* 106060 802E47E0 3C073F80 */ lui $a3, 0x3f80 -/* 106064 802E47E4 44060000 */ mfc1 $a2, $f0 -/* 106068 802E47E8 27A40018 */ addiu $a0, $sp, 0x18 -/* 10606C 802E47EC 0C019EC8 */ jal guRotateF -/* 106070 802E47F0 AFA60010 */ sw $a2, 0x10($sp) -/* 106074 802E47F4 27A40018 */ addiu $a0, $sp, 0x18 -/* 106078 802E47F8 26700058 */ addiu $s0, $s3, 0x58 -/* 10607C 802E47FC 0C019D40 */ jal guMtxF2L -/* 106080 802E4800 0200282D */ daddu $a1, $s0, $zero -/* 106084 802E4804 3C040001 */ lui $a0, 1 -/* 106088 802E4808 34841630 */ ori $a0, $a0, 0x1630 -/* 10608C 802E480C 26650098 */ addiu $a1, $s3, 0x98 -/* 106090 802E4810 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 106094 802E4814 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* 106098 802E4818 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 10609C 802E481C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 1060A0 802E4820 00021180 */ sll $v0, $v0, 6 -/* 1060A4 802E4824 00621821 */ addu $v1, $v1, $v0 -/* 1060A8 802E4828 00641821 */ addu $v1, $v1, $a0 -.L802E482C: -/* 1060AC 802E482C 8E160000 */ lw $s6, ($s0) -/* 1060B0 802E4830 8E170004 */ lw $s7, 4($s0) -/* 1060B4 802E4834 8E180008 */ lw $t8, 8($s0) -/* 1060B8 802E4838 8E19000C */ lw $t9, 0xc($s0) -/* 1060BC 802E483C AC760000 */ sw $s6, ($v1) -/* 1060C0 802E4840 AC770004 */ sw $s7, 4($v1) -/* 1060C4 802E4844 AC780008 */ sw $t8, 8($v1) -/* 1060C8 802E4848 AC79000C */ sw $t9, 0xc($v1) -/* 1060CC 802E484C 26100010 */ addiu $s0, $s0, 0x10 -/* 1060D0 802E4850 1605FFF6 */ bne $s0, $a1, .L802E482C -/* 1060D4 802E4854 24630010 */ addiu $v1, $v1, 0x10 -/* 1060D8 802E4858 0240502D */ daddu $t2, $s2, $zero -/* 1060DC 802E485C 26520008 */ addiu $s2, $s2, 8 -/* 1060E0 802E4860 3C160001 */ lui $s6, 1 -/* 1060E4 802E4864 36D61630 */ ori $s6, $s6, 0x1630 -/* 1060E8 802E4868 0240482D */ daddu $t1, $s2, $zero -/* 1060EC 802E486C 26520008 */ addiu $s2, $s2, 8 -/* 1060F0 802E4870 3C0FE200 */ lui $t7, 0xe200 -/* 1060F4 802E4874 35EF001C */ ori $t7, $t7, 0x1c -/* 1060F8 802E4878 3C0E0050 */ lui $t6, 0x50 -/* 1060FC 802E487C 35CE4358 */ ori $t6, $t6, 0x4358 -/* 106100 802E4880 0240302D */ daddu $a2, $s2, $zero -/* 106104 802E4884 26520008 */ addiu $s2, $s2, 8 -/* 106108 802E4888 0240382D */ daddu $a3, $s2, $zero -/* 10610C 802E488C 26520008 */ addiu $s2, $s2, 8 -/* 106110 802E4890 0240402D */ daddu $t0, $s2, $zero -/* 106114 802E4894 26520008 */ addiu $s2, $s2, 8 -/* 106118 802E4898 3C0DFCFF */ lui $t5, 0xfcff -/* 10611C 802E489C 35ADB3FF */ ori $t5, $t5, 0xb3ff -/* 106120 802E48A0 3C0CFF2C */ lui $t4, 0xff2c -/* 106124 802E48A4 358CFE7F */ ori $t4, $t4, 0xfe7f -/* 106128 802E48A8 0240202D */ daddu $a0, $s2, $zero -/* 10612C 802E48AC 26520008 */ addiu $s2, $s2, 8 -/* 106130 802E48B0 0240282D */ daddu $a1, $s2, $zero -/* 106134 802E48B4 3C0BD838 */ lui $t3, 0xd838 -/* 106138 802E48B8 356B0002 */ ori $t3, $t3, 2 -/* 10613C 802E48BC 3C148007 */ lui $s4, %hi(gMatrixListPos) -/* 106140 802E48C0 269441F0 */ addiu $s4, $s4, %lo(gMatrixListPos) -/* 106144 802E48C4 AFB60058 */ sw $s6, 0x58($sp) -/* 106148 802E48C8 96820000 */ lhu $v0, ($s4) -/* 10614C 802E48CC 3C03DA38 */ lui $v1, 0xda38 -/* 106150 802E48D0 AD430000 */ sw $v1, ($t2) -/* 106154 802E48D4 24430001 */ addiu $v1, $v0, 1 -/* 106158 802E48D8 3042FFFF */ andi $v0, $v0, 0xffff -/* 10615C 802E48DC 00021180 */ sll $v0, $v0, 6 -/* 106160 802E48E0 A6830000 */ sh $v1, ($s4) -/* 106164 802E48E4 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 106168 802E48E8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 10616C 802E48EC 00561021 */ addu $v0, $v0, $s6 -/* 106170 802E48F0 00621821 */ addu $v1, $v1, $v0 -/* 106174 802E48F4 3C02DE00 */ lui $v0, 0xde00 -/* 106178 802E48F8 AD430004 */ sw $v1, 4($t2) -/* 10617C 802E48FC AD2F0000 */ sw $t7, ($t1) -/* 106180 802E4900 AD2E0004 */ sw $t6, 4($t1) -/* 106184 802E4904 ACC20000 */ sw $v0, ($a2) -/* 106188 802E4908 3C02E700 */ lui $v0, 0xe700 -/* 10618C 802E490C ACDE0004 */ sw $fp, 4($a2) -/* 106190 802E4910 ACE20000 */ sw $v0, ($a3) -/* 106194 802E4914 3C02FA00 */ lui $v0, 0xfa00 -/* 106198 802E4918 ACE00004 */ sw $zero, 4($a3) -/* 10619C 802E491C AD0D0000 */ sw $t5, ($t0) -/* 1061A0 802E4920 AD0C0004 */ sw $t4, 4($t0) -/* 1061A4 802E4924 AC820000 */ sw $v0, ($a0) -/* 1061A8 802E4928 24020040 */ addiu $v0, $zero, 0x40 -/* 1061AC 802E492C AC950004 */ sw $s5, 4($a0) -/* 1061B0 802E4930 ACAB0000 */ sw $t3, ($a1) -/* 1061B4 802E4934 ACA20004 */ sw $v0, 4($a1) -/* 1061B8 802E4938 9223000B */ lbu $v1, 0xb($s1) -/* 1061BC 802E493C 24150048 */ addiu $s5, $zero, 0x48 -/* 1061C0 802E4940 0075102A */ slt $v0, $v1, $s5 -/* 1061C4 802E4944 10400002 */ beqz $v0, .L802E4950 -/* 1061C8 802E4948 26520008 */ addiu $s2, $s2, 8 -/* 1061CC 802E494C 0060A82D */ daddu $s5, $v1, $zero -.L802E4950: -/* 1061D0 802E4950 0260202D */ daddu $a0, $s3, $zero -/* 1061D4 802E4954 0C0B91C4 */ jal entity_HeartBlockContent_get_previous_yaw -/* 1061D8 802E4958 24050003 */ addiu $a1, $zero, 3 -/* 1061DC 802E495C 44050000 */ mfc1 $a1, $f0 -/* 1061E0 802E4960 44800000 */ mtc1 $zero, $f0 -/* 1061E4 802E4964 3C073F80 */ lui $a3, 0x3f80 -/* 1061E8 802E4968 44060000 */ mfc1 $a2, $f0 -/* 1061EC 802E496C 27A40018 */ addiu $a0, $sp, 0x18 -/* 1061F0 802E4970 0C019EC8 */ jal guRotateF -/* 1061F4 802E4974 AFA60010 */ sw $a2, 0x10($sp) -/* 1061F8 802E4978 27A40018 */ addiu $a0, $sp, 0x18 -/* 1061FC 802E497C 26700098 */ addiu $s0, $s3, 0x98 -/* 106200 802E4980 0C019D40 */ jal guMtxF2L -/* 106204 802E4984 0200282D */ daddu $a1, $s0, $zero -/* 106208 802E4988 266400D8 */ addiu $a0, $s3, 0xd8 -/* 10620C 802E498C 96820000 */ lhu $v0, ($s4) -/* 106210 802E4990 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 106214 802E4994 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 106218 802E4998 8FB70058 */ lw $s7, 0x58($sp) -/* 10621C 802E499C 00021180 */ sll $v0, $v0, 6 -/* 106220 802E49A0 00621821 */ addu $v1, $v1, $v0 -/* 106224 802E49A4 00771821 */ addu $v1, $v1, $s7 -.L802E49A8: -/* 106228 802E49A8 8E180000 */ lw $t8, ($s0) -/* 10622C 802E49AC 8E190004 */ lw $t9, 4($s0) -/* 106230 802E49B0 8E160008 */ lw $s6, 8($s0) -/* 106234 802E49B4 8E17000C */ lw $s7, 0xc($s0) -/* 106238 802E49B8 AC780000 */ sw $t8, ($v1) -/* 10623C 802E49BC AC790004 */ sw $t9, 4($v1) -/* 106240 802E49C0 AC760008 */ sw $s6, 8($v1) -/* 106244 802E49C4 AC77000C */ sw $s7, 0xc($v1) -/* 106248 802E49C8 26100010 */ addiu $s0, $s0, 0x10 -/* 10624C 802E49CC 1604FFF6 */ bne $s0, $a0, .L802E49A8 -/* 106250 802E49D0 24630010 */ addiu $v1, $v1, 0x10 -/* 106254 802E49D4 0240582D */ daddu $t3, $s2, $zero -/* 106258 802E49D8 26520008 */ addiu $s2, $s2, 8 -/* 10625C 802E49DC 3C110001 */ lui $s1, 1 -/* 106260 802E49E0 36311630 */ ori $s1, $s1, 0x1630 -/* 106264 802E49E4 0240502D */ daddu $t2, $s2, $zero -/* 106268 802E49E8 26520008 */ addiu $s2, $s2, 8 -/* 10626C 802E49EC 3C10E200 */ lui $s0, 0xe200 -/* 106270 802E49F0 3610001C */ ori $s0, $s0, 0x1c -/* 106274 802E49F4 3C0F0050 */ lui $t7, 0x50 -/* 106278 802E49F8 35EF4358 */ ori $t7, $t7, 0x4358 -/* 10627C 802E49FC 0240382D */ daddu $a3, $s2, $zero -/* 106280 802E4A00 26520008 */ addiu $s2, $s2, 8 -/* 106284 802E4A04 0240402D */ daddu $t0, $s2, $zero -/* 106288 802E4A08 26520008 */ addiu $s2, $s2, 8 -/* 10628C 802E4A0C 0240482D */ daddu $t1, $s2, $zero -/* 106290 802E4A10 26520008 */ addiu $s2, $s2, 8 -/* 106294 802E4A14 3C0EFCFF */ lui $t6, 0xfcff -/* 106298 802E4A18 35CEB3FF */ ori $t6, $t6, 0xb3ff -/* 10629C 802E4A1C 3C0DFF2C */ lui $t5, 0xff2c -/* 1062A0 802E4A20 35ADFE7F */ ori $t5, $t5, 0xfe7f -/* 1062A4 802E4A24 0240282D */ daddu $a1, $s2, $zero -/* 1062A8 802E4A28 26520008 */ addiu $s2, $s2, 8 -/* 1062AC 802E4A2C 0240302D */ daddu $a2, $s2, $zero -/* 1062B0 802E4A30 26520008 */ addiu $s2, $s2, 8 -/* 1062B4 802E4A34 3C0CD838 */ lui $t4, 0xd838 -/* 1062B8 802E4A38 358C0002 */ ori $t4, $t4, 2 -/* 1062BC 802E4A3C 3C048007 */ lui $a0, %hi(gMatrixListPos) -/* 1062C0 802E4A40 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) -/* 1062C4 802E4A44 94820000 */ lhu $v0, ($a0) -/* 1062C8 802E4A48 3C03DA38 */ lui $v1, 0xda38 -/* 1062CC 802E4A4C AD630000 */ sw $v1, ($t3) -/* 1062D0 802E4A50 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* 1062D4 802E4A54 AC32A66C */ sw $s2, %lo(gMasterGfxPos)($at) -/* 1062D8 802E4A58 24430001 */ addiu $v1, $v0, 1 -/* 1062DC 802E4A5C 3042FFFF */ andi $v0, $v0, 0xffff -/* 1062E0 802E4A60 00021180 */ sll $v0, $v0, 6 -/* 1062E4 802E4A64 A4830000 */ sh $v1, ($a0) -/* 1062E8 802E4A68 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 1062EC 802E4A6C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 1062F0 802E4A70 00511021 */ addu $v0, $v0, $s1 -/* 1062F4 802E4A74 00621821 */ addu $v1, $v1, $v0 -/* 1062F8 802E4A78 3C02DE00 */ lui $v0, 0xde00 -/* 1062FC 802E4A7C AD630004 */ sw $v1, 4($t3) -/* 106300 802E4A80 AD500000 */ sw $s0, ($t2) -/* 106304 802E4A84 AD4F0004 */ sw $t7, 4($t2) -/* 106308 802E4A88 ACE20000 */ sw $v0, ($a3) -/* 10630C 802E4A8C 3C02E700 */ lui $v0, 0xe700 -/* 106310 802E4A90 ACFE0004 */ sw $fp, 4($a3) -/* 106314 802E4A94 AD020000 */ sw $v0, ($t0) -/* 106318 802E4A98 3C02FA00 */ lui $v0, 0xfa00 -/* 10631C 802E4A9C AD000004 */ sw $zero, 4($t0) -/* 106320 802E4AA0 AD2E0000 */ sw $t6, ($t1) -/* 106324 802E4AA4 AD2D0004 */ sw $t5, 4($t1) -/* 106328 802E4AA8 ACA20000 */ sw $v0, ($a1) -/* 10632C 802E4AAC 24020040 */ addiu $v0, $zero, 0x40 -/* 106330 802E4AB0 ACB50004 */ sw $s5, 4($a1) -/* 106334 802E4AB4 ACCC0000 */ sw $t4, ($a2) -/* 106338 802E4AB8 ACC20004 */ sw $v0, 4($a2) -/* 10633C 802E4ABC 8FBF0084 */ lw $ra, 0x84($sp) -/* 106340 802E4AC0 8FBE0080 */ lw $fp, 0x80($sp) -/* 106344 802E4AC4 8FB7007C */ lw $s7, 0x7c($sp) -/* 106348 802E4AC8 8FB60078 */ lw $s6, 0x78($sp) -/* 10634C 802E4ACC 8FB50074 */ lw $s5, 0x74($sp) -/* 106350 802E4AD0 8FB40070 */ lw $s4, 0x70($sp) -/* 106354 802E4AD4 8FB3006C */ lw $s3, 0x6c($sp) -/* 106358 802E4AD8 8FB20068 */ lw $s2, 0x68($sp) -/* 10635C 802E4ADC 8FB10064 */ lw $s1, 0x64($sp) -/* 106360 802E4AE0 8FB00060 */ lw $s0, 0x60($sp) -/* 106364 802E4AE4 03E00008 */ jr $ra -/* 106368 802E4AE8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent_anim_beating.s b/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent_anim_beating.s deleted file mode 100644 index 3e537ce373..0000000000 --- a/ver/us/asm/nonmatchings/entity/HeartBlock/entity_HeartBlockContent_anim_beating.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802EB298 -.double 0.1 - -dlabel D_802EB2A0 -.double 0.02, 0.0 - -.section .text - -glabel entity_HeartBlockContent_anim_beating -/* 106BA4 802E5324 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 106BA8 802E5328 AFB10014 */ sw $s1, 0x14($sp) -/* 106BAC 802E532C 0080882D */ daddu $s1, $a0, $zero -/* 106BB0 802E5330 AFBF0018 */ sw $ra, 0x18($sp) -/* 106BB4 802E5334 AFB00010 */ sw $s0, 0x10($sp) -/* 106BB8 802E5338 0C0B92C4 */ jal entity_HeartBlockContent_set_initial_pos -/* 106BBC 802E533C 8E300040 */ lw $s0, 0x40($s1) -/* 106BC0 802E5340 C6200054 */ lwc1 $f0, 0x54($s1) -/* 106BC4 802E5344 3C013FF0 */ lui $at, 0x3ff0 -/* 106BC8 802E5348 44812800 */ mtc1 $at, $f5 -/* 106BCC 802E534C 44802000 */ mtc1 $zero, $f4 -/* 106BD0 802E5350 460000A1 */ cvt.d.s $f2, $f0 -/* 106BD4 802E5354 4624103C */ c.lt.d $f2, $f4 -/* 106BD8 802E5358 00000000 */ nop -/* 106BDC 802E535C 45010026 */ bc1t .L802E53F8 -/* 106BE0 802E5360 24020001 */ addiu $v0, $zero, 1 -/* 106BE4 802E5364 92030008 */ lbu $v1, 8($s0) -/* 106BE8 802E5368 10620010 */ beq $v1, $v0, .L802E53AC -/* 106BEC 802E536C 28620002 */ slti $v0, $v1, 2 -/* 106BF0 802E5370 50400005 */ beql $v0, $zero, .L802E5388 -/* 106BF4 802E5374 28620011 */ slti $v0, $v1, 0x11 -/* 106BF8 802E5378 10600007 */ beqz $v1, .L802E5398 -/* 106BFC 802E537C 00000000 */ nop -/* 106C00 802E5380 080B94FC */ j .L802E53F0 -/* 106C04 802E5384 A2000008 */ sb $zero, 8($s0) -.L802E5388: -/* 106C08 802E5388 50400019 */ beql $v0, $zero, .L802E53F0 -/* 106C0C 802E538C A2000008 */ sb $zero, 8($s0) -/* 106C10 802E5390 080B94F9 */ j .L802E53E4 -/* 106C14 802E5394 00000000 */ nop -.L802E5398: -/* 106C18 802E5398 3C01802F */ lui $at, %hi(D_802EB298) -/* 106C1C 802E539C D420B298 */ ldc1 $f0, %lo(D_802EB298)($at) -/* 106C20 802E53A0 46201000 */ add.d $f0, $f2, $f0 -/* 106C24 802E53A4 080B94F8 */ j .L802E53E0 -/* 106C28 802E53A8 46200020 */ cvt.s.d $f0, $f0 -.L802E53AC: -/* 106C2C 802E53AC 3C01802F */ lui $at, %hi(D_802EB2A0) -/* 106C30 802E53B0 D420B2A0 */ ldc1 $f0, %lo(D_802EB2A0)($at) -/* 106C34 802E53B4 46201001 */ sub.d $f0, $f2, $f0 -/* 106C38 802E53B8 46200020 */ cvt.s.d $f0, $f0 -/* 106C3C 802E53BC E6200054 */ swc1 $f0, 0x54($s1) -/* 106C40 802E53C0 46000021 */ cvt.d.s $f0, $f0 -/* 106C44 802E53C4 4624003E */ c.le.d $f0, $f4 -/* 106C48 802E53C8 00000000 */ nop -/* 106C4C 802E53CC 45000008 */ bc1f .L802E53F0 -/* 106C50 802E53D0 00000000 */ nop -/* 106C54 802E53D4 3C013F80 */ lui $at, 0x3f80 -/* 106C58 802E53D8 44810000 */ mtc1 $at, $f0 -/* 106C5C 802E53DC 00000000 */ nop -.L802E53E0: -/* 106C60 802E53E0 E6200054 */ swc1 $f0, 0x54($s1) -.L802E53E4: -/* 106C64 802E53E4 92020008 */ lbu $v0, 8($s0) -/* 106C68 802E53E8 24420001 */ addiu $v0, $v0, 1 -/* 106C6C 802E53EC A2020008 */ sb $v0, 8($s0) -.L802E53F0: -/* 106C70 802E53F0 C6200054 */ lwc1 $f0, 0x54($s1) -/* 106C74 802E53F4 E6200058 */ swc1 $f0, 0x58($s1) -.L802E53F8: -/* 106C78 802E53F8 8FBF0018 */ lw $ra, 0x18($sp) -/* 106C7C 802E53FC 8FB10014 */ lw $s1, 0x14($sp) -/* 106C80 802E5400 8FB00010 */ lw $s0, 0x10($sp) -/* 106C84 802E5404 03E00008 */ jr $ra -/* 106C88 802E5408 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/ItemBlock/entity_HitItemBlock_appear.s b/ver/us/asm/nonmatchings/entity/ItemBlock/entity_HitItemBlock_appear.s deleted file mode 100644 index 71d9b23e80..0000000000 --- a/ver/us/asm/nonmatchings/entity/ItemBlock/entity_HitItemBlock_appear.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HitItemBlock_appear -/* 105760 802E3EE0 9082000B */ lbu $v0, 0xb($a0) -/* 105764 802E3EE4 2C4200FF */ sltiu $v0, $v0, 0xff -/* 105768 802E3EE8 10400006 */ beqz $v0, .L802E3F04 -/* 10576C 802E3EEC 2483000B */ addiu $v1, $a0, 0xb -/* 105770 802E3EF0 9084000B */ lbu $a0, 0xb($a0) -/* 105774 802E3EF4 14800002 */ bnez $a0, .L802E3F00 -/* 105778 802E3EF8 24820020 */ addiu $v0, $a0, 0x20 -/* 10577C 802E3EFC 2482001F */ addiu $v0, $a0, 0x1f -.L802E3F00: -/* 105780 802E3F00 A0620000 */ sb $v0, ($v1) -.L802E3F04: -/* 105784 802E3F04 03E00008 */ jr $ra -/* 105788 802E3F08 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/ItemBlock/entity_ItemBlock_spawn_item.s b/ver/us/asm/nonmatchings/entity/ItemBlock/entity_ItemBlock_spawn_item.s deleted file mode 100644 index b7a359c5d5..0000000000 --- a/ver/us/asm/nonmatchings/entity/ItemBlock/entity_ItemBlock_spawn_item.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_ItemBlock_spawn_item -/* 10578C 802E3F0C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 105790 802E3F10 AFB00020 */ sw $s0, 0x20($sp) -/* 105794 802E3F14 0080802D */ daddu $s0, $a0, $zero -/* 105798 802E3F18 AFBF002C */ sw $ra, 0x2c($sp) -/* 10579C 802E3F1C AFB20028 */ sw $s2, 0x28($sp) -/* 1057A0 802E3F20 AFB10024 */ sw $s1, 0x24($sp) -/* 1057A4 802E3F24 8E110040 */ lw $s1, 0x40($s0) -/* 1057A8 802E3F28 86220010 */ lh $v0, 0x10($s1) -/* 1057AC 802E3F2C 1040003E */ beqz $v0, .L802E4028 -/* 1057B0 802E3F30 3C120010 */ lui $s2, 0x10 -/* 1057B4 802E3F34 8E020000 */ lw $v0, ($s0) -/* 1057B8 802E3F38 00521024 */ and $v0, $v0, $s2 -/* 1057BC 802E3F3C 1440003A */ bnez $v0, .L802E4028 -/* 1057C0 802E3F40 00000000 */ nop -/* 1057C4 802E3F44 0C03951B */ jal player_get_camera_facing_angle -/* 1057C8 802E3F48 00000000 */ nop -/* 1057CC 802E3F4C 8E020000 */ lw $v0, ($s0) -/* 1057D0 802E3F50 4600010D */ trunc.w.s $f4, $f0 -/* 1057D4 802E3F54 44032000 */ mfc1 $v1, $f4 -/* 1057D8 802E3F58 00521025 */ or $v0, $v0, $s2 -/* 1057DC 802E3F5C AE020000 */ sw $v0, ($s0) -/* 1057E0 802E3F60 86240010 */ lh $a0, 0x10($s1) -/* 1057E4 802E3F64 24020157 */ addiu $v0, $zero, 0x157 -/* 1057E8 802E3F68 54820013 */ bnel $a0, $v0, .L802E3FB8 -/* 1057EC 802E3F6C 24630168 */ addiu $v1, $v1, 0x168 -/* 1057F0 802E3F70 C602004C */ lwc1 $f2, 0x4c($s0) -/* 1057F4 802E3F74 24020015 */ addiu $v0, $zero, 0x15 -/* 1057F8 802E3F78 AFA20010 */ sw $v0, 0x10($sp) -/* 1057FC 802E3F7C AFA00014 */ sw $zero, 0x14($sp) -/* 105800 802E3F80 AFA30018 */ sw $v1, 0x18($sp) -/* 105804 802E3F84 9622000A */ lhu $v0, 0xa($s1) -/* 105808 802E3F88 3C01403C */ lui $at, 0x403c -/* 10580C 802E3F8C 44810800 */ mtc1 $at, $f1 -/* 105810 802E3F90 44800000 */ mtc1 $zero, $f0 -/* 105814 802E3F94 460010A1 */ cvt.d.s $f2, $f2 -/* 105818 802E3F98 46201080 */ add.d $f2, $f2, $f0 -/* 10581C 802E3F9C AFA2001C */ sw $v0, 0x1c($sp) -/* 105820 802E3FA0 8E050048 */ lw $a1, 0x48($s0) -/* 105824 802E3FA4 8E070050 */ lw $a3, 0x50($s0) -/* 105828 802E3FA8 462010A0 */ cvt.s.d $f2, $f2 -/* 10582C 802E3FAC 44061000 */ mfc1 $a2, $f2 -/* 105830 802E3FB0 080B9008 */ j .L802E4020 -/* 105834 802E3FB4 24040157 */ addiu $a0, $zero, 0x157 -.L802E3FB8: -/* 105838 802E3FB8 26050048 */ addiu $a1, $s0, 0x48 -/* 10583C 802E3FBC 00041140 */ sll $v0, $a0, 5 -/* 105840 802E3FC0 C600004C */ lwc1 $f0, 0x4c($s0) -/* 105844 802E3FC4 3C014034 */ lui $at, 0x4034 -/* 105848 802E3FC8 44811800 */ mtc1 $at, $f3 -/* 10584C 802E3FCC 44801000 */ mtc1 $zero, $f2 -/* 105850 802E3FD0 3C018008 */ lui $at, %hi(gItemTable+0x18) -/* 105854 802E3FD4 00220821 */ addu $at, $at, $v0 -/* 105858 802E3FD8 942278F8 */ lhu $v0, %lo(gItemTable+0x18)($at) -/* 10585C 802E3FDC 46000021 */ cvt.d.s $f0, $f0 -/* 105860 802E3FE0 46220000 */ add.d $f0, $f0, $f2 -/* 105864 802E3FE4 26070050 */ addiu $a3, $s0, 0x50 -/* 105868 802E3FE8 30420040 */ andi $v0, $v0, 0x40 -/* 10586C 802E3FEC 10400003 */ beqz $v0, .L802E3FFC -/* 105870 802E3FF0 46200020 */ cvt.s.d $f0, $f0 -/* 105874 802E3FF4 080B9000 */ j .L802E4000 -/* 105878 802E3FF8 2402000B */ addiu $v0, $zero, 0xb -.L802E3FFC: -/* 10587C 802E3FFC 2402000A */ addiu $v0, $zero, 0xa -.L802E4000: -/* 105880 802E4000 AFA20010 */ sw $v0, 0x10($sp) -/* 105884 802E4004 AFA00014 */ sw $zero, 0x14($sp) -/* 105888 802E4008 AFA30018 */ sw $v1, 0x18($sp) -/* 10588C 802E400C 9622000A */ lhu $v0, 0xa($s1) -/* 105890 802E4010 44060000 */ mfc1 $a2, $f0 -/* 105894 802E4014 AFA2001C */ sw $v0, 0x1c($sp) -/* 105898 802E4018 8CA50000 */ lw $a1, ($a1) -/* 10589C 802E401C 8CE70000 */ lw $a3, ($a3) -.L802E4020: -/* 1058A0 802E4020 0C04C4FD */ jal make_item_entity -/* 1058A4 802E4024 00000000 */ nop -.L802E4028: -/* 1058A8 802E4028 8FBF002C */ lw $ra, 0x2c($sp) -/* 1058AC 802E402C 8FB20028 */ lw $s2, 0x28($sp) -/* 1058B0 802E4030 8FB10024 */ lw $s1, 0x24($sp) -/* 1058B4 802E4034 8FB00020 */ lw $s0, 0x20($sp) -/* 1058B8 802E4038 03E00008 */ jr $ra -/* 1058BC 802E403C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/entity/SaveBlock/entity_SaveBlock_setupGfx.s b/ver/us/asm/nonmatchings/entity/SaveBlock/entity_SaveBlock_setupGfx.s deleted file mode 100644 index 48ec7d224d..0000000000 --- a/ver/us/asm/nonmatchings/entity/SaveBlock/entity_SaveBlock_setupGfx.s +++ /dev/null @@ -1,201 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_SaveBlock_setupGfx -/* 102660 802E0DE0 27BDFF28 */ addiu $sp, $sp, -0xd8 -/* 102664 802E0DE4 AFB000A8 */ sw $s0, 0xa8($sp) -/* 102668 802E0DE8 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* 10266C 802E0DEC 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) -/* 102670 802E0DF0 AFBF00CC */ sw $ra, 0xcc($sp) -/* 102674 802E0DF4 AFBE00C8 */ sw $fp, 0xc8($sp) -/* 102678 802E0DF8 AFB700C4 */ sw $s7, 0xc4($sp) -/* 10267C 802E0DFC AFB600C0 */ sw $s6, 0xc0($sp) -/* 102680 802E0E00 AFB500BC */ sw $s5, 0xbc($sp) -/* 102684 802E0E04 AFB400B8 */ sw $s4, 0xb8($sp) -/* 102688 802E0E08 AFB300B4 */ sw $s3, 0xb4($sp) -/* 10268C 802E0E0C AFB200B0 */ sw $s2, 0xb0($sp) -/* 102690 802E0E10 AFB100AC */ sw $s1, 0xac($sp) -/* 102694 802E0E14 F7B400D0 */ sdc1 $f20, 0xd0($sp) -/* 102698 802E0E18 0C04417A */ jal get_entity_by_index -/* 10269C 802E0E1C 3C170001 */ lui $s7, 1 -/* 1026A0 802E0E20 27A40018 */ addiu $a0, $sp, 0x18 -/* 1026A4 802E0E24 36F71630 */ ori $s7, $s7, 0x1630 -/* 1026A8 802E0E28 3C0DE200 */ lui $t5, 0xe200 -/* 1026AC 802E0E2C 35AD001C */ ori $t5, $t5, 0x1c -/* 1026B0 802E0E30 AFAD0098 */ sw $t5, 0x98($sp) -/* 1026B4 802E0E34 3C0DFCFF */ lui $t5, 0xfcff -/* 1026B8 802E0E38 35ADB3FF */ ori $t5, $t5, 0xb3ff -/* 1026BC 802E0E3C AFAD009C */ sw $t5, 0x9c($sp) -/* 1026C0 802E0E40 3C0DFF2C */ lui $t5, 0xff2c -/* 1026C4 802E0E44 35ADFE7F */ ori $t5, $t5, 0xfe7f -/* 1026C8 802E0E48 AFAD00A0 */ sw $t5, 0xa0($sp) -/* 1026CC 802E0E4C 3C0DD838 */ lui $t5, 0xd838 -/* 1026D0 802E0E50 0040B02D */ daddu $s6, $v0, $zero -/* 1026D4 802E0E54 3C140A00 */ lui $s4, 0xa00 -/* 1026D8 802E0E58 26943260 */ addiu $s4, $s4, 0x3260 -/* 1026DC 802E0E5C 3294FFFF */ andi $s4, $s4, 0xffff -/* 1026E0 802E0E60 AFAD00A4 */ sw $t5, 0xa4($sp) -/* 1026E4 802E0E64 8EC50044 */ lw $a1, 0x44($s6) -/* 1026E8 802E0E68 8ED20040 */ lw $s2, 0x40($s6) -/* 1026EC 802E0E6C 0C019D60 */ jal guMtxL2F -/* 1026F0 802E0E70 00B42821 */ addu $a1, $a1, $s4 -/* 1026F4 802E0E74 27B10058 */ addiu $s1, $sp, 0x58 -/* 1026F8 802E0E78 C7A0004C */ lwc1 $f0, 0x4c($sp) -/* 1026FC 802E0E7C 3C014148 */ lui $at, 0x4148 -/* 102700 802E0E80 4481A000 */ mtc1 $at, $f20 -/* 102704 802E0E84 44801000 */ mtc1 $zero, $f2 -/* 102708 802E0E88 8FAD00A4 */ lw $t5, 0xa4($sp) -/* 10270C 802E0E8C 3C073F80 */ lui $a3, 0x3f80 -/* 102710 802E0E90 46140000 */ add.s $f0, $f0, $f20 -/* 102714 802E0E94 35AD0002 */ ori $t5, $t5, 2 -/* 102718 802E0E98 AFAD00A4 */ sw $t5, 0xa4($sp) -/* 10271C 802E0E9C E7A0004C */ swc1 $f0, 0x4c($sp) -/* 102720 802E0EA0 86420004 */ lh $v0, 4($s2) -/* 102724 802E0EA4 44061000 */ mfc1 $a2, $f2 -/* 102728 802E0EA8 44822000 */ mtc1 $v0, $f4 -/* 10272C 802E0EAC 00000000 */ nop -/* 102730 802E0EB0 46802120 */ cvt.s.w $f4, $f4 -/* 102734 802E0EB4 44052000 */ mfc1 $a1, $f4 -/* 102738 802E0EB8 0220202D */ daddu $a0, $s1, $zero -/* 10273C 802E0EBC 0C019EC8 */ jal guRotateF -/* 102740 802E0EC0 AFA60010 */ sw $a2, 0x10($sp) -/* 102744 802E0EC4 0220202D */ daddu $a0, $s1, $zero -/* 102748 802E0EC8 27A50018 */ addiu $a1, $sp, 0x18 -/* 10274C 802E0ECC 0C019D80 */ jal guMtxCatF -/* 102750 802E0ED0 0220302D */ daddu $a2, $s1, $zero -/* 102754 802E0ED4 0220202D */ daddu $a0, $s1, $zero -/* 102758 802E0ED8 3C138007 */ lui $s3, %hi(gMatrixListPos) -/* 10275C 802E0EDC 267341F0 */ addiu $s3, $s3, %lo(gMatrixListPos) -/* 102760 802E0EE0 3C15800A */ lui $s5, %hi(gDisplayContext) -/* 102764 802E0EE4 26B5A674 */ addiu $s5, $s5, %lo(gDisplayContext) -/* 102768 802E0EE8 96650000 */ lhu $a1, ($s3) -/* 10276C 802E0EEC 8EA20000 */ lw $v0, ($s5) -/* 102770 802E0EF0 00052980 */ sll $a1, $a1, 6 -/* 102774 802E0EF4 00B72821 */ addu $a1, $a1, $s7 -/* 102778 802E0EF8 0C019D40 */ jal guMtxF2L -/* 10277C 802E0EFC 00452821 */ addu $a1, $v0, $a1 -/* 102780 802E0F00 0200382D */ daddu $a3, $s0, $zero -/* 102784 802E0F04 26100008 */ addiu $s0, $s0, 8 -/* 102788 802E0F08 0200402D */ daddu $t0, $s0, $zero -/* 10278C 802E0F0C 26100008 */ addiu $s0, $s0, 8 -/* 102790 802E0F10 3C0C0050 */ lui $t4, 0x50 -/* 102794 802E0F14 358C4B50 */ ori $t4, $t4, 0x4b50 -/* 102798 802E0F18 0200302D */ daddu $a2, $s0, $zero -/* 10279C 802E0F1C 26100008 */ addiu $s0, $s0, 8 -/* 1027A0 802E0F20 0200482D */ daddu $t1, $s0, $zero -/* 1027A4 802E0F24 26100008 */ addiu $s0, $s0, 8 -/* 1027A8 802E0F28 0200502D */ daddu $t2, $s0, $zero -/* 1027AC 802E0F2C 26100008 */ addiu $s0, $s0, 8 -/* 1027B0 802E0F30 0200582D */ daddu $t3, $s0, $zero -/* 1027B4 802E0F34 26100008 */ addiu $s0, $s0, 8 -/* 1027B8 802E0F38 0220202D */ daddu $a0, $s1, $zero -/* 1027BC 802E0F3C 96650000 */ lhu $a1, ($s3) -/* 1027C0 802E0F40 3C0DDA38 */ lui $t5, 0xda38 -/* 1027C4 802E0F44 ACED0000 */ sw $t5, ($a3) -/* 1027C8 802E0F48 8EA30000 */ lw $v1, ($s5) -/* 1027CC 802E0F4C 30A2FFFF */ andi $v0, $a1, 0xffff -/* 1027D0 802E0F50 00021180 */ sll $v0, $v0, 6 -/* 1027D4 802E0F54 00571021 */ addu $v0, $v0, $s7 -/* 1027D8 802E0F58 00621821 */ addu $v1, $v1, $v0 -/* 1027DC 802E0F5C ACE30004 */ sw $v1, 4($a3) -/* 1027E0 802E0F60 8FAD0098 */ lw $t5, 0x98($sp) -/* 1027E4 802E0F64 241E0040 */ addiu $fp, $zero, 0x40 -/* 1027E8 802E0F68 AD0C0004 */ sw $t4, 4($t0) -/* 1027EC 802E0F6C AD0D0000 */ sw $t5, ($t0) -/* 1027F0 802E0F70 8FAD009C */ lw $t5, 0x9c($sp) -/* 1027F4 802E0F74 3C020A00 */ lui $v0, 0xa00 -/* 1027F8 802E0F78 244234E0 */ addiu $v0, $v0, 0x34e0 -/* 1027FC 802E0F7C ACCD0000 */ sw $t5, ($a2) -/* 102800 802E0F80 8FAD00A0 */ lw $t5, 0xa0($sp) -/* 102804 802E0F84 24A50001 */ addiu $a1, $a1, 1 -/* 102808 802E0F88 ACCD0004 */ sw $t5, 4($a2) -/* 10280C 802E0F8C 3C0DFA00 */ lui $t5, 0xfa00 -/* 102810 802E0F90 AD2D0000 */ sw $t5, ($t1) -/* 102814 802E0F94 240D0080 */ addiu $t5, $zero, 0x80 -/* 102818 802E0F98 AD2D0004 */ sw $t5, 4($t1) -/* 10281C 802E0F9C 3C0DDE00 */ lui $t5, 0xde00 -/* 102820 802E0FA0 AD4D0000 */ sw $t5, ($t2) -/* 102824 802E0FA4 AD420004 */ sw $v0, 4($t2) -/* 102828 802E0FA8 8FAD00A4 */ lw $t5, 0xa4($sp) -/* 10282C 802E0FAC 3C020A00 */ lui $v0, 0xa00 -/* 102830 802E0FB0 244234F0 */ addiu $v0, $v0, 0x34f0 -/* 102834 802E0FB4 AD7E0004 */ sw $fp, 4($t3) -/* 102838 802E0FB8 AD6D0000 */ sw $t5, ($t3) -/* 10283C 802E0FBC 8ED20044 */ lw $s2, 0x44($s6) -/* 102840 802E0FC0 3042FFFF */ andi $v0, $v0, 0xffff -/* 102844 802E0FC4 A6650000 */ sh $a1, ($s3) -/* 102848 802E0FC8 02542821 */ addu $a1, $s2, $s4 -/* 10284C 802E0FCC 0C019D60 */ jal guMtxL2F -/* 102850 802E0FD0 02429021 */ addu $s2, $s2, $v0 -/* 102854 802E0FD4 0200182D */ daddu $v1, $s0, $zero -/* 102858 802E0FD8 26100008 */ addiu $s0, $s0, 8 -/* 10285C 802E0FDC 0220202D */ daddu $a0, $s1, $zero -/* 102860 802E0FE0 96650000 */ lhu $a1, ($s3) -/* 102864 802E0FE4 C7A0008C */ lwc1 $f0, 0x8c($sp) -/* 102868 802E0FE8 8EA20000 */ lw $v0, ($s5) -/* 10286C 802E0FEC 00052980 */ sll $a1, $a1, 6 -/* 102870 802E0FF0 00B72821 */ addu $a1, $a1, $s7 -/* 102874 802E0FF4 46140000 */ add.s $f0, $f0, $f20 -/* 102878 802E0FF8 00452821 */ addu $a1, $v0, $a1 -/* 10287C 802E0FFC 3C02E700 */ lui $v0, 0xe700 -/* 102880 802E1000 E7A0008C */ swc1 $f0, 0x8c($sp) -/* 102884 802E1004 AC620000 */ sw $v0, ($v1) -/* 102888 802E1008 0C019D40 */ jal guMtxF2L -/* 10288C 802E100C AC600004 */ sw $zero, 4($v1) -/* 102890 802E1010 0200402D */ daddu $t0, $s0, $zero -/* 102894 802E1014 26100008 */ addiu $s0, $s0, 8 -/* 102898 802E1018 0200482D */ daddu $t1, $s0, $zero -/* 10289C 802E101C 26100008 */ addiu $s0, $s0, 8 -/* 1028A0 802E1020 3C0A0050 */ lui $t2, 0x50 -/* 1028A4 802E1024 0200202D */ daddu $a0, $s0, $zero -/* 1028A8 802E1028 26100008 */ addiu $s0, $s0, 8 -/* 1028AC 802E102C 0200282D */ daddu $a1, $s0, $zero -/* 1028B0 802E1030 26100008 */ addiu $s0, $s0, 8 -/* 1028B4 802E1034 0200302D */ daddu $a2, $s0, $zero -/* 1028B8 802E1038 26100008 */ addiu $s0, $s0, 8 -/* 1028BC 802E103C 0200382D */ daddu $a3, $s0, $zero -/* 1028C0 802E1040 26100008 */ addiu $s0, $s0, 8 -/* 1028C4 802E1044 96620000 */ lhu $v0, ($s3) -/* 1028C8 802E1048 3C0DDA38 */ lui $t5, 0xda38 -/* 1028CC 802E104C AD0D0000 */ sw $t5, ($t0) -/* 1028D0 802E1050 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* 1028D4 802E1054 AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) -/* 1028D8 802E1058 24430001 */ addiu $v1, $v0, 1 -/* 1028DC 802E105C 3042FFFF */ andi $v0, $v0, 0xffff -/* 1028E0 802E1060 00021180 */ sll $v0, $v0, 6 -/* 1028E4 802E1064 A6630000 */ sh $v1, ($s3) -/* 1028E8 802E1068 8EA30000 */ lw $v1, ($s5) -/* 1028EC 802E106C 00571021 */ addu $v0, $v0, $s7 -/* 1028F0 802E1070 00621821 */ addu $v1, $v1, $v0 -/* 1028F4 802E1074 AD030004 */ sw $v1, 4($t0) -/* 1028F8 802E1078 8FAD0098 */ lw $t5, 0x98($sp) -/* 1028FC 802E107C 354A41D8 */ ori $t2, $t2, 0x41d8 -/* 102900 802E1080 AD2D0000 */ sw $t5, ($t1) -/* 102904 802E1084 AD2A0004 */ sw $t2, 4($t1) -/* 102908 802E1088 8FAD009C */ lw $t5, 0x9c($sp) -/* 10290C 802E108C AC8D0000 */ sw $t5, ($a0) -/* 102910 802E1090 8FAD00A0 */ lw $t5, 0xa0($sp) -/* 102914 802E1094 AC8D0004 */ sw $t5, 4($a0) -/* 102918 802E1098 3C0DFA00 */ lui $t5, 0xfa00 -/* 10291C 802E109C ACAD0000 */ sw $t5, ($a1) -/* 102920 802E10A0 240D0080 */ addiu $t5, $zero, 0x80 -/* 102924 802E10A4 ACAD0004 */ sw $t5, 4($a1) -/* 102928 802E10A8 3C0DDE00 */ lui $t5, 0xde00 -/* 10292C 802E10AC ACCD0000 */ sw $t5, ($a2) -/* 102930 802E10B0 ACD20004 */ sw $s2, 4($a2) -/* 102934 802E10B4 8FAD00A4 */ lw $t5, 0xa4($sp) -/* 102938 802E10B8 ACED0000 */ sw $t5, ($a3) -/* 10293C 802E10BC ACFE0004 */ sw $fp, 4($a3) -/* 102940 802E10C0 8FBF00CC */ lw $ra, 0xcc($sp) -/* 102944 802E10C4 8FBE00C8 */ lw $fp, 0xc8($sp) -/* 102948 802E10C8 8FB700C4 */ lw $s7, 0xc4($sp) -/* 10294C 802E10CC 8FB600C0 */ lw $s6, 0xc0($sp) -/* 102950 802E10D0 8FB500BC */ lw $s5, 0xbc($sp) -/* 102954 802E10D4 8FB400B8 */ lw $s4, 0xb8($sp) -/* 102958 802E10D8 8FB300B4 */ lw $s3, 0xb4($sp) -/* 10295C 802E10DC 8FB200B0 */ lw $s2, 0xb0($sp) -/* 102960 802E10E0 8FB100AC */ lw $s1, 0xac($sp) -/* 102964 802E10E4 8FB000A8 */ lw $s0, 0xa8($sp) -/* 102968 802E10E8 D7B400D0 */ ldc1 $f20, 0xd0($sp) -/* 10296C 802E10EC 03E00008 */ jr $ra -/* 102970 802E10F0 27BD00D8 */ addiu $sp, $sp, 0xd8 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_flip_over.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_flip_over.s deleted file mode 100644 index d6bfe687c5..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_flip_over.s +++ /dev/null @@ -1,420 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802EB2B0 -.word .L802E663C_107EBC, .L802E66F4_107F74, .L802E67E8_108068, .L802E685C_1080DC, .L802E697C_1081FC, .L802E698C_10820C, .L802E6AD4_108354, .L802E6AD4_108354, .L802E6AD4_108354, .L802E6AD4_108354, .L802E69A8_108228, .L802E69E0_108260, .L802E6A48_1082C8, 0, 0, 0 - -.section .text - -glabel entity_HiddenPanel_flip_over -/* 107DF4 802E6574 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 107DF8 802E6578 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 107DFC 802E657C 3C014234 */ lui $at, 0x4234 -/* 107E00 802E6580 44816000 */ mtc1 $at, $f12 -/* 107E04 802E6584 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 107E08 802E6588 AFB1001C */ sw $s1, 0x1c($sp) -/* 107E0C 802E658C 0080882D */ daddu $s1, $a0, $zero -/* 107E10 802E6590 AFBF0024 */ sw $ra, 0x24($sp) -/* 107E14 802E6594 AFB20020 */ sw $s2, 0x20($sp) -/* 107E18 802E6598 AFB00018 */ sw $s0, 0x18($sp) -/* 107E1C 802E659C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 107E20 802E65A0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 107E24 802E65A4 8E300040 */ lw $s0, 0x40($s1) -/* 107E28 802E65A8 0C00A6C9 */ jal clamp_angle -/* 107E2C 802E65AC 460C0300 */ add.s $f12, $f0, $f12 -/* 107E30 802E65B0 3C0142B4 */ lui $at, 0x42b4 -/* 107E34 802E65B4 44811000 */ mtc1 $at, $f2 -/* 107E38 802E65B8 46000106 */ mov.s $f4, $f0 -/* 107E3C 802E65BC 4602203C */ c.lt.s $f4, $f2 -/* 107E40 802E65C0 00000000 */ nop -/* 107E44 802E65C4 4501000F */ bc1t .L802E6604 -/* 107E48 802E65C8 00000000 */ nop -/* 107E4C 802E65CC 3C014334 */ lui $at, 0x4334 -/* 107E50 802E65D0 44810000 */ mtc1 $at, $f0 -/* 107E54 802E65D4 00000000 */ nop -/* 107E58 802E65D8 4604003E */ c.le.s $f0, $f4 -/* 107E5C 802E65DC 00000000 */ nop -/* 107E60 802E65E0 4500000B */ bc1f .L802E6610 -/* 107E64 802E65E4 00000000 */ nop -/* 107E68 802E65E8 3C014387 */ lui $at, 0x4387 -/* 107E6C 802E65EC 44810000 */ mtc1 $at, $f0 -/* 107E70 802E65F0 00000000 */ nop -/* 107E74 802E65F4 4600203C */ c.lt.s $f4, $f0 -/* 107E78 802E65F8 00000000 */ nop -/* 107E7C 802E65FC 45000004 */ bc1f .L802E6610 -/* 107E80 802E6600 00000000 */ nop -.L802E6604: -/* 107E84 802E6604 C6340068 */ lwc1 $f20, 0x68($s1) -/* 107E88 802E6608 080B9986 */ j .L802E6618 -/* 107E8C 802E660C 24120001 */ addiu $s2, $zero, 1 -.L802E6610: -/* 107E90 802E6610 C6340060 */ lwc1 $f20, 0x60($s1) -/* 107E94 802E6614 0000902D */ daddu $s2, $zero, $zero -.L802E6618: -/* 107E98 802E6618 82030000 */ lb $v1, ($s0) -/* 107E9C 802E661C 2C62000D */ sltiu $v0, $v1, 0xd -/* 107EA0 802E6620 1040012C */ beqz $v0, .L802E6AD4_108354 -/* 107EA4 802E6624 00031080 */ sll $v0, $v1, 2 -/* 107EA8 802E6628 3C01802F */ lui $at, %hi(jtbl_802EB2B0) -/* 107EAC 802E662C 00220821 */ addu $at, $at, $v0 -/* 107EB0 802E6630 8C22B2B0 */ lw $v0, %lo(jtbl_802EB2B0)($at) -/* 107EB4 802E6634 00400008 */ jr $v0 -/* 107EB8 802E6638 00000000 */ nop -.L802E663C_107EBC: -/* 107EBC 802E663C 0C05272D */ jal sfx_play_sound -/* 107EC0 802E6640 240420AB */ addiu $a0, $zero, 0x20ab -/* 107EC4 802E6644 24040001 */ addiu $a0, $zero, 1 -/* 107EC8 802E6648 3C0142B4 */ lui $at, 0x42b4 -/* 107ECC 802E664C 44810000 */ mtc1 $at, $f0 -/* 107ED0 802E6650 3C014282 */ lui $at, 0x4282 -/* 107ED4 802E6654 44811000 */ mtc1 $at, $f2 -/* 107ED8 802E6658 0080102D */ daddu $v0, $a0, $zero -/* 107EDC 802E665C A2020000 */ sb $v0, ($s0) -/* 107EE0 802E6660 A2020002 */ sb $v0, 2($s0) -/* 107EE4 802E6664 E600002C */ swc1 $f0, 0x2c($s0) -/* 107EE8 802E6668 0C009C22 */ jal set_time_freeze_mode -/* 107EEC 802E666C E6020030 */ swc1 $f2, 0x30($s0) -/* 107EF0 802E6670 0C038045 */ jal disable_player_static_collisions -/* 107EF4 802E6674 00000000 */ nop -/* 107EF8 802E6678 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* 107EFC 802E667C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* 107F00 802E6680 8C620004 */ lw $v0, 4($v1) -/* 107F04 802E6684 34420800 */ ori $v0, $v0, 0x800 -/* 107F08 802E6688 AC620004 */ sw $v0, 4($v1) -/* 107F0C 802E668C 82020003 */ lb $v0, 3($s0) -/* 107F10 802E6690 10400013 */ beqz $v0, .L802E66E0 -/* 107F14 802E6694 24020005 */ addiu $v0, $zero, 5 -/* 107F18 802E6698 A2000003 */ sb $zero, 3($s0) -/* 107F1C 802E669C C620004C */ lwc1 $f0, 0x4c($s1) -/* 107F20 802E66A0 AFA20010 */ sw $v0, 0x10($sp) -/* 107F24 802E66A4 96020006 */ lhu $v0, 6($s0) -/* 107F28 802E66A8 3C014000 */ lui $at, 0x4000 -/* 107F2C 802E66AC 44811800 */ mtc1 $at, $f3 -/* 107F30 802E66B0 44801000 */ mtc1 $zero, $f2 -/* 107F34 802E66B4 46000021 */ cvt.d.s $f0, $f0 -/* 107F38 802E66B8 46220000 */ add.d $f0, $f0, $f2 -/* 107F3C 802E66BC AFA20014 */ sw $v0, 0x14($sp) -/* 107F40 802E66C0 8E040010 */ lw $a0, 0x10($s0) -/* 107F44 802E66C4 8E250048 */ lw $a1, 0x48($s1) -/* 107F48 802E66C8 8E270050 */ lw $a3, 0x50($s1) -/* 107F4C 802E66CC 46200020 */ cvt.s.d $f0, $f0 -/* 107F50 802E66D0 44060000 */ mfc1 $a2, $f0 -/* 107F54 802E66D4 0C04C6A5 */ jal make_item_entity_nodelay -/* 107F58 802E66D8 00000000 */ nop -/* 107F5C 802E66DC AE020014 */ sw $v0, 0x14($s0) -.L802E66E0: -/* 107F60 802E66E0 8E220000 */ lw $v0, ($s1) -/* 107F64 802E66E4 2403FFFE */ addiu $v1, $zero, -2 -/* 107F68 802E66E8 00431024 */ and $v0, $v0, $v1 -/* 107F6C 802E66EC 080B9AB5 */ j .L802E6AD4_108354 -/* 107F70 802E66F0 AE220000 */ sw $v0, ($s1) -.L802E66F4_107F74: -/* 107F74 802E66F4 C60C002C */ lwc1 $f12, 0x2c($s0) -/* 107F78 802E66F8 3C0140C9 */ lui $at, 0x40c9 -/* 107F7C 802E66FC 34210FD0 */ ori $at, $at, 0xfd0 -/* 107F80 802E6700 44810000 */ mtc1 $at, $f0 -/* 107F84 802E6704 00000000 */ nop -/* 107F88 802E6708 46006302 */ mul.s $f12, $f12, $f0 -/* 107F8C 802E670C 00000000 */ nop -/* 107F90 802E6710 3C0143B4 */ lui $at, 0x43b4 -/* 107F94 802E6714 4481B000 */ mtc1 $at, $f22 -/* 107F98 802E6718 0C00A85B */ jal sin_rad -/* 107F9C 802E671C 46166303 */ div.s $f12, $f12, $f22 -/* 107FA0 802E6720 C6020028 */ lwc1 $f2, 0x28($s0) -/* 107FA4 802E6724 46001082 */ mul.s $f2, $f2, $f0 -/* 107FA8 802E6728 00000000 */ nop -/* 107FAC 802E672C C620004C */ lwc1 $f0, 0x4c($s1) -/* 107FB0 802E6730 46020000 */ add.s $f0, $f0, $f2 -/* 107FB4 802E6734 E620004C */ swc1 $f0, 0x4c($s1) -/* 107FB8 802E6738 C6020024 */ lwc1 $f2, 0x24($s0) -/* 107FBC 802E673C 4602003E */ c.le.s $f0, $f2 -/* 107FC0 802E6740 00000000 */ nop -/* 107FC4 802E6744 45000006 */ bc1f .L802E6760 -/* 107FC8 802E6748 2402000A */ addiu $v0, $zero, 0xa -/* 107FCC 802E674C AE200068 */ sw $zero, 0x68($s1) -/* 107FD0 802E6750 C6340068 */ lwc1 $f20, 0x68($s1) -/* 107FD4 802E6754 E622004C */ swc1 $f2, 0x4c($s1) -/* 107FD8 802E6758 AE200060 */ sw $zero, 0x60($s1) -/* 107FDC 802E675C A2020001 */ sb $v0, 1($s0) -.L802E6760: -/* 107FE0 802E6760 C600002C */ lwc1 $f0, 0x2c($s0) -/* 107FE4 802E6764 3C014120 */ lui $at, 0x4120 -/* 107FE8 802E6768 44811000 */ mtc1 $at, $f2 -/* 107FEC 802E676C 00000000 */ nop -/* 107FF0 802E6770 46020000 */ add.s $f0, $f0, $f2 -/* 107FF4 802E6774 3C014334 */ lui $at, 0x4334 -/* 107FF8 802E6778 44811000 */ mtc1 $at, $f2 -/* 107FFC 802E677C 00000000 */ nop -/* 108000 802E6780 4600103E */ c.le.s $f2, $f0 -/* 108004 802E6784 00000000 */ nop -/* 108008 802E6788 45000007 */ bc1f .L802E67A8 -/* 10800C 802E678C E600002C */ swc1 $f0, 0x2c($s0) -/* 108010 802E6790 92020000 */ lbu $v0, ($s0) -/* 108014 802E6794 24030007 */ addiu $v1, $zero, 7 -/* 108018 802E6798 E602002C */ swc1 $f2, 0x2c($s0) -/* 10801C 802E679C A2030001 */ sb $v1, 1($s0) -/* 108020 802E67A0 24420001 */ addiu $v0, $v0, 1 -/* 108024 802E67A4 A2020000 */ sb $v0, ($s0) -.L802E67A8: -/* 108028 802E67A8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 10802C 802E67AC 3C0142DC */ lui $at, 0x42dc -/* 108030 802E67B0 44810000 */ mtc1 $at, $f0 -/* 108034 802E67B4 00000000 */ nop -/* 108038 802E67B8 4602003C */ c.lt.s $f0, $f2 -/* 10803C 802E67BC 00000000 */ nop -/* 108040 802E67C0 450000C4 */ bc1f .L802E6AD4_108354 -/* 108044 802E67C4 00000000 */ nop -/* 108048 802E67C8 C6000030 */ lwc1 $f0, 0x30($s0) -/* 10804C 802E67CC 4600A500 */ add.s $f20, $f20, $f0 -/* 108050 802E67D0 4614B03E */ c.le.s $f22, $f20 -/* 108054 802E67D4 00000000 */ nop -/* 108058 802E67D8 450300BE */ bc1tl .L802E6AD4_108354 -/* 10805C 802E67DC 4616A501 */ sub.s $f20, $f20, $f22 -/* 108060 802E67E0 080B9AB5 */ j .L802E6AD4_108354 -/* 108064 802E67E4 00000000 */ nop -.L802E67E8_108068: -/* 108068 802E67E8 C6000030 */ lwc1 $f0, 0x30($s0) -/* 10806C 802E67EC 3C014000 */ lui $at, 0x4000 -/* 108070 802E67F0 44811000 */ mtc1 $at, $f2 -/* 108074 802E67F4 00000000 */ nop -/* 108078 802E67F8 46020001 */ sub.s $f0, $f0, $f2 -/* 10807C 802E67FC 44801000 */ mtc1 $zero, $f2 -/* 108080 802E6800 00000000 */ nop -/* 108084 802E6804 4602003E */ c.le.s $f0, $f2 -/* 108088 802E6808 00000000 */ nop -/* 10808C 802E680C 45000002 */ bc1f .L802E6818 -/* 108090 802E6810 E6000030 */ swc1 $f0, 0x30($s0) -/* 108094 802E6814 E6020030 */ swc1 $f2, 0x30($s0) -.L802E6818: -/* 108098 802E6818 C6000030 */ lwc1 $f0, 0x30($s0) -/* 10809C 802E681C 4600A500 */ add.s $f20, $f20, $f0 -/* 1080A0 802E6820 3C0143B4 */ lui $at, 0x43b4 -/* 1080A4 802E6824 44810000 */ mtc1 $at, $f0 -/* 1080A8 802E6828 00000000 */ nop -/* 1080AC 802E682C 4614003E */ c.le.s $f0, $f20 -/* 1080B0 802E6830 00000000 */ nop -/* 1080B4 802E6834 45030001 */ bc1tl .L802E683C -/* 1080B8 802E6838 4600A501 */ sub.s $f20, $f20, $f0 -.L802E683C: -/* 1080BC 802E683C 92020001 */ lbu $v0, 1($s0) -/* 1080C0 802E6840 2442FFFF */ addiu $v0, $v0, -1 -/* 1080C4 802E6844 A2020001 */ sb $v0, 1($s0) -/* 1080C8 802E6848 00021600 */ sll $v0, $v0, 0x18 -/* 1080CC 802E684C 1840004B */ blez $v0, .L802E697C_1081FC -/* 1080D0 802E6850 00000000 */ nop -/* 1080D4 802E6854 080B9AB5 */ j .L802E6AD4_108354 -/* 1080D8 802E6858 00000000 */ nop -.L802E685C_1080DC: -/* 1080DC 802E685C C6000030 */ lwc1 $f0, 0x30($s0) -/* 1080E0 802E6860 3C0140A0 */ lui $at, 0x40a0 -/* 1080E4 802E6864 44811000 */ mtc1 $at, $f2 -/* 1080E8 802E6868 00000000 */ nop -/* 1080EC 802E686C 46020001 */ sub.s $f0, $f0, $f2 -/* 1080F0 802E6870 4480B000 */ mtc1 $zero, $f22 -/* 1080F4 802E6874 00000000 */ nop -/* 1080F8 802E6878 4616003E */ c.le.s $f0, $f22 -/* 1080FC 802E687C 00000000 */ nop -/* 108100 802E6880 45000002 */ bc1f .L802E688C -/* 108104 802E6884 E6000030 */ swc1 $f0, 0x30($s0) -/* 108108 802E6888 E6160030 */ swc1 $f22, 0x30($s0) -.L802E688C: -/* 10810C 802E688C C6000030 */ lwc1 $f0, 0x30($s0) -/* 108110 802E6890 4600A500 */ add.s $f20, $f20, $f0 -/* 108114 802E6894 3C0143B4 */ lui $at, 0x43b4 -/* 108118 802E6898 44811000 */ mtc1 $at, $f2 -/* 10811C 802E689C 00000000 */ nop -/* 108120 802E68A0 4614103E */ c.le.s $f2, $f20 -/* 108124 802E68A4 00000000 */ nop -/* 108128 802E68A8 45030001 */ bc1tl .L802E68B0 -/* 10812C 802E68AC 46001506 */ mov.s $f20, $f2 -.L802E68B0: -/* 108130 802E68B0 C60C002C */ lwc1 $f12, 0x2c($s0) -/* 108134 802E68B4 3C0140C9 */ lui $at, 0x40c9 -/* 108138 802E68B8 34210FD0 */ ori $at, $at, 0xfd0 -/* 10813C 802E68BC 44810000 */ mtc1 $at, $f0 -/* 108140 802E68C0 00000000 */ nop -/* 108144 802E68C4 46006302 */ mul.s $f12, $f12, $f0 -/* 108148 802E68C8 00000000 */ nop -/* 10814C 802E68CC 0C00A85B */ jal sin_rad -/* 108150 802E68D0 46026303 */ div.s $f12, $f12, $f2 -/* 108154 802E68D4 C6020028 */ lwc1 $f2, 0x28($s0) -/* 108158 802E68D8 46001082 */ mul.s $f2, $f2, $f0 -/* 10815C 802E68DC 00000000 */ nop -/* 108160 802E68E0 C620004C */ lwc1 $f0, 0x4c($s1) -/* 108164 802E68E4 46020000 */ add.s $f0, $f0, $f2 -/* 108168 802E68E8 3C014120 */ lui $at, 0x4120 -/* 10816C 802E68EC 44811000 */ mtc1 $at, $f2 -/* 108170 802E68F0 E620004C */ swc1 $f0, 0x4c($s1) -/* 108174 802E68F4 C600002C */ lwc1 $f0, 0x2c($s0) -/* 108178 802E68F8 46020000 */ add.s $f0, $f0, $f2 -/* 10817C 802E68FC 3C014387 */ lui $at, 0x4387 -/* 108180 802E6900 44811000 */ mtc1 $at, $f2 -/* 108184 802E6904 00000000 */ nop -/* 108188 802E6908 4600103C */ c.lt.s $f2, $f0 -/* 10818C 802E690C 00000000 */ nop -/* 108190 802E6910 45000002 */ bc1f .L802E691C -/* 108194 802E6914 E600002C */ swc1 $f0, 0x2c($s0) -/* 108198 802E6918 E602002C */ swc1 $f2, 0x2c($s0) -.L802E691C: -/* 10819C 802E691C C622004C */ lwc1 $f2, 0x4c($s1) -/* 1081A0 802E6920 C6000024 */ lwc1 $f0, 0x24($s0) -/* 1081A4 802E6924 4600103E */ c.le.s $f2, $f0 -/* 1081A8 802E6928 00000000 */ nop -/* 1081AC 802E692C 45000069 */ bc1f .L802E6AD4_108354 -/* 1081B0 802E6930 0000202D */ daddu $a0, $zero, $zero -/* 1081B4 802E6934 4600B506 */ mov.s $f20, $f22 -/* 1081B8 802E6938 24050002 */ addiu $a1, $zero, 2 -/* 1081BC 802E693C 24060001 */ addiu $a2, $zero, 1 -/* 1081C0 802E6940 92020000 */ lbu $v0, ($s0) -/* 1081C4 802E6944 3C073E4C */ lui $a3, 0x3e4c -/* 1081C8 802E6948 34E7CCCD */ ori $a3, $a3, 0xcccd -/* 1081CC 802E694C 00461021 */ addu $v0, $v0, $a2 -/* 1081D0 802E6950 A2020000 */ sb $v0, ($s0) -/* 1081D4 802E6954 2402000A */ addiu $v0, $zero, 0xa -/* 1081D8 802E6958 E620004C */ swc1 $f0, 0x4c($s1) -/* 1081DC 802E695C E6340060 */ swc1 $f20, 0x60($s1) -/* 1081E0 802E6960 E6340068 */ swc1 $f20, 0x68($s1) -/* 1081E4 802E6964 0C0B2D72 */ jal exec_ShakeCamX -/* 1081E8 802E6968 A2020001 */ sb $v0, 1($s0) -/* 1081EC 802E696C 0C05272D */ jal sfx_play_sound -/* 1081F0 802E6970 240420AC */ addiu $a0, $zero, 0x20ac -/* 1081F4 802E6974 080B9AB5 */ j .L802E6AD4_108354 -/* 1081F8 802E6978 00000000 */ nop -.L802E697C_1081FC: -/* 1081FC 802E697C 92020000 */ lbu $v0, ($s0) -/* 108200 802E6980 24420001 */ addiu $v0, $v0, 1 -/* 108204 802E6984 080B9AB5 */ j .L802E6AD4_108354 -/* 108208 802E6988 A2020000 */ sb $v0, ($s0) -.L802E698C_10820C: -/* 10820C 802E698C 2402000B */ addiu $v0, $zero, 0xb -/* 108210 802E6990 A2020000 */ sb $v0, ($s0) -/* 108214 802E6994 C620004C */ lwc1 $f0, 0x4c($s1) -/* 108218 802E6998 3C014000 */ lui $at, 0x4000 -/* 10821C 802E699C 44811000 */ mtc1 $at, $f2 -/* 108220 802E69A0 080B9A76 */ j .L802E69D8 -/* 108224 802E69A4 46020000 */ add.s $f0, $f0, $f2 -.L802E69A8_108228: -/* 108228 802E69A8 2403FFFE */ addiu $v1, $zero, -2 -/* 10822C 802E69AC 8E220000 */ lw $v0, ($s1) -/* 108230 802E69B0 3C0140C0 */ lui $at, 0x40c0 -/* 108234 802E69B4 44811000 */ mtc1 $at, $f2 -/* 108238 802E69B8 00431024 */ and $v0, $v0, $v1 -/* 10823C 802E69BC AE220000 */ sw $v0, ($s1) -/* 108240 802E69C0 92020000 */ lbu $v0, ($s0) -/* 108244 802E69C4 A2000002 */ sb $zero, 2($s0) -/* 108248 802E69C8 24420001 */ addiu $v0, $v0, 1 -/* 10824C 802E69CC A2020000 */ sb $v0, ($s0) -/* 108250 802E69D0 C620004C */ lwc1 $f0, 0x4c($s1) -/* 108254 802E69D4 46020000 */ add.s $f0, $f0, $f2 -.L802E69D8: -/* 108258 802E69D8 080B9AB5 */ j .L802E6AD4_108354 -/* 10825C 802E69DC E620004C */ swc1 $f0, 0x4c($s1) -.L802E69E0_108260: -/* 108260 802E69E0 C620004C */ lwc1 $f0, 0x4c($s1) -/* 108264 802E69E4 3C013F80 */ lui $at, 0x3f80 -/* 108268 802E69E8 44811000 */ mtc1 $at, $f2 -/* 10826C 802E69EC 00000000 */ nop -/* 108270 802E69F0 46020001 */ sub.s $f0, $f0, $f2 -/* 108274 802E69F4 E620004C */ swc1 $f0, 0x4c($s1) -/* 108278 802E69F8 C6020024 */ lwc1 $f2, 0x24($s0) -/* 10827C 802E69FC 4602003E */ c.le.s $f0, $f2 -/* 108280 802E6A00 00000000 */ nop -/* 108284 802E6A04 45000033 */ bc1f .L802E6AD4_108354 -/* 108288 802E6A08 24030001 */ addiu $v1, $zero, 1 -/* 10828C 802E6A0C E622004C */ swc1 $f2, 0x4c($s1) -/* 108290 802E6A10 92020000 */ lbu $v0, ($s0) -/* 108294 802E6A14 A2030001 */ sb $v1, 1($s0) -/* 108298 802E6A18 24420001 */ addiu $v0, $v0, 1 -/* 10829C 802E6A1C A2020000 */ sb $v0, ($s0) -/* 1082A0 802E6A20 8E220000 */ lw $v0, ($s1) -/* 1082A4 802E6A24 34420021 */ ori $v0, $v0, 0x21 -/* 1082A8 802E6A28 AE220000 */ sw $v0, ($s1) -/* 1082AC 802E6A2C 82020002 */ lb $v0, 2($s0) -/* 1082B0 802E6A30 10400028 */ beqz $v0, .L802E6AD4_108354 -/* 1082B4 802E6A34 00000000 */ nop -/* 1082B8 802E6A38 0C038050 */ jal enable_player_static_collisions -/* 1082BC 802E6A3C 00000000 */ nop -/* 1082C0 802E6A40 080B9AB5 */ j .L802E6AD4_108354 -/* 1082C4 802E6A44 00000000 */ nop -.L802E6A48_1082C8: -/* 1082C8 802E6A48 92020001 */ lbu $v0, 1($s0) -/* 1082CC 802E6A4C 2442FFFF */ addiu $v0, $v0, -1 -/* 1082D0 802E6A50 A2020001 */ sb $v0, 1($s0) -/* 1082D4 802E6A54 00021600 */ sll $v0, $v0, 0x18 -/* 1082D8 802E6A58 0441001E */ bgez $v0, .L802E6AD4_108354 -/* 1082DC 802E6A5C 0220202D */ daddu $a0, $s1, $zero -/* 1082E0 802E6A60 0C043F5A */ jal exec_entity_commandlist -/* 1082E4 802E6A64 A2000000 */ sb $zero, ($s0) -/* 1082E8 802E6A68 82020002 */ lb $v0, 2($s0) -/* 1082EC 802E6A6C 10400009 */ beqz $v0, .L802E6A94 -/* 1082F0 802E6A70 00000000 */ nop -/* 1082F4 802E6A74 0C009C22 */ jal set_time_freeze_mode -/* 1082F8 802E6A78 0000202D */ daddu $a0, $zero, $zero -/* 1082FC 802E6A7C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 108300 802E6A80 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 108304 802E6A84 8C430004 */ lw $v1, 4($v0) -/* 108308 802E6A88 2404F7FF */ addiu $a0, $zero, -0x801 -/* 10830C 802E6A8C 00641824 */ and $v1, $v1, $a0 -/* 108310 802E6A90 AC430004 */ sw $v1, 4($v0) -.L802E6A94: -/* 108314 802E6A94 8E220000 */ lw $v0, ($s1) -/* 108318 802E6A98 2403FFDF */ addiu $v1, $zero, -0x21 -/* 10831C 802E6A9C 00431024 */ and $v0, $v0, $v1 -/* 108320 802E6AA0 AE220000 */ sw $v0, ($s1) -/* 108324 802E6AA4 8E040008 */ lw $a0, 8($s0) -/* 108328 802E6AA8 0480000A */ bltz $a0, .L802E6AD4_108354 -/* 10832C 802E6AAC 00000000 */ nop -/* 108330 802E6AB0 0C00E2B7 */ jal get_npc_by_index -/* 108334 802E6AB4 00000000 */ nop -/* 108338 802E6AB8 8C430000 */ lw $v1, ($v0) -/* 10833C 802E6ABC 2404FDF7 */ addiu $a0, $zero, -0x209 -/* 108340 802E6AC0 00641824 */ and $v1, $v1, $a0 -/* 108344 802E6AC4 AC430000 */ sw $v1, ($v0) -/* 108348 802E6AC8 8E04000C */ lw $a0, 0xc($s0) -/* 10834C 802E6ACC 00641825 */ or $v1, $v1, $a0 -/* 108350 802E6AD0 AC430000 */ sw $v1, ($v0) -.L802E6AD4_108354: -/* 108354 802E6AD4 56400002 */ bnel $s2, $zero, .L802E6AE0 -/* 108358 802E6AD8 E6340068 */ swc1 $f20, 0x68($s1) -/* 10835C 802E6ADC E6340060 */ swc1 $f20, 0x60($s1) -.L802E6AE0: -/* 108360 802E6AE0 8E040014 */ lw $a0, 0x14($s0) -/* 108364 802E6AE4 04800019 */ bltz $a0, .L802E6B4C -/* 108368 802E6AE8 00000000 */ nop -/* 10836C 802E6AEC 0C04C3D6 */ jal get_item_entity -/* 108370 802E6AF0 00000000 */ nop -/* 108374 802E6AF4 0040182D */ daddu $v1, $v0, $zero -/* 108378 802E6AF8 10600013 */ beqz $v1, .L802E6B48 -/* 10837C 802E6AFC 2402FFFF */ addiu $v0, $zero, -1 -/* 108380 802E6B00 8C620000 */ lw $v0, ($v1) -/* 108384 802E6B04 30420010 */ andi $v0, $v0, 0x10 -/* 108388 802E6B08 1040000B */ beqz $v0, .L802E6B38 -/* 10838C 802E6B0C 34028000 */ ori $v0, $zero, 0x8000 -/* 108390 802E6B10 C4600008 */ lwc1 $f0, 8($v1) -/* 108394 802E6B14 4600018D */ trunc.w.s $f6, $f0 -/* 108398 802E6B18 E6060018 */ swc1 $f6, 0x18($s0) -/* 10839C 802E6B1C C460000C */ lwc1 $f0, 0xc($v1) -/* 1083A0 802E6B20 4600018D */ trunc.w.s $f6, $f0 -/* 1083A4 802E6B24 E606001C */ swc1 $f6, 0x1c($s0) -/* 1083A8 802E6B28 C4600010 */ lwc1 $f0, 0x10($v1) -/* 1083AC 802E6B2C 4600018D */ trunc.w.s $f6, $f0 -/* 1083B0 802E6B30 080B9AD3 */ j .L802E6B4C -/* 1083B4 802E6B34 E6060020 */ swc1 $f6, 0x20($s0) -.L802E6B38: -/* 1083B8 802E6B38 AE020018 */ sw $v0, 0x18($s0) -/* 1083BC 802E6B3C AE02001C */ sw $v0, 0x1c($s0) -/* 1083C0 802E6B40 080B9AD3 */ j .L802E6B4C -/* 1083C4 802E6B44 AE020020 */ sw $v0, 0x20($s0) -.L802E6B48: -/* 1083C8 802E6B48 AE020014 */ sw $v0, 0x14($s0) -.L802E6B4C: -/* 1083CC 802E6B4C 8FBF0024 */ lw $ra, 0x24($sp) -/* 1083D0 802E6B50 8FB20020 */ lw $s2, 0x20($sp) -/* 1083D4 802E6B54 8FB1001C */ lw $s1, 0x1c($sp) -/* 1083D8 802E6B58 8FB00018 */ lw $s0, 0x18($sp) -/* 1083DC 802E6B5C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 1083E0 802E6B60 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 1083E4 802E6B64 03E00008 */ jr $ra -/* 1083E8 802E6B68 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_idle.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_idle.s deleted file mode 100644 index a2410eb2e3..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_idle.s +++ /dev/null @@ -1,127 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HiddenPanel_idle -/* 107C28 802E63A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 107C2C 802E63AC AFB3001C */ sw $s3, 0x1c($sp) -/* 107C30 802E63B0 0080982D */ daddu $s3, $a0, $zero -/* 107C34 802E63B4 AFBF0020 */ sw $ra, 0x20($sp) -/* 107C38 802E63B8 AFB20018 */ sw $s2, 0x18($sp) -/* 107C3C 802E63BC AFB10014 */ sw $s1, 0x14($sp) -/* 107C40 802E63C0 AFB00010 */ sw $s0, 0x10($sp) -/* 107C44 802E63C4 92620006 */ lbu $v0, 6($s3) -/* 107C48 802E63C8 8E720040 */ lw $s2, 0x40($s3) -/* 107C4C 802E63CC 30420001 */ andi $v0, $v0, 1 -/* 107C50 802E63D0 5040000A */ beql $v0, $zero, .L802E63FC -/* 107C54 802E63D4 A2400004 */ sb $zero, 4($s2) -/* 107C58 802E63D8 82420004 */ lb $v0, 4($s2) -/* 107C5C 802E63DC 14400008 */ bnez $v0, .L802E6400 -/* 107C60 802E63E0 2402FFFF */ addiu $v0, $zero, -1 -/* 107C64 802E63E4 24020001 */ addiu $v0, $zero, 1 -/* 107C68 802E63E8 A2420004 */ sb $v0, 4($s2) -/* 107C6C 802E63EC 0C03BCF5 */ jal func_800EF3D4 -/* 107C70 802E63F0 24040001 */ addiu $a0, $zero, 1 -/* 107C74 802E63F4 080B9900 */ j .L802E6400 -/* 107C78 802E63F8 2402FFFF */ addiu $v0, $zero, -1 -.L802E63FC: -/* 107C7C 802E63FC 2402FFFF */ addiu $v0, $zero, -1 -.L802E6400: -/* 107C80 802E6400 3C038016 */ lui $v1, %hi(D_8015A578) -/* 107C84 802E6404 2463A578 */ addiu $v1, $v1, %lo(D_8015A578) -/* 107C88 802E6408 AE420008 */ sw $v0, 8($s2) -/* 107C8C 802E640C AE40000C */ sw $zero, 0xc($s2) -/* 107C90 802E6410 80620000 */ lb $v0, ($v1) -/* 107C94 802E6414 10400050 */ beqz $v0, .L802E6558 -/* 107C98 802E6418 00000000 */ nop -/* 107C9C 802E641C C4600008 */ lwc1 $f0, 8($v1) -/* 107CA0 802E6420 C662004C */ lwc1 $f2, 0x4c($s3) -/* 107CA4 802E6424 46020001 */ sub.s $f0, $f0, $f2 -/* 107CA8 802E6428 3C014024 */ lui $at, 0x4024 -/* 107CAC 802E642C 44811800 */ mtc1 $at, $f3 -/* 107CB0 802E6430 44801000 */ mtc1 $zero, $f2 -/* 107CB4 802E6434 46000021 */ cvt.d.s $f0, $f0 -/* 107CB8 802E6438 46200005 */ abs.d $f0, $f0 -/* 107CBC 802E643C 4622003E */ c.le.d $f0, $f2 -/* 107CC0 802E6440 00000000 */ nop -/* 107CC4 802E6444 45000044 */ bc1f .L802E6558 -/* 107CC8 802E6448 2402000A */ addiu $v0, $zero, 0xa -/* 107CCC 802E644C A2420000 */ sb $v0, ($s2) -/* 107CD0 802E6450 C66C0048 */ lwc1 $f12, 0x48($s3) -/* 107CD4 802E6454 0C038022 */ jal get_xz_dist_to_player -/* 107CD8 802E6458 C66E0050 */ lwc1 $f14, 0x50($s3) -/* 107CDC 802E645C 4600010D */ trunc.w.s $f4, $f0 -/* 107CE0 802E6460 44102000 */ mfc1 $s0, $f4 -/* 107CE4 802E6464 00000000 */ nop -/* 107CE8 802E6468 2A020065 */ slti $v0, $s0, 0x65 -/* 107CEC 802E646C 1040003A */ beqz $v0, .L802E6558 -/* 107CF0 802E6470 00000000 */ nop -/* 107CF4 802E6474 92620006 */ lbu $v0, 6($s3) -/* 107CF8 802E6478 30420001 */ andi $v0, $v0, 1 -/* 107CFC 802E647C 10400005 */ beqz $v0, .L802E6494 -/* 107D00 802E6480 0260202D */ daddu $a0, $s3, $zero -/* 107D04 802E6484 3C013F00 */ lui $at, 0x3f00 -/* 107D08 802E6488 44810000 */ mtc1 $at, $f0 -/* 107D0C 802E648C 080B9954 */ j .L802E6550 -/* 107D10 802E6490 00000000 */ nop -.L802E6494: -/* 107D14 802E6494 0C0B9ADB */ jal entity_HiddenPanel_is_item_on_top -/* 107D18 802E6498 0260202D */ daddu $a0, $s3, $zero -/* 107D1C 802E649C 10400005 */ beqz $v0, .L802E64B4 -/* 107D20 802E64A0 0260202D */ daddu $a0, $s3, $zero -/* 107D24 802E64A4 3C013F00 */ lui $at, 0x3f00 -/* 107D28 802E64A8 44810000 */ mtc1 $at, $f0 -/* 107D2C 802E64AC 080B9954 */ j .L802E6550 -/* 107D30 802E64B0 00000000 */ nop -.L802E64B4: -/* 107D34 802E64B4 0C00F475 */ jal npc_find_standing_on_entity -/* 107D38 802E64B8 92640004 */ lbu $a0, 4($s3) -/* 107D3C 802E64BC 0040882D */ daddu $s1, $v0, $zero -/* 107D40 802E64C0 06200016 */ bltz $s1, .L802E651C -/* 107D44 802E64C4 00000000 */ nop -/* 107D48 802E64C8 0C00E2B7 */ jal get_npc_by_index -/* 107D4C 802E64CC 0220202D */ daddu $a0, $s1, $zero -/* 107D50 802E64D0 0040802D */ daddu $s0, $v0, $zero -/* 107D54 802E64D4 C66C0048 */ lwc1 $f12, 0x48($s3) -/* 107D58 802E64D8 C66E0050 */ lwc1 $f14, 0x50($s3) -/* 107D5C 802E64DC 8E060038 */ lw $a2, 0x38($s0) -/* 107D60 802E64E0 0C00A7B5 */ jal dist2D -/* 107D64 802E64E4 8E070040 */ lw $a3, 0x40($s0) -/* 107D68 802E64E8 0260202D */ daddu $a0, $s3, $zero -/* 107D6C 802E64EC AE510008 */ sw $s1, 8($s2) -/* 107D70 802E64F0 8E020000 */ lw $v0, ($s0) -/* 107D74 802E64F4 2403FFF7 */ addiu $v1, $zero, -9 -/* 107D78 802E64F8 30420208 */ andi $v0, $v0, 0x208 -/* 107D7C 802E64FC AE42000C */ sw $v0, 0xc($s2) -/* 107D80 802E6500 8E020000 */ lw $v0, ($s0) -/* 107D84 802E6504 3C013F00 */ lui $at, 0x3f00 -/* 107D88 802E6508 44810000 */ mtc1 $at, $f0 -/* 107D8C 802E650C 00431024 */ and $v0, $v0, $v1 -/* 107D90 802E6510 34420200 */ ori $v0, $v0, 0x200 -/* 107D94 802E6514 080B9954 */ j .L802E6550 -/* 107D98 802E6518 AE020000 */ sw $v0, ($s0) -.L802E651C: -/* 107D9C 802E651C 8E620000 */ lw $v0, ($s3) -/* 107DA0 802E6520 34420020 */ ori $v0, $v0, 0x20 -/* 107DA4 802E6524 AE620000 */ sw $v0, ($s3) -/* 107DA8 802E6528 2A02003D */ slti $v0, $s0, 0x3d -/* 107DAC 802E652C 14400005 */ bnez $v0, .L802E6544 -/* 107DB0 802E6530 0260202D */ daddu $a0, $s3, $zero -/* 107DB4 802E6534 3C013F00 */ lui $at, 0x3f00 -/* 107DB8 802E6538 44810000 */ mtc1 $at, $f0 -/* 107DBC 802E653C 080B9954 */ j .L802E6550 -/* 107DC0 802E6540 00000000 */ nop -.L802E6544: -/* 107DC4 802E6544 3C014120 */ lui $at, 0x4120 -/* 107DC8 802E6548 44810000 */ mtc1 $at, $f0 -/* 107DCC 802E654C A2400000 */ sb $zero, ($s2) -.L802E6550: -/* 107DD0 802E6550 0C043F5A */ jal exec_entity_commandlist -/* 107DD4 802E6554 E6400028 */ swc1 $f0, 0x28($s2) -.L802E6558: -/* 107DD8 802E6558 8FBF0020 */ lw $ra, 0x20($sp) -/* 107DDC 802E655C 8FB3001C */ lw $s3, 0x1c($sp) -/* 107DE0 802E6560 8FB20018 */ lw $s2, 0x18($sp) -/* 107DE4 802E6564 8FB10014 */ lw $s1, 0x14($sp) -/* 107DE8 802E6568 8FB00010 */ lw $s0, 0x10($sp) -/* 107DEC 802E656C 03E00008 */ jr $ra -/* 107DF0 802E6570 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s deleted file mode 100644 index 768e6d756e..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_init.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HiddenPanel_init -/* 1084A4 802E6C24 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 1084A8 802E6C28 AFB300A4 */ sw $s3, 0xa4($sp) -/* 1084AC 802E6C2C 0080982D */ daddu $s3, $a0, $zero -/* 1084B0 802E6C30 AFB400A8 */ sw $s4, 0xa8($sp) -/* 1084B4 802E6C34 3C148016 */ lui $s4, %hi(D_8015A578) -/* 1084B8 802E6C38 2694A578 */ addiu $s4, $s4, %lo(D_8015A578) -/* 1084BC 802E6C3C 0280202D */ daddu $a0, $s4, $zero -/* 1084C0 802E6C40 AFBF00AC */ sw $ra, 0xac($sp) -/* 1084C4 802E6C44 AFB200A0 */ sw $s2, 0xa0($sp) -/* 1084C8 802E6C48 AFB1009C */ sw $s1, 0x9c($sp) -/* 1084CC 802E6C4C AFB00098 */ sw $s0, 0x98($sp) -/* 1084D0 802E6C50 F7B600B8 */ sdc1 $f22, 0xb8($sp) -/* 1084D4 802E6C54 F7B400B0 */ sdc1 $f20, 0xb0($sp) -/* 1084D8 802E6C58 8E720040 */ lw $s2, 0x40($s3) -/* 1084DC 802E6C5C 0C00A580 */ jal mem_clear -/* 1084E0 802E6C60 24050010 */ addiu $a1, $zero, 0x10 -/* 1084E4 802E6C64 3C02802E */ lui $v0, %hi(entity_HiddenPanel_setupGfx) -/* 1084E8 802E6C68 244261B0 */ addiu $v0, $v0, %lo(entity_HiddenPanel_setupGfx) -/* 1084EC 802E6C6C AE62003C */ sw $v0, 0x3c($s3) -/* 1084F0 802E6C70 3402FFFF */ ori $v0, $zero, 0xffff -/* 1084F4 802E6C74 A6420006 */ sh $v0, 6($s2) -/* 1084F8 802E6C78 C660004C */ lwc1 $f0, 0x4c($s3) -/* 1084FC 802E6C7C 3C038016 */ lui $v1, %hi(CreateEntityVarArgBuffer) -/* 108500 802E6C80 2463C7D0 */ addiu $v1, $v1, %lo(CreateEntityVarArgBuffer) -/* 108504 802E6C84 E6400024 */ swc1 $f0, 0x24($s2) -/* 108508 802E6C88 94620002 */ lhu $v0, 2($v1) -/* 10850C 802E6C8C A6420074 */ sh $v0, 0x74($s2) -/* 108510 802E6C90 8C630004 */ lw $v1, 4($v1) -/* 108514 802E6C94 24020001 */ addiu $v0, $zero, 1 -/* 108518 802E6C98 A2420003 */ sb $v0, 3($s2) -/* 10851C 802E6C9C 2402FFFF */ addiu $v0, $zero, -1 -/* 108520 802E6CA0 AE420014 */ sw $v0, 0x14($s2) -/* 108524 802E6CA4 14600003 */ bnez $v1, .L802E6CB4 -/* 108528 802E6CA8 AE430010 */ sw $v1, 0x10($s2) -/* 10852C 802E6CAC 2402015C */ addiu $v0, $zero, 0x15c -/* 108530 802E6CB0 AE420010 */ sw $v0, 0x10($s2) -.L802E6CB4: -/* 108534 802E6CB4 26510034 */ addiu $s1, $s2, 0x34 -/* 108538 802E6CB8 0C019D28 */ jal guMtxIdentF -/* 10853C 802E6CBC 0220202D */ daddu $a0, $s1, $zero -/* 108540 802E6CC0 8E650048 */ lw $a1, 0x48($s3) -/* 108544 802E6CC4 8E66004C */ lw $a2, 0x4c($s3) -/* 108548 802E6CC8 8E670050 */ lw $a3, 0x50($s3) -/* 10854C 802E6CCC 4480A000 */ mtc1 $zero, $f20 -/* 108550 802E6CD0 0C019E40 */ jal guTranslateF -/* 108554 802E6CD4 27A40018 */ addiu $a0, $sp, 0x18 -/* 108558 802E6CD8 27B00058 */ addiu $s0, $sp, 0x58 -/* 10855C 802E6CDC E7B40010 */ swc1 $f20, 0x10($sp) -/* 108560 802E6CE0 8E650064 */ lw $a1, 0x64($s3) -/* 108564 802E6CE4 3C013F80 */ lui $at, 0x3f80 -/* 108568 802E6CE8 4481B000 */ mtc1 $at, $f22 -/* 10856C 802E6CEC 4406A000 */ mfc1 $a2, $f20 -/* 108570 802E6CF0 4407B000 */ mfc1 $a3, $f22 -/* 108574 802E6CF4 0C019EC8 */ jal guRotateF -/* 108578 802E6CF8 0200202D */ daddu $a0, $s0, $zero -/* 10857C 802E6CFC 0200202D */ daddu $a0, $s0, $zero -/* 108580 802E6D00 27A50018 */ addiu $a1, $sp, 0x18 -/* 108584 802E6D04 0C019D80 */ jal guMtxCatF -/* 108588 802E6D08 00A0302D */ daddu $a2, $a1, $zero -/* 10858C 802E6D0C E7B40010 */ swc1 $f20, 0x10($sp) -/* 108590 802E6D10 8E650060 */ lw $a1, 0x60($s3) -/* 108594 802E6D14 4406B000 */ mfc1 $a2, $f22 -/* 108598 802E6D18 4407A000 */ mfc1 $a3, $f20 -/* 10859C 802E6D1C 0C019EC8 */ jal guRotateF -/* 1085A0 802E6D20 0200202D */ daddu $a0, $s0, $zero -/* 1085A4 802E6D24 0200202D */ daddu $a0, $s0, $zero -/* 1085A8 802E6D28 27A50018 */ addiu $a1, $sp, 0x18 -/* 1085AC 802E6D2C 0C019D80 */ jal guMtxCatF -/* 1085B0 802E6D30 00A0302D */ daddu $a2, $a1, $zero -/* 1085B4 802E6D34 4406A000 */ mfc1 $a2, $f20 -/* 1085B8 802E6D38 0200202D */ daddu $a0, $s0, $zero -/* 1085BC 802E6D3C E7B60010 */ swc1 $f22, 0x10($sp) -/* 1085C0 802E6D40 8E650068 */ lw $a1, 0x68($s3) -/* 1085C4 802E6D44 0C019EC8 */ jal guRotateF -/* 1085C8 802E6D48 00C0382D */ daddu $a3, $a2, $zero -/* 1085CC 802E6D4C 0200202D */ daddu $a0, $s0, $zero -/* 1085D0 802E6D50 27A50018 */ addiu $a1, $sp, 0x18 -/* 1085D4 802E6D54 0C019D80 */ jal guMtxCatF -/* 1085D8 802E6D58 00A0302D */ daddu $a2, $a1, $zero -/* 1085DC 802E6D5C 8E650054 */ lw $a1, 0x54($s3) -/* 1085E0 802E6D60 8E660058 */ lw $a2, 0x58($s3) -/* 1085E4 802E6D64 8E67005C */ lw $a3, 0x5c($s3) -/* 1085E8 802E6D68 0C019DF0 */ jal guScaleF -/* 1085EC 802E6D6C 0200202D */ daddu $a0, $s0, $zero -/* 1085F0 802E6D70 0200202D */ daddu $a0, $s0, $zero -/* 1085F4 802E6D74 27A50018 */ addiu $a1, $sp, 0x18 -/* 1085F8 802E6D78 0C019D80 */ jal guMtxCatF -/* 1085FC 802E6D7C 0220302D */ daddu $a2, $s1, $zero -/* 108600 802E6D80 92820001 */ lbu $v0, 1($s4) -/* 108604 802E6D84 30420001 */ andi $v0, $v0, 1 -/* 108608 802E6D88 10400009 */ beqz $v0, .L802E6DB0 -/* 10860C 802E6D8C 00000000 */ nop -/* 108610 802E6D90 3C100A00 */ lui $s0, 0xa00 -/* 108614 802E6D94 261001B0 */ addiu $s0, $s0, 0x1b0 -/* 108618 802E6D98 3C05802F */ lui $a1, %hi(D_802EAAE0) -/* 10861C 802E6D9C 24A5AAE0 */ addiu $a1, $a1, %lo(D_802EAAE0) -/* 108620 802E6DA0 0C0442F3 */ jal entity_set_render_script -/* 108624 802E6DA4 0260202D */ daddu $a0, $s3, $zero -/* 108628 802E6DA8 080B9B6F */ j .L802E6DBC -/* 10862C 802E6DAC 3202FFFF */ andi $v0, $s0, 0xffff -.L802E6DB0: -/* 108630 802E6DB0 3C100A00 */ lui $s0, 0xa00 -/* 108634 802E6DB4 26100180 */ addiu $s0, $s0, 0x180 -/* 108638 802E6DB8 3202FFFF */ andi $v0, $s0, 0xffff -.L802E6DBC: -/* 10863C 802E6DBC 8E650044 */ lw $a1, 0x44($s3) -/* 108640 802E6DC0 96440074 */ lhu $a0, 0x74($s2) -/* 108644 802E6DC4 00A22821 */ addu $a1, $a1, $v0 -/* 108648 802E6DC8 AE450078 */ sw $a1, 0x78($s2) -/* 10864C 802E6DCC 8E670044 */ lw $a3, 0x44($s3) -/* 108650 802E6DD0 0C0470CB */ jal mdl_project_tex_coords -/* 108654 802E6DD4 26460034 */ addiu $a2, $s2, 0x34 -/* 108658 802E6DD8 3C038016 */ lui $v1, %hi(D_8015A578) -/* 10865C 802E6DDC 2463A578 */ addiu $v1, $v1, %lo(D_8015A578) -/* 108660 802E6DE0 90620001 */ lbu $v0, 1($v1) -/* 108664 802E6DE4 24420001 */ addiu $v0, $v0, 1 -/* 108668 802E6DE8 A0620001 */ sb $v0, 1($v1) -/* 10866C 802E6DEC 8FBF00AC */ lw $ra, 0xac($sp) -/* 108670 802E6DF0 8FB400A8 */ lw $s4, 0xa8($sp) -/* 108674 802E6DF4 8FB300A4 */ lw $s3, 0xa4($sp) -/* 108678 802E6DF8 8FB200A0 */ lw $s2, 0xa0($sp) -/* 10867C 802E6DFC 8FB1009C */ lw $s1, 0x9c($sp) -/* 108680 802E6E00 8FB00098 */ lw $s0, 0x98($sp) -/* 108684 802E6E04 D7B600B8 */ ldc1 $f22, 0xb8($sp) -/* 108688 802E6E08 D7B400B0 */ ldc1 $f20, 0xb0($sp) -/* 10868C 802E6E0C 03E00008 */ jr $ra -/* 108690 802E6E10 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 108694 802E6E14 00000000 */ nop -/* 108698 802E6E18 00000000 */ nop -/* 10869C 802E6E1C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_is_item_on_top.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_is_item_on_top.s deleted file mode 100644 index b1c4ad2608..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_is_item_on_top.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HiddenPanel_is_item_on_top -/* 1083EC 802E6B6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1083F0 802E6B70 AFB10014 */ sw $s1, 0x14($sp) -/* 1083F4 802E6B74 0080882D */ daddu $s1, $a0, $zero -/* 1083F8 802E6B78 AFBF0018 */ sw $ra, 0x18($sp) -/* 1083FC 802E6B7C AFB00010 */ sw $s0, 0x10($sp) -/* 108400 802E6B80 8E300040 */ lw $s0, 0x40($s1) -/* 108404 802E6B84 8E040014 */ lw $a0, 0x14($s0) -/* 108408 802E6B88 04800021 */ bltz $a0, .L802E6C10 -/* 10840C 802E6B8C 0000102D */ daddu $v0, $zero, $zero -/* 108410 802E6B90 0C04C3D6 */ jal get_item_entity -/* 108414 802E6B94 00000000 */ nop -/* 108418 802E6B98 5040001D */ beql $v0, $zero, .L802E6C10 -/* 10841C 802E6B9C 0000102D */ daddu $v0, $zero, $zero -/* 108420 802E6BA0 8C420000 */ lw $v0, ($v0) -/* 108424 802E6BA4 30420010 */ andi $v0, $v0, 0x10 -/* 108428 802E6BA8 10400019 */ beqz $v0, .L802E6C10 -/* 10842C 802E6BAC 0000102D */ daddu $v0, $zero, $zero -/* 108430 802E6BB0 C6200048 */ lwc1 $f0, 0x48($s1) -/* 108434 802E6BB4 C6020018 */ lwc1 $f2, 0x18($s0) -/* 108438 802E6BB8 468010A0 */ cvt.s.w $f2, $f2 -/* 10843C 802E6BBC 46020001 */ sub.s $f0, $f0, $f2 -/* 108440 802E6BC0 3C014041 */ lui $at, 0x4041 -/* 108444 802E6BC4 44812800 */ mtc1 $at, $f5 -/* 108448 802E6BC8 44802000 */ mtc1 $zero, $f4 -/* 10844C 802E6BCC 46000021 */ cvt.d.s $f0, $f0 -/* 108450 802E6BD0 46200005 */ abs.d $f0, $f0 -/* 108454 802E6BD4 4624003E */ c.le.d $f0, $f4 -/* 108458 802E6BD8 00000000 */ nop -/* 10845C 802E6BDC 4500000C */ bc1f .L802E6C10 -/* 108460 802E6BE0 00000000 */ nop -/* 108464 802E6BE4 C6200050 */ lwc1 $f0, 0x50($s1) -/* 108468 802E6BE8 C6020020 */ lwc1 $f2, 0x20($s0) -/* 10846C 802E6BEC 468010A0 */ cvt.s.w $f2, $f2 -/* 108470 802E6BF0 46020001 */ sub.s $f0, $f0, $f2 -/* 108474 802E6BF4 46000021 */ cvt.d.s $f0, $f0 -/* 108478 802E6BF8 46200005 */ abs.d $f0, $f0 -/* 10847C 802E6BFC 4624003E */ c.le.d $f0, $f4 -/* 108480 802E6C00 00000000 */ nop -/* 108484 802E6C04 45010002 */ bc1t .L802E6C10 -/* 108488 802E6C08 24020001 */ addiu $v0, $zero, 1 -/* 10848C 802E6C0C 0000102D */ daddu $v0, $zero, $zero -.L802E6C10: -/* 108490 802E6C10 8FBF0018 */ lw $ra, 0x18($sp) -/* 108494 802E6C14 8FB10014 */ lw $s1, 0x14($sp) -/* 108498 802E6C18 8FB00010 */ lw $s0, 0x10($sp) -/* 10849C 802E6C1C 03E00008 */ jr $ra -/* 1084A0 802E6C20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_set_ispy_notification.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_set_ispy_notification.s deleted file mode 100644 index c48048e62e..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_set_ispy_notification.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HiddenPanel_set_ispy_notification -/* 107BB8 802E6338 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 107BBC 802E633C AFBF0014 */ sw $ra, 0x14($sp) -/* 107BC0 802E6340 AFB00010 */ sw $s0, 0x10($sp) -/* 107BC4 802E6344 8C900040 */ lw $s0, 0x40($a0) -/* 107BC8 802E6348 0C03A752 */ jal is_ability_active -/* 107BCC 802E634C 24040029 */ addiu $a0, $zero, 0x29 -/* 107BD0 802E6350 1040000B */ beqz $v0, .L802E6380 -/* 107BD4 802E6354 00000000 */ nop -/* 107BD8 802E6358 0C05152F */ jal get_global_flag -/* 107BDC 802E635C 96040006 */ lhu $a0, 6($s0) -/* 107BE0 802E6360 14400007 */ bnez $v0, .L802E6380 -/* 107BE4 802E6364 00000000 */ nop -/* 107BE8 802E6368 3C038016 */ lui $v1, %hi(D_8015A578) -/* 107BEC 802E636C 2463A578 */ addiu $v1, $v1, %lo(D_8015A578) -/* 107BF0 802E6370 80620002 */ lb $v0, 2($v1) -/* 107BF4 802E6374 14400002 */ bnez $v0, .L802E6380 -/* 107BF8 802E6378 24020001 */ addiu $v0, $zero, 1 -/* 107BFC 802E637C A0620002 */ sb $v0, 2($v1) -.L802E6380: -/* 107C00 802E6380 8FBF0014 */ lw $ra, 0x14($sp) -/* 107C04 802E6384 8FB00010 */ lw $s0, 0x10($sp) -/* 107C08 802E6388 03E00008 */ jr $ra -/* 107C0C 802E638C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_setupGfx.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_setupGfx.s deleted file mode 100644 index aeebe5290a..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_HiddenPanel_setupGfx.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_HiddenPanel_setupGfx -/* 107A30 802E61B0 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 107A34 802E61B4 AFBF00A4 */ sw $ra, 0xa4($sp) -/* 107A38 802E61B8 AFB400A0 */ sw $s4, 0xa0($sp) -/* 107A3C 802E61BC AFB3009C */ sw $s3, 0x9c($sp) -/* 107A40 802E61C0 AFB20098 */ sw $s2, 0x98($sp) -/* 107A44 802E61C4 AFB10094 */ sw $s1, 0x94($sp) -/* 107A48 802E61C8 0C04417A */ jal get_entity_by_index -/* 107A4C 802E61CC AFB00090 */ sw $s0, 0x90($sp) -/* 107A50 802E61D0 0040982D */ daddu $s3, $v0, $zero -/* 107A54 802E61D4 8E740040 */ lw $s4, 0x40($s3) -/* 107A58 802E61D8 C662004C */ lwc1 $f2, 0x4c($s3) -/* 107A5C 802E61DC C6800024 */ lwc1 $f0, 0x24($s4) -/* 107A60 802E61E0 46001032 */ c.eq.s $f2, $f0 -/* 107A64 802E61E4 00000000 */ nop -/* 107A68 802E61E8 45010041 */ bc1t .L802E62F0 -/* 107A6C 802E61EC 00000000 */ nop -/* 107A70 802E61F0 0C019D28 */ jal guMtxIdentF -/* 107A74 802E61F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 107A78 802E61F8 27B00050 */ addiu $s0, $sp, 0x50 -/* 107A7C 802E61FC 0200202D */ daddu $a0, $s0, $zero -/* 107A80 802E6200 C6820024 */ lwc1 $f2, 0x24($s4) -/* 107A84 802E6204 3C013F80 */ lui $at, 0x3f80 -/* 107A88 802E6208 44810000 */ mtc1 $at, $f0 -/* 107A8C 802E620C 3C120001 */ lui $s2, 1 -/* 107A90 802E6210 46001080 */ add.s $f2, $f2, $f0 -/* 107A94 802E6214 8E650048 */ lw $a1, 0x48($s3) -/* 107A98 802E6218 8E670050 */ lw $a3, 0x50($s3) -/* 107A9C 802E621C 44061000 */ mfc1 $a2, $f2 -/* 107AA0 802E6220 0C019E40 */ jal guTranslateF -/* 107AA4 802E6224 36521630 */ ori $s2, $s2, 0x1630 -/* 107AA8 802E6228 0200202D */ daddu $a0, $s0, $zero -/* 107AAC 802E622C 27A50010 */ addiu $a1, $sp, 0x10 -/* 107AB0 802E6230 0C019D80 */ jal guMtxCatF -/* 107AB4 802E6234 0200302D */ daddu $a2, $s0, $zero -/* 107AB8 802E6238 0200202D */ daddu $a0, $s0, $zero -/* 107ABC 802E623C 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 107AC0 802E6240 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 107AC4 802E6244 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 107AC8 802E6248 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 107ACC 802E624C 96050000 */ lhu $a1, ($s0) -/* 107AD0 802E6250 8E220000 */ lw $v0, ($s1) -/* 107AD4 802E6254 00052980 */ sll $a1, $a1, 6 -/* 107AD8 802E6258 00B22821 */ addu $a1, $a1, $s2 -/* 107ADC 802E625C 0C019D40 */ jal guMtxF2L -/* 107AE0 802E6260 00452821 */ addu $a1, $v0, $a1 -/* 107AE4 802E6264 3C03DA38 */ lui $v1, 0xda38 -/* 107AE8 802E6268 34630002 */ ori $v1, $v1, 2 -/* 107AEC 802E626C 3C07D838 */ lui $a3, 0xd838 -/* 107AF0 802E6270 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* 107AF4 802E6274 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) -/* 107AF8 802E6278 34E70002 */ ori $a3, $a3, 2 -/* 107AFC 802E627C 8CA40000 */ lw $a0, ($a1) -/* 107B00 802E6280 96020000 */ lhu $v0, ($s0) -/* 107B04 802E6284 0080302D */ daddu $a2, $a0, $zero -/* 107B08 802E6288 24840008 */ addiu $a0, $a0, 8 -/* 107B0C 802E628C ACA40000 */ sw $a0, ($a1) -/* 107B10 802E6290 ACC30000 */ sw $v1, ($a2) -/* 107B14 802E6294 24430001 */ addiu $v1, $v0, 1 -/* 107B18 802E6298 3042FFFF */ andi $v0, $v0, 0xffff -/* 107B1C 802E629C 00021180 */ sll $v0, $v0, 6 -/* 107B20 802E62A0 A6030000 */ sh $v1, ($s0) -/* 107B24 802E62A4 8E230000 */ lw $v1, ($s1) -/* 107B28 802E62A8 00521021 */ addu $v0, $v0, $s2 -/* 107B2C 802E62AC 00621821 */ addu $v1, $v1, $v0 -/* 107B30 802E62B0 24820008 */ addiu $v0, $a0, 8 -/* 107B34 802E62B4 ACC30004 */ sw $v1, 4($a2) -/* 107B38 802E62B8 ACA20000 */ sw $v0, ($a1) -/* 107B3C 802E62BC 3C02DE00 */ lui $v0, 0xde00 -/* 107B40 802E62C0 AC820000 */ sw $v0, ($a0) -/* 107B44 802E62C4 8E630044 */ lw $v1, 0x44($s3) -/* 107B48 802E62C8 24820010 */ addiu $v0, $a0, 0x10 -/* 107B4C 802E62CC ACA20000 */ sw $v0, ($a1) -/* 107B50 802E62D0 24020040 */ addiu $v0, $zero, 0x40 -/* 107B54 802E62D4 AC82000C */ sw $v0, 0xc($a0) -/* 107B58 802E62D8 3C020A00 */ lui $v0, 0xa00 -/* 107B5C 802E62DC 24420230 */ addiu $v0, $v0, 0x230 -/* 107B60 802E62E0 3042FFFF */ andi $v0, $v0, 0xffff -/* 107B64 802E62E4 AC870008 */ sw $a3, 8($a0) -/* 107B68 802E62E8 00621821 */ addu $v1, $v1, $v0 -/* 107B6C 802E62EC AC830004 */ sw $v1, 4($a0) -.L802E62F0: -/* 107B70 802E62F0 96840074 */ lhu $a0, 0x74($s4) -/* 107B74 802E62F4 8E850078 */ lw $a1, 0x78($s4) -/* 107B78 802E62F8 8E670044 */ lw $a3, 0x44($s3) -/* 107B7C 802E62FC 0C0470CB */ jal mdl_project_tex_coords -/* 107B80 802E6300 26860034 */ addiu $a2, $s4, 0x34 -/* 107B84 802E6304 96850074 */ lhu $a1, 0x74($s4) -/* 107B88 802E6308 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* 107B8C 802E630C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* 107B90 802E6310 0C0475CB */ jal mdl_draw_hidden_panel_surface -/* 107B94 802E6314 00000000 */ nop -/* 107B98 802E6318 8FBF00A4 */ lw $ra, 0xa4($sp) -/* 107B9C 802E631C 8FB400A0 */ lw $s4, 0xa0($sp) -/* 107BA0 802E6320 8FB3009C */ lw $s3, 0x9c($sp) -/* 107BA4 802E6324 8FB20098 */ lw $s2, 0x98($sp) -/* 107BA8 802E6328 8FB10094 */ lw $s1, 0x94($sp) -/* 107BAC 802E632C 8FB00090 */ lw $s0, 0x90($sp) -/* 107BB0 802E6330 03E00008 */ jr $ra -/* 107BB4 802E6334 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_ScriptSpring_idle.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_ScriptSpring_idle.s deleted file mode 100644 index 8e9f605c60..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_ScriptSpring_idle.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_ScriptSpring_idle -/* 107830 802E5FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 107834 802E5FB4 AFB00018 */ sw $s0, 0x18($sp) -/* 107838 802E5FB8 0080802D */ daddu $s0, $a0, $zero -/* 10783C 802E5FBC 3C048011 */ lui $a0, %hi(gPlayerStatus) -/* 107840 802E5FC0 2484EFC8 */ addiu $a0, $a0, %lo(gPlayerStatus) -/* 107844 802E5FC4 AFBF001C */ sw $ra, 0x1c($sp) -/* 107848 802E5FC8 808300B4 */ lb $v1, 0xb4($a0) -/* 10784C 802E5FCC 24020021 */ addiu $v0, $zero, 0x21 -/* 107850 802E5FD0 10620020 */ beq $v1, $v0, .L802E6054 -/* 107854 802E5FD4 00000000 */ nop -/* 107858 802E5FD8 92020006 */ lbu $v0, 6($s0) -/* 10785C 802E5FDC 30420001 */ andi $v0, $v0, 1 -/* 107860 802E5FE0 1040001C */ beqz $v0, .L802E6054 -/* 107864 802E5FE4 24020005 */ addiu $v0, $zero, 5 -/* 107868 802E5FE8 A08200C5 */ sb $v0, 0xc5($a0) -/* 10786C 802E5FEC 8C820000 */ lw $v0, ($a0) -/* 107870 802E5FF0 2403FFFB */ addiu $v1, $zero, -5 -/* 107874 802E5FF4 00431024 */ and $v0, $v0, $v1 -/* 107878 802E5FF8 3C030080 */ lui $v1, 0x80 -/* 10787C 802E5FFC 00431025 */ or $v0, $v0, $v1 -/* 107880 802E6000 AC820000 */ sw $v0, ($a0) -/* 107884 802E6004 86040014 */ lh $a0, 0x14($s0) -/* 107888 802E6008 3C050000 */ lui $a1, 0 -/* 10788C 802E600C 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 107890 802E6010 0C048052 */ jal play_model_animation -/* 107894 802E6014 00000000 */ nop -/* 107898 802E6018 0C04419E */ jal entity_start_script -/* 10789C 802E601C 0200202D */ daddu $a0, $s0, $zero -/* 1078A0 802E6020 10400003 */ beqz $v0, .L802E6030 -/* 1078A4 802E6024 00000000 */ nop -/* 1078A8 802E6028 0C039769 */ jal set_action_state -/* 1078AC 802E602C 24040026 */ addiu $a0, $zero, 0x26 -.L802E6030: -/* 1078B0 802E6030 0C043F5A */ jal exec_entity_commandlist -/* 1078B4 802E6034 0200202D */ daddu $a0, $s0, $zero -/* 1078B8 802E6038 C6000050 */ lwc1 $f0, 0x50($s0) -/* 1078BC 802E603C 24042086 */ addiu $a0, $zero, 0x2086 -/* 1078C0 802E6040 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1078C4 802E6044 8E060048 */ lw $a2, 0x48($s0) -/* 1078C8 802E6048 8E07004C */ lw $a3, 0x4c($s0) -/* 1078CC 802E604C 0C052757 */ jal sfx_play_sound_at_position -/* 1078D0 802E6050 0000282D */ daddu $a1, $zero, $zero -.L802E6054: -/* 1078D4 802E6054 8FBF001C */ lw $ra, 0x1c($sp) -/* 1078D8 802E6058 8FB00018 */ lw $s0, 0x18($sp) -/* 1078DC 802E605C 03E00008 */ jr $ra -/* 1078E0 802E6060 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_SimpleSpring_idle.s b/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_SimpleSpring_idle.s deleted file mode 100644 index c7b6742602..0000000000 --- a/ver/us/asm/nonmatchings/entity/SimpleSpring/entity_SimpleSpring_idle.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_SimpleSpring_idle -/* 1078E4 802E6064 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1078E8 802E6068 AFB00018 */ sw $s0, 0x18($sp) -/* 1078EC 802E606C 0080802D */ daddu $s0, $a0, $zero -/* 1078F0 802E6070 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 1078F4 802E6074 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 1078F8 802E6078 AFB1001C */ sw $s1, 0x1c($sp) -/* 1078FC 802E607C 24030021 */ addiu $v1, $zero, 0x21 -/* 107900 802E6080 AFBF0020 */ sw $ra, 0x20($sp) -/* 107904 802E6084 80A200B4 */ lb $v0, 0xb4($a1) -/* 107908 802E6088 8E040040 */ lw $a0, 0x40($s0) -/* 10790C 802E608C 1043001D */ beq $v0, $v1, .L802E6104 -/* 107910 802E6090 00A0882D */ daddu $s1, $a1, $zero -/* 107914 802E6094 92020006 */ lbu $v0, 6($s0) -/* 107918 802E6098 30420001 */ andi $v0, $v0, 1 -/* 10791C 802E609C 10400019 */ beqz $v0, .L802E6104 -/* 107920 802E60A0 00000000 */ nop -/* 107924 802E60A4 8C820000 */ lw $v0, ($a0) -/* 107928 802E60A8 28420046 */ slti $v0, $v0, 0x46 -/* 10792C 802E60AC 14400002 */ bnez $v0, .L802E60B8 -/* 107930 802E60B0 24020005 */ addiu $v0, $zero, 5 -/* 107934 802E60B4 A0A200C5 */ sb $v0, 0xc5($a1) -.L802E60B8: -/* 107938 802E60B8 86040014 */ lh $a0, 0x14($s0) -/* 10793C 802E60BC 3C050000 */ lui $a1, 0 -/* 107940 802E60C0 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 107944 802E60C4 0C048052 */ jal play_model_animation -/* 107948 802E60C8 00000000 */ nop -/* 10794C 802E60CC 0C04419E */ jal entity_start_script -/* 107950 802E60D0 0200202D */ daddu $a0, $s0, $zero -/* 107954 802E60D4 0C043F5A */ jal exec_entity_commandlist -/* 107958 802E60D8 0200202D */ daddu $a0, $s0, $zero -/* 10795C 802E60DC C6000050 */ lwc1 $f0, 0x50($s0) -/* 107960 802E60E0 24042086 */ addiu $a0, $zero, 0x2086 -/* 107964 802E60E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 107968 802E60E8 8E060048 */ lw $a2, 0x48($s0) -/* 10796C 802E60EC 8E07004C */ lw $a3, 0x4c($s0) -/* 107970 802E60F0 0C052757 */ jal sfx_play_sound_at_position -/* 107974 802E60F4 0000282D */ daddu $a1, $zero, $zero -/* 107978 802E60F8 0C03805E */ jal disable_player_input -/* 10797C 802E60FC 00000000 */ nop -/* 107980 802E6100 AE200054 */ sw $zero, 0x54($s1) -.L802E6104: -/* 107984 802E6104 8FBF0020 */ lw $ra, 0x20($sp) -/* 107988 802E6108 8FB1001C */ lw $s1, 0x1c($sp) -/* 10798C 802E610C 8FB00018 */ lw $s0, 0x18($sp) -/* 107990 802E6110 03E00008 */ jr $ra -/* 107994 802E6114 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s b/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s deleted file mode 100644 index 6bf45a33f4..0000000000 --- a/ver/us/asm/nonmatchings/entity/SuperBlock/entity_SuperBlockContent_setupGfx.s +++ /dev/null @@ -1,389 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_SuperBlockContent_setupGfx -/* 1070EC 802E586C 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 1070F0 802E5870 AFB60088 */ sw $s6, 0x88($sp) -/* 1070F4 802E5874 3C16800A */ lui $s6, %hi(gMasterGfxPos) -/* 1070F8 802E5878 8ED6A66C */ lw $s6, %lo(gMasterGfxPos)($s6) -/* 1070FC 802E587C AFBF0094 */ sw $ra, 0x94($sp) -/* 107100 802E5880 AFBE0090 */ sw $fp, 0x90($sp) -/* 107104 802E5884 AFB7008C */ sw $s7, 0x8c($sp) -/* 107108 802E5888 AFB50084 */ sw $s5, 0x84($sp) -/* 10710C 802E588C AFB40080 */ sw $s4, 0x80($sp) -/* 107110 802E5890 AFB3007C */ sw $s3, 0x7c($sp) -/* 107114 802E5894 AFB20078 */ sw $s2, 0x78($sp) -/* 107118 802E5898 AFB10074 */ sw $s1, 0x74($sp) -/* 10711C 802E589C 0C04417A */ jal get_entity_by_index -/* 107120 802E58A0 AFB00070 */ sw $s0, 0x70($sp) -/* 107124 802E58A4 AFA20060 */ sw $v0, 0x60($sp) -/* 107128 802E58A8 8C570040 */ lw $s7, 0x40($v0) -/* 10712C 802E58AC 92E20008 */ lbu $v0, 8($s7) -/* 107130 802E58B0 14400011 */ bnez $v0, .L802E58F8 -/* 107134 802E58B4 2442FFFF */ addiu $v0, $v0, -1 -/* 107138 802E58B8 92E30009 */ lbu $v1, 9($s7) -/* 10713C 802E58BC 3C05802F */ lui $a1, %hi(D_802EA870) -/* 107140 802E58C0 24A5A870 */ addiu $a1, $a1, %lo(D_802EA870) -/* 107144 802E58C4 24630002 */ addiu $v1, $v1, 2 -/* 107148 802E58C8 3C02802F */ lui $v0, %hi(D_802EA870) -/* 10714C 802E58CC 00431021 */ addu $v0, $v0, $v1 -/* 107150 802E58D0 8042A870 */ lb $v0, %lo(D_802EA870)($v0) -/* 107154 802E58D4 3C04802F */ lui $a0, %hi(D_802EA870) -/* 107158 802E58D8 00832021 */ addu $a0, $a0, $v1 -/* 10715C 802E58DC 18400004 */ blez $v0, .L802E58F0 -/* 107160 802E58E0 9084A870 */ lbu $a0, %lo(D_802EA870)($a0) -/* 107164 802E58E4 A2E40008 */ sb $a0, 8($s7) -/* 107168 802E58E8 080B963F */ j .L802E58FC -/* 10716C 802E58EC A2E30009 */ sb $v1, 9($s7) -.L802E58F0: -/* 107170 802E58F0 90A20000 */ lbu $v0, ($a1) -/* 107174 802E58F4 A2E00009 */ sb $zero, 9($s7) -.L802E58F8: -/* 107178 802E58F8 A2E20008 */ sb $v0, 8($s7) -.L802E58FC: -/* 10717C 802E58FC 02C0382D */ daddu $a3, $s6, $zero -/* 107180 802E5900 26D60008 */ addiu $s6, $s6, 8 -/* 107184 802E5904 02E0202D */ daddu $a0, $s7, $zero -/* 107188 802E5908 24050001 */ addiu $a1, $zero, 1 -/* 10718C 802E590C 92E20009 */ lbu $v0, 9($s7) -/* 107190 802E5910 8FAF0060 */ lw $t7, 0x60($sp) -/* 107194 802E5914 8EF5012C */ lw $s5, 0x12c($s7) -/* 107198 802E5918 3C01802F */ lui $at, %hi(D_802EA871) -/* 10719C 802E591C 00220821 */ addu $at, $at, $v0 -/* 1071A0 802E5920 8022A871 */ lb $v0, %lo(D_802EA871)($at) -/* 1071A4 802E5924 8DE30044 */ lw $v1, 0x44($t7) -/* 1071A8 802E5928 00021080 */ sll $v0, $v0, 2 -/* 1071AC 802E592C 3C06802F */ lui $a2, %hi(D_802EA862) -/* 1071B0 802E5930 00C23021 */ addu $a2, $a2, $v0 -/* 1071B4 802E5934 94C6A862 */ lhu $a2, %lo(D_802EA862)($a2) -/* 1071B8 802E5938 3C02E700 */ lui $v0, 0xe700 -/* 1071BC 802E593C AFB50058 */ sw $s5, 0x58($sp) -/* 1071C0 802E5940 ACE20000 */ sw $v0, ($a3) -/* 1071C4 802E5944 ACE00004 */ sw $zero, 4($a3) -/* 1071C8 802E5948 00661821 */ addu $v1, $v1, $a2 -/* 1071CC 802E594C 0C0B959C */ jal entity_SuperBlockContent_get_previous_yaw -/* 1071D0 802E5950 AFA3005C */ sw $v1, 0x5c($sp) -/* 1071D4 802E5954 44050000 */ mfc1 $a1, $f0 -/* 1071D8 802E5958 44800000 */ mtc1 $zero, $f0 -/* 1071DC 802E595C 3C073F80 */ lui $a3, 0x3f80 -/* 1071E0 802E5960 44060000 */ mfc1 $a2, $f0 -/* 1071E4 802E5964 27A40018 */ addiu $a0, $sp, 0x18 -/* 1071E8 802E5968 0C019EC8 */ jal guRotateF -/* 1071EC 802E596C AFA60010 */ sw $a2, 0x10($sp) -/* 1071F0 802E5970 27A40018 */ addiu $a0, $sp, 0x18 -/* 1071F4 802E5974 26F00010 */ addiu $s0, $s7, 0x10 -/* 1071F8 802E5978 0C019D40 */ jal guMtxF2L -/* 1071FC 802E597C 0200282D */ daddu $a1, $s0, $zero -/* 107200 802E5980 3C040001 */ lui $a0, 1 -/* 107204 802E5984 34841630 */ ori $a0, $a0, 0x1630 -/* 107208 802E5988 26E50050 */ addiu $a1, $s7, 0x50 -/* 10720C 802E598C 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 107210 802E5990 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* 107214 802E5994 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 107218 802E5998 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 10721C 802E599C 00021180 */ sll $v0, $v0, 6 -/* 107220 802E59A0 00621821 */ addu $v1, $v1, $v0 -/* 107224 802E59A4 00641821 */ addu $v1, $v1, $a0 -.L802E59A8: -/* 107228 802E59A8 8E180000 */ lw $t8, ($s0) -/* 10722C 802E59AC 8E190004 */ lw $t9, 4($s0) -/* 107230 802E59B0 8E0F0008 */ lw $t7, 8($s0) -/* 107234 802E59B4 8E15000C */ lw $s5, 0xc($s0) -/* 107238 802E59B8 AC780000 */ sw $t8, ($v1) -/* 10723C 802E59BC AC790004 */ sw $t9, 4($v1) -/* 107240 802E59C0 AC6F0008 */ sw $t7, 8($v1) -/* 107244 802E59C4 AC75000C */ sw $s5, 0xc($v1) -/* 107248 802E59C8 26100010 */ addiu $s0, $s0, 0x10 -/* 10724C 802E59CC 1605FFF6 */ bne $s0, $a1, .L802E59A8 -/* 107250 802E59D0 24630010 */ addiu $v1, $v1, 0x10 -/* 107254 802E59D4 02C0702D */ daddu $t6, $s6, $zero -/* 107258 802E59D8 26D60008 */ addiu $s6, $s6, 8 -/* 10725C 802E59DC 3C180001 */ lui $t8, 1 -/* 107260 802E59E0 37181630 */ ori $t8, $t8, 0x1630 -/* 107264 802E59E4 02C0682D */ daddu $t5, $s6, $zero -/* 107268 802E59E8 26D60008 */ addiu $s6, $s6, 8 -/* 10726C 802E59EC 3C19E200 */ lui $t9, 0xe200 -/* 107270 802E59F0 3739001C */ ori $t9, $t9, 0x1c -/* 107274 802E59F4 3C140055 */ lui $s4, 0x55 -/* 107278 802E59F8 36943078 */ ori $s4, $s4, 0x3078 -/* 10727C 802E59FC 02C0582D */ daddu $t3, $s6, $zero -/* 107280 802E5A00 26D60008 */ addiu $s6, $s6, 8 -/* 107284 802E5A04 3C12FC12 */ lui $s2, 0xfc12 -/* 107288 802E5A08 36521824 */ ori $s2, $s2, 0x1824 -/* 10728C 802E5A0C 3C10FF33 */ lui $s0, 0xff33 -/* 107290 802E5A10 3610FFFF */ ori $s0, $s0, 0xffff -/* 107294 802E5A14 02C0202D */ daddu $a0, $s6, $zero -/* 107298 802E5A18 26D60008 */ addiu $s6, $s6, 8 -/* 10729C 802E5A1C 02C0282D */ daddu $a1, $s6, $zero -/* 1072A0 802E5A20 26D60008 */ addiu $s6, $s6, 8 -/* 1072A4 802E5A24 02C0402D */ daddu $t0, $s6, $zero -/* 1072A8 802E5A28 26D60008 */ addiu $s6, $s6, 8 -/* 1072AC 802E5A2C 3C0FF500 */ lui $t7, 0xf500 -/* 1072B0 802E5A30 35EF0100 */ ori $t7, $t7, 0x100 -/* 1072B4 802E5A34 02C0302D */ daddu $a2, $s6, $zero -/* 1072B8 802E5A38 26D60008 */ addiu $s6, $s6, 8 -/* 1072BC 802E5A3C 02C0482D */ daddu $t1, $s6, $zero -/* 1072C0 802E5A40 26D60008 */ addiu $s6, $s6, 8 -/* 1072C4 802E5A44 3C130703 */ lui $s3, 0x703 -/* 1072C8 802E5A48 3673C000 */ ori $s3, $s3, 0xc000 -/* 1072CC 802E5A4C 02C0382D */ daddu $a3, $s6, $zero -/* 1072D0 802E5A50 26D60008 */ addiu $s6, $s6, 8 -/* 1072D4 802E5A54 02C0502D */ daddu $t2, $s6, $zero -/* 1072D8 802E5A58 26D60008 */ addiu $s6, $s6, 8 -/* 1072DC 802E5A5C 02C0602D */ daddu $t4, $s6, $zero -/* 1072E0 802E5A60 3C11D838 */ lui $s1, 0xd838 -/* 1072E4 802E5A64 36310002 */ ori $s1, $s1, 2 -/* 1072E8 802E5A68 3C1E8007 */ lui $fp, %hi(gMatrixListPos) -/* 1072EC 802E5A6C 27DE41F0 */ addiu $fp, $fp, %lo(gMatrixListPos) -/* 1072F0 802E5A70 AFB80064 */ sw $t8, 0x64($sp) -/* 1072F4 802E5A74 97C20000 */ lhu $v0, ($fp) -/* 1072F8 802E5A78 3C03DA38 */ lui $v1, 0xda38 -/* 1072FC 802E5A7C ADC30000 */ sw $v1, ($t6) -/* 107300 802E5A80 24430001 */ addiu $v1, $v0, 1 -/* 107304 802E5A84 3042FFFF */ andi $v0, $v0, 0xffff -/* 107308 802E5A88 00021180 */ sll $v0, $v0, 6 -/* 10730C 802E5A8C A7C30000 */ sh $v1, ($fp) -/* 107310 802E5A90 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 107314 802E5A94 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 107318 802E5A98 00581021 */ addu $v0, $v0, $t8 -/* 10731C 802E5A9C 00621821 */ addu $v1, $v1, $v0 -/* 107320 802E5AA0 3C02FD10 */ lui $v0, 0xfd10 -/* 107324 802E5AA4 ADC30004 */ sw $v1, 4($t6) -/* 107328 802E5AA8 ADB90000 */ sw $t9, ($t5) -/* 10732C 802E5AAC ADB40004 */ sw $s4, 4($t5) -/* 107330 802E5AB0 AD720000 */ sw $s2, ($t3) -/* 107334 802E5AB4 AD700004 */ sw $s0, 4($t3) -/* 107338 802E5AB8 AC820000 */ sw $v0, ($a0) -/* 10733C 802E5ABC 8FB5005C */ lw $s5, 0x5c($sp) -/* 107340 802E5AC0 3C02E800 */ lui $v0, 0xe800 -/* 107344 802E5AC4 AC950004 */ sw $s5, 4($a0) -/* 107348 802E5AC8 ACA20000 */ sw $v0, ($a1) -/* 10734C 802E5ACC 3C020700 */ lui $v0, 0x700 -/* 107350 802E5AD0 ACA00004 */ sw $zero, 4($a1) -/* 107354 802E5AD4 AD020004 */ sw $v0, 4($t0) -/* 107358 802E5AD8 3C02E600 */ lui $v0, 0xe600 -/* 10735C 802E5ADC AD0F0000 */ sw $t7, ($t0) -/* 107360 802E5AE0 ACC20000 */ sw $v0, ($a2) -/* 107364 802E5AE4 3C02F000 */ lui $v0, 0xf000 -/* 107368 802E5AE8 ACC00004 */ sw $zero, 4($a2) -/* 10736C 802E5AEC 3C06E700 */ lui $a2, 0xe700 -/* 107370 802E5AF0 AD220000 */ sw $v0, ($t1) -/* 107374 802E5AF4 3C02DE00 */ lui $v0, 0xde00 -/* 107378 802E5AF8 AD330004 */ sw $s3, 4($t1) -/* 10737C 802E5AFC ACE60000 */ sw $a2, ($a3) -/* 107380 802E5B00 ACE00004 */ sw $zero, 4($a3) -/* 107384 802E5B04 AD420000 */ sw $v0, ($t2) -/* 107388 802E5B08 8FB80058 */ lw $t8, 0x58($sp) -/* 10738C 802E5B0C 24020040 */ addiu $v0, $zero, 0x40 -/* 107390 802E5B10 AD580004 */ sw $t8, 4($t2) -/* 107394 802E5B14 AD910000 */ sw $s1, ($t4) -/* 107398 802E5B18 AD820004 */ sw $v0, 4($t4) -/* 10739C 802E5B1C 8FB90060 */ lw $t9, 0x60($sp) -/* 1073A0 802E5B20 9323000B */ lbu $v1, 0xb($t9) -/* 1073A4 802E5B24 24110078 */ addiu $s1, $zero, 0x78 -/* 1073A8 802E5B28 0071102A */ slt $v0, $v1, $s1 -/* 1073AC 802E5B2C 10400002 */ beqz $v0, .L802E5B38 -/* 1073B0 802E5B30 26D60008 */ addiu $s6, $s6, 8 -/* 1073B4 802E5B34 0060882D */ daddu $s1, $v1, $zero -.L802E5B38: -/* 1073B8 802E5B38 02C0102D */ daddu $v0, $s6, $zero -/* 1073BC 802E5B3C 26D60008 */ addiu $s6, $s6, 8 -/* 1073C0 802E5B40 02E0202D */ daddu $a0, $s7, $zero -/* 1073C4 802E5B44 24050006 */ addiu $a1, $zero, 6 -/* 1073C8 802E5B48 AC460000 */ sw $a2, ($v0) -/* 1073CC 802E5B4C 0C0B959C */ jal entity_SuperBlockContent_get_previous_yaw -/* 1073D0 802E5B50 AC400004 */ sw $zero, 4($v0) -/* 1073D4 802E5B54 44050000 */ mfc1 $a1, $f0 -/* 1073D8 802E5B58 44800000 */ mtc1 $zero, $f0 -/* 1073DC 802E5B5C 3C073F80 */ lui $a3, 0x3f80 -/* 1073E0 802E5B60 44060000 */ mfc1 $a2, $f0 -/* 1073E4 802E5B64 27A40018 */ addiu $a0, $sp, 0x18 -/* 1073E8 802E5B68 0C019EC8 */ jal guRotateF -/* 1073EC 802E5B6C AFA60010 */ sw $a2, 0x10($sp) -/* 1073F0 802E5B70 27A40018 */ addiu $a0, $sp, 0x18 -/* 1073F4 802E5B74 26F00050 */ addiu $s0, $s7, 0x50 -/* 1073F8 802E5B78 0C019D40 */ jal guMtxF2L -/* 1073FC 802E5B7C 0200282D */ daddu $a1, $s0, $zero -/* 107400 802E5B80 26E40090 */ addiu $a0, $s7, 0x90 -/* 107404 802E5B84 97C20000 */ lhu $v0, ($fp) -/* 107408 802E5B88 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 10740C 802E5B8C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 107410 802E5B90 8FAF0064 */ lw $t7, 0x64($sp) -/* 107414 802E5B94 00021180 */ sll $v0, $v0, 6 -/* 107418 802E5B98 00621821 */ addu $v1, $v1, $v0 -/* 10741C 802E5B9C 006F1821 */ addu $v1, $v1, $t7 -.L802E5BA0: -/* 107420 802E5BA0 8E150000 */ lw $s5, ($s0) -/* 107424 802E5BA4 8E180004 */ lw $t8, 4($s0) -/* 107428 802E5BA8 8E190008 */ lw $t9, 8($s0) -/* 10742C 802E5BAC 8E0F000C */ lw $t7, 0xc($s0) -/* 107430 802E5BB0 AC750000 */ sw $s5, ($v1) -/* 107434 802E5BB4 AC780004 */ sw $t8, 4($v1) -/* 107438 802E5BB8 AC790008 */ sw $t9, 8($v1) -/* 10743C 802E5BBC AC6F000C */ sw $t7, 0xc($v1) -/* 107440 802E5BC0 26100010 */ addiu $s0, $s0, 0x10 -/* 107444 802E5BC4 1604FFF6 */ bne $s0, $a0, .L802E5BA0 -/* 107448 802E5BC8 24630010 */ addiu $v1, $v1, 0x10 -/* 10744C 802E5BCC 02C0482D */ daddu $t1, $s6, $zero -/* 107450 802E5BD0 26D60008 */ addiu $s6, $s6, 8 -/* 107454 802E5BD4 3C130001 */ lui $s3, 1 -/* 107458 802E5BD8 36731630 */ ori $s3, $s3, 0x1630 -/* 10745C 802E5BDC 02C0402D */ daddu $t0, $s6, $zero -/* 107460 802E5BE0 26D60008 */ addiu $s6, $s6, 8 -/* 107464 802E5BE4 3C0EE200 */ lui $t6, 0xe200 -/* 107468 802E5BE8 35CE001C */ ori $t6, $t6, 0x1c -/* 10746C 802E5BEC 3C0D0050 */ lui $t5, 0x50 -/* 107470 802E5BF0 35AD4358 */ ori $t5, $t5, 0x4358 -/* 107474 802E5BF4 02C0382D */ daddu $a3, $s6, $zero -/* 107478 802E5BF8 26D60008 */ addiu $s6, $s6, 8 -/* 10747C 802E5BFC 3C0CFCFF */ lui $t4, 0xfcff -/* 107480 802E5C00 358CB3FF */ ori $t4, $t4, 0xb3ff -/* 107484 802E5C04 3C0BFF2C */ lui $t3, 0xff2c -/* 107488 802E5C08 356BFE7F */ ori $t3, $t3, 0xfe7f -/* 10748C 802E5C0C 02C0202D */ daddu $a0, $s6, $zero -/* 107490 802E5C10 26D60008 */ addiu $s6, $s6, 8 -/* 107494 802E5C14 02C0282D */ daddu $a1, $s6, $zero -/* 107498 802E5C18 26D60008 */ addiu $s6, $s6, 8 -/* 10749C 802E5C1C 02C0302D */ daddu $a2, $s6, $zero -/* 1074A0 802E5C20 3C0AD838 */ lui $t2, 0xd838 -/* 1074A4 802E5C24 354A0002 */ ori $t2, $t2, 2 -/* 1074A8 802E5C28 3C128007 */ lui $s2, %hi(gMatrixListPos) -/* 1074AC 802E5C2C 265241F0 */ addiu $s2, $s2, %lo(gMatrixListPos) -/* 1074B0 802E5C30 3C03DA38 */ lui $v1, 0xda38 -/* 1074B4 802E5C34 96420000 */ lhu $v0, ($s2) -/* 1074B8 802E5C38 3C14800A */ lui $s4, %hi(gDisplayContext) -/* 1074BC 802E5C3C 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) -/* 1074C0 802E5C40 AD230000 */ sw $v1, ($t1) -/* 1074C4 802E5C44 24430001 */ addiu $v1, $v0, 1 -/* 1074C8 802E5C48 3042FFFF */ andi $v0, $v0, 0xffff -/* 1074CC 802E5C4C 00021180 */ sll $v0, $v0, 6 -/* 1074D0 802E5C50 A6430000 */ sh $v1, ($s2) -/* 1074D4 802E5C54 8E830000 */ lw $v1, ($s4) -/* 1074D8 802E5C58 00531021 */ addu $v0, $v0, $s3 -/* 1074DC 802E5C5C 00621821 */ addu $v1, $v1, $v0 -/* 1074E0 802E5C60 3C02FA00 */ lui $v0, 0xfa00 -/* 1074E4 802E5C64 AD230004 */ sw $v1, 4($t1) -/* 1074E8 802E5C68 AD0E0000 */ sw $t6, ($t0) -/* 1074EC 802E5C6C AD0D0004 */ sw $t5, 4($t0) -/* 1074F0 802E5C70 ACEC0000 */ sw $t4, ($a3) -/* 1074F4 802E5C74 ACEB0004 */ sw $t3, 4($a3) -/* 1074F8 802E5C78 AC820000 */ sw $v0, ($a0) -/* 1074FC 802E5C7C 3C02DE00 */ lui $v0, 0xde00 -/* 107500 802E5C80 AC910004 */ sw $s1, 4($a0) -/* 107504 802E5C84 ACA20000 */ sw $v0, ($a1) -/* 107508 802E5C88 8FB50058 */ lw $s5, 0x58($sp) -/* 10750C 802E5C8C 24020040 */ addiu $v0, $zero, 0x40 -/* 107510 802E5C90 ACB50004 */ sw $s5, 4($a1) -/* 107514 802E5C94 ACCA0000 */ sw $t2, ($a2) -/* 107518 802E5C98 ACC20004 */ sw $v0, 4($a2) -/* 10751C 802E5C9C 8FB80060 */ lw $t8, 0x60($sp) -/* 107520 802E5CA0 9303000B */ lbu $v1, 0xb($t8) -/* 107524 802E5CA4 24110050 */ addiu $s1, $zero, 0x50 -/* 107528 802E5CA8 0071102A */ slt $v0, $v1, $s1 -/* 10752C 802E5CAC 10400002 */ beqz $v0, .L802E5CB8 -/* 107530 802E5CB0 26D60008 */ addiu $s6, $s6, 8 -/* 107534 802E5CB4 0060882D */ daddu $s1, $v1, $zero -.L802E5CB8: -/* 107538 802E5CB8 02C0182D */ daddu $v1, $s6, $zero -/* 10753C 802E5CBC 26D60008 */ addiu $s6, $s6, 8 -/* 107540 802E5CC0 02E0202D */ daddu $a0, $s7, $zero -/* 107544 802E5CC4 2405000A */ addiu $a1, $zero, 0xa -/* 107548 802E5CC8 3C02E700 */ lui $v0, 0xe700 -/* 10754C 802E5CCC AC620000 */ sw $v0, ($v1) -/* 107550 802E5CD0 0C0B959C */ jal entity_SuperBlockContent_get_previous_yaw -/* 107554 802E5CD4 AC600004 */ sw $zero, 4($v1) -/* 107558 802E5CD8 44050000 */ mfc1 $a1, $f0 -/* 10755C 802E5CDC 44800000 */ mtc1 $zero, $f0 -/* 107560 802E5CE0 3C073F80 */ lui $a3, 0x3f80 -/* 107564 802E5CE4 44060000 */ mfc1 $a2, $f0 -/* 107568 802E5CE8 27A40018 */ addiu $a0, $sp, 0x18 -/* 10756C 802E5CEC 0C019EC8 */ jal guRotateF -/* 107570 802E5CF0 AFA60010 */ sw $a2, 0x10($sp) -/* 107574 802E5CF4 27A40018 */ addiu $a0, $sp, 0x18 -/* 107578 802E5CF8 26F00090 */ addiu $s0, $s7, 0x90 -/* 10757C 802E5CFC 0C019D40 */ jal guMtxF2L -/* 107580 802E5D00 0200282D */ daddu $a1, $s0, $zero -/* 107584 802E5D04 26E400D0 */ addiu $a0, $s7, 0xd0 -/* 107588 802E5D08 96420000 */ lhu $v0, ($s2) -/* 10758C 802E5D0C 8E830000 */ lw $v1, ($s4) -/* 107590 802E5D10 00021180 */ sll $v0, $v0, 6 -/* 107594 802E5D14 00621821 */ addu $v1, $v1, $v0 -/* 107598 802E5D18 00731821 */ addu $v1, $v1, $s3 -.L802E5D1C: -/* 10759C 802E5D1C 8E190000 */ lw $t9, ($s0) -/* 1075A0 802E5D20 8E0F0004 */ lw $t7, 4($s0) -/* 1075A4 802E5D24 8E150008 */ lw $s5, 8($s0) -/* 1075A8 802E5D28 8E18000C */ lw $t8, 0xc($s0) -/* 1075AC 802E5D2C AC790000 */ sw $t9, ($v1) -/* 1075B0 802E5D30 AC6F0004 */ sw $t7, 4($v1) -/* 1075B4 802E5D34 AC750008 */ sw $s5, 8($v1) -/* 1075B8 802E5D38 AC78000C */ sw $t8, 0xc($v1) -/* 1075BC 802E5D3C 26100010 */ addiu $s0, $s0, 0x10 -/* 1075C0 802E5D40 1604FFF6 */ bne $s0, $a0, .L802E5D1C -/* 1075C4 802E5D44 24630010 */ addiu $v1, $v1, 0x10 -/* 1075C8 802E5D48 02C0502D */ daddu $t2, $s6, $zero -/* 1075CC 802E5D4C 26D60008 */ addiu $s6, $s6, 8 -/* 1075D0 802E5D50 3C100001 */ lui $s0, 1 -/* 1075D4 802E5D54 36101630 */ ori $s0, $s0, 0x1630 -/* 1075D8 802E5D58 02C0482D */ daddu $t1, $s6, $zero -/* 1075DC 802E5D5C 26D60008 */ addiu $s6, $s6, 8 -/* 1075E0 802E5D60 3C19E200 */ lui $t9, 0xe200 -/* 1075E4 802E5D64 3739001C */ ori $t9, $t9, 0x1c -/* 1075E8 802E5D68 3C0E0050 */ lui $t6, 0x50 -/* 1075EC 802E5D6C 35CE4358 */ ori $t6, $t6, 0x4358 -/* 1075F0 802E5D70 02C0402D */ daddu $t0, $s6, $zero -/* 1075F4 802E5D74 26D60008 */ addiu $s6, $s6, 8 -/* 1075F8 802E5D78 3C0DFCFF */ lui $t5, 0xfcff -/* 1075FC 802E5D7C 35ADB3FF */ ori $t5, $t5, 0xb3ff -/* 107600 802E5D80 3C0CFF2C */ lui $t4, 0xff2c -/* 107604 802E5D84 358CFE7F */ ori $t4, $t4, 0xfe7f -/* 107608 802E5D88 02C0282D */ daddu $a1, $s6, $zero -/* 10760C 802E5D8C 26D60008 */ addiu $s6, $s6, 8 -/* 107610 802E5D90 02C0302D */ daddu $a2, $s6, $zero -/* 107614 802E5D94 26D60008 */ addiu $s6, $s6, 8 -/* 107618 802E5D98 02C0382D */ daddu $a3, $s6, $zero -/* 10761C 802E5D9C 26D60008 */ addiu $s6, $s6, 8 -/* 107620 802E5DA0 3C0BD838 */ lui $t3, 0xd838 -/* 107624 802E5DA4 356B0002 */ ori $t3, $t3, 2 -/* 107628 802E5DA8 3C048007 */ lui $a0, %hi(gMatrixListPos) -/* 10762C 802E5DAC 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) -/* 107630 802E5DB0 94820000 */ lhu $v0, ($a0) -/* 107634 802E5DB4 3C03DA38 */ lui $v1, 0xda38 -/* 107638 802E5DB8 AD430000 */ sw $v1, ($t2) -/* 10763C 802E5DBC 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* 107640 802E5DC0 AC36A66C */ sw $s6, %lo(gMasterGfxPos)($at) -/* 107644 802E5DC4 24430001 */ addiu $v1, $v0, 1 -/* 107648 802E5DC8 3042FFFF */ andi $v0, $v0, 0xffff -/* 10764C 802E5DCC 00021180 */ sll $v0, $v0, 6 -/* 107650 802E5DD0 A4830000 */ sh $v1, ($a0) -/* 107654 802E5DD4 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 107658 802E5DD8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 10765C 802E5DDC 00501021 */ addu $v0, $v0, $s0 -/* 107660 802E5DE0 00621821 */ addu $v1, $v1, $v0 -/* 107664 802E5DE4 3C02FA00 */ lui $v0, 0xfa00 -/* 107668 802E5DE8 AD430004 */ sw $v1, 4($t2) -/* 10766C 802E5DEC AD390000 */ sw $t9, ($t1) -/* 107670 802E5DF0 AD2E0004 */ sw $t6, 4($t1) -/* 107674 802E5DF4 AD0D0000 */ sw $t5, ($t0) -/* 107678 802E5DF8 AD0C0004 */ sw $t4, 4($t0) -/* 10767C 802E5DFC ACA20000 */ sw $v0, ($a1) -/* 107680 802E5E00 3C02DE00 */ lui $v0, 0xde00 -/* 107684 802E5E04 ACB10004 */ sw $s1, 4($a1) -/* 107688 802E5E08 ACC20000 */ sw $v0, ($a2) -/* 10768C 802E5E0C 8FAF0058 */ lw $t7, 0x58($sp) -/* 107690 802E5E10 24020040 */ addiu $v0, $zero, 0x40 -/* 107694 802E5E14 ACCF0004 */ sw $t7, 4($a2) -/* 107698 802E5E18 ACEB0000 */ sw $t3, ($a3) -/* 10769C 802E5E1C ACE20004 */ sw $v0, 4($a3) -/* 1076A0 802E5E20 8FBF0094 */ lw $ra, 0x94($sp) -/* 1076A4 802E5E24 8FBE0090 */ lw $fp, 0x90($sp) -/* 1076A8 802E5E28 8FB7008C */ lw $s7, 0x8c($sp) -/* 1076AC 802E5E2C 8FB60088 */ lw $s6, 0x88($sp) -/* 1076B0 802E5E30 8FB50084 */ lw $s5, 0x84($sp) -/* 1076B4 802E5E34 8FB40080 */ lw $s4, 0x80($sp) -/* 1076B8 802E5E38 8FB3007C */ lw $s3, 0x7c($sp) -/* 1076BC 802E5E3C 8FB20078 */ lw $s2, 0x78($sp) -/* 1076C0 802E5E40 8FB10074 */ lw $s1, 0x74($sp) -/* 1076C4 802E5E44 8FB00070 */ lw $s0, 0x70($sp) -/* 1076C8 802E5E48 03E00008 */ jr $ra -/* 1076CC 802E5E4C 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_init_fragments.s b/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_init_fragments.s deleted file mode 100644 index cfb349c149..0000000000 --- a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_init_fragments.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_WoodenCrate_init_fragments -/* 109660 802E7DE0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 109664 802E7DE4 AFB3009C */ sw $s3, 0x9c($sp) -/* 109668 802E7DE8 0080982D */ daddu $s3, $a0, $zero -/* 10966C 802E7DEC AFB400A0 */ sw $s4, 0xa0($sp) -/* 109670 802E7DF0 00C0A02D */ daddu $s4, $a2, $zero -/* 109674 802E7DF4 27A40050 */ addiu $a0, $sp, 0x50 -/* 109678 802E7DF8 AFB20098 */ sw $s2, 0x98($sp) -/* 10967C 802E7DFC 0000902D */ daddu $s2, $zero, $zero -/* 109680 802E7E00 AFB600A8 */ sw $s6, 0xa8($sp) -/* 109684 802E7E04 24160014 */ addiu $s6, $zero, 0x14 -/* 109688 802E7E08 AFB500A4 */ sw $s5, 0xa4($sp) -/* 10968C 802E7E0C 2415FFF6 */ addiu $s5, $zero, -0xa -/* 109690 802E7E10 AFBF00AC */ sw $ra, 0xac($sp) -/* 109694 802E7E14 AFB10094 */ sw $s1, 0x94($sp) -/* 109698 802E7E18 AFB00090 */ sw $s0, 0x90($sp) -/* 10969C 802E7E1C F7B400B0 */ sdc1 $f20, 0xb0($sp) -/* 1096A0 802E7E20 8E620040 */ lw $v0, 0x40($s3) -/* 1096A4 802E7E24 30A5FFFF */ andi $a1, $a1, 0xffff -/* 1096A8 802E7E28 0040802D */ daddu $s0, $v0, $zero -/* 1096AC 802E7E2C 8E620044 */ lw $v0, 0x44($s3) -/* 1096B0 802E7E30 3C014120 */ lui $at, 0x4120 -/* 1096B4 802E7E34 4481A000 */ mtc1 $at, $f20 -/* 1096B8 802E7E38 00451021 */ addu $v0, $v0, $a1 -/* 1096BC 802E7E3C AE020008 */ sw $v0, 8($s0) -/* 1096C0 802E7E40 3C02802F */ lui $v0, %hi(entity_WoodenCrate_setupGfx) -/* 1096C4 802E7E44 2442854C */ addiu $v0, $v0, %lo(entity_WoodenCrate_setupGfx) -/* 1096C8 802E7E48 AE62003C */ sw $v0, 0x3c($s3) -/* 1096CC 802E7E4C 240200FF */ addiu $v0, $zero, 0xff -/* 1096D0 802E7E50 A262000B */ sb $v0, 0xb($s3) -/* 1096D4 802E7E54 C600000C */ lwc1 $f0, 0xc($s0) -/* 1096D8 802E7E58 8E650048 */ lw $a1, 0x48($s3) -/* 1096DC 802E7E5C 8E670050 */ lw $a3, 0x50($s3) -/* 1096E0 802E7E60 44060000 */ mfc1 $a2, $f0 -/* 1096E4 802E7E64 0200882D */ daddu $s1, $s0, $zero -/* 1096E8 802E7E68 0C019E40 */ jal guTranslateF -/* 1096EC 802E7E6C AE66004C */ sw $a2, 0x4c($s3) -.L802E7E70: -/* 1096F0 802E7E70 3282FFFF */ andi $v0, $s4, 0xffff -/* 1096F4 802E7E74 26940040 */ addiu $s4, $s4, 0x40 -/* 1096F8 802E7E78 8E650044 */ lw $a1, 0x44($s3) -/* 1096FC 802E7E7C 27A40010 */ addiu $a0, $sp, 0x10 -/* 109700 802E7E80 0C019D60 */ jal guMtxL2F -/* 109704 802E7E84 00A22821 */ addu $a1, $a1, $v0 -/* 109708 802E7E88 27A40050 */ addiu $a0, $sp, 0x50 -/* 10970C 802E7E8C 27A50010 */ addiu $a1, $sp, 0x10 -/* 109710 802E7E90 0C019D80 */ jal guMtxCatF -/* 109714 802E7E94 00A0302D */ daddu $a2, $a1, $zero -/* 109718 802E7E98 C7A00040 */ lwc1 $f0, 0x40($sp) -/* 10971C 802E7E9C E6000154 */ swc1 $f0, 0x154($s0) -/* 109720 802E7EA0 C7A00044 */ lwc1 $f0, 0x44($sp) -/* 109724 802E7EA4 E60001E4 */ swc1 $f0, 0x1e4($s0) -/* 109728 802E7EA8 C7A00048 */ lwc1 $f0, 0x48($sp) -/* 10972C 802E7EAC 240400FF */ addiu $a0, $zero, 0xff -/* 109730 802E7EB0 0C00A67F */ jal rand_int -/* 109734 802E7EB4 E6000274 */ swc1 $f0, 0x274($s0) -/* 109738 802E7EB8 24040005 */ addiu $a0, $zero, 5 -/* 10973C 802E7EBC 00021023 */ negu $v0, $v0 -/* 109740 802E7EC0 A2220034 */ sb $v0, 0x34($s1) -/* 109744 802E7EC4 0C00A67F */ jal rand_int -/* 109748 802E7EC8 A23600A0 */ sb $s6, 0xa0($s1) -/* 10974C 802E7ECC 0040182D */ daddu $v1, $v0, $zero -/* 109750 802E7ED0 32420001 */ andi $v0, $s2, 1 -/* 109754 802E7ED4 14400002 */ bnez $v0, .L802E7EE0 -/* 109758 802E7ED8 2462000A */ addiu $v0, $v1, 0xa -/* 10975C 802E7EDC 02A31023 */ subu $v0, $s5, $v1 -.L802E7EE0: -/* 109760 802E7EE0 44820000 */ mtc1 $v0, $f0 -/* 109764 802E7EE4 00000000 */ nop -/* 109768 802E7EE8 46800020 */ cvt.s.w $f0, $f0 -/* 10976C 802E7EEC E60000C4 */ swc1 $f0, 0xc4($s0) -/* 109770 802E7EF0 E6140304 */ swc1 $f20, 0x304($s0) -/* 109774 802E7EF4 A2200010 */ sb $zero, 0x10($s1) -/* 109778 802E7EF8 A2200058 */ sb $zero, 0x58($s1) -/* 10977C 802E7EFC A220007C */ sb $zero, 0x7c($s1) -/* 109780 802E7F00 26310001 */ addiu $s1, $s1, 1 -/* 109784 802E7F04 26520001 */ addiu $s2, $s2, 1 -/* 109788 802E7F08 2A420023 */ slti $v0, $s2, 0x23 -/* 10978C 802E7F0C 1440FFD8 */ bnez $v0, .L802E7E70 -/* 109790 802E7F10 26100004 */ addiu $s0, $s0, 4 -/* 109794 802E7F14 8FBF00AC */ lw $ra, 0xac($sp) -/* 109798 802E7F18 8FB600A8 */ lw $s6, 0xa8($sp) -/* 10979C 802E7F1C 8FB500A4 */ lw $s5, 0xa4($sp) -/* 1097A0 802E7F20 8FB400A0 */ lw $s4, 0xa0($sp) -/* 1097A4 802E7F24 8FB3009C */ lw $s3, 0x9c($sp) -/* 1097A8 802E7F28 8FB20098 */ lw $s2, 0x98($sp) -/* 1097AC 802E7F2C 8FB10094 */ lw $s1, 0x94($sp) -/* 1097B0 802E7F30 8FB00090 */ lw $s0, 0x90($sp) -/* 1097B4 802E7F34 D7B400B0 */ ldc1 $f20, 0xb0($sp) -/* 1097B8 802E7F38 03E00008 */ jr $ra -/* 1097BC 802E7F3C 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_setupGfx.s b/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_setupGfx.s deleted file mode 100644 index d0c5a67b1a..0000000000 --- a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_setupGfx.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel entity_WoodenCrate_setupGfx -/* 109DCC 802E854C 27BDFE80 */ addiu $sp, $sp, -0x180 -/* 109DD0 802E8550 AFBE0148 */ sw $fp, 0x148($sp) -/* 109DD4 802E8554 0000F02D */ daddu $fp, $zero, $zero -/* 109DD8 802E8558 27A80098 */ addiu $t0, $sp, 0x98 -/* 109DDC 802E855C AFB5013C */ sw $s5, 0x13c($sp) -/* 109DE0 802E8560 27B500D8 */ addiu $s5, $sp, 0xd8 -/* 109DE4 802E8564 AFB40138 */ sw $s4, 0x138($sp) -/* 109DE8 802E8568 27B40058 */ addiu $s4, $sp, 0x58 -/* 109DEC 802E856C AFA8011C */ sw $t0, 0x11c($sp) -/* 109DF0 802E8570 3C080001 */ lui $t0, 1 -/* 109DF4 802E8574 AFB1012C */ sw $s1, 0x12c($sp) -/* 109DF8 802E8578 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* 109DFC 802E857C 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) -/* 109E00 802E8580 35081630 */ ori $t0, $t0, 0x1630 -/* 109E04 802E8584 AFBF014C */ sw $ra, 0x14c($sp) -/* 109E08 802E8588 AFB70144 */ sw $s7, 0x144($sp) -/* 109E0C 802E858C AFB60140 */ sw $s6, 0x140($sp) -/* 109E10 802E8590 AFB30134 */ sw $s3, 0x134($sp) -/* 109E14 802E8594 AFB20130 */ sw $s2, 0x130($sp) -/* 109E18 802E8598 AFB00128 */ sw $s0, 0x128($sp) -/* 109E1C 802E859C F7BE0178 */ sdc1 $f30, 0x178($sp) -/* 109E20 802E85A0 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* 109E24 802E85A4 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* 109E28 802E85A8 F7B80160 */ sdc1 $f24, 0x160($sp) -/* 109E2C 802E85AC F7B60158 */ sdc1 $f22, 0x158($sp) -/* 109E30 802E85B0 F7B40150 */ sdc1 $f20, 0x150($sp) -/* 109E34 802E85B4 0C04417A */ jal get_entity_by_index -/* 109E38 802E85B8 AFA80120 */ sw $t0, 0x120($sp) -/* 109E3C 802E85BC 0040B82D */ daddu $s7, $v0, $zero -/* 109E40 802E85C0 3C0143B4 */ lui $at, 0x43b4 -/* 109E44 802E85C4 4481D000 */ mtc1 $at, $f26 -/* 109E48 802E85C8 3C013B80 */ lui $at, 0x3b80 -/* 109E4C 802E85CC 4481C000 */ mtc1 $at, $f24 -/* 109E50 802E85D0 3C013F80 */ lui $at, 0x3f80 -/* 109E54 802E85D4 4481B000 */ mtc1 $at, $f22 -/* 109E58 802E85D8 8EE20040 */ lw $v0, 0x40($s7) -/* 109E5C 802E85DC 4480A000 */ mtc1 $zero, $f20 -/* 109E60 802E85E0 C6E00048 */ lwc1 $f0, 0x48($s7) -/* 109E64 802E85E4 0040902D */ daddu $s2, $v0, $zero -/* 109E68 802E85E8 0240982D */ daddu $s3, $s2, $zero -/* 109E6C 802E85EC 2630FFFC */ addiu $s0, $s1, -4 -/* 109E70 802E85F0 46000007 */ neg.s $f0, $f0 -/* 109E74 802E85F4 E7A00118 */ swc1 $f0, 0x118($sp) -/* 109E78 802E85F8 C6E0004C */ lwc1 $f0, 0x4c($s7) -/* 109E7C 802E85FC C6E20050 */ lwc1 $f2, 0x50($s7) -/* 109E80 802E8600 8E560008 */ lw $s6, 8($s2) -/* 109E84 802E8604 46000787 */ neg.s $f30, $f0 -/* 109E88 802E8608 46001707 */ neg.s $f28, $f2 -.L802E860C: -/* 109E8C 802E860C 82420010 */ lb $v0, 0x10($s2) -/* 109E90 802E8610 28420002 */ slti $v0, $v0, 2 -/* 109E94 802E8614 1040000F */ beqz $v0, .L802E8654 -/* 109E98 802E8618 3C03E200 */ lui $v1, 0xe200 -/* 109E9C 802E861C 26100008 */ addiu $s0, $s0, 8 -/* 109EA0 802E8620 3463001C */ ori $v1, $v1, 0x1c -/* 109EA4 802E8624 3C020055 */ lui $v0, 0x55 -/* 109EA8 802E8628 34422078 */ ori $v0, $v0, 0x2078 -/* 109EAC 802E862C AE03FFFC */ sw $v1, -4($s0) -/* 109EB0 802E8630 AE020000 */ sw $v0, ($s0) -/* 109EB4 802E8634 26100008 */ addiu $s0, $s0, 8 -/* 109EB8 802E8638 26310010 */ addiu $s1, $s1, 0x10 -/* 109EBC 802E863C 3C03FC12 */ lui $v1, 0xfc12 -/* 109EC0 802E8640 34631824 */ ori $v1, $v1, 0x1824 -/* 109EC4 802E8644 3C02FF33 */ lui $v0, 0xff33 -/* 109EC8 802E8648 3442FFFF */ ori $v0, $v0, 0xffff -/* 109ECC 802E864C 080BA1A1 */ j .L802E8684 -/* 109ED0 802E8650 AE03FFFC */ sw $v1, -4($s0) -.L802E8654: -/* 109ED4 802E8654 26100008 */ addiu $s0, $s0, 8 -/* 109ED8 802E8658 3C03FCFF */ lui $v1, 0xfcff -/* 109EDC 802E865C 3463C3FF */ ori $v1, $v1, 0xc3ff -/* 109EE0 802E8660 3C02FF30 */ lui $v0, 0xff30 -/* 109EE4 802E8664 3442FE7F */ ori $v0, $v0, 0xfe7f -/* 109EE8 802E8668 AE03FFFC */ sw $v1, -4($s0) -/* 109EEC 802E866C AE020000 */ sw $v0, ($s0) -/* 109EF0 802E8670 26100008 */ addiu $s0, $s0, 8 -/* 109EF4 802E8674 3C02FA00 */ lui $v0, 0xfa00 -/* 109EF8 802E8678 AE02FFFC */ sw $v0, -4($s0) -/* 109EFC 802E867C 92420034 */ lbu $v0, 0x34($s2) -/* 109F00 802E8680 26310010 */ addiu $s1, $s1, 0x10 -.L802E8684: -/* 109F04 802E8684 AE020000 */ sw $v0, ($s0) -/* 109F08 802E8688 8FA50118 */ lw $a1, 0x118($sp) -/* 109F0C 802E868C 4406F000 */ mfc1 $a2, $f30 -/* 109F10 802E8690 4407E000 */ mfc1 $a3, $f28 -/* 109F14 802E8694 0C019E40 */ jal guTranslateF -/* 109F18 802E8698 27A40018 */ addiu $a0, $sp, 0x18 -/* 109F1C 802E869C 92420058 */ lbu $v0, 0x58($s2) -/* 109F20 802E86A0 44820000 */ mtc1 $v0, $f0 -/* 109F24 802E86A4 00000000 */ nop -/* 109F28 802E86A8 46800020 */ cvt.s.w $f0, $f0 -/* 109F2C 802E86AC 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F30 802E86B0 00000000 */ nop -/* 109F34 802E86B4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F38 802E86B8 00000000 */ nop -/* 109F3C 802E86BC 4406B000 */ mfc1 $a2, $f22 -/* 109F40 802E86C0 4407A000 */ mfc1 $a3, $f20 -/* 109F44 802E86C4 8FA4011C */ lw $a0, 0x11c($sp) -/* 109F48 802E86C8 44050000 */ mfc1 $a1, $f0 -/* 109F4C 802E86CC 0C019EC8 */ jal guRotateF -/* 109F50 802E86D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 109F54 802E86D4 9242007C */ lbu $v0, 0x7c($s2) -/* 109F58 802E86D8 44820000 */ mtc1 $v0, $f0 -/* 109F5C 802E86DC 00000000 */ nop -/* 109F60 802E86E0 46800020 */ cvt.s.w $f0, $f0 -/* 109F64 802E86E4 461A0002 */ mul.s $f0, $f0, $f26 -/* 109F68 802E86E8 00000000 */ nop -/* 109F6C 802E86EC 26100008 */ addiu $s0, $s0, 8 -/* 109F70 802E86F0 26310018 */ addiu $s1, $s1, 0x18 -/* 109F74 802E86F4 46180002 */ mul.s $f0, $f0, $f24 -/* 109F78 802E86F8 00000000 */ nop -/* 109F7C 802E86FC 27DE0001 */ addiu $fp, $fp, 1 -/* 109F80 802E8700 02A0202D */ daddu $a0, $s5, $zero -/* 109F84 802E8704 4406A000 */ mfc1 $a2, $f20 -/* 109F88 802E8708 4407B000 */ mfc1 $a3, $f22 -/* 109F8C 802E870C 44050000 */ mfc1 $a1, $f0 -/* 109F90 802E8710 26520001 */ addiu $s2, $s2, 1 -/* 109F94 802E8714 0C019EC8 */ jal guRotateF -/* 109F98 802E8718 E7B40010 */ swc1 $f20, 0x10($sp) -/* 109F9C 802E871C 02A0282D */ daddu $a1, $s5, $zero -/* 109FA0 802E8720 8FA4011C */ lw $a0, 0x11c($sp) -/* 109FA4 802E8724 0C019D80 */ jal guMtxCatF -/* 109FA8 802E8728 02A0302D */ daddu $a2, $s5, $zero -/* 109FAC 802E872C 02A0202D */ daddu $a0, $s5, $zero -/* 109FB0 802E8730 27A50018 */ addiu $a1, $sp, 0x18 -/* 109FB4 802E8734 0C019D80 */ jal guMtxCatF -/* 109FB8 802E8738 00A0302D */ daddu $a2, $a1, $zero -/* 109FBC 802E873C 0280202D */ daddu $a0, $s4, $zero -/* 109FC0 802E8740 8E650154 */ lw $a1, 0x154($s3) -/* 109FC4 802E8744 8E6601E4 */ lw $a2, 0x1e4($s3) -/* 109FC8 802E8748 8E670274 */ lw $a3, 0x274($s3) -/* 109FCC 802E874C 0C019E40 */ jal guTranslateF -/* 109FD0 802E8750 26730004 */ addiu $s3, $s3, 4 -/* 109FD4 802E8754 27A40018 */ addiu $a0, $sp, 0x18 -/* 109FD8 802E8758 0280282D */ daddu $a1, $s4, $zero -/* 109FDC 802E875C 0C019D80 */ jal guMtxCatF -/* 109FE0 802E8760 0280302D */ daddu $a2, $s4, $zero -/* 109FE4 802E8764 0280202D */ daddu $a0, $s4, $zero -/* 109FE8 802E8768 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* 109FEC 802E876C 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* 109FF0 802E8770 3C02800A */ lui $v0, %hi(gDisplayContext) -/* 109FF4 802E8774 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* 109FF8 802E8778 8FA80120 */ lw $t0, 0x120($sp) -/* 109FFC 802E877C 00052980 */ sll $a1, $a1, 6 -/* 10A000 802E8780 00A82821 */ addu $a1, $a1, $t0 -/* 10A004 802E8784 0C019D40 */ jal guMtxF2L -/* 10A008 802E8788 00452821 */ addu $a1, $v0, $a1 -/* 10A00C 802E878C 3C05D838 */ lui $a1, 0xd838 -/* 10A010 802E8790 34A50002 */ ori $a1, $a1, 2 -/* 10A014 802E8794 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 10A018 802E8798 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* 10A01C 802E879C 3C03DA38 */ lui $v1, 0xda38 -/* 10A020 802E87A0 AE03FFFC */ sw $v1, -4($s0) -/* 10A024 802E87A4 8FA80120 */ lw $t0, 0x120($sp) -/* 10A028 802E87A8 24430001 */ addiu $v1, $v0, 1 -/* 10A02C 802E87AC 3042FFFF */ andi $v0, $v0, 0xffff -/* 10A030 802E87B0 00021180 */ sll $v0, $v0, 6 -/* 10A034 802E87B4 3C018007 */ lui $at, %hi(gMatrixListPos) -/* 10A038 802E87B8 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) -/* 10A03C 802E87BC 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 10A040 802E87C0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 10A044 802E87C4 00481021 */ addu $v0, $v0, $t0 -/* 10A048 802E87C8 00621821 */ addu $v1, $v1, $v0 -/* 10A04C 802E87CC AE030000 */ sw $v1, ($s0) -/* 10A050 802E87D0 96C40002 */ lhu $a0, 2($s6) -/* 10A054 802E87D4 26D60004 */ addiu $s6, $s6, 4 -/* 10A058 802E87D8 26100008 */ addiu $s0, $s0, 8 -/* 10A05C 802E87DC 8EE30044 */ lw $v1, 0x44($s7) -/* 10A060 802E87E0 3C02DE00 */ lui $v0, 0xde00 -/* 10A064 802E87E4 AE02FFFC */ sw $v0, -4($s0) -/* 10A068 802E87E8 24020040 */ addiu $v0, $zero, 0x40 -/* 10A06C 802E87EC 00641821 */ addu $v1, $v1, $a0 -/* 10A070 802E87F0 AE030000 */ sw $v1, ($s0) -/* 10A074 802E87F4 26100008 */ addiu $s0, $s0, 8 -/* 10A078 802E87F8 AE020000 */ sw $v0, ($s0) -/* 10A07C 802E87FC 2BC20023 */ slti $v0, $fp, 0x23 -/* 10A080 802E8800 1440FF82 */ bnez $v0, .L802E860C -/* 10A084 802E8804 AE05FFFC */ sw $a1, -4($s0) -/* 10A088 802E8808 8FBF014C */ lw $ra, 0x14c($sp) -/* 10A08C 802E880C 8FBE0148 */ lw $fp, 0x148($sp) -/* 10A090 802E8810 8FB70144 */ lw $s7, 0x144($sp) -/* 10A094 802E8814 8FB60140 */ lw $s6, 0x140($sp) -/* 10A098 802E8818 8FB5013C */ lw $s5, 0x13c($sp) -/* 10A09C 802E881C 8FB40138 */ lw $s4, 0x138($sp) -/* 10A0A0 802E8820 8FB30134 */ lw $s3, 0x134($sp) -/* 10A0A4 802E8824 8FB20130 */ lw $s2, 0x130($sp) -/* 10A0A8 802E8828 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* 10A0AC 802E882C AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) -/* 10A0B0 802E8830 8FB1012C */ lw $s1, 0x12c($sp) -/* 10A0B4 802E8834 8FB00128 */ lw $s0, 0x128($sp) -/* 10A0B8 802E8838 D7BE0178 */ ldc1 $f30, 0x178($sp) -/* 10A0BC 802E883C D7BC0170 */ ldc1 $f28, 0x170($sp) -/* 10A0C0 802E8840 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* 10A0C4 802E8844 D7B80160 */ ldc1 $f24, 0x160($sp) -/* 10A0C8 802E8848 D7B60158 */ ldc1 $f22, 0x158($sp) -/* 10A0CC 802E884C D7B40150 */ ldc1 $f20, 0x150($sp) -/* 10A0D0 802E8850 03E00008 */ jr $ra -/* 10A0D4 802E8854 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_update_fragments.s b/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_update_fragments.s deleted file mode 100644 index a742bb02e6..0000000000 --- a/ver/us/asm/nonmatchings/entity/WoodenCrate/entity_WoodenCrate_update_fragments.s +++ /dev/null @@ -1,403 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802EB350 -.double 0.4 - -dlabel D_802EB358 -.double 1.6 - -dlabel D_802EB360 -.double 0.8 - -dlabel D_802EB368 -.double -10.2 - -.section .text - -glabel entity_WoodenCrate_update_fragments -/* 109820 802E7FA0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 109824 802E7FA4 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 109828 802E7FA8 4480C000 */ mtc1 $zero, $f24 -/* 10982C 802E7FAC F7BC0078 */ sdc1 $f28, 0x78($sp) -/* 109830 802E7FB0 3C014100 */ lui $at, 0x4100 -/* 109834 802E7FB4 4481E000 */ mtc1 $at, $f28 -/* 109838 802E7FB8 AFBE0050 */ sw $fp, 0x50($sp) -/* 10983C 802E7FBC 0080F02D */ daddu $fp, $a0, $zero -/* 109840 802E7FC0 AFB3003C */ sw $s3, 0x3c($sp) -/* 109844 802E7FC4 0000982D */ daddu $s3, $zero, $zero -/* 109848 802E7FC8 AFB60048 */ sw $s6, 0x48($sp) -/* 10984C 802E7FCC 27B60020 */ addiu $s6, $sp, 0x20 -/* 109850 802E7FD0 AFB50044 */ sw $s5, 0x44($sp) -/* 109854 802E7FD4 27B50024 */ addiu $s5, $sp, 0x24 -/* 109858 802E7FD8 AFB40040 */ sw $s4, 0x40($sp) -/* 10985C 802E7FDC 27B40028 */ addiu $s4, $sp, 0x28 -/* 109860 802E7FE0 AFB7004C */ sw $s7, 0x4c($sp) -/* 109864 802E7FE4 3C178000 */ lui $s7, 0x8000 -/* 109868 802E7FE8 AFBF0054 */ sw $ra, 0x54($sp) -/* 10986C 802E7FEC AFB20038 */ sw $s2, 0x38($sp) -/* 109870 802E7FF0 AFB10034 */ sw $s1, 0x34($sp) -/* 109874 802E7FF4 AFB00030 */ sw $s0, 0x30($sp) -/* 109878 802E7FF8 F7BE0080 */ sdc1 $f30, 0x80($sp) -/* 10987C 802E7FFC F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 109880 802E8000 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 109884 802E8004 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 109888 802E8008 8FD20040 */ lw $s2, 0x40($fp) -/* 10988C 802E800C 4600C786 */ mov.s $f30, $f24 -/* 109890 802E8010 4600C686 */ mov.s $f26, $f24 -/* 109894 802E8014 0240882D */ daddu $s1, $s2, $zero -/* 109898 802E8018 0240802D */ daddu $s0, $s2, $zero -.L802E801C: -/* 10989C 802E801C 82230010 */ lb $v1, 0x10($s1) -/* 1098A0 802E8020 24020001 */ addiu $v0, $zero, 1 -/* 1098A4 802E8024 10620028 */ beq $v1, $v0, .L802E80C8 -/* 1098A8 802E8028 28620002 */ slti $v0, $v1, 2 -/* 1098AC 802E802C 10400005 */ beqz $v0, .L802E8044 -/* 1098B0 802E8030 24020002 */ addiu $v0, $zero, 2 -/* 1098B4 802E8034 10600009 */ beqz $v1, .L802E805C -/* 1098B8 802E8038 00000000 */ nop -/* 1098BC 802E803C 080BA05A */ j .L802E8168 -/* 1098C0 802E8040 00000000 */ nop -.L802E8044: -/* 1098C4 802E8044 10620029 */ beq $v1, $v0, .L802E80EC -/* 1098C8 802E8048 24020003 */ addiu $v0, $zero, 3 -/* 1098CC 802E804C 50620046 */ beql $v1, $v0, .L802E8168 -/* 1098D0 802E8050 26730001 */ addiu $s3, $s3, 1 -/* 1098D4 802E8054 080BA05A */ j .L802E8168 -/* 1098D8 802E8058 00000000 */ nop -.L802E805C: -/* 1098DC 802E805C 3C014000 */ lui $at, 0x4000 -/* 1098E0 802E8060 4481F000 */ mtc1 $at, $f30 -/* 1098E4 802E8064 922200A0 */ lbu $v0, 0xa0($s1) -/* 1098E8 802E8068 C61800C4 */ lwc1 $f24, 0xc4($s0) -/* 1098EC 802E806C 3C014120 */ lui $at, 0x4120 -/* 1098F0 802E8070 44810000 */ mtc1 $at, $f0 -/* 1098F4 802E8074 44801000 */ mtc1 $zero, $f2 -/* 1098F8 802E8078 44822000 */ mtc1 $v0, $f4 -/* 1098FC 802E807C 00000000 */ nop -/* 109900 802E8080 46802120 */ cvt.s.w $f4, $f4 -/* 109904 802E8084 4618103E */ c.le.s $f2, $f24 -/* 109908 802E8088 00000000 */ nop -/* 10990C 802E808C 45000006 */ bc1f .L802E80A8 -/* 109910 802E8090 46002683 */ div.s $f26, $f4, $f0 -/* 109914 802E8094 3C01802F */ lui $at, %hi(D_802EB350) -/* 109918 802E8098 D422B350 */ ldc1 $f2, %lo(D_802EB350)($at) -/* 10991C 802E809C 4600C021 */ cvt.d.s $f0, $f24 -/* 109920 802E80A0 080BA02F */ j .L802E80BC -/* 109924 802E80A4 46220001 */ sub.d $f0, $f0, $f2 -.L802E80A8: -/* 109928 802E80A8 3C013FE0 */ lui $at, 0x3fe0 -/* 10992C 802E80AC 44811800 */ mtc1 $at, $f3 -/* 109930 802E80B0 44801000 */ mtc1 $zero, $f2 -/* 109934 802E80B4 4600C021 */ cvt.d.s $f0, $f24 -/* 109938 802E80B8 46220000 */ add.d $f0, $f0, $f2 -.L802E80BC: -/* 10993C 802E80BC 46200020 */ cvt.s.d $f0, $f0 -/* 109940 802E80C0 080BA05A */ j .L802E8168 -/* 109944 802E80C4 E60000C4 */ swc1 $f0, 0xc4($s0) -.L802E80C8: -/* 109948 802E80C8 3C013F80 */ lui $at, 0x3f80 -/* 10994C 802E80CC 4481D000 */ mtc1 $at, $f26 -/* 109950 802E80D0 C60200C4 */ lwc1 $f2, 0xc4($s0) -/* 109954 802E80D4 3C013E80 */ lui $at, 0x3e80 -/* 109958 802E80D8 44810000 */ mtc1 $at, $f0 -/* 10995C 802E80DC 4480F000 */ mtc1 $zero, $f30 -/* 109960 802E80E0 46001602 */ mul.s $f24, $f2, $f0 -/* 109964 802E80E4 080BA05A */ j .L802E8168 -/* 109968 802E80E8 00000000 */ nop -.L802E80EC: -/* 10996C 802E80EC C60200C4 */ lwc1 $f2, 0xc4($s0) -/* 109970 802E80F0 3C013F80 */ lui $at, 0x3f80 -/* 109974 802E80F4 44810000 */ mtc1 $at, $f0 -/* 109978 802E80F8 00000000 */ nop -/* 10997C 802E80FC 46001080 */ add.s $f2, $f2, $f0 -/* 109980 802E8100 3C0141A0 */ lui $at, 0x41a0 -/* 109984 802E8104 44810000 */ mtc1 $at, $f0 -/* 109988 802E8108 00000000 */ nop -/* 10998C 802E810C 4602003C */ c.lt.s $f0, $f2 -/* 109990 802E8110 00000000 */ nop -/* 109994 802E8114 45000002 */ bc1f .L802E8120 -/* 109998 802E8118 E60200C4 */ swc1 $f2, 0xc4($s0) -/* 10999C 802E811C E60000C4 */ swc1 $f0, 0xc4($s0) -.L802E8120: -/* 1099A0 802E8120 C60200C4 */ lwc1 $f2, 0xc4($s0) -/* 1099A4 802E8124 3C01428C */ lui $at, 0x428c -/* 1099A8 802E8128 44812000 */ mtc1 $at, $f4 -/* 1099AC 802E812C C60001E4 */ lwc1 $f0, 0x1e4($s0) -/* 1099B0 802E8130 46041083 */ div.s $f2, $f2, $f4 -/* 1099B4 802E8134 46020001 */ sub.s $f0, $f0, $f2 -/* 1099B8 802E8138 E60001E4 */ swc1 $f0, 0x1e4($s0) -/* 1099BC 802E813C 92220034 */ lbu $v0, 0x34($s1) -/* 1099C0 802E8140 2442FFFB */ addiu $v0, $v0, -5 -/* 1099C4 802E8144 A2220034 */ sb $v0, 0x34($s1) -/* 1099C8 802E8148 304200FF */ andi $v0, $v0, 0xff -/* 1099CC 802E814C 2C420006 */ sltiu $v0, $v0, 6 -/* 1099D0 802E8150 10400005 */ beqz $v0, .L802E8168 -/* 1099D4 802E8154 00000000 */ nop -/* 1099D8 802E8158 92220010 */ lbu $v0, 0x10($s1) -/* 1099DC 802E815C A2200034 */ sb $zero, 0x34($s1) -/* 1099E0 802E8160 24420001 */ addiu $v0, $v0, 1 -/* 1099E4 802E8164 A2220010 */ sb $v0, 0x10($s1) -.L802E8168: -/* 1099E8 802E8168 82220010 */ lb $v0, 0x10($s1) -/* 1099EC 802E816C 28420002 */ slti $v0, $v0, 2 -/* 1099F0 802E8170 504000DB */ beql $v0, $zero, .L802E84E0 -/* 1099F4 802E8174 26310001 */ addiu $s1, $s1, 1 -/* 1099F8 802E8178 C6020304 */ lwc1 $f2, 0x304($s0) -/* 1099FC 802E817C 44800000 */ mtc1 $zero, $f0 -/* 109A00 802E8180 00000000 */ nop -/* 109A04 802E8184 4602003E */ c.le.s $f0, $f2 -/* 109A08 802E8188 3C01802F */ lui $at, %hi(D_802EB358) -/* 109A0C 802E818C D420B358 */ ldc1 $f0, %lo(D_802EB358)($at) -/* 109A10 802E8190 45000003 */ bc1f .L802E81A0 -/* 109A14 802E8194 460010A1 */ cvt.d.s $f2, $f2 -/* 109A18 802E8198 3C01802F */ lui $at, %hi(D_802EB360) -/* 109A1C 802E819C D420B360 */ ldc1 $f0, %lo(D_802EB360)($at) -.L802E81A0: -/* 109A20 802E81A0 46201081 */ sub.d $f2, $f2, $f0 -/* 109A24 802E81A4 3C01802F */ lui $at, %hi(D_802EB368) -/* 109A28 802E81A8 D424B368 */ ldc1 $f4, %lo(D_802EB368)($at) -/* 109A2C 802E81AC 462010A0 */ cvt.s.d $f2, $f2 -/* 109A30 802E81B0 46001021 */ cvt.d.s $f0, $f2 -/* 109A34 802E81B4 4624003C */ c.lt.d $f0, $f4 -/* 109A38 802E81B8 00000000 */ nop -/* 109A3C 802E81BC 45000006 */ bc1f .L802E81D8 -/* 109A40 802E81C0 E6020304 */ swc1 $f2, 0x304($s0) -/* 109A44 802E81C4 3C01C123 */ lui $at, 0xc123 -/* 109A48 802E81C8 34213333 */ ori $at, $at, 0x3333 -/* 109A4C 802E81CC 44810000 */ mtc1 $at, $f0 -/* 109A50 802E81D0 00000000 */ nop -/* 109A54 802E81D4 E6000304 */ swc1 $f0, 0x304($s0) -.L802E81D8: -/* 109A58 802E81D8 C60001E4 */ lwc1 $f0, 0x1e4($s0) -/* 109A5C 802E81DC C6020304 */ lwc1 $f2, 0x304($s0) -/* 109A60 802E81E0 46020000 */ add.s $f0, $f0, $f2 -/* 109A64 802E81E4 E60001E4 */ swc1 $f0, 0x1e4($s0) -/* 109A68 802E81E8 92220034 */ lbu $v0, 0x34($s1) -/* 109A6C 802E81EC 3C0143B4 */ lui $at, 0x43b4 -/* 109A70 802E81F0 44814000 */ mtc1 $at, $f8 -/* 109A74 802E81F4 4482A000 */ mtc1 $v0, $f20 -/* 109A78 802E81F8 00000000 */ nop -/* 109A7C 802E81FC 4680A520 */ cvt.s.w $f20, $f20 -/* 109A80 802E8200 4608A502 */ mul.s $f20, $f20, $f8 -/* 109A84 802E8204 00000000 */ nop -/* 109A88 802E8208 3C013B80 */ lui $at, 0x3b80 -/* 109A8C 802E820C 44814000 */ mtc1 $at, $f8 -/* 109A90 802E8210 00000000 */ nop -/* 109A94 802E8214 4608A502 */ mul.s $f20, $f20, $f8 -/* 109A98 802E8218 00000000 */ nop -/* 109A9C 802E821C 3C0140C9 */ lui $at, 0x40c9 -/* 109AA0 802E8220 34210FD0 */ ori $at, $at, 0xfd0 -/* 109AA4 802E8224 44814000 */ mtc1 $at, $f8 -/* 109AA8 802E8228 00000000 */ nop -/* 109AAC 802E822C 4608A002 */ mul.s $f0, $f20, $f8 -/* 109AB0 802E8230 00000000 */ nop -/* 109AB4 802E8234 3C0143B4 */ lui $at, 0x43b4 -/* 109AB8 802E8238 44814000 */ mtc1 $at, $f8 -/* 109ABC 802E823C 00000000 */ nop -/* 109AC0 802E8240 46080583 */ div.s $f22, $f0, $f8 -/* 109AC4 802E8244 0C00A85B */ jal sin_rad -/* 109AC8 802E8248 4600B306 */ mov.s $f12, $f22 -/* 109ACC 802E824C 4600D002 */ mul.s $f0, $f26, $f0 -/* 109AD0 802E8250 00000000 */ nop -/* 109AD4 802E8254 C6020154 */ lwc1 $f2, 0x154($s0) -/* 109AD8 802E8258 46001080 */ add.s $f2, $f2, $f0 -/* 109ADC 802E825C 4600B306 */ mov.s $f12, $f22 -/* 109AE0 802E8260 0C00A874 */ jal cos_rad -/* 109AE4 802E8264 E6020154 */ swc1 $f2, 0x154($s0) -/* 109AE8 802E8268 4600D002 */ mul.s $f0, $f26, $f0 -/* 109AEC 802E826C 00000000 */ nop -/* 109AF0 802E8270 3C040004 */ lui $a0, 4 -/* 109AF4 802E8274 C6020274 */ lwc1 $f2, 0x274($s0) -/* 109AF8 802E8278 02C0282D */ daddu $a1, $s6, $zero -/* 109AFC 802E827C 46001080 */ add.s $f2, $f2, $f0 -/* 109B00 802E8280 C6000154 */ lwc1 $f0, 0x154($s0) -/* 109B04 802E8284 02A0302D */ daddu $a2, $s5, $zero -/* 109B08 802E8288 E6020274 */ swc1 $f2, 0x274($s0) -/* 109B0C 802E828C C60201E4 */ lwc1 $f2, 0x1e4($s0) -/* 109B10 802E8290 C6040274 */ lwc1 $f4, 0x274($s0) -/* 109B14 802E8294 0280382D */ daddu $a3, $s4, $zero -/* 109B18 802E8298 E7A00020 */ swc1 $f0, 0x20($sp) -/* 109B1C 802E829C E7A20024 */ swc1 $f2, 0x24($sp) -/* 109B20 802E82A0 E7A40028 */ swc1 $f4, 0x28($sp) -/* 109B24 802E82A4 E7BA0010 */ swc1 $f26, 0x10($sp) -/* 109B28 802E82A8 E7B40014 */ swc1 $f20, 0x14($sp) -/* 109B2C 802E82AC E7BC0018 */ swc1 $f28, 0x18($sp) -/* 109B30 802E82B0 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* 109B34 802E82B4 E7BC001C */ swc1 $f28, 0x1c($sp) -/* 109B38 802E82B8 10400031 */ beqz $v0, .L802E8380 -/* 109B3C 802E82BC 3C040004 */ lui $a0, 4 -/* 109B40 802E82C0 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 109B44 802E82C4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 109B48 802E82C8 C7A40028 */ lwc1 $f4, 0x28($sp) -/* 109B4C 802E82CC E6000154 */ swc1 $f0, 0x154($s0) -/* 109B50 802E82D0 E60201E4 */ swc1 $f2, 0x1e4($s0) -/* 109B54 802E82D4 E6040274 */ swc1 $f4, 0x274($s0) -/* 109B58 802E82D8 92220034 */ lbu $v0, 0x34($s1) -/* 109B5C 802E82DC 3C0143B4 */ lui $at, 0x43b4 -/* 109B60 802E82E0 44814000 */ mtc1 $at, $f8 -/* 109B64 802E82E4 24420080 */ addiu $v0, $v0, 0x80 -/* 109B68 802E82E8 A2220034 */ sb $v0, 0x34($s1) -/* 109B6C 802E82EC 304200FF */ andi $v0, $v0, 0xff -/* 109B70 802E82F0 44820000 */ mtc1 $v0, $f0 -/* 109B74 802E82F4 00000000 */ nop -/* 109B78 802E82F8 46800020 */ cvt.s.w $f0, $f0 -/* 109B7C 802E82FC 46080002 */ mul.s $f0, $f0, $f8 -/* 109B80 802E8300 00000000 */ nop -/* 109B84 802E8304 3C013B80 */ lui $at, 0x3b80 -/* 109B88 802E8308 44814000 */ mtc1 $at, $f8 -/* 109B8C 802E830C 00000000 */ nop -/* 109B90 802E8310 46080002 */ mul.s $f0, $f0, $f8 -/* 109B94 802E8314 00000000 */ nop -/* 109B98 802E8318 3C0140C9 */ lui $at, 0x40c9 -/* 109B9C 802E831C 34210FD0 */ ori $at, $at, 0xfd0 -/* 109BA0 802E8320 44814000 */ mtc1 $at, $f8 -/* 109BA4 802E8324 00000000 */ nop -/* 109BA8 802E8328 46080002 */ mul.s $f0, $f0, $f8 -/* 109BAC 802E832C 00000000 */ nop -/* 109BB0 802E8330 3C0143B4 */ lui $at, 0x43b4 -/* 109BB4 802E8334 44814000 */ mtc1 $at, $f8 -/* 109BB8 802E8338 00000000 */ nop -/* 109BBC 802E833C 46080583 */ div.s $f22, $f0, $f8 -/* 109BC0 802E8340 0C00A85B */ jal sin_rad -/* 109BC4 802E8344 4600B306 */ mov.s $f12, $f22 -/* 109BC8 802E8348 461C0002 */ mul.s $f0, $f0, $f28 -/* 109BCC 802E834C 00000000 */ nop -/* 109BD0 802E8350 C6020154 */ lwc1 $f2, 0x154($s0) -/* 109BD4 802E8354 46001080 */ add.s $f2, $f2, $f0 -/* 109BD8 802E8358 4600B306 */ mov.s $f12, $f22 -/* 109BDC 802E835C 0C00A874 */ jal cos_rad -/* 109BE0 802E8360 E6020154 */ swc1 $f2, 0x154($s0) -/* 109BE4 802E8364 461C0002 */ mul.s $f0, $f0, $f28 -/* 109BE8 802E8368 00000000 */ nop -/* 109BEC 802E836C C6020274 */ lwc1 $f2, 0x274($s0) -/* 109BF0 802E8370 46001080 */ add.s $f2, $f2, $f0 -/* 109BF4 802E8374 4600E686 */ mov.s $f26, $f28 -/* 109BF8 802E8378 E6020274 */ swc1 $f2, 0x274($s0) -/* 109BFC 802E837C 3C040004 */ lui $a0, 4 -.L802E8380: -/* 109C00 802E8380 02C0282D */ daddu $a1, $s6, $zero -/* 109C04 802E8384 02A0302D */ daddu $a2, $s5, $zero -/* 109C08 802E8388 0280382D */ daddu $a3, $s4, $zero -/* 109C0C 802E838C 27A2002C */ addiu $v0, $sp, 0x2c -/* 109C10 802E8390 C60201E4 */ lwc1 $f2, 0x1e4($s0) -/* 109C14 802E8394 C6060154 */ lwc1 $f6, 0x154($s0) -/* 109C18 802E8398 461C1080 */ add.s $f2, $f2, $f28 -/* 109C1C 802E839C C6000304 */ lwc1 $f0, 0x304($s0) -/* 109C20 802E83A0 C6040274 */ lwc1 $f4, 0x274($s0) -/* 109C24 802E83A4 46000005 */ abs.s $f0, $f0 -/* 109C28 802E83A8 E7A60020 */ swc1 $f6, 0x20($sp) -/* 109C2C 802E83AC E7A40028 */ swc1 $f4, 0x28($sp) -/* 109C30 802E83B0 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 109C34 802E83B4 E7A20024 */ swc1 $f2, 0x24($sp) -/* 109C38 802E83B8 0C0372DF */ jal npc_raycast_down_sides -/* 109C3C 802E83BC AFA20010 */ sw $v0, 0x10($sp) -/* 109C40 802E83C0 1440000B */ bnez $v0, .L802E83F0 -/* 109C44 802E83C4 00000000 */ nop -/* 109C48 802E83C8 C640000C */ lwc1 $f0, 0xc($s2) -/* 109C4C 802E83CC 3C014348 */ lui $at, 0x4348 -/* 109C50 802E83D0 44811000 */ mtc1 $at, $f2 -/* 109C54 802E83D4 00000000 */ nop -/* 109C58 802E83D8 46020001 */ sub.s $f0, $f0, $f2 -/* 109C5C 802E83DC C7A20024 */ lwc1 $f2, 0x24($sp) -/* 109C60 802E83E0 4600103C */ c.lt.s $f2, $f0 -/* 109C64 802E83E4 00000000 */ nop -/* 109C68 802E83E8 45000010 */ bc1f .L802E842C -/* 109C6C 802E83EC 00000000 */ nop -.L802E83F0: -/* 109C70 802E83F0 92220010 */ lbu $v0, 0x10($s1) -/* 109C74 802E83F4 24420001 */ addiu $v0, $v0, 1 -/* 109C78 802E83F8 A2220010 */ sb $v0, 0x10($s1) -/* 109C7C 802E83FC C6000304 */ lwc1 $f0, 0x304($s0) -/* 109C80 802E8400 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 109C84 802E8404 46000005 */ abs.s $f0, $f0 -/* 109C88 802E8408 46001080 */ add.s $f2, $f2, $f0 -/* 109C8C 802E840C E61E0304 */ swc1 $f30, 0x304($s0) -/* 109C90 802E8410 E60201E4 */ swc1 $f2, 0x1e4($s0) -/* 109C94 802E8414 82230010 */ lb $v1, 0x10($s1) -/* 109C98 802E8418 24020002 */ addiu $v0, $zero, 2 -/* 109C9C 802E841C 14620003 */ bne $v1, $v0, .L802E842C -/* 109CA0 802E8420 240200FE */ addiu $v0, $zero, 0xfe -/* 109CA4 802E8424 A2220034 */ sb $v0, 0x34($s1) -/* 109CA8 802E8428 AE0000C4 */ sw $zero, 0xc4($s0) -.L802E842C: -/* 109CAC 802E842C 92220058 */ lbu $v0, 0x58($s1) -/* 109CB0 802E8430 44820000 */ mtc1 $v0, $f0 -/* 109CB4 802E8434 00000000 */ nop -/* 109CB8 802E8438 46800020 */ cvt.s.w $f0, $f0 -/* 109CBC 802E843C 46180000 */ add.s $f0, $f0, $f24 -/* 109CC0 802E8440 3C014F00 */ lui $at, 0x4f00 -/* 109CC4 802E8444 44814000 */ mtc1 $at, $f8 -/* 109CC8 802E8448 00000000 */ nop -/* 109CCC 802E844C 4600403E */ c.le.s $f8, $f0 -/* 109CD0 802E8450 00000000 */ nop -/* 109CD4 802E8454 45010005 */ bc1t .L802E846C -/* 109CD8 802E8458 26230058 */ addiu $v1, $s1, 0x58 -/* 109CDC 802E845C 4600020D */ trunc.w.s $f8, $f0 -/* 109CE0 802E8460 44024000 */ mfc1 $v0, $f8 -/* 109CE4 802E8464 080BA121 */ j .L802E8484 -/* 109CE8 802E8468 A0620000 */ sb $v0, ($v1) -.L802E846C: -/* 109CEC 802E846C 46080001 */ sub.s $f0, $f0, $f8 -/* 109CF0 802E8470 4600020D */ trunc.w.s $f8, $f0 -/* 109CF4 802E8474 44024000 */ mfc1 $v0, $f8 -/* 109CF8 802E8478 00000000 */ nop -/* 109CFC 802E847C 00571025 */ or $v0, $v0, $s7 -/* 109D00 802E8480 A0620000 */ sb $v0, ($v1) -.L802E8484: -/* 109D04 802E8484 9222007C */ lbu $v0, 0x7c($s1) -/* 109D08 802E8488 44820000 */ mtc1 $v0, $f0 -/* 109D0C 802E848C 00000000 */ nop -/* 109D10 802E8490 46800020 */ cvt.s.w $f0, $f0 -/* 109D14 802E8494 46180001 */ sub.s $f0, $f0, $f24 -/* 109D18 802E8498 3C014F00 */ lui $at, 0x4f00 -/* 109D1C 802E849C 44814000 */ mtc1 $at, $f8 -/* 109D20 802E84A0 00000000 */ nop -/* 109D24 802E84A4 4600403E */ c.le.s $f8, $f0 -/* 109D28 802E84A8 00000000 */ nop -/* 109D2C 802E84AC 45010005 */ bc1t .L802E84C4 -/* 109D30 802E84B0 2623007C */ addiu $v1, $s1, 0x7c -/* 109D34 802E84B4 4600020D */ trunc.w.s $f8, $f0 -/* 109D38 802E84B8 44024000 */ mfc1 $v0, $f8 -/* 109D3C 802E84BC 080BA137 */ j .L802E84DC -/* 109D40 802E84C0 A0620000 */ sb $v0, ($v1) -.L802E84C4: -/* 109D44 802E84C4 46080001 */ sub.s $f0, $f0, $f8 -/* 109D48 802E84C8 4600020D */ trunc.w.s $f8, $f0 -/* 109D4C 802E84CC 44024000 */ mfc1 $v0, $f8 -/* 109D50 802E84D0 00000000 */ nop -/* 109D54 802E84D4 00571025 */ or $v0, $v0, $s7 -/* 109D58 802E84D8 A0620000 */ sb $v0, ($v1) -.L802E84DC: -/* 109D5C 802E84DC 26310001 */ addiu $s1, $s1, 1 -.L802E84E0: -/* 109D60 802E84E0 26420023 */ addiu $v0, $s2, 0x23 -/* 109D64 802E84E4 0222102A */ slt $v0, $s1, $v0 -/* 109D68 802E84E8 1440FECC */ bnez $v0, .L802E801C -/* 109D6C 802E84EC 26100004 */ addiu $s0, $s0, 4 -/* 109D70 802E84F0 2A620023 */ slti $v0, $s3, 0x23 -/* 109D74 802E84F4 14400003 */ bnez $v0, .L802E8504 -/* 109D78 802E84F8 00000000 */ nop -/* 109D7C 802E84FC 0C043F5A */ jal exec_entity_commandlist -/* 109D80 802E8500 03C0202D */ daddu $a0, $fp, $zero -.L802E8504: -/* 109D84 802E8504 8FBF0054 */ lw $ra, 0x54($sp) -/* 109D88 802E8508 8FBE0050 */ lw $fp, 0x50($sp) -/* 109D8C 802E850C 8FB7004C */ lw $s7, 0x4c($sp) -/* 109D90 802E8510 8FB60048 */ lw $s6, 0x48($sp) -/* 109D94 802E8514 8FB50044 */ lw $s5, 0x44($sp) -/* 109D98 802E8518 8FB40040 */ lw $s4, 0x40($sp) -/* 109D9C 802E851C 8FB3003C */ lw $s3, 0x3c($sp) -/* 109DA0 802E8520 8FB20038 */ lw $s2, 0x38($sp) -/* 109DA4 802E8524 8FB10034 */ lw $s1, 0x34($sp) -/* 109DA8 802E8528 8FB00030 */ lw $s0, 0x30($sp) -/* 109DAC 802E852C D7BE0080 */ ldc1 $f30, 0x80($sp) -/* 109DB0 802E8530 D7BC0078 */ ldc1 $f28, 0x78($sp) -/* 109DB4 802E8534 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 109DB8 802E8538 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 109DBC 802E853C D7B60060 */ ldc1 $f22, 0x60($sp) -/* 109DC0 802E8540 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 109DC4 802E8544 03E00008 */ jr $ra -/* 109DC8 802E8548 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s deleted file mode 100644 index 3ddaf80f6f..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BAE00_E2B530 -/* E2B530 802BAE00 27BDFEB8 */ addiu $sp, $sp, -0x148 -/* E2B534 802BAE04 AFBF0130 */ sw $ra, 0x130($sp) -/* E2B538 802BAE08 AFB5012C */ sw $s5, 0x12c($sp) -/* E2B53C 802BAE0C AFB40128 */ sw $s4, 0x128($sp) -/* E2B540 802BAE10 AFB30124 */ sw $s3, 0x124($sp) -/* E2B544 802BAE14 AFB20120 */ sw $s2, 0x120($sp) -/* E2B548 802BAE18 AFB1011C */ sw $s1, 0x11c($sp) -/* E2B54C 802BAE1C AFB00118 */ sw $s0, 0x118($sp) -/* E2B550 802BAE20 F7B60140 */ sdc1 $f22, 0x140($sp) -/* E2B554 802BAE24 F7B40138 */ sdc1 $f20, 0x138($sp) -/* E2B558 802BAE28 0C04417A */ jal get_entity_by_index -/* E2B55C 802BAE2C 3C150001 */ lui $s5, 1 -/* E2B560 802BAE30 27B30058 */ addiu $s3, $sp, 0x58 -/* E2B564 802BAE34 0040882D */ daddu $s1, $v0, $zero -/* E2B568 802BAE38 8E340040 */ lw $s4, 0x40($s1) -/* E2B56C 802BAE3C 0C019D28 */ jal guMtxIdentF -/* E2B570 802BAE40 0260202D */ daddu $a0, $s3, $zero -/* E2B574 802BAE44 27B20098 */ addiu $s2, $sp, 0x98 -/* E2B578 802BAE48 8E850014 */ lw $a1, 0x14($s4) -/* E2B57C 802BAE4C 0C019D60 */ jal guMtxL2F -/* E2B580 802BAE50 0240202D */ daddu $a0, $s2, $zero -/* E2B584 802BAE54 0260202D */ daddu $a0, $s3, $zero -/* E2B588 802BAE58 0240282D */ daddu $a1, $s2, $zero -/* E2B58C 802BAE5C 0C019D80 */ jal guMtxCatF -/* E2B590 802BAE60 0240302D */ daddu $a2, $s2, $zero -/* E2B594 802BAE64 3C06BF80 */ lui $a2, 0xbf80 -/* E2B598 802BAE68 C7A000C8 */ lwc1 $f0, 0xc8($sp) -/* E2B59C 802BAE6C C6820004 */ lwc1 $f2, 4($s4) -/* E2B5A0 802BAE70 4480A000 */ mtc1 $zero, $f20 -/* E2B5A4 802BAE74 46020000 */ add.s $f0, $f0, $f2 -/* E2B5A8 802BAE78 4407A000 */ mfc1 $a3, $f20 -/* E2B5AC 802BAE7C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* E2B5B0 802BAE80 E7A000C8 */ swc1 $f0, 0xc8($sp) -/* E2B5B4 802BAE84 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2B5B8 802BAE88 8E250060 */ lw $a1, 0x60($s1) -/* E2B5BC 802BAE8C 0C019EC8 */ jal guRotateF -/* E2B5C0 802BAE90 0200202D */ daddu $a0, $s0, $zero -/* E2B5C4 802BAE94 0200202D */ daddu $a0, $s0, $zero -/* E2B5C8 802BAE98 0240282D */ daddu $a1, $s2, $zero -/* E2B5CC 802BAE9C 0C019D80 */ jal guMtxCatF -/* E2B5D0 802BAEA0 0240302D */ daddu $a2, $s2, $zero -/* E2B5D4 802BAEA4 3C013F80 */ lui $at, 0x3f80 -/* E2B5D8 802BAEA8 4481B000 */ mtc1 $at, $f22 -/* E2B5DC 802BAEAC 4406A000 */ mfc1 $a2, $f20 -/* E2B5E0 802BAEB0 4407A000 */ mfc1 $a3, $f20 -/* E2B5E4 802BAEB4 36B51630 */ ori $s5, $s5, 0x1630 -/* E2B5E8 802BAEB8 E7B60010 */ swc1 $f22, 0x10($sp) -/* E2B5EC 802BAEBC 8E250068 */ lw $a1, 0x68($s1) -/* E2B5F0 802BAEC0 0C019EC8 */ jal guRotateF -/* E2B5F4 802BAEC4 0200202D */ daddu $a0, $s0, $zero -/* E2B5F8 802BAEC8 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2B5FC 802BAECC 8E250060 */ lw $a1, 0x60($s1) -/* E2B600 802BAED0 4406B000 */ mfc1 $a2, $f22 -/* E2B604 802BAED4 4407A000 */ mfc1 $a3, $f20 -/* E2B608 802BAED8 0C019EC8 */ jal guRotateF -/* E2B60C 802BAEDC 27A40018 */ addiu $a0, $sp, 0x18 -/* E2B610 802BAEE0 0200202D */ daddu $a0, $s0, $zero -/* E2B614 802BAEE4 27A50018 */ addiu $a1, $sp, 0x18 -/* E2B618 802BAEE8 0C019D80 */ jal guMtxCatF -/* E2B61C 802BAEEC 00A0302D */ daddu $a2, $a1, $zero -/* E2B620 802BAEF0 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2B624 802BAEF4 8E250064 */ lw $a1, 0x64($s1) -/* E2B628 802BAEF8 4406A000 */ mfc1 $a2, $f20 -/* E2B62C 802BAEFC 4407B000 */ mfc1 $a3, $f22 -/* E2B630 802BAF00 0C019EC8 */ jal guRotateF -/* E2B634 802BAF04 0200202D */ daddu $a0, $s0, $zero -/* E2B638 802BAF08 27A40018 */ addiu $a0, $sp, 0x18 -/* E2B63C 802BAF0C 0200282D */ daddu $a1, $s0, $zero -/* E2B640 802BAF10 0C019D80 */ jal guMtxCatF -/* E2B644 802BAF14 0200302D */ daddu $a2, $s0, $zero -/* E2B648 802BAF18 0240202D */ daddu $a0, $s2, $zero -/* E2B64C 802BAF1C 0200282D */ daddu $a1, $s0, $zero -/* E2B650 802BAF20 0C019D80 */ jal guMtxCatF -/* E2B654 802BAF24 0240302D */ daddu $a2, $s2, $zero -/* E2B658 802BAF28 8E250054 */ lw $a1, 0x54($s1) -/* E2B65C 802BAF2C 8E260058 */ lw $a2, 0x58($s1) -/* E2B660 802BAF30 8E27005C */ lw $a3, 0x5c($s1) -/* E2B664 802BAF34 0C019DF0 */ jal guScaleF -/* E2B668 802BAF38 27A40018 */ addiu $a0, $sp, 0x18 -/* E2B66C 802BAF3C 0240202D */ daddu $a0, $s2, $zero -/* E2B670 802BAF40 27A50018 */ addiu $a1, $sp, 0x18 -/* E2B674 802BAF44 0C019D80 */ jal guMtxCatF -/* E2B678 802BAF48 00A0302D */ daddu $a2, $a1, $zero -/* E2B67C 802BAF4C 8E250048 */ lw $a1, 0x48($s1) -/* E2B680 802BAF50 8E26004C */ lw $a2, 0x4c($s1) -/* E2B684 802BAF54 8E270050 */ lw $a3, 0x50($s1) -/* E2B688 802BAF58 0C019E40 */ jal guTranslateF -/* E2B68C 802BAF5C 0260202D */ daddu $a0, $s3, $zero -/* E2B690 802BAF60 27A40018 */ addiu $a0, $sp, 0x18 -/* E2B694 802BAF64 0260282D */ daddu $a1, $s3, $zero -/* E2B698 802BAF68 0C019D80 */ jal guMtxCatF -/* E2B69C 802BAF6C 0260302D */ daddu $a2, $s3, $zero -/* E2B6A0 802BAF70 0260202D */ daddu $a0, $s3, $zero -/* E2B6A4 802BAF74 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* E2B6A8 802BAF78 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* E2B6AC 802BAF7C 3C11800A */ lui $s1, %hi(gDisplayContext) -/* E2B6B0 802BAF80 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* E2B6B4 802BAF84 96050000 */ lhu $a1, ($s0) -/* E2B6B8 802BAF88 8E220000 */ lw $v0, ($s1) -/* E2B6BC 802BAF8C 00052980 */ sll $a1, $a1, 6 -/* E2B6C0 802BAF90 00B52821 */ addu $a1, $a1, $s5 -/* E2B6C4 802BAF94 0C019D40 */ jal guMtxF2L -/* E2B6C8 802BAF98 00452821 */ addu $a1, $v0, $a1 -/* E2B6CC 802BAF9C 3C03DA38 */ lui $v1, 0xda38 -/* E2B6D0 802BAFA0 34630002 */ ori $v1, $v1, 2 -/* E2B6D4 802BAFA4 3C07D838 */ lui $a3, 0xd838 -/* E2B6D8 802BAFA8 3C05800A */ lui $a1, %hi(gMasterGfxPos) -/* E2B6DC 802BAFAC 24A5A66C */ addiu $a1, $a1, %lo(gMasterGfxPos) -/* E2B6E0 802BAFB0 34E70002 */ ori $a3, $a3, 2 -/* E2B6E4 802BAFB4 8CA40000 */ lw $a0, ($a1) -/* E2B6E8 802BAFB8 96020000 */ lhu $v0, ($s0) -/* E2B6EC 802BAFBC 0080302D */ daddu $a2, $a0, $zero -/* E2B6F0 802BAFC0 24840008 */ addiu $a0, $a0, 8 -/* E2B6F4 802BAFC4 ACA40000 */ sw $a0, ($a1) -/* E2B6F8 802BAFC8 ACC30000 */ sw $v1, ($a2) -/* E2B6FC 802BAFCC 24430001 */ addiu $v1, $v0, 1 -/* E2B700 802BAFD0 3042FFFF */ andi $v0, $v0, 0xffff -/* E2B704 802BAFD4 00021180 */ sll $v0, $v0, 6 -/* E2B708 802BAFD8 A6030000 */ sh $v1, ($s0) -/* E2B70C 802BAFDC 8E230000 */ lw $v1, ($s1) -/* E2B710 802BAFE0 00551021 */ addu $v0, $v0, $s5 -/* E2B714 802BAFE4 00621821 */ addu $v1, $v1, $v0 -/* E2B718 802BAFE8 24820008 */ addiu $v0, $a0, 8 -/* E2B71C 802BAFEC ACC30004 */ sw $v1, 4($a2) -/* E2B720 802BAFF0 ACA20000 */ sw $v0, ($a1) -/* E2B724 802BAFF4 3C02DE00 */ lui $v0, 0xde00 -/* E2B728 802BAFF8 AC820000 */ sw $v0, ($a0) -/* E2B72C 802BAFFC 8E830018 */ lw $v1, 0x18($s4) -/* E2B730 802BB000 24820010 */ addiu $v0, $a0, 0x10 -/* E2B734 802BB004 ACA20000 */ sw $v0, ($a1) -/* E2B738 802BB008 24020040 */ addiu $v0, $zero, 0x40 -/* E2B73C 802BB00C AC870008 */ sw $a3, 8($a0) -/* E2B740 802BB010 AC82000C */ sw $v0, 0xc($a0) -/* E2B744 802BB014 AC830004 */ sw $v1, 4($a0) -/* E2B748 802BB018 8FBF0130 */ lw $ra, 0x130($sp) -/* E2B74C 802BB01C 8FB5012C */ lw $s5, 0x12c($sp) -/* E2B750 802BB020 8FB40128 */ lw $s4, 0x128($sp) -/* E2B754 802BB024 8FB30124 */ lw $s3, 0x124($sp) -/* E2B758 802BB028 8FB20120 */ lw $s2, 0x120($sp) -/* E2B75C 802BB02C 8FB1011C */ lw $s1, 0x11c($sp) -/* E2B760 802BB030 8FB00118 */ lw $s0, 0x118($sp) -/* E2B764 802BB034 D7B60140 */ ldc1 $f22, 0x140($sp) -/* E2B768 802BB038 D7B40138 */ ldc1 $f20, 0x138($sp) -/* E2B76C 802BB03C 03E00008 */ jr $ra -/* E2B770 802BB040 27BD0148 */ addiu $sp, $sp, 0x148 diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s deleted file mode 100644 index bf43553955..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB044_E2B774 -/* E2B774 802BB044 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E2B778 802BB048 AFB10014 */ sw $s1, 0x14($sp) -/* E2B77C 802BB04C 0080882D */ daddu $s1, $a0, $zero -/* E2B780 802BB050 AFB20018 */ sw $s2, 0x18($sp) -/* E2B784 802BB054 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* E2B788 802BB058 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* E2B78C 802BB05C AFBF001C */ sw $ra, 0x1c($sp) -/* E2B790 802BB060 AFB00010 */ sw $s0, 0x10($sp) -/* E2B794 802BB064 F7B80030 */ sdc1 $f24, 0x30($sp) -/* E2B798 802BB068 F7B60028 */ sdc1 $f22, 0x28($sp) -/* E2B79C 802BB06C F7B40020 */ sdc1 $f20, 0x20($sp) -/* E2B7A0 802BB070 C640002C */ lwc1 $f0, 0x2c($s2) -/* E2B7A4 802BB074 C622004C */ lwc1 $f2, 0x4c($s1) -/* E2B7A8 802BB078 864200B0 */ lh $v0, 0xb0($s2) -/* E2B7AC 802BB07C 46020001 */ sub.s $f0, $f0, $f2 -/* E2B7B0 802BB080 8E300040 */ lw $s0, 0x40($s1) -/* E2B7B4 802BB084 44821000 */ mtc1 $v0, $f2 -/* E2B7B8 802BB088 00000000 */ nop -/* E2B7BC 802BB08C 468010A1 */ cvt.d.w $f2, $f2 -/* E2B7C0 802BB090 46000021 */ cvt.d.s $f0, $f0 -/* E2B7C4 802BB094 46200005 */ abs.d $f0, $f0 -/* E2B7C8 802BB098 4620103C */ c.lt.d $f2, $f0 -/* E2B7CC 802BB09C 00000000 */ nop -/* E2B7D0 802BB0A0 45000004 */ bc1f .L802BB0B4 -/* E2B7D4 802BB0A4 2403FFDF */ addiu $v1, $zero, -0x21 -/* E2B7D8 802BB0A8 8E220000 */ lw $v0, ($s1) -/* E2B7DC 802BB0AC 080AEC2F */ j .L802BB0BC -/* E2B7E0 802BB0B0 34420020 */ ori $v0, $v0, 0x20 -.L802BB0B4: -/* E2B7E4 802BB0B4 8E220000 */ lw $v0, ($s1) -/* E2B7E8 802BB0B8 00431024 */ and $v0, $v0, $v1 -.L802BB0BC: -/* E2B7EC 802BB0BC AE220000 */ sw $v0, ($s1) -/* E2B7F0 802BB0C0 92220006 */ lbu $v0, 6($s1) -/* E2B7F4 802BB0C4 30420001 */ andi $v0, $v0, 1 -/* E2B7F8 802BB0C8 5040003E */ beql $v0, $zero, .L802BB1C4 -/* E2B7FC 802BB0CC AE000000 */ sw $zero, ($s0) -/* E2B800 802BB0D0 C6020000 */ lwc1 $f2, ($s0) -/* E2B804 802BB0D4 44800000 */ mtc1 $zero, $f0 -/* E2B808 802BB0D8 00000000 */ nop -/* E2B80C 802BB0DC 46001032 */ c.eq.s $f2, $f0 -/* E2B810 802BB0E0 00000000 */ nop -/* E2B814 802BB0E4 45000003 */ bc1f .L802BB0F4 -/* E2B818 802BB0E8 3C040001 */ lui $a0, 1 -/* E2B81C 802BB0EC 0C037FBF */ jal suggest_player_anim_clearUnkFlag -/* E2B820 802BB0F0 34840005 */ ori $a0, $a0, 5 -.L802BB0F4: -/* E2B824 802BB0F4 C6000000 */ lwc1 $f0, ($s0) -/* E2B828 802BB0F8 3C013FE0 */ lui $at, 0x3fe0 -/* E2B82C 802BB0FC 44811800 */ mtc1 $at, $f3 -/* E2B830 802BB100 44801000 */ mtc1 $zero, $f2 -/* E2B834 802BB104 46000021 */ cvt.d.s $f0, $f0 -/* E2B838 802BB108 46220000 */ add.d $f0, $f0, $f2 -/* E2B83C 802BB10C 3C014004 */ lui $at, 0x4004 -/* E2B840 802BB110 44812800 */ mtc1 $at, $f5 -/* E2B844 802BB114 44802000 */ mtc1 $zero, $f4 -/* E2B848 802BB118 46200020 */ cvt.s.d $f0, $f0 -/* E2B84C 802BB11C 460000A1 */ cvt.d.s $f2, $f0 -/* E2B850 802BB120 4622203E */ c.le.d $f4, $f2 -/* E2B854 802BB124 00000000 */ nop -/* E2B858 802BB128 45000005 */ bc1f .L802BB140 -/* E2B85C 802BB12C E6000000 */ swc1 $f0, ($s0) -/* E2B860 802BB130 3C014020 */ lui $at, 0x4020 -/* E2B864 802BB134 44810000 */ mtc1 $at, $f0 -/* E2B868 802BB138 00000000 */ nop -/* E2B86C 802BB13C E6000000 */ swc1 $f0, ($s0) -.L802BB140: -/* E2B870 802BB140 C62C0064 */ lwc1 $f12, 0x64($s1) -/* E2B874 802BB144 3C014334 */ lui $at, 0x4334 -/* E2B878 802BB148 4481A000 */ mtc1 $at, $f20 -/* E2B87C 802BB14C 00000000 */ nop -/* E2B880 802BB150 460CA301 */ sub.s $f12, $f20, $f12 -/* E2B884 802BB154 3C0140C9 */ lui $at, 0x40c9 -/* E2B888 802BB158 34210FD0 */ ori $at, $at, 0xfd0 -/* E2B88C 802BB15C 4481B000 */ mtc1 $at, $f22 -/* E2B890 802BB160 00000000 */ nop -/* E2B894 802BB164 46166302 */ mul.s $f12, $f12, $f22 -/* E2B898 802BB168 00000000 */ nop -/* E2B89C 802BB16C 3C0143B4 */ lui $at, 0x43b4 -/* E2B8A0 802BB170 4481C000 */ mtc1 $at, $f24 -/* E2B8A4 802BB174 0C00A85B */ jal sin_rad -/* E2B8A8 802BB178 46186303 */ div.s $f12, $f12, $f24 -/* E2B8AC 802BB17C C6220064 */ lwc1 $f2, 0x64($s1) -/* E2B8B0 802BB180 4602A501 */ sub.s $f20, $f20, $f2 -/* E2B8B4 802BB184 4616A502 */ mul.s $f20, $f20, $f22 -/* E2B8B8 802BB188 00000000 */ nop -/* E2B8BC 802BB18C C6160000 */ lwc1 $f22, ($s0) -/* E2B8C0 802BB190 4600B582 */ mul.s $f22, $f22, $f0 -/* E2B8C4 802BB194 00000000 */ nop -/* E2B8C8 802BB198 0C00A874 */ jal cos_rad -/* E2B8CC 802BB19C 4618A303 */ div.s $f12, $f20, $f24 -/* E2B8D0 802BB1A0 C6040000 */ lwc1 $f4, ($s0) -/* E2B8D4 802BB1A4 46002102 */ mul.s $f4, $f4, $f0 -/* E2B8D8 802BB1A8 00000000 */ nop -/* E2B8DC 802BB1AC C6420028 */ lwc1 $f2, 0x28($s2) -/* E2B8E0 802BB1B0 46161080 */ add.s $f2, $f2, $f22 -/* E2B8E4 802BB1B4 C6400030 */ lwc1 $f0, 0x30($s2) -/* E2B8E8 802BB1B8 46040001 */ sub.s $f0, $f0, $f4 -/* E2B8EC 802BB1BC E6420028 */ swc1 $f2, 0x28($s2) -/* E2B8F0 802BB1C0 E6400030 */ swc1 $f0, 0x30($s2) -.L802BB1C4: -/* E2B8F4 802BB1C4 8FBF001C */ lw $ra, 0x1c($sp) -/* E2B8F8 802BB1C8 8FB20018 */ lw $s2, 0x18($sp) -/* E2B8FC 802BB1CC 8FB10014 */ lw $s1, 0x14($sp) -/* E2B900 802BB1D0 8FB00010 */ lw $s0, 0x10($sp) -/* E2B904 802BB1D4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* E2B908 802BB1D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* E2B90C 802BB1DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* E2B910 802BB1E0 03E00008 */ jr $ra -/* E2B914 802BB1E4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s deleted file mode 100644 index a8cc77b5b3..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s +++ /dev/null @@ -1,312 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802BCF50_E2D680 -.word .L802BB224_E2B954, .L802BB24C_E2B97C, .L802BB2CC_E2B9FC, .L802BB398_E2BAC8, .L802BB440_E2BB70, .L802BB468_E2BB98, .L802BB4E0_E2BC10, .L802BB56C_E2BC9C, .L802BB5A0_E2BCD0, 0 - -dlabel D_802BCF78_E2D6A8 -.double 0.2 - -dlabel D_802BCF80_E2D6B0 -.double 0.2 - -dlabel D_802BCF88_E2D6B8 -.double 90.0 - -dlabel D_802BCF90_E2D6C0 -.double 90.0, 0.0 - -.section .text - -glabel func_802BB1E8_E2B918 -/* E2B918 802BB1E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E2B91C 802BB1EC AFB1001C */ sw $s1, 0x1c($sp) -/* E2B920 802BB1F0 0080882D */ daddu $s1, $a0, $zero -/* E2B924 802BB1F4 AFBF0020 */ sw $ra, 0x20($sp) -/* E2B928 802BB1F8 AFB00018 */ sw $s0, 0x18($sp) -/* E2B92C 802BB1FC 8E300040 */ lw $s0, 0x40($s1) -/* E2B930 802BB200 82030012 */ lb $v1, 0x12($s0) -/* E2B934 802BB204 2C620009 */ sltiu $v0, $v1, 9 -/* E2B938 802BB208 104000F2 */ beqz $v0, .L802BB5D4 -/* E2B93C 802BB20C 00031080 */ sll $v0, $v1, 2 -/* E2B940 802BB210 3C01802C */ lui $at, %hi(jtbl_802BCF50_E2D680) -/* E2B944 802BB214 00220821 */ addu $at, $at, $v0 -/* E2B948 802BB218 8C22CF50 */ lw $v0, %lo(jtbl_802BCF50_E2D680)($at) -/* E2B94C 802BB21C 00400008 */ jr $v0 -/* E2B950 802BB220 00000000 */ nop -.L802BB224_E2B954: -/* E2B954 802BB224 0C0AEC11 */ jal func_802BB044_E2B774 -/* E2B958 802BB228 0220202D */ daddu $a0, $s1, $zero -/* E2B95C 802BB22C 8E220000 */ lw $v0, ($s1) -/* E2B960 802BB230 3C030010 */ lui $v1, 0x10 -/* E2B964 802BB234 00431024 */ and $v0, $v0, $v1 -/* E2B968 802BB238 104000E6 */ beqz $v0, .L802BB5D4 -/* E2B96C 802BB23C 24040269 */ addiu $a0, $zero, 0x269 -/* E2B970 802BB240 92020012 */ lbu $v0, 0x12($s0) -/* E2B974 802BB244 080AED57 */ j .L802BB55C -/* E2B978 802BB248 24420001 */ addiu $v0, $v0, 1 -.L802BB24C_E2B97C: -/* E2B97C 802BB24C C6000004 */ lwc1 $f0, 4($s0) -/* E2B980 802BB250 3C0140A0 */ lui $at, 0x40a0 -/* E2B984 802BB254 44811000 */ mtc1 $at, $f2 -/* E2B988 802BB258 00000000 */ nop -/* E2B98C 802BB25C 46020000 */ add.s $f0, $f0, $f2 -/* E2B990 802BB260 3C0141A0 */ lui $at, 0x41a0 -/* E2B994 802BB264 44811000 */ mtc1 $at, $f2 -/* E2B998 802BB268 00000000 */ nop -/* E2B99C 802BB26C 4600103E */ c.le.s $f2, $f0 -/* E2B9A0 802BB270 00000000 */ nop -/* E2B9A4 802BB274 450000D7 */ bc1f .L802BB5D4 -/* E2B9A8 802BB278 E6000004 */ swc1 $f0, 4($s0) -/* E2B9AC 802BB27C 92020012 */ lbu $v0, 0x12($s0) -/* E2B9B0 802BB280 E6020004 */ swc1 $f2, 4($s0) -/* E2B9B4 802BB284 24420001 */ addiu $v0, $v0, 1 -/* E2B9B8 802BB288 A2020012 */ sb $v0, 0x12($s0) -/* E2B9BC 802BB28C C6200068 */ lwc1 $f0, 0x68($s1) -/* E2B9C0 802BB290 3C014028 */ lui $at, 0x4028 -/* E2B9C4 802BB294 44811800 */ mtc1 $at, $f3 -/* E2B9C8 802BB298 44801000 */ mtc1 $zero, $f2 -/* E2B9CC 802BB29C 46000021 */ cvt.d.s $f0, $f0 -/* E2B9D0 802BB2A0 46220000 */ add.d $f0, $f0, $f2 -/* E2B9D4 802BB2A4 3C013E4C */ lui $at, 0x3e4c -/* E2B9D8 802BB2A8 3421CCCD */ ori $at, $at, 0xcccd -/* E2B9DC 802BB2AC 44812000 */ mtc1 $at, $f4 -/* E2B9E0 802BB2B0 3C01C000 */ lui $at, 0xc000 -/* E2B9E4 802BB2B4 44811000 */ mtc1 $at, $f2 -/* E2B9E8 802BB2B8 46200020 */ cvt.s.d $f0, $f0 -/* E2B9EC 802BB2BC E6200068 */ swc1 $f0, 0x68($s1) -/* E2B9F0 802BB2C0 E6020008 */ swc1 $f2, 8($s0) -/* E2B9F4 802BB2C4 080AED75 */ j .L802BB5D4 -/* E2B9F8 802BB2C8 E604000C */ swc1 $f4, 0xc($s0) -.L802BB2CC_E2B9FC: -/* E2B9FC 802BB2CC C600000C */ lwc1 $f0, 0xc($s0) -/* E2BA00 802BB2D0 3C01802C */ lui $at, %hi(D_802BCF78_E2D6A8) -/* E2BA04 802BB2D4 D422CF78 */ ldc1 $f2, %lo(D_802BCF78_E2D6A8)($at) -/* E2BA08 802BB2D8 46000021 */ cvt.d.s $f0, $f0 -/* E2BA0C 802BB2DC 46220000 */ add.d $f0, $f0, $f2 -/* E2BA10 802BB2E0 46200020 */ cvt.s.d $f0, $f0 -/* E2BA14 802BB2E4 E600000C */ swc1 $f0, 0xc($s0) -/* E2BA18 802BB2E8 C6220060 */ lwc1 $f2, 0x60($s1) -/* E2BA1C 802BB2EC 46001080 */ add.s $f2, $f2, $f0 -/* E2BA20 802BB2F0 E6220060 */ swc1 $f2, 0x60($s1) -/* E2BA24 802BB2F4 C6000008 */ lwc1 $f0, 8($s0) -/* E2BA28 802BB2F8 3C013FF0 */ lui $at, 0x3ff0 -/* E2BA2C 802BB2FC 44811800 */ mtc1 $at, $f3 -/* E2BA30 802BB300 44801000 */ mtc1 $zero, $f2 -/* E2BA34 802BB304 46000021 */ cvt.d.s $f0, $f0 -/* E2BA38 802BB308 46220001 */ sub.d $f0, $f0, $f2 -/* E2BA3C 802BB30C 46200020 */ cvt.s.d $f0, $f0 -/* E2BA40 802BB310 E6000008 */ swc1 $f0, 8($s0) -/* E2BA44 802BB314 C622004C */ lwc1 $f2, 0x4c($s1) -/* E2BA48 802BB318 46001080 */ add.s $f2, $f2, $f0 -/* E2BA4C 802BB31C C620006C */ lwc1 $f0, 0x6c($s1) -/* E2BA50 802BB320 4600103E */ c.le.s $f2, $f0 -/* E2BA54 802BB324 00000000 */ nop -/* E2BA58 802BB328 450000AA */ bc1f .L802BB5D4 -/* E2BA5C 802BB32C E622004C */ swc1 $f2, 0x4c($s1) -/* E2BA60 802BB330 E620004C */ swc1 $f0, 0x4c($s1) -/* E2BA64 802BB334 3C0140A0 */ lui $at, 0x40a0 -/* E2BA68 802BB338 44810000 */ mtc1 $at, $f0 -/* E2BA6C 802BB33C 92020012 */ lbu $v0, 0x12($s0) -/* E2BA70 802BB340 3C014040 */ lui $at, 0x4040 -/* E2BA74 802BB344 44811000 */ mtc1 $at, $f2 -/* E2BA78 802BB348 24420001 */ addiu $v0, $v0, 1 -/* E2BA7C 802BB34C E6000008 */ swc1 $f0, 8($s0) -/* E2BA80 802BB350 E602000C */ swc1 $f2, 0xc($s0) -/* E2BA84 802BB354 A2020012 */ sb $v0, 0x12($s0) -/* E2BA88 802BB358 C624004C */ lwc1 $f4, 0x4c($s1) -/* E2BA8C 802BB35C 3C0141C8 */ lui $at, 0x41c8 -/* E2BA90 802BB360 44810000 */ mtc1 $at, $f0 -/* E2BA94 802BB364 3C014120 */ lui $at, 0x4120 -/* E2BA98 802BB368 44811000 */ mtc1 $at, $f2 -/* E2BA9C 802BB36C 46002100 */ add.s $f4, $f4, $f0 -/* E2BAA0 802BB370 E7A20010 */ swc1 $f2, 0x10($sp) -/* E2BAA4 802BB374 8E250048 */ lw $a1, 0x48($s1) -/* E2BAA8 802BB378 8E270050 */ lw $a3, 0x50($s1) -/* E2BAAC 802BB37C 44062000 */ mfc1 $a2, $f4 -/* E2BAB0 802BB380 0C01BFBC */ jal fx_sparkles -/* E2BAB4 802BB384 0000202D */ daddu $a0, $zero, $zero -/* E2BAB8 802BB388 8E220000 */ lw $v0, ($s1) -/* E2BABC 802BB38C 34420020 */ ori $v0, $v0, 0x20 -/* E2BAC0 802BB390 080AED75 */ j .L802BB5D4 -/* E2BAC4 802BB394 AE220000 */ sw $v0, ($s1) -.L802BB398_E2BAC8: -/* E2BAC8 802BB398 C600000C */ lwc1 $f0, 0xc($s0) -/* E2BACC 802BB39C 3C01802C */ lui $at, %hi(D_802BCF80_E2D6B0) -/* E2BAD0 802BB3A0 D422CF80 */ ldc1 $f2, %lo(D_802BCF80_E2D6B0)($at) -/* E2BAD4 802BB3A4 46000021 */ cvt.d.s $f0, $f0 -/* E2BAD8 802BB3A8 46220000 */ add.d $f0, $f0, $f2 -/* E2BADC 802BB3AC 46200020 */ cvt.s.d $f0, $f0 -/* E2BAE0 802BB3B0 E600000C */ swc1 $f0, 0xc($s0) -/* E2BAE4 802BB3B4 C6220060 */ lwc1 $f2, 0x60($s1) -/* E2BAE8 802BB3B8 46001080 */ add.s $f2, $f2, $f0 -/* E2BAEC 802BB3BC E6220060 */ swc1 $f2, 0x60($s1) -/* E2BAF0 802BB3C0 C6000008 */ lwc1 $f0, 8($s0) -/* E2BAF4 802BB3C4 3C014000 */ lui $at, 0x4000 -/* E2BAF8 802BB3C8 44811800 */ mtc1 $at, $f3 -/* E2BAFC 802BB3CC 44801000 */ mtc1 $zero, $f2 -/* E2BB00 802BB3D0 46000021 */ cvt.d.s $f0, $f0 -/* E2BB04 802BB3D4 46220001 */ sub.d $f0, $f0, $f2 -/* E2BB08 802BB3D8 46200020 */ cvt.s.d $f0, $f0 -/* E2BB0C 802BB3DC E6000008 */ swc1 $f0, 8($s0) -/* E2BB10 802BB3E0 C622004C */ lwc1 $f2, 0x4c($s1) -/* E2BB14 802BB3E4 46001080 */ add.s $f2, $f2, $f0 -/* E2BB18 802BB3E8 C620006C */ lwc1 $f0, 0x6c($s1) -/* E2BB1C 802BB3EC 4600103E */ c.le.s $f2, $f0 -/* E2BB20 802BB3F0 00000000 */ nop -/* E2BB24 802BB3F4 45000077 */ bc1f .L802BB5D4 -/* E2BB28 802BB3F8 E622004C */ swc1 $f2, 0x4c($s1) -/* E2BB2C 802BB3FC 2404026A */ addiu $a0, $zero, 0x26a -/* E2BB30 802BB400 E620004C */ swc1 $f0, 0x4c($s1) -/* E2BB34 802BB404 3C014120 */ lui $at, 0x4120 -/* E2BB38 802BB408 44810000 */ mtc1 $at, $f0 -/* E2BB3C 802BB40C 3C013E4C */ lui $at, 0x3e4c -/* E2BB40 802BB410 3421CCCD */ ori $at, $at, 0xcccd -/* E2BB44 802BB414 44811000 */ mtc1 $at, $f2 -/* E2BB48 802BB418 92030012 */ lbu $v1, 0x12($s0) -/* E2BB4C 802BB41C 24020002 */ addiu $v0, $zero, 2 -/* E2BB50 802BB420 A2020011 */ sb $v0, 0x11($s0) -/* E2BB54 802BB424 24630001 */ addiu $v1, $v1, 1 -/* E2BB58 802BB428 E6000008 */ swc1 $f0, 8($s0) -/* E2BB5C 802BB42C E602000C */ swc1 $f2, 0xc($s0) -/* E2BB60 802BB430 0C05272D */ jal sfx_play_sound -/* E2BB64 802BB434 A2030012 */ sb $v1, 0x12($s0) -/* E2BB68 802BB438 080AED75 */ j .L802BB5D4 -/* E2BB6C 802BB43C 00000000 */ nop -.L802BB440_E2BB70: -/* E2BB70 802BB440 92020011 */ lbu $v0, 0x11($s0) -/* E2BB74 802BB444 2442FFFF */ addiu $v0, $v0, -1 -/* E2BB78 802BB448 A2020011 */ sb $v0, 0x11($s0) -/* E2BB7C 802BB44C 00021600 */ sll $v0, $v0, 0x18 -/* E2BB80 802BB450 1C400060 */ bgtz $v0, .L802BB5D4 -/* E2BB84 802BB454 00000000 */ nop -/* E2BB88 802BB458 92020012 */ lbu $v0, 0x12($s0) -/* E2BB8C 802BB45C 24420001 */ addiu $v0, $v0, 1 -/* E2BB90 802BB460 080AED75 */ j .L802BB5D4 -/* E2BB94 802BB464 A2020012 */ sb $v0, 0x12($s0) -.L802BB468_E2BB98: -/* E2BB98 802BB468 C600000C */ lwc1 $f0, 0xc($s0) -/* E2BB9C 802BB46C 46000000 */ add.s $f0, $f0, $f0 -/* E2BBA0 802BB470 3C0141F0 */ lui $at, 0x41f0 -/* E2BBA4 802BB474 44811000 */ mtc1 $at, $f2 -/* E2BBA8 802BB478 00000000 */ nop -/* E2BBAC 802BB47C 4600103C */ c.lt.s $f2, $f0 -/* E2BBB0 802BB480 00000000 */ nop -/* E2BBB4 802BB484 45000002 */ bc1f .L802BB490 -/* E2BBB8 802BB488 E600000C */ swc1 $f0, 0xc($s0) -/* E2BBBC 802BB48C E602000C */ swc1 $f2, 0xc($s0) -.L802BB490: -/* E2BBC0 802BB490 C6240060 */ lwc1 $f4, 0x60($s1) -/* E2BBC4 802BB494 C600000C */ lwc1 $f0, 0xc($s0) -/* E2BBC8 802BB498 46002100 */ add.s $f4, $f4, $f0 -/* E2BBCC 802BB49C 3C01802C */ lui $at, %hi(D_802BCF88_E2D6B8) -/* E2BBD0 802BB4A0 D422CF88 */ ldc1 $f2, %lo(D_802BCF88_E2D6B8)($at) -/* E2BBD4 802BB4A4 46002021 */ cvt.d.s $f0, $f4 -/* E2BBD8 802BB4A8 4620103E */ c.le.d $f2, $f0 -/* E2BBDC 802BB4AC 00000000 */ nop -/* E2BBE0 802BB4B0 45000048 */ bc1f .L802BB5D4 -/* E2BBE4 802BB4B4 E6240060 */ swc1 $f4, 0x60($s1) -/* E2BBE8 802BB4B8 3C0142B4 */ lui $at, 0x42b4 -/* E2BBEC 802BB4BC 44810000 */ mtc1 $at, $f0 -/* E2BBF0 802BB4C0 2404026A */ addiu $a0, $zero, 0x26a -/* E2BBF4 802BB4C4 E6200060 */ swc1 $f0, 0x60($s1) -/* E2BBF8 802BB4C8 92020012 */ lbu $v0, 0x12($s0) -/* E2BBFC 802BB4CC 3C01C1A0 */ lui $at, 0xc1a0 -/* E2BC00 802BB4D0 44810000 */ mtc1 $at, $f0 -/* E2BC04 802BB4D4 24420001 */ addiu $v0, $v0, 1 -/* E2BC08 802BB4D8 080AED57 */ j .L802BB55C -/* E2BC0C 802BB4DC E600000C */ swc1 $f0, 0xc($s0) -.L802BB4E0_E2BC10: -/* E2BC10 802BB4E0 C600000C */ lwc1 $f0, 0xc($s0) -/* E2BC14 802BB4E4 3C014120 */ lui $at, 0x4120 -/* E2BC18 802BB4E8 44811000 */ mtc1 $at, $f2 -/* E2BC1C 802BB4EC 00000000 */ nop -/* E2BC20 802BB4F0 46020000 */ add.s $f0, $f0, $f2 -/* E2BC24 802BB4F4 3C0141F0 */ lui $at, 0x41f0 -/* E2BC28 802BB4F8 44811000 */ mtc1 $at, $f2 -/* E2BC2C 802BB4FC 00000000 */ nop -/* E2BC30 802BB500 4600103C */ c.lt.s $f2, $f0 -/* E2BC34 802BB504 00000000 */ nop -/* E2BC38 802BB508 45000002 */ bc1f .L802BB514 -/* E2BC3C 802BB50C E600000C */ swc1 $f0, 0xc($s0) -/* E2BC40 802BB510 E602000C */ swc1 $f2, 0xc($s0) -.L802BB514: -/* E2BC44 802BB514 C6240060 */ lwc1 $f4, 0x60($s1) -/* E2BC48 802BB518 C600000C */ lwc1 $f0, 0xc($s0) -/* E2BC4C 802BB51C 46002100 */ add.s $f4, $f4, $f0 -/* E2BC50 802BB520 3C01802C */ lui $at, %hi(D_802BCF90_E2D6C0) -/* E2BC54 802BB524 D422CF90 */ ldc1 $f2, %lo(D_802BCF90_E2D6C0)($at) -/* E2BC58 802BB528 46002021 */ cvt.d.s $f0, $f4 -/* E2BC5C 802BB52C 4620103E */ c.le.d $f2, $f0 -/* E2BC60 802BB530 00000000 */ nop -/* E2BC64 802BB534 45000027 */ bc1f .L802BB5D4 -/* E2BC68 802BB538 E6240060 */ swc1 $f4, 0x60($s1) -/* E2BC6C 802BB53C 3C0142B4 */ lui $at, 0x42b4 -/* E2BC70 802BB540 44810000 */ mtc1 $at, $f0 -/* E2BC74 802BB544 2404026A */ addiu $a0, $zero, 0x26a -/* E2BC78 802BB548 E6200060 */ swc1 $f0, 0x60($s1) -/* E2BC7C 802BB54C 92020012 */ lbu $v0, 0x12($s0) -/* E2BC80 802BB550 24030005 */ addiu $v1, $zero, 5 -/* E2BC84 802BB554 A2030011 */ sb $v1, 0x11($s0) -/* E2BC88 802BB558 24420001 */ addiu $v0, $v0, 1 -.L802BB55C: -/* E2BC8C 802BB55C 0C05272D */ jal sfx_play_sound -/* E2BC90 802BB560 A2020012 */ sb $v0, 0x12($s0) -/* E2BC94 802BB564 080AED75 */ j .L802BB5D4 -/* E2BC98 802BB568 00000000 */ nop -.L802BB56C_E2BC9C: -/* E2BC9C 802BB56C 92020011 */ lbu $v0, 0x11($s0) -/* E2BCA0 802BB570 2442FFFF */ addiu $v0, $v0, -1 -/* E2BCA4 802BB574 A2020011 */ sb $v0, 0x11($s0) -/* E2BCA8 802BB578 00021600 */ sll $v0, $v0, 0x18 -/* E2BCAC 802BB57C 1C400015 */ bgtz $v0, .L802BB5D4 -/* E2BCB0 802BB580 0220202D */ daddu $a0, $s1, $zero -/* E2BCB4 802BB584 92020012 */ lbu $v0, 0x12($s0) -/* E2BCB8 802BB588 24420001 */ addiu $v0, $v0, 1 -/* E2BCBC 802BB58C 0C04419E */ jal entity_start_script -/* E2BCC0 802BB590 A2020012 */ sb $v0, 0x12($s0) -/* E2BCC4 802BB594 24020005 */ addiu $v0, $zero, 5 -/* E2BCC8 802BB598 080AED75 */ j .L802BB5D4 -/* E2BCCC 802BB59C A2020011 */ sb $v0, 0x11($s0) -.L802BB5A0_E2BCD0: -/* E2BCD0 802BB5A0 92020011 */ lbu $v0, 0x11($s0) -/* E2BCD4 802BB5A4 2442FFFF */ addiu $v0, $v0, -1 -/* E2BCD8 802BB5A8 A2020011 */ sb $v0, 0x11($s0) -/* E2BCDC 802BB5AC 00021600 */ sll $v0, $v0, 0x18 -/* E2BCE0 802BB5B0 1C400008 */ bgtz $v0, .L802BB5D4 -/* E2BCE4 802BB5B4 0220202D */ daddu $a0, $s1, $zero -/* E2BCE8 802BB5B8 92020012 */ lbu $v0, 0x12($s0) -/* E2BCEC 802BB5BC 24420001 */ addiu $v0, $v0, 1 -/* E2BCF0 802BB5C0 A2020012 */ sb $v0, 0x12($s0) -/* E2BCF4 802BB5C4 8E220000 */ lw $v0, ($s1) -/* E2BCF8 802BB5C8 34420021 */ ori $v0, $v0, 0x21 -/* E2BCFC 802BB5CC 0C043F5A */ jal exec_entity_commandlist -/* E2BD00 802BB5D0 AE220000 */ sw $v0, ($s1) -.L802BB5D4: -/* E2BD04 802BB5D4 92020012 */ lbu $v0, 0x12($s0) -/* E2BD08 802BB5D8 2442FFFE */ addiu $v0, $v0, -2 -/* E2BD0C 802BB5DC 2C420007 */ sltiu $v0, $v0, 7 -/* E2BD10 802BB5E0 1040000D */ beqz $v0, .L802BB618 -/* E2BD14 802BB5E4 00000000 */ nop -/* E2BD18 802BB5E8 92020010 */ lbu $v0, 0x10($s0) -/* E2BD1C 802BB5EC 24420001 */ addiu $v0, $v0, 1 -/* E2BD20 802BB5F0 A2020010 */ sb $v0, 0x10($s0) -/* E2BD24 802BB5F4 30420001 */ andi $v0, $v0, 1 -/* E2BD28 802BB5F8 10400004 */ beqz $v0, .L802BB60C -/* E2BD2C 802BB5FC 2403FFFE */ addiu $v1, $zero, -2 -/* E2BD30 802BB600 8E220000 */ lw $v0, ($s1) -/* E2BD34 802BB604 080AED85 */ j .L802BB614 -/* E2BD38 802BB608 34420001 */ ori $v0, $v0, 1 -.L802BB60C: -/* E2BD3C 802BB60C 8E220000 */ lw $v0, ($s1) -/* E2BD40 802BB610 00431024 */ and $v0, $v0, $v1 -.L802BB614: -/* E2BD44 802BB614 AE220000 */ sw $v0, ($s1) -.L802BB618: -/* E2BD48 802BB618 8FBF0020 */ lw $ra, 0x20($sp) -/* E2BD4C 802BB61C 8FB1001C */ lw $s1, 0x1c($sp) -/* E2BD50 802BB620 8FB00018 */ lw $s0, 0x18($sp) -/* E2BD54 802BB624 03E00008 */ jr $ra -/* E2BD58 802BB628 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s deleted file mode 100644 index a0c672545d..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB62C_E2BD5C -/* E2BD5C 802BB62C 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) -/* E2BD60 802BB630 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) -/* E2BD64 802BB634 3C030A00 */ lui $v1, 0xa00 -/* E2BD68 802BB638 24631EF8 */ addiu $v1, $v1, 0x1ef8 -/* E2BD6C 802BB63C 3063FFFF */ andi $v1, $v1, 0xffff -/* E2BD70 802BB640 AC82003C */ sw $v0, 0x3c($a0) -/* E2BD74 802BB644 8C820044 */ lw $v0, 0x44($a0) -/* E2BD78 802BB648 8C840040 */ lw $a0, 0x40($a0) -/* E2BD7C 802BB64C 00431021 */ addu $v0, $v0, $v1 -/* E2BD80 802BB650 AC820014 */ sw $v0, 0x14($a0) -/* E2BD84 802BB654 3C020A00 */ lui $v0, 0xa00 -/* E2BD88 802BB658 24421FA0 */ addiu $v0, $v0, 0x1fa0 -/* E2BD8C 802BB65C 03E00008 */ jr $ra -/* E2BD90 802BB660 AC820018 */ sw $v0, 0x18($a0) diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s deleted file mode 100644 index fad93baf1e..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB664_E2BD94 -/* E2BD94 802BB664 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) -/* E2BD98 802BB668 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) -/* E2BD9C 802BB66C 3C030A00 */ lui $v1, 0xa00 -/* E2BDA0 802BB670 24631690 */ addiu $v1, $v1, 0x1690 -/* E2BDA4 802BB674 3063FFFF */ andi $v1, $v1, 0xffff -/* E2BDA8 802BB678 AC82003C */ sw $v0, 0x3c($a0) -/* E2BDAC 802BB67C 8C820044 */ lw $v0, 0x44($a0) -/* E2BDB0 802BB680 8C840040 */ lw $a0, 0x40($a0) -/* E2BDB4 802BB684 00431021 */ addu $v0, $v0, $v1 -/* E2BDB8 802BB688 AC820014 */ sw $v0, 0x14($a0) -/* E2BDBC 802BB68C 3C020A00 */ lui $v0, 0xa00 -/* E2BDC0 802BB690 24421840 */ addiu $v0, $v0, 0x1840 -/* E2BDC4 802BB694 03E00008 */ jr $ra -/* E2BDC8 802BB698 AC820018 */ sw $v0, 0x18($a0) diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s deleted file mode 100644 index 3f80256c81..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB69C_E2BDCC -/* E2BDCC 802BB69C 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) -/* E2BDD0 802BB6A0 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) -/* E2BDD4 802BB6A4 3C030A00 */ lui $v1, 0xa00 -/* E2BDD8 802BB6A8 24631AC8 */ addiu $v1, $v1, 0x1ac8 -/* E2BDDC 802BB6AC 3063FFFF */ andi $v1, $v1, 0xffff -/* E2BDE0 802BB6B0 AC82003C */ sw $v0, 0x3c($a0) -/* E2BDE4 802BB6B4 8C820044 */ lw $v0, 0x44($a0) -/* E2BDE8 802BB6B8 8C840040 */ lw $a0, 0x40($a0) -/* E2BDEC 802BB6BC 00431021 */ addu $v0, $v0, $v1 -/* E2BDF0 802BB6C0 AC820014 */ sw $v0, 0x14($a0) -/* E2BDF4 802BB6C4 3C020A00 */ lui $v0, 0xa00 -/* E2BDF8 802BB6C8 24421B70 */ addiu $v0, $v0, 0x1b70 -/* E2BDFC 802BB6CC 03E00008 */ jr $ra -/* E2BE00 802BB6D0 AC820018 */ sw $v0, 0x18($a0) diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s deleted file mode 100644 index a9a8a4cd08..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB6D4_E2BE04 -/* E2BE04 802BB6D4 3C02802C */ lui $v0, %hi(func_802BAE00_E2B530) -/* E2BE08 802BB6D8 2442AE00 */ addiu $v0, $v0, %lo(func_802BAE00_E2B530) -/* E2BE0C 802BB6DC 3C030A00 */ lui $v1, 0xa00 -/* E2BE10 802BB6E0 24631AC8 */ addiu $v1, $v1, 0x1ac8 -/* E2BE14 802BB6E4 3063FFFF */ andi $v1, $v1, 0xffff -/* E2BE18 802BB6E8 AC82003C */ sw $v0, 0x3c($a0) -/* E2BE1C 802BB6EC 8C820044 */ lw $v0, 0x44($a0) -/* E2BE20 802BB6F0 8C840040 */ lw $a0, 0x40($a0) -/* E2BE24 802BB6F4 00431021 */ addu $v0, $v0, $v1 -/* E2BE28 802BB6F8 AC820014 */ sw $v0, 0x14($a0) -/* E2BE2C 802BB6FC 3C020A00 */ lui $v0, 0xa00 -/* E2BE30 802BB700 24421B70 */ addiu $v0, $v0, 0x1b70 -/* E2BE34 802BB704 03E00008 */ jr $ra -/* E2BE38 802BB708 AC820018 */ sw $v0, 0x18($a0) -/* E2BE3C 802BB70C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s deleted file mode 100644 index 7251db0893..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB710_E2BE40 -/* E2BE40 802BB710 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* E2BE44 802BB714 AFB3009C */ sw $s3, 0x9c($sp) -/* E2BE48 802BB718 0080982D */ daddu $s3, $a0, $zero -/* E2BE4C 802BB71C AFB400A0 */ sw $s4, 0xa0($sp) -/* E2BE50 802BB720 00C0A02D */ daddu $s4, $a2, $zero -/* E2BE54 802BB724 27A40050 */ addiu $a0, $sp, 0x50 -/* E2BE58 802BB728 AFB20098 */ sw $s2, 0x98($sp) -/* E2BE5C 802BB72C 0000902D */ daddu $s2, $zero, $zero -/* E2BE60 802BB730 AFB600A8 */ sw $s6, 0xa8($sp) -/* E2BE64 802BB734 24160014 */ addiu $s6, $zero, 0x14 -/* E2BE68 802BB738 AFB500A4 */ sw $s5, 0xa4($sp) -/* E2BE6C 802BB73C 2415FFF6 */ addiu $s5, $zero, -0xa -/* E2BE70 802BB740 AFBF00AC */ sw $ra, 0xac($sp) -/* E2BE74 802BB744 AFB10094 */ sw $s1, 0x94($sp) -/* E2BE78 802BB748 AFB00090 */ sw $s0, 0x90($sp) -/* E2BE7C 802BB74C F7B400B0 */ sdc1 $f20, 0xb0($sp) -/* E2BE80 802BB750 8E620040 */ lw $v0, 0x40($s3) -/* E2BE84 802BB754 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2BE88 802BB758 0040802D */ daddu $s0, $v0, $zero -/* E2BE8C 802BB75C 8E620044 */ lw $v0, 0x44($s3) -/* E2BE90 802BB760 3C014120 */ lui $at, 0x4120 -/* E2BE94 802BB764 4481A000 */ mtc1 $at, $f20 -/* E2BE98 802BB768 00451021 */ addu $v0, $v0, $a1 -/* E2BE9C 802BB76C AE020000 */ sw $v0, ($s0) -/* E2BEA0 802BB770 3C02802C */ lui $v0, %hi(func_802BBE3C_E2C56C) -/* E2BEA4 802BB774 2442BE3C */ addiu $v0, $v0, %lo(func_802BBE3C_E2C56C) -/* E2BEA8 802BB778 AE62003C */ sw $v0, 0x3c($s3) -/* E2BEAC 802BB77C 240200FF */ addiu $v0, $zero, 0xff -/* E2BEB0 802BB780 A262000B */ sb $v0, 0xb($s3) -/* E2BEB4 802BB784 C6000004 */ lwc1 $f0, 4($s0) -/* E2BEB8 802BB788 8E650048 */ lw $a1, 0x48($s3) -/* E2BEBC 802BB78C 8E670050 */ lw $a3, 0x50($s3) -/* E2BEC0 802BB790 44060000 */ mfc1 $a2, $f0 -/* E2BEC4 802BB794 0200882D */ daddu $s1, $s0, $zero -/* E2BEC8 802BB798 0C019E40 */ jal guTranslateF -/* E2BECC 802BB79C AE66004C */ sw $a2, 0x4c($s3) -.L802BB7A0: -/* E2BED0 802BB7A0 3282FFFF */ andi $v0, $s4, 0xffff -/* E2BED4 802BB7A4 26940040 */ addiu $s4, $s4, 0x40 -/* E2BED8 802BB7A8 8E650044 */ lw $a1, 0x44($s3) -/* E2BEDC 802BB7AC 27A40010 */ addiu $a0, $sp, 0x10 -/* E2BEE0 802BB7B0 0C019D60 */ jal guMtxL2F -/* E2BEE4 802BB7B4 00A22821 */ addu $a1, $a1, $v0 -/* E2BEE8 802BB7B8 27A40050 */ addiu $a0, $sp, 0x50 -/* E2BEEC 802BB7BC 27A50010 */ addiu $a1, $sp, 0x10 -/* E2BEF0 802BB7C0 0C019D80 */ jal guMtxCatF -/* E2BEF4 802BB7C4 00A0302D */ daddu $a2, $a1, $zero -/* E2BEF8 802BB7C8 C7A00040 */ lwc1 $f0, 0x40($sp) -/* E2BEFC 802BB7CC E6000080 */ swc1 $f0, 0x80($s0) -/* E2BF00 802BB7D0 C7A00044 */ lwc1 $f0, 0x44($sp) -/* E2BF04 802BB7D4 E60000B4 */ swc1 $f0, 0xb4($s0) -/* E2BF08 802BB7D8 C7A00048 */ lwc1 $f0, 0x48($sp) -/* E2BF0C 802BB7DC 240400FF */ addiu $a0, $zero, 0xff -/* E2BF10 802BB7E0 0C00A67F */ jal rand_int -/* E2BF14 802BB7E4 E60000E8 */ swc1 $f0, 0xe8($s0) -/* E2BF18 802BB7E8 24040005 */ addiu $a0, $zero, 5 -/* E2BF1C 802BB7EC 00021023 */ negu $v0, $v0 -/* E2BF20 802BB7F0 A2220015 */ sb $v0, 0x15($s1) -/* E2BF24 802BB7F4 0C00A67F */ jal rand_int -/* E2BF28 802BB7F8 A236003C */ sb $s6, 0x3c($s1) -/* E2BF2C 802BB7FC 0040182D */ daddu $v1, $v0, $zero -/* E2BF30 802BB800 32420001 */ andi $v0, $s2, 1 -/* E2BF34 802BB804 14400002 */ bnez $v0, .L802BB810 -/* E2BF38 802BB808 2462000A */ addiu $v0, $v1, 0xa -/* E2BF3C 802BB80C 02A31023 */ subu $v0, $s5, $v1 -.L802BB810: -/* E2BF40 802BB810 44820000 */ mtc1 $v0, $f0 -/* E2BF44 802BB814 00000000 */ nop -/* E2BF48 802BB818 46800020 */ cvt.s.w $f0, $f0 -/* E2BF4C 802BB81C E600004C */ swc1 $f0, 0x4c($s0) -/* E2BF50 802BB820 E614011C */ swc1 $f20, 0x11c($s0) -/* E2BF54 802BB824 A2200008 */ sb $zero, 8($s1) -/* E2BF58 802BB828 A2200022 */ sb $zero, 0x22($s1) -/* E2BF5C 802BB82C A220002F */ sb $zero, 0x2f($s1) -/* E2BF60 802BB830 26310001 */ addiu $s1, $s1, 1 -/* E2BF64 802BB834 26520001 */ addiu $s2, $s2, 1 -/* E2BF68 802BB838 2A42000C */ slti $v0, $s2, 0xc -/* E2BF6C 802BB83C 1440FFD8 */ bnez $v0, .L802BB7A0 -/* E2BF70 802BB840 26100004 */ addiu $s0, $s0, 4 -/* E2BF74 802BB844 8FBF00AC */ lw $ra, 0xac($sp) -/* E2BF78 802BB848 8FB600A8 */ lw $s6, 0xa8($sp) -/* E2BF7C 802BB84C 8FB500A4 */ lw $s5, 0xa4($sp) -/* E2BF80 802BB850 8FB400A0 */ lw $s4, 0xa0($sp) -/* E2BF84 802BB854 8FB3009C */ lw $s3, 0x9c($sp) -/* E2BF88 802BB858 8FB20098 */ lw $s2, 0x98($sp) -/* E2BF8C 802BB85C 8FB10094 */ lw $s1, 0x94($sp) -/* E2BF90 802BB860 8FB00090 */ lw $s0, 0x90($sp) -/* E2BF94 802BB864 D7B400B0 */ ldc1 $f20, 0xb0($sp) -/* E2BF98 802BB868 03E00008 */ jr $ra -/* E2BF9C 802BB86C 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s deleted file mode 100644 index 951d85c728..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB870_E2BFA0 -/* E2BFA0 802BB870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2BFA4 802BB874 3C050A00 */ lui $a1, 0xa00 -/* E2BFA8 802BB878 24A52E18 */ addiu $a1, $a1, 0x2e18 -/* E2BFAC 802BB87C AFBF0010 */ sw $ra, 0x10($sp) -/* E2BFB0 802BB880 8C820040 */ lw $v0, 0x40($a0) -/* E2BFB4 802BB884 C480004C */ lwc1 $f0, 0x4c($a0) -/* E2BFB8 802BB888 3C060A00 */ lui $a2, 0xa00 -/* E2BFBC 802BB88C 24C62478 */ addiu $a2, $a2, 0x2478 -/* E2BFC0 802BB890 0C0AEDC4 */ jal func_802BB710_E2BE40 -/* E2BFC4 802BB894 E4400004 */ swc1 $f0, 4($v0) -/* E2BFC8 802BB898 8FBF0010 */ lw $ra, 0x10($sp) -/* E2BFCC 802BB89C 03E00008 */ jr $ra -/* E2BFD0 802BB8A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s deleted file mode 100644 index 6dcccfa4ba..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s +++ /dev/null @@ -1,398 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802BCFA0_E2D6D0 -.double 0.4 - -dlabel D_802BCFA8_E2D6D8 -.double 1.6 - -dlabel D_802BCFB0_E2D6E0 -.double 0.8 - -dlabel D_802BCFB8_E2D6E8 -.double -10.2 - -.section .text - -glabel func_802BB8A4_E2BFD4 -/* E2BFD4 802BB8A4 27BDFF78 */ addiu $sp, $sp, -0x88 -/* E2BFD8 802BB8A8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* E2BFDC 802BB8AC 4480D000 */ mtc1 $zero, $f26 -/* E2BFE0 802BB8B0 F7BE0080 */ sdc1 $f30, 0x80($sp) -/* E2BFE4 802BB8B4 3C014F00 */ lui $at, 0x4f00 -/* E2BFE8 802BB8B8 4481F000 */ mtc1 $at, $f30 -/* E2BFEC 802BB8BC AFBE0050 */ sw $fp, 0x50($sp) -/* E2BFF0 802BB8C0 0080F02D */ daddu $fp, $a0, $zero -/* E2BFF4 802BB8C4 AFB3003C */ sw $s3, 0x3c($sp) -/* E2BFF8 802BB8C8 0000982D */ daddu $s3, $zero, $zero -/* E2BFFC 802BB8CC AFB60048 */ sw $s6, 0x48($sp) -/* E2C000 802BB8D0 27B60020 */ addiu $s6, $sp, 0x20 -/* E2C004 802BB8D4 AFB50044 */ sw $s5, 0x44($sp) -/* E2C008 802BB8D8 27B50024 */ addiu $s5, $sp, 0x24 -/* E2C00C 802BB8DC AFB40040 */ sw $s4, 0x40($sp) -/* E2C010 802BB8E0 27B40028 */ addiu $s4, $sp, 0x28 -/* E2C014 802BB8E4 AFB7004C */ sw $s7, 0x4c($sp) -/* E2C018 802BB8E8 3C178000 */ lui $s7, 0x8000 -/* E2C01C 802BB8EC AFBF0054 */ sw $ra, 0x54($sp) -/* E2C020 802BB8F0 AFB20038 */ sw $s2, 0x38($sp) -/* E2C024 802BB8F4 AFB10034 */ sw $s1, 0x34($sp) -/* E2C028 802BB8F8 AFB00030 */ sw $s0, 0x30($sp) -/* E2C02C 802BB8FC F7BC0078 */ sdc1 $f28, 0x78($sp) -/* E2C030 802BB900 F7B80068 */ sdc1 $f24, 0x68($sp) -/* E2C034 802BB904 F7B60060 */ sdc1 $f22, 0x60($sp) -/* E2C038 802BB908 F7B40058 */ sdc1 $f20, 0x58($sp) -/* E2C03C 802BB90C 8FD20040 */ lw $s2, 0x40($fp) -/* E2C040 802BB910 4600D706 */ mov.s $f28, $f26 -/* E2C044 802BB914 4600D606 */ mov.s $f24, $f26 -/* E2C048 802BB918 0240882D */ daddu $s1, $s2, $zero -/* E2C04C 802BB91C 0240802D */ daddu $s0, $s2, $zero -.L802BB920: -/* E2C050 802BB920 82230008 */ lb $v1, 8($s1) -/* E2C054 802BB924 24020001 */ addiu $v0, $zero, 1 -/* E2C058 802BB928 10620028 */ beq $v1, $v0, .L802BB9CC -/* E2C05C 802BB92C 28620002 */ slti $v0, $v1, 2 -/* E2C060 802BB930 10400005 */ beqz $v0, .L802BB948 -/* E2C064 802BB934 24020002 */ addiu $v0, $zero, 2 -/* E2C068 802BB938 10600009 */ beqz $v1, .L802BB960 -/* E2C06C 802BB93C 00000000 */ nop -/* E2C070 802BB940 080AEE9B */ j .L802BBA6C -/* E2C074 802BB944 00000000 */ nop -.L802BB948: -/* E2C078 802BB948 10620029 */ beq $v1, $v0, .L802BB9F0 -/* E2C07C 802BB94C 24020003 */ addiu $v0, $zero, 3 -/* E2C080 802BB950 50620046 */ beql $v1, $v0, .L802BBA6C -/* E2C084 802BB954 26730001 */ addiu $s3, $s3, 1 -/* E2C088 802BB958 080AEE9B */ j .L802BBA6C -/* E2C08C 802BB95C 00000000 */ nop -.L802BB960: -/* E2C090 802BB960 3C014000 */ lui $at, 0x4000 -/* E2C094 802BB964 4481E000 */ mtc1 $at, $f28 -/* E2C098 802BB968 9222003C */ lbu $v0, 0x3c($s1) -/* E2C09C 802BB96C C61A004C */ lwc1 $f26, 0x4c($s0) -/* E2C0A0 802BB970 3C014120 */ lui $at, 0x4120 -/* E2C0A4 802BB974 44810000 */ mtc1 $at, $f0 -/* E2C0A8 802BB978 44801000 */ mtc1 $zero, $f2 -/* E2C0AC 802BB97C 44822000 */ mtc1 $v0, $f4 -/* E2C0B0 802BB980 00000000 */ nop -/* E2C0B4 802BB984 46802120 */ cvt.s.w $f4, $f4 -/* E2C0B8 802BB988 461A103E */ c.le.s $f2, $f26 -/* E2C0BC 802BB98C 00000000 */ nop -/* E2C0C0 802BB990 45000006 */ bc1f .L802BB9AC -/* E2C0C4 802BB994 46002603 */ div.s $f24, $f4, $f0 -/* E2C0C8 802BB998 3C01802C */ lui $at, %hi(D_802BCFA0_E2D6D0) -/* E2C0CC 802BB99C D422CFA0 */ ldc1 $f2, %lo(D_802BCFA0_E2D6D0)($at) -/* E2C0D0 802BB9A0 4600D021 */ cvt.d.s $f0, $f26 -/* E2C0D4 802BB9A4 080AEE70 */ j .L802BB9C0 -/* E2C0D8 802BB9A8 46220001 */ sub.d $f0, $f0, $f2 -.L802BB9AC: -/* E2C0DC 802BB9AC 3C013FE0 */ lui $at, 0x3fe0 -/* E2C0E0 802BB9B0 44811800 */ mtc1 $at, $f3 -/* E2C0E4 802BB9B4 44801000 */ mtc1 $zero, $f2 -/* E2C0E8 802BB9B8 4600D021 */ cvt.d.s $f0, $f26 -/* E2C0EC 802BB9BC 46220000 */ add.d $f0, $f0, $f2 -.L802BB9C0: -/* E2C0F0 802BB9C0 46200020 */ cvt.s.d $f0, $f0 -/* E2C0F4 802BB9C4 080AEE9B */ j .L802BBA6C -/* E2C0F8 802BB9C8 E600004C */ swc1 $f0, 0x4c($s0) -.L802BB9CC: -/* E2C0FC 802BB9CC 3C013F80 */ lui $at, 0x3f80 -/* E2C100 802BB9D0 4481C000 */ mtc1 $at, $f24 -/* E2C104 802BB9D4 C602004C */ lwc1 $f2, 0x4c($s0) -/* E2C108 802BB9D8 3C013E80 */ lui $at, 0x3e80 -/* E2C10C 802BB9DC 44810000 */ mtc1 $at, $f0 -/* E2C110 802BB9E0 4480E000 */ mtc1 $zero, $f28 -/* E2C114 802BB9E4 46001682 */ mul.s $f26, $f2, $f0 -/* E2C118 802BB9E8 080AEE9B */ j .L802BBA6C -/* E2C11C 802BB9EC 00000000 */ nop -.L802BB9F0: -/* E2C120 802BB9F0 C602004C */ lwc1 $f2, 0x4c($s0) -/* E2C124 802BB9F4 3C013F80 */ lui $at, 0x3f80 -/* E2C128 802BB9F8 44810000 */ mtc1 $at, $f0 -/* E2C12C 802BB9FC 00000000 */ nop -/* E2C130 802BBA00 46001080 */ add.s $f2, $f2, $f0 -/* E2C134 802BBA04 3C0141A0 */ lui $at, 0x41a0 -/* E2C138 802BBA08 44810000 */ mtc1 $at, $f0 -/* E2C13C 802BBA0C 00000000 */ nop -/* E2C140 802BBA10 4602003C */ c.lt.s $f0, $f2 -/* E2C144 802BBA14 00000000 */ nop -/* E2C148 802BBA18 45000002 */ bc1f .L802BBA24 -/* E2C14C 802BBA1C E602004C */ swc1 $f2, 0x4c($s0) -/* E2C150 802BBA20 E600004C */ swc1 $f0, 0x4c($s0) -.L802BBA24: -/* E2C154 802BBA24 C602004C */ lwc1 $f2, 0x4c($s0) -/* E2C158 802BBA28 3C01428C */ lui $at, 0x428c -/* E2C15C 802BBA2C 44812000 */ mtc1 $at, $f4 -/* E2C160 802BBA30 C60000B4 */ lwc1 $f0, 0xb4($s0) -/* E2C164 802BBA34 46041083 */ div.s $f2, $f2, $f4 -/* E2C168 802BBA38 46020001 */ sub.s $f0, $f0, $f2 -/* E2C16C 802BBA3C E60000B4 */ swc1 $f0, 0xb4($s0) -/* E2C170 802BBA40 92220015 */ lbu $v0, 0x15($s1) -/* E2C174 802BBA44 2442FFFB */ addiu $v0, $v0, -5 -/* E2C178 802BBA48 A2220015 */ sb $v0, 0x15($s1) -/* E2C17C 802BBA4C 304200FF */ andi $v0, $v0, 0xff -/* E2C180 802BBA50 2C420006 */ sltiu $v0, $v0, 6 -/* E2C184 802BBA54 10400005 */ beqz $v0, .L802BBA6C -/* E2C188 802BBA58 00000000 */ nop -/* E2C18C 802BBA5C 92220008 */ lbu $v0, 8($s1) -/* E2C190 802BBA60 A2200015 */ sb $zero, 0x15($s1) -/* E2C194 802BBA64 24420001 */ addiu $v0, $v0, 1 -/* E2C198 802BBA68 A2220008 */ sb $v0, 8($s1) -.L802BBA6C: -/* E2C19C 802BBA6C 82220008 */ lb $v0, 8($s1) -/* E2C1A0 802BBA70 28420002 */ slti $v0, $v0, 2 -/* E2C1A4 802BBA74 504000D6 */ beql $v0, $zero, .L802BBDD0 -/* E2C1A8 802BBA78 26310001 */ addiu $s1, $s1, 1 -/* E2C1AC 802BBA7C C602011C */ lwc1 $f2, 0x11c($s0) -/* E2C1B0 802BBA80 44800000 */ mtc1 $zero, $f0 -/* E2C1B4 802BBA84 00000000 */ nop -/* E2C1B8 802BBA88 4602003E */ c.le.s $f0, $f2 -/* E2C1BC 802BBA8C 3C01802C */ lui $at, %hi(D_802BCFA8_E2D6D8) -/* E2C1C0 802BBA90 D420CFA8 */ ldc1 $f0, %lo(D_802BCFA8_E2D6D8)($at) -/* E2C1C4 802BBA94 45000003 */ bc1f .L802BBAA4 -/* E2C1C8 802BBA98 460010A1 */ cvt.d.s $f2, $f2 -/* E2C1CC 802BBA9C 3C01802C */ lui $at, %hi(D_802BCFB0_E2D6E0) -/* E2C1D0 802BBAA0 D420CFB0 */ ldc1 $f0, %lo(D_802BCFB0_E2D6E0)($at) -.L802BBAA4: -/* E2C1D4 802BBAA4 46201081 */ sub.d $f2, $f2, $f0 -/* E2C1D8 802BBAA8 3C01802C */ lui $at, %hi(D_802BCFB8_E2D6E8) -/* E2C1DC 802BBAAC D424CFB8 */ ldc1 $f4, %lo(D_802BCFB8_E2D6E8)($at) -/* E2C1E0 802BBAB0 462010A0 */ cvt.s.d $f2, $f2 -/* E2C1E4 802BBAB4 46001021 */ cvt.d.s $f0, $f2 -/* E2C1E8 802BBAB8 4624003C */ c.lt.d $f0, $f4 -/* E2C1EC 802BBABC 00000000 */ nop -/* E2C1F0 802BBAC0 45000006 */ bc1f .L802BBADC -/* E2C1F4 802BBAC4 E602011C */ swc1 $f2, 0x11c($s0) -/* E2C1F8 802BBAC8 3C01C123 */ lui $at, 0xc123 -/* E2C1FC 802BBACC 34213333 */ ori $at, $at, 0x3333 -/* E2C200 802BBAD0 44810000 */ mtc1 $at, $f0 -/* E2C204 802BBAD4 00000000 */ nop -/* E2C208 802BBAD8 E600011C */ swc1 $f0, 0x11c($s0) -.L802BBADC: -/* E2C20C 802BBADC C60000B4 */ lwc1 $f0, 0xb4($s0) -/* E2C210 802BBAE0 C602011C */ lwc1 $f2, 0x11c($s0) -/* E2C214 802BBAE4 46020000 */ add.s $f0, $f0, $f2 -/* E2C218 802BBAE8 E60000B4 */ swc1 $f0, 0xb4($s0) -/* E2C21C 802BBAEC 92220015 */ lbu $v0, 0x15($s1) -/* E2C220 802BBAF0 3C0143B4 */ lui $at, 0x43b4 -/* E2C224 802BBAF4 44814000 */ mtc1 $at, $f8 -/* E2C228 802BBAF8 4482A000 */ mtc1 $v0, $f20 -/* E2C22C 802BBAFC 00000000 */ nop -/* E2C230 802BBB00 4680A520 */ cvt.s.w $f20, $f20 -/* E2C234 802BBB04 4608A502 */ mul.s $f20, $f20, $f8 -/* E2C238 802BBB08 00000000 */ nop -/* E2C23C 802BBB0C 3C013B80 */ lui $at, 0x3b80 -/* E2C240 802BBB10 44814000 */ mtc1 $at, $f8 -/* E2C244 802BBB14 00000000 */ nop -/* E2C248 802BBB18 4608A502 */ mul.s $f20, $f20, $f8 -/* E2C24C 802BBB1C 00000000 */ nop -/* E2C250 802BBB20 3C0140C9 */ lui $at, 0x40c9 -/* E2C254 802BBB24 34210FD0 */ ori $at, $at, 0xfd0 -/* E2C258 802BBB28 44814000 */ mtc1 $at, $f8 -/* E2C25C 802BBB2C 00000000 */ nop -/* E2C260 802BBB30 4608A002 */ mul.s $f0, $f20, $f8 -/* E2C264 802BBB34 00000000 */ nop -/* E2C268 802BBB38 3C0143B4 */ lui $at, 0x43b4 -/* E2C26C 802BBB3C 44814000 */ mtc1 $at, $f8 -/* E2C270 802BBB40 00000000 */ nop -/* E2C274 802BBB44 46080583 */ div.s $f22, $f0, $f8 -/* E2C278 802BBB48 0C00A85B */ jal sin_rad -/* E2C27C 802BBB4C 4600B306 */ mov.s $f12, $f22 -/* E2C280 802BBB50 4600C002 */ mul.s $f0, $f24, $f0 -/* E2C284 802BBB54 00000000 */ nop -/* E2C288 802BBB58 C6020080 */ lwc1 $f2, 0x80($s0) -/* E2C28C 802BBB5C 46001080 */ add.s $f2, $f2, $f0 -/* E2C290 802BBB60 4600B306 */ mov.s $f12, $f22 -/* E2C294 802BBB64 0C00A874 */ jal cos_rad -/* E2C298 802BBB68 E6020080 */ swc1 $f2, 0x80($s0) -/* E2C29C 802BBB6C 4600C002 */ mul.s $f0, $f24, $f0 -/* E2C2A0 802BBB70 00000000 */ nop -/* E2C2A4 802BBB74 C60200E8 */ lwc1 $f2, 0xe8($s0) -/* E2C2A8 802BBB78 3C040004 */ lui $a0, 4 -/* E2C2AC 802BBB7C 46001080 */ add.s $f2, $f2, $f0 -/* E2C2B0 802BBB80 C6000080 */ lwc1 $f0, 0x80($s0) -/* E2C2B4 802BBB84 02C0282D */ daddu $a1, $s6, $zero -/* E2C2B8 802BBB88 E60200E8 */ swc1 $f2, 0xe8($s0) -/* E2C2BC 802BBB8C C60200B4 */ lwc1 $f2, 0xb4($s0) -/* E2C2C0 802BBB90 C60400E8 */ lwc1 $f4, 0xe8($s0) -/* E2C2C4 802BBB94 02A0302D */ daddu $a2, $s5, $zero -/* E2C2C8 802BBB98 E7A00020 */ swc1 $f0, 0x20($sp) -/* E2C2CC 802BBB9C E7A20024 */ swc1 $f2, 0x24($sp) -/* E2C2D0 802BBBA0 E7A40028 */ swc1 $f4, 0x28($sp) -/* E2C2D4 802BBBA4 3C014100 */ lui $at, 0x4100 -/* E2C2D8 802BBBA8 44814000 */ mtc1 $at, $f8 -/* E2C2DC 802BBBAC 0280382D */ daddu $a3, $s4, $zero -/* E2C2E0 802BBBB0 E7B80010 */ swc1 $f24, 0x10($sp) -/* E2C2E4 802BBBB4 E7B40014 */ swc1 $f20, 0x14($sp) -/* E2C2E8 802BBBB8 E7A80018 */ swc1 $f8, 0x18($sp) -/* E2C2EC 802BBBBC 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* E2C2F0 802BBBC0 E7A8001C */ swc1 $f8, 0x1c($sp) -/* E2C2F4 802BBBC4 10400031 */ beqz $v0, .L802BBC8C -/* E2C2F8 802BBBC8 3C040004 */ lui $a0, 4 -/* E2C2FC 802BBBCC C7A00020 */ lwc1 $f0, 0x20($sp) -/* E2C300 802BBBD0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2C304 802BBBD4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* E2C308 802BBBD8 E6000080 */ swc1 $f0, 0x80($s0) -/* E2C30C 802BBBDC E60200B4 */ swc1 $f2, 0xb4($s0) -/* E2C310 802BBBE0 E60400E8 */ swc1 $f4, 0xe8($s0) -/* E2C314 802BBBE4 92220015 */ lbu $v0, 0x15($s1) -/* E2C318 802BBBE8 3C0143B4 */ lui $at, 0x43b4 -/* E2C31C 802BBBEC 44814000 */ mtc1 $at, $f8 -/* E2C320 802BBBF0 24420080 */ addiu $v0, $v0, 0x80 -/* E2C324 802BBBF4 A2220015 */ sb $v0, 0x15($s1) -/* E2C328 802BBBF8 304200FF */ andi $v0, $v0, 0xff -/* E2C32C 802BBBFC 44820000 */ mtc1 $v0, $f0 -/* E2C330 802BBC00 00000000 */ nop -/* E2C334 802BBC04 46800020 */ cvt.s.w $f0, $f0 -/* E2C338 802BBC08 46080002 */ mul.s $f0, $f0, $f8 -/* E2C33C 802BBC0C 00000000 */ nop -/* E2C340 802BBC10 3C013B80 */ lui $at, 0x3b80 -/* E2C344 802BBC14 44814000 */ mtc1 $at, $f8 -/* E2C348 802BBC18 00000000 */ nop -/* E2C34C 802BBC1C 46080002 */ mul.s $f0, $f0, $f8 -/* E2C350 802BBC20 00000000 */ nop -/* E2C354 802BBC24 3C0140C9 */ lui $at, 0x40c9 -/* E2C358 802BBC28 34210FD0 */ ori $at, $at, 0xfd0 -/* E2C35C 802BBC2C 44814000 */ mtc1 $at, $f8 -/* E2C360 802BBC30 00000000 */ nop -/* E2C364 802BBC34 46080002 */ mul.s $f0, $f0, $f8 -/* E2C368 802BBC38 00000000 */ nop -/* E2C36C 802BBC3C 3C0143B4 */ lui $at, 0x43b4 -/* E2C370 802BBC40 44814000 */ mtc1 $at, $f8 -/* E2C374 802BBC44 3C014100 */ lui $at, 0x4100 -/* E2C378 802BBC48 4481C000 */ mtc1 $at, $f24 -/* E2C37C 802BBC4C 46080583 */ div.s $f22, $f0, $f8 -/* E2C380 802BBC50 0C00A85B */ jal sin_rad -/* E2C384 802BBC54 4600B306 */ mov.s $f12, $f22 -/* E2C388 802BBC58 46180002 */ mul.s $f0, $f0, $f24 -/* E2C38C 802BBC5C 00000000 */ nop -/* E2C390 802BBC60 C6020080 */ lwc1 $f2, 0x80($s0) -/* E2C394 802BBC64 46001080 */ add.s $f2, $f2, $f0 -/* E2C398 802BBC68 4600B306 */ mov.s $f12, $f22 -/* E2C39C 802BBC6C 0C00A874 */ jal cos_rad -/* E2C3A0 802BBC70 E6020080 */ swc1 $f2, 0x80($s0) -/* E2C3A4 802BBC74 46180002 */ mul.s $f0, $f0, $f24 -/* E2C3A8 802BBC78 00000000 */ nop -/* E2C3AC 802BBC7C C60200E8 */ lwc1 $f2, 0xe8($s0) -/* E2C3B0 802BBC80 46001080 */ add.s $f2, $f2, $f0 -/* E2C3B4 802BBC84 E60200E8 */ swc1 $f2, 0xe8($s0) -/* E2C3B8 802BBC88 3C040004 */ lui $a0, 4 -.L802BBC8C: -/* E2C3BC 802BBC8C 02C0282D */ daddu $a1, $s6, $zero -/* E2C3C0 802BBC90 02A0302D */ daddu $a2, $s5, $zero -/* E2C3C4 802BBC94 0280382D */ daddu $a3, $s4, $zero -/* E2C3C8 802BBC98 27A2002C */ addiu $v0, $sp, 0x2c -/* E2C3CC 802BBC9C C6020080 */ lwc1 $f2, 0x80($s0) -/* E2C3D0 802BBCA0 C60400B4 */ lwc1 $f4, 0xb4($s0) -/* E2C3D4 802BBCA4 C600011C */ lwc1 $f0, 0x11c($s0) -/* E2C3D8 802BBCA8 C60600E8 */ lwc1 $f6, 0xe8($s0) -/* E2C3DC 802BBCAC 46000005 */ abs.s $f0, $f0 -/* E2C3E0 802BBCB0 E7A20020 */ swc1 $f2, 0x20($sp) -/* E2C3E4 802BBCB4 E7A40024 */ swc1 $f4, 0x24($sp) -/* E2C3E8 802BBCB8 E7A60028 */ swc1 $f6, 0x28($sp) -/* E2C3EC 802BBCBC E7A0002C */ swc1 $f0, 0x2c($sp) -/* E2C3F0 802BBCC0 0C0372DF */ jal npc_raycast_down_sides -/* E2C3F4 802BBCC4 AFA20010 */ sw $v0, 0x10($sp) -/* E2C3F8 802BBCC8 1440000B */ bnez $v0, .L802BBCF8 -/* E2C3FC 802BBCCC 00000000 */ nop -/* E2C400 802BBCD0 C6400004 */ lwc1 $f0, 4($s2) -/* E2C404 802BBCD4 3C014348 */ lui $at, 0x4348 -/* E2C408 802BBCD8 44811000 */ mtc1 $at, $f2 -/* E2C40C 802BBCDC 00000000 */ nop -/* E2C410 802BBCE0 46020001 */ sub.s $f0, $f0, $f2 -/* E2C414 802BBCE4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2C418 802BBCE8 4600103C */ c.lt.s $f2, $f0 -/* E2C41C 802BBCEC 00000000 */ nop -/* E2C420 802BBCF0 45000010 */ bc1f .L802BBD34 -/* E2C424 802BBCF4 00000000 */ nop -.L802BBCF8: -/* E2C428 802BBCF8 92220008 */ lbu $v0, 8($s1) -/* E2C42C 802BBCFC 24420001 */ addiu $v0, $v0, 1 -/* E2C430 802BBD00 A2220008 */ sb $v0, 8($s1) -/* E2C434 802BBD04 C600011C */ lwc1 $f0, 0x11c($s0) -/* E2C438 802BBD08 C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2C43C 802BBD0C 46000005 */ abs.s $f0, $f0 -/* E2C440 802BBD10 46001080 */ add.s $f2, $f2, $f0 -/* E2C444 802BBD14 E61C011C */ swc1 $f28, 0x11c($s0) -/* E2C448 802BBD18 E60200B4 */ swc1 $f2, 0xb4($s0) -/* E2C44C 802BBD1C 82230008 */ lb $v1, 8($s1) -/* E2C450 802BBD20 24020002 */ addiu $v0, $zero, 2 -/* E2C454 802BBD24 14620003 */ bne $v1, $v0, .L802BBD34 -/* E2C458 802BBD28 240200FE */ addiu $v0, $zero, 0xfe -/* E2C45C 802BBD2C A2220015 */ sb $v0, 0x15($s1) -/* E2C460 802BBD30 AE00004C */ sw $zero, 0x4c($s0) -.L802BBD34: -/* E2C464 802BBD34 92220022 */ lbu $v0, 0x22($s1) -/* E2C468 802BBD38 44820000 */ mtc1 $v0, $f0 -/* E2C46C 802BBD3C 00000000 */ nop -/* E2C470 802BBD40 46800020 */ cvt.s.w $f0, $f0 -/* E2C474 802BBD44 461A0000 */ add.s $f0, $f0, $f26 -/* E2C478 802BBD48 4600F03E */ c.le.s $f30, $f0 -/* E2C47C 802BBD4C 00000000 */ nop -/* E2C480 802BBD50 45010005 */ bc1t .L802BBD68 -/* E2C484 802BBD54 26230022 */ addiu $v1, $s1, 0x22 -/* E2C488 802BBD58 4600020D */ trunc.w.s $f8, $f0 -/* E2C48C 802BBD5C 44024000 */ mfc1 $v0, $f8 -/* E2C490 802BBD60 080AEF60 */ j .L802BBD80 -/* E2C494 802BBD64 A0620000 */ sb $v0, ($v1) -.L802BBD68: -/* E2C498 802BBD68 461E0001 */ sub.s $f0, $f0, $f30 -/* E2C49C 802BBD6C 4600020D */ trunc.w.s $f8, $f0 -/* E2C4A0 802BBD70 44024000 */ mfc1 $v0, $f8 -/* E2C4A4 802BBD74 00000000 */ nop -/* E2C4A8 802BBD78 00571025 */ or $v0, $v0, $s7 -/* E2C4AC 802BBD7C A0620000 */ sb $v0, ($v1) -.L802BBD80: -/* E2C4B0 802BBD80 9222002F */ lbu $v0, 0x2f($s1) -/* E2C4B4 802BBD84 44820000 */ mtc1 $v0, $f0 -/* E2C4B8 802BBD88 00000000 */ nop -/* E2C4BC 802BBD8C 46800020 */ cvt.s.w $f0, $f0 -/* E2C4C0 802BBD90 461A0001 */ sub.s $f0, $f0, $f26 -/* E2C4C4 802BBD94 4600F03E */ c.le.s $f30, $f0 -/* E2C4C8 802BBD98 00000000 */ nop -/* E2C4CC 802BBD9C 45010005 */ bc1t .L802BBDB4 -/* E2C4D0 802BBDA0 2623002F */ addiu $v1, $s1, 0x2f -/* E2C4D4 802BBDA4 4600020D */ trunc.w.s $f8, $f0 -/* E2C4D8 802BBDA8 44024000 */ mfc1 $v0, $f8 -/* E2C4DC 802BBDAC 080AEF73 */ j .L802BBDCC -/* E2C4E0 802BBDB0 A0620000 */ sb $v0, ($v1) -.L802BBDB4: -/* E2C4E4 802BBDB4 461E0001 */ sub.s $f0, $f0, $f30 -/* E2C4E8 802BBDB8 4600020D */ trunc.w.s $f8, $f0 -/* E2C4EC 802BBDBC 44024000 */ mfc1 $v0, $f8 -/* E2C4F0 802BBDC0 00000000 */ nop -/* E2C4F4 802BBDC4 00571025 */ or $v0, $v0, $s7 -/* E2C4F8 802BBDC8 A0620000 */ sb $v0, ($v1) -.L802BBDCC: -/* E2C4FC 802BBDCC 26310001 */ addiu $s1, $s1, 1 -.L802BBDD0: -/* E2C500 802BBDD0 2642000C */ addiu $v0, $s2, 0xc -/* E2C504 802BBDD4 0222102A */ slt $v0, $s1, $v0 -/* E2C508 802BBDD8 1440FED1 */ bnez $v0, .L802BB920 -/* E2C50C 802BBDDC 26100004 */ addiu $s0, $s0, 4 -/* E2C510 802BBDE0 2A62000C */ slti $v0, $s3, 0xc -/* E2C514 802BBDE4 14400003 */ bnez $v0, .L802BBDF4 -/* E2C518 802BBDE8 00000000 */ nop -/* E2C51C 802BBDEC 0C043F5A */ jal exec_entity_commandlist -/* E2C520 802BBDF0 03C0202D */ daddu $a0, $fp, $zero -.L802BBDF4: -/* E2C524 802BBDF4 8FBF0054 */ lw $ra, 0x54($sp) -/* E2C528 802BBDF8 8FBE0050 */ lw $fp, 0x50($sp) -/* E2C52C 802BBDFC 8FB7004C */ lw $s7, 0x4c($sp) -/* E2C530 802BBE00 8FB60048 */ lw $s6, 0x48($sp) -/* E2C534 802BBE04 8FB50044 */ lw $s5, 0x44($sp) -/* E2C538 802BBE08 8FB40040 */ lw $s4, 0x40($sp) -/* E2C53C 802BBE0C 8FB3003C */ lw $s3, 0x3c($sp) -/* E2C540 802BBE10 8FB20038 */ lw $s2, 0x38($sp) -/* E2C544 802BBE14 8FB10034 */ lw $s1, 0x34($sp) -/* E2C548 802BBE18 8FB00030 */ lw $s0, 0x30($sp) -/* E2C54C 802BBE1C D7BE0080 */ ldc1 $f30, 0x80($sp) -/* E2C550 802BBE20 D7BC0078 */ ldc1 $f28, 0x78($sp) -/* E2C554 802BBE24 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* E2C558 802BBE28 D7B80068 */ ldc1 $f24, 0x68($sp) -/* E2C55C 802BBE2C D7B60060 */ ldc1 $f22, 0x60($sp) -/* E2C560 802BBE30 D7B40058 */ ldc1 $f20, 0x58($sp) -/* E2C564 802BBE34 03E00008 */ jr $ra -/* E2C568 802BBE38 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s deleted file mode 100644 index d645ded628..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BBE3C_E2C56C -/* E2C56C 802BBE3C 27BDFE80 */ addiu $sp, $sp, -0x180 -/* E2C570 802BBE40 AFBE0148 */ sw $fp, 0x148($sp) -/* E2C574 802BBE44 0000F02D */ daddu $fp, $zero, $zero -/* E2C578 802BBE48 27A80098 */ addiu $t0, $sp, 0x98 -/* E2C57C 802BBE4C AFB5013C */ sw $s5, 0x13c($sp) -/* E2C580 802BBE50 27B500D8 */ addiu $s5, $sp, 0xd8 -/* E2C584 802BBE54 AFB40138 */ sw $s4, 0x138($sp) -/* E2C588 802BBE58 27B40058 */ addiu $s4, $sp, 0x58 -/* E2C58C 802BBE5C AFA8011C */ sw $t0, 0x11c($sp) -/* E2C590 802BBE60 3C080001 */ lui $t0, 1 -/* E2C594 802BBE64 AFB1012C */ sw $s1, 0x12c($sp) -/* E2C598 802BBE68 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* E2C59C 802BBE6C 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) -/* E2C5A0 802BBE70 35081630 */ ori $t0, $t0, 0x1630 -/* E2C5A4 802BBE74 AFBF014C */ sw $ra, 0x14c($sp) -/* E2C5A8 802BBE78 AFB70144 */ sw $s7, 0x144($sp) -/* E2C5AC 802BBE7C AFB60140 */ sw $s6, 0x140($sp) -/* E2C5B0 802BBE80 AFB30134 */ sw $s3, 0x134($sp) -/* E2C5B4 802BBE84 AFB20130 */ sw $s2, 0x130($sp) -/* E2C5B8 802BBE88 AFB00128 */ sw $s0, 0x128($sp) -/* E2C5BC 802BBE8C F7BE0178 */ sdc1 $f30, 0x178($sp) -/* E2C5C0 802BBE90 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* E2C5C4 802BBE94 F7BA0168 */ sdc1 $f26, 0x168($sp) -/* E2C5C8 802BBE98 F7B80160 */ sdc1 $f24, 0x160($sp) -/* E2C5CC 802BBE9C F7B60158 */ sdc1 $f22, 0x158($sp) -/* E2C5D0 802BBEA0 F7B40150 */ sdc1 $f20, 0x150($sp) -/* E2C5D4 802BBEA4 0C04417A */ jal get_entity_by_index -/* E2C5D8 802BBEA8 AFA80120 */ sw $t0, 0x120($sp) -/* E2C5DC 802BBEAC 0040B82D */ daddu $s7, $v0, $zero -/* E2C5E0 802BBEB0 3C0143B4 */ lui $at, 0x43b4 -/* E2C5E4 802BBEB4 4481D000 */ mtc1 $at, $f26 -/* E2C5E8 802BBEB8 3C013B80 */ lui $at, 0x3b80 -/* E2C5EC 802BBEBC 4481C000 */ mtc1 $at, $f24 -/* E2C5F0 802BBEC0 3C013F80 */ lui $at, 0x3f80 -/* E2C5F4 802BBEC4 4481B000 */ mtc1 $at, $f22 -/* E2C5F8 802BBEC8 8EE20040 */ lw $v0, 0x40($s7) -/* E2C5FC 802BBECC 4480A000 */ mtc1 $zero, $f20 -/* E2C600 802BBED0 C6E00048 */ lwc1 $f0, 0x48($s7) -/* E2C604 802BBED4 0040902D */ daddu $s2, $v0, $zero -/* E2C608 802BBED8 0240982D */ daddu $s3, $s2, $zero -/* E2C60C 802BBEDC 2630FFFC */ addiu $s0, $s1, -4 -/* E2C610 802BBEE0 46000007 */ neg.s $f0, $f0 -/* E2C614 802BBEE4 E7A00118 */ swc1 $f0, 0x118($sp) -/* E2C618 802BBEE8 C6E0004C */ lwc1 $f0, 0x4c($s7) -/* E2C61C 802BBEEC C6E20050 */ lwc1 $f2, 0x50($s7) -/* E2C620 802BBEF0 8E560000 */ lw $s6, ($s2) -/* E2C624 802BBEF4 46000787 */ neg.s $f30, $f0 -/* E2C628 802BBEF8 46001707 */ neg.s $f28, $f2 -.L802BBEFC: -/* E2C62C 802BBEFC 82420008 */ lb $v0, 8($s2) -/* E2C630 802BBF00 28420002 */ slti $v0, $v0, 2 -/* E2C634 802BBF04 1040000F */ beqz $v0, .L802BBF44 -/* E2C638 802BBF08 3C03E200 */ lui $v1, 0xe200 -/* E2C63C 802BBF0C 26100008 */ addiu $s0, $s0, 8 -/* E2C640 802BBF10 3463001C */ ori $v1, $v1, 0x1c -/* E2C644 802BBF14 3C020055 */ lui $v0, 0x55 -/* E2C648 802BBF18 34422078 */ ori $v0, $v0, 0x2078 -/* E2C64C 802BBF1C AE03FFFC */ sw $v1, -4($s0) -/* E2C650 802BBF20 AE020000 */ sw $v0, ($s0) -/* E2C654 802BBF24 26100008 */ addiu $s0, $s0, 8 -/* E2C658 802BBF28 26310010 */ addiu $s1, $s1, 0x10 -/* E2C65C 802BBF2C 3C03FC12 */ lui $v1, 0xfc12 -/* E2C660 802BBF30 34631824 */ ori $v1, $v1, 0x1824 -/* E2C664 802BBF34 3C02FF33 */ lui $v0, 0xff33 -/* E2C668 802BBF38 3442FFFF */ ori $v0, $v0, 0xffff -/* E2C66C 802BBF3C 080AEFDD */ j .L802BBF74 -/* E2C670 802BBF40 AE03FFFC */ sw $v1, -4($s0) -.L802BBF44: -/* E2C674 802BBF44 26100008 */ addiu $s0, $s0, 8 -/* E2C678 802BBF48 3C03FCFF */ lui $v1, 0xfcff -/* E2C67C 802BBF4C 3463C3FF */ ori $v1, $v1, 0xc3ff -/* E2C680 802BBF50 3C02FF30 */ lui $v0, 0xff30 -/* E2C684 802BBF54 3442FE7F */ ori $v0, $v0, 0xfe7f -/* E2C688 802BBF58 AE03FFFC */ sw $v1, -4($s0) -/* E2C68C 802BBF5C AE020000 */ sw $v0, ($s0) -/* E2C690 802BBF60 26100008 */ addiu $s0, $s0, 8 -/* E2C694 802BBF64 3C02FA00 */ lui $v0, 0xfa00 -/* E2C698 802BBF68 AE02FFFC */ sw $v0, -4($s0) -/* E2C69C 802BBF6C 92420015 */ lbu $v0, 0x15($s2) -/* E2C6A0 802BBF70 26310010 */ addiu $s1, $s1, 0x10 -.L802BBF74: -/* E2C6A4 802BBF74 AE020000 */ sw $v0, ($s0) -/* E2C6A8 802BBF78 8FA50118 */ lw $a1, 0x118($sp) -/* E2C6AC 802BBF7C 4406F000 */ mfc1 $a2, $f30 -/* E2C6B0 802BBF80 4407E000 */ mfc1 $a3, $f28 -/* E2C6B4 802BBF84 0C019E40 */ jal guTranslateF -/* E2C6B8 802BBF88 27A40018 */ addiu $a0, $sp, 0x18 -/* E2C6BC 802BBF8C 92420022 */ lbu $v0, 0x22($s2) -/* E2C6C0 802BBF90 44820000 */ mtc1 $v0, $f0 -/* E2C6C4 802BBF94 00000000 */ nop -/* E2C6C8 802BBF98 46800020 */ cvt.s.w $f0, $f0 -/* E2C6CC 802BBF9C 461A0002 */ mul.s $f0, $f0, $f26 -/* E2C6D0 802BBFA0 00000000 */ nop -/* E2C6D4 802BBFA4 46180002 */ mul.s $f0, $f0, $f24 -/* E2C6D8 802BBFA8 00000000 */ nop -/* E2C6DC 802BBFAC 4406B000 */ mfc1 $a2, $f22 -/* E2C6E0 802BBFB0 4407A000 */ mfc1 $a3, $f20 -/* E2C6E4 802BBFB4 8FA4011C */ lw $a0, 0x11c($sp) -/* E2C6E8 802BBFB8 44050000 */ mfc1 $a1, $f0 -/* E2C6EC 802BBFBC 0C019EC8 */ jal guRotateF -/* E2C6F0 802BBFC0 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2C6F4 802BBFC4 9242002F */ lbu $v0, 0x2f($s2) -/* E2C6F8 802BBFC8 44820000 */ mtc1 $v0, $f0 -/* E2C6FC 802BBFCC 00000000 */ nop -/* E2C700 802BBFD0 46800020 */ cvt.s.w $f0, $f0 -/* E2C704 802BBFD4 461A0002 */ mul.s $f0, $f0, $f26 -/* E2C708 802BBFD8 00000000 */ nop -/* E2C70C 802BBFDC 26100008 */ addiu $s0, $s0, 8 -/* E2C710 802BBFE0 26310018 */ addiu $s1, $s1, 0x18 -/* E2C714 802BBFE4 46180002 */ mul.s $f0, $f0, $f24 -/* E2C718 802BBFE8 00000000 */ nop -/* E2C71C 802BBFEC 27DE0001 */ addiu $fp, $fp, 1 -/* E2C720 802BBFF0 02A0202D */ daddu $a0, $s5, $zero -/* E2C724 802BBFF4 4406A000 */ mfc1 $a2, $f20 -/* E2C728 802BBFF8 4407B000 */ mfc1 $a3, $f22 -/* E2C72C 802BBFFC 44050000 */ mfc1 $a1, $f0 -/* E2C730 802BC000 26520001 */ addiu $s2, $s2, 1 -/* E2C734 802BC004 0C019EC8 */ jal guRotateF -/* E2C738 802BC008 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2C73C 802BC00C 02A0282D */ daddu $a1, $s5, $zero -/* E2C740 802BC010 8FA4011C */ lw $a0, 0x11c($sp) -/* E2C744 802BC014 0C019D80 */ jal guMtxCatF -/* E2C748 802BC018 02A0302D */ daddu $a2, $s5, $zero -/* E2C74C 802BC01C 02A0202D */ daddu $a0, $s5, $zero -/* E2C750 802BC020 27A50018 */ addiu $a1, $sp, 0x18 -/* E2C754 802BC024 0C019D80 */ jal guMtxCatF -/* E2C758 802BC028 00A0302D */ daddu $a2, $a1, $zero -/* E2C75C 802BC02C 0280202D */ daddu $a0, $s4, $zero -/* E2C760 802BC030 8E650080 */ lw $a1, 0x80($s3) -/* E2C764 802BC034 8E6600B4 */ lw $a2, 0xb4($s3) -/* E2C768 802BC038 8E6700E8 */ lw $a3, 0xe8($s3) -/* E2C76C 802BC03C 0C019E40 */ jal guTranslateF -/* E2C770 802BC040 26730004 */ addiu $s3, $s3, 4 -/* E2C774 802BC044 27A40018 */ addiu $a0, $sp, 0x18 -/* E2C778 802BC048 0280282D */ daddu $a1, $s4, $zero -/* E2C77C 802BC04C 0C019D80 */ jal guMtxCatF -/* E2C780 802BC050 0280302D */ daddu $a2, $s4, $zero -/* E2C784 802BC054 0280202D */ daddu $a0, $s4, $zero -/* E2C788 802BC058 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* E2C78C 802BC05C 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* E2C790 802BC060 3C02800A */ lui $v0, %hi(gDisplayContext) -/* E2C794 802BC064 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* E2C798 802BC068 8FA80120 */ lw $t0, 0x120($sp) -/* E2C79C 802BC06C 00052980 */ sll $a1, $a1, 6 -/* E2C7A0 802BC070 00A82821 */ addu $a1, $a1, $t0 -/* E2C7A4 802BC074 0C019D40 */ jal guMtxF2L -/* E2C7A8 802BC078 00452821 */ addu $a1, $v0, $a1 -/* E2C7AC 802BC07C 3C05D838 */ lui $a1, 0xd838 -/* E2C7B0 802BC080 34A50002 */ ori $a1, $a1, 2 -/* E2C7B4 802BC084 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* E2C7B8 802BC088 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* E2C7BC 802BC08C 3C03DA38 */ lui $v1, 0xda38 -/* E2C7C0 802BC090 AE03FFFC */ sw $v1, -4($s0) -/* E2C7C4 802BC094 8FA80120 */ lw $t0, 0x120($sp) -/* E2C7C8 802BC098 24430001 */ addiu $v1, $v0, 1 -/* E2C7CC 802BC09C 3042FFFF */ andi $v0, $v0, 0xffff -/* E2C7D0 802BC0A0 00021180 */ sll $v0, $v0, 6 -/* E2C7D4 802BC0A4 3C018007 */ lui $at, %hi(gMatrixListPos) -/* E2C7D8 802BC0A8 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) -/* E2C7DC 802BC0AC 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2C7E0 802BC0B0 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2C7E4 802BC0B4 00481021 */ addu $v0, $v0, $t0 -/* E2C7E8 802BC0B8 00621821 */ addu $v1, $v1, $v0 -/* E2C7EC 802BC0BC AE030000 */ sw $v1, ($s0) -/* E2C7F0 802BC0C0 96C40002 */ lhu $a0, 2($s6) -/* E2C7F4 802BC0C4 26D60004 */ addiu $s6, $s6, 4 -/* E2C7F8 802BC0C8 26100008 */ addiu $s0, $s0, 8 -/* E2C7FC 802BC0CC 8EE30044 */ lw $v1, 0x44($s7) -/* E2C800 802BC0D0 3C02DE00 */ lui $v0, 0xde00 -/* E2C804 802BC0D4 AE02FFFC */ sw $v0, -4($s0) -/* E2C808 802BC0D8 24020040 */ addiu $v0, $zero, 0x40 -/* E2C80C 802BC0DC 00641821 */ addu $v1, $v1, $a0 -/* E2C810 802BC0E0 AE030000 */ sw $v1, ($s0) -/* E2C814 802BC0E4 26100008 */ addiu $s0, $s0, 8 -/* E2C818 802BC0E8 AE020000 */ sw $v0, ($s0) -/* E2C81C 802BC0EC 2BC2000C */ slti $v0, $fp, 0xc -/* E2C820 802BC0F0 1440FF82 */ bnez $v0, .L802BBEFC -/* E2C824 802BC0F4 AE05FFFC */ sw $a1, -4($s0) -/* E2C828 802BC0F8 8FBF014C */ lw $ra, 0x14c($sp) -/* E2C82C 802BC0FC 8FBE0148 */ lw $fp, 0x148($sp) -/* E2C830 802BC100 8FB70144 */ lw $s7, 0x144($sp) -/* E2C834 802BC104 8FB60140 */ lw $s6, 0x140($sp) -/* E2C838 802BC108 8FB5013C */ lw $s5, 0x13c($sp) -/* E2C83C 802BC10C 8FB40138 */ lw $s4, 0x138($sp) -/* E2C840 802BC110 8FB30134 */ lw $s3, 0x134($sp) -/* E2C844 802BC114 8FB20130 */ lw $s2, 0x130($sp) -/* E2C848 802BC118 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* E2C84C 802BC11C AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) -/* E2C850 802BC120 8FB1012C */ lw $s1, 0x12c($sp) -/* E2C854 802BC124 8FB00128 */ lw $s0, 0x128($sp) -/* E2C858 802BC128 D7BE0178 */ ldc1 $f30, 0x178($sp) -/* E2C85C 802BC12C D7BC0170 */ ldc1 $f28, 0x170($sp) -/* E2C860 802BC130 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* E2C864 802BC134 D7B80160 */ ldc1 $f24, 0x160($sp) -/* E2C868 802BC138 D7B60158 */ ldc1 $f22, 0x158($sp) -/* E2C86C 802BC13C D7B40150 */ ldc1 $f20, 0x150($sp) -/* E2C870 802BC140 03E00008 */ jr $ra -/* E2C874 802BC144 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s deleted file mode 100644 index afdcab4a34..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC148_E2C878 -/* E2C878 802BC148 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2C87C 802BC14C AFB00010 */ sw $s0, 0x10($sp) -/* E2C880 802BC150 0080802D */ daddu $s0, $a0, $zero -/* E2C884 802BC154 AFBF0014 */ sw $ra, 0x14($sp) -/* E2C888 802BC158 92020006 */ lbu $v0, 6($s0) -/* E2C88C 802BC15C 30420001 */ andi $v0, $v0, 1 -/* E2C890 802BC160 1040000D */ beqz $v0, .L802BC198 -/* E2C894 802BC164 00000000 */ nop -/* E2C898 802BC168 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* E2C89C 802BC16C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* E2C8A0 802BC170 804300B4 */ lb $v1, 0xb4($v0) -/* E2C8A4 802BC174 2402000E */ addiu $v0, $zero, 0xe -/* E2C8A8 802BC178 10620003 */ beq $v1, $v0, .L802BC188 -/* E2C8AC 802BC17C 24020010 */ addiu $v0, $zero, 0x10 -/* E2C8B0 802BC180 14620005 */ bne $v1, $v0, .L802BC198 -/* E2C8B4 802BC184 00000000 */ nop -.L802BC188: -/* E2C8B8 802BC188 0C04419E */ jal entity_start_script -/* E2C8BC 802BC18C 0200202D */ daddu $a0, $s0, $zero -/* E2C8C0 802BC190 0C043F5A */ jal exec_entity_commandlist -/* E2C8C4 802BC194 0200202D */ daddu $a0, $s0, $zero -.L802BC198: -/* E2C8C8 802BC198 8FBF0014 */ lw $ra, 0x14($sp) -/* E2C8CC 802BC19C 8FB00010 */ lw $s0, 0x10($sp) -/* E2C8D0 802BC1A0 03E00008 */ jr $ra -/* E2C8D4 802BC1A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s deleted file mode 100644 index 8de26f15f2..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC1A8_E2C8D8 -/* E2C8D8 802BC1A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2C8DC 802BC1AC 3C013F80 */ lui $at, 0x3f80 -/* E2C8E0 802BC1B0 44811000 */ mtc1 $at, $f2 -/* E2C8E4 802BC1B4 0000282D */ daddu $a1, $zero, $zero -/* E2C8E8 802BC1B8 AFBF0010 */ sw $ra, 0x10($sp) -/* E2C8EC 802BC1BC 8C830040 */ lw $v1, 0x40($a0) -.L802BC1C0: -/* E2C8F0 802BC1C0 C46000B4 */ lwc1 $f0, 0xb4($v1) -/* E2C8F4 802BC1C4 46020000 */ add.s $f0, $f0, $f2 -/* E2C8F8 802BC1C8 24A50001 */ addiu $a1, $a1, 1 -/* E2C8FC 802BC1CC 28A2000C */ slti $v0, $a1, 0xc -/* E2C900 802BC1D0 E46000B4 */ swc1 $f0, 0xb4($v1) -/* E2C904 802BC1D4 1440FFFA */ bnez $v0, .L802BC1C0 -/* E2C908 802BC1D8 24630004 */ addiu $v1, $v1, 4 -/* E2C90C 802BC1DC 3C05802C */ lui $a1, %hi(D_802BCE1C_E2D54C) -/* E2C910 802BC1E0 0C0442F3 */ jal entity_set_render_script -/* E2C914 802BC1E4 24A5CE1C */ addiu $a1, $a1, %lo(D_802BCE1C_E2D54C) -/* E2C918 802BC1E8 8FBF0010 */ lw $ra, 0x10($sp) -/* E2C91C 802BC1EC 03E00008 */ jr $ra -/* E2C920 802BC1F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* E2C924 802BC1F4 00000000 */ nop -/* E2C928 802BC1F8 00000000 */ nop -/* E2C92C 802BC1FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s deleted file mode 100644 index 63ebfac9cb..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802BCFC0_E2D6F0 -.word .L802BC2E8_E2CA18, .L802BC2F4_E2CA24, .L802BC2FC_E2CA2C, .L802BC304_E2CA34, .L802BC30C_E2CA3C, 0 - -.section .text - -glabel func_802BC200_E2C930 -/* E2C930 802BC200 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* E2C934 802BC204 AFB600A8 */ sw $s6, 0xa8($sp) -/* E2C938 802BC208 0080B02D */ daddu $s6, $a0, $zero -/* E2C93C 802BC20C AFB700AC */ sw $s7, 0xac($sp) -/* E2C940 802BC210 00C0B82D */ daddu $s7, $a2, $zero -/* E2C944 802BC214 AFB3009C */ sw $s3, 0x9c($sp) -/* E2C948 802BC218 0000982D */ daddu $s3, $zero, $zero -/* E2C94C 802BC21C AFB20098 */ sw $s2, 0x98($sp) -/* E2C950 802BC220 0260902D */ daddu $s2, $s3, $zero -/* E2C954 802BC224 27A40050 */ addiu $a0, $sp, 0x50 -/* E2C958 802BC228 AFB400A0 */ sw $s4, 0xa0($sp) -/* E2C95C 802BC22C 0260A02D */ daddu $s4, $s3, $zero -/* E2C960 802BC230 AFBF00B0 */ sw $ra, 0xb0($sp) -/* E2C964 802BC234 AFB500A4 */ sw $s5, 0xa4($sp) -/* E2C968 802BC238 AFB10094 */ sw $s1, 0x94($sp) -/* E2C96C 802BC23C AFB00090 */ sw $s0, 0x90($sp) -/* E2C970 802BC240 8EC20040 */ lw $v0, 0x40($s6) -/* E2C974 802BC244 0260A82D */ daddu $s5, $s3, $zero -/* E2C978 802BC248 0040802D */ daddu $s0, $v0, $zero -/* E2C97C 802BC24C 8EC20044 */ lw $v0, 0x44($s6) -/* E2C980 802BC250 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2C984 802BC254 00451021 */ addu $v0, $v0, $a1 -/* E2C988 802BC258 AE020000 */ sw $v0, ($s0) -/* E2C98C 802BC25C 3C02802C */ lui $v0, %hi(func_802BC974_E2D0A4) -/* E2C990 802BC260 2442C974 */ addiu $v0, $v0, %lo(func_802BC974_E2D0A4) -/* E2C994 802BC264 AEC2003C */ sw $v0, 0x3c($s6) -/* E2C998 802BC268 240200FF */ addiu $v0, $zero, 0xff -/* E2C99C 802BC26C A2C2000B */ sb $v0, 0xb($s6) -/* E2C9A0 802BC270 C6000004 */ lwc1 $f0, 4($s0) -/* E2C9A4 802BC274 8EC50048 */ lw $a1, 0x48($s6) -/* E2C9A8 802BC278 8EC70050 */ lw $a3, 0x50($s6) -/* E2C9AC 802BC27C 44060000 */ mfc1 $a2, $f0 -/* E2C9B0 802BC280 0200882D */ daddu $s1, $s0, $zero -/* E2C9B4 802BC284 0C019E40 */ jal guTranslateF -/* E2C9B8 802BC288 AEC6004C */ sw $a2, 0x4c($s6) -.L802BC28C: -/* E2C9BC 802BC28C 32E2FFFF */ andi $v0, $s7, 0xffff -/* E2C9C0 802BC290 26F70040 */ addiu $s7, $s7, 0x40 -/* E2C9C4 802BC294 8EC50044 */ lw $a1, 0x44($s6) -/* E2C9C8 802BC298 27A40010 */ addiu $a0, $sp, 0x10 -/* E2C9CC 802BC29C 0C019D60 */ jal guMtxL2F -/* E2C9D0 802BC2A0 00A22821 */ addu $a1, $a1, $v0 -/* E2C9D4 802BC2A4 27A40050 */ addiu $a0, $sp, 0x50 -/* E2C9D8 802BC2A8 27A50010 */ addiu $a1, $sp, 0x10 -/* E2C9DC 802BC2AC 0C019D80 */ jal guMtxCatF -/* E2C9E0 802BC2B0 00A0302D */ daddu $a2, $a1, $zero -/* E2C9E4 802BC2B4 C7A00040 */ lwc1 $f0, 0x40($sp) -/* E2C9E8 802BC2B8 E6000040 */ swc1 $f0, 0x40($s0) -/* E2C9EC 802BC2BC C7A00044 */ lwc1 $f0, 0x44($sp) -/* E2C9F0 802BC2C0 E6000058 */ swc1 $f0, 0x58($s0) -/* E2C9F4 802BC2C4 C7A00048 */ lwc1 $f0, 0x48($sp) -/* E2C9F8 802BC2C8 2E820005 */ sltiu $v0, $s4, 5 -/* E2C9FC 802BC2CC 10400011 */ beqz $v0, .L802BC314 -/* E2CA00 802BC2D0 E6000070 */ swc1 $f0, 0x70($s0) -/* E2CA04 802BC2D4 3C02802C */ lui $v0, %hi(jtbl_802BCFC0_E2D6F0) -/* E2CA08 802BC2D8 00551021 */ addu $v0, $v0, $s5 -/* E2CA0C 802BC2DC 8C42CFC0 */ lw $v0, %lo(jtbl_802BCFC0_E2D6F0)($v0) -/* E2CA10 802BC2E0 00400008 */ jr $v0 -/* E2CA14 802BC2E4 00000000 */ nop -.L802BC2E8_E2CA18: -/* E2CA18 802BC2E8 241300C0 */ addiu $s3, $zero, 0xc0 -/* E2CA1C 802BC2EC 080AF0C5 */ j .L802BC314 -/* E2CA20 802BC2F0 0000902D */ daddu $s2, $zero, $zero -.L802BC2F4_E2CA24: -/* E2CA24 802BC2F4 080AF0C4 */ j .L802BC310 -/* E2CA28 802BC2F8 24130060 */ addiu $s3, $zero, 0x60 -.L802BC2FC_E2CA2C: -/* E2CA2C 802BC2FC 080AF0C4 */ j .L802BC310 -/* E2CA30 802BC300 24130020 */ addiu $s3, $zero, 0x20 -.L802BC304_E2CA34: -/* E2CA34 802BC304 080AF0C4 */ j .L802BC310 -/* E2CA38 802BC308 241300A0 */ addiu $s3, $zero, 0xa0 -.L802BC30C_E2CA3C: -/* E2CA3C 802BC30C 241300E0 */ addiu $s3, $zero, 0xe0 -.L802BC310: -/* E2CA40 802BC310 24120014 */ addiu $s2, $zero, 0x14 -.L802BC314: -/* E2CA44 802BC314 24040005 */ addiu $a0, $zero, 5 -/* E2CA48 802BC318 A233000E */ sb $s3, 0xe($s1) -/* E2CA4C 802BC31C 0C00A67F */ jal rand_int -/* E2CA50 802BC320 A2320020 */ sb $s2, 0x20($s1) -/* E2CA54 802BC324 0040182D */ daddu $v1, $v0, $zero -/* E2CA58 802BC328 32820001 */ andi $v0, $s4, 1 -/* E2CA5C 802BC32C 14400003 */ bnez $v0, .L802BC33C -/* E2CA60 802BC330 2462000A */ addiu $v0, $v1, 0xa -/* E2CA64 802BC334 2402FFF6 */ addiu $v0, $zero, -0xa -/* E2CA68 802BC338 00431023 */ subu $v0, $v0, $v1 -.L802BC33C: -/* E2CA6C 802BC33C 44820000 */ mtc1 $v0, $f0 -/* E2CA70 802BC340 00000000 */ nop -/* E2CA74 802BC344 46800020 */ cvt.s.w $f0, $f0 -/* E2CA78 802BC348 E6000028 */ swc1 $f0, 0x28($s0) -/* E2CA7C 802BC34C 26B50004 */ addiu $s5, $s5, 4 -/* E2CA80 802BC350 26940001 */ addiu $s4, $s4, 1 -/* E2CA84 802BC354 3C014120 */ lui $at, 0x4120 -/* E2CA88 802BC358 44810000 */ mtc1 $at, $f0 -/* E2CA8C 802BC35C 2A820005 */ slti $v0, $s4, 5 -/* E2CA90 802BC360 E6000088 */ swc1 $f0, 0x88($s0) -/* E2CA94 802BC364 A2200008 */ sb $zero, 8($s1) -/* E2CA98 802BC368 A2200014 */ sb $zero, 0x14($s1) -/* E2CA9C 802BC36C A220001A */ sb $zero, 0x1a($s1) -/* E2CAA0 802BC370 26310001 */ addiu $s1, $s1, 1 -/* E2CAA4 802BC374 1440FFC5 */ bnez $v0, .L802BC28C -/* E2CAA8 802BC378 26100004 */ addiu $s0, $s0, 4 -/* E2CAAC 802BC37C 8FBF00B0 */ lw $ra, 0xb0($sp) -/* E2CAB0 802BC380 8FB700AC */ lw $s7, 0xac($sp) -/* E2CAB4 802BC384 8FB600A8 */ lw $s6, 0xa8($sp) -/* E2CAB8 802BC388 8FB500A4 */ lw $s5, 0xa4($sp) -/* E2CABC 802BC38C 8FB400A0 */ lw $s4, 0xa0($sp) -/* E2CAC0 802BC390 8FB3009C */ lw $s3, 0x9c($sp) -/* E2CAC4 802BC394 8FB20098 */ lw $s2, 0x98($sp) -/* E2CAC8 802BC398 8FB10094 */ lw $s1, 0x94($sp) -/* E2CACC 802BC39C 8FB00090 */ lw $s0, 0x90($sp) -/* E2CAD0 802BC3A0 03E00008 */ jr $ra -/* E2CAD4 802BC3A4 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s deleted file mode 100644 index edf6830392..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC3A8_E2CAD8 -/* E2CAD8 802BC3A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2CADC 802BC3AC 3C050A00 */ lui $a1, 0xa00 -/* E2CAE0 802BC3B0 24A51660 */ addiu $a1, $a1, 0x1660 -/* E2CAE4 802BC3B4 AFBF0010 */ sw $ra, 0x10($sp) -/* E2CAE8 802BC3B8 8C820040 */ lw $v0, 0x40($a0) -/* E2CAEC 802BC3BC C480004C */ lwc1 $f0, 0x4c($a0) -/* E2CAF0 802BC3C0 3C060A00 */ lui $a2, 0xa00 -/* E2CAF4 802BC3C4 24C61118 */ addiu $a2, $a2, 0x1118 -/* E2CAF8 802BC3C8 0C0AF080 */ jal func_802BC200_E2C930 -/* E2CAFC 802BC3CC E4400004 */ swc1 $f0, 4($v0) -/* E2CB00 802BC3D0 8FBF0010 */ lw $ra, 0x10($sp) -/* E2CB04 802BC3D4 03E00008 */ jr $ra -/* E2CB08 802BC3D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s deleted file mode 100644 index d9097f7494..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s +++ /dev/null @@ -1,398 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802BCFD8_E2D708 -.double 0.4 - -dlabel D_802BCFE0_E2D710 -.double 1.6 - -dlabel D_802BCFE8_E2D718 -.double 0.8 - -dlabel D_802BCFF0_E2D720 -.double -10.2, 0.0 - -.section .text - -glabel func_802BC3DC_E2CB0C -/* E2CB0C 802BC3DC 27BDFF78 */ addiu $sp, $sp, -0x88 -/* E2CB10 802BC3E0 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* E2CB14 802BC3E4 4480D000 */ mtc1 $zero, $f26 -/* E2CB18 802BC3E8 F7BE0080 */ sdc1 $f30, 0x80($sp) -/* E2CB1C 802BC3EC 3C014F00 */ lui $at, 0x4f00 -/* E2CB20 802BC3F0 4481F000 */ mtc1 $at, $f30 -/* E2CB24 802BC3F4 AFBE0050 */ sw $fp, 0x50($sp) -/* E2CB28 802BC3F8 0080F02D */ daddu $fp, $a0, $zero -/* E2CB2C 802BC3FC AFB3003C */ sw $s3, 0x3c($sp) -/* E2CB30 802BC400 0000982D */ daddu $s3, $zero, $zero -/* E2CB34 802BC404 AFB60048 */ sw $s6, 0x48($sp) -/* E2CB38 802BC408 27B60020 */ addiu $s6, $sp, 0x20 -/* E2CB3C 802BC40C AFB50044 */ sw $s5, 0x44($sp) -/* E2CB40 802BC410 27B50024 */ addiu $s5, $sp, 0x24 -/* E2CB44 802BC414 AFB40040 */ sw $s4, 0x40($sp) -/* E2CB48 802BC418 27B40028 */ addiu $s4, $sp, 0x28 -/* E2CB4C 802BC41C AFB7004C */ sw $s7, 0x4c($sp) -/* E2CB50 802BC420 3C178000 */ lui $s7, 0x8000 -/* E2CB54 802BC424 AFBF0054 */ sw $ra, 0x54($sp) -/* E2CB58 802BC428 AFB20038 */ sw $s2, 0x38($sp) -/* E2CB5C 802BC42C AFB10034 */ sw $s1, 0x34($sp) -/* E2CB60 802BC430 AFB00030 */ sw $s0, 0x30($sp) -/* E2CB64 802BC434 F7BC0078 */ sdc1 $f28, 0x78($sp) -/* E2CB68 802BC438 F7B80068 */ sdc1 $f24, 0x68($sp) -/* E2CB6C 802BC43C F7B60060 */ sdc1 $f22, 0x60($sp) -/* E2CB70 802BC440 F7B40058 */ sdc1 $f20, 0x58($sp) -/* E2CB74 802BC444 8FD20040 */ lw $s2, 0x40($fp) -/* E2CB78 802BC448 4600D706 */ mov.s $f28, $f26 -/* E2CB7C 802BC44C 4600D606 */ mov.s $f24, $f26 -/* E2CB80 802BC450 0240882D */ daddu $s1, $s2, $zero -/* E2CB84 802BC454 0240802D */ daddu $s0, $s2, $zero -.L802BC458: -/* E2CB88 802BC458 82230008 */ lb $v1, 8($s1) -/* E2CB8C 802BC45C 24020001 */ addiu $v0, $zero, 1 -/* E2CB90 802BC460 10620028 */ beq $v1, $v0, .L802BC504 -/* E2CB94 802BC464 28620002 */ slti $v0, $v1, 2 -/* E2CB98 802BC468 10400005 */ beqz $v0, .L802BC480 -/* E2CB9C 802BC46C 24020002 */ addiu $v0, $zero, 2 -/* E2CBA0 802BC470 10600009 */ beqz $v1, .L802BC498 -/* E2CBA4 802BC474 00000000 */ nop -/* E2CBA8 802BC478 080AF169 */ j .L802BC5A4 -/* E2CBAC 802BC47C 00000000 */ nop -.L802BC480: -/* E2CBB0 802BC480 10620029 */ beq $v1, $v0, .L802BC528 -/* E2CBB4 802BC484 24020003 */ addiu $v0, $zero, 3 -/* E2CBB8 802BC488 50620046 */ beql $v1, $v0, .L802BC5A4 -/* E2CBBC 802BC48C 26730001 */ addiu $s3, $s3, 1 -/* E2CBC0 802BC490 080AF169 */ j .L802BC5A4 -/* E2CBC4 802BC494 00000000 */ nop -.L802BC498: -/* E2CBC8 802BC498 3C014000 */ lui $at, 0x4000 -/* E2CBCC 802BC49C 4481E000 */ mtc1 $at, $f28 -/* E2CBD0 802BC4A0 92220020 */ lbu $v0, 0x20($s1) -/* E2CBD4 802BC4A4 C61A0028 */ lwc1 $f26, 0x28($s0) -/* E2CBD8 802BC4A8 3C014120 */ lui $at, 0x4120 -/* E2CBDC 802BC4AC 44810000 */ mtc1 $at, $f0 -/* E2CBE0 802BC4B0 44801000 */ mtc1 $zero, $f2 -/* E2CBE4 802BC4B4 44822000 */ mtc1 $v0, $f4 -/* E2CBE8 802BC4B8 00000000 */ nop -/* E2CBEC 802BC4BC 46802120 */ cvt.s.w $f4, $f4 -/* E2CBF0 802BC4C0 461A103E */ c.le.s $f2, $f26 -/* E2CBF4 802BC4C4 00000000 */ nop -/* E2CBF8 802BC4C8 45000006 */ bc1f .L802BC4E4 -/* E2CBFC 802BC4CC 46002603 */ div.s $f24, $f4, $f0 -/* E2CC00 802BC4D0 3C01802C */ lui $at, %hi(D_802BCFD8_E2D708) -/* E2CC04 802BC4D4 D422CFD8 */ ldc1 $f2, %lo(D_802BCFD8_E2D708)($at) -/* E2CC08 802BC4D8 4600D021 */ cvt.d.s $f0, $f26 -/* E2CC0C 802BC4DC 080AF13E */ j .L802BC4F8 -/* E2CC10 802BC4E0 46220001 */ sub.d $f0, $f0, $f2 -.L802BC4E4: -/* E2CC14 802BC4E4 3C013FE0 */ lui $at, 0x3fe0 -/* E2CC18 802BC4E8 44811800 */ mtc1 $at, $f3 -/* E2CC1C 802BC4EC 44801000 */ mtc1 $zero, $f2 -/* E2CC20 802BC4F0 4600D021 */ cvt.d.s $f0, $f26 -/* E2CC24 802BC4F4 46220000 */ add.d $f0, $f0, $f2 -.L802BC4F8: -/* E2CC28 802BC4F8 46200020 */ cvt.s.d $f0, $f0 -/* E2CC2C 802BC4FC 080AF169 */ j .L802BC5A4 -/* E2CC30 802BC500 E6000028 */ swc1 $f0, 0x28($s0) -.L802BC504: -/* E2CC34 802BC504 3C013F80 */ lui $at, 0x3f80 -/* E2CC38 802BC508 4481C000 */ mtc1 $at, $f24 -/* E2CC3C 802BC50C C6020028 */ lwc1 $f2, 0x28($s0) -/* E2CC40 802BC510 3C013E80 */ lui $at, 0x3e80 -/* E2CC44 802BC514 44810000 */ mtc1 $at, $f0 -/* E2CC48 802BC518 4480E000 */ mtc1 $zero, $f28 -/* E2CC4C 802BC51C 46001682 */ mul.s $f26, $f2, $f0 -/* E2CC50 802BC520 080AF169 */ j .L802BC5A4 -/* E2CC54 802BC524 00000000 */ nop -.L802BC528: -/* E2CC58 802BC528 C6020028 */ lwc1 $f2, 0x28($s0) -/* E2CC5C 802BC52C 3C013F80 */ lui $at, 0x3f80 -/* E2CC60 802BC530 44810000 */ mtc1 $at, $f0 -/* E2CC64 802BC534 00000000 */ nop -/* E2CC68 802BC538 46001080 */ add.s $f2, $f2, $f0 -/* E2CC6C 802BC53C 3C0141A0 */ lui $at, 0x41a0 -/* E2CC70 802BC540 44810000 */ mtc1 $at, $f0 -/* E2CC74 802BC544 00000000 */ nop -/* E2CC78 802BC548 4602003C */ c.lt.s $f0, $f2 -/* E2CC7C 802BC54C 00000000 */ nop -/* E2CC80 802BC550 45000002 */ bc1f .L802BC55C -/* E2CC84 802BC554 E6020028 */ swc1 $f2, 0x28($s0) -/* E2CC88 802BC558 E6000028 */ swc1 $f0, 0x28($s0) -.L802BC55C: -/* E2CC8C 802BC55C C6020028 */ lwc1 $f2, 0x28($s0) -/* E2CC90 802BC560 3C01428C */ lui $at, 0x428c -/* E2CC94 802BC564 44812000 */ mtc1 $at, $f4 -/* E2CC98 802BC568 C6000058 */ lwc1 $f0, 0x58($s0) -/* E2CC9C 802BC56C 46041083 */ div.s $f2, $f2, $f4 -/* E2CCA0 802BC570 46020001 */ sub.s $f0, $f0, $f2 -/* E2CCA4 802BC574 E6000058 */ swc1 $f0, 0x58($s0) -/* E2CCA8 802BC578 9222000E */ lbu $v0, 0xe($s1) -/* E2CCAC 802BC57C 2442FFFB */ addiu $v0, $v0, -5 -/* E2CCB0 802BC580 A222000E */ sb $v0, 0xe($s1) -/* E2CCB4 802BC584 304200FF */ andi $v0, $v0, 0xff -/* E2CCB8 802BC588 2C420006 */ sltiu $v0, $v0, 6 -/* E2CCBC 802BC58C 10400005 */ beqz $v0, .L802BC5A4 -/* E2CCC0 802BC590 00000000 */ nop -/* E2CCC4 802BC594 92220008 */ lbu $v0, 8($s1) -/* E2CCC8 802BC598 A220000E */ sb $zero, 0xe($s1) -/* E2CCCC 802BC59C 24420001 */ addiu $v0, $v0, 1 -/* E2CCD0 802BC5A0 A2220008 */ sb $v0, 8($s1) -.L802BC5A4: -/* E2CCD4 802BC5A4 82220008 */ lb $v0, 8($s1) -/* E2CCD8 802BC5A8 28420002 */ slti $v0, $v0, 2 -/* E2CCDC 802BC5AC 504000D6 */ beql $v0, $zero, .L802BC908 -/* E2CCE0 802BC5B0 26310001 */ addiu $s1, $s1, 1 -/* E2CCE4 802BC5B4 C6020088 */ lwc1 $f2, 0x88($s0) -/* E2CCE8 802BC5B8 44800000 */ mtc1 $zero, $f0 -/* E2CCEC 802BC5BC 00000000 */ nop -/* E2CCF0 802BC5C0 4602003E */ c.le.s $f0, $f2 -/* E2CCF4 802BC5C4 3C01802C */ lui $at, %hi(D_802BCFE0_E2D710) -/* E2CCF8 802BC5C8 D420CFE0 */ ldc1 $f0, %lo(D_802BCFE0_E2D710)($at) -/* E2CCFC 802BC5CC 45000003 */ bc1f .L802BC5DC -/* E2CD00 802BC5D0 460010A1 */ cvt.d.s $f2, $f2 -/* E2CD04 802BC5D4 3C01802C */ lui $at, %hi(D_802BCFE8_E2D718) -/* E2CD08 802BC5D8 D420CFE8 */ ldc1 $f0, %lo(D_802BCFE8_E2D718)($at) -.L802BC5DC: -/* E2CD0C 802BC5DC 46201081 */ sub.d $f2, $f2, $f0 -/* E2CD10 802BC5E0 3C01802C */ lui $at, %hi(D_802BCFF0_E2D720) -/* E2CD14 802BC5E4 D424CFF0 */ ldc1 $f4, %lo(D_802BCFF0_E2D720)($at) -/* E2CD18 802BC5E8 462010A0 */ cvt.s.d $f2, $f2 -/* E2CD1C 802BC5EC 46001021 */ cvt.d.s $f0, $f2 -/* E2CD20 802BC5F0 4624003C */ c.lt.d $f0, $f4 -/* E2CD24 802BC5F4 00000000 */ nop -/* E2CD28 802BC5F8 45000006 */ bc1f .L802BC614 -/* E2CD2C 802BC5FC E6020088 */ swc1 $f2, 0x88($s0) -/* E2CD30 802BC600 3C01C123 */ lui $at, 0xc123 -/* E2CD34 802BC604 34213333 */ ori $at, $at, 0x3333 -/* E2CD38 802BC608 44810000 */ mtc1 $at, $f0 -/* E2CD3C 802BC60C 00000000 */ nop -/* E2CD40 802BC610 E6000088 */ swc1 $f0, 0x88($s0) -.L802BC614: -/* E2CD44 802BC614 C6000058 */ lwc1 $f0, 0x58($s0) -/* E2CD48 802BC618 C6020088 */ lwc1 $f2, 0x88($s0) -/* E2CD4C 802BC61C 46020000 */ add.s $f0, $f0, $f2 -/* E2CD50 802BC620 E6000058 */ swc1 $f0, 0x58($s0) -/* E2CD54 802BC624 9222000E */ lbu $v0, 0xe($s1) -/* E2CD58 802BC628 3C0143B4 */ lui $at, 0x43b4 -/* E2CD5C 802BC62C 44814000 */ mtc1 $at, $f8 -/* E2CD60 802BC630 4482A000 */ mtc1 $v0, $f20 -/* E2CD64 802BC634 00000000 */ nop -/* E2CD68 802BC638 4680A520 */ cvt.s.w $f20, $f20 -/* E2CD6C 802BC63C 4608A502 */ mul.s $f20, $f20, $f8 -/* E2CD70 802BC640 00000000 */ nop -/* E2CD74 802BC644 3C013B80 */ lui $at, 0x3b80 -/* E2CD78 802BC648 44814000 */ mtc1 $at, $f8 -/* E2CD7C 802BC64C 00000000 */ nop -/* E2CD80 802BC650 4608A502 */ mul.s $f20, $f20, $f8 -/* E2CD84 802BC654 00000000 */ nop -/* E2CD88 802BC658 3C0140C9 */ lui $at, 0x40c9 -/* E2CD8C 802BC65C 34210FD0 */ ori $at, $at, 0xfd0 -/* E2CD90 802BC660 44814000 */ mtc1 $at, $f8 -/* E2CD94 802BC664 00000000 */ nop -/* E2CD98 802BC668 4608A002 */ mul.s $f0, $f20, $f8 -/* E2CD9C 802BC66C 00000000 */ nop -/* E2CDA0 802BC670 3C0143B4 */ lui $at, 0x43b4 -/* E2CDA4 802BC674 44814000 */ mtc1 $at, $f8 -/* E2CDA8 802BC678 00000000 */ nop -/* E2CDAC 802BC67C 46080583 */ div.s $f22, $f0, $f8 -/* E2CDB0 802BC680 0C00A85B */ jal sin_rad -/* E2CDB4 802BC684 4600B306 */ mov.s $f12, $f22 -/* E2CDB8 802BC688 4600C002 */ mul.s $f0, $f24, $f0 -/* E2CDBC 802BC68C 00000000 */ nop -/* E2CDC0 802BC690 C6020040 */ lwc1 $f2, 0x40($s0) -/* E2CDC4 802BC694 46001080 */ add.s $f2, $f2, $f0 -/* E2CDC8 802BC698 4600B306 */ mov.s $f12, $f22 -/* E2CDCC 802BC69C 0C00A874 */ jal cos_rad -/* E2CDD0 802BC6A0 E6020040 */ swc1 $f2, 0x40($s0) -/* E2CDD4 802BC6A4 4600C002 */ mul.s $f0, $f24, $f0 -/* E2CDD8 802BC6A8 00000000 */ nop -/* E2CDDC 802BC6AC C6020070 */ lwc1 $f2, 0x70($s0) -/* E2CDE0 802BC6B0 3C040004 */ lui $a0, 4 -/* E2CDE4 802BC6B4 46001080 */ add.s $f2, $f2, $f0 -/* E2CDE8 802BC6B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* E2CDEC 802BC6BC 02C0282D */ daddu $a1, $s6, $zero -/* E2CDF0 802BC6C0 E6020070 */ swc1 $f2, 0x70($s0) -/* E2CDF4 802BC6C4 C6020058 */ lwc1 $f2, 0x58($s0) -/* E2CDF8 802BC6C8 C6040070 */ lwc1 $f4, 0x70($s0) -/* E2CDFC 802BC6CC 02A0302D */ daddu $a2, $s5, $zero -/* E2CE00 802BC6D0 E7A00020 */ swc1 $f0, 0x20($sp) -/* E2CE04 802BC6D4 E7A20024 */ swc1 $f2, 0x24($sp) -/* E2CE08 802BC6D8 E7A40028 */ swc1 $f4, 0x28($sp) -/* E2CE0C 802BC6DC 3C014100 */ lui $at, 0x4100 -/* E2CE10 802BC6E0 44814000 */ mtc1 $at, $f8 -/* E2CE14 802BC6E4 0280382D */ daddu $a3, $s4, $zero -/* E2CE18 802BC6E8 E7B80010 */ swc1 $f24, 0x10($sp) -/* E2CE1C 802BC6EC E7B40014 */ swc1 $f20, 0x14($sp) -/* E2CE20 802BC6F0 E7A80018 */ swc1 $f8, 0x18($sp) -/* E2CE24 802BC6F4 0C0376B9 */ jal npc_test_move_taller_with_slipping -/* E2CE28 802BC6F8 E7A8001C */ swc1 $f8, 0x1c($sp) -/* E2CE2C 802BC6FC 10400031 */ beqz $v0, .L802BC7C4 -/* E2CE30 802BC700 3C040004 */ lui $a0, 4 -/* E2CE34 802BC704 C7A00020 */ lwc1 $f0, 0x20($sp) -/* E2CE38 802BC708 C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2CE3C 802BC70C C7A40028 */ lwc1 $f4, 0x28($sp) -/* E2CE40 802BC710 E6000040 */ swc1 $f0, 0x40($s0) -/* E2CE44 802BC714 E6020058 */ swc1 $f2, 0x58($s0) -/* E2CE48 802BC718 E6040070 */ swc1 $f4, 0x70($s0) -/* E2CE4C 802BC71C 9222000E */ lbu $v0, 0xe($s1) -/* E2CE50 802BC720 3C0143B4 */ lui $at, 0x43b4 -/* E2CE54 802BC724 44814000 */ mtc1 $at, $f8 -/* E2CE58 802BC728 24420080 */ addiu $v0, $v0, 0x80 -/* E2CE5C 802BC72C A222000E */ sb $v0, 0xe($s1) -/* E2CE60 802BC730 304200FF */ andi $v0, $v0, 0xff -/* E2CE64 802BC734 44820000 */ mtc1 $v0, $f0 -/* E2CE68 802BC738 00000000 */ nop -/* E2CE6C 802BC73C 46800020 */ cvt.s.w $f0, $f0 -/* E2CE70 802BC740 46080002 */ mul.s $f0, $f0, $f8 -/* E2CE74 802BC744 00000000 */ nop -/* E2CE78 802BC748 3C013B80 */ lui $at, 0x3b80 -/* E2CE7C 802BC74C 44814000 */ mtc1 $at, $f8 -/* E2CE80 802BC750 00000000 */ nop -/* E2CE84 802BC754 46080002 */ mul.s $f0, $f0, $f8 -/* E2CE88 802BC758 00000000 */ nop -/* E2CE8C 802BC75C 3C0140C9 */ lui $at, 0x40c9 -/* E2CE90 802BC760 34210FD0 */ ori $at, $at, 0xfd0 -/* E2CE94 802BC764 44814000 */ mtc1 $at, $f8 -/* E2CE98 802BC768 00000000 */ nop -/* E2CE9C 802BC76C 46080002 */ mul.s $f0, $f0, $f8 -/* E2CEA0 802BC770 00000000 */ nop -/* E2CEA4 802BC774 3C0143B4 */ lui $at, 0x43b4 -/* E2CEA8 802BC778 44814000 */ mtc1 $at, $f8 -/* E2CEAC 802BC77C 3C014100 */ lui $at, 0x4100 -/* E2CEB0 802BC780 4481C000 */ mtc1 $at, $f24 -/* E2CEB4 802BC784 46080583 */ div.s $f22, $f0, $f8 -/* E2CEB8 802BC788 0C00A85B */ jal sin_rad -/* E2CEBC 802BC78C 4600B306 */ mov.s $f12, $f22 -/* E2CEC0 802BC790 46180002 */ mul.s $f0, $f0, $f24 -/* E2CEC4 802BC794 00000000 */ nop -/* E2CEC8 802BC798 C6020040 */ lwc1 $f2, 0x40($s0) -/* E2CECC 802BC79C 46001080 */ add.s $f2, $f2, $f0 -/* E2CED0 802BC7A0 4600B306 */ mov.s $f12, $f22 -/* E2CED4 802BC7A4 0C00A874 */ jal cos_rad -/* E2CED8 802BC7A8 E6020040 */ swc1 $f2, 0x40($s0) -/* E2CEDC 802BC7AC 46180002 */ mul.s $f0, $f0, $f24 -/* E2CEE0 802BC7B0 00000000 */ nop -/* E2CEE4 802BC7B4 C6020070 */ lwc1 $f2, 0x70($s0) -/* E2CEE8 802BC7B8 46001080 */ add.s $f2, $f2, $f0 -/* E2CEEC 802BC7BC E6020070 */ swc1 $f2, 0x70($s0) -/* E2CEF0 802BC7C0 3C040004 */ lui $a0, 4 -.L802BC7C4: -/* E2CEF4 802BC7C4 02C0282D */ daddu $a1, $s6, $zero -/* E2CEF8 802BC7C8 02A0302D */ daddu $a2, $s5, $zero -/* E2CEFC 802BC7CC 0280382D */ daddu $a3, $s4, $zero -/* E2CF00 802BC7D0 27A2002C */ addiu $v0, $sp, 0x2c -/* E2CF04 802BC7D4 C6020040 */ lwc1 $f2, 0x40($s0) -/* E2CF08 802BC7D8 C6040058 */ lwc1 $f4, 0x58($s0) -/* E2CF0C 802BC7DC C6000088 */ lwc1 $f0, 0x88($s0) -/* E2CF10 802BC7E0 C6060070 */ lwc1 $f6, 0x70($s0) -/* E2CF14 802BC7E4 46000005 */ abs.s $f0, $f0 -/* E2CF18 802BC7E8 E7A20020 */ swc1 $f2, 0x20($sp) -/* E2CF1C 802BC7EC E7A40024 */ swc1 $f4, 0x24($sp) -/* E2CF20 802BC7F0 E7A60028 */ swc1 $f6, 0x28($sp) -/* E2CF24 802BC7F4 E7A0002C */ swc1 $f0, 0x2c($sp) -/* E2CF28 802BC7F8 0C0372DF */ jal npc_raycast_down_sides -/* E2CF2C 802BC7FC AFA20010 */ sw $v0, 0x10($sp) -/* E2CF30 802BC800 1440000B */ bnez $v0, .L802BC830 -/* E2CF34 802BC804 00000000 */ nop -/* E2CF38 802BC808 C6400004 */ lwc1 $f0, 4($s2) -/* E2CF3C 802BC80C 3C014348 */ lui $at, 0x4348 -/* E2CF40 802BC810 44811000 */ mtc1 $at, $f2 -/* E2CF44 802BC814 00000000 */ nop -/* E2CF48 802BC818 46020001 */ sub.s $f0, $f0, $f2 -/* E2CF4C 802BC81C C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2CF50 802BC820 4600103C */ c.lt.s $f2, $f0 -/* E2CF54 802BC824 00000000 */ nop -/* E2CF58 802BC828 45000010 */ bc1f .L802BC86C -/* E2CF5C 802BC82C 00000000 */ nop -.L802BC830: -/* E2CF60 802BC830 92220008 */ lbu $v0, 8($s1) -/* E2CF64 802BC834 24420001 */ addiu $v0, $v0, 1 -/* E2CF68 802BC838 A2220008 */ sb $v0, 8($s1) -/* E2CF6C 802BC83C C6000088 */ lwc1 $f0, 0x88($s0) -/* E2CF70 802BC840 C7A20024 */ lwc1 $f2, 0x24($sp) -/* E2CF74 802BC844 46000005 */ abs.s $f0, $f0 -/* E2CF78 802BC848 46001080 */ add.s $f2, $f2, $f0 -/* E2CF7C 802BC84C E61C0088 */ swc1 $f28, 0x88($s0) -/* E2CF80 802BC850 E6020058 */ swc1 $f2, 0x58($s0) -/* E2CF84 802BC854 82230008 */ lb $v1, 8($s1) -/* E2CF88 802BC858 24020002 */ addiu $v0, $zero, 2 -/* E2CF8C 802BC85C 14620003 */ bne $v1, $v0, .L802BC86C -/* E2CF90 802BC860 240200FE */ addiu $v0, $zero, 0xfe -/* E2CF94 802BC864 A222000E */ sb $v0, 0xe($s1) -/* E2CF98 802BC868 AE000028 */ sw $zero, 0x28($s0) -.L802BC86C: -/* E2CF9C 802BC86C 92220014 */ lbu $v0, 0x14($s1) -/* E2CFA0 802BC870 44820000 */ mtc1 $v0, $f0 -/* E2CFA4 802BC874 00000000 */ nop -/* E2CFA8 802BC878 46800020 */ cvt.s.w $f0, $f0 -/* E2CFAC 802BC87C 461A0000 */ add.s $f0, $f0, $f26 -/* E2CFB0 802BC880 4600F03E */ c.le.s $f30, $f0 -/* E2CFB4 802BC884 00000000 */ nop -/* E2CFB8 802BC888 45010005 */ bc1t .L802BC8A0 -/* E2CFBC 802BC88C 26230014 */ addiu $v1, $s1, 0x14 -/* E2CFC0 802BC890 4600020D */ trunc.w.s $f8, $f0 -/* E2CFC4 802BC894 44024000 */ mfc1 $v0, $f8 -/* E2CFC8 802BC898 080AF22E */ j .L802BC8B8 -/* E2CFCC 802BC89C A0620000 */ sb $v0, ($v1) -.L802BC8A0: -/* E2CFD0 802BC8A0 461E0001 */ sub.s $f0, $f0, $f30 -/* E2CFD4 802BC8A4 4600020D */ trunc.w.s $f8, $f0 -/* E2CFD8 802BC8A8 44024000 */ mfc1 $v0, $f8 -/* E2CFDC 802BC8AC 00000000 */ nop -/* E2CFE0 802BC8B0 00571025 */ or $v0, $v0, $s7 -/* E2CFE4 802BC8B4 A0620000 */ sb $v0, ($v1) -.L802BC8B8: -/* E2CFE8 802BC8B8 9222001A */ lbu $v0, 0x1a($s1) -/* E2CFEC 802BC8BC 44820000 */ mtc1 $v0, $f0 -/* E2CFF0 802BC8C0 00000000 */ nop -/* E2CFF4 802BC8C4 46800020 */ cvt.s.w $f0, $f0 -/* E2CFF8 802BC8C8 461A0001 */ sub.s $f0, $f0, $f26 -/* E2CFFC 802BC8CC 4600F03E */ c.le.s $f30, $f0 -/* E2D000 802BC8D0 00000000 */ nop -/* E2D004 802BC8D4 45010005 */ bc1t .L802BC8EC -/* E2D008 802BC8D8 2623001A */ addiu $v1, $s1, 0x1a -/* E2D00C 802BC8DC 4600020D */ trunc.w.s $f8, $f0 -/* E2D010 802BC8E0 44024000 */ mfc1 $v0, $f8 -/* E2D014 802BC8E4 080AF241 */ j .L802BC904 -/* E2D018 802BC8E8 A0620000 */ sb $v0, ($v1) -.L802BC8EC: -/* E2D01C 802BC8EC 461E0001 */ sub.s $f0, $f0, $f30 -/* E2D020 802BC8F0 4600020D */ trunc.w.s $f8, $f0 -/* E2D024 802BC8F4 44024000 */ mfc1 $v0, $f8 -/* E2D028 802BC8F8 00000000 */ nop -/* E2D02C 802BC8FC 00571025 */ or $v0, $v0, $s7 -/* E2D030 802BC900 A0620000 */ sb $v0, ($v1) -.L802BC904: -/* E2D034 802BC904 26310001 */ addiu $s1, $s1, 1 -.L802BC908: -/* E2D038 802BC908 26420005 */ addiu $v0, $s2, 5 -/* E2D03C 802BC90C 0222102A */ slt $v0, $s1, $v0 -/* E2D040 802BC910 1440FED1 */ bnez $v0, .L802BC458 -/* E2D044 802BC914 26100004 */ addiu $s0, $s0, 4 -/* E2D048 802BC918 2A620005 */ slti $v0, $s3, 5 -/* E2D04C 802BC91C 14400003 */ bnez $v0, .L802BC92C -/* E2D050 802BC920 00000000 */ nop -/* E2D054 802BC924 0C043F5A */ jal exec_entity_commandlist -/* E2D058 802BC928 03C0202D */ daddu $a0, $fp, $zero -.L802BC92C: -/* E2D05C 802BC92C 8FBF0054 */ lw $ra, 0x54($sp) -/* E2D060 802BC930 8FBE0050 */ lw $fp, 0x50($sp) -/* E2D064 802BC934 8FB7004C */ lw $s7, 0x4c($sp) -/* E2D068 802BC938 8FB60048 */ lw $s6, 0x48($sp) -/* E2D06C 802BC93C 8FB50044 */ lw $s5, 0x44($sp) -/* E2D070 802BC940 8FB40040 */ lw $s4, 0x40($sp) -/* E2D074 802BC944 8FB3003C */ lw $s3, 0x3c($sp) -/* E2D078 802BC948 8FB20038 */ lw $s2, 0x38($sp) -/* E2D07C 802BC94C 8FB10034 */ lw $s1, 0x34($sp) -/* E2D080 802BC950 8FB00030 */ lw $s0, 0x30($sp) -/* E2D084 802BC954 D7BE0080 */ ldc1 $f30, 0x80($sp) -/* E2D088 802BC958 D7BC0078 */ ldc1 $f28, 0x78($sp) -/* E2D08C 802BC95C D7BA0070 */ ldc1 $f26, 0x70($sp) -/* E2D090 802BC960 D7B80068 */ ldc1 $f24, 0x68($sp) -/* E2D094 802BC964 D7B60060 */ ldc1 $f22, 0x60($sp) -/* E2D098 802BC968 D7B40058 */ ldc1 $f20, 0x58($sp) -/* E2D09C 802BC96C 03E00008 */ jr $ra -/* E2D0A0 802BC970 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s deleted file mode 100644 index 0111a13648..0000000000 --- a/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC974_E2D0A4 -/* E2D0A4 802BC974 27BDFE80 */ addiu $sp, $sp, -0x180 -/* E2D0A8 802BC978 AFBE0148 */ sw $fp, 0x148($sp) -/* E2D0AC 802BC97C 0000F02D */ daddu $fp, $zero, $zero -/* E2D0B0 802BC980 27A80098 */ addiu $t0, $sp, 0x98 -/* E2D0B4 802BC984 AFB5013C */ sw $s5, 0x13c($sp) -/* E2D0B8 802BC988 27B500D8 */ addiu $s5, $sp, 0xd8 -/* E2D0BC 802BC98C AFB40138 */ sw $s4, 0x138($sp) -/* E2D0C0 802BC990 27B40058 */ addiu $s4, $sp, 0x58 -/* E2D0C4 802BC994 AFA8011C */ sw $t0, 0x11c($sp) -/* E2D0C8 802BC998 3C080001 */ lui $t0, 1 -/* E2D0CC 802BC99C AFB1012C */ sw $s1, 0x12c($sp) -/* E2D0D0 802BC9A0 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* E2D0D4 802BC9A4 8E31A66C */ lw $s1, %lo(gMasterGfxPos)($s1) -/* E2D0D8 802BC9A8 35081630 */ ori $t0, $t0, 0x1630 -/* E2D0DC 802BC9AC AFBF014C */ sw $ra, 0x14c($sp) -/* E2D0E0 802BC9B0 AFB70144 */ sw $s7, 0x144($sp) -/* E2D0E4 802BC9B4 AFB60140 */ sw $s6, 0x140($sp) -/* E2D0E8 802BC9B8 AFB30134 */ sw $s3, 0x134($sp) -/* E2D0EC 802BC9BC AFB20130 */ sw $s2, 0x130($sp) -/* E2D0F0 802BC9C0 AFB00128 */ sw $s0, 0x128($sp) -/* E2D0F4 802BC9C4 F7BE0178 */ sdc1 $f30, 0x178($sp) -/* E2D0F8 802BC9C8 F7BC0170 */ sdc1 $f28, 0x170($sp) -/* E2D0FC 802BC9CC F7BA0168 */ sdc1 $f26, 0x168($sp) -/* E2D100 802BC9D0 F7B80160 */ sdc1 $f24, 0x160($sp) -/* E2D104 802BC9D4 F7B60158 */ sdc1 $f22, 0x158($sp) -/* E2D108 802BC9D8 F7B40150 */ sdc1 $f20, 0x150($sp) -/* E2D10C 802BC9DC 0C04417A */ jal get_entity_by_index -/* E2D110 802BC9E0 AFA80120 */ sw $t0, 0x120($sp) -/* E2D114 802BC9E4 0040B82D */ daddu $s7, $v0, $zero -/* E2D118 802BC9E8 3C0143B4 */ lui $at, 0x43b4 -/* E2D11C 802BC9EC 4481D000 */ mtc1 $at, $f26 -/* E2D120 802BC9F0 3C013B80 */ lui $at, 0x3b80 -/* E2D124 802BC9F4 4481C000 */ mtc1 $at, $f24 -/* E2D128 802BC9F8 3C013F80 */ lui $at, 0x3f80 -/* E2D12C 802BC9FC 4481B000 */ mtc1 $at, $f22 -/* E2D130 802BCA00 8EE20040 */ lw $v0, 0x40($s7) -/* E2D134 802BCA04 4480A000 */ mtc1 $zero, $f20 -/* E2D138 802BCA08 C6E00048 */ lwc1 $f0, 0x48($s7) -/* E2D13C 802BCA0C 0040902D */ daddu $s2, $v0, $zero -/* E2D140 802BCA10 0240982D */ daddu $s3, $s2, $zero -/* E2D144 802BCA14 2630FFFC */ addiu $s0, $s1, -4 -/* E2D148 802BCA18 46000007 */ neg.s $f0, $f0 -/* E2D14C 802BCA1C E7A00118 */ swc1 $f0, 0x118($sp) -/* E2D150 802BCA20 C6E0004C */ lwc1 $f0, 0x4c($s7) -/* E2D154 802BCA24 C6E20050 */ lwc1 $f2, 0x50($s7) -/* E2D158 802BCA28 8E560000 */ lw $s6, ($s2) -/* E2D15C 802BCA2C 46000787 */ neg.s $f30, $f0 -/* E2D160 802BCA30 46001707 */ neg.s $f28, $f2 -.L802BCA34: -/* E2D164 802BCA34 82420008 */ lb $v0, 8($s2) -/* E2D168 802BCA38 28420002 */ slti $v0, $v0, 2 -/* E2D16C 802BCA3C 1040000F */ beqz $v0, .L802BCA7C -/* E2D170 802BCA40 3C03E200 */ lui $v1, 0xe200 -/* E2D174 802BCA44 26100008 */ addiu $s0, $s0, 8 -/* E2D178 802BCA48 3463001C */ ori $v1, $v1, 0x1c -/* E2D17C 802BCA4C 3C020055 */ lui $v0, 0x55 -/* E2D180 802BCA50 34422078 */ ori $v0, $v0, 0x2078 -/* E2D184 802BCA54 AE03FFFC */ sw $v1, -4($s0) -/* E2D188 802BCA58 AE020000 */ sw $v0, ($s0) -/* E2D18C 802BCA5C 26100008 */ addiu $s0, $s0, 8 -/* E2D190 802BCA60 26310010 */ addiu $s1, $s1, 0x10 -/* E2D194 802BCA64 3C03FC12 */ lui $v1, 0xfc12 -/* E2D198 802BCA68 34631824 */ ori $v1, $v1, 0x1824 -/* E2D19C 802BCA6C 3C02FF33 */ lui $v0, 0xff33 -/* E2D1A0 802BCA70 3442FFFF */ ori $v0, $v0, 0xffff -/* E2D1A4 802BCA74 080AF2AB */ j .L802BCAAC -/* E2D1A8 802BCA78 AE03FFFC */ sw $v1, -4($s0) -.L802BCA7C: -/* E2D1AC 802BCA7C 26100008 */ addiu $s0, $s0, 8 -/* E2D1B0 802BCA80 3C03FCFF */ lui $v1, 0xfcff -/* E2D1B4 802BCA84 3463C3FF */ ori $v1, $v1, 0xc3ff -/* E2D1B8 802BCA88 3C02FF30 */ lui $v0, 0xff30 -/* E2D1BC 802BCA8C 3442FE7F */ ori $v0, $v0, 0xfe7f -/* E2D1C0 802BCA90 AE03FFFC */ sw $v1, -4($s0) -/* E2D1C4 802BCA94 AE020000 */ sw $v0, ($s0) -/* E2D1C8 802BCA98 26100008 */ addiu $s0, $s0, 8 -/* E2D1CC 802BCA9C 3C02FA00 */ lui $v0, 0xfa00 -/* E2D1D0 802BCAA0 AE02FFFC */ sw $v0, -4($s0) -/* E2D1D4 802BCAA4 9242000E */ lbu $v0, 0xe($s2) -/* E2D1D8 802BCAA8 26310010 */ addiu $s1, $s1, 0x10 -.L802BCAAC: -/* E2D1DC 802BCAAC AE020000 */ sw $v0, ($s0) -/* E2D1E0 802BCAB0 8FA50118 */ lw $a1, 0x118($sp) -/* E2D1E4 802BCAB4 4406F000 */ mfc1 $a2, $f30 -/* E2D1E8 802BCAB8 4407E000 */ mfc1 $a3, $f28 -/* E2D1EC 802BCABC 0C019E40 */ jal guTranslateF -/* E2D1F0 802BCAC0 27A40018 */ addiu $a0, $sp, 0x18 -/* E2D1F4 802BCAC4 92420014 */ lbu $v0, 0x14($s2) -/* E2D1F8 802BCAC8 44820000 */ mtc1 $v0, $f0 -/* E2D1FC 802BCACC 00000000 */ nop -/* E2D200 802BCAD0 46800020 */ cvt.s.w $f0, $f0 -/* E2D204 802BCAD4 461A0002 */ mul.s $f0, $f0, $f26 -/* E2D208 802BCAD8 00000000 */ nop -/* E2D20C 802BCADC 46180002 */ mul.s $f0, $f0, $f24 -/* E2D210 802BCAE0 00000000 */ nop -/* E2D214 802BCAE4 4406B000 */ mfc1 $a2, $f22 -/* E2D218 802BCAE8 4407A000 */ mfc1 $a3, $f20 -/* E2D21C 802BCAEC 8FA4011C */ lw $a0, 0x11c($sp) -/* E2D220 802BCAF0 44050000 */ mfc1 $a1, $f0 -/* E2D224 802BCAF4 0C019EC8 */ jal guRotateF -/* E2D228 802BCAF8 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2D22C 802BCAFC 9242001A */ lbu $v0, 0x1a($s2) -/* E2D230 802BCB00 44820000 */ mtc1 $v0, $f0 -/* E2D234 802BCB04 00000000 */ nop -/* E2D238 802BCB08 46800020 */ cvt.s.w $f0, $f0 -/* E2D23C 802BCB0C 461A0002 */ mul.s $f0, $f0, $f26 -/* E2D240 802BCB10 00000000 */ nop -/* E2D244 802BCB14 26100008 */ addiu $s0, $s0, 8 -/* E2D248 802BCB18 26310018 */ addiu $s1, $s1, 0x18 -/* E2D24C 802BCB1C 46180002 */ mul.s $f0, $f0, $f24 -/* E2D250 802BCB20 00000000 */ nop -/* E2D254 802BCB24 27DE0001 */ addiu $fp, $fp, 1 -/* E2D258 802BCB28 02A0202D */ daddu $a0, $s5, $zero -/* E2D25C 802BCB2C 4406A000 */ mfc1 $a2, $f20 -/* E2D260 802BCB30 4407B000 */ mfc1 $a3, $f22 -/* E2D264 802BCB34 44050000 */ mfc1 $a1, $f0 -/* E2D268 802BCB38 26520001 */ addiu $s2, $s2, 1 -/* E2D26C 802BCB3C 0C019EC8 */ jal guRotateF -/* E2D270 802BCB40 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2D274 802BCB44 02A0282D */ daddu $a1, $s5, $zero -/* E2D278 802BCB48 8FA4011C */ lw $a0, 0x11c($sp) -/* E2D27C 802BCB4C 0C019D80 */ jal guMtxCatF -/* E2D280 802BCB50 02A0302D */ daddu $a2, $s5, $zero -/* E2D284 802BCB54 02A0202D */ daddu $a0, $s5, $zero -/* E2D288 802BCB58 27A50018 */ addiu $a1, $sp, 0x18 -/* E2D28C 802BCB5C 0C019D80 */ jal guMtxCatF -/* E2D290 802BCB60 00A0302D */ daddu $a2, $a1, $zero -/* E2D294 802BCB64 0280202D */ daddu $a0, $s4, $zero -/* E2D298 802BCB68 8E650040 */ lw $a1, 0x40($s3) -/* E2D29C 802BCB6C 8E660058 */ lw $a2, 0x58($s3) -/* E2D2A0 802BCB70 8E670070 */ lw $a3, 0x70($s3) -/* E2D2A4 802BCB74 0C019E40 */ jal guTranslateF -/* E2D2A8 802BCB78 26730004 */ addiu $s3, $s3, 4 -/* E2D2AC 802BCB7C 27A40018 */ addiu $a0, $sp, 0x18 -/* E2D2B0 802BCB80 0280282D */ daddu $a1, $s4, $zero -/* E2D2B4 802BCB84 0C019D80 */ jal guMtxCatF -/* E2D2B8 802BCB88 0280302D */ daddu $a2, $s4, $zero -/* E2D2BC 802BCB8C 0280202D */ daddu $a0, $s4, $zero -/* E2D2C0 802BCB90 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* E2D2C4 802BCB94 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* E2D2C8 802BCB98 3C02800A */ lui $v0, %hi(gDisplayContext) -/* E2D2CC 802BCB9C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* E2D2D0 802BCBA0 8FA80120 */ lw $t0, 0x120($sp) -/* E2D2D4 802BCBA4 00052980 */ sll $a1, $a1, 6 -/* E2D2D8 802BCBA8 00A82821 */ addu $a1, $a1, $t0 -/* E2D2DC 802BCBAC 0C019D40 */ jal guMtxF2L -/* E2D2E0 802BCBB0 00452821 */ addu $a1, $v0, $a1 -/* E2D2E4 802BCBB4 3C05D838 */ lui $a1, 0xd838 -/* E2D2E8 802BCBB8 34A50002 */ ori $a1, $a1, 2 -/* E2D2EC 802BCBBC 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* E2D2F0 802BCBC0 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* E2D2F4 802BCBC4 3C03DA38 */ lui $v1, 0xda38 -/* E2D2F8 802BCBC8 AE03FFFC */ sw $v1, -4($s0) -/* E2D2FC 802BCBCC 8FA80120 */ lw $t0, 0x120($sp) -/* E2D300 802BCBD0 24430001 */ addiu $v1, $v0, 1 -/* E2D304 802BCBD4 3042FFFF */ andi $v0, $v0, 0xffff -/* E2D308 802BCBD8 00021180 */ sll $v0, $v0, 6 -/* E2D30C 802BCBDC 3C018007 */ lui $at, %hi(gMatrixListPos) -/* E2D310 802BCBE0 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) -/* E2D314 802BCBE4 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2D318 802BCBE8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2D31C 802BCBEC 00481021 */ addu $v0, $v0, $t0 -/* E2D320 802BCBF0 00621821 */ addu $v1, $v1, $v0 -/* E2D324 802BCBF4 AE030000 */ sw $v1, ($s0) -/* E2D328 802BCBF8 96C40002 */ lhu $a0, 2($s6) -/* E2D32C 802BCBFC 26D60004 */ addiu $s6, $s6, 4 -/* E2D330 802BCC00 26100008 */ addiu $s0, $s0, 8 -/* E2D334 802BCC04 8EE30044 */ lw $v1, 0x44($s7) -/* E2D338 802BCC08 3C02DE00 */ lui $v0, 0xde00 -/* E2D33C 802BCC0C AE02FFFC */ sw $v0, -4($s0) -/* E2D340 802BCC10 24020040 */ addiu $v0, $zero, 0x40 -/* E2D344 802BCC14 00641821 */ addu $v1, $v1, $a0 -/* E2D348 802BCC18 AE030000 */ sw $v1, ($s0) -/* E2D34C 802BCC1C 26100008 */ addiu $s0, $s0, 8 -/* E2D350 802BCC20 AE020000 */ sw $v0, ($s0) -/* E2D354 802BCC24 2BC20005 */ slti $v0, $fp, 5 -/* E2D358 802BCC28 1440FF82 */ bnez $v0, .L802BCA34 -/* E2D35C 802BCC2C AE05FFFC */ sw $a1, -4($s0) -/* E2D360 802BCC30 8FBF014C */ lw $ra, 0x14c($sp) -/* E2D364 802BCC34 8FBE0148 */ lw $fp, 0x148($sp) -/* E2D368 802BCC38 8FB70144 */ lw $s7, 0x144($sp) -/* E2D36C 802BCC3C 8FB60140 */ lw $s6, 0x140($sp) -/* E2D370 802BCC40 8FB5013C */ lw $s5, 0x13c($sp) -/* E2D374 802BCC44 8FB40138 */ lw $s4, 0x138($sp) -/* E2D378 802BCC48 8FB30134 */ lw $s3, 0x134($sp) -/* E2D37C 802BCC4C 8FB20130 */ lw $s2, 0x130($sp) -/* E2D380 802BCC50 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* E2D384 802BCC54 AC31A66C */ sw $s1, %lo(gMasterGfxPos)($at) -/* E2D388 802BCC58 8FB1012C */ lw $s1, 0x12c($sp) -/* E2D38C 802BCC5C 8FB00128 */ lw $s0, 0x128($sp) -/* E2D390 802BCC60 D7BE0178 */ ldc1 $f30, 0x178($sp) -/* E2D394 802BCC64 D7BC0170 */ ldc1 $f28, 0x170($sp) -/* E2D398 802BCC68 D7BA0168 */ ldc1 $f26, 0x168($sp) -/* E2D39C 802BCC6C D7B80160 */ ldc1 $f24, 0x160($sp) -/* E2D3A0 802BCC70 D7B60158 */ ldc1 $f22, 0x158($sp) -/* E2D3A4 802BCC74 D7B40150 */ ldc1 $f20, 0x150($sp) -/* E2D3A8 802BCC78 03E00008 */ jr $ra -/* E2D3AC 802BCC7C 27BD0180 */ addiu $sp, $sp, 0x180 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s deleted file mode 100644 index d655d0dc05..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BAE00_E2D730 -/* E2D730 802BAE00 27BDFF00 */ addiu $sp, $sp, -0x100 -/* E2D734 802BAE04 AFBF00EC */ sw $ra, 0xec($sp) -/* E2D738 802BAE08 AFB400E8 */ sw $s4, 0xe8($sp) -/* E2D73C 802BAE0C AFB300E4 */ sw $s3, 0xe4($sp) -/* E2D740 802BAE10 AFB200E0 */ sw $s2, 0xe0($sp) -/* E2D744 802BAE14 AFB100DC */ sw $s1, 0xdc($sp) -/* E2D748 802BAE18 AFB000D8 */ sw $s0, 0xd8($sp) -/* E2D74C 802BAE1C F7B600F8 */ sdc1 $f22, 0xf8($sp) -/* E2D750 802BAE20 0C04417A */ jal get_entity_by_index -/* E2D754 802BAE24 F7B400F0 */ sdc1 $f20, 0xf0($sp) -/* E2D758 802BAE28 27A40018 */ addiu $a0, $sp, 0x18 -/* E2D75C 802BAE2C 0040A02D */ daddu $s4, $v0, $zero -/* E2D760 802BAE30 3C050A00 */ lui $a1, 0xa00 -/* E2D764 802BAE34 24A50B70 */ addiu $a1, $a1, 0xb70 -/* E2D768 802BAE38 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2D76C 802BAE3C 3C13800A */ lui $s3, %hi(gMasterGfxPos) -/* E2D770 802BAE40 8E73A66C */ lw $s3, %lo(gMasterGfxPos)($s3) -/* E2D774 802BAE44 8E820044 */ lw $v0, 0x44($s4) -/* E2D778 802BAE48 8E920040 */ lw $s2, 0x40($s4) -/* E2D77C 802BAE4C 4480A000 */ mtc1 $zero, $f20 -/* E2D780 802BAE50 0C019D60 */ jal guMtxL2F -/* E2D784 802BAE54 00452821 */ addu $a1, $v0, $a1 -/* E2D788 802BAE58 3C013F80 */ lui $at, 0x3f80 -/* E2D78C 802BAE5C 4481B000 */ mtc1 $at, $f22 -/* E2D790 802BAE60 27B10058 */ addiu $s1, $sp, 0x58 -/* E2D794 802BAE64 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2D798 802BAE68 8E450004 */ lw $a1, 4($s2) -/* E2D79C 802BAE6C 4407A000 */ mfc1 $a3, $f20 -/* E2D7A0 802BAE70 4406B000 */ mfc1 $a2, $f22 -/* E2D7A4 802BAE74 0C019EC8 */ jal guRotateF -/* E2D7A8 802BAE78 0220202D */ daddu $a0, $s1, $zero -/* E2D7AC 802BAE7C 27B00098 */ addiu $s0, $sp, 0x98 -/* E2D7B0 802BAE80 E7B60010 */ swc1 $f22, 0x10($sp) -/* E2D7B4 802BAE84 8E45000C */ lw $a1, 0xc($s2) -/* E2D7B8 802BAE88 4406A000 */ mfc1 $a2, $f20 -/* E2D7BC 802BAE8C 4407A000 */ mfc1 $a3, $f20 -/* E2D7C0 802BAE90 0C019EC8 */ jal guRotateF -/* E2D7C4 802BAE94 0200202D */ daddu $a0, $s0, $zero -/* E2D7C8 802BAE98 0220202D */ daddu $a0, $s1, $zero -/* E2D7CC 802BAE9C 0200282D */ daddu $a1, $s0, $zero -/* E2D7D0 802BAEA0 0C019D80 */ jal guMtxCatF -/* E2D7D4 802BAEA4 0200302D */ daddu $a2, $s0, $zero -/* E2D7D8 802BAEA8 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2D7DC 802BAEAC 8E450008 */ lw $a1, 8($s2) -/* E2D7E0 802BAEB0 4406A000 */ mfc1 $a2, $f20 -/* E2D7E4 802BAEB4 4407B000 */ mfc1 $a3, $f22 -/* E2D7E8 802BAEB8 0C019EC8 */ jal guRotateF -/* E2D7EC 802BAEBC 0220202D */ daddu $a0, $s1, $zero -/* E2D7F0 802BAEC0 0200202D */ daddu $a0, $s0, $zero -/* E2D7F4 802BAEC4 0220282D */ daddu $a1, $s1, $zero -/* E2D7F8 802BAEC8 0C019D80 */ jal guMtxCatF -/* E2D7FC 802BAECC 0220302D */ daddu $a2, $s1, $zero -/* E2D800 802BAED0 0220202D */ daddu $a0, $s1, $zero -/* E2D804 802BAED4 27A50018 */ addiu $a1, $sp, 0x18 -/* E2D808 802BAED8 0C019D80 */ jal guMtxCatF -/* E2D80C 802BAEDC 00A0302D */ daddu $a2, $a1, $zero -/* E2D810 802BAEE0 27A40018 */ addiu $a0, $sp, 0x18 -/* E2D814 802BAEE4 26500030 */ addiu $s0, $s2, 0x30 -/* E2D818 802BAEE8 0C019D40 */ jal guMtxF2L -/* E2D81C 802BAEEC 0200282D */ daddu $a1, $s0, $zero -/* E2D820 802BAEF0 3C040001 */ lui $a0, 1 -/* E2D824 802BAEF4 34841630 */ ori $a0, $a0, 0x1630 -/* E2D828 802BAEF8 26520070 */ addiu $s2, $s2, 0x70 -/* E2D82C 802BAEFC 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* E2D830 802BAF00 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* E2D834 802BAF04 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2D838 802BAF08 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2D83C 802BAF0C 00021180 */ sll $v0, $v0, 6 -/* E2D840 802BAF10 00621821 */ addu $v1, $v1, $v0 -/* E2D844 802BAF14 00641821 */ addu $v1, $v1, $a0 -.L802BAF18: -/* E2D848 802BAF18 8E0A0000 */ lw $t2, ($s0) -/* E2D84C 802BAF1C 8E0B0004 */ lw $t3, 4($s0) -/* E2D850 802BAF20 8E0C0008 */ lw $t4, 8($s0) -/* E2D854 802BAF24 8E0D000C */ lw $t5, 0xc($s0) -/* E2D858 802BAF28 AC6A0000 */ sw $t2, ($v1) -/* E2D85C 802BAF2C AC6B0004 */ sw $t3, 4($v1) -/* E2D860 802BAF30 AC6C0008 */ sw $t4, 8($v1) -/* E2D864 802BAF34 AC6D000C */ sw $t5, 0xc($v1) -/* E2D868 802BAF38 26100010 */ addiu $s0, $s0, 0x10 -/* E2D86C 802BAF3C 1612FFF6 */ bne $s0, $s2, .L802BAF18 -/* E2D870 802BAF40 24630010 */ addiu $v1, $v1, 0x10 -/* E2D874 802BAF44 0260282D */ daddu $a1, $s3, $zero -/* E2D878 802BAF48 26730008 */ addiu $s3, $s3, 8 -/* E2D87C 802BAF4C 3C080001 */ lui $t0, 1 -/* E2D880 802BAF50 35081630 */ ori $t0, $t0, 0x1630 -/* E2D884 802BAF54 0260302D */ daddu $a2, $s3, $zero -/* E2D888 802BAF58 26730008 */ addiu $s3, $s3, 8 -/* E2D88C 802BAF5C 0260382D */ daddu $a3, $s3, $zero -/* E2D890 802BAF60 26730008 */ addiu $s3, $s3, 8 -/* E2D894 802BAF64 3C09D838 */ lui $t1, 0xd838 -/* E2D898 802BAF68 35290002 */ ori $t1, $t1, 2 -/* E2D89C 802BAF6C 3C048007 */ lui $a0, %hi(gMatrixListPos) -/* E2D8A0 802BAF70 248441F0 */ addiu $a0, $a0, %lo(gMatrixListPos) -/* E2D8A4 802BAF74 94820000 */ lhu $v0, ($a0) -/* E2D8A8 802BAF78 3C03DA38 */ lui $v1, 0xda38 -/* E2D8AC 802BAF7C ACA30000 */ sw $v1, ($a1) -/* E2D8B0 802BAF80 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* E2D8B4 802BAF84 AC33A66C */ sw $s3, %lo(gMasterGfxPos)($at) -/* E2D8B8 802BAF88 24430001 */ addiu $v1, $v0, 1 -/* E2D8BC 802BAF8C 3042FFFF */ andi $v0, $v0, 0xffff -/* E2D8C0 802BAF90 00021180 */ sll $v0, $v0, 6 -/* E2D8C4 802BAF94 A4830000 */ sh $v1, ($a0) -/* E2D8C8 802BAF98 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2D8CC 802BAF9C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2D8D0 802BAFA0 00481021 */ addu $v0, $v0, $t0 -/* E2D8D4 802BAFA4 00621821 */ addu $v1, $v1, $v0 -/* E2D8D8 802BAFA8 ACA30004 */ sw $v1, 4($a1) -/* E2D8DC 802BAFAC 8E830044 */ lw $v1, 0x44($s4) -/* E2D8E0 802BAFB0 3C02DE00 */ lui $v0, 0xde00 -/* E2D8E4 802BAFB4 ACC20000 */ sw $v0, ($a2) -/* E2D8E8 802BAFB8 3C020A00 */ lui $v0, 0xa00 -/* E2D8EC 802BAFBC 24420D18 */ addiu $v0, $v0, 0xd18 -/* E2D8F0 802BAFC0 3042FFFF */ andi $v0, $v0, 0xffff -/* E2D8F4 802BAFC4 00621821 */ addu $v1, $v1, $v0 -/* E2D8F8 802BAFC8 24020040 */ addiu $v0, $zero, 0x40 -/* E2D8FC 802BAFCC ACC30004 */ sw $v1, 4($a2) -/* E2D900 802BAFD0 ACE90000 */ sw $t1, ($a3) -/* E2D904 802BAFD4 ACE20004 */ sw $v0, 4($a3) -/* E2D908 802BAFD8 8FBF00EC */ lw $ra, 0xec($sp) -/* E2D90C 802BAFDC 8FB400E8 */ lw $s4, 0xe8($sp) -/* E2D910 802BAFE0 8FB300E4 */ lw $s3, 0xe4($sp) -/* E2D914 802BAFE4 8FB200E0 */ lw $s2, 0xe0($sp) -/* E2D918 802BAFE8 8FB100DC */ lw $s1, 0xdc($sp) -/* E2D91C 802BAFEC 8FB000D8 */ lw $s0, 0xd8($sp) -/* E2D920 802BAFF0 D7B600F8 */ ldc1 $f22, 0xf8($sp) -/* E2D924 802BAFF4 D7B400F0 */ ldc1 $f20, 0xf0($sp) -/* E2D928 802BAFF8 03E00008 */ jr $ra -/* E2D92C 802BAFFC 27BD0100 */ addiu $sp, $sp, 0x100 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s deleted file mode 100644 index afa97d5863..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802BCDC0_E2F6F0 -.double 0.02 - -dlabel D_802BCDC8_E2F6F8 -.double 0.4 - -dlabel D_802BCDD0_E2F700 -.double 0.8 - -.section .text - -glabel func_802BB0A0_E2D9D0 -/* E2D9D0 802BB0A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E2D9D4 802BB0A4 AFB10014 */ sw $s1, 0x14($sp) -/* E2D9D8 802BB0A8 0080882D */ daddu $s1, $a0, $zero -/* E2D9DC 802BB0AC AFBF001C */ sw $ra, 0x1c($sp) -/* E2D9E0 802BB0B0 AFB20018 */ sw $s2, 0x18($sp) -/* E2D9E4 802BB0B4 AFB00010 */ sw $s0, 0x10($sp) -/* E2D9E8 802BB0B8 0C0AEC00 */ jal func_802BB000_E2D930 -/* E2D9EC 802BB0BC 8E300040 */ lw $s0, 0x40($s1) -/* E2D9F0 802BB0C0 82030002 */ lb $v1, 2($s0) -/* E2D9F4 802BB0C4 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* E2D9F8 802BB0C8 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* E2D9FC 802BB0CC 10600005 */ beqz $v1, .L802BB0E4 -/* E2DA00 802BB0D0 24020001 */ addiu $v0, $zero, 1 -/* E2DA04 802BB0D4 1062000A */ beq $v1, $v0, .L802BB100 -/* E2DA08 802BB0D8 00000000 */ nop -/* E2DA0C 802BB0DC 080AEC67 */ j .L802BB19C -/* E2DA10 802BB0E0 00000000 */ nop -.L802BB0E4: -/* E2DA14 802BB0E4 24020001 */ addiu $v0, $zero, 1 -/* E2DA18 802BB0E8 AE000018 */ sw $zero, 0x18($s0) -/* E2DA1C 802BB0EC A6000000 */ sh $zero, ($s0) -/* E2DA20 802BB0F0 A2020002 */ sb $v0, 2($s0) -/* E2DA24 802BB0F4 AE000004 */ sw $zero, 4($s0) -/* E2DA28 802BB0F8 080AEC67 */ j .L802BB19C -/* E2DA2C 802BB0FC AE00000C */ sw $zero, 0xc($s0) -.L802BB100: -/* E2DA30 802BB100 92220006 */ lbu $v0, 6($s1) -/* E2DA34 802BB104 30420001 */ andi $v0, $v0, 1 -/* E2DA38 802BB108 14400017 */ bnez $v0, .L802BB168 -/* E2DA3C 802BB10C 00000000 */ nop -/* E2DA40 802BB110 C6000014 */ lwc1 $f0, 0x14($s0) -/* E2DA44 802BB114 3C01802C */ lui $at, %hi(D_802BCDC0_E2F6F0) -/* E2DA48 802BB118 D422CDC0 */ ldc1 $f2, %lo(D_802BCDC0_E2F6F0)($at) -/* E2DA4C 802BB11C 46000021 */ cvt.d.s $f0, $f0 -/* E2DA50 802BB120 46220000 */ add.d $f0, $f0, $f2 -/* E2DA54 802BB124 3C014000 */ lui $at, 0x4000 -/* E2DA58 802BB128 44812800 */ mtc1 $at, $f5 -/* E2DA5C 802BB12C 44802000 */ mtc1 $zero, $f4 -/* E2DA60 802BB130 46200020 */ cvt.s.d $f0, $f0 -/* E2DA64 802BB134 460000A1 */ cvt.d.s $f2, $f0 -/* E2DA68 802BB138 4622203C */ c.lt.d $f4, $f2 -/* E2DA6C 802BB13C 00000000 */ nop -/* E2DA70 802BB140 45000016 */ bc1f .L802BB19C -/* E2DA74 802BB144 E6000014 */ swc1 $f0, 0x14($s0) -/* E2DA78 802BB148 45000014 */ bc1f .L802BB19C -/* E2DA7C 802BB14C 00000000 */ nop -/* E2DA80 802BB150 3C01802C */ lui $at, %hi(D_802BCDC8_E2F6F8) -/* E2DA84 802BB154 D420CDC8 */ ldc1 $f0, %lo(D_802BCDC8_E2F6F8)($at) -/* E2DA88 802BB158 46201001 */ sub.d $f0, $f2, $f0 -/* E2DA8C 802BB15C 46200020 */ cvt.s.d $f0, $f0 -/* E2DA90 802BB160 080AEC67 */ j .L802BB19C -/* E2DA94 802BB164 E6000014 */ swc1 $f0, 0x14($s0) -.L802BB168: -/* E2DA98 802BB168 C6000014 */ lwc1 $f0, 0x14($s0) -/* E2DA9C 802BB16C 3C01802C */ lui $at, %hi(D_802BCDD0_E2F700) -/* E2DAA0 802BB170 D422CDD0 */ ldc1 $f2, %lo(D_802BCDD0_E2F700)($at) -/* E2DAA4 802BB174 46000021 */ cvt.d.s $f0, $f0 -/* E2DAA8 802BB178 46220000 */ add.d $f0, $f0, $f2 -/* E2DAAC 802BB17C 3C014160 */ lui $at, 0x4160 -/* E2DAB0 802BB180 44811000 */ mtc1 $at, $f2 -/* E2DAB4 802BB184 46200020 */ cvt.s.d $f0, $f0 -/* E2DAB8 802BB188 4600103C */ c.lt.s $f2, $f0 -/* E2DABC 802BB18C 00000000 */ nop -/* E2DAC0 802BB190 45000002 */ bc1f .L802BB19C -/* E2DAC4 802BB194 E6000014 */ swc1 $f0, 0x14($s0) -/* E2DAC8 802BB198 E6020014 */ swc1 $f2, 0x14($s0) -.L802BB19C: -/* E2DACC 802BB19C C6000008 */ lwc1 $f0, 8($s0) -/* E2DAD0 802BB1A0 C60C0014 */ lwc1 $f12, 0x14($s0) -/* E2DAD4 802BB1A4 0C00A6C9 */ jal clamp_angle -/* E2DAD8 802BB1A8 460C0300 */ add.s $f12, $f0, $f12 -/* E2DADC 802BB1AC E6000008 */ swc1 $f0, 8($s0) -/* E2DAE0 802BB1B0 92220006 */ lbu $v0, 6($s1) -/* E2DAE4 802BB1B4 30420001 */ andi $v0, $v0, 1 -/* E2DAE8 802BB1B8 14400015 */ bnez $v0, .L802BB210 -/* E2DAEC 802BB1BC 3C030001 */ lui $v1, 1 -/* E2DAF0 802BB1C0 8E420004 */ lw $v0, 4($s2) -/* E2DAF4 802BB1C4 00431024 */ and $v0, $v0, $v1 -/* E2DAF8 802BB1C8 10400011 */ beqz $v0, .L802BB210 -/* E2DAFC 802BB1CC 00000000 */ nop -/* E2DB00 802BB1D0 C62C0048 */ lwc1 $f12, 0x48($s1) -/* E2DB04 802BB1D4 C62E0050 */ lwc1 $f14, 0x50($s1) -/* E2DB08 802BB1D8 8E460028 */ lw $a2, 0x28($s2) -/* E2DB0C 802BB1DC 0C00A7B5 */ jal dist2D -/* E2DB10 802BB1E0 8E470030 */ lw $a3, 0x30($s2) -/* E2DB14 802BB1E4 46000021 */ cvt.d.s $f0, $f0 -/* E2DB18 802BB1E8 3C01404E */ lui $at, 0x404e -/* E2DB1C 802BB1EC 44811800 */ mtc1 $at, $f3 -/* E2DB20 802BB1F0 44801000 */ mtc1 $zero, $f2 -/* E2DB24 802BB1F4 46200005 */ abs.d $f0, $f0 -/* E2DB28 802BB1F8 4622003C */ c.lt.d $f0, $f2 -/* E2DB2C 802BB1FC 00000000 */ nop -/* E2DB30 802BB200 45000003 */ bc1f .L802BB210 -/* E2DB34 802BB204 00000000 */ nop -/* E2DB38 802BB208 0C043F5A */ jal exec_entity_commandlist -/* E2DB3C 802BB20C 0220202D */ daddu $a0, $s1, $zero -.L802BB210: -/* E2DB40 802BB210 8FBF001C */ lw $ra, 0x1c($sp) -/* E2DB44 802BB214 8FB20018 */ lw $s2, 0x18($sp) -/* E2DB48 802BB218 8FB10014 */ lw $s1, 0x14($sp) -/* E2DB4C 802BB21C 8FB00010 */ lw $s0, 0x10($sp) -/* E2DB50 802BB220 03E00008 */ jr $ra -/* E2DB54 802BB224 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s deleted file mode 100644 index 4d09f77949..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB374_E2DCA4 -/* E2DCA4 802BB374 27BDFF30 */ addiu $sp, $sp, -0xd0 -/* E2DCA8 802BB378 AFBF00B8 */ sw $ra, 0xb8($sp) -/* E2DCAC 802BB37C AFB500B4 */ sw $s5, 0xb4($sp) -/* E2DCB0 802BB380 AFB400B0 */ sw $s4, 0xb0($sp) -/* E2DCB4 802BB384 AFB300AC */ sw $s3, 0xac($sp) -/* E2DCB8 802BB388 AFB200A8 */ sw $s2, 0xa8($sp) -/* E2DCBC 802BB38C AFB100A4 */ sw $s1, 0xa4($sp) -/* E2DCC0 802BB390 AFB000A0 */ sw $s0, 0xa0($sp) -/* E2DCC4 802BB394 F7B600C8 */ sdc1 $f22, 0xc8($sp) -/* E2DCC8 802BB398 F7B400C0 */ sdc1 $f20, 0xc0($sp) -/* E2DCCC 802BB39C 0C04417A */ jal get_entity_by_index -/* E2DCD0 802BB3A0 3C140001 */ lui $s4, 1 -/* E2DCD4 802BB3A4 0040902D */ daddu $s2, $v0, $zero -/* E2DCD8 802BB3A8 27B10058 */ addiu $s1, $sp, 0x58 -/* E2DCDC 802BB3AC 8E530040 */ lw $s3, 0x40($s2) -/* E2DCE0 802BB3B0 4480A000 */ mtc1 $zero, $f20 -/* E2DCE4 802BB3B4 3C013F80 */ lui $at, 0x3f80 -/* E2DCE8 802BB3B8 4481B000 */ mtc1 $at, $f22 -/* E2DCEC 802BB3BC 3C15800A */ lui $s5, %hi(gMasterGfxPos) -/* E2DCF0 802BB3C0 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) -/* E2DCF4 802BB3C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2DCF8 802BB3C8 8E450064 */ lw $a1, 0x64($s2) -/* E2DCFC 802BB3CC 4406A000 */ mfc1 $a2, $f20 -/* E2DD00 802BB3D0 4407B000 */ mfc1 $a3, $f22 -/* E2DD04 802BB3D4 8EB00000 */ lw $s0, ($s5) -/* E2DD08 802BB3D8 0C019EC8 */ jal guRotateF -/* E2DD0C 802BB3DC 0220202D */ daddu $a0, $s1, $zero -/* E2DD10 802BB3E0 8E450054 */ lw $a1, 0x54($s2) -/* E2DD14 802BB3E4 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DD18 802BB3E8 00A0302D */ daddu $a2, $a1, $zero -/* E2DD1C 802BB3EC 0C019DF0 */ jal guScaleF -/* E2DD20 802BB3F0 00A0382D */ daddu $a3, $a1, $zero -/* E2DD24 802BB3F4 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DD28 802BB3F8 0220282D */ daddu $a1, $s1, $zero -/* E2DD2C 802BB3FC 0C019D80 */ jal guMtxCatF -/* E2DD30 802BB400 0220302D */ daddu $a2, $s1, $zero -/* E2DD34 802BB404 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DD38 802BB408 3C050A00 */ lui $a1, 0xa00 -/* E2DD3C 802BB40C 24A51098 */ addiu $a1, $a1, 0x1098 -/* E2DD40 802BB410 8E420044 */ lw $v0, 0x44($s2) -/* E2DD44 802BB414 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2DD48 802BB418 0C019D60 */ jal guMtxL2F -/* E2DD4C 802BB41C 00452821 */ addu $a1, $v0, $a1 -/* E2DD50 802BB420 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* E2DD54 802BB424 C42C1DEC */ lwc1 $f12, %lo(gCameras+0x6C)($at) -/* E2DD58 802BB428 3C014334 */ lui $at, 0x4334 -/* E2DD5C 802BB42C 44810000 */ mtc1 $at, $f0 -/* E2DD60 802BB430 00000000 */ nop -/* E2DD64 802BB434 46006300 */ add.s $f12, $f12, $f0 -/* E2DD68 802BB438 3C0140C9 */ lui $at, 0x40c9 -/* E2DD6C 802BB43C 34210FD0 */ ori $at, $at, 0xfd0 -/* E2DD70 802BB440 44810000 */ mtc1 $at, $f0 -/* E2DD74 802BB444 00000000 */ nop -/* E2DD78 802BB448 46006302 */ mul.s $f12, $f12, $f0 -/* E2DD7C 802BB44C 00000000 */ nop -/* E2DD80 802BB450 27A50098 */ addiu $a1, $sp, 0x98 -/* E2DD84 802BB454 3C0143B4 */ lui $at, 0x43b4 -/* E2DD88 802BB458 44810000 */ mtc1 $at, $f0 -/* E2DD8C 802BB45C 27A6009C */ addiu $a2, $sp, 0x9c -/* E2DD90 802BB460 0C00A82D */ jal sin_cos_rad -/* E2DD94 802BB464 46006303 */ div.s $f12, $f12, $f0 -/* E2DD98 802BB468 C7A2004C */ lwc1 $f2, 0x4c($sp) -/* E2DD9C 802BB46C 3C014120 */ lui $at, 0x4120 -/* E2DDA0 802BB470 44812000 */ mtc1 $at, $f4 -/* E2DDA4 802BB474 0220202D */ daddu $a0, $s1, $zero -/* E2DDA8 802BB478 46041080 */ add.s $f2, $f2, $f4 -/* E2DDAC 802BB47C C7A00050 */ lwc1 $f0, 0x50($sp) -/* E2DDB0 802BB480 27A50018 */ addiu $a1, $sp, 0x18 -/* E2DDB4 802BB484 46040001 */ sub.s $f0, $f0, $f4 -/* E2DDB8 802BB488 00A0302D */ daddu $a2, $a1, $zero -/* E2DDBC 802BB48C E7A2004C */ swc1 $f2, 0x4c($sp) -/* E2DDC0 802BB490 0C019D80 */ jal guMtxCatF -/* E2DDC4 802BB494 E7A00050 */ swc1 $f0, 0x50($sp) -/* E2DDC8 802BB498 E7B60010 */ swc1 $f22, 0x10($sp) -/* E2DDCC 802BB49C 8E450068 */ lw $a1, 0x68($s2) -/* E2DDD0 802BB4A0 4406A000 */ mfc1 $a2, $f20 -/* E2DDD4 802BB4A4 4407A000 */ mfc1 $a3, $f20 -/* E2DDD8 802BB4A8 0C019EC8 */ jal guRotateF -/* E2DDDC 802BB4AC 0220202D */ daddu $a0, $s1, $zero -/* E2DDE0 802BB4B0 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DDE4 802BB4B4 0220282D */ daddu $a1, $s1, $zero -/* E2DDE8 802BB4B8 0C019D80 */ jal guMtxCatF -/* E2DDEC 802BB4BC 0080302D */ daddu $a2, $a0, $zero -/* E2DDF0 802BB4C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* E2DDF4 802BB4C4 8E650008 */ lw $a1, 8($s3) -/* E2DDF8 802BB4C8 4406A000 */ mfc1 $a2, $f20 -/* E2DDFC 802BB4CC 4407B000 */ mfc1 $a3, $f22 -/* E2DE00 802BB4D0 0C019EC8 */ jal guRotateF -/* E2DE04 802BB4D4 0220202D */ daddu $a0, $s1, $zero -/* E2DE08 802BB4D8 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DE0C 802BB4DC 0220282D */ daddu $a1, $s1, $zero -/* E2DE10 802BB4E0 0C019D80 */ jal guMtxCatF -/* E2DE14 802BB4E4 0080302D */ daddu $a2, $a0, $zero -/* E2DE18 802BB4E8 C7A00098 */ lwc1 $f0, 0x98($sp) -/* E2DE1C 802BB4EC 3C014180 */ lui $at, 0x4180 -/* E2DE20 802BB4F0 44812000 */ mtc1 $at, $f4 -/* E2DE24 802BB4F4 00000000 */ nop -/* E2DE28 802BB4F8 46040002 */ mul.s $f0, $f0, $f4 -/* E2DE2C 802BB4FC 00000000 */ nop -/* E2DE30 802BB500 C7A2009C */ lwc1 $f2, 0x9c($sp) -/* E2DE34 802BB504 46041082 */ mul.s $f2, $f2, $f4 -/* E2DE38 802BB508 00000000 */ nop -/* E2DE3C 802BB50C C6440048 */ lwc1 $f4, 0x48($s2) -/* E2DE40 802BB510 46002100 */ add.s $f4, $f4, $f0 -/* E2DE44 802BB514 C6400050 */ lwc1 $f0, 0x50($s2) -/* E2DE48 802BB518 36941630 */ ori $s4, $s4, 0x1630 -/* E2DE4C 802BB51C 46020001 */ sub.s $f0, $f0, $f2 -/* E2DE50 802BB520 8E46004C */ lw $a2, 0x4c($s2) -/* E2DE54 802BB524 44052000 */ mfc1 $a1, $f4 -/* E2DE58 802BB528 44070000 */ mfc1 $a3, $f0 -/* E2DE5C 802BB52C 0C019E40 */ jal guTranslateF -/* E2DE60 802BB530 0220202D */ daddu $a0, $s1, $zero -/* E2DE64 802BB534 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DE68 802BB538 0220282D */ daddu $a1, $s1, $zero -/* E2DE6C 802BB53C 0C019D80 */ jal guMtxCatF -/* E2DE70 802BB540 0080302D */ daddu $a2, $a0, $zero -/* E2DE74 802BB544 0200182D */ daddu $v1, $s0, $zero -/* E2DE78 802BB548 26100008 */ addiu $s0, $s0, 8 -/* E2DE7C 802BB54C 3C05FCFF */ lui $a1, 0xfcff -/* E2DE80 802BB550 34A5B3FF */ ori $a1, $a1, 0xb3ff -/* E2DE84 802BB554 3C02FF2C */ lui $v0, 0xff2c -/* E2DE88 802BB558 3442FE7F */ ori $v0, $v0, 0xfe7f -/* E2DE8C 802BB55C 0200302D */ daddu $a2, $s0, $zero -/* E2DE90 802BB560 26100008 */ addiu $s0, $s0, 8 -/* E2DE94 802BB564 27A40018 */ addiu $a0, $sp, 0x18 -/* E2DE98 802BB568 AC620004 */ sw $v0, 4($v1) -/* E2DE9C 802BB56C 3C02FA00 */ lui $v0, 0xfa00 -/* E2DEA0 802BB570 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* E2DEA4 802BB574 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* E2DEA8 802BB578 3C13800A */ lui $s3, %hi(gDisplayContext) -/* E2DEAC 802BB57C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) -/* E2DEB0 802BB580 AC650000 */ sw $a1, ($v1) -/* E2DEB4 802BB584 ACC20000 */ sw $v0, ($a2) -/* E2DEB8 802BB588 96250000 */ lhu $a1, ($s1) -/* E2DEBC 802BB58C 8E620000 */ lw $v0, ($s3) -/* E2DEC0 802BB590 9243000B */ lbu $v1, 0xb($s2) -/* E2DEC4 802BB594 00052980 */ sll $a1, $a1, 6 -/* E2DEC8 802BB598 00B42821 */ addu $a1, $a1, $s4 -/* E2DECC 802BB59C 00452821 */ addu $a1, $v0, $a1 -/* E2DED0 802BB5A0 0C019D40 */ jal guMtxF2L -/* E2DED4 802BB5A4 ACC30004 */ sw $v1, 4($a2) -/* E2DED8 802BB5A8 0200202D */ daddu $a0, $s0, $zero -/* E2DEDC 802BB5AC 26100008 */ addiu $s0, $s0, 8 -/* E2DEE0 802BB5B0 3C03DA38 */ lui $v1, 0xda38 -/* E2DEE4 802BB5B4 34630002 */ ori $v1, $v1, 2 -/* E2DEE8 802BB5B8 0200282D */ daddu $a1, $s0, $zero -/* E2DEEC 802BB5BC 26100008 */ addiu $s0, $s0, 8 -/* E2DEF0 802BB5C0 0200302D */ daddu $a2, $s0, $zero -/* E2DEF4 802BB5C4 26100008 */ addiu $s0, $s0, 8 -/* E2DEF8 802BB5C8 3C07D838 */ lui $a3, 0xd838 -/* E2DEFC 802BB5CC 96220000 */ lhu $v0, ($s1) -/* E2DF00 802BB5D0 34E70002 */ ori $a3, $a3, 2 -/* E2DF04 802BB5D4 AC830000 */ sw $v1, ($a0) -/* E2DF08 802BB5D8 AEB00000 */ sw $s0, ($s5) -/* E2DF0C 802BB5DC 24430001 */ addiu $v1, $v0, 1 -/* E2DF10 802BB5E0 3042FFFF */ andi $v0, $v0, 0xffff -/* E2DF14 802BB5E4 00021180 */ sll $v0, $v0, 6 -/* E2DF18 802BB5E8 A6230000 */ sh $v1, ($s1) -/* E2DF1C 802BB5EC 8E630000 */ lw $v1, ($s3) -/* E2DF20 802BB5F0 00541021 */ addu $v0, $v0, $s4 -/* E2DF24 802BB5F4 00621821 */ addu $v1, $v1, $v0 -/* E2DF28 802BB5F8 3C02DE00 */ lui $v0, 0xde00 -/* E2DF2C 802BB5FC AC830004 */ sw $v1, 4($a0) -/* E2DF30 802BB600 ACA20000 */ sw $v0, ($a1) -/* E2DF34 802BB604 3C020A00 */ lui $v0, 0xa00 -/* E2DF38 802BB608 244213B8 */ addiu $v0, $v0, 0x13b8 -/* E2DF3C 802BB60C ACA20004 */ sw $v0, 4($a1) -/* E2DF40 802BB610 24020040 */ addiu $v0, $zero, 0x40 -/* E2DF44 802BB614 ACC70000 */ sw $a3, ($a2) -/* E2DF48 802BB618 ACC20004 */ sw $v0, 4($a2) -/* E2DF4C 802BB61C 8FBF00B8 */ lw $ra, 0xb8($sp) -/* E2DF50 802BB620 8FB500B4 */ lw $s5, 0xb4($sp) -/* E2DF54 802BB624 8FB400B0 */ lw $s4, 0xb0($sp) -/* E2DF58 802BB628 8FB300AC */ lw $s3, 0xac($sp) -/* E2DF5C 802BB62C 8FB200A8 */ lw $s2, 0xa8($sp) -/* E2DF60 802BB630 8FB100A4 */ lw $s1, 0xa4($sp) -/* E2DF64 802BB634 8FB000A0 */ lw $s0, 0xa0($sp) -/* E2DF68 802BB638 D7B600C8 */ ldc1 $f22, 0xc8($sp) -/* E2DF6C 802BB63C D7B400C0 */ ldc1 $f20, 0xc0($sp) -/* E2DF70 802BB640 03E00008 */ jr $ra -/* E2DF74 802BB644 27BD00D0 */ addiu $sp, $sp, 0xd0 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s deleted file mode 100644 index 379ddeb148..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB648_E2DF78 -/* E2DF78 802BB648 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) -/* E2DF7C 802BB64C 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) -/* E2DF80 802BB650 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2DF84 802BB654 AFB00010 */ sw $s0, 0x10($sp) -/* E2DF88 802BB658 0080802D */ daddu $s0, $a0, $zero -/* E2DF8C 802BB65C AFBF0014 */ sw $ra, 0x14($sp) -/* E2DF90 802BB660 8E050040 */ lw $a1, 0x40($s0) -/* E2DF94 802BB664 30420010 */ andi $v0, $v0, 0x10 -/* E2DF98 802BB668 10400019 */ beqz $v0, .L802BB6D0 -/* E2DF9C 802BB66C 00000000 */ nop -/* E2DFA0 802BB670 92020006 */ lbu $v0, 6($s0) -/* E2DFA4 802BB674 30420048 */ andi $v0, $v0, 0x48 -/* E2DFA8 802BB678 10400015 */ beqz $v0, .L802BB6D0 -/* E2DFAC 802BB67C 00000000 */ nop -/* E2DFB0 802BB680 8E030000 */ lw $v1, ($s0) -/* E2DFB4 802BB684 30621000 */ andi $v0, $v1, 0x1000 -/* E2DFB8 802BB688 10400011 */ beqz $v0, .L802BB6D0 -/* E2DFBC 802BB68C 2402EFFF */ addiu $v0, $zero, -0x1001 -/* E2DFC0 802BB690 00621024 */ and $v0, $v1, $v0 -/* E2DFC4 802BB694 AE020000 */ sw $v0, ($s0) -/* E2DFC8 802BB698 0C04417A */ jal get_entity_by_index -/* E2DFCC 802BB69C 94A40004 */ lhu $a0, 4($a1) -/* E2DFD0 802BB6A0 8C450040 */ lw $a1, 0x40($v0) -/* E2DFD4 802BB6A4 94A20000 */ lhu $v0, ($a1) -/* E2DFD8 802BB6A8 14400009 */ bnez $v0, .L802BB6D0 -/* E2DFDC 802BB6AC 0200202D */ daddu $a0, $s0, $zero -/* E2DFE0 802BB6B0 24020001 */ addiu $v0, $zero, 1 -/* E2DFE4 802BB6B4 0C043F5A */ jal exec_entity_commandlist -/* E2DFE8 802BB6B8 A4A20000 */ sh $v0, ($a1) -/* E2DFEC 802BB6BC 86040014 */ lh $a0, 0x14($s0) -/* E2DFF0 802BB6C0 3C050000 */ lui $a1, 0 -/* E2DFF4 802BB6C4 24A500F4 */ addiu $a1, $a1, 0xf4 -/* E2DFF8 802BB6C8 0C048052 */ jal play_model_animation -/* E2DFFC 802BB6CC 00000000 */ nop -.L802BB6D0: -/* E2E000 802BB6D0 8FBF0014 */ lw $ra, 0x14($sp) -/* E2E004 802BB6D4 8FB00010 */ lw $s0, 0x10($sp) -/* E2E008 802BB6D8 03E00008 */ jr $ra -/* E2E00C 802BB6DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s deleted file mode 100644 index 47a7a8b094..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802BCDD8_E2F708 -.double 0.03 - -dlabel D_802BCDE0_E2F710 -.double 0.1 - -.section .text - -glabel func_802BB78C_E2E0BC -/* E2E0BC 802BB78C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E2E0C0 802BB790 AFB00010 */ sw $s0, 0x10($sp) -/* E2E0C4 802BB794 0080802D */ daddu $s0, $a0, $zero -/* E2E0C8 802BB798 AFBF0018 */ sw $ra, 0x18($sp) -/* E2E0CC 802BB79C AFB10014 */ sw $s1, 0x14($sp) -/* E2E0D0 802BB7A0 8E110040 */ lw $s1, 0x40($s0) -/* E2E0D4 802BB7A4 96230002 */ lhu $v1, 2($s1) -/* E2E0D8 802BB7A8 10600005 */ beqz $v1, .L802BB7C0 -/* E2E0DC 802BB7AC 24020001 */ addiu $v0, $zero, 1 -/* E2E0E0 802BB7B0 10620014 */ beq $v1, $v0, .L802BB804 -/* E2E0E4 802BB7B4 00000000 */ nop -/* E2E0E8 802BB7B8 080AEE29 */ j .L802BB8A4 -/* E2E0EC 802BB7BC 00000000 */ nop -.L802BB7C0: -/* E2E0F0 802BB7C0 96220000 */ lhu $v0, ($s1) -/* E2E0F4 802BB7C4 10400037 */ beqz $v0, .L802BB8A4 -/* E2E0F8 802BB7C8 00000000 */ nop -/* E2E0FC 802BB7CC 96220002 */ lhu $v0, 2($s1) -/* E2E100 802BB7D0 3C01C1C8 */ lui $at, 0xc1c8 -/* E2E104 802BB7D4 44810000 */ mtc1 $at, $f0 -/* E2E108 802BB7D8 3C013FE6 */ lui $at, 0x3fe6 -/* E2E10C 802BB7DC 34216666 */ ori $at, $at, 0x6666 -/* E2E110 802BB7E0 44811000 */ mtc1 $at, $f2 -/* E2E114 802BB7E4 A6200000 */ sh $zero, ($s1) -/* E2E118 802BB7E8 24420001 */ addiu $v0, $v0, 1 -/* E2E11C 802BB7EC A6220002 */ sh $v0, 2($s1) -/* E2E120 802BB7F0 240200FF */ addiu $v0, $zero, 0xff -/* E2E124 802BB7F4 E6000068 */ swc1 $f0, 0x68($s0) -/* E2E128 802BB7F8 E6020054 */ swc1 $f2, 0x54($s0) -/* E2E12C 802BB7FC 080AEE29 */ j .L802BB8A4 -/* E2E130 802BB800 A202000B */ sb $v0, 0xb($s0) -.L802BB804: -/* E2E134 802BB804 C6000068 */ lwc1 $f0, 0x68($s0) -/* E2E138 802BB808 3C013F80 */ lui $at, 0x3f80 -/* E2E13C 802BB80C 44811000 */ mtc1 $at, $f2 -/* E2E140 802BB810 00000000 */ nop -/* E2E144 802BB814 46020000 */ add.s $f0, $f0, $f2 -/* E2E148 802BB818 3C014100 */ lui $at, 0x4100 -/* E2E14C 802BB81C 44811000 */ mtc1 $at, $f2 -/* E2E150 802BB820 00000000 */ nop -/* E2E154 802BB824 4600103E */ c.le.s $f2, $f0 -/* E2E158 802BB828 00000000 */ nop -/* E2E15C 802BB82C 45000002 */ bc1f .L802BB838 -/* E2E160 802BB830 E6000068 */ swc1 $f0, 0x68($s0) -/* E2E164 802BB834 E6020068 */ swc1 $f2, 0x68($s0) -.L802BB838: -/* E2E168 802BB838 9202000B */ lbu $v0, 0xb($s0) -/* E2E16C 802BB83C 2442FFFA */ addiu $v0, $v0, -6 -/* E2E170 802BB840 A202000B */ sb $v0, 0xb($s0) -/* E2E174 802BB844 304200FF */ andi $v0, $v0, 0xff -/* E2E178 802BB848 2C420006 */ sltiu $v0, $v0, 6 -/* E2E17C 802BB84C 10400002 */ beqz $v0, .L802BB858 -/* E2E180 802BB850 24020006 */ addiu $v0, $zero, 6 -/* E2E184 802BB854 A202000B */ sb $v0, 0xb($s0) -.L802BB858: -/* E2E188 802BB858 C6000054 */ lwc1 $f0, 0x54($s0) -/* E2E18C 802BB85C 3C01802C */ lui $at, %hi(D_802BCDD8_E2F708) -/* E2E190 802BB860 D422CDD8 */ ldc1 $f2, %lo(D_802BCDD8_E2F708)($at) -/* E2E194 802BB864 46000021 */ cvt.d.s $f0, $f0 -/* E2E198 802BB868 46220001 */ sub.d $f0, $f0, $f2 -/* E2E19C 802BB86C 3C01802C */ lui $at, %hi(D_802BCDE0_E2F710) -/* E2E1A0 802BB870 D424CDE0 */ ldc1 $f4, %lo(D_802BCDE0_E2F710)($at) -/* E2E1A4 802BB874 46200020 */ cvt.s.d $f0, $f0 -/* E2E1A8 802BB878 460000A1 */ cvt.d.s $f2, $f0 -/* E2E1AC 802BB87C 4624103E */ c.le.d $f2, $f4 -/* E2E1B0 802BB880 00000000 */ nop -/* E2E1B4 802BB884 45000003 */ bc1f .L802BB894 -/* E2E1B8 802BB888 E6000054 */ swc1 $f0, 0x54($s0) -/* E2E1BC 802BB88C A6200002 */ sh $zero, 2($s1) -/* E2E1C0 802BB890 AE000054 */ sw $zero, 0x54($s0) -.L802BB894: -/* E2E1C4 802BB894 C6000054 */ lwc1 $f0, 0x54($s0) -/* E2E1C8 802BB898 46000086 */ mov.s $f2, $f0 -/* E2E1CC 802BB89C E6000058 */ swc1 $f0, 0x58($s0) -/* E2E1D0 802BB8A0 E602005C */ swc1 $f2, 0x5c($s0) -.L802BB8A4: -/* E2E1D4 802BB8A4 0C04417A */ jal get_entity_by_index -/* E2E1D8 802BB8A8 96240004 */ lhu $a0, 4($s1) -/* E2E1DC 802BB8AC C4400064 */ lwc1 $f0, 0x64($v0) -/* E2E1E0 802BB8B0 E6200008 */ swc1 $f0, 8($s1) -/* E2E1E4 802BB8B4 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* E2E1E8 802BB8B8 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* E2E1EC 802BB8BC E6000064 */ swc1 $f0, 0x64($s0) -/* E2E1F0 802BB8C0 8FBF0018 */ lw $ra, 0x18($sp) -/* E2E1F4 802BB8C4 8FB10014 */ lw $s1, 0x14($sp) -/* E2E1F8 802BB8C8 8FB00010 */ lw $s0, 0x10($sp) -/* E2E1FC 802BB8CC 03E00008 */ jr $ra -/* E2E200 802BB8D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s deleted file mode 100644 index be3a66f6f9..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802BCDE8_E2F718 -.word .L802BBA30_E2E360, .L802BBAC8_E2E3F8, .L802BBB44_E2E474, .L802BBBB8_E2E4E8, .L802BBBC4_E2E4F4, .L802BBC10_E2E540, .L802BBC74_E2E5A4, 0, 0, 0 - -.section .text - -glabel func_802BB9E0_E2E310 -/* E2E310 802BB9E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E2E314 802BB9E4 AFB20028 */ sw $s2, 0x28($sp) -/* E2E318 802BB9E8 0080902D */ daddu $s2, $a0, $zero -/* E2E31C 802BB9EC AFBF002C */ sw $ra, 0x2c($sp) -/* E2E320 802BB9F0 AFB10024 */ sw $s1, 0x24($sp) -/* E2E324 802BB9F4 AFB00020 */ sw $s0, 0x20($sp) -/* E2E328 802BB9F8 8E500040 */ lw $s0, 0x40($s2) -/* E2E32C 802BB9FC 3C048011 */ lui $a0, %hi(gPartnerActionStatus) -/* E2E330 802BBA00 2484EBB0 */ addiu $a0, $a0, %lo(gPartnerActionStatus) -/* E2E334 802BBA04 92030000 */ lbu $v1, ($s0) -/* E2E338 802BBA08 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* E2E33C 802BBA0C 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* E2E340 802BBA10 2C620007 */ sltiu $v0, $v1, 7 -/* E2E344 802BBA14 104000A2 */ beqz $v0, .L802BBCA0 -/* E2E348 802BBA18 00031080 */ sll $v0, $v1, 2 -/* E2E34C 802BBA1C 3C01802C */ lui $at, %hi(jtbl_802BCDE8_E2F718) -/* E2E350 802BBA20 00220821 */ addu $at, $at, $v0 -/* E2E354 802BBA24 8C22CDE8 */ lw $v0, %lo(jtbl_802BCDE8_E2F718)($at) -/* E2E358 802BBA28 00400008 */ jr $v0 -/* E2E35C 802BBA2C 00000000 */ nop -.L802BBA30_E2E360: -/* E2E360 802BBA30 92420006 */ lbu $v0, 6($s2) -/* E2E364 802BBA34 30420001 */ andi $v0, $v0, 1 -/* E2E368 802BBA38 50400099 */ beql $v0, $zero, .L802BBCA0 -/* E2E36C 802BBA3C A2000001 */ sb $zero, 1($s0) -/* E2E370 802BBA40 80820003 */ lb $v0, 3($a0) -/* E2E374 802BBA44 10400004 */ beqz $v0, .L802BBA58 -/* E2E378 802BBA48 00000000 */ nop -/* E2E37C 802BBA4C 8E220004 */ lw $v0, 4($s1) -/* E2E380 802BBA50 34420004 */ ori $v0, $v0, 4 -/* E2E384 802BBA54 AE220004 */ sw $v0, 4($s1) -.L802BBA58: -/* E2E388 802BBA58 0C03BCC0 */ jal func_800EF300 -/* E2E38C 802BBA5C 00000000 */ nop -/* E2E390 802BBA60 8E220004 */ lw $v0, 4($s1) -/* E2E394 802BBA64 3C030004 */ lui $v1, 4 -/* E2E398 802BBA68 00431025 */ or $v0, $v0, $v1 -/* E2E39C 802BBA6C AE220004 */ sw $v0, 4($s1) -/* E2E3A0 802BBA70 24020004 */ addiu $v0, $zero, 4 -/* E2E3A4 802BBA74 A6020002 */ sh $v0, 2($s0) -/* E2E3A8 802BBA78 92020001 */ lbu $v0, 1($s0) -/* E2E3AC 802BBA7C 92030000 */ lbu $v1, ($s0) -/* E2E3B0 802BBA80 24420001 */ addiu $v0, $v0, 1 -/* E2E3B4 802BBA84 24630001 */ addiu $v1, $v1, 1 -/* E2E3B8 802BBA88 A2020001 */ sb $v0, 1($s0) -/* E2E3BC 802BBA8C 0C03805E */ jal disable_player_input -/* E2E3C0 802BBA90 A2030000 */ sb $v1, ($s0) -/* E2E3C4 802BBA94 0C039769 */ jal set_action_state -/* E2E3C8 802BBA98 0000202D */ daddu $a0, $zero, $zero -/* E2E3CC 802BBA9C 86440014 */ lh $a0, 0x14($s2) -/* E2E3D0 802BBAA0 3C050000 */ lui $a1, 0 -/* E2E3D4 802BBAA4 24A50214 */ addiu $a1, $a1, 0x214 -/* E2E3D8 802BBAA8 0C048052 */ jal play_model_animation -/* E2E3DC 802BBAAC 00000000 */ nop -/* E2E3E0 802BBAB0 0C05272D */ jal sfx_play_sound -/* E2E3E4 802BBAB4 240400F2 */ addiu $a0, $zero, 0xf2 -/* E2E3E8 802BBAB8 0C0AEE35 */ jal func_802BB8D4_E2E204 -/* E2E3EC 802BBABC 0240202D */ daddu $a0, $s2, $zero -/* E2E3F0 802BBAC0 080AEF28 */ j .L802BBCA0 -/* E2E3F4 802BBAC4 00000000 */ nop -.L802BBAC8_E2E3F8: -/* E2E3F8 802BBAC8 8E220004 */ lw $v0, 4($s1) -/* E2E3FC 802BBACC 3C030004 */ lui $v1, 4 -/* E2E400 802BBAD0 00431025 */ or $v0, $v0, $v1 -/* E2E404 802BBAD4 AE220004 */ sw $v0, 4($s1) -/* E2E408 802BBAD8 96020002 */ lhu $v0, 2($s0) -/* E2E40C 802BBADC 2442FFFF */ addiu $v0, $v0, -1 -/* E2E410 802BBAE0 A6020002 */ sh $v0, 2($s0) -/* E2E414 802BBAE4 00021400 */ sll $v0, $v0, 0x10 -/* E2E418 802BBAE8 14400012 */ bnez $v0, .L802BBB34 -/* E2E41C 802BBAEC 24040080 */ addiu $a0, $zero, 0x80 -/* E2E420 802BBAF0 0C00A3C2 */ jal start_rumble -/* E2E424 802BBAF4 2405000A */ addiu $a1, $zero, 0xa -/* E2E428 802BBAF8 92020000 */ lbu $v0, ($s0) -/* E2E42C 802BBAFC 3C0142A0 */ lui $at, 0x42a0 -/* E2E430 802BBB00 44810000 */ mtc1 $at, $f0 -/* E2E434 802BBB04 2403001E */ addiu $v1, $zero, 0x1e -/* E2E438 802BBB08 A6030002 */ sh $v1, 2($s0) -/* E2E43C 802BBB0C 24420001 */ addiu $v0, $v0, 1 -/* E2E440 802BBB10 A2020000 */ sb $v0, ($s0) -/* E2E444 802BBB14 C62200A8 */ lwc1 $f2, 0xa8($s1) -/* E2E448 802BBB18 8E220000 */ lw $v0, ($s1) -/* E2E44C 802BBB1C 3C030010 */ lui $v1, 0x10 -/* E2E450 802BBB20 E62000A8 */ swc1 $f0, 0xa8($s1) -/* E2E454 802BBB24 00431025 */ or $v0, $v0, $v1 -/* E2E458 802BBB28 AE220000 */ sw $v0, ($s1) -/* E2E45C 802BBB2C 3C01802C */ lui $at, %hi(D_802BCE20) -/* E2E460 802BBB30 E422CE20 */ swc1 $f2, %lo(D_802BCE20)($at) -.L802BBB34: -/* E2E464 802BBB34 0C0AEE63 */ jal func_802BB98C_E2E2BC -/* E2E468 802BBB38 0240202D */ daddu $a0, $s2, $zero -/* E2E46C 802BBB3C 080AEF28 */ j .L802BBCA0 -/* E2E470 802BBB40 00000000 */ nop -.L802BBB44_E2E474: -/* E2E474 802BBB44 96020002 */ lhu $v0, 2($s0) -/* E2E478 802BBB48 2442FFFF */ addiu $v0, $v0, -1 -/* E2E47C 802BBB4C A6020002 */ sh $v0, 2($s0) -/* E2E480 802BBB50 00021400 */ sll $v0, $v0, 0x10 -/* E2E484 802BBB54 14400052 */ bnez $v0, .L802BBCA0 -/* E2E488 802BBB58 0000202D */ daddu $a0, $zero, $zero -/* E2E48C 802BBB5C 2405FFFF */ addiu $a1, $zero, -1 -/* E2E490 802BBB60 0080302D */ daddu $a2, $a0, $zero -/* E2E494 802BBB64 92020000 */ lbu $v0, ($s0) -/* E2E498 802BBB68 0080382D */ daddu $a3, $a0, $zero -/* E2E49C 802BBB6C 24420001 */ addiu $v0, $v0, 1 -/* E2E4A0 802BBB70 A2020000 */ sb $v0, ($s0) -/* E2E4A4 802BBB74 AFA00010 */ sw $zero, 0x10($sp) -/* E2E4A8 802BBB78 AFA00014 */ sw $zero, 0x14($sp) -/* E2E4AC 802BBB7C AFA00018 */ sw $zero, 0x18($sp) -/* E2E4B0 802BBB80 0C0B77B9 */ jal func_802DDEE4 -/* E2E4B4 802BBB84 AFA0001C */ sw $zero, 0x1c($sp) -/* E2E4B8 802BBB88 3C040001 */ lui $a0, 1 -/* E2E4BC 802BBB8C 34840002 */ ori $a0, $a0, 2 -/* E2E4C0 802BBB90 24050005 */ addiu $a1, $zero, 5 -/* E2E4C4 802BBB94 24060013 */ addiu $a2, $zero, 0x13 -/* E2E4C8 802BBB98 24070001 */ addiu $a3, $zero, 1 -/* E2E4CC 802BBB9C 00E0102D */ daddu $v0, $a3, $zero -/* E2E4D0 802BBBA0 AFA20010 */ sw $v0, 0x10($sp) -/* E2E4D4 802BBBA4 AFA00014 */ sw $zero, 0x14($sp) -/* E2E4D8 802BBBA8 0C0B77FE */ jal func_802DDFF8 -/* E2E4DC 802BBBAC AFA00018 */ sw $zero, 0x18($sp) -/* E2E4E0 802BBBB0 080AEF28 */ j .L802BBCA0 -/* E2E4E4 802BBBB4 00000000 */ nop -.L802BBBB8_E2E4E8: -/* E2E4E8 802BBBB8 92020000 */ lbu $v0, ($s0) -/* E2E4EC 802BBBBC 080AEF02 */ j .L802BBC08 -/* E2E4F0 802BBBC0 24420001 */ addiu $v0, $v0, 1 -.L802BBBC4_E2E4F4: -/* E2E4F4 802BBBC4 3C01802C */ lui $at, %hi(D_802BCE20) -/* E2E4F8 802BBBC8 C420CE20 */ lwc1 $f0, %lo(D_802BCE20)($at) -/* E2E4FC 802BBBCC 44801000 */ mtc1 $zero, $f2 -/* E2E500 802BBBD0 3C014387 */ lui $at, 0x4387 -/* E2E504 802BBBD4 44812000 */ mtc1 $at, $f4 -/* E2E508 802BBBD8 46020032 */ c.eq.s $f0, $f2 -/* E2E50C 802BBBDC 00000000 */ nop -/* E2E510 802BBBE0 45010004 */ bc1t .L802BBBF4 -/* E2E514 802BBBE4 E62000A8 */ swc1 $f0, 0xa8($s1) -/* E2E518 802BBBE8 3C0142B4 */ lui $at, 0x42b4 -/* E2E51C 802BBBEC 44812000 */ mtc1 $at, $f4 -/* E2E520 802BBBF0 00000000 */ nop -.L802BBBF4: -/* E2E524 802BBBF4 E6240080 */ swc1 $f4, 0x80($s1) -/* E2E528 802BBBF8 92020000 */ lbu $v0, ($s0) -/* E2E52C 802BBBFC 24030050 */ addiu $v1, $zero, 0x50 -/* E2E530 802BBC00 A6030002 */ sh $v1, 2($s0) -/* E2E534 802BBC04 24420001 */ addiu $v0, $v0, 1 -.L802BBC08: -/* E2E538 802BBC08 080AEF28 */ j .L802BBCA0 -/* E2E53C 802BBC0C A2020000 */ sb $v0, ($s0) -.L802BBC10_E2E540: -/* E2E540 802BBC10 96020002 */ lhu $v0, 2($s0) -/* E2E544 802BBC14 2442FFFF */ addiu $v0, $v0, -1 -/* E2E548 802BBC18 A6020002 */ sh $v0, 2($s0) -/* E2E54C 802BBC1C 00021400 */ sll $v0, $v0, 0x10 -/* E2E550 802BBC20 1440001F */ bnez $v0, .L802BBCA0 -/* E2E554 802BBC24 0000202D */ daddu $a0, $zero, $zero -/* E2E558 802BBC28 2405FFFF */ addiu $a1, $zero, -1 -/* E2E55C 802BBC2C 0080302D */ daddu $a2, $a0, $zero -/* E2E560 802BBC30 92020000 */ lbu $v0, ($s0) -/* E2E564 802BBC34 0080382D */ daddu $a3, $a0, $zero -/* E2E568 802BBC38 24420001 */ addiu $v0, $v0, 1 -/* E2E56C 802BBC3C A2020000 */ sb $v0, ($s0) -/* E2E570 802BBC40 AFA00010 */ sw $zero, 0x10($sp) -/* E2E574 802BBC44 AFA00014 */ sw $zero, 0x14($sp) -/* E2E578 802BBC48 AFA00018 */ sw $zero, 0x18($sp) -/* E2E57C 802BBC4C 0C0B77B9 */ jal func_802DDEE4 -/* E2E580 802BBC50 AFA0001C */ sw $zero, 0x1c($sp) -/* E2E584 802BBC54 0C038069 */ jal enable_player_input -/* E2E588 802BBC58 00000000 */ nop -/* E2E58C 802BBC5C 3C03FFEF */ lui $v1, 0xffef -/* E2E590 802BBC60 8E220000 */ lw $v0, ($s1) -/* E2E594 802BBC64 3463FFFF */ ori $v1, $v1, 0xffff -/* E2E598 802BBC68 00431024 */ and $v0, $v0, $v1 -/* E2E59C 802BBC6C 080AEF28 */ j .L802BBCA0 -/* E2E5A0 802BBC70 AE220000 */ sw $v0, ($s1) -.L802BBC74_E2E5A4: -/* E2E5A4 802BBC74 92420006 */ lbu $v0, 6($s2) -/* E2E5A8 802BBC78 30420001 */ andi $v0, $v0, 1 -/* E2E5AC 802BBC7C 14400008 */ bnez $v0, .L802BBCA0 -/* E2E5B0 802BBC80 00000000 */ nop -/* E2E5B4 802BBC84 80820000 */ lb $v0, ($a0) -/* E2E5B8 802BBC88 14400005 */ bnez $v0, .L802BBCA0 -/* E2E5BC 802BBC8C 00000000 */ nop -/* E2E5C0 802BBC90 0C03BCCA */ jal enable_partner_ai -/* E2E5C4 802BBC94 A2000000 */ sb $zero, ($s0) -/* E2E5C8 802BBC98 0C03954C */ jal phys_adjust_cam_on_landing -/* E2E5CC 802BBC9C 00000000 */ nop -.L802BBCA0: -/* E2E5D0 802BBCA0 8FBF002C */ lw $ra, 0x2c($sp) -/* E2E5D4 802BBCA4 8FB20028 */ lw $s2, 0x28($sp) -/* E2E5D8 802BBCA8 8FB10024 */ lw $s1, 0x24($sp) -/* E2E5DC 802BBCAC 8FB00020 */ lw $s0, 0x20($sp) -/* E2E5E0 802BBCB0 03E00008 */ jr $ra -/* E2E5E4 802BBCB4 27BD0030 */ addiu $sp, $sp, 0x30 -/* E2E5E8 802BBCB8 00000000 */ nop -/* E2E5EC 802BBCBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s deleted file mode 100644 index 98709f39ee..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BBCC0_E2E5F0 -/* E2E5F0 802BBCC0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) -/* E2E5F4 802BBCC4 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) -/* E2E5F8 802BBCC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2E5FC 802BBCCC AFB00010 */ sw $s0, 0x10($sp) -/* E2E600 802BBCD0 0080802D */ daddu $s0, $a0, $zero -/* E2E604 802BBCD4 30420010 */ andi $v0, $v0, 0x10 -/* E2E608 802BBCD8 1040000C */ beqz $v0, .L802BBD0C -/* E2E60C 802BBCDC AFBF0014 */ sw $ra, 0x14($sp) -/* E2E610 802BBCE0 92020006 */ lbu $v0, 6($s0) -/* E2E614 802BBCE4 30420048 */ andi $v0, $v0, 0x48 -/* E2E618 802BBCE8 10400008 */ beqz $v0, .L802BBD0C -/* E2E61C 802BBCEC 00000000 */ nop -/* E2E620 802BBCF0 0C043F5A */ jal exec_entity_commandlist -/* E2E624 802BBCF4 00000000 */ nop -/* E2E628 802BBCF8 86040014 */ lh $a0, 0x14($s0) -/* E2E62C 802BBCFC 3C050000 */ lui $a1, 0 -/* E2E630 802BBD00 24A500F4 */ addiu $a1, $a1, 0xf4 -/* E2E634 802BBD04 0C048052 */ jal play_model_animation -/* E2E638 802BBD08 00000000 */ nop -.L802BBD0C: -/* E2E63C 802BBD0C 8FBF0014 */ lw $ra, 0x14($sp) -/* E2E640 802BBD10 8FB00010 */ lw $s0, 0x10($sp) -/* E2E644 802BBD14 03E00008 */ jr $ra -/* E2E648 802BBD18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s deleted file mode 100644 index d8a69eb60d..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BBD1C_E2E64C -/* E2E64C 802BBD1C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) -/* E2E650 802BBD20 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) -/* E2E654 802BBD24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2E658 802BBD28 AFB00010 */ sw $s0, 0x10($sp) -/* E2E65C 802BBD2C 0080802D */ daddu $s0, $a0, $zero -/* E2E660 802BBD30 30420010 */ andi $v0, $v0, 0x10 -/* E2E664 802BBD34 1040000C */ beqz $v0, .L802BBD68 -/* E2E668 802BBD38 AFBF0014 */ sw $ra, 0x14($sp) -/* E2E66C 802BBD3C 92020006 */ lbu $v0, 6($s0) -/* E2E670 802BBD40 30420048 */ andi $v0, $v0, 0x48 -/* E2E674 802BBD44 10400008 */ beqz $v0, .L802BBD68 -/* E2E678 802BBD48 00000000 */ nop -/* E2E67C 802BBD4C 0C043F5A */ jal exec_entity_commandlist -/* E2E680 802BBD50 00000000 */ nop -/* E2E684 802BBD54 86040014 */ lh $a0, 0x14($s0) -/* E2E688 802BBD58 3C050000 */ lui $a1, 0 -/* E2E68C 802BBD5C 24A50064 */ addiu $a1, $a1, 0x64 -/* E2E690 802BBD60 0C048052 */ jal play_model_animation -/* E2E694 802BBD64 00000000 */ nop -.L802BBD68: -/* E2E698 802BBD68 8FBF0014 */ lw $ra, 0x14($sp) -/* E2E69C 802BBD6C 8FB00010 */ lw $s0, 0x10($sp) -/* E2E6A0 802BBD70 03E00008 */ jr $ra -/* E2E6A4 802BBD74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s deleted file mode 100644 index 2646f6e18e..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BBE8C_E2E7BC -/* E2E7BC 802BBE8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* E2E7C0 802BBE90 AFB10024 */ sw $s1, 0x24($sp) -/* E2E7C4 802BBE94 0080882D */ daddu $s1, $a0, $zero -/* E2E7C8 802BBE98 AFBF0028 */ sw $ra, 0x28($sp) -/* E2E7CC 802BBE9C AFB00020 */ sw $s0, 0x20($sp) -/* E2E7D0 802BBEA0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* E2E7D4 802BBEA4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* E2E7D8 802BBEA8 0C0AEF5E */ jal func_802BBD78_E2E6A8 -/* E2E7DC 802BBEAC 8E300040 */ lw $s0, 0x40($s1) -/* E2E7E0 802BBEB0 8E020000 */ lw $v0, ($s0) -/* E2E7E4 802BBEB4 28420003 */ slti $v0, $v0, 3 -/* E2E7E8 802BBEB8 1040004D */ beqz $v0, .L802BBFF0 -/* E2E7EC 802BBEBC 00000000 */ nop -/* E2E7F0 802BBEC0 0C00A6C9 */ jal clamp_angle -/* E2E7F4 802BBEC4 C62C0064 */ lwc1 $f12, 0x64($s1) -/* E2E7F8 802BBEC8 3C0140C9 */ lui $at, 0x40c9 -/* E2E7FC 802BBECC 34210FD0 */ ori $at, $at, 0xfd0 -/* E2E800 802BBED0 44811000 */ mtc1 $at, $f2 -/* E2E804 802BBED4 00000000 */ nop -/* E2E808 802BBED8 46020502 */ mul.s $f20, $f0, $f2 -/* E2E80C 802BBEDC 00000000 */ nop -/* E2E810 802BBEE0 3C0143B4 */ lui $at, 0x43b4 -/* E2E814 802BBEE4 44810000 */ mtc1 $at, $f0 -/* E2E818 802BBEE8 00000000 */ nop -/* E2E81C 802BBEEC 4600A503 */ div.s $f20, $f20, $f0 -/* E2E820 802BBEF0 0C00A874 */ jal cos_rad -/* E2E824 802BBEF4 4600A306 */ mov.s $f12, $f20 -/* E2E828 802BBEF8 3C01C03A */ lui $at, 0xc03a -/* E2E82C 802BBEFC 44811800 */ mtc1 $at, $f3 -/* E2E830 802BBF00 44801000 */ mtc1 $zero, $f2 -/* E2E834 802BBF04 46000021 */ cvt.d.s $f0, $f0 -/* E2E838 802BBF08 46220002 */ mul.d $f0, $f0, $f2 -/* E2E83C 802BBF0C 00000000 */ nop -/* E2E840 802BBF10 4600A306 */ mov.s $f12, $f20 -/* E2E844 802BBF14 0C00A85B */ jal sin_rad -/* E2E848 802BBF18 46200520 */ cvt.s.d $f20, $f0 -/* E2E84C 802BBF1C 3C014018 */ lui $at, 0x4018 -/* E2E850 802BBF20 44811800 */ mtc1 $at, $f3 -/* E2E854 802BBF24 44801000 */ mtc1 $zero, $f2 -/* E2E858 802BBF28 46000021 */ cvt.d.s $f0, $f0 -/* E2E85C 802BBF2C 46220002 */ mul.d $f0, $f0, $f2 -/* E2E860 802BBF30 00000000 */ nop -/* E2E864 802BBF34 24040020 */ addiu $a0, $zero, 0x20 -/* E2E868 802BBF38 0C00A67F */ jal rand_int -/* E2E86C 802BBF3C 462005A0 */ cvt.s.d $f22, $f0 -/* E2E870 802BBF40 28420011 */ slti $v0, $v0, 0x11 -/* E2E874 802BBF44 1440002A */ bnez $v0, .L802BBFF0 -/* E2E878 802BBF48 3C025555 */ lui $v0, 0x5555 -/* E2E87C 802BBF4C 8E050000 */ lw $a1, ($s0) -/* E2E880 802BBF50 34425556 */ ori $v0, $v0, 0x5556 -/* E2E884 802BBF54 00A20018 */ mult $a1, $v0 -/* E2E888 802BBF58 C6260064 */ lwc1 $f6, 0x64($s1) -/* E2E88C 802BBF5C 3C0142DC */ lui $at, 0x42dc -/* E2E890 802BBF60 44810000 */ mtc1 $at, $f0 -/* E2E894 802BBF64 24A20001 */ addiu $v0, $a1, 1 -/* E2E898 802BBF68 46003181 */ sub.s $f6, $f6, $f0 -/* E2E89C 802BBF6C AE020000 */ sw $v0, ($s0) -/* E2E8A0 802BBF70 C6240050 */ lwc1 $f4, 0x50($s1) -/* E2E8A4 802BBF74 46162100 */ add.s $f4, $f4, $f22 -/* E2E8A8 802BBF78 00051FC3 */ sra $v1, $a1, 0x1f -/* E2E8AC 802BBF7C 00004010 */ mfhi $t0 -/* E2E8B0 802BBF80 01031823 */ subu $v1, $t0, $v1 -/* E2E8B4 802BBF84 00031040 */ sll $v0, $v1, 1 -/* E2E8B8 802BBF88 00431021 */ addu $v0, $v0, $v1 -/* E2E8BC 802BBF8C 00A22823 */ subu $a1, $a1, $v0 -/* E2E8C0 802BBF90 00051100 */ sll $v0, $a1, 4 -/* E2E8C4 802BBF94 00451023 */ subu $v0, $v0, $a1 -/* E2E8C8 802BBF98 00021040 */ sll $v0, $v0, 1 -/* E2E8CC 802BBF9C 44820000 */ mtc1 $v0, $f0 -/* E2E8D0 802BBFA0 00000000 */ nop -/* E2E8D4 802BBFA4 46800020 */ cvt.s.w $f0, $f0 -/* E2E8D8 802BBFA8 46003180 */ add.s $f6, $f6, $f0 -/* E2E8DC 802BBFAC C6200048 */ lwc1 $f0, 0x48($s1) -/* E2E8E0 802BBFB0 46140000 */ add.s $f0, $f0, $f20 -/* E2E8E4 802BBFB4 C622004C */ lwc1 $f2, 0x4c($s1) -/* E2E8E8 802BBFB8 44072000 */ mfc1 $a3, $f4 -/* E2E8EC 802BBFBC 44050000 */ mfc1 $a1, $f0 -/* E2E8F0 802BBFC0 3C014278 */ lui $at, 0x4278 -/* E2E8F4 802BBFC4 44810000 */ mtc1 $at, $f0 -/* E2E8F8 802BBFC8 24020003 */ addiu $v0, $zero, 3 -/* E2E8FC 802BBFCC AFA20010 */ sw $v0, 0x10($sp) -/* E2E900 802BBFD0 46001080 */ add.s $f2, $f2, $f0 -/* E2E904 802BBFD4 AFA00014 */ sw $zero, 0x14($sp) -/* E2E908 802BBFD8 AFA0001C */ sw $zero, 0x1c($sp) -/* E2E90C 802BBFDC 44061000 */ mfc1 $a2, $f2 -/* E2E910 802BBFE0 4600320D */ trunc.w.s $f8, $f6 -/* E2E914 802BBFE4 E7A80018 */ swc1 $f8, 0x18($sp) -/* E2E918 802BBFE8 0C04C4FD */ jal make_item_entity -/* E2E91C 802BBFEC 24040157 */ addiu $a0, $zero, 0x157 -.L802BBFF0: -/* E2E920 802BBFF0 8FBF0028 */ lw $ra, 0x28($sp) -/* E2E924 802BBFF4 8FB10024 */ lw $s1, 0x24($sp) -/* E2E928 802BBFF8 8FB00020 */ lw $s0, 0x20($sp) -/* E2E92C 802BBFFC D7B60038 */ ldc1 $f22, 0x38($sp) -/* E2E930 802BC000 D7B40030 */ ldc1 $f20, 0x30($sp) -/* E2E934 802BC004 03E00008 */ jr $ra -/* E2E938 802BC008 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s deleted file mode 100644 index 6b6ed62aa7..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC0B8_E2E9E8 -/* E2E9E8 802BC0B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E2E9EC 802BC0BC AFBF0010 */ sw $ra, 0x10($sp) -/* E2E9F0 802BC0C0 84840014 */ lh $a0, 0x14($a0) -/* E2E9F4 802BC0C4 3C050000 */ lui $a1, 0 -/* E2E9F8 802BC0C8 24A50060 */ addiu $a1, $a1, 0x60 -/* E2E9FC 802BC0CC 0C048052 */ jal play_model_animation -/* E2EA00 802BC0D0 00000000 */ nop -/* E2EA04 802BC0D4 0C03805E */ jal disable_player_input -/* E2EA08 802BC0D8 00000000 */ nop -/* E2EA0C 802BC0DC 0C038039 */ jal disable_player_shadow -/* E2EA10 802BC0E0 00000000 */ nop -/* E2EA14 802BC0E4 8FBF0010 */ lw $ra, 0x10($sp) -/* E2EA18 802BC0E8 03E00008 */ jr $ra -/* E2EA1C 802BC0EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s deleted file mode 100644 index 77c8b7b6b1..0000000000 --- a/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BC4B0_E2EDE0 -/* E2EDE0 802BC4B0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* E2EDE4 802BC4B4 AFB500AC */ sw $s5, 0xac($sp) -/* E2EDE8 802BC4B8 3C15800A */ lui $s5, %hi(gMasterGfxPos) -/* E2EDEC 802BC4BC 26B5A66C */ addiu $s5, $s5, %lo(gMasterGfxPos) -/* E2EDF0 802BC4C0 AFBF00B0 */ sw $ra, 0xb0($sp) -/* E2EDF4 802BC4C4 AFB400A8 */ sw $s4, 0xa8($sp) -/* E2EDF8 802BC4C8 AFB300A4 */ sw $s3, 0xa4($sp) -/* E2EDFC 802BC4CC AFB200A0 */ sw $s2, 0xa0($sp) -/* E2EE00 802BC4D0 AFB1009C */ sw $s1, 0x9c($sp) -/* E2EE04 802BC4D4 AFB00098 */ sw $s0, 0x98($sp) -/* E2EE08 802BC4D8 8EB10000 */ lw $s1, ($s5) -/* E2EE0C 802BC4DC 0C04417A */ jal get_entity_by_index -/* E2EE10 802BC4E0 3C140001 */ lui $s4, 1 -/* E2EE14 802BC4E4 27A40018 */ addiu $a0, $sp, 0x18 -/* E2EE18 802BC4E8 0040902D */ daddu $s2, $v0, $zero -/* E2EE1C 802BC4EC 3C050A00 */ lui $a1, 0xa00 -/* E2EE20 802BC4F0 24A50B28 */ addiu $a1, $a1, 0xb28 -/* E2EE24 802BC4F4 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2EE28 802BC4F8 8E420044 */ lw $v0, 0x44($s2) -/* E2EE2C 802BC4FC 8E500040 */ lw $s0, 0x40($s2) -/* E2EE30 802BC500 0C019D60 */ jal guMtxL2F -/* E2EE34 802BC504 00452821 */ addu $a1, $v0, $a1 -/* E2EE38 802BC508 C6000004 */ lwc1 $f0, 4($s0) -/* E2EE3C 802BC50C 3C0142B4 */ lui $at, 0x42b4 -/* E2EE40 802BC510 44816000 */ mtc1 $at, $f12 -/* E2EE44 802BC514 00000000 */ nop -/* E2EE48 802BC518 460C0301 */ sub.s $f12, $f0, $f12 -/* E2EE4C 802BC51C 0C00A6C9 */ jal clamp_angle -/* E2EE50 802BC520 36941630 */ ori $s4, $s4, 0x1630 -/* E2EE54 802BC524 27B00058 */ addiu $s0, $sp, 0x58 -/* E2EE58 802BC528 44801000 */ mtc1 $zero, $f2 -/* E2EE5C 802BC52C 44050000 */ mfc1 $a1, $f0 -/* E2EE60 802BC530 3C013F80 */ lui $at, 0x3f80 -/* E2EE64 802BC534 44810000 */ mtc1 $at, $f0 -/* E2EE68 802BC538 44061000 */ mfc1 $a2, $f2 -/* E2EE6C 802BC53C 0200202D */ daddu $a0, $s0, $zero -/* E2EE70 802BC540 E7A00010 */ swc1 $f0, 0x10($sp) -/* E2EE74 802BC544 0C019EC8 */ jal guRotateF -/* E2EE78 802BC548 00C0382D */ daddu $a3, $a2, $zero -/* E2EE7C 802BC54C 0200202D */ daddu $a0, $s0, $zero -/* E2EE80 802BC550 27A50018 */ addiu $a1, $sp, 0x18 -/* E2EE84 802BC554 0C019D80 */ jal guMtxCatF -/* E2EE88 802BC558 00A0302D */ daddu $a2, $a1, $zero -/* E2EE8C 802BC55C 27A40018 */ addiu $a0, $sp, 0x18 -/* E2EE90 802BC560 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* E2EE94 802BC564 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* E2EE98 802BC568 3C13800A */ lui $s3, %hi(gDisplayContext) -/* E2EE9C 802BC56C 2673A674 */ addiu $s3, $s3, %lo(gDisplayContext) -/* E2EEA0 802BC570 96050000 */ lhu $a1, ($s0) -/* E2EEA4 802BC574 8E620000 */ lw $v0, ($s3) -/* E2EEA8 802BC578 00052980 */ sll $a1, $a1, 6 -/* E2EEAC 802BC57C 00B42821 */ addu $a1, $a1, $s4 -/* E2EEB0 802BC580 0C019D40 */ jal guMtxF2L -/* E2EEB4 802BC584 00452821 */ addu $a1, $v0, $a1 -/* E2EEB8 802BC588 0220202D */ daddu $a0, $s1, $zero -/* E2EEBC 802BC58C 26310008 */ addiu $s1, $s1, 8 -/* E2EEC0 802BC590 0220282D */ daddu $a1, $s1, $zero -/* E2EEC4 802BC594 26310008 */ addiu $s1, $s1, 8 -/* E2EEC8 802BC598 0220302D */ daddu $a2, $s1, $zero -/* E2EECC 802BC59C 26310008 */ addiu $s1, $s1, 8 -/* E2EED0 802BC5A0 3C07D838 */ lui $a3, 0xd838 -/* E2EED4 802BC5A4 34E70002 */ ori $a3, $a3, 2 -/* E2EED8 802BC5A8 96020000 */ lhu $v0, ($s0) -/* E2EEDC 802BC5AC 3C03DA38 */ lui $v1, 0xda38 -/* E2EEE0 802BC5B0 AC830000 */ sw $v1, ($a0) -/* E2EEE4 802BC5B4 AEB10000 */ sw $s1, ($s5) -/* E2EEE8 802BC5B8 24430001 */ addiu $v1, $v0, 1 -/* E2EEEC 802BC5BC 3042FFFF */ andi $v0, $v0, 0xffff -/* E2EEF0 802BC5C0 00021180 */ sll $v0, $v0, 6 -/* E2EEF4 802BC5C4 A6030000 */ sh $v1, ($s0) -/* E2EEF8 802BC5C8 8E630000 */ lw $v1, ($s3) -/* E2EEFC 802BC5CC 00541021 */ addu $v0, $v0, $s4 -/* E2EF00 802BC5D0 00621821 */ addu $v1, $v1, $v0 -/* E2EF04 802BC5D4 AC830004 */ sw $v1, 4($a0) -/* E2EF08 802BC5D8 8E430044 */ lw $v1, 0x44($s2) -/* E2EF0C 802BC5DC 3C02DE00 */ lui $v0, 0xde00 -/* E2EF10 802BC5E0 ACA20000 */ sw $v0, ($a1) -/* E2EF14 802BC5E4 3C020A00 */ lui $v0, 0xa00 -/* E2EF18 802BC5E8 24420BC8 */ addiu $v0, $v0, 0xbc8 -/* E2EF1C 802BC5EC 3042FFFF */ andi $v0, $v0, 0xffff -/* E2EF20 802BC5F0 00621821 */ addu $v1, $v1, $v0 -/* E2EF24 802BC5F4 24020040 */ addiu $v0, $zero, 0x40 -/* E2EF28 802BC5F8 ACA30004 */ sw $v1, 4($a1) -/* E2EF2C 802BC5FC ACC70000 */ sw $a3, ($a2) -/* E2EF30 802BC600 ACC20004 */ sw $v0, 4($a2) -/* E2EF34 802BC604 8FBF00B0 */ lw $ra, 0xb0($sp) -/* E2EF38 802BC608 8FB500AC */ lw $s5, 0xac($sp) -/* E2EF3C 802BC60C 8FB400A8 */ lw $s4, 0xa8($sp) -/* E2EF40 802BC610 8FB300A4 */ lw $s3, 0xa4($sp) -/* E2EF44 802BC614 8FB200A0 */ lw $s2, 0xa0($sp) -/* E2EF48 802BC618 8FB1009C */ lw $s1, 0x9c($sp) -/* E2EF4C 802BC61C 8FB00098 */ lw $s0, 0x98($sp) -/* E2EF50 802BC620 03E00008 */ jr $ra -/* E2EF54 802BC624 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s deleted file mode 100644 index b2264e04d9..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BAE00_E2F750 -/* E2F750 802BAE00 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* E2F754 802BAE04 AFBF00A4 */ sw $ra, 0xa4($sp) -/* E2F758 802BAE08 AFB200A0 */ sw $s2, 0xa0($sp) -/* E2F75C 802BAE0C AFB1009C */ sw $s1, 0x9c($sp) -/* E2F760 802BAE10 0C04417A */ jal get_entity_by_index -/* E2F764 802BAE14 AFB00098 */ sw $s0, 0x98($sp) -/* E2F768 802BAE18 27A40018 */ addiu $a0, $sp, 0x18 -/* E2F76C 802BAE1C 0040902D */ daddu $s2, $v0, $zero -/* E2F770 802BAE20 3C050A00 */ lui $a1, 0xa00 -/* E2F774 802BAE24 24A51968 */ addiu $a1, $a1, 0x1968 -/* E2F778 802BAE28 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2F77C 802BAE2C 8E420044 */ lw $v0, 0x44($s2) -/* E2F780 802BAE30 8E510040 */ lw $s1, 0x40($s2) -/* E2F784 802BAE34 0C019D60 */ jal guMtxL2F -/* E2F788 802BAE38 00452821 */ addu $a1, $v0, $a1 -/* E2F78C 802BAE3C 44800000 */ mtc1 $zero, $f0 -/* E2F790 802BAE40 3C073F80 */ lui $a3, 0x3f80 -/* E2F794 802BAE44 27B00058 */ addiu $s0, $sp, 0x58 -/* E2F798 802BAE48 E7A00010 */ swc1 $f0, 0x10($sp) -/* E2F79C 802BAE4C 8E250008 */ lw $a1, 8($s1) -/* E2F7A0 802BAE50 44060000 */ mfc1 $a2, $f0 -/* E2F7A4 802BAE54 0C019EC8 */ jal guRotateF -/* E2F7A8 802BAE58 0200202D */ daddu $a0, $s0, $zero -/* E2F7AC 802BAE5C 0200202D */ daddu $a0, $s0, $zero -/* E2F7B0 802BAE60 27A50018 */ addiu $a1, $sp, 0x18 -/* E2F7B4 802BAE64 0C019D80 */ jal guMtxCatF -/* E2F7B8 802BAE68 00A0302D */ daddu $a2, $a1, $zero -/* E2F7BC 802BAE6C 27A40018 */ addiu $a0, $sp, 0x18 -/* E2F7C0 802BAE70 26300010 */ addiu $s0, $s1, 0x10 -/* E2F7C4 802BAE74 0C019D40 */ jal guMtxF2L -/* E2F7C8 802BAE78 0200282D */ daddu $a1, $s0, $zero -/* E2F7CC 802BAE7C 3C040001 */ lui $a0, 1 -/* E2F7D0 802BAE80 34841630 */ ori $a0, $a0, 0x1630 -/* E2F7D4 802BAE84 26310050 */ addiu $s1, $s1, 0x50 -/* E2F7D8 802BAE88 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* E2F7DC 802BAE8C 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* E2F7E0 802BAE90 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2F7E4 802BAE94 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2F7E8 802BAE98 00021180 */ sll $v0, $v0, 6 -/* E2F7EC 802BAE9C 00621821 */ addu $v1, $v1, $v0 -/* E2F7F0 802BAEA0 00641821 */ addu $v1, $v1, $a0 -.L802BAEA4: -/* E2F7F4 802BAEA4 8E0A0000 */ lw $t2, ($s0) -/* E2F7F8 802BAEA8 8E0B0004 */ lw $t3, 4($s0) -/* E2F7FC 802BAEAC 8E0C0008 */ lw $t4, 8($s0) -/* E2F800 802BAEB0 8E0D000C */ lw $t5, 0xc($s0) -/* E2F804 802BAEB4 AC6A0000 */ sw $t2, ($v1) -/* E2F808 802BAEB8 AC6B0004 */ sw $t3, 4($v1) -/* E2F80C 802BAEBC AC6C0008 */ sw $t4, 8($v1) -/* E2F810 802BAEC0 AC6D000C */ sw $t5, 0xc($v1) -/* E2F814 802BAEC4 26100010 */ addiu $s0, $s0, 0x10 -/* E2F818 802BAEC8 1611FFF6 */ bne $s0, $s1, .L802BAEA4 -/* E2F81C 802BAECC 24630010 */ addiu $v1, $v1, 0x10 -/* E2F820 802BAED0 3C080001 */ lui $t0, 1 -/* E2F824 802BAED4 35081630 */ ori $t0, $t0, 0x1630 -/* E2F828 802BAED8 3C09D838 */ lui $t1, 0xd838 -/* E2F82C 802BAEDC 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* E2F830 802BAEE0 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* E2F834 802BAEE4 35290002 */ ori $t1, $t1, 2 -/* E2F838 802BAEE8 8CC40000 */ lw $a0, ($a2) -/* E2F83C 802BAEEC 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* E2F840 802BAEF0 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) -/* E2F844 802BAEF4 0080382D */ daddu $a3, $a0, $zero -/* E2F848 802BAEF8 24840008 */ addiu $a0, $a0, 8 -/* E2F84C 802BAEFC ACC40000 */ sw $a0, ($a2) -/* E2F850 802BAF00 94A20000 */ lhu $v0, ($a1) -/* E2F854 802BAF04 3C03DA38 */ lui $v1, 0xda38 -/* E2F858 802BAF08 ACE30000 */ sw $v1, ($a3) -/* E2F85C 802BAF0C 24430001 */ addiu $v1, $v0, 1 -/* E2F860 802BAF10 3042FFFF */ andi $v0, $v0, 0xffff -/* E2F864 802BAF14 00021180 */ sll $v0, $v0, 6 -/* E2F868 802BAF18 A4A30000 */ sh $v1, ($a1) -/* E2F86C 802BAF1C 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2F870 802BAF20 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2F874 802BAF24 00481021 */ addu $v0, $v0, $t0 -/* E2F878 802BAF28 00621821 */ addu $v1, $v1, $v0 -/* E2F87C 802BAF2C 24820008 */ addiu $v0, $a0, 8 -/* E2F880 802BAF30 ACE30004 */ sw $v1, 4($a3) -/* E2F884 802BAF34 ACC20000 */ sw $v0, ($a2) -/* E2F888 802BAF38 8E430044 */ lw $v1, 0x44($s2) -/* E2F88C 802BAF3C 3C02DE00 */ lui $v0, 0xde00 -/* E2F890 802BAF40 AC820000 */ sw $v0, ($a0) -/* E2F894 802BAF44 24820010 */ addiu $v0, $a0, 0x10 -/* E2F898 802BAF48 ACC20000 */ sw $v0, ($a2) -/* E2F89C 802BAF4C 24020040 */ addiu $v0, $zero, 0x40 -/* E2F8A0 802BAF50 AC82000C */ sw $v0, 0xc($a0) -/* E2F8A4 802BAF54 3C020A00 */ lui $v0, 0xa00 -/* E2F8A8 802BAF58 24421CF0 */ addiu $v0, $v0, 0x1cf0 -/* E2F8AC 802BAF5C 3042FFFF */ andi $v0, $v0, 0xffff -/* E2F8B0 802BAF60 AC890008 */ sw $t1, 8($a0) -/* E2F8B4 802BAF64 00621821 */ addu $v1, $v1, $v0 -/* E2F8B8 802BAF68 AC830004 */ sw $v1, 4($a0) -/* E2F8BC 802BAF6C 8FBF00A4 */ lw $ra, 0xa4($sp) -/* E2F8C0 802BAF70 8FB200A0 */ lw $s2, 0xa0($sp) -/* E2F8C4 802BAF74 8FB1009C */ lw $s1, 0x9c($sp) -/* E2F8C8 802BAF78 8FB00098 */ lw $s0, 0x98($sp) -/* E2F8CC 802BAF7C 03E00008 */ jr $ra -/* E2F8D0 802BAF80 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s deleted file mode 100644 index dbbfbbc7d9..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BAF84_E2F8D4 -/* E2F8D4 802BAF84 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* E2F8D8 802BAF88 AFBF00A4 */ sw $ra, 0xa4($sp) -/* E2F8DC 802BAF8C AFB200A0 */ sw $s2, 0xa0($sp) -/* E2F8E0 802BAF90 AFB1009C */ sw $s1, 0x9c($sp) -/* E2F8E4 802BAF94 0C04417A */ jal get_entity_by_index -/* E2F8E8 802BAF98 AFB00098 */ sw $s0, 0x98($sp) -/* E2F8EC 802BAF9C 27A40018 */ addiu $a0, $sp, 0x18 -/* E2F8F0 802BAFA0 0040902D */ daddu $s2, $v0, $zero -/* E2F8F4 802BAFA4 3C050A00 */ lui $a1, 0xa00 -/* E2F8F8 802BAFA8 24A519A8 */ addiu $a1, $a1, 0x19a8 -/* E2F8FC 802BAFAC 30A5FFFF */ andi $a1, $a1, 0xffff -/* E2F900 802BAFB0 8E420044 */ lw $v0, 0x44($s2) -/* E2F904 802BAFB4 8E510040 */ lw $s1, 0x40($s2) -/* E2F908 802BAFB8 0C019D60 */ jal guMtxL2F -/* E2F90C 802BAFBC 00452821 */ addu $a1, $v0, $a1 -/* E2F910 802BAFC0 44800000 */ mtc1 $zero, $f0 -/* E2F914 802BAFC4 3C073F80 */ lui $a3, 0x3f80 -/* E2F918 802BAFC8 27B00058 */ addiu $s0, $sp, 0x58 -/* E2F91C 802BAFCC E7A00010 */ swc1 $f0, 0x10($sp) -/* E2F920 802BAFD0 8E25000C */ lw $a1, 0xc($s1) -/* E2F924 802BAFD4 44060000 */ mfc1 $a2, $f0 -/* E2F928 802BAFD8 0C019EC8 */ jal guRotateF -/* E2F92C 802BAFDC 0200202D */ daddu $a0, $s0, $zero -/* E2F930 802BAFE0 0200202D */ daddu $a0, $s0, $zero -/* E2F934 802BAFE4 27A50018 */ addiu $a1, $sp, 0x18 -/* E2F938 802BAFE8 0C019D80 */ jal guMtxCatF -/* E2F93C 802BAFEC 00A0302D */ daddu $a2, $a1, $zero -/* E2F940 802BAFF0 27A40018 */ addiu $a0, $sp, 0x18 -/* E2F944 802BAFF4 26300050 */ addiu $s0, $s1, 0x50 -/* E2F948 802BAFF8 0C019D40 */ jal guMtxF2L -/* E2F94C 802BAFFC 0200282D */ daddu $a1, $s0, $zero -/* E2F950 802BB000 3C040001 */ lui $a0, 1 -/* E2F954 802BB004 34841630 */ ori $a0, $a0, 0x1630 -/* E2F958 802BB008 26310090 */ addiu $s1, $s1, 0x90 -/* E2F95C 802BB00C 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* E2F960 802BB010 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* E2F964 802BB014 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2F968 802BB018 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2F96C 802BB01C 00021180 */ sll $v0, $v0, 6 -/* E2F970 802BB020 00621821 */ addu $v1, $v1, $v0 -/* E2F974 802BB024 00641821 */ addu $v1, $v1, $a0 -.L802BB028: -/* E2F978 802BB028 8E0A0000 */ lw $t2, ($s0) -/* E2F97C 802BB02C 8E0B0004 */ lw $t3, 4($s0) -/* E2F980 802BB030 8E0C0008 */ lw $t4, 8($s0) -/* E2F984 802BB034 8E0D000C */ lw $t5, 0xc($s0) -/* E2F988 802BB038 AC6A0000 */ sw $t2, ($v1) -/* E2F98C 802BB03C AC6B0004 */ sw $t3, 4($v1) -/* E2F990 802BB040 AC6C0008 */ sw $t4, 8($v1) -/* E2F994 802BB044 AC6D000C */ sw $t5, 0xc($v1) -/* E2F998 802BB048 26100010 */ addiu $s0, $s0, 0x10 -/* E2F99C 802BB04C 1611FFF6 */ bne $s0, $s1, .L802BB028 -/* E2F9A0 802BB050 24630010 */ addiu $v1, $v1, 0x10 -/* E2F9A4 802BB054 3C080001 */ lui $t0, 1 -/* E2F9A8 802BB058 35081630 */ ori $t0, $t0, 0x1630 -/* E2F9AC 802BB05C 3C09D838 */ lui $t1, 0xd838 -/* E2F9B0 802BB060 3C06800A */ lui $a2, %hi(gMasterGfxPos) -/* E2F9B4 802BB064 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) -/* E2F9B8 802BB068 35290002 */ ori $t1, $t1, 2 -/* E2F9BC 802BB06C 8CC40000 */ lw $a0, ($a2) -/* E2F9C0 802BB070 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* E2F9C4 802BB074 24A541F0 */ addiu $a1, $a1, %lo(gMatrixListPos) -/* E2F9C8 802BB078 0080382D */ daddu $a3, $a0, $zero -/* E2F9CC 802BB07C 24840008 */ addiu $a0, $a0, 8 -/* E2F9D0 802BB080 ACC40000 */ sw $a0, ($a2) -/* E2F9D4 802BB084 94A20000 */ lhu $v0, ($a1) -/* E2F9D8 802BB088 3C03DA38 */ lui $v1, 0xda38 -/* E2F9DC 802BB08C ACE30000 */ sw $v1, ($a3) -/* E2F9E0 802BB090 24430001 */ addiu $v1, $v0, 1 -/* E2F9E4 802BB094 3042FFFF */ andi $v0, $v0, 0xffff -/* E2F9E8 802BB098 00021180 */ sll $v0, $v0, 6 -/* E2F9EC 802BB09C A4A30000 */ sh $v1, ($a1) -/* E2F9F0 802BB0A0 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E2F9F4 802BB0A4 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E2F9F8 802BB0A8 00481021 */ addu $v0, $v0, $t0 -/* E2F9FC 802BB0AC 00621821 */ addu $v1, $v1, $v0 -/* E2FA00 802BB0B0 24820008 */ addiu $v0, $a0, 8 -/* E2FA04 802BB0B4 ACE30004 */ sw $v1, 4($a3) -/* E2FA08 802BB0B8 ACC20000 */ sw $v0, ($a2) -/* E2FA0C 802BB0BC 8E430044 */ lw $v1, 0x44($s2) -/* E2FA10 802BB0C0 3C02DE00 */ lui $v0, 0xde00 -/* E2FA14 802BB0C4 AC820000 */ sw $v0, ($a0) -/* E2FA18 802BB0C8 24820010 */ addiu $v0, $a0, 0x10 -/* E2FA1C 802BB0CC ACC20000 */ sw $v0, ($a2) -/* E2FA20 802BB0D0 24020040 */ addiu $v0, $zero, 0x40 -/* E2FA24 802BB0D4 AC82000C */ sw $v0, 0xc($a0) -/* E2FA28 802BB0D8 3C020A00 */ lui $v0, 0xa00 -/* E2FA2C 802BB0DC 24421B68 */ addiu $v0, $v0, 0x1b68 -/* E2FA30 802BB0E0 3042FFFF */ andi $v0, $v0, 0xffff -/* E2FA34 802BB0E4 AC890008 */ sw $t1, 8($a0) -/* E2FA38 802BB0E8 00621821 */ addu $v1, $v1, $v0 -/* E2FA3C 802BB0EC AC830004 */ sw $v1, 4($a0) -/* E2FA40 802BB0F0 8FBF00A4 */ lw $ra, 0xa4($sp) -/* E2FA44 802BB0F4 8FB200A0 */ lw $s2, 0xa0($sp) -/* E2FA48 802BB0F8 8FB1009C */ lw $s1, 0x9c($sp) -/* E2FA4C 802BB0FC 8FB00098 */ lw $s0, 0x98($sp) -/* E2FA50 802BB100 03E00008 */ jr $ra -/* E2FA54 802BB104 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s deleted file mode 100644 index b114b2fdbb..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s +++ /dev/null @@ -1,176 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB108_E2FA58 -/* E2FA58 802BB108 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E2FA5C 802BB10C AFBF002C */ sw $ra, 0x2c($sp) -/* E2FA60 802BB110 AFB60028 */ sw $s6, 0x28($sp) -/* E2FA64 802BB114 AFB50024 */ sw $s5, 0x24($sp) -/* E2FA68 802BB118 AFB40020 */ sw $s4, 0x20($sp) -/* E2FA6C 802BB11C AFB3001C */ sw $s3, 0x1c($sp) -/* E2FA70 802BB120 AFB20018 */ sw $s2, 0x18($sp) -/* E2FA74 802BB124 AFB10014 */ sw $s1, 0x14($sp) -/* E2FA78 802BB128 0C04417A */ jal get_entity_by_index -/* E2FA7C 802BB12C AFB00010 */ sw $s0, 0x10($sp) -/* E2FA80 802BB130 3C07E300 */ lui $a3, 0xe300 -/* E2FA84 802BB134 34E71001 */ ori $a3, $a3, 0x1001 -/* E2FA88 802BB138 3C08F500 */ lui $t0, 0xf500 -/* E2FA8C 802BB13C 35080100 */ ori $t0, $t0, 0x100 -/* E2FA90 802BB140 3C090703 */ lui $t1, 0x703 -/* E2FA94 802BB144 3529C000 */ ori $t1, $t1, 0xc000 -/* E2FA98 802BB148 3C0AD700 */ lui $t2, 0xd700 -/* E2FA9C 802BB14C 354A0002 */ ori $t2, $t2, 2 -/* E2FAA0 802BB150 3C0DFC12 */ lui $t5, 0xfc12 -/* E2FAA4 802BB154 35AD1824 */ ori $t5, $t5, 0x1824 -/* E2FAA8 802BB158 3C0CFF33 */ lui $t4, 0xff33 -/* E2FAAC 802BB15C 358CFFFF */ ori $t4, $t4, 0xffff -/* E2FAB0 802BB160 3C0EE300 */ lui $t6, 0xe300 -/* E2FAB4 802BB164 35CE0D01 */ ori $t6, $t6, 0xd01 -/* E2FAB8 802BB168 3C0FE300 */ lui $t7, 0xe300 -/* E2FABC 802BB16C 35EF0F00 */ ori $t7, $t7, 0xf00 -/* E2FAC0 802BB170 3C100709 */ lui $s0, 0x709 -/* E2FAC4 802BB174 36104060 */ ori $s0, $s0, 0x4060 -/* E2FAC8 802BB178 3C11071F */ lui $s1, 0x71f -/* E2FACC 802BB17C 3631F200 */ ori $s1, $s1, 0xf200 -/* E2FAD0 802BB180 3C13F540 */ lui $s3, 0xf540 -/* E2FAD4 802BB184 36730800 */ ori $s3, $s3, 0x800 -/* E2FAD8 802BB188 3C120009 */ lui $s2, 9 -/* E2FADC 802BB18C 36524060 */ ori $s2, $s2, 0x4060 -/* E2FAE0 802BB190 3C14000F */ lui $s4, 0xf -/* E2FAE4 802BB194 3694C07C */ ori $s4, $s4, 0xc07c -/* E2FAE8 802BB198 3C15E300 */ lui $s5, 0xe300 -/* E2FAEC 802BB19C 36B50C00 */ ori $s5, $s5, 0xc00 -/* E2FAF0 802BB1A0 3C16E300 */ lui $s6, 0xe300 -/* E2FAF4 802BB1A4 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* E2FAF8 802BB1A8 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* E2FAFC 802BB1AC 36D61201 */ ori $s6, $s6, 0x1201 -/* E2FB00 802BB1B0 8C830000 */ lw $v1, ($a0) -/* E2FB04 802BB1B4 3C06E700 */ lui $a2, 0xe700 -/* E2FB08 802BB1B8 0060282D */ daddu $a1, $v1, $zero -/* E2FB0C 802BB1BC 24630008 */ addiu $v1, $v1, 8 -/* E2FB10 802BB1C0 AC830000 */ sw $v1, ($a0) -/* E2FB14 802BB1C4 8C4B0040 */ lw $t3, 0x40($v0) -/* E2FB18 802BB1C8 24620008 */ addiu $v0, $v1, 8 -/* E2FB1C 802BB1CC ACA60000 */ sw $a2, ($a1) -/* E2FB20 802BB1D0 ACA00004 */ sw $zero, 4($a1) -/* E2FB24 802BB1D4 AC820000 */ sw $v0, ($a0) -/* E2FB28 802BB1D8 34028000 */ ori $v0, $zero, 0x8000 -/* E2FB2C 802BB1DC AC620004 */ sw $v0, 4($v1) -/* E2FB30 802BB1E0 24620010 */ addiu $v0, $v1, 0x10 -/* E2FB34 802BB1E4 AC670000 */ sw $a3, ($v1) -/* E2FB38 802BB1E8 AC820000 */ sw $v0, ($a0) -/* E2FB3C 802BB1EC 3C02FD10 */ lui $v0, 0xfd10 -/* E2FB40 802BB1F0 AC620008 */ sw $v0, 8($v1) -/* E2FB44 802BB1F4 3C020A00 */ lui $v0, 0xa00 -/* E2FB48 802BB1F8 244218A0 */ addiu $v0, $v0, 0x18a0 -/* E2FB4C 802BB1FC AC62000C */ sw $v0, 0xc($v1) -/* E2FB50 802BB200 24620018 */ addiu $v0, $v1, 0x18 -/* E2FB54 802BB204 AC820000 */ sw $v0, ($a0) -/* E2FB58 802BB208 3C02E800 */ lui $v0, 0xe800 -/* E2FB5C 802BB20C AC620010 */ sw $v0, 0x10($v1) -/* E2FB60 802BB210 24620020 */ addiu $v0, $v1, 0x20 -/* E2FB64 802BB214 AC600014 */ sw $zero, 0x14($v1) -/* E2FB68 802BB218 AC820000 */ sw $v0, ($a0) -/* E2FB6C 802BB21C 3C020700 */ lui $v0, 0x700 -/* E2FB70 802BB220 AC62001C */ sw $v0, 0x1c($v1) -/* E2FB74 802BB224 24620028 */ addiu $v0, $v1, 0x28 -/* E2FB78 802BB228 3C05E600 */ lui $a1, 0xe600 -/* E2FB7C 802BB22C AC680018 */ sw $t0, 0x18($v1) -/* E2FB80 802BB230 AC820000 */ sw $v0, ($a0) -/* E2FB84 802BB234 24620030 */ addiu $v0, $v1, 0x30 -/* E2FB88 802BB238 AC650020 */ sw $a1, 0x20($v1) -/* E2FB8C 802BB23C AC600024 */ sw $zero, 0x24($v1) -/* E2FB90 802BB240 AC820000 */ sw $v0, ($a0) -/* E2FB94 802BB244 3C02F000 */ lui $v0, 0xf000 -/* E2FB98 802BB248 AC620028 */ sw $v0, 0x28($v1) -/* E2FB9C 802BB24C 24620038 */ addiu $v0, $v1, 0x38 -/* E2FBA0 802BB250 AC69002C */ sw $t1, 0x2c($v1) -/* E2FBA4 802BB254 AC820000 */ sw $v0, ($a0) -/* E2FBA8 802BB258 24620040 */ addiu $v0, $v1, 0x40 -/* E2FBAC 802BB25C AC660030 */ sw $a2, 0x30($v1) -/* E2FBB0 802BB260 AC600034 */ sw $zero, 0x34($v1) -/* E2FBB4 802BB264 AC820000 */ sw $v0, ($a0) -/* E2FBB8 802BB268 2402FFFF */ addiu $v0, $zero, -1 -/* E2FBBC 802BB26C AC62003C */ sw $v0, 0x3c($v1) -/* E2FBC0 802BB270 24620048 */ addiu $v0, $v1, 0x48 -/* E2FBC4 802BB274 AC6A0038 */ sw $t2, 0x38($v1) -/* E2FBC8 802BB278 AC820000 */ sw $v0, ($a0) -/* E2FBCC 802BB27C 24620050 */ addiu $v0, $v1, 0x50 -/* E2FBD0 802BB280 AC6D0040 */ sw $t5, 0x40($v1) -/* E2FBD4 802BB284 AC6C0044 */ sw $t4, 0x44($v1) -/* E2FBD8 802BB288 AC820000 */ sw $v0, ($a0) -/* E2FBDC 802BB28C 24620058 */ addiu $v0, $v1, 0x58 -/* E2FBE0 802BB290 AC6E0048 */ sw $t6, 0x48($v1) -/* E2FBE4 802BB294 AC60004C */ sw $zero, 0x4c($v1) -/* E2FBE8 802BB298 AC820000 */ sw $v0, ($a0) -/* E2FBEC 802BB29C 24620060 */ addiu $v0, $v1, 0x60 -/* E2FBF0 802BB2A0 AC6F0050 */ sw $t7, 0x50($v1) -/* E2FBF4 802BB2A4 AC600054 */ sw $zero, 0x54($v1) -/* E2FBF8 802BB2A8 AC820000 */ sw $v0, ($a0) -/* E2FBFC 802BB2AC 3C02FD50 */ lui $v0, 0xfd50 -/* E2FC00 802BB2B0 AC620058 */ sw $v0, 0x58($v1) -/* E2FC04 802BB2B4 3C020A00 */ lui $v0, 0xa00 -/* E2FC08 802BB2B8 244214A0 */ addiu $v0, $v0, 0x14a0 -/* E2FC0C 802BB2BC AC62005C */ sw $v0, 0x5c($v1) -/* E2FC10 802BB2C0 24620068 */ addiu $v0, $v1, 0x68 -/* E2FC14 802BB2C4 AC820000 */ sw $v0, ($a0) -/* E2FC18 802BB2C8 3C02F550 */ lui $v0, 0xf550 -/* E2FC1C 802BB2CC AC620060 */ sw $v0, 0x60($v1) -/* E2FC20 802BB2D0 24620070 */ addiu $v0, $v1, 0x70 -/* E2FC24 802BB2D4 AC700064 */ sw $s0, 0x64($v1) -/* E2FC28 802BB2D8 AC820000 */ sw $v0, ($a0) -/* E2FC2C 802BB2DC 24620078 */ addiu $v0, $v1, 0x78 -/* E2FC30 802BB2E0 AC650068 */ sw $a1, 0x68($v1) -/* E2FC34 802BB2E4 AC60006C */ sw $zero, 0x6c($v1) -/* E2FC38 802BB2E8 AC820000 */ sw $v0, ($a0) -/* E2FC3C 802BB2EC 3C02F300 */ lui $v0, 0xf300 -/* E2FC40 802BB2F0 AC620070 */ sw $v0, 0x70($v1) -/* E2FC44 802BB2F4 24620080 */ addiu $v0, $v1, 0x80 -/* E2FC48 802BB2F8 AC710074 */ sw $s1, 0x74($v1) -/* E2FC4C 802BB2FC AC820000 */ sw $v0, ($a0) -/* E2FC50 802BB300 24620088 */ addiu $v0, $v1, 0x88 -/* E2FC54 802BB304 AC660078 */ sw $a2, 0x78($v1) -/* E2FC58 802BB308 AC60007C */ sw $zero, 0x7c($v1) -/* E2FC5C 802BB30C AC820000 */ sw $v0, ($a0) -/* E2FC60 802BB310 24620090 */ addiu $v0, $v1, 0x90 -/* E2FC64 802BB314 3C05F200 */ lui $a1, 0xf200 -/* E2FC68 802BB318 AC730080 */ sw $s3, 0x80($v1) -/* E2FC6C 802BB31C AC720084 */ sw $s2, 0x84($v1) -/* E2FC70 802BB320 AC820000 */ sw $v0, ($a0) -/* E2FC74 802BB324 24620098 */ addiu $v0, $v1, 0x98 -/* E2FC78 802BB328 AC650088 */ sw $a1, 0x88($v1) -/* E2FC7C 802BB32C AC74008C */ sw $s4, 0x8c($v1) -/* E2FC80 802BB330 AC820000 */ sw $v0, ($a0) -/* E2FC84 802BB334 3C020008 */ lui $v0, 8 -/* E2FC88 802BB338 AC620094 */ sw $v0, 0x94($v1) -/* E2FC8C 802BB33C 246200A0 */ addiu $v0, $v1, 0xa0 -/* E2FC90 802BB340 AC750090 */ sw $s5, 0x90($v1) -/* E2FC94 802BB344 AC820000 */ sw $v0, ($a0) -/* E2FC98 802BB348 24022000 */ addiu $v0, $zero, 0x2000 -/* E2FC9C 802BB34C AC62009C */ sw $v0, 0x9c($v1) -/* E2FCA0 802BB350 246200A8 */ addiu $v0, $v1, 0xa8 -/* E2FCA4 802BB354 AC760098 */ sw $s6, 0x98($v1) -/* E2FCA8 802BB358 AC820000 */ sw $v0, ($a0) -/* E2FCAC 802BB35C 81620003 */ lb $v0, 3($t3) -/* E2FCB0 802BB360 00021080 */ sll $v0, $v0, 2 -/* E2FCB4 802BB364 30420FFF */ andi $v0, $v0, 0xfff -/* E2FCB8 802BB368 00021300 */ sll $v0, $v0, 0xc -/* E2FCBC 802BB36C 00451025 */ or $v0, $v0, $a1 -/* E2FCC0 802BB370 AC6200A0 */ sw $v0, 0xa0($v1) -/* E2FCC4 802BB374 81620003 */ lb $v0, 3($t3) -/* E2FCC8 802BB378 2442007C */ addiu $v0, $v0, 0x7c -/* E2FCCC 802BB37C 00021080 */ sll $v0, $v0, 2 -/* E2FCD0 802BB380 30420FFF */ andi $v0, $v0, 0xfff -/* E2FCD4 802BB384 00021300 */ sll $v0, $v0, 0xc -/* E2FCD8 802BB388 3442007C */ ori $v0, $v0, 0x7c -/* E2FCDC 802BB38C AC6200A4 */ sw $v0, 0xa4($v1) -/* E2FCE0 802BB390 8FBF002C */ lw $ra, 0x2c($sp) -/* E2FCE4 802BB394 8FB60028 */ lw $s6, 0x28($sp) -/* E2FCE8 802BB398 8FB50024 */ lw $s5, 0x24($sp) -/* E2FCEC 802BB39C 8FB40020 */ lw $s4, 0x20($sp) -/* E2FCF0 802BB3A0 8FB3001C */ lw $s3, 0x1c($sp) -/* E2FCF4 802BB3A4 8FB20018 */ lw $s2, 0x18($sp) -/* E2FCF8 802BB3A8 8FB10014 */ lw $s1, 0x14($sp) -/* E2FCFC 802BB3AC 8FB00010 */ lw $s0, 0x10($sp) -/* E2FD00 802BB3B0 03E00008 */ jr $ra -/* E2FD04 802BB3B4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s deleted file mode 100644 index 4abfc4e2a9..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s +++ /dev/null @@ -1,215 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB3B8_E2FD08 -/* E2FD08 802BB3B8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E2FD0C 802BB3BC AFB40020 */ sw $s4, 0x20($sp) -/* E2FD10 802BB3C0 0080A02D */ daddu $s4, $a0, $zero -/* E2FD14 802BB3C4 AFBF0030 */ sw $ra, 0x30($sp) -/* E2FD18 802BB3C8 AFB7002C */ sw $s7, 0x2c($sp) -/* E2FD1C 802BB3CC AFB60028 */ sw $s6, 0x28($sp) -/* E2FD20 802BB3D0 AFB50024 */ sw $s5, 0x24($sp) -/* E2FD24 802BB3D4 AFB3001C */ sw $s3, 0x1c($sp) -/* E2FD28 802BB3D8 AFB20018 */ sw $s2, 0x18($sp) -/* E2FD2C 802BB3DC AFB10014 */ sw $s1, 0x14($sp) -/* E2FD30 802BB3E0 0C04417A */ jal get_entity_by_index -/* E2FD34 802BB3E4 AFB00010 */ sw $s0, 0x10($sp) -/* E2FD38 802BB3E8 3C05E300 */ lui $a1, 0xe300 -/* E2FD3C 802BB3EC 34A51001 */ ori $a1, $a1, 0x1001 -/* E2FD40 802BB3F0 3C06D700 */ lui $a2, 0xd700 -/* E2FD44 802BB3F4 34C60002 */ ori $a2, $a2, 2 -/* E2FD48 802BB3F8 3C08FC20 */ lui $t0, 0xfc20 -/* E2FD4C 802BB3FC 3508A204 */ ori $t0, $t0, 0xa204 -/* E2FD50 802BB400 3C07FF13 */ lui $a3, 0xff13 -/* E2FD54 802BB404 34E7FFFF */ ori $a3, $a3, 0xffff -/* E2FD58 802BB408 3C09E300 */ lui $t1, 0xe300 -/* E2FD5C 802BB40C 35290D01 */ ori $t1, $t1, 0xd01 -/* E2FD60 802BB410 3C0BE300 */ lui $t3, 0xe300 -/* E2FD64 802BB414 356B0F00 */ ori $t3, $t3, 0xf00 -/* E2FD68 802BB418 3C0CFD88 */ lui $t4, 0xfd88 -/* E2FD6C 802BB41C 358C001F */ ori $t4, $t4, 0x1f -/* E2FD70 802BB420 3C0AF588 */ lui $t2, 0xf588 -/* E2FD74 802BB424 354A0800 */ ori $t2, $t2, 0x800 -/* E2FD78 802BB428 3C0D0701 */ lui $t5, 0x701 -/* E2FD7C 802BB42C 35AD4050 */ ori $t5, $t5, 0x4050 -/* E2FD80 802BB430 3C0E0707 */ lui $t6, 0x707 -/* E2FD84 802BB434 35CEC07C */ ori $t6, $t6, 0xc07c -/* E2FD88 802BB438 3C120001 */ lui $s2, 1 -/* E2FD8C 802BB43C 36524050 */ ori $s2, $s2, 0x4050 -/* E2FD90 802BB440 3C150007 */ lui $s5, 7 -/* E2FD94 802BB444 36B5C07C */ ori $s5, $s5, 0xc07c -/* E2FD98 802BB448 3C0FF588 */ lui $t7, 0xf588 -/* E2FD9C 802BB44C 35EF0880 */ ori $t7, $t7, 0x880 -/* E2FDA0 802BB450 3C160101 */ lui $s6, 0x101 -/* E2FDA4 802BB454 36D64050 */ ori $s6, $s6, 0x4050 -/* E2FDA8 802BB458 3C170107 */ lui $s7, 0x107 -/* E2FDAC 802BB45C 36F7C07C */ ori $s7, $s7, 0xc07c -/* E2FDB0 802BB460 3C18E300 */ lui $t8, 0xe300 -/* E2FDB4 802BB464 37180C00 */ ori $t8, $t8, 0xc00 -/* E2FDB8 802BB468 3C19E300 */ lui $t9, 0xe300 -/* E2FDBC 802BB46C 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* E2FDC0 802BB470 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) -/* E2FDC4 802BB474 37391201 */ ori $t9, $t9, 0x1201 -/* E2FDC8 802BB478 8E030000 */ lw $v1, ($s0) -/* E2FDCC 802BB47C 3C13E700 */ lui $s3, 0xe700 -/* E2FDD0 802BB480 0060202D */ daddu $a0, $v1, $zero -/* E2FDD4 802BB484 24630008 */ addiu $v1, $v1, 8 -/* E2FDD8 802BB488 AE030000 */ sw $v1, ($s0) -/* E2FDDC 802BB48C 8C510040 */ lw $s1, 0x40($v0) -/* E2FDE0 802BB490 24620008 */ addiu $v0, $v1, 8 -/* E2FDE4 802BB494 AC930000 */ sw $s3, ($a0) -/* E2FDE8 802BB498 AC800004 */ sw $zero, 4($a0) -/* E2FDEC 802BB49C AE020000 */ sw $v0, ($s0) -/* E2FDF0 802BB4A0 24620010 */ addiu $v0, $v1, 0x10 -/* E2FDF4 802BB4A4 AC650000 */ sw $a1, ($v1) -/* E2FDF8 802BB4A8 AC600004 */ sw $zero, 4($v1) -/* E2FDFC 802BB4AC AE020000 */ sw $v0, ($s0) -/* E2FE00 802BB4B0 2402FFFF */ addiu $v0, $zero, -1 -/* E2FE04 802BB4B4 AC62000C */ sw $v0, 0xc($v1) -/* E2FE08 802BB4B8 24620018 */ addiu $v0, $v1, 0x18 -/* E2FE0C 802BB4BC AC660008 */ sw $a2, 8($v1) -/* E2FE10 802BB4C0 AE020000 */ sw $v0, ($s0) -/* E2FE14 802BB4C4 24620020 */ addiu $v0, $v1, 0x20 -/* E2FE18 802BB4C8 AC680010 */ sw $t0, 0x10($v1) -/* E2FE1C 802BB4CC AC670014 */ sw $a3, 0x14($v1) -/* E2FE20 802BB4D0 AE020000 */ sw $v0, ($s0) -/* E2FE24 802BB4D4 24620028 */ addiu $v0, $v1, 0x28 -/* E2FE28 802BB4D8 AC690018 */ sw $t1, 0x18($v1) -/* E2FE2C 802BB4DC AC60001C */ sw $zero, 0x1c($v1) -/* E2FE30 802BB4E0 AE020000 */ sw $v0, ($s0) -/* E2FE34 802BB4E4 24620030 */ addiu $v0, $v1, 0x30 -/* E2FE38 802BB4E8 AC6B0020 */ sw $t3, 0x20($v1) -/* E2FE3C 802BB4EC AC600024 */ sw $zero, 0x24($v1) -/* E2FE40 802BB4F0 AE020000 */ sw $v0, ($s0) -/* E2FE44 802BB4F4 3C020A00 */ lui $v0, 0xa00 -/* E2FE48 802BB4F8 24420BF0 */ addiu $v0, $v0, 0xbf0 -/* E2FE4C 802BB4FC AC62002C */ sw $v0, 0x2c($v1) -/* E2FE50 802BB500 24620038 */ addiu $v0, $v1, 0x38 -/* E2FE54 802BB504 AC6C0028 */ sw $t4, 0x28($v1) -/* E2FE58 802BB508 AE020000 */ sw $v0, ($s0) -/* E2FE5C 802BB50C 24620040 */ addiu $v0, $v1, 0x40 -/* E2FE60 802BB510 3C05E600 */ lui $a1, 0xe600 -/* E2FE64 802BB514 AC6A0030 */ sw $t2, 0x30($v1) -/* E2FE68 802BB518 AC6D0034 */ sw $t5, 0x34($v1) -/* E2FE6C 802BB51C AE020000 */ sw $v0, ($s0) -/* E2FE70 802BB520 24620048 */ addiu $v0, $v1, 0x48 -/* E2FE74 802BB524 3C04F400 */ lui $a0, 0xf400 -/* E2FE78 802BB528 AC650038 */ sw $a1, 0x38($v1) -/* E2FE7C 802BB52C AC60003C */ sw $zero, 0x3c($v1) -/* E2FE80 802BB530 AE020000 */ sw $v0, ($s0) -/* E2FE84 802BB534 24620050 */ addiu $v0, $v1, 0x50 -/* E2FE88 802BB538 AC640040 */ sw $a0, 0x40($v1) -/* E2FE8C 802BB53C AC6E0044 */ sw $t6, 0x44($v1) -/* E2FE90 802BB540 AE020000 */ sw $v0, ($s0) -/* E2FE94 802BB544 24620058 */ addiu $v0, $v1, 0x58 -/* E2FE98 802BB548 AC730048 */ sw $s3, 0x48($v1) -/* E2FE9C 802BB54C AC60004C */ sw $zero, 0x4c($v1) -/* E2FEA0 802BB550 AE020000 */ sw $v0, ($s0) -/* E2FEA4 802BB554 24620060 */ addiu $v0, $v1, 0x60 -/* E2FEA8 802BB558 AC720054 */ sw $s2, 0x54($v1) -/* E2FEAC 802BB55C 3C12F200 */ lui $s2, 0xf200 -/* E2FEB0 802BB560 AC6A0050 */ sw $t2, 0x50($v1) -/* E2FEB4 802BB564 AE020000 */ sw $v0, ($s0) -/* E2FEB8 802BB568 24620068 */ addiu $v0, $v1, 0x68 -/* E2FEBC 802BB56C AC720058 */ sw $s2, 0x58($v1) -/* E2FEC0 802BB570 AC75005C */ sw $s5, 0x5c($v1) -/* E2FEC4 802BB574 AE020000 */ sw $v0, ($s0) -/* E2FEC8 802BB578 3C020A00 */ lui $v0, 0xa00 -/* E2FECC 802BB57C 24420FF0 */ addiu $v0, $v0, 0xff0 -/* E2FED0 802BB580 AC620064 */ sw $v0, 0x64($v1) -/* E2FED4 802BB584 24620070 */ addiu $v0, $v1, 0x70 -/* E2FED8 802BB588 AC6C0060 */ sw $t4, 0x60($v1) -/* E2FEDC 802BB58C AE020000 */ sw $v0, ($s0) -/* E2FEE0 802BB590 24620078 */ addiu $v0, $v1, 0x78 -/* E2FEE4 802BB594 AC6F0068 */ sw $t7, 0x68($v1) -/* E2FEE8 802BB598 AC6D006C */ sw $t5, 0x6c($v1) -/* E2FEEC 802BB59C AE020000 */ sw $v0, ($s0) -/* E2FEF0 802BB5A0 24620080 */ addiu $v0, $v1, 0x80 -/* E2FEF4 802BB5A4 AC650070 */ sw $a1, 0x70($v1) -/* E2FEF8 802BB5A8 AC600074 */ sw $zero, 0x74($v1) -/* E2FEFC 802BB5AC AE020000 */ sw $v0, ($s0) -/* E2FF00 802BB5B0 24620088 */ addiu $v0, $v1, 0x88 -/* E2FF04 802BB5B4 AC640078 */ sw $a0, 0x78($v1) -/* E2FF08 802BB5B8 AC6E007C */ sw $t6, 0x7c($v1) -/* E2FF0C 802BB5BC AE020000 */ sw $v0, ($s0) -/* E2FF10 802BB5C0 24620090 */ addiu $v0, $v1, 0x90 -/* E2FF14 802BB5C4 AC730080 */ sw $s3, 0x80($v1) -/* E2FF18 802BB5C8 AC600084 */ sw $zero, 0x84($v1) -/* E2FF1C 802BB5CC AE020000 */ sw $v0, ($s0) -/* E2FF20 802BB5D0 24620098 */ addiu $v0, $v1, 0x98 -/* E2FF24 802BB5D4 AC6F0088 */ sw $t7, 0x88($v1) -/* E2FF28 802BB5D8 AC76008C */ sw $s6, 0x8c($v1) -/* E2FF2C 802BB5DC AE020000 */ sw $v0, ($s0) -/* E2FF30 802BB5E0 246200A0 */ addiu $v0, $v1, 0xa0 -/* E2FF34 802BB5E4 AC720090 */ sw $s2, 0x90($v1) -/* E2FF38 802BB5E8 AC770094 */ sw $s7, 0x94($v1) -/* E2FF3C 802BB5EC AE020000 */ sw $v0, ($s0) -/* E2FF40 802BB5F0 3C020008 */ lui $v0, 8 -/* E2FF44 802BB5F4 AC62009C */ sw $v0, 0x9c($v1) -/* E2FF48 802BB5F8 246200A8 */ addiu $v0, $v1, 0xa8 -/* E2FF4C 802BB5FC AC780098 */ sw $t8, 0x98($v1) -/* E2FF50 802BB600 AE020000 */ sw $v0, ($s0) -/* E2FF54 802BB604 24022000 */ addiu $v0, $zero, 0x2000 -/* E2FF58 802BB608 0280202D */ daddu $a0, $s4, $zero -/* E2FF5C 802BB60C AC7900A0 */ sw $t9, 0xa0($v1) -/* E2FF60 802BB610 AC6200A4 */ sw $v0, 0xa4($v1) -/* E2FF64 802BB614 96220090 */ lhu $v0, 0x90($s1) -/* E2FF68 802BB618 96250092 */ lhu $a1, 0x92($s1) -/* E2FF6C 802BB61C 30420FFF */ andi $v0, $v0, 0xfff -/* E2FF70 802BB620 00021300 */ sll $v0, $v0, 0xc -/* E2FF74 802BB624 30A50FFF */ andi $a1, $a1, 0xfff -/* E2FF78 802BB628 00B22825 */ or $a1, $a1, $s2 -/* E2FF7C 802BB62C 00451025 */ or $v0, $v0, $a1 -/* E2FF80 802BB630 AC6200A8 */ sw $v0, 0xa8($v1) -/* E2FF84 802BB634 86220090 */ lh $v0, 0x90($s1) -/* E2FF88 802BB638 246500B0 */ addiu $a1, $v1, 0xb0 -/* E2FF8C 802BB63C AE050000 */ sw $a1, ($s0) -/* E2FF90 802BB640 86250092 */ lh $a1, 0x92($s1) -/* E2FF94 802BB644 2442007C */ addiu $v0, $v0, 0x7c -/* E2FF98 802BB648 30420FFF */ andi $v0, $v0, 0xfff -/* E2FF9C 802BB64C 00021300 */ sll $v0, $v0, 0xc -/* E2FFA0 802BB650 24A5007C */ addiu $a1, $a1, 0x7c -/* E2FFA4 802BB654 30A50FFF */ andi $a1, $a1, 0xfff -/* E2FFA8 802BB658 00451025 */ or $v0, $v0, $a1 -/* E2FFAC 802BB65C 0C0AEB80 */ jal func_802BAE00_E2F750 -/* E2FFB0 802BB660 AC6200AC */ sw $v0, 0xac($v1) -/* E2FFB4 802BB664 8E050000 */ lw $a1, ($s0) -/* E2FFB8 802BB668 0280202D */ daddu $a0, $s4, $zero -/* E2FFBC 802BB66C 00A0102D */ daddu $v0, $a1, $zero -/* E2FFC0 802BB670 AC530000 */ sw $s3, ($v0) -/* E2FFC4 802BB674 AC400004 */ sw $zero, 4($v0) -/* E2FFC8 802BB678 96230094 */ lhu $v1, 0x94($s1) -/* E2FFCC 802BB67C 24A50008 */ addiu $a1, $a1, 8 -/* E2FFD0 802BB680 AE050000 */ sw $a1, ($s0) -/* E2FFD4 802BB684 96220096 */ lhu $v0, 0x96($s1) -/* E2FFD8 802BB688 30630FFF */ andi $v1, $v1, 0xfff -/* E2FFDC 802BB68C 00031B00 */ sll $v1, $v1, 0xc -/* E2FFE0 802BB690 30420FFF */ andi $v0, $v0, 0xfff -/* E2FFE4 802BB694 00521025 */ or $v0, $v0, $s2 -/* E2FFE8 802BB698 00621825 */ or $v1, $v1, $v0 -/* E2FFEC 802BB69C ACA30000 */ sw $v1, ($a1) -/* E2FFF0 802BB6A0 86220094 */ lh $v0, 0x94($s1) -/* E2FFF4 802BB6A4 24A30008 */ addiu $v1, $a1, 8 -/* E2FFF8 802BB6A8 AE030000 */ sw $v1, ($s0) -/* E2FFFC 802BB6AC 86230096 */ lh $v1, 0x96($s1) -/* E30000 802BB6B0 2442007C */ addiu $v0, $v0, 0x7c -/* E30004 802BB6B4 30420FFF */ andi $v0, $v0, 0xfff -/* E30008 802BB6B8 00021300 */ sll $v0, $v0, 0xc -/* E3000C 802BB6BC 2463007C */ addiu $v1, $v1, 0x7c -/* E30010 802BB6C0 30630FFF */ andi $v1, $v1, 0xfff -/* E30014 802BB6C4 00431025 */ or $v0, $v0, $v1 -/* E30018 802BB6C8 0C0AEBE1 */ jal func_802BAF84_E2F8D4 -/* E3001C 802BB6CC ACA20004 */ sw $v0, 4($a1) -/* E30020 802BB6D0 0C0AEC42 */ jal func_802BB108_E2FA58 -/* E30024 802BB6D4 0280202D */ daddu $a0, $s4, $zero -/* E30028 802BB6D8 8FBF0030 */ lw $ra, 0x30($sp) -/* E3002C 802BB6DC 8FB7002C */ lw $s7, 0x2c($sp) -/* E30030 802BB6E0 8FB60028 */ lw $s6, 0x28($sp) -/* E30034 802BB6E4 8FB50024 */ lw $s5, 0x24($sp) -/* E30038 802BB6E8 8FB40020 */ lw $s4, 0x20($sp) -/* E3003C 802BB6EC 8FB3001C */ lw $s3, 0x1c($sp) -/* E30040 802BB6F0 8FB20018 */ lw $s2, 0x18($sp) -/* E30044 802BB6F4 8FB10014 */ lw $s1, 0x14($sp) -/* E30048 802BB6F8 8FB00010 */ lw $s0, 0x10($sp) -/* E3004C 802BB6FC 03E00008 */ jr $ra -/* E30050 802BB700 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s deleted file mode 100644 index 99b1e48264..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB76C_E300BC -/* E300BC 802BB76C 8C830040 */ lw $v1, 0x40($a0) -/* E300C0 802BB770 846200A4 */ lh $v0, 0xa4($v1) -/* E300C4 802BB774 C4800048 */ lwc1 $f0, 0x48($a0) -/* E300C8 802BB778 44821000 */ mtc1 $v0, $f2 -/* E300CC 802BB77C 00000000 */ nop -/* E300D0 802BB780 468010A0 */ cvt.s.w $f2, $f2 -/* E300D4 802BB784 846200A8 */ lh $v0, 0xa8($v1) -/* E300D8 802BB788 46001081 */ sub.s $f2, $f2, $f0 -/* E300DC 802BB78C C4840050 */ lwc1 $f4, 0x50($a0) -/* E300E0 802BB790 44820000 */ mtc1 $v0, $f0 -/* E300E4 802BB794 00000000 */ nop -/* E300E8 802BB798 46800020 */ cvt.s.w $f0, $f0 -/* E300EC 802BB79C 46040001 */ sub.s $f0, $f0, $f4 -/* E300F0 802BB7A0 0000102D */ daddu $v0, $zero, $zero -/* E300F4 802BB7A4 3C014120 */ lui $at, 0x4120 -/* E300F8 802BB7A8 44812000 */ mtc1 $at, $f4 -/* E300FC 802BB7AC 46001085 */ abs.s $f2, $f2 -/* E30100 802BB7B0 4604103E */ c.le.s $f2, $f4 -/* E30104 802BB7B4 00000000 */ nop -/* E30108 802BB7B8 45000002 */ bc1f .L802BB7C4 -/* E3010C 802BB7BC 46000005 */ abs.s $f0, $f0 -/* E30110 802BB7C0 24020001 */ addiu $v0, $zero, 1 -.L802BB7C4: -/* E30114 802BB7C4 4604003E */ c.le.s $f0, $f4 -/* E30118 802BB7C8 00000000 */ nop -/* E3011C 802BB7CC 45030001 */ bc1tl .L802BB7D4 -/* E30120 802BB7D0 24420001 */ addiu $v0, $v0, 1 -.L802BB7D4: -/* E30124 802BB7D4 28420002 */ slti $v0, $v0, 2 -/* E30128 802BB7D8 03E00008 */ jr $ra -/* E3012C 802BB7DC 38420001 */ xori $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s deleted file mode 100644 index cd323b1a3b..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BB7E0_E30130 -/* E30130 802BB7E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E30134 802BB7E4 AFBF0018 */ sw $ra, 0x18($sp) -/* E30138 802BB7E8 AFB10014 */ sw $s1, 0x14($sp) -/* E3013C 802BB7EC AFB00010 */ sw $s0, 0x10($sp) -/* E30140 802BB7F0 8C900040 */ lw $s0, 0x40($a0) -/* E30144 802BB7F4 861100AA */ lh $s1, 0xaa($s0) -/* E30148 802BB7F8 8E0400A0 */ lw $a0, 0xa0($s0) -/* E3014C 802BB7FC 1620001A */ bnez $s1, .L802BB868 -/* E30150 802BB800 2402FFFF */ addiu $v0, $zero, -1 -/* E30154 802BB804 8C830000 */ lw $v1, ($a0) -/* E30158 802BB808 10620006 */ beq $v1, $v0, .L802BB824 -/* E3015C 802BB80C 0000282D */ daddu $a1, $zero, $zero -/* E30160 802BB810 0040182D */ daddu $v1, $v0, $zero -.L802BB814: -/* E30164 802BB814 24840004 */ addiu $a0, $a0, 4 -/* E30168 802BB818 8C820000 */ lw $v0, ($a0) -/* E3016C 802BB81C 1443FFFD */ bne $v0, $v1, .L802BB814 -/* E30170 802BB820 24A50001 */ addiu $a1, $a1, 1 -.L802BB824: -/* E30174 802BB824 00052080 */ sll $a0, $a1, 2 -/* E30178 802BB828 00852021 */ addu $a0, $a0, $a1 -/* E3017C 802BB82C 00042040 */ sll $a0, $a0, 1 -/* E30180 802BB830 0C00A67F */ jal rand_int -/* E30184 802BB834 2484FFFF */ addiu $a0, $a0, -1 -/* E30188 802BB838 3C036666 */ lui $v1, 0x6666 -/* E3018C 802BB83C 34636667 */ ori $v1, $v1, 0x6667 -/* E30190 802BB840 00430018 */ mult $v0, $v1 -/* E30194 802BB844 000217C3 */ sra $v0, $v0, 0x1f -/* E30198 802BB848 8E0400A0 */ lw $a0, 0xa0($s0) -/* E3019C 802BB84C 00003010 */ mfhi $a2 -/* E301A0 802BB850 00061883 */ sra $v1, $a2, 2 -/* E301A4 802BB854 00621823 */ subu $v1, $v1, $v0 -/* E301A8 802BB858 00031880 */ sll $v1, $v1, 2 -/* E301AC 802BB85C 00641821 */ addu $v1, $v1, $a0 -/* E301B0 802BB860 8C620000 */ lw $v0, ($v1) -/* E301B4 802BB864 AE02009C */ sw $v0, 0x9c($s0) -.L802BB868: -/* E301B8 802BB868 8E05009C */ lw $a1, 0x9c($s0) -/* E301BC 802BB86C 00111080 */ sll $v0, $s1, 2 -/* E301C0 802BB870 00A21821 */ addu $v1, $a1, $v0 -/* E301C4 802BB874 8C640000 */ lw $a0, ($v1) -/* E301C8 802BB878 3C028000 */ lui $v0, 0x8000 -/* E301CC 802BB87C 10820013 */ beq $a0, $v0, .L802BB8CC -/* E301D0 802BB880 34420001 */ ori $v0, $v0, 1 -/* E301D4 802BB884 1482000A */ bne $a0, $v0, .L802BB8B0 -/* E301D8 802BB888 26310003 */ addiu $s1, $s1, 3 -/* E301DC 802BB88C 00A0182D */ daddu $v1, $a1, $zero -/* E301E0 802BB890 94620002 */ lhu $v0, 2($v1) -/* E301E4 802BB894 24630004 */ addiu $v1, $v1, 4 -/* E301E8 802BB898 A60200A4 */ sh $v0, 0xa4($s0) -/* E301EC 802BB89C 94620002 */ lhu $v0, 2($v1) -/* E301F0 802BB8A0 A60200A6 */ sh $v0, 0xa6($s0) -/* E301F4 802BB8A4 94620006 */ lhu $v0, 6($v1) -/* E301F8 802BB8A8 080AEE32 */ j .L802BB8C8 -/* E301FC 802BB8AC 0000882D */ daddu $s1, $zero, $zero -.L802BB8B0: -/* E30200 802BB8B0 94620002 */ lhu $v0, 2($v1) -/* E30204 802BB8B4 24630004 */ addiu $v1, $v1, 4 -/* E30208 802BB8B8 A60200A4 */ sh $v0, 0xa4($s0) -/* E3020C 802BB8BC 94620002 */ lhu $v0, 2($v1) -/* E30210 802BB8C0 A60200A6 */ sh $v0, 0xa6($s0) -/* E30214 802BB8C4 94620006 */ lhu $v0, 6($v1) -.L802BB8C8: -/* E30218 802BB8C8 A60200A8 */ sh $v0, 0xa8($s0) -.L802BB8CC: -/* E3021C 802BB8CC A61100AA */ sh $s1, 0xaa($s0) -/* E30220 802BB8D0 8FBF0018 */ lw $ra, 0x18($sp) -/* E30224 802BB8D4 8FB10014 */ lw $s1, 0x14($sp) -/* E30228 802BB8D8 8FB00010 */ lw $s0, 0x10($sp) -/* E3022C 802BB8DC 03E00008 */ jr $ra -/* E30230 802BB8E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s deleted file mode 100644 index 907046293a..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s +++ /dev/null @@ -1,240 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802BCB80_E314D0 -.double 0.02 - -dlabel D_802BCB88_E314D8 -.double -0.02 - -.section .text - -glabel func_802BBA60_E303B0 -/* E303B0 802BBA60 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E303B4 802BBA64 AFB10014 */ sw $s1, 0x14($sp) -/* E303B8 802BBA68 0080882D */ daddu $s1, $a0, $zero -/* E303BC 802BBA6C AFB20018 */ sw $s2, 0x18($sp) -/* E303C0 802BBA70 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* E303C4 802BBA74 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* E303C8 802BBA78 AFB3001C */ sw $s3, 0x1c($sp) -/* E303CC 802BBA7C 3C138011 */ lui $s3, %hi(gPartnerActionStatus) -/* E303D0 802BBA80 2673EBB0 */ addiu $s3, $s3, %lo(gPartnerActionStatus) -/* E303D4 802BBA84 AFBF0020 */ sw $ra, 0x20($sp) -/* E303D8 802BBA88 AFB00010 */ sw $s0, 0x10($sp) -/* E303DC 802BBA8C 0C009C64 */ jal get_time_freeze_mode -/* E303E0 802BBA90 8E300040 */ lw $s0, 0x40($s1) -/* E303E4 802BBA94 14400017 */ bnez $v0, .L802BBAF4 -/* E303E8 802BBA98 00000000 */ nop -/* E303EC 802BBA9C 0C04D07A */ jal is_picking_up_item -/* E303F0 802BBAA0 00000000 */ nop -/* E303F4 802BBAA4 14400013 */ bnez $v0, .L802BBAF4 -/* E303F8 802BBAA8 00000000 */ nop -/* E303FC 802BBAAC 8E420000 */ lw $v0, ($s2) -/* E30400 802BBAB0 30420020 */ andi $v0, $v0, 0x20 -/* E30404 802BBAB4 1440000F */ bnez $v0, .L802BBAF4 -/* E30408 802BBAB8 00000000 */ nop -/* E3040C 802BBABC 3C028011 */ lui $v0, %hi(gPlayerData) -/* E30410 802BBAC0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* E30414 802BBAC4 80430012 */ lb $v1, 0x12($v0) -/* E30418 802BBAC8 24020001 */ addiu $v0, $zero, 1 -/* E3041C 802BBACC 14620007 */ bne $v1, $v0, .L802BBAEC -/* E30420 802BBAD0 00000000 */ nop -/* E30424 802BBAD4 82420015 */ lb $v0, 0x15($s2) -/* E30428 802BBAD8 10400004 */ beqz $v0, .L802BBAEC -/* E3042C 802BBADC 2402001F */ addiu $v0, $zero, 0x1f -/* E30430 802BBAE0 824300B4 */ lb $v1, 0xb4($s2) -/* E30434 802BBAE4 14620003 */ bne $v1, $v0, .L802BBAF4 -/* E30438 802BBAE8 00000000 */ nop -.L802BBAEC: -/* E3043C 802BBAEC 0C0AEE39 */ jal func_802BB8E4_E30234 -/* E30440 802BBAF0 0220202D */ daddu $a0, $s1, $zero -.L802BBAF4: -/* E30444 802BBAF4 0C0AEDC1 */ jal func_802BB704_E30054 -/* E30448 802BBAF8 0220202D */ daddu $a0, $s1, $zero -/* E3044C 802BBAFC 96020098 */ lhu $v0, 0x98($s0) -/* E30450 802BBB00 24420001 */ addiu $v0, $v0, 1 -/* E30454 802BBB04 A6020098 */ sh $v0, 0x98($s0) -/* E30458 802BBB08 00021400 */ sll $v0, $v0, 0x10 -/* E3045C 802BBB0C 00021403 */ sra $v0, $v0, 0x10 -/* E30460 802BBB10 28420064 */ slti $v0, $v0, 0x64 -/* E30464 802BBB14 1040001B */ beqz $v0, .L802BBB84 -/* E30468 802BBB18 00000000 */ nop -/* E3046C 802BBB1C 3C014060 */ lui $at, 0x4060 -/* E30470 802BBB20 44813000 */ mtc1 $at, $f6 -/* E30474 802BBB24 C6080004 */ lwc1 $f8, 4($s0) -/* E30478 802BBB28 46083081 */ sub.s $f2, $f6, $f8 -/* E3047C 802BBB2C 3C0141E0 */ lui $at, 0x41e0 -/* E30480 802BBB30 44810000 */ mtc1 $at, $f0 -/* E30484 802BBB34 00000000 */ nop -/* E30488 802BBB38 46001103 */ div.s $f4, $f2, $f0 -/* E3048C 802BBB3C 3C01802C */ lui $at, %hi(D_802BCB80_E314D0) -/* E30490 802BBB40 D422CB80 */ ldc1 $f2, %lo(D_802BCB80_E314D0)($at) -/* E30494 802BBB44 46002021 */ cvt.d.s $f0, $f4 -/* E30498 802BBB48 4622003C */ c.lt.d $f0, $f2 -/* E3049C 802BBB4C 00000000 */ nop -/* E304A0 802BBB50 45020006 */ bc1fl .L802BBB6C -/* E304A4 802BBB54 46044000 */ add.s $f0, $f8, $f4 -/* E304A8 802BBB58 3C013CA3 */ lui $at, 0x3ca3 -/* E304AC 802BBB5C 3421D70A */ ori $at, $at, 0xd70a -/* E304B0 802BBB60 44812000 */ mtc1 $at, $f4 -/* E304B4 802BBB64 00000000 */ nop -/* E304B8 802BBB68 46044000 */ add.s $f0, $f8, $f4 -.L802BBB6C: -/* E304BC 802BBB6C 4600303E */ c.le.s $f6, $f0 -/* E304C0 802BBB70 00000000 */ nop -/* E304C4 802BBB74 4500001F */ bc1f .L802BBBF4 -/* E304C8 802BBB78 E6000004 */ swc1 $f0, 4($s0) -/* E304CC 802BBB7C 080AEEFD */ j .L802BBBF4 -/* E304D0 802BBB80 E6060004 */ swc1 $f6, 4($s0) -.L802BBB84: -/* E304D4 802BBB84 3C013FA6 */ lui $at, 0x3fa6 -/* E304D8 802BBB88 34216666 */ ori $at, $at, 0x6666 -/* E304DC 802BBB8C 44813000 */ mtc1 $at, $f6 -/* E304E0 802BBB90 C6080004 */ lwc1 $f8, 4($s0) -/* E304E4 802BBB94 46083081 */ sub.s $f2, $f6, $f8 -/* E304E8 802BBB98 3C013D80 */ lui $at, 0x3d80 -/* E304EC 802BBB9C 44810000 */ mtc1 $at, $f0 -/* E304F0 802BBBA0 00000000 */ nop -/* E304F4 802BBBA4 46001102 */ mul.s $f4, $f2, $f0 -/* E304F8 802BBBA8 00000000 */ nop -/* E304FC 802BBBAC 3C01802C */ lui $at, %hi(D_802BCB88_E314D8) -/* E30500 802BBBB0 D422CB88 */ ldc1 $f2, %lo(D_802BCB88_E314D8)($at) -/* E30504 802BBBB4 46002021 */ cvt.d.s $f0, $f4 -/* E30508 802BBBB8 4620103C */ c.lt.d $f2, $f0 -/* E3050C 802BBBBC 00000000 */ nop -/* E30510 802BBBC0 45020006 */ bc1fl .L802BBBDC -/* E30514 802BBBC4 46044000 */ add.s $f0, $f8, $f4 -/* E30518 802BBBC8 3C01BCA3 */ lui $at, 0xbca3 -/* E3051C 802BBBCC 3421D70A */ ori $at, $at, 0xd70a -/* E30520 802BBBD0 44812000 */ mtc1 $at, $f4 -/* E30524 802BBBD4 00000000 */ nop -/* E30528 802BBBD8 46044000 */ add.s $f0, $f8, $f4 -.L802BBBDC: -/* E3052C 802BBBDC 4606003E */ c.le.s $f0, $f6 -/* E30530 802BBBE0 00000000 */ nop -/* E30534 802BBBE4 45000003 */ bc1f .L802BBBF4 -/* E30538 802BBBE8 E6000004 */ swc1 $f0, 4($s0) -/* E3053C 802BBBEC E6060004 */ swc1 $f6, 4($s0) -/* E30540 802BBBF0 A6000098 */ sh $zero, 0x98($s0) -.L802BBBF4: -/* E30544 802BBBF4 C6000008 */ lwc1 $f0, 8($s0) -/* E30548 802BBBF8 C6020004 */ lwc1 $f2, 4($s0) -/* E3054C 802BBBFC 46020000 */ add.s $f0, $f0, $f2 -/* E30550 802BBC00 3C0143B4 */ lui $at, 0x43b4 -/* E30554 802BBC04 44814000 */ mtc1 $at, $f8 -/* E30558 802BBC08 00000000 */ nop -/* E3055C 802BBC0C 4600403C */ c.lt.s $f8, $f0 -/* E30560 802BBC10 00000000 */ nop -/* E30564 802BBC14 45000002 */ bc1f .L802BBC20 -/* E30568 802BBC18 E6000008 */ swc1 $f0, 8($s0) -/* E3056C 802BBC1C AE000008 */ sw $zero, 8($s0) -.L802BBC20: -/* E30570 802BBC20 C6000008 */ lwc1 $f0, 8($s0) -/* E30574 802BBC24 C606000C */ lwc1 $f6, 0xc($s0) -/* E30578 802BBC28 46060101 */ sub.s $f4, $f0, $f6 -/* E3057C 802BBC2C 44805000 */ mtc1 $zero, $f10 -/* E30580 802BBC30 00000000 */ nop -/* E30584 802BBC34 460A203C */ c.lt.s $f4, $f10 -/* E30588 802BBC38 00000000 */ nop -/* E3058C 802BBC3C 45030001 */ bc1tl .L802BBC44 -/* E30590 802BBC40 46082100 */ add.s $f4, $f4, $f8 -.L802BBC44: -/* E30594 802BBC44 3C013FD0 */ lui $at, 0x3fd0 -/* E30598 802BBC48 44810800 */ mtc1 $at, $f1 -/* E3059C 802BBC4C 44800000 */ mtc1 $zero, $f0 -/* E305A0 802BBC50 460020A1 */ cvt.d.s $f2, $f4 -/* E305A4 802BBC54 46201082 */ mul.d $f2, $f2, $f0 -/* E305A8 802BBC58 00000000 */ nop -/* E305AC 802BBC5C 46201120 */ cvt.s.d $f4, $f2 -/* E305B0 802BBC60 46043000 */ add.s $f0, $f6, $f4 -/* E305B4 802BBC64 4600403C */ c.lt.s $f8, $f0 -/* E305B8 802BBC68 00000000 */ nop -/* E305BC 802BBC6C 45000002 */ bc1f .L802BBC78 -/* E305C0 802BBC70 E600000C */ swc1 $f0, 0xc($s0) -/* E305C4 802BBC74 E60A000C */ swc1 $f10, 0xc($s0) -.L802BBC78: -/* E305C8 802BBC78 96020090 */ lhu $v0, 0x90($s0) -/* E305CC 802BBC7C 96030092 */ lhu $v1, 0x92($s0) -/* E305D0 802BBC80 24420004 */ addiu $v0, $v0, 4 -/* E305D4 802BBC84 A6020090 */ sh $v0, 0x90($s0) -/* E305D8 802BBC88 96020094 */ lhu $v0, 0x94($s0) -/* E305DC 802BBC8C 2463FFF8 */ addiu $v1, $v1, -8 -/* E305E0 802BBC90 A6030092 */ sh $v1, 0x92($s0) -/* E305E4 802BBC94 96030096 */ lhu $v1, 0x96($s0) -/* E305E8 802BBC98 24420004 */ addiu $v0, $v0, 4 -/* E305EC 802BBC9C 2463FFF0 */ addiu $v1, $v1, -0x10 -/* E305F0 802BBCA0 A6020094 */ sh $v0, 0x94($s0) -/* E305F4 802BBCA4 A6030096 */ sh $v1, 0x96($s0) -/* E305F8 802BBCA8 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* E305FC 802BBCAC C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* E30600 802BBCB0 46000007 */ neg.s $f0, $f0 -/* E30604 802BBCB4 E6200064 */ swc1 $f0, 0x64($s1) -/* E30608 802BBCB8 82620000 */ lb $v0, ($s3) -/* E3060C 802BBCBC 10400004 */ beqz $v0, .L802BBCD0 -/* E30610 802BBCC0 24020009 */ addiu $v0, $zero, 9 -/* E30614 802BBCC4 82630003 */ lb $v1, 3($s3) -/* E30618 802BBCC8 10620034 */ beq $v1, $v0, .L802BBD9C -/* E3061C 802BBCCC 00000000 */ nop -.L802BBCD0: -/* E30620 802BBCD0 824300B4 */ lb $v1, 0xb4($s2) -/* E30624 802BBCD4 2402001F */ addiu $v0, $zero, 0x1f -/* E30628 802BBCD8 1462000E */ bne $v1, $v0, .L802BBD14 -/* E3062C 802BBCDC 00000000 */ nop -/* E30630 802BBCE0 C62C0048 */ lwc1 $f12, 0x48($s1) -/* E30634 802BBCE4 C62E004C */ lwc1 $f14, 0x4c($s1) -/* E30638 802BBCE8 8E260050 */ lw $a2, 0x50($s1) -/* E3063C 802BBCEC 0C00F431 */ jal npc_find_closest_simple -/* E30640 802BBCF0 3C074248 */ lui $a3, 0x4248 -/* E30644 802BBCF4 10400007 */ beqz $v0, .L802BBD14 -/* E30648 802BBCF8 3C030400 */ lui $v1, 0x400 -/* E3064C 802BBCFC 8C420000 */ lw $v0, ($v0) -/* E30650 802BBD00 00431024 */ and $v0, $v0, $v1 -/* E30654 802BBD04 10400003 */ beqz $v0, .L802BBD14 -/* E30658 802BBD08 00000000 */ nop -/* E3065C 802BBD0C 3C018011 */ lui $at, %hi(TweesterTouchingPartner) -/* E30660 802BBD10 AC31C954 */ sw $s1, %lo(TweesterTouchingPartner)($at) -.L802BBD14: -/* E30664 802BBD14 0C04D07A */ jal is_picking_up_item -/* E30668 802BBD18 00000000 */ nop -/* E3066C 802BBD1C 1440001F */ bnez $v0, .L802BBD9C -/* E30670 802BBD20 00000000 */ nop -/* E30674 802BBD24 8E420000 */ lw $v0, ($s2) -/* E30678 802BBD28 30420020 */ andi $v0, $v0, 0x20 -/* E3067C 802BBD2C 1440001B */ bnez $v0, .L802BBD9C -/* E30680 802BBD30 2402001F */ addiu $v0, $zero, 0x1f -/* E30684 802BBD34 824300B4 */ lb $v1, 0xb4($s2) -/* E30688 802BBD38 10620018 */ beq $v1, $v0, .L802BBD9C -/* E3068C 802BBD3C 00000000 */ nop -/* E30690 802BBD40 86420010 */ lh $v0, 0x10($s2) -/* E30694 802BBD44 14400015 */ bnez $v0, .L802BBD9C -/* E30698 802BBD48 00000000 */ nop -/* E3069C 802BBD4C C62C0048 */ lwc1 $f12, 0x48($s1) -/* E306A0 802BBD50 C62E0050 */ lwc1 $f14, 0x50($s1) -/* E306A4 802BBD54 8E460028 */ lw $a2, 0x28($s2) -/* E306A8 802BBD58 0C00A7B5 */ jal dist2D -/* E306AC 802BBD5C 8E470030 */ lw $a3, 0x30($s2) -/* E306B0 802BBD60 46000021 */ cvt.d.s $f0, $f0 -/* E306B4 802BBD64 3C014049 */ lui $at, 0x4049 -/* E306B8 802BBD68 44811800 */ mtc1 $at, $f3 -/* E306BC 802BBD6C 44801000 */ mtc1 $zero, $f2 -/* E306C0 802BBD70 46200005 */ abs.d $f0, $f0 -/* E306C4 802BBD74 4622003E */ c.le.d $f0, $f2 -/* E306C8 802BBD78 00000000 */ nop -/* E306CC 802BBD7C 45000007 */ bc1f .L802BBD9C -/* E306D0 802BBD80 2404001F */ addiu $a0, $zero, 0x1f -/* E306D4 802BBD84 8E420004 */ lw $v0, 4($s2) -/* E306D8 802BBD88 3C018011 */ lui $at, %hi(TweesterTouchingPlayer) -/* E306DC 802BBD8C AC31C934 */ sw $s1, %lo(TweesterTouchingPlayer)($at) -/* E306E0 802BBD90 34420004 */ ori $v0, $v0, 4 -/* E306E4 802BBD94 0C039769 */ jal set_action_state -/* E306E8 802BBD98 AE420004 */ sw $v0, 4($s2) -.L802BBD9C: -/* E306EC 802BBD9C 8FBF0020 */ lw $ra, 0x20($sp) -/* E306F0 802BBDA0 8FB3001C */ lw $s3, 0x1c($sp) -/* E306F4 802BBDA4 8FB20018 */ lw $s2, 0x18($sp) -/* E306F8 802BBDA8 8FB10014 */ lw $s1, 0x14($sp) -/* E306FC 802BBDAC 8FB00010 */ lw $s0, 0x10($sp) -/* E30700 802BBDB0 03E00008 */ jr $ra -/* E30704 802BBDB4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s deleted file mode 100644 index 866846f052..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s +++ /dev/null @@ -1,279 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802BBE70_E307C0 -/* E307C0 802BBE70 27BDFEE8 */ addiu $sp, $sp, -0x118 -/* E307C4 802BBE74 AFB000F0 */ sw $s0, 0xf0($sp) -/* E307C8 802BBE78 3C10800A */ lui $s0, %hi(gMasterGfxPos) -/* E307CC 802BBE7C 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) -/* E307D0 802BBE80 AFBF0114 */ sw $ra, 0x114($sp) -/* E307D4 802BBE84 AFBE0110 */ sw $fp, 0x110($sp) -/* E307D8 802BBE88 AFB7010C */ sw $s7, 0x10c($sp) -/* E307DC 802BBE8C AFB60108 */ sw $s6, 0x108($sp) -/* E307E0 802BBE90 AFB50104 */ sw $s5, 0x104($sp) -/* E307E4 802BBE94 AFB40100 */ sw $s4, 0x100($sp) -/* E307E8 802BBE98 AFB300FC */ sw $s3, 0xfc($sp) -/* E307EC 802BBE9C AFB200F8 */ sw $s2, 0xf8($sp) -/* E307F0 802BBEA0 0C04417A */ jal get_entity_by_index -/* E307F4 802BBEA4 AFB100F4 */ sw $s1, 0xf4($sp) -/* E307F8 802BBEA8 0040902D */ daddu $s2, $v0, $zero -/* E307FC 802BBEAC 8E530040 */ lw $s3, 0x40($s2) -/* E30800 802BBEB0 27A40010 */ addiu $a0, $sp, 0x10 -/* E30804 802BBEB4 0C019D28 */ jal guMtxIdentF -/* E30808 802BBEB8 AFB30090 */ sw $s3, 0x90($sp) -/* E3080C 802BBEBC 27B10050 */ addiu $s1, $sp, 0x50 -/* E30810 802BBEC0 0220202D */ daddu $a0, $s1, $zero -/* E30814 802BBEC4 3C140001 */ lui $s4, 1 -/* E30818 802BBEC8 8E450048 */ lw $a1, 0x48($s2) -/* E3081C 802BBECC 8E660010 */ lw $a2, 0x10($s3) -/* E30820 802BBED0 8E470050 */ lw $a3, 0x50($s2) -/* E30824 802BBED4 36941630 */ ori $s4, $s4, 0x1630 -/* E30828 802BBED8 0C019E40 */ jal guTranslateF -/* E3082C 802BBEDC AFB40094 */ sw $s4, 0x94($sp) -/* E30830 802BBEE0 0220202D */ daddu $a0, $s1, $zero -/* E30834 802BBEE4 27A50010 */ addiu $a1, $sp, 0x10 -/* E30838 802BBEE8 0C019D80 */ jal guMtxCatF -/* E3083C 802BBEEC 0220302D */ daddu $a2, $s1, $zero -/* E30840 802BBEF0 0220202D */ daddu $a0, $s1, $zero -/* E30844 802BBEF4 3C118007 */ lui $s1, %hi(gMatrixListPos) -/* E30848 802BBEF8 263141F0 */ addiu $s1, $s1, %lo(gMatrixListPos) -/* E3084C 802BBEFC 96250000 */ lhu $a1, ($s1) -/* E30850 802BBF00 3C02800A */ lui $v0, %hi(gDisplayContext) -/* E30854 802BBF04 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* E30858 802BBF08 00052980 */ sll $a1, $a1, 6 -/* E3085C 802BBF0C 00B42821 */ addu $a1, $a1, $s4 -/* E30860 802BBF10 0C019D40 */ jal guMtxF2L -/* E30864 802BBF14 00452821 */ addu $a1, $v0, $a1 -/* E30868 802BBF18 0200202D */ daddu $a0, $s0, $zero -/* E3086C 802BBF1C 26100008 */ addiu $s0, $s0, 8 -/* E30870 802BBF20 3C03DA38 */ lui $v1, 0xda38 -/* E30874 802BBF24 34630002 */ ori $v1, $v1, 2 -/* E30878 802BBF28 0200A82D */ daddu $s5, $s0, $zero -/* E3087C 802BBF2C 26100008 */ addiu $s0, $s0, 8 -/* E30880 802BBF30 0200C02D */ daddu $t8, $s0, $zero -/* E30884 802BBF34 26100008 */ addiu $s0, $s0, 8 -/* E30888 802BBF38 3C13D838 */ lui $s3, 0xd838 -/* E3088C 802BBF3C 36730002 */ ori $s3, $s3, 2 -/* E30890 802BBF40 0200B02D */ daddu $s6, $s0, $zero -/* E30894 802BBF44 26100008 */ addiu $s0, $s0, 8 -/* E30898 802BBF48 0200C82D */ daddu $t9, $s0, $zero -/* E3089C 802BBF4C 26100008 */ addiu $s0, $s0, 8 -/* E308A0 802BBF50 3C14E300 */ lui $s4, 0xe300 -/* E308A4 802BBF54 36941001 */ ori $s4, $s4, 0x1001 -/* E308A8 802BBF58 0200F02D */ daddu $fp, $s0, $zero -/* E308AC 802BBF5C 26100008 */ addiu $s0, $s0, 8 -/* E308B0 802BBF60 AFB000E8 */ sw $s0, 0xe8($sp) -/* E308B4 802BBF64 26100008 */ addiu $s0, $s0, 8 -/* E308B8 802BBF68 AFB000A0 */ sw $s0, 0xa0($sp) -/* E308BC 802BBF6C 26100008 */ addiu $s0, $s0, 8 -/* E308C0 802BBF70 AFB30098 */ sw $s3, 0x98($sp) -/* E308C4 802BBF74 3C13F500 */ lui $s3, 0xf500 -/* E308C8 802BBF78 36730100 */ ori $s3, $s3, 0x100 -/* E308CC 802BBF7C AFB000A8 */ sw $s0, 0xa8($sp) -/* E308D0 802BBF80 26100008 */ addiu $s0, $s0, 8 -/* E308D4 802BBF84 AFB000AC */ sw $s0, 0xac($sp) -/* E308D8 802BBF88 26100008 */ addiu $s0, $s0, 8 -/* E308DC 802BBF8C AFB4009C */ sw $s4, 0x9c($sp) -/* E308E0 802BBF90 3C140703 */ lui $s4, 0x703 -/* E308E4 802BBF94 3694C000 */ ori $s4, $s4, 0xc000 -/* E308E8 802BBF98 AFB000EC */ sw $s0, 0xec($sp) -/* E308EC 802BBF9C 26100008 */ addiu $s0, $s0, 8 -/* E308F0 802BBFA0 AFB000B4 */ sw $s0, 0xb4($sp) -/* E308F4 802BBFA4 26100008 */ addiu $s0, $s0, 8 -/* E308F8 802BBFA8 AFB300A4 */ sw $s3, 0xa4($sp) -/* E308FC 802BBFAC 3C13D700 */ lui $s3, 0xd700 -/* E30900 802BBFB0 36730002 */ ori $s3, $s3, 2 -/* E30904 802BBFB4 0200B82D */ daddu $s7, $s0, $zero -/* E30908 802BBFB8 26100008 */ addiu $s0, $s0, 8 -/* E3090C 802BBFBC AFB400B0 */ sw $s4, 0xb0($sp) -/* E30910 802BBFC0 3C14FC12 */ lui $s4, 0xfc12 -/* E30914 802BBFC4 36941824 */ ori $s4, $s4, 0x1824 -/* E30918 802BBFC8 AFB300B8 */ sw $s3, 0xb8($sp) -/* E3091C 802BBFCC 3C13FF33 */ lui $s3, 0xff33 -/* E30920 802BBFD0 3673FFFF */ ori $s3, $s3, 0xffff -/* E30924 802BBFD4 0200782D */ daddu $t7, $s0, $zero -/* E30928 802BBFD8 26100008 */ addiu $s0, $s0, 8 -/* E3092C 802BBFDC AFB400BC */ sw $s4, 0xbc($sp) -/* E30930 802BBFE0 3C14E300 */ lui $s4, 0xe300 -/* E30934 802BBFE4 36940D01 */ ori $s4, $s4, 0xd01 -/* E30938 802BBFE8 0200582D */ daddu $t3, $s0, $zero -/* E3093C 802BBFEC 26100008 */ addiu $s0, $s0, 8 -/* E30940 802BBFF0 AFB300C0 */ sw $s3, 0xc0($sp) -/* E30944 802BBFF4 3C13E300 */ lui $s3, 0xe300 -/* E30948 802BBFF8 36730F00 */ ori $s3, $s3, 0xf00 -/* E3094C 802BBFFC 0200602D */ daddu $t4, $s0, $zero -/* E30950 802BC000 26100008 */ addiu $s0, $s0, 8 -/* E30954 802BC004 0200702D */ daddu $t6, $s0, $zero -/* E30958 802BC008 26100008 */ addiu $s0, $s0, 8 -/* E3095C 802BC00C AFB400C4 */ sw $s4, 0xc4($sp) -/* E30960 802BC010 3C140701 */ lui $s4, 0x701 -/* E30964 802BC014 36944170 */ ori $s4, $s4, 0x4170 -/* E30968 802BC018 0200502D */ daddu $t2, $s0, $zero -/* E3096C 802BC01C 26100008 */ addiu $s0, $s0, 8 -/* E30970 802BC020 0200682D */ daddu $t5, $s0, $zero -/* E30974 802BC024 26100008 */ addiu $s0, $s0, 8 -/* E30978 802BC028 AFB300C8 */ sw $s3, 0xc8($sp) -/* E3097C 802BC02C 3C13073F */ lui $s3, 0x73f -/* E30980 802BC030 3673F100 */ ori $s3, $s3, 0xf100 -/* E30984 802BC034 0200402D */ daddu $t0, $s0, $zero -/* E30988 802BC038 AFB400CC */ sw $s4, 0xcc($sp) -/* E3098C 802BC03C 3C14F540 */ lui $s4, 0xf540 -/* E30990 802BC040 36941000 */ ori $s4, $s4, 0x1000 -/* E30994 802BC044 AFB300D0 */ sw $s3, 0xd0($sp) -/* E30998 802BC048 3C130001 */ lui $s3, 1 -/* E3099C 802BC04C 36734170 */ ori $s3, $s3, 0x4170 -/* E309A0 802BC050 AFB400D4 */ sw $s4, 0xd4($sp) -/* E309A4 802BC054 3C14001F */ lui $s4, 0x1f -/* E309A8 802BC058 3694C07C */ ori $s4, $s4, 0xc07c -/* E309AC 802BC05C AFB300D8 */ sw $s3, 0xd8($sp) -/* E309B0 802BC060 3C13E300 */ lui $s3, 0xe300 -/* E309B4 802BC064 36730C00 */ ori $s3, $s3, 0xc00 -/* E309B8 802BC068 AFB400DC */ sw $s4, 0xdc($sp) -/* E309BC 802BC06C 3C14E300 */ lui $s4, 0xe300 -/* E309C0 802BC070 AFB300E0 */ sw $s3, 0xe0($sp) -/* E309C4 802BC074 96220000 */ lhu $v0, ($s1) -/* E309C8 802BC078 36941201 */ ori $s4, $s4, 0x1201 -/* E309CC 802BC07C AFB400E4 */ sw $s4, 0xe4($sp) -/* E309D0 802BC080 AC830000 */ sw $v1, ($a0) -/* E309D4 802BC084 24430001 */ addiu $v1, $v0, 1 -/* E309D8 802BC088 3042FFFF */ andi $v0, $v0, 0xffff -/* E309DC 802BC08C 00021180 */ sll $v0, $v0, 6 -/* E309E0 802BC090 A6230000 */ sh $v1, ($s1) -/* E309E4 802BC094 8FB30094 */ lw $s3, 0x94($sp) -/* E309E8 802BC098 3C03800A */ lui $v1, %hi(gDisplayContext) -/* E309EC 802BC09C 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* E309F0 802BC0A0 00531021 */ addu $v0, $v0, $s3 -/* E309F4 802BC0A4 00621821 */ addu $v1, $v1, $v0 -/* E309F8 802BC0A8 3C02DE00 */ lui $v0, 0xde00 -/* E309FC 802BC0AC AC830004 */ sw $v1, 4($a0) -/* E30A00 802BC0B0 AEA20000 */ sw $v0, ($s5) -/* E30A04 802BC0B4 3C020A00 */ lui $v0, 0xa00 -/* E30A08 802BC0B8 24421148 */ addiu $v0, $v0, 0x1148 -/* E30A0C 802BC0BC 8E430044 */ lw $v1, 0x44($s2) -/* E30A10 802BC0C0 3042FFFF */ andi $v0, $v0, 0xffff -/* E30A14 802BC0C4 00621821 */ addu $v1, $v1, $v0 -/* E30A18 802BC0C8 24020040 */ addiu $v0, $zero, 0x40 -/* E30A1C 802BC0CC AEA30004 */ sw $v1, 4($s5) -/* E30A20 802BC0D0 8FB40098 */ lw $s4, 0x98($sp) -/* E30A24 802BC0D4 3C03E700 */ lui $v1, 0xe700 -/* E30A28 802BC0D8 AF140000 */ sw $s4, ($t8) -/* E30A2C 802BC0DC AF020004 */ sw $v0, 4($t8) -/* E30A30 802BC0E0 AEC30000 */ sw $v1, ($s6) -/* E30A34 802BC0E4 AEC00004 */ sw $zero, 4($s6) -/* E30A38 802BC0E8 8FB3009C */ lw $s3, 0x9c($sp) -/* E30A3C 802BC0EC 34028000 */ ori $v0, $zero, 0x8000 -/* E30A40 802BC0F0 AF330000 */ sw $s3, ($t9) -/* E30A44 802BC0F4 AF220004 */ sw $v0, 4($t9) -/* E30A48 802BC0F8 3C02FD10 */ lui $v0, 0xfd10 -/* E30A4C 802BC0FC AFC20000 */ sw $v0, ($fp) -/* E30A50 802BC100 3C020A00 */ lui $v0, 0xa00 -/* E30A54 802BC104 24420D08 */ addiu $v0, $v0, 0xd08 -/* E30A58 802BC108 AFC20004 */ sw $v0, 4($fp) -/* E30A5C 802BC10C 8FB400E8 */ lw $s4, 0xe8($sp) -/* E30A60 802BC110 3C02E800 */ lui $v0, 0xe800 -/* E30A64 802BC114 AE820000 */ sw $v0, ($s4) -/* E30A68 802BC118 AE800004 */ sw $zero, 4($s4) -/* E30A6C 802BC11C 8FB400A4 */ lw $s4, 0xa4($sp) -/* E30A70 802BC120 8FB300A0 */ lw $s3, 0xa0($sp) -/* E30A74 802BC124 3C020700 */ lui $v0, 0x700 -/* E30A78 802BC128 AE740000 */ sw $s4, ($s3) -/* E30A7C 802BC12C AE620004 */ sw $v0, 4($s3) -/* E30A80 802BC130 8FB300A8 */ lw $s3, 0xa8($sp) -/* E30A84 802BC134 3C04E600 */ lui $a0, 0xe600 -/* E30A88 802BC138 AE640000 */ sw $a0, ($s3) -/* E30A8C 802BC13C AE600004 */ sw $zero, 4($s3) -/* E30A90 802BC140 8FB400AC */ lw $s4, 0xac($sp) -/* E30A94 802BC144 3C02F000 */ lui $v0, 0xf000 -/* E30A98 802BC148 AE820000 */ sw $v0, ($s4) -/* E30A9C 802BC14C 8FB300B0 */ lw $s3, 0xb0($sp) -/* E30AA0 802BC150 26100008 */ addiu $s0, $s0, 8 -/* E30AA4 802BC154 AE930004 */ sw $s3, 4($s4) -/* E30AA8 802BC158 8FB400EC */ lw $s4, 0xec($sp) -/* E30AAC 802BC15C 0200482D */ daddu $t1, $s0, $zero -/* E30AB0 802BC160 AE830000 */ sw $v1, ($s4) -/* E30AB4 802BC164 AE800004 */ sw $zero, 4($s4) -/* E30AB8 802BC168 8FB400B8 */ lw $s4, 0xb8($sp) -/* E30ABC 802BC16C 8FB300B4 */ lw $s3, 0xb4($sp) -/* E30AC0 802BC170 2402FFFF */ addiu $v0, $zero, -1 -/* E30AC4 802BC174 AE740000 */ sw $s4, ($s3) -/* E30AC8 802BC178 AE620004 */ sw $v0, 4($s3) -/* E30ACC 802BC17C 8FB300BC */ lw $s3, 0xbc($sp) -/* E30AD0 802BC180 26100008 */ addiu $s0, $s0, 8 -/* E30AD4 802BC184 AEF30000 */ sw $s3, ($s7) -/* E30AD8 802BC188 8FB400C0 */ lw $s4, 0xc0($sp) -/* E30ADC 802BC18C 0200382D */ daddu $a3, $s0, $zero -/* E30AE0 802BC190 AEF40004 */ sw $s4, 4($s7) -/* E30AE4 802BC194 8FB300C4 */ lw $s3, 0xc4($sp) -/* E30AE8 802BC198 26100008 */ addiu $s0, $s0, 8 -/* E30AEC 802BC19C ADF30000 */ sw $s3, ($t7) -/* E30AF0 802BC1A0 ADE00004 */ sw $zero, 4($t7) -/* E30AF4 802BC1A4 8FB400C8 */ lw $s4, 0xc8($sp) -/* E30AF8 802BC1A8 3C02FD50 */ lui $v0, 0xfd50 -/* E30AFC 802BC1AC AD740000 */ sw $s4, ($t3) -/* E30B00 802BC1B0 AD600004 */ sw $zero, 4($t3) -/* E30B04 802BC1B4 AD820000 */ sw $v0, ($t4) -/* E30B08 802BC1B8 3C020A00 */ lui $v0, 0xa00 -/* E30B0C 802BC1BC 24420508 */ addiu $v0, $v0, 0x508 -/* E30B10 802BC1C0 AD820004 */ sw $v0, 4($t4) -/* E30B14 802BC1C4 3C02F550 */ lui $v0, 0xf550 -/* E30B18 802BC1C8 ADC20000 */ sw $v0, ($t6) -/* E30B1C 802BC1CC 8FB300CC */ lw $s3, 0xcc($sp) -/* E30B20 802BC1D0 3C02F300 */ lui $v0, 0xf300 -/* E30B24 802BC1D4 ADD30004 */ sw $s3, 4($t6) -/* E30B28 802BC1D8 AD440000 */ sw $a0, ($t2) -/* E30B2C 802BC1DC AD400004 */ sw $zero, 4($t2) -/* E30B30 802BC1E0 ADA20000 */ sw $v0, ($t5) -/* E30B34 802BC1E4 8FB400D0 */ lw $s4, 0xd0($sp) -/* E30B38 802BC1E8 0200302D */ daddu $a2, $s0, $zero -/* E30B3C 802BC1EC ADB40004 */ sw $s4, 4($t5) -/* E30B40 802BC1F0 AD030000 */ sw $v1, ($t0) -/* E30B44 802BC1F4 AD000004 */ sw $zero, 4($t0) -/* E30B48 802BC1F8 8FB300D4 */ lw $s3, 0xd4($sp) -/* E30B4C 802BC1FC 26100008 */ addiu $s0, $s0, 8 -/* E30B50 802BC200 AD330000 */ sw $s3, ($t1) -/* E30B54 802BC204 8FB400D8 */ lw $s4, 0xd8($sp) -/* E30B58 802BC208 3C03F200 */ lui $v1, 0xf200 -/* E30B5C 802BC20C AD340004 */ sw $s4, 4($t1) -/* E30B60 802BC210 ACE30000 */ sw $v1, ($a3) -/* E30B64 802BC214 8FB300DC */ lw $s3, 0xdc($sp) -/* E30B68 802BC218 0200282D */ daddu $a1, $s0, $zero -/* E30B6C 802BC21C ACF30004 */ sw $s3, 4($a3) -/* E30B70 802BC220 8FB400E0 */ lw $s4, 0xe0($sp) -/* E30B74 802BC224 3C020008 */ lui $v0, 8 -/* E30B78 802BC228 ACD40000 */ sw $s4, ($a2) -/* E30B7C 802BC22C ACC20004 */ sw $v0, 4($a2) -/* E30B80 802BC230 8FB300E4 */ lw $s3, 0xe4($sp) -/* E30B84 802BC234 24022000 */ addiu $v0, $zero, 0x2000 -/* E30B88 802BC238 ACB30000 */ sw $s3, ($a1) -/* E30B8C 802BC23C ACA20004 */ sw $v0, 4($a1) -/* E30B90 802BC240 8FB40090 */ lw $s4, 0x90($sp) -/* E30B94 802BC244 26100008 */ addiu $s0, $s0, 8 -/* E30B98 802BC248 82820005 */ lb $v0, 5($s4) -/* E30B9C 802BC24C 0200202D */ daddu $a0, $s0, $zero -/* E30BA0 802BC250 00021080 */ sll $v0, $v0, 2 -/* E30BA4 802BC254 30420FFF */ andi $v0, $v0, 0xfff -/* E30BA8 802BC258 00021300 */ sll $v0, $v0, 0xc -/* E30BAC 802BC25C 00431025 */ or $v0, $v0, $v1 -/* E30BB0 802BC260 AC820000 */ sw $v0, ($a0) -/* E30BB4 802BC264 82820005 */ lb $v0, 5($s4) -/* E30BB8 802BC268 26100008 */ addiu $s0, $s0, 8 -/* E30BBC 802BC26C 3C01800A */ lui $at, %hi(gMasterGfxPos) -/* E30BC0 802BC270 AC30A66C */ sw $s0, %lo(gMasterGfxPos)($at) -/* E30BC4 802BC274 2442007C */ addiu $v0, $v0, 0x7c -/* E30BC8 802BC278 00021080 */ sll $v0, $v0, 2 -/* E30BCC 802BC27C 30420FFF */ andi $v0, $v0, 0xfff -/* E30BD0 802BC280 00021300 */ sll $v0, $v0, 0xc -/* E30BD4 802BC284 3442007C */ ori $v0, $v0, 0x7c -/* E30BD8 802BC288 AC820004 */ sw $v0, 4($a0) -/* E30BDC 802BC28C 8FBF0114 */ lw $ra, 0x114($sp) -/* E30BE0 802BC290 8FBE0110 */ lw $fp, 0x110($sp) -/* E30BE4 802BC294 8FB7010C */ lw $s7, 0x10c($sp) -/* E30BE8 802BC298 8FB60108 */ lw $s6, 0x108($sp) -/* E30BEC 802BC29C 8FB50104 */ lw $s5, 0x104($sp) -/* E30BF0 802BC2A0 8FB40100 */ lw $s4, 0x100($sp) -/* E30BF4 802BC2A4 8FB300FC */ lw $s3, 0xfc($sp) -/* E30BF8 802BC2A8 8FB200F8 */ lw $s2, 0xf8($sp) -/* E30BFC 802BC2AC 8FB100F4 */ lw $s1, 0xf4($sp) -/* E30C00 802BC2B0 8FB000F0 */ lw $s0, 0xf0($sp) -/* E30C04 802BC2B4 03E00008 */ jr $ra -/* E30C08 802BC2B8 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s deleted file mode 100644 index c5358eb7c2..0000000000 --- a/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s +++ /dev/null @@ -1,305 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802BCBA0_E314F0 -.word .L802BC5BC_E30F0C, .L802BC5FC_E30F4C, .L802BC6DC_E3102C, .L802BC7D0_E31120, .L802BC908_E31258, .L802BC928_E31278, .L802BC968_E312B8, 0 - -dlabel D_802BCBC0_E31510 -.double 0.08 - -dlabel D_802BCBC8_E31518 -.double 2.8 - -dlabel D_802BCBD0_E31520 -.double 0.1 - -dlabel D_802BCBD8_E31528 -.double 0.08 - -.section .text - -glabel func_802BC570_E30EC0 -/* E30EC0 802BC570 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* E30EC4 802BC574 AFB10014 */ sw $s1, 0x14($sp) -/* E30EC8 802BC578 0080882D */ daddu $s1, $a0, $zero -/* E30ECC 802BC57C AFBF0018 */ sw $ra, 0x18($sp) -/* E30ED0 802BC580 AFB00010 */ sw $s0, 0x10($sp) -/* E30ED4 802BC584 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* E30ED8 802BC588 F7B80030 */ sdc1 $f24, 0x30($sp) -/* E30EDC 802BC58C F7B60028 */ sdc1 $f22, 0x28($sp) -/* E30EE0 802BC590 F7B40020 */ sdc1 $f20, 0x20($sp) -/* E30EE4 802BC594 8E300040 */ lw $s0, 0x40($s1) -/* E30EE8 802BC598 82030000 */ lb $v1, ($s0) -/* E30EEC 802BC59C 2C620007 */ sltiu $v0, $v1, 7 -/* E30EF0 802BC5A0 104000F5 */ beqz $v0, .L802BC978 -/* E30EF4 802BC5A4 00031080 */ sll $v0, $v1, 2 -/* E30EF8 802BC5A8 3C01802C */ lui $at, %hi(jtbl_802BCBA0_E314F0) -/* E30EFC 802BC5AC 00220821 */ addu $at, $at, $v0 -/* E30F00 802BC5B0 8C22CBA0 */ lw $v0, %lo(jtbl_802BCBA0_E314F0)($at) -/* E30F04 802BC5B4 00400008 */ jr $v0 -/* E30F08 802BC5B8 00000000 */ nop -.L802BC5BC_E30F0C: -/* E30F0C 802BC5BC 92020000 */ lbu $v0, ($s0) -/* E30F10 802BC5C0 3C0142B4 */ lui $at, 0x42b4 -/* E30F14 802BC5C4 44810000 */ mtc1 $at, $f0 -/* E30F18 802BC5C8 3C03802C */ lui $v1, %hi(D_802BCAA0_E313F0) -/* E30F1C 802BC5CC 2463CAA0 */ addiu $v1, $v1, %lo(D_802BCAA0_E313F0) -/* E30F20 802BC5D0 A2000004 */ sb $zero, 4($s0) -/* E30F24 802BC5D4 A2000003 */ sb $zero, 3($s0) -/* E30F28 802BC5D8 24420001 */ addiu $v0, $v0, 1 -/* E30F2C 802BC5DC A2020000 */ sb $v0, ($s0) -/* E30F30 802BC5E0 E6000014 */ swc1 $f0, 0x14($s0) -/* E30F34 802BC5E4 90620000 */ lbu $v0, ($v1) -/* E30F38 802BC5E8 A2020005 */ sb $v0, 5($s0) -/* E30F3C 802BC5EC 90620001 */ lbu $v0, 1($v1) -/* E30F40 802BC5F0 24042085 */ addiu $a0, $zero, 0x2085 -/* E30F44 802BC5F4 0C05272D */ jal sfx_play_sound -/* E30F48 802BC5F8 A2020004 */ sb $v0, 4($s0) -.L802BC5FC_E30F4C: -/* E30F4C 802BC5FC C60C0014 */ lwc1 $f12, 0x14($s0) -/* E30F50 802BC600 3C0140C9 */ lui $at, 0x40c9 -/* E30F54 802BC604 34210FD0 */ ori $at, $at, 0xfd0 -/* E30F58 802BC608 44810000 */ mtc1 $at, $f0 -/* E30F5C 802BC60C 00000000 */ nop -/* E30F60 802BC610 46006302 */ mul.s $f12, $f12, $f0 -/* E30F64 802BC614 00000000 */ nop -/* E30F68 802BC618 C634004C */ lwc1 $f20, 0x4c($s1) -/* E30F6C 802BC61C 3C0143B4 */ lui $at, 0x43b4 -/* E30F70 802BC620 44810000 */ mtc1 $at, $f0 -/* E30F74 802BC624 4600A521 */ cvt.d.s $f20, $f20 -/* E30F78 802BC628 0C00A85B */ jal sin_rad -/* E30F7C 802BC62C 46006303 */ div.s $f12, $f12, $f0 -/* E30F80 802BC630 3C014020 */ lui $at, 0x4020 -/* E30F84 802BC634 44811800 */ mtc1 $at, $f3 -/* E30F88 802BC638 44801000 */ mtc1 $zero, $f2 -/* E30F8C 802BC63C 46000021 */ cvt.d.s $f0, $f0 -/* E30F90 802BC640 46220002 */ mul.d $f0, $f0, $f2 -/* E30F94 802BC644 00000000 */ nop -/* E30F98 802BC648 4620A500 */ add.d $f20, $f20, $f0 -/* E30F9C 802BC64C 3C014000 */ lui $at, 0x4000 -/* E30FA0 802BC650 44812000 */ mtc1 $at, $f4 -/* E30FA4 802BC654 4620A520 */ cvt.s.d $f20, $f20 -/* E30FA8 802BC658 E634004C */ swc1 $f20, 0x4c($s1) -/* E30FAC 802BC65C C6000014 */ lwc1 $f0, 0x14($s0) -/* E30FB0 802BC660 46040000 */ add.s $f0, $f0, $f4 -/* E30FB4 802BC664 3C014334 */ lui $at, 0x4334 -/* E30FB8 802BC668 44811000 */ mtc1 $at, $f2 -/* E30FBC 802BC66C 00000000 */ nop -/* E30FC0 802BC670 4600103E */ c.le.s $f2, $f0 -/* E30FC4 802BC674 00000000 */ nop -/* E30FC8 802BC678 45000002 */ bc1f .L802BC684 -/* E30FCC 802BC67C E6000014 */ swc1 $f0, 0x14($s0) -/* E30FD0 802BC680 E6020014 */ swc1 $f2, 0x14($s0) -.L802BC684: -/* E30FD4 802BC684 C6000010 */ lwc1 $f0, 0x10($s0) -/* E30FD8 802BC688 3C014248 */ lui $at, 0x4248 -/* E30FDC 802BC68C 44811000 */ mtc1 $at, $f2 -/* E30FE0 802BC690 00000000 */ nop -/* E30FE4 802BC694 46020080 */ add.s $f2, $f0, $f2 -/* E30FE8 802BC698 C620004C */ lwc1 $f0, 0x4c($s1) -/* E30FEC 802BC69C 4600103C */ c.lt.s $f2, $f0 -/* E30FF0 802BC6A0 00000000 */ nop -/* E30FF4 802BC6A4 450000B4 */ bc1f .L802BC978 -/* E30FF8 802BC6A8 00000000 */ nop -/* E30FFC 802BC6AC E622004C */ swc1 $f2, 0x4c($s1) -/* E31000 802BC6B0 92020000 */ lbu $v0, ($s0) -/* E31004 802BC6B4 3C014040 */ lui $at, 0x4040 -/* E31008 802BC6B8 44810000 */ mtc1 $at, $f0 -/* E3100C 802BC6BC 3C0142B4 */ lui $at, 0x42b4 -/* E31010 802BC6C0 44811000 */ mtc1 $at, $f2 -/* E31014 802BC6C4 E6040020 */ swc1 $f4, 0x20($s0) -/* E31018 802BC6C8 24420001 */ addiu $v0, $v0, 1 -/* E3101C 802BC6CC A2020000 */ sb $v0, ($s0) -/* E31020 802BC6D0 E6000018 */ swc1 $f0, 0x18($s0) -/* E31024 802BC6D4 080AF25E */ j .L802BC978 -/* E31028 802BC6D8 E602001C */ swc1 $f2, 0x1c($s0) -.L802BC6DC_E3102C: -/* E3102C 802BC6DC C60C001C */ lwc1 $f12, 0x1c($s0) -/* E31030 802BC6E0 3C0140C9 */ lui $at, 0x40c9 -/* E31034 802BC6E4 34210FD0 */ ori $at, $at, 0xfd0 -/* E31038 802BC6E8 4481C000 */ mtc1 $at, $f24 -/* E3103C 802BC6EC 00000000 */ nop -/* E31040 802BC6F0 46186302 */ mul.s $f12, $f12, $f24 -/* E31044 802BC6F4 00000000 */ nop -/* E31048 802BC6F8 3C0143B4 */ lui $at, 0x43b4 -/* E3104C 802BC6FC 4481A000 */ mtc1 $at, $f20 -/* E31050 802BC700 0C00A85B */ jal sin_rad -/* E31054 802BC704 46146303 */ div.s $f12, $f12, $f20 -/* E31058 802BC708 C60C0020 */ lwc1 $f12, 0x20($s0) -/* E3105C 802BC70C 46006302 */ mul.s $f12, $f12, $f0 -/* E31060 802BC710 00000000 */ nop -/* E31064 802BC714 0C00A6C9 */ jal clamp_angle -/* E31068 802BC718 E62C0068 */ swc1 $f12, 0x68($s1) -/* E3106C 802BC71C C600001C */ lwc1 $f0, 0x1c($s0) -/* E31070 802BC720 3C0141F0 */ lui $at, 0x41f0 -/* E31074 802BC724 4481B000 */ mtc1 $at, $f22 -/* E31078 802BC728 00000000 */ nop -/* E3107C 802BC72C 46160000 */ add.s $f0, $f0, $f22 -/* E31080 802BC730 4600A03E */ c.le.s $f20, $f0 -/* E31084 802BC734 00000000 */ nop -/* E31088 802BC738 45000003 */ bc1f .L802BC748 -/* E3108C 802BC73C E600001C */ swc1 $f0, 0x1c($s0) -/* E31090 802BC740 46140001 */ sub.s $f0, $f0, $f20 -/* E31094 802BC744 E600001C */ swc1 $f0, 0x1c($s0) -.L802BC748: -/* E31098 802BC748 C60C0014 */ lwc1 $f12, 0x14($s0) -/* E3109C 802BC74C 46186302 */ mul.s $f12, $f12, $f24 -/* E310A0 802BC750 00000000 */ nop -/* E310A4 802BC754 0C00A874 */ jal cos_rad -/* E310A8 802BC758 46146303 */ div.s $f12, $f12, $f20 -/* E310AC 802BC75C C6020018 */ lwc1 $f2, 0x18($s0) -/* E310B0 802BC760 46001082 */ mul.s $f2, $f2, $f0 -/* E310B4 802BC764 00000000 */ nop -/* E310B8 802BC768 C620004C */ lwc1 $f0, 0x4c($s1) -/* E310BC 802BC76C 46020000 */ add.s $f0, $f0, $f2 -/* E310C0 802BC770 E620004C */ swc1 $f0, 0x4c($s1) -/* E310C4 802BC774 C6000014 */ lwc1 $f0, 0x14($s0) -/* E310C8 802BC778 46160000 */ add.s $f0, $f0, $f22 -/* E310CC 802BC77C 4600A03E */ c.le.s $f20, $f0 -/* E310D0 802BC780 00000000 */ nop -/* E310D4 802BC784 45000003 */ bc1f .L802BC794 -/* E310D8 802BC788 E6000014 */ swc1 $f0, 0x14($s0) -/* E310DC 802BC78C 46140001 */ sub.s $f0, $f0, $f20 -/* E310E0 802BC790 E6000014 */ swc1 $f0, 0x14($s0) -.L802BC794: -/* E310E4 802BC794 C6000018 */ lwc1 $f0, 0x18($s0) -/* E310E8 802BC798 3C01802C */ lui $at, %hi(D_802BCBC0_E31510) -/* E310EC 802BC79C D422CBC0 */ ldc1 $f2, %lo(D_802BCBC0_E31510)($at) -/* E310F0 802BC7A0 46000021 */ cvt.d.s $f0, $f0 -/* E310F4 802BC7A4 46220001 */ sub.d $f0, $f0, $f2 -/* E310F8 802BC7A8 3C01802C */ lui $at, %hi(D_802BCBC8_E31518) -/* E310FC 802BC7AC D424CBC8 */ ldc1 $f4, %lo(D_802BCBC8_E31518)($at) -/* E31100 802BC7B0 46200020 */ cvt.s.d $f0, $f0 -/* E31104 802BC7B4 460000A1 */ cvt.d.s $f2, $f0 -/* E31108 802BC7B8 4624103C */ c.lt.d $f2, $f4 -/* E3110C 802BC7BC 00000000 */ nop -/* E31110 802BC7C0 4500006D */ bc1f .L802BC978 -/* E31114 802BC7C4 E6000018 */ swc1 $f0, 0x18($s0) -/* E31118 802BC7C8 080AF256 */ j .L802BC958 -/* E3111C 802BC7CC 00000000 */ nop -.L802BC7D0_E31120: -/* E31120 802BC7D0 C6000020 */ lwc1 $f0, 0x20($s0) -/* E31124 802BC7D4 3C01802C */ lui $at, %hi(D_802BCBD0_E31520) -/* E31128 802BC7D8 D422CBD0 */ ldc1 $f2, %lo(D_802BCBD0_E31520)($at) -/* E3112C 802BC7DC 46000021 */ cvt.d.s $f0, $f0 -/* E31130 802BC7E0 46220001 */ sub.d $f0, $f0, $f2 -/* E31134 802BC7E4 4480B000 */ mtc1 $zero, $f22 -/* E31138 802BC7E8 46200020 */ cvt.s.d $f0, $f0 -/* E3113C 802BC7EC 4616003E */ c.le.s $f0, $f22 -/* E31140 802BC7F0 00000000 */ nop -/* E31144 802BC7F4 45000002 */ bc1f .L802BC800 -/* E31148 802BC7F8 E6000020 */ swc1 $f0, 0x20($s0) -/* E3114C 802BC7FC E6160020 */ swc1 $f22, 0x20($s0) -.L802BC800: -/* E31150 802BC800 C60C001C */ lwc1 $f12, 0x1c($s0) -/* E31154 802BC804 3C0140C9 */ lui $at, 0x40c9 -/* E31158 802BC808 34210FD0 */ ori $at, $at, 0xfd0 -/* E3115C 802BC80C 4481D000 */ mtc1 $at, $f26 -/* E31160 802BC810 00000000 */ nop -/* E31164 802BC814 461A6302 */ mul.s $f12, $f12, $f26 -/* E31168 802BC818 00000000 */ nop -/* E3116C 802BC81C 3C0143B4 */ lui $at, 0x43b4 -/* E31170 802BC820 4481A000 */ mtc1 $at, $f20 -/* E31174 802BC824 0C00A85B */ jal sin_rad -/* E31178 802BC828 46146303 */ div.s $f12, $f12, $f20 -/* E3117C 802BC82C C60C0020 */ lwc1 $f12, 0x20($s0) -/* E31180 802BC830 46006302 */ mul.s $f12, $f12, $f0 -/* E31184 802BC834 00000000 */ nop -/* E31188 802BC838 0C00A6C9 */ jal clamp_angle -/* E3118C 802BC83C E62C0068 */ swc1 $f12, 0x68($s1) -/* E31190 802BC840 C600001C */ lwc1 $f0, 0x1c($s0) -/* E31194 802BC844 3C0141F0 */ lui $at, 0x41f0 -/* E31198 802BC848 4481C000 */ mtc1 $at, $f24 -/* E3119C 802BC84C 00000000 */ nop -/* E311A0 802BC850 46180000 */ add.s $f0, $f0, $f24 -/* E311A4 802BC854 4600A03E */ c.le.s $f20, $f0 -/* E311A8 802BC858 00000000 */ nop -/* E311AC 802BC85C 45000003 */ bc1f .L802BC86C -/* E311B0 802BC860 E600001C */ swc1 $f0, 0x1c($s0) -/* E311B4 802BC864 46140001 */ sub.s $f0, $f0, $f20 -/* E311B8 802BC868 E600001C */ swc1 $f0, 0x1c($s0) -.L802BC86C: -/* E311BC 802BC86C 0C0AF12E */ jal func_802BC4B8_E30E08 -/* E311C0 802BC870 0220202D */ daddu $a0, $s1, $zero -/* E311C4 802BC874 C60C0014 */ lwc1 $f12, 0x14($s0) -/* E311C8 802BC878 461A6302 */ mul.s $f12, $f12, $f26 -/* E311CC 802BC87C 00000000 */ nop -/* E311D0 802BC880 0C00A874 */ jal cos_rad -/* E311D4 802BC884 46146303 */ div.s $f12, $f12, $f20 -/* E311D8 802BC888 C6020018 */ lwc1 $f2, 0x18($s0) -/* E311DC 802BC88C 46001082 */ mul.s $f2, $f2, $f0 -/* E311E0 802BC890 00000000 */ nop -/* E311E4 802BC894 C620004C */ lwc1 $f0, 0x4c($s1) -/* E311E8 802BC898 46020000 */ add.s $f0, $f0, $f2 -/* E311EC 802BC89C E620004C */ swc1 $f0, 0x4c($s1) -/* E311F0 802BC8A0 C6000014 */ lwc1 $f0, 0x14($s0) -/* E311F4 802BC8A4 46180000 */ add.s $f0, $f0, $f24 -/* E311F8 802BC8A8 4600A03E */ c.le.s $f20, $f0 -/* E311FC 802BC8AC 00000000 */ nop -/* E31200 802BC8B0 45000003 */ bc1f .L802BC8C0 -/* E31204 802BC8B4 E6000014 */ swc1 $f0, 0x14($s0) -/* E31208 802BC8B8 46140001 */ sub.s $f0, $f0, $f20 -/* E3120C 802BC8BC E6000014 */ swc1 $f0, 0x14($s0) -.L802BC8C0: -/* E31210 802BC8C0 C6000018 */ lwc1 $f0, 0x18($s0) -/* E31214 802BC8C4 3C01802C */ lui $at, %hi(D_802BCBD8_E31528) -/* E31218 802BC8C8 D422CBD8 */ ldc1 $f2, %lo(D_802BCBD8_E31528)($at) -/* E3121C 802BC8CC 46000021 */ cvt.d.s $f0, $f0 -/* E31220 802BC8D0 46220001 */ sub.d $f0, $f0, $f2 -/* E31224 802BC8D4 46200020 */ cvt.s.d $f0, $f0 -/* E31228 802BC8D8 4616003E */ c.le.s $f0, $f22 -/* E3122C 802BC8DC 00000000 */ nop -/* E31230 802BC8E0 45000025 */ bc1f .L802BC978 -/* E31234 802BC8E4 E6000018 */ swc1 $f0, 0x18($s0) -/* E31238 802BC8E8 92020000 */ lbu $v0, ($s0) -/* E3123C 802BC8EC 24030008 */ addiu $v1, $zero, 8 -/* E31240 802BC8F0 E6160018 */ swc1 $f22, 0x18($s0) -/* E31244 802BC8F4 A2030001 */ sb $v1, 1($s0) -/* E31248 802BC8F8 24420001 */ addiu $v0, $v0, 1 -/* E3124C 802BC8FC A2020000 */ sb $v0, ($s0) -/* E31250 802BC900 080AF25E */ j .L802BC978 -/* E31254 802BC904 E6360068 */ swc1 $f22, 0x68($s1) -.L802BC908_E31258: -/* E31258 802BC908 92020001 */ lbu $v0, 1($s0) -/* E3125C 802BC90C 2442FFFF */ addiu $v0, $v0, -1 -/* E31260 802BC910 A2020001 */ sb $v0, 1($s0) -/* E31264 802BC914 00021600 */ sll $v0, $v0, 0x18 -/* E31268 802BC918 1040000F */ beqz $v0, .L802BC958 -/* E3126C 802BC91C 00000000 */ nop -/* E31270 802BC920 080AF25E */ j .L802BC978 -/* E31274 802BC924 00000000 */ nop -.L802BC928_E31278: -/* E31278 802BC928 C620004C */ lwc1 $f0, 0x4c($s1) -/* E3127C 802BC92C 3C014100 */ lui $at, 0x4100 -/* E31280 802BC930 44811000 */ mtc1 $at, $f2 -/* E31284 802BC934 00000000 */ nop -/* E31288 802BC938 46020001 */ sub.s $f0, $f0, $f2 -/* E3128C 802BC93C E620004C */ swc1 $f0, 0x4c($s1) -/* E31290 802BC940 C6020010 */ lwc1 $f2, 0x10($s0) -/* E31294 802BC944 4602003E */ c.le.s $f0, $f2 -/* E31298 802BC948 00000000 */ nop -/* E3129C 802BC94C 4500000A */ bc1f .L802BC978 -/* E312A0 802BC950 00000000 */ nop -/* E312A4 802BC954 E622004C */ swc1 $f2, 0x4c($s1) -.L802BC958: -/* E312A8 802BC958 92020000 */ lbu $v0, ($s0) -/* E312AC 802BC95C 24420001 */ addiu $v0, $v0, 1 -/* E312B0 802BC960 080AF25E */ j .L802BC978 -/* E312B4 802BC964 A2020000 */ sb $v0, ($s0) -.L802BC968_E312B8: -/* E312B8 802BC968 0C043F5A */ jal exec_entity_commandlist -/* E312BC 802BC96C 0220202D */ daddu $a0, $s1, $zero -/* E312C0 802BC970 0C038050 */ jal enable_player_static_collisions -/* E312C4 802BC974 A2000000 */ sb $zero, ($s0) -.L802BC978: -/* E312C8 802BC978 8FBF0018 */ lw $ra, 0x18($sp) -/* E312CC 802BC97C 8FB10014 */ lw $s1, 0x14($sp) -/* E312D0 802BC980 8FB00010 */ lw $s0, 0x10($sp) -/* E312D4 802BC984 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* E312D8 802BC988 D7B80030 */ ldc1 $f24, 0x30($sp) -/* E312DC 802BC98C D7B60028 */ ldc1 $f22, 0x28($sp) -/* E312E0 802BC990 D7B40020 */ ldc1 $f20, 0x20($sp) -/* E312E4 802BC994 03E00008 */ jr $ra -/* E312E8 802BC998 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index e460a01b65..99d9dbba92 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -782,7 +782,7 @@ segments: - [0xA5DD0, c, bss3] - [0xA5DD0, c, a5dd0_len_114e0] - [0xB4580, c, B4580] - - [0xB72B0, c, entity] + - [0xB72B0, c, entity_model] - [0xB9D60, c, msg] - [0xC50A0, c, C50A0] - [0xCD180, c, cd180_len_38f0] @@ -799,7 +799,7 @@ segments: - [0xE0B30, c, e0b30_len_b80] - [0xE16B0, .data, a5dd0_len_114e0] - [0xE2950, .data, B4580] - - [0xE2960, .data, entity] + - [0xE2960, .data, entity_model] - [0xE2980, .data, msg] - [0xE2CA0, .data, C50A0] - start: 0xE2DF0 @@ -853,27 +853,46 @@ segments: start: 0x102610 vram: 0x802E0D90 subsegments: - - [0x102610, c, entity/SaveBlock] + - [0x102610, c, entity/Shadow] + - [0x102660, c, entity/SaveBlock] - [0x102C80, c, entity/Switch] - - [0x103CD0, c, entity/103CD0] - - [0x104730, c, entity/104730] + - [0x103CD0, c, entity/ShatteringBlock_common] + - [0x104730, c, entity/ShatteringBlock] - [0x104940, c, entity/Block] - [0x105700, c, entity/ItemBlock] - [0x105F90, c, entity/HeartBlock] - [0x106EF0, c, entity/SuperBlock] - [0x107830, c, entity/SimpleSpring] + - [0x107A30, c, entity/HiddenPanel] - [0x1086A0, c, entity/Chest] - [0x109660, c, entity/WoodenCrate] - [0x10A230, c, entity/BlueWarpPipe] - [0x10A8D0, c, entity/Signpost] - - [0x10A9F0, data] - #- [0x10A9F0, i4, shadow/square, 16, 16] - #- [0x10AA70, i4, shadow/circle, 16, 16] - - [0x10AAF0, data] - #- [0x10AB70, i4, shadow/10AB70, 32, 32] - #- [0x10AD70, i4, shadow/10AD70, 32, 32] - - [0x10AF70, .data, entity/104730] - - [0x10B610, data] + - start: 0x10A9F0 + type: .data + name: entity/Shadow + subsegments: + - [0x10A9F0, i4, entity/shadow/square, 16, 16] + - [0x10AA70, i4, entity/shadow/circle, 16, 16] + - [0x10AAF0, vtx, entity/vtx/shadow1] + - [0x10AB30, vtx, entity/vtx/shadow2] + - [0x10AB70, i4, entity/shadow/square_big, 32, 32] + - [0x10AD70, i4, entity/shadow/circle_big, 32, 32] + - [0x10AF70] + - [0x10B1B0, .data, entity/SaveBlock] + - [0x10B2C0, .data, entity/Switch] + - [0x10B4C0, .data, entity/ShatteringBlock_common] + - [0x10B4F0, .data, entity/ShatteringBlock] + - [0x10B610, .data, entity/Block] + - [0x10BB90, .data, entity/ItemBlock] + - [0x10BF10, .data, entity/HeartBlock] + - [0x10C090, .data, entity/SuperBlock] + - [0x10C220, .data, entity/SimpleSpring] + - [0x10C300, .data, entity/HiddenPanel] + - [0x10C3B0, .data, entity/Chest] + - [0x10C6E0, .data, entity/WoodenCrate] + - [0x10C780, .data, entity/BlueWarpPipe] + - [0x10C830, .data, entity/Signpost] - [0x10C880] - type: code start: 0x10CC10 @@ -12048,10 +12067,12 @@ segments: vram: 0x802BAE00 overlay: True subsegments: - - [0xE2B530, c, E2B530] - - [0xE2BE40, c, E2BE40] - - [0xE2C930, c] - - [0xE2D410, data] + - [0xE2B530, c, Padlock] + - [0xE2BE40, c, BoardedFloor] + - [0xE2C930, c, BombableRock] + - [0xE2D410, .data, Padlock] + - [0xE2D530, .data, BoardedFloor] + - [0xE2D5E0, .data, BombableRock] - [0xE2D680] - type: code dir: entity/jan_iwa @@ -12059,10 +12080,12 @@ segments: vram: 0x802BAE00 overlay: True subsegments: - - [0xE2D730, c] - - [0xE2E5F0, c] - - [0xE2EDE0, c] - - [0xE2EFD0, data] + - [0xE2D730, c, Plants1] + - [0xE2E5F0, c, Plants2] + - [0xE2EDE0, c, ArrowSign] + - [0xE2EFD0, .data, Plants1] + - [0xE2F150, .data, Plants2] + - [0xE2F6A0, .data, ArrowSign] - [0xE2F6F0] - type: code dir: entity/sbk_omo @@ -12070,23 +12093,1147 @@ segments: vram: 0x802BAE00 overlay: True subsegments: - - [0xE2F750, c, E2F750] - - [0xE307C0, c, E307C0] - - [0xE31380, data] + - [0xE2F750, c, Tweester] + - [0xE307C0, c, StarBoxLauncher] + - [0xE31380, .data, Tweester] + - [0xE313F0, .data, StarBoxLauncher] - [0xE314C0] - - [0xE31530, bin] # unk data - - [0xE32420, bin] # unk data - - [0xE35670, bin] # unk data - - [0xE38890, bin] # unk data - - [0xE3B870, bin] # unk data - - [0xE3E260, bin] # unk data - - [0xE42240, bin] # unk data - - [0xE4B2E0, bin] # unk data - - [0xE4E7F0, bin] # unk data - - [0xE62370, bin] # unk data - - [0xE62AC0, bin] # unk data - - [0xE639C0, bin] # unk data - - [0xE648D0, bin] # unk data + - name: entity_model_Hammer1Block + dir: entity/model + type: code + start: 0xE31530 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE31530, c, Hammer1Block] + - start: 0xE31530 + type: .data + name: Hammer1Block + subsegments: + - [0xE31530, vtx, Hammer1Block] + - [0xE317B0, ci4, Hammer1Block_face, 16, 32] + - [0xE318B0, palette, Hammer1Block_face] + - [0xE318D0] + - name: entity_model_Hammer2Block + dir: entity/model + type: code + start: 0xE31A30 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE31A30, c, Hammer2Block] + - start: 0xE31A30 + type: .data + name: Hammer2Block + subsegments: + - [0xE31A30, vtx, Hammer2Block] + - [0xE31CB0, ci4, Hammer2Block_face, 16, 32] + - [0xE31DB0, palette, Hammer2Block_face] + - [0xE31DD0] + - name: entity_model_Hammer3Block + dir: entity/model + type: code + start: 0xE31F30 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE31F30, c, Hammer3Block] + - start: 0xE31F30 + type: .data + name: Hammer3Block + subsegments: + - [0xE31F30, vtx, Hammer3Block] + - [0xE321B0, ci4, Hammer3Block_face, 16, 32] + - [0xE322B0, palette, Hammer3Block_face] + - [0xE322D0] + - name: entity_model_ShatteringHammer1Block + dir: entity/model + type: code + start: 0xE32420 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE32420, c, ShatteringHammer1Block] + - start: 0xE32420 + type: .data + name: ShatteringHammer1Block + subsegments: + - [0xE32420, vtx, ShatteringHammer1Block] + - [0xE33480, ci8, ShatteringHammer1Block_texture, 16, 32] + - [0xE33680, palette, ShatteringHammer1Block_texture] + - [0xE33880] + - name: entity_model_ShatteringHammer2Block + dir: entity/model + type: code + start: 0xE35670 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE35670, c, ShatteringHammer2Block] + - start: 0xE35670 + type: .data + name: ShatteringHammer2Block + subsegments: + - [0xE35670, vtx, ShatteringHammer2Block] + - [0xE366D0, rgba16, ShatteringHammer2Block_texture, 16, 32] + - [0xE36AD0] + - name: entity_model_ShatteringHammer3Block + dir: entity/model + type: code + start: 0xE38890 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE38890, c, ShatteringHammer3Block] + - start: 0xE38890 + type: .data + name: ShatteringHammer3Block + subsegments: + - [0xE38890, vtx, ShatteringHammer3Block] + - [0xE398E0, ci4, ShatteringHammer3Block_texture, 16, 32] + - [0xE399E0, palette, ShatteringHammer3Block_texture] + - [0xE39A00] + - name: entity_model_YellowBlock + dir: entity/model + type: code + start: 0xE3B870 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3B870, c, YellowBlock] + - start: 0xE3B870 + type: .data + name: YellowBlock + subsegments: + - [0xE3B870, vtx, YellowBlock] + - [0xE3B9F0, rgba16, YellowBlock_face, 32, 32] + - [0xE3C1F0] + - name: entity_model_RedBlock + dir: entity/model + type: code + start: 0xE3C320 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3C320, c, RedBlock] + - start: 0xE3C320 + type: .data + name: RedBlock + subsegments: + - [0xE3C320, vtx, RedBlock] + - [0xE3C4A0, rgba16, RedBlock_face, 32, 32] + - [0xE3CCA0] + - name: entity_model_UnusedBlock + dir: entity/model + type: code + start: 0xE3CDD0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3CDD0, c, UnusedBlock] + - start: 0xE3CDD0 + type: .data + name: UnusedBlock + subsegments: + - [0xE3CDD0, vtx, UnusedBlock] + - [0xE3D190, rgba16, UnusedBlock_img1, 16, 32] + - [0xE3D590] + - [0xE3D618, ci4, UnusedBlock_img2, 16, 32] + - [0xE3D718, palette, UnusedBlock_img2] + - [0xE3D738] + - name: entity_model_PushBlock + dir: entity/model + type: code + start: 0xE3DA60 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3DA60, c, PushBlock] + - start: 0xE3DA60 + type: .data + name: PushBlock + subsegments: + - [0xE3DA60, vtx, PushBlock] + - [0xE3DB80, ci4, PushBlock_face, 16, 16] + - [0xE3DC00, palette, PushBlock_face] + - [0xE3DC20] + - name: entity_model_BrickBlock + dir: entity/model + type: code + start: 0xE3DDB0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3DDB0, c, BrickBlock] + - start: 0xE3DDB0 + type: .data + name: BrickBlock + subsegments: + - [0xE3DDB0, vtx, BrickBlock] + - [0xE3DEF0, ci4, BrickBlock_face, 32, 32] + - [0xE3E0F0, palette, BrickBlock_face] + - [0xE3E110] + - name: entity_model_ShatteringBrickBlock + dir: entity/model + type: code + start: 0xE3E260 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE3E260, c, ShatteringBrickBlock] + - start: 0xE3E260 + type: .data + name: ShatteringBrickBlock + subsegments: + - [0xE3E260, vtx, ShatteringBrickBlock] + - [0xE3FD00, rgba16, ShatteringBrickBlock_texture, 32, 32] + - [0xE40500] + - name: entity_model_InertYellowBlock + dir: entity/model + type: code + start: 0xE42240 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE42240, c, InertYellowBlock] + - start: 0xE42240 + type: .data + name: InertYellowBlock + subsegments: + - [0xE42240, vtx, InertYellowBlock_1] + - [0xE42340, vtx, InertYellowBlock_2] + - [0xE423C0, ci4, InertYellowBlock_face, 32, 32] + - [0xE425C0, palette, InertYellowBlock_face] + - [0xE425E0] + - name: entity_model_InertRedBlock + dir: entity/model + type: code + start: 0xE42740 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE42740, c, InertRedBlock] + - start: 0xE42740 + type: .data + name: InertRedBlock + subsegments: + - [0xE42740, vtx, InertRedBlock_1] + - [0xE42840, vtx, InertRedBlock_2] + - [0xE428C0, rgba16, InertRedBlock_face, 32, 32] + - [0xE430C0] + - name: entity_model_HeartBlock + dir: entity/model + type: code + start: 0xE431F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE431F0, c, HeartBlock] + - start: 0xE431F0 + type: .data + name: HeartBlock + subsegments: + - [0xE431F0, vtx, HeartBlock] + - [0xE435B0, rgba16, HeartBlock_face, 16, 32] + - [0xE439B0] + - name: entity_model_PowBlock + dir: entity/model + type: code + start: 0xE43B20 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE43B20, c, PowBlock] + - start: 0xE43B20 + type: .data + name: PowBlock + subsegments: + - [0xE43B20, vtx, PowBlock] + - [0xE43C20, ci8, PowBlock_face, 64, 32] + - [0xE44420, palette, PowBlock_face] + - [0xE44620] + - name: entity_model_SuperBlock + dir: entity/model + type: code + start: 0xE44800 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE44800, c, SuperBlock] + - start: 0xE44800 + type: .data + name: SuperBlock + subsegments: + - [0xE44800, vtx, SuperBlock] + - [0xE44C80, ci4, SuperBlock_tex, 16, 32] + - [0xE44D80, palette, SuperBlock_tex] + - [0xE44DA0] + - name: entity_model_UltraBlock + dir: entity/model + type: code + start: 0xE45110 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE45110, c, UltraBlock] + - start: 0xE45110 + type: .data + name: UltraBlock + subsegments: + - [0xE45110, vtx, UltraBlock] + - [0xE45590, ci4, UltraBlock_tex, 16, 32] + - [0xE45690, palette, UltraBlock_tex] + - [0xE456B0] + - name: entity_model_HitYellowBlock_gfx + dir: entity/model + type: code + start: 0xE459F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE459F0, c, HitYellowBlock_gfx] + - start: 0xE459F0 + type: .data + name: HitYellowBlock_gfx + subsegments: + - [0xE459F0, vtx, HitYellowBlock_1] + - [0xE45B50, vtx, HitYellowBlock_2] + - [0xE45CB0] + - [0xE45E10, rgba16, HitYellowBlock_face1, 32, 32] + - [0xE46610, rgba16, HitYellowBlock_face2, 32, 32] + - name: entity_model_HitYellowBlock_anim + dir: entity/model + type: code + start: 0xE46E10 + vram: 0x00000000 + subsegments: + - [0xE46E10, c, HitYellowBlock_anim] + - name: entity_model_HitFloatingYellowBlock_gfx + dir: entity/model + type: code + start: 0xE470B0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE470B0, c, HitFloatingYellowBlock_gfx] + - start: 0xE470B0 + type: .data + name: HitFloatingYellowBlock_gfx + subsegments: + - [0xE470B0, vtx, HitFloatingYellowBlock_1] + - [0xE47210, vtx, HitFloatingYellowBlock_2] + - [0xE47390] + - [0xE474F0, rgba16, HitFloatingYellowBlock_face1, 32, 32] + - [0xE47CF0, rgba16, HitFloatingYellowBlock_face2, 32, 32] + - name: entity_model_HitFloatingYellowBlock_anim + dir: entity/model + type: code + start: 0xE484F0 + vram: 0x00000000 + subsegments: + - [0xE484F0, c, HitFloatingYellowBlock_anim] + - name: entity_model_HitRedBlock_gfx + dir: entity/model + type: code + start: 0xE48780 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE48780, c, HitRedBlock_gfx] + - start: 0xE48780 + type: .data + name: HitRedBlock_gfx + subsegments: + - [0xE48780, vtx, HitRedBlock_1] + - [0xE488E0, vtx, HitRedBlock_2] + - [0xE48A40] + - [0xE48BE0, rgba16, HitRedBlock_face1, 32, 32] + - [0xE493E0, rgba16, HitRedBlock_face2, 32, 32] + - name: entity_model_HitRedBlock_anim + dir: entity/model + type: code + start: 0xE49BE0 + vram: 0x00000000 + subsegments: + - [0xE49BE0, c, HitRedBlock_anim] + - name: entity_model_HeartBlockContent + dir: entity/model + type: code + start: 0xE49E40 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE49E40, c, HeartBlockContent] + - start: 0xE49E40 + type: .data + name: HeartBlockContent + subsegments: + - [0xE49E40] + #- [0xE49E40, ci4, HeartBlockContent_img1, 32, 32] + #- [0xE4A040, ci4, HeartBlockContent_img2, 32, 32] + #- [0xE4A240, ci4, HeartBlockContent_img3, 32, 32] + #- [0xE4A440, palette, HeartBlockContent_pal] # this palette is common for all images above + #- [0xE4A460] + - name: entity_model_SuperBlockContent + dir: entity/model + type: code + start: 0xE4A6A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE4A6A0, c, SuperBlockContent] + - start: 0xE4A6A0 + type: .data + name: SuperBlockContent + subsegments: + - [0xE4A6A0, ci4, SuperBlockContent, 32, 32] + - [0xE4A8A0, palette, SuperBlockContent] + - [0xE4A8C0, palette, SuperBlockContent.pal2] + - [0xE4A8E0, palette, SuperBlockContent.pal3] + - [0xE4A900, palette, SuperBlockContent.pal4] + - [0xE4A920] + - name: entity_model_UltraBlockContent + dir: entity/model + type: code + start: 0xE4AA80 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE4AA80, c, UltraBlockContent] + - start: 0xE4AA80 + type: .data + name: UltraBlockContent + subsegments: + - [0xE4AA80] + #- [0xE4AA80, ci4, UltraBlockContent_img1, 32, 32] + #- [0xE4AC80, ci4, UltraBlockContent_img2, 32, 32] + #- [0xE4AE80, ci4, UltraBlockContent_img3, 32, 32] + #- [0xE4B080, palette, UltraBlockContent_pal] # this palette is common for all images above + #- [0xE4B0A0] + - name: entity_model_SaveBlock + dir: entity/model + type: code + start: 0xE4B2E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE4B2E0, c, SaveBlock] + - start: 0xE4B2E0 + type: .data + name: SaveBlock + subsegments: + - [0xE4B2E0, vtx, SaveBlock_1] + - [0xE4B650, vtx, SaveBlock_2] + - [0xE4B9A0, vtx, SaveBlock_3] + - [0xE4BBE0, rgba16, SaveBlock_star, 32, 32] + - [0xE4C3E0] + - [0xE4C450, rgba32, SaveBlock_face, 32, 32] + - [0xE4D450] + - [0xE4D4C8, rgba16, SaveBlock_letterS, 64, 32] + - [0xE4E4C8] + - name: entity_model_BoardedFloor + dir: entity/model + type: code + start: 0xE4E7F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE4E7F0, c, BoardedFloor] + - start: 0xE4E7F0 + type: .data + name: BoardedFloor + subsegments: + - [0xE4E7F0, vtx, BoardedFloor_1] + - [0xE4E9D0, vtx, BoardedFloor_2] + - [0xE4EBB0, vtx, BoardedFloor_3] + - [0xE4ED90, vtx, BoardedFloor_4] + - [0xE4EF70, vtx, BoardedFloor_5] + - [0xE4F0F0, vtx, BoardedFloor_6] + - [0xE4F270, vtx, BoardedFloor_7] + - [0xE4F470, vtx, BoardedFloor_8] + - [0xE4F670, vtx, BoardedFloor_9] + - [0xE4F7F0, vtx, BoardedFloor_A] + - [0xE4F970, vtx, BoardedFloor_B] + - [0xE4FA70, vtx, BoardedFloor_C] + - [0xE4FBF0, rgba16, BoardedFloor, 64, 32] + - [0xE50BF0] + - name: entity_model_WoodenCrate + dir: entity/model + type: code + start: 0xE51640 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE51640, c, WoodenCrate] + - start: 0xE51640 + type: .data + name: WoodenCrate + subsegments: + - [0xE51640, vtx, WoodenCrate] + - [0xE52BA0, ci4, WoodenCrate_img1, 64, 64] + - [0xE533A0, palette, WoodenCrate_img1] + - [0xE533C0] + - [0xE53468, ci4, WoodenCrate_img2, 64, 64] + - [0xE53C68, palette, WoodenCrate_img2] + - [0xE53C88] + - name: entity_model_StarBoxLauncher + dir: entity/model + type: code + start: 0xE55A40 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE55A40, c, StarBoxLauncher] + - start: 0xE55A40 + type: .data + name: StarBoxLauncher + subsegments: + - [0xE55A40, vtx, StarBoxLauncher_1] + - [0xE55B30, vtx, StarBoxLauncher_2] + - [0xE55C50, vtx, StarBoxLauncher_3] + - [0xE55C90, vtx, StarBoxLauncher_4] + - [0xE55CD0, rgba16, StarBoxLauncher_link, 16, 16] + - [0xE55ED0] + - [0xE55F48, ci4, StarBoxLauncher_face, 128, 32] + - [0xE56748, palette, StarBoxLauncher_face] + - [0xE56768] + - [0xE56810, ci4, StarBoxLauncher_box, 16, 32] + - [0xE56910, palette, StarBoxLauncher_box] + - [0xE56930] + - name: entity_model_HiddenPanel + dir: entity/model + type: code + start: 0xE56BA0 + vram: 0x0A000000 + subsegments: + - [0xE56BA0, c, HiddenPanel] + - name: entity_model_Tweester + dir: entity/model + type: code + start: 0xE56E60 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE56E60, c, Tweester] + - start: 0xE56E60 + type: .data + name: Tweester + subsegments: + - [0xE56E60, vtx, Tweester_1] + - [0xE57270, vtx, Tweester_2] + - [0xE57680, vtx, Tweester_3] + - [0xE576C0, vtx, Tweester_4] + - [0xE57A50, i8, Tweester_img1, 32, 32] + - [0xE57E50, i8, Tweester_img2, 32, 32] + - [0xE58250] + - [0xE58300, ci4, Tweester_img3, 64, 32] + - [0xE58700, palette, Tweester_img3] + - [0xE58720] + - name: entity_model_BlueWarpPipe + dir: entity/model + type: code + start: 0xE58CD0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE58CD0, c, BlueWarpPipe] + - start: 0xE58CD0 + type: .data + name: BlueWarpPipe + subsegments: + - [0xE58CD0, vtx, BlueWarpPipe_1] + - [0xE58D30, vtx, BlueWarpPipe_2] + - [0xE58FB0, vtx, BlueWarpPipe_3] + - [0xE58FF0, ci4, BlueWarpPipe_texBase, 16, 16] + - [0xE59070, palette, BlueWarpPipe_texBase] + - [0xE59090] + - [0xE59140, ci4, BlueWarpPipe_texPipe, 32, 16] + - [0xE59240, palette, BlueWarpPipe_texPipe] + - [0xE59260] + - name: entity_model_Signpost + dir: entity/model + type: code + start: 0xE59480 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE59480, c, Signpost] + - start: 0xE59480 + type: .data + name: Signpost + subsegments: + - [0xE59480, vtx, Signpost_1] + - [0xE595A0, vtx, Signpost_2] + - [0xE59A00, ci4, Signpost, 32, 32] + - [0xE59C00, palette, Signpost] + - [0xE59C20] + - name: entity_model_ArrowSign + dir: entity/model + type: code + start: 0xE59F00 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE59F00, c, ArrowSign] + - start: 0xE59F00 + type: .data + name: ArrowSign + subsegments: + - [0xE59F00] + - [0xE59F80, ci8, ArrowSign, 64, 32] + - [0xE5A780, palette, ArrowSign] + - [0xE5A980] + - name: entity_model_Padlock + dir: entity/model + type: code + start: 0xE5AB50 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE5AB50, c, Padlock] + - start: 0xE5AB50 + type: .data + name: Padlock + subsegments: + - [0xE5AB50, vtx, Padlock_1] + - [0xE5B110, vtx, Padlock_2] + - [0xE5B170, vtx, Padlock_3] + - [0xE5B1B0, vtx, Padlock_4] + - [0xE5B250, ci8, Padlock_face, 32, 32] + - [0xE5B650, palette, Padlock_face] + - [0xE5B850] + - [0xE5B8F8, ci8, Padlock_keyhole, 32, 64] + - [0xE5C0F8, palette, Padlock_keyhole] + - [0xE5C2F8] + - [0xE5C3A0, ci8, Padlock_body, 32, 32] + - [0xE5C7A0, palette, Padlock_body] + - [0xE5C9A0] + - name: entity_model_PadlockRedFrame + dir: entity/model + type: code + start: 0xE5CD80 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE5CD80, c, PadlockRedFrame] + - start: 0xE5CD80 + type: .data + name: PadlockRedFrame + subsegments: + - [0xE5CD80, vtx, PadlockRedFrame_1] + - [0xE5CF80, vtx, PadlockRedFrame_2] + - [0xE5CFC0, vtx, PadlockRedFrame_3] + - [0xE5D000, vtx, PadlockRedFrame_4] + - [0xE5D2C0, ci8, PadlockRedFrame_keyhole, 32, 64] + - [0xE5DAC0, palette, PadlockRedFrame_keyhole] + - [0xE5DCC0] + - [0xE5DD68, ci8, PadlockRedFrame_face, 32, 32] + - [0xE5E168, palette, PadlockRedFrame_face] + - [0xE5E368] + - name: entity_model_PadlockRedFace + dir: entity/model + type: code + start: 0xE5E730 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE5E730, c, PadlockRedFace] + - start: 0xE5E730 + type: .data + name: PadlockRedFace + subsegments: + - [0xE5E730, vtx, PadlockRedFace_1] + - [0xE5ECF0, vtx, PadlockRedFace_2] + - [0xE5ED50, vtx, PadlockRedFace_3] + - [0xE5ED90, vtx, PadlockRedFace_4] + - [0xE5EE30, i4, PadlockRedFace_face, 32, 32] + - [0xE5F030] + - [0xE5F0A8, ci8, PadlockRedFace_keyhole, 32, 64] + - [0xE5F8A8, palette, PadlockRedFace_keyhole] + - [0xE5FAA8] + - [0xE5FB50, ci8, PadlockRedFace_body, 32, 32] + - [0xE5FF50, palette, PadlockRedFace_body] + - [0xE60150] + - name: entity_model_PadlockBlueFace + dir: entity/model + type: code + start: 0xE60550 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE60550, c, PadlockBlueFace] + - start: 0xE60550 + type: .data + name: PadlockBlueFace + subsegments: + - [0xE60550, vtx, PadlockBlueFace_1] + - [0xE60B10, vtx, PadlockBlueFace_2] + - [0xE60B70, vtx, PadlockBlueFace_3] + - [0xE60BB0, vtx, PadlockBlueFace_4] + - [0xE60C50, i4, PadlockBlueFace_face, 32, 32] + - [0xE60E50] + - [0xE60EC8, ci8, PadlockBlueFace_keyhole, 32, 64] + - [0xE616C8, palette, PadlockBlueFace_keyhole] + - [0xE618C8] + - [0xE61970, ci8, PadlockBlueFace_body, 32, 32] + - [0xE61D70, palette, PadlockBlueFace_body] + - [0xE61F70] + - name: entity_model_GreenStompSwitch + dir: entity/model + type: code + start: 0xE62370 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE62370, c, GreenStompSwitch] + - start: 0xE62370 + type: .data + name: GreenStompSwitch + subsegments: + - [0xE62370, vtx, GreenStompSwitch_1] + - [0xE623F0, vtx, GreenStompSwitch_2] + - [0xE625F0, ci4, GreenStompSwitch_tex, 16, 16] + - [0xE62670, palette, GreenStompSwitch_tex] + - [0xE62690] + - [0xE62748, ci4, GreenStompSwitch_exclamationMark, 16, 32] + - [0xE62848, palette, GreenStompSwitch_exclamationMark] + - [0xE62868] + - name: entity_model_RedSwitch + dir: entity/model + type: code + start: 0xE62AC0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE62AC0, c, RedSwitch] + - start: 0xE62AC0 + type: .data + name: RedSwitch + subsegments: + - [0xE62AC0, vtx, RedSwitch_1] + - [0xE62E50, vtx, RedSwitch_2] + - [0xE62E90, vtx, RedSwitch_3] + - [0xE63090, ci8, RedSwitch_tex, 16, 16] + - [0xE63190, palette, RedSwitch_tex] + - [0xE63390] + - [0xE63438, ia4, RedSwitch_exclamationMark, 16, 32] + - [0xE63538] + - name: entity_model_BlueSwitch + dir: entity/model + type: code + start: 0xE639C0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE639C0, c, BlueSwitch] + - start: 0xE639C0 + type: .data + name: BlueSwitch + subsegments: + - [0xE639C0, vtx, BlueSwitch_1] + - [0xE63CC0, vtx, BlueSwitch_2] + - [0xE63D50, vtx, BlueSwitch_3] + - [0xE63D90, vtx, BlueSwitch_4] + - [0xE63F90, ci8, BlueSwitch_tex, 16, 16] + - [0xE64090, palette, BlueSwitch_tex] + - [0xE64290] + - [0xE64338, ia4, BlueSwitch_exclamationMark, 16, 32] + - [0xE64438] + - name: entity_model_Chest + dir: entity/model + type: code + start: 0xE648D0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE648D0, c, Chest] + - start: 0xE648D0 + type: .data + name: Chest + subsegments: + - [0xE648D0, vtx, Chest_1] + - [0xE64A60, vtx, Chest_2] + - [0xE64AE0, vtx, Chest_3] + - [0xE64C60, vtx, Chest_4] + - [0xE64CE0, rgba16, Chest_tex1, 16, 32] + - [0xE650E0] + - [0xE65168, ci4, Chest_tex2, 16, 32] + - [0xE65268, palette, Chest_tex2] + - [0xE65288] + - [0xE65340, ci4, Chest_lock, 16, 32] + - [0xE65440, palette, Chest_lock] + - [0xE65460] + - name: entity_model_ScriptSpring_gfx + dir: entity/model + type: code + start: 0xE657A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE657A0, c, ScriptSpring_gfx] + - start: 0xE657A0 + type: .data + name: ScriptSpring_gfx + subsegments: + - [0xE657A0, vtx, ScriptSpring_1] + - [0xE65A20, vtx, ScriptSpring_2] + - [0xE65AA0, vtx, ScriptSpring_3] + - [0xE65B20, vtx, ScriptSpring_4] + - [0xE65BA0, vtx, ScriptSpring_5] + - [0xE65E20, vtx, ScriptSpring_6] + - [0xE65F80, vtx, ScriptSpring_7] + - [0xE66000, ci8, ScriptSpring_tex1, 16, 16] + - [0xE66100, palette, ScriptSpring_tex1] + - [0xE66300] + - [0xE663A8, ci8, ScriptSpring_tex2, 16, 16] + - [0xE664A8, palette, ScriptSpring_tex2] + - [0xE666A8] + - [0xE66750, ci8, ScriptSpring_star, 32, 32] + - [0xE66B50, palette, ScriptSpring_star] + - [0xE66D50] + - name: entity_model_ScriptSpring_anim + dir: entity/model + type: code + start: 0xE67120 + vram: 0x00000000 + subsegments: + - [0xE67120, c, ScriptSpring_anim] + - name: entity_model_SimpleSpring_gfx + dir: entity/model + type: code + start: 0xE68580 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE68580, c, SimpleSpring_gfx] + - start: 0xE68580 + type: .data + name: SimpleSpring_gfx + subsegments: + - [0xE68580, vtx, SimpleSpring_1] + - [0xE68800, vtx, SimpleSpring_2] + - [0xE68880, vtx, SimpleSpring_3] + - [0xE68900, vtx, SimpleSpring_4] + - [0xE68B80, vtx, SimpleSpring_5] + - [0xE68CE0, vtx, SimpleSpring_6] + - [0xE68D60, ci8, SimpleSpring_tex1, 16, 16] + - [0xE68E60, palette, SimpleSpring_tex1] + - [0xE69060] + - [0xE69108, rgba16, SimpleSpring_tex2, 16, 16] + - [0xE69308] + - [0xE69380, ci8, SimpleSpring_star, 32, 32] + - [0xE69780, palette, SimpleSpring_star] + - [0xE69980] + - name: entity_model_SimpleSpring_anim + dir: entity/model + type: code + start: 0xE69D50 + vram: 0x00000000 + subsegments: + - [0xE69D50, c, SimpleSpring_anim] + - name: entity_model_BellbellPlant_gfx + dir: entity/model + type: code + start: 0xE6B1B0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE6B1B0, c, BellbellPlant_gfx] + - start: 0xE6B1B0 + type: .data + name: BellbellPlant_gfx + subsegments: + - [0xE6B1B0, vtx, BellbellPlant_1] + - [0xE6B540, vtx, BellbellPlant_2] + - [0xE6B7F0, vtx, BellbellPlant_3] + - [0xE6B8D0, vtx, BellbellPlant_4] + - [0xE6BBC0, vtx, BellbellPlant_5] + - [0xE6BCA0] + - [0xE6C240, rgba16, BellbellPlant, 16, 16] + - name: entity_model_BellbellPlant_anim + dir: entity/model + type: code + start: 0xE6C440 + vram: 0x00000000 + subsegments: + - [0xE6C440, c, BellbellPlant_anim] + - name: entity_model_TrumpetPlant_gfx + dir: entity/model + type: code + start: 0xE6D390 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE6D390, c, TrumpetPlant_gfx] + - start: 0xE6D390 + type: .data + name: TrumpetPlant_gfx + subsegments: + - [0xE6D390, vtx, TrumpetPlant_1] + - [0xE6D5D0, vtx, TrumpetPlant_2] + - [0xE6DD40] + - [0xE6E0D0, rgba16, TrumpetPlant, 16, 16] + - name: entity_model_TrumpetPlant_anim + dir: entity/model + type: code + start: 0xE6E2D0 + vram: 0x00000000 + subsegments: + - [0xE6E2D0, c, TrumpetPlant_anim] + - name: entity_model_MunchlesiaReset_gfx + dir: entity/model + type: code + start: 0xE6E660 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE6E660, c, MunchlesiaReset_gfx] + - start: 0xE6E660 + type: .data + name: MunchlesiaReset_gfx + subsegments: + - [0xE6E660, vtx, MunchlesiaReset] + - [0xE6FF50] + - [0xE74548, rgba16, MunchlesiaReset, 16, 16] + - name: entity_model_MunchlesiaReset_anim + dir: entity/model + type: code + start: 0xE74750 + vram: 0x00000000 + subsegments: + - [0xE74750, c, MunchlesiaReset_anim] + - name: entity_model_MunchlesiaGrab_gfx + dir: entity/model + type: code + start: 0xE74BD0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE74BD0, c, MunchlesiaGrab_gfx] + - start: 0xE74BD0 + type: .data + name: MunchlesiaGrab_gfx + subsegments: + - [0xE74BD0, vtx, MunchlesiaGrab] + - [0xE764C0] + - [0xE7AAB8, rgba16, MunchlesiaGrab, 16, 16] + - name: entity_model_MunchlesiaGrab_anim + dir: entity/model + type: code + start: 0xE7ACC0 + vram: 0x00000000 + subsegments: + - [0xE7ACC0, c, MunchlesiaGrab_anim] + - name: entity_model_MunchlesiaEnvelop_gfx + dir: entity/model + type: code + start: 0xE7B0E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE7B0E0, c, MunchlesiaEnvelop_gfx] + - start: 0xE7B0E0 + type: .data + name: MunchlesiaEnvelop_gfx + subsegments: + - [0xE7B0E0, vtx, MunchlesiaEnvelop] + - [0xE7C9D0] + - [0xE80FC8, rgba16, MunchlesiaEnvelop, 16, 16] + - name: entity_model_MunchlesiaEnvelop_anim + dir: entity/model + type: code + start: 0xE811D0 + vram: 0x00000000 + subsegments: + - [0xE811D0, c, MunchlesiaEnvelop_anim] + - name: entity_model_MunchlesiaBeginChew_gfx + dir: entity/model + type: code + start: 0xE815F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE815F0, c, MunchlesiaBeginChew_gfx] + - start: 0xE815F0 + type: .data + name: MunchlesiaBeginChew_gfx + subsegments: + - [0xE815F0, vtx, MunchlesiaBeginChew] + - [0xE82EE0] + - [0xE87E30, rgba16, MunchlesiaBeginChew, 16, 16] + - name: entity_model_MunchlesiaBeginChew_anim + dir: entity/model + type: code + start: 0xE88030 + vram: 0x00000000 + subsegments: + - [0xE88030, c, MunchlesiaBeginChew_anim] + - name: entity_model_MunchlesiaChewing_gfx + dir: entity/model + type: code + start: 0xE884A0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE884A0, c, MunchlesiaChewing_gfx] + - start: 0xE884A0 + type: .data + name: MunchlesiaChewing_gfx + subsegments: + - [0xE884A0, vtx, MunchlesiaChewing] + - [0xE89D90] + - [0xE8A210, rgba16, MunchlesiaChewing, 16, 16] + - name: entity_model_MunchlesiaChewing_anim + dir: entity/model + type: code + start: 0xE8A410 + vram: 0x00000000 + subsegments: + - [0xE8A410, c, MunchlesiaChewing_anim] + - name: entity_model_MunchlesiaSpitOut_gfx + dir: entity/model + type: code + start: 0xE8A9E0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE8A9E0, c, MunchlesiaSpitOut_gfx] + - start: 0xE8A9E0 + type: .data + name: MunchlesiaSpitOut_gfx + subsegments: + - [0xE8A9E0, vtx, MunchlesiaSpitOut] + - [0xE8C2D0] + - [0xE91220, rgba16, MunchlesiaSpitOut, 16, 16] + - name: entity_model_MunchlesiaSpitOut_anim + dir: entity/model + type: code + start: 0xE91420 + vram: 0x00000000 + subsegments: + - [0xE91420, c, MunchlesiaSpitOut_anim] + - name: entity_model_MunchlesiaReset1_gfx + dir: entity/model + type: code + start: 0xE91890 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE91890, c, MunchlesiaReset1_gfx] + - start: 0xE91890 + type: .data + name: MunchlesiaReset1_gfx + subsegments: + - [0xE91890, vtx, MunchlesiaReset1] + - [0xE93180] + - [0xE980D0, rgba16, MunchlesiaReset1, 16, 16] + - name: entity_model_MunchlesiaReset1_anim + dir: entity/model + type: code + start: 0xE982D0 + vram: 0x00000000 + subsegments: + - [0xE982D0, c, MunchlesiaReset1_anim] + - name: entity_model_CymbalPlant_anim + dir: entity/model + type: code + start: 0xE98740 + vram: 0x00000000 + subsegments: + - [0xE98740, c, CymbalPlant_anim] + - name: entity_model_CymbalPlant_gfx + dir: entity/model + type: code + start: 0xE992F0 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE992F0, c, CymbalPlant_gfx] + - start: 0xE992F0 + type: .data + name: CymbalPlant_gfx + subsegments: + - [0xE992F0, ci4, CymbalPlant, 64, 64] + - [0xE99AF0, palette, CymbalPlant] + - [0xE99B10] + - [0xE99BB8, vtx, CymbalPlant_1] + - [0xE99C58, vtx, CymbalPlant_2] + - [0xE99CB8, vtx, CymbalPlant_3] + - [0xE99D58, vtx, CymbalPlant_4] + - [0xE99EA8, vtx, CymbalPlant_5] + - [0xE9A018, vtx, CymbalPlant_6] + - [0xE9A0A8, vtx, CymbalPlant_7] + - [0xE9A218, vtx, CymbalPlant_8] + - [0xE9A368] + - name: entity_model_PinkFlower_anim + dir: entity/model + type: code + start: 0xE9A990 + vram: 0x00000000 + subsegments: + - [0xE9A990, c, PinkFlower_anim] + - name: entity_model_PinkFlower_gfx + dir: entity/model + type: code + start: 0xE9B500 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE9B500, c, PinkFlower_gfx] + - start: 0xE9B500 + type: .data + name: PinkFlower_gfx + subsegments: + - [0xE9B500, vtx, PinkFlower_1] + - [0xE9B540, vtx, PinkFlower_2] + - [0xE9B790, vtx, PinkFlower_3] + - [0xE9B8B0, vtx, PinkFlower_4] + - [0xE9B9B0, vtx, PinkFlower_5] + - [0xE9BAB0, ia16, PinkFlower_light, 16, 16] + - [0xE9BCB0] + - [0xE9BD20, rgba16, PinkFlower_tex, 16, 64] + - [0xE9C520] + - name: entity_model_SpinningFlower + dir: entity/model + type: code + start: 0xE9C900 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE9C900, c, SpinningFlower] + - start: 0xE9C900 + type: .data + name: SpinningFlower + subsegments: + - [0xE9C900, vtx, SpinningFlower_1] + - [0xE9C950, vtx, SpinningFlower_2] + - [0xE9C9A0, vtx, SpinningFlower_3] + - [0xE9CA20, vtx, SpinningFlower_4] + - [0xE9CA80, ia4, SpinningFlower_img1, 16, 32] + - [0xE9CB80] + - [0xE9CBF8, rgba16, SpinningFlower_petal, 32, 32] + - [0xE9D3F8] + - name: entity_model_BombableRock + dir: entity/model + type: code + start: 0xE9D650 + vram: 0x0A000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0xE9D650, c, BombableRock] + - start: 0xE9D650 + type: .data + name: BombableRock + subsegments: + - [0xE9D650, vtx, BombableRock_1] + - [0xE9D9D0, vtx, BombableRock_2] + - [0xE9DAF0, vtx, BombableRock_3] + - [0xE9DC50, vtx, BombableRock_4] + - [0xE9DD70, vtx, BombableRock_5] + - [0xE9DE90, ci4, BombableRock, 64, 64] + - [0xE9E690, palette, BombableRock] + - [0xE9E6B0] + - [0xE9ECD0, bin] # unk data - type: code start: 0xEA0900 vram: 0x80240000 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index c787ffd0e6..e99ca4fd5e 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3944,7 +3944,7 @@ entity_set_render_script = 0x80110BCC; // type:func rom:0xA72CC func_80110BF8 = 0x80110BF8; // type:func rom:0xA72F8 load_area_specific_entity_data = 0x80110C14; // type:func rom:0xA7314 clear_entity_data = 0x80110CB8; // type:func rom:0xA73B8 -func_80110E58 = 0x80110E58; // type:func rom:0xA7558 +init_entity_data = 0x80110E58; // type:func rom:0xA7558 func_80110F10 = 0x80110F10; // type:func rom:0xA7610 entity_anim_make_vertex_pointers = 0x801110B4; // type:func rom:0xA77B4 is_entity_data_loaded = 0x8011115C; // type:func rom:0xA785C @@ -3973,7 +3973,7 @@ gPlayerAnimation = 0x8010F080; // rom:0xA8530 SetEntityCullMode = 0x80111E9C; // type:func rom:0xA859C UseDynamicShadow = 0x80111F2C; // type:func rom:0xA862C AssignScript = 0x80111FB0; // type:func rom:0xA86B0 -AssignAreaFlag = 0x80111FF8; // type:func rom:0xA86F8 +AssignSwitchFlag = 0x80111FF8; // type:func rom:0xA86F8 gPlayerSpinState = 0x8010F250; // type:data rom:0xA8700 gPlayerData = 0x8010F290; // rom:0xA8740 size:0x340 AssignBlockFlag = 0x8011206C; // type:func rom:0xA876C @@ -4596,7 +4596,7 @@ D_8014C0E8 = 0x8014C0E8; // type:data rom:0xE27E8 D_8014C110 = 0x8014C110; // type:data rom:0xE2810 D_8014C138 = 0x8014C138; // type:data rom:0xE2838 D_8014C160 = 0x8014C160; // type:data rom:0xE2860 -D_8014C188 = 0x8014C188; // type:data rom:0xE2888 +mdl_renderTaskBasePriorities = 0x8014C188; // type:data rom:0xE2888 D_8014C248 = 0x8014C248; // type:data rom:0xE2948 gAnimScriptDefault = 0x8014C250; // type:data rom:0xE2950 D_8014C260 = 0x8014C260; // type:data rom:0xE2960 @@ -4819,7 +4819,7 @@ sort_scripts = 0x802C3000; // type:func rom:0xE79B0 gHudElementsNumber = 0x801512B4; // type:data rom:0xE79B4 gCurrentCustomModelGfxBuildersPtr = 0x801512B8; // type:data rom:0xE79B8 D_801512BC = 0x801512BC; // type:data rom:0xE79BC -D_801512C0 = 0x801512C0; // type:data rom:0xE79C0 +entity_numEntities = 0x801512C0; // type:data rom:0xE79C0 gEntityHeapBase = 0x801512C4; // type:data rom:0xE79C4 gHudElementCacheTableRaster = 0x801512C8; // type:data rom:0xE79C8 gCurrentModels = 0x801512CC; // rom:0xE79CC @@ -4849,7 +4849,7 @@ D_80151320 = 0x80151320; // type:data rom:0xE7A20 D_80151324 = 0x80151324; // type:data rom:0xE7A24 D_80151328 = 0x80151328; // type:data rom:0xE7A28 D_8015132C = 0x8015132C; // type:data rom:0xE7A2C -D_80151330 = 0x80151330; // type:data rom:0xE7A30 +entity_updateCounter = 0x80151330; // type:data rom:0xE7A30 gTriggerCount = 0x80151334; // rom:0xE7A34 D_80151338 = 0x80151338; // type:data rom:0xE7A38 gHudElementCacheSize = 0x8015133C; // type:data rom:0xE7A3C @@ -4970,7 +4970,7 @@ D_80153376 = 0x80153376; // type:data rom:0xE9A76 D_80153378 = 0x80153378; // type:data rom:0xE9A78 D_80153380 = 0x80153380; // type:data rom:0xE9A80 mdl_renderTaskLists = 0x801533A0; // type:data rom:0xE9AA0 -mdl_renderTaskMode = 0x801533AC; // type:data rom:0xE9AAC +mdl_renderTaskQueueIdx = 0x801533AC; // type:data rom:0xE9AAC mdl_renderTaskCount = 0x801533B0; // type:data rom:0xE9AB0 D_801533C0 = 0x801533C0; // type:data rom:0xE9AC0 evt_handle_case_less = 0x802C5148; // type:func rom:0xE9AF8 @@ -5770,7 +5770,7 @@ entity_HeartBlockContent_setupGfx = 0x802E4AEC; // type:func rom:0x10636C entity_HeartBlockContent_set_initial_pos = 0x802E4B10; // type:func rom:0x106390 entity_HeartBlockContent__reset = 0x802E4B60; // type:func rom:0x1063E0 entity_HeartBlockContent_anim_idle = 0x802E4C10; // type:func rom:0x106490 -func_802E4DE0 = 0x802E4DE0; // type:func rom:0x106660 +entity_HeartBlockContent_reset_data = 0x802E4DE0; // type:func rom:0x106660 entity_HeartBlockContent__anim_heal = 0x802E4E04; // type:func rom:0x106684 entity_HeartBlock_idle = 0x802E5308; // type:func rom:0x106B88 entity_HeartBlockContent_anim_beating = 0x802E5324; // type:func rom:0x106BA4 @@ -5850,8 +5850,8 @@ D_802E9738 = 0x802E9738; // type:data rom:0x10AFB8 D_802E9788 = 0x802E9788; // type:data rom:0x10B008 D_802E97B0 = 0x802E97D8; // type:data rom:0x10B058 D_802E97D8 = 0x802E9800; // type:data rom:0x10B080 -D_802E9828 = 0x802E9828; // type:data rom:0x10B0A8 -D_802E9830 = 0x802E9830; // type:data rom:0x10B0B0 +Entity_RenderNone = 0x802E9828; // type:data rom:0x10B0A8 +Entity_RenderNone_Script = 0x802E9830; // type:data rom:0x10B0B0 D_802E9850 = 0x802E9850; // type:data rom:0x10B0D0 D_802E9874 = 0x802E9874; // type:data rom:0x10B0F4 D_802E9898 = 0x802E9898; // type:data rom:0x10B118 @@ -25208,7 +25208,7 @@ func_802BC4B0_E2EDE0 = 0x802BC4B0; // type:func rom:0xE2EDE0 func_802BC628_E2EF58 = 0x802BC628; // type:func rom:0xE2EF58 func_802BC630_E2EF60 = 0x802BC630; // type:func rom:0xE2EF60 func_802BC658_E2EF88 = 0x802BC658; // type:func rom:0xE2EF88 -D_802BC7D0_E2F100 = 0x802BC7D0; // type:data rom:0xE2F100 +Entity_PinkFlowerLight = 0x802BC7D0; // type:data rom:0xE2F100 D_802BCC44_E2F574 = 0x802BCC44; // type:data rom:0xE2F574 D_802BCC68_E2F598 = 0x802BCC68; // type:data rom:0xE2F598 D_802BCC8C_E2F5BC = 0x802BCC8C; // type:data rom:0xE2F5BC @@ -25699,9 +25699,6 @@ func_80240540_EFF040 = 0x80240540; // type:func rom:0xEFF040 func_80240660_EFF160 = 0x80240660; // type:func rom:0xEFF160 func_80240784_EFF284 = 0x80240784; // type:func rom:0xEFF284 EFEB00_UnkFloatFunc = 0x802407B0; // type:func rom:0xEFF2B0 -D_00000094 = 0x94; // type:data -D_00000094_2 = 0x94; // type:data -D_000001E4 = 0x1E4; // type:data D_00E32420 = 0xE32420; // type:data D_00E35670 = 0xE35670; // type:data D_00E38890 = 0xE38890; // type:data @@ -25816,25 +25813,6 @@ D_09003740 = 0x9003740; // type:data D_09003780 = 0x9003780; // type:data D_090037C0 = 0x90037C0; // type:data D_09003800 = 0x9003800; // type:data -D_0A000328 = 0xA000328; // type:data -D_0A000380 = 0xA000380; // type:data -D_0A000740 = 0xA000740; // type:data -D_0A000750 = 0xA000750; // type:data -D_0A000800 = 0xA000800; // type:data -D_0A000808 = 0xA000808; // type:data -D_0A000EE8 = 0xA000EE8; // type:data -D_0A000EF8 = 0xA000EF8; // type:data -D_0A001218 = 0xA001218; // type:data -D_0A0014D8 = 0xA0014D8; // type:data -D_0A001508 = 0xA001508; // type:data -D_0A002318 = 0xA002318; // type:data -D_0A0026F0 = 0xA0026F0; // type:data -D_0A002F78 = 0xA002F78; // type:data -D_0A0031B0 = 0xA0031B0; // type:data -D_0A0031E0 = 0xA0031E0; // type:data -D_0A003508 = 0xA003508; // type:data -D_0A003F70 = 0xA003F70; // type:data -D_0A004350 = 0xA004350; // type:data obfuscated_battle_heap_create = 0x7012ACA1; // type:data obfuscated_general_heap_create = 0x7012BC11; // type:data D_7599F6D8 = 0x7599F6D8; // type:data @@ -27342,8 +27320,8 @@ D_802E9E54 = 0x802E9E54; // type:data D_802E9E80 = 0x802E9E80; // type:data Entity_InertYellowBlock = 0x802EA07C; // type:data Entity_InertRedBlock = 0x802EA0A0; // type:data -D_802EA0C4 = 0x802EA0C4; // type:data -D_802EA2BC = 0x802EA2BC; // type:data +Entity_BrickBlock = 0x802EA0C4; // type:data +Entity_PushBlock = 0x802EA2BC; // type:data D_802EA310 = 0x802EA310; // type:data Entity_HitGroundedYellowBlock = 0x802EA618; // type:data Entity_HitFloatingYellowBlock = 0x802EA63C; // type:data @@ -27364,7 +27342,7 @@ D_802EAC84 = 0x802EAC84; // type:data D_802EACC8 = 0x802EACC8; // type:data D_802EAD7C = 0x802EAD7C; // type:data D_802EAE7C = 0x802EAE7C; // type:data -D_802EAFDC = 0x802EAFDC; // type:data +Entity_Signpost = 0x802EAFDC; // type:data D_802EB370 = 0x802EB370; // type:data D_802EB380 = 0x802EB380; // type:data SaveBlockTutorialPrinterClosed = 0x802EB390; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index d1ed12c32b..51afb0cad4 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -1,29 +1,3 @@ -// plain values -D_00000094 = 0x94; -D_00000094_2 = 0x94; -D_000001E4 = 0x1E4; - -// 0x0A -D_0A000808 = 0x0A000808; -D_0A000328 = 0x0A000328; -D_0A000380 = 0x0A000380; -D_0A000740 = 0x0A000740; -D_0A000750 = 0x0A000750; -D_0A000800 = 0x0A000800; -D_0A000EE8 = 0x0A000EE8; -D_0A000EF8 = 0x0A000EF8; -D_0A004350 = 0x0A004350; -D_0A0026F0 = 0x0A0026F0; -D_0A0031E0 = 0x0A0031E0; -D_0A001508 = 0x0A001508; -D_0A0031B0 = 0x0A0031B0; -D_0A0014D8 = 0x0A0014D8; -D_0A002F78 = 0x0A002F78; -D_0A001218 = 0x0A001218; -D_0A003F70 = 0x0A003F70; -D_0A002318 = 0x0A002318; -D_0A003508 = 0x0A003508; - // Likely fake D_8887FFFB = 0x8887FFFB; D_A0000000 = 0xA0000000; @@ -1189,3 +1163,6 @@ D_80246550_kkj_19 = 0x80246550; D_80246560_kkj_19 = 0x80246560; D_80242568_filemenu = 0x80242568; +D_802EA871 = 0x802EA871; +D_802EA862 = 0x802EA862; +D_802EA862 = 0x802EA862;