From d355f290fed2cd00e7dda32e10bdde0c53205b45 Mon Sep 17 00:00:00 2001 From: Oliver Bell Date: Tue, 7 Apr 2026 23:06:16 +0100 Subject: [PATCH] more changes for sa1 sa2 merge - Migrate specific game headers into their own folders - Remove headers from sa1 codebase which can be referenced from sa2 --- .vscode/c_cpp_properties.json | 4 +- Makefile | 8 +- config.mk | 3 +- include/config.h | 5 +- include/constants/{ => sa1}/anim_commands.h | 0 include/constants/{ => sa1}/anim_sizes.h | 0 include/constants/{ => sa1}/animations.h | 2 +- .../constants/sa1}/char_states.h | 0 .../constants/sa1}/characters.h | 0 .../constants/sa1}/enemies.h | 0 .../constants/sa1}/interactables.h | 0 include/constants/{ => sa1}/items.h | 0 include/constants/{ => sa1}/move_states.h | 0 .../constants/sa1}/mp_map_interactables.h | 0 .../constants/{ => sa1}/player_transitions.h | 0 include/constants/{ => sa1}/songs.h | 0 .../constants/sa1}/text.h | 0 include/constants/{ => sa1}/tilemaps.h | 0 .../constants/sa1}/ui_graphics.h | 0 include/constants/{ => sa1}/vram_hardcoded.h | 0 include/constants/{ => sa1}/zones.h | 0 .../constants/sa2}/anim_commands.h | 0 .../constants/sa2}/anim_sizes.h | 0 .../constants/sa2}/animations.h | 2 +- include/constants/{ => sa2}/char_states.h | 0 include/constants/{ => sa2}/characters.h | 0 include/constants/{ => sa2}/enemies.h | 0 include/constants/{ => sa2}/interactables.h | 0 .../constants/sa2}/items.h | 0 .../constants/sa2}/move_states.h | 0 include/constants/sa2/mp_map_interactables.h | 24 + .../constants/sa2}/player_transitions.h | 0 .../constants/sa2}/songs.h | 0 include/constants/{ => sa2}/text.h | 0 .../constants/sa2}/tilemaps.h | 0 include/constants/sa2/ui_graphics.h | 134 + .../constants/sa2}/vram_hardcoded.h | 0 .../constants/sa2}/zones.h | 0 {sa1/include => include}/data/sa1/credits.h | 0 .../include => include}/data/sa1/recordings.h | 0 .../data/sa1/sprite_data.h | 0 .../data/sa1/sprite_tables.h | 0 .../data/sa1/tileset_debug_ascii.h | 0 .../data/sa1/ui_graphics.h | 2 +- include/data/sa2/input_combos.h | 2 +- include/game/globals.h | 42 +- .../game/sa1/assets/compressed/entities.h | 0 .../game/sa1/assets/compressed/roms.h | 0 .../game/sa1/menus/mp_mode_select.h | 0 .../game/sa1/menus/mp_mode_select_2.h | 0 .../game/sa1/menus/options_screen.h | 2 +- .../game/sa1/menus/time_attack.h | 0 .../game/sa1/menus/title_screen.h | 0 .../game/sa1/parameters/stage.h | 0 {sa1/include => include}/game/sa1/save.h | 4 +- .../game/sa1/special_stage/main.h | 0 .../game/sa1/stage/backgrounds/zone_3.h | 0 .../game/sa1/stage/backgrounds/zone_5.h | 0 .../game/sa1/stage/backgrounds/zone_6.h | 0 .../game/sa1/stage/egg_rocket_transitions.h | 0 .../stage/enemies/boss_xtra_super_egg_robo.h | 0 .../game/sa1/stage/enemies/bosses_shared.h | 0 .../game/sa1/stage/extra_stage.h | 0 .../sa1/stage/interactables/party_balloon.h | 0 .../game/sa1/stage/itembox.h | 0 .../game/sa1/stage/mp_chao.h | 0 .../game/sa1/stage/mp_hud.h | 0 .../game/sa1/stage/mp_results.h | 0 .../game/sa1/stage/mp_unk_0.h | 0 .../game/sa1/stage/mp_unk_1.h | 0 .../game/sa1/stage/mystery_itembox.h | 0 .../game/sa1/stage/nuts_and_bolts_task.h | 0 .../game/sa1/stage/player_controls.h | 0 .../game/sa1/stage/player_sonic.h | 0 .../game/sa1/stage/player_super_sonic.h | 0 .../game/sa1/stage/player_tails.h | 0 .../game/sa1/stage/some_task_manager.h | 0 .../game/sa1/stage/spawn_positions.h | 2 +- .../game/sa1/stage/stage_ui.h | 0 .../game/sa1/stage/tilemap_table.h | 0 .../game/sa1/stage/trapped_animals.h | 0 .../game/sa1/stage/ui_rendering.h | 0 .../game/sa1/ui/character_select.h | 0 .../game/sa1/ui/collect_chaos_emeralds_msg.h | 0 .../game/sa1/ui/course_select.h | 0 .../game/sa1/ui/game_over.h | 0 .../game/sa1/ui/stage_results.h | 0 .../game/sa1/ui/time_attack_lobby.h | 0 .../game/sa1/ui/time_attack_results.h | 0 .../game/sa1/ui/time_over.h | 0 include/game/sa2/options_screen.h | 2 +- include/game/sa2/save.h | 4 +- include/game/sa2/special_stage/data.h | 2 +- include/game/sa2/special_stage/tables.h | 2 +- include/game/sa2/stage/boost_effect.h | 2 +- include/game/sa2/stage/player_super_sonic.h | 2 +- include/game/shared/parameters/characters.h | 2 +- include/game/shared/stage/camera.h | 33 +- include/game/shared/stage/player.h | 9 +- include/game/shared/stage/rings_manager.h | 2 +- include/game/shared/stage/rings_scatter.h | 36 +- include/game/shared/stage/stage.h | 2 +- include/gba/dma_macros.h | 11 + include/gba/io_reg.h | 1 + include/global.h | 15 +- include/lib/agb_flash/flash_internal.h | 11 + include/lib/m4a/m4a_internal.h | 12 +- include/tilemap.h | 13 +- multi_boot/roms/collect_rings/Makefile | 2 +- multi_boot/roms/collect_rings/config.mk | 1 + sa1/Makefile | 20 +- sa1/config.mk | 1 + sa1/include/anim_sizes.h | 1214 - sa1/include/animation_commands.h | 122 - sa1/include/animation_commands_bg.h | 15 - sa1/include/bg_triangles.h | 34 - sa1/include/color.h | 49 - sa1/include/config.h | 52 - sa1/include/flags.h | 25 - sa1/include/game/dummy_task.h | 11 - sa1/include/game/game.h | 8 - sa1/include/game/globals.h | 291 - .../game/shared/parameters/characters.h | 2 +- sa1/include/game/shared/stage/player.h | 6 +- sa1/include/game/shared/stage/rings_manager.h | 2 +- sa1/include/game/shared/stage/rings_scatter.h | 14 +- sa1/include/game/shared/stage/stage.h | 2 +- sa1/include/gba/.clang-format | 4 - sa1/include/gba/cpuset_macros.h | 32 - sa1/include/gba/defines.h | 166 - sa1/include/gba/dma_macros.h | 239 - sa1/include/gba/gba.h | 12 - sa1/include/gba/io_reg.h | 824 - sa1/include/gba/isagbprint.h | 50 - sa1/include/gba/macro.h | 7 - sa1/include/gba/multiboot.h | 55 - sa1/include/gba/syscall.h | 76 - sa1/include/gba/types.h | 459 - sa1/include/global.h | 353 - sa1/include/input_recorder.h | 24 - sa1/include/lib/agb_flash/agb_flash.h | 13 - sa1/include/lib/agb_flash/flash_internal.h | 105 - sa1/include/lib/m4a/m4a.h | 40 - sa1/include/lib/m4a/m4a_internal.h | 477 - sa1/include/malloc_ewram.h | 18 - sa1/include/malloc_vram.h | 22 - sa1/include/multi_boot.h | 135 - sa1/include/multi_sio.h | 279 - sa1/include/sio32_multi_load.h | 153 - sa1/include/task.h | 147 - sa1/include/tilemap.h | 46 - sa1/include/trig.h | 33 - sa1/src/data/sa1/animations/animations.c | 24455 +++++----------- sa1/src/data/sa1/entity_tables.c | 71 +- sa1/src/data/sa1/tilemap_table.c | 4 +- sa1/src/game/sa1/menus/mp_mode_select.c | 8 +- sa1/src/game/sa1/menus/mp_mode_select_2.c | 8 +- sa1/src/game/sa1/menus/options.c | 8 +- sa1/src/game/sa1/menus/player_data.c | 8 +- sa1/src/game/sa1/menus/time_attack.c | 4 +- sa1/src/game/sa1/menus/title_screen.c | 12 +- sa1/src/game/sa1/multiplayer/chao_message.c | 8 +- sa1/src/game/sa1/special_stage/main.c | 8 +- .../game/sa1/stage/backgrounds/zone_4_init.c | 2 +- .../game/sa1/stage/backgrounds/zone_5_init.c | 2 +- sa1/src/game/sa1/stage/camera_destroy.c | 2 +- .../game/sa1/stage/egg_rocket_transitions.c | 6 +- .../stage/enemies/boss_1_egg_hammer_tank.c | 6 +- .../game/sa1/stage/enemies/boss_2_egg_press.c | 8 +- .../game/sa1/stage/enemies/boss_3_egg_ball.c | 8 +- .../sa1/stage/enemies/boss_4_egg_spider.c | 8 +- .../sa1/stage/enemies/boss_5_mecha_knuckles.c | 8 +- .../game/sa1/stage/enemies/boss_6_egg_snake.c | 6 +- .../sa1/stage/enemies/boss_x1_egg_wrecker.c | 6 +- .../sa1/stage/enemies/boss_x2_egg_drillster.c | 6 +- .../game/sa1/stage/enemies/boss_x3_egg_x.c | 10 +- .../stage/enemies/boss_xtra_super_egg_robot.c | 8 +- .../sa1/stage/enemies/bosses_egg_mobile.c | 10 +- sa1/src/game/sa1/stage/enemies/bosses_misc.c | 12 +- sa1/src/game/sa1/stage/enemies/buzzer.c | 6 +- sa1/src/game/sa1/stage/enemies/drisame.c | 6 +- sa1/src/game/sa1/stage/enemies/fireball.c | 6 +- sa1/src/game/sa1/stage/enemies/gamigami.c | 6 +- sa1/src/game/sa1/stage/enemies/hanabii.c | 4 +- sa1/src/game/sa1/stage/enemies/kerokero.c | 2 +- sa1/src/game/sa1/stage/enemies/kiki.c | 6 +- sa1/src/game/sa1/stage/enemies/kuraa.c | 4 +- sa1/src/game/sa1/stage/enemies/leon.c | 4 +- sa1/src/game/sa1/stage/enemies/mirror.c | 6 +- sa1/src/game/sa1/stage/enemies/mole.c | 4 +- sa1/src/game/sa1/stage/enemies/oct.c | 6 +- sa1/src/game/sa1/stage/enemies/pen_mk1.c | 6 +- sa1/src/game/sa1/stage/enemies/pierrot.c | 6 +- sa1/src/game/sa1/stage/enemies/rhinotank.c | 2 +- sa1/src/game/sa1/stage/enemies/senbon.c | 4 +- sa1/src/game/sa1/stage/enemies/slot.c | 6 +- sa1/src/game/sa1/stage/enemies/tentou.c | 6 +- sa1/src/game/sa1/stage/enemies/wamu.c | 6 +- sa1/src/game/sa1/stage/enemies/yukimaru.c | 6 +- sa1/src/game/sa1/stage/interactables/034.c | 4 +- sa1/src/game/sa1/stage/interactables/096.c | 2 +- sa1/src/game/sa1/stage/interactables/107.c | 8 +- sa1/src/game/sa1/stage/interactables/113.c | 2 +- .../sa1/stage/interactables/air_bubbles.c | 10 +- .../game/sa1/stage/interactables/booster.c | 8 +- .../sa1/stage/interactables/boulder_spawner.c | 12 +- .../sa1/stage/interactables/bounce_block.c | 8 +- sa1/src/game/sa1/stage/interactables/bowl.c | 12 +- .../sa1/stage/interactables/breakable_wall.c | 8 +- .../game/sa1/stage/interactables/bumpers.c | 12 +- .../game/sa1/stage/interactables/carousel.c | 10 +- .../game/sa1/stage/interactables/checkpoint.c | 6 +- .../interactables/conveyor_belt_movement.c | 2 +- .../interactables/conveyor_belt_object.c | 4 +- .../stage/interactables/crane_claw_and_lift.c | 10 +- .../game/sa1/stage/interactables/decoration.c | 12 +- .../sa1/stage/interactables/ferris_wheel.c | 8 +- .../stage/interactables/flipper_small_blue.c | 10 +- .../game/sa1/stage/interactables/flippers.c | 6 +- .../sa1/stage/interactables/forced_slide.c | 8 +- .../game/sa1/stage/interactables/grind_rail.c | 4 +- .../game/sa1/stage/interactables/half_pipe.c | 2 +- .../game/sa1/stage/interactables/hang_bar.c | 6 +- .../game/sa1/stage/interactables/hook_rail.c | 8 +- .../game/sa1/stage/interactables/ice_block.c | 10 +- .../sa1/stage/interactables/incline_ramp.c | 6 +- .../game/sa1/stage/interactables/iron_ball.c | 4 +- sa1/src/game/sa1/stage/interactables/lava.c | 2 +- .../sa1/stage/interactables/marble_track.c | 10 +- .../sa1/stage/interactables/maze_air_corner.c | 6 +- .../sa1/stage/interactables/moving_spring.c | 12 +- .../game/sa1/stage/interactables/panel_gate.c | 8 +- .../sa1/stage/interactables/party_balloon.c | 6 +- sa1/src/game/sa1/stage/interactables/pipe.c | 12 +- .../stage/interactables/platform_crumbling.c | 10 +- .../sa1/stage/interactables/platform_spiked.c | 12 +- .../sa1/stage/interactables/platform_square.c | 8 +- .../sa1/stage/interactables/platform_thin.c | 12 +- .../stage/interactables/platforms_085_089.c | 8 +- .../game/sa1/stage/interactables/propeller.c | 4 +- .../stage/interactables/red_flag_and_pole.c | 8 +- .../game/sa1/stage/interactables/run_wheel.c | 8 +- .../sa1/stage/interactables/security_gate.c | 2 +- .../stage/interactables/sega_sonic_letters.c | 2 +- .../game/sa1/stage/interactables/ship_swing.c | 2 +- .../game/sa1/stage/interactables/shrubbery.c | 4 +- .../sa1/stage/interactables/skating_stone.c | 8 +- .../stage/interactables/small_fall_block.c | 2 +- .../sa1/stage/interactables/special_spring.c | 8 +- .../sa1/stage/interactables/spiked_barrel.c | 4 +- sa1/src/game/sa1/stage/interactables/spikes.c | 12 +- sa1/src/game/sa1/stage/interactables/spring.c | 8 +- .../sa1/stage/interactables/spring_hiding.c | 6 +- .../game/sa1/stage/interactables/stage_goal.c | 8 +- .../sa1/stage/interactables/steam_exhaust.c | 10 +- .../game/sa1/stage/interactables/swing_rope.c | 4 +- .../sa1/stage/interactables/swinging_hook.c | 10 +- .../sa1/stage/interactables/teleport_orb.c | 6 +- .../stage/interactables/toggle_player_float.c | 4 +- .../stage/interactables/toggle_player_layer.c | 2 +- sa1/src/game/sa1/stage/interactables/torch.c | 4 +- sa1/src/game/sa1/stage/interactables/track.c | 12 +- .../game/sa1/stage/interactables/trampoline.c | 8 +- .../interactables/underwater_lava_platform.c | 10 +- .../game/sa1/stage/interactables/updraft.c | 2 +- .../sa1/stage/interactables/wall_bumper.c | 2 +- .../sa1/stage/interactables/water_bridge.c | 6 +- .../stage/interactables/water_bridge_splash.c | 2 +- .../game/sa1/stage/interactables/waterfall.c | 8 +- sa1/src/game/sa1/stage/itembox.c | 12 +- sa1/src/game/sa1/stage/mp_chao.c | 4 +- sa1/src/game/sa1/stage/mp_hud.c | 10 +- sa1/src/game/sa1/stage/mp_results.c | 6 +- sa1/src/game/sa1/stage/mp_results_b.c | 6 +- sa1/src/game/sa1/stage/mp_unk_1.c | 6 +- sa1/src/game/sa1/stage/mystery_itembox.c | 10 +- sa1/src/game/sa1/stage/player_amy.c | 6 +- sa1/src/game/sa1/stage/player_knuckles.c | 6 +- sa1/src/game/sa1/stage/player_sonic.c | 6 +- sa1/src/game/sa1/stage/player_super_sonic.c | 8 +- sa1/src/game/sa1/stage/player_tails.c | 8 +- sa1/src/game/sa1/stage/some_task_manager.c | 2 +- sa1/src/game/sa1/stage/stage_ui.c | 8 +- sa1/src/game/sa1/stage/stage_ui_z.c | 6 +- .../sa1/stage/temporary_sound_play_task.c | 2 +- .../game/sa1/stage/to_be_continued_screen.c | 4 +- sa1/src/game/sa1/stage/trapped_animals.c | 4 +- sa1/src/game/sa1/ui/character_select.c | 4 +- .../game/sa1/ui/collect_chaos_emeralds_msg.c | 2 +- sa1/src/game/sa1/ui/course_select.c | 6 +- sa1/src/game/sa1/ui/edit_language_screen.c | 6 +- sa1/src/game/sa1/ui/extra_stage_results.c | 6 +- sa1/src/game/sa1/ui/game_2_0.c | 2 +- sa1/src/game/sa1/ui/game_2_1.c | 8 +- sa1/src/game/sa1/ui/game_2_3.c | 6 +- sa1/src/game/sa1/ui/game_over.c | 6 +- sa1/src/game/sa1/ui/intro_animation.c | 6 +- .../game/sa1/ui/multiplayer_continue_screen.c | 2 +- sa1/src/game/sa1/ui/player_name_input_menu.c | 2 +- sa1/src/game/sa1/ui/sound_test.c | 4 +- sa1/src/game/sa1/ui/special_stage_intro.c | 8 +- sa1/src/game/sa1/ui/staff_credits.c | 8 +- sa1/src/game/sa1/ui/stage_results.c | 6 +- sa1/src/game/sa1/ui/time_attack_lobby.c | 4 +- sa1/src/game/sa1/ui/time_attack_record.c | 6 +- sa1/src/game/sa1/ui/time_attack_records.c | 10 +- sa1/src/game/sa1/ui/time_attack_results.c | 2 +- sa1/src/game/sa1/ui/time_over.c | 4 +- sa1/src/game/shared/collect_rings/results.c | 10 +- .../game/shared/menus/unused_level_select.c | 2 +- .../multiplayer/communication_outcome.c | 8 +- .../shared/stage/amy_attack_heart_effect.c | 4 +- sa1/src/game/shared/stage/camera.c | 8 +- .../game/shared/stage/collect_ring_effect.c | 2 +- sa1/src/game/shared/stage/collision.c | 10 +- sa1/src/game/shared/stage/collision_0.c | 2 +- sa1/src/game/shared/stage/demo_manager.c | 2 +- sa1/src/game/shared/stage/dust_cloud.c | 2 +- .../game/shared/stage/dust_effect_braking.c | 4 +- .../game/shared/stage/dust_effect_spindash.c | 2 +- .../game/shared/stage/enemy_defeat_score.c | 2 +- sa1/src/game/shared/stage/entities_manager.c | 4 +- sa1/src/game/shared/stage/grind_effect_1.c | 2 +- sa1/src/game/shared/stage/item_tasks.c | 4 +- sa1/src/game/shared/stage/magnetic_ring.c | 4 +- sa1/src/game/shared/stage/mp_event_mgr.c | 6 +- sa1/src/game/shared/stage/mp_event_recv_mgr.c | 2 +- sa1/src/game/shared/stage/mp_finish.c | 4 +- sa1/src/game/shared/stage/mp_indicators.c | 4 +- sa1/src/game/shared/stage/mp_player.c | 8 +- sa1/src/game/shared/stage/mp_sprite_task.c | 2 +- sa1/src/game/shared/stage/music_manager.c | 2 +- sa1/src/game/shared/stage/pause_menu.c | 4 +- sa1/src/game/shared/stage/player.c | 10 +- sa1/src/game/shared/stage/rings_manager.c | 2 +- sa1/src/game/shared/stage/rings_scatter.c | 10 +- sa1/src/game/shared/stage/stage.c | 6 +- sa1/src/game/shared/stage/terrain_collision.c | 2 +- .../game/shared/stage/underwater_effects.c | 4 +- sa1/src/game/shared/stage/water_effects.c | 6 +- src/data/sa2/animations/animations.c | 2 +- src/data/sa2/input_combos.c | 2 +- src/game/decomp_credits.c | 6 +- .../sa2/collect_rings/singlepak_connection.c | 8 +- src/game/sa2/collect_rings/time_display.c | 4 +- src/game/sa2/cutscenes/credits.c | 2 +- src/game/sa2/cutscenes/credits_end.c | 8 +- src/game/sa2/cutscenes/credits_slides.c | 4 +- src/game/sa2/cutscenes/endings.c | 2 +- src/game/sa2/cutscenes/extra_ending_fall.c | 6 +- src/game/sa2/cutscenes/extra_ending_slides.c | 6 +- src/game/sa2/cutscenes/final_ending_fall.c | 6 +- src/game/sa2/cutscenes/final_ending_land.c | 8 +- src/game/sa2/cutscenes/level_endings.c | 10 +- src/game/sa2/cutscenes/missing_emeralds.c | 6 +- src/game/sa2/multiplayer/mode_select.c | 8 +- .../sa2/multiplayer/multipak_connection.c | 8 +- src/game/sa2/multiplayer/results.c | 8 +- src/game/sa2/multiplayer/team_play.c | 8 +- src/game/sa2/options_screen.c | 6 +- src/game/sa2/save.c | 4 +- src/game/sa2/sound_test.c | 6 +- src/game/sa2/special_stage/collectables.c | 4 +- src/game/sa2/special_stage/guard_robo.c | 2 +- src/game/sa2/special_stage/main.c | 6 +- src/game/sa2/special_stage/physics.c | 4 +- src/game/sa2/special_stage/player.c | 4 +- src/game/sa2/special_stage/tables.c | 2 +- src/game/sa2/special_stage/ui.c | 6 +- src/game/sa2/special_stage/world.c | 6 +- src/game/sa2/stage/boost_effect.c | 6 +- src/game/sa2/stage/boost_mode_particles.c | 2 +- src/game/sa2/stage/boss_results_transition.c | 4 +- src/game/sa2/stage/bosses/boss_1.c | 8 +- src/game/sa2/stage/bosses/boss_2.c | 6 +- src/game/sa2/stage/bosses/boss_3.c | 6 +- src/game/sa2/stage/bosses/boss_4.c | 8 +- src/game/sa2/stage/bosses/boss_5.c | 6 +- src/game/sa2/stage/bosses/boss_6.c | 6 +- src/game/sa2/stage/bosses/boss_7.c | 4 +- src/game/sa2/stage/bosses/boss_8.c | 12 +- src/game/sa2/stage/bosses/boss_9.c | 6 +- src/game/sa2/stage/bosses/common.c | 6 +- .../stage/bosses/eggmobile_escape_sequence.c | 4 +- src/game/sa2/stage/bosses/explosion_parts.c | 4 +- src/game/sa2/stage/bosses/final_intro.c | 8 +- src/game/sa2/stage/cheese.c | 8 +- src/game/sa2/stage/debug_text_printer.c | 2 +- src/game/sa2/stage/enemies/balloon.c | 2 +- src/game/sa2/stage/enemies/bell.c | 2 +- src/game/sa2/stage/enemies/bullet_buzzer.c | 2 +- src/game/sa2/stage/enemies/buzzer.c | 2 +- src/game/sa2/stage/enemies/circus.c | 2 +- src/game/sa2/stage/enemies/flickey.c | 2 +- src/game/sa2/stage/enemies/geji_geji.c | 2 +- src/game/sa2/stage/enemies/gohla.c | 2 +- src/game/sa2/stage/enemies/hammerhead.c | 2 +- src/game/sa2/stage/enemies/kiki.c | 2 +- src/game/sa2/stage/enemies/koura.c | 4 +- src/game/sa2/stage/enemies/kubinaga.c | 4 +- src/game/sa2/stage/enemies/kura_kura.c | 2 +- src/game/sa2/stage/enemies/kyura.c | 2 +- src/game/sa2/stage/enemies/madillo.c | 2 +- src/game/sa2/stage/enemies/mon.c | 2 +- src/game/sa2/stage/enemies/mouse.c | 2 +- src/game/sa2/stage/enemies/pen.c | 2 +- src/game/sa2/stage/enemies/piko_piko.c | 2 +- src/game/sa2/stage/enemies/spinner.c | 2 +- src/game/sa2/stage/enemies/star.c | 2 +- src/game/sa2/stage/enemies/straw.c | 2 +- src/game/sa2/stage/enemies/yado.c | 8 +- src/game/sa2/stage/heart_particles_effect.c | 2 +- .../sa2/stage/interactables/ceiling_slope.c | 4 +- .../interactables/collect_rings_lap_trigger.c | 6 +- .../stage/interactables/egg_utopia/cannon.c | 8 +- .../interactables/egg_utopia/flying_handle.c | 8 +- .../interactables/egg_utopia/iron_ball.c | 2 +- .../stage/interactables/egg_utopia/launcher.c | 8 +- .../sa2/stage/interactables/egg_utopia/pole.c | 6 +- .../egg_utopia/speeding_platform.c | 6 +- src/game/sa2/stage/interactables/grind_rail.c | 4 +- .../stage/interactables/hot_crater/crane.c | 6 +- .../interactables/hot_crater/dash_ring.c | 10 +- .../hot_crater/floating_spring.c | 8 +- .../interactables/hot_crater/hook_rail.c | 10 +- .../interactables/hot_crater/turnaround_bar.c | 6 +- .../interactables/hot_crater/windup_stick.c | 6 +- .../interactables/ice_paradise/big_snowball.c | 8 +- .../ice_paradise/funnel_sphere.c | 8 +- .../interactables/ice_paradise/half_pipe.c | 4 +- .../stage/interactables/leaf_forest/booster.c | 6 +- .../interactables/leaf_forest/bouncy_bar.c | 8 +- .../interactables/leaf_forest/checkpoint.c | 8 +- .../interactables/leaf_forest/corkscrew.c | 8 +- .../interactables/leaf_forest/corkscrew_3d.c | 8 +- .../interactables/leaf_forest/decoration.c | 2 +- .../interactables/leaf_forest/incline_ramp.c | 6 +- .../leaf_forest/platform_crumbling.c | 4 +- .../leaf_forest/rotating_handle.c | 8 +- .../stage/interactables/leaf_forest/spikes.c | 8 +- .../interactables/leaf_forest/spring_bouncy.c | 10 +- .../interactables/leaf_forest/stage_goal.c | 4 +- .../leaf_forest/toggle_player_layer.c | 2 +- .../interactables/leaf_forest/windmill.c | 2 +- .../stage/interactables/music_plant/chord.c | 8 +- .../interactables/music_plant/french_horn.c | 8 +- .../interactables/music_plant/german_flute.c | 6 +- .../interactables/music_plant/keyboard.c | 8 +- .../interactables/music_plant/note_block.c | 8 +- .../interactables/music_plant/note_sphere.c | 6 +- .../interactables/music_plant/pipe_horn.c | 6 +- .../interactables/music_plant/pipe_sequence.c | 6 +- .../sa2/stage/interactables/note_particle.c | 2 +- src/game/sa2/stage/interactables/pipe.c | 2 +- src/game/sa2/stage/interactables/platform.c | 6 +- .../sa2/stage/interactables/platform_square.c | 8 +- .../sa2/stage/interactables/platform_thin.c | 8 +- src/game/sa2/stage/interactables/ramp.c | 6 +- .../sa2/stage/interactables/sky_canyon/fan.c | 4 +- .../interactables/sky_canyon/propeller.c | 8 +- .../sky_canyon/propeller_spring.c | 4 +- .../interactables/sky_canyon/small_windmill.c | 8 +- .../interactables/sky_canyon/whirlwind.c | 8 +- .../sa2/stage/interactables/sky_canyon_init.c | 2 +- .../sa2/stage/interactables/special_ring.c | 4 +- src/game/sa2/stage/interactables/spring.c | 8 +- .../techno_base/arrow_platform.c | 8 +- .../interactables/techno_base/bounce_block.c | 8 +- .../interactables/techno_base/light_bridge.c | 6 +- .../interactables/techno_base/light_globe.c | 6 +- .../techno_base/spike_platform.c | 4 +- src/game/sa2/stage/itembox.c | 12 +- src/game/sa2/stage/mp_attack_1_effect.c | 2 +- src/game/sa2/stage/mp_attack_2_effect.c | 2 +- src/game/sa2/stage/mystery_itembox.c | 10 +- src/game/sa2/stage/player_callbacks.c | 8 +- src/game/sa2/stage/player_super_sonic.c | 10 +- src/game/sa2/stage/race_progress.c | 4 +- src/game/sa2/stage/spawn_positions.c | 2 +- src/game/sa2/stage/stage_ui.c | 6 +- src/game/sa2/stage/tilemap_table.c | 4 +- src/game/sa2/stage/trapped_animals.c | 4 +- src/game/sa2/title_screen.c | 12 +- src/game/sa2/ui/character_select.c | 8 +- src/game/sa2/ui/countdown.c | 8 +- src/game/sa2/ui/course_select.c | 8 +- src/game/sa2/ui/game_over.c | 6 +- src/game/sa2/ui/multiplayer_lobby.c | 8 +- src/game/sa2/ui/stage_intro.c | 4 +- src/game/sa2/ui/stage_results.c | 8 +- src/game/sa2/ui/time_attack_lobby.c | 8 +- src/game/sa2/ui/time_attack_mode_select.c | 8 +- src/game/sa2/ui/time_attack_results.c | 6 +- src/game/shared/collect_rings/results.c | 8 +- src/game/shared/menus/unused_level_select.c | 2 +- .../multiplayer/communication_outcome.c | 8 +- .../shared/stage/amy_attack_heart_effect.c | 4 +- src/game/shared/stage/camera.c | 6 +- src/game/shared/stage/collect_ring_effect.c | 2 +- src/game/shared/stage/collision.c | 6 +- src/game/shared/stage/demo_manager.c | 4 +- src/game/shared/stage/dust_cloud.c | 2 +- src/game/shared/stage/dust_effect_braking.c | 2 +- src/game/shared/stage/dust_effect_spindash.c | 2 +- src/game/shared/stage/enemy_defeat_score.c | 2 +- src/game/shared/stage/entities_manager.c | 4 +- src/game/shared/stage/grind_effect_1.c | 4 +- src/game/shared/stage/item_tasks.c | 4 +- src/game/shared/stage/magnetic_ring.c | 4 +- src/game/shared/stage/mp_event_mgr.c | 4 +- src/game/shared/stage/mp_finish.c | 4 +- src/game/shared/stage/mp_indicators.c | 2 +- src/game/shared/stage/mp_player.c | 8 +- src/game/shared/stage/mp_sprite_task.c | 2 +- src/game/shared/stage/music_manager.c | 2 +- src/game/shared/stage/pause_menu.c | 6 +- src/game/shared/stage/player.c | 10 +- src/game/shared/stage/rings_manager.c | 2 +- src/game/shared/stage/rings_scatter.c | 32 +- src/game/shared/stage/stage.c | 8 +- src/game/shared/stage/terrain_collision.c | 2 +- src/game/shared/stage/underwater_effects.c | 2 +- src/game/shared/stage/water_effects.c | 4 +- tools/BriBaSA_ex/src/drawing.c | 4 +- tools/BriBaSA_ex/src/main.c | 4 +- 525 files changed, 9512 insertions(+), 23181 deletions(-) rename include/constants/{ => sa1}/anim_commands.h (100%) rename include/constants/{ => sa1}/anim_sizes.h (100%) rename include/constants/{ => sa1}/animations.h (99%) rename {sa1/include/constants => include/constants/sa1}/char_states.h (100%) rename {sa1/include/constants => include/constants/sa1}/characters.h (100%) rename {sa1/include/constants => include/constants/sa1}/enemies.h (100%) rename {sa1/include/constants => include/constants/sa1}/interactables.h (100%) rename include/constants/{ => sa1}/items.h (100%) rename include/constants/{ => sa1}/move_states.h (100%) rename {sa1/include/constants => include/constants/sa1}/mp_map_interactables.h (100%) rename include/constants/{ => sa1}/player_transitions.h (100%) rename include/constants/{ => sa1}/songs.h (100%) rename {sa1/include/constants => include/constants/sa1}/text.h (100%) rename include/constants/{ => sa1}/tilemaps.h (100%) rename {sa1/include/constants => include/constants/sa1}/ui_graphics.h (100%) rename include/constants/{ => sa1}/vram_hardcoded.h (100%) rename include/constants/{ => sa1}/zones.h (100%) rename {sa1/include/constants => include/constants/sa2}/anim_commands.h (100%) rename {sa1/include/constants => include/constants/sa2}/anim_sizes.h (100%) rename {sa1/include/constants => include/constants/sa2}/animations.h (99%) rename include/constants/{ => sa2}/char_states.h (100%) rename include/constants/{ => sa2}/characters.h (100%) rename include/constants/{ => sa2}/enemies.h (100%) rename include/constants/{ => sa2}/interactables.h (100%) rename {sa1/include/constants => include/constants/sa2}/items.h (100%) rename {sa1/include/constants => include/constants/sa2}/move_states.h (100%) create mode 100644 include/constants/sa2/mp_map_interactables.h rename {sa1/include/constants => include/constants/sa2}/player_transitions.h (100%) rename {sa1/include/constants => include/constants/sa2}/songs.h (100%) rename include/constants/{ => sa2}/text.h (100%) rename {sa1/include/constants => include/constants/sa2}/tilemaps.h (100%) create mode 100644 include/constants/sa2/ui_graphics.h rename {sa1/include/constants => include/constants/sa2}/vram_hardcoded.h (100%) rename {sa1/include/constants => include/constants/sa2}/zones.h (100%) rename {sa1/include => include}/data/sa1/credits.h (100%) rename {sa1/include => include}/data/sa1/recordings.h (100%) rename {sa1/include => include}/data/sa1/sprite_data.h (100%) rename {sa1/include => include}/data/sa1/sprite_tables.h (100%) rename {sa1/include => include}/data/sa1/tileset_debug_ascii.h (100%) rename {sa1/include => include}/data/sa1/ui_graphics.h (99%) rename {sa1/include => include}/game/sa1/assets/compressed/entities.h (100%) rename {sa1/include => include}/game/sa1/assets/compressed/roms.h (100%) rename {sa1/include => include}/game/sa1/menus/mp_mode_select.h (100%) rename {sa1/include => include}/game/sa1/menus/mp_mode_select_2.h (100%) rename {sa1/include => include}/game/sa1/menus/options_screen.h (96%) rename {sa1/include => include}/game/sa1/menus/time_attack.h (100%) rename {sa1/include => include}/game/sa1/menus/title_screen.h (100%) rename {sa1/include => include}/game/sa1/parameters/stage.h (100%) rename {sa1/include => include}/game/sa1/save.h (97%) rename {sa1/include => include}/game/sa1/special_stage/main.h (100%) rename {sa1/include => include}/game/sa1/stage/backgrounds/zone_3.h (100%) rename {sa1/include => include}/game/sa1/stage/backgrounds/zone_5.h (100%) rename {sa1/include => include}/game/sa1/stage/backgrounds/zone_6.h (100%) rename {sa1/include => include}/game/sa1/stage/egg_rocket_transitions.h (100%) rename {sa1/include => include}/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h (100%) rename {sa1/include => include}/game/sa1/stage/enemies/bosses_shared.h (100%) rename {sa1/include => include}/game/sa1/stage/extra_stage.h (100%) rename {sa1/include => include}/game/sa1/stage/interactables/party_balloon.h (100%) rename {sa1/include => include}/game/sa1/stage/itembox.h (100%) rename {sa1/include => include}/game/sa1/stage/mp_chao.h (100%) rename {sa1/include => include}/game/sa1/stage/mp_hud.h (100%) rename {sa1/include => include}/game/sa1/stage/mp_results.h (100%) rename {sa1/include => include}/game/sa1/stage/mp_unk_0.h (100%) rename {sa1/include => include}/game/sa1/stage/mp_unk_1.h (100%) rename {sa1/include => include}/game/sa1/stage/mystery_itembox.h (100%) rename {sa1/include => include}/game/sa1/stage/nuts_and_bolts_task.h (100%) rename {sa1/include => include}/game/sa1/stage/player_controls.h (100%) rename {sa1/include => include}/game/sa1/stage/player_sonic.h (100%) rename {sa1/include => include}/game/sa1/stage/player_super_sonic.h (100%) rename {sa1/include => include}/game/sa1/stage/player_tails.h (100%) rename {sa1/include => include}/game/sa1/stage/some_task_manager.h (100%) rename {sa1/include => include}/game/sa1/stage/spawn_positions.h (92%) rename {sa1/include => include}/game/sa1/stage/stage_ui.h (100%) rename {sa1/include => include}/game/sa1/stage/tilemap_table.h (100%) rename {sa1/include => include}/game/sa1/stage/trapped_animals.h (100%) rename {sa1/include => include}/game/sa1/stage/ui_rendering.h (100%) rename {sa1/include => include}/game/sa1/ui/character_select.h (100%) rename {sa1/include => include}/game/sa1/ui/collect_chaos_emeralds_msg.h (100%) rename {sa1/include => include}/game/sa1/ui/course_select.h (100%) rename {sa1/include => include}/game/sa1/ui/game_over.h (100%) rename {sa1/include => include}/game/sa1/ui/stage_results.h (100%) rename {sa1/include => include}/game/sa1/ui/time_attack_lobby.h (100%) rename {sa1/include => include}/game/sa1/ui/time_attack_results.h (100%) rename {sa1/include => include}/game/sa1/ui/time_over.h (100%) delete mode 100644 sa1/include/anim_sizes.h delete mode 100644 sa1/include/animation_commands.h delete mode 100644 sa1/include/animation_commands_bg.h delete mode 100644 sa1/include/bg_triangles.h delete mode 100644 sa1/include/color.h delete mode 100644 sa1/include/config.h delete mode 100644 sa1/include/flags.h delete mode 100644 sa1/include/game/dummy_task.h delete mode 100644 sa1/include/game/game.h delete mode 100644 sa1/include/game/globals.h delete mode 100644 sa1/include/gba/.clang-format delete mode 100644 sa1/include/gba/cpuset_macros.h delete mode 100644 sa1/include/gba/defines.h delete mode 100644 sa1/include/gba/dma_macros.h delete mode 100644 sa1/include/gba/gba.h delete mode 100644 sa1/include/gba/io_reg.h delete mode 100644 sa1/include/gba/isagbprint.h delete mode 100644 sa1/include/gba/macro.h delete mode 100644 sa1/include/gba/multiboot.h delete mode 100644 sa1/include/gba/syscall.h delete mode 100644 sa1/include/gba/types.h delete mode 100644 sa1/include/global.h delete mode 100644 sa1/include/input_recorder.h delete mode 100644 sa1/include/lib/agb_flash/agb_flash.h delete mode 100644 sa1/include/lib/agb_flash/flash_internal.h delete mode 100644 sa1/include/lib/m4a/m4a.h delete mode 100644 sa1/include/lib/m4a/m4a_internal.h delete mode 100644 sa1/include/malloc_ewram.h delete mode 100644 sa1/include/malloc_vram.h delete mode 100644 sa1/include/multi_boot.h delete mode 100644 sa1/include/multi_sio.h delete mode 100644 sa1/include/sio32_multi_load.h delete mode 100644 sa1/include/task.h delete mode 100644 sa1/include/tilemap.h delete mode 100644 sa1/include/trig.h diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index e5bdae7a6..0f1c556fe 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -5,7 +5,7 @@ "includePath": [ "${workspaceFolder}/include/**" ], - "defines": ["PLATFORM_GBA=1"], + "defines": ["PLATFORM_GBA=1", "GAME=GAME_SA2"], "compilerPath": "/usr/bin/gcc", "cStandard": "gnu17", "cppStandard": "gnu++17", @@ -17,7 +17,7 @@ "includePath": [ "${workspaceFolder}/sa1/include/**" ], - "defines": ["PLATFORM_GBA=1", "GAME=1"], + "defines": ["PLATFORM_GBA=1", "GAME=GAME_SA1"], "compilerPath": "/usr/bin/gcc", "cStandard": "gnu17", "cppStandard": "gnu++17", diff --git a/Makefile b/Makefile index 9fa365936..a6b98e113 100644 --- a/Makefile +++ b/Makefile @@ -229,7 +229,7 @@ FORMAT_H_PATHS := $(shell find . -name "*.h" ! -path '*/build/*' ! -path '*/ex # -P disables line markers (don't EVER use this, if you want proper debug info!) # -I sets an include path # -D defines a symbol -CPPFLAGS ?= $(INCLUDE_CPP_ARGS) -D $(GAME_REGION) +CPPFLAGS ?= $(INCLUDE_CPP_ARGS) -D $(GAME_REGION) -D GAME=$(GAME) CC1FLAGS ?= -Wimplicit -Wparentheses -Werror ifneq ($(GAME_VARIANT), DEFAULT) @@ -497,13 +497,13 @@ data/sa2/mb_chao_garden_japan.gba.lz: data/sa2/mb_chao_garden_japan.gba $(GFX) $< $@ -search 1 %interactables.bin: %interactables.csv - $(ENT_POS) $< $@ -entities INTERACTABLES -header "./include/constants/interactables.h" + $(ENT_POS) $< $@ -entities INTERACTABLES -header "./include/constants/sa2/interactables.h" %itemboxes.bin: %itemboxes.csv - $(ENT_POS) $< $@ -entities ITEMS -header "./include/constants/items.h" + $(ENT_POS) $< $@ -entities ITEMS -header "./include/constants/sa2/items.h" %enemies.bin: %enemies.csv - $(ENT_POS) $< $@ -entities ENEMIES -header "./include/constants/enemies.h" + $(ENT_POS) $< $@ -entities ENEMIES -header "./include/constants/sa2/enemies.h" %rings.bin: %rings.csv $(ENT_POS) $< $@ -entities RINGS diff --git a/config.mk b/config.mk index 15affde18..938bdbe39 100644 --- a/config.mk +++ b/config.mk @@ -54,6 +54,7 @@ endif GAME_REVISION ?= 0 GAME_REGION ?= USA GAME_VARIANT ?= DEFAULT +GAME ?= GAME_SA2 DEBUG ?= 0 # For gbafix @@ -63,8 +64,8 @@ MAKER_CODE := 78 BUILD_NAME := sa2 TITLE := SONICADVANC2 GAME_CODE := A2N -PS2_GAME_CODE := SLUS_054.02 +PS2_GAME_CODE := SLUS_054.02 # Revision ifeq ($(GAME_REVISION), 0) diff --git a/include/config.h b/include/config.h index 357b56580..a15ef6a91 100644 --- a/include/config.h +++ b/include/config.h @@ -13,8 +13,9 @@ #define ENGINE_3 3 #define ENGINE_4 4 -// TODO: Define this in Makefile through a compiler macro? -#define GAME GAME_SA2 +#ifndef GAME +#error GAME must be defined to compile +#endif // TODO: Do SA1 and SA2 use the same engine ver? // TODO: Do SA3 and KATAM use the same engine ver? diff --git a/include/constants/anim_commands.h b/include/constants/sa1/anim_commands.h similarity index 100% rename from include/constants/anim_commands.h rename to include/constants/sa1/anim_commands.h diff --git a/include/constants/anim_sizes.h b/include/constants/sa1/anim_sizes.h similarity index 100% rename from include/constants/anim_sizes.h rename to include/constants/sa1/anim_sizes.h diff --git a/include/constants/animations.h b/include/constants/sa1/animations.h similarity index 99% rename from include/constants/animations.h rename to include/constants/sa1/animations.h index 6dd7fff48..28e5b43e9 100644 --- a/include/constants/animations.h +++ b/include/constants/sa1/animations.h @@ -4,7 +4,7 @@ /* Collection of animation indices for Sonic Advance 1. * - By JaceCear */ -#include "constants/anim_sizes.h" +#include "constants/sa1/anim_sizes.h" /**************************** SA1 ****************************/ diff --git a/sa1/include/constants/char_states.h b/include/constants/sa1/char_states.h similarity index 100% rename from sa1/include/constants/char_states.h rename to include/constants/sa1/char_states.h diff --git a/sa1/include/constants/characters.h b/include/constants/sa1/characters.h similarity index 100% rename from sa1/include/constants/characters.h rename to include/constants/sa1/characters.h diff --git a/sa1/include/constants/enemies.h b/include/constants/sa1/enemies.h similarity index 100% rename from sa1/include/constants/enemies.h rename to include/constants/sa1/enemies.h diff --git a/sa1/include/constants/interactables.h b/include/constants/sa1/interactables.h similarity index 100% rename from sa1/include/constants/interactables.h rename to include/constants/sa1/interactables.h diff --git a/include/constants/items.h b/include/constants/sa1/items.h similarity index 100% rename from include/constants/items.h rename to include/constants/sa1/items.h diff --git a/include/constants/move_states.h b/include/constants/sa1/move_states.h similarity index 100% rename from include/constants/move_states.h rename to include/constants/sa1/move_states.h diff --git a/sa1/include/constants/mp_map_interactables.h b/include/constants/sa1/mp_map_interactables.h similarity index 100% rename from sa1/include/constants/mp_map_interactables.h rename to include/constants/sa1/mp_map_interactables.h diff --git a/include/constants/player_transitions.h b/include/constants/sa1/player_transitions.h similarity index 100% rename from include/constants/player_transitions.h rename to include/constants/sa1/player_transitions.h diff --git a/include/constants/songs.h b/include/constants/sa1/songs.h similarity index 100% rename from include/constants/songs.h rename to include/constants/sa1/songs.h diff --git a/sa1/include/constants/text.h b/include/constants/sa1/text.h similarity index 100% rename from sa1/include/constants/text.h rename to include/constants/sa1/text.h diff --git a/include/constants/tilemaps.h b/include/constants/sa1/tilemaps.h similarity index 100% rename from include/constants/tilemaps.h rename to include/constants/sa1/tilemaps.h diff --git a/sa1/include/constants/ui_graphics.h b/include/constants/sa1/ui_graphics.h similarity index 100% rename from sa1/include/constants/ui_graphics.h rename to include/constants/sa1/ui_graphics.h diff --git a/include/constants/vram_hardcoded.h b/include/constants/sa1/vram_hardcoded.h similarity index 100% rename from include/constants/vram_hardcoded.h rename to include/constants/sa1/vram_hardcoded.h diff --git a/include/constants/zones.h b/include/constants/sa1/zones.h similarity index 100% rename from include/constants/zones.h rename to include/constants/sa1/zones.h diff --git a/sa1/include/constants/anim_commands.h b/include/constants/sa2/anim_commands.h similarity index 100% rename from sa1/include/constants/anim_commands.h rename to include/constants/sa2/anim_commands.h diff --git a/sa1/include/constants/anim_sizes.h b/include/constants/sa2/anim_sizes.h similarity index 100% rename from sa1/include/constants/anim_sizes.h rename to include/constants/sa2/anim_sizes.h diff --git a/sa1/include/constants/animations.h b/include/constants/sa2/animations.h similarity index 99% rename from sa1/include/constants/animations.h rename to include/constants/sa2/animations.h index 6dd7fff48..b9448b84a 100644 --- a/sa1/include/constants/animations.h +++ b/include/constants/sa2/animations.h @@ -4,7 +4,7 @@ /* Collection of animation indices for Sonic Advance 1. * - By JaceCear */ -#include "constants/anim_sizes.h" +#include "constants/sa2/anim_sizes.h" /**************************** SA1 ****************************/ diff --git a/include/constants/char_states.h b/include/constants/sa2/char_states.h similarity index 100% rename from include/constants/char_states.h rename to include/constants/sa2/char_states.h diff --git a/include/constants/characters.h b/include/constants/sa2/characters.h similarity index 100% rename from include/constants/characters.h rename to include/constants/sa2/characters.h diff --git a/include/constants/enemies.h b/include/constants/sa2/enemies.h similarity index 100% rename from include/constants/enemies.h rename to include/constants/sa2/enemies.h diff --git a/include/constants/interactables.h b/include/constants/sa2/interactables.h similarity index 100% rename from include/constants/interactables.h rename to include/constants/sa2/interactables.h diff --git a/sa1/include/constants/items.h b/include/constants/sa2/items.h similarity index 100% rename from sa1/include/constants/items.h rename to include/constants/sa2/items.h diff --git a/sa1/include/constants/move_states.h b/include/constants/sa2/move_states.h similarity index 100% rename from sa1/include/constants/move_states.h rename to include/constants/sa2/move_states.h diff --git a/include/constants/sa2/mp_map_interactables.h b/include/constants/sa2/mp_map_interactables.h new file mode 100644 index 000000000..e15ec5b3a --- /dev/null +++ b/include/constants/sa2/mp_map_interactables.h @@ -0,0 +1,24 @@ +#ifndef GUARD_CONSTANTS_MP_MAP_INTERACTABLES_H +#define GUARD_CONSTANTS_MP_MAP_INTERACTABLES_H + +// Used for the Single Pak, "Collect Rings" stage +#define IA__MP_IA000 0 // => IA001 +#define IA__MP_IA001 1 // => IA002 +#define IA__MP_IA002 2 // => IA003 +#define IA__MP_IA003 3 // => IA003 +#define IA__MP_IA004 4 // => IA001 +#define IA__MP_IA005 5 // => IA002 +#define IA__MP_IA006 6 // => IA008 +#define IA__MP_IA007 7 // => IA009 +#define IA__MP_IA008 8 // => IA010 +#define IA__MP_IA009 9 // => IA010 +#define IA__MP_IA010 10 // => IA012 +#define IA__MP_IA011 11 // => IA012 +#define IA__MP_TOGGLE_PLAYER_LAYER__FRONT 12 +#define IA__MP_TOGGLE_PLAYER_LAYER__BACK 13 +#define IA__MP_IA014 14 // => IA021 +#define IA__MP_IA015 15 // => IA022 +#define IA__MP_IA016 16 // => IA040 +#define IA__MP_IA017 17 // => IA115 + +#endif // GUARD_CONSTANTS_MP_MAP_INTERACTABLES_H diff --git a/sa1/include/constants/player_transitions.h b/include/constants/sa2/player_transitions.h similarity index 100% rename from sa1/include/constants/player_transitions.h rename to include/constants/sa2/player_transitions.h diff --git a/sa1/include/constants/songs.h b/include/constants/sa2/songs.h similarity index 100% rename from sa1/include/constants/songs.h rename to include/constants/sa2/songs.h diff --git a/include/constants/text.h b/include/constants/sa2/text.h similarity index 100% rename from include/constants/text.h rename to include/constants/sa2/text.h diff --git a/sa1/include/constants/tilemaps.h b/include/constants/sa2/tilemaps.h similarity index 100% rename from sa1/include/constants/tilemaps.h rename to include/constants/sa2/tilemaps.h diff --git a/include/constants/sa2/ui_graphics.h b/include/constants/sa2/ui_graphics.h new file mode 100644 index 000000000..3130b450a --- /dev/null +++ b/include/constants/sa2/ui_graphics.h @@ -0,0 +1,134 @@ +#ifndef GUARD_SA1_UI_GRAPHICS_H +#define GUARD_SA1_UI_GRAPHICS_H + +#define UIGFX_ASCII_CHARS 0 +#define UIGFX_UI_ICON_SONIC 1 +#define UIGFX_UI_ICON_TAILS 2 +#define UIGFX_UI_ICON_KNUCKLES 3 +#define UIGFX_UI_ICON_AMY 4 +#define UIGFX_UI_ICON_RING 5 +#define UIGFX_STGINTRO_ZIGZAG_SONIC 6 +#define UIGFX_STGINTRO_ZIGZAG_TAILS 7 +#define UIGFX_STGINTRO_ZIGZAG_KNUCKLES 8 +#define UIGFX_STGINTRO_ZIGZAG_AMY 9 +#define UIGFX_STGINTRO_CHAR_NAMES 10 +#define UIGFX_STGRESULT_SONIC 11 +#define UIGFX_STGRESULT_TAILS 12 +#define UIGFX_STGRESULT_KNUCKLES 13 +#define UIGFX_STGRESULT_AMY 14 +#define UIGFX_STGRESULT_ACT12 15 +#define UIGFX_STGRESULT_HEADLINE_BACK 16 +#define UIGFX_STGNAMES_JP_0 17 +#define UIGFX_18 18 +#define UIGFX_STGNAME_1 19 +#define UIGFX_STGNAME_2 20 +#define UIGFX_STGNAME_3 21 +#define UIGFX_STGNAME_4 22 +#define UIGFX_STGNAME_5 23 +#define UIGFX_STGNAME_6 24 +#define UIGFX_STGNAME_7 25 +#define UIGFX_26 26 +#define UIGFX_27 27 +#define UIGFX_28 28 +#define UIGFX_29 29 +#define UIGFX_30 30 +#define UIGFX_31 31 +#define UIGFX_TIMER_DIGITS 32 +#define UIGFX_OK 33 +#define UIGFX_34 34 +#define UIGFX_35 35 +#define UIGFX_36 36 +#define UIGFX_37 37 +#define UIGFX_38 38 +#define UIGFX_39 39 +#define UIGFX_40 40 +#define UIGFX_41 41 +#define UIGFX_42 42 +#define UIGFX_43 43 +#define UIGFX_CHAR_SELECT_OK 44 +#define UIGFX_CHAR_SELECT_BLACK_BOX_2 45 +#define UIGFX_CHAR_SP_STAGE_RINGS_BG 46 +#define UIGFX_47 47 +#define UIGFX_48 48 +#define UIGFX_49 49 +#define UIGFX_50 50 +#define UIGFX_51 51 +#define UIGFX_52 52 +#define UIGFX_53 53 +#define UIGFX_54 54 +#define UIGFX_55 55 +#define UIGFX_56 56 +#define UIGFX_57 57 +#define UIGFX_58 58 +#define UIGFX_59 59 +#define UIGFX_60 60 +#define UIGFX_61 61 +#define UIGFX_62 62 +#define UIGFX_63 63 +#define UIGFX_64 64 +#define UIGFX_65 65 +#define UIGFX_66 66 +#define UIGFX_67 67 +#define UIGFX_68 68 +#define UIGFX_69 69 +#define UIGFX_70 70 +#define UIGFX_71 71 +#define UIGFX_72 72 +#define UIGFX_73 73 +#define UIGFX_74 74 +#define UIGFX_75 75 +#define UIGFX_76 76 +#define UIGFX_77 77 +#define UIGFX_78 78 +#define UIGFX_79 79 +#define UIGFX_80 80 +#define UIGFX_81 81 +#define UIGFX_82 82 +#define UIGFX_83 83 +#define UIGFX_84 84 +#define UIGFX_85 85 +#define UIGFX_86 86 +#define UIGFX_87 87 +#define UIGFX_88 88 +#define UIGFX_89 89 +#define UIGFX_90 90 +#define UIGFX_91 91 +#define UIGFX_92 92 +#define UIGFX_93 93 +#define UIGFX_94 94 +#define UIGFX_95 95 +#define UIGFX_96 96 +#define UIGFX_97 97 +#define UIGFX_98 98 +#define UIGFX_99 99 +#define UIGFX_100 100 +#define UIGFX_101 101 +#define UIGFX_102 102 +#define UIGFX_103 103 +#define UIGFX_104 104 +#define UIGFX_105 105 +#define UIGFX_106 106 +#define UIGFX_107 107 +#define UIGFX_108 108 +#define UIGFX_109 109 +#define UIGFX_110 110 +#define UIGFX_111 111 +#define UIGFX_112 112 +#define UIGFX_113 113 +#define UIGFX_114 114 +#define UIGFX_115 115 +#define UIGFX_116 116 +#define UIGFX_117 117 +#define UIGFX_118 118 +#define UIGFX_119 119 +#define UIGFX_120 120 +#define UIGFX_121 121 +#define UIGFX_122 122 +#define UIGFX_123 123 +#define UIGFX_124 124 +#define UIGFX_125 125 +#define UIGFX_126 126 +#define UIGFX_127 127 +#define UIGFX_OPTIONS 128 + +#endif // GUARD_SA1_UI_GRAPHICS_H \ No newline at end of file diff --git a/sa1/include/constants/vram_hardcoded.h b/include/constants/sa2/vram_hardcoded.h similarity index 100% rename from sa1/include/constants/vram_hardcoded.h rename to include/constants/sa2/vram_hardcoded.h diff --git a/sa1/include/constants/zones.h b/include/constants/sa2/zones.h similarity index 100% rename from sa1/include/constants/zones.h rename to include/constants/sa2/zones.h diff --git a/sa1/include/data/sa1/credits.h b/include/data/sa1/credits.h similarity index 100% rename from sa1/include/data/sa1/credits.h rename to include/data/sa1/credits.h diff --git a/sa1/include/data/sa1/recordings.h b/include/data/sa1/recordings.h similarity index 100% rename from sa1/include/data/sa1/recordings.h rename to include/data/sa1/recordings.h diff --git a/sa1/include/data/sa1/sprite_data.h b/include/data/sa1/sprite_data.h similarity index 100% rename from sa1/include/data/sa1/sprite_data.h rename to include/data/sa1/sprite_data.h diff --git a/sa1/include/data/sa1/sprite_tables.h b/include/data/sa1/sprite_tables.h similarity index 100% rename from sa1/include/data/sa1/sprite_tables.h rename to include/data/sa1/sprite_tables.h diff --git a/sa1/include/data/sa1/tileset_debug_ascii.h b/include/data/sa1/tileset_debug_ascii.h similarity index 100% rename from sa1/include/data/sa1/tileset_debug_ascii.h rename to include/data/sa1/tileset_debug_ascii.h diff --git a/sa1/include/data/sa1/ui_graphics.h b/include/data/sa1/ui_graphics.h similarity index 99% rename from sa1/include/data/sa1/ui_graphics.h rename to include/data/sa1/ui_graphics.h index e425f8820..9804eac2d 100644 --- a/sa1/include/data/sa1/ui_graphics.h +++ b/include/data/sa1/ui_graphics.h @@ -2,7 +2,7 @@ #define SA1_UI_GRAPHICS_H #include "global.h" -#include "constants/ui_graphics.h" +#include "constants/sa1/ui_graphics.h" /* This file was created using './scripts/extract_ui_graphics_data.py'. If you want to change a name or some other property, diff --git a/include/data/sa2/input_combos.h b/include/data/sa2/input_combos.h index 01fdb02fc..36557a9ce 100644 --- a/include/data/sa2/input_combos.h +++ b/include/data/sa2/input_combos.h @@ -2,7 +2,7 @@ #define GUARD_SA2_DATA_INPUT_COMBOS #include "types.h" -#include "constants/characters.h" +#include "constants/sa2/characters.h" extern const u8 *const *const gUnknown_08C871D4[NUM_CHARACTERS]; diff --git a/include/game/globals.h b/include/game/globals.h index 0cfaa02ed..85de2641d 100644 --- a/include/game/globals.h +++ b/include/game/globals.h @@ -19,15 +19,7 @@ #define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 5 #endif -// TODO: not verfied yet but all instances of this condition -// seem to be compiled out in collect rings -#ifndef COLLECT_RINGS_ROM -#define IS_COLLECT_RINGS_MINIGAME (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) -#else -#define IS_COLLECT_RINGS_MINIGAME TRUE -#endif - -// TODO: Improve this name; SA1 only? +// TODO: Improve this name #define IS_MP_OR_TEAM_PLAY ((gGameMode == GAME_MODE_MULTI_PLAYER) || (gGameMode == GAME_MODE_TEAM_PLAY)) #if (GAME == GAME_SA1) @@ -106,16 +98,26 @@ typedef struct { // Incomplete extern u8 gDemoPlayCounter; + +#if (GAME == GAME_SA1) +extern u16 ALIGNED(4) gSpecialStageReturnX; +#endif + extern u8 gGameMode; extern s8 gCurrentLevel; extern s8 gSelectedCharacter; #if (GAME == GAME_SA1) -extern bool8 gTailsEnabled; +// NOTE: Treat gTailsEnabled as bool8, it just does not match unsigned +extern s8 gTailsEnabled; extern s8 gNumSingleplayerCharacters; +#define NUM_SINGLEPLAYER_CHARS_MAX 2 +#elif (GAME == GAME_SA2) +extern u8 gNumSingleplayerCharacters; #endif extern u8 gMultiplayerLanguage; +extern s8 gMultiplayerCurrentLevel; // Sometimes loaded as s16, but as u16 most of the time. // If you encounter it being loaded as s16, please cast it. @@ -131,14 +133,20 @@ extern u8 gSpecialRingCount; // TODO: Types not checked yet! extern s32 gWorldSpeedY; +#if (GAME == GAME_SA2) extern s32 gWorldSpeedX; +#endif extern u16 gBossCameraClampYLower; extern u16 gBossCameraClampYUpper; extern u8 gRandomItemBox; +#if (GAME == GAME_SA1) +extern u16 gSpecialStageCollectedRings; +extern u16 gUnknown_0300507C; +#endif extern u8 gSpikesUnknownTimer; -extern s8 gUnknown_0300543C; +extern s8 SA2_LABEL(gUnknown_0300543C); extern struct Task *gEntitiesManagerTask; extern u8 gDestroySpotlights; @@ -154,8 +162,7 @@ extern u8 gDifficultyLevel; extern s8 gTrappedAnimalVariant; -extern u8 gBossIndex; // TODO: Boss ID in XX-Stage? But it's used in checkpointc.c ... -extern u8 gNumSingleplayerCharacters; +extern u8 gBossIndex; // TODO: Rename to gLastCheckpointIndex? (SA1 AND SA2!) // Incremented by 1 every frame if the game is not paused. // Starts before the stage-timer that is used for scores does. @@ -179,7 +186,13 @@ extern u8 gMultiplayerMissingHeartbeats[4]; extern u8 gActiveCollectRingEffectCount; extern u8 gMultiplayerUnlockedCharacters; + +#if (GAME == GAME_SA1) +extern u16 gSpecialStageReturnY; +#elif (GAME == GAME_SA2) extern u8 gMultiplayerUnlockedLevels; +#endif + extern u32 gMultiplayerIds[MULTI_SIO_PLAYERS_MAX]; extern u16 gMultiplayerNames[MULTI_SIO_PLAYERS_MAX][MAX_PLAYER_NAME_LENGTH]; @@ -244,6 +257,9 @@ void LinkCommunicationError(void); }) #if (GAME == GAME_SA1) && !defined(BUG_FIX) +// NOTE: gNumLives is u8, so without the bounds-check, +// which SA1 did not have, 255 would overflow to 0. +// During regular gameplay you would not get that many 1UPs, though. #define LIVES_BOUND_CHECK_A(lives) (lives) #define LIVES_BOUND_CHECK_B(lives) (lives) #define NEW_LIVE_COUNT(_type, _varname, _inc) (gNumLives += 1) diff --git a/sa1/include/game/sa1/assets/compressed/entities.h b/include/game/sa1/assets/compressed/entities.h similarity index 100% rename from sa1/include/game/sa1/assets/compressed/entities.h rename to include/game/sa1/assets/compressed/entities.h diff --git a/sa1/include/game/sa1/assets/compressed/roms.h b/include/game/sa1/assets/compressed/roms.h similarity index 100% rename from sa1/include/game/sa1/assets/compressed/roms.h rename to include/game/sa1/assets/compressed/roms.h diff --git a/sa1/include/game/sa1/menus/mp_mode_select.h b/include/game/sa1/menus/mp_mode_select.h similarity index 100% rename from sa1/include/game/sa1/menus/mp_mode_select.h rename to include/game/sa1/menus/mp_mode_select.h diff --git a/sa1/include/game/sa1/menus/mp_mode_select_2.h b/include/game/sa1/menus/mp_mode_select_2.h similarity index 100% rename from sa1/include/game/sa1/menus/mp_mode_select_2.h rename to include/game/sa1/menus/mp_mode_select_2.h diff --git a/sa1/include/game/sa1/menus/options_screen.h b/include/game/sa1/menus/options_screen.h similarity index 96% rename from sa1/include/game/sa1/menus/options_screen.h rename to include/game/sa1/menus/options_screen.h index 4c2fb034d..dac8f81ad 100644 --- a/sa1/include/game/sa1/menus/options_screen.h +++ b/include/game/sa1/menus/options_screen.h @@ -6,7 +6,7 @@ #include "game/sa1/ui/game_over.h" #include "game/sa1/save.h" #include "sprite.h" -#include "constants/text.h" +#include "constants/sa1/text.h" #define NUM_LANGSCRN_SPRITES_TYPE_1 6 #define NUM_LANGSCRN_SPRITES_TYPE_2 3 diff --git a/sa1/include/game/sa1/menus/time_attack.h b/include/game/sa1/menus/time_attack.h similarity index 100% rename from sa1/include/game/sa1/menus/time_attack.h rename to include/game/sa1/menus/time_attack.h diff --git a/sa1/include/game/sa1/menus/title_screen.h b/include/game/sa1/menus/title_screen.h similarity index 100% rename from sa1/include/game/sa1/menus/title_screen.h rename to include/game/sa1/menus/title_screen.h diff --git a/sa1/include/game/sa1/parameters/stage.h b/include/game/sa1/parameters/stage.h similarity index 100% rename from sa1/include/game/sa1/parameters/stage.h rename to include/game/sa1/parameters/stage.h diff --git a/sa1/include/game/sa1/save.h b/include/game/sa1/save.h similarity index 97% rename from sa1/include/game/sa1/save.h rename to include/game/sa1/save.h index c6c14e68e..8c8ae8619 100644 --- a/sa1/include/game/sa1/save.h +++ b/include/game/sa1/save.h @@ -4,8 +4,8 @@ #include "global.h" #include "game/globals.h" -#include "constants/zones.h" -#include "constants/characters.h" +#include "constants/sa1/zones.h" +#include "constants/sa1/characters.h" #define PLAYER_NAME_END_CHAR 0xFFFF diff --git a/sa1/include/game/sa1/special_stage/main.h b/include/game/sa1/special_stage/main.h similarity index 100% rename from sa1/include/game/sa1/special_stage/main.h rename to include/game/sa1/special_stage/main.h diff --git a/sa1/include/game/sa1/stage/backgrounds/zone_3.h b/include/game/sa1/stage/backgrounds/zone_3.h similarity index 100% rename from sa1/include/game/sa1/stage/backgrounds/zone_3.h rename to include/game/sa1/stage/backgrounds/zone_3.h diff --git a/sa1/include/game/sa1/stage/backgrounds/zone_5.h b/include/game/sa1/stage/backgrounds/zone_5.h similarity index 100% rename from sa1/include/game/sa1/stage/backgrounds/zone_5.h rename to include/game/sa1/stage/backgrounds/zone_5.h diff --git a/sa1/include/game/sa1/stage/backgrounds/zone_6.h b/include/game/sa1/stage/backgrounds/zone_6.h similarity index 100% rename from sa1/include/game/sa1/stage/backgrounds/zone_6.h rename to include/game/sa1/stage/backgrounds/zone_6.h diff --git a/sa1/include/game/sa1/stage/egg_rocket_transitions.h b/include/game/sa1/stage/egg_rocket_transitions.h similarity index 100% rename from sa1/include/game/sa1/stage/egg_rocket_transitions.h rename to include/game/sa1/stage/egg_rocket_transitions.h diff --git a/sa1/include/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h b/include/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h similarity index 100% rename from sa1/include/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h rename to include/game/sa1/stage/enemies/boss_xtra_super_egg_robo.h diff --git a/sa1/include/game/sa1/stage/enemies/bosses_shared.h b/include/game/sa1/stage/enemies/bosses_shared.h similarity index 100% rename from sa1/include/game/sa1/stage/enemies/bosses_shared.h rename to include/game/sa1/stage/enemies/bosses_shared.h diff --git a/sa1/include/game/sa1/stage/extra_stage.h b/include/game/sa1/stage/extra_stage.h similarity index 100% rename from sa1/include/game/sa1/stage/extra_stage.h rename to include/game/sa1/stage/extra_stage.h diff --git a/sa1/include/game/sa1/stage/interactables/party_balloon.h b/include/game/sa1/stage/interactables/party_balloon.h similarity index 100% rename from sa1/include/game/sa1/stage/interactables/party_balloon.h rename to include/game/sa1/stage/interactables/party_balloon.h diff --git a/sa1/include/game/sa1/stage/itembox.h b/include/game/sa1/stage/itembox.h similarity index 100% rename from sa1/include/game/sa1/stage/itembox.h rename to include/game/sa1/stage/itembox.h diff --git a/sa1/include/game/sa1/stage/mp_chao.h b/include/game/sa1/stage/mp_chao.h similarity index 100% rename from sa1/include/game/sa1/stage/mp_chao.h rename to include/game/sa1/stage/mp_chao.h diff --git a/sa1/include/game/sa1/stage/mp_hud.h b/include/game/sa1/stage/mp_hud.h similarity index 100% rename from sa1/include/game/sa1/stage/mp_hud.h rename to include/game/sa1/stage/mp_hud.h diff --git a/sa1/include/game/sa1/stage/mp_results.h b/include/game/sa1/stage/mp_results.h similarity index 100% rename from sa1/include/game/sa1/stage/mp_results.h rename to include/game/sa1/stage/mp_results.h diff --git a/sa1/include/game/sa1/stage/mp_unk_0.h b/include/game/sa1/stage/mp_unk_0.h similarity index 100% rename from sa1/include/game/sa1/stage/mp_unk_0.h rename to include/game/sa1/stage/mp_unk_0.h diff --git a/sa1/include/game/sa1/stage/mp_unk_1.h b/include/game/sa1/stage/mp_unk_1.h similarity index 100% rename from sa1/include/game/sa1/stage/mp_unk_1.h rename to include/game/sa1/stage/mp_unk_1.h diff --git a/sa1/include/game/sa1/stage/mystery_itembox.h b/include/game/sa1/stage/mystery_itembox.h similarity index 100% rename from sa1/include/game/sa1/stage/mystery_itembox.h rename to include/game/sa1/stage/mystery_itembox.h diff --git a/sa1/include/game/sa1/stage/nuts_and_bolts_task.h b/include/game/sa1/stage/nuts_and_bolts_task.h similarity index 100% rename from sa1/include/game/sa1/stage/nuts_and_bolts_task.h rename to include/game/sa1/stage/nuts_and_bolts_task.h diff --git a/sa1/include/game/sa1/stage/player_controls.h b/include/game/sa1/stage/player_controls.h similarity index 100% rename from sa1/include/game/sa1/stage/player_controls.h rename to include/game/sa1/stage/player_controls.h diff --git a/sa1/include/game/sa1/stage/player_sonic.h b/include/game/sa1/stage/player_sonic.h similarity index 100% rename from sa1/include/game/sa1/stage/player_sonic.h rename to include/game/sa1/stage/player_sonic.h diff --git a/sa1/include/game/sa1/stage/player_super_sonic.h b/include/game/sa1/stage/player_super_sonic.h similarity index 100% rename from sa1/include/game/sa1/stage/player_super_sonic.h rename to include/game/sa1/stage/player_super_sonic.h diff --git a/sa1/include/game/sa1/stage/player_tails.h b/include/game/sa1/stage/player_tails.h similarity index 100% rename from sa1/include/game/sa1/stage/player_tails.h rename to include/game/sa1/stage/player_tails.h diff --git a/sa1/include/game/sa1/stage/some_task_manager.h b/include/game/sa1/stage/some_task_manager.h similarity index 100% rename from sa1/include/game/sa1/stage/some_task_manager.h rename to include/game/sa1/stage/some_task_manager.h diff --git a/sa1/include/game/sa1/stage/spawn_positions.h b/include/game/sa1/stage/spawn_positions.h similarity index 92% rename from sa1/include/game/sa1/stage/spawn_positions.h rename to include/game/sa1/stage/spawn_positions.h index b18c97aca..50881df86 100644 --- a/sa1/include/game/sa1/stage/spawn_positions.h +++ b/include/game/sa1/stage/spawn_positions.h @@ -2,7 +2,7 @@ #define GUARD_STAGE_DATA_H #include "global.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" extern const s16 gSpawnPositions[NUM_LEVEL_IDS_SP][2]; extern const s16 gSpawnPositions_Modes_4_and_5[NUM_LEVEL_IDS_MP][MULTI_SIO_PLAYERS_MAX][2]; diff --git a/sa1/include/game/sa1/stage/stage_ui.h b/include/game/sa1/stage/stage_ui.h similarity index 100% rename from sa1/include/game/sa1/stage/stage_ui.h rename to include/game/sa1/stage/stage_ui.h diff --git a/sa1/include/game/sa1/stage/tilemap_table.h b/include/game/sa1/stage/tilemap_table.h similarity index 100% rename from sa1/include/game/sa1/stage/tilemap_table.h rename to include/game/sa1/stage/tilemap_table.h diff --git a/sa1/include/game/sa1/stage/trapped_animals.h b/include/game/sa1/stage/trapped_animals.h similarity index 100% rename from sa1/include/game/sa1/stage/trapped_animals.h rename to include/game/sa1/stage/trapped_animals.h diff --git a/sa1/include/game/sa1/stage/ui_rendering.h b/include/game/sa1/stage/ui_rendering.h similarity index 100% rename from sa1/include/game/sa1/stage/ui_rendering.h rename to include/game/sa1/stage/ui_rendering.h diff --git a/sa1/include/game/sa1/ui/character_select.h b/include/game/sa1/ui/character_select.h similarity index 100% rename from sa1/include/game/sa1/ui/character_select.h rename to include/game/sa1/ui/character_select.h diff --git a/sa1/include/game/sa1/ui/collect_chaos_emeralds_msg.h b/include/game/sa1/ui/collect_chaos_emeralds_msg.h similarity index 100% rename from sa1/include/game/sa1/ui/collect_chaos_emeralds_msg.h rename to include/game/sa1/ui/collect_chaos_emeralds_msg.h diff --git a/sa1/include/game/sa1/ui/course_select.h b/include/game/sa1/ui/course_select.h similarity index 100% rename from sa1/include/game/sa1/ui/course_select.h rename to include/game/sa1/ui/course_select.h diff --git a/sa1/include/game/sa1/ui/game_over.h b/include/game/sa1/ui/game_over.h similarity index 100% rename from sa1/include/game/sa1/ui/game_over.h rename to include/game/sa1/ui/game_over.h diff --git a/sa1/include/game/sa1/ui/stage_results.h b/include/game/sa1/ui/stage_results.h similarity index 100% rename from sa1/include/game/sa1/ui/stage_results.h rename to include/game/sa1/ui/stage_results.h diff --git a/sa1/include/game/sa1/ui/time_attack_lobby.h b/include/game/sa1/ui/time_attack_lobby.h similarity index 100% rename from sa1/include/game/sa1/ui/time_attack_lobby.h rename to include/game/sa1/ui/time_attack_lobby.h diff --git a/sa1/include/game/sa1/ui/time_attack_results.h b/include/game/sa1/ui/time_attack_results.h similarity index 100% rename from sa1/include/game/sa1/ui/time_attack_results.h rename to include/game/sa1/ui/time_attack_results.h diff --git a/sa1/include/game/sa1/ui/time_over.h b/include/game/sa1/ui/time_over.h similarity index 100% rename from sa1/include/game/sa1/ui/time_over.h rename to include/game/sa1/ui/time_over.h diff --git a/include/game/sa2/options_screen.h b/include/game/sa2/options_screen.h index 60b4c517e..07556c05f 100644 --- a/include/game/sa2/options_screen.h +++ b/include/game/sa2/options_screen.h @@ -5,7 +5,7 @@ #include "game/sa2/save.h" #include "sprite.h" #include "game/sa2/stage/screen_fade.h" -#include "constants/text.h" +#include "constants/sa2/text.h" #include "game/sa2/stage/player_controls.h" #define RENDER_TARGET_SCREEN 0 diff --git a/include/game/sa2/save.h b/include/game/sa2/save.h index c176ffb25..a7179e5f6 100644 --- a/include/game/sa2/save.h +++ b/include/game/sa2/save.h @@ -6,8 +6,8 @@ #include "game/globals.h" #include "game/sa2/stage/player_controls.h" -#include "constants/zones.h" -#include "constants/characters.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/characters.h" #define PLAYER_NAME_END_CHAR 0xFFFF diff --git a/include/game/sa2/special_stage/data.h b/include/game/sa2/special_stage/data.h index 11b8ed9b8..26f9fa7f9 100644 --- a/include/game/sa2/special_stage/data.h +++ b/include/game/sa2/special_stage/data.h @@ -3,7 +3,7 @@ #include "global.h" #include "sprite.h" // for the 'AnimId' type -#include "constants/zones.h" +#include "constants/sa2/zones.h" #define SPRITE_ARRAY_END \ { \ diff --git a/include/game/sa2/special_stage/tables.h b/include/game/sa2/special_stage/tables.h index d00c01242..80d4ae18c 100644 --- a/include/game/sa2/special_stage/tables.h +++ b/include/game/sa2/special_stage/tables.h @@ -2,7 +2,7 @@ #define GUARD_SPECIAL_STAGE_TABLES_H #include "global.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" extern const s16 gUnknown_080DF9D8[][3]; diff --git a/include/game/sa2/stage/boost_effect.h b/include/game/sa2/stage/boost_effect.h index a20621a3a..8fa2e1530 100644 --- a/include/game/sa2/stage/boost_effect.h +++ b/include/game/sa2/stage/boost_effect.h @@ -3,7 +3,7 @@ #include "global.h" #include "sprite.h" -#include "constants/characters.h" +#include "constants/sa2/characters.h" void sub_801561C(void); void sub_8015750(void); diff --git a/include/game/sa2/stage/player_super_sonic.h b/include/game/sa2/stage/player_super_sonic.h index 73bde2f37..b43035c22 100644 --- a/include/game/sa2/stage/player_super_sonic.h +++ b/include/game/sa2/stage/player_super_sonic.h @@ -1,7 +1,7 @@ #ifndef GUARD_PLAYER_SUPER_SONIC_H #define GUARD_PLAYER_SUPER_SONIC_H -#include "constants/zones.h" +#include "constants/sa2/zones.h" struct SuperSonic; diff --git a/include/game/shared/parameters/characters.h b/include/game/shared/parameters/characters.h index 15d23a633..ece020fd2 100644 --- a/include/game/shared/parameters/characters.h +++ b/include/game/shared/parameters/characters.h @@ -1,7 +1,7 @@ #ifndef GUARD_PARAMETERS_CHARACTERS_H #define GUARD_PARAMETERS_CHARACTERS_H -#include "constants/zones.h" +#include "constants/sa2/zones.h" /* NOTE: Copied from SA2! */ diff --git a/include/game/shared/stage/camera.h b/include/game/shared/stage/camera.h index b5d315a94..d49d26a29 100644 --- a/include/game/shared/stage/camera.h +++ b/include/game/shared/stage/camera.h @@ -27,13 +27,40 @@ typedef void (*BgUpdate)(s32, s32); // NOTE: This was copy-pasted from SA2. // There are type differences for members typedef struct Camera { - /* 0x00|0x04 */ CamCoord x; - /* 0x02|0x04 */ CamCoord y; + /* 0x00|0x04 */ CamCoord x; // TODO: might this be unsigned actually? + /* 0x02|0x04 */ CamCoord y; // TODO: might this be unsigned actually? #if (GAME == GAME_SA1) - u8 filler4[0x2C]; + /* 0x04 */ s16 SA2_LABEL(unk8); + /* 0x06 */ s16 SA2_LABEL(unkC); + /* 0x08 */ CamCoord SA2_LABEL(unk10); + /* 0x0A */ CamCoord SA2_LABEL(unk14); + /* 0x0C */ s16 shiftX; + /* 0x0E */ s16 shiftY; + /* 0x10 */ s16 SA2_LABEL(unk20); + /* 0x12 */ s16 SA2_LABEL(unk24); + + // TODO: Why are X/Y swapped? + // Did they make this a matrix or sth.? + // (Used to calc min/max cam pos in UpdateCamera()) + /* 0x14 */ s16 minY; + /* 0x16 */ s16 maxY; + /* 0x18 */ s16 minX; + /* 0x1A */ s16 maxX; + /* 0x1C */ s16 SA2_LABEL(unk40); + /* 0x1E */ s16 SA2_LABEL(unk44); + /* 0x20 */ s16 SA2_LABEL(unk48); + /* 0x22 */ s16 SA2_LABEL(unk4C); + /* 0x24 */ u16 unk24; + /* 0x26 */ u16 SA2_LABEL(unk50); + /* 0x28 */ u16 SA2_LABEL(unk52); + /* 0x2A */ u16 SA2_LABEL(unk54); + /* 0x2C */ BgUpdate fnBgUpdate; /* 0x30 */ struct Task *movementTask; /* 0x34 */ s16 shakeOffsetX; /* 0x36 */ s16 shakeOffsetY; + /* 0x38 */ s16 SA2_LABEL(unk64); + /* 0x3A */ u8 spectatorTarget; + /* 0x3B */ u8 filler3B[0x2]; #elif (GAME == GAME_SA2) /* 0x08 */ s32 unk8; /* 0x0C */ s32 unkC; diff --git a/include/game/shared/stage/player.h b/include/game/shared/stage/player.h index eafa904b6..6b6f29418 100644 --- a/include/game/shared/stage/player.h +++ b/include/game/shared/stage/player.h @@ -2,10 +2,10 @@ #define GUARD_STAGE_PLAYER_H #include "core.h" -#include "constants/move_states.h" +#include "constants/sa2/move_states.h" // TODO: merge these -#include "constants/characters.h" +#include "constants/sa2/characters.h" #include "game/shared/parameters/characters.h" #define PLAYER_IS_ALIVE (!(gPlayer.moveState & MOVESTATE_DEAD)) @@ -217,6 +217,11 @@ typedef struct Player_ { extern Player gPlayer; +#if (GAME == GAME_SA1) +// "Cheat Code" Tails +extern Player gPartner; +#endif + // In SA2 tricks stop all characters when the buttons are pressed. // Set this to TRUE to behave more like SA3. #define DISABLE_TRICK_AIR_WAIT !TRUE diff --git a/include/game/shared/stage/rings_manager.h b/include/game/shared/stage/rings_manager.h index f0d2ed370..0d482c97f 100644 --- a/include/game/shared/stage/rings_manager.h +++ b/include/game/shared/stage/rings_manager.h @@ -3,7 +3,7 @@ #include "global.h" #include "rect.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" #define MP_COLLECT_RINGS_COMPRESSED_POS_DATA ((u8 **)(EWRAM_START + 0x33008)) #define MP_COLLECT_RINGS_COMPRESSED_SIZE (u8 **)(EWRAM_START + 0x3300C) diff --git a/include/game/shared/stage/rings_scatter.h b/include/game/shared/stage/rings_scatter.h index 79a79f42c..75de60e99 100644 --- a/include/game/shared/stage/rings_scatter.h +++ b/include/game/shared/stage/rings_scatter.h @@ -1,11 +1,45 @@ #ifndef GUARD_SA2_RINGS_SCATTER_H #define GUARD_SA2_RINGS_SCATTER_H -extern struct Task *gRingsScatterTask; +#include "core.h" + +#if (GAME == GAME_SA1) +#define MAX_SCATTERING_RINGS_COUNT_SP 48 +#define MAX_SCATTERING_RINGS_COUNT_MP 32 +#elif (GAME == GAME_SA2) +#define MAX_SCATTERING_RINGS_COUNT_SP 32 +#define MAX_SCATTERING_RINGS_COUNT_MP 16 +#endif + +typedef struct { + /* 0x00 */ s32 x; + /* 0x04 */ s32 y; + /* 0x08 */ s16 velX; + /* 0x0A */ s16 velY; + /* 0x0C */ u16 unkC; + /* 0x0E */ s16 unkE; +#if (GAME == GAME_SA2) + /* 0x10 */ u16 unk10; +#endif +} ScatterRing; /* size: 0x14 */ + +typedef struct { + /* 0x000|0x000 */ Sprite sprRing; + /* 0x030|0x030 */ ScatterRing rings[MAX_SCATTERING_RINGS_COUNT_SP]; + /* 0x330|0x2B0 */ u32 SA2_LABEL(unk2B0); + /* 0x334|0x2B4 */ u16 SA2_LABEL(unk2B4); + /* 0x336|0x2B6 */ u16 SA2_LABEL(unk2B6); +} RingsScatter; /* size: 0x2B8 */ + +extern struct Task *gRingsScatterTask; // -> RingsScatter void InitPlayerHitRingsScatter(void); void DestroyRingsScatterTask(void); void InitScatteringRings(s32 x, s32 y, s32 numRings); +#if (GAME == GAME_SA1) +void InitScatteringRings_ExtraBossCapsule(s32 x, s32 y, s32 numRings); +#endif + #endif // GUARD_SA2_RINGS_SCATTER_H diff --git a/include/game/shared/stage/stage.h b/include/game/shared/stage/stage.h index 8118d18f4..a54255a07 100644 --- a/include/game/shared/stage/stage.h +++ b/include/game/shared/stage/stage.h @@ -3,7 +3,7 @@ #include "global.h" #include "core.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" void ApplyGameStageSettings(void); void GameStageStart(void); diff --git a/include/gba/dma_macros.h b/include/gba/dma_macros.h index cae132972..b6480f27d 100644 --- a/include/gba/dma_macros.h +++ b/include/gba/dma_macros.h @@ -74,8 +74,19 @@ extern void DmaSet(int dmaNum, const void *src, void *dest, u32 control); dmaRegs[5] &= ~DMA_ENABLE; \ dmaRegs[5]; \ } +// Used in SA1, stage.c +#define SlowDmaStop(dmaNum) \ +{ \ + vu16 *dmaRegs = (vu16 *)REG_ADDR_DMA##dmaNum##SAD; \ + dmaRegs[5] &= ~(DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT); \ + dmaRegs[5]; \ + dmaRegs[5] &= ~DMA_ENABLE; \ + dmaRegs[5]; \ + dmaRegs[5]; \ +} #else extern void DmaStop(int dmaNum); +static inline void SlowDmaStop(int dmaNum) { DmaStop(dmaNum); } #endif #define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \ diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index d1ab08dbb..328fd1236 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -594,6 +594,7 @@ extern unsigned char REG_BASE[IO_SIZE]; #define BGCNT_AFF256x256 0x4000 #define BGCNT_AFF512x512 0x8000 #define BGCNT_AFF1024x1024 0xC000 +#define BGCNT_TXTAFF_MASK 0xC000 // WININ/OUT #define WININ_WIN0_BG0 (1 << 0) diff --git a/include/global.h b/include/global.h index 718dfbd2d..21efe8c5b 100644 --- a/include/global.h +++ b/include/global.h @@ -90,6 +90,12 @@ typedef void (*VoidFn)(void); #define INCBIN_S32 INCBIN #endif // IDE support +#if (GAME == GAME_SA1) +#define INCBIN_MAP INCBIN_U8 +#else +#define INCBIN_MAP INCBIN_U16 +#endif + // Use STR() to turn the macro's *content* into a string #define STR_(x) #x #define STR(x) STR_(x) @@ -146,6 +152,7 @@ typedef void (*VoidFn)(void); // Multiplies two Q values #define Q_MUL(qValA, qValB) ((qValA * qValB) >> 8) +#define Q_MUL_NEG(qValA, qValB) (-(qValA * qValB) >> 8) #define Q_SQUARE(qVal) Q_MUL(qVal, qVal) #define Q_DIV(qValA, qValB) Div((qValA << 8), qValB) #define Q_DIV2(qValA, qValB) ((qValA << 8) / qValB) @@ -221,7 +228,8 @@ typedef void (*VoidFn)(void); } \ }) -#define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue)) +#define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue)) +#define ABS2(aValue) ((aValue) < 0 ? -(aValue) : (aValue)) #define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB))) @@ -287,6 +295,11 @@ typedef void (*VoidFn)(void); a = x ^ y; \ }) +#define XOR_SWAP_WORD(a, b) \ + a ^= b; \ + b ^= a; \ + a = (b ^ a); + // TODO: fix casts here #define SWAP_AND_NEGATE(a, b) \ a ^= (u8)b; \ diff --git a/include/lib/agb_flash/flash_internal.h b/include/lib/agb_flash/flash_internal.h index 5573c2d09..f999802c4 100644 --- a/include/lib/agb_flash/flash_internal.h +++ b/include/lib/agb_flash/flash_internal.h @@ -1,6 +1,13 @@ #ifndef GUARD_GBA_FLASH_INTERNAL_H #define GUARD_GBA_FLASH_INTERNAL_H +#if (GAME == GAME_SA1) +// It seems like the launch SDK had a way different +// version of this library than later ones, so we use this +// to make it match. +#define AGBFLASH_USE_V126 1 +#endif + #define FLASH_ROM_SIZE_1M 131072 // 1 megabit ROM #define SECTORS_PER_BANK 16 @@ -48,11 +55,15 @@ extern u16 gFlashNumRemainingBytes; extern u16 (*ProgramFlashSector)(u16, void *); extern u16 (*EraseFlashChip)(void); extern u16 (*EraseFlashSector)(u16); +#ifndef AGBFLASH_USE_V126 extern const u16 *gFlashMaxTime; +#endif extern const struct FlashType *gFlash; +#ifndef AGBFLASH_USE_V126 extern u8 gFlashTimeoutFlag; extern u8 (*PollFlashStatus)(u8 *); +#endif extern u16 (*WaitForFlashWrite)(u8, u8 *, u8); diff --git a/include/lib/m4a/m4a_internal.h b/include/lib/m4a/m4a_internal.h index cf90c7f8e..ef5e40c67 100644 --- a/include/lib/m4a/m4a_internal.h +++ b/include/lib/m4a/m4a_internal.h @@ -99,11 +99,13 @@ #endif #if PLATFORM_GBA -#define NUM_MUSIC_PLAYERS ((u16)gNumMusicPlayers) -#define MAX_LINES ((u32)gMaxLines) +#define NUM_MUSIC_PLAYERS ((u16)gNumMusicPlayers) +#define NUM_MUSIC_PLAYERS_STATIC 4 // @HACK because of how gNumMusicPlayers was defined to match +#define MAX_LINES ((u32)gMaxLines) #else -#define NUM_MUSIC_PLAYERS 4 -#define MAX_LINES 0 +#define NUM_MUSIC_PLAYERS 4 +#define NUM_MUSIC_PLAYERS_STATIC NUM_MUSIC_PLAYERS +#define MAX_LINES 0 #endif typedef s32 fixed8_24; @@ -381,7 +383,7 @@ extern u8 gMPlayMemAccArea[]; extern void *gMPlayJumpTable[]; extern struct MixerSource gCgbChans[]; -extern const struct MusicPlayer gMPlayTable[]; +extern const struct MusicPlayer gMPlayTable[NUM_MUSIC_PLAYERS_STATIC]; extern const struct Song gSongTable[]; extern const XcmdFunc gXcmdTable[]; diff --git a/include/tilemap.h b/include/tilemap.h index 4ac0cc8f0..ea81b5c4d 100644 --- a/include/tilemap.h +++ b/include/tilemap.h @@ -8,10 +8,15 @@ // TODO: This should be the type of Collision::metatiles, if that matches anywhere... typedef struct { +#ifdef M2C + // M2C: Empty structs are not supported. + u16 tile; +#else u16 index : 10; u16 xFlip : 1; u16 yFlip : 1; u16 pal : 4; +#endif } Tile; typedef struct { @@ -22,7 +27,11 @@ typedef struct { /* 0x07 */ u8 animDelay; /* 0x08 */ const u8 *tiles; /* 0x0C */ u32 tilesSize; +#if (GAME == GAME_SA1) + /* 0x10 */ const u16 *palette; +#else /* 0x10 */ const ColorRaw *palette; +#endif /* 0x14 */ u16 palOffset; /* 0x16 */ u16 palLength; @@ -33,9 +42,9 @@ typedef struct { struct MapHeader { /* 0x00 */ Tilemap tileset; - /* 0x1C */ const u16 *metatileMap; + /* 0x1C */ const MetatileIndexType *metatileMap; /* 0x20 */ u16 mapWidth; // in Metatiles /* 0x22 */ u16 mapHeight; // in Metatiles }; -#endif // GUARD_TILEMAP_H +#endif // GUARD_TILEMAP_H \ No newline at end of file diff --git a/multi_boot/roms/collect_rings/Makefile b/multi_boot/roms/collect_rings/Makefile index 9ac70d055..b7b78033e 100644 --- a/multi_boot/roms/collect_rings/Makefile +++ b/multi_boot/roms/collect_rings/Makefile @@ -209,7 +209,7 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) # -P disables line markers (don't EVER use this, if you want proper debug info!) # -I sets an include path # -D defines a symbol -CPPFLAGS ?= -D $(GAME_REGION) -D COLLECT_RINGS_ROM +CPPFLAGS ?= -D $(GAME_REGION) -D COLLECT_RINGS_ROM -D GAME=$(GAME) CC1FLAGS ?= -Wimplicit -Wparentheses -Werror INCLUDE_SCANINC_ARGS += -I ../../../tools/agbcc/include diff --git a/multi_boot/roms/collect_rings/config.mk b/multi_boot/roms/collect_rings/config.mk index cec6fc639..fa49678a7 100644 --- a/multi_boot/roms/collect_rings/config.mk +++ b/multi_boot/roms/collect_rings/config.mk @@ -6,6 +6,7 @@ MIDI_COMMENTS := "arm" PLATFORM ?= gba GAME_REVISION ?= 0 GAME_REGION ?= USA +GAME ?= GAME_SA2 DEBUG ?= 0 COMPARE ?= 1 diff --git a/sa1/Makefile b/sa1/Makefile index 2f3e9d58a..c50677372 100644 --- a/sa1/Makefile +++ b/sa1/Makefile @@ -132,6 +132,7 @@ INCLUDE_SCANINC_ARGS := $(INCLUDE_DIRS:%=-I %) SA2_INCLUDE_DIRS = ../include SA2_INCLUDE_CPP_ARGS := $(SA2_INCLUDE_DIRS:%=-iquote %) +SA2_INCLUDE_SCANINC_ARGS := $(INCLUDE_DIRS:%=-I %) ASM_SUBDIR = asm ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR) @@ -239,7 +240,7 @@ FORMAT_H_PATHS := $(shell find . -name "*.h" ! -path '*/build/*' ! -path '*/ex # -P disables line markers (don't EVER use this, if you want proper debug info!) # -I sets an include path # -D defines a symbol -CPPFLAGS ?= $(INCLUDE_CPP_ARGS) -D $(GAME_REGION) +CPPFLAGS ?= -D $(GAME_REGION) -D GAME=$(GAME) CC1FLAGS ?= -Wimplicit -Wparentheses -Werror ifneq ($(GAME_VARIANT), DEFAULT) @@ -470,13 +471,13 @@ data/sa1/mb_chao_garden_japan.gba.lz: data/sa1/mb_chao_garden_japan.gba $(GFX) $< $@ -search 1 %interactables.bin: %interactables.csv - $(ENT_POS) $< $@ -entities INTERACTABLES -header "./include/constants/interactables.h" + $(ENT_POS) $< $@ -entities INTERACTABLES -header "./include/constants/sa1/interactables.h" %itemboxes.bin: %itemboxes.csv - $(ENT_POS) $< $@ -entities ITEMS -header "./include/constants/items.h" + $(ENT_POS) $< $@ -entities ITEMS -header "./include/constants/sa1/items.h" %enemies.bin: %enemies.csv - $(ENT_POS) $< $@ -entities ENEMIES -header "./include/constants/enemies.h" + $(ENT_POS) $< $@ -entities ENEMIES -header "./include/constants/sa1/enemies.h" %rings.bin: %rings.csv $(ENT_POS) $< $@ -entities RINGS @@ -526,14 +527,14 @@ $(OBJ_DIR)/sa2/%.s: ../%.s $(OBJ_DIR)/sa2/%.o: $(OBJ_DIR)/sa2/%.c @echo "$(CC1) -o $@ $<" @$(shell mkdir -p $(shell dirname '$(OBJ_DIR)/sa2/$*.i')) - @$(CPP) $(CPPFLAGS) $< -o $(OBJ_DIR)/sa2/$*.i + @$(CPP) $(CPPFLAGS) $(SA2_INCLUDE_CPP_ARGS) $< -o $(OBJ_DIR)/sa2/$*.i @$(PREPROC) $(OBJ_DIR)/sa2/$*.i $(PLATFORM) "" | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(OBJ_DIR)/sa2/$*.s - @printf ".text\n\t.align\t2, 0\n" >> $(OBJ_DIR)/sa2/$*.s @$(AS) $(ASFLAGS) $(OBJ_DIR)/sa2/$*.s -o $@ $(OBJ_DIR)/sa2/%.d: $(OBJ_DIR)/sa2/%.c @$(shell mkdir -p $(shell dirname '$(OBJ_DIR)/sa2/$*.d')) - $(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) $< + $(SCANINC) -M $@ $(SA2_INCLUDE_SCANINC_ARGS) $< $(OBJ_DIR)/sa2/%.o: $(OBJ_DIR)/sa2/%.s @echo "$(AS) -o $@ $<" @@ -544,7 +545,7 @@ $(OBJ_DIR)/sa2/%.o: $(OBJ_DIR)/sa2/%.s $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c @echo "$(CC1) -o $@ $<" @$(shell mkdir -p $(shell dirname '$(C_BUILDDIR)/$*.i')) - @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i + @$(CPP) $(CPPFLAGS) $(INCLUDE_CPP_ARGS) $(SA2_INCLUDE_CPP_ARGS) $< -o $(C_BUILDDIR)/$*.i @$(PREPROC) $(C_BUILDDIR)/$*.i $(PLATFORM) "" | $(CC1) $(PROLOGUE_FIX) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s - ifeq ($(PLATFORM), gba) @printf ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s @@ -564,7 +565,7 @@ $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) $(INCLUDE_CPP_ARGS) - | $(AS) $(ASFLAGS) -o $@ - # Scan the ASM data dependencies to determine if any .inc files have changed $(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s @@ -572,12 +573,13 @@ $(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s ifneq ($(NODEP),1) -include $(addprefix $(OBJ_DIR)/,$(C_SRCS:.c=.d)) +-include $(SA2_C_SRCS:.c=.d) -include $(addprefix $(OBJ_DIR)/,$(DATA_ASM_SRCS:.s=.d)) endif $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s @echo "$(AS) -o $@ $<" - @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ - + @$(PREPROC) $< $(PLATFORM) "" | $(CPP) $(CPPFLAGS) $(INCLUDE_CPP_ARGS) - | $(AS) $(ASFLAGS) -o $@ - ### SUB-PROGRAMS ### diff --git a/sa1/config.mk b/sa1/config.mk index e6b270cb6..18edde519 100644 --- a/sa1/config.mk +++ b/sa1/config.mk @@ -54,6 +54,7 @@ endif GAME_REVISION ?= 0 GAME_REGION ?= EUROPE GAME_VARIANT ?= DEFAULT +GAME ?= GAME_SA1 DEBUG ?= 0 # For gbafix diff --git a/sa1/include/anim_sizes.h b/sa1/include/anim_sizes.h deleted file mode 100644 index 0024249ad..000000000 --- a/sa1/include/anim_sizes.h +++ /dev/null @@ -1,1214 +0,0 @@ -#ifndef GUARD_ANIM_SIZES_H -#define GUARD_ANIM_SIZES_H - -// TODO: Auto-generate this file -#define MAX_TILES(_animName) ((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8)) -#define MAX_TILES_VARIANT(_animName, _variant) ((_animName##_VAR##_variant##_WIDTH / 8) * (_animName##_VAR##_variant##_HEIGHT / 8)) -#define ALLOC_TILES(_animName) VramMalloc(((_animName##_WIDTH / 8) * (_animName##_HEIGHT / 8))) -#define ALLOC_TILES_VARIANT(_animName, _variant) \ - VramMalloc(((_animName##_VAR##_variant##_WIDTH / 8) * (_animName##_VAR##_variant##_HEIGHT / 8))) - -#if (GAME == GAME_SA1) -// 005 -#define SA1_ANIM_SONIC_RUN_WIDTH 64 -#define SA1_ANIM_SONIC_RUN_HEIGHT 64 - -// 39/138/... -#define SA1_CHAR_ANIM_MARBLE_TRACK_WIDTH 64 -#define SA1_CHAR_ANIM_MARBLE_TRACK_HEIGHT 64 - -// 50/149/... -#define SA1_CHAR_ANIM_50_WIDTH 32 -#define SA1_CHAR_ANIM_50_HEIGHT 32 - -// 250 -#define SA1_ANIM_KNUCKLES_UPPERCUT_WIDTH 32 -#define SA1_ANIM_KNUCKLES_UPPERCUT_HEIGHT 48 - -// 400 -#define SA1_ANIM_SUPER_SONIC_DASH_WIDTH 64 -#define SA1_ANIM_SUPER_SONIC_DASH_HEIGHT 40 - -// 401 -#define SA1_ANIM_KIKI_WIDTH 32 -#define SA1_ANIM_KIKI_HEIGHT 40 - -// 403 -#define SA1_ANIM_BUZZER_WIDTH 32 -#define SA1_ANIM_BUZZER_HEIGHT 40 - -// 404 -#define SA1_ANIM_GAMIGAMI_WIDTH 48 -#define SA1_ANIM_GAMIGAMI_HEIGHT 40 - -// 405 -#define SA1_ANIM_RHINOTANK_WIDTH 40 -#define SA1_ANIM_RHINOTANK_HEIGHT 32 - -// 406 -#define SA1_ANIM_KEROKERO_WIDTH 40 -#define SA1_ANIM_KEROKERO_HEIGHT 32 - -// 411 -#define SA1_ANIM_SENBON_WIDTH 32 -#define SA1_ANIM_SENBON_HEIGHT 32 - -// 410 -#define SA1_ANIM_GAMIGAMI_PROJ_WIDTH 16 -#define SA1_ANIM_GAMIGAMI_PROJ_HEIGHT 16 - -// 412 -#define SA1_ANIM_TENTOU_WIDTH 24 -#define SA1_ANIM_TENTOU_HEIGHT 16 - -// 413 -#define SA1_ANIM_FIREBALL_WIDTH (32 / 2) -#define SA1_ANIM_FIREBALL_HEIGHT 32 - -// 415 -#define SA1_ANIM_HANABII_WIDTH 32 -#define SA1_ANIM_HANABII_HEIGHT 40 - -// 416 -#define SA1_ANIM_HANABII_FIREWORK_WIDTH 32 -#define SA1_ANIM_HANABII_FIREWORK_HEIGHT 32 - -// 417 -#define SA1_ANIM_SLOT_WIDTH 24 -#define SA1_ANIM_SLOT_HEIGHT 40 - -// 418 -#define SA1_ANIM_PIERROT_WIDTH 48 -#define SA1_ANIM_PIERROT_HEIGHT 48 - -// 419 -#define SA1_ANIM_HANABII_PROJ_WIDTH 16 -#define SA1_ANIM_HANABII_PROJ_HEIGHT 16 - -// 420 -#define SA1_ANIM_SLOT_PROJ_WIDTH 16 -#define SA1_ANIM_SLOT_PROJ_HEIGHT 16 - -// 421 -#define SA1_ANIM_YUKIMARU_PROJ_WIDTH 8 -#define SA1_ANIM_YUKIMARU_PROJ_HEIGHT 8 - -// 422 -#define SA1_ANIM_YUKIMARU_WIDTH (32 / 2) -#define SA1_ANIM_YUKIMARU_HEIGHT 32 - -// 423 -#define SA1_ANIM_YUKIMARU_SIDEWAYS_WIDTH 32 -#define SA1_ANIM_YUKIMARU_SIDEWAYS_HEIGHT (32 / 2) - -// 424 -#define SA1_ANIM_DRISAME_WIDTH 40 -#define SA1_ANIM_DRISAME_HEIGHT 16 - -// 425 -#define SA1_ANIM_KURAA_WIDTH 24 -#define SA1_ANIM_KURAA_HEIGHT 40 - -// 426 -#define SA1_ANIM_PEN_WIDTH 16 -#define SA1_ANIM_PEN_HEIGHT 24 - -// 430 -#define SA1_ANIM_LEON_WIDTH 64 -#define SA1_ANIM_LEON_HEIGHT 24 - -// 431 -#define SA1_ANIM_WAMU_WIDTH 16 -#define SA1_ANIM_WAMU_HEIGHT 16 - -// 432 -#define SA1_ANIM_MIRROR_WIDTH 40 -#define SA1_ANIM_MIRROR_HEIGHT 32 - -// 433 -#define SA1_ANIM_OCT_WIDTH (32 / 2) -#define SA1_ANIM_OCT_HEIGHT 32 - -// 434 -#define SA1_ANIM_MOLE_WIDTH 32 -#define SA1_ANIM_MOLE_HEIGHT 32 - -// 452 -#define SA1_ANIM_CHECKPOINT_WIDTH 24 -#define SA1_ANIM_CHECKPOINT_HEIGHT 48 - -// 453 -#define SA1_ANIM_GOAL_WIDTH 48 -#define SA1_ANIM_GOAL_HEIGHT 48 - -// 454 -#define SA1_ANIM_SPIKES_WIDTH 32 -#define SA1_ANIM_SPIKES_HEIGHT 32 - -// 455 -#define SA1_ANIM_SPRING_WIDTH 32 -#define SA1_ANIM_SPRING_HEIGHT 32 - -// 458 -#define SA1_ANIM_ROCK_WIDTH 48 -#define SA1_ANIM_ROCK_HEIGHT 32 - -// 459 -#define SA1_ANIM_ROCK_DEBRIS_S_WIDTH 8 -#define SA1_ANIM_ROCK_DEBRIS_S_HEIGHT 8 - -// 460 -#define SA1_ANIM_ROCK_DEBRIS_L_WIDTH 16 -#define SA1_ANIM_ROCK_DEBRIS_L_HEIGHT 16 - -// 461 -#define SA1_ANIM_TRAMPOLINE1_WIDTH 48 -#define SA1_ANIM_TRAMPOLINE1_HEIGHT 32 - -// 462 -#define SA1_ANIM_BOUNCE_BLOCK_1_WIDTH 32 -#define SA1_ANIM_BOUNCE_BLOCK_1_HEIGHT 24 - -// 467 -#define SA1_ANIM_SHRUBBERY_WIDTH 32 -#define SA1_ANIM_SHRUBBERY_HEIGHT 32 - -// 468 -#define SA1_ANIM_BOUNCY_BAR_WIDTH 32 -#define SA1_ANIM_BOUNCY_BAR_HEIGHT 24 - -// 469 -#define SA1_ANIM_RED_FLAG_V_WIDTH 24 -#define SA1_ANIM_RED_FLAG_V_HEIGHT 32 - -// 470 -#define SA1_ANIM_RED_FLAG_H_WIDTH 24 -#define SA1_ANIM_RED_FLAG_H_HEIGHT 32 - -// 473 -#define SA1_ANIM_WATER_BRIDGE_SPLASH_WIDTH 56 -#define SA1_ANIM_WATER_BRIDGE_SPLASH_HEIGHT 56 - -// 474 -#define SA1_ANIM_WATER_SLIDE_SPLASH_WIDTH 48 -#define SA1_ANIM_WATER_SLIDE_SPLASH_HEIGHT 24 - -// 479 -#define SA1_ANIM_BALLOON_BLUE_WIDTH 24 -#define SA1_ANIM_BALLOON_BLUE_HEIGHT 48 - -// 478 -#define SA1_ANIM_FLIPPER_WIDTH 48 -#define SA1_ANIM_FLIPPER_HEIGHT 32 -#define SA1_ANIM_FLIPPER_VAR0_WIDTH 48 -#define SA1_ANIM_FLIPPER_VAR0_HEIGHT 24 -#define SA1_ANIM_FLIPPER_VAR1_WIDTH 48 -#define SA1_ANIM_FLIPPER_VAR1_HEIGHT 32 -#define SA1_ANIM_FLIPPER_VAR2_WIDTH 24 -#define SA1_ANIM_FLIPPER_VAR2_HEIGHT 48 -#define SA1_ANIM_FLIPPER_VAR3_WIDTH 40 -#define SA1_ANIM_FLIPPER_VAR3_HEIGHT 48 - -// 482 -#define SA1_ANIM_FIREWORKS_WIDTH 24 -#define SA1_ANIM_FIREWORKS_HEIGHT 24 - -// 484 -#define SA1_ANIM_BUMPER_BIG_WIDTH 48 -#define SA1_ANIM_BUMPER_BIG_HEIGHT 40 - -// 489 -#define SA1_ANIM_SHIP_SWING_SEGMENT_WIDTH 8 -#define SA1_ANIM_SHIP_SWING_SEGMENT_HEIGHT 8 - -// 490 -#define SA1_ANIM_SHIP_SWING_HOOK_WIDTH 24 -#define SA1_ANIM_SHIP_SWING_HOOK_HEIGHT 24 - -// 491 -#define SA1_ANIM_SHIP_SWING_WIDTH (96 / 2) -#define SA1_ANIM_SHIP_SWING_HEIGHT 40 - -// 492 -#define SA1_ANIM_SEGA_SONIC_LETTERS_WIDTH 32 -#define SA1_ANIM_SEGA_SONIC_LETTERS_HEIGHT 32 - -// 483 -#define SA1_ANIM_FIREWORKS_SMALL_WIDTH 16 -#define SA1_ANIM_FIREWORKS_SMALL_HEIGHT 16 - -// 495 -#define SA1_ANIM_PLATFORM_HORZ_3_WIDTH 48 -#define SA1_ANIM_PLATFORM_HORZ_3_HEIGHT 24 - -// 496 -#define SA1_ANIM_PANEL_GATE_SIDEWAYS_WIDTH 16 -#define SA1_ANIM_PANEL_GATE_SIDEWAYS_HEIGHT 32 - -// 497 -#define SA1_ANIM_PANEL_GATE_UPDOWN_WIDTH 32 -#define SA1_ANIM_PANEL_GATE_UPDOWN_HEIGHT 16 - -// 498 -#define SA1_ANIM_CRANE_CLAW_2_WIDTH 48 -#define SA1_ANIM_CRANE_CLAW_2_HEIGHT 40 -#define SA1_ANIM_CRANE_CLAW_2_VAR3_WIDTH 8 -#define SA1_ANIM_CRANE_CLAW_2_VAR3_HEIGHT 24 - -// 501 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR0_WIDTH 32 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR0_HEIGHT 32 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR1_WIDTH 32 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR1_HEIGHT 32 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR2_WIDTH 32 -#define SA1_ANIM_STEAM_EXHAUST_LID_VAR2_HEIGHT 16 - -// 503 -#define SA1_ANIM_ANCHOR_HANDLES_WIDTH 8 -#define SA1_ANIM_ANCHOR_HANDLES_HEIGHT 8 - -// 504 -#define SA1_ANIM_HOOK_RAIL_2_WIDTH 32 -#define SA1_ANIM_HOOK_RAIL_2_HEIGHT 32 -#define SA1_ANIM_HOOK_RAIL_2_VAR0_WIDTH 16 -#define SA1_ANIM_HOOK_RAIL_2_VAR0_HEIGHT 24 -#define SA1_ANIM_HOOK_RAIL_2_VAR1_WIDTH 32 -#define SA1_ANIM_HOOK_RAIL_2_VAR1_HEIGHT 32 - -// 505 -#define SA1_ANIM_TRAMPOLINE2_WIDTH 48 -#define SA1_ANIM_TRAMPOLINE2_HEIGHT 40 - -// 508 -#define SA1_ANIM_CONVEYOR_BELT_2_WIDE_WIDTH 96 -#define SA1_ANIM_CONVEYOR_BELT_2_WIDE_HEIGHT 24 - -// 509 -#define SA1_ANIM_CONVEYOR_BELT_2_SLIM_WIDTH 72 -#define SA1_ANIM_CONVEYOR_BELT_2_SLIM_HEIGHT 24 - -// 510 -#define SA1_ANIM_IRON_BALL_WIDTH 48 -#define SA1_ANIM_IRON_BALL_HEIGHT 48 - -// 511 -#define SA1_ANIM_TORCH6_1_WIDTH 16 -#define SA1_ANIM_TORCH6_1_HEIGHT 16 - -// 512 -#define SA1_ANIM_TORCH6_2_WIDTH 32 -#define SA1_ANIM_TORCH6_2_HEIGHT 16 - -// 515 -#define SA1_ANIM_PROPELLER_WIDTH 144 -#define SA1_ANIM_PROPELLER_HEIGHT 24 - -// 516 -#define SA1_ANIM_SPIKED_BARREL_WIDTH 48 -#define SA1_ANIM_SPIKED_BARREL_HEIGHT 40 - -// 529 -#define SA1_ANIM_SKATING_STONE_4_WIDTH 48 -#define SA1_ANIM_SKATING_STONE_4_HEIGHT 32 - -// 534 -#define SA1_ANIM_SECURITY_GATE_WIDTH 16 -#define SA1_ANIM_SECURITY_GATE_HEIGHT 48 - -// 541 -#define SA1_ANIM_IRON_BALL_5_WIDTH 48 -#define SA1_ANIM_IRON_BALL_5_HEIGHT 48 - -// 542 -#define SA1_ANIM_RUN_WHEEL_HEIGHT 32 -#define SA1_ANIM_RUN_WHEEL_WIDTH 32 - -// 545 -#define SA1_ANIM_LIFT_VAR0_WIDTH 8 -#define SA1_ANIM_LIFT_VAR0_HEIGHT 32 -#define SA1_ANIM_LIFT_VAR1_WIDTH 24 -#define SA1_ANIM_LIFT_VAR1_HEIGHT 24 - -// 547 -#define SA1_ANIM_SKATING_STONE_WIDTH 48 -#define SA1_ANIM_SKATING_STONE_HEIGHT 32 - -// 548 -#define SA1_ANIM_SKATING_STONE_DEBRIS_L_WIDTH 32 -#define SA1_ANIM_SKATING_STONE_DEBRIS_L_HEIGHT 32 - -// 549 -#define SA1_ANIM_SKATING_STONE_DEBRIS_S_WIDTH 8 -#define SA1_ANIM_SKATING_STONE_DEBRIS_S_HEIGHT 8 - -// 558 -#define SA1_ANIM_TORCH5_WIDTH 24 -#define SA1_ANIM_TORCH5_HEIGHT 40 - -// 558 -#define SA1_ANIM_BREAKABLE_WALL_1_WIDTH 32 -#define SA1_ANIM_BREAKABLE_WALL_1_HEIGHT 64 - -// 564 -#define SA1_ANIM_DEBRIS_A_WIDTH 8 -#define SA1_ANIM_DEBRIS_A_HEIGHT 8 - -// 564 -#define SA1_ANIM_DEBRIS_B_WIDTH 8 -#define SA1_ANIM_DEBRIS_B_HEIGHT 16 - -// 566 -#define SA1_ANIM_DEBRIS_C_WIDTH 8 -#define SA1_ANIM_DEBRIS_C_HEIGHT 8 - -// 567 -#define SA1_ANIM_STEAM_EXHAUST_WIDTH 32 -#define SA1_ANIM_STEAM_EXHAUST_HEIGHT 48 - -// 569 -#define SA1_ANIM_HOOK_RAIL_3_WIDTH 16 -#define SA1_ANIM_HOOK_RAIL_3_HEIGHT 24 - -// 572 -#define SA1_ANIM_SPECIAL_SPRING_WIDTH 32 -#define SA1_ANIM_SPECIAL_SPRING_HEIGHT 48 - -// 573 -#define SA1_ANIM_DRISAME_ICEBLOCK_WIDTH 56 -#define SA1_ANIM_DRISAME_ICEBLOCK_HEIGHT 32 - -// 574 -#define SA1_ANIM_FALLING_BRICK_XZONE_WIDTH 16 -#define SA1_ANIM_FALLING_BRICK_XZONE_HEIGHT 24 - -// 579 -#define SA1_ANIM_DRISAME_ICEBLOCK_DEBRIS_LARGE_WIDTH 16 -#define SA1_ANIM_DRISAME_ICEBLOCK_DEBRIS_LARGE_HEIGHT 16 - -// 579 -#define SA1_ANIM_DRISAME_ICEBLOCK_DEBRIS_SMALL_WIDTH 8 -#define SA1_ANIM_DRISAME_ICEBLOCK_DEBRIS_SMALL_HEIGHT 8 - -// 584 -#define SA1_ANIM_PIPE_ENTER_6_1_V_WIDTH 56 -#define SA1_ANIM_PIPE_ENTER_6_1_V_HEIGHT 80 - -// 585 -#define SA1_ANIM_PIPE_EXIT_6_1_V_WIDTH 56 -#define SA1_ANIM_PIPE_EXIT_6_1_V_HEIGHT 80 - -// 586 -#define SA1_ANIM_PIPE_ENTER_6_1_H_WIDTH 80 -#define SA1_ANIM_PIPE_ENTER_6_1_H_HEIGHT 56 - -// 587 -#define SA1_ANIM_PIPE_EXIT_6_1_H_WIDTH 56 -#define SA1_ANIM_PIPE_EXIT_6_1_H_HEIGHT 80 - -// 588 -#define SA1_ANIM_PIPE_GATE_2_H_WIDTH 80 -#define SA1_ANIM_PIPE_GATE_2_H_HEIGHT 56 - -// 589 -#define SA1_ANIM_PIPE_GATE_2_V_WIDTH 56 -#define SA1_ANIM_PIPE_GATE_2_V_HEIGHT 80 - -// 590 -#define SA1_ANIM_PIPE_ENTER_6_2_H_WIDTH 104 -#define SA1_ANIM_PIPE_ENTER_6_2_H_HEIGHT 56 - -// 591 -#define SA1_ANIM_PIPE_ENTER_6_2_V_WIDTH 56 -#define SA1_ANIM_PIPE_ENTER_6_2_V_HEIGHT 88 - -// 592 -#define SA1_ANIM_AIR_MAZE_CORNER_WIDTH 32 -#define SA1_ANIM_AIR_MAZE_CORNER_HEIGHT 32 - -// 603 -#define SA1_ANIM_CONVEYOR_BELT_6_SLIM_WIDTH 72 -#define SA1_ANIM_CONVEYOR_BELT_6_SLIM_HEIGHT 24 - -// 604 -#define SA1_ANIM_CONVEYOR_BELT_6_WIDE_WIDTH 96 -#define SA1_ANIM_CONVEYOR_BELT_6_WIDE_HEIGHT 24 - -// 670 -#define SA1_ANIM_EXTRA_BOSS_CAPSULE_WIDTH 32 -#define SA1_ANIM_EXTRA_BOSS_CAPSULE_HEIGHT 16 - -// 671 -#define SA1_ANIM_EXTRA_BOSS_CAPSULE_PART_WIDTH 16 -#define SA1_ANIM_EXTRA_BOSS_CAPSULE_PART_HEIGHT 16 - -// 672 -#define SA1_ANIM_EXTRA_BOSS_LASER_WIDTH 16 -#define SA1_ANIM_EXTRA_BOSS_LASER_HEIGHT 96 - -// 705 -#define SA1_ANIM_ITEMBOX_WIDTH 32 -#define SA1_ANIM_ITEMBOX_HEIGHT 32 - -// 706 -#define SA1_ANIM_ITEMBOX_TYPE_WIDTH 16 -#define SA1_ANIM_ITEMBOX_TYPE_HEIGHT 16 - -// 709 -#define SA1_ANIM_SCORE_WIDTH 16 -#define SA1_ANIM_SCORE_HEIGHT 8 - -// 715 -#define SA1_ANIM_GAME_OVER_WIDTH 64 -#define SA1_ANIM_GAME_OVER_HEIGHT 64 -#define SA1_ANIM_GAME_OVER_VAR0_WIDTH 64 // GAME -#define SA1_ANIM_GAME_OVER_VAR0_HEIGHT 64 - -#define SA1_ANIM_GAME_OVER_VAR1_WIDTH 64 // OVER -#define SA1_ANIM_GAME_OVER_VAR1_HEIGHT 64 -#define SA1_ANIM_GAME_OVER_VAR2_WIDTH 64 // CONTI -#define SA1_ANIM_GAME_OVER_VAR2_HEIGHT 64 -#define SA1_ANIM_GAME_OVER_VAR3_WIDTH 64 // NUE? -#define SA1_ANIM_GAME_OVER_VAR3_HEIGHT 64 -#define SA1_ANIM_GAME_OVER_VAR4_WIDTH 64 // TIME -#define SA1_ANIM_GAME_OVER_VAR4_HEIGHT 64 - -// 718 -#define SA1_ANIM_PAUSE_WIDTH 80 -#define SA1_ANIM_PAUSE_HEIGHT 16 - -// 719 -#define SA1_ANIM_WARNING_WIDTH 32 -#define SA1_ANIM_WARNING_HEIGHT 32 -#define SA1_ANIM_WARNING_VAR0_WIDTH 32 -#define SA1_ANIM_WARNING_VAR0_HEIGHT 32 -#define SA1_ANIM_WARNING_VAR1_WIDTH 32 -#define SA1_ANIM_WARNING_VAR1_HEIGHT 32 -#define SA1_ANIM_WARNING_VAR2_WIDTH 32 -#define SA1_ANIM_WARNING_VAR2_HEIGHT 32 - -// 720 -#define SA1_ANIM_PAUSE_BACKGROUND_WIDTH 96 -#define SA1_ANIM_PAUSE_BACKGROUND_HEIGHT 32 - -// 721 -#define SA1_ANIM_DEMO_PLAY_WIDTH 24 -#define SA1_ANIM_DEMO_PLAY_HEIGHT 8 - -// 749 -#define SA1_ANIM_GRIND_EFFECT_WIDTH 32 -#define SA1_ANIM_GRIND_EFFECT_HEIGHT 32 - -// 750 -#define SA1_ANIM_SHIELD_NORMAL_WIDTH 48 -#define SA1_ANIM_SHIELD_NORMAL_HEIGHT 48 - -// 751 -#define SA1_ANIM_SHIELD_MAGNETIC_WIDTH 48 -#define SA1_ANIM_SHIELD_MAGNETIC_HEIGHT 48 - -// 752 -#define SA1_ANIM_INVINCIBILITY_WIDTH 48 -#define SA1_ANIM_INVINCIBILITY_HEIGHT 48 -#define SA1_ANIM_INVINCIBILITY_VAR0_WIDTH 48 -#define SA1_ANIM_INVINCIBILITY_VAR0_HEIGHT 48 -#define SA1_ANIM_INVINCIBILITY_VAR1_WIDTH 24 -#define SA1_ANIM_INVINCIBILITY_VAR1_HEIGHT 24 - -// 775 -#define SA1_ANIM_SUPER_SONIC_SPARKLE_WIDTH 16 -#define SA1_ANIM_SUPER_SONIC_SPARKLE_HEIGHT 16 - -// 778 -#define SA1_ANIM_TAILS_TAIL_SWIPE_WIDTH 40 -#define SA1_ANIM_TAILS_TAIL_SWIPE_HEIGHT 24 - -// 778 -#define SA1_ANIM_PRESS_START_MSG_JP_WIDTH 184 -#define SA1_ANIM_PRESS_START_MSG_JP_HEIGHT 16 - -// 779 -#define SA1_ANIM_PRESS_START_MSG_EN_WIDTH 32 -#define SA1_ANIM_PRESS_START_MSG_EN_HEIGHT 32 - -// 781 -#define SA1_ANIM_DROWN_COUNTDOWN_WIDTH 16 -#define SA1_ANIM_DROWN_COUNTDOWN_HEIGHT 16 - -// 782 -#define SA1_ANIM_KNUCKLES_FLOAT_SPLASH_WIDTH 32 -#define SA1_ANIM_KNUCKLES_FLOAT_SPLASH_HEIGHT 16 - -// 794 -#define SA1_ANIM_CONFUSION_WIDTH 32 -#define SA1_ANIM_CONFUSION_HEIGHT 16 - -// 809 -#define SA1_ANIM_PAUSE_BACKGROUND_TA_WIDTH 128 -#define SA1_ANIM_PAUSE_BACKGROUND_TA_HEIGHT 48 - -// 810 -#define SA1_ANIM_PAUSE_TA_WIDTH 128 -#define SA1_ANIM_PAUSE_TA_HEIGHT 32 -#define SA1_ANIM_PAUSE_TA_VAR0_WIDTH 80 -#define SA1_ANIM_PAUSE_TA_VAR0_HEIGHT 32 -#define SA1_ANIM_PAUSE_TA_VAR1_WIDTH 128 -#define SA1_ANIM_PAUSE_TA_VAR1_HEIGHT 32 - -// 906 -#define SA1_ANIM_CRUMBLE_PLATFORM_WIDTH 64 -#define SA1_ANIM_CRUMBLE_PLATFORM_HEIGHT 32 - -#elif (GAME == GAME_SA2) -#elif (GAME == GAME_SA3) -// 858 -#define ANIM_CHAOMAP_EMERALD_WIDTH 24 -#define ANIM_CHAOMAP_EMERALD_HEIGHT 16 - -// 840 -#define ANIM_ANIMAL_WIDTH 16 -#define ANIM_ANIMAL_HEIGHT 16 - -// 866 -#define ANIM_SPRING_WIDTH 32 -#define ANIM_SPRING_HEIGHT 40 - -// 866 -#define ANIM_DASH_RING_WIDTH 48 -#define ANIM_DASH_RING_HEIGHT 48 -#define ANIM_DASH_RING_VAR0_WIDTH 16 -#define ANIM_DASH_RING_VAR0_HEIGHT 48 -#define ANIM_DASH_RING_VAR1_WIDTH 8 -#define ANIM_DASH_RING_VAR1_HEIGHT 48 -#define ANIM_DASH_RING_VAR2_WIDTH 48 -#define ANIM_DASH_RING_VAR2_HEIGHT 16 -#define ANIM_DASH_RING_VAR3_WIDTH 48 -#define ANIM_DASH_RING_VAR3_HEIGHT 8 -#define ANIM_DASH_RING_VAR4_WIDTH 48 -#define ANIM_DASH_RING_VAR4_HEIGHT 48 -#define ANIM_DASH_RING_VAR5_WIDTH 40 -#define ANIM_DASH_RING_VAR5_HEIGHT 40 - -// 869 -#define ANIM_SPIKES_WIDTH 32 -#define ANIM_SPIKES_HEIGHT 32 - -// 870 -#define ANIM_RAMP_WIDTH 40 -#define ANIM_RAMP_HEIGHT 32 -#define ANIM_RAMP_VAR0_WIDTH 40 -#define ANIM_RAMP_VAR0_HEIGHT 32 -#define ANIM_RAMP_VAR1_WIDTH 40 -#define ANIM_RAMP_VAR1_HEIGHT 24 - -// 872 -#define ANIM_ZONE_WARP_WIDTH 48 -#define ANIM_ZONE_WARP_HEIGHT 32 - -// 873 -#define ANIM_BOUNCY_BAR_WIDTH 32 -#define ANIM_BOUNCY_BAR_HEIGHT 24 - -// 874 -#define ANIM_ROTATING_HANDLE_WIDTH 24 -#define ANIM_ROTATING_HANDLE_HEIGHT 24 - -// 875 -#define ANIM_CHECKPOINT_WIDTH 24 -#define ANIM_CHECKPOINT_HEIGHT 48 -#define ANIM_CHECKPOINT_VAR0_WIDTH 16 -#define ANIM_CHECKPOINT_VAR0_HEIGHT 48 -#define ANIM_CHECKPOINT_VAR1_WIDTH 24 -#define ANIM_CHECKPOINT_VAR1_HEIGHT 48 - -// 876 -#define ANIM_LIFT_WIDTH 8 -#define ANIM_LIFT_HEIGHT 24 -#define ANIM_LIFT_VAR0_WIDTH 8 -#define ANIM_LIFT_VAR0_HEIGHT 24 -#define ANIM_LIFT_VAR1_WIDTH 8 -#define ANIM_LIFT_VAR1_HEIGHT 8 -#define ANIM_LIFT_VAR2_WIDTH 24 -#define ANIM_LIFT_VAR2_HEIGHT 16 - -// 877 -#define ANIM_PLATFORM_CRUMBLING_1_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_1_HEIGHT 32 - -// 878 -#define ANIM_TRAMPOLINE_WIDTH 48 -#define ANIM_TRAMPOLINE_HEIGHT 32 - -// 878 -#define ANIM_BUTTON_BLUE_WIDTH 24 -#define ANIM_BUTTON_BLUE_HEIGHT 24 - -// 880 -#define ANIM_BUTTON_SPRING_1_VAR0_WIDTH 32 -#define ANIM_BUTTON_SPRING_1_VAR0_HEIGHT 40 -#define ANIM_BUTTON_SPRING_1_VAR5_WIDTH 40 -#define ANIM_BUTTON_SPRING_1_VAR5_HEIGHT 24 -#define ANIM_BUTTON_SPRING_1_VAR10_WIDTH 32 -#define ANIM_BUTTON_SPRING_1_VAR10_HEIGHT 32 -#define ANIM_BUTTON_SPRING_1_VAR15_WIDTH 24 -#define ANIM_BUTTON_SPRING_1_VAR15_HEIGHT 24 - -// 882 -#define ANIM_DECO_ROCK_WIDTH 48 -#define ANIM_DECO_ROCK_HEIGHT 32 - -// 883 -#define ANIM_FLAT_SPRING_WIDTH 32 -#define ANIM_FLAT_SPRING_HEIGHT 32 - -// 884 -#define ANIM_PLATFORM_RAISING_WHEEL_WIDTH 32 -#define ANIM_PLATFORM_RAISING_WHEEL_HEIGHT 24 -#define ANIM_PLATFORM_RAISING_WHEEL_PLATFORM_WIDTH 24 -#define ANIM_PLATFORM_RAISING_WHEEL_PLATFORM_HEIGHT 24 - -// 886 -#define ANIM_ACCORDION_SPRING_2_WIDTH 32 -#define ANIM_ACCORDION_SPRING_2_HEIGHT 24 - -// 889 -#define ANIM_PLATFORM_2_WIDTH 48 -#define ANIM_PLATFORM_2_HEIGHT 24 - -// 886 -#define ANIM_PLATFORM_CRUMBLING_2_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_2_HEIGHT 24 - -// 898 -#define ANIM_PLATFORM_ON_A_PATH_3_WIDTH 56 -#define ANIM_PLATFORM_ON_A_PATH_3_HEIGHT 24 - -// 891 -#define ANIM_BUNGEE_CORD_WIDTH 8 -#define ANIM_BUNGEE_CORD_HEIGHT 8 -#define ANIM_BUNGEE_CORD_VAR0_WIDTH 8 -#define ANIM_BUNGEE_CORD_VAR0_HEIGHT 8 - -// 892 -#define ANIM_SUNSET_BRIDGE_WIDTH 24 -#define ANIM_SUNSET_BRIDGE_HEIGHT 32 - -// 893 -#define ANIM_PLATFORM_2_2_WIDTH 48 -#define ANIM_PLATFORM_2_2_HEIGHT 16 -#define ANIM_PLATFORM_2_2_VAR0_WIDTH 48 -#define ANIM_PLATFORM_2_2_VAR0_HEIGHT 16 - -// 894 -#define ANIM_WAGGLE_COIL_WIDTH 48 -#define ANIM_WAGGLE_COIL_HEIGHT 56 - -// 900 -#define ANIM_PLATFORM_3_0_WIDTH (48 / 2) -#define ANIM_PLATFORM_3_0_HEIGHT 24 - -// 901 -#define ANIM_SUCTION_3_VERTICAL_WIDTH 24 -#define ANIM_SUCTION_3_VERTICAL_HEIGHT 56 - -// 902 -#define ANIM_SUCTION_3_HORIZONTAL_WIDTH 56 -#define ANIM_SUCTION_3_HORIZONTAL_HEIGHT 24 - -// 903 -#define ANIM_DEATH_CRUSHER_SPIKED_WIDTH 24 -#define ANIM_DEATH_CRUSHER_SPIKED_HEIGHT 80 - -// 904 -#define ANIM_DEATH_CRUSHER_NO_LED_WIDTH 24 -#define ANIM_DEATH_CRUSHER_NO_LED_HEIGHT 48 - -// 905 -#define ANIM_DEATH_CRUSHER_WIDTH 24 -#define ANIM_DEATH_CRUSHER_HEIGHT 48 - -// 907 -#define ANIM_PLATFORM_CRUMBLING_3_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_3_HEIGHT 48 - -// 908 - x-mirrored -#define ANIM_PROPELLER_BUTTON_PLATFORM_WIDTH (64 / 2) -#define ANIM_PROPELLER_BUTTON_PLATFORM_HEIGHT 48 - -// 910 -#define ANIM_WATER_CANNON_WIDTH 32 -#define ANIM_WATER_CANNON_HEIGHT 48 - -// 911 -#define ANIM_FACTORY_RING_WIDTH 48 -#define ANIM_FACTORY_RING_HEIGHT 48 - -// 912 -#define ANIM_SPECIAL_SPRING_WIDTH 32 -#define ANIM_SPECIAL_SPRING_HEIGHT 48 - -// 913 -#define ANIM_BONUS_UFO_WIDTH 24 -#define ANIM_BONUS_UFO_HEIGHT 48 - -// 914 -#define ANIM_BONUS_UFO_RAY_WIDTH 24 -#define ANIM_BONUS_UFO_RAY_HEIGHT 56 - -// 915 -#define ANIM_ROCKET_WIDTH 48 -#define ANIM_ROCKET_HEIGHT 48 -#define ANIM_ROCKET_VAR0_WIDTH 16 -#define ANIM_ROCKET_VAR0_HEIGHT 8 -#define ANIM_ROCKET_VAR1_WIDTH 16 -#define ANIM_ROCKET_VAR1_HEIGHT 8 -#define ANIM_ROCKET_VAR2_WIDTH 8 -#define ANIM_ROCKET_VAR2_HEIGHT 8 -#define ANIM_ROCKET_VAR3_WIDTH 8 -#define ANIM_ROCKET_VAR3_HEIGHT 8 -#define ANIM_ROCKET_VAR4_WIDTH 8 -#define ANIM_ROCKET_VAR4_HEIGHT 8 -#define ANIM_ROCKET_VAR5_WIDTH 8 -#define ANIM_ROCKET_VAR5_HEIGHT 8 -#define ANIM_ROCKET_VAR6_WIDTH 8 -#define ANIM_ROCKET_VAR6_HEIGHT 8 - -// 916 -#define ANIM_FERRIS_WHEEL_HEIGHT 8 -#define ANIM_FERRIS_WHEEL_WIDTH 8 -#define ANIM_FERRIS_WHEEL_VAR0_HEIGHT 8 -#define ANIM_FERRIS_WHEEL_VAR0_WIDTH 8 -#define ANIM_FERRIS_WHEEL_VAR1_HEIGHT 8 -#define ANIM_FERRIS_WHEEL_VAR1_WIDTH 8 - -// 917 -#define ANIM_TOY_BALLOON_WIDTH 32 -#define ANIM_TOY_BALLOON_HEIGHT 48 - -// 918 (x-mirrored) -#define ANIM_SPRING_IN_A_BOX_WIDTH (64 / 2) -#define ANIM_SPRING_IN_A_BOX_HEIGHT 64 - -// 919 -#define ANIM_PANDA_CART_WIDTH 48 -#define ANIM_PANDA_CART_HEIGHT 40 - -// 920 -#define ANIM_PENDULUM_WIDTH 40 -#define ANIM_PENDULUM_HEIGHT 40 -#define ANIM_PENDULUM_VAR0_WIDTH 40 -#define ANIM_PENDULUM_VAR0_HEIGHT 40 -#define ANIM_PENDULUM_VAR1_WIDTH 8 -#define ANIM_PENDULUM_VAR1_HEIGHT 8 - -// 921 (x-mirrored) -#define ANIM_PLATFORM_SPIKED_WIDTH 32 -#define ANIM_PLATFORM_SPIKED_HEIGHT 48 - -// 922 -#define ANIM_ICE_SPIKE_WIDTH 32 -#define ANIM_ICE_SPIKE_HEIGHT 32 - -// 923 -#define ANIM_ICE_LAUNCHER_WIDTH 48 -#define ANIM_ICE_LAUNCHER_HEIGHT 64 - -// 924 -#define ANIM_WINDUP_BLOCK_WIDTH 24 -#define ANIM_WINDUP_BLOCK_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_VAR0_WIDTH 24 -#define ANIM_WINDUP_BLOCK_VAR0_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_VAR1_WIDTH 24 -#define ANIM_WINDUP_BLOCK_VAR1_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_VAR2_WIDTH 24 -#define ANIM_WINDUP_BLOCK_VAR2_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_VAR3_WIDTH 24 -#define ANIM_WINDUP_BLOCK_VAR3_HEIGHT 24 - -// 925 -#define ANIM_MINECART_WIDTH 64 -#define ANIM_MINECART_HEIGHT 64 -#define ANIM_MINECART_VAR0_WIDTH 64 -#define ANIM_MINECART_VAR0_HEIGHT 64 -#define ANIM_MINECART_VAR1_WIDTH 64 -#define ANIM_MINECART_VAR1_HEIGHT 64 -#define ANIM_MINECART_VAR2_WIDTH 16 -#define ANIM_MINECART_VAR2_HEIGHT 16 -#define ANIM_MINECART_VAR3_WIDTH 8 -#define ANIM_MINECART_VAR3_HEIGHT 8 -#define ANIM_MINECART_VAR4_WIDTH 8 -#define ANIM_MINECART_VAR4_HEIGHT 8 - -// 926 -#define ANIM_AIR_BUBBLES_WIDTH 24 -#define ANIM_AIR_BUBBLES_HEIGHT 24 -#define ANIM_AIR_BUBBLES_VAR0_WIDTH 24 -#define ANIM_AIR_BUBBLES_VAR0_HEIGHT 24 -#define ANIM_AIR_BUBBLES_VAR1_WIDTH 8 -#define ANIM_AIR_BUBBLES_VAR1_HEIGHT 8 -#define ANIM_AIR_BUBBLES_VAR2_WIDTH 24 -#define ANIM_AIR_BUBBLES_VAR2_HEIGHT 24 - -// 927 -#define ANIM_ATTACHED_PLATFORM_WIDTH 48 -#define ANIM_ATTACHED_PLATFORM_HEIGHT 16 -#define ANIM_ATTACHED_PLATFORM_VAR0_WIDTH 48 -#define ANIM_ATTACHED_PLATFORM_VAR0_HEIGHT 16 -#define ANIM_ATTACHED_PLATFORM_VAR1_WIDTH 16 -#define ANIM_ATTACHED_PLATFORM_VAR1_HEIGHT 16 -#define ANIM_ATTACHED_PLATFORM_VAR2_WIDTH 8 -#define ANIM_ATTACHED_PLATFORM_VAR2_HEIGHT 8 - -// 929 -#define ANIM_BOULDER_WIDTH 40 -#define ANIM_BOULDER_HEIGHT 40 -#define ANIM_BOULDER_VAR0_WIDTH 40 -#define ANIM_BOULDER_VAR0_HEIGHT 40 -#define ANIM_BOULDER_VAR1_WIDTH 16 -#define ANIM_BOULDER_VAR1_HEIGHT 16 -#define ANIM_BOULDER_VAR2_WIDTH 8 -#define ANIM_BOULDER_VAR2_HEIGHT 8 - -// 931 -#define ANIM_UFO_PLATFORM_WIDTH 48 -#define ANIM_UFO_PLATFORM_HEIGHT 24 - -// 930 -#define ANIM_CLOSING_WALL_WIDTH 72 -#define ANIM_CLOSING_WALL_HEIGHT 24 - -// 933 -#define ANIM_FALL_PLATFORM_CA_WIDTH 48 -#define ANIM_FALL_PLATFORM_CA_HEIGHT 16 - -// 934 -#define ANIM_WATER_CANNON_SPLASH_WIDTH 48 -#define ANIM_WATER_CANNON_SPLASH_HEIGHT 40 - -// 935 -#define ANIM_PLATFORM_CRUMBLING_7_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_7_HEIGHT 40 - -// 936 -#define ANIM_SPRING_6_WIDTH 24 -#define ANIM_SPRING_6_HEIGHT 40 - -// 938 -#define ANIM_PLATFORM_CRUMBLING_6_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_6_HEIGHT 24 - -// 939 -#define ANIM_SPRING_PLATFORM_6_WIDTH 24 -#define ANIM_SPRING_PLATFORM_6_HEIGHT 64 - -// 940 -#define ANIM_MAZE_WIDTH 48 -#define ANIM_MAZE_HEIGHT 64 -#define ANIM_MAZE_VAR0_WIDTH 48 -#define ANIM_MAZE_VAR0_HEIGHT 64 -#define ANIM_MAZE_VAR1_WIDTH 48 -#define ANIM_MAZE_VAR1_HEIGHT 64 -#define ANIM_MAZE_VAR2_WIDTH 48 -#define ANIM_MAZE_VAR2_HEIGHT 64 -#define ANIM_MAZE_VAR3_WIDTH 64 -#define ANIM_MAZE_VAR3_HEIGHT 48 -#define ANIM_MAZE_VAR4_WIDTH 64 -#define ANIM_MAZE_VAR4_HEIGHT 48 -#define ANIM_MAZE_VAR5_WIDTH 64 -#define ANIM_MAZE_VAR5_HEIGHT 48 -#define ANIM_MAZE_VAR6_WIDTH 24 -#define ANIM_MAZE_VAR6_HEIGHT 24 -#define ANIM_MAZE_VAR7_WIDTH 48 -#define ANIM_MAZE_VAR7_HEIGHT 56 -#define ANIM_MAZE_VAR8_WIDTH 56 -#define ANIM_MAZE_VAR8_HEIGHT 48 - -// 942 -#define ANIM_PLATFORM_ON_A_PATH_6_WIDTH 56 -#define ANIM_PLATFORM_ON_A_PATH_6_HEIGHT 24 - -// 945 -#define ANIM_MUD_FX_WIDTH 48 -#define ANIM_MUD_FX_HEIGHT 24 -#define ANIM_MUD_FX_CHAOS_ANGEL_WIDTH 48 -#define ANIM_MUD_FX_CHAOS_ANGEL_HEIGHT 24 - -// 948 -#define ANIM_GOAL_RING_WIDTH 24 -#define ANIM_GOAL_RING_HEIGHT 24 -#define ANIM_GOAL_RING_VAR8_WIDTH 24 // Sparkle effect -#define ANIM_GOAL_RING_VAR8_HEIGHT 16 - -// 949 -#define ANIM_SUCTION_VERTICAL_WIDTH 24 -#define ANIM_SUCTION_VERTICAL_HEIGHT 56 - -// 950 -#define ANIM_SUCTION_HORIZONTAL_WIDTH 56 -#define ANIM_SUCTION_HORIZONTAL_HEIGHT 24 - -// 951 -#define ANIM_PLATFORM_CRUMBLING_4_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_4_HEIGHT 24 - -// 952 -#define ANIM_PLATFORM_CRUMBLING_5_WIDTH 48 -#define ANIM_PLATFORM_CRUMBLING_5_HEIGHT 32 - -// 955 -#define ANIM_SUCTION_STREAM_HORIZONTAL_WIDTH 24 -#define ANIM_SUCTION_STREAM_HORIZONTAL_HEIGHT 56 - -// 956 -#define ANIM_SUCTION_STREAM_VERTICAL_WIDTH 56 -#define ANIM_SUCTION_STREAM_VERTICAL_HEIGHT 24 - -// 969 -#define ANIM_WINDUP_BLOCK_7_WIDTH 24 -#define ANIM_WINDUP_BLOCK_7_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_7_VAR0_WIDTH 24 -#define ANIM_WINDUP_BLOCK_7_VAR0_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_7_VAR1_WIDTH 8 -#define ANIM_WINDUP_BLOCK_7_VAR1_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_7_VAR2_WIDTH 24 -#define ANIM_WINDUP_BLOCK_7_VAR2_HEIGHT 24 -#define ANIM_WINDUP_BLOCK_7_VAR3_WIDTH 24 -#define ANIM_WINDUP_BLOCK_7_VAR3_HEIGHT 8 - -// 976 -#define ANIM_TOY_BALLOON_POPPED_WIDTH 32 -#define ANIM_TOY_BALLOON_POPPED_HEIGHT 48 - -// 976 -#define ANIM_OMOCHAO0_WIDTH 24 -#define ANIM_OMOCHAO0_HEIGHT 24 - -// 977 -#define ANIM_OMOCHAO1_WIDTH 24 -#define ANIM_OMOCHAO1_HEIGHT 24 - -// 978 -#define ANIM_OMOCHAO2_WIDTH 24 -#define ANIM_OMOCHAO2_HEIGHT 24 - -// 979 -#define ANIM_OMOCHAO3_WIDTH 24 -#define ANIM_OMOCHAO3_HEIGHT 24 - -// 980 -#define ANIM_OMOCHAO4_WIDTH 24 -#define ANIM_OMOCHAO4_HEIGHT 24 - -// 981 -#define ANIM_OMOCHAO5_WIDTH 24 -#define ANIM_OMOCHAO5_HEIGHT 24 - -// 983 -#define ANIM_ACT_RING_WIDTH 32 -#define ANIM_ACT_RING_HEIGHT 32 -#define ANIM_ACT_RING_VAR0_WIDTH 32 -#define ANIM_ACT_RING_VAR0_HEIGHT 32 -#define ANIM_ACT_RING_VAR1_WIDTH 32 -#define ANIM_ACT_RING_VAR1_HEIGHT 32 -#define ANIM_ACT_RING_VAR2_WIDTH 32 -#define ANIM_ACT_RING_VAR2_HEIGHT 32 -// "Crown" signalling completion -#define ANIM_ACT_RING_VAR3_WIDTH 24 -#define ANIM_ACT_RING_VAR3_HEIGHT 16 - -// 984 -#define ANIM_SPRING_PLATFORM_4_WIDTH 24 -#define ANIM_SPRING_PLATFORM_4_HEIGHT 64 - -// 986 -#define ANIM_SLOW_LIFT_7_WIDTH (112 / 2) -#define ANIM_SLOW_LIFT_7_HEIGHT 24 - -// 987 -#define ANIM_SPRING_4_WIDTH 32 -#define ANIM_SPRING_4_HEIGHT 40 - -// 995 -#define ANIM_BUTTON_SPRING_6_VAR0_WIDTH 32 -#define ANIM_BUTTON_SPRING_6_VAR0_HEIGHT 40 -#define ANIM_BUTTON_SPRING_6_VAR5_WIDTH 40 -#define ANIM_BUTTON_SPRING_6_VAR5_HEIGHT 24 -#define ANIM_BUTTON_SPRING_6_VAR10_WIDTH 32 -#define ANIM_BUTTON_SPRING_6_VAR10_HEIGHT 32 - -// 997 -#define ANIM_PLATFORM_BONUS_WIDTH 48 -#define ANIM_PLATFORM_BONUS_HEIGHT 48 -#define ANIM_PLATFORM_BONUS_VAR0_WIDTH 48 -#define ANIM_PLATFORM_BONUS_VAR0_HEIGHT 48 -#define ANIM_PLATFORM_BONUS_VAR1_WIDTH 48 -#define ANIM_PLATFORM_BONUS_VAR1_HEIGHT 24 - -// 1004 -#define ANIM_CHAO_SITTING_WIDTH 32 -#define ANIM_CHAO_SITTING_HEIGHT 32 - -// 1042 -#define ANIM_UI_PROMPT_BUTTON_WIDTH 16 -#define ANIM_UI_PROMPT_BUTTON_HEIGHT 16 - -// 1059 -#define ANIM_BONUS_UI_TIMER_DIGITS_WIDTH 8 -#define ANIM_BONUS_UI_TIMER_DIGITS_HEIGHT 16 - -// 1063 -#define ANIM_BONUS_UI_FLOWER_WIDTH 16 -#define ANIM_BONUS_UI_FLOWER_HEIGHT 24 - -// 1064 -#define ANIM_BONUS_UI_BAR_WIDTH 16 -#define ANIM_BONUS_UI_BAR_HEIGHT 16 - -// 1065 -#define ANIM_BONUS_UI_X_WIDTH 48 -#define ANIM_BONUS_UI_X_HEIGHT 32 -#define ANIM_BONUS_UI_X_VAR0_WIDTH 16 -#define ANIM_BONUS_UI_X_VAR0_HEIGHT 16 -#define ANIM_BONUS_UI_X_VAR1_WIDTH 48 -#define ANIM_BONUS_UI_X_VAR1_HEIGHT 32 - -// 1154 -#define ANIM_BONUS_CAPSULE_WIDTH 56 -#define ANIM_BONUS_CAPSULE_HEIGHT 72 - -// 1155 -#define ANIM_BONUS_CAPSULE_POINTS_WIDTH 24 -#define ANIM_BONUS_CAPSULE_POINTS_HEIGHT 24 - -// 1156 -#define ANIM_BONUS_CAPSULE_SWITCH_WIDTH 24 -#define ANIM_BONUS_CAPSULE_SWITCH_HEIGHT 16 - -// 1160 -#define ANIM_BONUS_UI_SCORE_WIDTH 32 -#define ANIM_BONUS_UI_SCORE_HEIGHT 16 - -// Enemies -// 1166 -#define ANIM_SPINNER_WIDTH 48 -#define ANIM_SPINNER_HEIGHT 32 - -// 1168 -#define ANIM_CONDOR_WIDTH 48 -#define ANIM_CONDOR_HEIGHT 40 - -// 1168 -#define ANIM_AKATENTO_WIDTH 32 -#define ANIM_AKATENTO_HEIGHT 24 - -// 1169 -#define ANIM_AOTENTO_WIDTH 32 -#define ANIM_AOTENTO_HEIGHT 32 - -// 1171 -#define ANIM_APE_WIDTH 40 -#define ANIM_APE_HEIGHT 32 -#define ANIM_APE_VAR2_WIDTH 16 -#define ANIM_APE_VAR2_HEIGHT 16 - -// 1172 -#define ANIM_APE_PROJ_WIDTH 16 -#define ANIM_APE_PROJ_HEIGHT 16 - -// 1173 -#define ANIM_FROG_WIDTH 32 -#define ANIM_FROG_HEIGHT 48 - -// 1174 -#define ANIM_MINIMOLE_WIDTH 48 -#define ANIM_MINIMOLE_HEIGHT 24 -#define ANIM_MINIMOLE_VAR0_WIDTH 48 -#define ANIM_MINIMOLE_VAR0_HEIGHT 24 -#define ANIM_MINIMOLE_VAR1_WIDTH 32 -#define ANIM_MINIMOLE_VAR1_HEIGHT 8 - -// 1175 -#define ANIM_BUZZER_WIDTH 48 -#define ANIM_BUZZER_HEIGHT 32 - -// 1176 -#define ANIM_BUZZER_PROJ_WIDTH 16 -#define ANIM_BUZZER_PROJ_HEIGHT 16 - -// 1178 -#define ANIM_TAKKON_WIDTH 32 -#define ANIM_TAKKON_HEIGHT 48 - -// 1177 -#define ANIM_JOUSUN_WIDTH 40 -#define ANIM_JOUSUN_HEIGHT 32 - -// 1180 -#define ANIM_TAKKON_PROJ_WIDTH 24 -#define ANIM_TAKKON_PROJ_HEIGHT 24 -#define ANIM_TAKKON_PROJ_VAR0_WIDTH 8 -#define ANIM_TAKKON_PROJ_VAR0_HEIGHT 24 -#define ANIM_TAKKON_PROJ_VAR4_WIDTH 24 -#define ANIM_TAKKON_PROJ_VAR4_HEIGHT 24 - -// 1182 -#define ANIM_GAOGAO_WIDTH 32 -#define ANIM_GAOGAO_HEIGHT 32 - -// 1187 -#define ANIM_GINPE_WIDTH 24 -#define ANIM_GINPE_HEIGHT 32 - -// 1187 -#define ANIM_GINPE_PROJ_WIDTH 8 -#define ANIM_GINPE_PROJ_HEIGHT 8 - -// 1191 -#define ANIM_YADOKK_WIDTH 32 -#define ANIM_YADOKK_HEIGHT 32 -#define ANIM_YADOKK_VAR2_WIDTH 32 -#define ANIM_YADOKK_VAR2_HEIGHT 32 - -// 1315 -#define ANIM_ITEM_BOX_TYPE_WIDTH 16 -#define ANIM_ITEM_BOX_TYPE_HEIGHT 16 - -// 1316 -#define ANIM_ITEM_BOX_WIDTH 32 -#define ANIM_ITEM_BOX_HEIGHT 32 - -// 1338 -#define ANIM_ITEM_BOX_CLOUD_EFFECT_WIDTH 32 -#define ANIM_ITEM_BOX_CLOUD_EFFECT_HEIGHT 32 - -// 1139 -#define ANIM_CONDOR_PROJ_EXPLOSION_WIDTH 32 -#define ANIM_CONDOR_PROJ_EXPLOSION_HEIGHT 32 - -// 1344 -#define ANIM_ICE_SHIVER_WIDTH 16 -#define ANIM_ICE_SHIVER_HEIGHT 16 - -// 1348 -#define ANIM_SPECIAL_KEY_WIDTH 32 -#define ANIM_SPECIAL_KEY_HEIGHT 32 - -// 1423 -#define ANIM_LIFE_ICONS_WIDTH 16 -#define ANIM_LIFE_ICONS_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR0_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR0_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR1_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR1_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR2_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR2_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR3_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR3_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR4_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR4_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR5_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR5_HEIGHT 16 -#define ANIM_LIFE_ICONS_VAR6_WIDTH 16 -#define ANIM_LIFE_ICONS_VAR6_HEIGHT 16 -#endif - -#endif // GUARD_ANIM_SIZES_H diff --git a/sa1/include/animation_commands.h b/sa1/include/animation_commands.h deleted file mode 100644 index 8a4ad12c3..000000000 --- a/sa1/include/animation_commands.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef GUARD_ANIMATION_COMMANDS_H -#define GUARD_ANIMATION_COMMANDS_H - -#include "global.h" -#include "sprite.h" - -#define AnimCommandSizeInWords(_structType) ((sizeof(_structType)) / sizeof(s32)) - -typedef AnimCmdResult (*AnimationCommandFunc)(void *cursor, Sprite *sprite); - -typedef struct { - /* 0x00 */ s32 cmdId; // -2 - - // Note(Jace): This needs to be signed, since a - // negative value infers that it's using 8bit-colors - /* 0x04 */ s32 tileIndex; - - /* 0x08 */ u32 numTilesToCopy; -} ACmd_GetTiles; - -typedef struct { - /* 0x00 */ s32 cmdId; // -2 - - /* 0x04 */ s32 palId; - /* 0x06 */ u16 numColors; - /* 0x08 */ u16 insertOffset; -} ACmd_GetPalette; - -typedef struct { - /* 0x00 */ s32 cmdId; // -3 - - /* 0x04 */ s32 offset; -} ACmd_JumpBack; - -typedef struct { - /* 0x00 */ s32 cmdId; // -4 -} ACmd_4; - -typedef struct { - /* 0x00 */ s32 cmdId; // -5 - - /* 0x04 */ u16 songId; -} ACmd_PlaySoundEffect; - -// TODO: param types unknown -typedef struct { - /* 0x00 */ s32 cmdId; // -6 - - /* 0x04 */ Hitbox hitbox; -} ACmd_Hitbox; - -typedef struct { - /* 0x00 */ s32 cmdId; // -7 - - /* 0x04 */ u16 x; - /* 0x06 */ u16 y; -} ACmd_TranslateSprite; - -typedef struct { - /* 0x00 */ s32 cmdId; // -8 - - /* 0x04 */ s32 unk4; - /* 0x08 */ s32 unk8; -} ACmd_8; - -typedef struct { - /* 0x00 */ s32 cmdId; // -9 - - /* 0x04 */ AnimId animId; - /* 0x08 */ u16 variant; -} ACmd_SetIdAndVariant; - -typedef struct { - /* 0x00 */ s32 cmdId; // -10 - - /* 0x04 */ s32 unk4; - /* 0x08 */ s32 unk8; - /* 0x0C */ s32 unkC; -} ACmd_10; - -typedef struct { - /* 0x00 */ s32 cmdId; // -11 - - /* 0x04 */ s32 priority; -} ACmd_SetSpritePriority; - -typedef struct { - /* 0x00 */ s32 cmdId; // -12 - - /* 0x04 */ s32 orderIndex; -} ACmd_SetOamOrder; - -typedef struct { - // number of frames this will be displayed - s32 delay; - - // frameId of this animation that should be displayed - s32 index; -} ACmd_ShowFrame; - -typedef union { - s32 id; - - ACmd_GetTiles tiles; - ACmd_GetPalette pal; - ACmd_JumpBack jump; - ACmd_4 end; - ACmd_PlaySoundEffect sfx; - ACmd_Hitbox _6; - ACmd_TranslateSprite translate; - ACmd_8 _8; - ACmd_SetIdAndVariant setAnimId; - ACmd_10 _10; - ACmd_SetSpritePriority _11; - ACmd_SetOamOrder setOamOrder; - - ACmd_ShowFrame show; -} ACmd; - -u32 Base10DigitsToHexNibbles(u16 num); - -#endif // GUARD_ANIMATION_COMMANDS_H diff --git a/sa1/include/animation_commands_bg.h b/sa1/include/animation_commands_bg.h deleted file mode 100644 index d53d71d5d..000000000 --- a/sa1/include/animation_commands_bg.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef GUARD_ANIMATION_COMMANDS_EXTRA_H -#define GUARD_ANIMATION_COMMANDS_EXTRA_H - -#include "gba/types.h" -#include "sprite.h" - -/* Copy-pasted from SA2 on January 15th, 2024 */ - -void UpdateBgAnimationTiles(Background *); - -s32 RenderText(void *dest, const void *font, u16 x, u16 y, u8 bg, const char *text, u8 palette); - -void numToTileIndices(u8 *digits, u16 number); - -#endif // GUARD_ANIMATION_COMMANDS_EXTRA_H diff --git a/sa1/include/bg_triangles.h b/sa1/include/bg_triangles.h deleted file mode 100644 index d265f935a..000000000 --- a/sa1/include/bg_triangles.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef GUARD_SPRITE_4_H -#define GUARD_SPRITE_4_H - -typedef struct { -#if !WIDESCREEN_HACK - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; -#else - u16 unk0; - u16 unk1; - u16 unk2; - u16 unk3; - u16 unk4; - u16 unk5; - u16 unk6; - u16 unk7; -#endif -} TriParam1; - -extern void SA2_LABEL(sub_8006DB4)(u8 bg, TriParam1 *arg1, s32 unused, s32 arg3); -extern void SA2_LABEL(sub_800724C)(u8 bg, TriParam1 *param1); -extern void SA2_LABEL(sub_80075D0)(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5); -extern void SA2_LABEL(sub_8007738)(u8 bg, int_vcount minY, int_vcount maxY, u16 param3, u8 param4, u8 param5, u16 param6, u8 param7, - u8 param8, s16 param9, s16 param10); -extern void SA2_LABEL(sub_8007858)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4); -extern void SA2_LABEL(sub_80078D4)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd); -void SA2_LABEL(sub_8007958)(u8 bg, int_vcount minY, int_vcount maxY, s16 param3, s8 param4, u16 param5, u16 param6); -#endif diff --git a/sa1/include/color.h b/sa1/include/color.h deleted file mode 100644 index 784eaf7e1..000000000 --- a/sa1/include/color.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef GUARD_COLOR_H -#define GUARD_COLOR_H - -// TODO: Full RGB in SA1 -#if PLATFORM_GBA || (GAME == GAME_SA1) || (RENDERER == RENDERER_SOFTWARE) -// ABGR_1555 -typedef uint16_t ColorRaw; -typedef union Color { - struct { - uint16_t r : 5; - uint16_t g : 5; - uint16_t b : 5; - uint16_t a : 1; - } split; - - ColorRaw raw; -} Color; - -#else -// RGBA_8888 -typedef uint32_t ColorRaw; -typedef union Color { - struct { - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; - } split; - - ColorRaw raw; -} Color; -#endif - -// NOTE: RGB16() is used in SA1 in some places for matching, -// so we can't have one single macro. :( -#define RGB16(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) -#define RGB16_REV(r, g, b) (((b) << 10) | ((g) << 5) | (r)) - -#define RGB_BLACK RGB16_REV(0, 0, 0) -#define RGB_WHITE RGB16_REV(31, 31, 31) -#define RGB_RED RGB16_REV(31, 0, 0) -#define RGB_GREEN RGB16_REV(0, 31, 0) -#define RGB_BLUE RGB16_REV(0, 0, 31) -#define RGB_YELLOW RGB16_REV(31, 31, 0) -#define RGB_MAGENTA RGB16_REV(31, 0, 31) -#define RGB_CYAN RGB16_REV(0, 31, 31) -#define RGB_WHITEALPHA (RGB_WHITE | 0x8000) - -#endif // GUARD_COLOR_H \ No newline at end of file diff --git a/sa1/include/config.h b/sa1/include/config.h deleted file mode 100644 index 47c62c476..000000000 --- a/sa1/include/config.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef GUARD_SA1_CONFIG_H -#define GUARD_SA1_CONFIG_H - -/* TODO: Generate config.h in nob */ - -#define GAME_SA1 1 -#define GAME_SA2 2 -#define GAME_SA3 3 -#define GAME_KATAM 4 - -#define ENGINE_1 1 -#define ENGINE_2 2 -#define ENGINE_3 3 -#define ENGINE_4 4 - -// TODO: Define this in Makefile through a compiler macro? -#define GAME GAME_SA1 - -// TODO: Do SA1 and SA2 use the same engine ver? -// TODO: Do SA3 and KATAM use the same engine ver? -#define ENGINE GAME - -// TODO: Put somewhere else? -#if PLATFORM_GBA -#define USE_NEW_DMA 0 -#else -#define USE_NEW_DMA 1 -#endif - -#ifndef TAS_TESTING -#define TAS_TESTING 0 -#endif - -#define TAS_INPUT_LOGGING 0 - -#ifndef HEADLESS -#define HEADLESS 0 -#endif - -#define TAS_TESTING_WIDESCREEN_HACK 1 - -#define RENDERER_SOFTWARE 0 -#define RENDERER_OPENGL 1 -#define RENDERER_COUNT 2 -#if PLATFORM_WIN32 && !PLATFORM_SDL -// TODO: Only win32 for now -#define RENDERER RENDERER_OPENGL -#else -#define RENDERER RENDERER_SOFTWARE -#endif - -#endif // GUARD_SA1_CONFIG_H diff --git a/sa1/include/flags.h b/sa1/include/flags.h deleted file mode 100644 index 8d1f0b356..000000000 --- a/sa1/include/flags.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef GUARD_FLAGS_H -#define GUARD_FLAGS_H - -#include "global.h" - -// used by 'animCmd_GetPalette_COPY' (0x08004314 in SA2) -#define FLAGS_UPDATE_BACKGROUND_PALETTES 0x1 -#define FLAGS_UPDATE_SPRITE_PALETTES 0x2 -#define FLAGS_EXECUTE_HBLANK_COPY 0x4 -#define FLAGS_EXECUTE_HBLANK_CALLBACKS 0x8 -#define FLAGS_EXECUTE_VBLANK_CALLBACKS 0x10 -#define FLAGS_20 0x20 -#define FLAGS_40 0x40 -#define FLAGS_80 0x80 -#define FLAGS_NO_FLASH_MEMORY 0x100 -#define FLAGS_200 0x200 -#define FLAGS_PAUSE_GAME 0x400 -#define FLAGS_800 0x800 -#define FLAGS_SKIP_INTRO 0x1000 -#define FLAGS_4000 0x4000 -#define FLAGS_8000 0x8000 - -extern u32 gFlags; - -#endif diff --git a/sa1/include/game/dummy_task.h b/sa1/include/game/dummy_task.h deleted file mode 100644 index 82c17c268..000000000 --- a/sa1/include/game/dummy_task.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef GUARD_DUMMY_TASK_H -#define GUARD_DUMMY_TASK_H - -#include "global.h" - -void CreateDummyTask(void); - -// Some sort of unused task variable -extern struct Task *gDummyTask; - -#endif diff --git a/sa1/include/game/game.h b/sa1/include/game/game.h deleted file mode 100644 index 1d5e6edc6..000000000 --- a/sa1/include/game/game.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef GUARD_GAME_H -#define GUARD_GAME_H - -#include "global.h" - -void GameInit(void); - -#endif // GUARD_GAME_H diff --git a/sa1/include/game/globals.h b/sa1/include/game/globals.h deleted file mode 100644 index 7e6c55bce..000000000 --- a/sa1/include/game/globals.h +++ /dev/null @@ -1,291 +0,0 @@ -#ifndef GUARD_SAKIT_GLOBALS_H -#define GUARD_SAKIT_GLOBALS_H - -#include "multi_sio.h" -#include "core.h" - -#define GAME_MODE_SINGLE_PLAYER 0 -#define GAME_MODE_TIME_ATTACK 1 - -#define GAME_MODE_MULTI_PLAYER 3 -#if (GAME == GAME_SA1) -#define GAME_MODE_RACE 2 -#define GAME_MODE_CHAO_HUNT 4 -#define GAME_MODE_TEAM_PLAY 5 -#define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 6 -#elif (GAME == GAME_SA2) -#define GAME_MODE_BOSS_TIME_ATTACK 2 -#define GAME_MODE_TEAM_PLAY 4 -#define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 5 -#endif - -// TODO: Improve this name -#define IS_MP_OR_TEAM_PLAY ((gGameMode == GAME_MODE_MULTI_PLAYER) || (gGameMode == GAME_MODE_TEAM_PLAY)) - -#if (GAME == GAME_SA1) -#define IS_SINGLE_PLAYER ((gGameMode == GAME_MODE_SINGLE_PLAYER) || (gGameMode == GAME_MODE_TIME_ATTACK)) -#elif (GAME == GAME_SA2) -#define IS_SINGLE_PLAYER \ - ((gGameMode == GAME_MODE_SINGLE_PLAYER) || (gGameMode == GAME_MODE_TIME_ATTACK) || (gGameMode == GAME_MODE_BOSS_TIME_ATTACK)) -#endif - -#if (GAME == GAME_SA1) -#define GAME_MODE_IS_TIME_ATTACK (gGameMode == GAME_MODE_TIME_ATTACK) -#elif (GAME == GAME_SA2) -#define GAME_MODE_IS_TIME_ATTACK (gGameMode == GAME_MODE_TIME_ATTACK || gGameMode == GAME_MODE_BOSS_TIME_ATTACK) -#endif - -#if (GAME == GAME_SA1) -#define GAME_MODE_REQUIRES_ITEM_RNG \ - ((gGameMode != GAME_MODE_SINGLE_PLAYER) && (gGameMode != GAME_MODE_TIME_ATTACK) && (gGameMode != GAME_MODE_RACE) \ - && (gGameMode != GAME_MODE_MULTI_PLAYER)) -#elif (GAME == GAME_SA2) -#define GAME_MODE_REQUIRES_ITEM_RNG (gGameMode == GAME_MODE_MULTI_PLAYER_COLLECT_RINGS) -) -#endif - -#define IS_MULTI_PLAYER (!(IS_SINGLE_PLAYER)) - -#define STAGE_FLAG__CLEAR 0x0000 -#define STAGE_FLAG__ACT_START 0x0001 // Turns timer off, likely other effects? -#define STAGE_FLAG__2 0x0002 -#define STAGE_FLAG__TIMER_REVERSED 0x0004 // Timer gets lower on every tick, and player loses life on 0:00:00. -#define STAGE_FLAG__10 0x0010 -#define STAGE_FLAG__DISABLE_PAUSE_MENU 0x0020 -#define STAGE_FLAG__DEMO_RUNNING 0x0040 // TODO: Check accuracy of name -#define STAGE_FLAG__GRAVITY_INVERTED 0x0080 -#define STAGE_FLAG__100 0x0100 // Set during stage's "loading screen" -#define STAGE_FLAG__TURN_OFF_TIMER 0x0200 -#define STAGE_FLAG__TURN_OFF_HUD 0x0400 - -#define DIFFICULTY_NORMAL 0 -#define DIFFICULTY_EASY 1 - -#define MAX_PLAYER_NAME_LENGTH 6 - -#define GRAVITY_IS_INVERTED (gStageFlags & STAGE_FLAG__GRAVITY_INVERTED) - -typedef struct { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u16 fadeoutSpeed; -} MusicManagerState; /* size: 8 */ - -typedef struct { - s32 squarePlayerDistance; - u16 angle; -} HomingTarget; - -// Common RoomEvent variables -#define ROOMEVENT_BASE u8 type - -// RoomEvent opaque struct -// See 'multiplayer_event_mgr.h' for more information on this -typedef struct { - ROOMEVENT_BASE; - - u8 opaque[7]; -} RoomEvent; /* 0x8 */ - -#define CHEESE_DISTANCE_MAX 200 -typedef struct { - /* 0x00 */ s32 squarePlayerDistance; - /* 0x04 */ struct Task *task; -} CheeseTarget; /* size: unknown (but >= 0x8?) */ - -// Incomplete -extern u8 gDemoPlayCounter; - -#if (GAME == GAME_SA1) -extern u16 ALIGNED(4) gSpecialStageReturnX; -#endif - -extern u8 gGameMode; - -extern s8 gCurrentLevel; -extern s8 gSelectedCharacter; -#if (GAME == GAME_SA1) -// NOTE: Treat gTailsEnabled as bool8, it just does not match unsigned -extern s8 gTailsEnabled; -extern s8 gNumSingleplayerCharacters; -#define NUM_SINGLEPLAYER_CHARS_MAX 2 -#endif - -extern u8 gMultiplayerLanguage; -extern s8 gMultiplayerCurrentLevel; - -// Sometimes loaded as s16, but as u16 most of the time. -// If you encounter it being loaded as s16, please cast it. -extern u16 gRingCount; - -extern MusicManagerState gMusicManagerState; - -// Time that is being used to score the player (or in Time Attack) -extern u32 gCourseTime; - -// Collected Special Rings in current stage? -extern u8 gSpecialRingCount; - -// TODO: Types not checked yet! -extern s32 gWorldSpeedY; -#if (GAME == GAME_SA2) -extern s32 gWorldSpeedX; -#endif - -extern u16 gBossCameraClampYLower; -extern u16 gBossCameraClampYUpper; -extern u8 gRandomItemBox; -#if (GAME == GAME_SA1) -extern u16 gSpecialStageCollectedRings; -extern u16 gUnknown_0300507C; -#endif -extern u8 gSpikesUnknownTimer; - -extern s8 SA2_LABEL(gUnknown_0300543C); -extern struct Task *gEntitiesManagerTask; - -extern u8 gDestroySpotlights; - -extern u8 gRoomEventQueueSendPos; - -// "Extra State" (see above #defines for states) -// TODO: Find better name. Put somewhere else? -extern u16 gStageFlags; -extern u16 gPrevStageFlags; - -extern u8 gDifficultyLevel; - -extern s8 gTrappedAnimalVariant; - -extern u8 gBossIndex; // TODO: Rename to gLastCheckpointIndex? (SA1 AND SA2!) - -// Incremented by 1 every frame if the game is not paused. -// Starts before the stage-timer that is used for scores does. -extern u32 gStageTime; -extern u32 gMPStageStartFrameCount; - -extern u32 gCheckpointTime; // Checkpoint timer? - -extern u8 gRoomEventQueueWritePos; - -extern u8 gBossRingsRespawnCount; -extern bool8 gBossRingsShallRespawn; -extern bool8 gBoostEffectTasksCreated; - -extern struct Task *gMultiplayerPlayerTasks[4]; -extern s8 gMultiplayerCharacters[4]; -extern s8 gMultiplayerRanks[4]; -extern u8 gOamMatrixIndex; - -extern u8 gMultiplayerMissingHeartbeats[4]; -extern u8 gActiveCollectRingEffectCount; - -extern u8 gMultiplayerUnlockedCharacters; - -#if (GAME == GAME_SA1) -extern u16 ALIGNED(4) gSpecialStageReturnY; -#elif (GAME == GAME_SA2) -u8 gMultiplayerUnlockedLevels; -#endif - -extern u32 gMultiplayerIds[MULTI_SIO_PLAYERS_MAX]; -extern u16 gMultiplayerNames[MULTI_SIO_PLAYERS_MAX][MAX_PLAYER_NAME_LENGTH]; - -extern u32 gMultiplayerPseudoRandom; - -extern s32 gLevelScore; -extern u8 gNumLives; -extern u8 gFinalBossActive; - -extern HomingTarget gHomingTarget; - -extern u8 gMultiplayerConnections; - -// Only set after the player passed it, used to determine extra score -extern s32 gStageGoalX; - -extern u8 gMPRingCollectWins[4]; -extern u8 gMultiplayerCharRings[MULTI_SIO_PLAYERS_MAX]; - -extern RoomEvent gRoomEventQueue[16]; - -extern CheeseTarget gCheeseTarget; - -extern struct Task *gChaoTasks[3]; - -#if (GAME == GAME_SA1) && !defined(BUG_FIX) -// NOTE: gNumLives is u8, so without the bounds-check, -// which SA1 did not have, 255 would overflow to 0. -// During regular gameplay you would not get that many 1UPs, though. -#define LIVES_BOUND_CHECK_A(lives) (lives) -#define LIVES_BOUND_CHECK_B(lives) (lives) -#define NEW_LIVE_COUNT(_type, _varname, _inc) (gNumLives += 1) - -#define BOUND_CHK_VARNAME gNumLives -#else -#define LIVES_BOUND_CHECK_A(lives) \ - ({ \ - if ((lives) > 255) \ - (lives) = 255; \ - gNumLives = (lives); \ - }) - -#define LIVES_BOUND_CHECK_B(lives) \ - ({ \ - if (lives > 255) { \ - gNumLives = 255; \ - } else { \ - gNumLives = lives; \ - } \ - }) - -#define NEW_LIVE_COUNT(_type, _varname, _inc) \ - _type _varname = divResA - divResB; \ - _varname += _inc; - -#define BOUND_CHK_VARNAME lives -#endif - -#define INCREMENT_SCORE_BASE(_inc, restartMusic, BoundCheck) \ - { \ - s32 divResA, divResB; \ - s32 oldScore = gLevelScore; \ - gLevelScore += _inc; \ - \ - divResA = Div(gLevelScore, 50000); \ - divResB = Div(oldScore, 50000); \ - \ - if ((divResA != divResB) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) { \ - NEW_LIVE_COUNT(u16, BOUND_CHK_VARNAME, gNumLives); \ - BoundCheck(BOUND_CHK_VARNAME); \ - \ - if (restartMusic) \ - gMusicManagerState.unk3 = 0x10 | 0x0; \ - } \ - } - -#define INCREMENT_SCORE_A(_inc) INCREMENT_SCORE_BASE(_inc, FALSE, LIVES_BOUND_CHECK_A) -#define INCREMENT_SCORE(_inc) INCREMENT_SCORE_BASE(_inc, TRUE, LIVES_BOUND_CHECK_A) -#define INCREMENT_SCORE_B(_inc) INCREMENT_SCORE_BASE(_inc, TRUE, LIVES_BOUND_CHECK_B) - -#define INCREMENT_RINGS(_inc) \ - { \ - s32 prevLives, newLives; \ - u16 oldRings = gRingCount; \ - gRingCount = oldRings + (_inc); \ - if (!(IS_EXTRA_STAGE(gCurrentLevel))) { \ - newLives = Div(gRingCount, 100); \ - prevLives = Div(oldRings, 100); \ - if ((newLives != prevLives) && (gGameMode == GAME_MODE_SINGLE_PLAYER)) { \ - u16 lives = gNumLives + 1; \ - gNumLives = LIVES_BOUND_CHECK_A(lives); \ - gMusicManagerState.unk3 = 0x10 | 0x0; \ - } \ - } \ - } - -#endif // GUARD_SAKIT_GLOBALS_H diff --git a/sa1/include/game/shared/parameters/characters.h b/sa1/include/game/shared/parameters/characters.h index 15d23a633..7e5178c59 100644 --- a/sa1/include/game/shared/parameters/characters.h +++ b/sa1/include/game/shared/parameters/characters.h @@ -1,7 +1,7 @@ #ifndef GUARD_PARAMETERS_CHARACTERS_H #define GUARD_PARAMETERS_CHARACTERS_H -#include "constants/zones.h" +#include "constants/sa1/zones.h" /* NOTE: Copied from SA2! */ diff --git a/sa1/include/game/shared/stage/player.h b/sa1/include/game/shared/stage/player.h index 790b291ed..2269e3e34 100644 --- a/sa1/include/game/shared/stage/player.h +++ b/sa1/include/game/shared/stage/player.h @@ -2,12 +2,12 @@ #define GUARD_STAGE_PLAYER_H // TODO: merge these -#include "constants/characters.h" +#include "constants/sa1/characters.h" //#include "game/shared/parameters/characters.h" #include "core.h" -#include "constants/characters.h" // for NUM_CHARACTERS -#include "constants/move_states.h" +#include "constants/sa1/characters.h" // for NUM_CHARACTERS +#include "constants/sa1/move_states.h" #define PLAYER_IS_ALIVE (!(gPlayer.moveState & MOVESTATE_DEAD)) #define IS_ALIVE(player) (!((player)->moveState & MOVESTATE_DEAD)) diff --git a/sa1/include/game/shared/stage/rings_manager.h b/sa1/include/game/shared/stage/rings_manager.h index 5882a4299..e7d6d885f 100644 --- a/sa1/include/game/shared/stage/rings_manager.h +++ b/sa1/include/game/shared/stage/rings_manager.h @@ -3,7 +3,7 @@ #include "global.h" #include "rect.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" #define MP_COLLECT_RINGS_COMPRESSED_POS_DATA ((u8 **)(EWRAM_START + 0x33008)) #define MP_COLLECT_RINGS_COMPRESSED_SIZE (u8 **)(EWRAM_START + 0x3300C) diff --git a/sa1/include/game/shared/stage/rings_scatter.h b/sa1/include/game/shared/stage/rings_scatter.h index c063e8978..75de60e99 100644 --- a/sa1/include/game/shared/stage/rings_scatter.h +++ b/sa1/include/game/shared/stage/rings_scatter.h @@ -1,6 +1,8 @@ #ifndef GUARD_SA2_RINGS_SCATTER_H #define GUARD_SA2_RINGS_SCATTER_H +#include "core.h" + #if (GAME == GAME_SA1) #define MAX_SCATTERING_RINGS_COUNT_SP 48 #define MAX_SCATTERING_RINGS_COUNT_MP 32 @@ -9,12 +11,6 @@ #define MAX_SCATTERING_RINGS_COUNT_MP 16 #endif -#if (GAME == GAME_SA1) -#define UNK10_CONDITION 1 -#elif (GAME == GAME_SA2) -#define UNK10_CONDITION !(ring->unk10 & 0x7) -#endif - typedef struct { /* 0x00 */ s32 x; /* 0x04 */ s32 y; @@ -30,9 +26,9 @@ typedef struct { typedef struct { /* 0x000|0x000 */ Sprite sprRing; /* 0x030|0x030 */ ScatterRing rings[MAX_SCATTERING_RINGS_COUNT_SP]; - /* 0x330|0x2B0 */ u32 sa2__unk2B0; - /* 0x334|0x2B4 */ u16 sa2__unk2B4; - /* 0x336|0x2B6 */ u16 sa2__unk2B6; + /* 0x330|0x2B0 */ u32 SA2_LABEL(unk2B0); + /* 0x334|0x2B4 */ u16 SA2_LABEL(unk2B4); + /* 0x336|0x2B6 */ u16 SA2_LABEL(unk2B6); } RingsScatter; /* size: 0x2B8 */ extern struct Task *gRingsScatterTask; // -> RingsScatter diff --git a/sa1/include/game/shared/stage/stage.h b/sa1/include/game/shared/stage/stage.h index db2284981..1583de598 100644 --- a/sa1/include/game/shared/stage/stage.h +++ b/sa1/include/game/shared/stage/stage.h @@ -3,7 +3,7 @@ #include "global.h" #include "core.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" void ApplyGameStageSettings(void); void GameStageStart(void); diff --git a/sa1/include/gba/.clang-format b/sa1/include/gba/.clang-format deleted file mode 100644 index f54a540f5..000000000 --- a/sa1/include/gba/.clang-format +++ /dev/null @@ -1,4 +0,0 @@ ---- -DisableFormat: true -SortIncludes: Never -... diff --git a/sa1/include/gba/cpuset_macros.h b/sa1/include/gba/cpuset_macros.h deleted file mode 100644 index 2cd6ab7c4..000000000 --- a/sa1/include/gba/cpuset_macros.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef GUARD_GBA_CPUSET_MACROS_H -#define GUARD_GBA_CPUSET_MACROS_H - -#define CPU_FILL(value, dest, size, bit) \ -{ \ - vu##bit tmp = (vu##bit)(value); \ - CpuSet((void *)&tmp, \ - dest, \ - CPU_SET_##bit##BIT | CPU_SET_SRC_FIXED | ((size)/(bit/8) & 0x1FFFFF)); \ -} - -#define CpuFill16(value, dest, size) CPU_FILL(value, dest, size, 16) -#define CpuFill32(value, dest, size) CPU_FILL(value, dest, size, 32) - -#define CPU_COPY(src, dest, size, bit) CpuSet(src, dest, CPU_SET_##bit##BIT | ((size)/(bit/8) & 0x1FFFFF)) - -#define CpuCopy16(src, dest, size) CPU_COPY(src, dest, size, 16) -#define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32) - -#define CpuFastFill(value, dest, size) \ -{ \ - volatile uintptr_t tmp = (volatile uintptr_t)(value); \ - CpuFastSet((void *)&tmp, \ - dest, \ - CPU_FAST_SET_SRC_FIXED | ((size)/(32/8) & 0x1FFFFF)); \ -} - -#define CpuFastFill16(value, dest, size) CpuFastFill(((value) << 16) | (value), (dest), (size)) - -#define CpuFastCopy(src, dest, size) CpuFastSet(src, dest, ((size)/(32/8) & 0x1FFFFF)) - -#endif // GUARD_GBA_CPUSET_MACROS_H diff --git a/sa1/include/gba/defines.h b/sa1/include/gba/defines.h deleted file mode 100644 index bfbe03382..000000000 --- a/sa1/include/gba/defines.h +++ /dev/null @@ -1,166 +0,0 @@ -#ifndef GUARD_GBA_DEFINES -#define GUARD_GBA_DEFINES - -#ifndef GEN_CTX -#include -#include // for uint16_t -#endif -#include "color.h" - -#define TRUE 1 -#define FALSE 0 - -#if !PORTABLE -#define IWRAM_DATA __attribute__((section("iwram_data"))) -#define EWRAM_DATA __attribute__((section("ewram_data"))) -#else -#define IWRAM_DATA -#define EWRAM_DATA -#endif - -// TODO: Move these elsewhere? -// #ifdef __GNUC__ -#define NAKED __attribute__((naked)) -#define UNUSED __attribute__((unused)) -//#define PACKED __attribute__((packed)) -#define ALIGNED(n) __attribute__((aligned(n))) -// #endif - -#define EWRAM_SIZE 0x40000 -#define IWRAM_SIZE 0x7E00 -#define PLTT_SIZE 0x400 -#define BG_PLTT_SIZE 0x200 -#define OBJ_PLTT_SIZE 0x200 -#define VRAM_SIZE 0x18000 -#define BG_VRAM_SIZE 0x10000 -// The size of OBJ_VRAM0_SIZE depends on the "Mode" of the graphics hardware. -// The data is interpreted differently by the hardware in each mode. -#define OBJ_VRAM0_SIZE 0x8000 -#define OBJ_VRAM1_SIZE 0x4000 -#define OAM_ENTRY_COUNT 128 -#if PORTABLE -// NOTE: Used in gba/types.h, so they have to be defined before the #include -#if defined(__PSP__) -// PSP: Use GBA-native resolution, SDL scales to 480x272 -#define DISPLAY_WIDTH 240 -#define DISPLAY_HEIGHT 160 -#elif defined(__PS2__) -// Runs at 60fps with the "fast draw" -#define DISPLAY_WIDTH 320 -#define DISPLAY_HEIGHT 180 -#else -#define DISPLAY_WIDTH 426 -#define DISPLAY_HEIGHT 240 -#endif - -// NOTE: We shouldn't consider WIDESCREEN_HACK a permanent thing. -// This hack should best be removed once there's a "native" platform layer. -#if ((DISPLAY_WIDTH >= 256) || (DISPLAY_HEIGHT >= 256)) -#undef VRAM_SIZE -#define VRAM_SIZE (0x18000 + (0x800 * (12))) -#define WIDESCREEN_HACK TRUE -#define EXTENDED_OAM !TRUE // TODO: re-enable once rendering works properly -#else -#define WIDESCREEN_HACK FALSE -#define EXTENDED_OAM !TRUE -#endif -extern uint8_t VRAM[VRAM_SIZE]; - -#if !EXTENDED_OAM -//#include "gba/types.h" -// TODO: Fix #define OAM_SIZE (OAM_ENTRY_COUNT*sizeof(OamData)) -#define OAM_SIZE (OAM_ENTRY_COUNT*8) -#else // EXTENDED_OAM -#define OAM_SIZE (OAM_ENTRY_COUNT*0xC) -#endif -extern struct SoundMixerState *SOUND_INFO_PTR; -extern uint16_t INTR_CHECK; -extern void (*INTR_VECTOR)(void); - -extern uint8_t EWRAM_START[EWRAM_SIZE]; -extern uint8_t IWRAM_START[IWRAM_SIZE]; -extern ColorRaw PLTT[PLTT_SIZE/sizeof(uint16_t)]; -#define BG_PLTT ((ColorRaw*)&PLTT[0]) -#define OBJ_PLTT ((ColorRaw*)&PLTT[BG_PLTT_SIZE/sizeof(uint16_t)]) -extern uint8_t OAM[OAM_SIZE]; - -#define BG_VRAM &VRAM[0] -#define BG_CHAR_ADDR(n) (((u8*)BG_VRAM) + (0x4000 * (n))) -#define BG_CHAR_ADDR_FROM_BGCNT(bg) (BG_VRAM + ((gBgCntRegs[bg] & BGCNT_CHARBASE(0x3)) << 12)) -#define BG_SCREEN_ADDR(n) (((u8*)BG_VRAM) + (0x800 * (n))) -#define BG_TILE_ADDR(n) (((u8*)BG_VRAM) + (0x80 * (n))) - -#define OBJ_VRAM0 &VRAM[0x10000] -#define OBJ_VRAM1 &VRAM[0x14000] - -#define OBJ_VRAM_TOTAL_SIZE (VRAM_SIZE - BG_VRAM_SIZE) -#else -#define DISPLAY_WIDTH 240 -#define DISPLAY_HEIGHT 160 - -// NOTE(Jace): I tried replacing these altogether, -// but that resulted in a nonmatching ROM -// (see notes above) -#define SOUND_INFO_PTR (*(struct SoundMixerState **)0x3007FF0) -#define INTR_CHECK (*(u16 *)0x3007FF8) -#define INTR_VECTOR (*(void **)0x3007FFC) - -#define EWRAM_START 0x02000000 -#define IWRAM_START 0x03000000 - -#define PLTT 0x5000000 -#define BG_PLTT ((u16 *)(PLTT)) -#define OBJ_PLTT ((u16 *)(PLTT + BG_PLTT_SIZE)) - -#define VRAM 0x6000000 - -#define BG_VRAM VRAM -#define BG_CHAR_ADDR(n) (BG_VRAM + ((n) << 14)) -#define BG_CHAR_ADDR_FROM_BGCNT(bg) ((u8*)BG_VRAM + ((gBgCntRegs[bg] & BGCNT_CHARBASE(0x3)) << 12)) -// TODO: Maybe rename BG_SCREEN_ADDR -#define BG_SCREEN_ADDR(n) (BG_VRAM + (0x800 * (n))) -#define BG_TILE_ADDR(n) (BG_VRAM + (0x80 * (n))) - -// text-mode BG -#define OBJ_VRAM0 (u8*)(VRAM + 0x10000) - -// bitmap-mode BG -#define OBJ_VRAM1 (u8*)(VRAM + 0x14000) - -#define OAM 0x7000000 -#define OAM_SIZE (OAM_ENTRY_COUNT*sizeof(OamData)) - -#define OBJ_VRAM_TOTAL_SIZE (VRAM_SIZE - BG_VRAM_SIZE) -#endif - -#define DISPLAY_CENTER_X (DISPLAY_WIDTH / 2) -#define DISPLAY_CENTER_Y (DISPLAY_HEIGHT / 2) - -#if WIDESCREEN_HACK -#define WIN_REG_SIZE 4 -#define WIN_RANGE(a, b) (((a) << 16) | (b)) -#define WIN_GET_LOWER(win_reg) (((win_reg) & 0xFFFF0000) >> 16) -#define WIN_GET_HIGHER(win_reg) (((win_reg) & 0x0000FFFF) >> 0) -typedef uint32_t winreg_t; -#else -#define WIN_REG_SIZE 2 -#define WIN_RANGE(a, b) (((a) << 8) | (b)) -#define WIN_GET_LOWER(win_reg) (((win_reg) & 0xFF00) >> 8) -#define WIN_GET_HIGHER(win_reg) (((win_reg) & 0x00FF) >> 0) -typedef uint16_t winreg_t; -#endif - -#define TILE_SIZE_4BPP 32 -#define TILE_SIZE_8BPP 64 - -// NOTE/TODO: Maybe this should somewhere else? -// NOTE: This appears to not match when using pointers, but with integers it's fine. -// uintptr_t should always be defined to be as big as a pointer, so there should be no issues. -#define GET_TILE_NUM_COMMON(vramPtr, tileSize) (((uintptr_t)(vramPtr) - (uintptr_t)OBJ_VRAM0) / (tileSize)) -#define GET_TILE_NUM(vramPtr) GET_TILE_NUM_COMMON((vramPtr), TILE_SIZE_4BPP) - -#define TOTAL_OBJ_TILE_COUNT 1024 - -#define SYSTEM_CLOCK (16 * 1024 * 1024) // System Clock - -#endif // GUARD_GBA_DEFINES diff --git a/sa1/include/gba/dma_macros.h b/sa1/include/gba/dma_macros.h deleted file mode 100644 index b6480f27d..000000000 --- a/sa1/include/gba/dma_macros.h +++ /dev/null @@ -1,239 +0,0 @@ -#ifndef GUARD_GBA_DMA_MACROS_H -#define GUARD_GBA_DMA_MACROS_H - -#include "config.h" - -#if PLATFORM_GBA -#define DmaSet(dmaNum, src, dest, control) \ -{ \ - vu32 *dmaRegs = (vu32 *)REG_ADDR_DMA##dmaNum##SAD; \ - dmaRegs[0] = (vu32)(src); \ - dmaRegs[1] = (vu32)(dest); \ - dmaRegs[2] = (vu32)(control); \ - dmaRegs[2]; \ -} -#else -extern void DmaSet(int dmaNum, const void *src, void *dest, u32 control); -#endif // PLATFORM_GBA - -#if PLATFORM_GBA -#define DMA_FILL(dmaNum, value, dest, size, bit) \ -{ \ - vu##bit tmp = (vu##bit)(value); \ - DmaSet(dmaNum, \ - &tmp, \ - dest, \ - (u32)((DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_FIXED | DMA_DEST_INC) << 16 \ - | ((size)/(bit/8)))); \ -} -#else -#define DMA_FILL(dmaNum, value, dest, size, bit) \ -{ \ - u##bit tmp = (u##bit)(value); \ - DmaSet(dmaNum, \ - &tmp, \ - dest, \ - (u32)((DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_FIXED | DMA_DEST_INC) << 16 \ - | ((size)/(bit/8)))); \ -} -#endif - -#define DmaFill16(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 16) -#define DmaFill32(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 32) - -// Note that the DMA clear macros cause the DMA control value to be calculated -// at runtime rather than compile time. The size is divided by the DMA transfer -// unit size (2 or 4 bytes) and then combined with the DMA control flags using a -// bitwise OR operation. - -#define DMA_CLEAR(dmaNum, dest, size, bit) \ -{ \ - vu##bit *_dest = (vu##bit *)(dest); \ - u32 _size = size; \ - DmaFill##bit(dmaNum, 0, _dest, _size); \ -} - -#define DmaClear16(dmaNum, dest, size) DMA_CLEAR(dmaNum, dest, size, 16) -#define DmaClear32(dmaNum, dest, size) DMA_CLEAR(dmaNum, dest, size, 32) - -#define DMA_COPY(dmaNum, src, dest, size, bit) \ - DmaSet(dmaNum, \ - src, \ - dest, \ - (u32)((DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_INC | DMA_DEST_INC) << 16 \ - | ((size)/(bit/8)))) - -#define DmaCopy16(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 16) -#define DmaCopy32(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 32) - -#if PLATFORM_GBA -#define DmaStop(dmaNum) \ -{ \ - vu16 *dmaRegs = (vu16 *)REG_ADDR_DMA##dmaNum##SAD; \ - dmaRegs[5] &= ~(DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT); \ - dmaRegs[5] &= ~DMA_ENABLE; \ - dmaRegs[5]; \ -} -// Used in SA1, stage.c -#define SlowDmaStop(dmaNum) \ -{ \ - vu16 *dmaRegs = (vu16 *)REG_ADDR_DMA##dmaNum##SAD; \ - dmaRegs[5] &= ~(DMA_START_MASK | DMA_DREQ_ON | DMA_REPEAT); \ - dmaRegs[5]; \ - dmaRegs[5] &= ~DMA_ENABLE; \ - dmaRegs[5]; \ - dmaRegs[5]; \ -} -#else -extern void DmaStop(int dmaNum); -static inline void SlowDmaStop(int dmaNum) { DmaStop(dmaNum); } -#endif - -#define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \ -{ \ - const void *_src = src; \ - void *_dest = (void *)(dest); \ - u32 _size = size; \ - while (1) \ - { \ - DmaCopy##bit(dmaNum, _src, _dest, (block)); \ - _src += (block); \ - _dest += (block); \ - _size -= (block); \ - if (_size <= (block)) \ - { \ - DmaCopy##bit(dmaNum, _src, _dest, _size); \ - break; \ - } \ - } \ -} - -#define DmaClearLarge(dmaNum, dest, size, block, bit) \ -{ \ - void *_dest = dest; \ - u32 _size = size; \ - while (1) \ - { \ - DmaFill##bit(dmaNum, 0, _dest, (block)); \ - _dest += (block); \ - _size -= (block); \ - if (_size <= (block)) \ - { \ - DmaFill##bit(dmaNum, 0, _dest, _size); \ - break; \ - } \ - } \ -} - -#define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16) -#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) - -#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16) -#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32) - -#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ -{ \ - const void *_src = src; \ - void *_dest = (void *)(dest); \ - u32 _size = size; \ - DmaCopy##bit(dmaNum, _src, _dest, _size); \ -} - -#define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16) -#define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32) - -#define DmaFillLarge(dmaNum, fillval, dest, size, block, bit) \ -{ \ - void *_dest = (void *)(dest); \ - u32 _size = (u32)(size); \ - while (1) \ - { \ - DmaFill##bit(dmaNum, fillval, _dest, (block)); \ - _dest += (block); \ - _size -= (block); \ - if (_size <= (block)) \ - { \ - DmaFill##bit(dmaNum, fillval, _dest, _size); \ - break; \ - } \ - } \ -} - -#define DmaFill16Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 16) -#define DmaFill32Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 32) - -#define DmaFillDefvars(dmaNum, fillval, dest, size, bit) \ -{ \ - void *_dest = (void *)(dest); \ - u32 _size = (u##bit)(size); \ - DmaFill##bit(dmaNum, fillval, _dest, _size); \ -} - -#define DmaFill16Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 16) -#define DmaFill32Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 32) - -#if PLATFORM_GBA -#define DmaWait(dmaNum) \ -{ \ - vu32 *dmaRegs = (vu32 *)REG_ADDR_DMA##dmaNum##SAD; \ - while (dmaRegs[2] & (DMA_ENABLE << 16)) \ - ; \ -} -#else -extern void DmaWait(int dmaNum); -#endif - -// from pokeemerald -// Maximum amount of data we will transfer in one operation -#define MAX_DMA_BLOCK_SIZE 0x1000 - -#define MAX_DMA_REQUESTS 128 - -#define DMA_REQUEST_COPY32 1 -#define DMA_REQUEST_FILL32 2 -#define DMA_REQUEST_COPY16 3 -#define DMA_REQUEST_FILL16 4 - -#define Dma3CopyLarge_(src, dest, size, bit) \ -{ \ - const void *_src = src; \ - void *_dest = dest; \ - u32 _size = size; \ - while (1) \ - { \ - if (_size <= MAX_DMA_BLOCK_SIZE) \ - { \ - DmaCopy##bit(3, _src, _dest, _size); \ - break; \ - } \ - DmaCopy##bit(3, _src, _dest, MAX_DMA_BLOCK_SIZE); \ - _src += MAX_DMA_BLOCK_SIZE; \ - _dest += MAX_DMA_BLOCK_SIZE; \ - _size -= MAX_DMA_BLOCK_SIZE; \ - } \ -} - -#define Dma3CopyLarge16_(src, dest, size) Dma3CopyLarge_(src, dest, size, 16) -#define Dma3CopyLarge32_(src, dest, size) Dma3CopyLarge_(src, dest, size, 32) - -#define Dma3FillLarge_(value, dest, size, bit) \ -{ \ - void *_dest = dest; \ - u32 _size = size; \ - while (1) \ - { \ - if (_size <= MAX_DMA_BLOCK_SIZE) \ - { \ - DmaFill##bit(3, value, _dest, _size); \ - break; \ - } \ - DmaFill##bit(3, value, _dest, MAX_DMA_BLOCK_SIZE); \ - _dest += MAX_DMA_BLOCK_SIZE; \ - _size -= MAX_DMA_BLOCK_SIZE; \ - } \ -} - -#define Dma3FillLarge16_(value, dest, size) Dma3FillLarge_(value, dest, size, 16) -#define Dma3FillLarge32_(value, dest, size) Dma3FillLarge_(value, dest, size, 32) - -#endif // GUARD_GBA_DMA_MACROS_H diff --git a/sa1/include/gba/gba.h b/sa1/include/gba/gba.h deleted file mode 100644 index 349344031..000000000 --- a/sa1/include/gba/gba.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef GUARD_GBA_GBA_H -#define GUARD_GBA_GBA_H - -#include "gba/defines.h" -#include "gba/io_reg.h" -#include "gba/types.h" -#include "gba/multiboot.h" -#include "gba/syscall.h" -#include "gba/macro.h" -#include "gba/isagbprint.h" - -#endif // GUARD_GBA_GBA_H diff --git a/sa1/include/gba/io_reg.h b/sa1/include/gba/io_reg.h deleted file mode 100644 index 237fec076..000000000 --- a/sa1/include/gba/io_reg.h +++ /dev/null @@ -1,824 +0,0 @@ -#ifndef GUARD_GBA_IO_REG_H -#define GUARD_GBA_IO_REG_H - -#if !GEN_CTX -#include -#endif - -#define IO_SIZE 0x400 -#if !PORTABLE -#define REG_BASE 0x4000000 // I/O register base address -#else -// TODO: Needs to be u8 because of the address macros -extern unsigned char REG_BASE[IO_SIZE]; -#endif - -// I/O register offsets - -#define REG_OFFSET_DISPCNT 0x0 -#define REG_OFFSET_DISPSTAT 0x4 -#define REG_OFFSET_VCOUNT 0x6 -#define REG_OFFSET_BG0CNT 0x8 -#define REG_OFFSET_BG1CNT 0xa -#define REG_OFFSET_BG2CNT 0xc -#define REG_OFFSET_BG3CNT 0xe -#define REG_OFFSET_BG0HOFS 0x10 -#define REG_OFFSET_BG0VOFS 0x12 -#define REG_OFFSET_BG1HOFS 0x14 -#define REG_OFFSET_BG1VOFS 0x16 -#define REG_OFFSET_BG2HOFS 0x18 -#define REG_OFFSET_BG2VOFS 0x1a -#define REG_OFFSET_BG3HOFS 0x1c -#define REG_OFFSET_BG3VOFS 0x1e -#define REG_OFFSET_BG2PA 0x20 -#define REG_OFFSET_BG2PB 0x22 -#define REG_OFFSET_BG2PC 0x24 -#define REG_OFFSET_BG2PD 0x26 -#define REG_OFFSET_BG2X 0x28 -#define REG_OFFSET_BG2X_L 0x28 -#define REG_OFFSET_BG2X_H 0x2a -#define REG_OFFSET_BG2Y 0x2c -#define REG_OFFSET_BG2Y_L 0x2c -#define REG_OFFSET_BG2Y_H 0x2e -#define REG_OFFSET_BG3PA 0x30 -#define REG_OFFSET_BG3PB 0x32 -#define REG_OFFSET_BG3PC 0x34 -#define REG_OFFSET_BG3PD 0x36 -#define REG_OFFSET_BG3X 0x38 -#define REG_OFFSET_BG3X_L 0x38 -#define REG_OFFSET_BG3X_H 0x3a -#define REG_OFFSET_BG3Y 0x3c -#define REG_OFFSET_BG3Y_L 0x3c -#define REG_OFFSET_BG3Y_H 0x3e - -#define REG_OFFSET_WIN 0x40 - -#define REG_OFFSET_WIN0H (REG_OFFSET_WIN + sizeof(winreg_t) * 0) -#define REG_OFFSET_WIN1H (REG_OFFSET_WIN + sizeof(winreg_t) * 1) -#define REG_OFFSET_WIN0V (REG_OFFSET_WIN + sizeof(winreg_t) * 2) -#define REG_OFFSET_WIN1V (REG_OFFSET_WIN + sizeof(winreg_t) * 3) -#define REG_OFFSET_WININ (REG_OFFSET_WIN + sizeof(winreg_t) * 4) -#define REG_OFFSET_WINOUT (REG_OFFSET_WIN + sizeof(winreg_t) * 5) - -#define REG_OFFSET_WIN_END (REG_OFFSET_WIN + sizeof(winreg_t) * 6) - -#define REG_OFFSET_MOSAIC REG_OFFSET_WIN_END // 0x4C -#define REG_OFFSET_BLDCNT (REG_OFFSET_MOSAIC + 4) // 0x50 -#define REG_OFFSET_BLDALPHA (REG_OFFSET_BLDCNT + 2) // 0x52 -#define REG_OFFSET_BLDY (REG_OFFSET_BLDALPHA + 2) // 0x54 - -// Starts at 10 after BLDY (0x60 on the GBA) -#define REG_OFFSET_SOUND REG_OFFSET_BLDY + 2 + 10 // 0x60 - -#define REG_OFFSET_SOUND1CNT_L REG_OFFSET_SOUND + 0x0 -#define REG_OFFSET_NR10 REG_OFFSET_SOUND + 0x0 -#define REG_OFFSET_SOUND1CNT_H REG_OFFSET_SOUND + 0x2 -#define REG_OFFSET_NR11 REG_OFFSET_SOUND + 0x2 -#define REG_OFFSET_NR12 REG_OFFSET_SOUND + 0x3 -#define REG_OFFSET_SOUND1CNT_X REG_OFFSET_SOUND + 0x4 -#define REG_OFFSET_NR13 REG_OFFSET_SOUND + 0x4 -#define REG_OFFSET_NR14 REG_OFFSET_SOUND + 0x5 -#define REG_OFFSET_SOUND2CNT_L REG_OFFSET_SOUND + 0x8 -#define REG_OFFSET_NR21 REG_OFFSET_SOUND + 0x8 -#define REG_OFFSET_NR22 REG_OFFSET_SOUND + 0x9 -#define REG_OFFSET_SOUND2CNT_H REG_OFFSET_SOUND + 0xC -#define REG_OFFSET_NR23 REG_OFFSET_SOUND + 0xC -#define REG_OFFSET_NR24 REG_OFFSET_SOUND + 0xD -#define REG_OFFSET_SOUND3CNT_L REG_OFFSET_SOUND + 0x10 -#define REG_OFFSET_NR30 REG_OFFSET_SOUND + 0x10 -#define REG_OFFSET_SOUND3CNT_H REG_OFFSET_SOUND + 0x12 -#define REG_OFFSET_NR31 REG_OFFSET_SOUND + 0x12 -#define REG_OFFSET_NR32 REG_OFFSET_SOUND + 0x13 -#define REG_OFFSET_SOUND3CNT_X REG_OFFSET_SOUND + 0x14 -#define REG_OFFSET_NR33 REG_OFFSET_SOUND + 0x14 -#define REG_OFFSET_NR34 REG_OFFSET_SOUND + 0x15 -#define REG_OFFSET_SOUND4CNT_L REG_OFFSET_SOUND + 0x18 -#define REG_OFFSET_NR41 REG_OFFSET_SOUND + 0x18 -#define REG_OFFSET_NR42 REG_OFFSET_SOUND + 0x19 -#define REG_OFFSET_SOUND4CNT_H REG_OFFSET_SOUND + 0x1c -#define REG_OFFSET_NR43 REG_OFFSET_SOUND + 0x1c -#define REG_OFFSET_NR44 REG_OFFSET_SOUND + 0x1d -#define REG_OFFSET_SOUNDCNT_L REG_OFFSET_SOUND + 0x20 -#define REG_OFFSET_NR50 REG_OFFSET_SOUND + 0x20 -#define REG_OFFSET_NR51 REG_OFFSET_SOUND + 0x21 -#define REG_OFFSET_SOUNDCNT_H REG_OFFSET_SOUND + 0x22 -#define REG_OFFSET_SOUNDCNT_X REG_OFFSET_SOUND + 0x24 -#define REG_OFFSET_NR52 REG_OFFSET_SOUND + 0x24 -#define REG_OFFSET_SOUNDBIAS REG_OFFSET_SOUND + 0x28 -#define REG_OFFSET_SOUNDBIAS_L REG_OFFSET_SOUND + 0x28 -#define REG_OFFSET_SOUNDBIAS_H REG_OFFSET_SOUND + 0x29 -#define REG_OFFSET_WAVE_RAM0 REG_OFFSET_SOUND + 0x30 -#define REG_OFFSET_WAVE_RAM1 REG_OFFSET_SOUND + 0x34 -#define REG_OFFSET_WAVE_RAM2 REG_OFFSET_SOUND + 0x38 -#define REG_OFFSET_WAVE_RAM3 REG_OFFSET_SOUND + 0x3c -#define REG_OFFSET_FIFO_A REG_OFFSET_SOUND + 0x40 -#define REG_OFFSET_FIFO_B REG_OFFSET_SOUND + 0x44 - -#define REG_OFFSET_DMA REG_OFFSET_SOUND + 0x50 -#if !USE_NEW_DMA -#define REG_OFFSET_DMA0SAD REG_OFFSET_DMA -#define REG_OFFSET_DMA0DAD 0xb4 -#define REG_OFFSET_DMA0CNT 0xb8 -#define REG_OFFSET_DMA0CNT_L 0xb8 -#define REG_OFFSET_DMA0CNT_H 0xba -#define REG_OFFSET_DMA1SAD 0xbc -#define REG_OFFSET_DMA1DAD 0xc0 -#define REG_OFFSET_DMA1CNT 0xc4 -#define REG_OFFSET_DMA1CNT_L 0xc4 -#define REG_OFFSET_DMA1CNT_H 0xc6 -#define REG_OFFSET_DMA2SAD 0xc8 -#define REG_OFFSET_DMA2DAD 0xcc -#define REG_OFFSET_DMA2CNT 0xd0 -#define REG_OFFSET_DMA2CNT_L 0xd0 -#define REG_OFFSET_DMA2CNT_H 0xd2 -#define REG_OFFSET_DMA3SAD 0xd4 -#define REG_OFFSET_DMA3DAD 0xd8 -#define REG_OFFSET_DMA3CNT 0xdc -#define REG_OFFSET_DMA3CNT_L 0xdc -#define REG_OFFSET_DMA3CNT_H 0xde -#else -// To fit this into the same memory footprint on 64bit, -// We need to put the control registers behind the pointers to avoid padding. -#define REG_OFFSET_DMA0SAD REG_OFFSET_DMA -#define REG_OFFSET_DMA1SAD (REG_OFFSET_DMA0SAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA2SAD (REG_OFFSET_DMA1SAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA3SAD (REG_OFFSET_DMA2SAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA0DAD (REG_OFFSET_DMA3SAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA1DAD (REG_OFFSET_DMA0DAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA2DAD (REG_OFFSET_DMA1DAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA3DAD (REG_OFFSET_DMA2DAD + sizeof(uintptr_t)) - -#define REG_OFFSET_DMA0CNT (REG_OFFSET_DMA3DAD + sizeof(uintptr_t)) -#define REG_OFFSET_DMA0CNT_L (REG_OFFSET_DMA0CNT + 0) -#define REG_OFFSET_DMA0CNT_H (REG_OFFSET_DMA0CNT_L + sizeof(uint16_t)) -#define REG_OFFSET_DMA1CNT (REG_OFFSET_DMA0CNT_H + sizeof(uint16_t)) -#define REG_OFFSET_DMA1CNT_L (REG_OFFSET_DMA1CNT + 0) -#define REG_OFFSET_DMA1CNT_H (REG_OFFSET_DMA1CNT_L + sizeof(uint16_t)) -#define REG_OFFSET_DMA2CNT (REG_OFFSET_DMA1CNT_H + sizeof(uint16_t)) -#define REG_OFFSET_DMA2CNT_L (REG_OFFSET_DMA2CNT + 0) -#define REG_OFFSET_DMA2CNT_H (REG_OFFSET_DMA2CNT_L + sizeof(uint16_t)) -#define REG_OFFSET_DMA3CNT (REG_OFFSET_DMA2CNT_H + sizeof(uint16_t)) -#define REG_OFFSET_DMA3CNT_L (REG_OFFSET_DMA3CNT + 0) -#define REG_OFFSET_DMA3CNT_H (REG_OFFSET_DMA3CNT_L + sizeof(uint16_t)) -#endif - -#define REG_OFFSET_TMCNT 0x100 -#define REG_OFFSET_TMCNT_L 0x100 -#define REG_OFFSET_TMCNT_H 0x102 -#define REG_OFFSET_TM0CNT 0x100 -#define REG_OFFSET_TM0CNT_L 0x100 -#define REG_OFFSET_TM0CNT_H 0x102 -#define REG_OFFSET_TM1CNT 0x104 -#define REG_OFFSET_TM1CNT_L 0x104 -#define REG_OFFSET_TM1CNT_H 0x106 -#define REG_OFFSET_TM2CNT 0x108 -#define REG_OFFSET_TM2CNT_L 0x108 -#define REG_OFFSET_TM2CNT_H 0x10a -#define REG_OFFSET_TM3CNT 0x10c -#define REG_OFFSET_TM3CNT_L 0x10c -#define REG_OFFSET_TM3CNT_H 0x10e - -#define REG_OFFSET_SIOCNT 0x128 -#define REG_OFFSET_SIODATA8 0x12a -#define REG_OFFSET_SIODATA32 0x120 -#define REG_OFFSET_SIOMLT_SEND 0x12a -#define REG_OFFSET_SIOMLT_RECV 0x120 -#define REG_OFFSET_SIOMULTI0 0x120 -#define REG_OFFSET_SIOMULTI1 0x122 -#define REG_OFFSET_SIOMULTI2 0x124 -#define REG_OFFSET_SIOMULTI3 0x126 - -#define REG_OFFSET_KEYINPUT 0x130 -#define REG_OFFSET_KEYCNT 0x132 - -#define REG_OFFSET_RCNT 0x134 - -#define REG_OFFSET_JOYCNT 0x140 -#define REG_OFFSET_JOYSTAT 0x158 -#define REG_OFFSET_JOY_RECV 0x150 -#define REG_OFFSET_JOY_RECV_L 0x150 -#define REG_OFFSET_JOY_RECV_H 0x152 -#define REG_OFFSET_JOY_TRANS 0x154 -#define REG_OFFSET_JOY_TRANS_L 0x154 -#define REG_OFFSET_JOY_TRANS_H 0x156 - -#define REG_OFFSET_IME 0x208 -#define REG_OFFSET_IE 0x200 -#define REG_OFFSET_IF 0x202 - -#define REG_OFFSET_WAITCNT 0x204 - -// I/O register addresses - -#define REG_ADDR_DISPCNT (REG_BASE + REG_OFFSET_DISPCNT) -#define REG_ADDR_DISPSTAT (REG_BASE + REG_OFFSET_DISPSTAT) -#define REG_ADDR_VCOUNT (REG_BASE + REG_OFFSET_VCOUNT) -#define REG_ADDR_BG0CNT (REG_BASE + REG_OFFSET_BG0CNT) -#define REG_ADDR_BG1CNT (REG_BASE + REG_OFFSET_BG1CNT) -#define REG_ADDR_BG2CNT (REG_BASE + REG_OFFSET_BG2CNT) -#define REG_ADDR_BG3CNT (REG_BASE + REG_OFFSET_BG3CNT) -#define REG_ADDR_BG0HOFS (REG_BASE + REG_OFFSET_BG0HOFS) -#define REG_ADDR_BG0VOFS (REG_BASE + REG_OFFSET_BG0VOFS) -#define REG_ADDR_BG1HOFS (REG_BASE + REG_OFFSET_BG1HOFS) -#define REG_ADDR_BG1VOFS (REG_BASE + REG_OFFSET_BG1VOFS) -#define REG_ADDR_BG2HOFS (REG_BASE + REG_OFFSET_BG2HOFS) -#define REG_ADDR_BG2VOFS (REG_BASE + REG_OFFSET_BG2VOFS) -#define REG_ADDR_BG3HOFS (REG_BASE + REG_OFFSET_BG3HOFS) -#define REG_ADDR_BG3VOFS (REG_BASE + REG_OFFSET_BG3VOFS) -#define REG_ADDR_BG2PA (REG_BASE + REG_OFFSET_BG2PA) -#define REG_ADDR_BG2PB (REG_BASE + REG_OFFSET_BG2PB) -#define REG_ADDR_BG2PC (REG_BASE + REG_OFFSET_BG2PC) -#define REG_ADDR_BG2PD (REG_BASE + REG_OFFSET_BG2PD) -#define REG_ADDR_BG2X (REG_BASE + REG_OFFSET_BG2X) -#define REG_ADDR_BG2X_L (REG_BASE + REG_OFFSET_BG2X_L) -#define REG_ADDR_BG2X_H (REG_BASE + REG_OFFSET_BG2X_H) -#define REG_ADDR_BG2Y (REG_BASE + REG_OFFSET_BG2Y) -#define REG_ADDR_BG2Y_L (REG_BASE + REG_OFFSET_BG2Y_L) -#define REG_ADDR_BG2Y_H (REG_BASE + REG_OFFSET_BG2Y_H) -#define REG_ADDR_BG3PA (REG_BASE + REG_OFFSET_BG3PA) -#define REG_ADDR_BG3PB (REG_BASE + REG_OFFSET_BG3PB) -#define REG_ADDR_BG3PC (REG_BASE + REG_OFFSET_BG3PC) -#define REG_ADDR_BG3PD (REG_BASE + REG_OFFSET_BG3PD) -#define REG_ADDR_BG3X (REG_BASE + REG_OFFSET_BG3X) -#define REG_ADDR_BG3X_L (REG_BASE + REG_OFFSET_BG3X_L) -#define REG_ADDR_BG3X_H (REG_BASE + REG_OFFSET_BG3X_H) -#define REG_ADDR_BG3Y (REG_BASE + REG_OFFSET_BG3Y) -#define REG_ADDR_BG3Y_L (REG_BASE + REG_OFFSET_BG3Y_L) -#define REG_ADDR_BG3Y_H (REG_BASE + REG_OFFSET_BG3Y_H) -#define REG_ADDR_WIN0H (REG_BASE + REG_OFFSET_WIN0H) -#define REG_ADDR_WIN1H (REG_BASE + REG_OFFSET_WIN1H) -#define REG_ADDR_WIN0V (REG_BASE + REG_OFFSET_WIN0V) -#define REG_ADDR_WIN1V (REG_BASE + REG_OFFSET_WIN1V) -#define REG_ADDR_WININ (REG_BASE + REG_OFFSET_WININ) -#define REG_ADDR_WINOUT (REG_BASE + REG_OFFSET_WINOUT) -#define REG_ADDR_MOSAIC (REG_BASE + REG_OFFSET_MOSAIC) -#define REG_ADDR_BLDCNT (REG_BASE + REG_OFFSET_BLDCNT) -#define REG_ADDR_BLDALPHA (REG_BASE + REG_OFFSET_BLDALPHA) -#define REG_ADDR_BLDY (REG_BASE + REG_OFFSET_BLDY) - -#define REG_ADDR_SOUND1CNT_L (REG_BASE + REG_OFFSET_SOUND1CNT_L) -#define REG_ADDR_NR10 (REG_BASE + REG_OFFSET_NR10) -#define REG_ADDR_SOUND1CNT_H (REG_BASE + REG_OFFSET_SOUND1CNT_H) -#define REG_ADDR_NR11 (REG_BASE + REG_OFFSET_NR11) -#define REG_ADDR_NR12 (REG_BASE + REG_OFFSET_NR12) -#define REG_ADDR_SOUND1CNT_X (REG_BASE + REG_OFFSET_SOUND1CNT_X) -#define REG_ADDR_NR13 (REG_BASE + REG_OFFSET_NR13) -#define REG_ADDR_NR14 (REG_BASE + REG_OFFSET_NR14) -#define REG_ADDR_SOUND2CNT_L (REG_BASE + REG_OFFSET_SOUND2CNT_L) -#define REG_ADDR_NR21 (REG_BASE + REG_OFFSET_NR21) -#define REG_ADDR_NR22 (REG_BASE + REG_OFFSET_NR22) -#define REG_ADDR_SOUND2CNT_H (REG_BASE + REG_OFFSET_SOUND2CNT_H) -#define REG_ADDR_NR23 (REG_BASE + REG_OFFSET_NR23) -#define REG_ADDR_NR24 (REG_BASE + REG_OFFSET_NR24) -#define REG_ADDR_SOUND3CNT_L (REG_BASE + REG_OFFSET_SOUND3CNT_L) -#define REG_ADDR_NR30 (REG_BASE + REG_OFFSET_NR30) -#define REG_ADDR_SOUND3CNT_H (REG_BASE + REG_OFFSET_SOUND3CNT_H) -#define REG_ADDR_NR31 (REG_BASE + REG_OFFSET_NR31) -#define REG_ADDR_NR32 (REG_BASE + REG_OFFSET_NR32) -#define REG_ADDR_SOUND3CNT_X (REG_BASE + REG_OFFSET_SOUND3CNT_X) -#define REG_ADDR_NR33 (REG_BASE + REG_OFFSET_NR33) -#define REG_ADDR_NR34 (REG_BASE + REG_OFFSET_NR34) -#define REG_ADDR_SOUND4CNT_L (REG_BASE + REG_OFFSET_SOUND4CNT_L) -#define REG_ADDR_NR41 (REG_BASE + REG_OFFSET_NR41) -#define REG_ADDR_NR42 (REG_BASE + REG_OFFSET_NR42) -#define REG_ADDR_SOUND4CNT_H (REG_BASE + REG_OFFSET_SOUND4CNT_H) -#define REG_ADDR_NR43 (REG_BASE + REG_OFFSET_NR43) -#define REG_ADDR_NR44 (REG_BASE + REG_OFFSET_NR44) -#define REG_ADDR_SOUNDCNT_L (REG_BASE + REG_OFFSET_SOUNDCNT_L) -#define REG_ADDR_NR50 (REG_BASE + REG_OFFSET_NR50) -#define REG_ADDR_NR51 (REG_BASE + REG_OFFSET_NR51) -#define REG_ADDR_SOUNDCNT_H (REG_BASE + REG_OFFSET_SOUNDCNT_H) -#define REG_ADDR_SOUNDCNT_X (REG_BASE + REG_OFFSET_SOUNDCNT_X) -#define REG_ADDR_NR52 (REG_BASE + REG_OFFSET_NR52) -#define REG_ADDR_SOUNDBIAS (REG_BASE + REG_OFFSET_SOUNDBIAS) -#define REG_ADDR_SOUNDBIAS_L (REG_BASE + REG_OFFSET_SOUNDBIAS_L) -#define REG_ADDR_SOUNDBIAS_H (REG_BASE + REG_OFFSET_SOUNDBIAS_H) -#define REG_ADDR_WAVE_RAM0 (REG_BASE + REG_OFFSET_WAVE_RAM0) -#define REG_ADDR_WAVE_RAM1 (REG_BASE + REG_OFFSET_WAVE_RAM1) -#define REG_ADDR_WAVE_RAM2 (REG_BASE + REG_OFFSET_WAVE_RAM2) -#define REG_ADDR_WAVE_RAM3 (REG_BASE + REG_OFFSET_WAVE_RAM3) -#define REG_ADDR_FIFO_A (REG_BASE + REG_OFFSET_FIFO_A) -#define REG_ADDR_FIFO_B (REG_BASE + REG_OFFSET_FIFO_B) - -#define REG_ADDR_DMA0SAD (REG_BASE + REG_OFFSET_DMA0SAD) -#define REG_ADDR_DMA0DAD (REG_BASE + REG_OFFSET_DMA0DAD) -#define REG_ADDR_DMA0CNT (REG_BASE + REG_OFFSET_DMA0CNT) -#define REG_ADDR_DMA0CNT_L (REG_BASE + REG_OFFSET_DMA0CNT_L) -#define REG_ADDR_DMA0CNT_H (REG_BASE + REG_OFFSET_DMA0CNT_H) -#define REG_ADDR_DMA1SAD (REG_BASE + REG_OFFSET_DMA1SAD) -#define REG_ADDR_DMA1DAD (REG_BASE + REG_OFFSET_DMA1DAD) -#define REG_ADDR_DMA1CNT (REG_BASE + REG_OFFSET_DMA1CNT) -#define REG_ADDR_DMA1CNT_L (REG_BASE + REG_OFFSET_DMA1CNT_L) -#define REG_ADDR_DMA1CNT_H (REG_BASE + REG_OFFSET_DMA1CNT_H) -#define REG_ADDR_DMA2SAD (REG_BASE + REG_OFFSET_DMA2SAD) -#define REG_ADDR_DMA2DAD (REG_BASE + REG_OFFSET_DMA2DAD) -#define REG_ADDR_DMA2CNT (REG_BASE + REG_OFFSET_DMA2CNT) -#define REG_ADDR_DMA2CNT_L (REG_BASE + REG_OFFSET_DMA2CNT_L) -#define REG_ADDR_DMA2CNT_H (REG_BASE + REG_OFFSET_DMA2CNT_H) -#define REG_ADDR_DMA3SAD (REG_BASE + REG_OFFSET_DMA3SAD) -#define REG_ADDR_DMA3DAD (REG_BASE + REG_OFFSET_DMA3DAD) -#define REG_ADDR_DMA3CNT (REG_BASE + REG_OFFSET_DMA3CNT) -#define REG_ADDR_DMA3CNT_L (REG_BASE + REG_OFFSET_DMA3CNT_L) -#define REG_ADDR_DMA3CNT_H (REG_BASE + REG_OFFSET_DMA3CNT_H) - -#define REG_ADDR_TMCNT (REG_BASE + REG_OFFSET_TMCNT) -#define REG_ADDR_TMCNT_L (REG_BASE + REG_OFFSET_TMCNT_L) -#define REG_ADDR_TMCNT_H (REG_BASE + REG_OFFSET_TMCNT_H) -#define REG_ADDR_TM0CNT (REG_BASE + REG_OFFSET_TM0CNT) -#define REG_ADDR_TM0CNT_L (REG_BASE + REG_OFFSET_TM0CNT_L) -#define REG_ADDR_TM0CNT_H (REG_BASE + REG_OFFSET_TM0CNT_H) -#define REG_ADDR_TM1CNT (REG_BASE + REG_OFFSET_TM1CNT) -#define REG_ADDR_TM1CNT_L (REG_BASE + REG_OFFSET_TM1CNT_L) -#define REG_ADDR_TM1CNT_H (REG_BASE + REG_OFFSET_TM1CNT_H) -#define REG_ADDR_TM2CNT (REG_BASE + REG_OFFSET_TM2CNT) -#define REG_ADDR_TM2CNT_L (REG_BASE + REG_OFFSET_TM2CNT_L) -#define REG_ADDR_TM2CNT_H (REG_BASE + REG_OFFSET_TM2CNT_H) -#define REG_ADDR_TM3CNT (REG_BASE + REG_OFFSET_TM3CNT) -#define REG_ADDR_TM3CNT_L (REG_BASE + REG_OFFSET_TM3CNT_L) -#define REG_ADDR_TM3CNT_H (REG_BASE + REG_OFFSET_TM3CNT_H) - -#define REG_ADDR_SIOCNT (REG_BASE + REG_OFFSET_SIOCNT) -#define REG_ADDR_SIODATA8 (REG_BASE + REG_OFFSET_SIODATA8) -#define REG_ADDR_SIODATA32 (REG_BASE + REG_OFFSET_SIODATA32) -#define REG_ADDR_SIOMLT_SEND (REG_BASE + REG_OFFSET_SIOMLT_SEND) -#define REG_ADDR_SIOMLT_RECV (REG_BASE + REG_OFFSET_SIOMLT_RECV) -#define REG_ADDR_SIOMULTI0 (REG_BASE + REG_OFFSET_SIOMULTI0) -#define REG_ADDR_SIOMULTI1 (REG_BASE + REG_OFFSET_SIOMULTI1) -#define REG_ADDR_SIOMULTI2 (REG_BASE + REG_OFFSET_SIOMULTI2) -#define REG_ADDR_SIOMULTI3 (REG_BASE + REG_OFFSET_SIOMULTI3) - -#define REG_ADDR_KEYINPUT (REG_BASE + REG_OFFSET_KEYINPUT) -#define REG_ADDR_KEYCNT (REG_BASE + REG_OFFSET_KEYCNT) - -#define REG_ADDR_RCNT (REG_BASE + REG_OFFSET_RCNT) - -#define REG_ADDR_JOYCNT (REG_BASE + REG_OFFSET_JOYCNT) -#define REG_ADDR_JOYSTAT (REG_BASE + REG_OFFSET_JOYSTAT) -#define REG_ADDR_JOY_RECV (REG_BASE + REG_OFFSET_JOY_RECV) -#define REG_ADDR_JOY_RECV_L (REG_BASE + REG_OFFSET_JOY_RECV_L) -#define REG_ADDR_JOY_RECV_H (REG_BASE + REG_OFFSET_JOY_RECV_H) -#define REG_ADDR_JOY_TRANS (REG_BASE + REG_OFFSET_JOY_TRANS) -#define REG_ADDR_JOY_TRANS_L (REG_BASE + REG_OFFSET_JOY_TRANS_L) -#define REG_ADDR_JOY_TRANS_H (REG_BASE + REG_OFFSET_JOY_TRANS_H) - -#define REG_ADDR_IME (REG_BASE + REG_OFFSET_IME) -#define REG_ADDR_IE (REG_BASE + REG_OFFSET_IE) -#define REG_ADDR_IF (REG_BASE + REG_OFFSET_IF) - -#define REG_ADDR_WAITCNT (REG_BASE + REG_OFFSET_WAITCNT) - -// I/O registers - -#define REG_DISPCNT (*(vu16 *)REG_ADDR_DISPCNT) -#define REG_DISPSTAT (*(vu16 *)REG_ADDR_DISPSTAT) -#define REG_VCOUNT (*(vu16 *)REG_ADDR_VCOUNT) -#define REG_BG0CNT (*(vu16 *)REG_ADDR_BG0CNT) -#define REG_BG1CNT (*(vu16 *)REG_ADDR_BG1CNT) -#define REG_BG2CNT (*(vu16 *)REG_ADDR_BG2CNT) -#define REG_BG3CNT (*(vu16 *)REG_ADDR_BG3CNT) -#define REG_BG0HOFS (*(vu16 *)REG_ADDR_BG0HOFS) -#define REG_BG0VOFS (*(vu16 *)REG_ADDR_BG0VOFS) -#define REG_BG1HOFS (*(vu16 *)REG_ADDR_BG1HOFS) -#define REG_BG1VOFS (*(vu16 *)REG_ADDR_BG1VOFS) -#define REG_BG2HOFS (*(vu16 *)REG_ADDR_BG2HOFS) -#define REG_BG2VOFS (*(vu16 *)REG_ADDR_BG2VOFS) -#define REG_BG3HOFS (*(vu16 *)REG_ADDR_BG3HOFS) -#define REG_BG3VOFS (*(vu16 *)REG_ADDR_BG3VOFS) -#define REG_BG2PA (*(vu16 *)REG_ADDR_BG2PA) -#define REG_BG2PB (*(vu16 *)REG_ADDR_BG2PB) -#define REG_BG2PC (*(vu16 *)REG_ADDR_BG2PC) -#define REG_BG2PD (*(vu16 *)REG_ADDR_BG2PD) -#define REG_BG2X (*(vu32 *)REG_ADDR_BG2X) -#define REG_BG2X_L (*(vu16 *)REG_ADDR_BG2X_L) -#define REG_BG2X_H (*(vu16 *)REG_ADDR_BG2X_H) -#define REG_BG2Y (*(vu32 *)REG_ADDR_BG2Y) -#define REG_BG2Y_L (*(vu16 *)REG_ADDR_BG2Y_L) -#define REG_BG2Y_H (*(vu16 *)REG_ADDR_BG2Y_H) -#define REG_BG3PA (*(vu16 *)REG_ADDR_BG3PA) -#define REG_BG3PB (*(vu16 *)REG_ADDR_BG3PB) -#define REG_BG3PC (*(vu16 *)REG_ADDR_BG3PC) -#define REG_BG3PD (*(vu16 *)REG_ADDR_BG3PD) -#define REG_BG3X (*(vu32 *)REG_ADDR_BG3X) -#define REG_BG3X_L (*(vu16 *)REG_ADDR_BG3X_L) -#define REG_BG3X_H (*(vu16 *)REG_ADDR_BG3X_H) -#define REG_BG3Y (*(vu32 *)REG_ADDR_BG3Y) -#define REG_BG3Y_L (*(vu16 *)REG_ADDR_BG3Y_L) -#define REG_BG3Y_H (*(vu16 *)REG_ADDR_BG3Y_H) -#define REG_WIN0H (*(volatile winreg_t *)REG_ADDR_WIN0H) -#define REG_WIN1H (*(volatile winreg_t *)REG_ADDR_WIN1H) -#define REG_WIN0V (*(volatile winreg_t *)REG_ADDR_WIN0V) -#define REG_WIN1V (*(volatile winreg_t *)REG_ADDR_WIN1V) -#define REG_WININ (*(volatile winreg_t *)REG_ADDR_WININ) -#define REG_WINOUT (*(volatile winreg_t *)REG_ADDR_WINOUT) -#define REG_MOSAIC (*(vu16 *)REG_ADDR_MOSAIC) -#define REG_BLDCNT (*(vu16 *)REG_ADDR_BLDCNT) -#define REG_BLDALPHA (*(vu16 *)REG_ADDR_BLDALPHA) -#define REG_BLDY (*(vu16 *)REG_ADDR_BLDY) - -#define REG_SOUND1CNT_L (*(vu16 *)REG_ADDR_SOUND1CNT_L) -#define REG_NR10 (*(vu8 *)REG_ADDR_NR10) -#define REG_SOUND1CNT_H (*(vu16 *)REG_ADDR_SOUND1CNT_H) -#define REG_NR11 (*(vu8 *)REG_ADDR_NR11) -#define REG_NR12 (*(vu8 *)REG_ADDR_NR12) -#define REG_SOUND1CNT_X (*(vu16 *)REG_ADDR_SOUND1CNT_X) -#define REG_NR13 (*(vu8 *)REG_ADDR_NR13) -#define REG_NR14 (*(vu8 *)REG_ADDR_NR14) -#define REG_SOUND2CNT_L (*(vu16 *)REG_ADDR_SOUND2CNT_L) -#define REG_NR21 (*(vu8 *)REG_ADDR_NR21) -#define REG_NR22 (*(vu8 *)REG_ADDR_NR22) -#define REG_SOUND2CNT_H (*(vu16 *)REG_ADDR_SOUND2CNT_H) -#define REG_NR23 (*(vu8 *)REG_ADDR_NR23) -#define REG_NR24 (*(vu8 *)REG_ADDR_NR24) -#define REG_SOUND3CNT_L (*(vu16 *)REG_ADDR_SOUND3CNT_L) -#define REG_NR30 (*(vu8 *)REG_ADDR_NR30) -#define REG_SOUND3CNT_H (*(vu16 *)REG_ADDR_SOUND3CNT_H) -#define REG_NR31 (*(vu8 *)REG_ADDR_NR31) -#define REG_NR32 (*(vu8 *)REG_ADDR_NR32) -#define REG_SOUND3CNT_X (*(vu16 *)REG_ADDR_SOUND3CNT_X) -#define REG_NR33 (*(vu8 *)REG_ADDR_NR33) -#define REG_NR34 (*(vu8 *)REG_ADDR_NR34) -#define REG_SOUND4CNT_L (*(vu16 *)REG_ADDR_SOUND4CNT_L) -#define REG_NR41 (*(vu8 *)REG_ADDR_NR41) -#define REG_NR42 (*(vu8 *)REG_ADDR_NR42) -#define REG_SOUND4CNT_H (*(vu16 *)REG_ADDR_SOUND4CNT_H) -#define REG_NR43 (*(vu8 *)REG_ADDR_NR43) -#define REG_NR44 (*(vu8 *)REG_ADDR_NR44) -#define REG_SOUNDCNT_L (*(vu16 *)REG_ADDR_SOUNDCNT_L) -#define REG_NR50 (*(vu8 *)REG_ADDR_NR50) -#define REG_NR51 (*(vu8 *)REG_ADDR_NR51) -#define REG_SOUNDCNT_H (*(vu16 *)REG_ADDR_SOUNDCNT_H) -#define REG_SOUNDCNT_X (*(vu16 *)REG_ADDR_SOUNDCNT_X) -#define REG_NR52 (*(vu8 *)REG_ADDR_NR52) -#define REG_SOUNDBIAS (*(vu16 *)REG_ADDR_SOUNDBIAS) -#define REG_SOUNDBIAS_L (*(vu8 *)REG_ADDR_SOUNDBIAS_L) -#define REG_SOUNDBIAS_H (*(vu8 *)REG_ADDR_SOUNDBIAS_H) -#define REG_WAVE_RAM0 (*(vu32 *)REG_ADDR_WAVE_RAM0) -#define REG_WAVE_RAM1 (*(vu32 *)REG_ADDR_WAVE_RAM1) -#define REG_WAVE_RAM2 (*(vu32 *)REG_ADDR_WAVE_RAM2) -#define REG_WAVE_RAM3 (*(vu32 *)REG_ADDR_WAVE_RAM3) -#define REG_FIFO_A (*(vu32 *)REG_ADDR_FIFO_A) -#define REG_FIFO_B (*(vu32 *)REG_ADDR_FIFO_B) - -#define REG_DMA0SAD (*(volatile uintptr_t *)REG_ADDR_DMA0SAD) -#define REG_DMA0DAD (*(volatile uintptr_t *)REG_ADDR_DMA0DAD) -#define REG_DMA0CNT (*(vu32 *)REG_ADDR_DMA0CNT) -#define REG_DMA0CNT_L (*(vu16 *)REG_ADDR_DMA0CNT_L) -#define REG_DMA0CNT_H (*(vu16 *)REG_ADDR_DMA0CNT_H) - -#define REG_DMA1SAD (*(volatile uintptr_t *)REG_ADDR_DMA1SAD) -#define REG_DMA1DAD (*(volatile uintptr_t *)REG_ADDR_DMA1DAD) -#define REG_DMA1CNT (*(vu32 *)REG_ADDR_DMA1CNT) -#define REG_DMA1CNT_L (*(vu16 *)REG_ADDR_DMA1CNT_L) -#define REG_DMA1CNT_H (*(vu16 *)REG_ADDR_DMA1CNT_H) - -#define REG_DMA2SAD (*(volatile uintptr_t *)REG_ADDR_DMA2SAD) -#define REG_DMA2DAD (*(volatile uintptr_t *)REG_ADDR_DMA2DAD) -#define REG_DMA2CNT (*(vu32 *)REG_ADDR_DMA2CNT) -#define REG_DMA2CNT_L (*(vu16 *)REG_ADDR_DMA2CNT_L) -#define REG_DMA2CNT_H (*(vu16 *)REG_ADDR_DMA2CNT_H) - -#define REG_DMA3SAD (*(volatile uintptr_t *)REG_ADDR_DMA3SAD) -#define REG_DMA3DAD (*(volatile uintptr_t *)REG_ADDR_DMA3DAD) -#define REG_DMA3CNT (*(vu32 *)REG_ADDR_DMA3CNT) -#define REG_DMA3CNT_L (*(vu16 *)REG_ADDR_DMA3CNT_L) -#define REG_DMA3CNT_H (*(vu16 *)REG_ADDR_DMA3CNT_H) - -#define REG_TMCNT(n) (*(vu16 *)(REG_ADDR_TMCNT + ((n) * 4))) -#define REG_TM0CNT (*(vu32 *)REG_ADDR_TM0CNT) -#define REG_TM0CNT_L (*(vu16 *)REG_ADDR_TM0CNT_L) -#define REG_TM0CNT_H (*(vu16 *)REG_ADDR_TM0CNT_H) -#define REG_TM1CNT (*(vu32 *)REG_ADDR_TM1CNT) -#define REG_TM1CNT_L (*(vu16 *)REG_ADDR_TM1CNT_L) -#define REG_TM1CNT_H (*(vu16 *)REG_ADDR_TM1CNT_H) -#define REG_TM2CNT (*(vu32 *)REG_ADDR_TM2CNT) -#define REG_TM2CNT_L (*(vu16 *)REG_ADDR_TM2CNT_L) -#define REG_TM2CNT_H (*(vu16 *)REG_ADDR_TM2CNT_H) -#define REG_TM3CNT (*(vu32 *)REG_ADDR_TM3CNT) -#define REG_TM3CNT_L (*(vu16 *)REG_ADDR_TM3CNT_L) -#define REG_TM3CNT_H (*(vu16 *)REG_ADDR_TM3CNT_H) - -#define REG_SIOCNT (*(vu16 *)REG_ADDR_SIOCNT) -#define REG_SIOCNT_32 (*(vu32 *)REG_ADDR_SIOCNT) -#define REG_SIODATA8 (*(vu16 *)REG_ADDR_SIODATA8) -#define REG_SIODATA32 (*(vu32 *)REG_ADDR_SIODATA32) -#define REG_SIOMLT_SEND (*(vu16 *)REG_ADDR_SIOMLT_SEND) -#define REG_SIOMLT_RECV (*(vu64 *)REG_ADDR_SIOMLT_RECV) -#define REG_SIOMULTI0 (*(vu16 *)REG_ADDR_SIOMULTI0) -#define REG_SIOMULTI1 (*(vu16 *)REG_ADDR_SIOMULTI1) -#define REG_SIOMULTI2 (*(vu16 *)REG_ADDR_SIOMULTI2) -#define REG_SIOMULTI3 (*(vu16 *)REG_ADDR_SIOMULTI3) - -#define REG_KEYINPUT (*(vu16 *)REG_ADDR_KEYINPUT) -#define REG_KEYCNT (*(vu16 *)REG_ADDR_KEYCNT) - -#define REG_RCNT (*(vu16 *)REG_ADDR_RCNT) - -#define REG_IME (*(vu16 *)REG_ADDR_IME) -#define REG_IE (*(vu16 *)REG_ADDR_IE) -#define REG_IF (*(vu16 *)REG_ADDR_IF) - -#define REG_WAITCNT (*(vu16 *)REG_ADDR_WAITCNT) - -// I/O register fields - -// DISPCNT -#define DISPCNT_MODE_0 0x0000 // BG0: text, BG1: text, BG2: text, BG3: text -#define DISPCNT_MODE_1 0x0001 // BG0: text, BG1: text, BG2: affine, BG3: off -#define DISPCNT_MODE_2 0x0002 // BG0: off, BG1: off, BG2: affine, BG3: affine -#define DISPCNT_MODE_3 0x0003 // Bitmap mode, 240x160, BGR555 color -#define DISPCNT_MODE_4 0x0004 // Bitmap mode, 240x160, 256 color palette -#define DISPCNT_MODE_5 0x0005 // Bitmap mode, 160x128, BGR555 color -#define DISPCNT_OBJ_1D_MAP 0x0040 -#define DISPCNT_FORCED_BLANK 0x0080 -#define DISPCNT_BG0_ON 0x0100 -#define DISPCNT_BG1_ON 0x0200 -#define DISPCNT_BG2_ON 0x0400 -#define DISPCNT_BG3_ON 0x0800 -#define DISPCNT_BG_ALL_ON 0x0F00 -#define DISPCNT_OBJ_ON 0x1000 -#define DISPCNT_WIN0_ON 0x2000 -#define DISPCNT_WIN1_ON 0x4000 -#define DISPCNT_OBJWIN_ON 0x8000 - -// DISPSTAT -#define DISPSTAT_VBLANK 0x0001 // in V-Blank -#define DISPSTAT_HBLANK 0x0002 // in H-Blank -#define DISPSTAT_VCOUNT 0x0004 // V-Count match -#define DISPSTAT_VBLANK_INTR 0x0008 // V-Blank interrupt enabled -#define DISPSTAT_HBLANK_INTR 0x0010 // H-Blank interrupt enabled -#define DISPSTAT_VCOUNT_INTR 0x0020 // V-Count interrupt enabled - -// BGCNT -// Values 0 - 3. Lower priority BGs will be drawn on top of higher priority BGs. -#define BGCNT_PRIORITY(n) (n) -// Values 0 - 3. Base block for tile pixel data. -// Target pointer: BG_CHAR_ADDR(n) -#define BGCNT_CHARBASE(n) ((n) << 2) -#define BGCNT_MOSAIC 0x0040 -#define BGCNT_16COLOR 0x0000 // 4 bits per pixel -#define BGCNT_256COLOR 0x0080 // 8 bits per pixel -#define BGCNT_SCREENBASE(n) ((n) << 8) // Values 0 - 31. Base block for tile map. -#if !WIDESCREEN_HACK -#define BGCNT_SCREENBASE_MASK 0x1F00 -#else -// Luckily BGCNT_WRAP is not used with text-mode backgrounds, which stage maps are. -#define BGCNT_SCREENBASE_MASK 0x3F00 -#endif -#define BGCNT_WRAP 0x2000 // Only affects affine BGs. Text BGs wrap by default. -#define BGCNT_TXT256x256 0x0000 // Internal screen size size of text mode BG in pixels. -#define BGCNT_TXT512x256 0x4000 -#define BGCNT_TXT256x512 0x8000 -#define BGCNT_TXT512x512 0xC000 -#define BGCNT_AFF128x128 0x0000 // Internal screen size size of affine mode BG in pixels. -#define BGCNT_AFF256x256 0x4000 -#define BGCNT_AFF512x512 0x8000 -#define BGCNT_AFF1024x1024 0xC000 -#define BGCNT_TXTAFF_MASK 0xC000 - -// WININ/OUT -#define WININ_WIN0_BG0 (1 << 0) -#define WININ_WIN0_BG1 (1 << 1) -#define WININ_WIN0_BG2 (1 << 2) -#define WININ_WIN0_BG3 (1 << 3) -#define WININ_WIN0_BG_ALL (WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3) -#define WININ_WIN0_OBJ (1 << 4) -#define WININ_WIN0_CLR (1 << 5) -#define WININ_WIN0_ALL (WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR) -#define WININ_WIN1_BG0 (1 << 8) -#define WININ_WIN1_BG1 (1 << 9) -#define WININ_WIN1_BG2 (1 << 10) -#define WININ_WIN1_BG3 (1 << 11) -#define WININ_WIN1_BG_ALL (WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3) -#define WININ_WIN1_OBJ (1 << 12) -#define WININ_WIN1_CLR (1 << 13) -#define WININ_WIN1_ALL (WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR) - -#define WINOUT_WIN01_BG0 (1 << 0) -#define WINOUT_WIN01_BG1 (1 << 1) -#define WINOUT_WIN01_BG2 (1 << 2) -#define WINOUT_WIN01_BG3 (1 << 3) -#define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3) -#define WINOUT_WIN01_OBJ (1 << 4) -#define WINOUT_WIN01_CLR (1 << 5) -#define WINOUT_WIN01_ALL (WINOUT_WIN01_BG_ALL | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR) -#define WINOUT_WINOBJ_BG0 (1 << 8) -#define WINOUT_WINOBJ_BG1 (1 << 9) -#define WINOUT_WINOBJ_BG2 (1 << 10) -#define WINOUT_WINOBJ_BG3 (1 << 11) -#define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3) -#define WINOUT_WINOBJ_OBJ (1 << 12) -#define WINOUT_WINOBJ_CLR (1 << 13) -#define WINOUT_WINOBJ_ALL (WINOUT_WINOBJ_BG_ALL | WINOUT_WINOBJ_OBJ | WINOUT_WINOBJ_CLR) - -// BLDCNT -// Bits 0-5 select layers for the 1st target -#define BLDCNT_TGT1_BG0 (1 << 0) -#define BLDCNT_TGT1_BG1 (1 << 1) -#define BLDCNT_TGT1_BG2 (1 << 2) -#define BLDCNT_TGT1_BG3 (1 << 3) -#define BLDCNT_TGT1_OBJ (1 << 4) -#define BLDCNT_TGT1_BD (1 << 5) -#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) -// Bits 6-7 select the special effect -#define BLDCNT_EFFECT_NONE (0 << 6) // no special effect -#define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) -#define BLDCNT_EFFECT_LIGHTEN (2 << 6) // 1st target becomes whiter (controlled by BLDY) -#define BLDCNT_EFFECT_DARKEN (3 << 6) // 1st target becomes blacker (controlled by BLDY) -// Bits 8-13 select layers for the 2nd target -#define BLDCNT_TGT2_BG0 (1 << 8) -#define BLDCNT_TGT2_BG1 (1 << 9) -#define BLDCNT_TGT2_BG2 (1 << 10) -#define BLDCNT_TGT2_BG3 (1 << 11) -#define BLDCNT_TGT2_OBJ (1 << 12) -#define BLDCNT_TGT2_BD (1 << 13) -#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) - -// BLDALPHA -#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) - -// SOUNDCNT_H -#define SOUND_CGB_MIX_QUARTER 0x0000 -#define SOUND_CGB_MIX_HALF 0x0001 -#define SOUND_CGB_MIX_FULL 0x0002 -#define SOUND_A_MIX_HALF 0x0000 -#define SOUND_A_MIX_FULL 0x0004 -#define SOUND_B_MIX_HALF 0x0000 -#define SOUND_B_MIX_FULL 0x0008 -#define SOUND_ALL_MIX_FULL 0x000E -#define SOUND_A_RIGHT_OUTPUT 0x0100 -#define SOUND_A_LEFT_OUTPUT 0x0200 -#define SOUND_A_TIMER_0 0x0000 -#define SOUND_A_TIMER_1 0x0400 -#define SOUND_A_FIFO_RESET 0x0800 -#define SOUND_B_RIGHT_OUTPUT 0x1000 -#define SOUND_B_LEFT_OUTPUT 0x2000 -#define SOUND_B_TIMER_0 0x0000 -#define SOUND_B_TIMER_1 0x4000 -#define SOUND_B_FIFO_RESET 0x8000 - -// SOUNDCNT_X -#define SOUND_1_ON 0x0001 -#define SOUND_2_ON 0x0002 -#define SOUND_3_ON 0x0004 -#define SOUND_4_ON 0x0008 -#define SOUND_MASTER_ENABLE 0x0080 - -// DMA -#define DMA_DEST_INC 0x0000 -#define DMA_DEST_DEC 0x0020 -#define DMA_DEST_FIXED 0x0040 -#define DMA_DEST_RELOAD 0x0060 -#define DMA_SRC_INC 0x0000 -#define DMA_SRC_DEC 0x0080 -#define DMA_SRC_FIXED 0x0100 -#define DMA_REPEAT 0x0200 -#define DMA_16BIT 0x0000 -#define DMA_32BIT 0x0400 -#define DMA_DREQ_ON 0x0800 -#define DMA_START_NOW 0x0000 -#define DMA_START_VBLANK 0x1000 -#define DMA_START_HBLANK 0x2000 -#define DMA_START_SPECIAL 0x3000 -#define DMA_START_MASK 0x3000 -#define DMA_INTR_ENABLE 0x4000 -#define DMA_ENABLE 0x8000 - -// timer -#define TIMER_1CLK 0x00 -#define TIMER_64CLK 0x01 -#define TIMER_256CLK 0x02 -#define TIMER_1024CLK 0x03 -#define TIMER_INTR_ENABLE 0x40 -#define TIMER_ENABLE 0x80 - -// serial -// serial -#define SIO_ID 0x0030 // Communication ID - -#define SIO_8BIT_MODE 0x0000 // Normal 8-bit communication mode -#define SIO_32BIT_MODE 0x1000 // Normal 32-bit communication mode -#define SIO_MULTI_MODE 0x2000 // Multi-player communication mode -#define SIO_UART_MODE 0x3000 // UART communication mode - -#define SIO_SCK_OUT 0x0000 // Select external clock -#define SIO_SCK_IN 0x0001 // Select internal clock -#define SIO_IN_SCK_256K 0x0000 // Select internal clock 256KHz -#define SIO_IN_SCK_2M 0x0002 // Select 2MHz -#define SIO_ACK_RECV 0x0004 // Request transfer -#define SIO_ACK_SEND 0x0008 // Enable transfer -#define SIO_9600_BPS 0x0000 // baud rate 9600 bps -#define SIO_38400_BPS 0x0001 // 38400 bps -#define SIO_57600_BPS 0x0002 // 57600 bps -#define SIO_115200_BPS 0x0003 // 115200 bps - -#define SIO_MULTI_CONNECT 0x0004 // Connecting multi-play communication -#define SIO_MULTI_DISCONNECT 0x0000 // Disconnect -#define SIO_MULTI_PARENT 0x0008 // Multi-play communication Connect master -#define SIO_MULTI_CHILD 0x0000 // Connect slave -#define SIO_MULTI_SI 0x0004 // Multi-play communication SI terminal -#define SIO_MULTI_SD 0x0008 // SD terminal -#define SIO_MULTI_BUSY 0x0080 // Multi-play communicating -#define SIO_CTS_ENABLE 0x0004 // Enable UART send enable signal -#define SIO_UART_7BIT 0x0000 // UART communication data length 7 bit -#define SIO_UART_8BIT 0x0080 // 8 bit - -#define SIO_ERROR 0x0040 // Detect error -#define SIO_START 0x0080 // Start transfer -#define SIO_ENABLE 0x0080 // Enable SIO - -#define SIO_PARITY_ENABLE 0x0200 // Enable parity -#define SIO_PARITY_EVEN 0x0000 // Even parity -#define SIO_PARITY_ODD 0x0008 // Odd parity -#define SIO_TRANS_ENABLE 0x0400 // Enable transmitter -#define SIO_TRANS_DATA_FULL 0x0010 // Transmitted data full -#define SIO_RECV_ENABLE 0x0800 // Enable receiver -#define SIO_RECV_DATA_EMPTY 0x0020 // No data received -#define SIO_INTR_ENABLE 0x4000 // Enable interrupt request - -#define SIO_MULTI_SI_SHIFT 2 -#define SIO_MULTI_SI_MASK 0x1 -#define SIO_MULTI_DI_SHIFT 3 -#define SIO_MULTI_DI_MASK 0x1 - -// keys -#define A_BUTTON 0x0001 -#define B_BUTTON 0x0002 -#define SELECT_BUTTON 0x0004 -#define START_BUTTON 0x0008 -#define DPAD_RIGHT 0x0010 -#define DPAD_LEFT 0x0020 -#define DPAD_UP 0x0040 -#define DPAD_DOWN 0x0080 -#define R_BUTTON 0x0100 -#define L_BUTTON 0x0200 -#define KEYS_MASK 0x03FF -#define KEY_INTR_ENABLE 0x0400 -#define KEY_OR_INTR 0x0000 -#define KEY_AND_INTR 0x8000 -#define DPAD_ANY 0x00F0 -#define DPAD_SIDEWAYS (DPAD_LEFT | DPAD_RIGHT) -#define DPAD_VERTICAL (DPAD_DOWN | DPAD_UP) -#define JOY_EXCL_DPAD 0x030F - -// interrupt flags -#define INTR_FLAG_VBLANK (1 << 0) -#define INTR_FLAG_HBLANK (1 << 1) -#define INTR_FLAG_VCOUNT (1 << 2) -#define INTR_FLAG_TIMER0 (1 << 3) -#define INTR_FLAG_TIMER1 (1 << 4) -#define INTR_FLAG_TIMER2 (1 << 5) -#define INTR_FLAG_TIMER3 (1 << 6) -#define INTR_FLAG_SERIAL (1 << 7) -#define INTR_FLAG_DMA0 (1 << 8) -#define INTR_FLAG_DMA1 (1 << 9) -#define INTR_FLAG_DMA2 (1 << 10) -#define INTR_FLAG_DMA3 (1 << 11) -#define INTR_FLAG_KEYPAD (1 << 12) -#define INTR_FLAG_GAMEPAK (1 << 13) - -// WAITCNT -#define WAITCNT_SRAM_4 (0 << 0) -#define WAITCNT_SRAM_3 (1 << 0) -#define WAITCNT_SRAM_2 (2 << 0) -#define WAITCNT_SRAM_8 (3 << 0) -#define WAITCNT_SRAM_MASK (3 << 0) - -#define WAITCNT_WS0_N_4 (0 << 2) -#define WAITCNT_WS0_N_3 (1 << 2) -#define WAITCNT_WS0_N_2 (2 << 2) -#define WAITCNT_WS0_N_8 (3 << 2) -#define WAITCNT_WS0_N_MASK (3 << 2) - -#define WAITCNT_WS0_S_2 (0 << 4) -#define WAITCNT_WS0_S_1 (1 << 4) - -#define WAITCNT_WS1_N_4 (0 << 5) -#define WAITCNT_WS1_N_3 (1 << 5) -#define WAITCNT_WS1_N_2 (2 << 5) -#define WAITCNT_WS1_N_8 (3 << 5) -#define WAITCNT_WS1_N_MASK (3 << 5) - -#define WAITCNT_WS1_S_4 (0 << 7) -#define WAITCNT_WS1_S_1 (1 << 7) - -#define WAITCNT_WS2_N_4 (0 << 8) -#define WAITCNT_WS2_N_3 (1 << 8) -#define WAITCNT_WS2_N_2 (2 << 8) -#define WAITCNT_WS2_N_8 (3 << 8) -#define WAITCNT_WS2_N_MASK (3 << 8) - -#define WAITCNT_WS2_S_8 (0 << 10) -#define WAITCNT_WS2_S_1 (1 << 10) - -#define WAITCNT_PHI_OUT_NONE (0 << 11) -#define WAITCNT_PHI_OUT_4MHZ (1 << 11) -#define WAITCNT_PHI_OUT_8MHZ (2 << 11) -#define WAITCNT_PHI_OUT_16MHZ (3 << 11) -#define WAITCNT_PHI_OUT_MASK (3 << 11) - -#define WAITCNT_PREFETCH_ENABLE (1 << 14) - -#define WAITCNT_AGB (0 << 15) -#define WAITCNT_CGB (1 << 15) - -#endif // GUARD_GBA_IO_REG_H diff --git a/sa1/include/gba/isagbprint.h b/sa1/include/gba/isagbprint.h deleted file mode 100644 index c5eb456c3..000000000 --- a/sa1/include/gba/isagbprint.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef GUARD_GBA_ISAGBPRINT_H -#define GUARD_GBA_ISAGBPRINT_H - -#ifdef NDEBUG -#define AGBPrintInit() -#define AGBPutc(cChr) -#define AGBPrint(pBuf) -#define AGBPrintf(pBuf, ...) -#define AGBPrintFlush1Block() -#define AGBPrintFlush() -#define AGBAssert(pFile, nLine, pExpression, nStopProgram) -#else -void AGBPrintInit(void); -void AGBPutc(const char cChr); -void AGBPrint(const char *pBuf); -void AGBPrintf(const char *pBuf, ...); -void AGBPrintFlush1Block(void); -void AGBPrintFlush(void); -void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); -#endif - -#undef AGB_ASSERT -#ifdef NDEBUG -#define AGB_ASSERT(exp) -#else -#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); -#endif - -#undef AGB_WARNING -#ifdef NDEBUG -#define AGB_WARNING(exp) -#else -#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); -#endif - -// for matching purposes - -#ifdef NDEBUG -#define AGB_ASSERT_EX(exp, file, line) -#else -#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); -#endif - -#ifdef NDEBUG -#define AGB_WARNING_EX(exp, file, line) -#else -#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); -#endif - -#endif // GUARD_GBA_ISAGBPRINT_H diff --git a/sa1/include/gba/macro.h b/sa1/include/gba/macro.h deleted file mode 100644 index 4c13f86fb..000000000 --- a/sa1/include/gba/macro.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_GBA_MACRO_H -#define GUARD_GBA_MACRO_H - -#include "gba/cpuset_macros.h" -#include "gba/dma_macros.h" - -#endif // GUARD_GBA_MACRO_H diff --git a/sa1/include/gba/multiboot.h b/sa1/include/gba/multiboot.h deleted file mode 100644 index e88b43a19..000000000 --- a/sa1/include/gba/multiboot.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef GUARD_GBA_MULTIBOOT_H -#define GUARD_GBA_MULTIBOOT_H - -#define MULTIBOOT_NCHILD 3 // Maximum number of slaves -#define MULTIBOOT_HEADER_SIZE 0xc0 // Header size -#define MULTIBOOT_SEND_SIZE_MIN 0x100 // Minimum transmission size -#define MULTIBOOT_SEND_SIZE_MAX 0x40000 // Maximum transmission size - -struct MultiBootParam -{ - u32 system_work[5]; - u8 handshake_data; - u8 padding; - u16 handshake_timeout; - u8 probe_count; - u8 client_data[MULTIBOOT_NCHILD]; - u8 palette_data; - u8 response_bit; - u8 client_bit; - u8 reserved1; - u8 *boot_srcp; - u8 *boot_endp; - u8 *masterp; - u8 *reserved2[MULTIBOOT_NCHILD]; - u32 system_work2[4]; - u8 sendflag; - u8 probe_target_bit; - u8 check_wait; - u8 server_type; -}; - -#define MULTIBOOT_ERROR_04 0x04 -#define MULTIBOOT_ERROR_08 0x08 -#define MULTIBOOT_ERROR_0c 0x0c -#define MULTIBOOT_ERROR_40 0x40 -#define MULTIBOOT_ERROR_44 0x44 -#define MULTIBOOT_ERROR_48 0x48 -#define MULTIBOOT_ERROR_4c 0x4c -#define MULTIBOOT_ERROR_80 0x80 -#define MULTIBOOT_ERROR_84 0x84 -#define MULTIBOOT_ERROR_88 0x88 -#define MULTIBOOT_ERROR_8c 0x8c -#define MULTIBOOT_ERROR_NO_PROBE_TARGET 0x50 -#define MULTIBOOT_ERROR_NO_DLREADY 0x60 -#define MULTIBOOT_ERROR_BOOT_FAILURE 0x70 -#define MULTIBOOT_ERROR_HANDSHAKE_FAILURE 0x71 - -#define MULTIBOOT_CONNECTION_CHECK_WAIT 15 - -#define MULTIBOOT_SERVER_TYPE_NORMAL 0 -#define MULTIBOOT_SERVER_TYPE_QUICK 1 - -#define MULTIBOOT_HANDSHAKE_TIMEOUT 400 - -#endif // GUARD_GBA_MULTIBOOT_H diff --git a/sa1/include/gba/syscall.h b/sa1/include/gba/syscall.h deleted file mode 100644 index 1f50ad8b8..000000000 --- a/sa1/include/gba/syscall.h +++ /dev/null @@ -1,76 +0,0 @@ -#ifndef GUARD_GBA_SYSCALL_H -#define GUARD_GBA_SYSCALL_H - -#define RESET_EWRAM 0x01 -#define RESET_IWRAM 0x02 -#define RESET_PALETTE 0x04 -#define RESET_VRAM 0x08 -#define RESET_OAM 0x10 -#define RESET_SIO_REGS 0x20 -#define RESET_SOUND_REGS 0x40 -#define RESET_REGS 0x80 -#define RESET_ALL 0xFF - -typedef struct { - u32 srcLength : 16; // in bytes - u32 srcWidth : 8; // in bits - u32 dstWidth : 8; // in bits -} BitUnPackData; - -void SoftReset(u32 resetFlags); -void SoftResetExram(u32 resetFlags); - -void RegisterRamReset(u32 resetFlags); - -void VBlankIntrWait(void); - -u16 Sqrt(u32 num); - -u16 ArcTan2(s16 x, s16 y); - -#define CPU_SET_SRC_FIXED 0x01000000 -#define CPU_SET_16BIT 0x00000000 -#define CPU_SET_32BIT 0x04000000 - -void CpuSet(const void *src, void *dest, u32 control); - -#define CPU_FAST_SET_SRC_FIXED 0x01000000 - -void CpuFastSet(const void *src, void *dest, u32 control); - -void BgAffineSet(struct BgAffineSrcData *src, struct BgAffineDstData *dest, s32 count); - -void ObjAffineSet(struct ObjAffineSrcData *src, void *dest, s32 count, s32 offset); - -void LZ77UnCompWram(const void *src, void *dest); - -void LZ77UnCompVram(const void *src, void *dest); - -void RLUnCompWram(const void *src, void *dest); - -void RLUnCompVram(const void *src, void *dest); - -int MultiBoot(struct MultiBootParam *mp); - - -#if PLATFORM_GBA -s32 Div(s32 num, s32 denom); -s32 DivArm(s32 denom, s32 num); -s32 Mod(s32 num, s32 denom); -s32 ModArm(s32 denom, s32 num); -#else -// New GCC doesn't like us calling a function 'Mod', so we'll just inline them all. -// Also it is VERY important to also cast 'denom' to s32 on 64bit architectures, -// otherwise 'num' might be interpreted as a s64, without being properly cast as one, -// leading to a signed s32 value getting divided like an unsigned one. -#define Div(num, denom) ({((denom) != 0) ? ((s32)(num) / (s32)(denom)) : 0;}) -#define Mod(num, denom) ({((denom) != 0) ? ((s32)(num) % (s32)(denom)) : 0;}) -#define DivArm(denom, num) ({((denom) != 0) ? ((s32)(num) / (s32)(denom)) : 0;}) -#define ModArm(denom, num) ({((denom) != 0) ? ((s32)(num) % (s32)(denom)) : 0;}) -#endif - -void SoundBiasReset(void); - -void SoundBiasSet(void); - -#endif // GUARD_GBA_SYSCALL_H diff --git a/sa1/include/gba/types.h b/sa1/include/gba/types.h deleted file mode 100644 index 72e721ad7..000000000 --- a/sa1/include/gba/types.h +++ /dev/null @@ -1,459 +0,0 @@ -#ifndef GUARD_GBA_TYPES_H -#define GUARD_GBA_TYPES_H - -#include "gba/defines.h" // for int_vcount (TODO) - -#if !GEN_CTX -#include -#endif - -#if defined(_MSC_VER) -#define PACKED(name, struct_body) \ - __pragma(pack(push, 1)) typedef struct struct_body name; \ - __pragma(pack(pop)) -#else -// NOTE: Please make sure NOT to add a ; to the end -// of the structs you enclose with this macro. -// PACKED(struct test { char a; int b; }); - good -// PACKED(struct test { char a; int b; };); - bad -#define PACKED(name, struct_body) \ - typedef struct __attribute__((packed)) name struct_body name; -#endif - -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; -typedef int8_t s8; -typedef int16_t s16; -typedef int32_t s32; -typedef int64_t s64; - -#if (GAME == GAME_SA1) -typedef u8 MetatileIndexType; -#else -typedef u16 MetatileIndexType; -#endif - -// If the DISPLAY_HEIGHT was >255, scanline effects would break, -// so we have to make this variable bigger. -// (u16 should be plenty for screen coordinates, right?) -#if !defined(DISPLAY_HEIGHT) -#error DISPLAY_HEIGHT not defined. -#endif -/// TODO: Technically this should only be #if (DISPLAY_HEIGHT > 255), -// we should probably replace uses of int_vcount with a different type where a high DISPLAY_WIDTH necessitates u16. -#if ((DISPLAY_WIDTH > 255) || (DISPLAY_HEIGHT > 255)) -typedef u16 int_vcount; -#else -typedef u8 int_vcount; -#endif - -typedef volatile u8 vu8; -typedef volatile u16 vu16; -typedef volatile u32 vu32; -typedef volatile u64 vu64; -typedef volatile s8 vs8; -typedef volatile s16 vs16; -typedef volatile s32 vs32; -typedef volatile s64 vs64; - -typedef float f32; -typedef double f64; - -typedef u8 bool8; -typedef u16 bool16; -typedef u32 bool32; - -struct BgCnt -{ - u16 priority:2; - u16 charBaseBlock:2; - u16 dummy:2; - u16 mosaic:1; - u16 palettes:1; - u16 screenBaseBlock:5; - u16 areaOverflowMode:1; - u16 screenSize:2; -}; -typedef volatile struct BgCnt vBgCnt; - -struct PlttData -{ - u16 r:5; // red - u16 g:5; // green - u16 b:5; // blue - u16 unused_15:1; -}; - -// NOTE: Inside the ROM the OAM data used for layouting -// is stored without an affine parameter, which makes sense -// since they're relatively unrelated and affine values are -// usually generated during runtime, anyway. -// That's what this variation of 'OamData' is for, -// as well using this to determine the size for some DMAs to gOamBuffer. -// TODO: Somehow this does not work by #include-ing main.h and using PACKED(); -// TODO: EXTENDED_OAM is not yet functional -#if !EXTENDED_OAM -PACKED(OamDataShort, { - /*0x00*/ - u32 y : 8; - - /*0x01*/ - u32 affineMode : 2; // 0x100, 0x200 -> 0x300 - u32 objMode : 2; // 0x400, 0x800 -> 0xC00 - u32 mosaic : 1; // 0x1000 - u32 bpp : 1; // 0x2000 - u32 shape : 2; // 0x4000, 0x8000 -> 0xC000 - - /*0x02*/ - u32 x : 9; - u32 matrixNum : 5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size : 2; // 0x4000, 0x8000 -> 0xC000 - - /*0x04*/ - u16 tileNum : 10; // 0x3FF - u16 priority : 2; // 0x400, 0x800 -> 0xC00 - u16 paletteNum : 4; -}); /* size: 0x6 (important to not be 0x8, see comment above struct!) */ - -typedef union { - struct { - /*0x00*/ u32 y:8; - /*0x01*/ u32 affineMode:2; // 0x100, 0x200 -> 0x400 - u32 objMode:2; // 0x400, 0x800 -> 0xC00 - u32 mosaic:1; // 0x1000 - u32 bpp:1; // 0x2000 - u32 shape:2; // 0x4000, 0x8000 -> 0xC000 - - /*0x02*/ u32 x:9; - u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size:2; // 0x4000, 0x8000 -> 0xC000 - - /*0x04*/ u16 tileNum:10; // 0x3FF - u16 priority:2; // 0x400, 0x800 -> 0xC00 - u16 paletteNum:4; - - /*0x06*/ u16 fractional:8; - u16 integer:7; - u16 sign:1; - } split; - - struct { - u16 attr0; - u16 attr1; - u16 attr2; - u16 affineParam; - } all; - - u16 raw[4]; -} OamData; - -#define OAM_GET_X(oamEntry) ((oamEntry)->all.attr1 & 0x1FF) -#define OAM_INIT_X(oamEntry, value, flip) (oamEntry)->all.attr1 = (((value) & 0x1FF) | ((flip) ? 0x1000 : 0)); -#define OAM_SET_X(oamEntry, value) { \ - u32 v; \ - (oamEntry)->all.attr1 &= ~0x1FF; \ - v = (value); \ - (oamEntry)->all.attr1 += v & 0x1FF; \ -} - -#define OAM_GET_Y(oamEntry) (oamEntry)->all.attr0 & 0xFF -#define OAM_INIT_Y(oamEntry, value) (oamEntry)->all.attr0 = (value) & 0xFF -#define OAM_SET_Y(oamEntry, value) { \ - u32 v; \ - (oamEntry)->all.attr0 &= ~0xFF; \ - v = (value); \ - (oamEntry)->all.attr0 += v & 0xFF; \ -} -#define OAM_SET_AFFINE_MODE(oamEntry, value) { \ - u32 v; \ - (oamEntry)->all.attr0 &= ~0x3; \ - v = (value); \ - (oamEntry)->all.attr0 |= v; \ -} - -#define OAM_DATA_SIZE_AFFINE 8 -#define OAM_DATA_SIZE_NO_AFFINE 6 - -#define OAM_DATA_COUNT_AFFINE (OAM_DATA_SIZE_AFFINE / sizeof(short)) -#define OAM_DATA_COUNT_NO_AFFINE (OAM_DATA_SIZE_NO_AFFINE / sizeof(short)) - -#else -PACKED(OamDataShort, { - /* 0x00 */ s16 x; - /* 0x02 */ s16 y; - - /* 0x04 */ u32 affineMode:2; // 0x1, 0x2 -> 0x4 - u32 objMode:2; // 0x4, 0x8 -> 0xC - u32 mosaic:1; // 0x10 - u32 bpp:1; // 0x20 - u32 shape:2; // 0x40, 0x80 -> 0xC0 - - /* 0x05 */ u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size:2; // 0x4000, 0x8000 -> 0xC000u32 - u32 padding:17; // NOTE: Padding MUST be here for some platforms not to break - - /* 0x08 */ u16 tileNum:10; // 0x3FF - u16 priority:2; // 0x400, 0x800 -> 0xC00 - u16 paletteNum:4; - -}); /* size: 0x6 (important to not be 0x8, see comment above struct!) */ - -typedef union { - struct { - /* 0x00 */ s16 x; - /* 0x02 */ s16 y; - - /* 0x04 */ u32 affineMode:2; // 0x1, 0x2 -> 0x4 - u32 objMode:2; // 0x4, 0x8 -> 0xC - u32 mosaic:1; // 0x10 - u32 bpp:1; // 0x20 - u32 shape:2; // 0x40, 0x80 -> 0xC0 - - /* 0x05 */ u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode - u32 size:2; // 0x4000, 0x8000 -> 0xC000 - u32 padding:17; // NOTE: Padding MUST be here for some platforms not to break - - /* 0x08 */ u16 tileNum:10; // 0x3FF - u16 priority:2; // 0x400, 0x800 -> 0xC00 - u16 paletteNum:4; - - /* 0x0A */ u16 fractional:8; - u16 integer:7; - u16 sign:1; - } split; - - struct { - s16 x; - s16 y; - u16 attr0; - u16 attr1; - u16 attr2; - u16 affineParam; - } all; - - u16 raw[6]; -} OamData; - -#define OAM_GET_X(oamEntry) (oamEntry)->x -#define OAM_INIT_X(oamEntry, value, flip) \ - (oamEntry)->split.x = (value); \ - (oamEntry)->split.matrixNum = ((flip) ? 0x08 : 0); -#define OAM_SET_X(oamEntry, value) { \ - (oamEntry)->split.x = (value); \ -} - -#define OAM_GET_Y(oamEntry) (oamEntry)->split.y -#define OAM_INIT_Y(oamEntry, value) (oamEntry)->split.y = (value); -#define OAM_SET_Y(oamEntry, value) (oamEntry)->split.y = (value); -#define OAM_SET_AFFINE_MODE(oamEntry, value) { \ - (oamEntry)->split.affineMode = (value); \ -} - -#define OAM_DATA_SIZE_AFFINE 12 -#define OAM_DATA_SIZE_NO_AFFINE 10 - -#define OAM_DATA_COUNT_AFFINE (OAM_DATA_SIZE_AFFINE / sizeof(short)) -#define OAM_DATA_COUNT_NO_AFFINE (OAM_DATA_SIZE_NO_AFFINE / sizeof(short)) - -#endif - -#define ST_OAM_HFLIP 0x08 -#define ST_OAM_VFLIP 0x10 -#define ST_OAM_MNUM_FLIP_MASK 0x18 - -#define ST_OAM_OBJ_NORMAL 0 -#define ST_OAM_OBJ_BLEND 1 -#define ST_OAM_OBJ_WINDOW 2 - -#define ST_OAM_AFFINE_OFF 0 -#define ST_OAM_AFFINE_NORMAL 1 -#define ST_OAM_AFFINE_ERASE 2 -#define ST_OAM_AFFINE_DOUBLE 3 - -#define ST_OAM_AFFINE_ON_MASK 1 -#define ST_OAM_AFFINE_DOUBLE_MASK 2 - -#define ST_OAM_4BPP 0 -#define ST_OAM_8BPP 1 - -#define ST_OAM_SQUARE 0 -#define ST_OAM_H_RECTANGLE 1 -#define ST_OAM_V_RECTANGLE 2 - -#define ST_OAM_SIZE_0 0 -#define ST_OAM_SIZE_1 1 -#define ST_OAM_SIZE_2 2 -#define ST_OAM_SIZE_3 3 - -#define SPRITE_SIZE_8x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_SQUARE)) -#define SPRITE_SIZE_16x16 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_SQUARE)) -#define SPRITE_SIZE_32x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_SQUARE)) -#define SPRITE_SIZE_64x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_SQUARE)) - -#define SPRITE_SIZE_16x8 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_H_RECTANGLE)) -#define SPRITE_SIZE_32x8 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_H_RECTANGLE)) -#define SPRITE_SIZE_32x16 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_H_RECTANGLE)) -#define SPRITE_SIZE_64x32 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_H_RECTANGLE)) - -#define SPRITE_SIZE_8x16 ((ST_OAM_SIZE_0 << 2) | (ST_OAM_V_RECTANGLE)) -#define SPRITE_SIZE_8x32 ((ST_OAM_SIZE_1 << 2) | (ST_OAM_V_RECTANGLE)) -#define SPRITE_SIZE_16x32 ((ST_OAM_SIZE_2 << 2) | (ST_OAM_V_RECTANGLE)) -#define SPRITE_SIZE_32x64 ((ST_OAM_SIZE_3 << 2) | (ST_OAM_V_RECTANGLE)) - -#define SPRITE_SIZE(dim) ((SPRITE_SIZE_##dim >> 2) & 0x03) -#define SPRITE_SHAPE(dim) (SPRITE_SIZE_##dim & 0x03) - -struct BgAffineSrcData -{ - s32 texX; - s32 texY; - s16 scrX; - s16 scrY; - s16 sx; - s16 sy; - u16 alpha; -}; - -struct BgAffineDstData -{ - s16 pa; - s16 pb; - s16 pc; - s16 pd; - s32 dx; - s32 dy; -}; - -struct ObjAffineSrcData -{ - s16 xScale; - s16 yScale; - u16 rotation; -}; - -// Normal SIO Control Structure -struct SioNormalCnt -{ - u16 sck_I_O:1; // Clock I/O Select - u16 sck:1; // Internal Clock Select - u16 ackRecv:1; // Transfer Enable Flag Receive - u16 ackSend:1; // Transfer Enable Flag Send - u16 unused_6_4:3; - u16 enable:1; // SIO Enable - u16 unused_11_8:4; - u16 mode:2; // Communication Mode Select - u16 ifEnable:1; // Interrupt Request Enable - u16 unused_15:1; - u8 data; // Data - u8 unused_31_24; -}; - -#define ST_SIO_8BIT_MODE 0 // Normal 8-bit communication mode -#define ST_SIO_32BIT_MODE 1 // Normal 32-bit communication mode - -#define ST_SIO_SCK_OUT 0 // Select external clock -#define ST_SIO_SCK_IN 1 // Select internal clock -#define ST_SIO_IN_SCK_256K 0 // Select internal clock 256KHz -#define ST_SIO_IN_SCK_2M 1 // Select 2MHz - -// Multi-player SIO Control Structure -struct SioMultiCnt -{ - u16 baudRate:2; // baud rate - u16 si:1; // SI terminal - u16 sd:1; // SD terminal - u16 id:2; // ID - u16 error:1; // error flag - u16 enable:1; // SIO enable - u16 unused_11_8:4; - u16 mode:2; // communication mode (should equal 2) - u16 ifEnable:1; // IRQ enable - u16 unused_15:1; - u16 data; // data -}; - -#define ST_SIO_MULTI_MODE 2 // Multi-play communication mode - -#define ST_SIO_9600_BPS 0 // Baud rate 9600 bps -#define ST_SIO_38400_BPS 1 // 38400 bps -#define ST_SIO_57600_BPS 2 // 57600 bps -#define ST_SIO_115200_BPS 3 // 115200 bps -#define ST_SIO_MULTI_PARENT 1 // Multi-play communication Connect master -#define ST_SIO_MULTI_CHILD 0 // Connect slave - -// UART - SIO Control Structure -struct SioUartCnt -{ - u16 baudRate:2; // Baud Rate - u16 ctsEnable:1; // Send Signal Enable - u16 paritySelect:1; // Parity Even/Odd - u16 transDataFull:1; // Transmit Data Full - u16 recvDataEmpty:1; // Receive Data Empty - u16 error:1; // Error Detect - u16 length:1; // Data Length - u16 fifoEnable:1; // FIFO Enable - u16 parityEnable:1; // Parity Enable - u16 transEnable:1; // Transmitter Enable - u16 recvEnable:1; // Receiver Enable - u16 mode:2; // Communication Mode Select - u16 ifEnable:1; // Interrupt Request Enable - u16 unused_15:1; - u8 data; // Data - u8 unused_31_24; -}; - -#define ST_SIO_UART_MODE 3 // UART communication mode - -#define ST_SIO_UART_7BIT 0 // UART communication data length 7 bits -#define ST_SIO_UART_8BIT 1 // 8 bits -#define ST_SIO_PARITY_EVEN 0 // Even parity -#define ST_SIO_PARITY_ODD 1 // Odd parity - -// JOY Bus Communication Control Structure -struct JoyCnt -{ - u8 ifReset:1; // JOY Bus Reset Interrupt Request - u8 ifRecv:1; // JOY Bus Received Interrupt Request - u8 ifSend:1; // JOY Bus Sent Interrupt Request - u8 unused_5_3:3; - u8 ifEnable:1; // Interrupt Request Enable - u8 unused_7:1; -}; - -// JOY Bus Communication Status Structure -struct JoyStat -{ - u8 unused_0:1; - u8 recv:1; // Receive Status - u8 unused_2:1; - u8 send:1; // Send Status - u8 flags:2; // General Flag - u8 unused_7_6:2; -}; - -// General Input/Output Control Structure -struct RCnt -{ - u8 sc:1; // Data - u8 sd:1; - u8 si:1; - u8 so:1; - u8 sc_i_o:1; // I/O Select - u8 sd_i_o:1; - u8 si_i_o:1; - u8 so_i_o:1; - u8 ifEnable:1; // Interrupt Request Enable - u8 unused_13_9:5; - u8 sioModeMaster:2; // SIO Mode Master -}; - -#define ST_R_SIO_MASTER_MODE 0 // SIO master mode -#define ST_R_DIRECT_MODE 2 // General input/output communication mode -#define ST_R_JOY_MODE 3 // JOY communication mode - -#define ST_R_IN 0 // Select input -#define ST_R_OUT 1 // Select output - -#endif // GUARD_GBA_TYPES_H diff --git a/sa1/include/global.h b/sa1/include/global.h deleted file mode 100644 index e59f0f655..000000000 --- a/sa1/include/global.h +++ /dev/null @@ -1,353 +0,0 @@ -#ifndef GUARD_GLOBAL_H -#define GUARD_GLOBAL_H - -#include "config.h" -#include "gba/gba.h" - -#if PLATFORM_GBA -#define ENABLE_AUDIO TRUE -#else -#define ENABLE_AUDIO TRUE -#define ENABLE_VRAM_VIEW !TRUE -#endif - -#define CONST_DATA __attribute__((section(".data"))) - -// #include "types.h" -// #include "variables.h" - -#if !PLATFORM_GBA -#ifdef _WIN32 -void *Platform_malloc(size_t numBytes); -void Platform_free(void *ptr); -#define malloc(numBytes) Platform_malloc(numBytes) -#define calloc(count, size) Platform_malloc(count *size) -#define free(numBytes) Platform_free(numBytes) -#endif -#endif - -#define SIO_MULTI_CNT ((volatile struct SioMultiCnt *)REG_ADDR_SIOCNT) - -typedef void (*VoidFn)(void); - -// helper macros - -// This macro is only needed while SA2 still has variables called gUnknown_XXXXXXX left -#if ((GAME == GAME_SA1) || (GAME == GAME_SA3)) -#define SA2_LABEL(_label) sa2__##_label -#else -#define SA2_LABEL(_label) _label -#endif - -#if (PORTABLE) -#define BUG_FIX - -#if !(defined NON_MATCHING) -#define NON_MATCHING 1 -#endif -#elif (DEBUG) -#define NON_MATCHING 1 -#endif - -#ifdef NON_MATCHING -#define ASM_FUNC(path, decl) -#define TEMP_FIX 1 -#else -#define ASM_FUNC(path, decl) \ - NAKED decl { asm(".include " #path); } -#define TEMP_FIX 0 -#endif - -#ifdef NON_MATCHING -#define NONMATCH(path, decl) decl -#define END_NONMATCH -#else -#define NONMATCH(path, decl) \ - NAKED decl \ - { \ - asm(".include " #path); \ - if (0) -#define END_NONMATCH } -#endif - -/// IDE support -#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__) -// We define these when using certain IDEs to fool preproc -#define _(x) (x) -#define __(x) (x) -#define INCBIN(...) \ - { \ - 0 \ - } -#define INCBIN_U8 INCBIN -#define INCBIN_U16 INCBIN -#define INCBIN_U32 INCBIN -#define INCBIN_S8 INCBIN -#define INCBIN_S16 INCBIN -#define INCBIN_S32 INCBIN -#endif // IDE support - -#if (GAME == GAME_SA1) -#define INCBIN_MAP INCBIN_U8 -#else -#define INCBIN_MAP INCBIN_U16 -#endif - -// Use STR() to turn the macro's *content* into a string -#define STR_(x) #x -#define STR(x) STR_(x) - -// NOTE: This has to be kept as-is. -// If casted it to be signed, -// dataIndex = (dataIndex + 1) % ARRAY_COUNT(data) -// wouldn't match. -#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) - -// Converts a number to Q8.8 fixed-point format -#define Q_8_8(n) ((s16)((n)*256)) - -// Converts a number to Q16.16 fixed-point format (<< 0x10) -#define Q_16_16(n) ((s32)((n)*0x10000)) - -// Converts a number to Q4.12 fixed-point format -#define Q_4_12(n) ((s16)((n)*4096)) - -// Converts a number to Q2.14 fixed-point format -#define Q_2_14(n) ((s16)((n)*0x4000)) - -// Converts a number to Q20.12 fixed-point format -#define Q_20_12(n) ((s32)((n)*4096)) - -// Converts a number to Q24.8 fixed-point format -#define Q_24_8(n) ((s32)((n)*256)) -#define Q_24_8_FRAC(n) ((u8)(n)) - -// This may be the "real" version as we are seeing better matches with -// it in some cases -#define Q_24_8_NEW(n) ((s32)((n) << 8)) - -// Converts a Q8.8 fixed-point format number to a regular integer -#define Q_8_8_TO_INT(n) ((int)((n) >> 8)) - -// Converts a Q4.12 fixed-point format number to a regular integer -#define Q_4_12_TO_INT(n) ((int)((n) >> 12)) - -// Converts a Q2.12 fixed-point format number to a regular integer -#define Q_2_14_TO_INT(n) ((int)((n) >> 14)) - -// Converts a Q24.8 fixed-point format number to a regular integer -#define Q_24_8_TO_INT(n) ((int)((n) >> 8)) - -// Converts a Q20.12 fixed-point format number to a regular integer -#define Q_20_12_TO_INT(n) ((int)((n) >> 12)) - -// Converts a Q16.16 fixed-point format number to a regular integer -#define Q_16_16_TO_INT(n) ((int)((n) >> 0x10)) - -// Converts a Q2.12 fixed-point format number to a Q24.8 fixed point number -#define Q_2_14_TO_Q_24_8(n) ((int)((n) >> 6)) - -// Multiplies two Q values -#define Q_MUL(qValA, qValB) ((qValA * qValB) >> 8) -#define Q_MUL_NEG(qValA, qValB) (-(qValA * qValB) >> 8) -#define Q_SQUARE(qVal) Q_MUL(qVal, qVal) -#define Q_DIV(qValA, qValB) Div((qValA << 8), qValB) -#define Q_DIV2(qValA, qValB) ((qValA << 8) / qValB) -#define Q_MUL_Q_F32(qVal, floatVal) Q_MUL(qVal, Q(floatVal)) - -/* - * Aliases for common macros - */ - -// Converts a number to Q24.8 fixed-point format -#define Q(n) Q_24_8(n) - -// Converts a number to Q24.8 fixed-point format -#define QS(n) Q_24_8_NEW(n) - -// Converts a Q24.8 fixed-point format number to a regular integer -#define I(n) Q_24_8_TO_INT(n) - -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) - -#define CLAMP(value, min, max) \ - ({ \ - s32 clamped; \ - if ((value) < (min)) { \ - clamped = (min); \ - } else { \ - clamped = (value) > (max) ? (max) : (value); \ - } \ - clamped; \ - }) - -#define CLAMP_T(type, value, min, max) \ - ({ \ - type clamped; \ - if ((value) >= (min)) { \ - clamped = (value) > (max) ? (max) : (value); \ - } else { \ - clamped = (min); \ - } \ - clamped; \ - }) - -#define CLAMP_16(value, min, max) CLAMP_T(s16, value, min, max) -#define CLAMP_32(value, min, max) CLAMP_T(s32, value, min, max) - -#define CLAMP_INLINE(var, min, max) \ - ({ \ - if ((var) < (min)) { \ - var = (min); \ - } else if ((var) > (max)) { \ - var = (max); \ - } \ - }) - -#define CLAMP_INLINE_NO_ELSE(var, min, max) \ - ({ \ - if ((var) < (min)) { \ - var = (min); \ - } \ - \ - if ((var) > (max)) { \ - var = (max); \ - } \ - }) - -#define CLAMP_INLINE2(var, min, max) \ - ({ \ - if ((var) > (max)) { \ - var = (max); \ - } else if ((var) < (min)) { \ - var = (min); \ - } \ - }) - -// TODO: Check whether ABS() can be replaced by ABS2! -#define ABS(aValue) ((aValue) >= 0 ? (aValue) : -(aValue)) -#define ABS2(aValue) ((aValue) < 0 ? -(aValue) : (aValue)) - -#define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB))) - -#define BitValue(y) (1 << (y)) -#define CheckBit(x, y) ((x) & (BitValue(y))) -#define GetBit(x, y) (((x) >> (y)) & 1) -#define SetBit(x, y) (x) |= BitValue(y) -#define SetSoleBit(x, y) (x) = BitValue(y) -#define ClearBit(x, y) (x) &= ~BitValue(y) - -// TODO: Use instrinsics for these, on platforms that support it! -// Like GetFirstSetBitIndex, but an external iterator can be passed. -#define GetFirstSetBitIndexExt(value, max, it) \ - ({ \ - s32 res; \ - \ - for (it = 0; it < (max); it++) { \ - if (GetBit(value, it)) { \ - break; \ - } \ - } \ - \ - res = it; \ - }) - -// Get the index to the first set bit in a given value. -#define GetFirstSetBitIndex(value, max) \ - ({ \ - s16 bit; \ - \ - bit = GetFirstSetBitIndexExt(value, max, bit); \ - }) - -// Like GetFirstSetBitIndex, but expects input value to only have 1 bit set. -#define GetSoleSetBitIndex(value, max) \ - ({ \ - s16 bit; \ - \ - for (bit = 0; bit < (max); bit++) { \ - if ((value) == (1 << bit)) { \ - break; \ - } \ - } \ - \ - bit; \ - }) - -// 60 is not exactly true as the GBA's FPS, but it's what they went -// with for the calculation -#define GBA_FRAMES_PER_SECOND 60 - -// TODO: fix casts here(?) -#define XOR_SWAP(a, b) \ - a ^= (u8)b; \ - b ^= (u8)a; \ - a = ((u8)b ^ (u8)a); - -#define XOR_SWAP_WORD(a, b) \ - a ^= b; \ - b ^= a; \ - a = (b ^ a); - -// TODO: fix casts here -#define SWAP_AND_NEGATE(a, b) \ - a ^= (u8)b; \ - b ^= (u8)a; \ - a = ((u8)b ^ (u8)a) * -1; \ - b = (u8)b * -1; - -#define NEGATE(var) \ - ({ \ - s32 temp = var; \ - var = -temp; \ - }) -#define DIRECT_NEGATE(var) (var = -var;) - -#define HALVE(var) (var = (var >> 1)) - -typedef struct { - s16 x; - s16 y; -} Vec2_16; - -typedef struct { - s32 x; - s32 y; -} Vec2_32; - -typedef struct { - u8 reserved : 4; - u8 compressedType : 4; - u32 size : 24; - void *data; -} RLCompressed; - -struct BlendRegs { - u16 bldCnt; - u16 bldAlpha; - u16 bldY; -}; - -// TODO: Should this be in a GBA-specific header file? -#define NUM_AFFINE_BACKGROUNDS 2 -#define NUM_BACKGROUNDS 4 - -// Values to be passed top the affine registers -// (used by BG2/BG3 in affine screen modes) -typedef struct { - /* 0x00 */ u16 pa, pb, pc, pd; - /* 0x08 */ u32 x, y; -} BgAffineReg; - -// TODO: Find better place for this -typedef void (*HBlankIntrFunc)(int_vcount vcount); -typedef void (*IntrFunc)(void); -typedef bool32 (*VBlankFunc)(void); - -extern void *iwram_end; -extern void *ewram_end; - -extern void *rom_footer; - -#endif // GUARD_GLOBAL_H diff --git a/sa1/include/input_recorder.h b/sa1/include/input_recorder.h deleted file mode 100644 index 314784258..000000000 --- a/sa1/include/input_recorder.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef GUARD_INPUT_RECORDER_H -#define GUARD_INPUT_RECORDER_H - -#include "global.h" - -#define RECORDER_DISABLED 0 -#define RECORDER_RECORD 1 - -// Maybe `RECORDER_PLAY` -#define RECORDER_PLAYBACK 2 - -struct InputRecorder { - /* 0x00 */ s32 playbackHead; - /* 0x04 */ s32 recordHead; - /* 0x08 */ u8 mode; -}; - -void InputRecorderResetRecordHead(void); -void InputRecorderResetPlaybackHead(void); -void InputRecorderLoadTape(void); -u16 InputRecorderRead(void); -void InputRecorderWrite(u16); - -#endif // INPUT_RECORDER_H diff --git a/sa1/include/lib/agb_flash/agb_flash.h b/sa1/include/lib/agb_flash/agb_flash.h deleted file mode 100644 index 27223d4e1..000000000 --- a/sa1/include/lib/agb_flash/agb_flash.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef GUARD_AGB_FLASH_512k_H -#define GUARD_AGB_FLASH_512k_H - -#include "global.h" - -u16 IdentifyFlash(void); -void ReadFlash(u16 sectorNum, u32 offset, void *dest, u32 size); -u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, void *dataSrc, u32 n); -u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); -extern u16 (*EraseFlashSector)(u16); - -#endif // GUARD_AGB_FLASH_512k_H diff --git a/sa1/include/lib/agb_flash/flash_internal.h b/sa1/include/lib/agb_flash/flash_internal.h deleted file mode 100644 index efe16cee9..000000000 --- a/sa1/include/lib/agb_flash/flash_internal.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef GUARD_GBA_FLASH_INTERNAL_H -#define GUARD_GBA_FLASH_INTERNAL_H - -#if (GAME == GAME_SA1) -// It seems like the launch SDK had a way different -// version of this library than later ones, so we use this -// to make it match. -#define AGBFLASH_USE_V126 1 -#endif - -#define FLASH_ROM_SIZE_1M 131072 // 1 megabit ROM -#define SECTORS_PER_BANK 16 - -#if !PORTABLE -#define FLASH_BASE ((u8 *)0xE000000) -#else -extern u8 FLASH_BASE[FLASH_ROM_SIZE_1M * SECTORS_PER_BANK]; -#endif - -#define FLASH_WRITE(addr, data) ((*(vu8 *)(FLASH_BASE + (addr))) = (data)) - -struct FlashSector { - u32 size; - u8 shift; - u16 count; - u16 top; -}; - -struct FlashType { - u32 romSize; - struct FlashSector sector; - u16 wait[2]; // game pak bus read/write wait - - // TODO: add support for anonymous unions/structs if possible - union { - struct { - u8 makerId; - u8 deviceId; - } separate; - u16 joined; - } ids; -}; - -struct FlashSetupInfo { - u16 (*programFlashSector)(u16, void *); - u16 (*eraseFlashChip)(void); - u16 (*eraseFlashSector)(u16); - u16 (*WaitForFlashWrite)(u8, u8 *, u8); - const u16 *maxTime; - struct FlashType type; -}; - -extern u16 gFlashNumRemainingBytes; - -extern u16 (*ProgramFlashSector)(u16, void *); -extern u16 (*EraseFlashChip)(void); -extern u16 (*EraseFlashSector)(u16); -extern const struct FlashType *gFlash; - -// extern u8 gFlashTimeoutFlag; -// extern u8 (*PollFlashStatus)(u8 *); - -extern u16 (*WaitForFlashWrite)(u8, u8 *, u8); - -extern const struct FlashSetupInfo LE39FW512; -extern const struct FlashSetupInfo AT29LV512; -extern const struct FlashSetupInfo MN63F805MNP; -extern const struct FlashSetupInfo MX29L512; -extern const struct FlashSetupInfo DefaultFlash512K; - -// extern const struct FlashSetupInfo MX29L010; -// extern const struct FlashSetupInfo LE26FV10N1TS; -// extern const struct FlashSetupInfo DefaultFlash1M; - -void SwitchFlashBank(u8 bankNum); -u16 ReadFlashId(void); -void StartFlashTimer(u8 phase); -void SetReadFlash1(u16 *dest); -void StopFlashTimer(void); -u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void)); -u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src); -void ReadFlash(u16 sectorNum, u32 offset, void *dest, u32 size); -u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, void *dataSrc, u32 n); - -u16 WaitForFlashWrite512K_Common(u8 phase, u8 *addr, u8 lastData); -u16 WaitForFlashWrite_Common(u8 phase, u8 *addr, u8 lastData); - -u16 ProgramByte(u8 *src, u8 *dest); - -u16 EraseFlashChip_LE(void); -u16 EraseFlashChip_AT(void); -u16 EraseFlashSector_LE(u16 sectorNum); -u16 EraseFlashSector_AT(u16 sectorNum); -u16 ProgramFlashSector_LE(u16 sectorNum, void *src); -u16 ProgramFlashSector_MX(u16 sectorNum, void *src); -u16 ProgramFlashSector_AT(u16 sectorNum, void *src); - -// agb_flash_1m -u16 IdentifyFlash(void); - -/* Manufacturers and chips */ -#define MANUFACTURER_ATMEL 0x1F -#define CHIP_ATMEL_AT29LV512 0x3D - -#endif // GUARD_GBA_FLASH_INTERNAL_H diff --git a/sa1/include/lib/m4a/m4a.h b/sa1/include/lib/m4a/m4a.h deleted file mode 100644 index 81985904c..000000000 --- a/sa1/include/lib/m4a/m4a.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef GUARD_M4A_H -#define GUARD_M4A_H - -#include "lib/m4a/m4a_internal.h" - -extern struct SoundMixerState gSoundInfo; - -extern struct MP2KPlayerState gMPlayInfo_BGM; -extern struct MP2KPlayerState gMPlayInfo_SE1; -extern struct MP2KPlayerState gMPlayInfo_SE2; -extern struct MP2KPlayerState gMPlayInfo_SE3; - -void m4aSoundVSync(void); - -void m4aSoundInit(void); -void m4aSoundMain(void); -void m4aSongNumStart(u16); -void m4aSongNumStartOrChange(u16); -void m4aSongNumStartOrContinue(u16); -void m4aSongNumStop(u16 n); -void m4aMPlayAllStop(void); -void m4aMPlayAllContinue(void); -void m4aMPlayContinue(struct MP2KPlayerState *mplayInfo); -void m4aMPlayFadeOut(struct MP2KPlayerState *mplayInfo, u16 speed); -void m4aMPlayFadeOutTemporarily(struct MP2KPlayerState *mplayInfo, u16 speed); -void m4aMPlayFadeIn(struct MP2KPlayerState *mplayInfo, u16 speed); -void m4aMPlayImmInit(struct MP2KPlayerState *mplayInfo); - -void m4aMPlayTempoControl(struct MP2KPlayerState *mplayInfo, u16 tempo); -void m4aMPlayVolumeControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, u16 volume); -void m4aMPlayPitchControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s16 pitch); -void m4aMPlayPanpotControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s8 pan); - -#define IS_ACTIVE_SONG(music_player_ID, song_ID) (gMPlayTable[music_player_ID].info->songHeader == gSongTable[song_ID].header) -#define MUSIC_PLAYER_BGM 0 -#define MUSIC_PLAYER_SE1 1 -#define MUSIC_PLAYER_SE2 2 -#define MUSIC_PLAYER_SE3 3 - -#endif // GUARD_M4A_H diff --git a/sa1/include/lib/m4a/m4a_internal.h b/sa1/include/lib/m4a/m4a_internal.h deleted file mode 100644 index 8af057aee..000000000 --- a/sa1/include/lib/m4a/m4a_internal.h +++ /dev/null @@ -1,477 +0,0 @@ -#ifndef GUARD_GBA_M4A_INTERNAL_H -#define GUARD_GBA_M4A_INTERNAL_H - -#include "gba/gba.h" - -// ASCII encoding of 'Smsh' in reverse -// This is presumably short for SMASH, the developer of MKS4AGB. -#define ID_NUMBER 0x68736D53 - -#define C_V 0x40 // center value for PAN, BEND, and TUNE - -#define SOUND_MODE_REVERB_VAL 0x0000007F -#define SOUND_MODE_REVERB_SET 0x00000080 -#define SOUND_MODE_MAXCHN 0x00000F00 -#define SOUND_MODE_MAXCHN_SHIFT 8 -#define SOUND_MODE_MASVOL 0x0000F000 -#define SOUND_MODE_MASVOL_SHIFT 12 -#define SOUND_MODE_FREQ_05734 0x00010000 -#define SOUND_MODE_FREQ_07884 0x00020000 -#define SOUND_MODE_FREQ_10512 0x00030000 -#define SOUND_MODE_FREQ_13379 0x00040000 -#define SOUND_MODE_FREQ_15768 0x00050000 -#define SOUND_MODE_FREQ_18157 0x00060000 -#define SOUND_MODE_FREQ_21024 0x00070000 -#define SOUND_MODE_FREQ_26758 0x00080000 -#define SOUND_MODE_FREQ_31536 0x00090000 -#define SOUND_MODE_FREQ_36314 0x000A0000 -#define SOUND_MODE_FREQ_40137 0x000B0000 -#define SOUND_MODE_FREQ_42048 0x000C0000 -#define SOUND_MODE_FREQ 0x000F0000 -#define SOUND_MODE_FREQ_SHIFT 16 -#define SOUND_MODE_DA_BIT_9 0x00800000 -#define SOUND_MODE_DA_BIT_8 0x00900000 -#define SOUND_MODE_DA_BIT_7 0x00A00000 -#define SOUND_MODE_DA_BIT_6 0x00B00000 -#define SOUND_MODE_DA_BIT 0x00B00000 -#define SOUND_MODE_DA_BIT_SHIFT 20 - -#if COLLECT_RINGS_ROM -#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_07884 | (15 << SOUND_MODE_MASVOL_SHIFT) | (4 << SOUND_MODE_MAXCHN_SHIFT)) -#else -#if (ENGINE == ENGINE_3) -#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (10 << SOUND_MODE_MASVOL_SHIFT) | (6 << SOUND_MODE_MAXCHN_SHIFT)) -#else -#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT) | (5 << SOUND_MODE_MAXCHN_SHIFT)) -#endif -#endif - -#define TONEDATA_TYPE_CGB 0x07 -#define TONEDATA_TYPE_FIX 0x08 -#define TONEDATA_TYPE_SPL 0x40 // key split -#define TONEDATA_TYPE_RHY 0x80 // rhythm - -#define TONEDATA_P_S_PAN 0xc0 -#define TONEDATA_P_S_PAM TONEDATA_P_S_PAN - -#define SOUND_CHANNEL_SF_START 0x80 -#define SOUND_CHANNEL_SF_STOP 0x40 -#define SOUND_CHANNEL_SF_LOOP 0x10 -#define SOUND_CHANNEL_SF_IEC 0x04 -#define SOUND_CHANNEL_SF_ENV 0x03 -#define SOUND_CHANNEL_SF_ENV_ATTACK 0x03 -#define SOUND_CHANNEL_SF_ENV_DECAY 0x02 -#define SOUND_CHANNEL_SF_ENV_SUSTAIN 0x01 -#define SOUND_CHANNEL_SF_ENV_RELEASE 0x00 -#define SOUND_CHANNEL_SF_ON (SOUND_CHANNEL_SF_START | SOUND_CHANNEL_SF_STOP | SOUND_CHANNEL_SF_IEC | SOUND_CHANNEL_SF_ENV) - -#define CGB_CHANNEL_MO_PIT 0x02 -#define CGB_CHANNEL_MO_VOL 0x01 - -#define CGB_NRx2_ENV_DIR_DEC 0x00 -#define CGB_NRx2_ENV_DIR_INC 0x08 - -#define MPT_FLG_VOLSET 0x01 -#define MPT_FLG_VOLCHG 0x03 -#define MPT_FLG_PITSET 0x04 -#define MPT_FLG_PITCHG 0x0C -#define MPT_FLG_START 0x40 -#define MPT_FLG_EXIST 0x80 - -#define MUSICPLAYER_STATUS_TRACK 0x0000ffff -#define MUSICPLAYER_STATUS_PAUSE 0x80000000 - -#define MAX_MUSICPLAYER_TRACKS 16 - -#define TRACKS_ALL 0xFFFF - -#define TEMPORARY_FADE 0x0001 -#define FADE_IN 0x0002 -#define FADE_VOL_MAX 64 -#define FADE_VOL_SHIFT 2 - -#define MAX_DIRECTSOUND_CHANNELS 12 - -#if PLATFORM_GBA -#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer -#else -#define PCM_DMA_BUF_SIZE 4907 // size of Direct Sound buffer -#endif - -#if PLATFORM_GBA -#define NUM_MUSIC_PLAYERS ((u16)gNumMusicPlayers) -#define NUM_MUSIC_PLAYERS_STATIC 4 // @HACK because of how gNumMusicPlayers was defined to match -#define MAX_LINES ((u32)gMaxLines) -#else -#define NUM_MUSIC_PLAYERS 4 -#define NUM_MUSIC_PLAYERS_STATIC NUM_MUSIC_PLAYERS -#define MAX_LINES 0 -#endif - -struct MP2KTrack; -struct MP2KPlayerState; - -typedef void (*MP2KEventNoteFunc)(u8, struct MP2KPlayerState *, struct MP2KTrack *); -typedef void (*MP2KEventFunc)(struct MP2KPlayerState *, struct MP2KTrack *); -typedef void (*CgbSoundFunc)(void); -typedef void (*CgbOscOffFunc)(u8); -typedef u32 (*MidiKeyToCgbFreqFunc)(u8, u8, u8); -typedef void (*ExtVolPitFunc)(void); -typedef void (*MPlayMainFunc)(struct MP2KPlayerState *); - -struct MixerSource { - u8 status; - u8 type; - u8 rightVol; - u8 leftVol; - - union { - struct { - u8 attack; - u8 decay; - u8 sustain; - u8 release; - u8 key; - u8 envelopeVol; - - u8 envelopeGoal; - u8 envelopeCtr; - - u8 echoVol; - u8 echoLen; - u8 padding1; - u8 padding2; - u8 gateTime; - u8 untransposedKey; - u8 velocity; - u8 priority; - u8 rhythmPan; - u8 padding3; - u8 padding4; - u8 padding5; - - u8 padding6; - u8 sustainGoal; - u8 nrx4; - u8 pan; - - u8 panMask; - u8 cgbStatus; - u8 length; - u8 sweep; - - u32 freq; - } cgb; - struct { - u8 attack; - u8 decay; - u8 sustain; - u8 release; - u8 key; - u8 envelopeVol; - - u8 envelopeVolR; - u8 envelopeVolL; - - u8 echoVol; - u8 echoLen; - u8 padding1; - u8 padding2; - u8 gateTime; - u8 untransposedKey; - u8 velocity; - u8 priority; - u8 rhythmPan; - u8 padding3; - u8 padding4; - u8 padding5; - - u32 ct; - float fw; - - u32 freq; - } sound; - } data; - - void *wav; // The next piece of data to be loading - void *current; // The working pointer from wav - - struct MP2KTrack *track; - struct MixerSource *prev; - struct MixerSource *next; - u32 padding7; // d4 - u32 blockCount; // bdpcm block count -}; - -struct SoundMixerState { - // This field is normally equal to ID_NUMBER but it is set to other - // values during sensitive operations for locking purposes. - u32 lockStatus; - - vu8 dmaCounter; - - // Direct Sound - u8 reverb; - u8 numChans; - u8 masterVol; - u8 freqOption; - - u8 extensionFlags; - u8 cgbCounter15; // periodically counts from 14 down to 0 (15 states) - u8 framesPerDmaCycle; // number of V-blanks per PCM DMA - u8 maxScanlines; - u8 gap[3]; - s32 samplesPerFrame; - s32 sampleRate; -#if PLATFORM_GBA - s32 sampleRateReciprocal; -#else - float sampleRateReciprocal; -#endif - struct MixerSource *cgbChans; - MPlayMainFunc MPlayMainHead; - struct MP2KPlayerState *musicPlayerHead; - CgbSoundFunc CgbSound; - CgbOscOffFunc CgbOscOff; - MidiKeyToCgbFreqFunc MidiKeyToCgbFreq; - void **MPlayJumpTable; - MP2KEventNoteFunc plynote; - ExtVolPitFunc ExtVolPit; - void *reserved2; - void *reserved3; - void *reversed4; - void *reserved5; - struct MixerSource chans[MAX_DIRECTSOUND_CHANNELS]; -#if PLATFORM_GBA - s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2]; -#else - float pcmBuffer[PCM_DMA_BUF_SIZE * 2]; -#endif -}; - -struct MP2KVoiceGroup { - u8 type; - u8 drumKey; - u8 cgbLength; - u8 pan_sweep; // pan or sweep (compatible sound ch. 1) - union { - struct { - struct WaveData *wav; - u8 attack; - u8 decay; - u8 sustain; - u8 release; - } sound; - struct { - struct MP2KVoiceGroup *group; - u8 *keySplitTable; - } keySplit; - } data; -}; - -struct WaveData { - u16 type; - u16 status; - - u32 freq; - u32 loopStart; - u32 size; // number of samples - s8 data[1]; // samples -}; - -struct MP2KSongHeader { - u8 trackCount; - u8 blockCount; - u8 priority; - u8 reverb; - struct MP2KVoiceGroup *voicegroup; - u8 *part[1]; -}; - -struct MP2KTrack { - u8 status; - u8 wait; - u8 patternLevel; - u8 repeatCount; - u8 gateTime; // 0 if TIE - u8 key; - u8 velocity; - u8 runningStatus; - s8 keyShiftCalculated; // Calculated by TrkVolPitSet using fields below. Units: semitones - u8 pitchCalculated; // Calculated by TrkVolPitSet using fields below. Units: 256ths of a semitone - s8 keyShift; // Units: semitones - s8 keyShiftPublic; // Units: semitones - s8 tune; // Units: 64ths of a semitone - u8 pitchPublic; // Units: 256ths of a semitone - s8 bend; // Units: (bendRange / 64)ths of a semitone - u8 bendRange; - u8 volRightCalculated; - u8 volLeftCalculated; - u8 vol; - u8 volPublic; // Used both for fades and MPlayVolumeControl - s8 pan; - s8 panPublic; - s8 modCalculated; // Pitch units: 16ths of a semitone - u8 modDepth; - u8 modType; - u8 lfoSpeed; - u8 lfoSpeedCounter; - u8 lfoDelay; - u8 lfoDelayCounter; - u8 priority; - u8 echoVolume; - u8 echoLength; - - struct MixerSource *chan; - struct MP2KVoiceGroup voicegroup; - - u8 gap[10]; - u16 unk_3A; - u32 unk_3C; - u8 *cmdPtr; - u8 *patternStack[3]; -}; - -struct MP2KPlayerState { - struct MP2KSongHeader *songHeader; - u32 status; - u8 trackCount; - u8 priority; - u8 cmd; - bool8 checkSongPriority; - u32 clock; - u8 padding[8]; - u8 *memAccArea; - u16 tempoRawBPM; // 150 initially... this doesn't seem right but whatever - u16 tempoScale; // 0x100 initially - u16 tempoInterval; // 150 initially - u16 tempoCounter; - u16 fadeInterval; - u16 fadeCounter; - u16 fadeOV; - struct MP2KTrack *tracks; - struct MP2KVoiceGroup *voicegroup; - u32 lockStatus; - MPlayMainFunc nextPlayerFunc; - struct MP2KPlayerState *nextPlayer; -}; - -struct MusicPlayer { - struct MP2KPlayerState *info; - struct MP2KTrack *track; - u8 numTracks; - u16 unk_A; -}; - -struct Song { - struct MP2KSongHeader *header; - u16 ms; - u16 me; -}; - -typedef void (*XcmdFunc)(struct MP2KPlayerState *, struct MP2KTrack *); - -extern char SoundMainRAM[]; -extern u8 gMPlayMemAccArea[]; -extern void *gMPlayJumpTable[]; -extern struct MixerSource gCgbChans[]; - -extern const struct MusicPlayer gMPlayTable[NUM_MUSIC_PLAYERS_STATIC]; -extern const struct Song gSongTable[]; -extern const XcmdFunc gXcmdTable[]; - -extern const u8 gClockTable[]; -extern const u8 gScaleTable[]; -extern const u32 gFreqTable[]; -extern const u16 gPcmSamplesPerVBlankTable[]; -extern void *const gMPlayJumpTableTemplate[]; - -extern const u8 gCgbScaleTable[]; -extern const s16 gCgbFreqTable[]; -extern const u8 gNoiseTable[]; -extern const u8 gCgb3Vol[]; - -#if PLATFORM_GBA -extern char gNumMusicPlayers[]; -extern char gMaxLines[]; -#endif - -u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust); -u32 umul3232H32(u32 multiplier, u32 multiplicand); -void SoundMain(void); -void SoundMainBTM(void *ptr); -void TrackStop(struct MP2KPlayerState *player, struct MP2KTrack *track); -void MP2KPlayerMain(struct MP2KPlayerState *); - -void ClearChain(struct MixerSource *chan); -void MP2KClearChain(struct MixerSource *chan); - -void MPlayContinue(struct MP2KPlayerState *mplayInfo); -void MPlayStart(struct MP2KPlayerState *mplayInfo, struct MP2KSongHeader *songHeader); -void MPlayStop(struct MP2KPlayerState *mplayInfo); -void FadeOutBody(struct MP2KPlayerState *mplayInfo); -void TrkVolPitSet(struct MP2KPlayerState *mplayInfo, struct MP2KTrack *track); -void MPlayFadeOut(struct MP2KPlayerState *mplayInfo, u16 speed); -void Clear64byte(void *addr); -void SoundInit(struct SoundMixerState *soundInfo); -void MPlayExtender(struct MixerSource *cgbChans); -void m4aSoundMode(u32 mode); -void MPlayOpen(struct MP2KPlayerState *mplayInfo, struct MP2KTrack *tracks, u8 trackCount); -void CgbSound(void); -void CgbOscOff(u8); -void CgbModVol(struct MixerSource *chan); -u32 MidiKeyToCgbFreq(u8, u8, u8); -void MPlayJumpTableCopy(void **mplayJumpTable); -void SampleFreqSet(u32 freq); -void m4aSoundVSyncOn(void); -void m4aSoundVSyncOff(void); - -void m4aMPlayTempoControl(struct MP2KPlayerState *mplayInfo, u16 tempo); -void m4aMPlayVolumeControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, u16 volume); -void m4aMPlayPitchControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s16 pitch); -void m4aMPlayPanpotControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s8 pan); -void ClearModM(struct MP2KTrack *track); -void m4aMPlayModDepthSet(struct MP2KPlayerState *mplayInfo, u16 trackBits, u8 modDepth); -void m4aMPlayLFOSpeedSet(struct MP2KPlayerState *mplayInfo, u16 trackBits, u8 lfoSpeed); - -// sound command handler functions -void MP2K_event_fine(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_goto(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_patt(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_pend(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_rept(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_memacc(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_prio(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_tempo(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_keysh(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_voice(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_vol(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_pan(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_bend(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_bendr(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_lfos(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_lfodl(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_mod(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_modt(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_tune(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_port(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xcmd(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_endtie(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_nxx(u8 clock, struct MP2KPlayerState *, struct MP2KTrack *); - -// extended sound command handler functions -void MP2K_event_xxx(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xwave(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xtype(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xatta(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xdeca(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xsust(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xrele(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xiecv(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xiecl(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xleng(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xswee(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xcmd_0C(struct MP2KPlayerState *, struct MP2KTrack *); -void MP2K_event_xcmd_0D(struct MP2KPlayerState *, struct MP2KTrack *); - -#endif // GUARD_GBA_M4A_INTERNAL_H diff --git a/sa1/include/malloc_ewram.h b/sa1/include/malloc_ewram.h deleted file mode 100644 index 58de2d36b..000000000 --- a/sa1/include/malloc_ewram.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef GUARD_MALLOC_EWRAM_H -#define GUARD_MALLOC_EWRAM_H - -#include "global.h" - -struct EwramNode { - /* 0x0 */ struct EwramNode *next; // Heap is implemented as a forward list. - /* 0x4 */ s32 state; // It records how much space is corresponding - // to this node. When you want to mark it as - // occupied/busy, negate it. - /* 0x8 */ u8 space[0]; // space for general purposes -}; - -void EwramInitHeap(void); -void *EwramMalloc(u32); -void EwramFree(void *); - -#endif // GUARD_MALLOC_EWRAM_H diff --git a/sa1/include/malloc_vram.h b/sa1/include/malloc_vram.h deleted file mode 100644 index 7abb11b90..000000000 --- a/sa1/include/malloc_vram.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef GUARD_MALLOC_VRAM_H -#define GUARD_MALLOC_VRAM_H - -#include "global.h" - -#define VRAM_HEAP_SEGMENT_SIZE 0x80 -#define VRAM_TILE_SLOTS_PER_SEGMENT (VRAM_HEAP_SEGMENT_SIZE / TILE_SIZE_4BPP) - -// TODO: Find out where these numbers come from -#if (ENGINE == ENGINE_1) -#define VRAM_TILE_SEGMENTS 156 -#define VRAM_HEAP_TILE_COUNT 112 -#elif (ENGINE == ENGINE_2) -#define VRAM_TILE_SEGMENTS 140 -#define VRAM_HEAP_TILE_COUNT 48 -#endif - -void *VramMalloc(u32); -void VramResetHeapState(void); -void VramFree(void *); - -#endif // GUARD_MALLOC_VRAM_H diff --git a/sa1/include/multi_boot.h b/sa1/include/multi_boot.h deleted file mode 100644 index 5d1dd8934..000000000 --- a/sa1/include/multi_boot.h +++ /dev/null @@ -1,135 +0,0 @@ -#ifndef GUARD_MULTI_BOOT_H -#define GUARD_MULTI_BOOT_H - -#include "global.h" - -/* From MASTER_INFO to MASTER_START_DL are upper values. - * From MASTER_REQUEST_CRC to MASTER_VERIFY_CRC are lower values - * (Upper=0) - */ -#define MULTIBOOT_MASTER_INFO 0x62 -#define MULTIBOOT_CLIENT_INFO 0x72 -#define MULTIBOOT_MASTER_START_PROBE 0x61 -#define MULTIBOOT_MASTER_REQUEST_DLREADY 0x63 -#define MULTIBOOT_CLIENT_DLREADY 0x73 -#define MULTIBOOT_MASTER_START_DL 0x64 -#define MULTIBOOT_MASTER_REQUEST_CRC 0x65 -#define MULTIBOOT_CLIENT_CALC_CRC 0x74 -#define MULTIBOOT_CLIENT_CRCREADY 0x75 -#define MULTIBOOT_MASTER_VERIFY_CRC 0x66 - -/*------------------------------------------------------------------*/ -/* Initialize Multi-play Boot */ -/*------------------------------------------------------------------*/ - -extern void MultiBootInit(struct MultiBootParam *mp); - -//* Sets serial communication mode as multi-play mode. -//* Basically, SIO_INTR_FLAG of IE is cleared, however it is -// acceptable to use SIO interrupt. -// -//* does not set mp -> masterp. -// Make sure to set up before calling this initialization function. - -/*------------------------------------------------------------------*/ -/* Multi-play Boot Main */ -/*------------------------------------------------------------------*/ - -extern s32 MultiBootMain(struct MultiBootParam *mp); - -//* Basically, call it once per frame. -// However, if there is a wait long enough, it is acceptable to call -// it multiple times per frame. The safe length of wait time depends -// on the application. (It is necessary to make the wait longer than -// the time it takes to process the interrupts of long period of -// time, including V-Blank interrupts.) -// -//* Returns 0 in normal completion. -// -//* Returns 0 when transfer ends (successfully) and a value of -// MultiBootCheckComplete() other than 0. -// -//* Once it is in the transfer end status, it simply returns 0 -// immediately. -// In order to cancel this status, call MultiBootInit(). -// It is acceptable to call MultiBootStartProbe() or -// MultiBootStartMaster(), however, they are internally calling -// MultiBootInit(). - -/*------------------------------------------------------------------*/ -/* Starts Client Recognition */ -/*------------------------------------------------------------------*/ - -extern void MultiBootStartProbe(struct MultiBootParam *mp); - -// After calling this, the client's recognition processing is done -// with // MultiBootMain(). Call after verifying mp -> -// probe_count is 0. - -/*------------------------------------------------------------------*/ -/* Starts Transfer from Master Server */ -/*------------------------------------------------------------------*/ - -extern void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, s32 length, u8 palette_color, s8 palette_speed); - -//* Among the units connected by multi-play communication cable, only -// those units with game pak inserted -// can become master server. -// -// srcp Pointer for the program that you want to boot -// (requires 4-byte alignment) -// For clients, it is downloaded immediately after -// the header. -// length Transfer byte count of program. -// MULTIBOOT_SEND_SIZE_MIN (0x100) bytes or more and -// MULTIBOOT_SEND_SIZE_MAX (0x40000) bytes or less. -// "palette_color" and "palette_speed" are palette flash parameters -// of client while loading. palette_color uses 0 to 6 to specify the -// basic palettes (7 types) With "palette_speed", it flashes in -// reversal order from -4 to -1 (-4 being the fastest) and it flashes -// in normal from +1 to +4 (+4 being the fastest) Palette is fixed -// (no flash) at 0. Do not specify any values other than listed -// above. - -/*------------------------------------------------------------------*/ -/* Check Transfer Completion */ -/*------------------------------------------------------------------*/ - -extern s32 MultiBootCheckComplete(struct MultiBootParam *mp); - -//* Check if transfer has completed. -// -//* Returns a value other than 0 if transfer has completed -//(successfully). -// Returns 0 if it is still recognizing, has not started transfer, or -// transfer has failed. -// -//* Calling any one of MultiBootInit(), MultiBootStartProbe() or -// MultiBootStartMaster() -// cancels the transfer completion status. - -/* magic value below aren't documented in SDK header */ - -/* probe_count */ - -#define MULTIBOOT_REQ_PREP_REC 0x0 -#define MULTIBOOT_REQ_START_REC 0x1 -#define MULTIBOOT_REQ_PROC_REC 0x2 - -#define MULTIBOOT_REC_COMPLETE 0xc4 - -#define MULTIBOOT_REQ_TX_CHECK 0xd0 -#define MULTIBOOT_REQ_TX_START 0xd1 - -#define MULTIBOOT_REQ_HANDSHAKE_START 0xe0 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_1 0xe1 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_2 0xe2 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_3 0xe3 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_4 0xe4 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_5 0xe5 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_6 0xe6 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_7 0xe7 -#define MULTIBOOT_REQ_HANDSHAKE_HEADER_CHECK_8 0xe8 -#define MULTIBOOT_HANDSHAKE_SUCCESS 0xe9 - -#endif // GUARD_MULTI_BOOT_H diff --git a/sa1/include/multi_sio.h b/sa1/include/multi_sio.h deleted file mode 100644 index d54083ea2..000000000 --- a/sa1/include/multi_sio.h +++ /dev/null @@ -1,279 +0,0 @@ -#ifndef GUARD_MULTI_SIO_H -#define GUARD_MULTI_SIO_H - -#include "global.h" - -// Optimize the following settings based on the software -// specifications - -#define MULTI_SIO_BLOCK_SIZE 20 // Communication Data Block Size (Max. 24 Bytes) - -#define MULTI_SIO_PLAYERS_MAX 4 // Maximum Number of Players - -#define MULTI_SIO_SYNC_DATA 0xfefe // Synchronized Data (0x0000/0xfffa~0xffff prohibited) - -// Comment out if no space in CPU internal Work RAM -#define MULTI_SIO_DI_FUNC_FAST // SIO Interrupt Prohibit Function High - // Speed Flag (CPU Internal RAM - // Execution) - -// Update if maximum delay for communication interrupt is larger than -// following. -#define MULTI_SIO_INTR_DELAY_MAX 2000 // Communication Interrupt Allowed Delay Clocks - -#ifdef MULTI_SIO_DI_FUNC_FAST -#define MULTI_SIO_INTR_CLOCK_MAX 400 // Communication Interrupt Processing Maximum Clocks -#else -#define MULTI_SIO_INTR_CLOCK_MAX 1000 -#endif - -#define MULTI_SIO_1P_SEND_CLOCKS 3000 // Communication Time for 1 unit - -#if MULTI_SIO_PLAYERS_MAX == 4 -#define MULTI_SIO_START_BIT_WAIT 0 // Start Bit Wait Time -#else -#define MULTI_SIO_START_BIT_WAIT 512 -#endif - -// During development set NDEBUG to undefined and value below to 0, -// define with last check and confirm operation with changed to 600. -// (Even if increase setting the communication interval increases, but -// processing doesn't slow). -//#define NDEBUG // Can define with -// Makefile (MakefileDemo) -#ifdef NDEBUG -#define MULTI_SIO_INTR_MARGIN 600 // Communication Interrupt Error Guarantee Value -#else -#define MULTI_SIO_INTR_MARGIN 0 -#endif - -#define MULTI_SIO_BAUD_RATE 115200 // Baud Rate -#define MULTI_SIO_BAUD_RATE_NO SIO_115200_BPS // Baud Rate No. - -#define MULTI_SIO_TIMER_NO 3 // Timer No. -#define MULTI_SIO_TIMER_INTR_FLAG (INTR_FLAG_TIMER0 << MULTI_SIO_TIMER_NO) - -#define REG_MULTI_SIO_TIMER (*(vu32 *)(REG_ADDR_TMCNT + (MULTI_SIO_TIMER_NO * 4))) -#define REG_MULTI_SIO_TIMER_L (*(vu16 *)(REG_ADDR_TMCNT_L + (MULTI_SIO_TIMER_NO * 4))) -#define REG_MULTI_SIO_TIMER_H (*(vu16 *)(REG_ADDR_TMCNT_H + (MULTI_SIO_TIMER_NO * 4))) -// Timer Register - -// Timer count number is calculated from communication data block -// size. -#define MULTI_SIO_TIMER_COUNT_TMP (SYSTEM_CLOCK / 60 / ((2 + 4 + MULTI_SIO_BLOCK_SIZE + 6) / (16 / 8))) -// Timer Count Temporary Value -#define MULTI_SIO_TIMER_COUNT_MIN \ - (MULTI_SIO_1P_SEND_CLOCKS * MULTI_SIO_PLAYERS_MAX + MULTI_SIO_START_BIT_WAIT + MULTI_SIO_INTR_MARGIN + MULTI_SIO_INTR_DELAY_MAX \ - + MULTI_SIO_INTR_CLOCK_MAX) -// Timer Count Minimum Value -#define MULTI_SIO_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value -#define MULTI_SIO_TIMER_COUNT (MULTI_SIO_TIMER_COUNT_MAX - MULTI_SIO_TIMER_COUNT_TMP) -// Timer Count -// Timer Count Setting Error -#if MULTI_SIO_TIMER_COUNT_TMP < MULTI_SIO_TIMER_COUNT_MIN -#error MULTI_SIO_TIMER_COUNT is too short, -#error because MULTI_SIO_BLOCK_SIZE or MULTI_SIO_INTR_DELAY_MAX is too large. -#elif MULTI_SIO_TIMER_COUNT_TMP > MULTI_SIO_TIMER_COUNT_MAX -#error MULTI_SIO_TIMER_COUNT is too long. -#endif - -// Multi-play Communication Packet Structure -struct MultiSioPacket { - u8 frameCounter; // Frame Counter - u8 recvErrorFlags : 4; // Receive Error Flag - u8 loadRequest : 1; // Load Request - u8 downloadSuccessFlag : 1; // Download Success Flag - u8 loadSuccessFlag : 1; // Load Success - u8 reserved_0 : 1; // Reserved - u16 checkSum; // Checksum - u16 data[MULTI_SIO_BLOCK_SIZE / 2]; // Communication Data - u16 overrunCatch[2]; // Overrun Protect Area -}; - -// Multi-play Communication Work Area Structure -struct MultiSioArea { - u8 type; // Connection (Master/Slave) - u8 state; // Communication Function State - u8 connectedFlags; // Connection History Flag - u8 recvSuccessFlags; // Receive Success Flag - - u8 syncRecvFlag[4]; // Receive Confirmation Flag - - u8 downloadSuccessFlags : 4; // Download Success Flag - u8 loadEnable : 1; // Enable Load - u8 loadRequest : 1; // Load Request - u8 loadSuccessFlag : 1; // Load Success - u8 startFlag : 1; // Communication Start Flag - - u8 hardError; // Hard error - u8 recvFlagsAvailableCounter; // Receiving success flag validation - // counter - - u8 sendFrameCounter; // Send Frame Counter - u8 recvFrameCounter[4][2]; // Receive Frame Counter - - s32 sendBufCounter; // Send Buffer Counter - s32 recvBufCounter[4]; // Receive Buffer Counter - - u16 *nextSendBufp; // Send Buffer Pointer - u16 *currentSendBufp; - u16 *currentRecvBufp[4]; // Receive Buffer Pointer - u16 *lastRecvBufp[4]; - u16 *recvCheckBufp[4]; - - struct MultiSioPacket sendBuf[2]; // Send Buffer (Double Buffer) - struct MultiSioPacket recvBuf[MULTI_SIO_PLAYERS_MAX][3]; - // Receive Buffer (Triple Buffer) -}; - -extern u32 gMultiSioRecvFuncBuf[0x40 / 4]; // Receive data/Check Buffer Change - // Routine RAM Execution Buffer -extern u32 gMultiSioIntrFuncBuf[0x120 / 4]; // Interrupt Routine RAM Execution Buffer - -extern struct MultiSioArea gMultiSioArea; // Multi-play Communication Work Area - -/*------------------------------------------------------------------*/ -/* Multi-play Communication Initialization */ -/*------------------------------------------------------------------*/ - -extern void MultiSioInit(u32 connectedFlags); - -//* Set serial communication mode to multi-play mode. -//* Initialize register and buffer. -//* Arguments: -// u32 connectedFlags Set appropriate flag if a unit recognized -// as connected - -/*------------------------------------------------------------------*/ -/* Start Multi-play Communication */ -/*------------------------------------------------------------------*/ - -void MultiSioStart(void); - -//* If following master recognition set flag to start send. -//* If slave or prior to master recognition do nothing. - -/*------------------------------------------------------------------*/ -/* Stop Multi-play Communication */ -/*------------------------------------------------------------------*/ - -void MultiSioStop(void); - -//* Stop Communication - -/*------------------------------------------------------------------*/ -/* Multi-play Communication Main */ -/*------------------------------------------------------------------*/ - -extern u32 MultiSioMain(void *sendp, void *recvp, u32 loadRequest); - -//* First determine if master or slave. If master recognized, -// initialize -// timer. -//* Call MultiSioSendDataSet() and set send data. -//* Call MultiSioRecvDataCheck() and check if normal receive done, -// and copy receive data to Recvp. -// -//* Set so called with as close a timing as possible within 1 frame. -//* Safer not to send data that matches flag data (SIO_SYNC_DATA) -// prior -// to connection determination. -// -//* Arguments: -// void *sendp User Send Buffer Pointer -// void *recvp User Receive Buffer Pointer -// u32 loadRequest Load Request - -//* Return Value: - -#define MULTI_SIO_RECV_ID_MASK 0x000f // Receive success flag -#define MULTI_SIO_CONNECTED_ID_MASK 0x0f00 // Connection history flag - -#define MULTI_SIO_RECV_ID_SHIFT 0 -#define MULTI_SIO_CONNECTED_ID_SHIFT 8 - -#define MULTI_SIO_RECV_ID0 0x0001 // Receive success flag Master -#define MULTI_SIO_RECV_ID1 0x0002 // Slave 1 -#define MULTI_SIO_RECV_ID2 0x0004 // Slave 2 -#define MULTI_SIO_RECV_ID3 0x0008 // Slave 3 -#define MULTI_SIO_LD_ENABLE 0x0010 // Enable load -#define MULTI_SIO_LD_REQUEST 0x0020 // Load request -#define MULTI_SIO_LD_SUCCESS 0x0040 // Load success -#define MULTI_SIO_TYPE 0x0080 // Connection (Master/Slave) -#define MULTI_SIO_PARENT 0x0080 // Connect Master -#define MULTI_SIO_CHILD 0x0000 // Connect Slave -#define MULTI_SIO_CONNECTED_ID0 0x0100 // Connection history flag Master -#define MULTI_SIO_CONNECTED_ID1 0x0200 // Slave 1 -#define MULTI_SIO_CONNECTED_ID2 0x0400 // Slave 2 -#define MULTI_SIO_CONNECTED_ID3 0x0800 // Slave 3 -#define MULTI_SIO_HARD_ERROR 0x1000 // Hard error -#define MULTI_SIO_ID_OVER_ERROR 0x2000 // ID over error -#define MULTI_SIO_RECV_FLAGS_AVAILABLE 0x8000 // Validate receive success flag - -#define MULTI_SIO_RECV_ID(x) (0x0001 << (x)) -#define MULTI_SIO_CONNECTED_ID(x) (0x0100 << (x)) - -#define MULTI_SIO_ALL_CONNECTED \ - (MULTI_SIO_CONNECTED_ID(0) | MULTI_SIO_CONNECTED_ID(1) | MULTI_SIO_CONNECTED_ID(2) | MULTI_SIO_CONNECTED_ID(3)) - -// Return Value Structure -struct MultiSioReturn { - u32 recvSuccessFlags : 4; // Receive success flag - u32 loadEnable : 1; // Enable load - u32 loadRequest : 1; // Load request - u32 loadSuccessFlag : 1; // Load success - u32 type : 1; // Connection (master/slave) - u32 connectedFlags : 4; // Connection history flag - u32 hardError : 1; // Hard error - u32 idOverError : 1; // ID over error - u32 reserved : 1; // Reservation - u32 recvFlagsAvailable : 1; // Validate receive success flag -}; - -/*------------------------------------------------------------------*/ -/* Multi-play Communication Interrupt */ -/*------------------------------------------------------------------*/ - -extern void MultiSioIntr(void); - -//* During communication interrupt, store receive data from each unit -// in each receive buffer and set the send buffer data to the -// register. -//* If master, reset timer and restart send. -// -//* Program so slave is called with communication interrupt and master -// is called with timer interrupt. -//* Adjust setting so 1 packet (Except for OverRunCatch[]) can be -// transfered with 1 frame. - -/*------------------------------------------------------------------*/ -/* Set Send Data */ -/*------------------------------------------------------------------*/ - -extern void MultiSioSendDataSet(void *sendp, u32 loadReq); - -//* Set the user send buffer data to send buffer. -// -//* Called from MultiSioMain(). -//* Not necessary to call directly. -// -//* Arguments: -// void *sendp User Send Buffer Pointer -// u32 loadReq Load Request - -/*------------------------------------------------------------------*/ -/* Check Receive Data */ -/*------------------------------------------------------------------*/ - -extern u32 MultiSioRecvDataCheck(void *recvp); - -//* Check if receive done normally. If normal, copy the receive data -// to the user receive buffer. -// -//* Called from MultiSioMain(). -//* Do not need to call directly. -// -//* Arguments: -// void *recvp User Receive Buffer Pointer - -#endif // GUARD_MULTI_SIO_H diff --git a/sa1/include/sio32_multi_load.h b/sa1/include/sio32_multi_load.h deleted file mode 100644 index 8a09e8589..000000000 --- a/sa1/include/sio32_multi_load.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef GUARD_SIO32_MULTI_LOAD_H -#define GUARD_SIO32_MULTI_LOAD_H - -#include "multi_sio.h" - -// Optimize the following settings based on the software -// specifications - -#define SIO32ML_BLOCK_SIZE 0x8000 - -// Update if maximum delay for communication interrupt is larger than -// following. -#define SIO32ML_INTR_DELAY_MAX 1000 // Communication Interrupt Allowed Delay Clocks - -#define SIO32ML_INTR_CLOCK_MAX 256 // Communication Interrupt Processing Maximum Clocks - -#define SIO32ML_SYNC_DATA \ - 0xfefefefe // Synchronized Data (0x00000000and 0xffffffff - // prohibited) - -#define SIO32ML_SYSTEM_CLOCK (16 * 1024 * 1024) // System Clock -#define SIO32ML_SHIFT_CLOCK (256 * 1024) // Shift Clock -#define SIO32ML_LINE_CLOCKS 1232 // Line Clocks - -// Comment out if no space in CPU internal Work RAM -#ifdef MULTI_SIO_DI_FUNC_FAST -// #define SIO32ML_DI_FUNC_FAST // SIO Interrupt -// Prohibit Function High Speed Flag (CPU Internal RAM Execution) -#endif - -#define SIO32ML_TIMER_NO 3 // Timer No. -#define SIO32ML_TIMER_INTR_FLAG (INTR_FLAG_TIMER0 << SIO32ML_TIMER_NO) -// Timer Interrupt Flag - -#define REG_SIO32ML_TIMER (*(vu32 *)(REG_ADDR_TMCNT + (SIO32ML_TIMER_NO * 4))) -#define REG_SIO32ML_TIMER_L (*(vu16 *)(REG_ADDR_TMCNT_L + (SIO32ML_TIMER_NO * 4))) -#define REG_SIO32ML_TIMER_H (*(vu16 *)(REG_ADDR_TMCNT_H + (SIO32ML_TIMER_NO * 4))) -// Timer Register - -// Timer count temporary value is calculated from communication data -// block size. -#define SIO32ML_TIMER_COUNT_TMP (SIO32ML_SYSTEM_CLOCK / SIO32ML_SHIFT_CLOCK * 32 + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX) -// Timer Count Temporary Value -#define SIO32ML_TIMER_COUNT_MAX 0x10000 // Timer Count Maximum Value -#define SIO32ML_TIMER_COUNT \ - ((SIO32ML_TIMER_COUNT_TMP > SIO32ML_TIMER_COUNT_MAX) ? SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_MAX \ - : SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT_TMP) -// Timer Count - -// Load timeout frames is calculated from above values. -#define SIO32ML_MODE_WAIT_FRAMES 6 // SIO Mode Switch Wait Frames -#define SIO32ML_LD_TIMEOUT_FRAMES \ - (((SIO32ML_TIMER_COUNT_MAX - SIO32ML_TIMER_COUNT + SIO32ML_INTR_DELAY_MAX + SIO32ML_INTR_CLOCK_MAX) * (SIO32ML_BLOCK_SIZE / 4)) \ - / (SIO32ML_LINE_CLOCKS * 228) \ - + SIO32ML_MODE_WAIT_FRAMES + 2) -// Load timeout frames - -// 32bit Serial Communication Multi-load Work Area Structure -struct Sio32MultiLoadArea { - u8 type; // Connection (Master/Slave) - u8 state; // Communication Function State - u8 frameCounter; // Frame Counter - u8 downloadSuccessFlag; // Download Success Flag - - u32 *datap; // Data Pointer - s32 dataCounter; // Data Counter - - u32 checkSum; // Checksum - u32 checkSumTmp; - s32 checkSumCounter; // Checksum Counter -}; - -extern struct Sio32MultiLoadArea gSio32MultiLoadArea; // 32bit Serial Communication - // Multi-load Work Area - -/*------------------------------------------------------------------*/ -/* 32bit Serial Communication Multi-load Intialization */ -/*------------------------------------------------------------------*/ - -extern void Sio32MultiLoadInit(u32 type, void *datap); - -//* Initialize register and buffer. -//* To avoid problem with shift clock synchronization set master to -// 256Kbps -// 32 bit serial communication mode first. -// -//* 2Mbps communication with a cable is not guaranteed so do not set -// up. -//* Set already connection already determined with multi-play -// communication -// to Type. -//* Do not pass VRAM address to Datap during display. -// May fail with checksum of stored data. -// Copy to VRAM after storing to work RAM once. -// After this, possible overwrite program data to work RAM. -// -//* Arguments: -// u32 type Connection (Master = Not 0/ Slave = 0) -// void *datap Data Pointer (Master = Send data/ Slave= Receive -// Buffer) - -/*------------------------------------------------------------------*/ -/* 32bit Serial Communication Multi-load Main */ -/*------------------------------------------------------------------*/ - -extern u32 Sio32MultiLoadMain(u32 *progressCounterp); - -//* After 1 frame wait, set the slave to 256Kbps 32bit serial -// communication -// mode. Also, until the slave's SIO mode is determined the waits and -// then communication is started. -//* Slave successively calculates receive data checksum, and checks -// when -// receive complete. -//* If receive is not completed at time when should be, end receive -// forcibly. -//* After communication ends prohibit communication interrupts, and -// return -// to multi-play communication mode. -// -//* Arguments: -// u32 *progressCounterp Progress Counter Pointer -// (Disabled when 0 specified) -//* Return Value: -// During communication = 0/ End = Not 0 - -/*------------------------------------------------------------------*/ -/* 32bit Serial Communication Multi-load Interrupt Routine */ -/*------------------------------------------------------------------*/ - -extern void Sio32MultiLoadIntr(void); - -//* Master does only send and slave only receive. -//* Master resets timer during send. -//* Slave stores receive data in order to receive buffer during -// communication interrupt. -// Lastly it stores checksum to work area. -// -//* Program so slave is called with communication interrupt and master -// is called with timer interrupt. -//* Data is passed with pipeline operation so delayed with slave with -// large ID and then received. Therefore at a minimum need to send -// two (8 Bytes) extra times. -// -//* Example: -// ID 0 1 2 3 -// Data 0 -> 0 -> 0 -> 0 -// 1 -> 0 -> 0 -> 0 -// 2 -> 1 -> 0 -> 0 -// 3 -> 2 -> 1 -> 0 -// 4 -> 3 -> 2 -> 1 - -#endif // GUARD_SIO32_MULTI_LOAD_H diff --git a/sa1/include/task.h b/sa1/include/task.h deleted file mode 100644 index 96c17b6d2..000000000 --- a/sa1/include/task.h +++ /dev/null @@ -1,147 +0,0 @@ -#ifndef GUARD_TASK_H -#define GUARD_TASK_H - -#include "global.h" - -struct Task; - -typedef void (*TaskMain)(void); -typedef void (*TaskDestructor)(struct Task *); - -// The task system uses the GBA's unique memory layout to halve the size of pointers. -// Other platforms need to have the same logical behavior, but done differently. -#if PLATFORM_GBA -typedef u16 TaskPtr; - -// Mainly used to silence (void* -> u16) warnings -typedef u32 TaskPtr32; - -#define TASK_PTR(taskRef) (IWRAM_START + (taskRef)) -#define TASK_IS_NULL(taskp) ((taskp) == (void *)IWRAM_START) - -typedef u16 IwramData; -#define CLEAR_TASK_MEMORY_ON_DESTROY FALSE -#else -typedef struct Task *TaskPtr; -typedef TaskPtr TaskPtr32; - -#define TASK_PTR(taskRef) (taskRef) -#define TASK_IS_NULL(task) ((task) == NULL) - -typedef void *IwramData; - -#if !DEBUG && !TAS_TESTING -#define ENABLE_TASK_LOGGING !TRUE -#else -#define ENABLE_TASK_LOGGING TRUE -#endif // !DEBUG && !TAS_TESTING - -#define CLEAR_TASK_MEMORY_ON_DESTROY TRUE -#endif // PLATFORM_GBA - -#define TASK_IS_NOT_NULL(taskp) !TASK_IS_NULL(taskp) - -#define MAX_TASK_NUM 128 - -#define TASK_INACTIVE 0x0001 -#define TASK_DESTROY_DISABLED 0x0002 -#define TASK_x0004 0x0004 -#define TASK_USE_EWRAM 0x0010 - -#define USE_SA2_TASK_SYSTEM (GAME == GAME_SA2) - -typedef struct Task { - /* 0x00 */ TaskPtr parent; - /* 0x02 */ TaskPtr prev; - /* 0x04 */ TaskPtr next; - /* 0x06 */ IwramData data; -#if PORTABLE - u32 dataSize; -#endif // PORTABLE - /* 0x08 */ TaskMain main; - /* 0x0C */ TaskDestructor dtor; - /* 0x10 */ u16 priority; // priority? - /* 0x12 */ u16 flags; // 0x1 = active - // 0x2 = ??? - // 0x10 = use ewram for struct -#if USE_SA2_TASK_SYSTEM - /* 0x14 */ u8 unk14; - /* 0x15 */ u8 unk15; - /* 0x16 */ u16 unk16; - /* 0x18 */ u16 unk18; -#endif // USE_SA2_TASK_SYSTEM - -#if ENABLE_TASK_LOGGING - const char *name; -#endif -} Task; - -#if PLATFORM_GBA -typedef u16 IwramNodePtr; -typedef u32 IwramNodePtr32; -#else -struct IwramNode; - -typedef struct IwramNode *IwramNodePtr; -typedef IwramNodePtr IwramNodePtr32; -#endif // PLATFORM_GBA - -#define IWRAM_PTR(ptr) TASK_PTR(ptr) - -struct IwramNode { - IwramNodePtr next; - s16 state; - - u8 ALIGNED(sizeof(void *)) space[0]; -}; - -#define TASK_DATA(taskp) (void *)TASK_PTR((taskp)->data) -#define TASK_PARENT(taskp) (struct Task *)TASK_PTR((taskp)->parent) -#define TASK_NEXT(taskp) (struct Task *)TASK_PTR((taskp)->next) -#define TasksDestroyAll() TasksDestroyInPriorityRange(0, 0xFFFF) - -#define TASK_HEAP_SIZE ((0x881) * sizeof(uintptr_t)) - -// NOTE: DO NOT USE, unless ABSOLUTELY necessary for matching!!! -#define TASK_GET_MEMBER(_taskType, _task, _memberType, _memberName) \ - *(_memberType *)((unsigned char *)TASK_DATA(_task) + offsetof(_taskType, _memberName)) -#define TASK_SET_MEMBER(_taskType, _task, _memberType, _memberName, _value) \ - TASK_GET_MEMBER(_taskType, _task, _memberType, _memberName) = (_value); - -extern struct Task gTasks[MAX_TASK_NUM]; -extern struct Task gEmptyTask; -extern struct Task *gTaskPtrs[MAX_TASK_NUM]; -extern s32 gNumTasks; -#if (ENGINE == ENGINE_3) -extern struct Task *gNextTaskToCheckForDestruction; -#endif -extern struct Task *gNextTask; -extern struct Task *gCurTask; -extern u8 gIwramHeap[TASK_HEAP_SIZE]; - -u32 TasksInit(void); -void TasksExec(void); - -#if ENABLE_TASK_LOGGING -#include - -struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor, const char *name); - -// The printout is split so we can still read the input, even if TaskCreate crashes. -#define TaskCreate(taskMain, structSize, priority, flags, taskDestructor) \ - ({ \ - printf("New '%s' (0x%X, %p) ", #taskMain, (u32)structSize, taskMain); \ - struct Task *tt = TaskCreate(taskMain, structSize, priority, flags, taskDestructor, #taskMain); \ - printf("at %p\n", tt); \ - tt; \ - }) -#else -struct Task *TaskCreate(TaskMain taskMain, u16 structSize, u16 priority, u16 flags, TaskDestructor taskDestructor); -#endif // ENABLE_TASK_LOGGING - -void TaskDestroy(struct Task *); -void *IwramMalloc(u16); -void IwramFree(void *p); -void TasksDestroyInPriorityRange(u16, u16); - -#endif // GUARD_TASK_H diff --git a/sa1/include/tilemap.h b/sa1/include/tilemap.h deleted file mode 100644 index 4bb4a0070..000000000 --- a/sa1/include/tilemap.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef GUARD_TILEMAP_H -#define GUARD_TILEMAP_H - -#define TILE_MASK_INDEX 0x03FF -#define TILE_MASK_X_FLIP 0x0400 -#define TILE_MASK_Y_FLIP 0x0800 -#define TILE_MASK_PALETTE 0xF000 - -// TODO: This should be the type of Collision::metatiles, if that matches anywhere... -typedef struct { -#ifdef M2C - // M2C: Empty structs are not supported. - u16 tile; -#else - u16 index : 10; - u16 xFlip : 1; - u16 yFlip : 1; - u16 pal : 4; -#endif -} Tile; - -typedef struct { - /* 0x00 */ u16 xTiles; - /* 0x02 */ u16 yTiles; - /* 0x04 */ u16 animTileSize; - /* 0x06 */ u8 animFrameCount; - /* 0x07 */ u8 animDelay; - /* 0x08 */ const u8 *tiles; - /* 0x0C */ u32 tilesSize; - /* 0x10 */ const u16 *palette; - /* 0x14 */ u16 palOffset; - /* 0x16 */ u16 palLength; - - // Can be u8* in some instances - // map = metatiles, when using with non-background map layers - /* 0x18 */ const u16 *map; -} Tilemap; /* size = 0x1C */ - -struct MapHeader { - /* 0x00 */ Tilemap tileset; - /* 0x1C */ const MetatileIndexType *metatileMap; - /* 0x20 */ u16 mapWidth; // in Metatiles - /* 0x22 */ u16 mapHeight; // in Metatiles -}; - -#endif // GUARD_TILEMAP_H \ No newline at end of file diff --git a/sa1/include/trig.h b/sa1/include/trig.h deleted file mode 100644 index 87bafb305..000000000 --- a/sa1/include/trig.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef GUARD_TRIG_H -#define GUARD_TRIG_H - -#include "global.h" - -extern const s16 gSineTable[1280]; - -#define SIN_PERIOD 1024 - -#define CLAMP_SIN_PERIOD(val) \ - ({ \ - s16 clamped = (val) & (SIN_PERIOD - 1); \ - clamped; \ - }) - -#define ONE_CYCLE (SIN_PERIOD - 1) - -#define SIN(radAngle) (gSineTable[(radAngle)]) -#define COS(radAngle) (gSineTable[(radAngle) + 256]) - -#define SIN_24_8(radAngle) Q_2_14_TO_Q_24_8(SIN(radAngle)) -#define COS_24_8(radAngle) Q_2_14_TO_Q_24_8(COS(radAngle)) - -#define DEG_TO_SIN(deg) ((int)((((double)(deg)) / 360.0) * (ONE_CYCLE + 1))) - -// NOTE: Returns a Q_24_8! -#define SIN_DEG(degrees) Q_2_14_TO_Q_24_8(gSineTable[DEG_TO_SIN(degrees)]) -#define COS_DEG(degrees) Q_2_14_TO_Q_24_8(gSineTable[DEG_TO_SIN(degrees) + 256]) - -#define SQUARE(v) ((v) * (v)) -#define CUBE(v) ((v) * (v) * (v)) - -#endif // GUARD_TRIG_H diff --git a/sa1/src/data/sa1/animations/animations.c b/sa1/src/data/sa1/animations/animations.c index a1542da10..444604f39 100644 --- a/sa1/src/data/sa1/animations/animations.c +++ b/sa1/src/data/sa1/animations/animations.c @@ -1,543 +1,408 @@ #include "global.h" -#include "constants/anim_commands.h" +#include "constants/sa1/anim_commands.h" const s32 anim_0000__v0_l0[] = { // 0x080DC188 - PALETTE(0, 16, 0x0) - TILES(0x0, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x0) TILES(0x0, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(6, 0) - TILES(0x14, 16) - SHOW_FRAME(6, 1) + TILES(0x14, 16) SHOW_FRAME(6, 1) - TILES(0x24, 16) - SHOW_FRAME(6, 2) + TILES(0x24, 16) SHOW_FRAME(6, 2) - TILES(0x34, 16) - SHOW_FRAME(6, 3) + TILES(0x34, 16) SHOW_FRAME(6, 3) - TILES(0x44, 20) - SHOW_FRAME(6, 4) + TILES(0x44, 20) SHOW_FRAME(6, 4) - TILES(0x58, 20) - SHOW_FRAME(6, 5) + TILES(0x58, 20) SHOW_FRAME(6, 5) - TILES(0x6C, 16) - SHOW_FRAME(6, 6) + TILES(0x6C, 16) SHOW_FRAME(6, 6) - TILES(0x7C, 20) - SHOW_FRAME(6, 7) + TILES(0x7C, 20) SHOW_FRAME(6, 7) - TILES(0x0, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(6, 0) + TILES(0x0, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(6, 0) - TILES(0x14, 16) - SHOW_FRAME(6, 1) + TILES(0x14, 16) SHOW_FRAME(6, 1) - TILES(0x90, 16) - SHOW_FRAME(6, 8) + TILES(0x90, 16) SHOW_FRAME(6, 8) - TILES(0xA0, 16) - SHOW_FRAME(6, 9) + TILES(0xA0, 16) SHOW_FRAME(6, 9) - TILES(0x44, 20) - SHOW_FRAME(6, 4) + TILES(0x44, 20) SHOW_FRAME(6, 4) - TILES(0x58, 20) - SHOW_FRAME(6, 5) + TILES(0x58, 20) SHOW_FRAME(6, 5) - TILES(0x6C, 16) - SHOW_FRAME(6, 6) + TILES(0x6C, 16) SHOW_FRAME(6, 6) - TILES(0x7C, 20) - SHOW_FRAME(6, 7) + TILES(0x7C, 20) SHOW_FRAME(6, 7) - TILES(0x0, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(6, 0) + TILES(0x0, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(6, 0) - TILES(0x14, 16) - SHOW_FRAME(6, 1) + TILES(0x14, 16) SHOW_FRAME(6, 1) - TILES(0x24, 16) - SHOW_FRAME(6, 2) + TILES(0x24, 16) SHOW_FRAME(6, 2) - TILES(0x34, 16) - SHOW_FRAME(6, 3) + TILES(0x34, 16) SHOW_FRAME(6, 3) - TILES(0x44, 20) - SHOW_FRAME(6, 4) + TILES(0x44, 20) SHOW_FRAME(6, 4) - TILES(0x58, 20) - SHOW_FRAME(6, 5) + TILES(0x58, 20) SHOW_FRAME(6, 5) - TILES(0x6C, 16) - SHOW_FRAME(6, 6) + TILES(0x6C, 16) SHOW_FRAME(6, 6) - TILES(0x7C, 20) - SHOW_FRAME(6, 7) + TILES(0x7C, 20) SHOW_FRAME(6, 7) - TILES(0xB0, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(6, 10) + TILES(0xB0, 20) HITBOX( + 0, -6, -13, 6, 16) SHOW_FRAME(6, 10) - TILES(0xC4, 20) - SHOW_FRAME(12, 11) + TILES(0xC4, 20) SHOW_FRAME(12, 11) - TILES(0xD8, 20) - SHOW_FRAME(6, 12) + TILES(0xD8, 20) SHOW_FRAME(6, + 12) - TILES(0xC4, 20) - SHOW_FRAME(6, 11) + TILES(0xC4, + 20) SHOW_FRAME(6, 11) - TILES(0xD8, 20) - SHOW_FRAME(6, 12) + TILES(0xD8, + 20) SHOW_FRAME(6, + 12) - TILES(0xC4, 20) - SHOW_FRAME(12, 11) + TILES(0xC4, 20) SHOW_FRAME( + 12, + 11) - TILES(0xB0, 20) - SHOW_FRAME(8, 10) + TILES(0xB0, 20) SHOW_FRAME( + 8, 10) - TILES(0x0, 20) - SHOW_FRAME(6, 0) + TILES(0x0, 20) SHOW_FRAME( + 6, 0) - TILES(0x58, 20) - SHOW_FRAME(6, 5) + TILES(0x58, 20) SHOW_FRAME( + 6, + 5) - TILES(0x6C, 16) - SHOW_FRAME(6, 6) + TILES(0x6C, 16) SHOW_FRAME( + 6, + 6) - TILES(0x7C, 20) - SHOW_FRAME(6, 7) + TILES( + 0x7C, + 20) + SHOW_FRAME( + 6, + 7) - JUMP_BACK(190) + JUMP_BACK( + 190) }; -const s32 * const anim_0000[1] = { +const s32 *const anim_0000[1] = { anim_0000__v0_l0, }; const s32 anim_0001__v0_l0[] = { // 0x080DC48C - PALETTE(0, 16, 0x0) - TILES(0xEC, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x0) TILES(0xEC, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(6, 0) - TILES(0x100, 20) - SHOW_FRAME(30, 1) + TILES(0x100, 20) SHOW_FRAME(30, 1) - TILES(0x114, 30) - SHOW_FRAME(10, 2) + TILES(0x114, 30) SHOW_FRAME(10, 2) - TILES(0x132, 20) - SHOW_FRAME(6, 3) + TILES(0x132, 20) SHOW_FRAME(6, 3) - TILES(0x100, 20) - SHOW_FRAME(40, 1) + TILES(0x100, 20) SHOW_FRAME(40, 1) - TILES(0x146, 20) - SHOW_FRAME(6, 4) + TILES(0x146, 20) SHOW_FRAME(6, 4) - TILES(0x15A, 25) - SHOW_FRAME(8, 5) + TILES(0x15A, 25) SHOW_FRAME(8, 5) - TILES(0x173, 25) - SHOW_FRAME(8, 6) + TILES(0x173, 25) SHOW_FRAME(8, 6) - TILES(0x15A, 25) - SHOW_FRAME(8, 5) + TILES(0x15A, 25) SHOW_FRAME(8, 5) - TILES(0x173, 25) - SHOW_FRAME(8, 6) + TILES(0x173, 25) SHOW_FRAME(8, 6) - TILES(0x15A, 25) - SHOW_FRAME(8, 5) + TILES(0x15A, 25) SHOW_FRAME(8, 5) - TILES(0x173, 25) - SHOW_FRAME(8, 6) + TILES(0x173, 25) SHOW_FRAME(8, 6) - TILES(0x18C, 20) - SHOW_FRAME(6, 7) + TILES(0x18C, 20) SHOW_FRAME(6, 7) - TILES(0x1A0, 20) - SHOW_FRAME(12, 8) + TILES(0x1A0, 20) SHOW_FRAME(12, 8) - TILES(0x1B4, 20) - SHOW_FRAME(6, 9) + TILES(0x1B4, 20) SHOW_FRAME(6, 9) - TILES(0x1C8, 20) - SHOW_FRAME(6, 10) + TILES(0x1C8, 20) SHOW_FRAME(6, 10) - TILES(0x1DC, 20) - SHOW_FRAME(6, 11) + TILES(0x1DC, 20) SHOW_FRAME(6, 11) - TILES(0x1F0, 20) - SHOW_FRAME(20, 12) + TILES(0x1F0, 20) SHOW_FRAME(20, 12) - TILES(0x204, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(8, 13) + TILES(0x204, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(8, 13) - TILES(0x218, 20) - SHOW_FRAME(30, 14) + TILES(0x218, 20) SHOW_FRAME(30, 14) - TILES(0x204, 20) - SHOW_FRAME(8, 13) - TILES(0x100, 20) - SHOW_FRAME(20, 1) + TILES(0x204, 20) SHOW_FRAME(8, 13) TILES( + 0x100, 20) SHOW_FRAME(20, 1) - TILES(0x22C, 20) - SHOW_FRAME(8, 15) + TILES(0x22C, 20) SHOW_FRAME(8, 15) - TILES(0x240, 20) - SHOW_FRAME(12, 16) + TILES(0x240, 20) SHOW_FRAME(12, 16) - TILES(0x254, 20) - SHOW_FRAME(8, 17) + TILES(0x254, 20) SHOW_FRAME(8, 17) - TILES(0x240, 20) - SHOW_FRAME(8, 16) + TILES(0x240, 20) SHOW_FRAME(8, 16) - TILES(0x254, 20) - SHOW_FRAME(8, 17) + TILES(0x254, 20) SHOW_FRAME(8, 17) - TILES(0x240, 20) - SHOW_FRAME(20, 16) + TILES(0x240, 20) SHOW_FRAME(20, + 16) - TILES(0x22C, 20) - SHOW_FRAME(6, 15) + TILES(0x22C, + 20) SHOW_FRAME(6, 15) - TILES(0x100, 20) - SHOW_FRAME(80, 1) + TILES(0x100, + 20) SHOW_FRAME(80, + 1) - TILES(0x22C, 20) - SHOW_FRAME(8, 15) + TILES( + 0x22C, + 20) SHOW_FRAME(8, 15) - TILES(0x240, 20) - SHOW_FRAME(12, 16) + TILES(0x240, 20) SHOW_FRAME( + 12, + 16) - TILES(0x254, 20) - SHOW_FRAME(8, 17) + TILES(0x254, 20) SHOW_FRAME( + 8, 17) - TILES(0x240, 20) - SHOW_FRAME(8, 16) + TILES(0x240, 20) SHOW_FRAME( + 8, + 16) - TILES(0x254, 20) - SHOW_FRAME(8, 17) + TILES(0x254, 20) SHOW_FRAME( + 8, + 17) - TILES(0x240, 20) - SHOW_FRAME(20, 16) + TILES(0x240, 20) SHOW_FRAME( + 20, + 16) - TILES(0x22C, 20) - SHOW_FRAME(6, 15) + TILES( + 0x22C, + 20) + SHOW_FRAME( + 6, + 15) - JUMP_BACK(80) + JUMP_BACK( + 80) }; -const s32 * const anim_0001[1] = { +const s32 *const anim_0001[1] = { anim_0001__v0_l0, }; const s32 anim_0002__v0_l0[] = { // 0x080DC7A0 - PALETTE(0, 16, 0x0) - TILES(0x268, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x268, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(1, 0) - TILES(0x27C, 20) - SHOW_FRAME(1, 1) - TILES(0x290, 20) - SHOW_FRAME(12, 2) + TILES(0x27C, 20) SHOW_FRAME(1, 1) TILES(0x290, 20) SHOW_FRAME(12, 2) - TILES(0x2A4, 20) - SHOW_FRAME(12, 3) + TILES(0x2A4, 20) SHOW_FRAME(12, 3) - TILES(0x290, 20) - SHOW_FRAME(12, 2) + TILES(0x290, 20) SHOW_FRAME(12, 2) - TILES(0x2B8, 20) - SHOW_FRAME(12, 4) + TILES(0x2B8, 20) SHOW_FRAME(12, 4) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0002__v1_l0[] = { // 0x080DC838 - PALETTE(0, 16, 0x0) - TILES(0x27C, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(1, 1) + PALETTE(0, 16, 0x0) TILES(0x27C, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(1, 1) - TILES(0x268, 20) - SHOW_FRAME(1, 0) + TILES(0x268, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0002[2] = { +const s32 *const anim_0002[2] = { anim_0002__v0_l0, anim_0002__v1_l0, }; const s32 anim_0003__v0_l0[] = { // 0x080DC884 - PALETTE(0, 16, 0x0) - TILES(0x2CC, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x2CC, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 0) - TILES(0x2DC, 16) - SHOW_FRAME(1, 1) + TILES(0x2DC, 16) SHOW_FRAME(1, 1) - TILES(0x2EC, 16) - SHOW_FRAME(1, 2) - TILES(0x2FC, 16) - SHOW_FRAME(1, 3) + TILES(0x2EC, 16) SHOW_FRAME(1, 2) TILES(0x2FC, 16) SHOW_FRAME(1, 3) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0003__v1_l0[] = { // 0x080DC8F4 - PALETTE(0, 16, 0x0) - TILES(0x2DC, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 1) + PALETTE(0, 16, 0x0) TILES(0x2DC, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 1) - TILES(0x2CC, 16) - SHOW_FRAME(1, 0) + TILES(0x2CC, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0003[2] = { +const s32 *const anim_0003[2] = { anim_0003__v0_l0, anim_0003__v1_l0, }; const s32 anim_0004__v0_l0[] = { // 0x080DC940 - PALETTE(0, 16, 0x0) - TILES(0x30C, 64) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x30C, 64) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 0) - TILES(0x34C, 64) - SHOW_FRAME(3, 1) + TILES(0x34C, 64) SHOW_FRAME(3, 1) - TILES(0x38C, 64) - SHOW_FRAME(3, 2) + TILES(0x38C, 64) SHOW_FRAME(3, 2) - TILES(0x3CC, 64) - SHOW_FRAME(3, 3) + TILES(0x3CC, 64) SHOW_FRAME(3, 3) - TILES(0x40C, 64) - SHOW_FRAME(3, 4) + TILES(0x40C, 64) SHOW_FRAME(3, 4) - TILES(0x44C, 64) - SHOW_FRAME(3, 5) + TILES(0x44C, 64) SHOW_FRAME(3, 5) - TILES(0x48C, 64) - SHOW_FRAME(3, 6) + TILES(0x48C, 64) SHOW_FRAME(3, 6) - TILES(0x4CC, 64) - SHOW_FRAME(3, 7) + TILES(0x4CC, 64) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0004[1] = { +const s32 *const anim_0004[1] = { anim_0004__v0_l0, }; const s32 anim_0005__v0_l0[] = { // 0x080DCA04 - PALETTE(0, 16, 0x0) - TILES(0x50C, 64) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x50C, 64) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(2, 0) - TILES(0x54C, 64) - SHOW_FRAME(2, 1) + TILES(0x54C, 64) SHOW_FRAME(2, 1) - TILES(0x58C, 64) - SHOW_FRAME(2, 2) + TILES(0x58C, 64) SHOW_FRAME(2, 2) - TILES(0x5CC, 64) - SHOW_FRAME(2, 3) + TILES(0x5CC, 64) SHOW_FRAME(2, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0005[1] = { +const s32 *const anim_0005[1] = { anim_0005__v0_l0, }; const s32 anim_0006__v0_l0[] = { // 0x080DCA78 - PALETTE(0, 16, 0x0) - TILES(0x60C, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x60C, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(1, 0) - TILES(0x620, 20) - SHOW_FRAME(1, 1) + TILES(0x620, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0006[1] = { +const s32 *const anim_0006[1] = { anim_0006__v0_l0, }; const s32 anim_0007__v0_l0[] = { // 0x080DCAC0 - PALETTE(0, 16, 0x0) - TILES(0x634, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x634, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(1, 0) - TILES(0x648, 20) - SHOW_FRAME(1, 1) + TILES(0x648, 20) SHOW_FRAME(1, 1) - TILES(0x65C, 25) - SHOW_FRAME(1, 2) + TILES(0x65C, 25) SHOW_FRAME(1, 2) - TILES(0x675, 20) - SHOW_FRAME(1, 3) + TILES(0x675, 20) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0007[1] = { +const s32 *const anim_0007[1] = { anim_0007__v0_l0, }; const s32 anim_0008__v0_l0[] = { // 0x080DCB30 - PALETTE(0, 16, 0x0) - TILES(0x689, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x689, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x699, 16) - SHOW_FRAME(2, 1) + TILES(0x699, 16) SHOW_FRAME(2, 1) - TILES(0x6A9, 16) - SHOW_FRAME(2, 2) + TILES(0x6A9, 16) SHOW_FRAME(2, 2) - TILES(0x6B9, 16) - SHOW_FRAME(2, 3) + TILES(0x6B9, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0008[1] = { +const s32 *const anim_0008[1] = { anim_0008__v0_l0, }; const s32 anim_0009__v0_l0[] = { // 0x080DCBB0 - PALETTE(0, 16, 0x0) - TILES(0x6C9, 25) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(2, 0) - TILES(0x6E2, 25) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 1) + PALETTE(0, 16, 0x0) TILES(0x6C9, 25) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(2, 0) TILES(0x6E2, 25) HITBOX(0, -6, -13, 6, 16) + SHOW_FRAME(4, 1) - TILES(0x6FB, 25) - SHOW_FRAME(4, 2) + TILES(0x6FB, 25) SHOW_FRAME(4, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0009__v1_l0[] = { // 0x080DCC18 - PALETTE(0, 16, 0x0) - TILES(0x6C9, 25) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x6C9, 25) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0009[2] = { +const s32 *const anim_0009[2] = { anim_0009__v0_l0, anim_0009__v1_l0, }; const s32 anim_0010__v0_l0[] = { // 0x080DCC50 - PALETTE(0, 16, 0x0) - TILES(0x714, 24) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 0) - TILES(0x72C, 18) - SHOW_FRAME(3, 1) + PALETTE(0, 16, 0x0) TILES(0x714, 24) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 0) TILES(0x72C, 18) SHOW_FRAME(3, 1) - TILES(0x73E, 18) - SHOW_FRAME(3, 2) + TILES(0x73E, 18) SHOW_FRAME(3, 2) - TILES(0x750, 18) - SHOW_FRAME(3, 3) + TILES(0x750, 18) SHOW_FRAME(3, 3) - JUMP_BACK(15) + JUMP_BACK(15) }; const s32 anim_0010__v1_l0[] = { // 0x080DCCC0 - PALETTE(0, 16, 0x0) - TILES(0x714, 24) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x714, 24) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(2, 0) - TILES(0x762, 20) - SHOW_FRAME(2, 4) + TILES(0x762, 20) SHOW_FRAME(2, 4) - TILES(0x776, 20) - SHOW_FRAME(2, 5) + TILES(0x776, 20) SHOW_FRAME(2, 5) - TILES(0x78A, 20) - SHOW_FRAME(3, 6) + TILES(0x78A, 20) SHOW_FRAME(3, 6) - TILES(0x79E, 20) - SHOW_FRAME(3, 7) + TILES(0x79E, 20) SHOW_FRAME(3, 7) - TILES(0x7B2, 20) - SHOW_FRAME(3, 8) + TILES(0x7B2, 20) SHOW_FRAME(3, 8) - END() + END() }; const s32 anim_0010__v2_l0[] = { // 0x080DCD54 - PALETTE(0, 16, 0x0) - TILES(0x7C6, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 9) + PALETTE(0, 16, 0x0) TILES(0x7C6, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 9) - TILES(0x7DA, 20) - SHOW_FRAME(3, 10) + TILES(0x7DA, 20) SHOW_FRAME(3, 10) - TILES(0x7EE, 20) - SHOW_FRAME(3, 11) + TILES(0x7EE, 20) SHOW_FRAME(3, 11) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0010__v3_l0[] = { // 0x080DCDB0 - PALETTE(0, 16, 0x0) - TILES(0x802, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 12) + PALETTE(0, 16, 0x0) TILES(0x802, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 12) - TILES(0x816, 16) - HITBOX(0, -6, 0, 6, 24) - SHOW_FRAME(1, 13) + TILES(0x816, 16) HITBOX(0, -6, 0, 6, 24) SHOW_FRAME(1, 13) - TILES(0x826, 16) - HITBOX(0, -6, 0, 6, 24) - SHOW_FRAME(1, 14) + TILES(0x826, 16) HITBOX(0, -6, 0, 6, 24) SHOW_FRAME(1, 14) - TILES(0x816, 16) - HITBOX(0, -6, 0, 6, 24) - SHOW_FRAME(1, 13) + TILES(0x816, 16) HITBOX(0, -6, 0, 6, 24) SHOW_FRAME(1, 13) - END() + END() }; -const s32 * const anim_0010[4] = { +const s32 *const anim_0010[4] = { anim_0010__v0_l0, anim_0010__v1_l0, anim_0010__v2_l0, @@ -545,2782 +410,1943 @@ const s32 * const anim_0010[4] = { }; const s32 anim_0011__v0_l0[] = { // 0x080DCE50 - PALETTE(0, 16, 0x0) - TILES(0x836, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x836, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(4, 0) - TILES(0x84A, 16) - SHOW_FRAME(4, 1) + TILES(0x84A, 16) SHOW_FRAME(4, 1) - TILES(0x85A, 20) - SHOW_FRAME(4, 2) + TILES(0x85A, 20) SHOW_FRAME(4, 2) - TILES(0x86E, 20) - SHOW_FRAME(4, 3) + TILES(0x86E, 20) SHOW_FRAME(4, 3) - TILES(0x882, 20) - SHOW_FRAME(4, 4) + TILES(0x882, 20) SHOW_FRAME(4, 4) - TILES(0x896, 20) - SHOW_FRAME(4, 5) + TILES(0x896, 20) SHOW_FRAME(4, 5) - TILES(0x8AA, 20) - SHOW_FRAME(4, 6) + TILES(0x8AA, 20) SHOW_FRAME(4, 6) - TILES(0x8BE, 20) - SHOW_FRAME(4, 7) + TILES(0x8BE, 20) SHOW_FRAME(4, 7) - TILES(0x8D2, 20) - SHOW_FRAME(4, 8) + TILES(0x8D2, 20) SHOW_FRAME(4, 8) - TILES(0x8E6, 16) - SHOW_FRAME(4, 9) + TILES(0x8E6, 16) SHOW_FRAME(4, 9) - TILES(0x8F6, 20) - SHOW_FRAME(4, 10) + TILES(0x8F6, 20) SHOW_FRAME(4, 10) - END() + END() }; -const s32 * const anim_0011[1] = { +const s32 *const anim_0011[1] = { anim_0011__v0_l0, }; const s32 anim_0012__v0_l0[] = { // 0x080DCF4C - PALETTE(0, 16, 0x0) - TILES(0x90A, 16) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 0) - TILES(0x91A, 16) - SHOW_FRAME(6, 1) + PALETTE(0, 16, 0x0) TILES(0x90A, 16) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(4, 0) TILES(0x91A, 16) SHOW_FRAME(6, 1) - TILES(0x92A, 16) - SHOW_FRAME(6, 2) + TILES(0x92A, 16) SHOW_FRAME(6, 2) - TILES(0x93A, 16) - SHOW_FRAME(6, 3) + TILES(0x93A, 16) SHOW_FRAME(6, 3) - TILES(0x94A, 16) - SHOW_FRAME(6, 4) + TILES(0x94A, 16) SHOW_FRAME(6, 4) - TILES(0x95A, 16) - SHOW_FRAME(6, 5) + TILES(0x95A, 16) SHOW_FRAME(6, 5) - TILES(0x96A, 16) - SHOW_FRAME(6, 6) + TILES(0x96A, 16) SHOW_FRAME(6, 6) - TILES(0x97A, 16) - SHOW_FRAME(6, 7) + TILES(0x97A, 16) SHOW_FRAME(6, 7) - TILES(0x98A, 16) - SHOW_FRAME(6, 8) + TILES(0x98A, 16) SHOW_FRAME(6, 8) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0012__v1_l0[] = { // 0x080DD020 - PALETTE(0, 16, 0x0) - TILES(0x90A, 16) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x90A, 16) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0012[2] = { +const s32 *const anim_0012[2] = { anim_0012__v0_l0, anim_0012__v1_l0, }; const s32 anim_0013__v0_l0[] = { // 0x080DD058 - PALETTE(0, 16, 0x0) - TILES(0x99A, 20) - HITBOX(0, -5, -13, 7, 16) - SHOW_FRAME(2, 0) - TILES(0x9AE, 25) - HITBOX(0, -5, -13, 7, 16) - SHOW_FRAME(2, 1) + PALETTE(0, 16, 0x0) TILES(0x99A, 20) HITBOX(0, -5, -13, 7, 16) SHOW_FRAME(2, 0) TILES(0x9AE, 25) HITBOX(0, -5, -13, 7, 16) + SHOW_FRAME(2, 1) - TILES(0x9C7, 25) - SHOW_FRAME(2, 2) + TILES(0x9C7, 25) SHOW_FRAME(2, 2) - TILES(0x9E0, 25) - SHOW_FRAME(2, 3) + TILES(0x9E0, 25) SHOW_FRAME(2, 3) - TILES(0x9F9, 20) - SHOW_FRAME(2, 4) + TILES(0x9F9, 20) SHOW_FRAME(2, 4) - TILES(0xA0D, 25) - SHOW_FRAME(2, 5) + TILES(0xA0D, 25) SHOW_FRAME(2, 5) - TILES(0xA26, 25) - SHOW_FRAME(2, 6) + TILES(0xA26, 25) SHOW_FRAME(2, 6) - TILES(0xA3F, 25) - SHOW_FRAME(2, 7) + TILES(0xA3F, 25) SHOW_FRAME(2, 7) - TILES(0xA58, 20) - SHOW_FRAME(2, 8) + TILES(0xA58, 20) SHOW_FRAME(2, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0013__v1_l0[] = { // 0x080DD138 - PALETTE(0, 16, 0x0) - TILES(0xA6C, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(2, 9) + PALETTE(0, 16, 0x0) TILES(0xA6C, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(2, 9) - END() + END() }; -const s32 * const anim_0013[2] = { +const s32 *const anim_0013[2] = { anim_0013__v0_l0, anim_0013__v1_l0, }; const s32 anim_0014__v0_l0[] = { // 0x080DD170 - PALETTE(0, 16, 0x0) - TILES(0xA80, 25) - HITBOX(0, -16, -13, -4, 16) - SHOW_FRAME(2, 0) - TILES(0xA99, 25) - HITBOX(0, -16, -13, -4, 16) - SHOW_FRAME(3, 1) + PALETTE(0, 16, 0x0) TILES(0xA80, 25) HITBOX(0, -16, -13, -4, 16) SHOW_FRAME(2, 0) TILES(0xA99, 25) HITBOX(0, -16, -13, -4, 16) + SHOW_FRAME(3, 1) - TILES(0xAB2, 25) - SHOW_FRAME(3, 2) + TILES(0xAB2, 25) SHOW_FRAME(3, 2) - TILES(0xACB, 25) - SHOW_FRAME(3, 3) + TILES(0xACB, 25) SHOW_FRAME(3, 3) - TILES(0xAE4, 20) - SHOW_FRAME(3, 4) + TILES(0xAE4, 20) SHOW_FRAME(3, 4) - TILES(0xAF8, 25) - SHOW_FRAME(3, 5) + TILES(0xAF8, 25) SHOW_FRAME(3, 5) - TILES(0xB11, 25) - SHOW_FRAME(3, 6) + TILES(0xB11, 25) SHOW_FRAME(3, 6) - TILES(0xB2A, 25) - SHOW_FRAME(3, 7) + TILES(0xB2A, 25) SHOW_FRAME(3, 7) - TILES(0xB43, 30) - SHOW_FRAME(3, 8) + TILES(0xB43, 30) SHOW_FRAME(3, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0014__v1_l0[] = { // 0x080DD250 - PALETTE(0, 16, 0x0) - TILES(0xB61, 25) - HITBOX(0, -14, -13, -2, 16) - SHOW_FRAME(2, 9) + PALETTE(0, 16, 0x0) TILES(0xB61, 25) HITBOX(0, -14, -13, -2, 16) SHOW_FRAME(2, 9) - END() + END() }; -const s32 * const anim_0014[2] = { +const s32 *const anim_0014[2] = { anim_0014__v0_l0, anim_0014__v1_l0, }; const s32 anim_0017__v0_l0[] = { // 0x080DD288 - PALETTE(0, 16, 0x0) - TILES(0xB7A, 24) - HITBOX(0, -6, -14, 6, 14) - PLAY_SOUND(191) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x0) TILES(0xB7A, 24) HITBOX(0, -6, -14, 6, 14) PLAY_SOUND(191) SHOW_FRAME(6, 0) - TILES(0xB92, 24) - SHOW_FRAME(6, 1) + TILES(0xB92, 24) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0017[1] = { +const s32 *const anim_0017[1] = { anim_0017__v0_l0, }; const s32 anim_0018__v0_l0[] = { // 0x080DD2D8 - PALETTE(0, 16, 0x0) - TILES(0xBAA, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0xBAA, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0xBBA, 16) - SHOW_FRAME(2, 1) + TILES(0xBBA, 16) SHOW_FRAME(2, 1) - TILES(0xBCA, 16) - SHOW_FRAME(2, 2) + TILES(0xBCA, 16) SHOW_FRAME(2, 2) - TILES(0xBDA, 16) - SHOW_FRAME(2, 3) + TILES(0xBDA, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; const s32 anim_0018__v1_l0[] = { // 0x080DD354 - PALETTE(0, 16, 0x0) - TILES(0xBEA, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 4) + PALETTE(0, 16, 0x0) TILES(0xBEA, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 4) - TILES(0xBFA, 16) - HITBOX(0, -7, -9, 5, 8) - SHOW_FRAME(2, 5) + TILES(0xBFA, 16) HITBOX(0, -7, -9, 5, 8) SHOW_FRAME(2, 5) - TILES(0xC0A, 16) - HITBOX(0, -7, -9, 5, 8) - SHOW_FRAME(2, 6) + TILES(0xC0A, 16) HITBOX(0, -7, -9, 5, 8) SHOW_FRAME(2, 6) - TILES(0xC1A, 16) - HITBOX(0, -7, -9, 5, 8) - SHOW_FRAME(2, 7) + TILES(0xC1A, 16) HITBOX(0, -7, -9, 5, 8) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0018[2] = { +const s32 *const anim_0018[2] = { anim_0018__v0_l0, anim_0018__v1_l0, }; const s32 anim_0019__v0_l0[] = { // 0x080DD3F8 - PALETTE(0, 16, 0x0) - TILES(0xC2A, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0xC2A, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 0) - TILES(0xC3E, 25) - SHOW_FRAME(3, 1) + TILES(0xC3E, 25) SHOW_FRAME(3, 1) - TILES(0xC57, 20) - SHOW_FRAME(3, 2) + TILES(0xC57, 20) SHOW_FRAME(3, 2) - TILES(0xC6B, 25) - SHOW_FRAME(3, 3) - TILES(0xC84, 20) - SHOW_FRAME(3, 4) + TILES(0xC6B, 25) SHOW_FRAME(3, 3) TILES(0xC84, 20) SHOW_FRAME(3, 4) - JUMP_BACK(5) + JUMP_BACK(5) }; -const s32 * const anim_0019[1] = { +const s32 *const anim_0019[1] = { anim_0019__v0_l0, }; const s32 anim_0021__v0_l0[] = { // 0x080DD480 - PALETTE(0, 16, 0x0) - TILES(0xC98, 20) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0xC98, 20) SHOW_FRAME(3, 0) - TILES(0xCAC, 25) - SHOW_FRAME(3, 1) + TILES(0xCAC, 25) SHOW_FRAME(3, 1) - TILES(0xC98, 20) - SHOW_FRAME(12, 0) + TILES(0xC98, 20) SHOW_FRAME(12, 0) - TILES(0xCC5, 16) - SHOW_FRAME(2, 2) - TILES(0xCD5, 20) - SHOW_FRAME(3, 3) + TILES(0xCC5, 16) SHOW_FRAME(2, 2) TILES(0xCD5, 20) SHOW_FRAME(3, 3) - TILES(0xCE9, 20) - SHOW_FRAME(3, 4) + TILES(0xCE9, 20) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0021[1] = { +const s32 *const anim_0021[1] = { anim_0021__v0_l0, }; const s32 anim_0022__v0_l0[] = { // 0x080DD510 - PALETTE(0, 16, 0x0) - TILES(0xCFD, 20) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0xCFD, 20) SHOW_FRAME(3, 0) - TILES(0xD11, 20) - SHOW_FRAME(3, 1) + TILES(0xD11, 20) SHOW_FRAME(3, 1) - TILES(0xD25, 20) - SHOW_FRAME(3, 2) + TILES(0xD25, 20) SHOW_FRAME(3, 2) - TILES(0xD39, 20) - SHOW_FRAME(3, 3) + TILES(0xD39, 20) SHOW_FRAME(3, 3) - TILES(0xD4D, 20) - SHOW_FRAME(3, 4) + TILES(0xD4D, 20) SHOW_FRAME(3, 4) - TILES(0xD61, 20) - SHOW_FRAME(3, 5) + TILES(0xD61, 20) SHOW_FRAME(3, 5) - TILES(0xD75, 25) - SHOW_FRAME(3, 6) + TILES(0xD75, 25) SHOW_FRAME(3, 6) - TILES(0xD8E, 25) - SHOW_FRAME(3, 7) - TILES(0xDA7, 20) - SHOW_FRAME(3, 8) + TILES(0xD8E, 25) SHOW_FRAME(3, 7) TILES(0xDA7, 20) SHOW_FRAME(3, 8) - TILES(0xDBB, 20) - SHOW_FRAME(3, 9) + TILES(0xDBB, 20) SHOW_FRAME(3, 9) - TILES(0xDCF, 20) - SHOW_FRAME(3, 10) + TILES(0xDCF, 20) SHOW_FRAME(3, 10) - TILES(0xDE3, 20) - SHOW_FRAME(3, 11) + TILES(0xDE3, 20) SHOW_FRAME(3, 11) - TILES(0xDF7, 20) - SHOW_FRAME(3, 12) + TILES(0xDF7, 20) SHOW_FRAME(3, 12) - TILES(0xE0B, 20) - SHOW_FRAME(3, 13) + TILES(0xE0B, 20) SHOW_FRAME(3, 13) - TILES(0xD75, 25) - SHOW_FRAME(3, 6) + TILES(0xD75, 25) SHOW_FRAME(3, 6) - TILES(0xE1F, 25) - SHOW_FRAME(3, 14) + TILES(0xE1F, 25) SHOW_FRAME(3, 14) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0022[1] = { +const s32 *const anim_0022[1] = { anim_0022__v0_l0, }; const s32 anim_0023__v0_l0[] = { // 0x080DD668 - PALETTE(0, 16, 0x0) - TILES(0xE38, 20) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0xE38, 20) SHOW_FRAME(4, 0) - TILES(0xE4C, 20) - SHOW_FRAME(4, 1) + TILES(0xE4C, 20) SHOW_FRAME(4, 1) - TILES(0xE60, 24) - SHOW_FRAME(4, 2) + TILES(0xE60, 24) SHOW_FRAME(4, 2) - TILES(0xE78, 24) - SHOW_FRAME(4, 3) + TILES(0xE78, 24) SHOW_FRAME(4, 3) - TILES(0xE90, 24) - SHOW_FRAME(4, 4) + TILES(0xE90, 24) SHOW_FRAME(4, 4) - TILES(0xEA8, 24) - SHOW_FRAME(4, 5) + TILES(0xEA8, 24) SHOW_FRAME(4, 5) - TILES(0xEC0, 20) - SHOW_FRAME(4, 6) + TILES(0xEC0, 20) SHOW_FRAME(4, 6) - TILES(0xED4, 20) - SHOW_FRAME(4, 7) + TILES(0xED4, 20) SHOW_FRAME(4, 7) - TILES(0xEE8, 20) - SHOW_FRAME(4, 8) + TILES(0xEE8, 20) SHOW_FRAME(4, 8) - TILES(0xEFC, 20) - SHOW_FRAME(8, 9) + TILES(0xEFC, 20) SHOW_FRAME(8, 9) - TILES(0xEE8, 20) - SHOW_FRAME(4, 8) + TILES(0xEE8, 20) SHOW_FRAME(4, 8) - TILES(0xF10, 20) - SHOW_FRAME(3, 10) + TILES(0xF10, 20) SHOW_FRAME(3, 10) - TILES(0xF24, 20) - SHOW_FRAME(3, 11) + TILES(0xF24, 20) SHOW_FRAME(3, 11) - TILES(0xF38, 25) - SHOW_FRAME(4, 12) + TILES(0xF38, 25) SHOW_FRAME(4, 12) - TILES(0xF51, 25) - SHOW_FRAME(8, 13) + TILES(0xF51, 25) SHOW_FRAME(8, 13) - TILES(0xF6A, 25) - SHOW_FRAME(4, 14) + TILES(0xF6A, 25) SHOW_FRAME(4, 14) - TILES(0xF83, 25) - SHOW_FRAME(4, 15) + TILES(0xF83, 25) SHOW_FRAME(4, 15) - TILES(0xF9C, 25) - SHOW_FRAME(4, 16) + TILES(0xF9C, 25) SHOW_FRAME(4, 16) - END() + END() }; -const s32 * const anim_0023[1] = { +const s32 *const anim_0023[1] = { anim_0023__v0_l0, }; const s32 anim_0024__v0_l0[] = { // 0x080DD7E4 - PALETTE(0, 16, 0x0) - TILES(0xFB5, 25) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0xFB5, 25) SHOW_FRAME(3, 0) - TILES(0xFCE, 25) - SHOW_FRAME(3, 1) + TILES(0xFCE, 25) SHOW_FRAME(3, 1) - TILES(0xFE7, 25) - SHOW_FRAME(3, 2) + TILES(0xFE7, 25) SHOW_FRAME(3, 2) - TILES(0x1000, 25) - SHOW_FRAME(20, 3) + TILES(0x1000, 25) SHOW_FRAME(20, 3) - TILES(0xFB5, 25) - SHOW_FRAME(3, 0) + TILES(0xFB5, 25) SHOW_FRAME(3, 0) - TILES(0x1019, 20) - SHOW_FRAME(3, 4) + TILES(0x1019, 20) SHOW_FRAME(3, 4) - TILES(0x102D, 20) - SHOW_FRAME(30, 5) + TILES(0x102D, 20) SHOW_FRAME(30, 5) - END() + END() }; -const s32 * const anim_0024[1] = { +const s32 *const anim_0024[1] = { anim_0024__v0_l0, }; const s32 anim_0025__v0_l0[] = { // 0x080DD884 - PALETTE(0, 16, 0x70) - TILES(0x1041, 18) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x70) TILES(0x1041, 18) SHOW_FRAME(3, 0) - TILES(0x1053, 24) - SHOW_FRAME(3, 1) + TILES(0x1053, 24) SHOW_FRAME(3, 1) - TILES(0x106B, 18) - SHOW_FRAME(3, 2) + TILES(0x106B, 18) SHOW_FRAME(3, 2) - TILES(0x107D, 24) - SHOW_FRAME(3, 3) + TILES(0x107D, 24) SHOW_FRAME(3, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0025[1] = { +const s32 *const anim_0025[1] = { anim_0025__v0_l0, }; const s32 anim_0026__v0_l0[] = { // 0x080DD8EC - PALETTE(0, 16, 0x70) - TILES(0x1095, 35) - SHOW_FRAME(20, 0) + PALETTE(0, 16, 0x70) TILES(0x1095, 35) SHOW_FRAME(20, 0) - TILES(0x10B8, 36) - SHOW_FRAME(10, 1) + TILES(0x10B8, 36) SHOW_FRAME(10, 1) - TILES(0x10DC, 42) - SHOW_FRAME(8, 2) + TILES(0x10DC, 42) SHOW_FRAME(8, 2) - TILES(0x1106, 42) - SHOW_FRAME(7, 3) + TILES(0x1106, 42) SHOW_FRAME(7, 3) - TILES(0x1130, 42) - SHOW_FRAME(5, 4) + TILES(0x1130, 42) SHOW_FRAME(5, 4) - TILES(0x115A, 42) - SHOW_FRAME(3, 5) - TILES(0x1184, 42) - SHOW_FRAME(2, 6) + TILES(0x115A, 42) SHOW_FRAME(3, 5) TILES(0x1184, 42) SHOW_FRAME(2, 6) - TILES(0x11AE, 42) - SHOW_FRAME(2, 7) + TILES(0x11AE, 42) SHOW_FRAME(2, 7) - TILES(0x11D8, 42) - SHOW_FRAME(2, 8) + TILES(0x11D8, 42) SHOW_FRAME(2, 8) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0026[1] = { +const s32 *const anim_0026[1] = { anim_0026__v0_l0, }; const s32 anim_0027__v0_l0[] = { // 0x080DD9B8 - PALETTE(0, 16, 0x0) - TILES(0x1202, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x1202, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x1242, 64) - SHOW_FRAME(2, 1) + TILES(0x1242, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v1_l0[] = { // 0x080DDA00 - PALETTE(0, 16, 0x0) - TILES(0x1282, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(0, 16, 0x0) TILES(0x1282, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x12C2, 64) - SHOW_FRAME(2, 3) + TILES(0x12C2, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v2_l0[] = { // 0x080DDA48 - PALETTE(0, 16, 0x0) - TILES(0x1302, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(0, 16, 0x0) TILES(0x1302, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x1342, 64) - SHOW_FRAME(2, 5) + TILES(0x1342, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v3_l0[] = { // 0x080DDA90 - PALETTE(0, 16, 0x0) - TILES(0x1382, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(0, 16, 0x0) TILES(0x1382, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x13C2, 64) - SHOW_FRAME(2, 7) + TILES(0x13C2, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v4_l0[] = { // 0x080DDAD8 - PALETTE(0, 16, 0x0) - TILES(0x1402, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(0, 16, 0x0) TILES(0x1402, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x1442, 64) - SHOW_FRAME(2, 9) + TILES(0x1442, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v5_l0[] = { // 0x080DDB20 - PALETTE(0, 16, 0x0) - TILES(0x1482, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(0, 16, 0x0) TILES(0x1482, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x14C2, 64) - SHOW_FRAME(2, 11) + TILES(0x14C2, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v6_l0[] = { // 0x080DDB68 - PALETTE(0, 16, 0x0) - TILES(0x1502, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(0, 16, 0x0) TILES(0x1502, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0x1542, 64) - SHOW_FRAME(2, 13) + TILES(0x1542, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v7_l0[] = { // 0x080DDBB0 - PALETTE(0, 16, 0x0) - TILES(0x1582, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(0, 16, 0x0) TILES(0x1582, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0x15C2, 64) - SHOW_FRAME(2, 15) + TILES(0x15C2, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0027__v8_l0[] = { // 0x080DDBF8 - PALETTE(0, 16, 0x0) - TILES(0x1602, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 16) + PALETTE(0, 16, 0x0) TILES(0x1602, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 16) - TILES(0x1642, 64) - SHOW_FRAME(2, 17) + TILES(0x1642, 64) SHOW_FRAME(2, 17) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0027[9] = { - anim_0027__v0_l0, - anim_0027__v1_l0, - anim_0027__v2_l0, - anim_0027__v3_l0, - anim_0027__v4_l0, - anim_0027__v5_l0, - anim_0027__v6_l0, - anim_0027__v7_l0, - anim_0027__v8_l0, +const s32 *const anim_0027[9] = { + anim_0027__v0_l0, anim_0027__v1_l0, anim_0027__v2_l0, anim_0027__v3_l0, anim_0027__v4_l0, + anim_0027__v5_l0, anim_0027__v6_l0, anim_0027__v7_l0, anim_0027__v8_l0, }; const s32 anim_0028__v0_l0[] = { // 0x080DDC64 - PALETTE(0, 16, 0x0) - TILES(0x1682, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x1682, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x16C2, 64) - SHOW_FRAME(2, 1) + TILES(0x16C2, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v1_l0[] = { // 0x080DDCAC - PALETTE(0, 16, 0x0) - TILES(0x1702, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(0, 16, 0x0) TILES(0x1702, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x1742, 64) - SHOW_FRAME(2, 3) + TILES(0x1742, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v2_l0[] = { // 0x080DDCF4 - PALETTE(0, 16, 0x0) - TILES(0x1782, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(0, 16, 0x0) TILES(0x1782, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x17C2, 64) - SHOW_FRAME(2, 5) + TILES(0x17C2, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v3_l0[] = { // 0x080DDD3C - PALETTE(0, 16, 0x0) - TILES(0x1802, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(0, 16, 0x0) TILES(0x1802, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x1842, 64) - SHOW_FRAME(2, 7) + TILES(0x1842, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v4_l0[] = { // 0x080DDD84 - PALETTE(0, 16, 0x0) - TILES(0x1882, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(0, 16, 0x0) TILES(0x1882, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x18C2, 64) - SHOW_FRAME(2, 9) + TILES(0x18C2, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v5_l0[] = { // 0x080DDDCC - PALETTE(0, 16, 0x0) - TILES(0x1902, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(0, 16, 0x0) TILES(0x1902, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x1942, 64) - SHOW_FRAME(2, 11) + TILES(0x1942, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v6_l0[] = { // 0x080DDE14 - PALETTE(0, 16, 0x0) - TILES(0x1982, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(0, 16, 0x0) TILES(0x1982, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0x19C2, 64) - SHOW_FRAME(2, 13) + TILES(0x19C2, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0028__v7_l0[] = { // 0x080DDE5C - PALETTE(0, 16, 0x0) - TILES(0x1A02, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(0, 16, 0x0) TILES(0x1A02, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0x1A42, 64) - SHOW_FRAME(2, 15) + TILES(0x1A42, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0028[8] = { - anim_0028__v0_l0, - anim_0028__v1_l0, - anim_0028__v2_l0, - anim_0028__v3_l0, - anim_0028__v4_l0, - anim_0028__v5_l0, - anim_0028__v6_l0, - anim_0028__v7_l0, +const s32 *const anim_0028[8] = { + anim_0028__v0_l0, anim_0028__v1_l0, anim_0028__v2_l0, anim_0028__v3_l0, + anim_0028__v4_l0, anim_0028__v5_l0, anim_0028__v6_l0, anim_0028__v7_l0, }; const s32 anim_0029__v0_l0[] = { // 0x080DDEC4 - PALETTE(0, 16, 0x0) - TILES(0x1A82, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) - TILES(0x1AC2, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 1) + PALETTE(0, 16, 0x0) TILES(0x1A82, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) TILES(0x1AC2, 64) HITBOX(0, -10, -10, 10, 10) + SHOW_FRAME(2, 1) - TILES(0x1B02, 64) - SHOW_FRAME(2, 2) + TILES(0x1B02, 64) SHOW_FRAME(2, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0029__v1_l0[] = { // 0x080DDF2C - PALETTE(0, 16, 0x0) - TILES(0x1A82, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x1A82, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0029[2] = { +const s32 *const anim_0029[2] = { anim_0029__v0_l0, anim_0029__v1_l0, }; const s32 anim_0030__v0_l0[] = { // 0x080DDF64 - PALETTE(0, 16, 0x0) - TILES(0x1B42, 64) - HITBOX(0, -22, -22, 22, 22) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x1B42, 64) HITBOX(0, -22, -22, 22, 22) SHOW_FRAME(2, 0) - TILES(0x1B82, 64) - SHOW_FRAME(2, 1) + TILES(0x1B82, 64) SHOW_FRAME(2, 1) - TILES(0x1BC2, 64) - SHOW_FRAME(2, 2) + TILES(0x1BC2, 64) SHOW_FRAME(2, 2) - TILES(0x1C02, 64) - SHOW_FRAME(2, 3) + TILES(0x1C02, 64) SHOW_FRAME(2, 3) - TILES(0x1C42, 64) - SHOW_FRAME(2, 4) + TILES(0x1C42, 64) SHOW_FRAME(2, 4) - TILES(0x1C82, 64) - SHOW_FRAME(2, 5) + TILES(0x1C82, 64) SHOW_FRAME(2, 5) - TILES(0x1CC2, 64) - SHOW_FRAME(2, 6) + TILES(0x1CC2, 64) SHOW_FRAME(2, 6) - TILES(0x1D02, 64) - SHOW_FRAME(2, 7) + TILES(0x1D02, 64) SHOW_FRAME(2, 7) - TILES(0x1D42, 64) - SHOW_FRAME(2, 8) + TILES(0x1D42, 64) SHOW_FRAME(2, 8) - TILES(0x1D82, 64) - SHOW_FRAME(2, 9) + TILES(0x1D82, 64) SHOW_FRAME(2, 9) - TILES(0x1DC2, 64) - SHOW_FRAME(2, 10) + TILES(0x1DC2, 64) SHOW_FRAME(2, 10) - JUMP_BACK(61) + JUMP_BACK(61) }; -const s32 * const anim_0030[1] = { +const s32 *const anim_0030[1] = { anim_0030__v0_l0, }; const s32 anim_0031__v0_l0[] = { // 0x080DE064 - PALETTE(0, 16, 0x0) - TILES(0x1E02, 64) - HITBOX(0, -20, -20, 20, 20) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x1E02, 64) HITBOX(0, -20, -20, 20, 20) SHOW_FRAME(2, 0) - TILES(0x1E42, 64) - SHOW_FRAME(2, 1) + TILES(0x1E42, 64) SHOW_FRAME(2, 1) - TILES(0x1E82, 64) - SHOW_FRAME(2, 2) + TILES(0x1E82, 64) SHOW_FRAME(2, 2) - TILES(0x1EC2, 64) - SHOW_FRAME(3, 3) + TILES(0x1EC2, 64) SHOW_FRAME(3, 3) - TILES(0x1F02, 64) - SHOW_FRAME(3, 4) + TILES(0x1F02, 64) SHOW_FRAME(3, 4) - TILES(0x1F42, 64) - SHOW_FRAME(3, 5) + TILES(0x1F42, 64) SHOW_FRAME(3, 5) - TILES(0x1F82, 64) - SHOW_FRAME(3, 6) + TILES(0x1F82, 64) SHOW_FRAME(3, 6) - TILES(0x1FC2, 64) - SHOW_FRAME(3, 7) + TILES(0x1FC2, 64) SHOW_FRAME(3, 7) - TILES(0x2002, 64) - SHOW_FRAME(3, 8) + TILES(0x2002, 64) SHOW_FRAME(3, 8) - TILES(0x2042, 64) - SHOW_FRAME(3, 9) + TILES(0x2042, 64) SHOW_FRAME(3, 9) - TILES(0x2082, 64) - SHOW_FRAME(3, 10) + TILES(0x2082, 64) SHOW_FRAME(3, 10) - TILES(0x1EC2, 64) - SHOW_FRAME(3, 3) + TILES(0x1EC2, 64) SHOW_FRAME(3, 3) - TILES(0x20C2, 64) - SHOW_FRAME(3, 11) + TILES(0x20C2, 64) SHOW_FRAME(3, 11) - TILES(0x2102, 64) - SHOW_FRAME(3, 12) + TILES(0x2102, 64) SHOW_FRAME(3, 12) - TILES(0x2142, 64) - SHOW_FRAME(3, 13) + TILES(0x2142, 64) SHOW_FRAME(3, 13) - END() + END() }; // Bug/Leftover? -const s32 anim_0031__v0_l1[] = { // 0x080DE064 +const s32 anim_0031__v0_l1[] = { + // 0x080DE064 }; -const s32 * const anim_0031[2] = { +const s32 *const anim_0031[2] = { anim_0031__v0_l0, anim_0031__v0_l1, }; const s32 anim_0032__v0_l0[] = { // 0x080DE1B4 - PALETTE(0, 16, 0x0) - TILES(0x2182, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x2182, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(3, 0) - TILES(0x21C2, 64) - SHOW_FRAME(3, 1) + TILES(0x21C2, 64) SHOW_FRAME(3, 1) - TILES(0x2202, 64) - SHOW_FRAME(3, 2) + TILES(0x2202, 64) SHOW_FRAME(3, 2) - TILES(0x2242, 64) - SHOW_FRAME(3, 3) + TILES(0x2242, 64) SHOW_FRAME(3, 3) - TILES(0x2282, 64) - SHOW_FRAME(3, 4) + TILES(0x2282, 64) SHOW_FRAME(3, 4) - TILES(0x22C2, 64) - SHOW_FRAME(3, 5) + TILES(0x22C2, 64) SHOW_FRAME(3, 5) - TILES(0x2302, 64) - SHOW_FRAME(3, 6) + TILES(0x2302, 64) SHOW_FRAME(3, 6) - JUMP_BACK(41) + JUMP_BACK(41) }; -const s32 * const anim_0032[1] = { +const s32 *const anim_0032[1] = { anim_0032__v0_l0, }; const s32 anim_0033__v0_l0[] = { // 0x080DE264 - PALETTE(0, 16, 0x0) - TILES(0x2342, 64) - SHOW_FRAME(6, 0) - TILES(0x2382, 64) - SHOW_FRAME(3, 1) + PALETTE(0, 16, 0x0) TILES(0x2342, 64) SHOW_FRAME(6, 0) TILES(0x2382, 64) SHOW_FRAME(3, 1) - TILES(0x23C2, 64) - SHOW_FRAME(3, 2) + TILES(0x23C2, 64) SHOW_FRAME(3, 2) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0033__v1_l0[] = { // 0x080DE2B4 - PALETTE(0, 16, 0x0) - TILES(0x2342, 64) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x0) TILES(0x2342, 64) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0033[2] = { +const s32 *const anim_0033[2] = { anim_0033__v0_l0, anim_0033__v1_l0, }; const s32 anim_0034__v0_l0[] = { // 0x080DE2E0 - PALETTE(0, 16, 0x0) - TILES(0x2402, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x2402, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x2442, 64) - SHOW_FRAME(2, 1) + TILES(0x2442, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0034__v1_l0[] = { // 0x080DE328 - PALETTE(0, 16, 0x0) - TILES(0x2482, 64) - SHOW_FRAME(2, 2) + PALETTE(0, 16, 0x0) TILES(0x2482, 64) SHOW_FRAME(2, 2) - TILES(0x24C2, 64) - SHOW_FRAME(2, 3) + TILES(0x24C2, 64) SHOW_FRAME(2, 3) - TILES(0x2502, 64) - SHOW_FRAME(2, 4) + TILES(0x2502, 64) SHOW_FRAME(2, 4) - TILES(0x2542, 64) - SHOW_FRAME(2, 5) + TILES(0x2542, 64) SHOW_FRAME(2, 5) - TILES(0x2582, 64) - SHOW_FRAME(2, 6) + TILES(0x2582, 64) SHOW_FRAME(2, 6) - TILES(0x25C2, 64) - SHOW_FRAME(2, 7) + TILES(0x25C2, 64) SHOW_FRAME(2, 7) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0034[2] = { +const s32 *const anim_0034[2] = { anim_0034__v0_l0, anim_0034__v1_l0, }; const s32 anim_0035__v0_l0[] = { // 0x080DE3BC - PALETTE(0, 16, 0x70) - TILES(0x2602, 16) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x70) TILES(0x2602, 16) SHOW_FRAME(1, 0) - TILES(0x2612, 16) - SHOW_FRAME(1, 1) + TILES(0x2612, 16) SHOW_FRAME(1, 1) - TILES(0x2622, 16) - SHOW_FRAME(16, 2) + TILES(0x2622, 16) SHOW_FRAME(16, 2) - TILES(0x2612, 16) - SHOW_FRAME(1, 1) + TILES(0x2612, 16) SHOW_FRAME(1, 1) - TILES(0x2602, 16) - SHOW_FRAME(2, 0) + TILES(0x2602, 16) SHOW_FRAME(2, 0) - TILES(0x2632, 20) - SHOW_FRAME(2, 3) + TILES(0x2632, 20) SHOW_FRAME(2, 3) - TILES(0x2646, 25) - SHOW_FRAME(20, 4) - TILES(0x265F, 20) - SHOW_FRAME(6, 5) + TILES(0x2646, 25) SHOW_FRAME(20, 4) TILES(0x265F, 20) SHOW_FRAME(6, 5) - TILES(0x2673, 25) - SHOW_FRAME(6, 6) + TILES(0x2673, 25) SHOW_FRAME(6, 6) - TILES(0x268C, 25) - SHOW_FRAME(6, 7) + TILES(0x268C, 25) SHOW_FRAME(6, 7) - TILES(0x26A5, 20) - SHOW_FRAME(6, 8) + TILES(0x26A5, 20) SHOW_FRAME(6, 8) - TILES(0x26B9, 20) - SHOW_FRAME(6, 9) + TILES(0x26B9, 20) SHOW_FRAME(6, 9) - TILES(0x2646, 25) - SHOW_FRAME(6, 4) + TILES(0x2646, 25) SHOW_FRAME(6, 4) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0035[1] = { +const s32 *const anim_0035[1] = { anim_0035__v0_l0, }; const s32 anim_0036__v0_l0[] = { // 0x080DE4D8 - PALETTE(0, 16, 0x0) - TILES(0x26CD, 16) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x26CD, 16) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 0) - TILES(0x26DD, 16) - SHOW_FRAME(3, 1) + TILES(0x26DD, 16) SHOW_FRAME(3, 1) - TILES(0x26ED, 16) - SHOW_FRAME(3, 2) + TILES(0x26ED, 16) SHOW_FRAME(3, 2) - TILES(0x26FD, 16) - SHOW_FRAME(3, 3) + TILES(0x26FD, 16) SHOW_FRAME(3, 3) - TILES(0x270D, 16) - SHOW_FRAME(3, 4) + TILES(0x270D, 16) SHOW_FRAME(3, 4) - TILES(0x271D, 16) - SHOW_FRAME(3, 5) + TILES(0x271D, 16) SHOW_FRAME(3, 5) - TILES(0x272D, 16) - SHOW_FRAME(3, 6) + TILES(0x272D, 16) SHOW_FRAME(3, 6) - TILES(0x273D, 16) - SHOW_FRAME(3, 7) + TILES(0x273D, 16) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0036__v1_l0[] = { // 0x080DE598 - PALETTE(0, 16, 0x0) - TILES(0x274D, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 8) + PALETTE(0, 16, 0x0) TILES(0x274D, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 8) - TILES(0x2761, 20) - SHOW_FRAME(3, 9) + TILES(0x2761, 20) SHOW_FRAME(3, 9) - TILES(0x2775, 16) - SHOW_FRAME(3, 10) + TILES(0x2775, 16) SHOW_FRAME(3, 10) - TILES(0x2785, 20) - SHOW_FRAME(3, 11) + TILES(0x2785, 20) SHOW_FRAME(3, 11) - TILES(0x2799, 20) - SHOW_FRAME(3, 12) + TILES(0x2799, 20) SHOW_FRAME(3, 12) - TILES(0x27AD, 20) - SHOW_FRAME(3, 13) + TILES(0x27AD, 20) SHOW_FRAME(3, 13) - TILES(0x27C1, 20) - SHOW_FRAME(3, 14) + TILES(0x27C1, 20) SHOW_FRAME(3, 14) - TILES(0x27D5, 20) - SHOW_FRAME(3, 15) + TILES(0x27D5, 20) SHOW_FRAME(3, 15) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0036__v2_l0[] = { // 0x080DE658 - PALETTE(0, 16, 0x0) - TILES(0x27E9, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 16) + PALETTE(0, 16, 0x0) TILES(0x27E9, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 16) - TILES(0x27FD, 20) - SHOW_FRAME(3, 17) + TILES(0x27FD, 20) SHOW_FRAME(3, 17) - TILES(0x2811, 25) - SHOW_FRAME(3, 18) + TILES(0x2811, 25) SHOW_FRAME(3, 18) - TILES(0x282A, 20) - SHOW_FRAME(3, 19) + TILES(0x282A, 20) SHOW_FRAME(3, 19) - TILES(0x283E, 20) - SHOW_FRAME(3, 20) + TILES(0x283E, 20) SHOW_FRAME(3, 20) - TILES(0x2852, 20) - SHOW_FRAME(3, 21) + TILES(0x2852, 20) SHOW_FRAME(3, 21) - TILES(0x2866, 16) - SHOW_FRAME(3, 22) + TILES(0x2866, 16) SHOW_FRAME(3, 22) - TILES(0x2876, 20) - SHOW_FRAME(3, 23) + TILES(0x2876, 20) SHOW_FRAME(3, 23) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0036[3] = { +const s32 *const anim_0036[3] = { anim_0036__v0_l0, anim_0036__v1_l0, anim_0036__v2_l0, }; const s32 anim_0037__v0_l0[] = { // 0x080DE724 - PALETTE(0, 16, 0x0) - TILES(0x288A, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x288A, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(2, 0) - TILES(0x289E, 25) - SHOW_FRAME(2, 1) + TILES(0x289E, 25) SHOW_FRAME(2, 1) - TILES(0x28B7, 25) - SHOW_FRAME(4, 2) + TILES(0x28B7, 25) SHOW_FRAME(4, 2) - TILES(0x28D0, 25) - SHOW_FRAME(1, 3) + TILES(0x28D0, 25) SHOW_FRAME(1, 3) - TILES(0x28E9, 20) - SHOW_FRAME(1, 4) - TILES(0x28FD, 30) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(1, 5) + TILES(0x28E9, 20) SHOW_FRAME(1, 4) TILES(0x28FD, 30) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(1, 5) - TILES(0x291B, 30) - SHOW_FRAME(1, 6) + TILES(0x291B, 30) SHOW_FRAME(1, 6) - TILES(0x2939, 30) - SHOW_FRAME(1, 7) + TILES(0x2939, 30) SHOW_FRAME(1, 7) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0037[1] = { +const s32 *const anim_0037[1] = { anim_0037__v0_l0, }; const s32 anim_0038__v0_l0[] = { // 0x080DE7F4 - PALETTE(0, 16, 0x0) - TILES(0x2957, 30) - HITBOX(0, -3, -18, 9, 14) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x2957, 30) HITBOX(0, -3, -18, 9, 14) SHOW_FRAME(3, 0) - TILES(0x2975, 30) - SHOW_FRAME(3, 1) + TILES(0x2975, 30) SHOW_FRAME(3, 1) - TILES(0x2993, 30) - SHOW_FRAME(3, 2) + TILES(0x2993, 30) SHOW_FRAME(3, 2) - TILES(0x29B1, 24) - HITBOX(0, -3, -12, 9, 14) - SHOW_FRAME(2, 3) + TILES(0x29B1, 24) HITBOX(0, -3, -12, 9, 14) SHOW_FRAME(2, 3) - TILES(0x29C9, 18) - SHOW_FRAME(2, 4) + TILES(0x29C9, 18) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0038[1] = { +const s32 *const anim_0038[1] = { anim_0038__v0_l0, }; const s32 anim_0039__v0_l0[] = { // 0x080DE884 - PALETTE(0, 16, 0x0) - TILES(0x29DB, 64) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x29DB, 64) SHOW_FRAME(2, 0) - TILES(0x2A1B, 64) - SHOW_FRAME(2, 1) + TILES(0x2A1B, 64) SHOW_FRAME(2, 1) - TILES(0x2A5B, 64) - SHOW_FRAME(2, 2) + TILES(0x2A5B, 64) SHOW_FRAME(2, 2) - TILES(0x2A9B, 64) - SHOW_FRAME(2, 3) + TILES(0x2A9B, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0039[1] = { +const s32 *const anim_0039[1] = { anim_0039__v0_l0, }; const s32 anim_0040__v0_l0[] = { // 0x080DE8EC - PALETTE(0, 16, 0x0) - TILES(0x2ADB, 28) - HITBOX(0, -32, -22, -8, -4) - CMD_12(0x10) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x2ADB, 28) HITBOX(0, -32, -22, -8, -4) CMD_12(0x10) SHOW_FRAME(3, 0) - TILES(0x2AF7, 20) - HITBOX(0, -24, -22, -6, -4) - CMD_12(0x10) - SHOW_FRAME(3, 1) + TILES(0x2AF7, 20) HITBOX(0, -24, -22, -6, -4) CMD_12(0x10) SHOW_FRAME(3, 1) - TILES(0x2B0B, 16) - HITBOX(0, -8, -22, 0, -4) - CMD_12(0x10) - SHOW_FRAME(3, 2) + TILES(0x2B0B, 16) HITBOX(0, -8, -22, 0, -4) CMD_12(0x10) SHOW_FRAME(3, 2) - TILES(0x2B1B, 16) - HITBOX(0, 2, -22, 10, -4) - CMD_12(0x10) - SHOW_FRAME(3, 3) + TILES(0x2B1B, 16) HITBOX(0, 2, -22, 10, -4) CMD_12(0x10) SHOW_FRAME(3, 3) - TILES(0x2B2B, 24) - HITBOX(0, 6, -22, 24, -4) - CMD_12(0x10) - SHOW_FRAME(3, 4) + TILES(0x2B2B, 24) HITBOX(0, 6, -22, 24, -4) CMD_12(0x10) SHOW_FRAME(3, 4) - TILES(0x2B43, 28) - HITBOX(0, 8, -22, 32, -4) - CMD_12(0x10) - SHOW_FRAME(3, 5) + TILES(0x2B43, 28) HITBOX(0, 8, -22, 32, -4) CMD_12(0x10) SHOW_FRAME(3, 5) - TILES(0x2B5F, 20) - HITBOX(0, 6, -22, 24, -4) - CMD_12(0x13) - SHOW_FRAME(3, 6) + TILES(0x2B5F, 20) HITBOX(0, 6, -22, 24, -4) CMD_12(0x13) SHOW_FRAME(3, 6) - TILES(0x2B73, 16) - HITBOX(0, 2, -22, 10, -4) - CMD_12(0x13) - SHOW_FRAME(3, 7) + TILES(0x2B73, 16) HITBOX(0, 2, -22, 10, -4) CMD_12(0x13) SHOW_FRAME(3, 7) - TILES(0x2B83, 20) - HITBOX(0, -8, -22, 0, -4) - CMD_12(0x13) - SHOW_FRAME(3, 8) + TILES(0x2B83, 20) HITBOX(0, -8, -22, 0, -4) CMD_12(0x13) SHOW_FRAME(3, 8) - TILES(0x2B97, 20) - HITBOX(0, -24, -22, -6, -4) - CMD_12(0x13) - SHOW_FRAME(3, 9) + TILES(0x2B97, 20) HITBOX(0, -24, -22, -6, -4) CMD_12(0x13) SHOW_FRAME(3, 9) - JUMP_BACK(103) + JUMP_BACK(103) }; const s32 anim_0040__v1_l0[] = { // 0x080DEA90 - PALETTE(0, 16, 0x0) - TILES(0x2BAB, 28) - HITBOX(0, -8, 2, 8, 36) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 10) + PALETTE(0, 16, 0x0) TILES(0x2BAB, 28) HITBOX(0, -8, 2, 8, 36) SET_PRIORITY(0x2) SHOW_FRAME(3, 10) - TILES(0x2BC7, 20) - HITBOX(0, -8, 2, 8, 24) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 11) + TILES(0x2BC7, 20) HITBOX(0, -8, 2, 8, 24) SET_PRIORITY(0x2) SHOW_FRAME(3, 11) - TILES(0x2BDB, 16) - HITBOX(0, -8, -2, 8, 10) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 12) + TILES(0x2BDB, 16) HITBOX(0, -8, -2, 8, 10) SET_PRIORITY(0x2) SHOW_FRAME(3, 12) - TILES(0x2BEB, 16) - HITBOX(0, -8, -10, 8, 2) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 13) + TILES(0x2BEB, 16) HITBOX(0, -8, -10, 8, 2) SET_PRIORITY(0x2) SHOW_FRAME(3, 13) - TILES(0x2BFB, 24) - HITBOX(0, -8, -18, 8, 0) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 14) + TILES(0x2BFB, 24) HITBOX(0, -8, -18, 8, 0) SET_PRIORITY(0x2) SHOW_FRAME(3, 14) - TILES(0x2C13, 28) - HITBOX(0, -8, -37, 8, -3) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 15) + TILES(0x2C13, 28) HITBOX(0, -8, -37, 8, -3) SET_PRIORITY(0x2) SHOW_FRAME(3, 15) - TILES(0x2C2F, 20) - HITBOX(0, -8, -22, 8, 0) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 16) + TILES(0x2C2F, 20) HITBOX(0, -8, -22, 8, 0) SET_PRIORITY(0x3) SHOW_FRAME(3, 16) - TILES(0x2C43, 16) - HITBOX(0, -8, -10, 8, 2) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 17) + TILES(0x2C43, 16) HITBOX(0, -8, -10, 8, 2) SET_PRIORITY(0x3) SHOW_FRAME(3, 17) - TILES(0x2C53, 20) - HITBOX(0, -8, -2, 8, 10) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 18) + TILES(0x2C53, 20) HITBOX(0, -8, -2, 8, 10) SET_PRIORITY(0x3) SHOW_FRAME(3, 18) - TILES(0x2C67, 20) - HITBOX(0, -8, 2, 8, 20) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 19) + TILES(0x2C67, 20) HITBOX(0, -8, 2, 8, 20) SET_PRIORITY(0x3) SHOW_FRAME(3, 19) - JUMP_BACK(103) + JUMP_BACK(103) }; -const s32 * const anim_0040[2] = { +const s32 *const anim_0040[2] = { anim_0040__v0_l0, anim_0040__v1_l0, }; const s32 anim_0041__v0_l0[] = { // 0x080DEC3C - PALETTE(0, 16, 0x0) - TILES(0x2C7B, 24) - HITBOX(0, -6, -19, 6, 7) - SHOW_FRAME(10, 0) + PALETTE(0, 16, 0x0) TILES(0x2C7B, 24) HITBOX(0, -6, -19, 6, 7) SHOW_FRAME(10, 0) - TILES(0x2C93, 24) - SHOW_FRAME(10, 1) + TILES(0x2C93, 24) SHOW_FRAME(10, 1) - TILES(0x2CAB, 24) - SHOW_FRAME(10, 2) + TILES(0x2CAB, 24) SHOW_FRAME(10, 2) - TILES(0x2C93, 24) - SHOW_FRAME(10, 1) + TILES(0x2C93, 24) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0041__v1_l0[] = { // 0x080DECAC - PALETTE(0, 16, 0x0) - TILES(0x2CC3, 24) - HITBOX(0, -6, -19, 6, 7) - SHOW_FRAME(5, 3) + PALETTE(0, 16, 0x0) TILES(0x2CC3, 24) HITBOX(0, -6, -19, 6, 7) SHOW_FRAME(5, 3) - TILES(0x2C93, 24) - SHOW_FRAME(5, 1) + TILES(0x2C93, 24) SHOW_FRAME(5, 1) - TILES(0x2CDB, 24) - SHOW_FRAME(5, 4) + TILES(0x2CDB, 24) SHOW_FRAME(5, 4) - TILES(0x2C93, 24) - SHOW_FRAME(5, 1) + TILES(0x2C93, 24) SHOW_FRAME(5, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0041[2] = { +const s32 *const anim_0041[2] = { anim_0041__v0_l0, anim_0041__v1_l0, }; const s32 anim_0042__v0_l0[] = { // 0x080DED24 - PALETTE(0, 16, 0x0) - TILES(0x2CF3, 36) - HITBOX(0, -6, -12, 6, 10) - SHOW_FRAME(5, 0) + PALETTE(0, 16, 0x0) TILES(0x2CF3, 36) HITBOX(0, -6, -12, 6, 10) SHOW_FRAME(5, 0) - TILES(0x2D17, 25) - SHOW_FRAME(5, 1) + TILES(0x2D17, 25) SHOW_FRAME(5, 1) - TILES(0x2D30, 16) - SHOW_FRAME(5, 2) + TILES(0x2D30, 16) SHOW_FRAME(5, 2) - TILES(0x2D40, 25) - SHOW_FRAME(5, 3) + TILES(0x2D40, 25) SHOW_FRAME(5, 3) - TILES(0x2D59, 36) - SHOW_FRAME(5, 4) + TILES(0x2D59, 36) SHOW_FRAME(5, 4) - TILES(0x2D7D, 20) - SHOW_FRAME(5, 5) + TILES(0x2D7D, 20) SHOW_FRAME(5, 5) - TILES(0x2D91, 16) - SHOW_FRAME(5, 6) + TILES(0x2D91, 16) SHOW_FRAME(5, 6) - TILES(0x2DA1, 20) - SHOW_FRAME(5, 7) + TILES(0x2DA1, 20) SHOW_FRAME(5, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0042[1] = { +const s32 *const anim_0042[1] = { anim_0042__v0_l0, }; const s32 anim_0043__v0_l0[] = { // 0x080DEDE8 - PALETTE(0, 16, 0x0) - TILES(0x2DB5, 30) - SHOW_FRAME(8, 0) + PALETTE(0, 16, 0x0) TILES(0x2DB5, 30) SHOW_FRAME(8, 0) - TILES(0x2DD3, 30) - SHOW_FRAME(8, 1) + TILES(0x2DD3, 30) SHOW_FRAME(8, 1) - TILES(0x2DF1, 30) - SHOW_FRAME(8, 2) + TILES(0x2DF1, 30) SHOW_FRAME(8, 2) - TILES(0x2DD3, 30) - SHOW_FRAME(8, 1) + TILES(0x2DD3, 30) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0043[1] = { +const s32 *const anim_0043[1] = { anim_0043__v0_l0, }; const s32 anim_0044__v0_l0[] = { // 0x080DEE50 - PALETTE(0, 16, 0x0) - TILES(0x2E0F, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x2E0F, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0x2E23, 20) - SHOW_FRAME(2, 1) + TILES(0x2E23, 20) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0044__v1_l0[] = { // 0x080DEE98 - PALETTE(0, 16, 0x0) - TILES(0x2E37, 30) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(2, 2) + PALETTE(0, 16, 0x0) TILES(0x2E37, 30) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(2, 2) - TILES(0x2E55, 28) - SHOW_FRAME(2, 3) + TILES(0x2E55, 28) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0044[2] = { +const s32 *const anim_0044[2] = { anim_0044__v0_l0, anim_0044__v1_l0, }; const s32 anim_0045__v0_l0[] = { // 0x080DEEE8 - PALETTE(0, 16, 0x0) - TILES(0x2E71, 20) - HITBOX(0, -6, -16, 6, 8) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x2E71, 20) HITBOX(0, -6, -16, 6, 8) SHOW_FRAME(3, 0) - TILES(0x2E85, 24) - SHOW_FRAME(3, 1) + TILES(0x2E85, 24) SHOW_FRAME(3, 1) - TILES(0x2E9D, 20) - SHOW_FRAME(3, 2) + TILES(0x2E9D, 20) SHOW_FRAME(3, 2) - TILES(0x2E71, 20) - SHOW_FRAME(3, 0) + TILES(0x2E71, 20) SHOW_FRAME(3, 0) - TILES(0x2E85, 24) - SHOW_FRAME(3, 1) + TILES(0x2E85, 24) SHOW_FRAME(3, 1) - TILES(0x2E9D, 20) - SHOW_FRAME(3, 2) + TILES(0x2E9D, 20) SHOW_FRAME(3, 2) - TILES(0x2EB1, 25) - SHOW_FRAME(3, 3) + TILES(0x2EB1, 25) SHOW_FRAME(3, 3) - TILES(0x2ECA, 20) - SHOW_FRAME(3, 4) + TILES(0x2ECA, 20) SHOW_FRAME(3, 4) - TILES(0x2EDE, 25) - SHOW_FRAME(3, 5) + TILES(0x2EDE, 25) SHOW_FRAME(3, 5) - TILES(0x2EF7, 20) - SHOW_FRAME(3, 6) + TILES(0x2EF7, 20) SHOW_FRAME(3, 6) - TILES(0x2EB1, 25) - SHOW_FRAME(3, 3) + TILES(0x2EB1, 25) SHOW_FRAME(3, 3) - TILES(0x2ECA, 20) - SHOW_FRAME(3, 4) + TILES(0x2ECA, 20) SHOW_FRAME(3, 4) - TILES(0x2EDE, 25) - SHOW_FRAME(3, 5) + TILES(0x2EDE, 25) SHOW_FRAME(3, 5) - TILES(0x2EF7, 20) - SHOW_FRAME(3, 6) + TILES(0x2EF7, 20) SHOW_FRAME(3, 6) - TILES(0x2EB1, 25) - SHOW_FRAME(3, 3) + TILES(0x2EB1, 25) SHOW_FRAME(3, 3) - TILES(0x2ECA, 20) - SHOW_FRAME(3, 4) + TILES(0x2ECA, 20) SHOW_FRAME(3, 4) - TILES(0x2EDE, 25) - SHOW_FRAME(3, 5) + TILES(0x2EDE, 25) SHOW_FRAME(3, 5) - TILES(0x2EF7, 20) - SHOW_FRAME(3, 6) - TILES(0x2F0B, 20) - HITBOX(0, -6, -16, 6, 8) - SHOW_FRAME(3, 7) + TILES(0x2EF7, 20) SHOW_FRAME(3, 6) TILES(0x2F0B, 20) + HITBOX(0, -6, -16, 6, 8) SHOW_FRAME(3, 7) - TILES(0x2F1F, 20) - SHOW_FRAME(3, 8) + TILES(0x2F1F, 20) SHOW_FRAME(3, 8) - TILES(0x2F33, 20) - SHOW_FRAME(3, 9) + TILES(0x2F33, 20) SHOW_FRAME(3, 9) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0045__v1_l0[] = { // 0x080DF0B8 - PALETTE(0, 16, 0x0) - TILES(0x2F47, 20) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(3, 10) + PALETTE(0, 16, 0x0) TILES(0x2F47, 20) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(3, 10) - TILES(0x2F5B, 16) - SHOW_FRAME(1, 11) + TILES(0x2F5B, 16) SHOW_FRAME(1, 11) - TILES(0x2F6B, 16) - SHOW_FRAME(1, 12) + TILES(0x2F6B, 16) SHOW_FRAME(1, 12) - TILES(0x2F7B, 16) - SHOW_FRAME(4, 13) + TILES(0x2F7B, 16) SHOW_FRAME(4, 13) - TILES(0x2F6B, 16) - SHOW_FRAME(2, 12) + TILES(0x2F6B, 16) SHOW_FRAME(2, 12) - TILES(0x2F5B, 16) - SHOW_FRAME(2, 11) + TILES(0x2F5B, 16) SHOW_FRAME(2, 11) - END() + END() }; -const s32 * const anim_0045[2] = { +const s32 *const anim_0045[2] = { anim_0045__v0_l0, anim_0045__v1_l0, }; const s32 anim_0049__v0_l0[] = { // 0x080DF154 - PALETTE(0, 16, 0x0) - TILES(0x2F8B, 16) - HITBOX(0, -6, -12, 6, 10) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x2F8B, 16) HITBOX(0, -6, -12, 6, 10) SHOW_FRAME(2, 0) - TILES(0x2F9B, 16) - SHOW_FRAME(2, 1) + TILES(0x2F9B, 16) SHOW_FRAME(2, 1) - TILES(0x2FAB, 16) - SHOW_FRAME(2, 2) + TILES(0x2FAB, 16) SHOW_FRAME(2, 2) - TILES(0x2FBB, 16) - SHOW_FRAME(2, 3) - TILES(0x2FCB, 20) - HITBOX(0, -8, -14, 6, 12) - SHOW_FRAME(2, 4) + TILES(0x2FBB, 16) SHOW_FRAME(2, 3) TILES(0x2FCB, 20) HITBOX(0, -8, -14, 6, 12) SHOW_FRAME(2, 4) - TILES(0x2FDF, 24) - SHOW_FRAME(2, 5) + TILES(0x2FDF, 24) SHOW_FRAME(2, 5) - TILES(0x2FF7, 20) - SHOW_FRAME(2, 6) + TILES(0x2FF7, 20) SHOW_FRAME(2, 6) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0049__v1_l0[] = { // 0x080DF20C - PALETTE(0, 16, 0x0) - TILES(0x300B, 25) - HITBOX(0, -6, -12, 6, 12) - SHOW_FRAME(2, 7) + PALETTE(0, 16, 0x0) TILES(0x300B, 25) HITBOX(0, -6, -12, 6, 12) SHOW_FRAME(2, 7) - TILES(0x3024, 25) - SHOW_FRAME(2, 8) + TILES(0x3024, 25) SHOW_FRAME(2, 8) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0049__v2_l0[] = { // 0x080DF254 - PALETTE(0, 16, 0x0) - TILES(0x303D, 25) - HITBOX(0, -6, -12, 6, 12) - SHOW_FRAME(2, 9) + PALETTE(0, 16, 0x0) TILES(0x303D, 25) HITBOX(0, -6, -12, 6, 12) SHOW_FRAME(2, 9) - END() + END() }; -const s32 * const anim_0049[3] = { +const s32 *const anim_0049[3] = { anim_0049__v0_l0, anim_0049__v1_l0, anim_0049__v2_l0, }; const s32 anim_0050__v0_l0[] = { // 0x080DF290 - PALETTE(0, 16, 0x0) - TILES(0x3056, 16) - HITBOX(0, -8, -8, 10, 10) - HITBOX(1, -14, -14, 14, 14) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x3056, 16) HITBOX(0, -8, -8, 10, 10) HITBOX(1, -14, -14, 14, 14) SHOW_FRAME(1, 0) - TILES(0x3066, 12) - SHOW_FRAME(1, 1) + TILES(0x3066, 12) SHOW_FRAME(1, 1) - TILES(0x3072, 16) - SHOW_FRAME(1, 2) + TILES(0x3072, 16) SHOW_FRAME(1, 2) - TILES(0x3082, 16) - SHOW_FRAME(1, 3) + TILES(0x3082, 16) SHOW_FRAME(1, 3) - TILES(0x3092, 16) - SHOW_FRAME(1, 4) + TILES(0x3092, 16) SHOW_FRAME(1, 4) - TILES(0x30A2, 12) - SHOW_FRAME(1, 5) + TILES(0x30A2, 12) SHOW_FRAME(1, 5) - TILES(0x30AE, 16) - SHOW_FRAME(1, 6) + TILES(0x30AE, 16) SHOW_FRAME(1, 6) - TILES(0x30BE, 20) - SHOW_FRAME(1, 7) - TILES(0x30D2, 16) - HITBOX(0, -8, -8, 8, 8) - SHOW_FRAME(2, 8) + TILES(0x30BE, 20) SHOW_FRAME(1, 7) TILES(0x30D2, 16) HITBOX(0, -8, -8, 8, 8) SHOW_FRAME(2, 8) - TILES(0x30E2, 16) - SHOW_FRAME(2, 9) + TILES(0x30E2, 16) SHOW_FRAME(2, 9) - TILES(0x30F2, 16) - SHOW_FRAME(2, 10) + TILES(0x30F2, 16) SHOW_FRAME(2, 10) - TILES(0x3102, 16) - SHOW_FRAME(2, 11) + TILES(0x3102, 16) SHOW_FRAME(2, 11) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0050__v1_l0[] = { // 0x080DF3B8 - PALETTE(1, 16, 0x50) - TILES(0x3112, 8) - SHOW_FRAME(2, 12) + PALETTE(1, 16, 0x50) TILES(0x3112, 8) SHOW_FRAME(2, 12) - TILES(0x311A, 16) - SHOW_FRAME(2, 13) + TILES(0x311A, 16) SHOW_FRAME(2, 13) - TILES(0x312A, 16) - SHOW_FRAME(2, 14) + TILES(0x312A, 16) SHOW_FRAME(2, 14) - TILES(0x313A, 16) - SHOW_FRAME(2, 15) + TILES(0x313A, 16) SHOW_FRAME(2, 15) - TILES(0x314A, 16) - SHOW_FRAME(2, 16) + TILES(0x314A, 16) SHOW_FRAME(2, 16) - TILES(0x315A, 16) - SHOW_FRAME(2, 17) + TILES(0x315A, 16) SHOW_FRAME(2, 17) - TILES(0x316A, 12) - SHOW_FRAME(2, 18) + TILES(0x316A, 12) SHOW_FRAME(2, 18) - TILES(0x3176, 16) - SHOW_FRAME(2, 19) + TILES(0x3176, 16) SHOW_FRAME(2, 19) - END() + END() }; -const s32 * const anim_0050[2] = { +const s32 *const anim_0050[2] = { anim_0050__v0_l0, anim_0050__v1_l0, }; const s32 anim_0051__v0_l0[] = { // 0x080DF470 - PALETTE(0, 16, 0x0) - TILES(0x3186, 16) - HITBOX(0, -8, -4, 6, 12) - HITBOX(1, -10, -8, 12, 16) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x0) TILES(0x3186, 16) HITBOX(0, -8, -4, 6, 12) HITBOX(1, -10, -8, 12, 16) SHOW_FRAME(6, 0) - TILES(0x3196, 16) - HITBOX(0, -6, -2, 6, 16) - SHOW_FRAME(6, 1) + TILES(0x3196, 16) HITBOX(0, -6, -2, 6, 16) SHOW_FRAME(6, 1) - TILES(0x31A6, 16) - SHOW_FRAME(6, 2) + TILES(0x31A6, 16) SHOW_FRAME(6, 2) - TILES(0x31B6, 12) - HITBOX(0, -6, -2, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(6, 3) + TILES(0x31B6, 12) HITBOX(0, -6, -2, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(6, 3) - END() + END() }; -const s32 * const anim_0051[1] = { +const s32 *const anim_0051[1] = { anim_0051__v0_l0, }; const s32 anim_0052__v0_l0[] = { // 0x080DF510 - PALETTE(0, 16, 0x0) - TILES(0x31C2, 16) - HITBOX(0, -6, -2, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x31C2, 16) HITBOX(0, -6, -2, 6, 16) SHOW_FRAME(3, 0) - TILES(0x31D2, 30) - HITBOX(0, -14, -10, 14, 16) - HITBOX(1, -23, -20, 6, 16) - SHOW_FRAME(2, 1) + TILES(0x31D2, 30) HITBOX(0, -14, -10, 14, 16) HITBOX(1, -23, -20, 6, 16) SHOW_FRAME(2, 1) - TILES(0x31F0, 18) - SHOW_FRAME(2, 2) + TILES(0x31F0, 18) SHOW_FRAME(2, 2) - TILES(0x3202, 24) - HITBOX(0, -14, -10, 14, 16) - HITBOX(1, -20, -15, 6, 16) - SHOW_FRAME(2, 3) + TILES(0x3202, 24) HITBOX(0, -14, -10, 14, 16) HITBOX(1, -20, -15, 6, 16) SHOW_FRAME(2, 3) - TILES(0x321A, 30) - SHOW_FRAME(2, 4) + TILES(0x321A, 30) SHOW_FRAME(2, 4) - TILES(0x3238, 30) - HITBOX(0, -6, -10, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(2, 5) + TILES(0x3238, 30) HITBOX(0, -6, -10, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(2, 5) - TILES(0x3256, 36) - SHOW_FRAME(1, 6) + TILES(0x3256, 36) SHOW_FRAME(1, 6) - TILES(0x327A, 25) - SHOW_FRAME(1, 7) + TILES(0x327A, 25) SHOW_FRAME(1, 7) - TILES(0x3293, 30) - SHOW_FRAME(1, 8) + TILES(0x3293, 30) SHOW_FRAME(1, 8) - TILES(0x32B1, 30) - SHOW_FRAME(2, 9) + TILES(0x32B1, 30) SHOW_FRAME(2, 9) - TILES(0x32CF, 20) - SHOW_FRAME(3, 10) + TILES(0x32CF, 20) SHOW_FRAME(3, 10) - END() + END() }; -const s32 * const anim_0052[1] = { +const s32 *const anim_0052[1] = { anim_0052__v0_l0, }; const s32 anim_0053__v0_l0[] = { // 0x080DF654 - PALETTE(0, 16, 0x0) - TILES(0x32E3, 24) - HITBOX(0, -14, -2, 14, 16) - HITBOX(1, -21, -8, 3, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x32E3, 24) HITBOX(0, -14, -2, 14, 16) HITBOX(1, -21, -8, 3, 16) SHOW_FRAME(2, 0) - TILES(0x32FB, 24) - SHOW_FRAME(2, 1) + TILES(0x32FB, 24) SHOW_FRAME(2, 1) - TILES(0x3313, 24) - SHOW_FRAME(2, 2) + TILES(0x3313, 24) SHOW_FRAME(2, 2) - JUMP_BACK(24) + JUMP_BACK(24) }; const s32 anim_0053__v1_l0[] = { // 0x080DF6BC - PALETTE(0, 16, 0x0) - TILES(0x332B, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(2, 3) + PALETTE(0, 16, 0x0) TILES(0x332B, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(2, 3) - TILES(0x333B, 16) - SHOW_FRAME(2, 4) + TILES(0x333B, 16) SHOW_FRAME(2, 4) - TILES(0x334B, 16) - SHOW_FRAME(2, 5) + TILES(0x334B, 16) SHOW_FRAME(2, 5) - END() + END() }; -const s32 * const anim_0053[2] = { +const s32 *const anim_0053[2] = { anim_0053__v0_l0, anim_0053__v1_l0, }; const s32 anim_0055__v0_l0[] = { // 0x080DF71C - PALETTE(0, 16, 0x0) - TILES(0x335B, 16) - HITBOX(0, -6, -8, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x335B, 16) HITBOX(0, -6, -8, 6, 16) SHOW_FRAME(2, 0) - TILES(0x336B, 16) - SHOW_FRAME(2, 1) + TILES(0x336B, 16) SHOW_FRAME(2, 1) - TILES(0x337B, 16) - SHOW_FRAME(2, 2) + TILES(0x337B, 16) SHOW_FRAME(2, 2) - TILES(0x338B, 16) - SHOW_FRAME(2, 3) + TILES(0x338B, 16) SHOW_FRAME(2, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0055[1] = { +const s32 *const anim_0055[1] = { anim_0055__v0_l0, }; const s32 anim_0081__v0_l0[] = { // 0x080DF790 - PALETTE(0, 16, 0x0) - TILES(0x339B, 25) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x339B, 25) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(4, 0) - TILES(0x33B4, 30) - SHOW_FRAME(4, 1) + TILES(0x33B4, 30) SHOW_FRAME(4, 1) - TILES(0x33D2, 36) - SHOW_FRAME(4, 2) + TILES(0x33D2, 36) SHOW_FRAME(4, 2) - TILES(0x33F6, 25) - SHOW_FRAME(4, 3) + TILES(0x33F6, 25) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0081[1] = { +const s32 *const anim_0081[1] = { anim_0081__v0_l0, }; const s32 anim_0082__v0_l0[] = { // 0x080DF804 - PALETTE(0, 16, 0x0) - TILES(0x340F, 30) - HITBOX(0, -6, -13, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0x340F, 30) HITBOX(0, -6, -13, 6, 16) SHOW_FRAME(4, 0) - TILES(0x342D, 36) - SHOW_FRAME(4, 1) + TILES(0x342D, 36) SHOW_FRAME(4, 1) - TILES(0x3451, 36) - SHOW_FRAME(4, 2) + TILES(0x3451, 36) SHOW_FRAME(4, 2) - TILES(0x3475, 24) - SHOW_FRAME(4, 3) + TILES(0x3475, 24) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0082[1] = { +const s32 *const anim_0082[1] = { anim_0082__v0_l0, }; const s32 anim_0083__v0_l0[] = { // 0x080DF878 - PALETTE(0, 16, 0x0) - TILES(0x348D, 20) - HITBOX(0, -6, -12, 6, 6) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x348D, 20) HITBOX(0, -6, -12, 6, 6) SHOW_FRAME(2, 0) - TILES(0x34A1, 20) - SHOW_FRAME(2, 1) + TILES(0x34A1, 20) SHOW_FRAME(2, 1) - TILES(0x34B5, 20) - SHOW_FRAME(2, 2) + TILES(0x34B5, 20) SHOW_FRAME(2, 2) - TILES(0x34C9, 20) - SHOW_FRAME(2, 3) + TILES(0x34C9, 20) SHOW_FRAME(2, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0083[1] = { +const s32 *const anim_0083[1] = { anim_0083__v0_l0, }; const s32 anim_0084__v0_l0[] = { // 0x080DF8EC - PALETTE(0, 16, 0x0) - TILES(0x34DD, 20) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x0) TILES(0x34DD, 20) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x34F1, 30) - SHOW_FRAME(2, 1) + TILES(0x34F1, 30) SHOW_FRAME(2, 1) - TILES(0x350F, 35) - SHOW_FRAME(2, 2) + TILES(0x350F, 35) SHOW_FRAME(2, 2) - TILES(0x3532, 16) - SHOW_FRAME(2, 3) + TILES(0x3532, 16) SHOW_FRAME(2, 3) - END() + END() }; -const s32 * const anim_0084[1] = { +const s32 *const anim_0084[1] = { anim_0084__v0_l0, }; const s32 anim_0085__v0_l0[] = { // 0x080DF968 - PALETTE(0, 16, 0x70) - TILES(0x3542, 24) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x70) TILES(0x3542, 24) SHOW_FRAME(3, 0) - TILES(0x355A, 24) - SHOW_FRAME(3, 1) + TILES(0x355A, 24) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0085[1] = { +const s32 *const anim_0085[1] = { anim_0085__v0_l0, }; const s32 anim_0086__v0_l0[] = { // 0x080DF9A8 - PALETTE(0, 16, 0x70) - TILES(0x3572, 16) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x70) TILES(0x3572, 16) SHOW_FRAME(2, 0) - TILES(0x3582, 16) - SHOW_FRAME(2, 1) + TILES(0x3582, 16) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0086__v1_l0[] = { // 0x080DF9E0 - PALETTE(0, 16, 0x70) - TILES(0x3592, 16) - SHOW_FRAME(2, 2) + PALETTE(0, 16, 0x70) TILES(0x3592, 16) SHOW_FRAME(2, 2) - END() + END() }; -const s32 * const anim_0086[2] = { +const s32 *const anim_0086[2] = { anim_0086__v0_l0, anim_0086__v1_l0, }; const s32 anim_0087__v0_l0[] = { // 0x080DFA0C - PALETTE(0, 16, 0x0) - TILES(0x35A2, 15) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x35A2, 15) SHOW_FRAME(3, 0) - TILES(0x35B1, 15) - SHOW_FRAME(3, 1) + TILES(0x35B1, 15) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0087[1] = { +const s32 *const anim_0087[1] = { anim_0087__v0_l0, }; const s32 anim_0088__v0_l0[] = { // 0x080DFA4C - PALETTE(0, 16, 0x70) - TILES(0x35C0, 20) - SHOW_FRAME(6, 0) + PALETTE(0, 16, 0x70) TILES(0x35C0, 20) SHOW_FRAME(6, 0) - TILES(0x35D4, 20) - SHOW_FRAME(6, 1) + TILES(0x35D4, 20) SHOW_FRAME(6, 1) - TILES(0x35E8, 20) - SHOW_FRAME(6, 2) - TILES(0x35FC, 20) - SHOW_FRAME(3, 3) + TILES(0x35E8, 20) SHOW_FRAME(6, 2) TILES(0x35FC, 20) SHOW_FRAME(3, 3) - TILES(0x3610, 20) - SHOW_FRAME(3, 4) + TILES(0x3610, 20) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0088[1] = { +const s32 *const anim_0088[1] = { anim_0088__v0_l0, }; const s32 anim_0089__v0_l0[] = { // 0x080DFAC8 - PALETTE(0, 16, 0x70) - TILES(0x3624, 20) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x70) TILES(0x3624, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0089__v1_l0[] = { // 0x080DFAEC - PALETTE(0, 16, 0x70) - TILES(0x3638, 20) - SHOW_FRAME(4, 1) + PALETTE(0, 16, 0x70) TILES(0x3638, 20) SHOW_FRAME(4, 1) - TILES(0x364C, 20) - SHOW_FRAME(4, 2) + TILES(0x364C, 20) SHOW_FRAME(4, 2) - TILES(0x3660, 20) - SHOW_FRAME(4, 3) + TILES(0x3660, 20) SHOW_FRAME(4, 3) - TILES(0x3674, 20) - SHOW_FRAME(40, 4) + TILES(0x3674, 20) SHOW_FRAME(40, 4) - END() + END() }; -const s32 * const anim_0089[2] = { +const s32 *const anim_0089[2] = { anim_0089__v0_l0, anim_0089__v1_l0, }; const s32 anim_0091__v0_l0[] = { // 0x080DFB54 - PALETTE(0, 16, 0x70) - TILES(0x3688, 16) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x70) TILES(0x3688, 16) SHOW_FRAME(3, 0) - TILES(0x3698, 16) - SHOW_FRAME(3, 1) + TILES(0x3698, 16) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0091[1] = { +const s32 *const anim_0091[1] = { anim_0091__v0_l0, }; const s32 anim_0093__v0_l0[] = { // 0x080DFB94 - PALETTE(0, 16, 0x0) - TILES(0x36A8, 25) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x36A8, 25) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0093__v1_l0[] = { // 0x080DFBC4 - PALETTE(0, 16, 0x0) - TILES(0x36C1, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 1) + PALETTE(0, 16, 0x0) TILES(0x36C1, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0093__v2_l0[] = { // 0x080DFBF4 - PALETTE(0, 16, 0x0) - TILES(0x36D1, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 2) + PALETTE(0, 16, 0x0) TILES(0x36D1, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0093__v3_l0[] = { // 0x080DFC24 - PALETTE(0, 16, 0x0) - TILES(0x36E1, 25) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 3) + PALETTE(0, 16, 0x0) TILES(0x36E1, 25) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0093__v4_l0[] = { // 0x080DFC54 - PALETTE(0, 16, 0x0) - TILES(0x36FA, 20) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 4) + PALETTE(0, 16, 0x0) TILES(0x36FA, 20) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0093__v5_l0[] = { // 0x080DFC84 - PALETTE(0, 16, 0x0) - TILES(0x370E, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 5) + PALETTE(0, 16, 0x0) TILES(0x370E, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0093__v6_l0[] = { // 0x080DFCB4 - PALETTE(0, 16, 0x0) - TILES(0x371E, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 6) + PALETTE(0, 16, 0x0) TILES(0x371E, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0093__v7_l0[] = { // 0x080DFCE4 - PALETTE(0, 16, 0x0) - TILES(0x372E, 20) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 7) + PALETTE(0, 16, 0x0) TILES(0x372E, 20) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 7) - END() + END() }; -const s32 * const anim_0093[8] = { - anim_0093__v0_l0, - anim_0093__v1_l0, - anim_0093__v2_l0, - anim_0093__v3_l0, - anim_0093__v4_l0, - anim_0093__v5_l0, - anim_0093__v6_l0, - anim_0093__v7_l0, +const s32 *const anim_0093[8] = { + anim_0093__v0_l0, anim_0093__v1_l0, anim_0093__v2_l0, anim_0093__v3_l0, + anim_0093__v4_l0, anim_0093__v5_l0, anim_0093__v6_l0, anim_0093__v7_l0, }; const s32 anim_0096__v0_l0[] = { // 0x080DFD34 - PALETTE(0, 16, 0x70) - TILES(0x3742, 64) - SHOW_FRAME(2, 0) + PALETTE(0, 16, 0x70) TILES(0x3742, 64) SHOW_FRAME(2, 0) - TILES(0x3782, 64) - SHOW_FRAME(2, 1) + TILES(0x3782, 64) SHOW_FRAME(2, 1) - TILES(0x37C2, 64) - SHOW_FRAME(2, 2) + TILES(0x37C2, 64) SHOW_FRAME(2, 2) - TILES(0x3802, 64) - SHOW_FRAME(2, 3) + TILES(0x3802, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0096[1] = { +const s32 *const anim_0096[1] = { anim_0096__v0_l0, }; const s32 anim_0097__v0_l0[] = { // 0x080DFD9C - PALETTE(0, 16, 0x0) - TILES(0x3842, 8) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x3842, 8) SHOW_FRAME(1, 0) - TILES(0x384A, 8) - SHOW_FRAME(1, 1) + TILES(0x384A, 8) SHOW_FRAME(1, 1) - TILES(0x3842, 8) - SHOW_FRAME(1, 0) + TILES(0x3842, 8) SHOW_FRAME(1, 0) - TILES(0x3852, 12) - SHOW_FRAME(1, 2) + TILES(0x3852, 12) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0097[1] = { +const s32 *const anim_0097[1] = { anim_0097__v0_l0, }; const s32 anim_0098__v0_l0[] = { // 0x080DFE00 - PALETTE(0, 16, 0x0) - TILES(0x385E, 64) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x0) TILES(0x385E, 64) SHOW_FRAME(3, 0) - END() + END() }; -const s32 * const anim_0098[1] = { +const s32 *const anim_0098[1] = { anim_0098__v0_l0, }; const s32 anim_0099__v0_l0[] = { // 0x080DFE28 - PALETTE(2, 16, 0x10) - TILES(0x389E, 24) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(8, 0) + PALETTE(2, 16, 0x10) TILES(0x389E, 24) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(8, 0) - TILES(0x38B6, 24) - SHOW_FRAME(8, 1) + TILES(0x38B6, 24) SHOW_FRAME(8, 1) - TILES(0x38CE, 30) - SHOW_FRAME(8, 2) + TILES(0x38CE, 30) SHOW_FRAME(8, 2) - TILES(0x38EC, 24) - SHOW_FRAME(8, 3) + TILES(0x38EC, 24) SHOW_FRAME(8, 3) - TILES(0x3904, 24) - SHOW_FRAME(8, 4) + TILES(0x3904, 24) SHOW_FRAME(8, 4) - TILES(0x391C, 24) - SHOW_FRAME(8, 5) + TILES(0x391C, 24) SHOW_FRAME(8, 5) - TILES(0x3934, 30) - SHOW_FRAME(8, 6) + TILES(0x3934, 30) SHOW_FRAME(8, 6) - TILES(0x3952, 24) - SHOW_FRAME(8, 7) + TILES(0x3952, 24) SHOW_FRAME(8, 7) - TILES(0x389E, 24) - SHOW_FRAME(8, 0) + TILES(0x389E, 24) SHOW_FRAME(8, 0) - TILES(0x396A, 24) - SHOW_FRAME(8, 8) + TILES(0x396A, 24) SHOW_FRAME(8, 8) - TILES(0x3982, 30) - SHOW_FRAME(8, 9) + TILES(0x3982, 30) SHOW_FRAME(8, 9) - TILES(0x39A0, 24) - SHOW_FRAME(8, 10) + TILES(0x39A0, 24) SHOW_FRAME(8, 10) - TILES(0x3904, 24) - SHOW_FRAME(8, 4) + TILES(0x3904, 24) SHOW_FRAME(8, 4) - TILES(0x391C, 24) - SHOW_FRAME(8, 5) + TILES(0x391C, 24) SHOW_FRAME(8, 5) - TILES(0x3934, 30) - SHOW_FRAME(8, 6) + TILES(0x3934, 30) SHOW_FRAME(8, 6) - TILES(0x3952, 24) - SHOW_FRAME(8, 7) + TILES(0x3952, 24) SHOW_FRAME(8, 7) - JUMP_BACK(86) + JUMP_BACK(86) }; -const s32 * const anim_0099[1] = { +const s32 *const anim_0099[1] = { anim_0099__v0_l0, }; const s32 anim_0100__v0_l0[] = { // 0x080DFF8C - PALETTE(2, 16, 0x10) - TILES(0x39B8, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x39B8, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 0) - TILES(0x39CC, 36) - SHOW_FRAME(10, 1) + TILES(0x39CC, 36) SHOW_FRAME(10, 1) - TILES(0x39F0, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(12, 2) + TILES(0x39F0, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(12, 2) - TILES(0x3A04, 20) - SHOW_FRAME(10, 3) + TILES(0x3A04, 20) SHOW_FRAME(10, 3) - TILES(0x3A18, 20) - SHOW_FRAME(10, 4) + TILES(0x3A18, 20) SHOW_FRAME(10, 4) - TILES(0x3A04, 20) - SHOW_FRAME(10, 3) + TILES(0x3A04, 20) SHOW_FRAME(10, 3) - TILES(0x39F0, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(10, 2) + TILES(0x39F0, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(10, 2) - TILES(0x3A04, 20) - SHOW_FRAME(10, 3) + TILES(0x3A04, 20) SHOW_FRAME(10, 3) - TILES(0x3A18, 20) - SHOW_FRAME(10, 4) + TILES(0x3A18, 20) SHOW_FRAME(10, 4) - TILES(0x3A04, 20) - SHOW_FRAME(10, 3) + TILES(0x3A04, 20) SHOW_FRAME(10, 3) - TILES(0x3A2C, 16) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(6, 5) + TILES(0x3A2C, 16) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(6, 5) - TILES(0x3A3C, 12) - SHOW_FRAME(6, 6) + TILES(0x3A3C, 12) SHOW_FRAME(6, 6) - TILES(0x3A2C, 16) - SHOW_FRAME(6, 5) + TILES(0x3A2C, 16) SHOW_FRAME(6, 5) - TILES(0x3A48, 20) - SHOW_FRAME(6, 7) + TILES(0x3A48, 20) SHOW_FRAME(6, 7) - TILES(0x3A5C, 16) - SHOW_FRAME(6, 8) + TILES(0x3A5C, 16) SHOW_FRAME(6, 8) - TILES(0x3A6C, 16) - SHOW_FRAME(6, 9) + TILES(0x3A6C, 16) SHOW_FRAME(6, 9) - TILES(0x3A5C, 16) - SHOW_FRAME(6, 8) + TILES(0x3A5C, 16) SHOW_FRAME(6, 8) - TILES(0x3A48, 20) - SHOW_FRAME(6, 7) + TILES(0x3A48, 20) SHOW_FRAME(6, 7) - TILES(0x3A2C, 16) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(6, 5) + TILES(0x3A2C, 16) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(6, 5) - TILES(0x3A3C, 12) - SHOW_FRAME(6, 6) + TILES(0x3A3C, 12) SHOW_FRAME(6, 6) - TILES(0x3A2C, 16) - SHOW_FRAME(6, 5) + TILES(0x3A2C, 16) SHOW_FRAME(6, 5) - TILES(0x3A48, 20) - SHOW_FRAME(6, 7) + TILES(0x3A48, 20) SHOW_FRAME(6, 7) - TILES(0x3A5C, 16) - SHOW_FRAME(6, 8) + TILES(0x3A5C, 16) SHOW_FRAME(6, 8) - TILES(0x3A6C, 16) - SHOW_FRAME(6, 9) + TILES(0x3A6C, 16) SHOW_FRAME(6, 9) - TILES(0x3A5C, 16) - SHOW_FRAME(6, 8) + TILES(0x3A5C, 16) SHOW_FRAME(6, 8) - TILES(0x3A48, 20) - SHOW_FRAME(30, 7) + TILES(0x3A48, 20) SHOW_FRAME(30, 7) - TILES(0x3A7C, 20) - SHOW_FRAME(10, 10) + TILES(0x3A7C, 20) SHOW_FRAME(10, + 10) - TILES(0x3A90, 20) - SHOW_FRAME(10, 11) + TILES(0x3A90, + 20) SHOW_FRAME(10, 11) - TILES(0x3AA4, 24) - SHOW_FRAME(6, 12) - TILES(0x3ABC, 28) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(6, 13) + TILES(0x3AA4, + 24) SHOW_FRAME(6, + 12) + TILES(0x3ABC, 28) HITBOX( + 0, + -6, + -10, 6, + 16) SHOW_FRAME(6, 13) - TILES(0x3AD8, 28) - SHOW_FRAME(6, 14) + TILES(0x3AD8, 28) SHOW_FRAME( + 6, 14) - TILES(0x3AF4, 28) - SHOW_FRAME(6, 15) + TILES(0x3AF4, 28) SHOW_FRAME( + 6, 15) - TILES(0x3B10, 28) - SHOW_FRAME(6, 16) + TILES(0x3B10, 28) SHOW_FRAME( + 6, + 16) - TILES(0x3B2C, 28) - SHOW_FRAME(6, 17) + TILES( + 0x3B2C, + 28) + SHOW_FRAME( + 6, + 17) - TILES(0x3B48, 28) - SHOW_FRAME(6, 18) + TILES( + 0x3B48, + 28) + SHOW_FRAME( + 6, + 18) - TILES(0x3B64, 28) - SHOW_FRAME(6, 19) + TILES(0x3B64, + 28) + SHOW_FRAME( + 6, + 19) - TILES(0x3B80, 28) - SHOW_FRAME(6, 20) + TILES(0x3B80, + 28) + SHOW_FRAME( + 6, + 20) - TILES(0x3ABC, 28) - SHOW_FRAME(6, 13) + TILES(0x3ABC, + 28) + SHOW_FRAME( + 6, + 13) - TILES(0x3B9C, 28) - SHOW_FRAME(6, 21) + TILES(0x3B9C, + 28) + SHOW_FRAME( + 6, + 21) - TILES(0x3BB8, 28) - SHOW_FRAME(6, 22) + TILES(0x3BB8, + 28) + SHOW_FRAME( + 6, + 22) - TILES(0x3BD4, 28) - SHOW_FRAME(6, 23) + TILES(0x3BD4, + 28) + SHOW_FRAME( + 6, + 23) - TILES(0x3B2C, 28) - SHOW_FRAME(6, 17) + TILES(0x3B2C, + 28) + SHOW_FRAME(6, 17) - TILES(0x3B48, 28) - SHOW_FRAME(6, 18) + TILES(0x3B48, 28) SHOW_FRAME( + 6, + 18) - TILES(0x3B64, 28) - SHOW_FRAME(6, 19) + TILES(0x3B64, 28) SHOW_FRAME( + 6, + 19) - TILES(0x3BF0, 28) - SHOW_FRAME(6, 24) + TILES( + 0x3BF0, + 28) + SHOW_FRAME( + 6, + 24) - JUMP_BACK(83) + JUMP_BACK( + 83) }; -const s32 * const anim_0100[1] = { +const s32 *const anim_0100[1] = { anim_0100__v0_l0, }; const s32 anim_0101__v0_l0[] = { // 0x080E0370 - PALETTE(2, 16, 0x10) - TILES(0x3C0C, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x3C0C, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 0) - TILES(0x3C20, 25) - SHOW_FRAME(2, 1) - TILES(0x3C39, 25) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(10, 2) + TILES(0x3C20, 25) SHOW_FRAME(2, 1) TILES(0x3C39, 25) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(10, 2) - TILES(0x3C52, 25) - SHOW_FRAME(10, 3) + TILES(0x3C52, 25) SHOW_FRAME(10, 3) - TILES(0x3C6B, 25) - SHOW_FRAME(10, 4) + TILES(0x3C6B, 25) SHOW_FRAME(10, 4) - TILES(0x3C84, 25) - SHOW_FRAME(10, 5) + TILES(0x3C84, 25) SHOW_FRAME(10, 5) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0101__v1_l0[] = { // 0x080E0414 - PALETTE(2, 16, 0x10) - TILES(0x3C20, 25) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 1) + PALETTE(2, 16, 0x10) TILES(0x3C20, 25) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 1) - TILES(0x3C0C, 20) - SHOW_FRAME(2, 0) + TILES(0x3C0C, 20) SHOW_FRAME(2, 0) - END() + END() }; -const s32 * const anim_0101[2] = { +const s32 *const anim_0101[2] = { anim_0101__v0_l0, anim_0101__v1_l0, }; const s32 anim_0102__v0_l0[] = { // 0x080E0460 - PALETTE(2, 16, 0x10) - TILES(0x3C9D, 20) - HITBOX(0, -6, -4, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x3C9D, 20) HITBOX(0, -6, -4, 6, 16) SHOW_FRAME(1, 0) - TILES(0x3CB1, 24) - SHOW_FRAME(1, 1) - TILES(0x3CC9, 18) - SHOW_FRAME(6, 2) + TILES(0x3CB1, 24) SHOW_FRAME(1, 1) TILES(0x3CC9, 18) SHOW_FRAME(6, 2) - TILES(0x3CDB, 18) - SHOW_FRAME(6, 3) + TILES(0x3CDB, 18) SHOW_FRAME(6, 3) - TILES(0x3CED, 18) - SHOW_FRAME(6, 4) + TILES(0x3CED, 18) SHOW_FRAME(6, 4) - TILES(0x3CFF, 18) - SHOW_FRAME(6, 5) + TILES(0x3CFF, 18) SHOW_FRAME(6, 5) - TILES(0x3D11, 18) - SHOW_FRAME(6, 6) + TILES(0x3D11, 18) SHOW_FRAME(6, 6) - TILES(0x3D23, 18) - SHOW_FRAME(6, 7) + TILES(0x3D23, 18) SHOW_FRAME(6, 7) - TILES(0x3D35, 18) - SHOW_FRAME(6, 8) + TILES(0x3D35, 18) SHOW_FRAME(6, 8) - TILES(0x3D47, 18) - SHOW_FRAME(6, 9) + TILES(0x3D47, 18) SHOW_FRAME(6, 9) - TILES(0x3CC9, 18) - SHOW_FRAME(6, 2) + TILES(0x3CC9, 18) SHOW_FRAME(6, 2) - TILES(0x3D59, 18) - SHOW_FRAME(6, 10) + TILES(0x3D59, 18) SHOW_FRAME(6, 10) - TILES(0x3D6B, 18) - SHOW_FRAME(6, 11) + TILES(0x3D6B, 18) SHOW_FRAME(6, 11) - TILES(0x3D7D, 18) - SHOW_FRAME(6, 12) + TILES(0x3D7D, 18) SHOW_FRAME(6, 12) - TILES(0x3D11, 18) - SHOW_FRAME(6, 6) + TILES(0x3D11, 18) SHOW_FRAME(6, 6) - TILES(0x3D23, 18) - SHOW_FRAME(6, 7) + TILES(0x3D23, 18) SHOW_FRAME(6, 7) - TILES(0x3D35, 18) - SHOW_FRAME(6, 8) + TILES(0x3D35, 18) SHOW_FRAME(6, 8) - TILES(0x3D47, 18) - SHOW_FRAME(6, 9) + TILES(0x3D47, 18) SHOW_FRAME(6, 9) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0102__v1_l0[] = { // 0x080E05E8 - PALETTE(2, 16, 0x10) - TILES(0x3CB1, 24) - HITBOX(0, -6, -4, 6, 16) - SHOW_FRAME(1, 1) + PALETTE(2, 16, 0x10) TILES(0x3CB1, 24) HITBOX(0, -6, -4, 6, 16) SHOW_FRAME(1, 1) - TILES(0x3C9D, 20) - SHOW_FRAME(1, 0) + TILES(0x3C9D, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0102[2] = { +const s32 *const anim_0102[2] = { anim_0102__v0_l0, anim_0102__v1_l0, }; const s32 anim_0103__v0_l0[] = { // 0x080E0634 - PALETTE(2, 16, 0x10) - TILES(0x3D8F, 64) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x3D8F, 64) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(3, 0) - TILES(0x3DCF, 64) - SHOW_FRAME(3, 1) + TILES(0x3DCF, 64) SHOW_FRAME(3, 1) - TILES(0x3E0F, 64) - SHOW_FRAME(3, 2) + TILES(0x3E0F, 64) SHOW_FRAME(3, 2) - TILES(0x3E4F, 64) - SHOW_FRAME(3, 3) + TILES(0x3E4F, 64) SHOW_FRAME(3, 3) - TILES(0x3E8F, 64) - SHOW_FRAME(3, 4) + TILES(0x3E8F, 64) SHOW_FRAME(3, 4) - TILES(0x3ECF, 64) - SHOW_FRAME(3, 5) + TILES(0x3ECF, 64) SHOW_FRAME(3, 5) - TILES(0x3F0F, 64) - SHOW_FRAME(3, 6) + TILES(0x3F0F, 64) SHOW_FRAME(3, 6) - TILES(0x3F4F, 64) - SHOW_FRAME(3, 7) + TILES(0x3F4F, 64) SHOW_FRAME(3, 7) - TILES(0x3D8F, 64) - SHOW_FRAME(3, 0) + TILES(0x3D8F, 64) SHOW_FRAME(3, 0) - TILES(0x3F8F, 64) - SHOW_FRAME(3, 8) + TILES(0x3F8F, 64) SHOW_FRAME(3, 8) - TILES(0x3FCF, 64) - SHOW_FRAME(3, 9) + TILES(0x3FCF, 64) SHOW_FRAME(3, 9) - TILES(0x400F, 64) - SHOW_FRAME(3, 10) + TILES(0x400F, 64) SHOW_FRAME(3, 10) - TILES(0x3E8F, 64) - SHOW_FRAME(3, 4) + TILES(0x3E8F, 64) SHOW_FRAME(3, 4) - TILES(0x3ECF, 64) - SHOW_FRAME(3, 5) + TILES(0x3ECF, 64) SHOW_FRAME(3, 5) - TILES(0x3F0F, 64) - SHOW_FRAME(3, 6) + TILES(0x3F0F, 64) SHOW_FRAME(3, 6) - TILES(0x3F4F, 64) - SHOW_FRAME(3, 7) + TILES(0x3F4F, 64) SHOW_FRAME(3, 7) - JUMP_BACK(86) + JUMP_BACK(86) }; -const s32 * const anim_0103[1] = { +const s32 *const anim_0103[1] = { anim_0103__v0_l0, }; const s32 anim_0104__v0_l0[] = { // 0x080E0798 - PALETTE(2, 16, 0x10) - TILES(0x404F, 64) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x404F, 64) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 0) - TILES(0x408F, 64) - SHOW_FRAME(2, 1) + TILES(0x408F, 64) SHOW_FRAME(2, 1) - TILES(0x40CF, 64) - SHOW_FRAME(2, 2) + TILES(0x40CF, 64) SHOW_FRAME(2, 2) - TILES(0x410F, 64) - SHOW_FRAME(2, 3) + TILES(0x410F, 64) SHOW_FRAME(2, 3) - TILES(0x414F, 64) - SHOW_FRAME(2, 4) + TILES(0x414F, 64) SHOW_FRAME(2, 4) - TILES(0x418F, 64) - SHOW_FRAME(2, 5) + TILES(0x418F, 64) SHOW_FRAME(2, 5) - TILES(0x41CF, 64) - SHOW_FRAME(2, 6) + TILES(0x41CF, 64) SHOW_FRAME(2, 6) - TILES(0x420F, 64) - SHOW_FRAME(2, 7) + TILES(0x420F, 64) SHOW_FRAME(2, 7) - TILES(0x404F, 64) - SHOW_FRAME(2, 0) + TILES(0x404F, 64) SHOW_FRAME(2, 0) - TILES(0x424F, 64) - SHOW_FRAME(2, 8) + TILES(0x424F, 64) SHOW_FRAME(2, 8) - TILES(0x428F, 64) - SHOW_FRAME(2, 9) + TILES(0x428F, 64) SHOW_FRAME(2, 9) - TILES(0x42CF, 64) - SHOW_FRAME(2, 10) + TILES(0x42CF, 64) SHOW_FRAME(2, 10) - TILES(0x414F, 64) - SHOW_FRAME(2, 4) + TILES(0x414F, 64) SHOW_FRAME(2, 4) - TILES(0x418F, 64) - SHOW_FRAME(2, 5) + TILES(0x418F, 64) SHOW_FRAME(2, 5) - TILES(0x41CF, 64) - SHOW_FRAME(2, 6) + TILES(0x41CF, 64) SHOW_FRAME(2, 6) - TILES(0x420F, 64) - SHOW_FRAME(2, 7) + TILES(0x420F, 64) SHOW_FRAME(2, 7) - JUMP_BACK(86) + JUMP_BACK(86) }; -const s32 * const anim_0104[1] = { +const s32 *const anim_0104[1] = { anim_0104__v0_l0, }; const s32 anim_0105__v0_l0[] = { // 0x080E08FC - PALETTE(2, 16, 0x10) - TILES(0x430F, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x430F, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(1, 0) - TILES(0x4323, 20) - SHOW_FRAME(1, 1) + TILES(0x4323, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0105[1] = { +const s32 *const anim_0105[1] = { anim_0105__v0_l0, }; const s32 anim_0106__v0_l0[] = { // 0x080E0944 - PALETTE(2, 16, 0x10) - TILES(0x4337, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x4337, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(1, 0) - TILES(0x434B, 20) - SHOW_FRAME(1, 1) + TILES(0x434B, 20) SHOW_FRAME(1, 1) - TILES(0x435F, 16) - SHOW_FRAME(1, 2) + TILES(0x435F, 16) SHOW_FRAME(1, 2) - TILES(0x436F, 24) - SHOW_FRAME(1, 3) + TILES(0x436F, 24) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0106[1] = { +const s32 *const anim_0106[1] = { anim_0106__v0_l0, }; const s32 anim_0107__v0_l0[] = { // 0x080E09B4 - PALETTE(2, 16, 0x10) - TILES(0x4387, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x4387, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x4397, 16) - SHOW_FRAME(2, 1) + TILES(0x4397, 16) SHOW_FRAME(2, 1) - TILES(0x43A7, 16) - SHOW_FRAME(2, 2) + TILES(0x43A7, 16) SHOW_FRAME(2, 2) - TILES(0x43B7, 16) - SHOW_FRAME(2, 3) + TILES(0x43B7, 16) SHOW_FRAME(2, 3) - TILES(0x4387, 16) - SHOW_FRAME(2, 0) + TILES(0x4387, 16) SHOW_FRAME(2, 0) - TILES(0x4397, 16) - SHOW_FRAME(2, 1) + TILES(0x4397, 16) SHOW_FRAME(2, 1) - TILES(0x43A7, 16) - SHOW_FRAME(2, 2) + TILES(0x43A7, 16) SHOW_FRAME(2, 2) - TILES(0x43B7, 16) - SHOW_FRAME(2, 3) + TILES(0x43B7, 16) SHOW_FRAME(2, 3) - JUMP_BACK(49) + JUMP_BACK(49) }; const s32 anim_0107__v1_l0[] = { // 0x080E0A80 - PALETTE(2, 16, 0x10) - TILES(0x43C7, 16) - SHOW_FRAME(2, 4) + PALETTE(2, 16, 0x10) TILES(0x43C7, 16) SHOW_FRAME(2, 4) - TILES(0x43D7, 16) - SHOW_FRAME(2, 5) + TILES(0x43D7, 16) SHOW_FRAME(2, 5) - TILES(0x43E7, 16) - SHOW_FRAME(2, 6) + TILES(0x43E7, 16) SHOW_FRAME(2, 6) - TILES(0x43F7, 16) - SHOW_FRAME(2, 7) + TILES(0x43F7, 16) SHOW_FRAME(2, 7) - TILES(0x4407, 16) - SHOW_FRAME(2, 8) + TILES(0x4407, 16) SHOW_FRAME(2, 8) - TILES(0x4417, 16) - SHOW_FRAME(2, 9) + TILES(0x4417, 16) SHOW_FRAME(2, 9) - TILES(0x4427, 16) - SHOW_FRAME(2, 10) + TILES(0x4427, 16) SHOW_FRAME(2, 10) - TILES(0x4437, 16) - SHOW_FRAME(2, 11) + TILES(0x4437, 16) SHOW_FRAME(2, 11) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0107[2] = { +const s32 *const anim_0107[2] = { anim_0107__v0_l0, anim_0107__v1_l0, }; const s32 anim_0108__v0_l0[] = { // 0x080E0B3C - PALETTE(2, 16, 0x10) - TILES(0x4447, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 0) - TILES(0x445B, 20) - SHOW_FRAME(4, 1) + PALETTE(2, 16, 0x10) TILES(0x4447, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 0) TILES(0x445B, 20) SHOW_FRAME(4, 1) - TILES(0x446F, 20) - SHOW_FRAME(4, 2) + TILES(0x446F, 20) SHOW_FRAME(4, 2) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0108__v1_l0[] = { // 0x080E0B98 - PALETTE(2, 16, 0x10) - TILES(0x4483, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 3) + PALETTE(2, 16, 0x10) TILES(0x4483, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0108[2] = { +const s32 *const anim_0108[2] = { anim_0108__v0_l0, anim_0108__v1_l0, }; const s32 anim_0109__v0_l0[] = { // 0x080E0BD0 - PALETTE(2, 16, 0x10) - TILES(0x4497, 21) - HITBOX(0, -6, -12, 6, 10) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x4497, 21) HITBOX(0, -6, -12, 6, 10) SHOW_FRAME(2, 0) - TILES(0x44AC, 21) - SHOW_FRAME(2, 1) + TILES(0x44AC, 21) SHOW_FRAME(2, 1) - TILES(0x44C1, 21) - SHOW_FRAME(2, 2) + TILES(0x44C1, 21) SHOW_FRAME(2, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0109__v1_l0[] = { // 0x080E0C2C - PALETTE(2, 16, 0x10) - TILES(0x44D6, 18) - HITBOX(0, -6, -12, 6, 10) - SHOW_FRAME(2, 3) + PALETTE(2, 16, 0x10) TILES(0x44D6, 18) HITBOX(0, -6, -12, 6, 10) SHOW_FRAME(2, 3) - TILES(0x44E8, 24) - HITBOX(0, -6, -14, 6, 8) - SHOW_FRAME(3, 4) + TILES(0x44E8, 24) HITBOX(0, -6, -14, 6, 8) SHOW_FRAME(3, 4) - TILES(0x4500, 20) - SHOW_FRAME(3, 5) + TILES(0x4500, 20) SHOW_FRAME(3, 5) - TILES(0x4514, 20) - SHOW_FRAME(4, 6) + TILES(0x4514, 20) SHOW_FRAME(4, 6) - TILES(0x4528, 20) - HITBOX(0, -6, -16, 6, 6) - SHOW_FRAME(4, 7) + TILES(0x4528, 20) HITBOX(0, -6, -16, 6, 6) SHOW_FRAME(4, 7) - TILES(0x453C, 25) - HITBOX(0, -6, -14, 6, 6) - SHOW_FRAME(4, 8) + TILES(0x453C, 25) HITBOX(0, -6, -14, 6, 6) SHOW_FRAME(4, 8) - END() + END() }; const s32 anim_0109__v2_l0[] = { // 0x080E0CE4 - PALETTE(2, 16, 0x10) - TILES(0x4555, 28) - HITBOX(0, -6, -16, 6, 6) - SHOW_FRAME(3, 9) + PALETTE(2, 16, 0x10) TILES(0x4555, 28) HITBOX(0, -6, -16, 6, 6) SHOW_FRAME(3, 9) - TILES(0x4571, 28) - SHOW_FRAME(3, 10) + TILES(0x4571, 28) SHOW_FRAME(3, 10) - TILES(0x458D, 28) - SHOW_FRAME(3, 11) + TILES(0x458D, 28) SHOW_FRAME(3, 11) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0109__v3_l0[] = { // 0x080E0D40 - PALETTE(2, 16, 0x10) - TILES(0x45A9, 20) - SHOW_FRAME(2, 12) + PALETTE(2, 16, 0x10) TILES(0x45A9, 20) SHOW_FRAME(2, 12) - TILES(0x45BD, 24) - SHOW_FRAME(1, 13) + TILES(0x45BD, 24) SHOW_FRAME(1, 13) - TILES(0x45D5, 18) - SHOW_FRAME(1, 14) + TILES(0x45D5, 18) SHOW_FRAME(1, 14) - TILES(0x45BD, 24) - SHOW_FRAME(1, 13) + TILES(0x45BD, 24) SHOW_FRAME(1, 13) - END() + END() }; -const s32 * const anim_0109[4] = { +const s32 *const anim_0109[4] = { anim_0109__v0_l0, anim_0109__v1_l0, anim_0109__v2_l0, @@ -3328,2789 +2354,1927 @@ const s32 * const anim_0109[4] = { }; const s32 anim_0110__v0_l0[] = { // 0x080E0DB0 - PALETTE(2, 16, 0x10) - TILES(0x45E7, 25) - HITBOX(0, -6, -11, 6, 11) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x45E7, 25) HITBOX(0, -6, -11, 6, 11) SHOW_FRAME(4, 0) - TILES(0x4600, 25) - SHOW_FRAME(4, 1) + TILES(0x4600, 25) SHOW_FRAME(4, 1) - TILES(0x4619, 24) - SHOW_FRAME(4, 2) + TILES(0x4619, 24) SHOW_FRAME(4, 2) - TILES(0x4631, 24) - SHOW_FRAME(4, 3) + TILES(0x4631, 24) SHOW_FRAME(4, 3) - TILES(0x4649, 20) - SHOW_FRAME(4, 4) + TILES(0x4649, 20) SHOW_FRAME(4, 4) - TILES(0x465D, 20) - SHOW_FRAME(4, 5) + TILES(0x465D, 20) SHOW_FRAME(4, 5) - TILES(0x4671, 20) - SHOW_FRAME(4, 6) + TILES(0x4671, 20) SHOW_FRAME(4, 6) - TILES(0x4685, 20) - SHOW_FRAME(4, 7) + TILES(0x4685, 20) SHOW_FRAME(4, 7) - TILES(0x4699, 20) - SHOW_FRAME(4, 8) + TILES(0x4699, 20) SHOW_FRAME(4, 8) - TILES(0x46AD, 20) - SHOW_FRAME(4, 9) + TILES(0x46AD, 20) SHOW_FRAME(4, 9) - TILES(0x46C1, 25) - SHOW_FRAME(4, 10) + TILES(0x46C1, 25) SHOW_FRAME(4, 10) - END() + END() }; -const s32 * const anim_0110[1] = { +const s32 *const anim_0110[1] = { anim_0110__v0_l0, }; const s32 anim_0111__v0_l0[] = { // 0x080E0EAC - PALETTE(2, 16, 0x10) - TILES(0x46DA, 24) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 0) - TILES(0x46F2, 30) - SHOW_FRAME(7, 1) + PALETTE(2, 16, 0x10) TILES(0x46DA, 24) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 0) TILES(0x46F2, 30) SHOW_FRAME(7, 1) - TILES(0x4710, 30) - SHOW_FRAME(7, 2) + TILES(0x4710, 30) SHOW_FRAME(7, 2) - TILES(0x472E, 30) - SHOW_FRAME(7, 3) + TILES(0x472E, 30) SHOW_FRAME(7, 3) - TILES(0x474C, 24) - SHOW_FRAME(7, 4) + TILES(0x474C, 24) SHOW_FRAME(7, 4) - TILES(0x4764, 24) - SHOW_FRAME(7, 5) + TILES(0x4764, 24) SHOW_FRAME(7, 5) - TILES(0x477C, 24) - SHOW_FRAME(7, 6) + TILES(0x477C, 24) SHOW_FRAME(7, 6) - TILES(0x4794, 24) - SHOW_FRAME(7, 7) + TILES(0x4794, 24) SHOW_FRAME(7, 7) - TILES(0x47AC, 24) - SHOW_FRAME(7, 8) + TILES(0x47AC, 24) SHOW_FRAME(7, 8) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0111__v1_l0[] = { // 0x080E0F80 - PALETTE(2, 16, 0x10) - TILES(0x46DA, 24) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x46DA, 24) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0111[2] = { +const s32 *const anim_0111[2] = { anim_0111__v0_l0, anim_0111__v1_l0, }; const s32 anim_0112__v0_l0[] = { // 0x080E0FB8 - PALETTE(2, 16, 0x10) - TILES(0x47C4, 20) - HITBOX(0, -3, -10, 9, 16) - SHOW_FRAME(2, 0) - TILES(0x47D8, 28) - HITBOX(0, -3, -10, 9, 16) - SHOW_FRAME(2, 1) + PALETTE(2, 16, 0x10) TILES(0x47C4, 20) HITBOX(0, -3, -10, 9, 16) SHOW_FRAME(2, 0) TILES(0x47D8, 28) HITBOX(0, -3, -10, 9, 16) + SHOW_FRAME(2, 1) - TILES(0x47F4, 30) - SHOW_FRAME(2, 2) + TILES(0x47F4, 30) SHOW_FRAME(2, 2) - TILES(0x4812, 35) - SHOW_FRAME(2, 3) + TILES(0x4812, 35) SHOW_FRAME(2, 3) - TILES(0x4835, 28) - SHOW_FRAME(2, 4) + TILES(0x4835, 28) SHOW_FRAME(2, 4) - TILES(0x4851, 24) - SHOW_FRAME(2, 5) + TILES(0x4851, 24) SHOW_FRAME(2, 5) - TILES(0x4869, 24) - SHOW_FRAME(2, 6) + TILES(0x4869, 24) SHOW_FRAME(2, 6) - TILES(0x4881, 30) - SHOW_FRAME(2, 7) + TILES(0x4881, 30) SHOW_FRAME(2, 7) - TILES(0x489F, 28) - SHOW_FRAME(2, 8) + TILES(0x489F, 28) SHOW_FRAME(2, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0112__v1_l0[] = { // 0x080E1098 - PALETTE(2, 16, 0x10) - TILES(0x48BB, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 9) + PALETTE(2, 16, 0x10) TILES(0x48BB, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 9) - END() + END() }; -const s32 * const anim_0112[2] = { +const s32 *const anim_0112[2] = { anim_0112__v0_l0, anim_0112__v1_l0, }; const s32 anim_0113__v0_l0[] = { // 0x080E10D0 - PALETTE(2, 16, 0x10) - TILES(0x48CF, 30) - HITBOX(0, -13, -10, -1, 16) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x48CF, 30) HITBOX(0, -13, -10, -1, 16) SHOW_FRAME(4, 0) - TILES(0x48ED, 36) - SHOW_FRAME(4, 1) + TILES(0x48ED, 36) SHOW_FRAME(4, 1) - TILES(0x4911, 42) - SHOW_FRAME(4, 2) + TILES(0x4911, 42) SHOW_FRAME(4, 2) - TILES(0x493B, 24) - SHOW_FRAME(4, 3) + TILES(0x493B, 24) SHOW_FRAME(4, 3) - TILES(0x4953, 35) - SHOW_FRAME(4, 4) + TILES(0x4953, 35) SHOW_FRAME(4, 4) - TILES(0x4976, 35) - SHOW_FRAME(4, 5) + TILES(0x4976, 35) SHOW_FRAME(4, 5) - TILES(0x4999, 30) - SHOW_FRAME(4, 6) + TILES(0x4999, 30) SHOW_FRAME(4, 6) - TILES(0x49B7, 30) - SHOW_FRAME(4, 7) + TILES(0x49B7, 30) SHOW_FRAME(4, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0113__v1_l0[] = { // 0x080E1190 - PALETTE(2, 16, 0x10) - TILES(0x49D5, 24) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(1, 8) + PALETTE(2, 16, 0x10) TILES(0x49D5, 24) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0113[2] = { +const s32 *const anim_0113[2] = { anim_0113__v0_l0, anim_0113__v1_l0, }; const s32 anim_0116__v0_l0[] = { // 0x080E11C8 - PALETTE(2, 16, 0x10) - TILES(0x49ED, 20) - HITBOX(0, -6, -10, 6, 16) - PLAY_SOUND(191) - SHOW_FRAME(6, 0) + PALETTE(2, 16, 0x10) TILES(0x49ED, 20) HITBOX(0, -6, -10, 6, 16) PLAY_SOUND(191) SHOW_FRAME(6, 0) - TILES(0x4A01, 20) - SHOW_FRAME(6, 1) + TILES(0x4A01, 20) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0116[1] = { +const s32 *const anim_0116[1] = { anim_0116__v0_l0, }; const s32 anim_0117__v0_l0[] = { // 0x080E1218 - PALETTE(2, 16, 0x10) - TILES(0x4A15, 24) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x4A15, 24) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x4A2D, 24) - SHOW_FRAME(2, 1) + TILES(0x4A2D, 24) SHOW_FRAME(2, 1) - TILES(0x4A45, 24) - SHOW_FRAME(2, 2) + TILES(0x4A45, 24) SHOW_FRAME(2, 2) - TILES(0x4A5D, 28) - SHOW_FRAME(2, 3) + TILES(0x4A5D, 28) SHOW_FRAME(2, 3) - TILES(0x4A79, 24) - SHOW_FRAME(2, 4) + TILES(0x4A79, 24) SHOW_FRAME(2, 4) - TILES(0x4A91, 24) - SHOW_FRAME(2, 5) + TILES(0x4A91, 24) SHOW_FRAME(2, 5) - TILES(0x4AA9, 24) - SHOW_FRAME(2, 6) + TILES(0x4AA9, 24) SHOW_FRAME(2, 6) - TILES(0x4AC1, 28) - SHOW_FRAME(2, 7) + TILES(0x4AC1, 28) SHOW_FRAME(2, 7) - JUMP_BACK(49) + JUMP_BACK(49) }; -const s32 * const anim_0117[1] = { +const s32 *const anim_0117[1] = { anim_0117__v0_l0, }; const s32 anim_0118__v0_l0[] = { // 0x080E12E8 - PALETTE(2, 16, 0x10) - TILES(0x4ADD, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x4ADD, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(3, 0) - TILES(0x4AF1, 20) - SHOW_FRAME(3, 1) + TILES(0x4AF1, 20) SHOW_FRAME(3, 1) - TILES(0x4B05, 20) - SHOW_FRAME(3, 2) + TILES(0x4B05, 20) SHOW_FRAME(3, 2) - TILES(0x4B19, 20) - SHOW_FRAME(3, 3) + TILES(0x4B19, 20) SHOW_FRAME(3, 3) - TILES(0x4B2D, 20) - SHOW_FRAME(3, 4) + TILES(0x4B2D, 20) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0118[1] = { +const s32 *const anim_0118[1] = { anim_0118__v0_l0, }; const s32 anim_0120__v0_l0[] = { // 0x080E136C - PALETTE(2, 16, 0x10) - TILES(0x4B41, 25) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x4B41, 25) SHOW_FRAME(3, 0) - TILES(0x4B5A, 20) - SHOW_FRAME(3, 1) + TILES(0x4B5A, 20) SHOW_FRAME(3, 1) - TILES(0x4B41, 25) - SHOW_FRAME(3, 0) + TILES(0x4B41, 25) SHOW_FRAME(3, 0) - TILES(0x4B6E, 20) - SHOW_FRAME(3, 2) - TILES(0x4B82, 20) - SHOW_FRAME(3, 3) + TILES(0x4B6E, 20) SHOW_FRAME(3, 2) TILES(0x4B82, 20) SHOW_FRAME(3, 3) - TILES(0x4B96, 15) - SHOW_FRAME(3, 4) + TILES(0x4B96, 15) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0120[1] = { +const s32 *const anim_0120[1] = { anim_0120__v0_l0, }; const s32 anim_0121__v0_l0[] = { // 0x080E13FC - PALETTE(2, 16, 0x10) - TILES(0x4BA5, 24) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x4BA5, 24) SHOW_FRAME(3, 0) - TILES(0x4BBD, 24) - SHOW_FRAME(3, 1) + TILES(0x4BBD, 24) SHOW_FRAME(3, 1) - TILES(0x4BD5, 24) - SHOW_FRAME(3, 2) + TILES(0x4BD5, 24) SHOW_FRAME(3, 2) - TILES(0x4BED, 24) - SHOW_FRAME(3, 3) - TILES(0x4C05, 24) - SHOW_FRAME(3, 4) + TILES(0x4BED, 24) SHOW_FRAME(3, 3) TILES(0x4C05, 24) SHOW_FRAME(3, 4) - TILES(0x4C1D, 24) - SHOW_FRAME(3, 5) + TILES(0x4C1D, 24) SHOW_FRAME(3, 5) - TILES(0x4C35, 24) - SHOW_FRAME(3, 6) + TILES(0x4C35, 24) SHOW_FRAME(3, 6) - TILES(0x4C4D, 24) - SHOW_FRAME(3, 7) + TILES(0x4C4D, 24) SHOW_FRAME(3, 7) - TILES(0x4C65, 24) - SHOW_FRAME(3, 8) + TILES(0x4C65, 24) SHOW_FRAME(3, 8) - TILES(0x4C7D, 24) - SHOW_FRAME(3, 9) + TILES(0x4C7D, 24) SHOW_FRAME(3, 9) - TILES(0x4C95, 24) - SHOW_FRAME(3, 10) + TILES(0x4C95, 24) SHOW_FRAME(3, 10) - TILES(0x4CAD, 24) - SHOW_FRAME(3, 11) + TILES(0x4CAD, 24) SHOW_FRAME(3, 11) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0121[1] = { +const s32 *const anim_0121[1] = { anim_0121__v0_l0, }; const s32 anim_0122__v0_l0[] = { // 0x080E1504 - PALETTE(2, 16, 0x10) - TILES(0x4CC5, 20) - SHOW_FRAME(6, 0) + PALETTE(2, 16, 0x10) TILES(0x4CC5, 20) SHOW_FRAME(6, 0) - TILES(0x4CD9, 30) - SHOW_FRAME(8, 1) + TILES(0x4CD9, 30) SHOW_FRAME(8, 1) - TILES(0x4CF7, 20) - SHOW_FRAME(4, 2) + TILES(0x4CF7, 20) SHOW_FRAME(4, 2) - TILES(0x4D0B, 12) - SHOW_FRAME(4, 3) + TILES(0x4D0B, 12) SHOW_FRAME(4, 3) - TILES(0x4D17, 16) - SHOW_FRAME(6, 4) + TILES(0x4D17, 16) SHOW_FRAME(6, 4) - TILES(0x4D27, 25) - SHOW_FRAME(8, 5) + TILES(0x4D27, 25) SHOW_FRAME(8, 5) - TILES(0x4D40, 24) - SHOW_FRAME(4, 6) + TILES(0x4D40, 24) SHOW_FRAME(4, 6) - TILES(0x4D58, 12) - SHOW_FRAME(4, 7) + TILES(0x4D58, 12) SHOW_FRAME(4, 7) - TILES(0x4D64, 16) - SHOW_FRAME(4, 8) + TILES(0x4D64, 16) SHOW_FRAME(4, 8) - TILES(0x4D74, 20) - SHOW_FRAME(4, 9) + TILES(0x4D74, 20) SHOW_FRAME(4, 9) - TILES(0x4D88, 20) - SHOW_FRAME(4, 10) + TILES(0x4D88, 20) SHOW_FRAME(4, 10) - TILES(0x4D9C, 16) - SHOW_FRAME(4, 11) + TILES(0x4D9C, 16) SHOW_FRAME(4, 11) - TILES(0x4DAC, 20) - SHOW_FRAME(4, 12) + TILES(0x4DAC, 20) SHOW_FRAME(4, 12) - TILES(0x4DC0, 16) - SHOW_FRAME(4, 13) + TILES(0x4DC0, 16) SHOW_FRAME(4, 13) - TILES(0x4DD0, 20) - SHOW_FRAME(4, 14) + TILES(0x4DD0, 20) SHOW_FRAME(4, 14) - TILES(0x4DE4, 25) - SHOW_FRAME(2, 15) + TILES(0x4DE4, 25) SHOW_FRAME(2, 15) - TILES(0x4DFD, 15) - SHOW_FRAME(4, 16) + TILES(0x4DFD, 15) SHOW_FRAME(4, 16) - TILES(0x4E0C, 16) - SHOW_FRAME(4, 17) + TILES(0x4E0C, 16) SHOW_FRAME(4, 17) - TILES(0x4E1C, 20) - SHOW_FRAME(6, 18) + TILES(0x4E1C, 20) SHOW_FRAME(6, 18) - TILES(0x4E30, 20) - SHOW_FRAME(6, 19) + TILES(0x4E30, 20) SHOW_FRAME(6, 19) - TILES(0x4E44, 20) - SHOW_FRAME(6, 20) - TILES(0x4E58, 30) - SHOW_FRAME(6, 21) + TILES(0x4E44, 20) SHOW_FRAME(6, 20) TILES(0x4E58, 30) + SHOW_FRAME(6, 21) - TILES(0x4E76, 35) - SHOW_FRAME(6, 22) + TILES(0x4E76, 35) SHOW_FRAME(6, 22) - TILES(0x4E99, 35) - SHOW_FRAME(6, 23) + TILES(0x4E99, 35) SHOW_FRAME(6, 23) - TILES(0x4EBC, 30) - SHOW_FRAME(6, 24) + TILES(0x4EBC, 30) SHOW_FRAME(6, 24) - TILES(0x4EDA, 30) - SHOW_FRAME(6, 25) + TILES(0x4EDA, 30) SHOW_FRAME(6, 25) - TILES(0x4EF8, 35) - SHOW_FRAME(6, 26) + TILES(0x4EF8, 35) + SHOW_FRAME(6, 26) - TILES(0x4F1B, 30) - SHOW_FRAME(6, 27) + TILES(0x4F1B, 30) + SHOW_FRAME(6, 27) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0122[1] = { +const s32 *const anim_0122[1] = { anim_0122__v0_l0, }; const s32 anim_0123__v0_l0[] = { // 0x080E174C - PALETTE(2, 16, 0x10) - TILES(0x4F39, 35) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x4F39, 35) SHOW_FRAME(4, 0) - TILES(0x4F5C, 20) - SHOW_FRAME(15, 1) + TILES(0x4F5C, 20) SHOW_FRAME(15, 1) - TILES(0x4F70, 20) - SHOW_FRAME(4, 2) + TILES(0x4F70, 20) SHOW_FRAME(4, 2) - TILES(0x4F84, 20) - SHOW_FRAME(4, 3) + TILES(0x4F84, 20) SHOW_FRAME(4, 3) - TILES(0x4F98, 30) - SHOW_FRAME(4, 4) + TILES(0x4F98, 30) SHOW_FRAME(4, 4) - TILES(0x4FB6, 25) - SHOW_FRAME(4, 5) + TILES(0x4FB6, 25) SHOW_FRAME(4, 5) - TILES(0x4FCF, 30) - SHOW_FRAME(4, 6) + TILES(0x4FCF, 30) SHOW_FRAME(4, 6) - TILES(0x4FED, 24) - SHOW_FRAME(4, 7) + TILES(0x4FED, 24) SHOW_FRAME(4, 7) - TILES(0x4F98, 30) - SHOW_FRAME(4, 4) + TILES(0x4F98, 30) SHOW_FRAME(4, 4) - TILES(0x5005, 25) - SHOW_FRAME(4, 8) + TILES(0x5005, 25) SHOW_FRAME(4, 8) - TILES(0x501E, 30) - SHOW_FRAME(4, 9) + TILES(0x501E, 30) SHOW_FRAME(4, 9) - TILES(0x503C, 24) - SHOW_FRAME(4, 10) + TILES(0x503C, 24) SHOW_FRAME(4, 10) - TILES(0x4F98, 30) - SHOW_FRAME(4, 4) + TILES(0x4F98, 30) SHOW_FRAME(4, 4) - TILES(0x4FB6, 25) - SHOW_FRAME(4, 5) + TILES(0x4FB6, 25) SHOW_FRAME(4, 5) - TILES(0x4FCF, 30) - SHOW_FRAME(4, 6) + TILES(0x4FCF, 30) SHOW_FRAME(4, 6) - TILES(0x4FED, 24) - SHOW_FRAME(4, 7) + TILES(0x4FED, 24) SHOW_FRAME(4, 7) - TILES(0x4F98, 30) - SHOW_FRAME(4, 4) + TILES(0x4F98, 30) SHOW_FRAME(4, 4) - TILES(0x5005, 25) - SHOW_FRAME(4, 8) + TILES(0x5005, 25) SHOW_FRAME(4, 8) - TILES(0x501E, 30) - SHOW_FRAME(4, 9) + TILES(0x501E, 30) SHOW_FRAME(4, 9) - TILES(0x503C, 24) - SHOW_FRAME(4, 10) + TILES(0x503C, 24) SHOW_FRAME(4, 10) - TILES(0x5054, 20) - SHOW_FRAME(4, 11) + TILES(0x5054, 20) SHOW_FRAME(4, 11) - TILES(0x5068, 20) - SHOW_FRAME(4, 12) + TILES(0x5068, 20) SHOW_FRAME(4, 12) - END() + END() }; -const s32 * const anim_0123[1] = { +const s32 *const anim_0123[1] = { anim_0123__v0_l0, }; const s32 anim_0124__v0_l0[] = { // 0x080E1918 - PALETTE(2, 16, 0x80) - TILES(0x507C, 21) - HITBOX(0, -6, -14, 6, 8) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x80) TILES(0x507C, 21) HITBOX(0, -6, -14, 6, 8) SHOW_FRAME(3, 0) - TILES(0x5091, 21) - SHOW_FRAME(3, 1) + TILES(0x5091, 21) SHOW_FRAME(3, 1) - TILES(0x50A6, 21) - SHOW_FRAME(3, 2) + TILES(0x50A6, 21) SHOW_FRAME(3, 2) - TILES(0x50BB, 24) - SHOW_FRAME(3, 3) + TILES(0x50BB, 24) SHOW_FRAME(3, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0124[1] = { +const s32 *const anim_0124[1] = { anim_0124__v0_l0, }; const s32 anim_0125__v0_l0[] = { // 0x080E198C - PALETTE(2, 16, 0x80) - TILES(0x50D3, 35) - SHOW_FRAME(20, 0) + PALETTE(2, 16, 0x80) TILES(0x50D3, 35) SHOW_FRAME(20, 0) - TILES(0x50F6, 30) - SHOW_FRAME(10, 1) + TILES(0x50F6, 30) SHOW_FRAME(10, 1) - TILES(0x5114, 36) - SHOW_FRAME(8, 2) + TILES(0x5114, 36) SHOW_FRAME(8, 2) - TILES(0x5138, 35) - SHOW_FRAME(7, 3) + TILES(0x5138, 35) SHOW_FRAME(7, 3) - TILES(0x515B, 42) - SHOW_FRAME(5, 4) + TILES(0x515B, 42) SHOW_FRAME(5, 4) - TILES(0x5185, 42) - SHOW_FRAME(3, 5) - TILES(0x51AF, 56) - SHOW_FRAME(2, 6) + TILES(0x5185, 42) SHOW_FRAME(3, 5) TILES(0x51AF, 56) SHOW_FRAME(2, 6) - TILES(0x51E7, 56) - SHOW_FRAME(2, 7) + TILES(0x51E7, 56) SHOW_FRAME(2, 7) - TILES(0x521F, 56) - SHOW_FRAME(2, 8) + TILES(0x521F, 56) SHOW_FRAME(2, 8) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0125[1] = { +const s32 *const anim_0125[1] = { anim_0125__v0_l0, }; const s32 anim_0126__v0_l0[] = { // 0x080E1A58 - PALETTE(2, 16, 0x10) - TILES(0x5257, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x5257, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x5297, 64) - SHOW_FRAME(2, 1) + TILES(0x5297, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v1_l0[] = { // 0x080E1AA0 - PALETTE(2, 16, 0x10) - TILES(0x52D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(2, 16, 0x10) TILES(0x52D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x5317, 64) - SHOW_FRAME(2, 3) + TILES(0x5317, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v2_l0[] = { // 0x080E1AE8 - PALETTE(2, 16, 0x10) - TILES(0x5357, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(2, 16, 0x10) TILES(0x5357, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x5397, 64) - SHOW_FRAME(2, 5) + TILES(0x5397, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v3_l0[] = { // 0x080E1B30 - PALETTE(2, 16, 0x10) - TILES(0x53D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(2, 16, 0x10) TILES(0x53D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x5417, 64) - SHOW_FRAME(2, 7) + TILES(0x5417, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v4_l0[] = { // 0x080E1B78 - PALETTE(2, 16, 0x10) - TILES(0x5457, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(2, 16, 0x10) TILES(0x5457, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x5497, 64) - SHOW_FRAME(2, 9) + TILES(0x5497, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v5_l0[] = { // 0x080E1BC0 - PALETTE(2, 16, 0x10) - TILES(0x54D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(2, 16, 0x10) TILES(0x54D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x5517, 64) - SHOW_FRAME(2, 11) + TILES(0x5517, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v6_l0[] = { // 0x080E1C08 - PALETTE(2, 16, 0x10) - TILES(0x5557, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(2, 16, 0x10) TILES(0x5557, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0x5597, 64) - SHOW_FRAME(2, 13) + TILES(0x5597, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v7_l0[] = { // 0x080E1C50 - PALETTE(2, 16, 0x10) - TILES(0x55D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(2, 16, 0x10) TILES(0x55D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0x5617, 64) - SHOW_FRAME(2, 15) + TILES(0x5617, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0126__v8_l0[] = { // 0x080E1C98 - PALETTE(2, 16, 0x10) - TILES(0x5657, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 16) + PALETTE(2, 16, 0x10) TILES(0x5657, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 16) - TILES(0x5697, 64) - SHOW_FRAME(2, 17) + TILES(0x5697, 64) SHOW_FRAME(2, 17) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0126[9] = { - anim_0126__v0_l0, - anim_0126__v1_l0, - anim_0126__v2_l0, - anim_0126__v3_l0, - anim_0126__v4_l0, - anim_0126__v5_l0, - anim_0126__v6_l0, - anim_0126__v7_l0, - anim_0126__v8_l0, +const s32 *const anim_0126[9] = { + anim_0126__v0_l0, anim_0126__v1_l0, anim_0126__v2_l0, anim_0126__v3_l0, anim_0126__v4_l0, + anim_0126__v5_l0, anim_0126__v6_l0, anim_0126__v7_l0, anim_0126__v8_l0, }; const s32 anim_0127__v0_l0[] = { // 0x080E1D04 - PALETTE(2, 16, 0x10) - TILES(0x56D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x56D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(1, 0) - TILES(0x5717, 64) - SHOW_FRAME(1, 1) + TILES(0x5717, 64) SHOW_FRAME(1, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v1_l0[] = { // 0x080E1D4C - PALETTE(2, 16, 0x10) - TILES(0x5757, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(2, 16, 0x10) TILES(0x5757, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x5797, 64) - SHOW_FRAME(2, 3) + TILES(0x5797, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v2_l0[] = { // 0x080E1D94 - PALETTE(2, 16, 0x10) - TILES(0x57D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(2, 16, 0x10) TILES(0x57D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x5817, 64) - SHOW_FRAME(2, 5) + TILES(0x5817, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v3_l0[] = { // 0x080E1DDC - PALETTE(2, 16, 0x10) - TILES(0x5857, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(2, 16, 0x10) TILES(0x5857, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x5897, 64) - SHOW_FRAME(2, 7) + TILES(0x5897, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v4_l0[] = { // 0x080E1E24 - PALETTE(2, 16, 0x10) - TILES(0x58D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(2, 16, 0x10) TILES(0x58D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x5917, 64) - SHOW_FRAME(2, 9) + TILES(0x5917, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v5_l0[] = { // 0x080E1E6C - PALETTE(2, 16, 0x10) - TILES(0x5957, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(2, 16, 0x10) TILES(0x5957, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x5997, 64) - SHOW_FRAME(2, 11) + TILES(0x5997, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v6_l0[] = { // 0x080E1EB4 - PALETTE(2, 16, 0x10) - TILES(0x59D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(2, 16, 0x10) TILES(0x59D7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0x5A17, 64) - SHOW_FRAME(2, 13) + TILES(0x5A17, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0127__v7_l0[] = { // 0x080E1EFC - PALETTE(2, 16, 0x10) - TILES(0x5A57, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(2, 16, 0x10) TILES(0x5A57, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0x5A97, 64) - SHOW_FRAME(2, 15) + TILES(0x5A97, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0127[8] = { - anim_0127__v0_l0, - anim_0127__v1_l0, - anim_0127__v2_l0, - anim_0127__v3_l0, - anim_0127__v4_l0, - anim_0127__v5_l0, - anim_0127__v6_l0, - anim_0127__v7_l0, +const s32 *const anim_0127[8] = { + anim_0127__v0_l0, anim_0127__v1_l0, anim_0127__v2_l0, anim_0127__v3_l0, + anim_0127__v4_l0, anim_0127__v5_l0, anim_0127__v6_l0, anim_0127__v7_l0, }; const s32 anim_0128__v0_l0[] = { // 0x080E1F64 - PALETTE(2, 16, 0x10) - TILES(0x5AD7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) - TILES(0x5B17, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 1) + PALETTE(2, 16, 0x10) TILES(0x5AD7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) TILES(0x5B17, 64) HITBOX(0, -10, -10, 10, 10) + SHOW_FRAME(2, 1) - TILES(0x5B57, 64) - SHOW_FRAME(2, 2) + TILES(0x5B57, 64) SHOW_FRAME(2, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0128__v1_l0[] = { // 0x080E1FCC - PALETTE(2, 16, 0x10) - TILES(0x5AD7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x5AD7, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0128[2] = { +const s32 *const anim_0128[2] = { anim_0128__v0_l0, anim_0128__v1_l0, }; const s32 anim_0129__v0_l0[] = { // 0x080E2004 - PALETTE(2, 16, 0x10) - TILES(0x5B97, 64) - HITBOX(0, -20, -20, 20, 20) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x5B97, 64) HITBOX(0, -20, -20, 20, 20) SHOW_FRAME(2, 0) - TILES(0x5BD7, 64) - SHOW_FRAME(2, 1) + TILES(0x5BD7, 64) SHOW_FRAME(2, 1) - TILES(0x5C17, 64) - SHOW_FRAME(2, 2) + TILES(0x5C17, 64) SHOW_FRAME(2, 2) - TILES(0x5C57, 64) - SHOW_FRAME(2, 3) + TILES(0x5C57, 64) SHOW_FRAME(2, 3) - TILES(0x5C97, 64) - SHOW_FRAME(2, 4) + TILES(0x5C97, 64) SHOW_FRAME(2, 4) - TILES(0x5CD7, 64) - SHOW_FRAME(2, 5) + TILES(0x5CD7, 64) SHOW_FRAME(2, 5) - TILES(0x5D17, 64) - SHOW_FRAME(2, 6) + TILES(0x5D17, 64) SHOW_FRAME(2, 6) - TILES(0x5D57, 64) - SHOW_FRAME(2, 7) + TILES(0x5D57, 64) SHOW_FRAME(2, 7) - TILES(0x5D97, 64) - SHOW_FRAME(2, 8) + TILES(0x5D97, 64) SHOW_FRAME(2, 8) - TILES(0x5DD7, 64) - SHOW_FRAME(2, 9) + TILES(0x5DD7, 64) SHOW_FRAME(2, 9) - TILES(0x5E17, 64) - SHOW_FRAME(2, 10) + TILES(0x5E17, 64) SHOW_FRAME(2, 10) - JUMP_BACK(61) + JUMP_BACK(61) }; -const s32 * const anim_0129[1] = { +const s32 *const anim_0129[1] = { anim_0129__v0_l0, }; const s32 anim_0130__v0_l0[] = { // 0x080E2104 - PALETTE(2, 16, 0x10) - TILES(0x5E57, 64) - HITBOX(0, -14, -14, 14, 14) - SHOW_FRAME(5, 0) + PALETTE(2, 16, 0x10) TILES(0x5E57, 64) HITBOX(0, -14, -14, 14, 14) SHOW_FRAME(5, 0) - TILES(0x5E97, 64) - SHOW_FRAME(2, 1) + TILES(0x5E97, 64) SHOW_FRAME(2, 1) - TILES(0x5ED7, 64) - SHOW_FRAME(2, 2) + TILES(0x5ED7, 64) SHOW_FRAME(2, 2) - TILES(0x5F17, 64) - SHOW_FRAME(2, 3) + TILES(0x5F17, 64) SHOW_FRAME(2, 3) - TILES(0x5F57, 64) - SHOW_FRAME(2, 4) + TILES(0x5F57, 64) SHOW_FRAME(2, 4) - TILES(0x5F97, 64) - SHOW_FRAME(2, 5) + TILES(0x5F97, 64) SHOW_FRAME(2, 5) - TILES(0x5FD7, 64) - SHOW_FRAME(2, 6) + TILES(0x5FD7, 64) SHOW_FRAME(2, 6) - TILES(0x6017, 64) - SHOW_FRAME(2, 7) + TILES(0x6017, 64) SHOW_FRAME(2, 7) - TILES(0x6057, 64) - SHOW_FRAME(2, 8) + TILES(0x6057, 64) SHOW_FRAME(2, 8) - TILES(0x5E97, 64) - SHOW_FRAME(2, 1) + TILES(0x5E97, 64) SHOW_FRAME(2, 1) - TILES(0x5ED7, 64) - SHOW_FRAME(2, 2) + TILES(0x5ED7, 64) SHOW_FRAME(2, 2) - TILES(0x5F17, 64) - SHOW_FRAME(2, 3) + TILES(0x5F17, 64) SHOW_FRAME(2, 3) - TILES(0x5F57, 64) - SHOW_FRAME(2, 4) + TILES(0x5F57, 64) SHOW_FRAME(2, 4) - TILES(0x5F97, 64) - SHOW_FRAME(2, 5) + TILES(0x5F97, 64) SHOW_FRAME(2, 5) - TILES(0x5FD7, 64) - SHOW_FRAME(2, 6) + TILES(0x5FD7, 64) SHOW_FRAME(2, 6) - TILES(0x6017, 64) - SHOW_FRAME(2, 7) + TILES(0x6017, 64) SHOW_FRAME(2, 7) - TILES(0x6057, 64) - SHOW_FRAME(2, 8) + TILES(0x6057, 64) SHOW_FRAME(2, 8) - TILES(0x5E57, 64) - HITBOX(0, 0, 0, 0, 0) - SHOW_FRAME(5, 0) + TILES(0x5E57, 64) HITBOX(0, 0, 0, 0, 0) SHOW_FRAME(5, 0) - END() + END() }; -const s32 * const anim_0130[1] = { +const s32 *const anim_0130[1] = { anim_0130__v0_l0, }; const s32 anim_0131__v0_l0[] = { // 0x080E2298 - PALETTE(2, 16, 0x10) - TILES(0x6097, 64) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x6097, 64) SHOW_FRAME(3, 0) - TILES(0x60D7, 64) - SHOW_FRAME(3, 1) + TILES(0x60D7, 64) SHOW_FRAME(3, 1) - TILES(0x6117, 64) - SHOW_FRAME(3, 2) + TILES(0x6117, 64) SHOW_FRAME(3, 2) - TILES(0x6157, 64) - SHOW_FRAME(3, 3) + TILES(0x6157, 64) SHOW_FRAME(3, 3) - TILES(0x6197, 64) - SHOW_FRAME(3, 4) + TILES(0x6197, 64) SHOW_FRAME(3, 4) - TILES(0x61D7, 64) - SHOW_FRAME(3, 5) + TILES(0x61D7, 64) SHOW_FRAME(3, 5) - TILES(0x6217, 64) - SHOW_FRAME(3, 6) + TILES(0x6217, 64) SHOW_FRAME(3, 6) - TILES(0x6257, 64) - SHOW_FRAME(3, 7) + TILES(0x6257, 64) SHOW_FRAME(3, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0131[1] = { +const s32 *const anim_0131[1] = { anim_0131__v0_l0, }; const s32 anim_0132__v0_l0[] = { // 0x080E2350 - PALETTE(2, 16, 0x10) - TILES(0x6297, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(6, 0) - TILES(0x62D7, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 1) + PALETTE(2, 16, 0x10) TILES(0x6297, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(6, 0) TILES(0x62D7, 64) HITBOX(0, -10, -10, 10, 10) + SHOW_FRAME(4, 1) - TILES(0x6317, 64) - SHOW_FRAME(4, 2) + TILES(0x6317, 64) SHOW_FRAME(4, 2) - TILES(0x6357, 64) - SHOW_FRAME(4, 3) + TILES(0x6357, 64) SHOW_FRAME(4, 3) - TILES(0x6397, 64) - SHOW_FRAME(4, 4) + TILES(0x6397, 64) SHOW_FRAME(4, 4) - TILES(0x63D7, 64) - SHOW_FRAME(4, 5) + TILES(0x63D7, 64) SHOW_FRAME(4, 5) - TILES(0x6417, 64) - SHOW_FRAME(4, 6) + TILES(0x6417, 64) SHOW_FRAME(4, 6) - TILES(0x6457, 64) - SHOW_FRAME(4, 7) + TILES(0x6457, 64) SHOW_FRAME(4, 7) - TILES(0x6497, 64) - SHOW_FRAME(4, 8) + TILES(0x6497, 64) SHOW_FRAME(4, 8) - TILES(0x64D7, 64) - SHOW_FRAME(4, 9) + TILES(0x64D7, 64) SHOW_FRAME(4, 9) - TILES(0x6317, 64) - SHOW_FRAME(4, 2) + TILES(0x6317, 64) SHOW_FRAME(4, 2) - JUMP_BACK(53) + JUMP_BACK(53) }; const s32 anim_0132__v1_l0[] = { // 0x080E2458 - PALETTE(2, 16, 0x10) - TILES(0x6297, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(6, 0) + PALETTE(2, 16, 0x10) TILES(0x6297, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0132[2] = { +const s32 *const anim_0132[2] = { anim_0132__v0_l0, anim_0132__v1_l0, }; const s32 anim_0133__v0_l0[] = { // 0x080E2490 - PALETTE(2, 16, 0x10) - TILES(0x6517, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x6517, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x6557, 64) - SHOW_FRAME(2, 1) + TILES(0x6557, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0133__v1_l0[] = { // 0x080E24D8 - PALETTE(2, 16, 0x10) - TILES(0x6597, 64) - SHOW_FRAME(2, 2) + PALETTE(2, 16, 0x10) TILES(0x6597, 64) SHOW_FRAME(2, 2) - TILES(0x65D7, 64) - SHOW_FRAME(2, 3) + TILES(0x65D7, 64) SHOW_FRAME(2, 3) - TILES(0x6617, 64) - SHOW_FRAME(2, 4) + TILES(0x6617, 64) SHOW_FRAME(2, 4) - TILES(0x6657, 64) - SHOW_FRAME(2, 5) + TILES(0x6657, 64) SHOW_FRAME(2, 5) - TILES(0x6697, 64) - SHOW_FRAME(2, 6) + TILES(0x6697, 64) SHOW_FRAME(2, 6) - TILES(0x66D7, 64) - SHOW_FRAME(2, 7) + TILES(0x66D7, 64) SHOW_FRAME(2, 7) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0133[2] = { +const s32 *const anim_0133[2] = { anim_0133__v0_l0, anim_0133__v1_l0, }; const s32 anim_0134__v0_l0[] = { // 0x080E256C - PALETTE(2, 16, 0x10) - TILES(0x6717, 16) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x6717, 16) SHOW_FRAME(3, 0) - TILES(0x6727, 20) - SHOW_FRAME(3, 1) + TILES(0x6727, 20) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0134__v1_l0[] = { // 0x080E25A8 - PALETTE(2, 16, 0x10) - TILES(0x673B, 20) - SHOW_FRAME(2, 2) + PALETTE(2, 16, 0x10) TILES(0x673B, 20) SHOW_FRAME(2, 2) - TILES(0x674F, 24) - SHOW_FRAME(2, 3) + TILES(0x674F, 24) SHOW_FRAME(2, 3) - TILES(0x6767, 18) - SHOW_FRAME(3, 4) + TILES(0x6767, 18) SHOW_FRAME(3, 4) - TILES(0x6779, 20) - SHOW_FRAME(3, 5) + TILES(0x6779, 20) SHOW_FRAME(3, 5) - TILES(0x678D, 24) - SHOW_FRAME(3, 6) - TILES(0x67A5, 28) - SHOW_FRAME(6, 7) + TILES(0x678D, 24) SHOW_FRAME(3, 6) TILES(0x67A5, 28) SHOW_FRAME(6, 7) - TILES(0x67C1, 24) - SHOW_FRAME(6, 8) + TILES(0x67C1, 24) SHOW_FRAME(6, 8) - TILES(0x67D9, 28) - SHOW_FRAME(6, 9) + TILES(0x67D9, 28) SHOW_FRAME(6, 9) - TILES(0x67F5, 28) - SHOW_FRAME(6, 10) + TILES(0x67F5, 28) SHOW_FRAME(6, 10) - TILES(0x6811, 28) - SHOW_FRAME(6, 11) + TILES(0x6811, 28) SHOW_FRAME(6, 11) - TILES(0x682D, 24) - SHOW_FRAME(6, 12) + TILES(0x682D, 24) SHOW_FRAME(6, 12) - TILES(0x6845, 28) - SHOW_FRAME(6, 13) + TILES(0x6845, 28) SHOW_FRAME(6, 13) - TILES(0x6861, 28) - SHOW_FRAME(6, 14) + TILES(0x6861, 28) SHOW_FRAME(6, 14) - TILES(0x687D, 28) - SHOW_FRAME(6, 15) + TILES(0x687D, 28) SHOW_FRAME(6, 15) - TILES(0x6899, 24) - SHOW_FRAME(6, 16) + TILES(0x6899, 24) SHOW_FRAME(6, 16) - TILES(0x68B1, 28) - SHOW_FRAME(6, 17) + TILES(0x68B1, 28) SHOW_FRAME(6, 17) - TILES(0x67F5, 28) - SHOW_FRAME(6, 10) + TILES(0x67F5, 28) SHOW_FRAME(6, 10) - TILES(0x6811, 28) - SHOW_FRAME(6, 11) + TILES(0x6811, 28) SHOW_FRAME(6, 11) - TILES(0x682D, 24) - SHOW_FRAME(6, 12) + TILES(0x682D, 24) SHOW_FRAME(6, 12) - TILES(0x6845, 28) - SHOW_FRAME(6, 13) + TILES(0x6845, 28) SHOW_FRAME(6, 13) - TILES(0x6861, 28) - SHOW_FRAME(6, 14) + TILES(0x6861, 28) SHOW_FRAME(6, 14) - JUMP_BACK(80) + JUMP_BACK(80) }; -const s32 * const anim_0134[2] = { +const s32 *const anim_0134[2] = { anim_0134__v0_l0, anim_0134__v1_l0, }; const s32 anim_0135__v0_l0[] = { // 0x080E2768 - PALETTE(2, 16, 0x10) - TILES(0x68CD, 30) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x68CD, 30) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(3, 0) - TILES(0x68EB, 30) - SHOW_FRAME(3, 1) + TILES(0x68EB, 30) SHOW_FRAME(3, 1) - TILES(0x6909, 30) - SHOW_FRAME(3, 2) + TILES(0x6909, 30) SHOW_FRAME(3, 2) - TILES(0x6927, 35) - SHOW_FRAME(3, 3) + TILES(0x6927, 35) SHOW_FRAME(3, 3) - TILES(0x694A, 30) - SHOW_FRAME(3, 4) + TILES(0x694A, 30) SHOW_FRAME(3, 4) - TILES(0x6968, 30) - SHOW_FRAME(3, 5) + TILES(0x6968, 30) SHOW_FRAME(3, 5) - TILES(0x6986, 30) - SHOW_FRAME(3, 6) + TILES(0x6986, 30) SHOW_FRAME(3, 6) - TILES(0x69A4, 35) - SHOW_FRAME(3, 7) + TILES(0x69A4, 35) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0135__v1_l0[] = { // 0x080E2828 - PALETTE(2, 16, 0x10) - TILES(0x69C7, 30) - HITBOX(0, -4, -8, 8, 20) - SHOW_FRAME(3, 8) + PALETTE(2, 16, 0x10) TILES(0x69C7, 30) HITBOX(0, -4, -8, 8, 20) SHOW_FRAME(3, 8) - TILES(0x69E5, 30) - SHOW_FRAME(3, 9) + TILES(0x69E5, 30) SHOW_FRAME(3, 9) - TILES(0x6A03, 28) - SHOW_FRAME(3, 10) + TILES(0x6A03, 28) SHOW_FRAME(3, 10) - TILES(0x6A1F, 30) - SHOW_FRAME(3, 11) + TILES(0x6A1F, 30) SHOW_FRAME(3, 11) - TILES(0x6A3D, 30) - SHOW_FRAME(3, 12) + TILES(0x6A3D, 30) SHOW_FRAME(3, 12) - TILES(0x6A5B, 30) - SHOW_FRAME(3, 13) + TILES(0x6A5B, 30) SHOW_FRAME(3, 13) - TILES(0x6A79, 35) - SHOW_FRAME(3, 14) + TILES(0x6A79, 35) SHOW_FRAME(3, 14) - TILES(0x6A9C, 30) - SHOW_FRAME(3, 15) + TILES(0x6A9C, 30) SHOW_FRAME(3, 15) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0135__v2_l0[] = { // 0x080E28E8 - PALETTE(2, 16, 0x10) - TILES(0x6ABA, 30) - HITBOX(0, -4, -10, 8, 18) - SHOW_FRAME(3, 16) + PALETTE(2, 16, 0x10) TILES(0x6ABA, 30) HITBOX(0, -4, -10, 8, 18) SHOW_FRAME(3, 16) - TILES(0x6AD8, 30) - SHOW_FRAME(3, 17) + TILES(0x6AD8, 30) SHOW_FRAME(3, 17) - TILES(0x6AF6, 35) - SHOW_FRAME(3, 18) + TILES(0x6AF6, 35) SHOW_FRAME(3, 18) - TILES(0x6B19, 30) - SHOW_FRAME(3, 19) + TILES(0x6B19, 30) SHOW_FRAME(3, 19) - TILES(0x6B37, 30) - SHOW_FRAME(3, 20) + TILES(0x6B37, 30) SHOW_FRAME(3, 20) - TILES(0x6B55, 35) - SHOW_FRAME(3, 21) + TILES(0x6B55, 35) SHOW_FRAME(3, 21) - TILES(0x6B78, 32) - SHOW_FRAME(3, 22) + TILES(0x6B78, 32) SHOW_FRAME(3, 22) - TILES(0x6B98, 30) - SHOW_FRAME(3, 23) + TILES(0x6B98, 30) SHOW_FRAME(3, 23) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0135[3] = { +const s32 *const anim_0135[3] = { anim_0135__v0_l0, anim_0135__v1_l0, anim_0135__v2_l0, }; const s32 anim_0136__v0_l0[] = { // 0x080E29B4 - PALETTE(2, 16, 0x10) - TILES(0x6BB6, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x6BB6, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(2, 0) - TILES(0x6BCA, 24) - SHOW_FRAME(2, 1) + TILES(0x6BCA, 24) SHOW_FRAME(2, 1) - TILES(0x6BE2, 28) - SHOW_FRAME(4, 2) + TILES(0x6BE2, 28) SHOW_FRAME(4, 2) - TILES(0x6BFE, 24) - SHOW_FRAME(1, 3) + TILES(0x6BFE, 24) SHOW_FRAME(1, 3) - TILES(0x6C16, 28) - SHOW_FRAME(1, 4) - TILES(0x6C32, 24) - HITBOX(0, -14, -10, -2, 16) - SHOW_FRAME(2, 5) + TILES(0x6C16, 28) SHOW_FRAME(1, 4) TILES(0x6C32, 24) HITBOX(0, -14, -10, -2, 16) SHOW_FRAME(2, 5) - TILES(0x6C4A, 24) - SHOW_FRAME(2, 6) + TILES(0x6C4A, 24) SHOW_FRAME(2, 6) - TILES(0x6C62, 24) - SHOW_FRAME(2, 7) + TILES(0x6C62, 24) SHOW_FRAME(2, 7) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0136[1] = { +const s32 *const anim_0136[1] = { anim_0136__v0_l0, }; const s32 anim_0137__v0_l0[] = { // 0x080E2A84 - PALETTE(2, 16, 0x10) - TILES(0x6C7A, 28) - HITBOX(0, -6, -14, 6, 8) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x6C7A, 28) HITBOX(0, -6, -14, 6, 8) SHOW_FRAME(3, 0) - TILES(0x6C96, 28) - SHOW_FRAME(3, 1) + TILES(0x6C96, 28) SHOW_FRAME(3, 1) - TILES(0x6CB2, 28) - SHOW_FRAME(3, 2) + TILES(0x6CB2, 28) SHOW_FRAME(3, 2) - TILES(0x6CCE, 32) - HITBOX(0, -6, -14, 6, 8) - SHOW_FRAME(2, 3) + TILES(0x6CCE, 32) HITBOX(0, -6, -14, 6, 8) SHOW_FRAME(2, 3) - TILES(0x6CEE, 32) - HITBOX(0, -6, -14, 6, 8) - SHOW_FRAME(2, 4) + TILES(0x6CEE, 32) HITBOX(0, -6, -14, 6, 8) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0137[1] = { +const s32 *const anim_0137[1] = { anim_0137__v0_l0, }; const s32 anim_0138__v0_l0[] = { // 0x080E2B20 - PALETTE(2, 16, 0x10) - TILES(0x6D0E, 64) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x6D0E, 64) SHOW_FRAME(2, 0) - TILES(0x6D4E, 64) - SHOW_FRAME(2, 1) + TILES(0x6D4E, 64) SHOW_FRAME(2, 1) - TILES(0x6D8E, 64) - SHOW_FRAME(2, 2) + TILES(0x6D8E, 64) SHOW_FRAME(2, 2) - TILES(0x6DCE, 64) - SHOW_FRAME(2, 3) + TILES(0x6DCE, 64) SHOW_FRAME(2, 3) - TILES(0x6D0E, 64) - SHOW_FRAME(2, 0) + TILES(0x6D0E, 64) SHOW_FRAME(2, 0) - TILES(0x6D4E, 64) - SHOW_FRAME(2, 1) + TILES(0x6D4E, 64) SHOW_FRAME(2, 1) - TILES(0x6D8E, 64) - SHOW_FRAME(2, 2) + TILES(0x6D8E, 64) SHOW_FRAME(2, 2) - TILES(0x6DCE, 64) - SHOW_FRAME(2, 3) + TILES(0x6DCE, 64) SHOW_FRAME(2, 3) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0138__v1_l0[] = { // 0x080E2BD4 - PALETTE(2, 16, 0x10) - TILES(0x6E0E, 64) - SHOW_FRAME(2, 4) + PALETTE(2, 16, 0x10) TILES(0x6E0E, 64) SHOW_FRAME(2, 4) - TILES(0x6E4E, 64) - SHOW_FRAME(2, 5) + TILES(0x6E4E, 64) SHOW_FRAME(2, 5) - TILES(0x6E8E, 64) - SHOW_FRAME(2, 6) + TILES(0x6E8E, 64) SHOW_FRAME(2, 6) - TILES(0x6ECE, 64) - SHOW_FRAME(2, 7) + TILES(0x6ECE, 64) SHOW_FRAME(2, 7) - TILES(0x6F0E, 64) - SHOW_FRAME(2, 8) + TILES(0x6F0E, 64) SHOW_FRAME(2, 8) - TILES(0x6F4E, 64) - SHOW_FRAME(2, 9) + TILES(0x6F4E, 64) SHOW_FRAME(2, 9) - TILES(0x6F8E, 64) - SHOW_FRAME(2, 10) + TILES(0x6F8E, 64) SHOW_FRAME(2, 10) - TILES(0x6FCE, 64) - SHOW_FRAME(2, 11) + TILES(0x6FCE, 64) SHOW_FRAME(2, 11) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0138[2] = { +const s32 *const anim_0138[2] = { anim_0138__v0_l0, anim_0138__v1_l0, }; const s32 anim_0139__v0_l0[] = { // 0x080E2C90 - PALETTE(2, 16, 0x10) - TILES(0x700E, 24) - HITBOX(0, -32, -20, -4, -6) - CMD_12(0x10) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x700E, 24) HITBOX(0, -32, -20, -4, -6) CMD_12(0x10) SHOW_FRAME(3, 0) - TILES(0x7026, 20) - HITBOX(0, -20, -20, -2, -6) - CMD_12(0x10) - SHOW_FRAME(3, 1) + TILES(0x7026, 20) HITBOX(0, -20, -20, -2, -6) CMD_12(0x10) SHOW_FRAME(3, 1) - TILES(0x703A, 20) - HITBOX(0, -12, -20, 0, -6) - CMD_12(0x10) - SHOW_FRAME(3, 2) + TILES(0x703A, 20) HITBOX(0, -12, -20, 0, -6) CMD_12(0x10) SHOW_FRAME(3, 2) - TILES(0x704E, 24) - HITBOX(0, 2, -20, 14, -6) - CMD_12(0x10) - SHOW_FRAME(3, 3) + TILES(0x704E, 24) HITBOX(0, 2, -20, 14, -6) CMD_12(0x10) SHOW_FRAME(3, 3) - TILES(0x7066, 24) - HITBOX(0, 3, -20, 21, -6) - CMD_12(0x10) - SHOW_FRAME(3, 4) + TILES(0x7066, 24) HITBOX(0, 3, -20, 21, -6) CMD_12(0x10) SHOW_FRAME(3, 4) - TILES(0x707E, 24) - HITBOX(0, 4, -20, 32, -6) - CMD_12(0x10) - SHOW_FRAME(3, 5) + TILES(0x707E, 24) HITBOX(0, 4, -20, 32, -6) CMD_12(0x10) SHOW_FRAME(3, 5) - TILES(0x7096, 20) - HITBOX(0, 4, -20, 22, -6) - CMD_12(0x13) - SHOW_FRAME(3, 6) + TILES(0x7096, 20) HITBOX(0, 4, -20, 22, -6) CMD_12(0x13) SHOW_FRAME(3, 6) - TILES(0x70AA, 24) - HITBOX(0, 1, -20, 13, -6) - CMD_12(0x13) - SHOW_FRAME(3, 7) + TILES(0x70AA, 24) HITBOX(0, 1, -20, 13, -6) CMD_12(0x13) SHOW_FRAME(3, 7) - TILES(0x70C2, 24) - HITBOX(0, -15, -20, -3, -6) - CMD_12(0x13) - SHOW_FRAME(3, 8) + TILES(0x70C2, 24) HITBOX(0, -15, -20, -3, -6) CMD_12(0x13) SHOW_FRAME(3, 8) - TILES(0x70DA, 24) - HITBOX(0, -21, -20, -3, -6) - CMD_12(0x13) - SHOW_FRAME(3, 9) + TILES(0x70DA, 24) HITBOX(0, -21, -20, -3, -6) CMD_12(0x13) SHOW_FRAME(3, 9) - JUMP_BACK(103) + JUMP_BACK(103) }; const s32 anim_0139__v1_l0[] = { // 0x080E2E34 - PALETTE(2, 16, 0x10) - TILES(0x70F2, 24) - HITBOX(0, -7, 4, 5, 30) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 10) + PALETTE(2, 16, 0x10) TILES(0x70F2, 24) HITBOX(0, -7, 4, 5, 30) SET_PRIORITY(0x2) SHOW_FRAME(3, 10) - TILES(0x710A, 20) - HITBOX(0, -7, 0, 5, 24) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 11) + TILES(0x710A, 20) HITBOX(0, -7, 0, 5, 24) SET_PRIORITY(0x2) SHOW_FRAME(3, 11) - TILES(0x711E, 20) - HITBOX(0, -7, -5, 7, 11) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 12) + TILES(0x711E, 20) HITBOX(0, -7, -5, 7, 11) SET_PRIORITY(0x2) SHOW_FRAME(3, 12) - TILES(0x7132, 24) - HITBOX(0, -6, -9, 6, 5) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 13) + TILES(0x7132, 24) HITBOX(0, -6, -9, 6, 5) SET_PRIORITY(0x2) SHOW_FRAME(3, 13) - TILES(0x714A, 24) - HITBOX(0, -6, -15, 6, 1) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 14) + TILES(0x714A, 24) HITBOX(0, -6, -15, 6, 1) SET_PRIORITY(0x2) SHOW_FRAME(3, 14) - TILES(0x7162, 24) - HITBOX(0, -6, -29, 6, -3) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 15) + TILES(0x7162, 24) HITBOX(0, -6, -29, 6, -3) SET_PRIORITY(0x2) SHOW_FRAME(3, 15) - TILES(0x717A, 20) - HITBOX(0, -6, -26, 6, -2) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 16) + TILES(0x717A, 20) HITBOX(0, -6, -26, 6, -2) SET_PRIORITY(0x3) SHOW_FRAME(3, 16) - TILES(0x718E, 24) - HITBOX(0, -6, -16, 6, 0) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 17) + TILES(0x718E, 24) HITBOX(0, -6, -16, 6, 0) SET_PRIORITY(0x3) SHOW_FRAME(3, 17) - TILES(0x71A6, 24) - HITBOX(0, -6, -6, 6, 8) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 18) + TILES(0x71A6, 24) HITBOX(0, -6, -6, 6, 8) SET_PRIORITY(0x3) SHOW_FRAME(3, 18) - TILES(0x71BE, 24) - HITBOX(0, -6, 2, 6, 18) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 19) + TILES(0x71BE, 24) HITBOX(0, -6, 2, 6, 18) SET_PRIORITY(0x3) SHOW_FRAME(3, 19) - JUMP_BACK(103) + JUMP_BACK(103) }; -const s32 * const anim_0139[2] = { +const s32 *const anim_0139[2] = { anim_0139__v0_l0, anim_0139__v1_l0, }; const s32 anim_0140__v0_l0[] = { // 0x080E2FE0 - PALETTE(2, 16, 0x10) - TILES(0x71D6, 28) - HITBOX(0, -6, -18, 6, 4) - SHOW_FRAME(10, 0) + PALETTE(2, 16, 0x10) TILES(0x71D6, 28) HITBOX(0, -6, -18, 6, 4) SHOW_FRAME(10, 0) - TILES(0x71F2, 28) - SHOW_FRAME(10, 1) + TILES(0x71F2, 28) SHOW_FRAME(10, 1) - TILES(0x720E, 28) - SHOW_FRAME(10, 2) + TILES(0x720E, 28) SHOW_FRAME(10, 2) - TILES(0x71F2, 28) - SHOW_FRAME(10, 1) + TILES(0x71F2, 28) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0140__v1_l0[] = { // 0x080E3050 - PALETTE(2, 16, 0x10) - TILES(0x722A, 28) - HITBOX(0, -6, -18, 6, 4) - SHOW_FRAME(5, 3) + PALETTE(2, 16, 0x10) TILES(0x722A, 28) HITBOX(0, -6, -18, 6, 4) SHOW_FRAME(5, 3) - TILES(0x7246, 28) - SHOW_FRAME(5, 4) + TILES(0x7246, 28) SHOW_FRAME(5, 4) - TILES(0x7262, 28) - SHOW_FRAME(5, 5) + TILES(0x7262, 28) SHOW_FRAME(5, 5) - TILES(0x7246, 28) - SHOW_FRAME(5, 4) + TILES(0x7246, 28) SHOW_FRAME(5, 4) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0140[2] = { +const s32 *const anim_0140[2] = { anim_0140__v0_l0, anim_0140__v1_l0, }; const s32 anim_0141__v0_l0[] = { // 0x080E30C8 - PALETTE(2, 16, 0x10) - TILES(0x727E, 24) - HITBOX(0, -10, -6, 10, 10) - SHOW_FRAME(5, 0) + PALETTE(2, 16, 0x10) TILES(0x727E, 24) HITBOX(0, -10, -6, 10, 10) SHOW_FRAME(5, 0) - TILES(0x7296, 24) - SHOW_FRAME(5, 1) + TILES(0x7296, 24) SHOW_FRAME(5, 1) - TILES(0x72AE, 20) - SHOW_FRAME(5, 2) + TILES(0x72AE, 20) SHOW_FRAME(5, 2) - TILES(0x72C2, 24) - SHOW_FRAME(5, 3) + TILES(0x72C2, 24) SHOW_FRAME(5, 3) - TILES(0x72DA, 24) - SHOW_FRAME(5, 4) + TILES(0x72DA, 24) SHOW_FRAME(5, 4) - TILES(0x72F2, 24) - SHOW_FRAME(5, 5) + TILES(0x72F2, 24) SHOW_FRAME(5, 5) - TILES(0x730A, 30) - SHOW_FRAME(5, 6) + TILES(0x730A, 30) SHOW_FRAME(5, 6) - TILES(0x7328, 24) - SHOW_FRAME(5, 7) + TILES(0x7328, 24) SHOW_FRAME(5, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0141[1] = { +const s32 *const anim_0141[1] = { anim_0141__v0_l0, }; const s32 anim_0142__v0_l0[] = { // 0x080E318C - PALETTE(2, 16, 0x10) - TILES(0x7340, 28) - SHOW_FRAME(8, 0) + PALETTE(2, 16, 0x10) TILES(0x7340, 28) SHOW_FRAME(8, 0) - TILES(0x735C, 28) - SHOW_FRAME(8, 1) + TILES(0x735C, 28) SHOW_FRAME(8, 1) - TILES(0x7378, 28) - SHOW_FRAME(8, 2) + TILES(0x7378, 28) SHOW_FRAME(8, 2) - TILES(0x735C, 28) - SHOW_FRAME(8, 1) + TILES(0x735C, 28) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0142[1] = { +const s32 *const anim_0142[1] = { anim_0142__v0_l0, }; const s32 anim_0145__v0_l0[] = { // 0x080E31F4 - PALETTE(2, 16, 0x10) - TILES(0x7394, 24) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(3, 0) - TILES(0x73AC, 30) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(3, 1) + PALETTE(2, 16, 0x10) TILES(0x7394, 24) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(3, 0) TILES(0x73AC, 30) HITBOX(0, -6, -10, 6, 10) + SHOW_FRAME(3, 1) - TILES(0x73CA, 30) - SHOW_FRAME(3, 2) + TILES(0x73CA, 30) SHOW_FRAME(3, 2) - TILES(0x73E8, 30) - SHOW_FRAME(3, 3) + TILES(0x73E8, 30) SHOW_FRAME(3, 3) - TILES(0x7406, 30) - SHOW_FRAME(3, 4) + TILES(0x7406, 30) SHOW_FRAME(3, 4) - TILES(0x7424, 24) - SHOW_FRAME(3, 5) + TILES(0x7424, 24) SHOW_FRAME(3, 5) - TILES(0x743C, 30) - SHOW_FRAME(3, 6) + TILES(0x743C, 30) SHOW_FRAME(3, 6) - TILES(0x745A, 30) - SHOW_FRAME(3, 7) + TILES(0x745A, 30) SHOW_FRAME(3, 7) - TILES(0x7478, 30) - SHOW_FRAME(3, 8) + TILES(0x7478, 30) SHOW_FRAME(3, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0145[1] = { +const s32 *const anim_0145[1] = { anim_0145__v0_l0, }; const s32 anim_0146__v0_l0[] = { // 0x080E32D8 - PALETTE(2, 16, 0x10) - TILES(0x7496, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x7496, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 0) - TILES(0x74AA, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 1) + TILES(0x74AA, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0146[1] = { +const s32 *const anim_0146[1] = { anim_0146__v0_l0, }; const s32 anim_0147__v0_l0[] = { // 0x080E332C - PALETTE(2, 16, 0x10) - TILES(0x74BE, 35) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(6, 0) - TILES(0x74E1, 35) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(6, 1) + PALETTE(2, 16, 0x10) TILES(0x74BE, 35) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(6, 0) TILES(0x74E1, 35) HITBOX(0, -6, -10, 6, 10) + SHOW_FRAME(6, 1) - TILES(0x7504, 42) - SHOW_FRAME(6, 2) + TILES(0x7504, 42) SHOW_FRAME(6, 2) - TILES(0x752E, 42) - SHOW_FRAME(6, 3) + TILES(0x752E, 42) SHOW_FRAME(6, 3) - TILES(0x7558, 42) - SHOW_FRAME(6, 4) + TILES(0x7558, 42) SHOW_FRAME(6, 4) - TILES(0x7582, 30) - SHOW_FRAME(6, 5) + TILES(0x7582, 30) SHOW_FRAME(6, 5) - TILES(0x75A0, 42) - SHOW_FRAME(6, 6) + TILES(0x75A0, 42) SHOW_FRAME(6, 6) - TILES(0x75CA, 42) - SHOW_FRAME(6, 7) + TILES(0x75CA, 42) SHOW_FRAME(6, 7) - TILES(0x75F4, 35) - SHOW_FRAME(6, 8) + TILES(0x75F4, 35) SHOW_FRAME(6, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0147[1] = { +const s32 *const anim_0147[1] = { anim_0147__v0_l0, }; const s32 anim_0149__v0_l0[] = { // 0x080E3410 - PALETTE(2, 16, 0x10) - TILES(0x7617, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x7617, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(3, 0) - TILES(0x762B, 20) - HITBOX(0, -10, -10, 2, 16) - SHOW_FRAME(3, 1) + TILES(0x762B, 20) HITBOX(0, -10, -10, 2, 16) SHOW_FRAME(3, 1) - TILES(0x763F, 24) - HITBOX(0, -12, -10, 0, 16) - PLAY_SOUND(121) - SHOW_FRAME(3, 2) + TILES(0x763F, 24) HITBOX(0, -12, -10, 0, 16) PLAY_SOUND(121) SHOW_FRAME(3, 2) - TILES(0x7657, 24) - HITBOX(0, -6, -10, 6, 16) - HITBOX(1, -20, -10, -6, 16) - SHOW_FRAME(3, 3) + TILES(0x7657, 24) HITBOX(0, -6, -10, 6, 16) HITBOX(1, -20, -10, -6, 16) SHOW_FRAME(3, 3) - TILES(0x766F, 28) - HITBOX(0, -14, -10, -2, 16) - HITBOX(1, -48, -10, -12, 16) - SHOW_FRAME(3, 4) + TILES(0x766F, 28) HITBOX(0, -14, -10, -2, 16) HITBOX(1, -48, -10, -12, 16) SHOW_FRAME(3, 4) - TILES(0x768B, 28) - HITBOX(0, -14, -10, -2, 16) - HITBOX(1, -40, -10, -14, 16) - SHOW_FRAME(3, 5) + TILES(0x768B, 28) HITBOX(0, -14, -10, -2, 16) HITBOX(1, -40, -10, -14, 16) SHOW_FRAME(3, 5) - TILES(0x76A7, 24) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 6) + TILES(0x76A7, 24) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 6) - TILES(0x76BF, 16) - HITBOX(0, -8, -10, 4, 16) - SHOW_FRAME(4, 7) + TILES(0x76BF, 16) HITBOX(0, -8, -10, 4, 16) SHOW_FRAME(4, 7) - TILES(0x76CF, 20) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 8) + TILES(0x76CF, 20) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 8) - END() + END() }; -const s32 * const anim_0149[1] = { +const s32 *const anim_0149[1] = { anim_0149__v0_l0, }; const s32 anim_0155__v0_l0[] = { // 0x080E3570 - PALETTE(2, 16, 0x10) - TILES(0x76E3, 20) - HITBOX(0, -6, -10, 6, 10) - HITBOX(1, -21, -19, 22, -11) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x76E3, 20) HITBOX(0, -6, -10, 6, 10) HITBOX(1, -21, -19, 22, -11) SHOW_FRAME(2, 0) - TILES(0x76F7, 20) - SHOW_FRAME(2, 1) + TILES(0x76F7, 20) SHOW_FRAME(2, 1) - TILES(0x770B, 30) - SHOW_FRAME(2, 2) + TILES(0x770B, 30) SHOW_FRAME(2, 2) - TILES(0x7729, 25) - SHOW_FRAME(2, 3) + TILES(0x7729, 25) SHOW_FRAME(2, 3) - TILES(0x7742, 20) - SHOW_FRAME(2, 4) + TILES(0x7742, 20) SHOW_FRAME(2, 4) - TILES(0x7756, 20) - SHOW_FRAME(2, 5) + TILES(0x7756, 20) SHOW_FRAME(2, 5) - TILES(0x776A, 30) - SHOW_FRAME(2, 6) + TILES(0x776A, 30) SHOW_FRAME(2, 6) - TILES(0x7788, 25) - SHOW_FRAME(2, 7) + TILES(0x7788, 25) SHOW_FRAME(2, 7) - TILES(0x76E3, 20) - SHOW_FRAME(2, 0) + TILES(0x76E3, 20) SHOW_FRAME(2, 0) - TILES(0x76F7, 20) - SHOW_FRAME(2, 1) + TILES(0x76F7, 20) SHOW_FRAME(2, 1) - TILES(0x770B, 30) - SHOW_FRAME(2, 2) + TILES(0x770B, 30) SHOW_FRAME(2, 2) - TILES(0x7729, 25) - SHOW_FRAME(2, 3) + TILES(0x7729, 25) SHOW_FRAME(2, 3) - TILES(0x77A1, 20) - SHOW_FRAME(2, 8) + TILES(0x77A1, 20) SHOW_FRAME(2, 8) - TILES(0x77B5, 20) - SHOW_FRAME(2, 9) + TILES(0x77B5, 20) SHOW_FRAME(2, 9) - TILES(0x77C9, 30) - SHOW_FRAME(2, 10) + TILES(0x77C9, 30) SHOW_FRAME(2, 10) - TILES(0x7788, 25) - SHOW_FRAME(2, 7) + TILES(0x7788, 25) SHOW_FRAME(2, 7) - JUMP_BACK(89) + JUMP_BACK(89) }; -const s32 * const anim_0155[1] = { +const s32 *const anim_0155[1] = { anim_0155__v0_l0, }; const s32 anim_0156__v0_l0[] = { // 0x080E36E0 - PALETTE(2, 16, 0x10) - TILES(0x77E7, 25) - HITBOX(0, -6, -10, 6, 10) - HITBOX(1, -17, -19, 17, -11) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x77E7, 25) HITBOX(0, -6, -10, 6, 10) HITBOX(1, -17, -19, 17, -11) SHOW_FRAME(1, 0) - TILES(0x7800, 25) - HITBOX(0, -6, -10, 6, 10) - HITBOX(1, -17, -19, 17, -11) - SHOW_FRAME(1, 1) + TILES(0x7800, 25) HITBOX(0, -6, -10, 6, 10) HITBOX(1, -17, -19, 17, -11) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0156[1] = { +const s32 *const anim_0156[1] = { anim_0156__v0_l0, }; const s32 anim_0157__v0_l0[] = { // 0x080E374C - PALETTE(2, 16, 0x10) - TILES(0x7819, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(6, 0) + PALETTE(2, 16, 0x10) TILES(0x7819, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(6, 0) - TILES(0x782D, 30) - SHOW_FRAME(3, 1) - TILES(0x784B, 30) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(6, 2) + TILES(0x782D, 30) SHOW_FRAME(3, 1) TILES(0x784B, 30) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(6, 2) - TILES(0x7869, 30) - SHOW_FRAME(6, 3) + TILES(0x7869, 30) SHOW_FRAME(6, 3) - TILES(0x7887, 30) - SHOW_FRAME(6, 4) + TILES(0x7887, 30) SHOW_FRAME(6, 4) - TILES(0x78A5, 30) - SHOW_FRAME(6, 5) + TILES(0x78A5, 30) SHOW_FRAME(6, 5) - TILES(0x78C3, 30) - SHOW_FRAME(6, 6) + TILES(0x78C3, 30) SHOW_FRAME(6, 6) - TILES(0x78E1, 30) - SHOW_FRAME(6, 7) + TILES(0x78E1, 30) SHOW_FRAME(6, 7) - TILES(0x78FF, 30) - SHOW_FRAME(6, 8) + TILES(0x78FF, 30) SHOW_FRAME(6, 8) - TILES(0x791D, 30) - SHOW_FRAME(6, 9) + TILES(0x791D, 30) SHOW_FRAME(6, 9) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0157[1] = { +const s32 *const anim_0157[1] = { anim_0157__v0_l0, }; const s32 anim_0158__v0_l0[] = { // 0x080E3844 - PALETTE(2, 16, 0x10) - TILES(0x793B, 30) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x793B, 30) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(3, 0) - TILES(0x7959, 20) - HITBOX(0, -10, -10, 2, 10) - SHOW_FRAME(3, 1) - TILES(0x796D, 16) - SHOW_FRAME(3, 2) + TILES(0x7959, 20) HITBOX(0, -10, -10, 2, 10) SHOW_FRAME(3, 1) TILES(0x796D, 16) SHOW_FRAME(3, 2) - TILES(0x797D, 20) - SHOW_FRAME(3, 3) + TILES(0x797D, 20) SHOW_FRAME(3, 3) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0158__v1_l0[] = { // 0x080E38C0 - PALETTE(2, 16, 0x10) - TILES(0x7991, 20) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(2, 4) + PALETTE(2, 16, 0x10) TILES(0x7991, 20) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(2, 4) - TILES(0x79A5, 24) - SHOW_FRAME(2, 5) + TILES(0x79A5, 24) SHOW_FRAME(2, 5) - TILES(0x79BD, 18) - SHOW_FRAME(3, 6) + TILES(0x79BD, 18) SHOW_FRAME(3, 6) - TILES(0x79A5, 24) - SHOW_FRAME(2, 5) + TILES(0x79A5, 24) SHOW_FRAME(2, 5) - END() + END() }; -const s32 * const anim_0158[2] = { +const s32 *const anim_0158[2] = { anim_0158__v0_l0, anim_0158__v1_l0, }; const s32 anim_0180__v0_l0[] = { // 0x080E3934 - PALETTE(2, 16, 0x10) - TILES(0x79CF, 36) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x79CF, 36) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 0) - TILES(0x79F3, 36) - SHOW_FRAME(4, 1) + TILES(0x79F3, 36) SHOW_FRAME(4, 1) - TILES(0x7A17, 36) - SHOW_FRAME(4, 2) + TILES(0x7A17, 36) SHOW_FRAME(4, 2) - TILES(0x79F3, 36) - SHOW_FRAME(4, 1) + TILES(0x79F3, 36) SHOW_FRAME(4, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0180[1] = { +const s32 *const anim_0180[1] = { anim_0180__v0_l0, }; const s32 anim_0181__v0_l0[] = { // 0x080E39A8 - PALETTE(2, 16, 0x10) - TILES(0x7A3B, 25) - HITBOX(0, -6, -10, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(2, 16, 0x10) TILES(0x7A3B, 25) HITBOX(0, -6, -10, 6, 16) SHOW_FRAME(4, 0) - TILES(0x7A54, 25) - SHOW_FRAME(4, 1) + TILES(0x7A54, 25) SHOW_FRAME(4, 1) - TILES(0x7A6D, 25) - SHOW_FRAME(4, 2) + TILES(0x7A6D, 25) SHOW_FRAME(4, 2) - TILES(0x7A54, 25) - SHOW_FRAME(4, 1) + TILES(0x7A54, 25) SHOW_FRAME(4, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0181[1] = { +const s32 *const anim_0181[1] = { anim_0181__v0_l0, }; const s32 anim_0182__v0_l0[] = { // 0x080E3A1C - PALETTE(2, 16, 0x10) - TILES(0x7A86, 25) - HITBOX(0, -6, -11, 6, 8) - SHOW_FRAME(2, 0) + PALETTE(2, 16, 0x10) TILES(0x7A86, 25) HITBOX(0, -6, -11, 6, 8) SHOW_FRAME(2, 0) - TILES(0x7A9F, 25) - SHOW_FRAME(2, 1) + TILES(0x7A9F, 25) SHOW_FRAME(2, 1) - TILES(0x7AB8, 25) - SHOW_FRAME(2, 2) + TILES(0x7AB8, 25) SHOW_FRAME(2, 2) - TILES(0x7A9F, 25) - SHOW_FRAME(2, 1) + TILES(0x7A9F, 25) SHOW_FRAME(2, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0182[1] = { +const s32 *const anim_0182[1] = { anim_0182__v0_l0, }; const s32 anim_0184__v0_l0[] = { // 0x080E3A90 - PALETTE(3, 16, 0x80) - TILES(0x7AD1, 21) - SHOW_FRAME(3, 0) + PALETTE(3, 16, 0x80) TILES(0x7AD1, 21) SHOW_FRAME(3, 0) - TILES(0x7AE6, 21) - SHOW_FRAME(3, 1) + TILES(0x7AE6, 21) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0184[1] = { +const s32 *const anim_0184[1] = { anim_0184__v0_l0, }; const s32 anim_0185__v0_l0[] = { // 0x080E3AD0 - PALETTE(3, 16, 0x80) - TILES(0x7AFB, 20) - SHOW_FRAME(2, 0) + PALETTE(3, 16, 0x80) TILES(0x7AFB, 20) SHOW_FRAME(2, 0) - TILES(0x7B0F, 24) - SHOW_FRAME(2, 1) + TILES(0x7B0F, 24) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0185__v1_l0[] = { // 0x080E3B08 - PALETTE(3, 16, 0x80) - TILES(0x7B27, 18) - SHOW_FRAME(2, 2) + PALETTE(3, 16, 0x80) TILES(0x7B27, 18) SHOW_FRAME(2, 2) - JUMP_BACK(8) + JUMP_BACK(8) }; -const s32 * const anim_0185[2] = { +const s32 *const anim_0185[2] = { anim_0185__v0_l0, anim_0185__v1_l0, }; const s32 anim_0186__v0_l0[] = { // 0x080E3B38 - PALETTE(3, 16, 0x80) - TILES(0x7B39, 24) - SHOW_FRAME(3, 0) + PALETTE(3, 16, 0x80) TILES(0x7B39, 24) SHOW_FRAME(3, 0) - TILES(0x7B51, 24) - SHOW_FRAME(3, 1) + TILES(0x7B51, 24) SHOW_FRAME(3, 1) - TILES(0x7B69, 24) - SHOW_FRAME(3, 2) + TILES(0x7B69, 24) SHOW_FRAME(3, 2) - TILES(0x7B81, 24) - SHOW_FRAME(3, 3) + TILES(0x7B81, 24) SHOW_FRAME(3, 3) - TILES(0x7B99, 24) - SHOW_FRAME(3, 4) + TILES(0x7B99, 24) SHOW_FRAME(3, 4) - TILES(0x7BB1, 24) - SHOW_FRAME(3, 5) + TILES(0x7BB1, 24) SHOW_FRAME(3, 5) - TILES(0x7BC9, 24) - SHOW_FRAME(3, 6) + TILES(0x7BC9, 24) SHOW_FRAME(3, 6) - TILES(0x7BE1, 24) - SHOW_FRAME(3, 7) + TILES(0x7BE1, 24) SHOW_FRAME(3, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0186[1] = { +const s32 *const anim_0186[1] = { anim_0186__v0_l0, }; const s32 anim_0187__v0_l0[] = { // 0x080E3BF0 - PALETTE(3, 16, 0x80) - TILES(0x7BF9, 24) - SHOW_FRAME(6, 0) + PALETTE(3, 16, 0x80) TILES(0x7BF9, 24) SHOW_FRAME(6, 0) - TILES(0x7C11, 20) - SHOW_FRAME(6, 1) + TILES(0x7C11, 20) SHOW_FRAME(6, 1) - TILES(0x7C25, 16) - SHOW_FRAME(6, 2) - TILES(0x7C35, 16) - SHOW_FRAME(3, 3) + TILES(0x7C25, 16) SHOW_FRAME(6, 2) TILES(0x7C35, 16) SHOW_FRAME(3, 3) - TILES(0x7C45, 16) - SHOW_FRAME(3, 4) + TILES(0x7C45, 16) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0187[1] = { +const s32 *const anim_0187[1] = { anim_0187__v0_l0, }; const s32 anim_0188__v0_l0[] = { // 0x080E3C6C - PALETTE(3, 16, 0x80) - TILES(0x7C55, 30) - SHOW_FRAME(1, 0) + PALETTE(3, 16, 0x80) TILES(0x7C55, 30) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0188__v1_l0[] = { // 0x080E3C90 - PALETTE(3, 16, 0x80) - TILES(0x7C73, 24) - SHOW_FRAME(4, 1) + PALETTE(3, 16, 0x80) TILES(0x7C73, 24) SHOW_FRAME(4, 1) - TILES(0x7C8B, 24) - SHOW_FRAME(4, 2) + TILES(0x7C8B, 24) SHOW_FRAME(4, 2) - TILES(0x7CA3, 24) - SHOW_FRAME(40, 3) + TILES(0x7CA3, 24) SHOW_FRAME(40, 3) - END() + END() }; -const s32 * const anim_0188[2] = { +const s32 *const anim_0188[2] = { anim_0188__v0_l0, anim_0188__v1_l0, }; const s32 anim_0190__v0_l0[] = { // 0x080E3CE4 - PALETTE(3, 16, 0x80) - TILES(0x7CBB, 9) - SHOW_FRAME(3, 0) + PALETTE(3, 16, 0x80) TILES(0x7CBB, 9) SHOW_FRAME(3, 0) - TILES(0x7CC4, 9) - SHOW_FRAME(3, 1) + TILES(0x7CC4, 9) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0190[1] = { +const s32 *const anim_0190[1] = { anim_0190__v0_l0, }; const s32 anim_0191__v0_l0[] = { // 0x080E3D24 - PALETTE(3, 16, 0x80) - TILES(0x7CCD, 9) - SHOW_FRAME(10, 0) + PALETTE(3, 16, 0x80) TILES(0x7CCD, 9) SHOW_FRAME(10, 0) - TILES(0x7CD6, 9) - SHOW_FRAME(10, 1) + TILES(0x7CD6, 9) SHOW_FRAME(10, 1) - TILES(0x7CDF, 9) - SHOW_FRAME(10, 2) + TILES(0x7CDF, 9) SHOW_FRAME(10, 2) - TILES(0x7CE8, 6) - SHOW_FRAME(16, 3) + TILES(0x7CE8, 6) SHOW_FRAME(16, 3) - TILES(0x7CDF, 9) - SHOW_FRAME(10, 2) + TILES(0x7CDF, 9) SHOW_FRAME(10, 2) - TILES(0x7CD6, 9) - SHOW_FRAME(10, 1) + TILES(0x7CD6, 9) SHOW_FRAME(10, 1) - TILES(0x7CCD, 9) - SHOW_FRAME(10, 0) + TILES(0x7CCD, 9) SHOW_FRAME(10, 0) - TILES(0x7CEE, 9) - SHOW_FRAME(16, 4) + TILES(0x7CEE, 9) SHOW_FRAME(16, 4) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0191__v1_l0[] = { // 0x080E3DD8 - PALETTE(3, 16, 0x80) - TILES(0x7CDF, 9) - SHOW_FRAME(1, 2) + PALETTE(3, 16, 0x80) TILES(0x7CDF, 9) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0191[2] = { +const s32 *const anim_0191[2] = { anim_0191__v0_l0, anim_0191__v1_l0, }; const s32 anim_0192__v0_l0[] = { // 0x080E3E04 - PALETTE(4, 16, 0x10) - TILES(0x7CF7, 24) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 0) + PALETTE(4, 16, 0x10) TILES(0x7CF7, 24) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0192__v1_l0[] = { // 0x080E3E34 - PALETTE(4, 16, 0x10) - TILES(0x7D0F, 28) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 1) + PALETTE(4, 16, 0x10) TILES(0x7D0F, 28) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0192__v2_l0[] = { // 0x080E3E64 - PALETTE(4, 16, 0x10) - TILES(0x7D2B, 24) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 2) + PALETTE(4, 16, 0x10) TILES(0x7D2B, 24) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0192__v3_l0[] = { // 0x080E3E94 - PALETTE(4, 16, 0x10) - TILES(0x7D43, 28) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 3) + PALETTE(4, 16, 0x10) TILES(0x7D43, 28) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0192__v4_l0[] = { // 0x080E3EC4 - PALETTE(4, 16, 0x10) - TILES(0x7D5F, 28) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 4) + PALETTE(4, 16, 0x10) TILES(0x7D5F, 28) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0192__v5_l0[] = { // 0x080E3EF4 - PALETTE(4, 16, 0x10) - TILES(0x7D7B, 24) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 5) + PALETTE(4, 16, 0x10) TILES(0x7D7B, 24) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0192__v6_l0[] = { // 0x080E3F24 - PALETTE(4, 16, 0x10) - TILES(0x7D93, 24) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 6) + PALETTE(4, 16, 0x10) TILES(0x7D93, 24) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0192__v7_l0[] = { // 0x080E3F54 - PALETTE(4, 16, 0x10) - TILES(0x7DAB, 24) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 7) + PALETTE(4, 16, 0x10) TILES(0x7DAB, 24) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 7) - END() + END() }; -const s32 * const anim_0192[8] = { - anim_0192__v0_l0, - anim_0192__v1_l0, - anim_0192__v2_l0, - anim_0192__v3_l0, - anim_0192__v4_l0, - anim_0192__v5_l0, - anim_0192__v6_l0, - anim_0192__v7_l0, +const s32 *const anim_0192[8] = { + anim_0192__v0_l0, anim_0192__v1_l0, anim_0192__v2_l0, anim_0192__v3_l0, + anim_0192__v4_l0, anim_0192__v5_l0, anim_0192__v6_l0, anim_0192__v7_l0, }; const s32 anim_0195__v0_l0[] = { // 0x080E3FA4 - PALETTE(3, 16, 0x80) - TILES(0x7DC3, 64) - SHOW_FRAME(2, 0) + PALETTE(3, 16, 0x80) TILES(0x7DC3, 64) SHOW_FRAME(2, 0) - TILES(0x7E03, 64) - SHOW_FRAME(2, 1) + TILES(0x7E03, 64) SHOW_FRAME(2, 1) - TILES(0x7E43, 64) - SHOW_FRAME(2, 2) + TILES(0x7E43, 64) SHOW_FRAME(2, 2) - TILES(0x7E83, 64) - SHOW_FRAME(2, 3) + TILES(0x7E83, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0195[1] = { +const s32 *const anim_0195[1] = { anim_0195__v0_l0, }; const s32 anim_0196__v0_l0[] = { // 0x080E400C - PALETTE(2, 16, 0x10) - TILES(0x7EC3, 12) - SHOW_FRAME(1, 0) + PALETTE(2, 16, 0x10) TILES(0x7EC3, 12) SHOW_FRAME(1, 0) - TILES(0x7ECF, 12) - SHOW_FRAME(1, 1) + TILES(0x7ECF, 12) SHOW_FRAME(1, 1) - TILES(0x7EC3, 12) - SHOW_FRAME(1, 0) + TILES(0x7EC3, 12) SHOW_FRAME(1, 0) - TILES(0x7EDB, 15) - SHOW_FRAME(1, 2) + TILES(0x7EDB, 15) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0196[1] = { +const s32 *const anim_0196[1] = { anim_0196__v0_l0, }; const s32 anim_0197__v0_l0[] = { // 0x080E4070 - PALETTE(2, 16, 0x10) - TILES(0x7EEA, 64) - SHOW_FRAME(3, 0) + PALETTE(2, 16, 0x10) TILES(0x7EEA, 64) SHOW_FRAME(3, 0) - END() + END() }; -const s32 * const anim_0197[1] = { +const s32 *const anim_0197[1] = { anim_0197__v0_l0, }; const s32 anim_0198__v0_l0[] = { // 0x080E4098 - PALETTE(2, 16, 0x10) - TILES(0x7F2A, 20) - SHOW_FRAME(6, 0) + PALETTE(2, 16, 0x10) TILES(0x7F2A, 20) SHOW_FRAME(6, 0) - TILES(0x7F3E, 25) - SHOW_FRAME(4, 1) + TILES(0x7F3E, 25) SHOW_FRAME(4, 1) - TILES(0x7F57, 25) - SHOW_FRAME(4, 2) + TILES(0x7F57, 25) SHOW_FRAME(4, 2) - TILES(0x7F70, 25) - SHOW_FRAME(4, 3) + TILES(0x7F70, 25) SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0198[1] = { +const s32 *const anim_0198[1] = { anim_0198__v0_l0, }; const s32 anim_0199__v0_l0[] = { // 0x080E40FC - PALETTE(5, 16, 0x20) - TILES(0x7F89, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(5, 0) + PALETTE(5, 16, 0x20) TILES(0x7F89, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(5, 0) - TILES(0x7F9D, 20) - SHOW_FRAME(5, 1) + TILES(0x7F9D, 20) SHOW_FRAME(5, 1) - TILES(0x7FB1, 20) - SHOW_FRAME(5, 2) + TILES(0x7FB1, 20) SHOW_FRAME(5, 2) - TILES(0x7FC5, 16) - SHOW_FRAME(5, 3) + TILES(0x7FC5, 16) SHOW_FRAME(5, 3) - TILES(0x7FD5, 20) - SHOW_FRAME(5, 4) + TILES(0x7FD5, 20) SHOW_FRAME(5, 4) - TILES(0x7F89, 20) - SHOW_FRAME(5, 0) + TILES(0x7F89, 20) SHOW_FRAME(5, 0) - TILES(0x7F9D, 20) - SHOW_FRAME(5, 1) + TILES(0x7F9D, 20) SHOW_FRAME(5, 1) - TILES(0x7FB1, 20) - SHOW_FRAME(5, 2) + TILES(0x7FB1, 20) SHOW_FRAME(5, 2) - TILES(0x7FC5, 16) - SHOW_FRAME(5, 3) + TILES(0x7FC5, 16) SHOW_FRAME(5, 3) - TILES(0x7FD5, 20) - SHOW_FRAME(5, 4) + TILES(0x7FD5, 20) SHOW_FRAME(5, 4) - TILES(0x7FE9, 20) - SHOW_FRAME(5, 5) + TILES(0x7FE9, 20) SHOW_FRAME(5, 5) - TILES(0x7F89, 20) - SHOW_FRAME(5, 0) + TILES(0x7F89, 20) SHOW_FRAME(5, 0) - TILES(0x7F9D, 20) - SHOW_FRAME(5, 1) + TILES(0x7F9D, 20) SHOW_FRAME(5, 1) - TILES(0x7FFD, 20) - SHOW_FRAME(5, 6) + TILES(0x7FFD, 20) SHOW_FRAME(5, 6) - TILES(0x8011, 16) - SHOW_FRAME(5, 7) + TILES(0x8011, 16) SHOW_FRAME(5, 7) - TILES(0x8021, 20) - SHOW_FRAME(5, 8) + TILES(0x8021, 20) SHOW_FRAME(5, 8) - TILES(0x7FE9, 20) - SHOW_FRAME(5, 5) + TILES(0x7FE9, 20) SHOW_FRAME(5, 5) - TILES(0x7F89, 20) - SHOW_FRAME(5, 0) + TILES(0x7F89, 20) SHOW_FRAME(5, 0) - TILES(0x7F9D, 20) - SHOW_FRAME(5, 1) + TILES(0x7F9D, 20) SHOW_FRAME(5, 1) - TILES(0x7FB1, 20) - SHOW_FRAME(5, 2) + TILES(0x7FB1, 20) SHOW_FRAME(5, 2) - TILES(0x7FC5, 16) - SHOW_FRAME(5, 3) + TILES(0x7FC5, 16) SHOW_FRAME(5, 3) - TILES(0x7FD5, 20) - HITBOX(0, -6, -13, 8, 16) - SHOW_FRAME(5, 4) + TILES(0x7FD5, 20) HITBOX(0, -6, -13, 8, + 16) SHOW_FRAME(5, 4) - TILES(0x8035, 20) - SHOW_FRAME(5, 9) + TILES(0x8035, 20) SHOW_FRAME(5, 9) - TILES(0x8049, 20) - SHOW_FRAME(10, 10) + TILES(0x8049, 20) SHOW_FRAME(10, 10) - TILES(0x805D, 20) - SHOW_FRAME(5, 11) + TILES(0x805D, 20) SHOW_FRAME(5, 11) - TILES(0x8071, 20) - SHOW_FRAME(5, 12) + TILES(0x8071, 20) SHOW_FRAME(5, 12) - TILES(0x8085, 20) - SHOW_FRAME(5, 13) + TILES(0x8085, 20) SHOW_FRAME(5, + 13) - TILES(0x8035, 20) - SHOW_FRAME(5, 9) + TILES(0x8035, + 20) SHOW_FRAME(5, 9) - TILES(0x8049, 20) - SHOW_FRAME(5, 10) + TILES(0x8049, + 20) SHOW_FRAME(5, + 10) - TILES(0x805D, 20) - SHOW_FRAME(5, 11) + TILES( + 0x805D, + 20) SHOW_FRAME(5, + 11) - TILES(0x8071, 20) - SHOW_FRAME(5, 12) + TILES(0x8071, 20) SHOW_FRAME( + 5, 12) - TILES(0x8085, 20) - SHOW_FRAME(12, 13) + TILES(0x8085, 20) SHOW_FRAME( + 12, + 13) - TILES(0x8035, 20) - SHOW_FRAME(6, 9) + TILES(0x8035, 20) SHOW_FRAME( + 6, + 9) - TILES(0x7FE9, 20) - SHOW_FRAME(5, 5) + TILES(0x7FE9, 20) SHOW_FRAME( + 5, + 5) - TILES(0x7F89, 20) - SHOW_FRAME(5, 0) + TILES(0x7F89, 20) SHOW_FRAME( + 5, + 0) - TILES(0x7F9D, 20) - SHOW_FRAME(5, 1) + TILES(0x7F9D, 20) SHOW_FRAME( + 5, + 1) - TILES(0x7FB1, 20) - SHOW_FRAME(5, 2) + TILES(0x7FB1, 20) SHOW_FRAME( + 5, + 2) - TILES(0x7FC5, 16) - SHOW_FRAME(5, 3) + TILES(0x7FC5, 16) SHOW_FRAME( + 5, + 3) - TILES(0x7FD5, 20) - SHOW_FRAME(5, 4) + TILES( + 0x7FD5, + 20) + SHOW_FRAME( + 5, + 4) - JUMP_BACK(204) + JUMP_BACK( + 204) }; -const s32 * const anim_0199[1] = { +const s32 *const anim_0199[1] = { anim_0199__v0_l0, }; const s32 anim_0200__v0_l0[] = { // 0x080E4438 - PALETTE(5, 16, 0x20) - TILES(0x8099, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(10, 0) + PALETTE(5, 16, 0x20) TILES(0x8099, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(10, 0) - TILES(0x80AD, 15) - SHOW_FRAME(10, 1) + TILES(0x80AD, 15) SHOW_FRAME(10, 1) - TILES(0x80BC, 24) - SHOW_FRAME(20, 2) + TILES(0x80BC, 24) SHOW_FRAME(20, 2) - TILES(0x80D4, 15) - SHOW_FRAME(30, 3) + TILES(0x80D4, 15) SHOW_FRAME(30, 3) - TILES(0x80E3, 15) - SHOW_FRAME(8, 4) + TILES(0x80E3, 15) SHOW_FRAME(8, 4) - TILES(0x80D4, 15) - SHOW_FRAME(8, 3) + TILES(0x80D4, 15) SHOW_FRAME(8, 3) - TILES(0x80E3, 15) - SHOW_FRAME(8, 4) + TILES(0x80E3, 15) SHOW_FRAME(8, 4) - TILES(0x80D4, 15) - SHOW_FRAME(8, 3) + TILES(0x80D4, 15) SHOW_FRAME(8, 3) - TILES(0x80E3, 15) - SHOW_FRAME(8, 4) + TILES(0x80E3, 15) SHOW_FRAME(8, 4) - TILES(0x80D4, 15) - SHOW_FRAME(30, 3) + TILES(0x80D4, 15) SHOW_FRAME(30, 3) - TILES(0x80F2, 15) - SHOW_FRAME(4, 5) + TILES(0x80F2, 15) SHOW_FRAME(4, 5) - TILES(0x8101, 20) - SHOW_FRAME(10, 6) + TILES(0x8101, 20) SHOW_FRAME(10, 6) - TILES(0x80F2, 15) - SHOW_FRAME(4, 5) + TILES(0x80F2, 15) SHOW_FRAME(4, 5) - TILES(0x8115, 15) - SHOW_FRAME(10, 7) + TILES(0x8115, 15) SHOW_FRAME(10, 7) - TILES(0x80F2, 15) - SHOW_FRAME(60, 5) + TILES(0x80F2, 15) SHOW_FRAME(60, 5) - TILES(0x8124, 15) - SHOW_FRAME(6, 8) + TILES(0x8124, 15) SHOW_FRAME(6, 8) - TILES(0x8133, 15) - SHOW_FRAME(6, 9) + TILES(0x8133, 15) SHOW_FRAME(6, 9) - TILES(0x8142, 15) - SHOW_FRAME(4, 10) + TILES(0x8142, 15) SHOW_FRAME(4, 10) - TILES(0x8133, 15) - SHOW_FRAME(16, 9) + TILES(0x8133, 15) SHOW_FRAME(16, 9) - TILES(0x8124, 15) - SHOW_FRAME(6, 8) + TILES(0x8124, 15) SHOW_FRAME(6, 8) - TILES(0x80D4, 15) - SHOW_FRAME(8, 3) + TILES(0x80D4, 15) SHOW_FRAME(8, 3) - TILES(0x8151, 20) - SHOW_FRAME(10, 11) + TILES(0x8151, 20) SHOW_FRAME(10, 11) - TILES(0x8165, 20) - SHOW_FRAME(10, 12) + TILES(0x8165, 20) SHOW_FRAME(10, 12) - TILES(0x8151, 20) - SHOW_FRAME(10, 11) + TILES(0x8151, 20) SHOW_FRAME(10, 11) - TILES(0x8165, 20) - SHOW_FRAME(10, 12) + TILES(0x8165, 20) SHOW_FRAME(10, 12) - TILES(0x8151, 20) - SHOW_FRAME(40, 11) - TILES(0x80D4, 15) - SHOW_FRAME(8, 3) + TILES(0x8151, 20) SHOW_FRAME(40, 11) + TILES(0x80D4, 15) SHOW_FRAME(8, + 3) - TILES(0x80E3, 15) - SHOW_FRAME(8, 4) + TILES(0x80E3, + 15) SHOW_FRAME(8, 4) - TILES(0x80D4, 15) - SHOW_FRAME(8, 3) + TILES(0x80D4, 15) + SHOW_FRAME(8, 3) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0200[1] = { +const s32 *const anim_0200[1] = { anim_0200__v0_l0, }; const s32 anim_0201__v0_l0[] = { // 0x080E46A0 - PALETTE(5, 16, 0x20) - TILES(0x8179, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x8179, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0x818D, 20) - SHOW_FRAME(2, 1) + TILES(0x818D, 20) SHOW_FRAME(2, 1) - TILES(0x81A1, 20) - SHOW_FRAME(2, 2) + TILES(0x81A1, 20) SHOW_FRAME(2, 2) - END() + END() }; const s32 anim_0201__v1_l0[] = { // 0x080E46F8 - PALETTE(5, 16, 0x20) - TILES(0x818D, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 1) + PALETTE(5, 16, 0x20) TILES(0x818D, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 1) - TILES(0x8179, 20) - SHOW_FRAME(1, 0) + TILES(0x8179, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0201[2] = { +const s32 *const anim_0201[2] = { anim_0201__v0_l0, anim_0201__v1_l0, }; const s32 anim_0202__v0_l0[] = { // 0x080E4744 - PALETTE(5, 16, 0x20) - TILES(0x81B5, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0x81B5, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 0) - TILES(0x81C5, 16) - SHOW_FRAME(1, 1) + TILES(0x81C5, 16) SHOW_FRAME(1, 1) - TILES(0x81D5, 12) - SHOW_FRAME(1, 2) + TILES(0x81D5, 12) SHOW_FRAME(1, 2) - TILES(0x81E1, 16) - SHOW_FRAME(1, 3) + TILES(0x81E1, 16) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0202__v1_l0[] = { // 0x080E47B0 - PALETTE(5, 16, 0x20) - TILES(0x81C5, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 1) + PALETTE(5, 16, 0x20) TILES(0x81C5, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 1) - TILES(0x81B5, 16) - SHOW_FRAME(1, 0) + TILES(0x81B5, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0202[2] = { +const s32 *const anim_0202[2] = { anim_0202__v0_l0, anim_0202__v1_l0, }; const s32 anim_0203__v0_l0[] = { // 0x080E47FC - PALETTE(5, 16, 0x20) - TILES(0x81F1, 64) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x81F1, 64) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(3, 0) - TILES(0x8231, 64) - SHOW_FRAME(3, 1) + TILES(0x8231, 64) SHOW_FRAME(3, 1) - TILES(0x8271, 64) - SHOW_FRAME(3, 2) + TILES(0x8271, 64) SHOW_FRAME(3, 2) - TILES(0x82B1, 64) - SHOW_FRAME(3, 3) + TILES(0x82B1, 64) SHOW_FRAME(3, 3) - TILES(0x82F1, 64) - SHOW_FRAME(3, 4) + TILES(0x82F1, 64) SHOW_FRAME(3, 4) - TILES(0x8331, 64) - SHOW_FRAME(3, 5) + TILES(0x8331, 64) SHOW_FRAME(3, 5) - TILES(0x8371, 64) - SHOW_FRAME(3, 6) + TILES(0x8371, 64) SHOW_FRAME(3, 6) - TILES(0x83B1, 64) - SHOW_FRAME(3, 7) + TILES(0x83B1, 64) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0203[1] = { +const s32 *const anim_0203[1] = { anim_0203__v0_l0, }; const s32 anim_0204__v0_l0[] = { // 0x080E48C0 - PALETTE(5, 16, 0x20) - TILES(0x83F1, 64) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x83F1, 64) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0x8431, 64) - SHOW_FRAME(2, 1) + TILES(0x8431, 64) SHOW_FRAME(2, 1) - TILES(0x8471, 64) - SHOW_FRAME(2, 2) + TILES(0x8471, 64) SHOW_FRAME(2, 2) - TILES(0x84B1, 64) - SHOW_FRAME(2, 3) + TILES(0x84B1, 64) SHOW_FRAME(2, 3) - TILES(0x84F1, 64) - SHOW_FRAME(2, 4) + TILES(0x84F1, 64) SHOW_FRAME(2, 4) - TILES(0x8531, 64) - SHOW_FRAME(2, 5) + TILES(0x8531, 64) SHOW_FRAME(2, 5) - TILES(0x8571, 64) - SHOW_FRAME(2, 6) + TILES(0x8571, 64) SHOW_FRAME(2, 6) - TILES(0x85B1, 64) - SHOW_FRAME(2, 7) + TILES(0x85B1, 64) SHOW_FRAME(2, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0204[1] = { +const s32 *const anim_0204[1] = { anim_0204__v0_l0, }; const s32 anim_0205__v0_l0[] = { // 0x080E4984 - PALETTE(5, 16, 0x20) - TILES(0x85F1, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0x85F1, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 0) - TILES(0x8605, 20) - SHOW_FRAME(1, 1) + TILES(0x8605, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0205[1] = { +const s32 *const anim_0205[1] = { anim_0205__v0_l0, }; const s32 anim_0206__v0_l0[] = { // 0x080E49CC - PALETTE(5, 16, 0x20) - TILES(0x8619, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0x8619, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 0) - TILES(0x862D, 30) - SHOW_FRAME(1, 1) + TILES(0x862D, 30) SHOW_FRAME(1, 1) - TILES(0x864B, 30) - SHOW_FRAME(1, 2) + TILES(0x864B, 30) SHOW_FRAME(1, 2) - TILES(0x8669, 25) - SHOW_FRAME(1, 3) + TILES(0x8669, 25) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0206[1] = { +const s32 *const anim_0206[1] = { anim_0206__v0_l0, }; const s32 anim_0207__v0_l0[] = { // 0x080E4A3C - PALETTE(5, 16, 0x20) - TILES(0x8682, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x8682, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x8692, 16) - SHOW_FRAME(2, 1) + TILES(0x8692, 16) SHOW_FRAME(2, 1) - TILES(0x86A2, 16) - SHOW_FRAME(2, 2) + TILES(0x86A2, 16) SHOW_FRAME(2, 2) - TILES(0x86B2, 16) - SHOW_FRAME(2, 3) + TILES(0x86B2, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0207[1] = { +const s32 *const anim_0207[1] = { anim_0207__v0_l0, }; const s32 anim_0208__v0_l0[] = { // 0x080E4ABC - PALETTE(5, 16, 0x20) - TILES(0x86C2, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x86C2, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0x86D6, 30) - SHOW_FRAME(2, 1) - TILES(0x86F4, 30) - SHOW_FRAME(2, 2) + TILES(0x86D6, 30) SHOW_FRAME(2, 1) TILES(0x86F4, 30) SHOW_FRAME(2, 2) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0208__v1_l0[] = { // 0x080E4B18 - PALETTE(5, 16, 0x20) - TILES(0x8712, 30) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 3) + PALETTE(5, 16, 0x20) TILES(0x8712, 30) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 3) - TILES(0x86C2, 20) - SHOW_FRAME(2, 0) + TILES(0x86C2, 20) SHOW_FRAME(2, 0) - END() + END() }; -const s32 * const anim_0208[2] = { +const s32 *const anim_0208[2] = { anim_0208__v0_l0, anim_0208__v1_l0, }; const s32 anim_0209__v0_l0[] = { // 0x080E4B64 - PALETTE(5, 16, 0x20) - TILES(0x8730, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 0) - TILES(0x8744, 20) - SHOW_FRAME(3, 1) + PALETTE(5, 16, 0x20) TILES(0x8730, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 0) TILES(0x8744, 20) SHOW_FRAME(3, 1) - TILES(0x8758, 20) - SHOW_FRAME(3, 2) + TILES(0x8758, 20) SHOW_FRAME(3, 2) - TILES(0x876C, 20) - SHOW_FRAME(3, 3) + TILES(0x876C, 20) SHOW_FRAME(3, 3) - JUMP_BACK(15) + JUMP_BACK(15) }; const s32 anim_0209__v1_l0[] = { // 0x080E4BD4 - PALETTE(5, 16, 0x20) - TILES(0x8780, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 4) + PALETTE(5, 16, 0x20) TILES(0x8780, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 4) - TILES(0x8794, 20) - SHOW_FRAME(3, 5) + TILES(0x8794, 20) SHOW_FRAME(3, 5) - TILES(0x87A8, 20) - SHOW_FRAME(3, 6) + TILES(0x87A8, 20) SHOW_FRAME(3, 6) - TILES(0x87BC, 25) - SHOW_FRAME(3, 7) + TILES(0x87BC, 25) SHOW_FRAME(3, 7) - TILES(0x87D5, 30) - SHOW_FRAME(3, 8) + TILES(0x87D5, 30) SHOW_FRAME(3, 8) - TILES(0x87F3, 30) - SHOW_FRAME(3, 9) + TILES(0x87F3, 30) SHOW_FRAME(3, 9) - END() + END() }; const s32 anim_0209__v2_l0[] = { // 0x080E4C68 - PALETTE(5, 16, 0x20) - TILES(0x8811, 30) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 10) + PALETTE(5, 16, 0x20) TILES(0x8811, 30) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 10) - TILES(0x882F, 30) - SHOW_FRAME(3, 11) + TILES(0x882F, 30) SHOW_FRAME(3, 11) - TILES(0x884D, 30) - SHOW_FRAME(3, 12) + TILES(0x884D, 30) SHOW_FRAME(3, 12) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0209__v3_l0[] = { // 0x080E4CC4 - PALETTE(5, 16, 0x20) - TILES(0x886B, 30) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 13) + PALETTE(5, 16, 0x20) TILES(0x886B, 30) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 13) - TILES(0x8889, 16) - HITBOX(0, -6, -2, 6, 28) - SHOW_FRAME(1, 14) + TILES(0x8889, 16) HITBOX(0, -6, -2, 6, 28) SHOW_FRAME(1, 14) - TILES(0x8899, 16) - SHOW_FRAME(1, 15) + TILES(0x8899, 16) SHOW_FRAME(1, 15) - TILES(0x8889, 16) - SHOW_FRAME(1, 14) + TILES(0x8889, 16) SHOW_FRAME(1, 14) - END() + END() }; -const s32 * const anim_0209[4] = { +const s32 *const anim_0209[4] = { anim_0209__v0_l0, anim_0209__v1_l0, anim_0209__v2_l0, @@ -6118,1475 +4282,990 @@ const s32 * const anim_0209[4] = { }; const s32 anim_0210__v0_l0[] = { // 0x080E4D4C - PALETTE(5, 16, 0x20) - TILES(0x88A9, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0x88A9, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(4, 0) - TILES(0x88BD, 20) - SHOW_FRAME(4, 1) + TILES(0x88BD, 20) SHOW_FRAME(4, 1) - TILES(0x88D1, 20) - SHOW_FRAME(4, 2) + TILES(0x88D1, 20) SHOW_FRAME(4, 2) - TILES(0x88E5, 25) - SHOW_FRAME(4, 3) + TILES(0x88E5, 25) SHOW_FRAME(4, 3) - TILES(0x88FE, 25) - SHOW_FRAME(4, 4) + TILES(0x88FE, 25) SHOW_FRAME(4, 4) - TILES(0x8917, 25) - SHOW_FRAME(4, 5) + TILES(0x8917, 25) SHOW_FRAME(4, 5) - TILES(0x8930, 20) - SHOW_FRAME(4, 6) + TILES(0x8930, 20) SHOW_FRAME(4, 6) - TILES(0x8944, 20) - SHOW_FRAME(4, 7) + TILES(0x8944, 20) SHOW_FRAME(4, 7) - TILES(0x8958, 25) - SHOW_FRAME(4, 8) + TILES(0x8958, 25) SHOW_FRAME(4, 8) - TILES(0x8971, 20) - SHOW_FRAME(4, 9) + TILES(0x8971, 20) SHOW_FRAME(4, 9) - TILES(0x8985, 25) - SHOW_FRAME(4, 10) + TILES(0x8985, 25) SHOW_FRAME(4, 10) - END() + END() }; -const s32 * const anim_0210[1] = { +const s32 *const anim_0210[1] = { anim_0210__v0_l0, }; const s32 anim_0211__v0_l0[] = { // 0x080E4E48 - PALETTE(5, 16, 0x20) - TILES(0x899E, 16) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) - TILES(0x89AE, 16) - SHOW_FRAME(6, 1) + PALETTE(5, 16, 0x20) TILES(0x899E, 16) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) TILES(0x89AE, 16) SHOW_FRAME(6, 1) - TILES(0x89BE, 16) - SHOW_FRAME(6, 2) + TILES(0x89BE, 16) SHOW_FRAME(6, 2) - TILES(0x89CE, 16) - SHOW_FRAME(6, 3) + TILES(0x89CE, 16) SHOW_FRAME(6, 3) - TILES(0x89DE, 16) - SHOW_FRAME(6, 4) + TILES(0x89DE, 16) SHOW_FRAME(6, 4) - TILES(0x89EE, 16) - SHOW_FRAME(6, 5) + TILES(0x89EE, 16) SHOW_FRAME(6, 5) - TILES(0x89FE, 16) - SHOW_FRAME(6, 6) + TILES(0x89FE, 16) SHOW_FRAME(6, 6) - TILES(0x8A0E, 16) - SHOW_FRAME(6, 7) + TILES(0x8A0E, 16) SHOW_FRAME(6, 7) - TILES(0x8A1E, 16) - SHOW_FRAME(6, 8) + TILES(0x8A1E, 16) SHOW_FRAME(6, 8) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0211__v1_l0[] = { // 0x080E4F1C - PALETTE(5, 16, 0x20) - TILES(0x899E, 16) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0x899E, 16) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0211[2] = { +const s32 *const anim_0211[2] = { anim_0211__v0_l0, anim_0211__v1_l0, }; const s32 anim_0212__v0_l0[] = { // 0x080E4F54 - PALETTE(5, 16, 0x20) - TILES(0x8A2E, 25) - HITBOX(0, -7, -14, 5, 16) - SHOW_FRAME(2, 0) - TILES(0x8A47, 30) - SHOW_FRAME(3, 1) + PALETTE(5, 16, 0x20) TILES(0x8A2E, 25) HITBOX(0, -7, -14, 5, 16) SHOW_FRAME(2, 0) TILES(0x8A47, 30) SHOW_FRAME(3, 1) - TILES(0x8A65, 36) - SHOW_FRAME(3, 2) + TILES(0x8A65, 36) SHOW_FRAME(3, 2) - TILES(0x8A89, 36) - SHOW_FRAME(3, 3) + TILES(0x8A89, 36) SHOW_FRAME(3, 3) - TILES(0x8AAD, 30) - SHOW_FRAME(3, 4) + TILES(0x8AAD, 30) SHOW_FRAME(3, 4) - TILES(0x8ACB, 30) - SHOW_FRAME(3, 5) + TILES(0x8ACB, 30) SHOW_FRAME(3, 5) - TILES(0x8AE9, 30) - SHOW_FRAME(3, 6) + TILES(0x8AE9, 30) SHOW_FRAME(3, 6) - JUMP_BACK(30) + JUMP_BACK(30) }; const s32 anim_0212__v1_l0[] = { // 0x080E5000 - PALETTE(5, 16, 0x20) - TILES(0x8B07, 25) - HITBOX(0, 2, -14, 14, 16) - SHOW_FRAME(2, 7) + PALETTE(5, 16, 0x20) TILES(0x8B07, 25) HITBOX(0, 2, -14, 14, 16) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0212[2] = { +const s32 *const anim_0212[2] = { anim_0212__v0_l0, anim_0212__v1_l0, }; const s32 anim_0213__v0_l0[] = { // 0x080E5038 - PALETTE(5, 16, 0x20) - TILES(0x8B20, 25) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) - TILES(0x8B39, 30) - SHOW_FRAME(4, 1) + PALETTE(5, 16, 0x20) TILES(0x8B20, 25) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) TILES(0x8B39, 30) SHOW_FRAME(4, 1) - TILES(0x8B57, 30) - SHOW_FRAME(4, 2) + TILES(0x8B57, 30) SHOW_FRAME(4, 2) - TILES(0x8B75, 25) - SHOW_FRAME(4, 3) + TILES(0x8B75, 25) SHOW_FRAME(4, 3) - TILES(0x8B8E, 36) - SHOW_FRAME(4, 4) + TILES(0x8B8E, 36) SHOW_FRAME(4, 4) - TILES(0x8BB2, 36) - SHOW_FRAME(4, 5) + TILES(0x8BB2, 36) SHOW_FRAME(4, 5) - TILES(0x8BD6, 36) - SHOW_FRAME(4, 6) + TILES(0x8BD6, 36) SHOW_FRAME(4, 6) - JUMP_BACK(30) + JUMP_BACK(30) }; const s32 anim_0213__v1_l0[] = { // 0x080E50E4 - PALETTE(5, 16, 0x20) - TILES(0x8BFA, 25) - HITBOX(0, -4, -14, 8, 16) - SHOW_FRAME(2, 7) + PALETTE(5, 16, 0x20) TILES(0x8BFA, 25) HITBOX(0, -4, -14, 8, 16) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0213[2] = { +const s32 *const anim_0213[2] = { anim_0213__v0_l0, anim_0213__v1_l0, }; const s32 anim_0216__v0_l0[] = { // 0x080E511C - PALETTE(5, 16, 0x20) - TILES(0x8C13, 30) - HITBOX(0, -6, -14, 6, 14) - PLAY_SOUND(191) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x20) TILES(0x8C13, 30) HITBOX(0, -6, -14, 6, 14) PLAY_SOUND(191) SHOW_FRAME(6, 0) - TILES(0x8C31, 30) - SHOW_FRAME(6, 1) + TILES(0x8C31, 30) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0216[1] = { +const s32 *const anim_0216[1] = { anim_0216__v0_l0, }; const s32 anim_0217__v0_l0[] = { // 0x080E516C - PALETTE(5, 16, 0x20) - TILES(0x8C4F, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x8C4F, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x8C5F, 16) - SHOW_FRAME(2, 1) + TILES(0x8C5F, 16) SHOW_FRAME(2, 1) - TILES(0x8C6F, 16) - SHOW_FRAME(2, 2) + TILES(0x8C6F, 16) SHOW_FRAME(2, 2) - TILES(0x8C7F, 16) - SHOW_FRAME(2, 3) + TILES(0x8C7F, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; const s32 anim_0217__v1_l0[] = { // 0x080E51E8 - PALETTE(5, 16, 0x20) - TILES(0x8C8F, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 4) + PALETTE(5, 16, 0x20) TILES(0x8C8F, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 4) - TILES(0x8C9F, 16) - SHOW_FRAME(2, 5) + TILES(0x8C9F, 16) SHOW_FRAME(2, 5) - TILES(0x8CAF, 16) - SHOW_FRAME(2, 6) + TILES(0x8CAF, 16) SHOW_FRAME(2, 6) - TILES(0x8CBF, 16) - SHOW_FRAME(2, 7) + TILES(0x8CBF, 16) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0217[2] = { +const s32 *const anim_0217[2] = { anim_0217__v0_l0, anim_0217__v1_l0, }; const s32 anim_0218__v0_l0[] = { // 0x080E5268 - PALETTE(5, 16, 0x20) - TILES(0x8CCF, 25) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x8CCF, 25) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(3, 0) - TILES(0x8CE8, 20) - SHOW_FRAME(3, 1) + TILES(0x8CE8, 20) SHOW_FRAME(3, 1) - TILES(0x8CFC, 20) - SHOW_FRAME(3, 2) + TILES(0x8CFC, 20) SHOW_FRAME(3, 2) - TILES(0x8D10, 20) - SHOW_FRAME(3, 3) - TILES(0x8D24, 15) - SHOW_FRAME(3, 4) + TILES(0x8D10, 20) SHOW_FRAME(3, 3) TILES(0x8D24, 15) SHOW_FRAME(3, 4) - JUMP_BACK(5) + JUMP_BACK(5) }; -const s32 * const anim_0218[1] = { +const s32 *const anim_0218[1] = { anim_0218__v0_l0, }; const s32 anim_0220__v0_l0[] = { // 0x080E52F0 - PALETTE(5, 16, 0x20) - TILES(0x8D33, 30) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x8D33, 30) SHOW_FRAME(3, 0) - TILES(0x8D51, 36) - SHOW_FRAME(3, 1) + TILES(0x8D51, 36) SHOW_FRAME(3, 1) - TILES(0x8D33, 30) - SHOW_FRAME(3, 0) + TILES(0x8D33, 30) SHOW_FRAME(3, 0) - TILES(0x8D75, 25) - SHOW_FRAME(3, 2) - TILES(0x8D8E, 20) - SHOW_FRAME(3, 3) + TILES(0x8D75, 25) SHOW_FRAME(3, 2) TILES(0x8D8E, 20) SHOW_FRAME(3, 3) - TILES(0x8DA2, 20) - SHOW_FRAME(3, 4) + TILES(0x8DA2, 20) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0220[1] = { +const s32 *const anim_0220[1] = { anim_0220__v0_l0, }; const s32 anim_0221__v0_l0[] = { // 0x080E5380 - PALETTE(5, 16, 0x20) - TILES(0x8DB6, 20) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x8DB6, 20) SHOW_FRAME(3, 0) - TILES(0x8DCA, 20) - SHOW_FRAME(3, 1) + TILES(0x8DCA, 20) SHOW_FRAME(3, 1) - TILES(0x8DDE, 24) - SHOW_FRAME(3, 2) + TILES(0x8DDE, 24) SHOW_FRAME(3, 2) - TILES(0x8DF6, 25) - SHOW_FRAME(3, 3) + TILES(0x8DF6, 25) SHOW_FRAME(3, 3) - TILES(0x8E0F, 20) - SHOW_FRAME(3, 4) + TILES(0x8E0F, 20) SHOW_FRAME(3, 4) - TILES(0x8E23, 20) - SHOW_FRAME(3, 5) + TILES(0x8E23, 20) SHOW_FRAME(3, 5) - TILES(0x8E37, 25) - SHOW_FRAME(3, 6) + TILES(0x8E37, 25) SHOW_FRAME(3, 6) - TILES(0x8E50, 25) - SHOW_FRAME(3, 7) - TILES(0x8E69, 24) - SHOW_FRAME(3, 8) + TILES(0x8E50, 25) SHOW_FRAME(3, 7) TILES(0x8E69, 24) SHOW_FRAME(3, 8) - TILES(0x8E81, 30) - SHOW_FRAME(3, 9) + TILES(0x8E81, 30) SHOW_FRAME(3, 9) - TILES(0x8E9F, 30) - SHOW_FRAME(3, 10) + TILES(0x8E9F, 30) SHOW_FRAME(3, 10) - TILES(0x8EBD, 24) - SHOW_FRAME(3, 11) + TILES(0x8EBD, 24) SHOW_FRAME(3, 11) - TILES(0x8ED5, 24) - SHOW_FRAME(3, 12) + TILES(0x8ED5, 24) SHOW_FRAME(3, 12) - TILES(0x8EED, 24) - SHOW_FRAME(3, 13) + TILES(0x8EED, 24) SHOW_FRAME(3, 13) - TILES(0x8F05, 30) - SHOW_FRAME(3, 14) + TILES(0x8F05, 30) SHOW_FRAME(3, 14) - TILES(0x8F23, 30) - SHOW_FRAME(3, 15) + TILES(0x8F23, 30) SHOW_FRAME(3, 15) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0221[1] = { +const s32 *const anim_0221[1] = { anim_0221__v0_l0, }; const s32 anim_0222__v0_l0[] = { // 0x080E54D8 - PALETTE(5, 16, 0x20) - TILES(0x8F41, 20) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0x8F41, 20) SHOW_FRAME(4, 0) - TILES(0x8F55, 30) - SHOW_FRAME(6, 1) + TILES(0x8F55, 30) SHOW_FRAME(6, 1) - TILES(0x8F73, 20) - SHOW_FRAME(4, 2) + TILES(0x8F73, 20) SHOW_FRAME(4, 2) - TILES(0x8F87, 20) - SHOW_FRAME(4, 3) + TILES(0x8F87, 20) SHOW_FRAME(4, 3) - TILES(0x8F9B, 20) - SHOW_FRAME(4, 4) + TILES(0x8F9B, 20) SHOW_FRAME(4, 4) - TILES(0x8FAF, 15) - SHOW_FRAME(6, 5) + TILES(0x8FAF, 15) SHOW_FRAME(6, 5) - TILES(0x8FBE, 20) - SHOW_FRAME(16, 6) + TILES(0x8FBE, 20) SHOW_FRAME(16, 6) - TILES(0x8FD2, 15) - SHOW_FRAME(6, 7) + TILES(0x8FD2, 15) SHOW_FRAME(6, 7) - TILES(0x8FE1, 20) - SHOW_FRAME(6, 8) + TILES(0x8FE1, 20) SHOW_FRAME(6, 8) - TILES(0x8FF5, 20) - SHOW_FRAME(4, 9) + TILES(0x8FF5, 20) SHOW_FRAME(4, 9) - TILES(0x9009, 20) - SHOW_FRAME(4, 10) + TILES(0x9009, 20) SHOW_FRAME(4, 10) - TILES(0x901D, 20) - SHOW_FRAME(4, 11) + TILES(0x901D, 20) SHOW_FRAME(4, 11) - TILES(0x9031, 25) - SHOW_FRAME(4, 12) + TILES(0x9031, 25) SHOW_FRAME(4, 12) - TILES(0x904A, 25) - SHOW_FRAME(4, 13) + TILES(0x904A, 25) SHOW_FRAME(4, 13) - TILES(0x8FF5, 20) - SHOW_FRAME(4, 9) + TILES(0x8FF5, 20) SHOW_FRAME(4, 9) - TILES(0x9009, 20) - SHOW_FRAME(4, 10) + TILES(0x9009, 20) SHOW_FRAME(4, 10) - TILES(0x901D, 20) - SHOW_FRAME(4, 11) + TILES(0x901D, 20) SHOW_FRAME(4, 11) - TILES(0x9031, 25) - SHOW_FRAME(4, 12) + TILES(0x9031, 25) SHOW_FRAME(4, 12) - TILES(0x904A, 25) - SHOW_FRAME(4, 13) + TILES(0x904A, 25) SHOW_FRAME(4, 13) - TILES(0x8FF5, 20) - SHOW_FRAME(12, 9) + TILES(0x8FF5, 20) SHOW_FRAME(12, 9) - TILES(0x9063, 20) - SHOW_FRAME(3, 14) + TILES(0x9063, 20) SHOW_FRAME(3, 14) - TILES(0x9077, 20) - SHOW_FRAME(30, 15) + TILES(0x9077, 20) SHOW_FRAME(30, 15) - END() + END() }; -const s32 * const anim_0222[1] = { +const s32 *const anim_0222[1] = { anim_0222__v0_l0, }; const s32 anim_0223__v0_l0[] = { // 0x080E56A4 - PALETTE(5, 16, 0x20) - TILES(0x908B, 25) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x908B, 25) SHOW_FRAME(3, 0) - TILES(0x90A4, 25) - SHOW_FRAME(3, 1) + TILES(0x90A4, 25) SHOW_FRAME(3, 1) - TILES(0x90BD, 25) - SHOW_FRAME(1, 2) + TILES(0x90BD, 25) SHOW_FRAME(1, 2) - TILES(0x90D6, 25) - SHOW_FRAME(26, 3) + TILES(0x90D6, 25) SHOW_FRAME(26, 3) - TILES(0x908B, 25) - SHOW_FRAME(3, 0) + TILES(0x908B, 25) SHOW_FRAME(3, 0) - TILES(0x90EF, 20) - SHOW_FRAME(10, 4) + TILES(0x90EF, 20) SHOW_FRAME(10, 4) - TILES(0x9103, 20) - SHOW_FRAME(1, 5) + TILES(0x9103, 20) SHOW_FRAME(1, 5) - TILES(0x9117, 30) - SHOW_FRAME(2, 6) + TILES(0x9117, 30) SHOW_FRAME(2, 6) - TILES(0x9135, 30) - SHOW_FRAME(2, 7) + TILES(0x9135, 30) SHOW_FRAME(2, 7) - TILES(0x9153, 35) - SHOW_FRAME(4, 8) + TILES(0x9153, 35) SHOW_FRAME(4, 8) - TILES(0x9117, 30) - SHOW_FRAME(2, 6) + TILES(0x9117, 30) SHOW_FRAME(2, 6) - TILES(0x9103, 20) - SHOW_FRAME(1, 5) + TILES(0x9103, 20) SHOW_FRAME(1, 5) - TILES(0x9176, 20) - SHOW_FRAME(6, 9) + TILES(0x9176, 20) SHOW_FRAME(6, 9) - TILES(0x918A, 20) - SHOW_FRAME(1, 10) + TILES(0x918A, 20) SHOW_FRAME(1, 10) - TILES(0x919E, 20) - SHOW_FRAME(2, 11) + TILES(0x919E, 20) SHOW_FRAME(2, 11) - TILES(0x91B2, 35) - SHOW_FRAME(4, 12) + TILES(0x91B2, 35) SHOW_FRAME(4, 12) - TILES(0x91D5, 35) - SHOW_FRAME(2, 13) + TILES(0x91D5, 35) SHOW_FRAME(2, 13) - TILES(0x919E, 20) - SHOW_FRAME(2, 11) + TILES(0x919E, 20) SHOW_FRAME(2, 11) - TILES(0x918A, 20) - SHOW_FRAME(2, 10) + TILES(0x918A, 20) SHOW_FRAME(2, 10) - TILES(0x90EF, 20) - SHOW_FRAME(2, 4) + TILES(0x90EF, 20) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0223[1] = { +const s32 *const anim_0223[1] = { anim_0223__v0_l0, }; const s32 anim_0224__v0_l0[] = { // 0x080E5848 - PALETTE(5, 16, 0x90) - TILES(0x91F8, 20) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x90) TILES(0x91F8, 20) SHOW_FRAME(3, 0) - TILES(0x920C, 20) - SHOW_FRAME(3, 1) + TILES(0x920C, 20) SHOW_FRAME(3, 1) - TILES(0x9220, 20) - SHOW_FRAME(3, 2) + TILES(0x9220, 20) SHOW_FRAME(3, 2) - TILES(0x9234, 20) - SHOW_FRAME(3, 3) + TILES(0x9234, 20) SHOW_FRAME(3, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0224[1] = { +const s32 *const anim_0224[1] = { anim_0224__v0_l0, }; const s32 anim_0225__v0_l0[] = { // 0x080E58B0 - PALETTE(5, 16, 0x90) - TILES(0x9248, 30) - SHOW_FRAME(20, 0) + PALETTE(5, 16, 0x90) TILES(0x9248, 30) SHOW_FRAME(20, 0) - TILES(0x9266, 36) - SHOW_FRAME(10, 1) + TILES(0x9266, 36) SHOW_FRAME(10, 1) - TILES(0x928A, 42) - SHOW_FRAME(8, 2) + TILES(0x928A, 42) SHOW_FRAME(8, 2) - TILES(0x92B4, 42) - SHOW_FRAME(7, 3) + TILES(0x92B4, 42) SHOW_FRAME(7, 3) - TILES(0x92DE, 42) - SHOW_FRAME(5, 4) + TILES(0x92DE, 42) SHOW_FRAME(5, 4) - TILES(0x9308, 42) - SHOW_FRAME(3, 5) - TILES(0x9332, 42) - SHOW_FRAME(2, 6) + TILES(0x9308, 42) SHOW_FRAME(3, 5) TILES(0x9332, 42) SHOW_FRAME(2, 6) - TILES(0x935C, 42) - SHOW_FRAME(2, 7) + TILES(0x935C, 42) SHOW_FRAME(2, 7) - TILES(0x9386, 42) - SHOW_FRAME(2, 8) + TILES(0x9386, 42) SHOW_FRAME(2, 8) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0225[1] = { +const s32 *const anim_0225[1] = { anim_0225__v0_l0, }; const s32 anim_0226__v0_l0[] = { // 0x080E597C - PALETTE(5, 16, 0x20) - TILES(0x93B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x93B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x93F0, 64) - SHOW_FRAME(2, 1) + TILES(0x93F0, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v1_l0[] = { // 0x080E59C4 - PALETTE(5, 16, 0x20) - TILES(0x9430, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(5, 16, 0x20) TILES(0x9430, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x9470, 64) - SHOW_FRAME(2, 3) + TILES(0x9470, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v2_l0[] = { // 0x080E5A0C - PALETTE(5, 16, 0x20) - TILES(0x94B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(5, 16, 0x20) TILES(0x94B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x94F0, 64) - SHOW_FRAME(2, 5) + TILES(0x94F0, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v3_l0[] = { // 0x080E5A54 - PALETTE(5, 16, 0x20) - TILES(0x9530, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(5, 16, 0x20) TILES(0x9530, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x9570, 64) - SHOW_FRAME(2, 7) + TILES(0x9570, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v4_l0[] = { // 0x080E5A9C - PALETTE(5, 16, 0x20) - TILES(0x95B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(5, 16, 0x20) TILES(0x95B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x95F0, 64) - SHOW_FRAME(2, 9) + TILES(0x95F0, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v5_l0[] = { // 0x080E5AE4 - PALETTE(5, 16, 0x20) - TILES(0x9630, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(5, 16, 0x20) TILES(0x9630, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x9670, 64) - SHOW_FRAME(2, 11) + TILES(0x9670, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v6_l0[] = { // 0x080E5B2C - PALETTE(5, 16, 0x20) - TILES(0x96B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(5, 16, 0x20) TILES(0x96B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0x96F0, 64) - SHOW_FRAME(2, 13) + TILES(0x96F0, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v7_l0[] = { // 0x080E5B74 - PALETTE(5, 16, 0x20) - TILES(0x9730, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(5, 16, 0x20) TILES(0x9730, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0x9770, 64) - SHOW_FRAME(2, 15) + TILES(0x9770, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0226__v8_l0[] = { // 0x080E5BBC - PALETTE(5, 16, 0x20) - TILES(0x97B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 16) + PALETTE(5, 16, 0x20) TILES(0x97B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 16) - TILES(0x97F0, 64) - SHOW_FRAME(2, 17) + TILES(0x97F0, 64) SHOW_FRAME(2, 17) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0226[9] = { - anim_0226__v0_l0, - anim_0226__v1_l0, - anim_0226__v2_l0, - anim_0226__v3_l0, - anim_0226__v4_l0, - anim_0226__v5_l0, - anim_0226__v6_l0, - anim_0226__v7_l0, - anim_0226__v8_l0, +const s32 *const anim_0226[9] = { + anim_0226__v0_l0, anim_0226__v1_l0, anim_0226__v2_l0, anim_0226__v3_l0, anim_0226__v4_l0, + anim_0226__v5_l0, anim_0226__v6_l0, anim_0226__v7_l0, anim_0226__v8_l0, }; const s32 anim_0227__v0_l0[] = { // 0x080E5C28 - PALETTE(5, 16, 0x20) - TILES(0x9830, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x9830, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x9870, 64) - SHOW_FRAME(2, 1) + TILES(0x9870, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v1_l0[] = { // 0x080E5C70 - PALETTE(5, 16, 0x20) - TILES(0x98B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(5, 16, 0x20) TILES(0x98B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0x98F0, 64) - SHOW_FRAME(2, 3) + TILES(0x98F0, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v2_l0[] = { // 0x080E5CB8 - PALETTE(5, 16, 0x20) - TILES(0x9930, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(5, 16, 0x20) TILES(0x9930, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0x9970, 64) - SHOW_FRAME(2, 5) + TILES(0x9970, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v3_l0[] = { // 0x080E5D00 - PALETTE(5, 16, 0x20) - TILES(0x99B0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(5, 16, 0x20) TILES(0x99B0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0x99F0, 64) - SHOW_FRAME(2, 7) + TILES(0x99F0, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v4_l0[] = { // 0x080E5D48 - PALETTE(5, 16, 0x20) - TILES(0x9A30, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(5, 16, 0x20) TILES(0x9A30, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0x9A70, 64) - SHOW_FRAME(2, 9) + TILES(0x9A70, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v5_l0[] = { // 0x080E5D90 - PALETTE(5, 16, 0x20) - TILES(0x9AB0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(5, 16, 0x20) TILES(0x9AB0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0x9AB0, 64) - SHOW_FRAME(2, 10) + TILES(0x9AB0, 64) SHOW_FRAME(2, 10) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v6_l0[] = { // 0x080E5DD8 - PALETTE(5, 16, 0x20) - TILES(0x9AF0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 11) + PALETTE(5, 16, 0x20) TILES(0x9AF0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 11) - TILES(0x9B30, 64) - SHOW_FRAME(2, 12) + TILES(0x9B30, 64) SHOW_FRAME(2, 12) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0227__v7_l0[] = { // 0x080E5E20 - PALETTE(5, 16, 0x20) - TILES(0x9B70, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 13) + PALETTE(5, 16, 0x20) TILES(0x9B70, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 13) - TILES(0x9BB0, 64) - SHOW_FRAME(2, 14) + TILES(0x9BB0, 64) SHOW_FRAME(2, 14) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0227[8] = { - anim_0227__v0_l0, - anim_0227__v1_l0, - anim_0227__v2_l0, - anim_0227__v3_l0, - anim_0227__v4_l0, - anim_0227__v5_l0, - anim_0227__v6_l0, - anim_0227__v7_l0, +const s32 *const anim_0227[8] = { + anim_0227__v0_l0, anim_0227__v1_l0, anim_0227__v2_l0, anim_0227__v3_l0, + anim_0227__v4_l0, anim_0227__v5_l0, anim_0227__v6_l0, anim_0227__v7_l0, }; const s32 anim_0228__v0_l0[] = { // 0x080E5E88 - PALETTE(5, 16, 0x20) - TILES(0x9BF0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) - TILES(0x9C30, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 1) + PALETTE(5, 16, 0x20) TILES(0x9BF0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) TILES(0x9C30, 64) HITBOX(0, -10, -10, 10, 10) + SHOW_FRAME(2, 1) - TILES(0x9C70, 64) - SHOW_FRAME(2, 2) + TILES(0x9C70, 64) SHOW_FRAME(2, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0228__v1_l0[] = { // 0x080E5EF0 - PALETTE(5, 16, 0x20) - TILES(0x9BF0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0x9BF0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0228[2] = { +const s32 *const anim_0228[2] = { anim_0228__v0_l0, anim_0228__v1_l0, }; const s32 anim_0229__v0_l0[] = { // 0x080E5F28 - PALETTE(5, 16, 0x20) - TILES(0x9CB0, 64) - HITBOX(0, -20, -20, 20, 20) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0x9CB0, 64) HITBOX(0, -20, -20, 20, 20) SHOW_FRAME(2, 0) - TILES(0x9CF0, 64) - SHOW_FRAME(2, 1) + TILES(0x9CF0, 64) SHOW_FRAME(2, 1) - TILES(0x9D30, 64) - SHOW_FRAME(2, 2) + TILES(0x9D30, 64) SHOW_FRAME(2, 2) - TILES(0x9D70, 64) - SHOW_FRAME(2, 3) + TILES(0x9D70, 64) SHOW_FRAME(2, 3) - TILES(0x9DB0, 64) - SHOW_FRAME(2, 4) + TILES(0x9DB0, 64) SHOW_FRAME(2, 4) - TILES(0x9DF0, 64) - SHOW_FRAME(2, 5) + TILES(0x9DF0, 64) SHOW_FRAME(2, 5) - TILES(0x9E30, 64) - SHOW_FRAME(2, 6) + TILES(0x9E30, 64) SHOW_FRAME(2, 6) - TILES(0x9E70, 64) - SHOW_FRAME(2, 7) + TILES(0x9E70, 64) SHOW_FRAME(2, 7) - TILES(0x9EB0, 64) - SHOW_FRAME(2, 8) + TILES(0x9EB0, 64) SHOW_FRAME(2, 8) - TILES(0x9EF0, 64) - SHOW_FRAME(2, 9) + TILES(0x9EF0, 64) SHOW_FRAME(2, 9) - TILES(0x9F30, 64) - SHOW_FRAME(2, 10) + TILES(0x9F30, 64) SHOW_FRAME(2, 10) - JUMP_BACK(61) + JUMP_BACK(61) }; -const s32 * const anim_0229[1] = { +const s32 *const anim_0229[1] = { anim_0229__v0_l0, }; const s32 anim_0230__v0_l0[] = { // 0x080E6028 - PALETTE(5, 16, 0x20) - TILES(0x9F70, 64) - HITBOX(0, -14, -14, 14, 14) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0x9F70, 64) HITBOX(0, -14, -14, 14, 14) SHOW_FRAME(3, 0) - TILES(0x9FB0, 64) - SHOW_FRAME(3, 1) + TILES(0x9FB0, 64) SHOW_FRAME(3, 1) - TILES(0x9FF0, 64) - SHOW_FRAME(3, 2) + TILES(0x9FF0, 64) SHOW_FRAME(3, 2) - TILES(0xA030, 64) - SHOW_FRAME(3, 3) + TILES(0xA030, 64) SHOW_FRAME(3, 3) - TILES(0xA070, 64) - SHOW_FRAME(3, 4) + TILES(0xA070, 64) SHOW_FRAME(3, 4) - TILES(0xA0B0, 64) - SHOW_FRAME(3, 5) + TILES(0xA0B0, 64) SHOW_FRAME(3, 5) - TILES(0xA0F0, 64) - SHOW_FRAME(3, 6) + TILES(0xA0F0, 64) SHOW_FRAME(3, 6) - TILES(0xA130, 64) - SHOW_FRAME(3, 7) + TILES(0xA130, 64) SHOW_FRAME(3, 7) - TILES(0xA170, 64) - SHOW_FRAME(3, 8) + TILES(0xA170, 64) SHOW_FRAME(3, 8) - TILES(0xA1B0, 64) - SHOW_FRAME(3, 9) + TILES(0xA1B0, 64) SHOW_FRAME(3, 9) - TILES(0xA1F0, 64) - SHOW_FRAME(3, 10) + TILES(0xA1F0, 64) SHOW_FRAME(3, 10) - TILES(0xA230, 64) - SHOW_FRAME(3, 11) + TILES(0xA230, 64) SHOW_FRAME(3, 11) - TILES(0xA270, 64) - SHOW_FRAME(3, 12) + TILES(0xA270, 64) SHOW_FRAME(3, 12) - TILES(0xA2B0, 64) - SHOW_FRAME(3, 13) + TILES(0xA2B0, 64) SHOW_FRAME(3, 13) - END() + END() }; -const s32 * const anim_0230[1] = { +const s32 *const anim_0230[1] = { anim_0230__v0_l0, }; const s32 anim_0231__v0_l0[] = { // 0x080E6160 - PALETTE(5, 16, 0x20) - TILES(0xA2F0, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xA2F0, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(3, 0) - TILES(0xA330, 64) - SHOW_FRAME(3, 1) + TILES(0xA330, 64) SHOW_FRAME(3, 1) - TILES(0xA370, 64) - SHOW_FRAME(3, 2) + TILES(0xA370, 64) SHOW_FRAME(3, 2) - TILES(0xA3B0, 64) - SHOW_FRAME(3, 3) + TILES(0xA3B0, 64) SHOW_FRAME(3, 3) - TILES(0xA3F0, 64) - SHOW_FRAME(3, 4) + TILES(0xA3F0, 64) SHOW_FRAME(3, 4) - TILES(0xA430, 64) - SHOW_FRAME(3, 5) + TILES(0xA430, 64) SHOW_FRAME(3, 5) - TILES(0xA470, 64) - SHOW_FRAME(3, 6) + TILES(0xA470, 64) SHOW_FRAME(3, 6) - JUMP_BACK(41) + JUMP_BACK(41) }; -const s32 * const anim_0231[1] = { +const s32 *const anim_0231[1] = { anim_0231__v0_l0, }; const s32 anim_0232__v0_l0[] = { // 0x080E6210 - PALETTE(5, 16, 0x20) - TILES(0xA4B0, 64) - SHOW_FRAME(6, 0) - TILES(0xA4F0, 64) - SHOW_FRAME(3, 1) + PALETTE(5, 16, 0x20) TILES(0xA4B0, 64) SHOW_FRAME(6, 0) TILES(0xA4F0, 64) SHOW_FRAME(3, 1) - TILES(0xA530, 64) - SHOW_FRAME(3, 2) + TILES(0xA530, 64) SHOW_FRAME(3, 2) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0232__v1_l0[] = { // 0x080E6260 - PALETTE(5, 16, 0x20) - TILES(0xA4B0, 64) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x20) TILES(0xA4B0, 64) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0232[2] = { +const s32 *const anim_0232[2] = { anim_0232__v0_l0, anim_0232__v1_l0, }; const s32 anim_0233__v0_l0[] = { // 0x080E628C - PALETTE(5, 16, 0x20) - TILES(0xA570, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xA570, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0xA5B0, 64) - SHOW_FRAME(2, 1) + TILES(0xA5B0, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0233__v1_l0[] = { // 0x080E62D4 - PALETTE(5, 16, 0x20) - TILES(0xA5F0, 64) - SHOW_FRAME(2, 2) + PALETTE(5, 16, 0x20) TILES(0xA5F0, 64) SHOW_FRAME(2, 2) - TILES(0xA630, 64) - SHOW_FRAME(2, 3) + TILES(0xA630, 64) SHOW_FRAME(2, 3) - TILES(0xA670, 64) - SHOW_FRAME(2, 4) + TILES(0xA670, 64) SHOW_FRAME(2, 4) - TILES(0xA6B0, 64) - SHOW_FRAME(2, 5) + TILES(0xA6B0, 64) SHOW_FRAME(2, 5) - TILES(0xA6F0, 64) - SHOW_FRAME(2, 6) + TILES(0xA6F0, 64) SHOW_FRAME(2, 6) - TILES(0xA730, 64) - SHOW_FRAME(2, 7) + TILES(0xA730, 64) SHOW_FRAME(2, 7) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0233[2] = { +const s32 *const anim_0233[2] = { anim_0233__v0_l0, anim_0233__v1_l0, }; const s32 anim_0234__v0_l0[] = { // 0x080E6368 - PALETTE(5, 16, 0x90) - TILES(0xA770, 16) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x90) TILES(0xA770, 16) SHOW_FRAME(1, 0) - TILES(0xA780, 16) - SHOW_FRAME(1, 1) + TILES(0xA780, 16) SHOW_FRAME(1, 1) - TILES(0xA790, 16) - SHOW_FRAME(16, 2) + TILES(0xA790, 16) SHOW_FRAME(16, 2) - TILES(0xA7A0, 16) - SHOW_FRAME(4, 3) + TILES(0xA7A0, 16) SHOW_FRAME(4, 3) - TILES(0xA7B0, 16) - SHOW_FRAME(4, 4) + TILES(0xA7B0, 16) SHOW_FRAME(4, 4) - TILES(0xA7C0, 20) - SHOW_FRAME(4, 5) + TILES(0xA7C0, 20) SHOW_FRAME(4, 5) - TILES(0xA7D4, 20) - SHOW_FRAME(4, 6) + TILES(0xA7D4, 20) SHOW_FRAME(4, 6) - TILES(0xA7E8, 25) - SHOW_FRAME(30, 7) + TILES(0xA7E8, 25) SHOW_FRAME(30, 7) - END() + END() }; -const s32 * const anim_0234[1] = { +const s32 *const anim_0234[1] = { anim_0234__v0_l0, }; const s32 anim_0235__v0_l0[] = { // 0x080E641C - PALETTE(5, 16, 0x20) - TILES(0xA801, 16) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xA801, 16) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(3, 0) - TILES(0xA811, 16) - SHOW_FRAME(3, 1) + TILES(0xA811, 16) SHOW_FRAME(3, 1) - TILES(0xA821, 20) - SHOW_FRAME(3, 2) + TILES(0xA821, 20) SHOW_FRAME(3, 2) - TILES(0xA835, 16) - SHOW_FRAME(3, 3) + TILES(0xA835, 16) SHOW_FRAME(3, 3) - TILES(0xA845, 16) - SHOW_FRAME(3, 4) + TILES(0xA845, 16) SHOW_FRAME(3, 4) - TILES(0xA855, 16) - SHOW_FRAME(3, 5) + TILES(0xA855, 16) SHOW_FRAME(3, 5) - TILES(0xA865, 16) - SHOW_FRAME(3, 6) + TILES(0xA865, 16) SHOW_FRAME(3, 6) - TILES(0xA875, 16) - SHOW_FRAME(3, 7) + TILES(0xA875, 16) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0235__v1_l0[] = { // 0x080E64DC - PALETTE(5, 16, 0x20) - TILES(0xA885, 30) - HITBOX(0, -6, -16, 6, 16) - SHOW_FRAME(3, 8) + PALETTE(5, 16, 0x20) TILES(0xA885, 30) HITBOX(0, -6, -16, 6, 16) SHOW_FRAME(3, 8) - TILES(0xA8A3, 25) - SHOW_FRAME(3, 9) + TILES(0xA8A3, 25) SHOW_FRAME(3, 9) - TILES(0xA8BC, 20) - SHOW_FRAME(3, 10) + TILES(0xA8BC, 20) SHOW_FRAME(3, 10) - TILES(0xA8D0, 25) - SHOW_FRAME(3, 11) + TILES(0xA8D0, 25) SHOW_FRAME(3, 11) - TILES(0xA8E9, 30) - SHOW_FRAME(3, 12) + TILES(0xA8E9, 30) SHOW_FRAME(3, 12) - TILES(0xA907, 25) - SHOW_FRAME(3, 13) + TILES(0xA907, 25) SHOW_FRAME(3, 13) - TILES(0xA920, 30) - SHOW_FRAME(3, 14) + TILES(0xA920, 30) SHOW_FRAME(3, 14) - TILES(0xA93E, 25) - SHOW_FRAME(3, 15) + TILES(0xA93E, 25) SHOW_FRAME(3, 15) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0235__v2_l0[] = { // 0x080E659C - PALETTE(5, 16, 0x20) - TILES(0xA957, 30) - HITBOX(0, -6, -16, 6, 16) - SHOW_FRAME(3, 16) + PALETTE(5, 16, 0x20) TILES(0xA957, 30) HITBOX(0, -6, -16, 6, 16) SHOW_FRAME(3, 16) - TILES(0xA975, 25) - SHOW_FRAME(3, 17) + TILES(0xA975, 25) SHOW_FRAME(3, 17) - TILES(0xA98E, 30) - SHOW_FRAME(3, 18) + TILES(0xA98E, 30) SHOW_FRAME(3, 18) - TILES(0xA9AC, 25) - SHOW_FRAME(3, 19) + TILES(0xA9AC, 25) SHOW_FRAME(3, 19) - TILES(0xA9C5, 30) - SHOW_FRAME(3, 20) + TILES(0xA9C5, 30) SHOW_FRAME(3, 20) - TILES(0xA9E3, 30) - SHOW_FRAME(3, 21) + TILES(0xA9E3, 30) SHOW_FRAME(3, 21) - TILES(0xAA01, 25) - SHOW_FRAME(3, 22) + TILES(0xAA01, 25) SHOW_FRAME(3, 22) - TILES(0xAA1A, 30) - SHOW_FRAME(3, 23) + TILES(0xAA1A, 30) SHOW_FRAME(3, 23) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0235[3] = { +const s32 *const anim_0235[3] = { anim_0235__v0_l0, anim_0235__v1_l0, anim_0235__v2_l0, }; const s32 anim_0236__v0_l0[] = { // 0x080E6668 - PALETTE(5, 16, 0x20) - TILES(0xAA38, 25) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xAA38, 25) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0xAA51, 24) - SHOW_FRAME(2, 1) + TILES(0xAA51, 24) SHOW_FRAME(2, 1) - TILES(0xAA69, 20) - SHOW_FRAME(4, 2) + TILES(0xAA69, 20) SHOW_FRAME(4, 2) - TILES(0xAA7D, 25) - SHOW_FRAME(1, 3) + TILES(0xAA7D, 25) SHOW_FRAME(1, 3) - TILES(0xAA96, 25) - SHOW_FRAME(1, 4) + TILES(0xAA96, 25) SHOW_FRAME(1, 4) - TILES(0xAAAF, 30) - HITBOX(0, -8, -14, 4, 16) - SHOW_FRAME(2, 5) + TILES(0xAAAF, 30) HITBOX(0, -8, -14, 4, 16) SHOW_FRAME(2, 5) - TILES(0xAACD, 30) - SHOW_FRAME(2, 6) + TILES(0xAACD, 30) SHOW_FRAME(2, 6) - TILES(0xAAEB, 30) - SHOW_FRAME(2, 7) + TILES(0xAAEB, 30) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0236[1] = { +const s32 *const anim_0236[1] = { anim_0236__v0_l0, }; const s32 anim_0237__v0_l0[] = { // 0x080E6734 - PALETTE(5, 16, 0x20) - TILES(0xAB09, 30) - HITBOX(0, -6, -18, 8, 14) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xAB09, 30) HITBOX(0, -6, -18, 8, 14) SHOW_FRAME(3, 0) - TILES(0xAB27, 30) - SHOW_FRAME(3, 1) + TILES(0xAB27, 30) SHOW_FRAME(3, 1) - TILES(0xAB45, 30) - SHOW_FRAME(3, 2) + TILES(0xAB45, 30) SHOW_FRAME(3, 2) - TILES(0xAB63, 24) - SHOW_FRAME(2, 3) + TILES(0xAB63, 24) SHOW_FRAME(2, 3) - TILES(0xAB7B, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(2, 4) + TILES(0xAB7B, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0237[1] = { +const s32 *const anim_0237[1] = { anim_0237__v0_l0, }; const s32 anim_0238__v0_l0[] = { // 0x080E67C4 - PALETTE(5, 16, 0x20) - TILES(0xAB8F, 64) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xAB8F, 64) SHOW_FRAME(2, 0) - TILES(0xABCF, 64) - SHOW_FRAME(2, 1) + TILES(0xABCF, 64) SHOW_FRAME(2, 1) - TILES(0xAC0F, 64) - SHOW_FRAME(2, 2) + TILES(0xAC0F, 64) SHOW_FRAME(2, 2) - TILES(0xAC4F, 64) - SHOW_FRAME(2, 3) + TILES(0xAC4F, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0238[1] = { +const s32 *const anim_0238[1] = { anim_0238__v0_l0, }; const s32 anim_0239__v0_l0[] = { // 0x080E682C - PALETTE(5, 16, 0x20) - TILES(0xAC8F, 28) - HITBOX(0, -30, -24, -6, -6) - CMD_12(0x10) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xAC8F, 28) HITBOX(0, -30, -24, -6, -6) CMD_12(0x10) SHOW_FRAME(3, 0) - TILES(0xACAB, 20) - HITBOX(0, -22, -24, -4, -6) - CMD_12(0x10) - SHOW_FRAME(3, 1) + TILES(0xACAB, 20) HITBOX(0, -22, -24, -4, -6) CMD_12(0x10) SHOW_FRAME(3, 1) - TILES(0xACBF, 12) - HITBOX(0, -6, -24, 2, -6) - CMD_12(0x10) - SHOW_FRAME(3, 2) + TILES(0xACBF, 12) HITBOX(0, -6, -24, 2, -6) CMD_12(0x10) SHOW_FRAME(3, 2) - TILES(0xACCB, 20) - HITBOX(0, -2, -24, 6, -6) - CMD_12(0x10) - SHOW_FRAME(3, 3) + TILES(0xACCB, 20) HITBOX(0, -2, -24, 6, -6) CMD_12(0x10) SHOW_FRAME(3, 3) - TILES(0xACDF, 20) - HITBOX(0, 8, -24, 26, -6) - CMD_12(0x10) - SHOW_FRAME(3, 4) + TILES(0xACDF, 20) HITBOX(0, 8, -24, 26, -6) CMD_12(0x10) SHOW_FRAME(3, 4) - TILES(0xACF3, 28) - HITBOX(0, 6, -24, 34, -6) - CMD_12(0x10) - SHOW_FRAME(3, 5) + TILES(0xACF3, 28) HITBOX(0, 6, -24, 34, -6) CMD_12(0x10) SHOW_FRAME(3, 5) - TILES(0xAD0F, 20) - HITBOX(0, 8, -24, 26, -6) - CMD_12(0x13) - SHOW_FRAME(3, 6) + TILES(0xAD0F, 20) HITBOX(0, 8, -24, 26, -6) CMD_12(0x13) SHOW_FRAME(3, 6) - TILES(0xAD23, 16) - HITBOX(0, 2, -24, 10, -6) - CMD_12(0x13) - SHOW_FRAME(3, 7) + TILES(0xAD23, 16) HITBOX(0, 2, -24, 10, -6) CMD_12(0x13) SHOW_FRAME(3, 7) - TILES(0xAD33, 16) - HITBOX(0, -8, -24, 0, -6) - CMD_12(0x13) - SHOW_FRAME(3, 8) + TILES(0xAD33, 16) HITBOX(0, -8, -24, 0, -6) CMD_12(0x13) SHOW_FRAME(3, 8) - TILES(0xAD43, 24) - HITBOX(0, -22, -24, -4, -6) - CMD_12(0x13) - SHOW_FRAME(3, 9) + TILES(0xAD43, 24) HITBOX(0, -22, -24, -4, -6) CMD_12(0x13) SHOW_FRAME(3, 9) - JUMP_BACK(103) + JUMP_BACK(103) }; const s32 anim_0239__v1_l0[] = { // 0x080E69D0 - PALETTE(5, 16, 0x20) - TILES(0xAD5B, 28) - HITBOX(0, -8, 1, 8, 35) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 10) + PALETTE(5, 16, 0x20) TILES(0xAD5B, 28) HITBOX(0, -8, 1, 8, 35) SET_PRIORITY(0x2) SHOW_FRAME(3, 10) - TILES(0xAD77, 20) - HITBOX(0, -8, 1, 8, 23) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 11) + TILES(0xAD77, 20) HITBOX(0, -8, 1, 8, 23) SET_PRIORITY(0x2) SHOW_FRAME(3, 11) - TILES(0xAD8B, 12) - HITBOX(0, -8, -3, 8, 9) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 12) + TILES(0xAD8B, 12) HITBOX(0, -8, -3, 8, 9) SET_PRIORITY(0x2) SHOW_FRAME(3, 12) - TILES(0xAD97, 20) - HITBOX(0, -8, -12, 8, 0) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 13) + TILES(0xAD97, 20) HITBOX(0, -8, -12, 8, 0) SET_PRIORITY(0x2) SHOW_FRAME(3, 13) - TILES(0xADAB, 20) - HITBOX(0, -8, -20, 8, -2) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 14) + TILES(0xADAB, 20) HITBOX(0, -8, -20, 8, -2) SET_PRIORITY(0x2) SHOW_FRAME(3, 14) - TILES(0xADBF, 28) - HITBOX(0, -8, -40, 8, -6) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 15) + TILES(0xADBF, 28) HITBOX(0, -8, -40, 8, -6) SET_PRIORITY(0x2) SHOW_FRAME(3, 15) - TILES(0xADDB, 20) - HITBOX(0, -8, -24, 8, -2) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 16) + TILES(0xADDB, 20) HITBOX(0, -8, -24, 8, -2) SET_PRIORITY(0x3) SHOW_FRAME(3, 16) - TILES(0xADEF, 16) - HITBOX(0, -8, -12, 8, 0) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 17) + TILES(0xADEF, 16) HITBOX(0, -8, -12, 8, 0) SET_PRIORITY(0x3) SHOW_FRAME(3, 17) - TILES(0xADFF, 16) - HITBOX(0, -8, -3, 8, 9) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 18) + TILES(0xADFF, 16) HITBOX(0, -8, -3, 8, 9) SET_PRIORITY(0x3) SHOW_FRAME(3, 18) - TILES(0xAE0F, 24) - HITBOX(0, -8, 1, 8, 19) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 19) + TILES(0xAE0F, 24) HITBOX(0, -8, 1, 8, 19) SET_PRIORITY(0x3) SHOW_FRAME(3, 19) - JUMP_BACK(103) + JUMP_BACK(103) }; -const s32 * const anim_0239[2] = { +const s32 *const anim_0239[2] = { anim_0239__v0_l0, anim_0239__v1_l0, }; const s32 anim_0240__v0_l0[] = { // 0x080E6B7C - PALETTE(5, 16, 0x20) - TILES(0xAE27, 24) - HITBOX(0, -6, -19, 6, 7) - SHOW_FRAME(10, 0) + PALETTE(5, 16, 0x20) TILES(0xAE27, 24) HITBOX(0, -6, -19, 6, 7) SHOW_FRAME(10, 0) - TILES(0xAE3F, 24) - SHOW_FRAME(10, 1) + TILES(0xAE3F, 24) SHOW_FRAME(10, 1) - TILES(0xAE57, 24) - SHOW_FRAME(10, 2) + TILES(0xAE57, 24) SHOW_FRAME(10, 2) - TILES(0xAE3F, 24) - SHOW_FRAME(10, 1) + TILES(0xAE3F, 24) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0240__v1_l0[] = { // 0x080E6BEC - PALETTE(5, 16, 0x20) - TILES(0xAE6F, 24) - HITBOX(0, -6, -19, 6, 7) - SHOW_FRAME(5, 3) + PALETTE(5, 16, 0x20) TILES(0xAE6F, 24) HITBOX(0, -6, -19, 6, 7) SHOW_FRAME(5, 3) - TILES(0xAE87, 24) - SHOW_FRAME(5, 4) + TILES(0xAE87, 24) SHOW_FRAME(5, 4) - TILES(0xAE9F, 24) - SHOW_FRAME(5, 5) + TILES(0xAE9F, 24) SHOW_FRAME(5, 5) - TILES(0xAE87, 24) - SHOW_FRAME(5, 4) + TILES(0xAE87, 24) SHOW_FRAME(5, 4) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0240[2] = { +const s32 *const anim_0240[2] = { anim_0240__v0_l0, anim_0240__v1_l0, }; const s32 anim_0241__v0_l0[] = { // 0x080E6C64 - PALETTE(5, 16, 0x20) - TILES(0xAEB7, 36) - HITBOX(0, -6, -12, 6, 10) - SHOW_FRAME(5, 0) + PALETTE(5, 16, 0x20) TILES(0xAEB7, 36) HITBOX(0, -6, -12, 6, 10) SHOW_FRAME(5, 0) - TILES(0xAEDB, 30) - SHOW_FRAME(5, 1) + TILES(0xAEDB, 30) SHOW_FRAME(5, 1) - TILES(0xAEF9, 20) - SHOW_FRAME(5, 2) + TILES(0xAEF9, 20) SHOW_FRAME(5, 2) - TILES(0xAF0D, 30) - SHOW_FRAME(5, 3) + TILES(0xAF0D, 30) SHOW_FRAME(5, 3) - TILES(0xAF2B, 36) - SHOW_FRAME(5, 4) + TILES(0xAF2B, 36) SHOW_FRAME(5, 4) - TILES(0xAF4F, 20) - SHOW_FRAME(5, 5) + TILES(0xAF4F, 20) SHOW_FRAME(5, 5) - TILES(0xAF63, 25) - SHOW_FRAME(5, 6) + TILES(0xAF63, 25) SHOW_FRAME(5, 6) - TILES(0xAF7C, 20) - SHOW_FRAME(5, 7) + TILES(0xAF7C, 20) SHOW_FRAME(5, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0241[1] = { +const s32 *const anim_0241[1] = { anim_0241__v0_l0, }; const s32 anim_0242__v0_l0[] = { // 0x080E6D28 - PALETTE(5, 16, 0x20) - TILES(0xAF90, 30) - SHOW_FRAME(8, 0) + PALETTE(5, 16, 0x20) TILES(0xAF90, 30) SHOW_FRAME(8, 0) - TILES(0xAFAE, 30) - SHOW_FRAME(8, 1) + TILES(0xAFAE, 30) SHOW_FRAME(8, 1) - TILES(0xAFCC, 30) - SHOW_FRAME(8, 2) + TILES(0xAFCC, 30) SHOW_FRAME(8, 2) - TILES(0xAFAE, 30) - SHOW_FRAME(8, 1) + TILES(0xAFAE, 30) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0242[1] = { +const s32 *const anim_0242[1] = { anim_0242__v0_l0, }; const s32 anim_0245__v0_l0[] = { // 0x080E6D90 - PALETTE(5, 16, 0x20) - TILES(0xAFEA, 20) - HITBOX(0, -4, -8, 18, 6) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x20) TILES(0xAFEA, 20) HITBOX(0, -4, -8, 18, 6) SHOW_FRAME(6, 0) - TILES(0xAFFE, 20) - SHOW_FRAME(4, 1) + TILES(0xAFFE, 20) SHOW_FRAME(4, 1) - TILES(0xB012, 20) - SHOW_FRAME(4, 2) + TILES(0xB012, 20) SHOW_FRAME(4, 2) - TILES(0xB026, 15) - SHOW_FRAME(6, 3) + TILES(0xB026, 15) SHOW_FRAME(6, 3) - TILES(0xB035, 20) - SHOW_FRAME(6, 4) + TILES(0xB035, 20) SHOW_FRAME(6, 4) - TILES(0xB049, 16) - SHOW_FRAME(6, 5) + TILES(0xB049, 16) SHOW_FRAME(6, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0245[1] = { +const s32 *const anim_0245[1] = { anim_0245__v0_l0, }; const s32 anim_0246__v0_l0[] = { // 0x080E6E2C - PALETTE(5, 16, 0x20) - TILES(0xB059, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0xB059, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0246__v1_l0[] = { // 0x080E6E5C - PALETTE(5, 16, 0x20) - TILES(0xB071, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 1) + PALETTE(5, 16, 0x20) TILES(0xB071, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0246__v2_l0[] = { // 0x080E6E8C - PALETTE(5, 16, 0x20) - TILES(0xB089, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 2) + PALETTE(5, 16, 0x20) TILES(0xB089, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0246__v3_l0[] = { // 0x080E6EBC - PALETTE(5, 16, 0x20) - TILES(0xB0A1, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 3) + PALETTE(5, 16, 0x20) TILES(0xB0A1, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0246[4] = { +const s32 *const anim_0246[4] = { anim_0246__v0_l0, anim_0246__v1_l0, anim_0246__v2_l0, @@ -7594,157 +5273,97 @@ const s32 * const anim_0246[4] = { }; const s32 anim_0249__v0_l0[] = { // 0x080E6EFC - PALETTE(5, 16, 0x20) - TILES(0xB0B9, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB0B9, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0xB0B9, 20) - SHOW_FRAME(2, 0) + TILES(0xB0B9, 20) SHOW_FRAME(2, 0) - TILES(0xB0CD, 30) - HITBOX(0, -16, -14, 2, 16) - HITBOX(1, -32, -12, -14, 16) - PLAY_SOUND(126) - SHOW_FRAME(2, 1) + TILES(0xB0CD, 30) HITBOX(0, -16, -14, 2, 16) HITBOX(1, -32, -12, -14, 16) PLAY_SOUND(126) SHOW_FRAME(2, 1) - TILES(0xB0EB, 35) - HITBOX(0, -6, -14, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(4, 2) + TILES(0xB0EB, 35) HITBOX(0, -6, -14, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(4, 2) - TILES(0xB10E, 30) - HITBOX(0, -6, -14, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(2, 3) + TILES(0xB10E, 30) HITBOX(0, -6, -14, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(2, 3) - TILES(0xB0B9, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + TILES(0xB0B9, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0249__v1_l0[] = { // 0x080E6FEC - PALETTE(5, 16, 0x20) - TILES(0xB12C, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 4) + PALETTE(5, 16, 0x20) TILES(0xB12C, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 4) - TILES(0xB140, 20) - SHOW_FRAME(2, 5) + TILES(0xB140, 20) SHOW_FRAME(2, 5) - TILES(0xB154, 35) - HITBOX(0, -17, -14, 6, 16) - HITBOX(1, -32, -12, -14, 16) - SHOW_FRAME(2, 6) + TILES(0xB154, 35) HITBOX(0, -17, -14, 6, 16) HITBOX(1, -32, -12, -14, 16) SHOW_FRAME(2, 6) - TILES(0xB177, 35) - HITBOX(0, -17, -14, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(6, 7) + TILES(0xB177, 35) HITBOX(0, -17, -14, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(6, 7) - TILES(0xB140, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 5) + TILES(0xB140, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 5) - TILES(0xB12C, 20) - SHOW_FRAME(2, 4) + TILES(0xB12C, 20) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0249[2] = { +const s32 *const anim_0249[2] = { anim_0249__v0_l0, anim_0249__v1_l0, }; const s32 anim_0250__v0_l0[] = { // 0x080E70C4 - PALETTE(5, 16, 0x20) - TILES(0xB19A, 25) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB19A, 25) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0xB1B3, 25) - SHOW_FRAME(2, 1) + TILES(0xB1B3, 25) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0250__v1_l0[] = { // 0x080E7108 - PALETTE(5, 16, 0x20) - TILES(0xB1CC, 28) - HITBOX(0, -6, -20, 6, 2) - HITBOX(1, -16, -35, 0, 16) - SHOW_FRAME(6, 2) + PALETTE(5, 16, 0x20) TILES(0xB1CC, 28) HITBOX(0, -6, -20, 6, 2) HITBOX(1, -16, -35, 0, 16) SHOW_FRAME(6, 2) - TILES(0xB1E8, 24) - HITBOX(0, -6, -20, 6, 2) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(5, 3) + TILES(0xB1E8, 24) HITBOX(0, -6, -20, 6, 2) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(5, 3) - TILES(0xB200, 30) - SHOW_FRAME(4, 4) + TILES(0xB200, 30) SHOW_FRAME(4, 4) - TILES(0xB21E, 30) - SHOW_FRAME(3, 5) - TILES(0xB23C, 30) - SHOW_FRAME(2, 6) + TILES(0xB21E, 30) SHOW_FRAME(3, 5) TILES(0xB23C, 30) SHOW_FRAME(2, 6) - TILES(0xB25A, 30) - SHOW_FRAME(2, 7) + TILES(0xB25A, 30) SHOW_FRAME(2, 7) - TILES(0xB278, 30) - SHOW_FRAME(2, 8) + TILES(0xB278, 30) SHOW_FRAME(2, 8) - JUMP_BACK(15) + JUMP_BACK(15) }; const s32 anim_0250__v2_l0[] = { // 0x080E71D8 - PALETTE(5, 16, 0x20) - TILES(0xB296, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 9) + PALETTE(5, 16, 0x20) TILES(0xB296, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 9) - TILES(0xB2A6, 16) - SHOW_FRAME(1, 10) + TILES(0xB2A6, 16) SHOW_FRAME(1, 10) - TILES(0xB296, 16) - SHOW_FRAME(1, 9) + TILES(0xB296, 16) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0250__v3_l0[] = { // 0x080E7230 - PALETTE(6, 16, 0x40) - TILES(0xB2B6, 6) - SHOW_FRAME(2, 11) + PALETTE(6, 16, 0x40) TILES(0xB2B6, 6) SHOW_FRAME(2, 11) - TILES(0xB2BC, 12) - SHOW_FRAME(2, 12) + TILES(0xB2BC, 12) SHOW_FRAME(2, 12) - TILES(0xB2C8, 20) - SHOW_FRAME(2, 13) + TILES(0xB2C8, 20) SHOW_FRAME(2, 13) - TILES(0xB2DC, 20) - SHOW_FRAME(2, 14) + TILES(0xB2DC, 20) SHOW_FRAME(2, 14) - TILES(0xB2F0, 24) - SHOW_FRAME(3, 15) + TILES(0xB2F0, 24) SHOW_FRAME(3, 15) - TILES(0xB308, 24) - SHOW_FRAME(3, 16) + TILES(0xB308, 24) SHOW_FRAME(3, 16) - TILES(0xB320, 24) - SHOW_FRAME(3, 17) + TILES(0xB320, 24) SHOW_FRAME(3, 17) - TILES(0xB338, 9) - SHOW_FRAME(3, 18) + TILES(0xB338, 9) SHOW_FRAME(3, 18) - END() + END() }; -const s32 * const anim_0250[4] = { +const s32 *const anim_0250[4] = { anim_0250__v0_l0, anim_0250__v1_l0, anim_0250__v2_l0, @@ -7752,63 +5371,42 @@ const s32 * const anim_0250[4] = { }; const s32 anim_0260__v0_l0[] = { // 0x080E72F0 - PALETTE(5, 16, 0x20) - TILES(0xB341, 24) - HITBOX(0, -6, -8, 16, 6) - HITBOX(1, -12, -12, 2, 9) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xB341, 24) HITBOX(0, -6, -8, 16, 6) HITBOX(1, -12, -12, 2, 9) SHOW_FRAME(3, 0) - TILES(0xB359, 24) - SHOW_FRAME(3, 1) + TILES(0xB359, 24) SHOW_FRAME(3, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0260[1] = { +const s32 *const anim_0260[1] = { anim_0260__v0_l0, }; const s32 anim_0261__v0_l0[] = { // 0x080E7348 - PALETTE(5, 16, 0x20) - TILES(0xB371, 24) - HITBOX(0, -6, -8, 16, 6) - HITBOX(1, -12, -12, 2, 9) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0xB371, 24) HITBOX(0, -6, -8, 16, 6) HITBOX(1, -12, -12, 2, 9) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0261__v1_l0[] = { // 0x080E7384 - PALETTE(5, 16, 0x20) - TILES(0xB389, 24) - HITBOX(0, -10, -8, 12, 6) - HITBOX(1, -16, -12, -2, 9) - SHOW_FRAME(1, 1) + PALETTE(5, 16, 0x20) TILES(0xB389, 24) HITBOX(0, -10, -8, 12, 6) HITBOX(1, -16, -12, -2, 9) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0261__v2_l0[] = { // 0x080E73C0 - PALETTE(5, 16, 0x20) - TILES(0xB3A1, 24) - HITBOX(0, -14, -8, 8, 6) - HITBOX(1, 2, -12, 16, 9) - SHOW_FRAME(1, 2) + PALETTE(5, 16, 0x20) TILES(0xB3A1, 24) HITBOX(0, -14, -8, 8, 6) HITBOX(1, 2, -12, 16, 9) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0261__v3_l0[] = { // 0x080E73FC - PALETTE(5, 16, 0x20) - TILES(0xB3B9, 24) - HITBOX(0, -18, -8, 4, 6) - HITBOX(1, -2, -12, 12, 9) - SHOW_FRAME(1, 3) + PALETTE(5, 16, 0x20) TILES(0xB3B9, 24) HITBOX(0, -18, -8, 4, 6) HITBOX(1, -2, -12, 12, 9) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0261[4] = { +const s32 *const anim_0261[4] = { anim_0261__v0_l0, anim_0261__v1_l0, anim_0261__v2_l0, @@ -7816,1121 +5414,836 @@ const s32 * const anim_0261[4] = { }; const s32 anim_0262__v0_l0[] = { // 0x080E7448 - PALETTE(5, 16, 0x20) - TILES(0xB3D1, 15) - HITBOX(0, -5, -6, 21, 7) - HITBOX(1, -11, -10, 2, 10) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB3D1, 15) HITBOX(0, -5, -6, 21, 7) HITBOX(1, -11, -10, 2, 10) SHOW_FRAME(2, 0) - TILES(0xB3E0, 15) - SHOW_FRAME(2, 1) + TILES(0xB3E0, 15) SHOW_FRAME(2, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0262[1] = { +const s32 *const anim_0262[1] = { anim_0262__v0_l0, }; const s32 anim_0263__v0_l0[] = { // 0x080E74A0 - PALETTE(5, 16, 0x20) - TILES(0xB3EF, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xB3EF, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 0) - TILES(0xB403, 25) - SHOW_FRAME(3, 1) + TILES(0xB403, 25) SHOW_FRAME(3, 1) - TILES(0xB41C, 30) - SHOW_FRAME(3, 2) + TILES(0xB41C, 30) SHOW_FRAME(3, 2) - TILES(0xB43A, 30) - SHOW_FRAME(3, 3) + TILES(0xB43A, 30) SHOW_FRAME(3, 3) - TILES(0xB458, 30) - SHOW_FRAME(3, 4) + TILES(0xB458, 30) SHOW_FRAME(3, 4) - TILES(0xB476, 30) - SHOW_FRAME(3, 5) - TILES(0xB494, 30) - SHOW_FRAME(3, 6) + TILES(0xB476, 30) SHOW_FRAME(3, 5) TILES(0xB494, 30) SHOW_FRAME(3, 6) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0263__v1_l0[] = { // 0x080E754C - PALETTE(5, 16, 0x20) - TILES(0xB4B2, 30) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 7) + PALETTE(5, 16, 0x20) TILES(0xB4B2, 30) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 7) - TILES(0xB4D0, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 8) + TILES(0xB4D0, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 8) - TILES(0xB4E0, 16) - SHOW_FRAME(1, 9) + TILES(0xB4E0, 16) SHOW_FRAME(1, 9) - TILES(0xB4F0, 16) - SHOW_FRAME(6, 10) + TILES(0xB4F0, 16) SHOW_FRAME(6, 10) - TILES(0xB4E0, 16) - SHOW_FRAME(1, 9) + TILES(0xB4E0, 16) SHOW_FRAME(1, 9) - TILES(0xB4D0, 16) - SHOW_FRAME(1, 8) + TILES(0xB4D0, 16) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0263[2] = { +const s32 *const anim_0263[2] = { anim_0263__v0_l0, anim_0263__v1_l0, }; const s32 anim_0264__v0_l0[] = { // 0x080E75F4 - PALETTE(5, 16, 0x20) - TILES(0xB500, 30) - HITBOX(0, -2, -14, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB500, 30) HITBOX(0, -2, -14, 10, 10) SHOW_FRAME(2, 0) - TILES(0xB51E, 20) - HITBOX(0, -6, -10, 10, 15) - SHOW_FRAME(2, 1) + TILES(0xB51E, 20) HITBOX(0, -6, -10, 10, 15) SHOW_FRAME(2, 1) - TILES(0xB532, 16) - HITBOX(0, -9, -9, -9, -9) - SHOW_FRAME(2, 2) + TILES(0xB532, 16) HITBOX(0, -9, -9, -9, -9) SHOW_FRAME(2, 2) - END() + END() }; -const s32 * const anim_0264[1] = { +const s32 *const anim_0264[1] = { anim_0264__v0_l0, }; const s32 anim_0265__v0_l0[] = { // 0x080E7668 - PALETTE(5, 16, 0x20) - TILES(0xB542, 20) - HITBOX(0, -6, -10, 10, 15) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0xB542, 20) HITBOX(0, -6, -10, 10, 15) SHOW_FRAME(4, 0) - TILES(0xB556, 24) - PLAY_SOUND(125) - SHOW_FRAME(4, 1) + TILES(0xB556, 24) PLAY_SOUND(125) SHOW_FRAME(4, 1) - TILES(0xB56E, 20) - SHOW_FRAME(4, 2) + TILES(0xB56E, 20) SHOW_FRAME(4, 2) - TILES(0xB582, 20) - SHOW_FRAME(4, 3) + TILES(0xB582, 20) SHOW_FRAME(4, 3) - TILES(0xB596, 24) - PLAY_SOUND(125) - SHOW_FRAME(4, 4) + TILES(0xB596, 24) PLAY_SOUND(125) SHOW_FRAME(4, 4) - TILES(0xB5AE, 20) - SHOW_FRAME(4, 5) + TILES(0xB5AE, 20) SHOW_FRAME(4, 5) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0265__v1_l0[] = { // 0x080E7710 - PALETTE(5, 16, 0x20) - TILES(0xB5AE, 20) - HITBOX(0, -6, -10, 10, 15) - SHOW_FRAME(4, 5) + PALETTE(5, 16, 0x20) TILES(0xB5AE, 20) HITBOX(0, -6, -10, 10, 15) SHOW_FRAME(4, 5) - TILES(0xB596, 24) - SHOW_FRAME(4, 4) + TILES(0xB596, 24) SHOW_FRAME(4, 4) - TILES(0xB582, 20) - PLAY_SOUND(125) - SHOW_FRAME(4, 3) + TILES(0xB582, 20) PLAY_SOUND(125) SHOW_FRAME(4, 3) - TILES(0xB56E, 20) - SHOW_FRAME(4, 2) + TILES(0xB56E, 20) SHOW_FRAME(4, 2) - TILES(0xB556, 24) - SHOW_FRAME(4, 1) + TILES(0xB556, 24) SHOW_FRAME(4, 1) - TILES(0xB542, 20) - PLAY_SOUND(125) - SHOW_FRAME(4, 0) + TILES(0xB542, 20) PLAY_SOUND(125) SHOW_FRAME(4, 0) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0265__v2_l0[] = { // 0x080E77B8 - PALETTE(5, 16, 0x20) - TILES(0xB5C2, 16) - HITBOX(0, -6, -10, 10, 15) - SHOW_FRAME(1, 6) + PALETTE(5, 16, 0x20) TILES(0xB5C2, 16) HITBOX(0, -6, -10, 10, 15) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0265__v3_l0[] = { // 0x080E77E8 - PALETTE(5, 16, 0x20) - TILES(0xB5D2, 20) - HITBOX(0, -9, -8, 7, 15) - SHOW_FRAME(4, 7) + PALETTE(5, 16, 0x20) TILES(0xB5D2, 20) HITBOX(0, -9, -8, 7, 15) SHOW_FRAME(4, 7) - TILES(0xB5E6, 18) - HITBOX(0, -15, -16, 1, 10) - SHOW_FRAME(4, 8) + TILES(0xB5E6, 18) HITBOX(0, -15, -16, 1, 10) SHOW_FRAME(4, 8) - TILES(0xB5F8, 24) - HITBOX(0, -17, -20, -7, 6) - SHOW_FRAME(4, 9) + TILES(0xB5F8, 24) HITBOX(0, -17, -20, -7, 6) SHOW_FRAME(4, 9) - TILES(0xB610, 24) - SHOW_FRAME(4, 10) + TILES(0xB610, 24) SHOW_FRAME(4, 10) - TILES(0xB628, 20) - HITBOX(0, -19, -20, -7, 0) - SHOW_FRAME(4, 11) + TILES(0xB628, 20) HITBOX(0, -19, -20, -7, 0) SHOW_FRAME(4, 11) - END() + END() }; const s32 anim_0265__v4_l0[] = { // 0x080E788C - PALETTE(5, 16, 0x20) - TILES(0xB63C, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(4, 12) + PALETTE(5, 16, 0x20) TILES(0xB63C, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(4, 12) - TILES(0xB64C, 16) - SHOW_FRAME(4, 13) + TILES(0xB64C, 16) SHOW_FRAME(4, 13) - END() + END() }; -const s32 * const anim_0265[5] = { - anim_0265__v0_l0, - anim_0265__v1_l0, - anim_0265__v2_l0, - anim_0265__v3_l0, - anim_0265__v4_l0, +const s32 *const anim_0265[5] = { + anim_0265__v0_l0, anim_0265__v1_l0, anim_0265__v2_l0, anim_0265__v3_l0, anim_0265__v4_l0, }; const s32 anim_0269__v0_l0[] = { // 0x080E78E4 - PALETTE(5, 16, 0x20) - TILES(0xB65C, 30) - HITBOX(0, -6, -17, 6, 9) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x20) TILES(0xB65C, 30) HITBOX(0, -6, -17, 6, 9) SHOW_FRAME(6, 0) - TILES(0xB67A, 24) - SHOW_FRAME(4, 1) + TILES(0xB67A, 24) SHOW_FRAME(4, 1) - TILES(0xB692, 24) - SHOW_FRAME(4, 2) + TILES(0xB692, 24) SHOW_FRAME(4, 2) - TILES(0xB6AA, 24) - SHOW_FRAME(6, 3) + TILES(0xB6AA, 24) SHOW_FRAME(6, 3) - TILES(0xB6C2, 24) - SHOW_FRAME(6, 4) + TILES(0xB6C2, 24) SHOW_FRAME(6, 4) - TILES(0xB6DA, 24) - SHOW_FRAME(6, 5) + TILES(0xB6DA, 24) SHOW_FRAME(6, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0269[1] = { +const s32 *const anim_0269[1] = { anim_0269__v0_l0, }; const s32 anim_0270__v0_l0[] = { // 0x080E7980 - PALETTE(5, 16, 0x20) - TILES(0xB6F2, 24) - HITBOX(0, -6, -17, 6, 9) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB6F2, 24) HITBOX(0, -6, -17, 6, 9) SHOW_FRAME(2, 0) - TILES(0xB70A, 24) - SHOW_FRAME(2, 1) + TILES(0xB70A, 24) SHOW_FRAME(2, 1) - END() + END() }; -const s32 * const anim_0270[1] = { +const s32 *const anim_0270[1] = { anim_0270__v0_l0, }; const s32 anim_0271__v0_l0[] = { // 0x080E79C8 - PALETTE(5, 16, 0x20) - TILES(0xB722, 30) - HITBOX(0, -6, -17, 6, 9) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x20) TILES(0xB722, 30) HITBOX(0, -6, -17, 6, 9) SHOW_FRAME(6, 0) - TILES(0xB740, 24) - SHOW_FRAME(6, 1) + TILES(0xB740, 24) SHOW_FRAME(6, 1) - TILES(0xB758, 24) - SHOW_FRAME(6, 2) + TILES(0xB758, 24) SHOW_FRAME(6, 2) - TILES(0xB770, 24) - SHOW_FRAME(6, 3) + TILES(0xB770, 24) SHOW_FRAME(6, 3) - TILES(0xB788, 24) - SHOW_FRAME(6, 4) + TILES(0xB788, 24) SHOW_FRAME(6, 4) - TILES(0xB7A0, 24) - SHOW_FRAME(6, 5) + TILES(0xB7A0, 24) SHOW_FRAME(6, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0271[1] = { +const s32 *const anim_0271[1] = { anim_0271__v0_l0, }; const s32 anim_0280__v0_l0[] = { // 0x080E7A64 - PALETTE(5, 16, 0x20) - TILES(0xB7B8, 30) - HITBOX(0, -4, -14, 8, 16) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0xB7B8, 30) HITBOX(0, -4, -14, 8, 16) SHOW_FRAME(4, 0) - TILES(0xB7D6, 36) - SHOW_FRAME(4, 1) + TILES(0xB7D6, 36) SHOW_FRAME(4, 1) - TILES(0xB7FA, 36) - SHOW_FRAME(4, 2) + TILES(0xB7FA, 36) SHOW_FRAME(4, 2) - TILES(0xB81E, 25) - SHOW_FRAME(4, 3) + TILES(0xB81E, 25) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0280[1] = { +const s32 *const anim_0280[1] = { anim_0280__v0_l0, }; const s32 anim_0281__v0_l0[] = { // 0x080E7AD8 - PALETTE(5, 16, 0x20) - TILES(0xB837, 30) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(5, 16, 0x20) TILES(0xB837, 30) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) - TILES(0xB855, 36) - SHOW_FRAME(4, 1) + TILES(0xB855, 36) SHOW_FRAME(4, 1) - TILES(0xB879, 36) - SHOW_FRAME(4, 2) + TILES(0xB879, 36) SHOW_FRAME(4, 2) - TILES(0xB89D, 24) - SHOW_FRAME(4, 3) + TILES(0xB89D, 24) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0281[1] = { +const s32 *const anim_0281[1] = { anim_0281__v0_l0, }; const s32 anim_0282__v0_l0[] = { // 0x080E7B4C - PALETTE(5, 16, 0x20) - TILES(0xB8B5, 25) - HITBOX(0, -6, -16, 6, 2) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x20) TILES(0xB8B5, 25) HITBOX(0, -6, -16, 6, 2) SHOW_FRAME(2, 0) - TILES(0xB8CE, 25) - SHOW_FRAME(2, 1) + TILES(0xB8CE, 25) SHOW_FRAME(2, 1) - TILES(0xB8E7, 25) - SHOW_FRAME(2, 2) + TILES(0xB8E7, 25) SHOW_FRAME(2, 2) - TILES(0xB900, 20) - SHOW_FRAME(2, 3) + TILES(0xB900, 20) SHOW_FRAME(2, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0282[1] = { +const s32 *const anim_0282[1] = { anim_0282__v0_l0, }; const s32 anim_0284__v0_l0[] = { // 0x080E7BC0 - PALETTE(5, 16, 0x90) - TILES(0xB914, 24) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x90) TILES(0xB914, 24) SHOW_FRAME(3, 0) - TILES(0xB92C, 24) - SHOW_FRAME(3, 1) + TILES(0xB92C, 24) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0284[1] = { +const s32 *const anim_0284[1] = { anim_0284__v0_l0, }; const s32 anim_0285__v0_l0[] = { // 0x080E7C00 - PALETTE(5, 16, 0x90) - TILES(0xB944, 16) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x90) TILES(0xB944, 16) SHOW_FRAME(2, 0) - TILES(0xB954, 16) - SHOW_FRAME(2, 1) + TILES(0xB954, 16) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0285__v1_l0[] = { // 0x080E7C38 - PALETTE(5, 16, 0x90) - TILES(0xB964, 16) - SHOW_FRAME(2, 2) + PALETTE(5, 16, 0x90) TILES(0xB964, 16) SHOW_FRAME(2, 2) - END() + END() }; -const s32 * const anim_0285[2] = { +const s32 *const anim_0285[2] = { anim_0285__v0_l0, anim_0285__v1_l0, }; const s32 anim_0286__v0_l0[] = { // 0x080E7C64 - PALETTE(5, 16, 0x90) - TILES(0xB974, 15) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x90) TILES(0xB974, 15) SHOW_FRAME(3, 0) - TILES(0xB983, 20) - SHOW_FRAME(3, 1) + TILES(0xB983, 20) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0286[1] = { +const s32 *const anim_0286[1] = { anim_0286__v0_l0, }; const s32 anim_0287__v0_l0[] = { // 0x080E7CA4 - PALETTE(5, 16, 0x90) - TILES(0xB997, 20) - SHOW_FRAME(6, 0) + PALETTE(5, 16, 0x90) TILES(0xB997, 20) SHOW_FRAME(6, 0) - TILES(0xB9AB, 15) - SHOW_FRAME(6, 1) + TILES(0xB9AB, 15) SHOW_FRAME(6, 1) - TILES(0xB9BA, 20) - SHOW_FRAME(6, 2) - TILES(0xB9CE, 20) - SHOW_FRAME(3, 3) + TILES(0xB9BA, 20) SHOW_FRAME(6, 2) TILES(0xB9CE, 20) SHOW_FRAME(3, 3) - TILES(0xB9E2, 20) - SHOW_FRAME(3, 4) + TILES(0xB9E2, 20) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0287[1] = { +const s32 *const anim_0287[1] = { anim_0287__v0_l0, }; const s32 anim_0288__v0_l0[] = { // 0x080E7D20 - PALETTE(5, 16, 0x90) - TILES(0xB9F6, 20) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x90) TILES(0xB9F6, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0288__v1_l0[] = { // 0x080E7D44 - PALETTE(5, 16, 0x90) - TILES(0xBA0A, 20) - SHOW_FRAME(6, 1) + PALETTE(5, 16, 0x90) TILES(0xBA0A, 20) SHOW_FRAME(6, 1) - TILES(0xBA1E, 15) - SHOW_FRAME(6, 2) + TILES(0xBA1E, 15) SHOW_FRAME(6, 2) - TILES(0xBA2D, 15) - SHOW_FRAME(40, 3) + TILES(0xBA2D, 15) SHOW_FRAME(40, 3) - END() + END() }; -const s32 * const anim_0288[2] = { +const s32 *const anim_0288[2] = { anim_0288__v0_l0, anim_0288__v1_l0, }; const s32 anim_0292__v0_l0[] = { // 0x080E7D98 - PALETTE(5, 16, 0x20) - TILES(0xBA3C, 25) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0xBA3C, 25) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0292__v1_l0[] = { // 0x080E7DC8 - PALETTE(5, 16, 0x20) - TILES(0xBA55, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 1) + PALETTE(5, 16, 0x20) TILES(0xBA55, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0292__v2_l0[] = { // 0x080E7DF8 - PALETTE(5, 16, 0x20) - TILES(0xBA65, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 2) + PALETTE(5, 16, 0x20) TILES(0xBA65, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0292__v3_l0[] = { // 0x080E7E28 - PALETTE(5, 16, 0x20) - TILES(0xBA75, 25) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 3) + PALETTE(5, 16, 0x20) TILES(0xBA75, 25) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0292__v4_l0[] = { // 0x080E7E58 - PALETTE(5, 16, 0x20) - TILES(0xBA8E, 24) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 4) + PALETTE(5, 16, 0x20) TILES(0xBA8E, 24) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0292__v5_l0[] = { // 0x080E7E88 - PALETTE(5, 16, 0x20) - TILES(0xBAA6, 20) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 5) + PALETTE(5, 16, 0x20) TILES(0xBAA6, 20) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0292__v6_l0[] = { // 0x080E7EB8 - PALETTE(5, 16, 0x20) - TILES(0xBABA, 16) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 6) + PALETTE(5, 16, 0x20) TILES(0xBABA, 16) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0292__v7_l0[] = { // 0x080E7EE8 - PALETTE(5, 16, 0x20) - TILES(0xBACA, 25) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(1, 7) + PALETTE(5, 16, 0x20) TILES(0xBACA, 25) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(1, 7) - END() + END() }; -const s32 * const anim_0292[8] = { - anim_0292__v0_l0, - anim_0292__v1_l0, - anim_0292__v2_l0, - anim_0292__v3_l0, - anim_0292__v4_l0, - anim_0292__v5_l0, - anim_0292__v6_l0, - anim_0292__v7_l0, +const s32 *const anim_0292[8] = { + anim_0292__v0_l0, anim_0292__v1_l0, anim_0292__v2_l0, anim_0292__v3_l0, + anim_0292__v4_l0, anim_0292__v5_l0, anim_0292__v6_l0, anim_0292__v7_l0, }; const s32 anim_0295__v0_l0[] = { // 0x080E7F38 - PALETTE(5, 16, 0x90) - TILES(0xBAE3, 64) - SHOW_FRAME(2, 0) + PALETTE(5, 16, 0x90) TILES(0xBAE3, 64) SHOW_FRAME(2, 0) - TILES(0xBB23, 64) - SHOW_FRAME(2, 1) + TILES(0xBB23, 64) SHOW_FRAME(2, 1) - TILES(0xBB63, 64) - SHOW_FRAME(2, 2) + TILES(0xBB63, 64) SHOW_FRAME(2, 2) - TILES(0xBBA3, 64) - SHOW_FRAME(2, 3) + TILES(0xBBA3, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0295[1] = { +const s32 *const anim_0295[1] = { anim_0295__v0_l0, }; const s32 anim_0296__v0_l0[] = { // 0x080E7FA0 - PALETTE(5, 16, 0x20) - TILES(0xBBE3, 8) - SHOW_FRAME(1, 0) + PALETTE(5, 16, 0x20) TILES(0xBBE3, 8) SHOW_FRAME(1, 0) - TILES(0xBBEB, 8) - SHOW_FRAME(1, 1) + TILES(0xBBEB, 8) SHOW_FRAME(1, 1) - TILES(0xBBE3, 8) - SHOW_FRAME(1, 0) + TILES(0xBBE3, 8) SHOW_FRAME(1, 0) - TILES(0xBBF3, 12) - SHOW_FRAME(1, 2) + TILES(0xBBF3, 12) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0296[1] = { +const s32 *const anim_0296[1] = { anim_0296__v0_l0, }; const s32 anim_0297__v0_l0[] = { // 0x080E8004 - PALETTE(5, 16, 0x20) - TILES(0xBBFF, 64) - SHOW_FRAME(3, 0) + PALETTE(5, 16, 0x20) TILES(0xBBFF, 64) SHOW_FRAME(3, 0) - END() + END() }; -const s32 * const anim_0297[1] = { +const s32 *const anim_0297[1] = { anim_0297__v0_l0, }; const s32 anim_0298__v0_l0[] = { // 0x080E802C - PALETTE(7, 16, 0x30) - TILES(0xBC3F, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(6, 0) + PALETTE(7, 16, 0x30) TILES(0xBC3F, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(6, 0) - TILES(0xBC53, 20) - SHOW_FRAME(6, 1) + TILES(0xBC53, 20) SHOW_FRAME(6, 1) - TILES(0xBC67, 20) - SHOW_FRAME(6, 2) + TILES(0xBC67, 20) SHOW_FRAME(6, 2) - TILES(0xBC7B, 20) - SHOW_FRAME(6, 3) + TILES(0xBC7B, 20) SHOW_FRAME(6, 3) - TILES(0xBC8F, 20) - SHOW_FRAME(6, 4) + TILES(0xBC8F, 20) SHOW_FRAME(6, 4) - TILES(0xBCA3, 20) - SHOW_FRAME(6, 5) + TILES(0xBCA3, 20) SHOW_FRAME(6, 5) - TILES(0xBCB7, 20) - SHOW_FRAME(6, 6) + TILES(0xBCB7, 20) SHOW_FRAME(6, 6) - TILES(0xBCCB, 20) - SHOW_FRAME(6, 7) + TILES(0xBCCB, 20) SHOW_FRAME(6, 7) - TILES(0xBC3F, 20) - SHOW_FRAME(6, 0) + TILES(0xBC3F, 20) SHOW_FRAME(6, 0) - TILES(0xBCDF, 20) - SHOW_FRAME(6, 8) + TILES(0xBCDF, 20) SHOW_FRAME(6, 8) - TILES(0xBCF3, 20) - SHOW_FRAME(6, 9) + TILES(0xBCF3, 20) SHOW_FRAME(6, 9) - TILES(0xBD07, 20) - SHOW_FRAME(6, 10) + TILES(0xBD07, 20) SHOW_FRAME(6, 10) - TILES(0xBC8F, 20) - SHOW_FRAME(6, 4) + TILES(0xBC8F, 20) SHOW_FRAME(6, 4) - TILES(0xBCA3, 20) - SHOW_FRAME(6, 5) + TILES(0xBCA3, 20) SHOW_FRAME(6, 5) - TILES(0xBCB7, 20) - SHOW_FRAME(6, 6) + TILES(0xBCB7, 20) SHOW_FRAME(6, 6) - TILES(0xBCCB, 20) - SHOW_FRAME(6, 7) + TILES(0xBCCB, 20) SHOW_FRAME(6, 7) - JUMP_BACK(86) + JUMP_BACK(86) }; -const s32 * const anim_0298[1] = { +const s32 *const anim_0298[1] = { anim_0298__v0_l0, }; const s32 anim_0299__v0_l0[] = { // 0x080E8190 - PALETTE(7, 16, 0x30) - TILES(0xBD1B, 30) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(20, 0) + PALETTE(7, 16, 0x30) TILES(0xBD1B, 30) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(20, 0) - TILES(0xBD39, 20) - SHOW_FRAME(4, 1) + TILES(0xBD39, 20) SHOW_FRAME(4, 1) - TILES(0xBD4D, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(8, 2) + TILES(0xBD4D, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(8, 2) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD75, 20) - SHOW_FRAME(8, 4) + TILES(0xBD75, 20) SHOW_FRAME(8, 4) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD4D, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(8, 2) + TILES(0xBD4D, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(8, 2) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD75, 20) - SHOW_FRAME(8, 4) + TILES(0xBD75, 20) SHOW_FRAME(8, 4) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD4D, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(8, 2) + TILES(0xBD4D, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(8, 2) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD75, 20) - SHOW_FRAME(8, 4) + TILES(0xBD75, 20) SHOW_FRAME(8, 4) - TILES(0xBD61, 20) - SHOW_FRAME(8, 3) + TILES(0xBD61, 20) SHOW_FRAME(8, 3) - TILES(0xBD89, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(8, 5) + TILES(0xBD89, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(8, 5) - TILES(0xBD9D, 20) - SHOW_FRAME(8, 6) + TILES(0xBD9D, 20) SHOW_FRAME(8, 6) - TILES(0xBDB1, 20) - SHOW_FRAME(8, 7) + TILES(0xBDB1, 20) SHOW_FRAME(8, 7) - TILES(0xBD9D, 20) - SHOW_FRAME(60, 6) + TILES(0xBD9D, 20) SHOW_FRAME(60, 6) - TILES(0xBDC5, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(4, 8) + TILES(0xBDC5, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(4, 8) - TILES(0xBDD5, 20) - SHOW_FRAME(8, 9) + TILES(0xBDD5, 20) SHOW_FRAME(8, 9) - TILES(0xBDE9, 16) - SHOW_FRAME(10, 10) + TILES(0xBDE9, 16) SHOW_FRAME(10, 10) - TILES(0xBDF9, 16) - SHOW_FRAME(8, 11) + TILES(0xBDF9, 16) SHOW_FRAME(8, 11) - TILES(0xBE09, 16) - SHOW_FRAME(4, 12) + TILES(0xBE09, 16) SHOW_FRAME(4, 12) - TILES(0xBE19, 16) - SHOW_FRAME(4, 13) + TILES(0xBE19, 16) SHOW_FRAME(4, 13) - TILES(0xBE29, 16) - SHOW_FRAME(4, 14) + TILES(0xBE29, 16) SHOW_FRAME(4, 14) - TILES(0xBE39, 16) - SHOW_FRAME(4, 15) + TILES(0xBE39, 16) SHOW_FRAME(4, 15) - TILES(0xBE29, 16) - SHOW_FRAME(4, 14) + TILES(0xBE29, 16) SHOW_FRAME(4, + 14) - TILES(0xBE49, 16) - SHOW_FRAME(4, 16) + TILES(0xBE49, + 16) SHOW_FRAME(4, 16) - TILES(0xBE29, 16) - SHOW_FRAME(4, 14) + TILES(0xBE29, + 16) SHOW_FRAME(4, + 14) - TILES(0xBE39, 16) - SHOW_FRAME(60, 15) + TILES( + 0xBE39, + 16) SHOW_FRAME(60, 15) - TILES(0xBE59, 20) - SHOW_FRAME(8, 17) + TILES(0xBE59, 20) SHOW_FRAME( + 8, 17) - TILES(0xBE6D, 16) - SHOW_FRAME(6, 18) + TILES(0xBE6D, 16) SHOW_FRAME( + 6, 18) - TILES(0xBE7D, 20) - SHOW_FRAME(6, 19) + TILES(0xBE7D, 20) SHOW_FRAME( + 6, + 19) - TILES(0xBE91, 20) - SHOW_FRAME(6, 20) + TILES(0xBE91, 20) SHOW_FRAME( + 6, + 20) - TILES(0xBEA5, 20) - SHOW_FRAME(6, 21) + TILES(0xBEA5, 20) SHOW_FRAME( + 6, + 21) - TILES(0xBEB9, 16) - SHOW_FRAME(60, 22) + TILES(0xBEB9, 16) SHOW_FRAME( + 60, + 22) - TILES(0xBEC9, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 23) + TILES(0xBEC9, 16) HITBOX( + 0, + -6, + -12, + 6, + 16) SHOW_FRAME(2, 23) - TILES(0xBED9, 20) - SHOW_FRAME(5, 24) + TILES(0xBED9, 20) SHOW_FRAME( + 5, + 24) - TILES(0xBEED, 20) - SHOW_FRAME(5, 25) + TILES(0xBEED, 20) SHOW_FRAME( + 5, + 25) - TILES(0xBF01, 20) - SHOW_FRAME(5, 26) + TILES(0xBF01, 20) SHOW_FRAME( + 5, + 26) - TILES(0xBEED, 20) - SHOW_FRAME(5, 25) + TILES(0xBEED, 20) SHOW_FRAME( + 5, + 25) - TILES(0xBF01, 20) - SHOW_FRAME(5, 26) + TILES( + 0xBF01, + 20) + SHOW_FRAME( + 5, + 26) - TILES(0xBEED, 20) - SHOW_FRAME(5, 25) + TILES( + 0xBEED, + 20) + SHOW_FRAME( + 5, + 25) - TILES(0xBF01, 20) - SHOW_FRAME(30, 26) + TILES(0xBF01, 20) SHOW_FRAME(30, 26) - TILES(0xBF15, 16) - SHOW_FRAME(2, 27) - TILES(0xBF25, 30) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(5, 28) + TILES( + 0xBF15, + 16) + SHOW_FRAME( + 2, + 27) + TILES( + 0xBF25, + 30) + HITBOX( + 0, + -6, -12, + 6, 16) + SHOW_FRAME( + 5, + 28) - TILES(0xBF43, 30) - SHOW_FRAME(4, 29) + TILES(0xBF43, + 30) + SHOW_FRAME( + 4, + 29) - TILES(0xBF61, 20) - SHOW_FRAME(5, 30) + TILES(0xBF61, 20) SHOW_FRAME(5, + 30) - TILES(0xBF43, 30) - SHOW_FRAME(4, 29) + TILES( + 0xBF43, + 30) + SHOW_FRAME( + 4, + 29) - JUMP_BACK(23) + JUMP_BACK( + 23) }; -const s32 * const anim_0299[1] = { +const s32 *const anim_0299[1] = { anim_0299__v0_l0, }; const s32 anim_0300__v0_l0[] = { // 0x080E85DC - PALETTE(7, 16, 0x30) - TILES(0xBF75, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xBF75, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 0) - TILES(0xBF89, 15) - SHOW_FRAME(2, 1) - TILES(0xBF98, 15) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(12, 2) + TILES(0xBF89, 15) SHOW_FRAME(2, 1) TILES(0xBF98, 15) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(12, 2) - TILES(0xBFA7, 15) - SHOW_FRAME(4, 3) + TILES(0xBFA7, 15) SHOW_FRAME(4, 3) - TILES(0xBFB6, 15) - SHOW_FRAME(4, 4) + TILES(0xBFB6, 15) SHOW_FRAME(4, 4) - TILES(0xBFA7, 15) - SHOW_FRAME(4, 3) + TILES(0xBFA7, 15) SHOW_FRAME(4, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0300__v1_l0[] = { // 0x080E8680 - PALETTE(7, 16, 0x30) - TILES(0xBF89, 15) - SHOW_FRAME(1, 1) + PALETTE(7, 16, 0x30) TILES(0xBF89, 15) SHOW_FRAME(1, 1) - TILES(0xBF75, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + TILES(0xBF75, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0300[2] = { +const s32 *const anim_0300[2] = { anim_0300__v0_l0, anim_0300__v1_l0, }; const s32 anim_0301__v0_l0[] = { // 0x080E86CC - PALETTE(7, 16, 0x30) - TILES(0xBFC5, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xBFC5, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 0) - TILES(0xBFD5, 16) - SHOW_FRAME(1, 1) + TILES(0xBFD5, 16) SHOW_FRAME(1, 1) - TILES(0xBFE5, 16) - SHOW_FRAME(1, 2) + TILES(0xBFE5, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0301__v1_l0[] = { // 0x080E8724 - PALETTE(7, 16, 0x30) - TILES(0xBFF5, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 3) + PALETTE(7, 16, 0x30) TILES(0xBFF5, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 3) - TILES(0xC005, 16) - SHOW_FRAME(1, 4) + TILES(0xC005, 16) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0301[2] = { +const s32 *const anim_0301[2] = { anim_0301__v0_l0, anim_0301__v1_l0, }; const s32 anim_0302__v0_l0[] = { // 0x080E8770 - PALETTE(7, 16, 0x30) - TILES(0xC015, 64) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xC015, 64) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(3, 0) - TILES(0xC055, 64) - SHOW_FRAME(3, 1) + TILES(0xC055, 64) SHOW_FRAME(3, 1) - TILES(0xC095, 64) - SHOW_FRAME(3, 2) + TILES(0xC095, 64) SHOW_FRAME(3, 2) - TILES(0xC0D5, 64) - SHOW_FRAME(3, 3) + TILES(0xC0D5, 64) SHOW_FRAME(3, 3) - TILES(0xC115, 64) - SHOW_FRAME(3, 4) + TILES(0xC115, 64) SHOW_FRAME(3, 4) - TILES(0xC155, 64) - SHOW_FRAME(3, 5) + TILES(0xC155, 64) SHOW_FRAME(3, 5) - TILES(0xC195, 64) - SHOW_FRAME(3, 6) + TILES(0xC195, 64) SHOW_FRAME(3, 6) - TILES(0xC1D5, 64) - SHOW_FRAME(3, 7) + TILES(0xC1D5, 64) SHOW_FRAME(3, 7) - TILES(0xC015, 64) - SHOW_FRAME(3, 0) + TILES(0xC015, 64) SHOW_FRAME(3, 0) - TILES(0xC215, 64) - SHOW_FRAME(3, 8) + TILES(0xC215, 64) SHOW_FRAME(3, 8) - TILES(0xC255, 64) - SHOW_FRAME(3, 9) + TILES(0xC255, 64) SHOW_FRAME(3, 9) - TILES(0xC295, 64) - SHOW_FRAME(3, 10) + TILES(0xC295, 64) SHOW_FRAME(3, 10) - TILES(0xC115, 64) - SHOW_FRAME(3, 4) + TILES(0xC115, 64) SHOW_FRAME(3, 4) - TILES(0xC155, 64) - SHOW_FRAME(3, 5) + TILES(0xC155, 64) SHOW_FRAME(3, 5) - TILES(0xC195, 64) - SHOW_FRAME(3, 6) + TILES(0xC195, 64) SHOW_FRAME(3, 6) - TILES(0xC1D5, 64) - SHOW_FRAME(3, 7) + TILES(0xC1D5, 64) SHOW_FRAME(3, 7) - JUMP_BACK(86) + JUMP_BACK(86) }; -const s32 * const anim_0302[1] = { +const s32 *const anim_0302[1] = { anim_0302__v0_l0, }; const s32 anim_0303__v0_l0[] = { // 0x080E88D4 - PALETTE(7, 16, 0x30) - TILES(0xC2D5, 64) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xC2D5, 64) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 0) - TILES(0xC315, 64) - SHOW_FRAME(2, 1) + TILES(0xC315, 64) SHOW_FRAME(2, 1) - TILES(0xC355, 64) - SHOW_FRAME(2, 2) + TILES(0xC355, 64) SHOW_FRAME(2, 2) - TILES(0xC395, 64) - SHOW_FRAME(2, 3) + TILES(0xC395, 64) SHOW_FRAME(2, 3) - TILES(0xC3D5, 64) - SHOW_FRAME(2, 4) + TILES(0xC3D5, 64) SHOW_FRAME(2, 4) - TILES(0xC415, 64) - SHOW_FRAME(2, 5) + TILES(0xC415, 64) SHOW_FRAME(2, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0303[1] = { +const s32 *const anim_0303[1] = { anim_0303__v0_l0, }; const s32 anim_0304__v0_l0[] = { // 0x080E8970 - PALETTE(7, 16, 0x30) - TILES(0xC455, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xC455, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xC469, 20) - SHOW_FRAME(1, 1) + TILES(0xC469, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0304[1] = { +const s32 *const anim_0304[1] = { anim_0304__v0_l0, }; const s32 anim_0305__v0_l0[] = { // 0x080E89B8 - PALETTE(7, 16, 0x30) - TILES(0xC47D, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xC47D, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xC48D, 20) - SHOW_FRAME(1, 1) + TILES(0xC48D, 20) SHOW_FRAME(1, 1) - TILES(0xC4A1, 20) - SHOW_FRAME(1, 2) + TILES(0xC4A1, 20) SHOW_FRAME(1, 2) - TILES(0xC4B5, 16) - SHOW_FRAME(1, 3) + TILES(0xC4B5, 16) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0305[1] = { +const s32 *const anim_0305[1] = { anim_0305__v0_l0, }; const s32 anim_0306__v0_l0[] = { // 0x080E8A28 - PALETTE(7, 16, 0x30) - TILES(0xC4C5, 12) - HITBOX(0, -8, -6, 8, 10) - PLAY_SOUND(133) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xC4C5, 12) HITBOX(0, -8, -6, 8, 10) PLAY_SOUND(133) SHOW_FRAME(2, 0) - TILES(0xC4D1, 16) - SHOW_FRAME(2, 1) + TILES(0xC4D1, 16) SHOW_FRAME(2, 1) - TILES(0xC4E1, 12) - SHOW_FRAME(2, 2) + TILES(0xC4E1, 12) SHOW_FRAME(2, 2) - TILES(0xC4ED, 16) - SHOW_FRAME(2, 3) + TILES(0xC4ED, 16) SHOW_FRAME(2, 3) - JUMP_BACK(28) + JUMP_BACK(28) }; -const s32 * const anim_0306[1] = { +const s32 *const anim_0306[1] = { anim_0306__v0_l0, }; const s32 anim_0307__v0_l0[] = { // 0x080E8AA4 - PALETTE(7, 16, 0x30) - TILES(0xC4FD, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 0) - TILES(0xC511, 20) - SHOW_FRAME(2, 1) + PALETTE(7, 16, 0x30) TILES(0xC4FD, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 0) TILES(0xC511, 20) SHOW_FRAME(2, 1) - TILES(0xC525, 20) - SHOW_FRAME(2, 2) + TILES(0xC525, 20) SHOW_FRAME(2, 2) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0307__v1_l0[] = { // 0x080E8B00 - PALETTE(7, 16, 0x30) - TILES(0xC539, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 3) + PALETTE(7, 16, 0x30) TILES(0xC539, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 3) - END() + END() }; -const s32 * const anim_0307[2] = { +const s32 *const anim_0307[2] = { anim_0307__v0_l0, anim_0307__v1_l0, }; const s32 anim_0308__v0_l0[] = { // 0x080E8B38 - PALETTE(7, 16, 0x30) - TILES(0xC549, 24) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xC549, 24) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(3, 0) - TILES(0xC561, 24) - SHOW_FRAME(3, 1) + TILES(0xC561, 24) SHOW_FRAME(3, 1) - TILES(0xC579, 24) - SHOW_FRAME(3, 2) + TILES(0xC579, 24) SHOW_FRAME(3, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0308__v1_l0[] = { // 0x080E8B94 - PALETTE(7, 16, 0x30) - TILES(0xC591, 20) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(3, 3) + PALETTE(7, 16, 0x30) TILES(0xC591, 20) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(3, 3) - TILES(0xC5A5, 20) - SHOW_FRAME(3, 4) + TILES(0xC5A5, 20) SHOW_FRAME(3, 4) - TILES(0xC5B9, 20) - SHOW_FRAME(3, 5) + TILES(0xC5B9, 20) SHOW_FRAME(3, 5) - TILES(0xC5CD, 20) - SHOW_FRAME(4, 6) + TILES(0xC5CD, 20) SHOW_FRAME(4, 6) - TILES(0xC5E1, 20) - SHOW_FRAME(4, 7) + TILES(0xC5E1, 20) SHOW_FRAME(4, 7) - TILES(0xC5F5, 20) - SHOW_FRAME(4, 8) + TILES(0xC5F5, 20) SHOW_FRAME(4, 8) - END() + END() }; const s32 anim_0308__v2_l0[] = { // 0x080E8C28 - PALETTE(7, 16, 0x30) - TILES(0xC609, 30) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(3, 9) + PALETTE(7, 16, 0x30) TILES(0xC609, 30) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(3, 9) - TILES(0xC627, 30) - SHOW_FRAME(3, 10) + TILES(0xC627, 30) SHOW_FRAME(3, 10) - TILES(0xC645, 30) - SHOW_FRAME(3, 11) + TILES(0xC645, 30) SHOW_FRAME(3, 11) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0308__v3_l0[] = { // 0x080E8C84 - PALETTE(7, 16, 0x30) - TILES(0xC663, 16) - SHOW_FRAME(2, 12) + PALETTE(7, 16, 0x30) TILES(0xC663, 16) SHOW_FRAME(2, 12) - TILES(0xC673, 16) - SHOW_FRAME(1, 13) + TILES(0xC673, 16) SHOW_FRAME(1, 13) - TILES(0xC683, 16) - SHOW_FRAME(1, 14) + TILES(0xC683, 16) SHOW_FRAME(1, 14) - END() + END() }; -const s32 * const anim_0308[4] = { +const s32 *const anim_0308[4] = { anim_0308__v0_l0, anim_0308__v1_l0, anim_0308__v2_l0, @@ -8938,4053 +6251,2801 @@ const s32 * const anim_0308[4] = { }; const s32 anim_0309__v0_l0[] = { // 0x080E8CE0 - PALETTE(7, 16, 0x30) - TILES(0xC693, 20) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(4, 0) + PALETTE(7, 16, 0x30) TILES(0xC693, 20) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(4, 0) - TILES(0xC6A7, 15) - SHOW_FRAME(4, 1) + TILES(0xC6A7, 15) SHOW_FRAME(4, 1) - TILES(0xC6B6, 12) - SHOW_FRAME(4, 2) + TILES(0xC6B6, 12) SHOW_FRAME(4, 2) - TILES(0xC6C2, 16) - SHOW_FRAME(4, 3) + TILES(0xC6C2, 16) SHOW_FRAME(4, 3) - TILES(0xC6D2, 16) - SHOW_FRAME(4, 4) + TILES(0xC6D2, 16) SHOW_FRAME(4, 4) - TILES(0xC6E2, 12) - SHOW_FRAME(4, 5) + TILES(0xC6E2, 12) SHOW_FRAME(4, 5) - TILES(0xC6EE, 16) - SHOW_FRAME(4, 6) + TILES(0xC6EE, 16) SHOW_FRAME(4, 6) - TILES(0xC6FE, 16) - SHOW_FRAME(4, 7) + TILES(0xC6FE, 16) SHOW_FRAME(4, 7) - TILES(0xC70E, 16) - SHOW_FRAME(4, 8) + TILES(0xC70E, 16) SHOW_FRAME(4, 8) - TILES(0xC71E, 25) - SHOW_FRAME(4, 9) + TILES(0xC71E, 25) SHOW_FRAME(4, 9) - TILES(0xC737, 20) - SHOW_FRAME(4, 10) + TILES(0xC737, 20) SHOW_FRAME(4, 10) - END() + END() }; -const s32 * const anim_0309[1] = { +const s32 *const anim_0309[1] = { anim_0309__v0_l0, }; const s32 anim_0310__v0_l0[] = { // 0x080E8DDC - PALETTE(7, 16, 0x30) - TILES(0xC74B, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(4, 0) - TILES(0xC75F, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(7, 1) + PALETTE(7, 16, 0x30) TILES(0xC74B, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(4, 0) TILES(0xC75F, 20) HITBOX(0, -6, -12, 6, 16) + SHOW_FRAME(7, 1) - TILES(0xC773, 20) - SHOW_FRAME(7, 2) + TILES(0xC773, 20) SHOW_FRAME(7, 2) - TILES(0xC787, 20) - SHOW_FRAME(7, 3) + TILES(0xC787, 20) SHOW_FRAME(7, 3) - TILES(0xC79B, 16) - SHOW_FRAME(7, 4) + TILES(0xC79B, 16) SHOW_FRAME(7, 4) - TILES(0xC7AB, 16) - SHOW_FRAME(7, 5) + TILES(0xC7AB, 16) SHOW_FRAME(7, 5) - TILES(0xC7BB, 16) - SHOW_FRAME(7, 6) + TILES(0xC7BB, 16) SHOW_FRAME(7, 6) - TILES(0xC7CB, 16) - SHOW_FRAME(7, 7) + TILES(0xC7CB, 16) SHOW_FRAME(7, 7) - TILES(0xC7DB, 16) - SHOW_FRAME(7, 8) + TILES(0xC7DB, 16) SHOW_FRAME(7, 8) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0310__v1_l0[] = { // 0x080E8EBC - PALETTE(7, 16, 0x30) - TILES(0xC74B, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(7, 16, 0x30) TILES(0xC74B, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0310[2] = { +const s32 *const anim_0310[2] = { anim_0310__v0_l0, anim_0310__v1_l0, }; const s32 anim_0311__v0_l0[] = { // 0x080E8EF4 - PALETTE(7, 16, 0x30) - TILES(0xC7EB, 20) - HITBOX(0, -3, -12, 9, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xC7EB, 20) HITBOX(0, -3, -12, 9, 16) SHOW_FRAME(2, 0) - TILES(0xC7FF, 16) - SHOW_FRAME(2, 1) + TILES(0xC7FF, 16) SHOW_FRAME(2, 1) - TILES(0xC80F, 16) - SHOW_FRAME(2, 2) - TILES(0xC81F, 20) - HITBOX(0, -3, -12, 9, 16) - SHOW_FRAME(5, 3) + TILES(0xC80F, 16) SHOW_FRAME(2, 2) TILES(0xC81F, 20) HITBOX(0, -3, -12, 9, 16) SHOW_FRAME(5, 3) - TILES(0xC833, 20) - SHOW_FRAME(5, 4) + TILES(0xC833, 20) SHOW_FRAME(5, 4) - TILES(0xC847, 20) - SHOW_FRAME(5, 5) + TILES(0xC847, 20) SHOW_FRAME(5, 5) - TILES(0xC833, 20) - SHOW_FRAME(5, 4) + TILES(0xC833, 20) SHOW_FRAME(5, 4) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0311__v1_l0[] = { // 0x080E8FAC - PALETTE(7, 16, 0x30) - TILES(0xC85B, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 6) + PALETTE(7, 16, 0x30) TILES(0xC85B, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 6) - TILES(0xC86B, 16) - SHOW_FRAME(2, 7) + TILES(0xC86B, 16) SHOW_FRAME(2, 7) - TILES(0xC87B, 20) - HITBOX(0, -69, 6, -69, 6) - SHOW_FRAME(2, 8) + TILES(0xC87B, 20) HITBOX(0, -69, 6, -69, 6) SHOW_FRAME(2, 8) - END() + END() }; -const s32 * const anim_0311[2] = { +const s32 *const anim_0311[2] = { anim_0311__v0_l0, anim_0311__v1_l0, }; const s32 anim_0312__v0_l0[] = { // 0x080E9018 - PALETTE(7, 16, 0x30) - TILES(0xC88F, 15) - HITBOX(0, -5, -12, 7, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xC88F, 15) HITBOX(0, -5, -12, 7, 16) SHOW_FRAME(1, 0) - TILES(0xC89E, 15) - HITBOX(0, -63, -41, -63, -41) - SHOW_FRAME(1, 1) + TILES(0xC89E, 15) HITBOX(0, -63, -41, -63, -41) SHOW_FRAME(1, 1) - TILES(0xC8AD, 15) - SHOW_FRAME(2, 2) - TILES(0xC8BC, 15) - HITBOX(0, 0, -12, 12, 16) - SHOW_FRAME(15, 3) + TILES(0xC8AD, 15) SHOW_FRAME(2, 2) TILES(0xC8BC, 15) HITBOX(0, 0, -12, 12, 16) SHOW_FRAME(15, 3) - TILES(0xC8CB, 15) - SHOW_FRAME(5, 4) + TILES(0xC8CB, 15) SHOW_FRAME(5, 4) - TILES(0xC8DA, 15) - SHOW_FRAME(5, 5) + TILES(0xC8DA, 15) SHOW_FRAME(5, 5) - TILES(0xC8CB, 15) - SHOW_FRAME(5, 4) + TILES(0xC8CB, 15) SHOW_FRAME(5, 4) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0312__v1_l0[] = { // 0x080E90DC - PALETTE(7, 16, 0x30) - TILES(0xC8E9, 15) - HITBOX(0, -4, -12, 8, 16) - SHOW_FRAME(2, 6) + PALETTE(7, 16, 0x30) TILES(0xC8E9, 15) HITBOX(0, -4, -12, 8, 16) SHOW_FRAME(2, 6) - TILES(0xC8F8, 15) - SHOW_FRAME(1, 7) + TILES(0xC8F8, 15) SHOW_FRAME(1, 7) - TILES(0xC907, 15) - SHOW_FRAME(1, 8) + TILES(0xC907, 15) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0312[2] = { +const s32 *const anim_0312[2] = { anim_0312__v0_l0, anim_0312__v1_l0, }; const s32 anim_0315__v0_l0[] = { // 0x080E913C - PALETTE(7, 16, 0x30) - TILES(0xC916, 20) - HITBOX(0, -6, -12, 6, 16) - PLAY_SOUND(191) - SHOW_FRAME(6, 0) + PALETTE(7, 16, 0x30) TILES(0xC916, 20) HITBOX(0, -6, -12, 6, 16) PLAY_SOUND(191) SHOW_FRAME(6, 0) - TILES(0xC92A, 15) - SHOW_FRAME(6, 1) + TILES(0xC92A, 15) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0315[1] = { +const s32 *const anim_0315[1] = { anim_0315__v0_l0, }; const s32 anim_0317__v0_l0[] = { // 0x080E918C - PALETTE(7, 16, 0x30) - TILES(0xC939, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xC939, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(3, 0) - TILES(0xC94D, 20) - SHOW_FRAME(3, 1) + TILES(0xC94D, 20) SHOW_FRAME(3, 1) - TILES(0xC961, 16) - SHOW_FRAME(3, 2) + TILES(0xC961, 16) SHOW_FRAME(3, 2) - TILES(0xC971, 16) - SHOW_FRAME(3, 3) + TILES(0xC971, 16) SHOW_FRAME(3, 3) - END() + END() }; -const s32 * const anim_0317[1] = { +const s32 *const anim_0317[1] = { anim_0317__v0_l0, }; const s32 anim_0319__v0_l0[] = { // 0x080E91FC - PALETTE(7, 16, 0x30) - TILES(0xC981, 20) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xC981, 20) SHOW_FRAME(3, 0) - TILES(0xC995, 30) - SHOW_FRAME(3, 1) + TILES(0xC995, 30) SHOW_FRAME(3, 1) - TILES(0xC9B3, 30) - SHOW_FRAME(2, 2) - TILES(0xC9D1, 20) - SHOW_FRAME(3, 3) + TILES(0xC9B3, 30) SHOW_FRAME(2, 2) TILES(0xC9D1, 20) SHOW_FRAME(3, 3) - TILES(0xC9E5, 20) - SHOW_FRAME(3, 4) + TILES(0xC9E5, 20) SHOW_FRAME(3, 4) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0319[1] = { +const s32 *const anim_0319[1] = { anim_0319__v0_l0, }; const s32 anim_0320__v0_l0[] = { // 0x080E9278 - PALETTE(7, 16, 0x30) - TILES(0xC9F9, 20) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xC9F9, 20) SHOW_FRAME(3, 0) - TILES(0xCA0D, 20) - SHOW_FRAME(3, 1) + TILES(0xCA0D, 20) SHOW_FRAME(3, 1) - TILES(0xCA21, 16) - SHOW_FRAME(3, 2) + TILES(0xCA21, 16) SHOW_FRAME(3, 2) - TILES(0xCA31, 16) - SHOW_FRAME(3, 3) - TILES(0xCA41, 16) - SHOW_FRAME(3, 4) + TILES(0xCA31, 16) SHOW_FRAME(3, 3) TILES(0xCA41, 16) SHOW_FRAME(3, 4) - TILES(0xCA51, 20) - SHOW_FRAME(3, 5) + TILES(0xCA51, 20) SHOW_FRAME(3, 5) - TILES(0xCA65, 16) - SHOW_FRAME(3, 6) + TILES(0xCA65, 16) SHOW_FRAME(3, 6) - TILES(0xCA75, 16) - SHOW_FRAME(3, 7) + TILES(0xCA75, 16) SHOW_FRAME(3, 7) - TILES(0xCA85, 16) - SHOW_FRAME(3, 8) + TILES(0xCA85, 16) SHOW_FRAME(3, 8) - TILES(0xCA95, 20) - SHOW_FRAME(3, 9) + TILES(0xCA95, 20) SHOW_FRAME(3, 9) - TILES(0xCAA9, 16) - SHOW_FRAME(3, 10) + TILES(0xCAA9, 16) SHOW_FRAME(3, 10) - TILES(0xCAB9, 16) - SHOW_FRAME(3, 11) + TILES(0xCAB9, 16) SHOW_FRAME(3, 11) - TILES(0xCAC9, 16) - SHOW_FRAME(3, 12) + TILES(0xCAC9, 16) SHOW_FRAME(3, 12) - TILES(0xCAD9, 20) - SHOW_FRAME(3, 13) + TILES(0xCAD9, 20) SHOW_FRAME(3, 13) - TILES(0xCAED, 16) - SHOW_FRAME(3, 14) + TILES(0xCAED, 16) SHOW_FRAME(3, 14) - TILES(0xCA75, 16) - SHOW_FRAME(3, 7) + TILES(0xCA75, 16) SHOW_FRAME(3, 7) - TILES(0xCA85, 16) - SHOW_FRAME(3, 8) + TILES(0xCA85, 16) SHOW_FRAME(3, 8) - TILES(0xCA95, 20) - SHOW_FRAME(3, 9) + TILES(0xCA95, 20) SHOW_FRAME(3, 9) - TILES(0xCAA9, 16) - SHOW_FRAME(3, 10) + TILES(0xCAA9, 16) SHOW_FRAME(3, 10) - TILES(0xCAB9, 16) - SHOW_FRAME(3, 11) + TILES(0xCAB9, 16) SHOW_FRAME(3, 11) - JUMP_BACK(80) + JUMP_BACK(80) }; -const s32 * const anim_0320[1] = { +const s32 *const anim_0320[1] = { anim_0320__v0_l0, }; const s32 anim_0321__v0_l0[] = { // 0x080E9420 - PALETTE(7, 16, 0x30) - TILES(0xCAFD, 15) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xCAFD, 15) SHOW_FRAME(3, 0) - TILES(0xCB0C, 15) - SHOW_FRAME(3, 1) + TILES(0xCB0C, 15) SHOW_FRAME(3, 1) - TILES(0xCB1B, 20) - SHOW_FRAME(4, 2) + TILES(0xCB1B, 20) SHOW_FRAME(4, 2) - TILES(0xCB2F, 20) - SHOW_FRAME(4, 3) + TILES(0xCB2F, 20) SHOW_FRAME(4, 3) - TILES(0xCB43, 20) - SHOW_FRAME(4, 4) + TILES(0xCB43, 20) SHOW_FRAME(4, 4) - TILES(0xCB57, 20) - SHOW_FRAME(4, 5) + TILES(0xCB57, 20) SHOW_FRAME(4, 5) - TILES(0xCB6B, 20) - SHOW_FRAME(4, 6) + TILES(0xCB6B, 20) SHOW_FRAME(4, 6) - TILES(0xCB7F, 15) - SHOW_FRAME(4, 7) + TILES(0xCB7F, 15) SHOW_FRAME(4, 7) - TILES(0xCB8E, 20) - SHOW_FRAME(4, 8) + TILES(0xCB8E, 20) SHOW_FRAME(4, 8) - TILES(0xCBA2, 20) - SHOW_FRAME(4, 9) + TILES(0xCBA2, 20) SHOW_FRAME(4, 9) - TILES(0xCBB6, 20) - SHOW_FRAME(4, 10) + TILES(0xCBB6, 20) SHOW_FRAME(4, 10) - TILES(0xCBCA, 20) - SHOW_FRAME(4, 11) + TILES(0xCBCA, 20) SHOW_FRAME(4, 11) - TILES(0xCBDE, 20) - SHOW_FRAME(4, 12) + TILES(0xCBDE, 20) SHOW_FRAME(4, 12) - TILES(0xCBF2, 15) - SHOW_FRAME(4, 13) + TILES(0xCBF2, 15) SHOW_FRAME(4, 13) - TILES(0xCB1B, 20) - SHOW_FRAME(4, 2) + TILES(0xCB1B, 20) SHOW_FRAME(4, 2) - TILES(0xCB2F, 20) - SHOW_FRAME(4, 3) + TILES(0xCB2F, 20) SHOW_FRAME(4, 3) - TILES(0xCB43, 20) - SHOW_FRAME(4, 4) + TILES(0xCB43, 20) SHOW_FRAME(4, 4) - TILES(0xCB57, 20) - SHOW_FRAME(4, 5) + TILES(0xCB57, 20) SHOW_FRAME(4, 5) - TILES(0xCB6B, 20) - SHOW_FRAME(4, 6) + TILES(0xCB6B, 20) SHOW_FRAME(4, 6) - TILES(0xCB7F, 15) - SHOW_FRAME(4, 7) + TILES(0xCB7F, 15) SHOW_FRAME(4, 7) - TILES(0xCB8E, 20) - SHOW_FRAME(4, 8) + TILES(0xCB8E, 20) SHOW_FRAME(4, 8) - TILES(0xCBA2, 20) - SHOW_FRAME(4, 9) + TILES(0xCBA2, 20) SHOW_FRAME(4, 9) - TILES(0xCBB6, 20) - SHOW_FRAME(4, 10) + TILES(0xCBB6, 20) SHOW_FRAME(4, 10) - TILES(0xCBCA, 20) - SHOW_FRAME(4, 11) + TILES(0xCBCA, 20) SHOW_FRAME(4, 11) - TILES(0xCBDE, 20) - SHOW_FRAME(4, 12) + TILES(0xCBDE, 20) SHOW_FRAME(4, 12) - TILES(0xCBF2, 15) - SHOW_FRAME(4, 13) + TILES(0xCBF2, 15) SHOW_FRAME(4, 13) - TILES(0xCC01, 16) - SHOW_FRAME(4, 14) + TILES(0xCC01, 16) SHOW_FRAME(4, + 14) - TILES(0xCC11, 15) - SHOW_FRAME(4, 15) + TILES(0xCC11, + 15) SHOW_FRAME(4, 15) - TILES(0xCC20, 12) - SHOW_FRAME(4, 16) + TILES(0xCC20, + 12) SHOW_FRAME(4, + 16) - TILES(0xCC2C, 15) - SHOW_FRAME(4, 17) + TILES( + 0xCC2C, + 15) SHOW_FRAME(4, + 17) - TILES(0xCC3B, 16) - SHOW_FRAME(4, 18) + TILES( + 0xCC3B, + 16) SHOW_FRAME(4, + 18) - TILES(0xCC4B, 20) - SHOW_FRAME(4, 19) + TILES(0xCC4B, 20) SHOW_FRAME( + 4, 19) - TILES(0xCC5F, 25) - SHOW_FRAME(4, 20) + TILES(0xCC5F, 25) SHOW_FRAME( + 4, + 20) - TILES(0xCC78, 16) - SHOW_FRAME(4, 21) + TILES(0xCC78, 16) SHOW_FRAME( + 4, + 21) - TILES(0xCC88, 16) - SHOW_FRAME(4, 22) + TILES(0xCC88, 16) SHOW_FRAME( + 4, + 22) - TILES(0xCC98, 16) - SHOW_FRAME(4, 23) + TILES(0xCC98, 16) SHOW_FRAME( + 4, + 23) - TILES(0xCCA8, 12) - SHOW_FRAME(4, 24) + TILES(0xCCA8, 12) SHOW_FRAME( + 4, + 24) - TILES(0xCCB4, 12) - SHOW_FRAME(4, 25) + TILES(0xCCB4, 12) SHOW_FRAME( + 4, + 25) - TILES(0xCCC0, 12) - SHOW_FRAME(8, 26) + TILES(0xCCC0, 12) SHOW_FRAME( + 8, + 26) - TILES(0xCCCC, 20) - SHOW_FRAME(3, 27) + TILES(0xCCCC, 20) SHOW_FRAME( + 3, + 27) - TILES(0xCCE0, 20) - SHOW_FRAME(3, 28) + TILES(0xCCE0, 20) SHOW_FRAME( + 3, + 28) - TILES(0xCCF4, 16) - SHOW_FRAME(30, 29) + TILES( + 0xCCF4, + 16) + SHOW_FRAME( + 30, + 29) - END() + END() }; -const s32 * const anim_0321[1] = { +const s32 *const anim_0321[1] = { anim_0321__v0_l0, }; const s32 anim_0322__v0_l0[] = { // 0x080E977C - PALETTE(7, 16, 0x30) - TILES(0xCD04, 12) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xCD04, 12) SHOW_FRAME(2, 0) - TILES(0xCD10, 20) - SHOW_FRAME(5, 1) + TILES(0xCD10, 20) SHOW_FRAME(5, 1) - TILES(0xCD24, 16) - SHOW_FRAME(5, 2) + TILES(0xCD24, 16) SHOW_FRAME(5, 2) - TILES(0xCD34, 16) - SHOW_FRAME(5, 3) + TILES(0xCD34, 16) SHOW_FRAME(5, 3) - TILES(0xCD44, 12) - SHOW_FRAME(20, 4) + TILES(0xCD44, 12) SHOW_FRAME(20, 4) - TILES(0xCD50, 16) - SHOW_FRAME(2, 5) + TILES(0xCD50, 16) SHOW_FRAME(2, 5) - TILES(0xCD60, 24) - SHOW_FRAME(4, 6) + TILES(0xCD60, 24) SHOW_FRAME(4, 6) - TILES(0xCD78, 24) - SHOW_FRAME(4, 7) + TILES(0xCD78, 24) SHOW_FRAME(4, 7) - TILES(0xCD90, 24) - SHOW_FRAME(4, 8) + TILES(0xCD90, 24) SHOW_FRAME(4, 8) - TILES(0xCD78, 24) - SHOW_FRAME(4, 7) + TILES(0xCD78, 24) SHOW_FRAME(4, 7) - TILES(0xCD60, 24) - SHOW_FRAME(4, 6) + TILES(0xCD60, 24) SHOW_FRAME(4, 6) - TILES(0xCD78, 24) - SHOW_FRAME(4, 7) + TILES(0xCD78, 24) SHOW_FRAME(4, 7) - TILES(0xCD90, 24) - SHOW_FRAME(4, 8) + TILES(0xCD90, 24) SHOW_FRAME(4, 8) - TILES(0xCD78, 24) - SHOW_FRAME(4, 7) + TILES(0xCD78, 24) SHOW_FRAME(4, 7) - END() + END() }; const s32 anim_0322__v1_l0[] = { // 0x080E98A4 - PALETTE(7, 16, 0x30) - TILES(0xCDA8, 25) - SHOW_FRAME(2, 9) + PALETTE(7, 16, 0x30) TILES(0xCDA8, 25) SHOW_FRAME(2, 9) - END() + END() }; -const s32 * const anim_0322[2] = { +const s32 *const anim_0322[2] = { anim_0322__v0_l0, anim_0322__v1_l0, }; const s32 anim_0323__v0_l0[] = { // 0x080E98D0 - PALETTE(7, 16, 0x90) - TILES(0xCDC1, 24) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x90) TILES(0xCDC1, 24) SHOW_FRAME(3, 0) - TILES(0xCDD9, 24) - SHOW_FRAME(3, 1) + TILES(0xCDD9, 24) SHOW_FRAME(3, 1) - TILES(0xCDF1, 24) - SHOW_FRAME(3, 2) + TILES(0xCDF1, 24) SHOW_FRAME(3, 2) - TILES(0xCE09, 24) - SHOW_FRAME(3, 3) + TILES(0xCE09, 24) SHOW_FRAME(3, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0323[1] = { +const s32 *const anim_0323[1] = { anim_0323__v0_l0, }; const s32 anim_0324__v0_l0[] = { // 0x080E9938 - PALETTE(7, 16, 0xA0) - TILES(0xCE21, 24) - SHOW_FRAME(20, 0) + PALETTE(7, 16, 0xA0) TILES(0xCE21, 24) SHOW_FRAME(20, 0) - TILES(0xCE39, 36) - SHOW_FRAME(10, 1) + TILES(0xCE39, 36) SHOW_FRAME(10, 1) - TILES(0xCE5D, 36) - SHOW_FRAME(8, 2) + TILES(0xCE5D, 36) SHOW_FRAME(8, 2) - TILES(0xCE81, 35) - SHOW_FRAME(7, 3) + TILES(0xCE81, 35) SHOW_FRAME(7, 3) - TILES(0xCEA4, 42) - SHOW_FRAME(5, 4) + TILES(0xCEA4, 42) SHOW_FRAME(5, 4) - TILES(0xCECE, 30) - SHOW_FRAME(3, 5) - TILES(0xCEEC, 30) - SHOW_FRAME(2, 6) + TILES(0xCECE, 30) SHOW_FRAME(3, 5) TILES(0xCEEC, 30) SHOW_FRAME(2, 6) - TILES(0xCF0A, 30) - SHOW_FRAME(2, 7) + TILES(0xCF0A, 30) SHOW_FRAME(2, 7) - TILES(0xCF28, 30) - SHOW_FRAME(2, 8) + TILES(0xCF28, 30) SHOW_FRAME(2, 8) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0324[1] = { +const s32 *const anim_0324[1] = { anim_0324__v0_l0, }; const s32 anim_0325__v0_l0[] = { // 0x080E9A04 - PALETTE(7, 16, 0x30) - TILES(0xCF46, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xCF46, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0xCF86, 64) - SHOW_FRAME(2, 1) + TILES(0xCF86, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v1_l0[] = { // 0x080E9A4C - PALETTE(7, 16, 0x30) - TILES(0xCFC6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(7, 16, 0x30) TILES(0xCFC6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0xD006, 64) - SHOW_FRAME(2, 3) + TILES(0xD006, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v2_l0[] = { // 0x080E9A94 - PALETTE(7, 16, 0x30) - TILES(0xD046, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(7, 16, 0x30) TILES(0xD046, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0xD086, 64) - SHOW_FRAME(2, 5) + TILES(0xD086, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v3_l0[] = { // 0x080E9ADC - PALETTE(7, 16, 0x30) - TILES(0xD0C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(7, 16, 0x30) TILES(0xD0C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0xD106, 64) - SHOW_FRAME(2, 7) + TILES(0xD106, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v4_l0[] = { // 0x080E9B24 - PALETTE(7, 16, 0x30) - TILES(0xD146, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(7, 16, 0x30) TILES(0xD146, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0xD186, 64) - SHOW_FRAME(2, 9) + TILES(0xD186, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v5_l0[] = { // 0x080E9B6C - PALETTE(7, 16, 0x30) - TILES(0xD1C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(7, 16, 0x30) TILES(0xD1C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0xD206, 64) - SHOW_FRAME(2, 11) + TILES(0xD206, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v6_l0[] = { // 0x080E9BB4 - PALETTE(7, 16, 0x30) - TILES(0xD246, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(7, 16, 0x30) TILES(0xD246, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0xD286, 64) - SHOW_FRAME(2, 13) + TILES(0xD286, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v7_l0[] = { // 0x080E9BFC - PALETTE(7, 16, 0x30) - TILES(0xD2C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(7, 16, 0x30) TILES(0xD2C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0xD306, 64) - SHOW_FRAME(2, 15) + TILES(0xD306, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0325__v8_l0[] = { // 0x080E9C44 - PALETTE(7, 16, 0x30) - TILES(0xD346, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 16) + PALETTE(7, 16, 0x30) TILES(0xD346, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 16) - TILES(0xD386, 64) - SHOW_FRAME(2, 17) + TILES(0xD386, 64) SHOW_FRAME(2, 17) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0325[9] = { - anim_0325__v0_l0, - anim_0325__v1_l0, - anim_0325__v2_l0, - anim_0325__v3_l0, - anim_0325__v4_l0, - anim_0325__v5_l0, - anim_0325__v6_l0, - anim_0325__v7_l0, - anim_0325__v8_l0, +const s32 *const anim_0325[9] = { + anim_0325__v0_l0, anim_0325__v1_l0, anim_0325__v2_l0, anim_0325__v3_l0, anim_0325__v4_l0, + anim_0325__v5_l0, anim_0325__v6_l0, anim_0325__v7_l0, anim_0325__v8_l0, }; const s32 anim_0326__v0_l0[] = { // 0x080E9CB0 - PALETTE(7, 16, 0x30) - TILES(0xD3C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xD3C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0xD406, 64) - SHOW_FRAME(2, 1) + TILES(0xD406, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v1_l0[] = { // 0x080E9CF8 - PALETTE(7, 16, 0x30) - TILES(0xD446, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 2) + PALETTE(7, 16, 0x30) TILES(0xD446, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 2) - TILES(0xD486, 64) - SHOW_FRAME(2, 3) + TILES(0xD486, 64) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v2_l0[] = { // 0x080E9D40 - PALETTE(7, 16, 0x30) - TILES(0xD4C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 4) + PALETTE(7, 16, 0x30) TILES(0xD4C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 4) - TILES(0xD506, 64) - SHOW_FRAME(2, 5) + TILES(0xD506, 64) SHOW_FRAME(2, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v3_l0[] = { // 0x080E9D88 - PALETTE(7, 16, 0x30) - TILES(0xD546, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 6) + PALETTE(7, 16, 0x30) TILES(0xD546, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 6) - TILES(0xD586, 64) - SHOW_FRAME(2, 7) + TILES(0xD586, 64) SHOW_FRAME(2, 7) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v4_l0[] = { // 0x080E9DD0 - PALETTE(7, 16, 0x30) - TILES(0xD5C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 8) + PALETTE(7, 16, 0x30) TILES(0xD5C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 8) - TILES(0xD606, 64) - SHOW_FRAME(2, 9) + TILES(0xD606, 64) SHOW_FRAME(2, 9) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v5_l0[] = { // 0x080E9E18 - PALETTE(7, 16, 0x30) - TILES(0xD646, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 10) + PALETTE(7, 16, 0x30) TILES(0xD646, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 10) - TILES(0xD686, 64) - SHOW_FRAME(2, 11) + TILES(0xD686, 64) SHOW_FRAME(2, 11) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v6_l0[] = { // 0x080E9E60 - PALETTE(7, 16, 0x30) - TILES(0xD6C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 12) + PALETTE(7, 16, 0x30) TILES(0xD6C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 12) - TILES(0xD706, 64) - SHOW_FRAME(2, 13) + TILES(0xD706, 64) SHOW_FRAME(2, 13) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0326__v7_l0[] = { // 0x080E9EA8 - PALETTE(7, 16, 0x30) - TILES(0xD746, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 14) + PALETTE(7, 16, 0x30) TILES(0xD746, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 14) - TILES(0xD786, 64) - SHOW_FRAME(2, 15) + TILES(0xD786, 64) SHOW_FRAME(2, 15) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0326[8] = { - anim_0326__v0_l0, - anim_0326__v1_l0, - anim_0326__v2_l0, - anim_0326__v3_l0, - anim_0326__v4_l0, - anim_0326__v5_l0, - anim_0326__v6_l0, - anim_0326__v7_l0, +const s32 *const anim_0326[8] = { + anim_0326__v0_l0, anim_0326__v1_l0, anim_0326__v2_l0, anim_0326__v3_l0, + anim_0326__v4_l0, anim_0326__v5_l0, anim_0326__v6_l0, anim_0326__v7_l0, }; const s32 anim_0327__v0_l0[] = { // 0x080E9F10 - PALETTE(7, 16, 0x30) - TILES(0xD7C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) - TILES(0xD806, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 1) + PALETTE(7, 16, 0x30) TILES(0xD7C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) TILES(0xD806, 64) HITBOX(0, -10, -10, 10, 10) + SHOW_FRAME(2, 1) - TILES(0xD846, 64) - SHOW_FRAME(2, 2) + TILES(0xD846, 64) SHOW_FRAME(2, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0327__v1_l0[] = { // 0x080E9F78 - PALETTE(7, 16, 0x30) - TILES(0xD7C6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(4, 0) + PALETTE(7, 16, 0x30) TILES(0xD7C6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0327[2] = { +const s32 *const anim_0327[2] = { anim_0327__v0_l0, anim_0327__v1_l0, }; const s32 anim_0328__v0_l0[] = { // 0x080E9FB0 - PALETTE(7, 16, 0x30) - TILES(0xD886, 64) - HITBOX(0, -20, -20, 20, 20) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xD886, 64) HITBOX(0, -20, -20, 20, 20) SHOW_FRAME(2, 0) - TILES(0xD8C6, 64) - SHOW_FRAME(2, 1) + TILES(0xD8C6, 64) SHOW_FRAME(2, 1) - TILES(0xD906, 64) - SHOW_FRAME(2, 2) + TILES(0xD906, 64) SHOW_FRAME(2, 2) - TILES(0xD946, 64) - SHOW_FRAME(2, 3) + TILES(0xD946, 64) SHOW_FRAME(2, 3) - TILES(0xD986, 64) - SHOW_FRAME(2, 4) + TILES(0xD986, 64) SHOW_FRAME(2, 4) - TILES(0xD9C6, 64) - SHOW_FRAME(2, 5) + TILES(0xD9C6, 64) SHOW_FRAME(2, 5) - TILES(0xDA06, 64) - SHOW_FRAME(2, 6) + TILES(0xDA06, 64) SHOW_FRAME(2, 6) - TILES(0xDA46, 64) - SHOW_FRAME(2, 7) + TILES(0xDA46, 64) SHOW_FRAME(2, 7) - TILES(0xDA86, 64) - SHOW_FRAME(2, 8) + TILES(0xDA86, 64) SHOW_FRAME(2, 8) - TILES(0xDAC6, 64) - SHOW_FRAME(2, 9) + TILES(0xDAC6, 64) SHOW_FRAME(2, 9) - TILES(0xDB06, 64) - SHOW_FRAME(2, 10) + TILES(0xDB06, 64) SHOW_FRAME(2, 10) - JUMP_BACK(61) + JUMP_BACK(61) }; -const s32 * const anim_0328[1] = { +const s32 *const anim_0328[1] = { anim_0328__v0_l0, }; const s32 anim_0329__v0_l0[] = { // 0x080EA0B0 - PALETTE(7, 16, 0x30) - TILES(0xDB46, 64) - HITBOX(0, -14, -14, 14, 14) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xDB46, 64) HITBOX(0, -14, -14, 14, 14) SHOW_FRAME(1, 0) - TILES(0xDB86, 64) - SHOW_FRAME(2, 1) + TILES(0xDB86, 64) SHOW_FRAME(2, 1) - TILES(0xDBC6, 64) - SHOW_FRAME(2, 2) + TILES(0xDBC6, 64) SHOW_FRAME(2, 2) - TILES(0xDC06, 64) - SHOW_FRAME(2, 3) + TILES(0xDC06, 64) SHOW_FRAME(2, 3) - TILES(0xDC46, 64) - SHOW_FRAME(2, 4) + TILES(0xDC46, 64) SHOW_FRAME(2, 4) - TILES(0xDC86, 64) - SHOW_FRAME(2, 5) + TILES(0xDC86, 64) SHOW_FRAME(2, 5) - TILES(0xDCC6, 64) - SHOW_FRAME(2, 6) + TILES(0xDCC6, 64) SHOW_FRAME(2, 6) - TILES(0xDD06, 64) - SHOW_FRAME(2, 7) + TILES(0xDD06, 64) SHOW_FRAME(2, 7) - TILES(0xDD46, 64) - SHOW_FRAME(2, 8) + TILES(0xDD46, 64) SHOW_FRAME(2, 8) - TILES(0xDD86, 64) - SHOW_FRAME(2, 9) + TILES(0xDD86, 64) SHOW_FRAME(2, 9) - TILES(0xDDC6, 64) - SHOW_FRAME(2, 10) + TILES(0xDDC6, 64) SHOW_FRAME(2, 10) - TILES(0xDE06, 64) - SHOW_FRAME(2, 11) + TILES(0xDE06, 64) SHOW_FRAME(2, 11) - TILES(0xDE46, 64) - SHOW_FRAME(2, 12) + TILES(0xDE46, 64) SHOW_FRAME(2, 12) - TILES(0xDB86, 64) - SHOW_FRAME(2, 1) + TILES(0xDB86, 64) SHOW_FRAME(2, 1) - TILES(0xDBC6, 64) - SHOW_FRAME(2, 2) + TILES(0xDBC6, 64) SHOW_FRAME(2, 2) - TILES(0xDC06, 64) - SHOW_FRAME(2, 3) + TILES(0xDC06, 64) SHOW_FRAME(2, 3) - TILES(0xDC46, 64) - SHOW_FRAME(2, 4) + TILES(0xDC46, 64) SHOW_FRAME(2, 4) - TILES(0xDC86, 64) - SHOW_FRAME(2, 5) + TILES(0xDC86, 64) SHOW_FRAME(2, 5) - TILES(0xDCC6, 64) - SHOW_FRAME(2, 6) + TILES(0xDCC6, 64) SHOW_FRAME(2, 6) - TILES(0xDD06, 64) - SHOW_FRAME(2, 7) + TILES(0xDD06, 64) SHOW_FRAME(2, 7) - TILES(0xDD46, 64) - SHOW_FRAME(2, 8) + TILES(0xDD46, 64) SHOW_FRAME(2, 8) - TILES(0xDD86, 64) - SHOW_FRAME(2, 9) + TILES(0xDD86, 64) SHOW_FRAME(2, 9) - TILES(0xDE86, 64) - HITBOX(0, 0, 0, 0, 0) - SHOW_FRAME(1, 13) + TILES(0xDE86, 64) HITBOX(0, 0, 0, 0, 0) + SHOW_FRAME(1, 13) - END() + END() }; -const s32 * const anim_0329[1] = { +const s32 *const anim_0329[1] = { anim_0329__v0_l0, }; const s32 anim_0330__v0_l0[] = { // 0x080EA2A8 - PALETTE(7, 16, 0x30) - TILES(0xDEC6, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xDEC6, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(3, 0) - TILES(0xDF06, 64) - SHOW_FRAME(3, 1) + TILES(0xDF06, 64) SHOW_FRAME(3, 1) - TILES(0xDF46, 64) - SHOW_FRAME(3, 2) + TILES(0xDF46, 64) SHOW_FRAME(3, 2) - TILES(0xDF86, 64) - SHOW_FRAME(3, 3) + TILES(0xDF86, 64) SHOW_FRAME(3, 3) - TILES(0xDFC6, 64) - SHOW_FRAME(3, 4) + TILES(0xDFC6, 64) SHOW_FRAME(3, 4) - TILES(0xE006, 64) - SHOW_FRAME(3, 5) + TILES(0xE006, 64) SHOW_FRAME(3, 5) - TILES(0xE046, 64) - SHOW_FRAME(3, 6) + TILES(0xE046, 64) SHOW_FRAME(3, 6) - JUMP_BACK(41) + JUMP_BACK(41) }; -const s32 * const anim_0330[1] = { +const s32 *const anim_0330[1] = { anim_0330__v0_l0, }; const s32 anim_0331__v0_l0[] = { // 0x080EA358 - PALETTE(7, 16, 0x30) - TILES(0xE086, 64) - SHOW_FRAME(6, 0) + PALETTE(7, 16, 0x30) TILES(0xE086, 64) SHOW_FRAME(6, 0) - TILES(0xE0C6, 64) - SHOW_FRAME(3, 1) + TILES(0xE0C6, 64) SHOW_FRAME(3, 1) - TILES(0xE106, 64) - SHOW_FRAME(8, 2) + TILES(0xE106, 64) SHOW_FRAME(8, 2) - TILES(0xE146, 64) - SHOW_FRAME(5, 3) - TILES(0xE186, 64) - SHOW_FRAME(3, 4) + TILES(0xE146, 64) SHOW_FRAME(5, 3) TILES(0xE186, 64) SHOW_FRAME(3, 4) - TILES(0xE1C6, 64) - SHOW_FRAME(3, 5) + TILES(0xE1C6, 64) SHOW_FRAME(3, 5) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0331__v1_l0[] = { // 0x080EA3E4 - PALETTE(7, 16, 0x30) - TILES(0xE086, 64) - SHOW_FRAME(6, 0) + PALETTE(7, 16, 0x30) TILES(0xE086, 64) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0331[2] = { +const s32 *const anim_0331[2] = { anim_0331__v0_l0, anim_0331__v1_l0, }; const s32 anim_0332__v0_l0[] = { // 0x080EA410 - PALETTE(7, 16, 0x30) - TILES(0xE206, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xE206, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0xE246, 64) - SHOW_FRAME(2, 1) + TILES(0xE246, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0332__v1_l0[] = { // 0x080EA458 - PALETTE(7, 16, 0x30) - TILES(0xE286, 64) - SHOW_FRAME(2, 2) + PALETTE(7, 16, 0x30) TILES(0xE286, 64) SHOW_FRAME(2, 2) - TILES(0xE2C6, 64) - SHOW_FRAME(2, 3) + TILES(0xE2C6, 64) SHOW_FRAME(2, 3) - TILES(0xE306, 64) - SHOW_FRAME(2, 4) + TILES(0xE306, 64) SHOW_FRAME(2, 4) - TILES(0xE346, 64) - SHOW_FRAME(2, 5) + TILES(0xE346, 64) SHOW_FRAME(2, 5) - TILES(0xE386, 64) - SHOW_FRAME(2, 6) + TILES(0xE386, 64) SHOW_FRAME(2, 6) - TILES(0xE3C6, 64) - SHOW_FRAME(2, 7) + TILES(0xE3C6, 64) SHOW_FRAME(2, 7) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0332[2] = { +const s32 *const anim_0332[2] = { anim_0332__v0_l0, anim_0332__v1_l0, }; const s32 anim_0333__v0_l0[] = { // 0x080EA4EC - PALETTE(7, 16, 0xA0) - TILES(0xE406, 18) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0xA0) TILES(0xE406, 18) SHOW_FRAME(3, 0) - TILES(0xE418, 18) - SHOW_FRAME(3, 1) + TILES(0xE418, 18) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0333__v1_l0[] = { // 0x080EA528 - PALETTE(7, 16, 0xA0) - TILES(0xE42A, 15) - SHOW_FRAME(3, 2) + PALETTE(7, 16, 0xA0) TILES(0xE42A, 15) SHOW_FRAME(3, 2) - TILES(0xE439, 20) - SHOW_FRAME(3, 3) + TILES(0xE439, 20) SHOW_FRAME(3, 3) - TILES(0xE44D, 16) - SHOW_FRAME(3, 4) + TILES(0xE44D, 16) SHOW_FRAME(3, 4) - TILES(0xE45D, 16) - SHOW_FRAME(15, 5) + TILES(0xE45D, 16) SHOW_FRAME(15, 5) - TILES(0xE46D, 15) - SHOW_FRAME(3, 6) + TILES(0xE46D, 15) SHOW_FRAME(3, 6) - TILES(0xE47C, 15) - SHOW_FRAME(3, 7) + TILES(0xE47C, 15) SHOW_FRAME(3, 7) - TILES(0xE48B, 15) - SHOW_FRAME(3, 8) + TILES(0xE48B, 15) SHOW_FRAME(3, 8) - TILES(0xE49A, 20) - SHOW_FRAME(3, 9) + TILES(0xE49A, 20) SHOW_FRAME(3, 9) - TILES(0xE4AE, 20) - SHOW_FRAME(3, 10) - TILES(0xE4C2, 25) - SHOW_FRAME(25, 11) + TILES(0xE4AE, 20) SHOW_FRAME(3, 10) TILES(0xE4C2, 25) SHOW_FRAME(25, 11) - TILES(0xE4DB, 25) - SHOW_FRAME(6, 12) + TILES(0xE4DB, 25) SHOW_FRAME(6, 12) - TILES(0xE4F4, 25) - SHOW_FRAME(6, 13) + TILES(0xE4F4, 25) SHOW_FRAME(6, 13) - TILES(0xE4DB, 25) - SHOW_FRAME(6, 12) + TILES(0xE4DB, 25) SHOW_FRAME(6, 12) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0333[2] = { +const s32 *const anim_0333[2] = { anim_0333__v0_l0, anim_0333__v1_l0, }; const s32 anim_0334__v0_l0[] = { // 0x080EA648 - PALETTE(7, 16, 0x30) - TILES(0xE50D, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xE50D, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(3, 0) - TILES(0xE51D, 16) - SHOW_FRAME(3, 1) + TILES(0xE51D, 16) SHOW_FRAME(3, 1) - TILES(0xE52D, 16) - SHOW_FRAME(3, 2) + TILES(0xE52D, 16) SHOW_FRAME(3, 2) - TILES(0xE53D, 16) - SHOW_FRAME(3, 3) + TILES(0xE53D, 16) SHOW_FRAME(3, 3) - TILES(0xE54D, 16) - SHOW_FRAME(3, 4) + TILES(0xE54D, 16) SHOW_FRAME(3, 4) - TILES(0xE55D, 16) - SHOW_FRAME(3, 5) + TILES(0xE55D, 16) SHOW_FRAME(3, 5) - TILES(0xE56D, 16) - SHOW_FRAME(3, 6) + TILES(0xE56D, 16) SHOW_FRAME(3, 6) - TILES(0xE57D, 16) - SHOW_FRAME(3, 7) + TILES(0xE57D, 16) SHOW_FRAME(3, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0334__v1_l0[] = { // 0x080EA708 - PALETTE(7, 16, 0x30) - TILES(0xE58D, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(3, 8) + PALETTE(7, 16, 0x30) TILES(0xE58D, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(3, 8) - TILES(0xE5A1, 20) - SHOW_FRAME(3, 9) + TILES(0xE5A1, 20) SHOW_FRAME(3, 9) - TILES(0xE5B5, 20) - SHOW_FRAME(3, 10) + TILES(0xE5B5, 20) SHOW_FRAME(3, 10) - TILES(0xE5C9, 20) - SHOW_FRAME(3, 11) + TILES(0xE5C9, 20) SHOW_FRAME(3, 11) - TILES(0xE5DD, 20) - SHOW_FRAME(3, 12) + TILES(0xE5DD, 20) SHOW_FRAME(3, 12) - TILES(0xE5F1, 20) - SHOW_FRAME(3, 13) + TILES(0xE5F1, 20) SHOW_FRAME(3, 13) - TILES(0xE605, 20) - SHOW_FRAME(3, 14) + TILES(0xE605, 20) SHOW_FRAME(3, 14) - TILES(0xE619, 20) - SHOW_FRAME(3, 15) + TILES(0xE619, 20) SHOW_FRAME(3, 15) - JUMP_BACK(46) + JUMP_BACK(46) }; const s32 anim_0334__v2_l0[] = { // 0x080EA7C8 - PALETTE(7, 16, 0x30) - TILES(0xE62D, 20) - HITBOX(0, -6, -18, 6, 10) - SHOW_FRAME(3, 16) + PALETTE(7, 16, 0x30) TILES(0xE62D, 20) HITBOX(0, -6, -18, 6, 10) SHOW_FRAME(3, 16) - TILES(0xE641, 20) - SHOW_FRAME(3, 17) + TILES(0xE641, 20) SHOW_FRAME(3, 17) - TILES(0xE655, 20) - SHOW_FRAME(3, 18) + TILES(0xE655, 20) SHOW_FRAME(3, 18) - TILES(0xE669, 20) - SHOW_FRAME(3, 19) + TILES(0xE669, 20) SHOW_FRAME(3, 19) - TILES(0xE67D, 20) - SHOW_FRAME(3, 20) + TILES(0xE67D, 20) SHOW_FRAME(3, 20) - TILES(0xE691, 20) - SHOW_FRAME(3, 21) + TILES(0xE691, 20) SHOW_FRAME(3, 21) - TILES(0xE6A5, 20) - SHOW_FRAME(3, 22) + TILES(0xE6A5, 20) SHOW_FRAME(3, 22) - TILES(0xE6B9, 20) - SHOW_FRAME(3, 23) + TILES(0xE6B9, 20) SHOW_FRAME(3, 23) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0334[3] = { +const s32 *const anim_0334[3] = { anim_0334__v0_l0, anim_0334__v1_l0, anim_0334__v2_l0, }; const s32 anim_0335__v0_l0[] = { // 0x080EA894 - PALETTE(7, 16, 0x30) - TILES(0xE6CD, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xE6CD, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 0) - TILES(0xE6DD, 16) - SHOW_FRAME(2, 1) + TILES(0xE6DD, 16) SHOW_FRAME(2, 1) - TILES(0xE6ED, 16) - HITBOX(0, -74, 29, -74, 29) - SHOW_FRAME(4, 2) + TILES(0xE6ED, 16) HITBOX(0, -74, 29, -74, 29) SHOW_FRAME(4, 2) - TILES(0xE6FD, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 3) + TILES(0xE6FD, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 3) - TILES(0xE70D, 12) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 4) - TILES(0xE719, 20) - HITBOX(0, -4, -12, 6, 16) - SHOW_FRAME(2, 5) + TILES(0xE70D, 12) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 4) TILES(0xE719, 20) HITBOX(0, -4, -12, 6, 16) + SHOW_FRAME(2, 5) - TILES(0xE72D, 20) - SHOW_FRAME(2, 6) + TILES(0xE72D, 20) SHOW_FRAME(2, 6) - TILES(0xE741, 20) - HITBOX(0, -57, 26, -57, 26) - SHOW_FRAME(2, 7) + TILES(0xE741, 20) HITBOX(0, -57, 26, -57, 26) SHOW_FRAME(2, 7) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0335[1] = { +const s32 *const anim_0335[1] = { anim_0335__v0_l0, }; const s32 anim_0336__v0_l0[] = { // 0x080EA994 - PALETTE(7, 16, 0x30) - TILES(0xE755, 24) - HITBOX(0, -6, -14, 4, 14) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xE755, 24) HITBOX(0, -6, -14, 4, 14) SHOW_FRAME(3, 0) - TILES(0xE76D, 24) - SHOW_FRAME(3, 1) + TILES(0xE76D, 24) SHOW_FRAME(3, 1) - TILES(0xE785, 24) - SHOW_FRAME(3, 2) + TILES(0xE785, 24) SHOW_FRAME(3, 2) - TILES(0xE79D, 20) - HITBOX(0, -6, -14, 6, 12) - SHOW_FRAME(2, 3) + TILES(0xE79D, 20) HITBOX(0, -6, -14, 6, 12) SHOW_FRAME(2, 3) - TILES(0xE7B1, 24) - HITBOX(0, -6, -14, 6, 14) - SHOW_FRAME(2, 4) + TILES(0xE7B1, 24) HITBOX(0, -6, -14, 6, 14) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0336[1] = { +const s32 *const anim_0336[1] = { anim_0336__v0_l0, }; const s32 anim_0337__v0_l0[] = { // 0x080EAA30 - PALETTE(7, 16, 0x30) - TILES(0xE7C9, 64) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xE7C9, 64) SHOW_FRAME(2, 0) - TILES(0xE809, 64) - SHOW_FRAME(2, 1) + TILES(0xE809, 64) SHOW_FRAME(2, 1) - TILES(0xE849, 64) - SHOW_FRAME(2, 2) + TILES(0xE849, 64) SHOW_FRAME(2, 2) - TILES(0xE889, 64) - SHOW_FRAME(2, 3) + TILES(0xE889, 64) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0337[1] = { +const s32 *const anim_0337[1] = { anim_0337__v0_l0, }; const s32 anim_0338__v0_l0[] = { // 0x080EAA98 - PALETTE(7, 16, 0x30) - TILES(0xE8C9, 24) - HITBOX(0, -30, -20, -4, -4) - CMD_12(0x10) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xE8C9, 24) HITBOX(0, -30, -20, -4, -4) CMD_12(0x10) SHOW_FRAME(3, 0) - TILES(0xE8E1, 20) - HITBOX(0, -22, -20, -2, -4) - CMD_12(0x10) - SHOW_FRAME(3, 1) + TILES(0xE8E1, 20) HITBOX(0, -22, -20, -2, -4) CMD_12(0x10) SHOW_FRAME(3, 1) - TILES(0xE8F5, 16) - HITBOX(0, -4, -20, 2, -4) - CMD_12(0x10) - SHOW_FRAME(3, 2) + TILES(0xE8F5, 16) HITBOX(0, -4, -20, 2, -4) CMD_12(0x10) SHOW_FRAME(3, 2) - TILES(0xE905, 16) - HITBOX(0, 2, -20, 8, -4) - CMD_12(0x10) - SHOW_FRAME(3, 3) + TILES(0xE905, 16) HITBOX(0, 2, -20, 8, -4) CMD_12(0x10) SHOW_FRAME(3, 3) - TILES(0xE915, 16) - HITBOX(0, 3, -20, 23, -4) - CMD_12(0x10) - SHOW_FRAME(3, 4) + TILES(0xE915, 16) HITBOX(0, 3, -20, 23, -4) CMD_12(0x10) SHOW_FRAME(3, 4) - TILES(0xE925, 20) - HITBOX(0, 4, -20, 30, -4) - CMD_12(0x10) - SHOW_FRAME(3, 5) + TILES(0xE925, 20) HITBOX(0, 4, -20, 30, -4) CMD_12(0x10) SHOW_FRAME(3, 5) - TILES(0xE939, 20) - HITBOX(0, 4, -20, 24, -4) - CMD_12(0x13) - SHOW_FRAME(3, 6) + TILES(0xE939, 20) HITBOX(0, 4, -20, 24, -4) CMD_12(0x13) SHOW_FRAME(3, 6) - TILES(0xE94D, 12) - HITBOX(0, 3, -20, 9, -4) - CMD_12(0x13) - SHOW_FRAME(3, 7) + TILES(0xE94D, 12) HITBOX(0, 3, -20, 9, -4) CMD_12(0x13) SHOW_FRAME(3, 7) - TILES(0xE959, 16) - HITBOX(0, -8, -20, -2, -4) - CMD_12(0x13) - SHOW_FRAME(3, 8) + TILES(0xE959, 16) HITBOX(0, -8, -20, -2, -4) CMD_12(0x13) SHOW_FRAME(3, 8) - TILES(0xE969, 20) - HITBOX(0, -22, -20, -2, -4) - CMD_12(0x13) - SHOW_FRAME(3, 9) + TILES(0xE969, 20) HITBOX(0, -22, -20, -2, -4) CMD_12(0x13) SHOW_FRAME(3, 9) - JUMP_BACK(103) + JUMP_BACK(103) }; const s32 anim_0338__v1_l0[] = { // 0x080EAC3C - PALETTE(7, 16, 0x30) - TILES(0xE97D, 24) - HITBOX(0, -8, 32, 8, 8) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 10) + PALETTE(7, 16, 0x30) TILES(0xE97D, 24) HITBOX(0, -8, 32, 8, 8) SET_PRIORITY(0x2) SHOW_FRAME(3, 10) - TILES(0xE995, 20) - HITBOX(0, -8, 23, 8, 9) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 11) + TILES(0xE995, 20) HITBOX(0, -8, 23, 8, 9) SET_PRIORITY(0x2) SHOW_FRAME(3, 11) - TILES(0xE9A9, 16) - HITBOX(0, -8, 9, 8, -3) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 12) + TILES(0xE9A9, 16) HITBOX(0, -8, 9, 8, -3) SET_PRIORITY(0x2) SHOW_FRAME(3, 12) - TILES(0xE9B9, 16) - HITBOX(0, -8, 2, 8, -10) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 13) + TILES(0xE9B9, 16) HITBOX(0, -8, 2, 8, -10) SET_PRIORITY(0x2) SHOW_FRAME(3, 13) - TILES(0xE9C9, 16) - HITBOX(0, -8, 1, 8, -17) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 14) + TILES(0xE9C9, 16) HITBOX(0, -8, 1, 8, -17) SET_PRIORITY(0x2) SHOW_FRAME(3, 14) - TILES(0xE9D9, 20) - HITBOX(0, -8, -4, 8, -28) - SET_PRIORITY(0x2) - SHOW_FRAME(3, 15) + TILES(0xE9D9, 20) HITBOX(0, -8, -4, 8, -28) SET_PRIORITY(0x2) SHOW_FRAME(3, 15) - TILES(0xE9ED, 20) - HITBOX(0, -8, -8, 8, -22) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 16) + TILES(0xE9ED, 20) HITBOX(0, -8, -8, 8, -22) SET_PRIORITY(0x3) SHOW_FRAME(3, 16) - TILES(0xEA01, 12) - HITBOX(0, -8, 2, 8, -10) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 17) + TILES(0xEA01, 12) HITBOX(0, -8, 2, 8, -10) SET_PRIORITY(0x3) SHOW_FRAME(3, 17) - TILES(0xEA0D, 16) - HITBOX(0, -9, 9, 7, -3) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 18) + TILES(0xEA0D, 16) HITBOX(0, -9, 9, 7, -3) SET_PRIORITY(0x3) SHOW_FRAME(3, 18) - TILES(0xEA1D, 20) - HITBOX(0, -8, 20, 8, 2) - SET_PRIORITY(0x3) - SHOW_FRAME(3, 19) + TILES(0xEA1D, 20) HITBOX(0, -8, 20, 8, 2) SET_PRIORITY(0x3) SHOW_FRAME(3, 19) - JUMP_BACK(103) + JUMP_BACK(103) }; -const s32 * const anim_0338[2] = { +const s32 *const anim_0338[2] = { anim_0338__v0_l0, anim_0338__v1_l0, }; const s32 anim_0339__v0_l0[] = { // 0x080EADE8 - PALETTE(7, 16, 0x30) - TILES(0xEA31, 24) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(10, 0) + PALETTE(7, 16, 0x30) TILES(0xEA31, 24) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(10, 0) - TILES(0xEA49, 24) - SHOW_FRAME(10, 1) + TILES(0xEA49, 24) SHOW_FRAME(10, 1) - TILES(0xEA61, 24) - SHOW_FRAME(10, 2) + TILES(0xEA61, 24) SHOW_FRAME(10, 2) - TILES(0xEA49, 24) - SHOW_FRAME(10, 1) + TILES(0xEA49, 24) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0339__v1_l0[] = { // 0x080EAE58 - PALETTE(7, 16, 0x30) - TILES(0xEA79, 24) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(5, 3) + PALETTE(7, 16, 0x30) TILES(0xEA79, 24) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(5, 3) - TILES(0xEA91, 24) - SHOW_FRAME(5, 4) + TILES(0xEA91, 24) SHOW_FRAME(5, 4) - TILES(0xEAA9, 24) - SHOW_FRAME(5, 5) + TILES(0xEAA9, 24) SHOW_FRAME(5, 5) - TILES(0xEA91, 24) - SHOW_FRAME(5, 4) + TILES(0xEA91, 24) SHOW_FRAME(5, 4) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0339[2] = { +const s32 *const anim_0339[2] = { anim_0339__v0_l0, anim_0339__v1_l0, }; const s32 anim_0340__v0_l0[] = { // 0x080EAED0 - PALETTE(7, 16, 0x30) - TILES(0xEAC1, 25) - HITBOX(0, -6, -12, 6, 8) - SHOW_FRAME(5, 0) + PALETTE(7, 16, 0x30) TILES(0xEAC1, 25) HITBOX(0, -6, -12, 6, 8) SHOW_FRAME(5, 0) - TILES(0xEADA, 20) - SHOW_FRAME(5, 1) + TILES(0xEADA, 20) SHOW_FRAME(5, 1) - TILES(0xEAEE, 20) - SHOW_FRAME(5, 2) + TILES(0xEAEE, 20) SHOW_FRAME(5, 2) - TILES(0xEB02, 16) - SHOW_FRAME(5, 3) + TILES(0xEB02, 16) SHOW_FRAME(5, 3) - TILES(0xEB12, 25) - SHOW_FRAME(5, 4) + TILES(0xEB12, 25) SHOW_FRAME(5, 4) - TILES(0xEB2B, 20) - SHOW_FRAME(5, 5) + TILES(0xEB2B, 20) SHOW_FRAME(5, 5) - TILES(0xEB3F, 20) - SHOW_FRAME(5, 6) + TILES(0xEB3F, 20) SHOW_FRAME(5, 6) - TILES(0xEB53, 20) - SHOW_FRAME(5, 7) + TILES(0xEB53, 20) SHOW_FRAME(5, 7) - JUMP_BACK(46) + JUMP_BACK(46) }; -const s32 * const anim_0340[1] = { +const s32 *const anim_0340[1] = { anim_0340__v0_l0, }; const s32 anim_0341__v0_l0[] = { // 0x080EAF94 - PALETTE(7, 16, 0x30) - TILES(0xEB67, 24) - SHOW_FRAME(8, 0) + PALETTE(7, 16, 0x30) TILES(0xEB67, 24) SHOW_FRAME(8, 0) - TILES(0xEB7F, 24) - SHOW_FRAME(8, 1) + TILES(0xEB7F, 24) SHOW_FRAME(8, 1) - TILES(0xEB97, 24) - SHOW_FRAME(8, 2) + TILES(0xEB97, 24) SHOW_FRAME(8, 2) - TILES(0xEB7F, 24) - SHOW_FRAME(8, 1) + TILES(0xEB7F, 24) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0341[1] = { +const s32 *const anim_0341[1] = { anim_0341__v0_l0, }; const s32 anim_0342__v0_l0[] = { // 0x080EAFFC - PALETTE(7, 16, 0x30) - TILES(0xEBAF, 25) - HITBOX(0, -6, -4, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xEBAF, 25) HITBOX(0, -6, -4, 6, 16) SHOW_FRAME(2, 0) - TILES(0xEBC8, 25) - SHOW_FRAME(2, 1) + TILES(0xEBC8, 25) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0342__v1_l0[] = { // 0x080EB044 - PALETTE(7, 16, 0x30) - TILES(0xEBE1, 25) - HITBOX(0, -6, -2, 6, 16) - SHOW_FRAME(2, 2) + PALETTE(7, 16, 0x30) TILES(0xEBE1, 25) HITBOX(0, -6, -2, 6, 16) SHOW_FRAME(2, 2) - TILES(0xEBFA, 25) - SHOW_FRAME(2, 3) + TILES(0xEBFA, 25) SHOW_FRAME(2, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0342[2] = { +const s32 *const anim_0342[2] = { anim_0342__v0_l0, anim_0342__v1_l0, }; const s32 anim_0343__v0_l0[] = { // 0x080EB094 - PALETTE(7, 16, 0x30) - TILES(0xEC13, 20) - HITBOX(0, -6, -16, 6, 6) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xEC13, 20) HITBOX(0, -6, -16, 6, 6) SHOW_FRAME(2, 0) - TILES(0xEC27, 20) - HITBOX(0, -6, -20, 6, 6) - SHOW_FRAME(8, 1) + TILES(0xEC27, 20) HITBOX(0, -6, -20, 6, 6) SHOW_FRAME(8, 1) - TILES(0xEC3B, 20) - SHOW_FRAME(1, 2) + TILES(0xEC3B, 20) SHOW_FRAME(1, 2) - TILES(0xEC4F, 25) - HITBOX(0, -6, -14, 6, 12) - SHOW_FRAME(3, 3) + TILES(0xEC4F, 25) HITBOX(0, -6, -14, 6, 12) SHOW_FRAME(3, 3) - TILES(0xEC68, 25) - SHOW_FRAME(3, 4) + TILES(0xEC68, 25) SHOW_FRAME(3, 4) - TILES(0xEC81, 25) - SHOW_FRAME(3, 5) + TILES(0xEC81, 25) SHOW_FRAME(3, 5) - TILES(0xEC4F, 25) - HITBOX(0, -6, -14, 6, 12) - SHOW_FRAME(3, 3) + TILES(0xEC4F, 25) HITBOX(0, -6, -14, 6, 12) SHOW_FRAME(3, 3) - TILES(0xEC68, 25) - SHOW_FRAME(3, 4) + TILES(0xEC68, 25) SHOW_FRAME(3, 4) - TILES(0xEC81, 25) - SHOW_FRAME(3, 5) + TILES(0xEC81, 25) SHOW_FRAME(3, 5) - TILES(0xEC4F, 25) - HITBOX(0, -6, -14, 6, 12) - SHOW_FRAME(3, 3) + TILES(0xEC4F, 25) HITBOX(0, -6, -14, 6, 12) SHOW_FRAME(3, 3) - TILES(0xEC68, 25) - SHOW_FRAME(3, 4) + TILES(0xEC68, 25) SHOW_FRAME(3, 4) - TILES(0xEC81, 25) - SHOW_FRAME(3, 5) + TILES(0xEC81, 25) SHOW_FRAME(3, 5) - TILES(0xEC9A, 20) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(1, 6) - TILES(0xECAE, 30) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(3, 7) + TILES(0xEC9A, 20) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(1, 6) TILES(0xECAE, 30) + HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(3, 7) - TILES(0xECCC, 30) - SHOW_FRAME(3, 8) + TILES(0xECCC, 30) SHOW_FRAME(3, 8) - TILES(0xECEA, 30) - SHOW_FRAME(3, 9) + TILES(0xECEA, 30) SHOW_FRAME(3, 9) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0343[1] = { +const s32 *const anim_0343[1] = { anim_0343__v0_l0, }; const s32 anim_0348__v0_l0[] = { // 0x080EB240 - PALETTE(7, 16, 0x30) - TILES(0xED08, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xED08, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xED1C, 24) - HITBOX(0, 0, -12, 14, 16) - SHOW_FRAME(1, 1) + TILES(0xED1C, 24) HITBOX(0, 0, -12, 14, 16) SHOW_FRAME(1, 1) - TILES(0xED34, 20) - HITBOX(0, 2, -12, 14, 16) - SHOW_FRAME(1, 2) + TILES(0xED34, 20) HITBOX(0, 2, -12, 14, 16) SHOW_FRAME(1, 2) - TILES(0xED48, 35) - HITBOX(0, 6, -12, 18, 16) - SHOW_FRAME(1, 3) + TILES(0xED48, 35) HITBOX(0, 6, -12, 18, 16) SHOW_FRAME(1, 3) - TILES(0xED6B, 35) - SHOW_FRAME(2, 4) + TILES(0xED6B, 35) SHOW_FRAME(2, 4) - TILES(0xED8E, 30) - SHOW_FRAME(3, 5) + TILES(0xED8E, 30) SHOW_FRAME(3, 5) - TILES(0xEDAC, 30) - HITBOX(0, 2, -12, 14, 16) - SHOW_FRAME(1, 6) + TILES(0xEDAC, 30) HITBOX(0, 2, -12, 14, 16) SHOW_FRAME(1, 6) - TILES(0xEDCA, 24) - HITBOX(0, 0, -12, 12, 16) - HITBOX(1, -20, -35, 10, -2) - SHOW_FRAME(1, 7) + TILES(0xEDCA, 24) HITBOX(0, 0, -12, 12, 16) HITBOX(1, -20, -35, 10, -2) SHOW_FRAME(1, 7) - TILES(0xEDE2, 42) - HITBOX(0, -6, -12, 6, 16) - HITBOX(1, -32, -23, 0, 16) - PLAY_SOUND(128) - SHOW_FRAME(2, 8) + TILES(0xEDE2, 42) HITBOX(0, -6, -12, 6, 16) HITBOX(1, -32, -23, 0, 16) PLAY_SOUND(128) SHOW_FRAME(2, 8) - TILES(0xEE0C, 35) - SHOW_FRAME(2, 9) + TILES(0xEE0C, 35) SHOW_FRAME(2, 9) - TILES(0xEE2F, 35) - SHOW_FRAME(2, 10) + TILES(0xEE2F, 35) SHOW_FRAME(2, 10) - TILES(0xEE52, 28) - SHOW_FRAME(2, 11) + TILES(0xEE52, 28) SHOW_FRAME(2, 11) - TILES(0xEE6E, 16) - HITBOX(0, -6, -12, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(3, 12) + TILES(0xEE6E, 16) HITBOX(0, -6, -12, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(3, 12) - TILES(0xEE7E, 20) - SHOW_FRAME(3, 13) + TILES(0xEE7E, 20) SHOW_FRAME(3, 13) - TILES(0xEE92, 16) - SHOW_FRAME(3, 14) + TILES(0xEE92, 16) SHOW_FRAME(3, 14) - END() + END() }; -const s32 * const anim_0348[1] = { +const s32 *const anim_0348[1] = { anim_0348__v0_l0, }; const s32 anim_0353__v0_l0[] = { // 0x080EB40C - PALETTE(7, 16, 0x30) - TILES(0xEEA2, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xEEA2, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xEEB6, 20) - SHOW_FRAME(1, 1) + TILES(0xEEB6, 20) SHOW_FRAME(1, 1) - TILES(0xEECA, 25) - SHOW_FRAME(1, 2) + TILES(0xEECA, 25) SHOW_FRAME(1, 2) - TILES(0xEEE3, 30) - SHOW_FRAME(1, 3) + TILES(0xEEE3, 30) SHOW_FRAME(1, 3) - TILES(0xEF01, 30) - SHOW_FRAME(3, 4) + TILES(0xEF01, 30) SHOW_FRAME(3, 4) - TILES(0xEF1F, 36) - SHOW_FRAME(4, 5) + TILES(0xEF1F, 36) SHOW_FRAME(4, 5) - TILES(0xEF43, 36) - SHOW_FRAME(2, 6) + TILES(0xEF43, 36) SHOW_FRAME(2, 6) - TILES(0xEF67, 35) - SHOW_FRAME(1, 7) + TILES(0xEF67, 35) SHOW_FRAME(1, 7) - TILES(0xEF8A, 42) - HITBOX(0, -6, -12, 6, 16) - HITBOX(1, -32, -42, 0, 0) - SHOW_FRAME(1, 8) + TILES(0xEF8A, 42) HITBOX(0, -6, -12, 6, 16) HITBOX(1, -32, -42, 0, 0) SHOW_FRAME(1, 8) - TILES(0xEFB4, 42) - HITBOX(0, -14, -12, -2, 16) - HITBOX(1, -40, -34, -7, 6) - SHOW_FRAME(1, 9) + TILES(0xEFB4, 42) HITBOX(0, -14, -12, -2, 16) HITBOX(1, -40, -34, -7, 6) SHOW_FRAME(1, 9) - TILES(0xEFDE, 42) - HITBOX(0, -14, -12, -2, 16) - HITBOX(1, -44, -23, -11, 16) - PLAY_SOUND(128) - SHOW_FRAME(1, 10) + TILES(0xEFDE, 42) HITBOX(0, -14, -12, -2, 16) HITBOX(1, -44, -23, -11, + 16) PLAY_SOUND(128) SHOW_FRAME(1, 10) - TILES(0xF008, 42) - SHOW_FRAME(2, 11) + TILES(0xF008, 42) SHOW_FRAME(2, 11) - TILES(0xF032, 42) - SHOW_FRAME(2, 12) + TILES(0xF032, 42) SHOW_FRAME(2, 12) - TILES(0xF05C, 28) - SHOW_FRAME(2, 13) + TILES(0xF05C, 28) SHOW_FRAME(2, 13) - TILES(0xF078, 28) - SHOW_FRAME(8, 14) + TILES(0xF078, 28) SHOW_FRAME(8, 14) - TILES(0xF094, 16) - HITBOX(0, -8, -12, 4, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(3, 15) + TILES(0xF094, 16) HITBOX(0, -8, -12, 4, 16) HITBOX(1, 0, 0, 0, 0) + SHOW_FRAME(3, 15) - TILES(0xF0A4, 16) - HITBOX(0, -4, -12, 8, 16) - SHOW_FRAME(3, 16) + TILES(0xF0A4, 16) HITBOX(0, -4, -12, 8, 16) SHOW_FRAME(3, 16) - TILES(0xF0B4, 12) - HITBOX(0, -2, -12, 10, 16) - SHOW_FRAME(3, 17) + TILES(0xF0B4, 12) HITBOX(0, -2, -12, 10, 16) SHOW_FRAME(3, 17) - END() + END() }; -const s32 * const anim_0353[1] = { +const s32 *const anim_0353[1] = { anim_0353__v0_l0, }; const s32 anim_0373__v0_l0[] = { // 0x080EB614 - PALETTE(7, 16, 0x30) - TILES(0xF0C0, 30) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xF0C0, 30) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xF0DE, 24) - SHOW_FRAME(1, 1) + TILES(0xF0DE, 24) SHOW_FRAME(1, 1) - TILES(0xF0F6, 28) - SHOW_FRAME(2, 2) + TILES(0xF0F6, 28) SHOW_FRAME(2, 2) - TILES(0xF112, 20) - HITBOX(0, -9, -19, 8, 13) - SHOW_FRAME(1, 3) + TILES(0xF112, 20) HITBOX(0, -9, -19, 8, 13) SHOW_FRAME(1, 3) - TILES(0xF126, 25) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(2, 4) + TILES(0xF126, 25) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(2, 4) - TILES(0xF13F, 18) - SHOW_FRAME(2, 5) + TILES(0xF13F, 18) SHOW_FRAME(2, 5) - TILES(0xF151, 25) - SHOW_FRAME(2, 6) + TILES(0xF151, 25) SHOW_FRAME(2, 6) - TILES(0xF16A, 18) - SHOW_FRAME(2, 7) + TILES(0xF16A, 18) SHOW_FRAME(2, 7) - TILES(0xF17C, 20) - SHOW_FRAME(2, 8) + TILES(0xF17C, 20) SHOW_FRAME(2, 8) - TILES(0xF190, 15) - SHOW_FRAME(2, 9) + TILES(0xF190, 15) SHOW_FRAME(2, 9) - TILES(0xF19F, 25) - SHOW_FRAME(2, 10) + TILES(0xF19F, 25) SHOW_FRAME(2, 10) - TILES(0xF1B8, 15) - SHOW_FRAME(2, 11) + TILES(0xF1B8, 15) SHOW_FRAME(2, 11) - TILES(0xF126, 25) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(2, 4) + TILES(0xF126, 25) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(2, 4) - TILES(0xF13F, 18) - SHOW_FRAME(2, 5) + TILES(0xF13F, 18) SHOW_FRAME(2, 5) - TILES(0xF151, 25) - SHOW_FRAME(2, 6) + TILES(0xF151, 25) SHOW_FRAME(2, 6) - TILES(0xF16A, 18) - SHOW_FRAME(2, 7) + TILES(0xF16A, 18) SHOW_FRAME(2, 7) - TILES(0xF17C, 20) - SHOW_FRAME(2, 8) + TILES(0xF17C, 20) SHOW_FRAME(2, 8) - TILES(0xF190, 15) - SHOW_FRAME(2, 9) - TILES(0xF1C7, 30) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(3, 12) + TILES(0xF190, 15) SHOW_FRAME(2, 9) TILES(0xF1C7, 30) + HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(3, 12) - TILES(0xF1E5, 30) - SHOW_FRAME(3, 13) + TILES(0xF1E5, 30) SHOW_FRAME(3, 13) - TILES(0xF203, 30) - SHOW_FRAME(3, 14) + TILES(0xF203, 30) SHOW_FRAME(3, 14) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0373[1] = { +const s32 *const anim_0373[1] = { anim_0373__v0_l0, }; const s32 anim_0374__v0_l0[] = { // 0x080EB80C - PALETTE(7, 16, 0x30) - TILES(0xF221, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0x30) TILES(0xF221, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 0) - TILES(0xF231, 16) - SHOW_FRAME(1, 1) + TILES(0xF231, 16) SHOW_FRAME(1, 1) - TILES(0xF241, 16) - SHOW_FRAME(2, 2) - TILES(0xF251, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 3) + TILES(0xF241, 16) SHOW_FRAME(2, 2) TILES(0xF251, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 3) - TILES(0xF265, 20) - SHOW_FRAME(2, 4) + TILES(0xF265, 20) SHOW_FRAME(2, 4) - TILES(0xF279, 20) - SHOW_FRAME(2, 5) + TILES(0xF279, 20) SHOW_FRAME(2, 5) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0374__v1_l0[] = { // 0x080EB8B0 - PALETTE(7, 16, 0x30) - TILES(0xF28D, 20) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 6) - TILES(0xF2A1, 20) - SHOW_FRAME(2, 7) + PALETTE(7, 16, 0x30) TILES(0xF28D, 20) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 6) TILES(0xF2A1, 20) SHOW_FRAME(2, 7) - TILES(0xF2B5, 20) - SHOW_FRAME(2, 8) + TILES(0xF2B5, 20) SHOW_FRAME(2, 8) - JUMP_BACK(10) + JUMP_BACK(10) }; const s32 anim_0374__v2_l0[] = { // 0x080EB90C - PALETTE(7, 16, 0x30) - TILES(0xF2C9, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(1, 9) + PALETTE(7, 16, 0x30) TILES(0xF2C9, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(1, 9) - END() + END() }; -const s32 * const anim_0374[3] = { +const s32 *const anim_0374[3] = { anim_0374__v0_l0, anim_0374__v1_l0, anim_0374__v2_l0, }; const s32 anim_0375__v0_l0[] = { // 0x080EB948 - PALETTE(7, 16, 0x30) - TILES(0xF2D9, 16) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xF2D9, 16) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(2, 0) - TILES(0xF2E9, 20) - HITBOX(0, -6, -8, 8, 16) - HITBOX(1, -16, -14, 0, 16) - SHOW_FRAME(2, 1) + TILES(0xF2E9, 20) HITBOX(0, -6, -8, 8, 16) HITBOX(1, -16, -14, 0, 16) SHOW_FRAME(2, 1) - TILES(0xF2FD, 20) - SHOW_FRAME(2, 2) + TILES(0xF2FD, 20) SHOW_FRAME(2, 2) - TILES(0xF311, 20) - HITBOX(0, -6, -2, 8, 16) - HITBOX(1, -16, -2, 0, 16) - SHOW_FRAME(2, 3) - TILES(0xF325, 20) - HITBOX(1, -16, -2, 0, 16) - SHOW_FRAME(3, 4) + TILES(0xF311, 20) HITBOX(0, -6, -2, 8, 16) HITBOX(1, -16, -2, 0, 16) SHOW_FRAME(2, 3) TILES(0xF325, 20) + HITBOX(1, -16, -2, 0, 16) SHOW_FRAME(3, 4) - TILES(0xF339, 24) - SHOW_FRAME(3, 5) + TILES(0xF339, 24) SHOW_FRAME(3, 5) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0375__v1_l0[] = { // 0x080EBA1C - PALETTE(7, 16, 0x30) - TILES(0xF351, 18) - HITBOX(0, -6, -4, 6, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(6, 6) + PALETTE(7, 16, 0x30) TILES(0xF351, 18) HITBOX(0, -6, -4, 6, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(6, 6) - TILES(0xF363, 20) - SHOW_FRAME(2, 7) + TILES(0xF363, 20) SHOW_FRAME(2, 7) - TILES(0xF377, 20) - SHOW_FRAME(2, 8) + TILES(0xF377, 20) SHOW_FRAME(2, 8) - TILES(0xF38B, 15) - HITBOX(0, -6, -4, 6, 16) - SHOW_FRAME(6, 9) + TILES(0xF38B, 15) HITBOX(0, -6, -4, 6, 16) SHOW_FRAME(6, 9) - TILES(0xF39A, 15) - SHOW_FRAME(6, 10) + TILES(0xF39A, 15) SHOW_FRAME(6, 10) - TILES(0xF38B, 15) - SHOW_FRAME(6, 9) + TILES(0xF38B, 15) SHOW_FRAME(6, 9) - TILES(0xF39A, 15) - SHOW_FRAME(6, 10) + TILES(0xF39A, 15) SHOW_FRAME(6, 10) - TILES(0xF38B, 15) - SHOW_FRAME(6, 9) + TILES(0xF38B, 15) SHOW_FRAME(6, 9) - TILES(0xF3A9, 15) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 11) + TILES(0xF3A9, 15) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 11) - TILES(0xF3B8, 16) - SHOW_FRAME(1, 12) + TILES(0xF3B8, 16) SHOW_FRAME(1, 12) - END() + END() }; -const s32 * const anim_0375[2] = { +const s32 *const anim_0375[2] = { anim_0375__v0_l0, anim_0375__v1_l0, }; const s32 anim_0376__v0_l0[] = { // 0x080EBB2C - PALETTE(7, 16, 0x30) - TILES(0xF3C8, 24) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF3C8, 24) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(3, 0) - TILES(0xF3E0, 35) - SHOW_FRAME(4, 1) + TILES(0xF3E0, 35) SHOW_FRAME(4, 1) - TILES(0xF403, 30) - HITBOX(0, -6, -12, 6, 14) - HITBOX(1, -24, -27, 21, 12) - SHOW_FRAME(3, 2) + TILES(0xF403, 30) HITBOX(0, -6, -12, 6, 14) HITBOX(1, -24, -27, 21, 12) SHOW_FRAME(3, 2) - TILES(0xF421, 30) - HITBOX(0, -6, -12, 6, 14) - HITBOX(1, -39, -25, 17, 28) - SHOW_FRAME(3, 3) + TILES(0xF421, 30) HITBOX(0, -6, -12, 6, 14) HITBOX(1, -39, -25, 17, 28) SHOW_FRAME(3, 3) - TILES(0xF43F, 42) - HITBOX(0, -6, -12, 8, 14) - HITBOX(1, -29, -23, 14, 33) - SHOW_FRAME(3, 4) + TILES(0xF43F, 42) HITBOX(0, -6, -12, 8, 14) HITBOX(1, -29, -23, 14, 33) SHOW_FRAME(3, 4) - TILES(0xF469, 30) - HITBOX(0, -6, -4, 6, 22) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(3, 5) + TILES(0xF469, 30) HITBOX(0, -6, -4, 6, 22) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(3, 5) - TILES(0xF487, 20) - SHOW_FRAME(3, 6) + TILES(0xF487, 20) SHOW_FRAME(3, 6) - TILES(0xF49B, 20) - SHOW_FRAME(3, 7) + TILES(0xF49B, 20) SHOW_FRAME(3, 7) - TILES(0xF4AF, 24) - SHOW_FRAME(3, 8) + TILES(0xF4AF, 24) SHOW_FRAME(3, 8) - TILES(0xF4C7, 16) - SHOW_FRAME(3, 9) + TILES(0xF4C7, 16) SHOW_FRAME(3, 9) - TILES(0xF4D7, 20) - SHOW_FRAME(4, 10) - TILES(0xF4EB, 30) - SHOW_FRAME(3, 11) + TILES(0xF4D7, 20) SHOW_FRAME(4, 10) TILES(0xF4EB, 30) SHOW_FRAME(3, 11) - TILES(0xF509, 30) - SHOW_FRAME(3, 12) + TILES(0xF509, 30) SHOW_FRAME(3, 12) - TILES(0xF527, 30) - SHOW_FRAME(3, 13) + TILES(0xF527, 30) SHOW_FRAME(3, 13) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0376[1] = { +const s32 *const anim_0376[1] = { anim_0376__v0_l0, }; const s32 anim_0377__v0_l0[] = { // 0x080EBCC8 - PALETTE(7, 16, 0x30) - TILES(0xF545, 20) - HITBOX(0, -6, -12, 6, 14) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF545, 20) HITBOX(0, -6, -12, 6, 14) SHOW_FRAME(3, 0) - TILES(0xF559, 20) - SHOW_FRAME(4, 1) + TILES(0xF559, 20) SHOW_FRAME(4, 1) - TILES(0xF56D, 20) - SHOW_FRAME(3, 2) - TILES(0xF581, 30) - HITBOX(0, -6, -12, 6, 14) - HITBOX(1, -24, -6, 24, 14) - SHOW_FRAME(2, 3) + TILES(0xF56D, 20) SHOW_FRAME(3, 2) TILES(0xF581, 30) HITBOX(0, -6, -12, 6, 14) HITBOX(1, -24, -6, 24, 14) SHOW_FRAME(2, 3) - TILES(0xF59F, 20) - SHOW_FRAME(2, 4) + TILES(0xF59F, 20) SHOW_FRAME(2, 4) - TILES(0xF5B3, 30) - SHOW_FRAME(2, 5) + TILES(0xF5B3, 30) SHOW_FRAME(2, 5) - TILES(0xF5D1, 20) - SHOW_FRAME(2, 6) + TILES(0xF5D1, 20) SHOW_FRAME(2, 6) - TILES(0xF5E5, 16) - SHOW_FRAME(2, 7) + TILES(0xF5E5, 16) SHOW_FRAME(2, 7) - TILES(0xF5F5, 24) - SHOW_FRAME(2, 8) + TILES(0xF5F5, 24) SHOW_FRAME(2, 8) - JUMP_BACK(36) + JUMP_BACK(36) }; const s32 anim_0377__v1_l0[] = { // 0x080EBDB4 - PALETTE(7, 16, 0x30) - TILES(0xF60D, 20) - HITBOX(0, -6, -12, 6, 14) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(4, 9) - TILES(0xF621, 30) - SHOW_FRAME(3, 10) + PALETTE(7, 16, 0x30) TILES(0xF60D, 20) HITBOX(0, -6, -12, 6, 14) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(4, 9) TILES(0xF621, 30) + SHOW_FRAME(3, 10) - TILES(0xF63F, 30) - SHOW_FRAME(3, 11) + TILES(0xF63F, 30) SHOW_FRAME(3, 11) - TILES(0xF65D, 30) - SHOW_FRAME(3, 12) + TILES(0xF65D, 30) SHOW_FRAME(3, 12) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0377[2] = { +const s32 *const anim_0377[2] = { anim_0377__v0_l0, anim_0377__v1_l0, }; const s32 anim_0379__v0_l0[] = { // 0x080EBE38 - PALETTE(7, 16, 0x30) - TILES(0xF67B, 24) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF67B, 24) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(3, 0) - TILES(0xF693, 24) - SHOW_FRAME(3, 1) + TILES(0xF693, 24) SHOW_FRAME(3, 1) - TILES(0xF6AB, 24) - SHOW_FRAME(3, 2) + TILES(0xF6AB, 24) SHOW_FRAME(3, 2) - TILES(0xF693, 24) - SHOW_FRAME(3, 1) + TILES(0xF693, 24) SHOW_FRAME(3, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0379[1] = { +const s32 *const anim_0379[1] = { anim_0379__v0_l0, }; const s32 anim_0380__v0_l0[] = { // 0x080EBEAC - PALETTE(7, 16, 0x30) - TILES(0xF6C3, 30) - HITBOX(0, -6, -12, 6, 16) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF6C3, 30) HITBOX(0, -6, -12, 6, 16) SHOW_FRAME(3, 0) - TILES(0xF6E1, 24) - SHOW_FRAME(3, 1) + TILES(0xF6E1, 24) SHOW_FRAME(3, 1) - TILES(0xF6F9, 24) - SHOW_FRAME(3, 2) + TILES(0xF6F9, 24) SHOW_FRAME(3, 2) - TILES(0xF6E1, 24) - SHOW_FRAME(3, 1) + TILES(0xF6E1, 24) SHOW_FRAME(3, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0380[1] = { +const s32 *const anim_0380[1] = { anim_0380__v0_l0, }; const s32 anim_0381__v0_l0[] = { // 0x080EBF20 - PALETTE(7, 16, 0x30) - TILES(0xF711, 20) - HITBOX(0, -6, -18, 6, 8) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF711, 20) HITBOX(0, -6, -18, 6, 8) SHOW_FRAME(3, 0) - TILES(0xF725, 25) - SHOW_FRAME(3, 1) + TILES(0xF725, 25) SHOW_FRAME(3, 1) - TILES(0xF73E, 25) - SHOW_FRAME(3, 2) + TILES(0xF73E, 25) SHOW_FRAME(3, 2) - TILES(0xF725, 25) - SHOW_FRAME(3, 1) + TILES(0xF725, 25) SHOW_FRAME(3, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0381[1] = { +const s32 *const anim_0381[1] = { anim_0381__v0_l0, }; const s32 anim_0383__v0_l0[] = { // 0x080EBF94 - PALETTE(7, 16, 0xA0) - TILES(0xF757, 18) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0xA0) TILES(0xF757, 18) SHOW_FRAME(3, 0) - TILES(0xF769, 18) - SHOW_FRAME(3, 1) + TILES(0xF769, 18) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0383[1] = { +const s32 *const anim_0383[1] = { anim_0383__v0_l0, }; const s32 anim_0384__v0_l0[] = { // 0x080EBFD4 - PALETTE(7, 16, 0xA0) - TILES(0xF77B, 16) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0xA0) TILES(0xF77B, 16) SHOW_FRAME(2, 0) - TILES(0xF78B, 16) - SHOW_FRAME(2, 1) + TILES(0xF78B, 16) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0384__v1_l0[] = { // 0x080EC00C - PALETTE(7, 16, 0xA0) - TILES(0xF79B, 16) - SHOW_FRAME(2, 2) + PALETTE(7, 16, 0xA0) TILES(0xF79B, 16) SHOW_FRAME(2, 2) - JUMP_BACK(8) + JUMP_BACK(8) }; -const s32 * const anim_0384[2] = { +const s32 *const anim_0384[2] = { anim_0384__v0_l0, anim_0384__v1_l0, }; const s32 anim_0385__v0_l0[] = { // 0x080EC03C - PALETTE(7, 16, 0xA0) - TILES(0xF7AB, 15) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0xA0) TILES(0xF7AB, 15) SHOW_FRAME(3, 0) - TILES(0xF7BA, 15) - SHOW_FRAME(3, 1) + TILES(0xF7BA, 15) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0385[1] = { +const s32 *const anim_0385[1] = { anim_0385__v0_l0, }; const s32 anim_0386__v0_l0[] = { // 0x080EC07C - PALETTE(7, 16, 0xA0) - TILES(0xF7C9, 25) - SHOW_FRAME(8, 0) - TILES(0xF7E2, 25) - SHOW_FRAME(3, 1) + PALETTE(7, 16, 0xA0) TILES(0xF7C9, 25) SHOW_FRAME(8, 0) TILES(0xF7E2, 25) SHOW_FRAME(3, 1) - TILES(0xF7FB, 25) - SHOW_FRAME(3, 2) + TILES(0xF7FB, 25) SHOW_FRAME(3, 2) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0386[1] = { +const s32 *const anim_0386[1] = { anim_0386__v0_l0, }; const s32 anim_0387__v0_l0[] = { // 0x080EC0D0 - PALETTE(7, 16, 0xA0) - TILES(0xF814, 20) - SHOW_FRAME(1, 0) + PALETTE(7, 16, 0xA0) TILES(0xF814, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0387__v1_l0[] = { // 0x080EC0F4 - PALETTE(7, 16, 0xA0) - TILES(0xF828, 20) - SHOW_FRAME(4, 1) + PALETTE(7, 16, 0xA0) TILES(0xF828, 20) SHOW_FRAME(4, 1) - TILES(0xF83C, 20) - SHOW_FRAME(4, 2) + TILES(0xF83C, 20) SHOW_FRAME(4, 2) - TILES(0xF850, 20) - SHOW_FRAME(40, 3) + TILES(0xF850, 20) SHOW_FRAME(40, 3) - END() + END() }; -const s32 * const anim_0387[2] = { +const s32 *const anim_0387[2] = { anim_0387__v0_l0, anim_0387__v1_l0, }; const s32 anim_0391__v0_l0[] = { // 0x080EC148 - PALETTE(8, 16, 0x30) - TILES(0xF864, 16) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 0) + PALETTE(8, 16, 0x30) TILES(0xF864, 16) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0391__v1_l0[] = { // 0x080EC178 - PALETTE(8, 16, 0x30) - TILES(0xF874, 16) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 1) + PALETTE(8, 16, 0x30) TILES(0xF874, 16) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0391__v2_l0[] = { // 0x080EC1A8 - PALETTE(8, 16, 0x30) - TILES(0xF884, 16) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 2) + PALETTE(8, 16, 0x30) TILES(0xF884, 16) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0391__v3_l0[] = { // 0x080EC1D8 - PALETTE(8, 16, 0x30) - TILES(0xF894, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 3) + PALETTE(8, 16, 0x30) TILES(0xF894, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0391__v4_l0[] = { // 0x080EC208 - PALETTE(8, 16, 0x30) - TILES(0xF8A8, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 4) + PALETTE(8, 16, 0x30) TILES(0xF8A8, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0391__v5_l0[] = { // 0x080EC238 - PALETTE(8, 16, 0x30) - TILES(0xF8BC, 16) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 5) + PALETTE(8, 16, 0x30) TILES(0xF8BC, 16) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0391__v6_l0[] = { // 0x080EC268 - PALETTE(8, 16, 0x30) - TILES(0xF8CC, 16) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 6) + PALETTE(8, 16, 0x30) TILES(0xF8CC, 16) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0391__v7_l0[] = { // 0x080EC298 - PALETTE(8, 16, 0x30) - TILES(0xF8DC, 20) - HITBOX(0, -6, -10, 6, 10) - SHOW_FRAME(1, 7) + PALETTE(8, 16, 0x30) TILES(0xF8DC, 20) HITBOX(0, -6, -10, 6, 10) SHOW_FRAME(1, 7) - END() + END() }; -const s32 * const anim_0391[8] = { - anim_0391__v0_l0, - anim_0391__v1_l0, - anim_0391__v2_l0, - anim_0391__v3_l0, - anim_0391__v4_l0, - anim_0391__v5_l0, - anim_0391__v6_l0, - anim_0391__v7_l0, +const s32 *const anim_0391[8] = { + anim_0391__v0_l0, anim_0391__v1_l0, anim_0391__v2_l0, anim_0391__v3_l0, + anim_0391__v4_l0, anim_0391__v5_l0, anim_0391__v6_l0, anim_0391__v7_l0, }; const s32 anim_0392__v0_l0[] = { // 0x080EC2E8 - PALETTE(7, 16, 0x30) - TILES(0xF8F0, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF8F0, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(3, 0) - TILES(0xF900, 16) - SHOW_FRAME(3, 1) + TILES(0xF900, 16) SHOW_FRAME(3, 1) - TILES(0xF910, 16) - SHOW_FRAME(3, 2) + TILES(0xF910, 16) SHOW_FRAME(3, 2) - TILES(0xF920, 16) - SHOW_FRAME(3, 3) + TILES(0xF920, 16) SHOW_FRAME(3, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0392[1] = { +const s32 *const anim_0392[1] = { anim_0392__v0_l0, }; const s32 anim_0393__v0_l0[] = { // 0x080EC368 - PALETTE(7, 16, 0x30) - TILES(0xF930, 16) - HITBOX(0, -8, -7, 8, 9) - HITBOX(1, -8, -7, 8, 9) - SHOW_FRAME(3, 0) + PALETTE(7, 16, 0x30) TILES(0xF930, 16) HITBOX(0, -8, -7, 8, 9) HITBOX(1, -8, -7, 8, 9) SHOW_FRAME(3, 0) - TILES(0xF940, 12) - SHOW_FRAME(3, 1) + TILES(0xF940, 12) SHOW_FRAME(3, 1) - TILES(0xF94C, 12) - SHOW_FRAME(3, 2) + TILES(0xF94C, 12) SHOW_FRAME(3, 2) - JUMP_BACK(24) + JUMP_BACK(24) }; -const s32 * const anim_0393[1] = { +const s32 *const anim_0393[1] = { anim_0393__v0_l0, }; const s32 anim_0394__v0_l0[] = { // 0x080EC3D4 - PALETTE(7, 16, 0xA0) - TILES(0xF958, 64) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0xA0) TILES(0xF958, 64) SHOW_FRAME(2, 0) - TILES(0xF998, 64) - SHOW_FRAME(2, 1) + TILES(0xF998, 64) SHOW_FRAME(2, 1) - TILES(0xF9D8, 64) - SHOW_FRAME(2, 2) + TILES(0xF9D8, 64) SHOW_FRAME(2, 2) - TILES(0xFA18, 64) - SHOW_FRAME(2, 3) + TILES(0xFA18, 64) SHOW_FRAME(2, 3) - TILES(0xFA58, 64) - SHOW_FRAME(2, 4) + TILES(0xFA58, 64) SHOW_FRAME(2, 4) - TILES(0xFA98, 64) - SHOW_FRAME(2, 5) + TILES(0xFA98, 64) SHOW_FRAME(2, 5) - TILES(0xFAD8, 64) - SHOW_FRAME(2, 6) + TILES(0xFAD8, 64) SHOW_FRAME(2, 6) - TILES(0xFB18, 64) - SHOW_FRAME(2, 7) + TILES(0xFB18, 64) SHOW_FRAME(2, 7) - TILES(0xFB58, 64) - SHOW_FRAME(2, 8) + TILES(0xFB58, 64) SHOW_FRAME(2, 8) - TILES(0xFB98, 64) - SHOW_FRAME(2, 9) + TILES(0xFB98, 64) SHOW_FRAME(2, 9) - JUMP_BACK(53) + JUMP_BACK(53) }; -const s32 * const anim_0394[1] = { +const s32 *const anim_0394[1] = { anim_0394__v0_l0, }; const s32 anim_0396__v0_l0[] = { // 0x080EC4B4 - PALETTE(7, 16, 0x30) - TILES(0xFBD8, 64) - SHOW_FRAME(2, 0) + PALETTE(7, 16, 0x30) TILES(0xFBD8, 64) SHOW_FRAME(2, 0) - END() + END() }; -const s32 * const anim_0396[1] = { +const s32 *const anim_0396[1] = { anim_0396__v0_l0, }; const s32 anim_0397__v0_l0[] = { // 0x080EC4DC - PALETTE(0, 16, 0x0) - TILES(0xFC18, 20) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0xFC18, 20) SHOW_FRAME(4, 0) - TILES(0xFC2C, 20) - SHOW_FRAME(4, 1) + TILES(0xFC2C, 20) SHOW_FRAME(4, 1) - TILES(0xFC40, 20) - SHOW_FRAME(4, 2) + TILES(0xFC40, 20) SHOW_FRAME(4, 2) - END() + END() }; -const s32 * const anim_0397[1] = { +const s32 *const anim_0397[1] = { anim_0397__v0_l0, }; const s32 anim_0398__v0_l0[] = { // 0x080EC52C - PALETTE(0, 16, 0x0) - TILES(0xFC54, 16) - SHOW_FRAME(4, 0) + PALETTE(0, 16, 0x0) TILES(0xFC54, 16) SHOW_FRAME(4, 0) - TILES(0xFC64, 16) - SHOW_FRAME(10, 1) + TILES(0xFC64, 16) SHOW_FRAME(10, 1) - TILES(0xFC74, 16) - SHOW_FRAME(2, 2) + TILES(0xFC74, 16) SHOW_FRAME(2, 2) - TILES(0xFC54, 16) - SHOW_FRAME(4, 0) + TILES(0xFC54, 16) SHOW_FRAME(4, 0) - TILES(0xFC84, 20) - SHOW_FRAME(3, 3) + TILES(0xFC84, 20) SHOW_FRAME(3, 3) - TILES(0xFC98, 20) - SHOW_FRAME(3, 4) + TILES(0xFC98, 20) SHOW_FRAME(3, 4) - TILES(0xFCAC, 24) - SHOW_FRAME(3, 5) + TILES(0xFCAC, 24) SHOW_FRAME(3, 5) - TILES(0xFCC4, 24) - SHOW_FRAME(3, 6) + TILES(0xFCC4, 24) SHOW_FRAME(3, 6) - PALETTE(9, 16, 0x0) - TILES(0xFCDC, 24) - SHOW_FRAME(3, 7) + PALETTE(9, 16, 0x0) TILES(0xFCDC, 24) SHOW_FRAME(3, 7) - PALETTE(10, 16, 0x0) - TILES(0xFCF4, 24) - SHOW_FRAME(3, 8) - PALETTE(11, 16, 0x0) - TILES(0xFD0C, 24) - SHOW_FRAME(1, 9) + PALETTE(10, 16, 0x0) TILES(0xFCF4, 24) SHOW_FRAME(3, 8) PALETTE(11, 16, 0x0) TILES(0xFD0C, 24) + SHOW_FRAME(1, 9) - PALETTE(12, 16, 0x30) - TILES(0xFD24, 24) - SHOW_FRAME(1, 10) + PALETTE(12, 16, 0x30) TILES(0xFD24, 24) SHOW_FRAME(1, 10) - PALETTE(11, 16, 0x0) - TILES(0xFD3C, 24) - SHOW_FRAME(1, 11) + PALETTE(11, 16, 0x0) TILES(0xFD3C, 24) SHOW_FRAME(1, 11) - PALETTE(12, 16, 0x30) - TILES(0xFD54, 24) - SHOW_FRAME(1, 12) + PALETTE(12, 16, 0x30) TILES(0xFD54, 24) SHOW_FRAME(1, 12) - JUMP_BACK(32) + JUMP_BACK(32) }; const s32 anim_0398__v1_l0[] = { // 0x080EC6A0 - PALETTE(13, 16, 0x50) - TILES(0xFD6C, 36) - SHOW_FRAME(3, 13) + PALETTE(13, 16, 0x50) TILES(0xFD6C, 36) SHOW_FRAME(3, 13) - TILES(0xFD90, 56) - SHOW_FRAME(3, 14) + TILES(0xFD90, 56) SHOW_FRAME(3, 14) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0398[2] = { +const s32 *const anim_0398[2] = { anim_0398__v0_l0, anim_0398__v1_l0, }; const s32 anim_0399__v0_l0[] = { // 0x080EC6E4 - PALETTE(11, 16, 0x0) - TILES(0xFDC8, 24) - HITBOX(0, -14, -10, 13, 6) - HITBOX(1, -14, -10, 13, 6) - SHOW_FRAME(2, 0) + PALETTE(11, 16, 0x0) TILES(0xFDC8, 24) HITBOX(0, -14, -10, 13, 6) HITBOX(1, -14, -10, 13, 6) SHOW_FRAME(2, 0) - PALETTE(12, 16, 0x30) - TILES(0xFDE0, 24) - SHOW_FRAME(2, 1) + PALETTE(12, 16, 0x30) TILES(0xFDE0, 24) SHOW_FRAME(2, 1) - PALETTE(11, 16, 0x0) - TILES(0xFDF8, 24) - SHOW_FRAME(2, 2) + PALETTE(11, 16, 0x0) TILES(0xFDF8, 24) SHOW_FRAME(2, 2) - PALETTE(12, 16, 0x30) - TILES(0xFE10, 24) - SHOW_FRAME(2, 3) + PALETTE(12, 16, 0x30) TILES(0xFE10, 24) SHOW_FRAME(2, 3) - JUMP_BACK(38) + JUMP_BACK(38) }; const s32 anim_0399__v1_l0[] = { // 0x080EC784 - PALETTE(11, 16, 0x0) - TILES(0xFE28, 24) - HITBOX(0, -14, -10, 13, 6) - HITBOX(1, -20, -15, 3, 11) - SHOW_FRAME(2, 4) + PALETTE(11, 16, 0x0) TILES(0xFE28, 24) HITBOX(0, -14, -10, 13, 6) HITBOX(1, -20, -15, 3, 11) SHOW_FRAME(2, 4) - PALETTE(12, 16, 0x30) - TILES(0xFE40, 24) - SHOW_FRAME(2, 5) + PALETTE(12, 16, 0x30) TILES(0xFE40, 24) SHOW_FRAME(2, 5) - PALETTE(11, 16, 0x0) - TILES(0xFE58, 24) - SHOW_FRAME(2, 6) + PALETTE(11, 16, 0x0) TILES(0xFE58, 24) SHOW_FRAME(2, 6) - PALETTE(12, 16, 0x30) - TILES(0xFE70, 24) - SHOW_FRAME(2, 7) + PALETTE(12, 16, 0x30) TILES(0xFE70, 24) SHOW_FRAME(2, 7) - JUMP_BACK(38) + JUMP_BACK(38) }; const s32 anim_0399__v2_l0[] = { // 0x080EC824 - PALETTE(11, 16, 0x0) - TILES(0xFE88, 64) - SHOW_FRAME(1, 8) + PALETTE(11, 16, 0x0) TILES(0xFE88, 64) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0399[3] = { +const s32 *const anim_0399[3] = { anim_0399__v0_l0, anim_0399__v1_l0, anim_0399__v2_l0, }; const s32 anim_0400__v0_l0[] = { // 0x080EC854 - PALETTE(14, 16, 0x20) - TILES(0xFEC8, 40) - SHOW_FRAME(2, 0) + PALETTE(14, 16, 0x20) TILES(0xFEC8, 40) SHOW_FRAME(2, 0) - TILES(0xFEF0, 40) - SHOW_FRAME(2, 1) + TILES(0xFEF0, 40) SHOW_FRAME(2, 1) - TILES(0xFF18, 40) - SHOW_FRAME(2, 2) + TILES(0xFF18, 40) SHOW_FRAME(2, 2) - TILES(0xFF40, 40) - SHOW_FRAME(2, 3) + TILES(0xFF40, 40) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0400__v1_l0[] = { // 0x080EC8B8 - PALETTE(14, 16, 0x20) - TILES(0xFF68, 40) - SHOW_FRAME(3, 4) + PALETTE(14, 16, 0x20) TILES(0xFF68, 40) SHOW_FRAME(3, 4) - TILES(0xFF90, 40) - SHOW_FRAME(3, 5) + TILES(0xFF90, 40) SHOW_FRAME(3, 5) - TILES(0xFFB8, 40) - SHOW_FRAME(3, 6) + TILES(0xFFB8, 40) SHOW_FRAME(3, 6) - END() + END() }; -const s32 * const anim_0400[2] = { +const s32 *const anim_0400[2] = { anim_0400__v0_l0, anim_0400__v1_l0, }; const s32 anim_0401__v0_l0[] = { // 0x080EC90C - PALETTE(15, 16, 0xC0) - TILES(0xFFE0, 20) - HITBOX(0, -13, -22, 10, 5) - SHOW_FRAME(1, 0) + PALETTE(15, 16, 0xC0) TILES(0xFFE0, 20) HITBOX(0, -13, -22, 10, 5) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0401__v1_l0[] = { // 0x080EC93C - PALETTE(15, 16, 0xC0) - TILES(0xFFF4, 20) - HITBOX(0, -13, -22, 10, 6) - SHOW_FRAME(8, 1) + PALETTE(15, 16, 0xC0) TILES(0xFFF4, 20) HITBOX(0, -13, -22, 10, 6) SHOW_FRAME(8, 1) - TILES(0x10008, 20) - SHOW_FRAME(8, 2) + TILES(0x10008, 20) SHOW_FRAME(8, 2) - TILES(0xFFE0, 20) - SHOW_FRAME(8, 0) + TILES(0xFFE0, 20) SHOW_FRAME(8, 0) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0401__v2_l0[] = { // 0x080EC998 - PALETTE(15, 16, 0xC0) - TILES(0x1001C, 20) - HITBOX(0, -8, -20, 7, 3) - SHOW_FRAME(6, 3) + PALETTE(15, 16, 0xC0) TILES(0x1001C, 20) HITBOX(0, -8, -20, 7, 3) SHOW_FRAME(6, 3) - TILES(0x10030, 20) - HITBOX(0, -9, -20, 11, 0) - SHOW_FRAME(8, 4) + TILES(0x10030, 20) HITBOX(0, -9, -20, 11, 0) SHOW_FRAME(8, 4) - TILES(0x10044, 20) - HITBOX(0, -7, -19, 7, 2) - SHOW_FRAME(8, 5) + TILES(0x10044, 20) HITBOX(0, -7, -19, 7, 2) SHOW_FRAME(8, 5) - END() + END() }; -const s32 * const anim_0401[3] = { +const s32 *const anim_0401[3] = { anim_0401__v0_l0, anim_0401__v1_l0, anim_0401__v2_l0, }; const s32 anim_0402__v0_l0[] = { // 0x080ECA14 - PALETTE(16, 16, 0x70) - TILES(0x10058, 16) - HITBOX(0, -10, -7, 9, 10) - SHOW_FRAME(4, 0) + PALETTE(16, 16, 0x70) TILES(0x10058, 16) HITBOX(0, -10, -7, 9, 10) SHOW_FRAME(4, 0) - TILES(0x10068, 16) - HITBOX(0, -8, -5, 7, 9) - SHOW_FRAME(4, 1) + TILES(0x10068, 16) HITBOX(0, -8, -5, 7, 9) SHOW_FRAME(4, 1) - TILES(0x10078, 16) - HITBOX(0, -5, -5, 6, 6) - SHOW_FRAME(4, 2) + TILES(0x10078, 16) HITBOX(0, -5, -5, 6, 6) SHOW_FRAME(4, 2) - TILES(0x10088, 12) - SHOW_FRAME(4, 3) + TILES(0x10088, 12) SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0402[1] = { +const s32 *const anim_0402[1] = { anim_0402__v0_l0, }; const s32 anim_0403__v0_l0[] = { // 0x080ECA9C - PALETTE(17, 16, 0xC0) - TILES(0x10094, 20) - HITBOX(0, -10, -27, 12, -2) - SHOW_FRAME(2, 0) + PALETTE(17, 16, 0xC0) TILES(0x10094, 20) HITBOX(0, -10, -27, 12, -2) SHOW_FRAME(2, 0) - TILES(0x100A8, 20) - HITBOX(0, -10, -27, 12, -2) - SHOW_FRAME(2, 1) + TILES(0x100A8, 20) HITBOX(0, -10, -27, 12, -2) SHOW_FRAME(2, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; const s32 anim_0403__v1_l0[] = { // 0x080ECAF0 - PALETTE(17, 16, 0xC0) - TILES(0x100BC, 20) - HITBOX(0, -9, -26, 10, -3) - SHOW_FRAME(3, 2) + PALETTE(17, 16, 0xC0) TILES(0x100BC, 20) HITBOX(0, -9, -26, 10, -3) SHOW_FRAME(3, 2) - TILES(0x100D0, 20) - HITBOX(0, -9, -26, 10, -3) - SHOW_FRAME(4, 3) + TILES(0x100D0, 20) HITBOX(0, -9, -26, 10, -3) SHOW_FRAME(4, 3) - JUMP_BACK(19) + JUMP_BACK(19) }; const s32 anim_0403__v2_l0[] = { // 0x080ECB44 - PALETTE(17, 16, 0xC0) - TILES(0x100E4, 20) - HITBOX(0, -5, -30, 7, -3) - SHOW_FRAME(5, 4) + PALETTE(17, 16, 0xC0) TILES(0x100E4, 20) HITBOX(0, -5, -30, 7, -3) SHOW_FRAME(5, 4) - END() + END() }; -const s32 * const anim_0403[3] = { +const s32 *const anim_0403[3] = { anim_0403__v0_l0, anim_0403__v1_l0, anim_0403__v2_l0, }; const s32 anim_0404__v0_l0[] = { // 0x080ECB80 - PALETTE(15, 16, 0xC0) - TILES(0x100F8, 24) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(5, 0) + PALETTE(15, 16, 0xC0) TILES(0x100F8, 24) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(5, 0) - TILES(0x10110, 30) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(5, 1) + TILES(0x10110, 30) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(5, 1) - TILES(0x1012E, 24) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(5, 2) + TILES(0x1012E, 24) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(5, 2) - TILES(0x10110, 30) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(5, 1) + TILES(0x10110, 30) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(5, 1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0404__v1_l0[] = { // 0x080ECC14 - PALETTE(15, 16, 0xC0) - TILES(0x10146, 30) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(10, 3) + PALETTE(15, 16, 0xC0) TILES(0x10146, 30) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(10, 3) - TILES(0x10164, 30) - HITBOX(0, -13, -21, 13, -4) - SHOW_FRAME(10, 4) + TILES(0x10164, 30) HITBOX(0, -13, -21, 13, -4) SHOW_FRAME(10, 4) - END() + END() }; -const s32 * const anim_0404[2] = { +const s32 *const anim_0404[2] = { anim_0404__v0_l0, anim_0404__v1_l0, }; const s32 anim_0405__v0_l0[] = { // 0x080ECC6C - PALETTE(18, 16, 0xD0) - TILES(0x10182, 20) - HITBOX(0, -14, -26, 14, 2) - SHOW_FRAME(4, 0) + PALETTE(18, 16, 0xD0) TILES(0x10182, 20) HITBOX(0, -14, -26, 14, 2) SHOW_FRAME(4, 0) - TILES(0x10196, 20) - SHOW_FRAME(4, 1) + TILES(0x10196, 20) SHOW_FRAME(4, 1) - TILES(0x101AA, 20) - SHOW_FRAME(4, 2) + TILES(0x101AA, 20) SHOW_FRAME(4, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0405__v1_l0[] = { // 0x080ECCC8 - PALETTE(18, 16, 0xD0) - TILES(0x10182, 20) - HITBOX(0, -14, -26, 14, 2) - SHOW_FRAME(3, 0) + PALETTE(18, 16, 0xD0) TILES(0x10182, 20) HITBOX(0, -14, -26, 14, 2) SHOW_FRAME(3, 0) - TILES(0x101BE, 20) - SHOW_FRAME(3, 3) + TILES(0x101BE, 20) SHOW_FRAME(3, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0405__v2_l0[] = { // 0x080ECD10 - PALETTE(18, 16, 0xD0) - TILES(0x101D2, 20) - HITBOX(0, -14, -26, 14, 2) - SHOW_FRAME(12, 4) + PALETTE(18, 16, 0xD0) TILES(0x101D2, 20) HITBOX(0, -14, -26, 14, 2) SHOW_FRAME(12, 4) - TILES(0x101E6, 20) - SHOW_FRAME(12, 5) + TILES(0x101E6, 20) SHOW_FRAME(12, 5) - END() + END() }; -const s32 * const anim_0405[3] = { +const s32 *const anim_0405[3] = { anim_0405__v0_l0, anim_0405__v1_l0, anim_0405__v2_l0, }; const s32 anim_0406__v0_l0[] = { // 0x080ECD60 - PALETTE(19, 16, 0xE0) - TILES(0x101FA, 16) - HITBOX(0, -8, -19, 6, -2) - SHOW_FRAME(4, 0) + PALETTE(19, 16, 0xE0) TILES(0x101FA, 16) HITBOX(0, -8, -19, 6, -2) SHOW_FRAME(4, 0) - TILES(0x1020A, 12) - HITBOX(0, -10, -18, 8, -3) - SHOW_FRAME(4, 1) + TILES(0x1020A, 12) HITBOX(0, -10, -18, 8, -3) SHOW_FRAME(4, 1) - TILES(0x10216, 20) - HITBOX(0, -10, -31, 12, -7) - SHOW_FRAME(6, 2) + TILES(0x10216, 20) HITBOX(0, -10, -31, 12, -7) SHOW_FRAME(6, 2) - TILES(0x1022A, 20) - HITBOX(0, -13, -22, 10, -5) - SHOW_FRAME(20, 3) + TILES(0x1022A, 20) HITBOX(0, -13, -22, 10, -5) SHOW_FRAME(20, 3) - TILES(0x1020A, 12) - HITBOX(0, -11, -18, 9, -2) - SHOW_FRAME(4, 1) + TILES(0x1020A, 12) HITBOX(0, -11, -18, 9, -2) SHOW_FRAME(4, 1) - END() + END() }; const s32 anim_0406__v1_l0[] = { // 0x080ECE10 - PALETTE(19, 16, 0xE0) - TILES(0x1023E, 16) - HITBOX(0, -10, -21, 7, -1) - SHOW_FRAME(7, 4) + PALETTE(19, 16, 0xE0) TILES(0x1023E, 16) HITBOX(0, -10, -21, 7, -1) SHOW_FRAME(7, 4) - TILES(0x1024E, 16) - HITBOX(0, -10, -19, 7, -2) - SHOW_FRAME(7, 5) + TILES(0x1024E, 16) HITBOX(0, -10, -19, 7, -2) SHOW_FRAME(7, 5) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0406[2] = { +const s32 *const anim_0406[2] = { anim_0406__v0_l0, anim_0406__v1_l0, }; const s32 anim_0407__v0_l0[] = { // 0x080ECE6C - TILES(0x1025E, 64) - PALETTE(20, 16, 0x90) - HITBOX(0, -15, -29, 14, -1) - SHOW_FRAME(6, 0) + TILES(0x1025E, 64) PALETTE(20, 16, 0x90) HITBOX(0, -15, -29, 14, -1) SHOW_FRAME(6, 0) - HITBOX(0, -15, -29, 14, -1) - SHOW_FRAME(6, 1) + HITBOX(0, -15, -29, 14, -1) SHOW_FRAME(6, 1) - HITBOX(0, -15, -29, 14, -1) - SHOW_FRAME(6, 2) + HITBOX(0, -15, -29, 14, -1) SHOW_FRAME(6, 2) - HITBOX(0, -15, -29, 14, -1) - SHOW_FRAME(6, 3) + HITBOX(0, -15, -29, 14, -1) SHOW_FRAME(6, 3) - END() + END() }; -const s32 * const anim_0407[1] = { +const s32 *const anim_0407[1] = { anim_0407__v0_l0, }; const s32 anim_0408__v0_l0[] = { // 0x080ECEDC - PALETTE(17, 16, 0xC0) - TILES(0x1029E, 4) - HITBOX(0, -4, -4, 4, 5) - SHOW_FRAME(1, 0) + PALETTE(17, 16, 0xC0) TILES(0x1029E, 4) HITBOX(0, -4, -4, 4, 5) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0408[1] = { +const s32 *const anim_0408[1] = { anim_0408__v0_l0, }; const s32 anim_0409__v0_l0[] = { // 0x080ECF10 - PALETTE(17, 16, 0xC0) - TILES(0x102A2, 1) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(1, 0) + PALETTE(17, 16, 0xC0) TILES(0x102A2, 1) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0409[1] = { +const s32 *const anim_0409[1] = { anim_0409__v0_l0, }; const s32 anim_0410__v0_l0[] = { // 0x080ECF44 - PALETTE(17, 16, 0xC0) - TILES(0x102A3, 4) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(3, 0) + PALETTE(17, 16, 0xC0) TILES(0x102A3, 4) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(3, 0) - TILES(0x102A7, 4) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(3, 1) + TILES(0x102A7, 4) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(3, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0410[1] = { +const s32 *const anim_0410[1] = { anim_0410__v0_l0, }; const s32 anim_0411__v0_l0[] = { // 0x080ECF9C - PALETTE(21, 16, 0xE0) - TILES(0x102AB, 8) - HITBOX(0, -6, -14, 6, -2) - SHOW_FRAME(5, 0) + PALETTE(21, 16, 0xE0) TILES(0x102AB, 8) HITBOX(0, -6, -14, 6, -2) SHOW_FRAME(5, 0) - TILES(0x102B3, 8) - SHOW_FRAME(5, 1) + TILES(0x102B3, 8) SHOW_FRAME(5, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0411__v1_l0[] = { // 0x080ECFE4 - PALETTE(21, 16, 0xE0) - TILES(0x102BB, 16) - HITBOX(0, -10, -18, 10, 2) - SHOW_FRAME(5, 2) + PALETTE(21, 16, 0xE0) TILES(0x102BB, 16) HITBOX(0, -10, -18, 10, 2) SHOW_FRAME(5, 2) - TILES(0x102CB, 16) - SHOW_FRAME(5, 3) + TILES(0x102CB, 16) SHOW_FRAME(5, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0411[2] = { +const s32 *const anim_0411[2] = { anim_0411__v0_l0, anim_0411__v1_l0, }; const s32 anim_0412__v0_l0[] = { // 0x080ED034 - PALETTE(22, 16, 0xD0) - TILES(0x102DB, 4) - HITBOX(0, -8, -1, 8, 13) - SHOW_FRAME(30, 0) + PALETTE(22, 16, 0xD0) TILES(0x102DB, 4) HITBOX(0, -8, -1, 8, 13) SHOW_FRAME(30, 0) - END() + END() }; const s32 anim_0412__v1_l0[] = { // 0x080ED064 - PALETTE(22, 16, 0xD0) - TILES(0x102DF, 6) - HITBOX(0, -8, 2, 8, 16) - SHOW_FRAME(3, 1) + PALETTE(22, 16, 0xD0) TILES(0x102DF, 6) HITBOX(0, -8, 2, 8, 16) SHOW_FRAME(3, 1) - TILES(0x102E5, 6) - SHOW_FRAME(3, 2) + TILES(0x102E5, 6) SHOW_FRAME(3, 2) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0412__v2_l0[] = { // 0x080ED0AC - PALETTE(22, 16, 0xD0) - TILES(0x102EB, 4) - HITBOX(0, -8, -1, 8, 13) - SHOW_FRAME(20, 3) + PALETTE(22, 16, 0xD0) TILES(0x102EB, 4) HITBOX(0, -8, -1, 8, 13) SHOW_FRAME(20, 3) - END() + END() }; -const s32 * const anim_0412[3] = { +const s32 *const anim_0412[3] = { anim_0412__v0_l0, anim_0412__v1_l0, anim_0412__v2_l0, }; const s32 anim_0413__v0_l0[] = { // 0x080ED0E8 - PALETTE(23, 16, 0xC0) - TILES(0x102EF, 4) - HITBOX(0, -6, -22, 6, -5) - SHOW_FRAME(4, 0) + PALETTE(23, 16, 0xC0) TILES(0x102EF, 4) HITBOX(0, -6, -22, 6, -5) SHOW_FRAME(4, 0) - TILES(0x102F3, 4) - SHOW_FRAME(4, 1) + TILES(0x102F3, 4) SHOW_FRAME(4, 1) - TILES(0x102F7, 8) - SHOW_FRAME(4, 2) + TILES(0x102F7, 8) SHOW_FRAME(4, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0413__v1_l0[] = { // 0x080ED144 - PALETTE(23, 16, 0xC0) - TILES(0x102FF, 6) - SHOW_FRAME(5, 3) + PALETTE(23, 16, 0xC0) TILES(0x102FF, 6) SHOW_FRAME(5, 3) - TILES(0x10305, 6) - SHOW_FRAME(5, 4) + TILES(0x10305, 6) SHOW_FRAME(5, 4) - END() + END() }; -const s32 * const anim_0413[2] = { +const s32 *const anim_0413[2] = { anim_0413__v0_l0, anim_0413__v1_l0, }; const s32 anim_0414__v0_l0[] = { // 0x080ED184 - PALETTE(23, 16, 0xC0) - TILES(0x1030B, 1) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(3, 0) + PALETTE(23, 16, 0xC0) TILES(0x1030B, 1) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(3, 0) - TILES(0x1030C, 1) - SHOW_FRAME(3, 1) + TILES(0x1030C, 1) SHOW_FRAME(3, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0414[1] = { +const s32 *const anim_0414[1] = { anim_0414__v0_l0, }; const s32 anim_0415__v0_l0[] = { // 0x080ED1D0 - PALETTE(24, 16, 0xD0) - TILES(0x1030D, 16) - HITBOX(0, -10, -26, 10, 2) - SHOW_FRAME(5, 0) + PALETTE(24, 16, 0xD0) TILES(0x1030D, 16) HITBOX(0, -10, -26, 10, 2) SHOW_FRAME(5, 0) - TILES(0x1031D, 16) - HITBOX(0, -10, -26, 10, 2) - SHOW_FRAME(5, 1) + TILES(0x1031D, 16) HITBOX(0, -10, -26, 10, 2) SHOW_FRAME(5, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; const s32 anim_0415__v1_l0[] = { // 0x080ED224 - PALETTE(24, 16, 0xD0) - TILES(0x1032D, 20) - HITBOX(0, -10, -26, 10, 2) - SHOW_FRAME(5, 2) + PALETTE(24, 16, 0xD0) TILES(0x1032D, 20) HITBOX(0, -10, -26, 10, 2) SHOW_FRAME(5, 2) - TILES(0x10341, 20) - HITBOX(0, -10, -26, 10, 2) - SHOW_FRAME(10, 3) + TILES(0x10341, 20) HITBOX(0, -10, -26, 10, 2) SHOW_FRAME(10, 3) - TILES(0x1032D, 20) - HITBOX(0, -10, -26, 10, 2) - SHOW_FRAME(5, 2) + TILES(0x1032D, 20) HITBOX(0, -10, -26, 10, 2) SHOW_FRAME(5, 2) - END() + END() }; -const s32 * const anim_0415[2] = { +const s32 *const anim_0415[2] = { anim_0415__v0_l0, anim_0415__v1_l0, }; const s32 anim_0416__v0_l0[] = { // 0x080ED29C - PALETTE(25, 16, 0xD0) - TILES(0x10355, 1) - HITBOX(0, -6, -6, 7, 7) - SHOW_FRAME(4, 0) + PALETTE(25, 16, 0xD0) TILES(0x10355, 1) HITBOX(0, -6, -6, 7, 7) SHOW_FRAME(4, 0) - TILES(0x10356, 4) - HITBOX(0, -16, -16, 16, 16) - SHOW_FRAME(4, 1) + TILES(0x10356, 4) HITBOX(0, -16, -16, 16, 16) SHOW_FRAME(4, 1) - TILES(0x1035A, 9) - HITBOX(0, -16, -16, 16, 16) - SHOW_FRAME(4, 2) + TILES(0x1035A, 9) HITBOX(0, -16, -16, 16, 16) SHOW_FRAME(4, 2) - TILES(0x10363, 16) - HITBOX(0, -24, -24, 24, 24) - SHOW_FRAME(4, 3) + TILES(0x10363, 16) HITBOX(0, -24, -24, 24, 24) SHOW_FRAME(4, 3) - TILES(0x10373, 16) - HITBOX(0, -24, -24, 24, 24) - SHOW_FRAME(4, 4) + TILES(0x10373, 16) HITBOX(0, -24, -24, 24, 24) SHOW_FRAME(4, 4) - END() + END() }; -const s32 * const anim_0416[1] = { +const s32 *const anim_0416[1] = { anim_0416__v0_l0, }; const s32 anim_0417__v0_l0[] = { // 0x080ED350 - PALETTE(26, 16, 0xE0) - TILES(0x10383, 15) - HITBOX(0, -21, -29, 21, -8) - SHOW_FRAME(4, 0) + PALETTE(26, 16, 0xE0) TILES(0x10383, 15) HITBOX(0, -21, -29, 21, -8) SHOW_FRAME(4, 0) - TILES(0x10392, 15) - SHOW_FRAME(4, 1) + TILES(0x10392, 15) SHOW_FRAME(4, 1) - TILES(0x103A1, 15) - SHOW_FRAME(4, 2) + TILES(0x103A1, 15) SHOW_FRAME(4, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0417__v1_l0[] = { // 0x080ED3AC - PALETTE(26, 16, 0xE0) - TILES(0x103B0, 12) - HITBOX(0, -21, -29, 21, -8) - SHOW_FRAME(4, 3) + PALETTE(26, 16, 0xE0) TILES(0x103B0, 12) HITBOX(0, -21, -29, 21, -8) SHOW_FRAME(4, 3) - TILES(0x103BC, 12) - SHOW_FRAME(4, 4) + TILES(0x103BC, 12) SHOW_FRAME(4, 4) - TILES(0x103C8, 15) - SHOW_FRAME(4, 5) + TILES(0x103C8, 15) SHOW_FRAME(4, 5) - END() + END() }; -const s32 * const anim_0417[2] = { +const s32 *const anim_0417[2] = { anim_0417__v0_l0, anim_0417__v1_l0, }; const s32 anim_0418__v0_l0[] = { // 0x080ED40C - PALETTE(24, 16, 0xC0) - TILES(0x103D7, 36) - HITBOX(0, -10, -42, 10, -22) - HITBOX(1, -14, -22, 14, 2) - SHOW_FRAME(5, 0) + PALETTE(24, 16, 0xC0) TILES(0x103D7, 36) HITBOX(0, -10, -42, 10, -22) HITBOX(1, -14, -22, 14, 2) SHOW_FRAME(5, 0) - TILES(0x103FB, 36) - SHOW_FRAME(5, 1) + TILES(0x103FB, 36) SHOW_FRAME(5, 1) - TILES(0x1041F, 24) - SHOW_FRAME(5, 2) + TILES(0x1041F, 24) SHOW_FRAME(5, 2) - TILES(0x10437, 36) - SHOW_FRAME(5, 3) + TILES(0x10437, 36) SHOW_FRAME(5, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0418[1] = { +const s32 *const anim_0418[1] = { anim_0418__v0_l0, }; const s32 anim_0419__v0_l0[] = { // 0x080ED48C - PALETTE(24, 16, 0xD0) - TILES(0x1045B, 4) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(4, 0) + PALETTE(24, 16, 0xD0) TILES(0x1045B, 4) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(4, 0) - TILES(0x1045F, 4) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(4, 1) + TILES(0x1045F, 4) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(4, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0419[1] = { +const s32 *const anim_0419[1] = { anim_0419__v0_l0, }; const s32 anim_0420__v0_l0[] = { // 0x080ED4E4 - PALETTE(26, 16, 0xE0) - TILES(0x10463, 4) - HITBOX(0, -6, -5, 6, 6) - SHOW_FRAME(1, 0) + PALETTE(26, 16, 0xE0) TILES(0x10463, 4) HITBOX(0, -6, -5, 6, 6) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0420[1] = { +const s32 *const anim_0420[1] = { anim_0420__v0_l0, }; const s32 anim_0421__v0_l0[] = { // 0x080ED518 - PALETTE(26, 16, 0xE0) - TILES(0x10467, 1) - SHOW_FRAME(1, 0) + PALETTE(26, 16, 0xE0) TILES(0x10467, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0421[1] = { +const s32 *const anim_0421[1] = { anim_0421__v0_l0, }; const s32 anim_0422__v0_l0[] = { // 0x080ED540 - PALETTE(27, 16, 0xC0) - TILES(0x10468, 6) - HITBOX(0, -6, -20, 6, 1) - SHOW_FRAME(10, 0) + PALETTE(27, 16, 0xC0) TILES(0x10468, 6) HITBOX(0, -6, -20, 6, 1) SHOW_FRAME(10, 0) - TILES(0x1046E, 6) - HITBOX(0, -6, -19, 6, 1) - SHOW_FRAME(3, 1) + TILES(0x1046E, 6) HITBOX(0, -6, -19, 6, 1) SHOW_FRAME(3, 1) - TILES(0x10474, 8) - HITBOX(0, -6, -20, 6, 1) - SHOW_FRAME(6, 2) + TILES(0x10474, 8) HITBOX(0, -6, -20, 6, 1) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0422__v1_l0[] = { // 0x080ED5B0 - PALETTE(27, 16, 0xC0) - TILES(0x10468, 6) - HITBOX(0, -6, -20, 6, 1) - SHOW_FRAME(6, 0) + PALETTE(27, 16, 0xC0) TILES(0x10468, 6) HITBOX(0, -6, -20, 6, 1) SHOW_FRAME(6, 0) - TILES(0x1047C, 8) - HITBOX(0, -6, -20, 6, 1) - SHOW_FRAME(6, 3) + TILES(0x1047C, 8) HITBOX(0, -6, -20, 6, 1) SHOW_FRAME(6, 3) - TILES(0x10468, 6) - HITBOX(0, -6, -20, 6, 1) - SHOW_FRAME(6, 0) + TILES(0x10468, 6) HITBOX(0, -6, -20, 6, 1) SHOW_FRAME(6, 0) - TILES(0x10484, 8) - HITBOX(0, -6, -21, 6, 1) - SHOW_FRAME(6, 4) + TILES(0x10484, 8) HITBOX(0, -6, -21, 6, 1) SHOW_FRAME(6, 4) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0422[2] = { +const s32 *const anim_0422[2] = { anim_0422__v0_l0, anim_0422__v1_l0, }; const s32 anim_0423__v0_l0[] = { // 0x080ED64C - PALETTE(27, 16, 0xC0) - TILES(0x1048C, 6) - HITBOX(0, -20, -6, 1, 6) - SHOW_FRAME(10, 0) + PALETTE(27, 16, 0xC0) TILES(0x1048C, 6) HITBOX(0, -20, -6, 1, 6) SHOW_FRAME(10, 0) - TILES(0x10492, 6) - HITBOX(0, -19, -6, 1, 6) - SHOW_FRAME(3, 1) + TILES(0x10492, 6) HITBOX(0, -19, -6, 1, 6) SHOW_FRAME(3, 1) - TILES(0x10498, 8) - HITBOX(0, -21, -6, 1, 6) - SHOW_FRAME(6, 2) + TILES(0x10498, 8) HITBOX(0, -21, -6, 1, 6) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0423__v1_l0[] = { // 0x080ED6BC - PALETTE(27, 16, 0xC0) - TILES(0x1048C, 6) - HITBOX(0, -19, -6, 1, 6) - SHOW_FRAME(5, 0) + PALETTE(27, 16, 0xC0) TILES(0x1048C, 6) HITBOX(0, -19, -6, 1, 6) SHOW_FRAME(5, 0) - TILES(0x104A0, 8) - HITBOX(0, -21, -6, 1, 6) - SHOW_FRAME(5, 3) + TILES(0x104A0, 8) HITBOX(0, -21, -6, 1, 6) SHOW_FRAME(5, 3) - TILES(0x1048C, 6) - HITBOX(0, -20, -6, 1, 6) - SHOW_FRAME(5, 0) + TILES(0x1048C, 6) HITBOX(0, -20, -6, 1, 6) SHOW_FRAME(5, 0) - TILES(0x104A8, 8) - HITBOX(0, -21, -6, 1, 6) - SHOW_FRAME(5, 4) + TILES(0x104A8, 8) HITBOX(0, -21, -6, 1, 6) SHOW_FRAME(5, 4) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0423[2] = { +const s32 *const anim_0423[2] = { anim_0423__v0_l0, anim_0423__v1_l0, }; const s32 anim_0424__v0_l0[] = { // 0x080ED758 - PALETTE(27, 16, 0xC0) - TILES(0x104B0, 10) - HITBOX(0, -14, -5, 14, 3) - SHOW_FRAME(4, 0) + PALETTE(27, 16, 0xC0) TILES(0x104B0, 10) HITBOX(0, -14, -5, 14, 3) SHOW_FRAME(4, 0) - TILES(0x104BA, 10) - SHOW_FRAME(4, 1) + TILES(0x104BA, 10) SHOW_FRAME(4, 1) - TILES(0x104C4, 10) - SHOW_FRAME(4, 2) + TILES(0x104C4, 10) SHOW_FRAME(4, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0424[1] = { +const s32 *const anim_0424[1] = { anim_0424__v0_l0, }; const s32 anim_0425__v0_l0[] = { // 0x080ED7B8 - PALETTE(28, 16, 0xE0) - TILES(0x104CE, 6) - HITBOX(0, -6, -8, 6, 6) - SHOW_FRAME(6, 0) + PALETTE(28, 16, 0xE0) TILES(0x104CE, 6) HITBOX(0, -6, -8, 6, 6) SHOW_FRAME(6, 0) - TILES(0x104D4, 8) - SHOW_FRAME(6, 1) + TILES(0x104D4, 8) SHOW_FRAME(6, 1) - TILES(0x104DC, 3) - SHOW_FRAME(6, 2) + TILES(0x104DC, 3) SHOW_FRAME(6, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0425__v1_l0[] = { // 0x080ED814 - PALETTE(28, 16, 0xE0) - TILES(0x104DF, 15) - HITBOX(0, -16, -16, 16, 16) - SHOW_FRAME(2, 3) + PALETTE(28, 16, 0xE0) TILES(0x104DF, 15) HITBOX(0, -16, -16, 16, 16) SHOW_FRAME(2, 3) - TILES(0x104EE, 15) - SHOW_FRAME(2, 4) + TILES(0x104EE, 15) SHOW_FRAME(2, 4) - TILES(0x104FD, 15) - SHOW_FRAME(2, 5) + TILES(0x104FD, 15) SHOW_FRAME(2, 5) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0425[2] = { +const s32 *const anim_0425[2] = { anim_0425__v0_l0, anim_0425__v1_l0, }; const s32 anim_0426__v0_l0[] = { // 0x080ED878 - PALETTE(29, 16, 0xD0) - TILES(0x1050C, 8) - HITBOX(0, -5, -23, 7, 1) - SHOW_FRAME(5, 0) + PALETTE(29, 16, 0xD0) TILES(0x1050C, 8) HITBOX(0, -5, -23, 7, 1) SHOW_FRAME(5, 0) - TILES(0x10514, 6) - SHOW_FRAME(5, 1) + TILES(0x10514, 6) SHOW_FRAME(5, 1) - TILES(0x1051A, 8) - SHOW_FRAME(5, 2) + TILES(0x1051A, 8) SHOW_FRAME(5, 2) - TILES(0x10514, 6) - SHOW_FRAME(5, 1) + TILES(0x10514, 6) SHOW_FRAME(5, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0426__v1_l0[] = { // 0x080ED8E8 - PALETTE(29, 16, 0xD0) - TILES(0x10522, 6) - HITBOX(0, -6, -23, 6, 1) - SHOW_FRAME(13, 3) + PALETTE(29, 16, 0xD0) TILES(0x10522, 6) HITBOX(0, -6, -23, 6, 1) SHOW_FRAME(13, 3) - TILES(0x10528, 6) - SHOW_FRAME(5, 4) + TILES(0x10528, 6) SHOW_FRAME(5, 4) - END() + END() }; -const s32 * const anim_0426[2] = { +const s32 *const anim_0426[2] = { anim_0426__v0_l0, anim_0426__v1_l0, }; const s32 anim_0427__v0_l0[] = { // 0x080ED934 - PALETTE(27, 16, 0xC0) - TILES(0x1052E, 1) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(1, 0) + PALETTE(27, 16, 0xC0) TILES(0x1052E, 1) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0427[1] = { +const s32 *const anim_0427[1] = { anim_0427__v0_l0, }; const s32 anim_0428__v0_l0[] = { // 0x080ED968 - PALETTE(29, 16, 0xD0) - TILES(0x1052F, 4) - HITBOX(0, -5, -10, 5, 1) - SHOW_FRAME(1, 0) + PALETTE(29, 16, 0xD0) TILES(0x1052F, 4) HITBOX(0, -5, -10, 5, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0428[1] = { +const s32 *const anim_0428[1] = { anim_0428__v0_l0, }; const s32 anim_0429__v0_l0[] = { // 0x080ED99C - PALETTE(29, 16, 0xD0) - TILES(0x10533, 1) - SHOW_FRAME(1, 0) + PALETTE(29, 16, 0xD0) TILES(0x10533, 1) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0429__v1_l0[] = { // 0x080ED9C0 - PALETTE(29, 16, 0xD0) - TILES(0x10534, 1) - SHOW_FRAME(1, 1) + PALETTE(29, 16, 0xD0) TILES(0x10534, 1) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0429[2] = { +const s32 *const anim_0429[2] = { anim_0429__v0_l0, anim_0429__v1_l0, }; const s32 anim_0430__v0_l0[] = { // 0x080ED9EC - PALETTE(30, 16, 0xE0) - TILES(0x10535, 18) - HITBOX(0, -12, -16, 12, 2) - SHOW_FRAME(5, 0) + PALETTE(30, 16, 0xE0) TILES(0x10535, 18) HITBOX(0, -12, -16, 12, 2) SHOW_FRAME(5, 0) - TILES(0x10547, 18) - SHOW_FRAME(5, 1) + TILES(0x10547, 18) SHOW_FRAME(5, 1) - TILES(0x10535, 18) - SHOW_FRAME(5, 0) + TILES(0x10535, 18) SHOW_FRAME(5, 0) - TILES(0x10559, 18) - SHOW_FRAME(5, 2) + TILES(0x10559, 18) SHOW_FRAME(5, 2) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0430__v1_l0[] = { // 0x080EDA5C - PALETTE(30, 16, 0xE0) - TILES(0x1056B, 18) - HITBOX(0, -12, -16, 12, 2) - SHOW_FRAME(13, 3) + PALETTE(30, 16, 0xE0) TILES(0x1056B, 18) HITBOX(0, -12, -16, 12, 2) SHOW_FRAME(13, 3) - TILES(0x1057D, 21) - SHOW_FRAME(2, 4) + TILES(0x1057D, 21) SHOW_FRAME(2, 4) - TILES(0x10592, 24) - HITBOX(0, -12, -16, 12, 2) - HITBOX(1, -38, -16, -12, 2) - SHOW_FRAME(12, 5) + TILES(0x10592, 24) HITBOX(0, -12, -16, 12, 2) HITBOX(1, -38, -16, -12, 2) SHOW_FRAME(12, 5) - TILES(0x1057D, 21) - SHOW_FRAME(2, 4) + TILES(0x1057D, 21) SHOW_FRAME(2, 4) - TILES(0x1056B, 18) - HITBOX(0, -12, -16, 12, 2) - SHOW_FRAME(2, 3) + TILES(0x1056B, 18) HITBOX(0, -12, -16, 12, 2) SHOW_FRAME(2, 3) - END() + END() }; const s32 anim_0430__v2_l0[] = { // 0x080EDB00 - PALETTE(30, 16, 0xE0) - TILES(0x105AA, 18) - HITBOX(0, -12, -16, 12, 2) - SHOW_FRAME(7, 6) + PALETTE(30, 16, 0xE0) TILES(0x105AA, 18) HITBOX(0, -12, -16, 12, 2) SHOW_FRAME(7, 6) - TILES(0x105BC, 18) - HITBOX(0, -14, -16, 12, 2) - SHOW_FRAME(7, 7) + TILES(0x105BC, 18) HITBOX(0, -14, -16, 12, 2) SHOW_FRAME(7, 7) - END() + END() }; -const s32 * const anim_0430[3] = { +const s32 *const anim_0430[3] = { anim_0430__v0_l0, anim_0430__v1_l0, anim_0430__v2_l0, }; const s32 anim_0431__v0_l0[] = { // 0x080EDB5C - PALETTE(18, 16, 0xD0) - TILES(0x105CE, 4) - HITBOX(0, -6, -6, 6, 6) - SHOW_FRAME(1, 0) + PALETTE(18, 16, 0xD0) TILES(0x105CE, 4) HITBOX(0, -6, -6, 6, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0431__v1_l0[] = { // 0x080EDB8C - PALETTE(18, 16, 0xD0) - TILES(0x105D2, 4) - HITBOX(0, -6, -6, 6, 6) - SHOW_FRAME(1, 1) + PALETTE(18, 16, 0xD0) TILES(0x105D2, 4) HITBOX(0, -6, -6, 6, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0431__v2_l0[] = { // 0x080EDBBC - PALETTE(18, 16, 0xD0) - TILES(0x105D6, 4) - HITBOX(0, -5, -5, 5, 5) - SHOW_FRAME(1, 2) + PALETTE(18, 16, 0xD0) TILES(0x105D6, 4) HITBOX(0, -5, -5, 5, 5) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0431[3] = { +const s32 *const anim_0431[3] = { anim_0431__v0_l0, anim_0431__v1_l0, anim_0431__v2_l0, }; const s32 anim_0432__v0_l0[] = { // 0x080EDBF8 - PALETTE(31, 16, 0xD0) - TILES(0x105DA, 16) - HITBOX(0, -10, -26, 10, -6) - SHOW_FRAME(5, 0) + PALETTE(31, 16, 0xD0) TILES(0x105DA, 16) HITBOX(0, -10, -26, 10, -6) SHOW_FRAME(5, 0) - TILES(0x105EA, 16) - SHOW_FRAME(5, 1) + TILES(0x105EA, 16) SHOW_FRAME(5, 1) - TILES(0x105FA, 16) - SHOW_FRAME(5, 2) + TILES(0x105FA, 16) SHOW_FRAME(5, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0432__v1_l0[] = { // 0x080EDC54 - PALETTE(31, 16, 0xD0) - TILES(0x1060A, 20) - HITBOX(0, -10, -26, 10, -6) - SHOW_FRAME(4, 3) + PALETTE(31, 16, 0xD0) TILES(0x1060A, 20) HITBOX(0, -10, -26, 10, -6) SHOW_FRAME(4, 3) - TILES(0x1061E, 20) - SHOW_FRAME(3, 4) + TILES(0x1061E, 20) SHOW_FRAME(3, 4) - TILES(0x1060A, 20) - SHOW_FRAME(4, 3) + TILES(0x1060A, 20) SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0432[2] = { +const s32 *const anim_0432[2] = { anim_0432__v0_l0, anim_0432__v1_l0, }; const s32 anim_0433__v0_l0[] = { // 0x080EDCB4 - PALETTE(31, 16, 0xD0) - TILES(0x10632, 8) - HITBOX(0, -8, -24, 8, -4) - SHOW_FRAME(5, 0) + PALETTE(31, 16, 0xD0) TILES(0x10632, 8) HITBOX(0, -8, -24, 8, -4) SHOW_FRAME(5, 0) - TILES(0x1063A, 8) - SHOW_FRAME(5, 1) + TILES(0x1063A, 8) SHOW_FRAME(5, 1) - TILES(0x10642, 8) - SHOW_FRAME(5, 2) + TILES(0x10642, 8) SHOW_FRAME(5, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0433__v1_l0[] = { // 0x080EDD10 - PALETTE(31, 16, 0xD0) - TILES(0x10632, 8) - HITBOX(0, -8, -24, 8, -4) - SHOW_FRAME(5, 0) + PALETTE(31, 16, 0xD0) TILES(0x10632, 8) HITBOX(0, -8, -24, 8, -4) SHOW_FRAME(5, 0) - TILES(0x1064A, 8) - SHOW_FRAME(3, 3) + TILES(0x1064A, 8) SHOW_FRAME(3, 3) - TILES(0x10652, 8) - SHOW_FRAME(3, 4) + TILES(0x10652, 8) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0433[2] = { +const s32 *const anim_0433[2] = { anim_0433__v0_l0, anim_0433__v1_l0, }; const s32 anim_0434__v0_l0[] = { // 0x080EDD70 - PALETTE(21, 16, 0xE0) - TILES(0x1065A, 4) - SHOW_FRAME(1, 0) + PALETTE(21, 16, 0xE0) TILES(0x1065A, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0434__v1_l0[] = { // 0x080EDD94 - PALETTE(21, 16, 0xE0) - TILES(0x1065E, 4) - SHOW_FRAME(3, 1) + PALETTE(21, 16, 0xE0) TILES(0x1065E, 4) SHOW_FRAME(3, 1) - TILES(0x10662, 12) - SHOW_FRAME(3, 2) + TILES(0x10662, 12) SHOW_FRAME(3, 2) - TILES(0x1066E, 16) - HITBOX(0, -7, -20, 7, 2) - SHOW_FRAME(50, 3) + TILES(0x1066E, 16) HITBOX(0, -7, -20, 7, 2) SHOW_FRAME(50, 3) - TILES(0x10662, 12) - HITBOX(0, -7, -13, 7, 2) - SHOW_FRAME(10, 2) + TILES(0x10662, 12) HITBOX(0, -7, -13, 7, 2) SHOW_FRAME(10, 2) - TILES(0x1065E, 4) - SHOW_FRAME(6, 1) + TILES(0x1065E, 4) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0434[2] = { +const s32 *const anim_0434[2] = { anim_0434__v0_l0, anim_0434__v1_l0, }; const s32 anim_0435__v0_l0[] = { // 0x080EDE28 - PALETTE(31, 16, 0xD0) - TILES(0x1067E, 4) - HITBOX(0, -4, -4, 4, 4) - SHOW_FRAME(3, 0) + PALETTE(31, 16, 0xD0) TILES(0x1067E, 4) HITBOX(0, -4, -4, 4, 4) SHOW_FRAME(3, 0) - TILES(0x10682, 4) - SHOW_FRAME(3, 1) + TILES(0x10682, 4) SHOW_FRAME(3, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0435[1] = { +const s32 *const anim_0435[1] = { anim_0435__v0_l0, }; const s32 anim_0436__v0_l0[] = { // 0x080EDE74 - PALETTE(31, 16, 0xD0) - TILES(0x10686, 4) - HITBOX(0, -4, -4, 4, 4) - SHOW_FRAME(3, 0) + PALETTE(31, 16, 0xD0) TILES(0x10686, 4) HITBOX(0, -4, -4, 4, 4) SHOW_FRAME(3, 0) - TILES(0x1068A, 4) - HITBOX(0, -4, -4, 4, 4) - SHOW_FRAME(1, 1) + TILES(0x1068A, 4) HITBOX(0, -4, -4, 4, 4) SHOW_FRAME(1, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0436[1] = { +const s32 *const anim_0436[1] = { anim_0436__v0_l0, }; const s32 anim_0437__v0_l0[] = { // 0x080EDECC - PALETTE(32, 16, 0xF0) - TILES(0x1068E, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x1068E, 4) SHOW_FRAME(8, 0) - TILES(0x10692, 4) - SHOW_FRAME(8, 1) + TILES(0x10692, 4) SHOW_FRAME(8, 1) - TILES(0x10696, 4) - SHOW_FRAME(8, 2) + TILES(0x10696, 4) SHOW_FRAME(8, 2) - TILES(0x10692, 4) - SHOW_FRAME(8, 1) + TILES(0x10692, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0437[1] = { +const s32 *const anim_0437[1] = { anim_0437__v0_l0, }; const s32 anim_0438__v0_l0[] = { // 0x080EDF34 - PALETTE(32, 16, 0xF0) - TILES(0x1069A, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x1069A, 4) SHOW_FRAME(8, 0) - TILES(0x1069E, 4) - SHOW_FRAME(8, 1) + TILES(0x1069E, 4) SHOW_FRAME(8, 1) - TILES(0x106A2, 4) - SHOW_FRAME(8, 2) + TILES(0x106A2, 4) SHOW_FRAME(8, 2) - TILES(0x1069E, 4) - SHOW_FRAME(8, 1) + TILES(0x1069E, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0438[1] = { +const s32 *const anim_0438[1] = { anim_0438__v0_l0, }; const s32 anim_0439__v0_l0[] = { // 0x080EDF9C - PALETTE(32, 16, 0xF0) - TILES(0x106A6, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106A6, 4) SHOW_FRAME(8, 0) - TILES(0x106AA, 4) - SHOW_FRAME(8, 1) + TILES(0x106AA, 4) SHOW_FRAME(8, 1) - TILES(0x106AE, 4) - SHOW_FRAME(8, 2) + TILES(0x106AE, 4) SHOW_FRAME(8, 2) - TILES(0x106AA, 4) - SHOW_FRAME(8, 1) + TILES(0x106AA, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0439[1] = { +const s32 *const anim_0439[1] = { anim_0439__v0_l0, }; const s32 anim_0440__v0_l0[] = { // 0x080EE004 - PALETTE(32, 16, 0xF0) - TILES(0x106B2, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106B2, 4) SHOW_FRAME(8, 0) - TILES(0x106B6, 4) - SHOW_FRAME(2, 1) + TILES(0x106B6, 4) SHOW_FRAME(2, 1) - TILES(0x106BA, 4) - SHOW_FRAME(10, 2) + TILES(0x106BA, 4) SHOW_FRAME(10, 2) - TILES(0x106B6, 4) - SHOW_FRAME(2, 1) + TILES(0x106B6, 4) SHOW_FRAME(2, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0440[1] = { +const s32 *const anim_0440[1] = { anim_0440__v0_l0, }; const s32 anim_0441__v0_l0[] = { // 0x080EE06C - PALETTE(32, 16, 0xF0) - TILES(0x106BE, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106BE, 4) SHOW_FRAME(8, 0) - TILES(0x106C2, 4) - SHOW_FRAME(8, 1) + TILES(0x106C2, 4) SHOW_FRAME(8, 1) - TILES(0x106C6, 4) - SHOW_FRAME(8, 2) + TILES(0x106C6, 4) SHOW_FRAME(8, 2) - TILES(0x106C2, 4) - SHOW_FRAME(8, 1) + TILES(0x106C2, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0441[1] = { +const s32 *const anim_0441[1] = { anim_0441__v0_l0, }; const s32 anim_0442__v0_l0[] = { // 0x080EE0D4 - PALETTE(32, 16, 0xF0) - TILES(0x106CA, 4) - SHOW_FRAME(3, 0) + PALETTE(32, 16, 0xF0) TILES(0x106CA, 4) SHOW_FRAME(3, 0) - TILES(0x106CE, 4) - SHOW_FRAME(3, 1) + TILES(0x106CE, 4) SHOW_FRAME(3, 1) - TILES(0x106D2, 4) - SHOW_FRAME(3, 2) + TILES(0x106D2, 4) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0442[1] = { +const s32 *const anim_0442[1] = { anim_0442__v0_l0, }; const s32 anim_0443__v0_l0[] = { // 0x080EE128 - PALETTE(32, 16, 0xF0) - TILES(0x106D6, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106D6, 4) SHOW_FRAME(8, 0) - TILES(0x106DA, 4) - SHOW_FRAME(8, 1) + TILES(0x106DA, 4) SHOW_FRAME(8, 1) - TILES(0x106DE, 4) - SHOW_FRAME(8, 2) + TILES(0x106DE, 4) SHOW_FRAME(8, 2) - TILES(0x106DA, 4) - SHOW_FRAME(8, 1) + TILES(0x106DA, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0443[1] = { +const s32 *const anim_0443[1] = { anim_0443__v0_l0, }; const s32 anim_0444__v0_l0[] = { // 0x080EE190 - PALETTE(32, 16, 0xF0) - TILES(0x106E2, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106E2, 4) SHOW_FRAME(8, 0) - TILES(0x106E6, 4) - SHOW_FRAME(8, 1) + TILES(0x106E6, 4) SHOW_FRAME(8, 1) - TILES(0x106EA, 4) - SHOW_FRAME(8, 2) + TILES(0x106EA, 4) SHOW_FRAME(8, 2) - TILES(0x106E6, 4) - SHOW_FRAME(8, 1) + TILES(0x106E6, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0444[1] = { +const s32 *const anim_0444[1] = { anim_0444__v0_l0, }; const s32 anim_0445__v0_l0[] = { // 0x080EE1F8 - PALETTE(32, 16, 0xF0) - TILES(0x106EE, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106EE, 4) SHOW_FRAME(8, 0) - TILES(0x106F2, 4) - SHOW_FRAME(8, 1) + TILES(0x106F2, 4) SHOW_FRAME(8, 1) - TILES(0x106F6, 4) - SHOW_FRAME(8, 2) + TILES(0x106F6, 4) SHOW_FRAME(8, 2) - TILES(0x106F2, 4) - SHOW_FRAME(8, 1) + TILES(0x106F2, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0445[1] = { +const s32 *const anim_0445[1] = { anim_0445__v0_l0, }; const s32 anim_0446__v0_l0[] = { // 0x080EE260 - PALETTE(32, 16, 0xF0) - TILES(0x106FA, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x106FA, 4) SHOW_FRAME(8, 0) - TILES(0x106FE, 4) - SHOW_FRAME(8, 1) + TILES(0x106FE, 4) SHOW_FRAME(8, 1) - TILES(0x10702, 4) - SHOW_FRAME(8, 2) + TILES(0x10702, 4) SHOW_FRAME(8, 2) - TILES(0x106FE, 4) - SHOW_FRAME(8, 1) + TILES(0x106FE, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0446[1] = { +const s32 *const anim_0446[1] = { anim_0446__v0_l0, }; const s32 anim_0447__v0_l0[] = { // 0x080EE2C8 - PALETTE(32, 16, 0xF0) - TILES(0x10706, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x10706, 4) SHOW_FRAME(8, 0) - TILES(0x1070A, 4) - SHOW_FRAME(8, 1) + TILES(0x1070A, 4) SHOW_FRAME(8, 1) - TILES(0x1070E, 4) - SHOW_FRAME(8, 2) + TILES(0x1070E, 4) SHOW_FRAME(8, 2) - TILES(0x1070A, 4) - SHOW_FRAME(8, 1) + TILES(0x1070A, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0447[1] = { +const s32 *const anim_0447[1] = { anim_0447__v0_l0, }; const s32 anim_0448__v0_l0[] = { // 0x080EE330 - PALETTE(32, 16, 0xF0) - TILES(0x10712, 4) - SHOW_FRAME(3, 0) + PALETTE(32, 16, 0xF0) TILES(0x10712, 4) SHOW_FRAME(3, 0) - TILES(0x10716, 4) - SHOW_FRAME(3, 1) + TILES(0x10716, 4) SHOW_FRAME(3, 1) - TILES(0x1071A, 4) - SHOW_FRAME(3, 2) + TILES(0x1071A, 4) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0448[1] = { +const s32 *const anim_0448[1] = { anim_0448__v0_l0, }; const s32 anim_0449__v0_l0[] = { // 0x080EE384 - PALETTE(32, 16, 0xF0) - TILES(0x1071E, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x1071E, 4) SHOW_FRAME(8, 0) - TILES(0x10722, 4) - SHOW_FRAME(8, 1) + TILES(0x10722, 4) SHOW_FRAME(8, 1) - TILES(0x10726, 4) - SHOW_FRAME(8, 2) + TILES(0x10726, 4) SHOW_FRAME(8, 2) - TILES(0x10722, 4) - SHOW_FRAME(8, 1) + TILES(0x10722, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0449[1] = { +const s32 *const anim_0449[1] = { anim_0449__v0_l0, }; const s32 anim_0450__v0_l0[] = { // 0x080EE3EC - PALETTE(32, 16, 0xF0) - TILES(0x1072A, 4) - SHOW_FRAME(6, 0) + PALETTE(32, 16, 0xF0) TILES(0x1072A, 4) SHOW_FRAME(6, 0) - TILES(0x1072E, 4) - SHOW_FRAME(6, 1) + TILES(0x1072E, 4) SHOW_FRAME(6, 1) - TILES(0x10732, 4) - SHOW_FRAME(6, 2) + TILES(0x10732, 4) SHOW_FRAME(6, 2) - TILES(0x1072E, 4) - SHOW_FRAME(6, 1) + TILES(0x1072E, 4) SHOW_FRAME(6, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0450[1] = { +const s32 *const anim_0450[1] = { anim_0450__v0_l0, }; const s32 anim_0451__v0_l0[] = { // 0x080EE454 - PALETTE(32, 16, 0xF0) - TILES(0x10736, 4) - SHOW_FRAME(8, 0) + PALETTE(32, 16, 0xF0) TILES(0x10736, 4) SHOW_FRAME(8, 0) - TILES(0x1073A, 4) - SHOW_FRAME(8, 1) + TILES(0x1073A, 4) SHOW_FRAME(8, 1) - TILES(0x1073E, 4) - SHOW_FRAME(8, 2) + TILES(0x1073E, 4) SHOW_FRAME(8, 2) - TILES(0x1073A, 4) - SHOW_FRAME(8, 1) + TILES(0x1073A, 4) SHOW_FRAME(8, 1) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0451[1] = { +const s32 *const anim_0451[1] = { anim_0451__v0_l0, }; const s32 anim_0452__v0_l0[] = { // 0x080EE4BC - PALETTE(33, 16, 0x70) - TILES(0x10742, 12) - HITBOX(0, -7, -44, 8, 5) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10742, 12) HITBOX(0, -7, -44, 8, 5) SHOW_FRAME(3, 0) - JUMP_BACK(11) + JUMP_BACK(11) }; const s32 anim_0452__v1_l0[] = { // 0x080EE4F0 - PALETTE(33, 16, 0x70) - TILES(0x1074E, 18) - PLAY_SOUND(169) - SHOW_FRAME(2, 1) + PALETTE(33, 16, 0x70) TILES(0x1074E, 18) PLAY_SOUND(169) SHOW_FRAME(2, 1) - TILES(0x10760, 15) - SHOW_FRAME(2, 2) + TILES(0x10760, 15) SHOW_FRAME(2, 2) - TILES(0x1076F, 10) - SHOW_FRAME(2, 3) + TILES(0x1076F, 10) SHOW_FRAME(2, 3) - TILES(0x10779, 15) - SHOW_FRAME(2, 4) + TILES(0x10779, 15) SHOW_FRAME(2, 4) - TILES(0x10788, 18) - SHOW_FRAME(2, 5) + TILES(0x10788, 18) SHOW_FRAME(2, 5) - TILES(0x10742, 12) - SHOW_FRAME(2, 0) + TILES(0x10742, 12) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0452__v2_l0[] = { // 0x080EE580 - PALETTE(33, 16, 0x70) - TILES(0x10742, 12) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10742, 12) SHOW_FRAME(3, 0) - TILES(0x1079A, 12) - SHOW_FRAME(3, 6) + TILES(0x1079A, 12) SHOW_FRAME(3, 6) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0452[3] = { +const s32 *const anim_0452[3] = { anim_0452__v0_l0, anim_0452__v1_l0, anim_0452__v2_l0, }; const s32 anim_0453__v0_l0[] = { // 0x080EE5C8 - PALETTE(34, 16, 0x90) - TILES(0x107A6, 30) - SHOW_FRAME(2, 0) + PALETTE(34, 16, 0x90) TILES(0x107A6, 30) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0453__v1_l0[] = { // 0x080EE5EC - PALETTE(34, 16, 0x90) - TILES(0x107C4, 20) - SHOW_FRAME(2, 1) + PALETTE(34, 16, 0x90) TILES(0x107C4, 20) SHOW_FRAME(2, 1) - TILES(0x107D8, 20) - SHOW_FRAME(2, 2) + TILES(0x107D8, 20) SHOW_FRAME(2, 2) - TILES(0x107EC, 30) - SHOW_FRAME(2, 3) + TILES(0x107EC, 30) SHOW_FRAME(2, 3) - TILES(0x1080A, 20) - SHOW_FRAME(2, 4) + TILES(0x1080A, 20) SHOW_FRAME(2, 4) - TILES(0x1081E, 20) - SHOW_FRAME(2, 5) + TILES(0x1081E, 20) SHOW_FRAME(2, 5) - TILES(0x107A6, 30) - SHOW_FRAME(2, 0) + TILES(0x107A6, 30) SHOW_FRAME(2, 0) - JUMP_BACK(33) + JUMP_BACK(33) }; const s32 anim_0453__v2_l0[] = { // 0x080EE678 - PALETTE(34, 16, 0x90) - TILES(0x10832, 36) - SHOW_FRAME(2, 6) + PALETTE(34, 16, 0x90) TILES(0x10832, 36) SHOW_FRAME(2, 6) - END() + END() }; -const s32 * const anim_0453[3] = { +const s32 *const anim_0453[3] = { anim_0453__v0_l0, anim_0453__v1_l0, anim_0453__v2_l0, }; const s32 anim_0454__v0_l0[] = { // 0x080EE6A8 - PALETTE(35, 16, 0x90) - TILES(0x10856, 4) - SHOW_FRAME(1, 0) + PALETTE(35, 16, 0x90) TILES(0x10856, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0454__v1_l0[] = { // 0x080EE6CC - PALETTE(35, 16, 0x90) - TILES(0x1085A, 8) - SHOW_FRAME(1, 1) + PALETTE(35, 16, 0x90) TILES(0x1085A, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0454__v2_l0[] = { // 0x080EE6F0 - PALETTE(35, 16, 0x90) - TILES(0x10862, 16) - HITBOX(0, -16, -21, 15, 3) - SHOW_FRAME(1, 2) + PALETTE(35, 16, 0x90) TILES(0x10862, 16) HITBOX(0, -16, -21, 15, 3) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0454__v3_l0[] = { // 0x080EE720 - PALETTE(35, 16, 0x90) - TILES(0x10872, 16) - HITBOX(0, -2, -30, 22, 1) - SHOW_FRAME(1, 3) + PALETTE(35, 16, 0x90) TILES(0x10872, 16) HITBOX(0, -2, -30, 22, 1) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0454[4] = { +const s32 *const anim_0454[4] = { anim_0454__v0_l0, anim_0454__v1_l0, anim_0454__v2_l0, @@ -12992,762 +9053,532 @@ const s32 * const anim_0454[4] = { }; const s32 anim_0455__v0_l0[] = { // 0x080EE760 - PALETTE(33, 16, 0x70) - TILES(0x10882, 12) - HITBOX(0, -12, -17, 12, -1) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10882, 12) HITBOX(0, -12, -17, 12, -1) SHOW_FRAME(3, 0) - END() + END() }; const s32 anim_0455__v1_l0[] = { // 0x080EE790 - PALETTE(33, 16, 0x70) - TILES(0x1088E, 12) - HITBOX(0, -13, -19, 13, -1) - SHOW_FRAME(1, 1) + PALETTE(33, 16, 0x70) TILES(0x1088E, 12) HITBOX(0, -13, -19, 13, -1) SHOW_FRAME(1, 1) - TILES(0x1089A, 16) - HITBOX(0, -13, -32, 13, -1) - SHOW_FRAME(2, 2) + TILES(0x1089A, 16) HITBOX(0, -13, -32, 13, -1) SHOW_FRAME(2, 2) - TILES(0x108AA, 16) - HITBOX(0, -13, -28, 13, -1) - SHOW_FRAME(1, 3) + TILES(0x108AA, 16) HITBOX(0, -13, -28, 13, -1) SHOW_FRAME(1, 3) - TILES(0x108BA, 16) - HITBOX(0, -13, -31, 13, -1) - SHOW_FRAME(5, 4) + TILES(0x108BA, 16) HITBOX(0, -13, -31, 13, -1) SHOW_FRAME(5, 4) - TILES(0x108AA, 16) - HITBOX(0, -13, -28, 13, -1) - SHOW_FRAME(3, 3) + TILES(0x108AA, 16) HITBOX(0, -13, -28, 13, -1) SHOW_FRAME(3, 3) - END() + END() }; const s32 anim_0455__v2_l0[] = { // 0x080EE840 - PALETTE(33, 16, 0x70) - TILES(0x108CA, 12) - HITBOX(0, -2, -29, 16, 0) - SHOW_FRAME(3, 5) + PALETTE(33, 16, 0x70) TILES(0x108CA, 12) HITBOX(0, -2, -29, 16, 0) SHOW_FRAME(3, 5) - END() + END() }; const s32 anim_0455__v3_l0[] = { // 0x080EE870 - PALETTE(33, 16, 0x70) - TILES(0x108D6, 12) - HITBOX(0, -2, -29, 14, 0) - SHOW_FRAME(1, 6) + PALETTE(33, 16, 0x70) TILES(0x108D6, 12) HITBOX(0, -2, -29, 14, 0) SHOW_FRAME(1, 6) - TILES(0x108E2, 16) - HITBOX(0, -2, -29, 29, 0) - SHOW_FRAME(2, 7) + TILES(0x108E2, 16) HITBOX(0, -2, -29, 29, 0) SHOW_FRAME(2, 7) - TILES(0x108F2, 16) - HITBOX(0, -2, -29, 25, 0) - SHOW_FRAME(1, 8) + TILES(0x108F2, 16) HITBOX(0, -2, -29, 25, 0) SHOW_FRAME(1, 8) - TILES(0x10902, 16) - HITBOX(0, -2, -29, 28, 0) - SHOW_FRAME(5, 9) + TILES(0x10902, 16) HITBOX(0, -2, -29, 28, 0) SHOW_FRAME(5, 9) - TILES(0x108F2, 16) - HITBOX(0, -2, -29, 25, 0) - SHOW_FRAME(3, 8) + TILES(0x108F2, 16) HITBOX(0, -2, -29, 25, 0) SHOW_FRAME(3, 8) - END() + END() }; const s32 anim_0455__v4_l0[] = { // 0x080EE920 - PALETTE(33, 16, 0x70) - TILES(0x10912, 9) - HITBOX(0, 0, -27, 20, -4) - HITBOX(1, 9, -27, 20, -16) - SHOW_FRAME(3, 10) + PALETTE(33, 16, 0x70) TILES(0x10912, 9) HITBOX(0, 0, -27, 20, -4) HITBOX(1, 9, -27, 20, -16) SHOW_FRAME(3, 10) - END() + END() }; const s32 anim_0455__v5_l0[] = { // 0x080EE95C - PALETTE(33, 16, 0x70) - TILES(0x1091B, 9) - HITBOX(0, 0, -26, 19, -4) - SHOW_FRAME(1, 11) + PALETTE(33, 16, 0x70) TILES(0x1091B, 9) HITBOX(0, 0, -26, 19, -4) SHOW_FRAME(1, 11) - TILES(0x10924, 16) - HITBOX(0, 0, -35, 28, -4) - SHOW_FRAME(2, 12) + TILES(0x10924, 16) HITBOX(0, 0, -35, 28, -4) SHOW_FRAME(2, 12) - TILES(0x10934, 16) - HITBOX(0, 0, -32, 25, -4) - SHOW_FRAME(1, 13) + TILES(0x10934, 16) HITBOX(0, 0, -32, 25, -4) SHOW_FRAME(1, 13) - TILES(0x10944, 16) - HITBOX(0, 0, -34, 27, -4) - SHOW_FRAME(5, 14) + TILES(0x10944, 16) HITBOX(0, 0, -34, 27, -4) SHOW_FRAME(5, 14) - TILES(0x10934, 16) - HITBOX(0, 0, -32, 25, -4) - SHOW_FRAME(3, 13) + TILES(0x10934, 16) HITBOX(0, 0, -32, 25, -4) SHOW_FRAME(3, 13) - END() + END() }; const s32 anim_0455__v6_l0[] = { // 0x080EEA0C - PALETTE(33, 16, 0x70) - TILES(0x10954, 6) - HITBOX(0, 0, -23, 20, -9) - HITBOX(1, 9, -23, 20, -9) - SHOW_FRAME(1, 15) + PALETTE(33, 16, 0x70) TILES(0x10954, 6) HITBOX(0, 0, -23, 20, -9) HITBOX(1, 9, -23, 20, -9) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0455__v7_l0[] = { // 0x080EEA48 - PALETTE(33, 16, 0x70) - TILES(0x1095A, 6) - SHOW_FRAME(2, 16) + PALETTE(33, 16, 0x70) TILES(0x1095A, 6) SHOW_FRAME(2, 16) - TILES(0x10960, 12) - SHOW_FRAME(1, 17) + TILES(0x10960, 12) SHOW_FRAME(1, 17) - TILES(0x1096C, 12) - SHOW_FRAME(5, 18) + TILES(0x1096C, 12) SHOW_FRAME(5, 18) - TILES(0x10978, 12) - SHOW_FRAME(3, 19) + TILES(0x10978, 12) SHOW_FRAME(3, 19) - END() + END() }; -const s32 * const anim_0455[8] = { - anim_0455__v0_l0, - anim_0455__v1_l0, - anim_0455__v2_l0, - anim_0455__v3_l0, - anim_0455__v4_l0, - anim_0455__v5_l0, - anim_0455__v6_l0, - anim_0455__v7_l0, +const s32 *const anim_0455[8] = { + anim_0455__v0_l0, anim_0455__v1_l0, anim_0455__v2_l0, anim_0455__v3_l0, + anim_0455__v4_l0, anim_0455__v5_l0, anim_0455__v6_l0, anim_0455__v7_l0, }; const s32 anim_0456__v0_l0[] = { // 0x080EEAC8 - PALETTE(36, 16, 0x80) - TILES(0x10984, 2) - SHOW_FRAME(1, 0) + PALETTE(36, 16, 0x80) TILES(0x10984, 2) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0456[1] = { +const s32 *const anim_0456[1] = { anim_0456__v0_l0, }; const s32 anim_0457__v0_l0[] = { // 0x080EEAF0 - PALETTE(35, 16, 0x90) - TILES(0x10986, 16) - HITBOX(0, -14, -30, 13, -2) - SHOW_FRAME(4, 0) + PALETTE(35, 16, 0x90) TILES(0x10986, 16) HITBOX(0, -14, -30, 13, -2) SHOW_FRAME(4, 0) - TILES(0x10996, 16) - HITBOX(0, -14, -30, 13, -2) - SHOW_FRAME(4, 1) + TILES(0x10996, 16) HITBOX(0, -14, -30, 13, -2) SHOW_FRAME(4, 1) - TILES(0x109A6, 16) - HITBOX(0, -14, -30, 13, -2) - SHOW_FRAME(4, 2) + TILES(0x109A6, 16) HITBOX(0, -14, -30, 13, -2) SHOW_FRAME(4, 2) - TILES(0x109B6, 16) - HITBOX(0, -14, -30, 13, -2) - SHOW_FRAME(4, 3) + TILES(0x109B6, 16) HITBOX(0, -14, -30, 13, -2) SHOW_FRAME(4, 3) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0457[1] = { +const s32 *const anim_0457[1] = { anim_0457__v0_l0, }; const s32 anim_0458__v0_l0[] = { // 0x080EEB88 - PALETTE(35, 16, 0x90) - TILES(0x109C6, 24) - HITBOX(0, -16, -28, 16, -2) - SHOW_FRAME(1, 0) + PALETTE(35, 16, 0x90) TILES(0x109C6, 24) HITBOX(0, -16, -28, 16, -2) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0458[1] = { +const s32 *const anim_0458[1] = { anim_0458__v0_l0, }; const s32 anim_0459__v0_l0[] = { // 0x080EEBBC - TILES(0x109DE, 1) - PALETTE(35, 16, 0x90) - SHOW_FRAME(1, 0) + TILES(0x109DE, 1) PALETTE(35, 16, 0x90) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0459[1] = { +const s32 *const anim_0459[1] = { anim_0459__v0_l0, }; const s32 anim_0460__v0_l0[] = { // 0x080EEBE4 - TILES(0x109DF, 4) - PALETTE(35, 16, 0x90) - SHOW_FRAME(1, 0) + TILES(0x109DF, 4) PALETTE(35, 16, 0x90) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0460[1] = { +const s32 *const anim_0460[1] = { anim_0460__v0_l0, }; const s32 anim_0461__v0_l0[] = { // 0x080EEC0C - PALETTE(37, 16, 0x70) - TILES(0x109E3, 18) - HITBOX(0, -20, -11, 20, 4) - SHOW_FRAME(1, 0) + PALETTE(37, 16, 0x70) TILES(0x109E3, 18) HITBOX(0, -20, -11, 20, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0461__v1_l0[] = { // 0x080EEC3C - PALETTE(37, 16, 0x70) - TILES(0x109F5, 18) - HITBOX(0, -20, -11, 20, 4) - SHOW_FRAME(2, 1) + PALETTE(37, 16, 0x70) TILES(0x109F5, 18) HITBOX(0, -20, -11, 20, 4) SHOW_FRAME(2, 1) - TILES(0x10A07, 24) - SHOW_FRAME(3, 2) + TILES(0x10A07, 24) SHOW_FRAME(3, 2) - TILES(0x10A1F, 18) - SHOW_FRAME(2, 3) + TILES(0x10A1F, 18) SHOW_FRAME(2, 3) - TILES(0x10A31, 24) - SHOW_FRAME(2, 4) + TILES(0x10A31, 24) SHOW_FRAME(2, 4) - TILES(0x10A49, 18) - SHOW_FRAME(2, 5) + TILES(0x10A49, 18) SHOW_FRAME(2, 5) - TILES(0x10A5B, 18) - SHOW_FRAME(2, 6) + TILES(0x10A5B, 18) SHOW_FRAME(2, 6) - END() + END() }; -const s32 * const anim_0461[2] = { +const s32 *const anim_0461[2] = { anim_0461__v0_l0, anim_0461__v1_l0, }; const s32 anim_0462__v0_l0[] = { // 0x080EECD8 - PALETTE(38, 16, 0xB0) - TILES(0x10A6D, 12) - HITBOX(0, -15, -5, 15, 11) - SHOW_FRAME(1, 0) + PALETTE(38, 16, 0xB0) TILES(0x10A6D, 12) HITBOX(0, -15, -5, 15, 11) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0462[1] = { +const s32 *const anim_0462[1] = { anim_0462__v0_l0, }; const s32 anim_0463__v0_l0[] = { // 0x080EED0C - PALETTE(39, 16, 0xB0) - TILES(0x10A79, 18) - HITBOX(0, -24, -6, 24, -4) - SHOW_FRAME(1, 0) + PALETTE(39, 16, 0xB0) TILES(0x10A79, 18) HITBOX(0, -24, -6, 24, -4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0463[1] = { +const s32 *const anim_0463[1] = { anim_0463__v0_l0, }; const s32 anim_0464__v0_l0[] = { // 0x080EED40 - PALETTE(33, 16, 0x70) - TILES(0x10A8B, 18) - SHOW_FRAME(2, 0) + PALETTE(33, 16, 0x70) TILES(0x10A8B, 18) SHOW_FRAME(2, 0) - TILES(0x10A9D, 18) - SHOW_FRAME(2, 1) + TILES(0x10A9D, 18) SHOW_FRAME(2, 1) - TILES(0x10AAF, 18) - SHOW_FRAME(2, 2) + TILES(0x10AAF, 18) SHOW_FRAME(2, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0464[1] = { +const s32 *const anim_0464[1] = { anim_0464__v0_l0, }; const s32 anim_0465__v0_l0[] = { // 0x080EED94 - PALETTE(39, 16, 0xB0) - TILES(0x10AC1, 1) - HITBOX(0, -12, -12, 12, 12) - SHOW_FRAME(1, 0) + PALETTE(39, 16, 0xB0) TILES(0x10AC1, 1) HITBOX(0, -12, -12, 12, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0465__v1_l0[] = { // 0x080EEDC4 - PALETTE(39, 16, 0xB0) - TILES(0x10AC2, 1) - SHOW_FRAME(1, 1) + PALETTE(39, 16, 0xB0) TILES(0x10AC2, 1) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0465__v2_l0[] = { // 0x080EEDE8 - PALETTE(39, 16, 0xB0) - TILES(0x10AC3, 1) - SHOW_FRAME(1, 2) + PALETTE(39, 16, 0xB0) TILES(0x10AC3, 1) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0465__v3_l0[] = { // 0x080EEE0C - PALETTE(39, 16, 0xB0) - TILES(0x10AC4, 1) - SHOW_FRAME(1, 3) + PALETTE(39, 16, 0xB0) TILES(0x10AC4, 1) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0465__v4_l0[] = { // 0x080EEE30 - PALETTE(39, 16, 0xB0) - TILES(0x10AC5, 1) - SHOW_FRAME(1, 4) + PALETTE(39, 16, 0xB0) TILES(0x10AC5, 1) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0465__v5_l0[] = { // 0x080EEE54 - PALETTE(39, 16, 0xB0) - TILES(0x10AC6, 1) - SHOW_FRAME(1, 5) + PALETTE(39, 16, 0xB0) TILES(0x10AC6, 1) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0465__v6_l0[] = { // 0x080EEE78 - PALETTE(39, 16, 0xB0) - TILES(0x10AC7, 1) - HITBOX(0, -12, -8, 12, 12) - SHOW_FRAME(1, 6) + PALETTE(39, 16, 0xB0) TILES(0x10AC7, 1) HITBOX(0, -12, -8, 12, 12) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0465__v7_l0[] = { // 0x080EEEA8 - PALETTE(39, 16, 0xB0) - TILES(0x10AC8, 1) - SHOW_FRAME(1, 7) + PALETTE(39, 16, 0xB0) TILES(0x10AC8, 1) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0465__v8_l0[] = { // 0x080EEECC - PALETTE(39, 16, 0xB0) - TILES(0x10AC9, 1) - SHOW_FRAME(1, 8) + PALETTE(39, 16, 0xB0) TILES(0x10AC9, 1) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0465[9] = { - anim_0465__v0_l0, - anim_0465__v1_l0, - anim_0465__v2_l0, - anim_0465__v3_l0, - anim_0465__v4_l0, - anim_0465__v5_l0, - anim_0465__v6_l0, - anim_0465__v7_l0, - anim_0465__v8_l0, +const s32 *const anim_0465[9] = { + anim_0465__v0_l0, anim_0465__v1_l0, anim_0465__v2_l0, anim_0465__v3_l0, anim_0465__v4_l0, + anim_0465__v5_l0, anim_0465__v6_l0, anim_0465__v7_l0, anim_0465__v8_l0, }; const s32 anim_0466__v0_l0[] = { // 0x080EEF14 - PALETTE(33, 16, 0x70) - TILES(0x10ACA, 4) - SHOW_FRAME(1, 0) + PALETTE(33, 16, 0x70) TILES(0x10ACA, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0466[1] = { +const s32 *const anim_0466[1] = { anim_0466__v0_l0, }; const s32 anim_0467__v0_l0[] = { // 0x080EEF3C - PALETTE(39, 16, 0xB0) - TILES(0x10ACE, 4) - SHOW_FRAME(6, 0) + PALETTE(39, 16, 0xB0) TILES(0x10ACE, 4) SHOW_FRAME(6, 0) - TILES(0x10AD2, 16) - SHOW_FRAME(6, 1) + TILES(0x10AD2, 16) SHOW_FRAME(6, 1) - TILES(0x10AE2, 16) - SHOW_FRAME(6, 2) + TILES(0x10AE2, 16) SHOW_FRAME(6, 2) - TILES(0x10AF2, 12) - SHOW_FRAME(7, 3) + TILES(0x10AF2, 12) SHOW_FRAME(7, 3) - TILES(0x10AFE, 9) - SHOW_FRAME(8, 4) + TILES(0x10AFE, 9) SHOW_FRAME(8, 4) - TILES(0x10B07, 9) - SHOW_FRAME(8, 5) + TILES(0x10B07, 9) SHOW_FRAME(8, 5) - TILES(0x10B10, 9) - SHOW_FRAME(12, 6) + TILES(0x10B10, 9) SHOW_FRAME(12, 6) - END() + END() }; -const s32 * const anim_0467[1] = { +const s32 *const anim_0467[1] = { anim_0467__v0_l0, }; const s32 anim_0468__v0_l0[] = { // 0x080EEFDC - PALETTE(33, 16, 0x70) - TILES(0x10B19, 8) - HITBOX(0, 10, 5, 23, 8) - SHOW_FRAME(1, 0) + PALETTE(33, 16, 0x70) TILES(0x10B19, 8) HITBOX(0, 10, 5, 23, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0468__v1_l0[] = { // 0x080EF00C - PALETTE(33, 16, 0x70) - TILES(0x10B19, 8) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10B19, 8) SHOW_FRAME(3, 0) - TILES(0x10B21, 8) - SHOW_FRAME(3, 1) + TILES(0x10B21, 8) SHOW_FRAME(3, 1) - TILES(0x10B29, 12) - SHOW_FRAME(3, 2) + TILES(0x10B29, 12) SHOW_FRAME(3, 2) - TILES(0x10B35, 8) - SHOW_FRAME(2, 3) + TILES(0x10B35, 8) SHOW_FRAME(2, 3) - TILES(0x10B21, 8) - SHOW_FRAME(2, 1) + TILES(0x10B21, 8) SHOW_FRAME(2, 1) - TILES(0x10B3D, 8) - SHOW_FRAME(4, 4) + TILES(0x10B3D, 8) SHOW_FRAME(4, 4) - TILES(0x10B21, 8) - SHOW_FRAME(3, 1) + TILES(0x10B21, 8) SHOW_FRAME(3, 1) - TILES(0x10B3D, 8) - SHOW_FRAME(3, 4) + TILES(0x10B3D, 8) SHOW_FRAME(3, 4) - TILES(0x10B19, 8) - SHOW_FRAME(6, 0) + TILES(0x10B19, 8) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0468[2] = { +const s32 *const anim_0468[2] = { anim_0468__v0_l0, anim_0468__v1_l0, }; const s32 anim_0469__v0_l0[] = { // 0x080EF0D8 - PALETTE(33, 16, 0x70) - TILES(0x10B45, 12) - HITBOX(0, -10, -24, 10, 2) - SHOW_FRAME(6, 0) + PALETTE(33, 16, 0x70) TILES(0x10B45, 12) HITBOX(0, -10, -24, 10, 2) SHOW_FRAME(6, 0) - END() + END() }; const s32 anim_0469__v1_l0[] = { // 0x080EF108 - PALETTE(33, 16, 0x70) - TILES(0x10B51, 12) - SHOW_FRAME(2, 1) + PALETTE(33, 16, 0x70) TILES(0x10B51, 12) SHOW_FRAME(2, 1) - TILES(0x10B5D, 12) - SHOW_FRAME(2, 2) + TILES(0x10B5D, 12) SHOW_FRAME(2, 2) - TILES(0x10B69, 12) - SHOW_FRAME(4, 3) + TILES(0x10B69, 12) SHOW_FRAME(4, 3) - TILES(0x10B75, 12) - SHOW_FRAME(1, 4) + TILES(0x10B75, 12) SHOW_FRAME(1, 4) - TILES(0x10B5D, 12) - SHOW_FRAME(4, 2) + TILES(0x10B5D, 12) SHOW_FRAME(4, 2) - TILES(0x10B81, 12) - SHOW_FRAME(4, 5) + TILES(0x10B81, 12) SHOW_FRAME(4, 5) - TILES(0x10B5D, 12) - SHOW_FRAME(3, 2) + TILES(0x10B5D, 12) SHOW_FRAME(3, 2) - TILES(0x10B81, 12) - SHOW_FRAME(3, 5) + TILES(0x10B81, 12) SHOW_FRAME(3, 5) - TILES(0x10B51, 12) - SHOW_FRAME(6, 1) + TILES(0x10B51, 12) SHOW_FRAME(6, 1) - END() + END() }; -const s32 * const anim_0469[2] = { +const s32 *const anim_0469[2] = { anim_0469__v0_l0, anim_0469__v1_l0, }; const s32 anim_0470__v0_l0[] = { // 0x080EF1D4 - PALETTE(33, 16, 0x70) - TILES(0x10B8D, 12) - HITBOX(0, 10, 5, 23, 8) - SHOW_FRAME(1, 0) + PALETTE(33, 16, 0x70) TILES(0x10B8D, 12) HITBOX(0, 10, 5, 23, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0470__v1_l0[] = { // 0x080EF204 - PALETTE(33, 16, 0x70) - TILES(0x10B8D, 12) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10B8D, 12) SHOW_FRAME(3, 0) - TILES(0x10B99, 12) - SHOW_FRAME(3, 1) + TILES(0x10B99, 12) SHOW_FRAME(3, 1) - TILES(0x10BA5, 12) - SHOW_FRAME(3, 2) + TILES(0x10BA5, 12) SHOW_FRAME(3, 2) - TILES(0x10BB1, 12) - SHOW_FRAME(2, 3) + TILES(0x10BB1, 12) SHOW_FRAME(2, 3) - TILES(0x10B99, 12) - SHOW_FRAME(2, 1) + TILES(0x10B99, 12) SHOW_FRAME(2, 1) - TILES(0x10BBD, 12) - SHOW_FRAME(4, 4) + TILES(0x10BBD, 12) SHOW_FRAME(4, 4) - TILES(0x10B99, 12) - SHOW_FRAME(3, 1) + TILES(0x10B99, 12) SHOW_FRAME(3, 1) - TILES(0x10BBD, 12) - SHOW_FRAME(3, 4) + TILES(0x10BBD, 12) SHOW_FRAME(3, 4) - TILES(0x10B8D, 12) - SHOW_FRAME(6, 0) + TILES(0x10B8D, 12) SHOW_FRAME(6, 0) - END() + END() }; -const s32 * const anim_0470[2] = { +const s32 *const anim_0470[2] = { anim_0470__v0_l0, anim_0470__v1_l0, }; const s32 anim_0471__v0_l0[] = { // 0x080EF2D0 - PALETTE(40, 16, 0x70) - TILES(0x10BC9, 8) - HITBOX(0, -15, -6, 7, 0) - SHOW_FRAME(2, 0) + PALETTE(40, 16, 0x70) TILES(0x10BC9, 8) HITBOX(0, -15, -6, 7, 0) SHOW_FRAME(2, 0) - TILES(0x10BD1, 8) - HITBOX(0, -15, -6, 7, 0) - SHOW_FRAME(2, 1) + TILES(0x10BD1, 8) HITBOX(0, -15, -6, 7, 0) SHOW_FRAME(2, 1) - TILES(0x10BD9, 8) - HITBOX(0, -15, -6, 7, 0) - SHOW_FRAME(2, 2) + TILES(0x10BD9, 8) HITBOX(0, -15, -6, 7, 0) SHOW_FRAME(2, 2) - JUMP_BACK(27) + JUMP_BACK(27) }; const s32 anim_0471__v1_l0[] = { // 0x080EF344 - PALETTE(40, 16, 0x70) - TILES(0x10BE1, 12) - HITBOX(0, -15, -9, 6, 2) - SHOW_FRAME(2, 3) + PALETTE(40, 16, 0x70) TILES(0x10BE1, 12) HITBOX(0, -15, -9, 6, 2) SHOW_FRAME(2, 3) - TILES(0x10BED, 12) - HITBOX(0, -15, -9, 6, 2) - SHOW_FRAME(2, 4) + TILES(0x10BED, 12) HITBOX(0, -15, -9, 6, 2) SHOW_FRAME(2, 4) - TILES(0x10BF9, 12) - HITBOX(0, -15, -9, 6, 2) - SHOW_FRAME(2, 5) + TILES(0x10BF9, 12) HITBOX(0, -15, -9, 6, 2) SHOW_FRAME(2, 5) - JUMP_BACK(27) + JUMP_BACK(27) }; const s32 anim_0471__v2_l0[] = { // 0x080EF3B8 - PALETTE(40, 16, 0x70) - TILES(0x10C05, 12) - HITBOX(0, -14, -6, 9, 1) - SHOW_FRAME(2, 6) + PALETTE(40, 16, 0x70) TILES(0x10C05, 12) HITBOX(0, -14, -6, 9, 1) SHOW_FRAME(2, 6) - TILES(0x10C11, 12) - HITBOX(0, -14, -6, 9, 1) - SHOW_FRAME(2, 7) + TILES(0x10C11, 12) HITBOX(0, -14, -6, 9, 1) SHOW_FRAME(2, 7) - TILES(0x10C1D, 12) - HITBOX(0, -14, -6, 9, 1) - SHOW_FRAME(2, 8) + TILES(0x10C1D, 12) HITBOX(0, -14, -6, 9, 1) SHOW_FRAME(2, 8) - JUMP_BACK(27) + JUMP_BACK(27) }; -const s32 * const anim_0471[3] = { +const s32 *const anim_0471[3] = { anim_0471__v0_l0, anim_0471__v1_l0, anim_0471__v2_l0, }; const s32 anim_0472__v0_l0[] = { // 0x080EF438 - PALETTE(40, 16, 0x70) - TILES(0x10C29, 8) - HITBOX(0, -12, -6, 0, 14) - SHOW_FRAME(2, 0) + PALETTE(40, 16, 0x70) TILES(0x10C29, 8) HITBOX(0, -12, -6, 0, 14) SHOW_FRAME(2, 0) - TILES(0x10C31, 8) - HITBOX(0, -16, -8, 0, 8) - SHOW_FRAME(2, 1) + TILES(0x10C31, 8) HITBOX(0, -16, -8, 0, 8) SHOW_FRAME(2, 1) - TILES(0x10C39, 8) - HITBOX(0, -16, -8, 0, 8) - SHOW_FRAME(2, 2) + TILES(0x10C39, 8) HITBOX(0, -16, -8, 0, 8) SHOW_FRAME(2, 2) - JUMP_BACK(27) + JUMP_BACK(27) }; -const s32 * const anim_0472[1] = { +const s32 *const anim_0472[1] = { anim_0472__v0_l0, }; const s32 anim_0473__v0_l0[] = { // 0x080EF4B0 - PALETTE(33, 16, 0x70) - TILES(0x10C41, 49) - SHOW_FRAME(2, 0) + PALETTE(33, 16, 0x70) TILES(0x10C41, 49) SHOW_FRAME(2, 0) - TILES(0x10C72, 49) - SHOW_FRAME(2, 1) + TILES(0x10C72, 49) SHOW_FRAME(2, 1) - TILES(0x10CA3, 49) - SHOW_FRAME(2, 2) + TILES(0x10CA3, 49) SHOW_FRAME(2, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0473[1] = { +const s32 *const anim_0473[1] = { anim_0473__v0_l0, }; const s32 anim_0474__v0_l0[] = { // 0x080EF504 - PALETTE(33, 16, 0x70) - TILES(0x10CD4, 12) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10CD4, 12) SHOW_FRAME(3, 0) - TILES(0x10CE0, 18) - SHOW_FRAME(3, 1) + TILES(0x10CE0, 18) SHOW_FRAME(3, 1) - TILES(0x10CF2, 12) - SHOW_FRAME(3, 2) + TILES(0x10CF2, 12) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0474[1] = { +const s32 *const anim_0474[1] = { anim_0474__v0_l0, }; const s32 anim_0475__v0_l0[] = { // 0x080EF558 - PALETTE(41, 16, 0x70) - TILES(0x10CFE, 36) - HITBOX(0, 9, -39, 39, -9) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x10CFE, 36) HITBOX(0, 9, -39, 39, -9) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0475[1] = { +const s32 *const anim_0475[1] = { anim_0475__v0_l0, }; const s32 anim_0476__v0_l0[] = { // 0x080EF58C - PALETTE(41, 16, 0x70) - TILES(0x10D22, 12) - HITBOX(0, -20, -4, 20, 8) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x10D22, 12) HITBOX(0, -20, -4, 20, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0476[1] = { +const s32 *const anim_0476[1] = { anim_0476__v0_l0, }; const s32 anim_0477__v0_l0[] = { // 0x080EF5C0 - PALETTE(41, 16, 0x70) - TILES(0x10D2E, 12) - HITBOX(0, -8, -18, 4, 18) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x10D2E, 12) HITBOX(0, -8, -18, 4, 18) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0477[1] = { +const s32 *const anim_0477[1] = { anim_0477__v0_l0, }; const s32 anim_0478__v0_l0[] = { // 0x080EF5F4 - PALETTE(42, 16, 0x70) - TILES(0x10D3A, 18) - HITBOX(0, -8, -8, 40, 18) - SHOW_FRAME(1, 0) + PALETTE(42, 16, 0x70) TILES(0x10D3A, 18) HITBOX(0, -8, -8, 40, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0478__v1_l0[] = { // 0x080EF624 - PALETTE(42, 16, 0x70) - TILES(0x10D4C, 24) - SHOW_FRAME(5, 1) + PALETTE(42, 16, 0x70) TILES(0x10D4C, 24) SHOW_FRAME(5, 1) - TILES(0x10D64, 18) - SHOW_FRAME(5, 2) + TILES(0x10D64, 18) SHOW_FRAME(5, 2) - END() + END() }; const s32 anim_0478__v2_l0[] = { // 0x080EF65C - PALETTE(42, 16, 0x70) - TILES(0x10D76, 18) - HITBOX(0, -8, -8, 9, 40) - SHOW_FRAME(1, 3) + PALETTE(42, 16, 0x70) TILES(0x10D76, 18) HITBOX(0, -8, -8, 9, 40) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0478__v3_l0[] = { // 0x080EF68C - PALETTE(42, 16, 0x70) - TILES(0x10D88, 30) - SHOW_FRAME(5, 4) + PALETTE(42, 16, 0x70) TILES(0x10D88, 30) SHOW_FRAME(5, 4) - TILES(0x10DA6, 18) - SHOW_FRAME(5, 5) + TILES(0x10DA6, 18) SHOW_FRAME(5, 5) - END() + END() }; -const s32 * const anim_0478[4] = { +const s32 *const anim_0478[4] = { anim_0478__v0_l0, anim_0478__v1_l0, anim_0478__v2_l0, @@ -13755,1481 +9586,1054 @@ const s32 * const anim_0478[4] = { }; const s32 anim_0479__v0_l0[] = { // 0x080EF6D4 - PALETTE(43, 16, 0x70) - TILES(0x10DB8, 18) - HITBOX(0, -6, -16, 6, 0) - SHOW_FRAME(9, 0) + PALETTE(43, 16, 0x70) TILES(0x10DB8, 18) HITBOX(0, -6, -16, 6, 0) SHOW_FRAME(9, 0) - TILES(0x10DCA, 18) - SHOW_FRAME(9, 1) + TILES(0x10DCA, 18) SHOW_FRAME(9, 1) - TILES(0x10DDC, 18) - SHOW_FRAME(9, 2) + TILES(0x10DDC, 18) SHOW_FRAME(9, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0479__v1_l0[] = { // 0x080EF730 - PALETTE(43, 16, 0x70) - TILES(0x10DEE, 18) - SHOW_FRAME(6, 3) + PALETTE(43, 16, 0x70) TILES(0x10DEE, 18) SHOW_FRAME(6, 3) - TILES(0x10E00, 18) - SHOW_FRAME(3, 4) + TILES(0x10E00, 18) SHOW_FRAME(3, 4) - TILES(0x10E12, 12) - SHOW_FRAME(6, 5) + TILES(0x10E12, 12) SHOW_FRAME(6, 5) - TILES(0x10E1E, 12) - SHOW_FRAME(6, 6) + TILES(0x10E1E, 12) SHOW_FRAME(6, 6) - TILES(0x10E2A, 12) - SHOW_FRAME(6, 7) + TILES(0x10E2A, 12) SHOW_FRAME(6, 7) - TILES(0x10E36, 12) - SHOW_FRAME(6, 8) + TILES(0x10E36, 12) SHOW_FRAME(6, 8) - END() + END() }; -const s32 * const anim_0479[2] = { +const s32 *const anim_0479[2] = { anim_0479__v0_l0, anim_0479__v1_l0, }; const s32 anim_0480__v0_l0[] = { // 0x080EF7C0 - PALETTE(43, 16, 0x70) - TILES(0x10E42, 18) - HITBOX(0, -6, -16, 6, 0) - SHOW_FRAME(9, 0) + PALETTE(43, 16, 0x70) TILES(0x10E42, 18) HITBOX(0, -6, -16, 6, 0) SHOW_FRAME(9, 0) - TILES(0x10E54, 18) - SHOW_FRAME(9, 1) + TILES(0x10E54, 18) SHOW_FRAME(9, 1) - TILES(0x10E66, 18) - SHOW_FRAME(9, 2) + TILES(0x10E66, 18) SHOW_FRAME(9, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0480__v1_l0[] = { // 0x080EF81C - PALETTE(43, 16, 0x70) - TILES(0x10E78, 18) - SHOW_FRAME(6, 3) + PALETTE(43, 16, 0x70) TILES(0x10E78, 18) SHOW_FRAME(6, 3) - TILES(0x10E8A, 18) - SHOW_FRAME(3, 4) + TILES(0x10E8A, 18) SHOW_FRAME(3, 4) - TILES(0x10E9C, 12) - SHOW_FRAME(6, 5) + TILES(0x10E9C, 12) SHOW_FRAME(6, 5) - TILES(0x10EA8, 12) - SHOW_FRAME(6, 6) + TILES(0x10EA8, 12) SHOW_FRAME(6, 6) - TILES(0x10EB4, 12) - SHOW_FRAME(6, 7) + TILES(0x10EB4, 12) SHOW_FRAME(6, 7) - TILES(0x10EC0, 12) - SHOW_FRAME(6, 8) + TILES(0x10EC0, 12) SHOW_FRAME(6, 8) - END() + END() }; -const s32 * const anim_0480[2] = { +const s32 *const anim_0480[2] = { anim_0480__v0_l0, anim_0480__v1_l0, }; const s32 anim_0481__v0_l0[] = { // 0x080EF8AC - PALETTE(43, 16, 0x70) - TILES(0x10ECC, 18) - HITBOX(0, -6, -16, 6, 0) - SHOW_FRAME(9, 0) + PALETTE(43, 16, 0x70) TILES(0x10ECC, 18) HITBOX(0, -6, -16, 6, 0) SHOW_FRAME(9, 0) - TILES(0x10EDE, 18) - SHOW_FRAME(9, 1) + TILES(0x10EDE, 18) SHOW_FRAME(9, 1) - TILES(0x10EF0, 18) - SHOW_FRAME(9, 2) + TILES(0x10EF0, 18) SHOW_FRAME(9, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0481__v1_l0[] = { // 0x080EF908 - PALETTE(43, 16, 0x70) - TILES(0x10F02, 18) - SHOW_FRAME(6, 3) + PALETTE(43, 16, 0x70) TILES(0x10F02, 18) SHOW_FRAME(6, 3) - TILES(0x10F14, 18) - SHOW_FRAME(3, 4) + TILES(0x10F14, 18) SHOW_FRAME(3, 4) - TILES(0x10F26, 12) - SHOW_FRAME(6, 5) + TILES(0x10F26, 12) SHOW_FRAME(6, 5) - TILES(0x10F32, 12) - SHOW_FRAME(6, 6) + TILES(0x10F32, 12) SHOW_FRAME(6, 6) - TILES(0x10F3E, 12) - SHOW_FRAME(6, 7) + TILES(0x10F3E, 12) SHOW_FRAME(6, 7) - TILES(0x10F4A, 12) - SHOW_FRAME(6, 8) + TILES(0x10F4A, 12) SHOW_FRAME(6, 8) - END() + END() }; -const s32 * const anim_0481[2] = { +const s32 *const anim_0481[2] = { anim_0481__v0_l0, anim_0481__v1_l0, }; const s32 anim_0482__v0_l0[] = { // 0x080EF998 - PALETTE(44, 16, 0x70) - TILES(0x10F56, 1) - SHOW_FRAME(5, 0) + PALETTE(44, 16, 0x70) TILES(0x10F56, 1) SHOW_FRAME(5, 0) - TILES(0x10F57, 4) - SHOW_FRAME(2, 1) + TILES(0x10F57, 4) SHOW_FRAME(2, 1) - TILES(0x10F5B, 4) - SHOW_FRAME(4, 2) + TILES(0x10F5B, 4) SHOW_FRAME(4, 2) - TILES(0x10F5F, 9) - SHOW_FRAME(6, 3) + TILES(0x10F5F, 9) SHOW_FRAME(6, 3) - TILES(0x10F68, 9) - SHOW_FRAME(7, 4) + TILES(0x10F68, 9) SHOW_FRAME(7, 4) - END() + END() }; -const s32 * const anim_0482[1] = { +const s32 *const anim_0482[1] = { anim_0482__v0_l0, }; const s32 anim_0483__v0_l0[] = { // 0x080EFA10 - PALETTE(45, 16, 0x70) - TILES(0x10F71, 1) - SHOW_FRAME(5, 0) + PALETTE(45, 16, 0x70) TILES(0x10F71, 1) SHOW_FRAME(5, 0) - TILES(0x10F72, 1) - SHOW_FRAME(2, 1) + TILES(0x10F72, 1) SHOW_FRAME(2, 1) - TILES(0x10F73, 4) - SHOW_FRAME(4, 2) + TILES(0x10F73, 4) SHOW_FRAME(4, 2) - TILES(0x10F77, 4) - SHOW_FRAME(6, 3) + TILES(0x10F77, 4) SHOW_FRAME(6, 3) - TILES(0x10F7B, 4) - SHOW_FRAME(7, 4) + TILES(0x10F7B, 4) SHOW_FRAME(7, 4) - END() + END() }; -const s32 * const anim_0483[1] = { +const s32 *const anim_0483[1] = { anim_0483__v0_l0, }; const s32 anim_0484__v0_l0[] = { // 0x080EFA88 - PALETTE(41, 16, 0x70) - TILES(0x10F7F, 30) - HITBOX(0, -22, -14, 22, 15) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x10F7F, 30) HITBOX(0, -22, -14, 22, 15) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0484[1] = { +const s32 *const anim_0484[1] = { anim_0484__v0_l0, }; const s32 anim_0485__v0_l0[] = { // 0x080EFABC - PALETTE(41, 16, 0x70) - TILES(0x10F9D, 16) - HITBOX(0, -11, -11, 11, 11) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x10F9D, 16) HITBOX(0, -11, -11, 11, 11) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0485[1] = { +const s32 *const anim_0485[1] = { anim_0485__v0_l0, }; const s32 anim_0486__v0_l0[] = { // 0x080EFAF0 - PALETTE(33, 16, 0x70) - TILES(0x10FAD, 60) - HITBOX(0, -48, -20, 47, 18) - SHOW_FRAME(3, 0) + PALETTE(33, 16, 0x70) TILES(0x10FAD, 60) HITBOX(0, -48, -20, 47, 18) SHOW_FRAME(3, 0) - TILES(0x10FE9, 60) - SHOW_FRAME(3, 1) + TILES(0x10FE9, 60) SHOW_FRAME(3, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0486[1] = { +const s32 *const anim_0486[1] = { anim_0486__v0_l0, }; const s32 anim_0487__v0_l0[] = { // 0x080EFB3C - PALETTE(46, 16, 0x70) - TILES(0x11025, 60) - HITBOX(0, -49, 10, 49, 40) - SHOW_FRAME(6, 0) + PALETTE(46, 16, 0x70) TILES(0x11025, 60) HITBOX(0, -49, 10, 49, 40) SHOW_FRAME(6, 0) - TILES(0x11061, 60) - SHOW_FRAME(6, 1) + TILES(0x11061, 60) SHOW_FRAME(6, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0487[1] = { +const s32 *const anim_0487[1] = { anim_0487__v0_l0, }; const s32 anim_0488__v0_l0[] = { // 0x080EFB88 - PALETTE(47, 16, 0x70) - TILES(0x1109D, 16) - HITBOX(0, -18, -40, 18, 16) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x1109D, 16) HITBOX(0, -18, -40, 18, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0488[1] = { +const s32 *const anim_0488[1] = { anim_0488__v0_l0, }; const s32 anim_0489__v0_l0[] = { // 0x080EFBBC - PALETTE(47, 16, 0x70) - TILES(0x110AD, 1) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x110AD, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0489[1] = { +const s32 *const anim_0489[1] = { anim_0489__v0_l0, }; const s32 anim_0490__v0_l0[] = { // 0x080EFBE4 - PALETTE(47, 16, 0x70) - TILES(0x110AE, 9) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x110AE, 9) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0490[1] = { +const s32 *const anim_0490[1] = { anim_0490__v0_l0, }; const s32 anim_0491__v0_l0[] = { // 0x080EFC18 - PALETTE(47, 16, 0x70) - TILES(0x110B7, 30) - HITBOX(0, -36, 0, 36, 13) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x110B7, 30) HITBOX(0, -36, 0, 36, 13) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0491[1] = { +const s32 *const anim_0491[1] = { anim_0491__v0_l0, }; const s32 anim_0492__v0_l0[] = { // 0x080EFC4C - PALETTE(48, 16, 0x70) - TILES(0x110D5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 0) + PALETTE(48, 16, 0x70) TILES(0x110D5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 0) - TILES(0x110E5, 16) - SHOW_FRAME(20, 1) + TILES(0x110E5, 16) SHOW_FRAME(20, 1) - TILES(0x110D5, 16) - SHOW_FRAME(5, 0) + TILES(0x110D5, 16) SHOW_FRAME(5, 0) - TILES(0x110E5, 16) - SHOW_FRAME(12, 1) + TILES(0x110E5, 16) SHOW_FRAME(12, 1) - TILES(0x110D5, 16) - SHOW_FRAME(5, 0) + TILES(0x110D5, 16) SHOW_FRAME(5, 0) - TILES(0x110E5, 16) - SHOW_FRAME(8, 1) + TILES(0x110E5, 16) SHOW_FRAME(8, 1) - TILES(0x110D5, 16) - SHOW_FRAME(2, 0) + TILES(0x110D5, 16) SHOW_FRAME(2, 0) - TILES(0x110E5, 16) - SHOW_FRAME(30, 1) + TILES(0x110E5, 16) SHOW_FRAME(30, 1) - TILES(0x110F5, 16) - SHOW_FRAME(4, 2) + TILES(0x110F5, 16) SHOW_FRAME(4, 2) - TILES(0x11105, 16) - SHOW_FRAME(4, 3) + TILES(0x11105, 16) SHOW_FRAME(4, 3) - TILES(0x11115, 16) - SHOW_FRAME(4, 4) + TILES(0x11115, 16) SHOW_FRAME(4, 4) - TILES(0x110D5, 16) - SHOW_FRAME(4, 0) + TILES(0x110D5, 16) SHOW_FRAME(4, 0) - END() + END() }; const s32 anim_0492__v1_l0[] = { // 0x080EFD58 - PALETTE(48, 16, 0x70) - TILES(0x110E5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(6, 1) + PALETTE(48, 16, 0x70) TILES(0x110E5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(6, 1) - TILES(0x11115, 16) - SHOW_FRAME(2, 4) + TILES(0x11115, 16) SHOW_FRAME(2, 4) - TILES(0x110D5, 16) - SHOW_FRAME(30, 0) + TILES(0x110D5, 16) SHOW_FRAME(30, 0) - TILES(0x110E5, 16) - SHOW_FRAME(6, 1) + TILES(0x110E5, 16) SHOW_FRAME(6, 1) - TILES(0x110D5, 16) - SHOW_FRAME(2, 0) + TILES(0x110D5, 16) SHOW_FRAME(2, 0) - TILES(0x110E5, 16) - SHOW_FRAME(6, 1) + TILES(0x110E5, 16) SHOW_FRAME(6, 1) - TILES(0x110D5, 16) - SHOW_FRAME(2, 0) + TILES(0x110D5, 16) SHOW_FRAME(2, 0) - TILES(0x11115, 16) - SHOW_FRAME(1, 4) + TILES(0x11115, 16) SHOW_FRAME(1, 4) - TILES(0x11105, 16) - SHOW_FRAME(1, 3) + TILES(0x11105, 16) SHOW_FRAME(1, 3) - TILES(0x110F5, 16) - SHOW_FRAME(1, 2) + TILES(0x110F5, 16) SHOW_FRAME(1, 2) - TILES(0x110E5, 16) - SHOW_FRAME(1, 1) + TILES(0x110E5, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0492__v2_l0[] = { // 0x080EFE50 - PALETTE(48, 16, 0x70) - TILES(0x110D5, 16) - SHOW_FRAME(1, 0) + PALETTE(48, 16, 0x70) TILES(0x110D5, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0492__v3_l0[] = { // 0x080EFE74 - PALETTE(48, 16, 0x70) - TILES(0x110E5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 1) - TILES(0x110F5, 16) - SHOW_FRAME(2, 2) + PALETTE(48, 16, 0x70) TILES(0x110E5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 1) TILES(0x110F5, 16) SHOW_FRAME(2, 2) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v4_l0[] = { // 0x080EFEBC - PALETTE(48, 16, 0x70) - TILES(0x11125, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 5) + PALETTE(48, 16, 0x70) TILES(0x11125, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 5) - TILES(0x11135, 16) - SHOW_FRAME(20, 6) + TILES(0x11135, 16) SHOW_FRAME(20, 6) - TILES(0x11125, 16) - SHOW_FRAME(5, 5) + TILES(0x11125, 16) SHOW_FRAME(5, 5) - TILES(0x11135, 16) - SHOW_FRAME(12, 6) + TILES(0x11135, 16) SHOW_FRAME(12, 6) - TILES(0x11125, 16) - SHOW_FRAME(5, 5) + TILES(0x11125, 16) SHOW_FRAME(5, 5) - TILES(0x11135, 16) - SHOW_FRAME(8, 6) + TILES(0x11135, 16) SHOW_FRAME(8, 6) - TILES(0x11125, 16) - SHOW_FRAME(2, 5) + TILES(0x11125, 16) SHOW_FRAME(2, 5) - TILES(0x11135, 16) - SHOW_FRAME(30, 6) + TILES(0x11135, 16) SHOW_FRAME(30, 6) - TILES(0x11145, 16) - SHOW_FRAME(4, 7) + TILES(0x11145, 16) SHOW_FRAME(4, 7) - TILES(0x11155, 16) - SHOW_FRAME(4, 8) + TILES(0x11155, 16) SHOW_FRAME(4, 8) - TILES(0x11165, 16) - SHOW_FRAME(4, 9) + TILES(0x11165, 16) SHOW_FRAME(4, 9) - TILES(0x11125, 16) - SHOW_FRAME(4, 5) + TILES(0x11125, 16) SHOW_FRAME(4, 5) - END() + END() }; const s32 anim_0492__v5_l0[] = { // 0x080EFFC8 - PALETTE(48, 16, 0x70) - TILES(0x11135, 16) - SHOW_FRAME(6, 6) + PALETTE(48, 16, 0x70) TILES(0x11135, 16) SHOW_FRAME(6, 6) - TILES(0x11165, 16) - SHOW_FRAME(2, 9) + TILES(0x11165, 16) SHOW_FRAME(2, 9) - TILES(0x11125, 16) - SHOW_FRAME(30, 5) + TILES(0x11125, 16) SHOW_FRAME(30, 5) - TILES(0x11135, 16) - SHOW_FRAME(6, 6) + TILES(0x11135, 16) SHOW_FRAME(6, 6) - TILES(0x11125, 16) - SHOW_FRAME(2, 5) + TILES(0x11125, 16) SHOW_FRAME(2, 5) - TILES(0x11135, 16) - SHOW_FRAME(6, 6) + TILES(0x11135, 16) SHOW_FRAME(6, 6) - TILES(0x11125, 16) - SHOW_FRAME(2, 5) + TILES(0x11125, 16) SHOW_FRAME(2, 5) - TILES(0x11165, 16) - SHOW_FRAME(1, 9) + TILES(0x11165, 16) SHOW_FRAME(1, 9) - TILES(0x11155, 16) - SHOW_FRAME(1, 8) + TILES(0x11155, 16) SHOW_FRAME(1, 8) - TILES(0x11145, 16) - SHOW_FRAME(1, 7) + TILES(0x11145, 16) SHOW_FRAME(1, 7) - TILES(0x11135, 16) - SHOW_FRAME(1, 6) + TILES(0x11135, 16) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0492__v6_l0[] = { // 0x080F00B4 - PALETTE(48, 16, 0x70) - TILES(0x11125, 16) - SHOW_FRAME(1, 5) + PALETTE(48, 16, 0x70) TILES(0x11125, 16) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0492__v7_l0[] = { // 0x080F00D8 - TILES(0x11135, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 6) - TILES(0x11145, 16) - SHOW_FRAME(2, 7) + TILES(0x11135, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 6) TILES(0x11145, 16) SHOW_FRAME(2, 7) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v8_l0[] = { // 0x080F0114 - PALETTE(48, 16, 0x70) - TILES(0x11175, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 10) + PALETTE(48, 16, 0x70) TILES(0x11175, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 10) - TILES(0x11185, 16) - SHOW_FRAME(20, 11) + TILES(0x11185, 16) SHOW_FRAME(20, 11) - TILES(0x11175, 16) - SHOW_FRAME(5, 10) + TILES(0x11175, 16) SHOW_FRAME(5, 10) - TILES(0x11185, 16) - SHOW_FRAME(12, 11) + TILES(0x11185, 16) SHOW_FRAME(12, 11) - TILES(0x11175, 16) - SHOW_FRAME(5, 10) + TILES(0x11175, 16) SHOW_FRAME(5, 10) - TILES(0x11185, 16) - SHOW_FRAME(8, 11) + TILES(0x11185, 16) SHOW_FRAME(8, 11) - TILES(0x11175, 16) - SHOW_FRAME(2, 10) + TILES(0x11175, 16) SHOW_FRAME(2, 10) - TILES(0x11185, 16) - SHOW_FRAME(30, 11) + TILES(0x11185, 16) SHOW_FRAME(30, 11) - TILES(0x11195, 16) - SHOW_FRAME(4, 12) + TILES(0x11195, 16) SHOW_FRAME(4, 12) - TILES(0x111A5, 16) - SHOW_FRAME(4, 13) + TILES(0x111A5, 16) SHOW_FRAME(4, 13) - TILES(0x111B5, 16) - SHOW_FRAME(4, 14) + TILES(0x111B5, 16) SHOW_FRAME(4, 14) - TILES(0x11175, 16) - SHOW_FRAME(4, 10) + TILES(0x11175, 16) SHOW_FRAME(4, 10) - END() + END() }; const s32 anim_0492__v9_l0[] = { // 0x080F0220 - PALETTE(48, 16, 0x70) - TILES(0x11185, 16) - SHOW_FRAME(6, 11) + PALETTE(48, 16, 0x70) TILES(0x11185, 16) SHOW_FRAME(6, 11) - TILES(0x111B5, 16) - SHOW_FRAME(2, 14) + TILES(0x111B5, 16) SHOW_FRAME(2, 14) - TILES(0x11175, 16) - SHOW_FRAME(30, 10) + TILES(0x11175, 16) SHOW_FRAME(30, 10) - TILES(0x11185, 16) - SHOW_FRAME(6, 11) + TILES(0x11185, 16) SHOW_FRAME(6, 11) - TILES(0x11175, 16) - SHOW_FRAME(2, 10) + TILES(0x11175, 16) SHOW_FRAME(2, 10) - TILES(0x11185, 16) - SHOW_FRAME(6, 11) + TILES(0x11185, 16) SHOW_FRAME(6, 11) - TILES(0x11175, 16) - SHOW_FRAME(2, 10) + TILES(0x11175, 16) SHOW_FRAME(2, 10) - TILES(0x111B5, 16) - SHOW_FRAME(1, 14) + TILES(0x111B5, 16) SHOW_FRAME(1, 14) - TILES(0x111A5, 16) - SHOW_FRAME(1, 13) + TILES(0x111A5, 16) SHOW_FRAME(1, 13) - TILES(0x11195, 16) - SHOW_FRAME(1, 12) + TILES(0x11195, 16) SHOW_FRAME(1, 12) - TILES(0x11185, 16) - SHOW_FRAME(1, 11) + TILES(0x11185, 16) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0492__v10_l0[] = { // 0x080F030C - PALETTE(48, 16, 0x70) - TILES(0x11175, 16) - SHOW_FRAME(1, 10) + PALETTE(48, 16, 0x70) TILES(0x11175, 16) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0492__v11_l0[] = { // 0x080F0330 - PALETTE(48, 16, 0x70) - TILES(0x11185, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 11) - TILES(0x11195, 16) - SHOW_FRAME(2, 12) + PALETTE(48, 16, 0x70) TILES(0x11185, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 11) TILES(0x11195, 16) SHOW_FRAME(2, 12) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v12_l0[] = { // 0x080F0378 - PALETTE(48, 16, 0x70) - TILES(0x111C5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 15) + PALETTE(48, 16, 0x70) TILES(0x111C5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 15) - TILES(0x111D5, 16) - SHOW_FRAME(20, 16) + TILES(0x111D5, 16) SHOW_FRAME(20, 16) - TILES(0x111C5, 16) - SHOW_FRAME(5, 15) + TILES(0x111C5, 16) SHOW_FRAME(5, 15) - TILES(0x111D5, 16) - SHOW_FRAME(12, 16) + TILES(0x111D5, 16) SHOW_FRAME(12, 16) - TILES(0x111C5, 16) - SHOW_FRAME(5, 15) + TILES(0x111C5, 16) SHOW_FRAME(5, 15) - TILES(0x111D5, 16) - SHOW_FRAME(8, 16) + TILES(0x111D5, 16) SHOW_FRAME(8, 16) - TILES(0x111C5, 16) - SHOW_FRAME(2, 15) + TILES(0x111C5, 16) SHOW_FRAME(2, 15) - TILES(0x111D5, 16) - SHOW_FRAME(30, 16) + TILES(0x111D5, 16) SHOW_FRAME(30, 16) - TILES(0x111E5, 16) - SHOW_FRAME(4, 17) + TILES(0x111E5, 16) SHOW_FRAME(4, 17) - TILES(0x111F5, 16) - SHOW_FRAME(4, 18) + TILES(0x111F5, 16) SHOW_FRAME(4, 18) - TILES(0x11205, 16) - SHOW_FRAME(4, 19) + TILES(0x11205, 16) SHOW_FRAME(4, 19) - TILES(0x111C5, 16) - SHOW_FRAME(4, 15) + TILES(0x111C5, 16) SHOW_FRAME(4, 15) - END() + END() }; const s32 anim_0492__v13_l0[] = { // 0x080F0484 - PALETTE(48, 16, 0x70) - TILES(0x111D5, 16) - SHOW_FRAME(6, 16) + PALETTE(48, 16, 0x70) TILES(0x111D5, 16) SHOW_FRAME(6, 16) - TILES(0x11205, 16) - SHOW_FRAME(2, 19) + TILES(0x11205, 16) SHOW_FRAME(2, 19) - TILES(0x111C5, 16) - SHOW_FRAME(30, 15) + TILES(0x111C5, 16) SHOW_FRAME(30, 15) - TILES(0x111D5, 16) - SHOW_FRAME(6, 16) + TILES(0x111D5, 16) SHOW_FRAME(6, 16) - TILES(0x111C5, 16) - SHOW_FRAME(2, 15) + TILES(0x111C5, 16) SHOW_FRAME(2, 15) - TILES(0x111D5, 16) - SHOW_FRAME(6, 16) + TILES(0x111D5, 16) SHOW_FRAME(6, 16) - TILES(0x111C5, 16) - SHOW_FRAME(2, 15) + TILES(0x111C5, 16) SHOW_FRAME(2, 15) - TILES(0x11205, 16) - SHOW_FRAME(1, 19) + TILES(0x11205, 16) SHOW_FRAME(1, 19) - TILES(0x111F5, 16) - SHOW_FRAME(1, 18) + TILES(0x111F5, 16) SHOW_FRAME(1, 18) - TILES(0x111E5, 16) - SHOW_FRAME(1, 17) + TILES(0x111E5, 16) SHOW_FRAME(1, 17) - TILES(0x111D5, 16) - SHOW_FRAME(1, 16) + TILES(0x111D5, 16) SHOW_FRAME(1, 16) - END() + END() }; const s32 anim_0492__v14_l0[] = { // 0x080F0570 - PALETTE(48, 16, 0x70) - TILES(0x111C5, 16) - SHOW_FRAME(1, 15) + PALETTE(48, 16, 0x70) TILES(0x111C5, 16) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0492__v15_l0[] = { // 0x080F0594 - PALETTE(48, 16, 0x70) - TILES(0x111D5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 16) - TILES(0x111E5, 16) - SHOW_FRAME(2, 17) + PALETTE(48, 16, 0x70) TILES(0x111D5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 16) TILES(0x111E5, 16) SHOW_FRAME(2, 17) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v16_l0[] = { // 0x080F05DC - PALETTE(48, 16, 0x70) - TILES(0x11215, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 20) + PALETTE(48, 16, 0x70) TILES(0x11215, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 20) - TILES(0x11225, 16) - SHOW_FRAME(20, 21) + TILES(0x11225, 16) SHOW_FRAME(20, 21) - TILES(0x11215, 16) - SHOW_FRAME(5, 20) + TILES(0x11215, 16) SHOW_FRAME(5, 20) - TILES(0x11225, 16) - SHOW_FRAME(12, 21) + TILES(0x11225, 16) SHOW_FRAME(12, 21) - TILES(0x11215, 16) - SHOW_FRAME(5, 20) + TILES(0x11215, 16) SHOW_FRAME(5, 20) - TILES(0x11225, 16) - SHOW_FRAME(8, 21) + TILES(0x11225, 16) SHOW_FRAME(8, 21) - TILES(0x11215, 16) - SHOW_FRAME(2, 20) + TILES(0x11215, 16) SHOW_FRAME(2, 20) - TILES(0x11225, 16) - SHOW_FRAME(30, 21) + TILES(0x11225, 16) SHOW_FRAME(30, 21) - TILES(0x11235, 16) - SHOW_FRAME(4, 22) + TILES(0x11235, 16) SHOW_FRAME(4, 22) - TILES(0x11245, 16) - SHOW_FRAME(4, 23) + TILES(0x11245, 16) SHOW_FRAME(4, 23) - TILES(0x11255, 16) - SHOW_FRAME(4, 24) + TILES(0x11255, 16) SHOW_FRAME(4, 24) - TILES(0x11215, 16) - SHOW_FRAME(4, 20) + TILES(0x11215, 16) SHOW_FRAME(4, 20) - END() + END() }; const s32 anim_0492__v17_l0[] = { // 0x080F06E8 - PALETTE(48, 16, 0x70) - TILES(0x11225, 16) - SHOW_FRAME(6, 21) + PALETTE(48, 16, 0x70) TILES(0x11225, 16) SHOW_FRAME(6, 21) - TILES(0x11255, 16) - SHOW_FRAME(2, 24) + TILES(0x11255, 16) SHOW_FRAME(2, 24) - TILES(0x11215, 16) - SHOW_FRAME(30, 20) + TILES(0x11215, 16) SHOW_FRAME(30, 20) - TILES(0x11225, 16) - SHOW_FRAME(6, 21) + TILES(0x11225, 16) SHOW_FRAME(6, 21) - TILES(0x11215, 16) - SHOW_FRAME(2, 20) + TILES(0x11215, 16) SHOW_FRAME(2, 20) - TILES(0x11225, 16) - SHOW_FRAME(6, 21) + TILES(0x11225, 16) SHOW_FRAME(6, 21) - TILES(0x11215, 16) - SHOW_FRAME(2, 20) + TILES(0x11215, 16) SHOW_FRAME(2, 20) - TILES(0x11255, 16) - SHOW_FRAME(1, 24) + TILES(0x11255, 16) SHOW_FRAME(1, 24) - TILES(0x11245, 16) - SHOW_FRAME(1, 23) + TILES(0x11245, 16) SHOW_FRAME(1, 23) - TILES(0x11235, 16) - SHOW_FRAME(1, 22) + TILES(0x11235, 16) SHOW_FRAME(1, 22) - TILES(0x11225, 16) - SHOW_FRAME(1, 21) + TILES(0x11225, 16) SHOW_FRAME(1, 21) - END() + END() }; const s32 anim_0492__v18_l0[] = { // 0x080F07D4 - PALETTE(48, 16, 0x70) - TILES(0x11215, 16) - SHOW_FRAME(1, 20) + PALETTE(48, 16, 0x70) TILES(0x11215, 16) SHOW_FRAME(1, 20) - END() + END() }; const s32 anim_0492__v19_l0[] = { // 0x080F07F8 - PALETTE(48, 16, 0x70) - TILES(0x11225, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 21) - TILES(0x11235, 16) - SHOW_FRAME(2, 22) + PALETTE(48, 16, 0x70) TILES(0x11225, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 21) TILES(0x11235, 16) SHOW_FRAME(2, 22) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v20_l0[] = { // 0x080F0840 - PALETTE(48, 16, 0x70) - TILES(0x11265, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 25) + PALETTE(48, 16, 0x70) TILES(0x11265, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 25) - TILES(0x11275, 16) - SHOW_FRAME(20, 26) + TILES(0x11275, 16) SHOW_FRAME(20, 26) - TILES(0x11265, 16) - SHOW_FRAME(5, 25) + TILES(0x11265, 16) SHOW_FRAME(5, 25) - TILES(0x11275, 16) - SHOW_FRAME(12, 26) + TILES(0x11275, 16) SHOW_FRAME(12, 26) - TILES(0x11265, 16) - SHOW_FRAME(5, 25) + TILES(0x11265, 16) SHOW_FRAME(5, 25) - TILES(0x11275, 16) - SHOW_FRAME(8, 26) + TILES(0x11275, 16) SHOW_FRAME(8, 26) - TILES(0x11265, 16) - SHOW_FRAME(2, 25) + TILES(0x11265, 16) SHOW_FRAME(2, 25) - TILES(0x11275, 16) - SHOW_FRAME(30, 26) + TILES(0x11275, 16) SHOW_FRAME(30, 26) - TILES(0x11285, 16) - SHOW_FRAME(4, 27) + TILES(0x11285, 16) SHOW_FRAME(4, 27) - TILES(0x11295, 16) - SHOW_FRAME(4, 28) + TILES(0x11295, 16) SHOW_FRAME(4, 28) - TILES(0x112A5, 16) - SHOW_FRAME(4, 29) + TILES(0x112A5, 16) SHOW_FRAME(4, 29) - TILES(0x11265, 16) - SHOW_FRAME(4, 25) + TILES(0x11265, 16) SHOW_FRAME(4, 25) - END() + END() }; const s32 anim_0492__v21_l0[] = { // 0x080F094C - PALETTE(48, 16, 0x70) - TILES(0x11275, 16) - SHOW_FRAME(6, 26) + PALETTE(48, 16, 0x70) TILES(0x11275, 16) SHOW_FRAME(6, 26) - TILES(0x112A5, 16) - SHOW_FRAME(2, 29) + TILES(0x112A5, 16) SHOW_FRAME(2, 29) - TILES(0x11265, 16) - SHOW_FRAME(30, 25) + TILES(0x11265, 16) SHOW_FRAME(30, 25) - TILES(0x11275, 16) - SHOW_FRAME(6, 26) + TILES(0x11275, 16) SHOW_FRAME(6, 26) - TILES(0x11265, 16) - SHOW_FRAME(2, 25) + TILES(0x11265, 16) SHOW_FRAME(2, 25) - TILES(0x11275, 16) - SHOW_FRAME(6, 26) + TILES(0x11275, 16) SHOW_FRAME(6, 26) - TILES(0x11265, 16) - SHOW_FRAME(2, 25) + TILES(0x11265, 16) SHOW_FRAME(2, 25) - TILES(0x112A5, 16) - SHOW_FRAME(1, 29) + TILES(0x112A5, 16) SHOW_FRAME(1, 29) - TILES(0x11295, 16) - SHOW_FRAME(1, 28) + TILES(0x11295, 16) SHOW_FRAME(1, 28) - TILES(0x11285, 16) - SHOW_FRAME(1, 27) + TILES(0x11285, 16) SHOW_FRAME(1, 27) - TILES(0x11275, 16) - SHOW_FRAME(1, 26) + TILES(0x11275, 16) SHOW_FRAME(1, 26) - END() + END() }; const s32 anim_0492__v22_l0[] = { // 0x080F0A38 - PALETTE(48, 16, 0x70) - TILES(0x11265, 16) - SHOW_FRAME(1, 25) + PALETTE(48, 16, 0x70) TILES(0x11265, 16) SHOW_FRAME(1, 25) - END() + END() }; const s32 anim_0492__v23_l0[] = { // 0x080F0A5C - PALETTE(48, 16, 0x70) - TILES(0x11275, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 26) - TILES(0x11285, 16) - SHOW_FRAME(2, 27) + PALETTE(48, 16, 0x70) TILES(0x11275, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 26) TILES(0x11285, 16) SHOW_FRAME(2, 27) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v24_l0[] = { // 0x080F0AA4 - PALETTE(48, 16, 0x70) - TILES(0x112B5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 30) + PALETTE(48, 16, 0x70) TILES(0x112B5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 30) - TILES(0x112C5, 16) - SHOW_FRAME(20, 31) + TILES(0x112C5, 16) SHOW_FRAME(20, 31) - TILES(0x112B5, 16) - SHOW_FRAME(5, 30) + TILES(0x112B5, 16) SHOW_FRAME(5, 30) - TILES(0x112C5, 16) - SHOW_FRAME(12, 31) + TILES(0x112C5, 16) SHOW_FRAME(12, 31) - TILES(0x112B5, 16) - SHOW_FRAME(5, 30) + TILES(0x112B5, 16) SHOW_FRAME(5, 30) - TILES(0x112C5, 16) - SHOW_FRAME(8, 31) + TILES(0x112C5, 16) SHOW_FRAME(8, 31) - TILES(0x112B5, 16) - SHOW_FRAME(2, 30) + TILES(0x112B5, 16) SHOW_FRAME(2, 30) - TILES(0x112C5, 16) - SHOW_FRAME(30, 31) + TILES(0x112C5, 16) SHOW_FRAME(30, 31) - TILES(0x112D5, 16) - SHOW_FRAME(4, 32) + TILES(0x112D5, 16) SHOW_FRAME(4, 32) - TILES(0x112E5, 16) - SHOW_FRAME(4, 33) + TILES(0x112E5, 16) SHOW_FRAME(4, 33) - TILES(0x112F5, 16) - SHOW_FRAME(4, 34) + TILES(0x112F5, 16) SHOW_FRAME(4, 34) - TILES(0x112B5, 16) - SHOW_FRAME(4, 30) + TILES(0x112B5, 16) SHOW_FRAME(4, 30) - END() + END() }; const s32 anim_0492__v25_l0[] = { // 0x080F0BB0 - PALETTE(48, 16, 0x70) - TILES(0x112C5, 16) - SHOW_FRAME(6, 31) + PALETTE(48, 16, 0x70) TILES(0x112C5, 16) SHOW_FRAME(6, 31) - TILES(0x112F5, 16) - SHOW_FRAME(2, 34) + TILES(0x112F5, 16) SHOW_FRAME(2, 34) - TILES(0x112B5, 16) - SHOW_FRAME(30, 30) + TILES(0x112B5, 16) SHOW_FRAME(30, 30) - TILES(0x112C5, 16) - SHOW_FRAME(6, 31) + TILES(0x112C5, 16) SHOW_FRAME(6, 31) - TILES(0x112B5, 16) - SHOW_FRAME(2, 30) + TILES(0x112B5, 16) SHOW_FRAME(2, 30) - TILES(0x112C5, 16) - SHOW_FRAME(6, 31) + TILES(0x112C5, 16) SHOW_FRAME(6, 31) - TILES(0x112B5, 16) - SHOW_FRAME(2, 30) + TILES(0x112B5, 16) SHOW_FRAME(2, 30) - TILES(0x112F5, 16) - SHOW_FRAME(1, 34) + TILES(0x112F5, 16) SHOW_FRAME(1, 34) - TILES(0x112E5, 16) - SHOW_FRAME(1, 33) + TILES(0x112E5, 16) SHOW_FRAME(1, 33) - TILES(0x112D5, 16) - SHOW_FRAME(1, 32) + TILES(0x112D5, 16) SHOW_FRAME(1, 32) - TILES(0x112C5, 16) - SHOW_FRAME(1, 31) + TILES(0x112C5, 16) SHOW_FRAME(1, 31) - END() + END() }; const s32 anim_0492__v26_l0[] = { // 0x080F0C9C - PALETTE(48, 16, 0x70) - TILES(0x112B5, 16) - SHOW_FRAME(1, 30) + PALETTE(48, 16, 0x70) TILES(0x112B5, 16) SHOW_FRAME(1, 30) - END() + END() }; const s32 anim_0492__v27_l0[] = { // 0x080F0CC0 - PALETTE(48, 16, 0x70) - TILES(0x112C5, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 31) - TILES(0x112D5, 16) - SHOW_FRAME(2, 32) + PALETTE(48, 16, 0x70) TILES(0x112C5, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 31) TILES(0x112D5, 16) SHOW_FRAME(2, 32) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0492__v28_l0[] = { // 0x080F0D08 - PALETTE(48, 16, 0x70) - TILES(0x11305, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(5, 35) + PALETTE(48, 16, 0x70) TILES(0x11305, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(5, 35) - TILES(0x11315, 16) - SHOW_FRAME(20, 36) + TILES(0x11315, 16) SHOW_FRAME(20, 36) - TILES(0x11305, 16) - SHOW_FRAME(5, 35) + TILES(0x11305, 16) SHOW_FRAME(5, 35) - TILES(0x11315, 16) - SHOW_FRAME(12, 36) + TILES(0x11315, 16) SHOW_FRAME(12, 36) - TILES(0x11305, 16) - SHOW_FRAME(5, 35) + TILES(0x11305, 16) SHOW_FRAME(5, 35) - TILES(0x11315, 16) - SHOW_FRAME(8, 36) + TILES(0x11315, 16) SHOW_FRAME(8, 36) - TILES(0x11305, 16) - SHOW_FRAME(2, 35) + TILES(0x11305, 16) SHOW_FRAME(2, 35) - TILES(0x11315, 16) - SHOW_FRAME(30, 36) + TILES(0x11315, 16) SHOW_FRAME(30, 36) - TILES(0x11325, 16) - SHOW_FRAME(4, 37) + TILES(0x11325, 16) SHOW_FRAME(4, 37) - TILES(0x11335, 16) - SHOW_FRAME(4, 38) + TILES(0x11335, 16) SHOW_FRAME(4, 38) - TILES(0x11345, 16) - SHOW_FRAME(4, 39) + TILES(0x11345, 16) SHOW_FRAME(4, 39) - TILES(0x11305, 16) - SHOW_FRAME(4, 35) + TILES(0x11305, 16) SHOW_FRAME(4, 35) - END() + END() }; const s32 anim_0492__v29_l0[] = { // 0x080F0E14 - PALETTE(48, 16, 0x70) - TILES(0x11315, 16) - SHOW_FRAME(6, 36) + PALETTE(48, 16, 0x70) TILES(0x11315, 16) SHOW_FRAME(6, 36) - TILES(0x11345, 16) - SHOW_FRAME(2, 39) + TILES(0x11345, 16) SHOW_FRAME(2, 39) - TILES(0x11305, 16) - SHOW_FRAME(30, 35) + TILES(0x11305, 16) SHOW_FRAME(30, 35) - TILES(0x11315, 16) - SHOW_FRAME(6, 36) + TILES(0x11315, 16) SHOW_FRAME(6, 36) - TILES(0x11305, 16) - SHOW_FRAME(2, 35) + TILES(0x11305, 16) SHOW_FRAME(2, 35) - TILES(0x11315, 16) - SHOW_FRAME(6, 36) + TILES(0x11315, 16) SHOW_FRAME(6, 36) - TILES(0x11305, 16) - SHOW_FRAME(2, 35) + TILES(0x11305, 16) SHOW_FRAME(2, 35) - TILES(0x11345, 16) - SHOW_FRAME(1, 39) + TILES(0x11345, 16) SHOW_FRAME(1, 39) - TILES(0x11335, 16) - SHOW_FRAME(1, 38) + TILES(0x11335, 16) SHOW_FRAME(1, 38) - TILES(0x11325, 16) - SHOW_FRAME(1, 37) + TILES(0x11325, 16) SHOW_FRAME(1, 37) - TILES(0x11315, 16) - SHOW_FRAME(1, 36) + TILES(0x11315, 16) SHOW_FRAME(1, 36) - END() + END() }; const s32 anim_0492__v30_l0[] = { // 0x080F0F00 - PALETTE(48, 16, 0x70) - TILES(0x11305, 16) - SHOW_FRAME(1, 35) + PALETTE(48, 16, 0x70) TILES(0x11305, 16) SHOW_FRAME(1, 35) - END() + END() }; const s32 anim_0492__v31_l0[] = { // 0x080F0F24 - PALETTE(48, 16, 0x70) - TILES(0x11315, 16) - HITBOX(0, -12, -11, 13, 12) - SHOW_FRAME(2, 36) - TILES(0x11325, 16) - SHOW_FRAME(2, 37) + PALETTE(48, 16, 0x70) TILES(0x11315, 16) HITBOX(0, -12, -11, 13, 12) SHOW_FRAME(2, 36) TILES(0x11325, 16) SHOW_FRAME(2, 37) - JUMP_BACK(5) + JUMP_BACK(5) }; -const s32 * const anim_0492[32] = { - anim_0492__v0_l0, - anim_0492__v1_l0, - anim_0492__v2_l0, - anim_0492__v3_l0, - anim_0492__v4_l0, - anim_0492__v5_l0, - anim_0492__v6_l0, - anim_0492__v7_l0, - anim_0492__v8_l0, - anim_0492__v9_l0, - anim_0492__v10_l0, - anim_0492__v11_l0, - anim_0492__v12_l0, - anim_0492__v13_l0, - anim_0492__v14_l0, - anim_0492__v15_l0, - anim_0492__v16_l0, - anim_0492__v17_l0, - anim_0492__v18_l0, - anim_0492__v19_l0, - anim_0492__v20_l0, - anim_0492__v21_l0, - anim_0492__v22_l0, - anim_0492__v23_l0, - anim_0492__v24_l0, - anim_0492__v25_l0, - anim_0492__v26_l0, - anim_0492__v27_l0, - anim_0492__v28_l0, - anim_0492__v29_l0, - anim_0492__v30_l0, - anim_0492__v31_l0, +const s32 *const anim_0492[32] = { + anim_0492__v0_l0, anim_0492__v1_l0, anim_0492__v2_l0, anim_0492__v3_l0, anim_0492__v4_l0, anim_0492__v5_l0, anim_0492__v6_l0, + anim_0492__v7_l0, anim_0492__v8_l0, anim_0492__v9_l0, anim_0492__v10_l0, anim_0492__v11_l0, anim_0492__v12_l0, anim_0492__v13_l0, + anim_0492__v14_l0, anim_0492__v15_l0, anim_0492__v16_l0, anim_0492__v17_l0, anim_0492__v18_l0, anim_0492__v19_l0, anim_0492__v20_l0, + anim_0492__v21_l0, anim_0492__v22_l0, anim_0492__v23_l0, anim_0492__v24_l0, anim_0492__v25_l0, anim_0492__v26_l0, anim_0492__v27_l0, + anim_0492__v28_l0, anim_0492__v29_l0, anim_0492__v30_l0, anim_0492__v31_l0, }; const s32 anim_0493__v0_l0[] = { // 0x080F0FEC - PALETTE(47, 16, 0x70) - TILES(0x11355, 20) - HITBOX(0, -16, -18, 16, 16) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x11355, 20) HITBOX(0, -16, -18, 16, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0493[1] = { +const s32 *const anim_0493[1] = { anim_0493__v0_l0, }; const s32 anim_0494__v0_l0[] = { // 0x080F1020 - PALETTE(47, 16, 0x70) - TILES(0x11369, 36) - HITBOX(0, -24, -23, 24, 24) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x11369, 36) HITBOX(0, -24, -23, 24, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0494[1] = { +const s32 *const anim_0494[1] = { anim_0494__v0_l0, }; const s32 anim_0495__v0_l0[] = { // 0x080F1054 - PALETTE(47, 16, 0x70) - TILES(0x1138D, 18) - HITBOX(0, -24, -10, 24, -4) - SHOW_FRAME(1, 0) + PALETTE(47, 16, 0x70) TILES(0x1138D, 18) HITBOX(0, -24, -10, 24, -4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0495[1] = { +const s32 *const anim_0495[1] = { anim_0495__v0_l0, }; const s32 anim_0496__v0_l0[] = { // 0x080F1088 - PALETTE(41, 16, 0x70) - TILES(0x1139F, 8) - HITBOX(0, -16, 0, 7, 32) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x1139F, 8) HITBOX(0, -16, 0, 7, 32) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0496__v1_l0[] = { // 0x080F10B8 - PALETTE(41, 16, 0x70) - TILES(0x113A7, 8) - HITBOX(0, -16, 0, 7, 32) - SHOW_FRAME(1, 1) + PALETTE(41, 16, 0x70) TILES(0x113A7, 8) HITBOX(0, -16, 0, 7, 32) SHOW_FRAME(1, 1) - TILES(0x113AF, 8) - SHOW_FRAME(1, 2) + TILES(0x113AF, 8) SHOW_FRAME(1, 2) - TILES(0x113B7, 8) - SHOW_FRAME(1, 3) + TILES(0x113B7, 8) SHOW_FRAME(1, 3) - TILES(0x113BF, 8) - SHOW_FRAME(1, 4) + TILES(0x113BF, 8) SHOW_FRAME(1, 4) - TILES(0x113C7, 8) - SHOW_FRAME(1, 5) + TILES(0x113C7, 8) SHOW_FRAME(1, 5) - TILES(0x1139F, 8) - SHOW_FRAME(1, 0) + TILES(0x1139F, 8) SHOW_FRAME(1, 0) - TILES(0x113A7, 8) - SHOW_FRAME(1, 1) + TILES(0x113A7, 8) SHOW_FRAME(1, 1) - TILES(0x113AF, 8) - SHOW_FRAME(1, 2) + TILES(0x113AF, 8) SHOW_FRAME(1, 2) - TILES(0x113B7, 8) - SHOW_FRAME(1, 3) + TILES(0x113B7, 8) SHOW_FRAME(1, 3) - TILES(0x113BF, 8) - SHOW_FRAME(2, 4) + TILES(0x113BF, 8) SHOW_FRAME(2, 4) - TILES(0x113C7, 8) - SHOW_FRAME(2, 5) + TILES(0x113C7, 8) SHOW_FRAME(2, 5) - TILES(0x1139F, 8) - SHOW_FRAME(2, 0) + TILES(0x1139F, 8) SHOW_FRAME(2, 0) - TILES(0x113A7, 8) - SHOW_FRAME(2, 1) + TILES(0x113A7, 8) SHOW_FRAME(2, 1) - TILES(0x113AF, 8) - SHOW_FRAME(2, 2) + TILES(0x113AF, 8) SHOW_FRAME(2, 2) - TILES(0x113B7, 8) - SHOW_FRAME(2, 3) + TILES(0x113B7, 8) SHOW_FRAME(2, 3) - TILES(0x113BF, 8) - SHOW_FRAME(3, 4) + TILES(0x113BF, 8) SHOW_FRAME(3, 4) - TILES(0x113C7, 8) - SHOW_FRAME(3, 5) + TILES(0x113C7, 8) SHOW_FRAME(3, 5) - TILES(0x1139F, 8) - SHOW_FRAME(3, 0) + TILES(0x1139F, 8) SHOW_FRAME(3, 0) - TILES(0x113A7, 8) - SHOW_FRAME(3, 1) + TILES(0x113A7, 8) SHOW_FRAME(3, 1) - TILES(0x113AF, 8) - SHOW_FRAME(3, 2) + TILES(0x113AF, 8) SHOW_FRAME(3, 2) - TILES(0x113B7, 8) - SHOW_FRAME(4, 3) + TILES(0x113B7, 8) SHOW_FRAME(4, 3) - TILES(0x113BF, 8) - SHOW_FRAME(4, 4) + TILES(0x113BF, 8) SHOW_FRAME(4, 4) - TILES(0x113C7, 8) - SHOW_FRAME(4, 5) + TILES(0x113C7, 8) SHOW_FRAME(4, 5) - TILES(0x1139F, 8) - SHOW_FRAME(4, 0) + TILES(0x1139F, 8) SHOW_FRAME(4, 0) - TILES(0x113A7, 8) - SHOW_FRAME(5, 1) + TILES(0x113A7, 8) SHOW_FRAME(5, 1) - TILES(0x113AF, 8) - SHOW_FRAME(5, 2) + TILES(0x113AF, 8) SHOW_FRAME(5, 2) - TILES(0x113B7, 8) - SHOW_FRAME(5, 3) + TILES(0x113B7, 8) SHOW_FRAME(5, + 3) - TILES(0x113BF, 8) - SHOW_FRAME(6, 4) + TILES(0x113BF, + 8) SHOW_FRAME(6, 4) - TILES(0x113C7, 8) - SHOW_FRAME(6, 5) + TILES(0x113C7, + 8) SHOW_FRAME(6, + 5) - TILES(0x1139F, 8) - SHOW_FRAME(7, 0) + TILES( + 0x1139F, + 8) SHOW_FRAME(7, + 0) - TILES(0x113A7, 8) - SHOW_FRAME(8, 1) + TILES( + 0x113A7, + 8) SHOW_FRAME(8, + 1) - TILES(0x113AF, 8) - SHOW_FRAME(9, 2) + TILES( + 0x113AF, + 8) SHOW_FRAME(9, + 2) - TILES(0x113B7, 8) - SHOW_FRAME(10, 3) + TILES(0x113B7, 8) SHOW_FRAME( + 10, + 3) - TILES(0x113BF, 8) - SHOW_FRAME(11, 4) + TILES(0x113BF, 8) SHOW_FRAME( + 11, + 4) - TILES(0x113C7, 8) - SHOW_FRAME(12, 5) + TILES( + 0x113C7, + 8) + SHOW_FRAME( + 12, + 5) - JUMP_BACK(181) + JUMP_BACK( + 181) }; -const s32 * const anim_0496[2] = { +const s32 *const anim_0496[2] = { anim_0496__v0_l0, anim_0496__v1_l0, }; const s32 anim_0497__v0_l0[] = { // 0x080F139C - PALETTE(41, 16, 0x70) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x113CF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 1) + TILES(0x113D7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 2) + TILES(0x113DF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 3) + TILES(0x113E7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 4) + TILES(0x113EF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 4) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 5) + TILES(0x113F7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 5) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 0) + TILES(0x113CF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 1) + TILES(0x113D7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 2) + TILES(0x113DF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 3) + TILES(0x113E7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 4) + TILES(0x113EF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 4) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 5) + TILES(0x113F7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 5) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 0) + TILES(0x113CF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 1) + TILES(0x113D7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(2, 2) + TILES(0x113DF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(2, 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(3, 3) + TILES(0x113E7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(3, 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(3, 4) + TILES(0x113EF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(3, 4) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(3, 5) + TILES(0x113F7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(3, 5) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(3, 0) + TILES(0x113CF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(3, 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(3, 1) + TILES(0x113D7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(3, 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(4, 2) + TILES(0x113DF, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(4, + 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(4, 3) + TILES(0x113E7, 8) HITBOX(0, 4, -6, 28, + 6) SHOW_FRAME(4, 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(4, 4) + TILES(0x113EF, 8) HITBOX(0, 4, -6, 28, + 6) SHOW_FRAME(4, 4) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(4, 5) + TILES(0x113F7, 8) HITBOX(0, 4, -6, 28, + 6) SHOW_FRAME(4, 5) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(5, 0) + TILES(0x113CF, 8) HITBOX( + 0, 4, -6, 28, 6) SHOW_FRAME(5, 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(5, 1) + TILES(0x113D7, + 8) HITBOX(0, 4, -6, 28, + 6) SHOW_FRAME(5, 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(5, 2) + TILES(0x113DF, 8) HITBOX( + 0, 4, -6, 28, + 6) SHOW_FRAME(5, 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(6, 3) + TILES(0x113E7, 8) HITBOX( + 0, 4, -6, 28, + 6) SHOW_FRAME(6, 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(6, 4) + TILES(0x113EF, 8) HITBOX( + 0, 4, -6, + 28, + 6) SHOW_FRAME(6, 4) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(7, 5) + TILES(0x113F7, 8) HITBOX( + 0, 4, -6, + 28, + 6) SHOW_FRAME(7, + 5) - TILES(0x113CF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(8, 0) + TILES(0x113CF, 8) HITBOX( + 0, 4, -6, + 28, + 6) SHOW_FRAME(8, + 0) - TILES(0x113D7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(9, 1) + TILES(0x113D7, 8) HITBOX( + 0, 4, + -6, + 28, + 6) SHOW_FRAME(9, + 1) - TILES(0x113DF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(10, 2) + TILES(0x113DF, 8) HITBOX( + 0, + 4, + -6, + 28, + 6) SHOW_FRAME(10, + 2) - TILES(0x113E7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(11, 3) + TILES(0x113E7, 8) HITBOX( + 0, + 4, + -6, + 28, + 6) SHOW_FRAME(11, + 3) - TILES(0x113EF, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(12, 4) + TILES(0x113EF, 8) HITBOX( + 0, + 4, + -6, + 28, + 6) + SHOW_FRAME( + 12, + 4) - JUMP_BACK(283) + JUMP_BACK( + 283) }; const s32 anim_0497__v1_l0[] = { // 0x080F1810 - PALETTE(41, 16, 0x70) - TILES(0x113F7, 8) - HITBOX(0, 4, -6, 28, 6) - SHOW_FRAME(1, 5) + PALETTE(41, 16, 0x70) TILES(0x113F7, 8) HITBOX(0, 4, -6, 28, 6) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0497[2] = { +const s32 *const anim_0497[2] = { anim_0497__v0_l0, anim_0497__v1_l0, }; const s32 anim_0498__v0_l0[] = { // 0x080F1848 - PALETTE(49, 16, 0xB0) - TILES(0x113FF, 30) - HITBOX(0, -10, 24, 10, 44) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x113FF, 30) HITBOX(0, -10, 24, 10, 44) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0498__v1_l0[] = { // 0x080F1878 - PALETTE(49, 16, 0xB0) - TILES(0x1141D, 30) - SHOW_FRAME(2, 1) + PALETTE(49, 16, 0xB0) TILES(0x1141D, 30) SHOW_FRAME(2, 1) - TILES(0x1143B, 30) - SHOW_FRAME(2, 2) + TILES(0x1143B, 30) SHOW_FRAME(2, 2) - END() + END() }; const s32 anim_0498__v2_l0[] = { // 0x080F18B0 - PALETTE(49, 16, 0xB0) - TILES(0x1141D, 30) - SHOW_FRAME(2, 1) + PALETTE(49, 16, 0xB0) TILES(0x1141D, 30) SHOW_FRAME(2, 1) - TILES(0x113FF, 30) - SHOW_FRAME(1, 0) + TILES(0x113FF, 30) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0498__v3_l0[] = { // 0x080F18E8 - PALETTE(49, 16, 0xB0) - TILES(0x11459, 3) - SHOW_FRAME(1, 3) + PALETTE(49, 16, 0xB0) TILES(0x11459, 3) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0498[4] = { +const s32 *const anim_0498[4] = { anim_0498__v0_l0, anim_0498__v1_l0, anim_0498__v2_l0, @@ -15237,435 +10641,317 @@ const s32 * const anim_0498[4] = { }; const s32 anim_0499__v0_l0[] = { // 0x080F191C - PALETTE(50, 16, 0xB0) - TILES(0x1145C, 12) - HITBOX(0, -15, -8, 15, 9) - SHOW_FRAME(1, 0) + PALETTE(50, 16, 0xB0) TILES(0x1145C, 12) HITBOX(0, -15, -8, 15, 9) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0499[1] = { +const s32 *const anim_0499[1] = { anim_0499__v0_l0, }; const s32 anim_0501__v0_l0[] = { // 0x080F1950 - PALETTE(51, 16, 0xB0) - TILES(0x11468, 12) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(1, 0) + PALETTE(51, 16, 0xB0) TILES(0x11468, 12) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0501__v1_l0[] = { // 0x080F1980 - PALETTE(51, 16, 0xB0) - TILES(0x11474, 8) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(6, 1) + PALETTE(51, 16, 0xB0) TILES(0x11474, 8) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(6, 1) - TILES(0x1147C, 16) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(6, 2) + TILES(0x1147C, 16) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(6, 2) - TILES(0x1148C, 16) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(6, 3) + TILES(0x1148C, 16) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(6, 3) - TILES(0x1149C, 16) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(6, 4) + TILES(0x1149C, 16) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(6, 4) - TILES(0x114AC, 16) - HITBOX(0, -11, -8, 11, 0) - SHOW_FRAME(6, 5) + TILES(0x114AC, 16) HITBOX(0, -11, -8, 11, 0) SHOW_FRAME(6, 5) - END() + END() }; const s32 anim_0501__v2_l0[] = { // 0x080F1A30 - PALETTE(51, 16, 0xB0) - TILES(0x114BC, 8) - HITBOX(0, -10, -21, 10, -7) - SHOW_FRAME(1, 6) + PALETTE(51, 16, 0xB0) TILES(0x114BC, 8) HITBOX(0, -10, -21, 10, -7) SHOW_FRAME(1, 6) - END() + END() }; -const s32 * const anim_0501[3] = { +const s32 *const anim_0501[3] = { anim_0501__v0_l0, anim_0501__v1_l0, anim_0501__v2_l0, }; const s32 anim_0502__v0_l0[] = { // 0x080F1A6C - PALETTE(49, 16, 0xB0) - TILES(0x114C4, 32) - HITBOX(0, 0, 4, 64, 23) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x114C4, 32) HITBOX(0, 0, 4, 64, 23) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0502[1] = { +const s32 *const anim_0502[1] = { anim_0502__v0_l0, }; const s32 anim_0503__v0_l0[] = { // 0x080F1AA0 - PALETTE(52, 16, 0xB0) - TILES(0x114E4, 1) - SHOW_FRAME(1, 0) + PALETTE(52, 16, 0xB0) TILES(0x114E4, 1) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0503__v1_l0[] = { // 0x080F1AC4 - PALETTE(52, 16, 0xB0) - TILES(0x114E5, 1) - SHOW_FRAME(1, 1) + PALETTE(52, 16, 0xB0) TILES(0x114E5, 1) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0503__v2_l0[] = { // 0x080F1AE8 - PALETTE(52, 16, 0xB0) - TILES(0x114E6, 1) - SHOW_FRAME(1, 2) + PALETTE(52, 16, 0xB0) TILES(0x114E6, 1) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0503[3] = { +const s32 *const anim_0503[3] = { anim_0503__v0_l0, anim_0503__v1_l0, anim_0503__v2_l0, }; const s32 anim_0504__v0_l0[] = { // 0x080F1B18 - PALETTE(52, 16, 0xB0) - TILES(0x114E7, 6) - HITBOX(0, -7, 12, 7, 42) - SHOW_FRAME(1, 0) + PALETTE(52, 16, 0xB0) TILES(0x114E7, 6) HITBOX(0, -7, 12, 7, 42) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0504__v1_l0[] = { // 0x080F1B48 - PALETTE(52, 16, 0xB0) - TILES(0x114ED, 16) - HITBOX(0, -112, 123, -112, 123) - SHOW_FRAME(1, 1) + PALETTE(52, 16, 0xB0) TILES(0x114ED, 16) HITBOX(0, -112, 123, -112, 123) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0504[2] = { +const s32 *const anim_0504[2] = { anim_0504__v0_l0, anim_0504__v1_l0, }; const s32 anim_0505__v0_l0[] = { // 0x080F1B80 - PALETTE(52, 16, 0xB0) - TILES(0x114FD, 18) - HITBOX(0, -23, -14, 23, 2) - SHOW_FRAME(1, 0) + PALETTE(52, 16, 0xB0) TILES(0x114FD, 18) HITBOX(0, -23, -14, 23, 2) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0505__v1_l0[] = { // 0x080F1BB0 - PALETTE(52, 16, 0xB0) - TILES(0x1150F, 12) - SHOW_FRAME(4, 1) + PALETTE(52, 16, 0xB0) TILES(0x1150F, 12) SHOW_FRAME(4, 1) - TILES(0x1151B, 30) - SHOW_FRAME(2, 2) + TILES(0x1151B, 30) SHOW_FRAME(2, 2) - TILES(0x11539, 12) - SHOW_FRAME(1, 3) + TILES(0x11539, 12) SHOW_FRAME(1, 3) - TILES(0x11545, 24) - SHOW_FRAME(5, 4) + TILES(0x11545, 24) SHOW_FRAME(5, 4) - TILES(0x1155D, 12) - SHOW_FRAME(3, 5) + TILES(0x1155D, 12) SHOW_FRAME(3, 5) - TILES(0x11569, 18) - SHOW_FRAME(3, 6) + TILES(0x11569, 18) SHOW_FRAME(3, 6) - END() + END() }; -const s32 * const anim_0505[2] = { +const s32 *const anim_0505[2] = { anim_0505__v0_l0, anim_0505__v1_l0, }; const s32 anim_0506__v0_l0[] = { // 0x080F1C40 - PALETTE(53, 16, 0x70) - TILES(0x1157B, 18) - HITBOX(0, -24, -5, 24, -3) - SHOW_FRAME(1, 0) + PALETTE(53, 16, 0x70) TILES(0x1157B, 18) HITBOX(0, -24, -5, 24, -3) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0506[1] = { +const s32 *const anim_0506[1] = { anim_0506__v0_l0, }; const s32 anim_0507__v0_l0[] = { // 0x080F1C74 - PALETTE(49, 16, 0xB0) - TILES(0x1158D, 12) - HITBOX(0, -14, -5, 14, 14) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x1158D, 12) HITBOX(0, -14, -5, 14, 14) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0507[1] = { +const s32 *const anim_0507[1] = { anim_0507__v0_l0, }; const s32 anim_0508__v0_l0[] = { // 0x080F1CA8 - PALETTE(49, 16, 0xB0) - TILES(0x11599, 36) - HITBOX(0, -44, -5, 44, 8) - SHOW_FRAME(10, 0) + PALETTE(49, 16, 0xB0) TILES(0x11599, 36) HITBOX(0, -44, -5, 44, 8) SHOW_FRAME(10, 0) - TILES(0x115BD, 36) - SHOW_FRAME(10, 1) + TILES(0x115BD, 36) SHOW_FRAME(10, 1) - TILES(0x115E1, 36) - SHOW_FRAME(10, 2) + TILES(0x115E1, 36) SHOW_FRAME(10, 2) - TILES(0x11605, 36) - SHOW_FRAME(10, 3) + TILES(0x11605, 36) SHOW_FRAME(10, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0508__v1_l0[] = { // 0x080F1D18 - PALETTE(49, 16, 0xB0) - TILES(0x11605, 36) - HITBOX(0, -44, -3, 44, 8) - SHOW_FRAME(10, 3) + PALETTE(49, 16, 0xB0) TILES(0x11605, 36) HITBOX(0, -44, -3, 44, 8) SHOW_FRAME(10, 3) - TILES(0x115E1, 36) - SHOW_FRAME(10, 2) + TILES(0x115E1, 36) SHOW_FRAME(10, 2) - TILES(0x115BD, 36) - SHOW_FRAME(10, 1) + TILES(0x115BD, 36) SHOW_FRAME(10, 1) - TILES(0x11599, 36) - SHOW_FRAME(10, 0) + TILES(0x11599, 36) SHOW_FRAME(10, 0) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0508[2] = { +const s32 *const anim_0508[2] = { anim_0508__v0_l0, anim_0508__v1_l0, }; const s32 anim_0509__v0_l0[] = { // 0x080F1D90 - PALETTE(49, 16, 0xB0) - TILES(0x11629, 27) - HITBOX(0, -32, -7, 32, 6) - SHOW_FRAME(10, 0) + PALETTE(49, 16, 0xB0) TILES(0x11629, 27) HITBOX(0, -32, -7, 32, 6) SHOW_FRAME(10, 0) - TILES(0x11644, 27) - SHOW_FRAME(10, 1) + TILES(0x11644, 27) SHOW_FRAME(10, 1) - TILES(0x1165F, 27) - SHOW_FRAME(10, 2) + TILES(0x1165F, 27) SHOW_FRAME(10, 2) - TILES(0x1167A, 27) - SHOW_FRAME(10, 3) + TILES(0x1167A, 27) SHOW_FRAME(10, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0509__v1_l0[] = { // 0x080F1E00 - PALETTE(49, 16, 0xB0) - TILES(0x1167A, 27) - HITBOX(0, -32, -7, 32, 6) - SHOW_FRAME(10, 3) + PALETTE(49, 16, 0xB0) TILES(0x1167A, 27) HITBOX(0, -32, -7, 32, 6) SHOW_FRAME(10, 3) - TILES(0x1165F, 27) - SHOW_FRAME(10, 2) + TILES(0x1165F, 27) SHOW_FRAME(10, 2) - TILES(0x11644, 27) - SHOW_FRAME(10, 1) + TILES(0x11644, 27) SHOW_FRAME(10, 1) - TILES(0x11629, 27) - SHOW_FRAME(10, 0) + TILES(0x11629, 27) SHOW_FRAME(10, 0) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0509[2] = { +const s32 *const anim_0509[2] = { anim_0509__v0_l0, anim_0509__v1_l0, }; const s32 anim_0510__v0_l0[] = { // 0x080F1E78 - PALETTE(54, 16, 0xB0) - TILES(0x11695, 36) - HITBOX(0, -14, -14, 14, 14) - SHOW_FRAME(1, 0) + PALETTE(54, 16, 0xB0) TILES(0x11695, 36) HITBOX(0, -14, -14, 14, 14) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0510[1] = { +const s32 *const anim_0510[1] = { anim_0510__v0_l0, }; const s32 anim_0511__v0_l0[] = { // 0x080F1EAC - PALETTE(55, 16, 0xB0) - TILES(0x116B9, 4) - HITBOX(0, -8, -3, 8, 8) - SHOW_FRAME(7, 0) + PALETTE(55, 16, 0xB0) TILES(0x116B9, 4) HITBOX(0, -8, -3, 8, 8) SHOW_FRAME(7, 0) - TILES(0x116BD, 4) - SHOW_FRAME(7, 1) + TILES(0x116BD, 4) SHOW_FRAME(7, 1) - TILES(0x116C1, 4) - SHOW_FRAME(7, 2) + TILES(0x116C1, 4) SHOW_FRAME(7, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0511[1] = { +const s32 *const anim_0511[1] = { anim_0511__v0_l0, }; const s32 anim_0512__v0_l0[] = { // 0x080F1F0C - PALETTE(56, 16, 0xB0) - TILES(0x116C5, 8) - SHOW_FRAME(7, 0) + PALETTE(56, 16, 0xB0) TILES(0x116C5, 8) SHOW_FRAME(7, 0) - TILES(0x116CD, 8) - SHOW_FRAME(7, 1) + TILES(0x116CD, 8) SHOW_FRAME(7, 1) - TILES(0x116D5, 8) - SHOW_FRAME(7, 2) + TILES(0x116D5, 8) SHOW_FRAME(7, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0512[1] = { +const s32 *const anim_0512[1] = { anim_0512__v0_l0, }; const s32 anim_0513__v0_l0[] = { // 0x080F1F60 - PALETTE(49, 16, 0xB0) - TILES(0x116DD, 32) - HITBOX(0, 0, 3, 64, 32) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x116DD, 32) HITBOX(0, 0, 3, 64, 32) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0513[1] = { +const s32 *const anim_0513[1] = { anim_0513__v0_l0, }; const s32 anim_0514__v0_l0[] = { // 0x080F1F94 - PALETTE(41, 16, 0x70) - TILES(0x116FD, 16) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x116FD, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0514__v1_l0[] = { // 0x080F1FB8 - PALETTE(41, 16, 0x70) - TILES(0x1170D, 25) - SHOW_FRAME(1, 1) + PALETTE(41, 16, 0x70) TILES(0x1170D, 25) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0514[2] = { +const s32 *const anim_0514[2] = { anim_0514__v0_l0, anim_0514__v1_l0, }; const s32 anim_0515__v0_l0[] = { // 0x080F1FE4 - PALETTE(57, 16, 0xB0) - TILES(0x11726, 54) - HITBOX(0, -72, -11, 72, 10) - SHOW_FRAME(4, 0) + PALETTE(57, 16, 0xB0) TILES(0x11726, 54) HITBOX(0, -72, -11, 72, 10) SHOW_FRAME(4, 0) - TILES(0x1175C, 54) - SHOW_FRAME(4, 1) + TILES(0x1175C, 54) SHOW_FRAME(4, 1) - TILES(0x11792, 42) - SHOW_FRAME(4, 2) + TILES(0x11792, 42) SHOW_FRAME(4, 2) - TILES(0x117BC, 54) - SHOW_FRAME(4, 3) + TILES(0x117BC, 54) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0515[1] = { +const s32 *const anim_0515[1] = { anim_0515__v0_l0, }; const s32 anim_0516__v0_l0[] = { // 0x080F2058 - PALETTE(35, 16, 0x90) - TILES(0x117F2, 30) - HITBOX(0, -24, -16, 24, 16) - HITBOX(1, -20, -22, 20, -14) - SHOW_FRAME(16, 0) + PALETTE(35, 16, 0x90) TILES(0x117F2, 30) HITBOX(0, -24, -16, 24, 16) HITBOX(1, -20, -22, 20, -14) SHOW_FRAME(16, 0) - END() + END() }; const s32 anim_0516__v1_l0[] = { // 0x080F2094 - PALETTE(35, 16, 0x90) - TILES(0x11810, 30) - HITBOX(0, -24, -14, 24, 16) - SHOW_FRAME(16, 1) + PALETTE(35, 16, 0x90) TILES(0x11810, 30) HITBOX(0, -24, -14, 24, 16) SHOW_FRAME(16, 1) - TILES(0x1182E, 24) - SHOW_FRAME(16, 2) + TILES(0x1182E, 24) SHOW_FRAME(16, 2) - TILES(0x11846, 30) - SHOW_FRAME(16, 3) + TILES(0x11846, 30) SHOW_FRAME(16, 3) - END() + END() }; const s32 anim_0516__v2_l0[] = { // 0x080F20EC - PALETTE(35, 16, 0x90) - TILES(0x11864, 30) - HITBOX(0, -24, -14, 24, 15) - HITBOX(1, -21, 15, 21, 21) - SHOW_FRAME(16, 4) + PALETTE(35, 16, 0x90) TILES(0x11864, 30) HITBOX(0, -24, -14, 24, 15) HITBOX(1, -21, 15, 21, 21) SHOW_FRAME(16, 4) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0516__v3_l0[] = { // 0x080F212C - PALETTE(35, 16, 0x90) - TILES(0x11882, 30) - HITBOX(0, -24, -14, 24, 16) - SHOW_FRAME(16, 5) + PALETTE(35, 16, 0x90) TILES(0x11882, 30) HITBOX(0, -24, -14, 24, 16) SHOW_FRAME(16, 5) - TILES(0x118A0, 24) - SHOW_FRAME(16, 6) + TILES(0x118A0, 24) SHOW_FRAME(16, 6) - TILES(0x118B8, 30) - SHOW_FRAME(16, 7) + TILES(0x118B8, 30) SHOW_FRAME(16, 7) - END() + END() }; -const s32 * const anim_0516[4] = { +const s32 *const anim_0516[4] = { anim_0516__v0_l0, anim_0516__v1_l0, anim_0516__v2_l0, @@ -15673,2706 +10959,1967 @@ const s32 * const anim_0516[4] = { }; const s32 anim_0517__v0_l0[] = { // 0x080F2194 - PALETTE(49, 16, 0xB0) - TILES(0x118D6, 18) - HITBOX(0, -24, -8, 24, 8) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x118D6, 18) HITBOX(0, -24, -8, 24, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0517[1] = { +const s32 *const anim_0517[1] = { anim_0517__v0_l0, }; const s32 anim_0518__v0_l0[] = { // 0x080F21C8 - PALETTE(49, 16, 0xB0) - TILES(0x118E8, 36) - HITBOX(0, -24, -20, 24, 24) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x118E8, 36) HITBOX(0, -24, -20, 24, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0518[1] = { +const s32 *const anim_0518[1] = { anim_0518__v0_l0, }; const s32 anim_0519__v0_l0[] = { // 0x080F21FC - PALETTE(49, 16, 0xB0) - TILES(0x1190C, 40) - HITBOX(0, -39, -14, 39, 16) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x1190C, 40) HITBOX(0, -39, -14, 39, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0519[1] = { +const s32 *const anim_0519[1] = { anim_0519__v0_l0, }; const s32 anim_0520__v0_l0[] = { // 0x080F2230 - PALETTE(50, 16, 0xB0) - TILES(0x11934, 8) - SHOW_FRAME(1, 0) + PALETTE(50, 16, 0xB0) TILES(0x11934, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0520[1] = { +const s32 *const anim_0520[1] = { anim_0520__v0_l0, }; const s32 anim_0521__v0_l0[] = { // 0x080F2258 - PALETTE(58, 16, 0x70) - TILES(0x1193C, 20) - HITBOX(0, -15, -9, 15, 20) - SHOW_FRAME(1, 0) + PALETTE(58, 16, 0x70) TILES(0x1193C, 20) HITBOX(0, -15, -9, 15, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0521[1] = { +const s32 *const anim_0521[1] = { anim_0521__v0_l0, }; const s32 anim_0522__v0_l0[] = { // 0x080F228C - PALETTE(59, 16, 0x70) - TILES(0x11950, 16) - HITBOX(0, 0, -11, 16, 12) - SHOW_FRAME(1, 0) + PALETTE(59, 16, 0x70) TILES(0x11950, 16) HITBOX(0, 0, -11, 16, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0522__v1_l0[] = { // 0x080F22BC - PALETTE(59, 16, 0x70) - TILES(0x11960, 8) - SHOW_FRAME(3, 1) + PALETTE(59, 16, 0x70) TILES(0x11960, 8) SHOW_FRAME(3, 1) - TILES(0x11968, 16) - SHOW_FRAME(3, 2) + TILES(0x11968, 16) SHOW_FRAME(3, 2) - TILES(0x11978, 12) - SHOW_FRAME(4, 3) + TILES(0x11978, 12) SHOW_FRAME(4, 3) - TILES(0x11968, 16) - SHOW_FRAME(4, 2) + TILES(0x11968, 16) SHOW_FRAME(4, 2) - TILES(0x11978, 12) - SHOW_FRAME(5, 3) + TILES(0x11978, 12) SHOW_FRAME(5, 3) - TILES(0x11968, 16) - SHOW_FRAME(5, 2) + TILES(0x11968, 16) SHOW_FRAME(5, 2) - END() + END() }; -const s32 * const anim_0522[2] = { +const s32 *const anim_0522[2] = { anim_0522__v0_l0, anim_0522__v1_l0, }; const s32 anim_0523__v0_l0[] = { // 0x080F234C - PALETTE(60, 16, 0xB0) - TILES(0x11984, 18) - HITBOX(0, -24, -9, 24, -7) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11984, 18) HITBOX(0, -24, -9, 24, -7) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0523[1] = { +const s32 *const anim_0523[1] = { anim_0523__v0_l0, }; const s32 anim_0524__v0_l0[] = { // 0x080F2380 - PALETTE(60, 16, 0xB0) - TILES(0x11996, 36) - HITBOX(0, -24, -23, 24, 24) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11996, 36) HITBOX(0, -24, -23, 24, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0524[1] = { +const s32 *const anim_0524[1] = { anim_0524__v0_l0, }; const s32 anim_0525__v0_l0[] = { // 0x080F23B4 - PALETTE(60, 16, 0xB0) - TILES(0x119BA, 18) - HITBOX(0, -22, -18, 23, -12) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x119BA, 18) HITBOX(0, -22, -18, 23, -12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0525[1] = { +const s32 *const anim_0525[1] = { anim_0525__v0_l0, }; const s32 anim_0526__v0_l0[] = { // 0x080F23E8 - PALETTE(61, 16, 0x70) - TILES(0x119CC, 24) - HITBOX(0, -13, -15, 13, 28) - SHOW_FRAME(1, 0) + PALETTE(61, 16, 0x70) TILES(0x119CC, 24) HITBOX(0, -13, -15, 13, 28) SHOW_FRAME(1, 0) - TILES(0x119E4, 28) - HITBOX(0, -13, -28, 13, 28) - SHOW_FRAME(2, 1) + TILES(0x119E4, 28) HITBOX(0, -13, -28, 13, 28) SHOW_FRAME(2, 1) - TILES(0x11A00, 28) - HITBOX(0, -13, -24, 13, 28) - SHOW_FRAME(1, 2) + TILES(0x11A00, 28) HITBOX(0, -13, -24, 13, 28) SHOW_FRAME(1, 2) - TILES(0x11A1C, 28) - HITBOX(0, -13, -27, 13, 28) - SHOW_FRAME(5, 3) + TILES(0x11A1C, 28) HITBOX(0, -13, -27, 13, 28) SHOW_FRAME(5, 3) - TILES(0x11A00, 28) - HITBOX(0, -13, -24, 13, 28) - SHOW_FRAME(3, 2) + TILES(0x11A00, 28) HITBOX(0, -13, -24, 13, 28) SHOW_FRAME(3, 2) - END() + END() }; const s32 anim_0526__v1_l0[] = { // 0x080F2498 - PALETTE(62, 16, 0x70) - TILES(0x11A38, 24) - HITBOX(0, -13, -13, 13, 28) - SHOW_FRAME(3, 4) + PALETTE(62, 16, 0x70) TILES(0x11A38, 24) HITBOX(0, -13, -13, 13, 28) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0526[2] = { +const s32 *const anim_0526[2] = { anim_0526__v0_l0, anim_0526__v1_l0, }; const s32 anim_0527__v0_l0[] = { // 0x080F24D0 - PALETTE(63, 16, 0xB0) - TILES(0x11A50, 32) - HITBOX(0, 0, 4, 64, 23) - SHOW_FRAME(1, 0) + PALETTE(63, 16, 0xB0) TILES(0x11A50, 32) HITBOX(0, 0, 4, 64, 23) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0527[1] = { +const s32 *const anim_0527[1] = { anim_0527__v0_l0, }; const s32 anim_0528__v0_l0[] = { // 0x080F2504 - PALETTE(60, 16, 0xB0) - TILES(0x11A70, 30) - HITBOX(0, -19, -18, 19, -5) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11A70, 30) HITBOX(0, -19, -18, 19, -5) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0528[1] = { +const s32 *const anim_0528[1] = { anim_0528__v0_l0, }; const s32 anim_0529__v0_l0[] = { // 0x080F2538 - PALETTE(60, 16, 0xB0) - TILES(0x11A8E, 24) - HITBOX(0, -24, -30, 24, 0) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11A8E, 24) HITBOX(0, -24, -30, 24, 0) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0529[1] = { +const s32 *const anim_0529[1] = { anim_0529__v0_l0, }; const s32 anim_0530__v0_l0[] = { // 0x080F256C - PALETTE(62, 16, 0x70) - TILES(0x11AA6, 4) - SHOW_FRAME(1, 0) + PALETTE(62, 16, 0x70) TILES(0x11AA6, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0530[1] = { +const s32 *const anim_0530[1] = { anim_0530__v0_l0, }; const s32 anim_0531__v0_l0[] = { // 0x080F2594 - PALETTE(64, 16, 0x70) - TILES(0x11AAA, 4) - SHOW_FRAME(1, 0) + PALETTE(64, 16, 0x70) TILES(0x11AAA, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0531[1] = { +const s32 *const anim_0531[1] = { anim_0531__v0_l0, }; const s32 anim_0532__v0_l0[] = { // 0x080F25BC - PALETTE(1, 16, 0x50) - TILES(0x11AAE, 1) - HITBOX(0, -9, 5, 9, 7) - SHOW_FRAME(20, 0) + PALETTE(1, 16, 0x50) TILES(0x11AAE, 1) HITBOX(0, -9, 5, 9, 7) SHOW_FRAME(20, 0) - TILES(0x11AAF, 9) - SHOW_FRAME(20, 1) + TILES(0x11AAF, 9) SHOW_FRAME(20, 1) - TILES(0x11AB8, 9) - SHOW_FRAME(20, 2) + TILES(0x11AB8, 9) SHOW_FRAME(20, 2) - TILES(0x11AC1, 9) - SHOW_FRAME(20, 3) - TILES(0x11ACA, 9) - SHOW_FRAME(12, 4) + TILES(0x11AC1, 9) SHOW_FRAME(20, 3) TILES(0x11ACA, 9) SHOW_FRAME(12, 4) - TILES(0x11AD3, 9) - SHOW_FRAME(12, 5) + TILES(0x11AD3, 9) SHOW_FRAME(12, 5) - TILES(0x11ADC, 9) - SHOW_FRAME(12, 6) + TILES(0x11ADC, 9) SHOW_FRAME(12, 6) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0532[1] = { +const s32 *const anim_0532[1] = { anim_0532__v0_l0, }; const s32 anim_0533__v0_l0[] = { // 0x080F266C - PALETTE(1, 16, 0x50) - TILES(0x11AE5, 4) - SHOW_FRAME(12, 0) + PALETTE(1, 16, 0x50) TILES(0x11AE5, 4) SHOW_FRAME(12, 0) - TILES(0x11AE9, 4) - SHOW_FRAME(12, 1) + TILES(0x11AE9, 4) SHOW_FRAME(12, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0533[1] = { +const s32 *const anim_0533[1] = { anim_0533__v0_l0, }; const s32 anim_0534__v0_l0[] = { // 0x080F26AC - PALETTE(49, 16, 0xB0) - TILES(0x11AED, 12) - HITBOX(0, -8, -48, 8, 0) - SHOW_FRAME(1, 0) + PALETTE(49, 16, 0xB0) TILES(0x11AED, 12) HITBOX(0, -8, -48, 8, 0) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0534[1] = { +const s32 *const anim_0534[1] = { anim_0534__v0_l0, }; const s32 anim_0535__v0_l0[] = { // 0x080F26E0 - PALETTE(65, 16, 0xB0) - TILES(0x11AF9, 18) - HITBOX(0, -24, -8, 24, -6) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11AF9, 18) HITBOX(0, -24, -8, 24, -6) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0535[1] = { +const s32 *const anim_0535[1] = { anim_0535__v0_l0, }; const s32 anim_0536__v0_l0[] = { // 0x080F2714 - PALETTE(65, 16, 0xB0) - TILES(0x11B0B, 40) - HITBOX(0, -16, -37, 16, 40) - SHOW_FRAME(4, 0) + PALETTE(65, 16, 0xB0) TILES(0x11B0B, 40) HITBOX(0, -16, -37, 16, 40) SHOW_FRAME(4, 0) - END() + END() }; -const s32 * const anim_0536[1] = { +const s32 *const anim_0536[1] = { anim_0536__v0_l0, }; const s32 anim_0537__v0_l0[] = { // 0x080F2748 - PALETTE(65, 16, 0xB0) - TILES(0x11B33, 40) - HITBOX(0, -40, -14, 40, 16) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11B33, 40) HITBOX(0, -40, -14, 40, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0537[1] = { +const s32 *const anim_0537[1] = { anim_0537__v0_l0, }; const s32 anim_0538__v0_l0[] = { // 0x080F277C - PALETTE(66, 16, 0xB0) - TILES(0x11B5B, 36) - HITBOX(0, -24, -20, 24, 24) - SHOW_FRAME(1, 0) + PALETTE(66, 16, 0xB0) TILES(0x11B5B, 36) HITBOX(0, -24, -20, 24, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0538[1] = { +const s32 *const anim_0538[1] = { anim_0538__v0_l0, }; const s32 anim_0539__v0_l0[] = { // 0x080F27B0 - PALETTE(66, 16, 0xB0) - TILES(0x11B7F, 36) - HITBOX(0, -24, -20, 24, 23) - SHOW_FRAME(1, 0) + PALETTE(66, 16, 0xB0) TILES(0x11B7F, 36) HITBOX(0, -24, -20, 24, 23) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0539[1] = { +const s32 *const anim_0539[1] = { anim_0539__v0_l0, }; const s32 anim_0540__v0_l0[] = { // 0x080F27E4 - PALETTE(62, 16, 0x70) - TILES(0x11BA3, 24) - HITBOX(0, -13, -13, 13, 28) - SHOW_FRAME(3, 0) + PALETTE(62, 16, 0x70) TILES(0x11BA3, 24) HITBOX(0, -13, -13, 13, 28) SHOW_FRAME(3, 0) - END() + END() }; const s32 anim_0540__v1_l0[] = { // 0x080F2814 - PALETTE(62, 16, 0x70) - TILES(0x11BBB, 24) - HITBOX(0, -13, -15, 13, 28) - SHOW_FRAME(1, 1) + PALETTE(62, 16, 0x70) TILES(0x11BBB, 24) HITBOX(0, -13, -15, 13, 28) SHOW_FRAME(1, 1) - TILES(0x11BD3, 28) - HITBOX(0, -13, -28, 13, 28) - SHOW_FRAME(2, 2) + TILES(0x11BD3, 28) HITBOX(0, -13, -28, 13, 28) SHOW_FRAME(2, 2) - TILES(0x11BEF, 28) - HITBOX(0, -13, -24, 13, 28) - SHOW_FRAME(1, 3) + TILES(0x11BEF, 28) HITBOX(0, -13, -24, 13, 28) SHOW_FRAME(1, 3) - TILES(0x11C0B, 28) - HITBOX(0, -13, -27, 13, 28) - SHOW_FRAME(5, 4) + TILES(0x11C0B, 28) HITBOX(0, -13, -27, 13, 28) SHOW_FRAME(5, 4) - TILES(0x11BEF, 28) - HITBOX(0, -13, -24, 13, 28) - SHOW_FRAME(3, 3) + TILES(0x11BEF, 28) HITBOX(0, -13, -24, 13, 28) SHOW_FRAME(3, 3) - END() + END() }; -const s32 * const anim_0540[2] = { +const s32 *const anim_0540[2] = { anim_0540__v0_l0, anim_0540__v1_l0, }; const s32 anim_0541__v0_l0[] = { // 0x080F28CC - PALETTE(35, 16, 0x90) - TILES(0x11C27, 36) - HITBOX(0, -20, -20, 20, 20) - SHOW_FRAME(1, 0) + PALETTE(35, 16, 0x90) TILES(0x11C27, 36) HITBOX(0, -20, -20, 20, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0541[1] = { +const s32 *const anim_0541[1] = { anim_0541__v0_l0, }; const s32 anim_0542__v0_l0[] = { // 0x080F2900 - PALETTE(67, 16, 0x60) - TILES(0x11C4B, 16) - HITBOX(0, -7, -13, 11, 18) - SHOW_FRAME(6, 0) + PALETTE(67, 16, 0x60) TILES(0x11C4B, 16) HITBOX(0, -7, -13, 11, 18) SHOW_FRAME(6, 0) - TILES(0x11C5B, 16) - SHOW_FRAME(6, 1) + TILES(0x11C5B, 16) SHOW_FRAME(6, 1) - TILES(0x11C6B, 16) - SHOW_FRAME(6, 2) + TILES(0x11C6B, 16) SHOW_FRAME(6, 2) - TILES(0x11C7B, 16) - SHOW_FRAME(6, 3) + TILES(0x11C7B, 16) SHOW_FRAME(6, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0542__v1_l0[] = { // 0x080F2970 - PALETTE(67, 16, 0x60) - TILES(0x11C4B, 16) - HITBOX(0, -7, -13, 11, 18) - SHOW_FRAME(6, 0) + PALETTE(67, 16, 0x60) TILES(0x11C4B, 16) HITBOX(0, -7, -13, 11, 18) SHOW_FRAME(6, 0) - TILES(0x11C7B, 16) - SHOW_FRAME(6, 3) + TILES(0x11C7B, 16) SHOW_FRAME(6, 3) - TILES(0x11C6B, 16) - SHOW_FRAME(6, 2) + TILES(0x11C6B, 16) SHOW_FRAME(6, 2) - TILES(0x11C5B, 16) - SHOW_FRAME(6, 1) + TILES(0x11C5B, 16) SHOW_FRAME(6, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0542[2] = { +const s32 *const anim_0542[2] = { anim_0542__v0_l0, anim_0542__v1_l0, }; const s32 anim_0543__v0_l0[] = { // 0x080F29E8 - PALETTE(65, 16, 0xB0) - TILES(0x11C8B, 12) - HITBOX(0, -15, -6, 15, 12) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11C8B, 12) HITBOX(0, -15, -6, 15, 12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0543[1] = { +const s32 *const anim_0543[1] = { anim_0543__v0_l0, }; const s32 anim_0544__v0_l0[] = { // 0x080F2A1C - PALETTE(65, 16, 0xB0) - TILES(0x11C97, 25) - HITBOX(0, -20, -18, 20, 1) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11C97, 25) HITBOX(0, -20, -18, 20, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0544[1] = { +const s32 *const anim_0544[1] = { anim_0544__v0_l0, }; const s32 anim_0545__v0_l0[] = { // 0x080F2A50 - PALETTE(66, 16, 0xB0) - TILES(0x11CB0, 4) - SHOW_FRAME(1, 0) + PALETTE(66, 16, 0xB0) TILES(0x11CB0, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0545__v1_l0[] = { // 0x080F2A74 - PALETTE(66, 16, 0xB0) - TILES(0x11CB4, 9) - HITBOX(0, -5, -2, 9, 10) - SHOW_FRAME(1, 1) + PALETTE(66, 16, 0xB0) TILES(0x11CB4, 9) HITBOX(0, -5, -2, 9, 10) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0545[2] = { +const s32 *const anim_0545[2] = { anim_0545__v0_l0, anim_0545__v1_l0, }; const s32 anim_0546__v0_l0[] = { // 0x080F2AAC - PALETTE(68, 16, 0x60) - TILES(0x11CBD, 60) - HITBOX(0, -48, -20, 48, 20) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x11CBD, 60) HITBOX(0, -48, -20, 48, 20) SHOW_FRAME(1, 0) - TILES(0x11CF9, 60) - HITBOX(0, -48, -20, 48, 20) - SHOW_FRAME(1, 1) + TILES(0x11CF9, 60) HITBOX(0, -48, -20, 48, 20) SHOW_FRAME(1, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0546[1] = { +const s32 *const anim_0546[1] = { anim_0546__v0_l0, }; const s32 anim_0547__v0_l0[] = { // 0x080F2B04 - PALETTE(67, 16, 0x60) - TILES(0x11D35, 24) - HITBOX(0, -24, -30, 24, 0) - SHOW_FRAME(1, 0) + PALETTE(67, 16, 0x60) TILES(0x11D35, 24) HITBOX(0, -24, -30, 24, 0) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0547[1] = { +const s32 *const anim_0547[1] = { anim_0547__v0_l0, }; const s32 anim_0548__v0_l0[] = { // 0x080F2B38 - PALETTE(67, 16, 0x60) - TILES(0x11D4D, 16) - SHOW_FRAME(1, 0) + PALETTE(67, 16, 0x60) TILES(0x11D4D, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0548[1] = { +const s32 *const anim_0548[1] = { anim_0548__v0_l0, }; const s32 anim_0549__v0_l0[] = { // 0x080F2B60 - PALETTE(67, 16, 0x60) - TILES(0x11D5D, 1) - SHOW_FRAME(1, 0) + PALETTE(67, 16, 0x60) TILES(0x11D5D, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0549[1] = { +const s32 *const anim_0549[1] = { anim_0549__v0_l0, }; const s32 anim_0550__v0_l0[] = { // 0x080F2B88 - PALETTE(65, 16, 0xB0) - TILES(0x11D5E, 40) - HITBOX(0, -40, -12, 40, 16) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11D5E, 40) HITBOX(0, -40, -12, 40, 16) SHOW_FRAME(1, 0) - JUMP_BACK(11) + JUMP_BACK(11) }; -const s32 * const anim_0550[1] = { +const s32 *const anim_0550[1] = { anim_0550__v0_l0, }; const s32 anim_0551__v0_l0[] = { // 0x080F2BC0 - PALETTE(65, 16, 0xB0) - TILES(0x11D86, 32) - HITBOX(0, 0, 4, 64, 23) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x11D86, 32) HITBOX(0, 0, 4, 64, 23) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0551[1] = { +const s32 *const anim_0551[1] = { anim_0551__v0_l0, }; const s32 anim_0552__v0_l0[] = { // 0x080F2BF4 - PALETTE(68, 16, 0x60) - TILES(0x11DA6, 18) - SHOW_FRAME(2, 0) + PALETTE(68, 16, 0x60) TILES(0x11DA6, 18) SHOW_FRAME(2, 0) - TILES(0x11DB8, 18) - SHOW_FRAME(2, 1) + TILES(0x11DB8, 18) SHOW_FRAME(2, 1) - TILES(0x11DCA, 18) - SHOW_FRAME(2, 2) + TILES(0x11DCA, 18) SHOW_FRAME(2, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0552[1] = { +const s32 *const anim_0552[1] = { anim_0552__v0_l0, }; const s32 anim_0553__v0_l0[] = { // 0x080F2C48 - PALETTE(69, 16, 0xB0) - TILES(0x11DDC, 64) - SHOW_FRAME(1, 0) + PALETTE(69, 16, 0xB0) TILES(0x11DDC, 64) SHOW_FRAME(1, 0) - JUMP_BACK(8) + JUMP_BACK(8) }; -const s32 * const anim_0553[1] = { +const s32 *const anim_0553[1] = { anim_0553__v0_l0, }; const s32 anim_0554__v0_l0[] = { // 0x080F2C74 - PALETTE(60, 16, 0xB0) - TILES(0x11E1C, 1) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11E1C, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0554[1] = { +const s32 *const anim_0554[1] = { anim_0554__v0_l0, }; const s32 anim_0555__v0_l0[] = { // 0x080F2C9C - PALETTE(60, 16, 0xB0) - TILES(0x11E1D, 25) - HITBOX(0, -18, -38, 18, 1) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11E1D, 25) HITBOX(0, -18, -38, 18, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0555[1] = { +const s32 *const anim_0555[1] = { anim_0555__v0_l0, }; const s32 anim_0556__v0_l0[] = { // 0x080F2CD0 - PALETTE(69, 16, 0xB0) - TILES(0x11E36, 64) - SHOW_FRAME(1, 0) + PALETTE(69, 16, 0xB0) TILES(0x11E36, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0556[1] = { +const s32 *const anim_0556[1] = { anim_0556__v0_l0, }; const s32 anim_0557__v0_l0[] = { // 0x080F2CF8 - PALETTE(60, 16, 0xB0) - TILES(0x11E76, 4) - SHOW_FRAME(1, 0) + PALETTE(60, 16, 0xB0) TILES(0x11E76, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0557[1] = { +const s32 *const anim_0557[1] = { anim_0557__v0_l0, }; const s32 anim_0558__v0_l0[] = { // 0x080F2D20 - PALETTE(65, 16, 0xB0) - TILES(0x11E7A, 15) - SHOW_FRAME(8, 0) + PALETTE(65, 16, 0xB0) TILES(0x11E7A, 15) SHOW_FRAME(8, 0) - TILES(0x11E89, 15) - SHOW_FRAME(8, 1) + TILES(0x11E89, 15) SHOW_FRAME(8, 1) - TILES(0x11E98, 15) - SHOW_FRAME(8, 2) + TILES(0x11E98, 15) SHOW_FRAME(8, 2) - TILES(0x11EA7, 15) - SHOW_FRAME(8, 3) + TILES(0x11EA7, 15) SHOW_FRAME(8, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0558[1] = { +const s32 *const anim_0558[1] = { anim_0558__v0_l0, }; const s32 anim_0559__v0_l0[] = { // 0x080F2D88 - PALETTE(70, 16, 0xB0) - TILES(0x11EB6, 32) - HITBOX(0, 0, 0, 31, 64) - SHOW_FRAME(1, 0) + PALETTE(70, 16, 0xB0) TILES(0x11EB6, 32) HITBOX(0, 0, 0, 31, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0559[1] = { +const s32 *const anim_0559[1] = { anim_0559__v0_l0, }; const s32 anim_0560__v0_l0[] = { // 0x080F2DBC - PALETTE(71, 16, 0x70) - TILES(0x11ED6, 16) - HITBOX(0, -16, -17, 16, 8) - HITBOX(1, -16, -17, 16, 8) - SHOW_FRAME(16, 0) + PALETTE(71, 16, 0x70) TILES(0x11ED6, 16) HITBOX(0, -16, -17, 16, 8) HITBOX(1, -16, -17, 16, 8) SHOW_FRAME(16, 0) - TILES(0x11EE6, 12) - HITBOX(0, -16, -17, 16, 8) - HITBOX(1, -16, -17, 16, 8) - SHOW_FRAME(16, 1) + TILES(0x11EE6, 12) HITBOX(0, -16, -17, 16, 8) HITBOX(1, -16, -17, 16, 8) SHOW_FRAME(16, 1) - END() + END() }; -const s32 * const anim_0560[1] = { +const s32 *const anim_0560[1] = { anim_0560__v0_l0, }; const s32 anim_0561__v0_l0[] = { // 0x080F2E28 - PALETTE(71, 16, 0x70) - TILES(0x11EF2, 4) - HITBOX(0, -16, 0, 16, 8) - SHOW_FRAME(16, 0) + PALETTE(71, 16, 0x70) TILES(0x11EF2, 4) HITBOX(0, -16, 0, 16, 8) SHOW_FRAME(16, 0) - TILES(0x11EF6, 4) - HITBOX(0, -16, 0, 16, 8) - SHOW_FRAME(16, 1) + TILES(0x11EF6, 4) HITBOX(0, -16, 0, 16, 8) SHOW_FRAME(16, 1) - TILES(0x11EFA, 4) - HITBOX(0, -16, 0, 16, 8) - SHOW_FRAME(16, 2) + TILES(0x11EFA, 4) HITBOX(0, -16, 0, 16, 8) SHOW_FRAME(16, 2) - JUMP_BACK(27) + JUMP_BACK(27) }; -const s32 * const anim_0561[1] = { +const s32 *const anim_0561[1] = { anim_0561__v0_l0, }; const s32 anim_0562__v0_l0[] = { // 0x080F2EA0 - PALETTE(1, 16, 0x50) - TILES(0x11EFE, 18) - HITBOX(0, -16, -13, -16, -13) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x11EFE, 18) HITBOX(0, -16, -13, -16, -13) SHOW_FRAME(3, 0) - TILES(0x11F10, 18) - SHOW_FRAME(3, 1) + TILES(0x11F10, 18) SHOW_FRAME(3, 1) - TILES(0x11F22, 18) - SHOW_FRAME(3, 2) + TILES(0x11F22, 18) SHOW_FRAME(3, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0562[1] = { +const s32 *const anim_0562[1] = { anim_0562__v0_l0, }; const s32 anim_0563__v0_l0[] = { // 0x080F2F00 - TILES(0x11F34, 6) - PALETTE(1, 16, 0x50) - SHOW_FRAME(12, 0) + TILES(0x11F34, 6) PALETTE(1, 16, 0x50) SHOW_FRAME(12, 0) - SHOW_FRAME(12, 1) + SHOW_FRAME(12, 1) - SHOW_FRAME(12, 2) + SHOW_FRAME(12, 2) - JUMP_BACK(9) + JUMP_BACK(9) }; -const s32 * const anim_0563[1] = { +const s32 *const anim_0563[1] = { anim_0563__v0_l0, }; const s32 anim_0564__v0_l0[] = { // 0x080F2F3C - PALETTE(66, 16, 0xB0) - TILES(0x11F3A, 1) - SHOW_FRAME(4, 0) + PALETTE(66, 16, 0xB0) TILES(0x11F3A, 1) SHOW_FRAME(4, 0) - TILES(0x11F3B, 1) - SHOW_FRAME(4, 1) + TILES(0x11F3B, 1) SHOW_FRAME(4, 1) - TILES(0x11F3C, 1) - SHOW_FRAME(4, 2) + TILES(0x11F3C, 1) SHOW_FRAME(4, 2) - TILES(0x11F3D, 1) - SHOW_FRAME(4, 3) + TILES(0x11F3D, 1) SHOW_FRAME(4, 3) - TILES(0x11F3E, 1) - SHOW_FRAME(4, 4) + TILES(0x11F3E, 1) SHOW_FRAME(4, 4) - TILES(0x11F3F, 1) - SHOW_FRAME(4, 5) + TILES(0x11F3F, 1) SHOW_FRAME(4, 5) - TILES(0x11F40, 1) - SHOW_FRAME(4, 6) + TILES(0x11F40, 1) SHOW_FRAME(4, 6) - TILES(0x11F41, 1) - SHOW_FRAME(4, 7) + TILES(0x11F41, 1) SHOW_FRAME(4, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0564[1] = { +const s32 *const anim_0564[1] = { anim_0564__v0_l0, }; const s32 anim_0565__v0_l0[] = { // 0x080F2FF4 - PALETTE(66, 16, 0xB0) - TILES(0x11F42, 2) - SHOW_FRAME(6, 0) + PALETTE(66, 16, 0xB0) TILES(0x11F42, 2) SHOW_FRAME(6, 0) - TILES(0x11F44, 2) - SHOW_FRAME(6, 1) + TILES(0x11F44, 2) SHOW_FRAME(6, 1) - TILES(0x11F46, 2) - SHOW_FRAME(6, 2) + TILES(0x11F46, 2) SHOW_FRAME(6, 2) - TILES(0x11F48, 2) - SHOW_FRAME(6, 3) + TILES(0x11F48, 2) SHOW_FRAME(6, 3) - TILES(0x11F4A, 2) - SHOW_FRAME(6, 4) + TILES(0x11F4A, 2) SHOW_FRAME(6, 4) - TILES(0x11F4C, 2) - SHOW_FRAME(6, 5) + TILES(0x11F4C, 2) SHOW_FRAME(6, 5) - TILES(0x11F4E, 2) - SHOW_FRAME(6, 6) + TILES(0x11F4E, 2) SHOW_FRAME(6, 6) - TILES(0x11F50, 2) - SHOW_FRAME(6, 7) + TILES(0x11F50, 2) SHOW_FRAME(6, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0565[1] = { +const s32 *const anim_0565[1] = { anim_0565__v0_l0, }; const s32 anim_0566__v0_l0[] = { // 0x080F30AC - PALETTE(66, 16, 0xB0) - TILES(0x11F52, 1) - SHOW_FRAME(5, 0) + PALETTE(66, 16, 0xB0) TILES(0x11F52, 1) SHOW_FRAME(5, 0) - TILES(0x11F53, 1) - SHOW_FRAME(5, 1) + TILES(0x11F53, 1) SHOW_FRAME(5, 1) - TILES(0x11F54, 1) - SHOW_FRAME(5, 2) + TILES(0x11F54, 1) SHOW_FRAME(5, 2) - TILES(0x11F55, 1) - SHOW_FRAME(5, 3) + TILES(0x11F55, 1) SHOW_FRAME(5, 3) - TILES(0x11F56, 1) - SHOW_FRAME(5, 4) + TILES(0x11F56, 1) SHOW_FRAME(5, 4) - TILES(0x11F57, 1) - SHOW_FRAME(5, 5) + TILES(0x11F57, 1) SHOW_FRAME(5, 5) - TILES(0x11F58, 1) - SHOW_FRAME(5, 6) + TILES(0x11F58, 1) SHOW_FRAME(5, 6) - TILES(0x11F59, 1) - SHOW_FRAME(5, 7) + TILES(0x11F59, 1) SHOW_FRAME(5, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0566[1] = { +const s32 *const anim_0566[1] = { anim_0566__v0_l0, }; const s32 anim_0567__v0_l0[] = { // 0x080F3164 - PALETTE(72, 16, 0xB0) - TILES(0x11F5A, 20) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 0) + PALETTE(72, 16, 0xB0) TILES(0x11F5A, 20) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 0) - TILES(0x11F6E, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 1) + TILES(0x11F6E, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 1) - TILES(0x11F86, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 2) + TILES(0x11F86, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 2) - TILES(0x11F9E, 20) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 3) + TILES(0x11F9E, 20) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 3) - TILES(0x11FB2, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 4) + TILES(0x11FB2, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 4) - TILES(0x11FCA, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 5) + TILES(0x11FCA, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 5) - JUMP_BACK(69) + JUMP_BACK(69) }; const s32 anim_0567__v1_l0[] = { // 0x080F3280 - PALETTE(72, 16, 0xB0) - TILES(0x11F5A, 20) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 0) + PALETTE(72, 16, 0xB0) TILES(0x11F5A, 20) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 0) - TILES(0x11F6E, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 1) + TILES(0x11F6E, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 1) - TILES(0x11FE2, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 6) + TILES(0x11FE2, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 6) - TILES(0x11FFA, 20) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, -11, -38, 11, -12) - SHOW_FRAME(4, 7) + TILES(0x11FFA, 20) HITBOX(0, -11, -8, 11, 0) HITBOX(1, -11, -38, 11, -12) SHOW_FRAME(4, 7) - TILES(0x1200E, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(4, 8) + TILES(0x1200E, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(4, 8) - TILES(0x12026, 24) - HITBOX(0, -11, -8, 11, 0) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(4, 9) + TILES(0x12026, 24) HITBOX(0, -11, -8, 11, 0) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(4, 9) - END() + END() }; -const s32 * const anim_0567[2] = { +const s32 *const anim_0567[2] = { anim_0567__v0_l0, anim_0567__v1_l0, }; const s32 anim_0568__v0_l0[] = { // 0x080F33A0 - PALETTE(68, 16, 0x60) - TILES(0x1203E, 12) - SHOW_FRAME(3, 0) + PALETTE(68, 16, 0x60) TILES(0x1203E, 12) SHOW_FRAME(3, 0) - TILES(0x1204A, 18) - SHOW_FRAME(3, 1) + TILES(0x1204A, 18) SHOW_FRAME(3, 1) - TILES(0x1205C, 12) - SHOW_FRAME(3, 2) + TILES(0x1205C, 12) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0568[1] = { +const s32 *const anim_0568[1] = { anim_0568__v0_l0, }; const s32 anim_0569__v0_l0[] = { // 0x080F33F4 - PALETTE(63, 16, 0xB0) - TILES(0x12068, 6) - HITBOX(0, -7, 12, 7, 42) - SHOW_FRAME(1, 0) + PALETTE(63, 16, 0xB0) TILES(0x12068, 6) HITBOX(0, -7, 12, 7, 42) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0569[1] = { +const s32 *const anim_0569[1] = { anim_0569__v0_l0, }; const s32 anim_0570__v0_l0[] = { // 0x080F3428 - PALETTE(73, 16, 0x70) - TILES(0x1206E, 12) - HITBOX(0, 4, -8, 20, 22) - SHOW_FRAME(1, 0) + PALETTE(73, 16, 0x70) TILES(0x1206E, 12) HITBOX(0, 4, -8, 20, 22) SHOW_FRAME(1, 0) - TILES(0x1207A, 12) - SHOW_FRAME(1, 1) + TILES(0x1207A, 12) SHOW_FRAME(1, 1) - TILES(0x12086, 12) - SHOW_FRAME(1, 2) + TILES(0x12086, 12) SHOW_FRAME(1, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0570[1] = { +const s32 *const anim_0570[1] = { anim_0570__v0_l0, }; const s32 anim_0571__v0_l0[] = { // 0x080F3488 - PALETTE(73, 16, 0x70) - TILES(0x12092, 12) - HITBOX(0, 3, 0, 18, 23) - SHOW_FRAME(1, 0) + PALETTE(73, 16, 0x70) TILES(0x12092, 12) HITBOX(0, 3, 0, 18, 23) SHOW_FRAME(1, 0) - TILES(0x1209E, 12) - SHOW_FRAME(1, 1) + TILES(0x1209E, 12) SHOW_FRAME(1, 1) - TILES(0x120AA, 12) - SHOW_FRAME(1, 2) + TILES(0x120AA, 12) SHOW_FRAME(1, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0571[1] = { +const s32 *const anim_0571[1] = { anim_0571__v0_l0, }; const s32 anim_0572__v0_l0[] = { // 0x080F34E8 - PALETTE(33, 16, 0x70) - TILES(0x120B6, 20) - SHOW_FRAME(1, 0) + PALETTE(33, 16, 0x70) TILES(0x120B6, 20) SHOW_FRAME(1, 0) - TILES(0x120CA, 16) - SHOW_FRAME(2, 1) + TILES(0x120CA, 16) SHOW_FRAME(2, 1) - TILES(0x120DA, 24) - SHOW_FRAME(1, 2) + TILES(0x120DA, 24) SHOW_FRAME(1, 2) - TILES(0x120F2, 24) - SHOW_FRAME(5, 3) + TILES(0x120F2, 24) SHOW_FRAME(5, 3) - TILES(0x1210A, 24) - SHOW_FRAME(3, 4) + TILES(0x1210A, 24) SHOW_FRAME(3, 4) - END() + END() }; const s32 anim_0572__v1_l0[] = { // 0x080F355C - PALETTE(33, 16, 0x70) - TILES(0x120B6, 20) - HITBOX(0, -15, -32, 15, 1) - SHOW_FRAME(1, 0) + PALETTE(33, 16, 0x70) TILES(0x120B6, 20) HITBOX(0, -15, -32, 15, 1) SHOW_FRAME(1, 0) - JUMP_BACK(11) + JUMP_BACK(11) }; -const s32 * const anim_0572[2] = { +const s32 *const anim_0572[2] = { anim_0572__v0_l0, anim_0572__v1_l0, }; const s32 anim_0573__v0_l0[] = { // 0x080F3598 - PALETTE(74, 16, 0xB0) - TILES(0x12122, 28) - SHOW_FRAME(1, 0) + PALETTE(74, 16, 0xB0) TILES(0x12122, 28) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0573[1] = { +const s32 *const anim_0573[1] = { anim_0573__v0_l0, }; const s32 anim_0574__v0_l0[] = { // 0x080F35C0 - PALETTE(75, 16, 0xD0) - TILES(0x1213E, 6) - HITBOX(0, -8, -13, 8, 8) - SHOW_FRAME(1, 0) + PALETTE(75, 16, 0xD0) TILES(0x1213E, 6) HITBOX(0, -8, -13, 8, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0574[1] = { +const s32 *const anim_0574[1] = { anim_0574__v0_l0, }; const s32 anim_0575__v0_l0[] = { // 0x080F35F4 - PALETTE(76, 16, 0xE0) - TILES(0x12144, 72) - HITBOX(0, -28, -53, 29, 0) - SHOW_FRAME(1, 0) + PALETTE(76, 16, 0xE0) TILES(0x12144, 72) HITBOX(0, -28, -53, 29, 0) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0575__v1_l0[] = { // 0x080F3624 - PALETTE(76, 16, 0xE0) - TILES(0x1218C, 72) - HITBOX(0, -28, -53, 29, 0) - SHOW_FRAME(1, 1) + PALETTE(76, 16, 0xE0) TILES(0x1218C, 72) HITBOX(0, -28, -53, 29, 0) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0575__v2_l0[] = { // 0x080F3654 - PALETTE(76, 16, 0xE0) - TILES(0x121D4, 81) - HITBOX(0, -12, -73, 12, -65) - SHOW_FRAME(1, 2) + PALETTE(76, 16, 0xE0) TILES(0x121D4, 81) HITBOX(0, -12, -73, 12, -65) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0575[3] = { +const s32 *const anim_0575[3] = { anim_0575__v0_l0, anim_0575__v1_l0, anim_0575__v2_l0, }; const s32 anim_0576__v0_l0[] = { // 0x080F3690 - PALETTE(76, 16, 0xE0) - TILES(0x12225, 6) - HITBOX(0, -13, -76, 13, -60) - SHOW_FRAME(1, 0) + PALETTE(76, 16, 0xE0) TILES(0x12225, 6) HITBOX(0, -13, -76, 13, -60) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0576[1] = { +const s32 *const anim_0576[1] = { anim_0576__v0_l0, }; const s32 anim_0577__v0_l0[] = { // 0x080F36C4 - PALETTE(76, 16, 0xE0) - TILES(0x1222B, 64) - SHOW_FRAME(1, 0) + PALETTE(76, 16, 0xE0) TILES(0x1222B, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0577[1] = { +const s32 *const anim_0577[1] = { anim_0577__v0_l0, }; const s32 anim_0578__v0_l0[] = { // 0x080F36EC - PALETTE(76, 16, 0xE0) - TILES(0x1226B, 64) - SHOW_FRAME(1, 0) + PALETTE(76, 16, 0xE0) TILES(0x1226B, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0578[1] = { +const s32 *const anim_0578[1] = { anim_0578__v0_l0, }; const s32 anim_0579__v0_l0[] = { // 0x080F3714 - PALETTE(74, 16, 0xB0) - TILES(0x122AB, 4) - SHOW_FRAME(1, 0) + PALETTE(74, 16, 0xB0) TILES(0x122AB, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0579[1] = { +const s32 *const anim_0579[1] = { anim_0579__v0_l0, }; const s32 anim_0580__v0_l0[] = { // 0x080F373C - PALETTE(74, 16, 0xB0) - TILES(0x122AF, 1) - SHOW_FRAME(1, 0) + PALETTE(74, 16, 0xB0) TILES(0x122AF, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0580[1] = { +const s32 *const anim_0580[1] = { anim_0580__v0_l0, }; const s32 anim_0581__v0_l0[] = { // 0x080F3764 - PALETTE(1, 16, 0x50) - TILES(0x122B0, 12) - SHOW_FRAME(10, 0) + PALETTE(1, 16, 0x50) TILES(0x122B0, 12) SHOW_FRAME(10, 0) - TILES(0x122BC, 12) - SHOW_FRAME(10, 1) + TILES(0x122BC, 12) SHOW_FRAME(10, 1) - TILES(0x122C8, 12) - SHOW_FRAME(10, 2) + TILES(0x122C8, 12) SHOW_FRAME(10, 2) - TILES(0x122D4, 6) - SHOW_FRAME(10, 3) + TILES(0x122D4, 6) SHOW_FRAME(10, 3) - END() + END() }; -const s32 * const anim_0581[1] = { +const s32 *const anim_0581[1] = { anim_0581__v0_l0, }; const s32 anim_0582__v0_l0[] = { // 0x080F37C8 - PALETTE(41, 16, 0x70) - TILES(0x122DA, 24) - HITBOX(0, -13, -12, 13, 23) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x122DA, 24) HITBOX(0, -13, -12, 13, 23) SHOW_FRAME(1, 0) - TILES(0x122F2, 24) - SHOW_FRAME(2, 1) + TILES(0x122F2, 24) SHOW_FRAME(2, 1) - TILES(0x1230A, 28) - SHOW_FRAME(5, 2) + TILES(0x1230A, 28) SHOW_FRAME(5, 2) - TILES(0x12326, 28) - SHOW_FRAME(3, 3) + TILES(0x12326, 28) SHOW_FRAME(3, 3) - TILES(0x12342, 28) - SHOW_FRAME(3, 4) + TILES(0x12342, 28) SHOW_FRAME(3, 4) - END() + END() }; const s32 anim_0582__v1_l0[] = { // 0x080F3848 - PALETTE(41, 16, 0x70) - TILES(0x122DA, 24) - HITBOX(0, -13, -12, 13, 24) - SHOW_FRAME(1, 0) + PALETTE(41, 16, 0x70) TILES(0x122DA, 24) HITBOX(0, -13, -12, 13, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0582[2] = { +const s32 *const anim_0582[2] = { anim_0582__v0_l0, anim_0582__v1_l0, }; const s32 anim_0583__v0_l0[] = { // 0x080F3880 - PALETTE(77, 16, 0x70) - TILES(0x1235E, 10) - SHOW_FRAME(1, 0) + PALETTE(77, 16, 0x70) TILES(0x1235E, 10) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0583[1] = { +const s32 *const anim_0583[1] = { anim_0583__v0_l0, }; const s32 anim_0584__v0_l0[] = { // 0x080F38A8 - PALETTE(78, 16, 0x70) - TILES(0x12368, 70) - HITBOX(0, -19, -27, 21, 46) - SHOW_FRAME(4, 0) + PALETTE(78, 16, 0x70) TILES(0x12368, 70) HITBOX(0, -19, -27, 21, 46) SHOW_FRAME(4, 0) - TILES(0x123AE, 70) - SHOW_FRAME(4, 1) + TILES(0x123AE, 70) SHOW_FRAME(4, 1) - TILES(0x123F4, 70) - SHOW_FRAME(4, 2) + TILES(0x123F4, 70) SHOW_FRAME(4, 2) - TILES(0x1243A, 70) - SHOW_FRAME(4, 3) + TILES(0x1243A, 70) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0584[1] = { +const s32 *const anim_0584[1] = { anim_0584__v0_l0, }; const s32 anim_0585__v0_l0[] = { // 0x080F391C - PALETTE(78, 16, 0x70) - TILES(0x12480, 70) - HITBOX(0, -19, -27, 21, 46) - SHOW_FRAME(4, 0) + PALETTE(78, 16, 0x70) TILES(0x12480, 70) HITBOX(0, -19, -27, 21, 46) SHOW_FRAME(4, 0) - TILES(0x124C6, 70) - SHOW_FRAME(4, 1) + TILES(0x124C6, 70) SHOW_FRAME(4, 1) - TILES(0x1250C, 70) - SHOW_FRAME(4, 2) + TILES(0x1250C, 70) SHOW_FRAME(4, 2) - TILES(0x12552, 70) - SHOW_FRAME(4, 3) + TILES(0x12552, 70) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0585[1] = { +const s32 *const anim_0585[1] = { anim_0585__v0_l0, }; const s32 anim_0586__v0_l0[] = { // 0x080F3990 - PALETTE(78, 16, 0x70) - TILES(0x12598, 70) - HITBOX(0, -26, -19, 47, 21) - SHOW_FRAME(4, 0) + PALETTE(78, 16, 0x70) TILES(0x12598, 70) HITBOX(0, -26, -19, 47, 21) SHOW_FRAME(4, 0) - TILES(0x125DE, 70) - SHOW_FRAME(4, 1) + TILES(0x125DE, 70) SHOW_FRAME(4, 1) - TILES(0x12624, 70) - SHOW_FRAME(4, 2) + TILES(0x12624, 70) SHOW_FRAME(4, 2) - TILES(0x1266A, 70) - SHOW_FRAME(4, 3) + TILES(0x1266A, 70) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0586[1] = { +const s32 *const anim_0586[1] = { anim_0586__v0_l0, }; const s32 anim_0587__v0_l0[] = { // 0x080F3A04 - PALETTE(78, 16, 0x70) - TILES(0x126B0, 70) - HITBOX(0, -26, -19, 47, 21) - SHOW_FRAME(4, 0) + PALETTE(78, 16, 0x70) TILES(0x126B0, 70) HITBOX(0, -26, -19, 47, 21) SHOW_FRAME(4, 0) - TILES(0x126F6, 70) - SHOW_FRAME(4, 1) + TILES(0x126F6, 70) SHOW_FRAME(4, 1) - TILES(0x1273C, 70) - SHOW_FRAME(4, 2) + TILES(0x1273C, 70) SHOW_FRAME(4, 2) - TILES(0x12782, 70) - SHOW_FRAME(4, 3) + TILES(0x12782, 70) SHOW_FRAME(4, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0587[1] = { +const s32 *const anim_0587[1] = { anim_0587__v0_l0, }; const s32 anim_0588__v0_l0[] = { // 0x080F3A78 - PALETTE(79, 16, 0xB0) - TILES(0x127C8, 70) - HITBOX(0, -27, -20, 46, 20) - SHOW_FRAME(35, 0) + PALETTE(79, 16, 0xB0) TILES(0x127C8, 70) HITBOX(0, -27, -20, 46, 20) SHOW_FRAME(35, 0) - TILES(0x1280E, 70) - SHOW_FRAME(10, 1) + TILES(0x1280E, 70) SHOW_FRAME(10, 1) - TILES(0x12854, 70) - SHOW_FRAME(10, 2) + TILES(0x12854, 70) SHOW_FRAME(10, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0588__v1_l0[] = { // 0x080F3AD4 - PALETTE(79, 16, 0xB0) - TILES(0x1289A, 70) - HITBOX(0, -27, -20, 46, 20) - SHOW_FRAME(35, 3) + PALETTE(79, 16, 0xB0) TILES(0x1289A, 70) HITBOX(0, -27, -20, 46, 20) SHOW_FRAME(35, 3) - TILES(0x128E0, 70) - SHOW_FRAME(10, 4) + TILES(0x128E0, 70) SHOW_FRAME(10, 4) - TILES(0x12926, 70) - SHOW_FRAME(10, 5) + TILES(0x12926, 70) SHOW_FRAME(10, 5) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0588[2] = { +const s32 *const anim_0588[2] = { anim_0588__v0_l0, anim_0588__v1_l0, }; const s32 anim_0589__v0_l0[] = { // 0x080F3B38 - PALETTE(79, 16, 0xB0) - TILES(0x1296C, 70) - HITBOX(0, -20, -28, 20, 45) - SHOW_FRAME(35, 0) + PALETTE(79, 16, 0xB0) TILES(0x1296C, 70) HITBOX(0, -20, -28, 20, 45) SHOW_FRAME(35, 0) - TILES(0x129B2, 70) - SHOW_FRAME(10, 1) + TILES(0x129B2, 70) SHOW_FRAME(10, 1) - TILES(0x129F8, 70) - SHOW_FRAME(10, 2) + TILES(0x129F8, 70) SHOW_FRAME(10, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; const s32 anim_0589__v1_l0[] = { // 0x080F3B94 - PALETTE(79, 16, 0xB0) - TILES(0x12A3E, 70) - HITBOX(0, -20, -28, 20, 45) - SHOW_FRAME(35, 3) + PALETTE(79, 16, 0xB0) TILES(0x12A3E, 70) HITBOX(0, -20, -28, 20, 45) SHOW_FRAME(35, 3) - TILES(0x12A84, 70) - SHOW_FRAME(10, 4) + TILES(0x12A84, 70) SHOW_FRAME(10, 4) - TILES(0x12ACA, 70) - SHOW_FRAME(10, 5) + TILES(0x12ACA, 70) SHOW_FRAME(10, 5) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0589[2] = { +const s32 *const anim_0589[2] = { anim_0589__v0_l0, anim_0589__v1_l0, }; const s32 anim_0590__v0_l0[] = { // 0x080F3BF8 - PALETTE(80, 16, 0xB0) - TILES(0x12B10, 91) - HITBOX(0, -52, -28, 51, 36) - SHOW_FRAME(8, 0) + PALETTE(80, 16, 0xB0) TILES(0x12B10, 91) HITBOX(0, -52, -28, 51, 36) SHOW_FRAME(8, 0) - TILES(0x12B6B, 91) - SHOW_FRAME(8, 1) + TILES(0x12B6B, 91) SHOW_FRAME(8, 1) - TILES(0x12BC6, 91) - SHOW_FRAME(8, 2) + TILES(0x12BC6, 91) SHOW_FRAME(8, 2) - TILES(0x12C21, 91) - SHOW_FRAME(8, 3) + TILES(0x12C21, 91) SHOW_FRAME(8, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0590__v1_l0[] = { // 0x080F3C68 - PALETTE(80, 16, 0xB0) - TILES(0x12C7C, 91) - HITBOX(0, -52, -28, 51, 36) - SHOW_FRAME(8, 4) + PALETTE(80, 16, 0xB0) TILES(0x12C7C, 91) HITBOX(0, -52, -28, 51, 36) SHOW_FRAME(8, 4) - TILES(0x12CD7, 91) - SHOW_FRAME(8, 5) + TILES(0x12CD7, 91) SHOW_FRAME(8, 5) - TILES(0x12D32, 91) - SHOW_FRAME(8, 6) + TILES(0x12D32, 91) SHOW_FRAME(8, 6) - TILES(0x12D8D, 91) - SHOW_FRAME(8, 7) + TILES(0x12D8D, 91) SHOW_FRAME(8, 7) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0590[2] = { +const s32 *const anim_0590[2] = { anim_0590__v0_l0, anim_0590__v1_l0, }; const s32 anim_0591__v0_l0[] = { // 0x080F3CE0 - PALETTE(80, 16, 0xB0) - TILES(0x12DE8, 77) - HITBOX(0, -27, -44, 27, 45) - SHOW_FRAME(8, 0) + PALETTE(80, 16, 0xB0) TILES(0x12DE8, 77) HITBOX(0, -27, -44, 27, 45) SHOW_FRAME(8, 0) - TILES(0x12E35, 77) - SHOW_FRAME(8, 1) + TILES(0x12E35, 77) SHOW_FRAME(8, 1) - TILES(0x12E82, 77) - SHOW_FRAME(8, 2) + TILES(0x12E82, 77) SHOW_FRAME(8, 2) - TILES(0x12ECF, 77) - SHOW_FRAME(8, 3) + TILES(0x12ECF, 77) SHOW_FRAME(8, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0591__v1_l0[] = { // 0x080F3D50 - PALETTE(80, 16, 0xB0) - TILES(0x12F1C, 77) - HITBOX(0, -27, -44, 27, 45) - SHOW_FRAME(8, 4) + PALETTE(80, 16, 0xB0) TILES(0x12F1C, 77) HITBOX(0, -27, -44, 27, 45) SHOW_FRAME(8, 4) - TILES(0x12F69, 77) - SHOW_FRAME(8, 5) + TILES(0x12F69, 77) SHOW_FRAME(8, 5) - TILES(0x12FB6, 77) - SHOW_FRAME(8, 6) + TILES(0x12FB6, 77) SHOW_FRAME(8, 6) - TILES(0x13003, 77) - SHOW_FRAME(8, 7) + TILES(0x13003, 77) SHOW_FRAME(8, 7) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0591[2] = { +const s32 *const anim_0591[2] = { anim_0591__v0_l0, anim_0591__v1_l0, }; const s32 anim_0592__v0_l0[] = { // 0x080F3DC8 - PALETTE(81, 16, 0xB0) - TILES(0x13050, 16) - HITBOX(0, -16, -16, 12, -8) - SHOW_FRAME(1, 0) + PALETTE(81, 16, 0xB0) TILES(0x13050, 16) HITBOX(0, -16, -16, 12, -8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0592[1] = { +const s32 *const anim_0592[1] = { anim_0592__v0_l0, }; const s32 anim_0593__v0_l0[] = { // 0x080F3DFC - PALETTE(82, 16, 0x70) - TILES(0x13060, 28) - HITBOX(0, 0, -30, 56, 0) - SHOW_FRAME(8, 0) + PALETTE(82, 16, 0x70) TILES(0x13060, 28) HITBOX(0, 0, -30, 56, 0) SHOW_FRAME(8, 0) - TILES(0x1307C, 28) - SHOW_FRAME(8, 1) + TILES(0x1307C, 28) SHOW_FRAME(8, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0593__v1_l0[] = { // 0x080F3E44 - PALETTE(83, 16, 0x70) - TILES(0x13098, 28) - HITBOX(0, 0, 0, 29, 56) - SHOW_FRAME(8, 2) + PALETTE(83, 16, 0x70) TILES(0x13098, 28) HITBOX(0, 0, 0, 29, 56) SHOW_FRAME(8, 2) - TILES(0x130B4, 28) - SHOW_FRAME(8, 3) + TILES(0x130B4, 28) SHOW_FRAME(8, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0593[2] = { +const s32 *const anim_0593[2] = { anim_0593__v0_l0, anim_0593__v1_l0, }; const s32 anim_0594__v0_l0[] = { // 0x080F3E94 - PALETTE(63, 16, 0xB0) - TILES(0x130D0, 32) - HITBOX(0, 0, 0, 32, 64) - SHOW_FRAME(1, 0) + PALETTE(63, 16, 0xB0) TILES(0x130D0, 32) HITBOX(0, 0, 0, 32, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0594[1] = { +const s32 *const anim_0594[1] = { anim_0594__v0_l0, }; const s32 anim_0595__v0_l0[] = { // 0x080F3EC8 - PALETTE(65, 16, 0xB0) - TILES(0x130F0, 32) - HITBOX(0, 0, 0, 32, 63) - SHOW_FRAME(1, 0) + PALETTE(65, 16, 0xB0) TILES(0x130F0, 32) HITBOX(0, 0, 0, 32, 63) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0595[1] = { +const s32 *const anim_0595[1] = { anim_0595__v0_l0, }; const s32 anim_0596__v0_l0[] = { // 0x080F3EFC - PALETTE(84, 16, 0xB0) - TILES(0x13110, 32) - HITBOX(0, 0, 0, 32, 64) - SHOW_FRAME(1, 0) + PALETTE(84, 16, 0xB0) TILES(0x13110, 32) HITBOX(0, 0, 0, 32, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0596[1] = { +const s32 *const anim_0596[1] = { anim_0596__v0_l0, }; const s32 anim_0597__v0_l0[] = { // 0x080F3F30 - PALETTE(85, 16, 0x70) - TILES(0x13130, 1) - SHOW_FRAME(10, 0) + PALETTE(85, 16, 0x70) TILES(0x13130, 1) SHOW_FRAME(10, 0) - TILES(0x13131, 1) - SHOW_FRAME(10, 1) + TILES(0x13131, 1) SHOW_FRAME(10, 1) - TILES(0x13132, 1) - SHOW_FRAME(10, 2) + TILES(0x13132, 1) SHOW_FRAME(10, 2) - TILES(0x13133, 1) - SHOW_FRAME(10, 3) + TILES(0x13133, 1) SHOW_FRAME(10, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0597[1] = { +const s32 *const anim_0597[1] = { anim_0597__v0_l0, }; const s32 anim_0598__v0_l0[] = { // 0x080F3F98 - PALETTE(86, 16, 0xB0) - TILES(0x13134, 18) - HITBOX(0, -24, -8, 24, 8) - SHOW_FRAME(1, 0) + PALETTE(86, 16, 0xB0) TILES(0x13134, 18) HITBOX(0, -24, -8, 24, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0598[1] = { +const s32 *const anim_0598[1] = { anim_0598__v0_l0, }; const s32 anim_0599__v0_l0[] = { // 0x080F3FCC - PALETTE(86, 16, 0xB0) - TILES(0x13146, 36) - HITBOX(0, -24, -20, 24, 24) - SHOW_FRAME(1, 0) + PALETTE(86, 16, 0xB0) TILES(0x13146, 36) HITBOX(0, -24, -20, 24, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0599[1] = { +const s32 *const anim_0599[1] = { anim_0599__v0_l0, }; const s32 anim_0600__v0_l0[] = { // 0x080F4000 - PALETTE(86, 16, 0xB0) - TILES(0x1316A, 40) - HITBOX(0, -39, -14, 39, 16) - SHOW_FRAME(1, 0) + PALETTE(86, 16, 0xB0) TILES(0x1316A, 40) HITBOX(0, -39, -14, 39, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0600[1] = { +const s32 *const anim_0600[1] = { anim_0600__v0_l0, }; const s32 anim_0601__v0_l0[] = { // 0x080F4034 - PALETTE(86, 16, 0xB0) - TILES(0x13192, 12) - HITBOX(0, -14, -9, 14, 10) - SHOW_FRAME(1, 0) + PALETTE(86, 16, 0xB0) TILES(0x13192, 12) HITBOX(0, -14, -9, 14, 10) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0601[1] = { +const s32 *const anim_0601[1] = { anim_0601__v0_l0, }; const s32 anim_0602__v0_l0[] = { // 0x080F4068 - PALETTE(86, 16, 0xB0) - TILES(0x1319E, 32) - HITBOX(0, 0, 3, 64, 32) - SHOW_FRAME(1, 0) + PALETTE(86, 16, 0xB0) TILES(0x1319E, 32) HITBOX(0, 0, 3, 64, 32) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0602[1] = { +const s32 *const anim_0602[1] = { anim_0602__v0_l0, }; const s32 anim_0603__v0_l0[] = { // 0x080F409C - PALETTE(86, 16, 0xB0) - TILES(0x131BE, 27) - HITBOX(0, -32, -7, 32, 6) - SHOW_FRAME(10, 0) + PALETTE(86, 16, 0xB0) TILES(0x131BE, 27) HITBOX(0, -32, -7, 32, 6) SHOW_FRAME(10, 0) - TILES(0x131D9, 27) - SHOW_FRAME(10, 1) + TILES(0x131D9, 27) SHOW_FRAME(10, 1) - TILES(0x131F4, 27) - SHOW_FRAME(10, 2) + TILES(0x131F4, 27) SHOW_FRAME(10, 2) - TILES(0x1320F, 27) - SHOW_FRAME(10, 3) + TILES(0x1320F, 27) SHOW_FRAME(10, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0603__v1_l0[] = { // 0x080F410C - PALETTE(86, 16, 0xB0) - TILES(0x131BE, 27) - HITBOX(0, -32, -7, 32, 6) - SHOW_FRAME(10, 0) + PALETTE(86, 16, 0xB0) TILES(0x131BE, 27) HITBOX(0, -32, -7, 32, 6) SHOW_FRAME(10, 0) - TILES(0x1320F, 27) - SHOW_FRAME(10, 3) + TILES(0x1320F, 27) SHOW_FRAME(10, 3) - TILES(0x131F4, 27) - SHOW_FRAME(10, 2) + TILES(0x131F4, 27) SHOW_FRAME(10, 2) - TILES(0x131D9, 27) - SHOW_FRAME(10, 1) + TILES(0x131D9, 27) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0603[2] = { +const s32 *const anim_0603[2] = { anim_0603__v0_l0, anim_0603__v1_l0, }; const s32 anim_0604__v0_l0[] = { // 0x080F4184 - PALETTE(86, 16, 0xB0) - TILES(0x1322A, 36) - HITBOX(0, -44, -5, 44, 8) - SHOW_FRAME(10, 0) + PALETTE(86, 16, 0xB0) TILES(0x1322A, 36) HITBOX(0, -44, -5, 44, 8) SHOW_FRAME(10, 0) - TILES(0x1324E, 36) - SHOW_FRAME(10, 1) + TILES(0x1324E, 36) SHOW_FRAME(10, 1) - TILES(0x13272, 36) - SHOW_FRAME(10, 2) + TILES(0x13272, 36) SHOW_FRAME(10, 2) - TILES(0x13296, 36) - SHOW_FRAME(10, 3) + TILES(0x13296, 36) SHOW_FRAME(10, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0604__v1_l0[] = { // 0x080F41F4 - PALETTE(86, 16, 0xB0) - TILES(0x1322A, 36) - HITBOX(0, -44, -5, 44, 8) - SHOW_FRAME(10, 0) + PALETTE(86, 16, 0xB0) TILES(0x1322A, 36) HITBOX(0, -44, -5, 44, 8) SHOW_FRAME(10, 0) - TILES(0x13296, 36) - SHOW_FRAME(10, 3) + TILES(0x13296, 36) SHOW_FRAME(10, 3) - TILES(0x13272, 36) - SHOW_FRAME(10, 2) + TILES(0x13272, 36) SHOW_FRAME(10, 2) - TILES(0x1324E, 36) - SHOW_FRAME(10, 1) + TILES(0x1324E, 36) SHOW_FRAME(10, 1) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0604[2] = { +const s32 *const anim_0604[2] = { anim_0604__v0_l0, anim_0604__v1_l0, }; const s32 anim_0605__v0_l0[] = { // 0x080F426C - PALETTE(87, 16, 0xD0) - TILES(0x132BA, 18) - HITBOX(0, -24, -7, 24, -5) - SHOW_FRAME(1, 0) + PALETTE(87, 16, 0xD0) TILES(0x132BA, 18) HITBOX(0, -24, -7, 24, -5) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0605[1] = { +const s32 *const anim_0605[1] = { anim_0605__v0_l0, }; const s32 anim_0606__v0_l0[] = { // 0x080F42A0 - PALETTE(88, 16, 0x0) - TILES(0x132CC, 16) - SHOW_FRAME(1, 0) + PALETTE(88, 16, 0x0) TILES(0x132CC, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0606[1] = { +const s32 *const anim_0606[1] = { anim_0606__v0_l0, }; const s32 anim_0607__v0_l0[] = { // 0x080F42C8 - PALETTE(89, 16, 0xA0) - TILES(0x132DC, 63) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x132DC, 63) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0607__v1_l0[] = { // 0x080F42EC - PALETTE(89, 16, 0xA0) - TILES(0x132DC, 63) - HITBOX(0, -32, -56, 29, 0) - HITBOX(1, -16, -36, 16, -16) - SHOW_FRAME(4, 0) + PALETTE(89, 16, 0xA0) TILES(0x132DC, 63) HITBOX(0, -32, -56, 29, 0) HITBOX(1, -16, -36, 16, -16) SHOW_FRAME(4, 0) - TILES(0x1331B, 70) - SHOW_FRAME(4, 1) + TILES(0x1331B, 70) SHOW_FRAME(4, 1) - CHANGE_ANIM(607, 2) + CHANGE_ANIM(607, 2) }; const s32 anim_0607__v2_l0[] = { // 0x080F4340 - PALETTE(89, 16, 0xA0) - TILES(0x13361, 70) - SHOW_FRAME(4, 2) + PALETTE(89, 16, 0xA0) TILES(0x13361, 70) SHOW_FRAME(4, 2) - CHANGE_ANIM(607, 1) + CHANGE_ANIM(607, 1) }; -const s32 * const anim_0607[3] = { +const s32 *const anim_0607[3] = { anim_0607__v0_l0, anim_0607__v1_l0, anim_0607__v2_l0, }; const s32 anim_0608__v0_l0[] = { // 0x080F4374 - PALETTE(89, 16, 0xA0) - TILES(0x133A7, 4) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x133A7, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0608[1] = { +const s32 *const anim_0608[1] = { anim_0608__v0_l0, }; const s32 anim_0609__v0_l0[] = { // 0x080F439C - PALETTE(89, 16, 0xA0) - TILES(0x133AB, 64) - HITBOX(0, -16, -16, 16, 16) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x133AB, 64) HITBOX(0, -16, -16, 16, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0609[1] = { +const s32 *const anim_0609[1] = { anim_0609__v0_l0, }; const s32 anim_0610__v0_l0[] = { // 0x080F43D0 - PALETTE(90, 16, 0x80) - TILES(0x133EB, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x133EB, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0610__v1_l0[] = { // 0x080F43F4 - PALETTE(90, 16, 0x80) - TILES(0x133F3, 8) - SHOW_FRAME(6, 1) + PALETTE(90, 16, 0x80) TILES(0x133F3, 8) SHOW_FRAME(6, 1) - TILES(0x133FB, 8) - SHOW_FRAME(6, 2) + TILES(0x133FB, 8) SHOW_FRAME(6, 2) - TILES(0x133F3, 8) - SHOW_FRAME(6, 1) + TILES(0x133F3, 8) SHOW_FRAME(6, 1) - TILES(0x133FB, 8) - SHOW_FRAME(6, 2) + TILES(0x133FB, 8) SHOW_FRAME(6, 2) - TILES(0x133F3, 8) - SHOW_FRAME(6, 1) + TILES(0x133F3, 8) SHOW_FRAME(6, 1) - TILES(0x133FB, 8) - SHOW_FRAME(6, 2) + TILES(0x133FB, 8) SHOW_FRAME(6, 2) - CHANGE_ANIM(610, 0) + CHANGE_ANIM(610, 0) }; const s32 anim_0610__v2_l0[] = { // 0x080F4480 - PALETTE(90, 16, 0x80) - TILES(0x13403, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x13403, 8) SHOW_FRAME(5, 3) - TILES(0x1340B, 8) - SHOW_FRAME(3, 4) + TILES(0x1340B, 8) SHOW_FRAME(3, 4) - TILES(0x13403, 8) - SHOW_FRAME(5, 3) + TILES(0x13403, 8) SHOW_FRAME(5, 3) - TILES(0x1340B, 8) - SHOW_FRAME(3, 4) + TILES(0x1340B, 8) SHOW_FRAME(3, 4) - TILES(0x13403, 8) - SHOW_FRAME(5, 3) + TILES(0x13403, 8) SHOW_FRAME(5, 3) - TILES(0x1340B, 8) - SHOW_FRAME(3, 4) + TILES(0x1340B, 8) SHOW_FRAME(3, 4) - CHANGE_ANIM(610, 0) + CHANGE_ANIM(610, 0) }; -const s32 * const anim_0610[3] = { +const s32 *const anim_0610[3] = { anim_0610__v0_l0, anim_0610__v1_l0, anim_0610__v2_l0, }; const s32 anim_0611__v0_l0[] = { // 0x080F4518 - TILES(0x13413, 80) - PALETTE(33, 16, 0x70) - PLAY_SOUND(144) - SHOW_FRAME(4, 0) + TILES(0x13413, 80) PALETTE(33, 16, 0x70) PLAY_SOUND(144) SHOW_FRAME(4, 0) - SHOW_FRAME(4, 1) + SHOW_FRAME(4, 1) - SHOW_FRAME(4, 2) + SHOW_FRAME(4, 2) - SHOW_FRAME(4, 3) + SHOW_FRAME(4, 3) - SHOW_FRAME(4, 4) + SHOW_FRAME(4, 4) - END() + END() }; -const s32 * const anim_0611[1] = { +const s32 *const anim_0611[1] = { anim_0611__v0_l0, }; const s32 anim_0612__v0_l0[] = { // 0x080F4568 - PALETTE(89, 16, 0xA0) - TILES(0x13463, 56) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x13463, 56) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0612[1] = { +const s32 *const anim_0612[1] = { anim_0612__v0_l0, }; const s32 anim_0613__v0_l0[] = { // 0x080F4590 - PALETTE(89, 16, 0xA0) - TILES(0x1349B, 16) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x1349B, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0613[1] = { +const s32 *const anim_0613[1] = { anim_0613__v0_l0, }; const s32 anim_0614__v0_l0[] = { // 0x080F45B8 - PALETTE(89, 16, 0xA0) - TILES(0x134AB, 16) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x134AB, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0614[1] = { +const s32 *const anim_0614[1] = { anim_0614__v0_l0, }; const s32 anim_0615__v0_l0[] = { // 0x080F45E0 - PALETTE(89, 16, 0xA0) - TILES(0x134BB, 16) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x134BB, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0615[1] = { +const s32 *const anim_0615[1] = { anim_0615__v0_l0, }; const s32 anim_0616__v0_l0[] = { // 0x080F4608 - PALETTE(89, 16, 0xA0) - TILES(0x134CB, 16) - SHOW_FRAME(1, 0) + PALETTE(89, 16, 0xA0) TILES(0x134CB, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0616[1] = { +const s32 *const anim_0616[1] = { anim_0616__v0_l0, }; const s32 anim_0617__v0_l0[] = { // 0x080F4630 - PALETTE(91, 16, 0xA0) - TILES(0x134DB, 8) - SHOW_FRAME(1, 0) + PALETTE(91, 16, 0xA0) TILES(0x134DB, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0617[1] = { +const s32 *const anim_0617[1] = { anim_0617__v0_l0, }; const s32 anim_0618__v0_l0[] = { // 0x080F4658 - PALETTE(90, 16, 0x80) - TILES(0x134E3, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x134E3, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0618__v1_l0[] = { // 0x080F467C - PALETTE(90, 16, 0x80) - TILES(0x134EB, 8) - SHOW_FRAME(6, 1) + PALETTE(90, 16, 0x80) TILES(0x134EB, 8) SHOW_FRAME(6, 1) - TILES(0x134F3, 8) - SHOW_FRAME(6, 2) + TILES(0x134F3, 8) SHOW_FRAME(6, 2) - TILES(0x134EB, 8) - SHOW_FRAME(6, 1) + TILES(0x134EB, 8) SHOW_FRAME(6, 1) - TILES(0x134F3, 8) - SHOW_FRAME(6, 2) + TILES(0x134F3, 8) SHOW_FRAME(6, 2) - TILES(0x134EB, 8) - SHOW_FRAME(6, 1) + TILES(0x134EB, 8) SHOW_FRAME(6, 1) - TILES(0x134F3, 8) - SHOW_FRAME(6, 2) + TILES(0x134F3, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0618__v2_l0[] = { // 0x080F4704 - PALETTE(90, 16, 0x80) - TILES(0x134FB, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x134FB, 8) SHOW_FRAME(5, 3) - TILES(0x13503, 8) - SHOW_FRAME(3, 4) + TILES(0x13503, 8) SHOW_FRAME(3, 4) - TILES(0x134FB, 8) - SHOW_FRAME(5, 3) + TILES(0x134FB, 8) SHOW_FRAME(5, 3) - TILES(0x13503, 8) - SHOW_FRAME(3, 4) + TILES(0x13503, 8) SHOW_FRAME(3, 4) - TILES(0x134FB, 8) - SHOW_FRAME(5, 3) + TILES(0x134FB, 8) SHOW_FRAME(5, 3) - TILES(0x13503, 8) - SHOW_FRAME(3, 4) + TILES(0x13503, 8) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0618[3] = { +const s32 *const anim_0618[3] = { anim_0618__v0_l0, anim_0618__v1_l0, anim_0618__v2_l0, }; const s32 anim_0619__v0_l0[] = { // 0x080F4798 - PALETTE(91, 16, 0xA0) - TILES(0x1350B, 8) - SHOW_FRAME(1, 0) + PALETTE(91, 16, 0xA0) TILES(0x1350B, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0619[1] = { +const s32 *const anim_0619[1] = { anim_0619__v0_l0, }; const s32 anim_0620__v0_l0[] = { // 0x080F47C0 - PALETTE(91, 16, 0xA0) - TILES(0x13513, 54) - HITBOX(0, -19, -65, 20, -30) - HITBOX(1, -16, -30, 16, 2) - HITBOX(2, 0, 0, 0, 0) - SHOW_FRAME(4, 0) + PALETTE(91, 16, 0xA0) TILES(0x13513, 54) HITBOX(0, -19, -65, 20, -30) HITBOX(1, -16, -30, 16, 2) HITBOX(2, 0, 0, 0, 0) SHOW_FRAME(4, 0) - TILES(0x13549, 54) - HITBOX(0, -19, -65, 20, -30) - HITBOX(1, -16, -30, 16, 2) - HITBOX(2, -24, -69, -24, -70) - SHOW_FRAME(4, 1) + TILES(0x13549, 54) HITBOX(0, -19, -65, 20, -30) HITBOX(1, -16, -30, 16, 2) HITBOX(2, -24, -69, -24, -70) SHOW_FRAME(4, 1) - TILES(0x1357F, 54) - HITBOX(0, -19, -65, 20, -30) - HITBOX(1, -16, -30, 16, 2) - HITBOX(2, -24, -68, -24, -70) - SHOW_FRAME(4, 2) + TILES(0x1357F, 54) HITBOX(0, -19, -65, 20, -30) HITBOX(1, -16, -30, 16, 2) HITBOX(2, -24, -68, -24, -70) SHOW_FRAME(4, 2) - TILES(0x13549, 54) - HITBOX(0, -19, -65, 20, -30) - HITBOX(1, -16, -30, 16, 2) - HITBOX(2, -24, -69, -24, -70) - SHOW_FRAME(4, 1) + TILES(0x13549, 54) HITBOX(0, -19, -65, 20, -30) HITBOX(1, -16, -30, 16, 2) HITBOX(2, -24, -69, -24, -70) SHOW_FRAME(4, 1) - JUMP_BACK(59) + JUMP_BACK(59) }; const s32 anim_0620__v1_l0[] = { // 0x080F48B4 - PALETTE(91, 16, 0xA0) - TILES(0x135B5, 54) - HITBOX(0, -19, -68, 20, -33) - HITBOX(1, -16, -35, 16, 2) - HITBOX(2, -24, -73, -24, -70) - SHOW_FRAME(3, 3) + PALETTE(91, 16, 0xA0) TILES(0x135B5, 54) HITBOX(0, -19, -68, 20, -33) HITBOX(1, -16, -35, 16, 2) HITBOX(2, -24, -73, -24, + -70) SHOW_FRAME(3, 3) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -19, 16, 3) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(3, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -19, 16, 3) HITBOX(2, -24, -57, -24, -70) SHOW_FRAME(3, 4) - TILES(0x13615, 42) - HITBOX(0, -19, -44, 20, -9) - HITBOX(1, -16, -9, 16, 3) - HITBOX(2, -24, -50, -24, -70) - SHOW_FRAME(3, 5) + TILES(0x13615, 42) HITBOX(0, -19, -44, 20, -9) HITBOX(1, -16, -9, 16, 3) HITBOX(2, -24, -50, -24, -70) SHOW_FRAME(3, 5) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -18, 16, 2) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(3, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -18, 16, 2) HITBOX(2, -24, -57, -24, -70) SHOW_FRAME(3, 4) - TILES(0x135B5, 54) - HITBOX(0, -19, -68, 20, -33) - HITBOX(1, -16, -35, 16, 2) - HITBOX(2, -24, -73, -24, -70) - SHOW_FRAME(3, 3) + TILES(0x135B5, 54) HITBOX(0, -19, -68, 20, -33) HITBOX(1, -16, -35, 16, 2) HITBOX(2, -24, -73, -24, -70) + SHOW_FRAME(3, 3) - END() + END() }; const s32 anim_0620__v2_l0[] = { // 0x080F49DC - PALETTE(91, 16, 0xA0) - TILES(0x135B5, 54) - HITBOX(0, -19, -68, 20, -33) - HITBOX(1, -16, -35, 16, 2) - HITBOX(2, -24, -73, -24, -70) - SHOW_FRAME(3, 3) + PALETTE(91, 16, 0xA0) TILES(0x135B5, 54) HITBOX(0, -19, -68, 20, -33) HITBOX(1, -16, -35, 16, 2) HITBOX(2, -24, -73, -24, + -70) SHOW_FRAME(3, 3) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -19, 16, 3) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(3, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -19, 16, 3) HITBOX(2, -24, -57, -24, -70) SHOW_FRAME(3, 4) - TILES(0x13615, 42) - HITBOX(0, -19, -44, 20, -9) - HITBOX(1, -16, -9, 16, 3) - HITBOX(2, -24, -50, -24, -70) - SHOW_FRAME(6, 5) + TILES(0x13615, 42) HITBOX(0, -19, -44, 20, -9) HITBOX(1, -16, -9, 16, 3) HITBOX(2, -24, -50, -24, -70) SHOW_FRAME(6, 5) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -19, 16, 3) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(6, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -19, 16, 3) HITBOX(2, -24, -57, -24, -70) SHOW_FRAME(6, 4) - TILES(0x13615, 42) - HITBOX(0, -19, -44, 20, -9) - HITBOX(1, -16, -9, 16, 3) - HITBOX(2, -24, -50, -24, -70) - SHOW_FRAME(5, 5) + TILES(0x13615, 42) HITBOX(0, -19, -44, 20, -9) HITBOX(1, -16, -9, 16, 3) HITBOX(2, -24, -50, -24, -70) SHOW_FRAME(5, 5) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -19, 16, 3) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(5, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -19, 16, 3) HITBOX(2, -24, -57, -24, -70) + SHOW_FRAME(5, 4) - TILES(0x13615, 42) - HITBOX(0, -19, -44, 20, -9) - HITBOX(1, -16, -9, 16, 3) - HITBOX(2, -24, -50, -24, -70) - SHOW_FRAME(4, 5) + TILES(0x13615, 42) HITBOX(0, -19, -44, 20, -9) HITBOX(1, -16, -9, 16, 3) HITBOX(2, -24, -50, -24, -70) + SHOW_FRAME(4, 5) - TILES(0x135EB, 42) - HITBOX(0, -19, -54, 20, -19) - HITBOX(1, -16, -19, 16, 3) - HITBOX(2, -24, -57, -24, -70) - SHOW_FRAME(4, 4) + TILES(0x135EB, 42) HITBOX(0, -19, -54, 20, -19) HITBOX(1, -16, -19, 16, 3) + HITBOX(2, -24, -57, -24, -70) SHOW_FRAME(4, 4) - TILES(0x135B5, 54) - HITBOX(0, -19, -68, 20, -33) - HITBOX(1, -16, -35, 16, 2) - HITBOX(2, -24, -73, -24, -70) - SHOW_FRAME(3, 3) + TILES(0x135B5, 54) HITBOX(0, -19, -68, 20, -33) HITBOX(1, -16, -35, 16, 2) + HITBOX(2, -24, -73, -24, -70) SHOW_FRAME(3, 3) - END() + END() }; -const s32 * const anim_0620[3] = { +const s32 *const anim_0620[3] = { anim_0620__v0_l0, anim_0620__v1_l0, anim_0620__v2_l0, }; const s32 anim_0621__v0_l0[] = { // 0x080F4BF0 - PALETTE(91, 16, 0xA0) - TILES(0x1363F, 30) - SHOW_FRAME(1, 0) + PALETTE(91, 16, 0xA0) TILES(0x1363F, 30) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0621[1] = { +const s32 *const anim_0621[1] = { anim_0621__v0_l0, }; const s32 anim_0622__v0_l0[] = { // 0x080F4C18 - PALETTE(90, 16, 0x80) - TILES(0x1365D, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x1365D, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0622__v1_l0[] = { // 0x080F4C3C - PALETTE(90, 16, 0x80) - TILES(0x13665, 8) - SHOW_FRAME(6, 1) + PALETTE(90, 16, 0x80) TILES(0x13665, 8) SHOW_FRAME(6, 1) - TILES(0x1366D, 8) - SHOW_FRAME(6, 2) + TILES(0x1366D, 8) SHOW_FRAME(6, 2) - TILES(0x13665, 8) - SHOW_FRAME(6, 1) + TILES(0x13665, 8) SHOW_FRAME(6, 1) - TILES(0x1366D, 8) - SHOW_FRAME(6, 2) + TILES(0x1366D, 8) SHOW_FRAME(6, 2) - TILES(0x13665, 8) - SHOW_FRAME(6, 1) + TILES(0x13665, 8) SHOW_FRAME(6, 1) - TILES(0x1366D, 8) - SHOW_FRAME(6, 2) + TILES(0x1366D, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0622__v2_l0[] = { // 0x080F4CC4 - PALETTE(90, 16, 0x80) - TILES(0x13675, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x13675, 8) SHOW_FRAME(5, 3) - TILES(0x1367D, 8) - SHOW_FRAME(3, 4) + TILES(0x1367D, 8) SHOW_FRAME(3, 4) - TILES(0x13675, 8) - SHOW_FRAME(5, 3) + TILES(0x13675, 8) SHOW_FRAME(5, 3) - TILES(0x1367D, 8) - SHOW_FRAME(3, 4) + TILES(0x1367D, 8) SHOW_FRAME(3, 4) - TILES(0x13675, 8) - SHOW_FRAME(5, 3) + TILES(0x13675, 8) SHOW_FRAME(5, 3) - TILES(0x1367D, 8) - SHOW_FRAME(3, 4) + TILES(0x1367D, 8) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0622[3] = { +const s32 *const anim_0622[3] = { anim_0622__v0_l0, anim_0622__v1_l0, anim_0622__v2_l0, }; const s32 anim_0623__v0_l0[] = { // 0x080F4D58 - PALETTE(92, 16, 0xA0) - TILES(0x13685, 16) - SHOW_FRAME(1, 0) + PALETTE(92, 16, 0xA0) TILES(0x13685, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0623[1] = { +const s32 *const anim_0623[1] = { anim_0623__v0_l0, }; const s32 anim_0624__v0_l0[] = { // 0x080F4D80 - PALETTE(92, 16, 0xA0) - TILES(0x13695, 36) - HITBOX(0, -20, -20, 20, 22) - SHOW_FRAME(5, 0) + PALETTE(92, 16, 0xA0) TILES(0x13695, 36) HITBOX(0, -20, -20, 20, 22) SHOW_FRAME(5, 0) - TILES(0x136B9, 36) - SHOW_FRAME(5, 1) + TILES(0x136B9, 36) SHOW_FRAME(5, 1) - TILES(0x136DD, 36) - SHOW_FRAME(5, 2) + TILES(0x136DD, 36) SHOW_FRAME(5, 2) - TILES(0x13701, 36) - SHOW_FRAME(5, 3) + TILES(0x13701, 36) SHOW_FRAME(5, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0624[1] = { +const s32 *const anim_0624[1] = { anim_0624__v0_l0, }; const s32 anim_0625__v0_l0[] = { // 0x080F4DF4 - PALETTE(93, 16, 0xB0) - TILES(0x13725, 36) - HITBOX(0, -20, -20, 20, 22) - SHOW_FRAME(5, 0) + PALETTE(93, 16, 0xB0) TILES(0x13725, 36) HITBOX(0, -20, -20, 20, 22) SHOW_FRAME(5, 0) - TILES(0x13749, 36) - SHOW_FRAME(5, 1) + TILES(0x13749, 36) SHOW_FRAME(5, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0625[1] = { +const s32 *const anim_0625[1] = { anim_0625__v0_l0, }; const s32 anim_0626__v0_l0[] = { // 0x080F4E40 - PALETTE(94, 16, 0xA0) - TILES(0x1376D, 48) - HITBOX(0, -23, 16, 23, 58) - SHOW_FRAME(1, 0) + PALETTE(94, 16, 0xA0) TILES(0x1376D, 48) HITBOX(0, -23, 16, 23, 58) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0626[1] = { +const s32 *const anim_0626[1] = { anim_0626__v0_l0, }; const s32 anim_0627__v0_l0[] = { // 0x080F4E74 - PALETTE(95, 16, 0xA0) - TILES(0x1379D, 16) - SHOW_FRAME(1, 0) + PALETTE(95, 16, 0xA0) TILES(0x1379D, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0627__v1_l0[] = { // 0x080F4E98 - PALETTE(95, 16, 0xA0) - TILES(0x137AD, 12) - SHOW_FRAME(1, 1) + PALETTE(95, 16, 0xA0) TILES(0x137AD, 12) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0627[2] = { +const s32 *const anim_0627[2] = { anim_0627__v0_l0, anim_0627__v1_l0, }; const s32 anim_0628__v0_l0[] = { // 0x080F4EC4 - PALETTE(94, 16, 0xA0) - TILES(0x137B9, 64) - HITBOX(0, -23, 0, 23, 53) - SHOW_FRAME(7, 0) + PALETTE(94, 16, 0xA0) TILES(0x137B9, 64) HITBOX(0, -23, 0, 23, 53) SHOW_FRAME(7, 0) - TILES(0x137F9, 64) - SHOW_FRAME(7, 1) + TILES(0x137F9, 64) SHOW_FRAME(7, 1) - TILES(0x13839, 64) - SHOW_FRAME(7, 2) + TILES(0x13839, 64) SHOW_FRAME(7, 2) - TILES(0x13879, 64) - SHOW_FRAME(7, 3) + TILES(0x13879, 64) SHOW_FRAME(7, 3) - JUMP_BACK(26) + JUMP_BACK(26) }; const s32 anim_0628__v1_l0[] = { // 0x080F4F34 - PALETTE(94, 16, 0xA0) - TILES(0x138B9, 64) - HITBOX(0, -23, 0, 23, 53) - SHOW_FRAME(5, 4) + PALETTE(94, 16, 0xA0) TILES(0x138B9, 64) HITBOX(0, -23, 0, 23, 53) SHOW_FRAME(5, 4) - TILES(0x138F9, 64) - SHOW_FRAME(5, 5) + TILES(0x138F9, 64) SHOW_FRAME(5, 5) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0628__v2_l0[] = { // 0x080F4F7C - PALETTE(94, 16, 0xA0) - TILES(0x138B9, 64) - HITBOX(0, -23, 0, 23, 53) - SHOW_FRAME(1, 4) + PALETTE(94, 16, 0xA0) TILES(0x138B9, 64) HITBOX(0, -23, 0, 23, 53) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0628[3] = { +const s32 *const anim_0628[3] = { anim_0628__v0_l0, anim_0628__v1_l0, anim_0628__v2_l0, }; const s32 anim_0629__v0_l0[] = { // 0x080F4FB8 - PALETTE(96, 16, 0x80) - TILES(0x13939, 8) - SHOW_FRAME(1, 0) + PALETTE(96, 16, 0x80) TILES(0x13939, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0629__v1_l0[] = { // 0x080F4FDC - PALETTE(96, 16, 0x80) - TILES(0x13941, 8) - SHOW_FRAME(6, 1) + PALETTE(96, 16, 0x80) TILES(0x13941, 8) SHOW_FRAME(6, 1) - TILES(0x13949, 8) - SHOW_FRAME(6, 2) + TILES(0x13949, 8) SHOW_FRAME(6, 2) - TILES(0x13941, 8) - SHOW_FRAME(6, 1) + TILES(0x13941, 8) SHOW_FRAME(6, 1) - TILES(0x13949, 8) - SHOW_FRAME(6, 2) + TILES(0x13949, 8) SHOW_FRAME(6, 2) - TILES(0x13941, 8) - SHOW_FRAME(6, 1) + TILES(0x13941, 8) SHOW_FRAME(6, 1) - TILES(0x13949, 8) - SHOW_FRAME(6, 2) + TILES(0x13949, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0629__v2_l0[] = { // 0x080F5064 - PALETTE(96, 16, 0x80) - TILES(0x13951, 8) - SHOW_FRAME(5, 3) + PALETTE(96, 16, 0x80) TILES(0x13951, 8) SHOW_FRAME(5, 3) - TILES(0x13949, 8) - SHOW_FRAME(3, 2) + TILES(0x13949, 8) SHOW_FRAME(3, 2) - TILES(0x13951, 8) - SHOW_FRAME(5, 3) + TILES(0x13951, 8) SHOW_FRAME(5, 3) - TILES(0x13949, 8) - SHOW_FRAME(3, 2) + TILES(0x13949, 8) SHOW_FRAME(3, 2) - TILES(0x13951, 8) - SHOW_FRAME(5, 3) + TILES(0x13951, 8) SHOW_FRAME(5, 3) - TILES(0x13949, 8) - SHOW_FRAME(3, 2) + TILES(0x13949, 8) SHOW_FRAME(3, 2) - END() + END() }; -const s32 * const anim_0629[3] = { +const s32 *const anim_0629[3] = { anim_0629__v0_l0, anim_0629__v1_l0, anim_0629__v2_l0, }; const s32 anim_0630__v0_l0[] = { // 0x080F50F8 - PALETTE(97, 16, 0xB0) - TILES(0x13959, 24) - HITBOX(0, -12, -17, 11, 6) - HITBOX(1, -5, 5, 4, 15) - SHOW_FRAME(1, 0) + PALETTE(97, 16, 0xB0) TILES(0x13959, 24) HITBOX(0, -12, -17, 11, 6) HITBOX(1, -5, 5, 4, 15) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0630[1] = { +const s32 *const anim_0630[1] = { anim_0630__v0_l0, }; const s32 anim_0631__v0_l0[] = { // 0x080F5138 - PALETTE(98, 16, 0xA0) - TILES(0x13971, 16) - SHOW_FRAME(60, 0) + PALETTE(98, 16, 0xA0) TILES(0x13971, 16) SHOW_FRAME(60, 0) - END() + END() }; const s32 anim_0631__v1_l0[] = { // 0x080F515C - PALETTE(98, 16, 0xA0) - TILES(0x13981, 20) - SHOW_FRAME(4, 1) + PALETTE(98, 16, 0xA0) TILES(0x13981, 20) SHOW_FRAME(4, 1) - TILES(0x13995, 30) - SHOW_FRAME(4, 2) + TILES(0x13995, 30) SHOW_FRAME(4, 2) - TILES(0x139B3, 24) - SHOW_FRAME(4, 3) + TILES(0x139B3, 24) SHOW_FRAME(4, 3) - TILES(0x13995, 30) - SHOW_FRAME(3, 2) + TILES(0x13995, 30) SHOW_FRAME(3, 2) - TILES(0x13981, 20) - SHOW_FRAME(3, 1) + TILES(0x13981, 20) SHOW_FRAME(3, 1) - TILES(0x139CB, 20) - SHOW_FRAME(4, 4) + TILES(0x139CB, 20) SHOW_FRAME(4, 4) - TILES(0x139DF, 20) - SHOW_FRAME(4, 5) + TILES(0x139DF, 20) SHOW_FRAME(4, 5) - TILES(0x139F3, 20) - SHOW_FRAME(4, 6) + TILES(0x139F3, 20) SHOW_FRAME(4, 6) - TILES(0x13A07, 20) - SHOW_FRAME(12, 7) + TILES(0x13A07, 20) SHOW_FRAME(12, 7) - END() + END() }; -const s32 * const anim_0631[2] = { +const s32 *const anim_0631[2] = { anim_0631__v0_l0, anim_0631__v1_l0, }; const s32 anim_0632__v0_l0[] = { // 0x080F5228 - PALETTE(98, 16, 0xA0) - TILES(0x13A1B, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(98, 16, 0xA0) TILES(0x13A1B, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) - TILES(0x13A2F, 20) - SHOW_FRAME(4, 1) + TILES(0x13A2F, 20) SHOW_FRAME(4, 1) - TILES(0x13A43, 20) - SHOW_FRAME(4, 2) + TILES(0x13A43, 20) SHOW_FRAME(4, 2) - TILES(0x13A57, 20) - SHOW_FRAME(4, 3) + TILES(0x13A57, 20) SHOW_FRAME(4, 3) - TILES(0x13A6B, 16) - SHOW_FRAME(4, 4) + TILES(0x13A6B, 16) SHOW_FRAME(4, 4) - TILES(0x13A7B, 20) - SHOW_FRAME(4, 5) + TILES(0x13A7B, 20) SHOW_FRAME(4, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0632[1] = { +const s32 *const anim_0632[1] = { anim_0632__v0_l0, }; const s32 anim_0633__v0_l0[] = { // 0x080F52C4 - PALETTE(98, 16, 0xA0) - TILES(0x13A8F, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(98, 16, 0xA0) TILES(0x13A8F, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 0) - TILES(0x13AA3, 20) - SHOW_FRAME(1, 1) + TILES(0x13AA3, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0633[1] = { +const s32 *const anim_0633[1] = { anim_0633__v0_l0, }; const s32 anim_0634__v0_l0[] = { // 0x080F530C - PALETTE(98, 16, 0xA0) - TILES(0x13AB7, 25) - SHOW_FRAME(3, 0) + PALETTE(98, 16, 0xA0) TILES(0x13AB7, 25) SHOW_FRAME(3, 0) - TILES(0x13AD0, 20) - SHOW_FRAME(3, 1) + TILES(0x13AD0, 20) SHOW_FRAME(3, 1) - TILES(0x13AE4, 20) - SHOW_FRAME(3, 2) + TILES(0x13AE4, 20) SHOW_FRAME(3, 2) - TILES(0x13AF8, 20) - SHOW_FRAME(3, 3) + TILES(0x13AF8, 20) SHOW_FRAME(3, 3) - TILES(0x13B0C, 15) - SHOW_FRAME(3, 4) + TILES(0x13B0C, 15) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0634[1] = { +const s32 *const anim_0634[1] = { anim_0634__v0_l0, }; const s32 anim_0635__v0_l0[] = { // 0x080F5384 - PALETTE(98, 16, 0xA0) - TILES(0x13B1B, 20) - SHOW_FRAME(3, 0) + PALETTE(98, 16, 0xA0) TILES(0x13B1B, 20) SHOW_FRAME(3, 0) - TILES(0x13B2F, 15) - SHOW_FRAME(3, 1) + TILES(0x13B2F, 15) SHOW_FRAME(3, 1) - TILES(0x13B3E, 15) - SHOW_FRAME(3, 2) + TILES(0x13B3E, 15) SHOW_FRAME(3, 2) - TILES(0x13B4D, 20) - SHOW_FRAME(3, 3) + TILES(0x13B4D, 20) SHOW_FRAME(3, 3) - TILES(0x13B61, 20) - SHOW_FRAME(3, 4) + TILES(0x13B61, 20) SHOW_FRAME(3, 4) - TILES(0x13B75, 16) - SHOW_FRAME(3, 5) + TILES(0x13B75, 16) SHOW_FRAME(3, 5) - END() + END() }; -const s32 * const anim_0635[1] = { +const s32 *const anim_0635[1] = { anim_0635__v0_l0, }; const s32 anim_0636__v0_l0[] = { // 0x080F5410 - PALETTE(98, 16, 0xA0) - TILES(0x13B85, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(98, 16, 0xA0) TILES(0x13B85, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x13B95, 16) - SHOW_FRAME(2, 1) + TILES(0x13B95, 16) SHOW_FRAME(2, 1) - TILES(0x13BA5, 16) - SHOW_FRAME(2, 2) + TILES(0x13BA5, 16) SHOW_FRAME(2, 2) - TILES(0x13BB5, 16) - SHOW_FRAME(2, 3) + TILES(0x13BB5, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0636[1] = { +const s32 *const anim_0636[1] = { anim_0636__v0_l0, }; const s32 anim_0637__v0_l0[] = { // 0x080F5490 - PALETTE(98, 16, 0xA0) - TILES(0x13BC5, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(98, 16, 0xA0) TILES(0x13BC5, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x13BD5, 16) - SHOW_FRAME(2, 1) + TILES(0x13BD5, 16) SHOW_FRAME(2, 1) - TILES(0x13BE5, 16) - SHOW_FRAME(2, 2) + TILES(0x13BE5, 16) SHOW_FRAME(2, 2) - TILES(0x13BF5, 16) - SHOW_FRAME(2, 3) + TILES(0x13BF5, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; const s32 anim_0637__v1_l0[] = { // 0x080F550C - PALETTE(98, 16, 0xA0) - TILES(0x13C05, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 4) + PALETTE(98, 16, 0xA0) TILES(0x13C05, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 4) - TILES(0x13C15, 16) - SHOW_FRAME(2, 5) + TILES(0x13C15, 16) SHOW_FRAME(2, 5) - TILES(0x13C25, 16) - SHOW_FRAME(2, 6) + TILES(0x13C25, 16) SHOW_FRAME(2, 6) - TILES(0x13C35, 16) - SHOW_FRAME(2, 7) + TILES(0x13C35, 16) SHOW_FRAME(2, 7) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0637[2] = { +const s32 *const anim_0637[2] = { anim_0637__v0_l0, anim_0637__v1_l0, }; const s32 anim_0638__v0_l0[] = { // 0x080F5590 - PALETTE(98, 16, 0xA0) - TILES(0x13C45, 24) - HITBOX(0, -12, -8, 10, 6) - HITBOX(1, -24, -10, 0, 13) - SHOW_FRAME(3, 0) + PALETTE(98, 16, 0xA0) TILES(0x13C45, 24) HITBOX(0, -12, -8, 10, 6) HITBOX(1, -24, -10, 0, 13) SHOW_FRAME(3, 0) - TILES(0x13C5D, 24) - SHOW_FRAME(3, 1) + TILES(0x13C5D, 24) SHOW_FRAME(3, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0638[1] = { +const s32 *const anim_0638[1] = { anim_0638__v0_l0, }; const s32 anim_0639__v0_l0[] = { // 0x080F55E8 - PALETTE(98, 16, 0xA0) - TILES(0x13C75, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 0) + PALETTE(98, 16, 0xA0) TILES(0x13C75, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0639__v1_l0[] = { // 0x080F5618 - PALETTE(98, 16, 0xA0) - TILES(0x13C8D, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 1) + PALETTE(98, 16, 0xA0) TILES(0x13C8D, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0639__v2_l0[] = { // 0x080F5648 - PALETTE(98, 16, 0xA0) - TILES(0x13CA5, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 2) + PALETTE(98, 16, 0xA0) TILES(0x13CA5, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0639__v3_l0[] = { // 0x080F5678 - PALETTE(98, 16, 0xA0) - TILES(0x13CBD, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 3) + PALETTE(98, 16, 0xA0) TILES(0x13CBD, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0639[4] = { +const s32 *const anim_0639[4] = { anim_0639__v0_l0, anim_0639__v1_l0, anim_0639__v2_l0, @@ -18380,387 +12927,265 @@ const s32 * const anim_0639[4] = { }; const s32 anim_0640__v0_l0[] = { // 0x080F56B8 - PALETTE(98, 16, 0xA0) - TILES(0x13CD5, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 0) + PALETTE(98, 16, 0xA0) TILES(0x13CD5, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 0) - TILES(0x13CE9, 25) - SHOW_FRAME(3, 1) + TILES(0x13CE9, 25) SHOW_FRAME(3, 1) - TILES(0x13D02, 30) - SHOW_FRAME(3, 2) + TILES(0x13D02, 30) SHOW_FRAME(3, 2) - TILES(0x13D20, 30) - SHOW_FRAME(3, 3) + TILES(0x13D20, 30) SHOW_FRAME(3, 3) - TILES(0x13D3E, 30) - SHOW_FRAME(3, 4) + TILES(0x13D3E, 30) SHOW_FRAME(3, 4) - TILES(0x13D5C, 30) - SHOW_FRAME(3, 5) + TILES(0x13D5C, 30) SHOW_FRAME(3, 5) - TILES(0x13D7A, 30) - SHOW_FRAME(3, 6) + TILES(0x13D7A, 30) SHOW_FRAME(3, 6) - END() + END() }; const s32 anim_0640__v1_l0[] = { // 0x080F5760 - PALETTE(98, 16, 0xA0) - TILES(0x13D98, 30) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 7) + PALETTE(98, 16, 0xA0) TILES(0x13D98, 30) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 7) - TILES(0x13DB6, 16) - HITBOX(0, -6, -6, 6, 16) - SHOW_FRAME(1, 8) + TILES(0x13DB6, 16) HITBOX(0, -6, -6, 6, 16) SHOW_FRAME(1, 8) - TILES(0x13DC6, 16) - SHOW_FRAME(1, 9) + TILES(0x13DC6, 16) SHOW_FRAME(1, 9) - TILES(0x13DD6, 16) - SHOW_FRAME(6, 10) + TILES(0x13DD6, 16) SHOW_FRAME(6, 10) - TILES(0x13DC6, 16) - SHOW_FRAME(1, 9) + TILES(0x13DC6, 16) SHOW_FRAME(1, 9) - TILES(0x13DB6, 16) - SHOW_FRAME(1, 8) + TILES(0x13DB6, 16) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0640[2] = { +const s32 *const anim_0640[2] = { anim_0640__v0_l0, anim_0640__v1_l0, }; const s32 anim_0641__v0_l0[] = { // 0x080F5808 - PALETTE(98, 16, 0xA0) - TILES(0x13DE6, 15) - HITBOX(0, -11, -6, 15, 7) - SHOW_FRAME(2, 0) + PALETTE(98, 16, 0xA0) TILES(0x13DE6, 15) HITBOX(0, -11, -6, 15, 7) SHOW_FRAME(2, 0) - TILES(0x13DF5, 15) - SHOW_FRAME(2, 1) + TILES(0x13DF5, 15) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0641[1] = { +const s32 *const anim_0641[1] = { anim_0641__v0_l0, }; const s32 anim_0642__v0_l0[] = { // 0x080F5854 - PALETTE(98, 16, 0xA0) - TILES(0x13E04, 16) - HITBOX(0, -8, -6, 8, 16) - PLAY_SOUND(132) - SHOW_FRAME(1, 0) + PALETTE(98, 16, 0xA0) TILES(0x13E04, 16) HITBOX(0, -8, -6, 8, 16) PLAY_SOUND(132) SHOW_FRAME(1, 0) - TILES(0x13E14, 16) - SHOW_FRAME(1, 1) + TILES(0x13E14, 16) SHOW_FRAME(1, 1) - TILES(0x13E24, 12) - SHOW_FRAME(1, 2) + TILES(0x13E24, 12) SHOW_FRAME(1, 2) - TILES(0x13E30, 16) - SHOW_FRAME(30, 3) + TILES(0x13E30, 16) SHOW_FRAME(30, 3) - TILES(0x13E14, 16) - SHOW_FRAME(1, 1) + TILES(0x13E14, 16) SHOW_FRAME(1, 1) - TILES(0x13E04, 16) - SHOW_FRAME(1, 0) + TILES(0x13E04, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0642[1] = { +const s32 *const anim_0642[1] = { anim_0642__v0_l0, }; const s32 anim_0643__v0_l0[] = { // 0x080F58F4 - PALETTE(98, 16, 0xA0) - TILES(0x13E40, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 0) + PALETTE(98, 16, 0xA0) TILES(0x13E40, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 0) - TILES(0x13E54, 30) - SHOW_FRAME(2, 1) + TILES(0x13E54, 30) SHOW_FRAME(2, 1) - TILES(0x13E72, 30) - HITBOX(0, -16, -14, 0, 16) - HITBOX(1, -32, -12, -4, 16) - PLAY_SOUND(126) - SHOW_FRAME(2, 2) + TILES(0x13E72, 30) HITBOX(0, -16, -14, 0, 16) HITBOX(1, -32, -12, -4, 16) PLAY_SOUND(126) SHOW_FRAME(2, 2) - TILES(0x13E90, 35) - HITBOX(0, -16, -14, 0, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(4, 3) + TILES(0x13E90, 35) HITBOX(0, -16, -14, 0, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(4, 3) - TILES(0x13E54, 30) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 1) + TILES(0x13E54, 30) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 1) - TILES(0x13E40, 20) - SHOW_FRAME(2, 0) + TILES(0x13E40, 20) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0643__v1_l0[] = { // 0x080F59CC - PALETTE(98, 16, 0xA0) - TILES(0x13EB3, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 4) + PALETTE(98, 16, 0xA0) TILES(0x13EB3, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 4) - TILES(0x13EC7, 20) - SHOW_FRAME(2, 5) + TILES(0x13EC7, 20) SHOW_FRAME(2, 5) - TILES(0x13EDB, 35) - HITBOX(0, -16, -14, 0, 16) - HITBOX(1, -32, -12, -4, 16) - PLAY_SOUND(126) - SHOW_FRAME(2, 6) + TILES(0x13EDB, 35) HITBOX(0, -16, -14, 0, 16) HITBOX(1, -32, -12, -4, 16) PLAY_SOUND(126) SHOW_FRAME(2, 6) - TILES(0x13EFE, 35) - HITBOX(0, -16, -13, 0, 16) - HITBOX(1, 0, 0, 0, 0) - SHOW_FRAME(6, 7) + TILES(0x13EFE, 35) HITBOX(0, -16, -13, 0, 16) HITBOX(1, 0, 0, 0, 0) SHOW_FRAME(6, 7) - TILES(0x13EC7, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(2, 5) + TILES(0x13EC7, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(2, 5) - TILES(0x13EB3, 20) - SHOW_FRAME(2, 4) + TILES(0x13EB3, 20) SHOW_FRAME(2, 4) - END() + END() }; -const s32 * const anim_0643[2] = { +const s32 *const anim_0643[2] = { anim_0643__v0_l0, anim_0643__v1_l0, }; const s32 anim_0644__v0_l0[] = { // 0x080F5AAC - PALETTE(99, 16, 0xB0) - TILES(0x13F21, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(99, 16, 0xB0) TILES(0x13F21, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) - TILES(0x13F35, 20) - SHOW_FRAME(3, 1) + TILES(0x13F35, 20) SHOW_FRAME(3, 1) - TILES(0x13F49, 25) - SHOW_FRAME(3, 2) + TILES(0x13F49, 25) SHOW_FRAME(3, 2) - TILES(0x13F62, 20) - SHOW_FRAME(3, 3) + TILES(0x13F62, 20) SHOW_FRAME(3, 3) - TILES(0x13F76, 25) - SHOW_FRAME(4, 4) + TILES(0x13F76, 25) SHOW_FRAME(4, 4) - TILES(0x13F8F, 25) - SHOW_FRAME(4, 5) + TILES(0x13F8F, 25) SHOW_FRAME(4, 5) - JUMP_BACK(36) + JUMP_BACK(36) }; -const s32 * const anim_0644[1] = { +const s32 *const anim_0644[1] = { anim_0644__v0_l0, }; const s32 anim_0645__v0_l0[] = { // 0x080F5B48 - PALETTE(100, 16, 0xB0) - TILES(0x13FA8, 20) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 0) + PALETTE(100, 16, 0xB0) TILES(0x13FA8, 20) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 0) - TILES(0x13FBC, 20) - SHOW_FRAME(1, 1) + TILES(0x13FBC, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0645[1] = { +const s32 *const anim_0645[1] = { anim_0645__v0_l0, }; const s32 anim_0646__v0_l0[] = { // 0x080F5B90 - PALETTE(100, 16, 0xB0) - TILES(0x13FD0, 25) - SHOW_FRAME(3, 0) + PALETTE(100, 16, 0xB0) TILES(0x13FD0, 25) SHOW_FRAME(3, 0) - TILES(0x13FE9, 20) - SHOW_FRAME(3, 1) + TILES(0x13FE9, 20) SHOW_FRAME(3, 1) - TILES(0x13FFD, 20) - SHOW_FRAME(3, 2) + TILES(0x13FFD, 20) SHOW_FRAME(3, 2) - TILES(0x14011, 20) - SHOW_FRAME(3, 3) + TILES(0x14011, 20) SHOW_FRAME(3, 3) - TILES(0x14025, 15) - SHOW_FRAME(3, 4) + TILES(0x14025, 15) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0646[1] = { +const s32 *const anim_0646[1] = { anim_0646__v0_l0, }; const s32 anim_0647__v0_l0[] = { // 0x080F5C08 - PALETTE(100, 16, 0xB0) - TILES(0x14034, 20) - SHOW_FRAME(3, 0) + PALETTE(100, 16, 0xB0) TILES(0x14034, 20) SHOW_FRAME(3, 0) - TILES(0x14048, 15) - SHOW_FRAME(3, 1) + TILES(0x14048, 15) SHOW_FRAME(3, 1) - TILES(0x14057, 15) - SHOW_FRAME(3, 2) + TILES(0x14057, 15) SHOW_FRAME(3, 2) - TILES(0x14066, 20) - SHOW_FRAME(3, 3) + TILES(0x14066, 20) SHOW_FRAME(3, 3) - TILES(0x1407A, 20) - SHOW_FRAME(3, 4) + TILES(0x1407A, 20) SHOW_FRAME(3, 4) - TILES(0x1408E, 16) - SHOW_FRAME(3, 5) + TILES(0x1408E, 16) SHOW_FRAME(3, 5) - END() + END() }; -const s32 * const anim_0647[1] = { +const s32 *const anim_0647[1] = { anim_0647__v0_l0, }; const s32 anim_0648__v0_l0[] = { // 0x080F5C94 - PALETTE(100, 16, 0xB0) - TILES(0x1409E, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(100, 16, 0xB0) TILES(0x1409E, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x140AE, 16) - SHOW_FRAME(2, 1) + TILES(0x140AE, 16) SHOW_FRAME(2, 1) - TILES(0x140BE, 16) - SHOW_FRAME(2, 2) + TILES(0x140BE, 16) SHOW_FRAME(2, 2) - TILES(0x140CE, 16) - SHOW_FRAME(2, 3) + TILES(0x140CE, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0648[1] = { +const s32 *const anim_0648[1] = { anim_0648__v0_l0, }; const s32 anim_0649__v0_l0[] = { // 0x080F5D14 - PALETTE(100, 16, 0xB0) - TILES(0x140DE, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 0) + PALETTE(100, 16, 0xB0) TILES(0x140DE, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 0) - TILES(0x140EE, 16) - SHOW_FRAME(2, 1) + TILES(0x140EE, 16) SHOW_FRAME(2, 1) - TILES(0x140FE, 16) - SHOW_FRAME(2, 2) + TILES(0x140FE, 16) SHOW_FRAME(2, 2) - TILES(0x1410E, 16) - SHOW_FRAME(2, 3) + TILES(0x1410E, 16) SHOW_FRAME(2, 3) - JUMP_BACK(29) + JUMP_BACK(29) }; const s32 anim_0649__v1_l0[] = { // 0x080F5D90 - PALETTE(100, 16, 0xB0) - TILES(0x1411E, 16) - HITBOX(0, -8, -8, 8, 8) - HITBOX(1, -8, -8, 8, 8) - SHOW_FRAME(2, 4) + PALETTE(100, 16, 0xB0) TILES(0x1411E, 16) HITBOX(0, -8, -8, 8, 8) HITBOX(1, -8, -8, 8, 8) SHOW_FRAME(2, 4) - TILES(0x1412E, 16) - SHOW_FRAME(2, 5) + TILES(0x1412E, 16) SHOW_FRAME(2, 5) - TILES(0x1413E, 16) - SHOW_FRAME(2, 6) + TILES(0x1413E, 16) SHOW_FRAME(2, 6) - TILES(0x1414E, 16) - SHOW_FRAME(2, 7) + TILES(0x1414E, 16) SHOW_FRAME(2, 7) - JUMP_BACK(29) + JUMP_BACK(29) }; -const s32 * const anim_0649[2] = { +const s32 *const anim_0649[2] = { anim_0649__v0_l0, anim_0649__v1_l0, }; const s32 anim_0650__v0_l0[] = { // 0x080F5E14 - PALETTE(100, 16, 0xB0) - TILES(0x1415E, 24) - HITBOX(0, -12, -8, 10, 6) - HITBOX(1, -24, -10, 0, 13) - SHOW_FRAME(3, 0) + PALETTE(100, 16, 0xB0) TILES(0x1415E, 24) HITBOX(0, -12, -8, 10, 6) HITBOX(1, -24, -10, 0, 13) SHOW_FRAME(3, 0) - TILES(0x14176, 24) - SHOW_FRAME(3, 1) + TILES(0x14176, 24) SHOW_FRAME(3, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0650[1] = { +const s32 *const anim_0650[1] = { anim_0650__v0_l0, }; const s32 anim_0651__v0_l0[] = { // 0x080F5E6C - PALETTE(100, 16, 0xB0) - TILES(0x1418E, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 0) + PALETTE(100, 16, 0xB0) TILES(0x1418E, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0651__v1_l0[] = { // 0x080F5E9C - PALETTE(100, 16, 0xB0) - TILES(0x141A6, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 1) + PALETTE(100, 16, 0xB0) TILES(0x141A6, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0651__v2_l0[] = { // 0x080F5ECC - PALETTE(100, 16, 0xB0) - TILES(0x141BE, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 2) + PALETTE(100, 16, 0xB0) TILES(0x141BE, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0651__v3_l0[] = { // 0x080F5EFC - PALETTE(100, 16, 0xB0) - TILES(0x141D6, 24) - HITBOX(0, -12, -8, 10, 6) - SHOW_FRAME(1, 3) + PALETTE(100, 16, 0xB0) TILES(0x141D6, 24) HITBOX(0, -12, -8, 10, 6) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0651[4] = { +const s32 *const anim_0651[4] = { anim_0651__v0_l0, anim_0651__v1_l0, anim_0651__v2_l0, @@ -18768,443 +13193,311 @@ const s32 * const anim_0651[4] = { }; const s32 anim_0652__v0_l0[] = { // 0x080F5F3C - PALETTE(100, 16, 0xB0) - TILES(0x141EE, 20) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 0) + PALETTE(100, 16, 0xB0) TILES(0x141EE, 20) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 0) - TILES(0x14202, 25) - SHOW_FRAME(3, 1) + TILES(0x14202, 25) SHOW_FRAME(3, 1) - TILES(0x1421B, 30) - SHOW_FRAME(3, 2) + TILES(0x1421B, 30) SHOW_FRAME(3, 2) - TILES(0x14239, 30) - SHOW_FRAME(3, 3) + TILES(0x14239, 30) SHOW_FRAME(3, 3) - TILES(0x14257, 30) - SHOW_FRAME(3, 4) + TILES(0x14257, 30) SHOW_FRAME(3, 4) - TILES(0x14275, 30) - SHOW_FRAME(3, 5) + TILES(0x14275, 30) SHOW_FRAME(3, 5) - TILES(0x14293, 30) - SHOW_FRAME(3, 6) + TILES(0x14293, 30) SHOW_FRAME(3, 6) - END() + END() }; const s32 anim_0652__v1_l0[] = { // 0x080F5FE4 - PALETTE(100, 16, 0xB0) - TILES(0x142B1, 30) - HITBOX(0, -6, -16, 6, 14) - SHOW_FRAME(3, 7) + PALETTE(100, 16, 0xB0) TILES(0x142B1, 30) HITBOX(0, -6, -16, 6, 14) SHOW_FRAME(3, 7) - TILES(0x142CF, 16) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(1, 8) + TILES(0x142CF, 16) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(1, 8) - TILES(0x142DF, 16) - SHOW_FRAME(1, 9) + TILES(0x142DF, 16) SHOW_FRAME(1, 9) - TILES(0x142EF, 16) - SHOW_FRAME(6, 10) + TILES(0x142EF, 16) SHOW_FRAME(6, 10) - TILES(0x142DF, 16) - SHOW_FRAME(1, 9) + TILES(0x142DF, 16) SHOW_FRAME(1, 9) - TILES(0x142CF, 16) - SHOW_FRAME(1, 8) + TILES(0x142CF, 16) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0652[2] = { +const s32 *const anim_0652[2] = { anim_0652__v0_l0, anim_0652__v1_l0, }; const s32 anim_0653__v0_l0[] = { // 0x080F608C - PALETTE(100, 16, 0xB0) - TILES(0x142FF, 15) - HITBOX(0, -11, -6, 15, 7) - SHOW_FRAME(2, 0) + PALETTE(100, 16, 0xB0) TILES(0x142FF, 15) HITBOX(0, -11, -6, 15, 7) SHOW_FRAME(2, 0) - TILES(0x1430E, 15) - SHOW_FRAME(2, 1) + TILES(0x1430E, 15) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0653[1] = { +const s32 *const anim_0653[1] = { anim_0653__v0_l0, }; const s32 anim_0654__v0_l0[] = { // 0x080F60D8 - PALETTE(99, 16, 0xB0) - TILES(0x1431D, 16) - HITBOX(0, -8, -6, 8, 16) - PLAY_SOUND(132) - SHOW_FRAME(1, 0) + PALETTE(99, 16, 0xB0) TILES(0x1431D, 16) HITBOX(0, -8, -6, 8, 16) PLAY_SOUND(132) SHOW_FRAME(1, 0) - TILES(0x1432D, 16) - SHOW_FRAME(1, 1) + TILES(0x1432D, 16) SHOW_FRAME(1, 1) - TILES(0x1433D, 12) - SHOW_FRAME(1, 2) + TILES(0x1433D, 12) SHOW_FRAME(1, 2) - TILES(0x14349, 16) - SHOW_FRAME(30, 3) + TILES(0x14349, 16) SHOW_FRAME(30, 3) - TILES(0x1432D, 16) - SHOW_FRAME(1, 1) + TILES(0x1432D, 16) SHOW_FRAME(1, 1) - TILES(0x1431D, 16) - SHOW_FRAME(1, 0) + TILES(0x1431D, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0654[1] = { +const s32 *const anim_0654[1] = { anim_0654__v0_l0, }; const s32 anim_0655__v0_l0[] = { // 0x080F6178 - PALETTE(100, 16, 0xB0) - TILES(0x14359, 16) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(4, 0) + PALETTE(100, 16, 0xB0) TILES(0x14359, 16) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(4, 0) - TILES(0x14369, 16) - SHOW_FRAME(6, 1) + TILES(0x14369, 16) SHOW_FRAME(6, 1) - TILES(0x14379, 24) - SHOW_FRAME(18, 2) + TILES(0x14379, 24) SHOW_FRAME(18, 2) - END() + END() }; const s32 anim_0655__v1_l0[] = { // 0x080F61D0 - PALETTE(100, 16, 0xB0) - TILES(0x14391, 25) - HITBOX(0, -6, -14, 6, 16) - SHOW_FRAME(12, 3) + PALETTE(100, 16, 0xB0) TILES(0x14391, 25) HITBOX(0, -6, -14, 6, 16) SHOW_FRAME(12, 3) - TILES(0x143AA, 25) - SHOW_FRAME(4, 4) + TILES(0x143AA, 25) SHOW_FRAME(4, 4) - TILES(0x143C3, 20) - SHOW_FRAME(4, 5) + TILES(0x143C3, 20) SHOW_FRAME(4, 5) - TILES(0x143D7, 25) - SHOW_FRAME(6, 6) + TILES(0x143D7, 25) SHOW_FRAME(6, 6) - TILES(0x143F0, 20) - SHOW_FRAME(10, 7) + TILES(0x143F0, 20) SHOW_FRAME(10, 7) - END() + END() }; -const s32 * const anim_0655[2] = { +const s32 *const anim_0655[2] = { anim_0655__v0_l0, anim_0655__v1_l0, }; const s32 anim_0656__v0_l0[] = { // 0x080F6258 - PALETTE(101, 16, 0xC0) - TILES(0x14404, 64) - HITBOX(0, -21, -5, 8, 5) - SHOW_FRAME(2, 0) + PALETTE(101, 16, 0xC0) TILES(0x14404, 64) HITBOX(0, -21, -5, 8, 5) SHOW_FRAME(2, 0) - TILES(0x14444, 64) - SHOW_FRAME(2, 1) + TILES(0x14444, 64) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0656[1] = { +const s32 *const anim_0656[1] = { anim_0656__v0_l0, }; const s32 anim_0657__v0_l0[] = { // 0x080F62A4 - PALETTE(100, 16, 0xB0) - TILES(0x14484, 64) - SHOW_FRAME(3, 0) + PALETTE(100, 16, 0xB0) TILES(0x14484, 64) SHOW_FRAME(3, 0) - TILES(0x144C4, 64) - SHOW_FRAME(3, 1) + TILES(0x144C4, 64) SHOW_FRAME(3, 1) - TILES(0x14504, 64) - SHOW_FRAME(3, 2) + TILES(0x14504, 64) SHOW_FRAME(3, 2) - TILES(0x14544, 64) - SHOW_FRAME(3, 3) + TILES(0x14544, 64) SHOW_FRAME(3, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; const s32 anim_0657__v1_l0[] = { // 0x080F6308 - PALETTE(100, 16, 0xB0) - TILES(0x14584, 15) - SHOW_FRAME(3, 4) + PALETTE(100, 16, 0xB0) TILES(0x14584, 15) SHOW_FRAME(3, 4) - TILES(0x14593, 15) - SHOW_FRAME(3, 5) + TILES(0x14593, 15) SHOW_FRAME(3, 5) - END() + END() }; -const s32 * const anim_0657[2] = { +const s32 *const anim_0657[2] = { anim_0657__v0_l0, anim_0657__v1_l0, }; const s32 anim_0658__v0_l0[] = { // 0x080F6348 - PALETTE(100, 16, 0xB0) - TILES(0x145A2, 16) - SHOW_FRAME(1, 0) + PALETTE(100, 16, 0xB0) TILES(0x145A2, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0658__v1_l0[] = { // 0x080F636C - PALETTE(100, 16, 0xB0) - TILES(0x145B2, 16) - SHOW_FRAME(1, 1) + PALETTE(100, 16, 0xB0) TILES(0x145B2, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0658__v2_l0[] = { // 0x080F6390 - PALETTE(100, 16, 0xB0) - TILES(0x145C2, 16) - SHOW_FRAME(1, 2) + PALETTE(100, 16, 0xB0) TILES(0x145C2, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0658__v3_l0[] = { // 0x080F63B4 - PALETTE(100, 16, 0xB0) - TILES(0x145D2, 16) - SHOW_FRAME(1, 3) + PALETTE(100, 16, 0xB0) TILES(0x145D2, 16) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0658__v4_l0[] = { // 0x080F63D8 - PALETTE(100, 16, 0xB0) - TILES(0x145E2, 16) - SHOW_FRAME(1, 4) + PALETTE(100, 16, 0xB0) TILES(0x145E2, 16) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0658__v5_l0[] = { // 0x080F63FC - PALETTE(100, 16, 0xB0) - TILES(0x145F2, 16) - SHOW_FRAME(1, 5) + PALETTE(100, 16, 0xB0) TILES(0x145F2, 16) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0658[6] = { - anim_0658__v0_l0, - anim_0658__v1_l0, - anim_0658__v2_l0, - anim_0658__v3_l0, - anim_0658__v4_l0, - anim_0658__v5_l0, +const s32 *const anim_0658[6] = { + anim_0658__v0_l0, anim_0658__v1_l0, anim_0658__v2_l0, anim_0658__v3_l0, anim_0658__v4_l0, anim_0658__v5_l0, }; const s32 anim_0659__v0_l0[] = { // 0x080F6438 - PALETTE(102, 16, 0xB0) - TILES(0x14602, 16) - HITBOX(0, -13, -13, 13, 13) - SHOW_FRAME(1, 0) + PALETTE(102, 16, 0xB0) TILES(0x14602, 16) HITBOX(0, -13, -13, 13, 13) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0659[1] = { +const s32 *const anim_0659[1] = { anim_0659__v0_l0, }; const s32 anim_0660__v0_l0[] = { // 0x080F646C - PALETTE(103, 16, 0x80) - TILES(0x14612, 8) - SHOW_FRAME(1, 0) + PALETTE(103, 16, 0x80) TILES(0x14612, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0660__v1_l0[] = { // 0x080F6490 - PALETTE(103, 16, 0x80) - TILES(0x1461A, 8) - SHOW_FRAME(6, 1) + PALETTE(103, 16, 0x80) TILES(0x1461A, 8) SHOW_FRAME(6, 1) - TILES(0x14622, 8) - SHOW_FRAME(6, 2) + TILES(0x14622, 8) SHOW_FRAME(6, 2) - TILES(0x1461A, 8) - SHOW_FRAME(6, 1) + TILES(0x1461A, 8) SHOW_FRAME(6, 1) - TILES(0x14622, 8) - SHOW_FRAME(6, 2) + TILES(0x14622, 8) SHOW_FRAME(6, 2) - TILES(0x1461A, 8) - SHOW_FRAME(6, 1) + TILES(0x1461A, 8) SHOW_FRAME(6, 1) - TILES(0x14622, 8) - SHOW_FRAME(6, 2) + TILES(0x14622, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0660__v2_l0[] = { // 0x080F6518 - PALETTE(103, 16, 0x80) - TILES(0x1462A, 8) - SHOW_FRAME(5, 3) + PALETTE(103, 16, 0x80) TILES(0x1462A, 8) SHOW_FRAME(5, 3) - TILES(0x14632, 8) - SHOW_FRAME(3, 4) + TILES(0x14632, 8) SHOW_FRAME(3, 4) - TILES(0x1462A, 8) - SHOW_FRAME(5, 3) + TILES(0x1462A, 8) SHOW_FRAME(5, 3) - TILES(0x14632, 8) - SHOW_FRAME(3, 4) + TILES(0x14632, 8) SHOW_FRAME(3, 4) - TILES(0x1462A, 8) - SHOW_FRAME(5, 3) + TILES(0x1462A, 8) SHOW_FRAME(5, 3) - TILES(0x14632, 8) - SHOW_FRAME(3, 4) + TILES(0x14632, 8) SHOW_FRAME(3, 4) - END() + END() }; const s32 anim_0660__v3_l0[] = { // 0x080F65A0 - PALETTE(103, 16, 0x80) - TILES(0x1463A, 8) - SHOW_FRAME(1, 5) + PALETTE(103, 16, 0x80) TILES(0x1463A, 8) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0660__v4_l0[] = { // 0x080F65C4 - PALETTE(103, 16, 0x80) - TILES(0x14642, 8) - SHOW_FRAME(6, 6) + PALETTE(103, 16, 0x80) TILES(0x14642, 8) SHOW_FRAME(6, 6) - TILES(0x1464A, 8) - SHOW_FRAME(6, 7) + TILES(0x1464A, 8) SHOW_FRAME(6, 7) - TILES(0x14642, 8) - SHOW_FRAME(6, 6) + TILES(0x14642, 8) SHOW_FRAME(6, 6) - TILES(0x1464A, 8) - SHOW_FRAME(6, 7) + TILES(0x1464A, 8) SHOW_FRAME(6, 7) - TILES(0x14642, 8) - SHOW_FRAME(6, 6) + TILES(0x14642, 8) SHOW_FRAME(6, 6) - TILES(0x1464A, 8) - SHOW_FRAME(6, 7) + TILES(0x1464A, 8) SHOW_FRAME(6, 7) - END() + END() }; const s32 anim_0660__v5_l0[] = { // 0x080F664C - PALETTE(103, 16, 0x80) - TILES(0x14652, 8) - SHOW_FRAME(5, 8) + PALETTE(103, 16, 0x80) TILES(0x14652, 8) SHOW_FRAME(5, 8) - TILES(0x1465A, 8) - SHOW_FRAME(3, 9) + TILES(0x1465A, 8) SHOW_FRAME(3, 9) - TILES(0x14652, 8) - SHOW_FRAME(5, 8) + TILES(0x14652, 8) SHOW_FRAME(5, 8) - TILES(0x1465A, 8) - SHOW_FRAME(3, 9) + TILES(0x1465A, 8) SHOW_FRAME(3, 9) - TILES(0x14652, 8) - SHOW_FRAME(5, 8) + TILES(0x14652, 8) SHOW_FRAME(5, 8) - TILES(0x1465A, 8) - SHOW_FRAME(3, 9) + TILES(0x1465A, 8) SHOW_FRAME(3, 9) - END() + END() }; -const s32 * const anim_0660[6] = { - anim_0660__v0_l0, - anim_0660__v1_l0, - anim_0660__v2_l0, - anim_0660__v3_l0, - anim_0660__v4_l0, - anim_0660__v5_l0, +const s32 *const anim_0660[6] = { + anim_0660__v0_l0, anim_0660__v1_l0, anim_0660__v2_l0, anim_0660__v3_l0, anim_0660__v4_l0, anim_0660__v5_l0, }; const s32 anim_0661__v0_l0[] = { // 0x080F66EC - PALETTE(104, 16, 0xA0) - TILES(0x14662, 4) - SHOW_FRAME(1, 0) + PALETTE(104, 16, 0xA0) TILES(0x14662, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0661[1] = { +const s32 *const anim_0661[1] = { anim_0661__v0_l0, }; const s32 anim_0662__v0_l0[] = { // 0x080F6714 - PALETTE(104, 16, 0xA0) - TILES(0x14666, 48) - HITBOX(0, 0, 0, 0, 0) - HITBOX(1, -24, -24, 24, 24) - SHOW_FRAME(4, 0) + PALETTE(104, 16, 0xA0) TILES(0x14666, 48) HITBOX(0, 0, 0, 0, 0) HITBOX(1, -24, -24, 24, 24) SHOW_FRAME(4, 0) - TILES(0x14666, 48) - SHOW_FRAME(4, 1) + TILES(0x14666, 48) SHOW_FRAME(4, 1) - END() + END() }; const s32 anim_0662__v1_l0[] = { // 0x080F6764 - PALETTE(104, 16, 0xA0) - TILES(0x14696, 48) - HITBOX(0, 0, 0, 0, 0) - HITBOX(1, -24, -24, 24, 24) - SHOW_FRAME(4, 2) + PALETTE(104, 16, 0xA0) TILES(0x14696, 48) HITBOX(0, 0, 0, 0, 0) HITBOX(1, -24, -24, 24, 24) SHOW_FRAME(4, 2) - TILES(0x14696, 48) - SHOW_FRAME(4, 3) + TILES(0x14696, 48) SHOW_FRAME(4, 3) - END() + END() }; const s32 anim_0662__v2_l0[] = { // 0x080F67B4 - PALETTE(104, 16, 0xA0) - TILES(0x146C6, 48) - HITBOX(0, -18, -32, 18, -12) - HITBOX(1, -24, -24, 24, 24) - SHOW_FRAME(5, 4) + PALETTE(104, 16, 0xA0) TILES(0x146C6, 48) HITBOX(0, -18, -32, 18, -12) HITBOX(1, -24, -24, 24, 24) SHOW_FRAME(5, 4) - END() + END() }; const s32 anim_0662__v3_l0[] = { // 0x080F67F0 - PALETTE(104, 16, 0xA0) - TILES(0x146C6, 48) - HITBOX(0, 0, 0, 0, 0) - HITBOX(1, -24, -24, 24, 24) - SHOW_FRAME(5, 5) + PALETTE(104, 16, 0xA0) TILES(0x146C6, 48) HITBOX(0, 0, 0, 0, 0) HITBOX(1, -24, -24, 24, 24) SHOW_FRAME(5, 5) - END() + END() }; -const s32 * const anim_0662[4] = { +const s32 *const anim_0662[4] = { anim_0662__v0_l0, anim_0662__v1_l0, anim_0662__v2_l0, @@ -19212,115 +13505,85 @@ const s32 * const anim_0662[4] = { }; const s32 anim_0663__v0_l0[] = { // 0x080F683C - PALETTE(104, 16, 0xA0) - TILES(0x146F6, 6) - SHOW_FRAME(4, 0) + PALETTE(104, 16, 0xA0) TILES(0x146F6, 6) SHOW_FRAME(4, 0) - TILES(0x146FC, 6) - SHOW_FRAME(4, 1) + TILES(0x146FC, 6) SHOW_FRAME(4, 1) - END() + END() }; -const s32 * const anim_0663[1] = { +const s32 *const anim_0663[1] = { anim_0663__v0_l0, }; const s32 anim_0664__v0_l0[] = { // 0x080F6878 - PALETTE(102, 16, 0xB0) - TILES(0x14702, 4) - HITBOX(0, -3, -3, 3, 3) - SHOW_FRAME(1, 0) + PALETTE(102, 16, 0xB0) TILES(0x14702, 4) HITBOX(0, -3, -3, 3, 3) SHOW_FRAME(1, 0) - TILES(0x14706, 4) - SHOW_FRAME(1, 1) + TILES(0x14706, 4) SHOW_FRAME(1, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0664[1] = { +const s32 *const anim_0664[1] = { anim_0664__v0_l0, }; const s32 anim_0665__v0_l0[] = { // 0x080F68C4 - PALETTE(105, 16, 0xB0) - TILES(0x1470A, 64) - HITBOX(0, -16, -24, 12, -4) - HITBOX(1, -16, -24, 12, 12) - SHOW_FRAME(1, 0) + PALETTE(105, 16, 0xB0) TILES(0x1470A, 64) HITBOX(0, -16, -24, 12, -4) HITBOX(1, -16, -24, 12, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0665__v1_l0[] = { // 0x080F6900 - PALETTE(105, 16, 0xB0) - TILES(0x1474A, 64) - HITBOX(0, -16, -24, 12, -4) - HITBOX(1, -16, -24, 12, 12) - SHOW_FRAME(1, 1) + PALETTE(105, 16, 0xB0) TILES(0x1474A, 64) HITBOX(0, -16, -24, 12, -4) HITBOX(1, -16, -24, 12, 12) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0665[2] = { +const s32 *const anim_0665[2] = { anim_0665__v0_l0, anim_0665__v1_l0, }; const s32 anim_0666__v0_l0[] = { // 0x080F6944 - PALETTE(106, 16, 0xA0) - TILES(0x80000000, 72) - HITBOX(0, 0, 0, 0, 0) - HITBOX(1, -24, -28, 24, 44) - SHOW_FRAME(4, 0) + PALETTE(106, 16, 0xA0) TILES(0x80000000, 72) HITBOX(0, 0, 0, 0, 0) HITBOX(1, -24, -28, 24, 44) SHOW_FRAME(4, 0) - TILES(0x80000048, 72) - SHOW_FRAME(4, 1) + TILES(0x80000048, 72) SHOW_FRAME(4, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0666[1] = { +const s32 *const anim_0666[1] = { anim_0666__v0_l0, }; const s32 anim_0667__v0_l0[] = { // 0x080F699C - PALETTE(106, 16, 0xA0) - TILES(0x1478A, 16) - SHOW_FRAME(1, 0) + PALETTE(106, 16, 0xA0) TILES(0x1478A, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0667__v1_l0[] = { // 0x080F69C0 - PALETTE(106, 16, 0xA0) - TILES(0x1479A, 16) - SHOW_FRAME(1, 1) + PALETTE(106, 16, 0xA0) TILES(0x1479A, 16) SHOW_FRAME(1, 1) - JUMP_BACK(8) + JUMP_BACK(8) }; const s32 anim_0667__v2_l0[] = { // 0x080F69E8 - PALETTE(106, 16, 0xA0) - TILES(0x147AA, 16) - HITBOX(1, -11, 0, 11, 9) - SHOW_FRAME(4, 2) + PALETTE(106, 16, 0xA0) TILES(0x147AA, 16) HITBOX(1, -11, 0, 11, 9) SHOW_FRAME(4, 2) - TILES(0x147BA, 16) - SHOW_FRAME(4, 3) + TILES(0x147BA, 16) SHOW_FRAME(4, 3) - JUMP_BACK(16) + JUMP_BACK(16) }; const s32 anim_0667__v3_l0[] = { // 0x080F6A30 - TILES(0x147CA, 16) - HITBOX(1, -14, 0, 7, 9) - SHOW_FRAME(1, 4) + TILES(0x147CA, 16) HITBOX(1, -14, 0, 7, 9) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0667[4] = { +const s32 *const anim_0667[4] = { anim_0667__v0_l0, anim_0667__v1_l0, anim_0667__v2_l0, @@ -19328,117 +13591,85 @@ const s32 * const anim_0667[4] = { }; const s32 anim_0668__v0_l0[] = { // 0x080F6A64 - PALETTE(106, 16, 0xA0) - TILES(0x147DA, 64) - SHOW_FRAME(4, 0) + PALETTE(106, 16, 0xA0) TILES(0x147DA, 64) SHOW_FRAME(4, 0) - TILES(0x1481A, 64) - SHOW_FRAME(4, 1) + TILES(0x1481A, 64) SHOW_FRAME(4, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0668__v1_l0[] = { // 0x080F6AA0 - PALETTE(106, 16, 0xA0) - TILES(0x1485A, 64) - SHOW_FRAME(4, 2) + PALETTE(106, 16, 0xA0) TILES(0x1485A, 64) SHOW_FRAME(4, 2) - TILES(0x1489A, 64) - SHOW_FRAME(4, 3) + TILES(0x1489A, 64) SHOW_FRAME(4, 3) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0668[2] = { +const s32 *const anim_0668[2] = { anim_0668__v0_l0, anim_0668__v1_l0, }; const s32 anim_0669__v0_l0[] = { // 0x080F6AE4 - PALETTE(106, 16, 0xA0) - TILES(0x148DA, 9) - SHOW_FRAME(1, 0) + PALETTE(106, 16, 0xA0) TILES(0x148DA, 9) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0669[1] = { +const s32 *const anim_0669[1] = { anim_0669__v0_l0, }; const s32 anim_0670__v0_l0[] = { // 0x080F6B0C - PALETTE(106, 16, 0xA0) - TILES(0x148E3, 3) - HITBOX(0, 0, -8, 8, 8) - HITBOX(1, 0, -8, 8, 8) - SHOW_FRAME(4, 0) + PALETTE(106, 16, 0xA0) TILES(0x148E3, 3) HITBOX(0, 0, -8, 8, 8) HITBOX(1, 0, -8, 8, 8) SHOW_FRAME(4, 0) - TILES(0x148E6, 3) - SHOW_FRAME(4, 1) + TILES(0x148E6, 3) SHOW_FRAME(4, 1) - END() + END() }; const s32 anim_0670__v1_l0[] = { // 0x080F6B5C - PALETTE(106, 16, 0xA0) - TILES(0x148E9, 8) - SHOW_FRAME(4, 2) + PALETTE(106, 16, 0xA0) TILES(0x148E9, 8) SHOW_FRAME(4, 2) - TILES(0x148F1, 8) - SHOW_FRAME(4, 3) + TILES(0x148F1, 8) SHOW_FRAME(4, 3) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0670__v2_l0[] = { // 0x080F6B98 - PALETTE(106, 16, 0xA0) - TILES(0x148E3, 3) - HITBOX(0, 0, -8, 8, 8) - HITBOX(1, 0, -8, 8, 8) - SHOW_FRAME(3, 0) + PALETTE(106, 16, 0xA0) TILES(0x148E3, 3) HITBOX(0, 0, -8, 8, 8) HITBOX(1, 0, -8, 8, 8) SHOW_FRAME(3, 0) - TILES(0x148E6, 3) - SHOW_FRAME(3, 1) + TILES(0x148E6, 3) SHOW_FRAME(3, 1) - TILES(0x148F9, 6) - SHOW_FRAME(3, 4) + TILES(0x148F9, 6) SHOW_FRAME(3, 4) - TILES(0x148FF, 6) - SHOW_FRAME(3, 5) + TILES(0x148FF, 6) SHOW_FRAME(3, 5) - TILES(0x14905, 8) - SHOW_FRAME(3, 6) + TILES(0x14905, 8) SHOW_FRAME(3, 6) - TILES(0x1490D, 8) - SHOW_FRAME(3, 7) + TILES(0x1490D, 8) SHOW_FRAME(3, 7) - TILES(0x148F9, 6) - SHOW_FRAME(3, 4) + TILES(0x148F9, 6) SHOW_FRAME(3, 4) - TILES(0x148FF, 6) - SHOW_FRAME(3, 5) + TILES(0x148FF, 6) SHOW_FRAME(3, 5) - JUMP_BACK(49) + JUMP_BACK(49) }; const s32 anim_0670__v3_l0[] = { // 0x080F6C64 - PALETTE(106, 16, 0xA0) - TILES(0x148F9, 6) - SHOW_FRAME(4, 4) + PALETTE(106, 16, 0xA0) TILES(0x148F9, 6) SHOW_FRAME(4, 4) - TILES(0x148FF, 6) - SHOW_FRAME(4, 5) + TILES(0x148FF, 6) SHOW_FRAME(4, 5) - TILES(0x14905, 8) - SHOW_FRAME(4, 6) + TILES(0x14905, 8) SHOW_FRAME(4, 6) - TILES(0x1490D, 8) - SHOW_FRAME(4, 7) + TILES(0x1490D, 8) SHOW_FRAME(4, 7) - END() + END() }; -const s32 * const anim_0670[4] = { +const s32 *const anim_0670[4] = { anim_0670__v0_l0, anim_0670__v1_l0, anim_0670__v2_l0, @@ -19446,263 +13677,190 @@ const s32 * const anim_0670[4] = { }; const s32 anim_0671__v0_l0[] = { // 0x080F6CD4 - PALETTE(106, 16, 0xA0) - TILES(0x14915, 4) - SHOW_FRAME(1, 0) + PALETTE(106, 16, 0xA0) TILES(0x14915, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0671[1] = { +const s32 *const anim_0671[1] = { anim_0671__v0_l0, }; const s32 anim_0672__v0_l0[] = { // 0x080F6CFC - PALETTE(106, 16, 0xC0) - TILES(0x14919, 4) - HITBOX(0, -7, -14, 7, 3) - HITBOX(1, -7, -14, 7, 3) - PLAY_SOUND(162) - SHOW_FRAME(3, 0) + PALETTE(106, 16, 0xC0) TILES(0x14919, 4) HITBOX(0, -7, -14, 7, 3) HITBOX(1, -7, -14, 7, 3) PLAY_SOUND(162) SHOW_FRAME(3, 0) - TILES(0x1491D, 12) - HITBOX(0, -7, -46, 7, 2) - HITBOX(1, -7, -46, 7, 2) - SHOW_FRAME(3, 1) + TILES(0x1491D, 12) HITBOX(0, -7, -46, 7, 2) HITBOX(1, -7, -46, 7, 2) SHOW_FRAME(3, 1) - TILES(0x14929, 24) - HITBOX(0, -7, -92, 7, 3) - HITBOX(1, -7, -92, 7, 3) - SHOW_FRAME(3, 2) + TILES(0x14929, 24) HITBOX(0, -7, -92, 7, 3) HITBOX(1, -7, -92, 7, 3) SHOW_FRAME(3, 2) - TILES(0x14941, 24) - HITBOX(0, -6, -92, 6, -30) - HITBOX(1, -6, -92, 6, -30) - SHOW_FRAME(3, 3) + TILES(0x14941, 24) HITBOX(0, -6, -92, 6, -30) HITBOX(1, -6, -92, 6, -30) SHOW_FRAME(3, 3) - TILES(0x14959, 22) - SHOW_FRAME(3, 4) + TILES(0x14959, 22) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0672[1] = { +const s32 *const anim_0672[1] = { anim_0672__v0_l0, }; const s32 anim_0673__v0_l0[] = { // 0x080F6DDC - PALETTE(105, 16, 0xB0) - TILES(0x1496F, 64) - HITBOX(0, 0, 0, 0, 0) - HITBOX(1, -7, -7, 7, 7) - SHOW_FRAME(3, 0) + PALETTE(105, 16, 0xB0) TILES(0x1496F, 64) HITBOX(0, 0, 0, 0, 0) HITBOX(1, -7, -7, 7, 7) SHOW_FRAME(3, 0) - TILES(0x149AF, 64) - SHOW_FRAME(3, 1) + TILES(0x149AF, 64) SHOW_FRAME(3, 1) - TILES(0x1496F, 64) - SHOW_FRAME(3, 2) + TILES(0x1496F, 64) SHOW_FRAME(3, 2) - JUMP_BACK(24) + JUMP_BACK(24) }; -const s32 * const anim_0673[1] = { +const s32 *const anim_0673[1] = { anim_0673__v0_l0, }; const s32 anim_0674__v0_l0[] = { // 0x080F6E48 - PALETTE(105, 16, 0xB0) - TILES(0x149EF, 4) - SHOW_FRAME(1, 0) + PALETTE(105, 16, 0xB0) TILES(0x149EF, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0674[1] = { +const s32 *const anim_0674[1] = { anim_0674__v0_l0, }; const s32 anim_0675__v0_l0[] = { // 0x080F6E70 - PALETTE(106, 16, 0xC0) - TILES(0x149F3, 4) - HITBOX(0, -5, -5, 5, 5) - HITBOX(1, -5, -5, 5, 5) - SHOW_FRAME(3, 0) + PALETTE(106, 16, 0xC0) TILES(0x149F3, 4) HITBOX(0, -5, -5, 5, 5) HITBOX(1, -5, -5, 5, 5) SHOW_FRAME(3, 0) - TILES(0x149F7, 4) - SHOW_FRAME(3, 1) + TILES(0x149F7, 4) SHOW_FRAME(3, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0675[1] = { +const s32 *const anim_0675[1] = { anim_0675__v0_l0, }; const s32 anim_0676__v0_l0[] = { // 0x080F6EC8 - PALETTE(107, 16, 0xF0) - TILES(0x149FB, 16) - HITBOX(0, -10, -10, 10, 10) - HITBOX(1, -12, -12, 12, 12) - SHOW_FRAME(1, 0) + PALETTE(107, 16, 0xF0) TILES(0x149FB, 16) HITBOX(0, -10, -10, 10, 10) HITBOX(1, -12, -12, 12, 12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0676[1] = { +const s32 *const anim_0676[1] = { anim_0676__v0_l0, }; const s32 anim_0677__v0_l0[] = { // 0x080F6F08 - PALETTE(107, 16, 0xF0) - TILES(0x14A0B, 4) - HITBOX(0, -6, -6, 6, 6) - HITBOX(1, -6, -6, 6, 6) - SHOW_FRAME(1, 0) + PALETTE(107, 16, 0xF0) TILES(0x14A0B, 4) HITBOX(0, -6, -6, 6, 6) HITBOX(1, -6, -6, 6, 6) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0677[1] = { +const s32 *const anim_0677[1] = { anim_0677__v0_l0, }; const s32 anim_0678__v0_l0[] = { // 0x080F6F48 - PALETTE(107, 16, 0xF0) - TILES(0x14A0F, 1) - SHOW_FRAME(1, 0) + PALETTE(107, 16, 0xF0) TILES(0x14A0F, 1) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0678[1] = { +const s32 *const anim_0678[1] = { anim_0678__v0_l0, }; const s32 anim_0679__v0_l0[] = { // 0x080F6F70 - PALETTE(108, 16, 0xA0) - TILES(0x14A10, 16) - HITBOX(0, -49, 2, -28, 23) - SHOW_FRAME(4, 0) + PALETTE(108, 16, 0xA0) TILES(0x14A10, 16) HITBOX(0, -49, 2, -28, 23) SHOW_FRAME(4, 0) - TILES(0x14A20, 16) - SHOW_FRAME(4, 1) + TILES(0x14A20, 16) SHOW_FRAME(4, 1) - TILES(0x14A10, 16) - SHOW_FRAME(4, 2) + TILES(0x14A10, 16) SHOW_FRAME(4, 2) - JUMP_BACK(21) + JUMP_BACK(21) }; -const s32 * const anim_0679[1] = { +const s32 *const anim_0679[1] = { anim_0679__v0_l0, }; const s32 anim_0680__v0_l0[] = { // 0x080F6FD0 - PALETTE(90, 16, 0x80) - TILES(0x14A30, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x14A30, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0680__v1_l0[] = { // 0x080F6FF4 - PALETTE(90, 16, 0x80) - TILES(0x14A38, 8) - SHOW_FRAME(6, 1) + PALETTE(90, 16, 0x80) TILES(0x14A38, 8) SHOW_FRAME(6, 1) - TILES(0x14A40, 8) - SHOW_FRAME(6, 2) + TILES(0x14A40, 8) SHOW_FRAME(6, 2) - TILES(0x14A38, 8) - SHOW_FRAME(6, 1) + TILES(0x14A38, 8) SHOW_FRAME(6, 1) - TILES(0x14A40, 8) - SHOW_FRAME(6, 2) + TILES(0x14A40, 8) SHOW_FRAME(6, 2) - TILES(0x14A38, 8) - SHOW_FRAME(6, 1) + TILES(0x14A38, 8) SHOW_FRAME(6, 1) - TILES(0x14A40, 8) - SHOW_FRAME(6, 2) + TILES(0x14A40, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0680__v2_l0[] = { // 0x080F707C - PALETTE(90, 16, 0x80) - TILES(0x14A48, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x14A48, 8) SHOW_FRAME(5, 3) - TILES(0x14A50, 8) - SHOW_FRAME(3, 4) + TILES(0x14A50, 8) SHOW_FRAME(3, 4) - TILES(0x14A48, 8) - SHOW_FRAME(5, 3) + TILES(0x14A48, 8) SHOW_FRAME(5, 3) - TILES(0x14A50, 8) - SHOW_FRAME(3, 4) + TILES(0x14A50, 8) SHOW_FRAME(3, 4) - TILES(0x14A48, 8) - SHOW_FRAME(5, 3) + TILES(0x14A48, 8) SHOW_FRAME(5, 3) - TILES(0x14A50, 8) - SHOW_FRAME(3, 4) + TILES(0x14A50, 8) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0680[3] = { +const s32 *const anim_0680[3] = { anim_0680__v0_l0, anim_0680__v1_l0, anim_0680__v2_l0, }; const s32 anim_0681__v0_l0[] = { // 0x080F7110 - PALETTE(108, 16, 0xA0) - TILES(0x14A58, 16) - SHOW_FRAME(4, 0) + PALETTE(108, 16, 0xA0) TILES(0x14A58, 16) SHOW_FRAME(4, 0) - TILES(0x14A68, 16) - SHOW_FRAME(4, 1) + TILES(0x14A68, 16) SHOW_FRAME(4, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0681__v1_l0[] = { // 0x080F714C - PALETTE(108, 16, 0xA0) - TILES(0x14A78, 16) - SHOW_FRAME(4, 2) + PALETTE(108, 16, 0xA0) TILES(0x14A78, 16) SHOW_FRAME(4, 2) - TILES(0x14A88, 16) - SHOW_FRAME(4, 3) + TILES(0x14A88, 16) SHOW_FRAME(4, 3) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0681__v2_l0[] = { // 0x080F7188 - PALETTE(108, 16, 0xA0) - TILES(0x14A98, 16) - SHOW_FRAME(4, 4) + PALETTE(108, 16, 0xA0) TILES(0x14A98, 16) SHOW_FRAME(4, 4) - TILES(0x14AA8, 16) - SHOW_FRAME(4, 5) + TILES(0x14AA8, 16) SHOW_FRAME(4, 5) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0681__v3_l0[] = { // 0x080F71C4 - PALETTE(108, 16, 0xA0) - TILES(0x14AB8, 16) - SHOW_FRAME(4, 6) + PALETTE(108, 16, 0xA0) TILES(0x14AB8, 16) SHOW_FRAME(4, 6) - TILES(0x14AC8, 16) - SHOW_FRAME(4, 7) + TILES(0x14AC8, 16) SHOW_FRAME(4, 7) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0681[4] = { +const s32 *const anim_0681[4] = { anim_0681__v0_l0, anim_0681__v1_l0, anim_0681__v2_l0, @@ -19710,621 +13868,435 @@ const s32 * const anim_0681[4] = { }; const s32 anim_0682__v0_l0[] = { // 0x080F7210 - PALETTE(108, 16, 0xA0) - TILES(0x14AD8, 54) - HITBOX(0, -28, -14, 26, 24) - SHOW_FRAME(1, 0) + PALETTE(108, 16, 0xA0) TILES(0x14AD8, 54) HITBOX(0, -28, -14, 26, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0682[1] = { +const s32 *const anim_0682[1] = { anim_0682__v0_l0, }; const s32 anim_0683__v0_l0[] = { // 0x080F7244 - PALETTE(109, 16, 0xB0) - TILES(0x14B0E, 4) - SHOW_FRAME(3, 0) + PALETTE(109, 16, 0xB0) TILES(0x14B0E, 4) SHOW_FRAME(3, 0) - TILES(0x14B12, 2) - SHOW_FRAME(3, 1) + TILES(0x14B12, 2) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0683__v1_l0[] = { // 0x080F7280 - PALETTE(109, 16, 0xB0) - TILES(0x14B14, 2) - SHOW_FRAME(6, 2) + PALETTE(109, 16, 0xB0) TILES(0x14B14, 2) SHOW_FRAME(6, 2) - TILES(0x14B16, 2) - SHOW_FRAME(6, 3) + TILES(0x14B16, 2) SHOW_FRAME(6, 3) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0683__v2_l0[] = { // 0x080F72BC - PALETTE(109, 16, 0xA0) - TILES(0x14B18, 4) - SHOW_FRAME(1, 4) + PALETTE(109, 16, 0xA0) TILES(0x14B18, 4) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0683[3] = { +const s32 *const anim_0683[3] = { anim_0683__v0_l0, anim_0683__v1_l0, anim_0683__v2_l0, }; const s32 anim_0684__v0_l0[] = { // 0x080F72EC - PALETTE(109, 16, 0xB0) - TILES(0x14B1C, 30) - HITBOX(0, -20, -18, 22, 18) - SHOW_FRAME(1, 0) + PALETTE(109, 16, 0xB0) TILES(0x14B1C, 30) HITBOX(0, -20, -18, 22, 18) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0684[1] = { +const s32 *const anim_0684[1] = { anim_0684__v0_l0, }; const s32 anim_0685__v0_l0[] = { // 0x080F7320 - PALETTE(110, 16, 0x90) - TILES(0x14B3A, 16) - HITBOX(0, -14, -14, 14, 14) - SHOW_FRAME(2, 0) + PALETTE(110, 16, 0x90) TILES(0x14B3A, 16) HITBOX(0, -14, -14, 14, 14) SHOW_FRAME(2, 0) - TILES(0x14B4A, 16) - SHOW_FRAME(2, 1) + TILES(0x14B4A, 16) SHOW_FRAME(2, 1) - JUMP_BACK(16) + JUMP_BACK(16) }; -const s32 * const anim_0685[1] = { +const s32 *const anim_0685[1] = { anim_0685__v0_l0, }; const s32 anim_0686__v0_l0[] = { // 0x080F736C - PALETTE(90, 16, 0x80) - TILES(0x14B5A, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x14B5A, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0686__v1_l0[] = { // 0x080F7390 - PALETTE(90, 16, 0x80) - TILES(0x14B62, 8) - SHOW_FRAME(6, 1) + PALETTE(90, 16, 0x80) TILES(0x14B62, 8) SHOW_FRAME(6, 1) - TILES(0x14B6A, 8) - SHOW_FRAME(6, 2) + TILES(0x14B6A, 8) SHOW_FRAME(6, 2) - TILES(0x14B62, 8) - SHOW_FRAME(6, 1) + TILES(0x14B62, 8) SHOW_FRAME(6, 1) - TILES(0x14B6A, 8) - SHOW_FRAME(6, 2) + TILES(0x14B6A, 8) SHOW_FRAME(6, 2) - TILES(0x14B62, 8) - SHOW_FRAME(6, 1) + TILES(0x14B62, 8) SHOW_FRAME(6, 1) - TILES(0x14B6A, 8) - SHOW_FRAME(6, 2) + TILES(0x14B6A, 8) SHOW_FRAME(6, 2) - END() + END() }; const s32 anim_0686__v2_l0[] = { // 0x080F7418 - PALETTE(90, 16, 0x80) - TILES(0x14B72, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x14B72, 8) SHOW_FRAME(5, 3) - TILES(0x14B7A, 8) - SHOW_FRAME(3, 4) + TILES(0x14B7A, 8) SHOW_FRAME(3, 4) - TILES(0x14B72, 8) - SHOW_FRAME(5, 3) + TILES(0x14B72, 8) SHOW_FRAME(5, 3) - TILES(0x14B7A, 8) - SHOW_FRAME(3, 4) + TILES(0x14B7A, 8) SHOW_FRAME(3, 4) - TILES(0x14B72, 8) - SHOW_FRAME(5, 3) + TILES(0x14B72, 8) SHOW_FRAME(5, 3) - TILES(0x14B7A, 8) - SHOW_FRAME(3, 4) + TILES(0x14B7A, 8) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0686[3] = { +const s32 *const anim_0686[3] = { anim_0686__v0_l0, anim_0686__v1_l0, anim_0686__v2_l0, }; const s32 anim_0687__v0_l0[] = { // 0x080F74AC - PALETTE(111, 16, 0xF0) - TILES(0x14B82, 42) - HITBOX(0, -18, -27, 17, -14) - HITBOX(1, -22, -16, 24, 31) - SHOW_FRAME(5, 0) + PALETTE(111, 16, 0xF0) TILES(0x14B82, 42) HITBOX(0, -18, -27, 17, -14) HITBOX(1, -22, -16, 24, 31) SHOW_FRAME(5, 0) - TILES(0x14BAC, 42) - SHOW_FRAME(5, 1) + TILES(0x14BAC, 42) SHOW_FRAME(5, 1) - JUMP_BACK(19) + JUMP_BACK(19) }; -const s32 * const anim_0687[1] = { +const s32 *const anim_0687[1] = { anim_0687__v0_l0, }; const s32 anim_0688__v0_l0[] = { // 0x080F7504 - PALETTE(112, 16, 0xE0) - TILES(0x14BD6, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 0) + PALETTE(112, 16, 0xE0) TILES(0x14BD6, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 0) - TILES(0x14BE2, 12) - SHOW_FRAME(4, 1) + TILES(0x14BE2, 12) SHOW_FRAME(4, 1) - TILES(0x14BEE, 12) - SHOW_FRAME(4, 2) + TILES(0x14BEE, 12) SHOW_FRAME(4, 2) - TILES(0x14BFA, 12) - SHOW_FRAME(4, 3) + TILES(0x14BFA, 12) SHOW_FRAME(4, 3) - TILES(0x14C06, 12) - SHOW_FRAME(4, 4) + TILES(0x14C06, 12) SHOW_FRAME(4, 4) - TILES(0x14C12, 12) - SHOW_FRAME(4, 5) + TILES(0x14C12, 12) SHOW_FRAME(4, 5) - TILES(0x14C1E, 12) - SHOW_FRAME(4, 6) + TILES(0x14C1E, 12) SHOW_FRAME(4, 6) - TILES(0x14C2A, 12) - SHOW_FRAME(4, 7) + TILES(0x14C2A, 12) SHOW_FRAME(4, 7) - TILES(0x14C36, 12) - SHOW_FRAME(4, 8) + TILES(0x14C36, 12) SHOW_FRAME(4, 8) - TILES(0x14C42, 12) - SHOW_FRAME(4, 9) + TILES(0x14C42, 12) SHOW_FRAME(4, 9) - TILES(0x14C4E, 12) - SHOW_FRAME(4, 10) + TILES(0x14C4E, 12) SHOW_FRAME(4, 10) - TILES(0x14C5A, 12) - SHOW_FRAME(4, 11) + TILES(0x14C5A, 12) SHOW_FRAME(4, 11) - JUMP_BACK(66) + JUMP_BACK(66) }; const s32 anim_0688__v1_l0[] = { // 0x080F7614 - PALETTE(112, 16, 0xE0) - TILES(0x14C66, 12) - SHOW_FRAME(4, 12) + PALETTE(112, 16, 0xE0) TILES(0x14C66, 12) SHOW_FRAME(4, 12) - TILES(0x14C72, 12) - SHOW_FRAME(4, 13) + TILES(0x14C72, 12) SHOW_FRAME(4, 13) - TILES(0x14C7E, 12) - SHOW_FRAME(4, 14) + TILES(0x14C7E, 12) SHOW_FRAME(4, 14) - TILES(0x14C8A, 12) - SHOW_FRAME(4, 15) + TILES(0x14C8A, 12) SHOW_FRAME(4, 15) - TILES(0x14C96, 12) - SHOW_FRAME(4, 16) + TILES(0x14C96, 12) SHOW_FRAME(4, 16) - TILES(0x14CA2, 12) - SHOW_FRAME(4, 17) + TILES(0x14CA2, 12) SHOW_FRAME(4, 17) - TILES(0x14CAE, 12) - SHOW_FRAME(4, 18) + TILES(0x14CAE, 12) SHOW_FRAME(4, 18) - TILES(0x14CBA, 12) - SHOW_FRAME(4, 19) + TILES(0x14CBA, 12) SHOW_FRAME(4, 19) - TILES(0x14CC6, 12) - SHOW_FRAME(4, 20) + TILES(0x14CC6, 12) SHOW_FRAME(4, 20) - TILES(0x14CD2, 12) - SHOW_FRAME(4, 21) + TILES(0x14CD2, 12) SHOW_FRAME(4, 21) - TILES(0x14CDE, 12) - SHOW_FRAME(4, 22) + TILES(0x14CDE, 12) SHOW_FRAME(4, 22) - TILES(0x14CEA, 12) - SHOW_FRAME(4, 23) + TILES(0x14CEA, 12) SHOW_FRAME(4, 23) - JUMP_BACK(63) + JUMP_BACK(63) }; const s32 anim_0688__v2_l0[] = { // 0x080F7718 - PALETTE(112, 16, 0xE0) - TILES(0x14CF6, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 24) + PALETTE(112, 16, 0xE0) TILES(0x14CF6, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 24) - END() + END() }; const s32 anim_0688__v3_l0[] = { // 0x080F7748 - PALETTE(112, 16, 0xE0) - TILES(0x14C8A, 12) - SHOW_FRAME(4, 15) + PALETTE(112, 16, 0xE0) TILES(0x14C8A, 12) SHOW_FRAME(4, 15) - END() + END() }; const s32 anim_0688__v4_l0[] = { // 0x080F776C - PALETTE(112, 16, 0xE0) - TILES(0x14D02, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 25) + PALETTE(112, 16, 0xE0) TILES(0x14D02, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 25) - END() + END() }; const s32 anim_0688__v5_l0[] = { // 0x080F779C - PALETTE(112, 16, 0xE0) - TILES(0x14CBA, 12) - SHOW_FRAME(4, 19) + PALETTE(112, 16, 0xE0) TILES(0x14CBA, 12) SHOW_FRAME(4, 19) - END() + END() }; const s32 anim_0688__v6_l0[] = { // 0x080F77C0 - PALETTE(112, 16, 0xE0) - TILES(0x14D0E, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 26) + PALETTE(112, 16, 0xE0) TILES(0x14D0E, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 26) - END() + END() }; const s32 anim_0688__v7_l0[] = { // 0x080F77F0 - PALETTE(112, 16, 0xE0) - TILES(0x14CEA, 12) - SHOW_FRAME(4, 23) + PALETTE(112, 16, 0xE0) TILES(0x14CEA, 12) SHOW_FRAME(4, 23) - END() + END() }; const s32 anim_0688__v8_l0[] = { // 0x080F7814 - PALETTE(112, 16, 0xE0) - TILES(0x14C06, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 4) + PALETTE(112, 16, 0xE0) TILES(0x14C06, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 4) - TILES(0x14C12, 12) - SHOW_FRAME(4, 5) + TILES(0x14C12, 12) SHOW_FRAME(4, 5) - TILES(0x14C1E, 12) - SHOW_FRAME(4, 6) + TILES(0x14C1E, 12) SHOW_FRAME(4, 6) - TILES(0x14C2A, 12) - SHOW_FRAME(4, 7) + TILES(0x14C2A, 12) SHOW_FRAME(4, 7) - END() + END() }; const s32 anim_0688__v9_l0[] = { // 0x080F7880 - PALETTE(112, 16, 0xE0) - TILES(0x14BD6, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 0) + PALETTE(112, 16, 0xE0) TILES(0x14BD6, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 0) - TILES(0x14BE2, 12) - SHOW_FRAME(4, 1) + TILES(0x14BE2, 12) SHOW_FRAME(4, 1) - TILES(0x14BEE, 12) - SHOW_FRAME(4, 2) + TILES(0x14BEE, 12) SHOW_FRAME(4, 2) - TILES(0x14BFA, 12) - SHOW_FRAME(4, 3) + TILES(0x14BFA, 12) SHOW_FRAME(4, 3) - END() + END() }; const s32 anim_0688__v10_l0[] = { // 0x080F78EC - PALETTE(112, 16, 0xE0) - TILES(0x14C36, 12) - HITBOX(0, -28, -12, 28, 12) - SHOW_FRAME(4, 8) + PALETTE(112, 16, 0xE0) TILES(0x14C36, 12) HITBOX(0, -28, -12, 28, 12) SHOW_FRAME(4, 8) - TILES(0x14C42, 12) - SHOW_FRAME(4, 9) + TILES(0x14C42, 12) SHOW_FRAME(4, 9) - TILES(0x14C4E, 12) - SHOW_FRAME(4, 10) + TILES(0x14C4E, 12) SHOW_FRAME(4, 10) - TILES(0x14C5A, 12) - SHOW_FRAME(4, 11) + TILES(0x14C5A, 12) SHOW_FRAME(4, 11) - END() + END() }; const s32 anim_0688__v11_l0[] = { // 0x080F7958 - PALETTE(112, 16, 0xE0) - TILES(0x14C96, 12) - SHOW_FRAME(4, 16) + PALETTE(112, 16, 0xE0) TILES(0x14C96, 12) SHOW_FRAME(4, 16) - TILES(0x14CA2, 12) - SHOW_FRAME(4, 17) + TILES(0x14CA2, 12) SHOW_FRAME(4, 17) - TILES(0x14CAE, 12) - SHOW_FRAME(4, 18) + TILES(0x14CAE, 12) SHOW_FRAME(4, 18) - TILES(0x14CBA, 12) - SHOW_FRAME(4, 19) + TILES(0x14CBA, 12) SHOW_FRAME(4, 19) - END() + END() }; const s32 anim_0688__v12_l0[] = { // 0x080F79B8 - PALETTE(112, 16, 0xE0) - TILES(0x14C66, 12) - SHOW_FRAME(4, 12) + PALETTE(112, 16, 0xE0) TILES(0x14C66, 12) SHOW_FRAME(4, 12) - TILES(0x14C72, 12) - SHOW_FRAME(4, 13) + TILES(0x14C72, 12) SHOW_FRAME(4, 13) - TILES(0x14C7E, 12) - SHOW_FRAME(4, 14) + TILES(0x14C7E, 12) SHOW_FRAME(4, 14) - TILES(0x14C8A, 12) - SHOW_FRAME(4, 15) + TILES(0x14C8A, 12) SHOW_FRAME(4, 15) - END() + END() }; const s32 anim_0688__v13_l0[] = { // 0x080F7A18 - PALETTE(112, 16, 0xE0) - TILES(0x14CC6, 12) - SHOW_FRAME(4, 20) + PALETTE(112, 16, 0xE0) TILES(0x14CC6, 12) SHOW_FRAME(4, 20) - TILES(0x14CD2, 12) - SHOW_FRAME(4, 21) + TILES(0x14CD2, 12) SHOW_FRAME(4, 21) - TILES(0x14CDE, 12) - SHOW_FRAME(4, 22) + TILES(0x14CDE, 12) SHOW_FRAME(4, 22) - TILES(0x14CEA, 12) - SHOW_FRAME(4, 23) + TILES(0x14CEA, 12) SHOW_FRAME(4, 23) - END() + END() }; const s32 anim_0688__v14_l0[] = { // 0x080F7A78 - PALETTE(112, 16, 0xE0) - TILES(0x14C2A, 12) - SHOW_FRAME(4, 7) + PALETTE(112, 16, 0xE0) TILES(0x14C2A, 12) SHOW_FRAME(4, 7) - END() + END() }; const s32 anim_0688__v15_l0[] = { // 0x080F7A9C - PALETTE(112, 16, 0xE0) - TILES(0x14BFA, 12) - SHOW_FRAME(4, 3) + PALETTE(112, 16, 0xE0) TILES(0x14BFA, 12) SHOW_FRAME(4, 3) - END() + END() }; const s32 anim_0688__v16_l0[] = { // 0x080F7AC0 - PALETTE(112, 16, 0xE0) - TILES(0x14C5A, 12) - SHOW_FRAME(4, 11) + PALETTE(112, 16, 0xE0) TILES(0x14C5A, 12) SHOW_FRAME(4, 11) - END() + END() }; const s32 anim_0688__v17_l0[] = { // 0x080F7AE4 - PALETTE(112, 16, 0xE0) - TILES(0x14CBA, 12) - SHOW_FRAME(4, 19) + PALETTE(112, 16, 0xE0) TILES(0x14CBA, 12) SHOW_FRAME(4, 19) - END() + END() }; const s32 anim_0688__v18_l0[] = { // 0x080F7B08 - PALETTE(112, 16, 0xE0) - TILES(0x14C8A, 12) - SHOW_FRAME(4, 15) + PALETTE(112, 16, 0xE0) TILES(0x14C8A, 12) SHOW_FRAME(4, 15) - END() + END() }; const s32 anim_0688__v19_l0[] = { // 0x080F7B2C - PALETTE(112, 16, 0xE0) - TILES(0x14CEA, 12) - SHOW_FRAME(4, 23) + PALETTE(112, 16, 0xE0) TILES(0x14CEA, 12) SHOW_FRAME(4, 23) - END() + END() }; -const s32 * const anim_0688[20] = { - anim_0688__v0_l0, - anim_0688__v1_l0, - anim_0688__v2_l0, - anim_0688__v3_l0, - anim_0688__v4_l0, - anim_0688__v5_l0, - anim_0688__v6_l0, - anim_0688__v7_l0, - anim_0688__v8_l0, - anim_0688__v9_l0, - anim_0688__v10_l0, - anim_0688__v11_l0, - anim_0688__v12_l0, - anim_0688__v13_l0, - anim_0688__v14_l0, - anim_0688__v15_l0, - anim_0688__v16_l0, - anim_0688__v17_l0, - anim_0688__v18_l0, - anim_0688__v19_l0, +const s32 *const anim_0688[20] = { + anim_0688__v0_l0, anim_0688__v1_l0, anim_0688__v2_l0, anim_0688__v3_l0, anim_0688__v4_l0, anim_0688__v5_l0, anim_0688__v6_l0, + anim_0688__v7_l0, anim_0688__v8_l0, anim_0688__v9_l0, anim_0688__v10_l0, anim_0688__v11_l0, anim_0688__v12_l0, anim_0688__v13_l0, + anim_0688__v14_l0, anim_0688__v15_l0, anim_0688__v16_l0, anim_0688__v17_l0, anim_0688__v18_l0, anim_0688__v19_l0, }; const s32 anim_0689__v0_l0[] = { // 0x080F7BA0 - PALETTE(113, 16, 0xE0) - TILES(0x14D1A, 64) - HITBOX(0, -10, -10, 20, 10) - SHOW_FRAME(1, 0) + PALETTE(113, 16, 0xE0) TILES(0x14D1A, 64) HITBOX(0, -10, -10, 20, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0689__v1_l0[] = { // 0x080F7BD0 - PALETTE(113, 16, 0xE0) - TILES(0x14D5A, 64) - HITBOX(0, -6, -6, 6, 6) - SHOW_FRAME(1, 1) + PALETTE(113, 16, 0xE0) TILES(0x14D5A, 64) HITBOX(0, -6, -6, 6, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0689__v2_l0[] = { // 0x080F7C00 - PALETTE(113, 16, 0xE0) - TILES(0x14D9A, 64) - SHOW_FRAME(5, 2) + PALETTE(113, 16, 0xE0) TILES(0x14D9A, 64) SHOW_FRAME(5, 2) - TILES(0x14DDA, 64) - SHOW_FRAME(5, 3) + TILES(0x14DDA, 64) SHOW_FRAME(5, 3) - END() + END() }; -const s32 * const anim_0689[3] = { +const s32 *const anim_0689[3] = { anim_0689__v0_l0, anim_0689__v1_l0, anim_0689__v2_l0, }; const s32 anim_0690__v0_l0[] = { // 0x080F7C44 - PALETTE(113, 16, 0xE0) - TILES(0x14E1A, 4) - SHOW_FRAME(1, 0) + PALETTE(113, 16, 0xE0) TILES(0x14E1A, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0690__v1_l0[] = { // 0x080F7C68 - PALETTE(113, 16, 0xE0) - TILES(0x14E1E, 4) - HITBOX(0, -7, -7, 7, 7) - SHOW_FRAME(1, 1) + PALETTE(113, 16, 0xE0) TILES(0x14E1E, 4) HITBOX(0, -7, -7, 7, 7) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0690[2] = { +const s32 *const anim_0690[2] = { anim_0690__v0_l0, anim_0690__v1_l0, }; const s32 anim_0691__v0_l0[] = { // 0x080F7CA0 - PALETTE(90, 16, 0x80) - TILES(0x14E22, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x14E22, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0691__v1_l0[] = { // 0x080F7CC4 - PALETTE(90, 16, 0x80) - TILES(0x14E22, 8) - SHOW_FRAME(15, 0) + PALETTE(90, 16, 0x80) TILES(0x14E22, 8) SHOW_FRAME(15, 0) - PALETTE(90, 16, 0x80) - TILES(0x14E2A, 12) - SHOW_FRAME(4, 1) + PALETTE(90, 16, 0x80) TILES(0x14E2A, 12) SHOW_FRAME(4, 1) - TILES(0x14E36, 12) - SHOW_FRAME(8, 2) + TILES(0x14E36, 12) SHOW_FRAME(8, 2) - TILES(0x14E2A, 12) - SHOW_FRAME(4, 1) + TILES(0x14E2A, 12) SHOW_FRAME(4, 1) - TILES(0x14E36, 12) - SHOW_FRAME(8, 2) + TILES(0x14E36, 12) SHOW_FRAME(8, 2) - TILES(0x14E2A, 12) - SHOW_FRAME(4, 1) + TILES(0x14E2A, 12) SHOW_FRAME(4, 1) - TILES(0x14E36, 12) - SHOW_FRAME(8, 2) + TILES(0x14E36, 12) SHOW_FRAME(8, 2) - TILES(0x14E2A, 12) - SHOW_FRAME(4, 1) + TILES(0x14E2A, 12) SHOW_FRAME(4, 1) - TILES(0x14E36, 12) - SHOW_FRAME(8, 2) + TILES(0x14E36, 12) SHOW_FRAME(8, 2) - TILES(0x14E2A, 12) - SHOW_FRAME(4, 1) + TILES(0x14E2A, 12) SHOW_FRAME(4, 1) - TILES(0x14E36, 12) - SHOW_FRAME(8, 2) + TILES(0x14E36, 12) SHOW_FRAME(8, 2) - END() + END() }; const s32 anim_0691__v2_l0[] = { // 0x080F7DBC - PALETTE(90, 16, 0x80) - TILES(0x14E42, 8) - SHOW_FRAME(5, 3) + PALETTE(90, 16, 0x80) TILES(0x14E42, 8) SHOW_FRAME(5, 3) - TILES(0x14E4A, 8) - SHOW_FRAME(3, 4) + TILES(0x14E4A, 8) SHOW_FRAME(3, 4) - TILES(0x14E42, 8) - SHOW_FRAME(5, 3) + TILES(0x14E42, 8) SHOW_FRAME(5, 3) - TILES(0x14E4A, 8) - SHOW_FRAME(3, 4) + TILES(0x14E4A, 8) SHOW_FRAME(3, 4) - TILES(0x14E42, 8) - SHOW_FRAME(5, 3) + TILES(0x14E42, 8) SHOW_FRAME(5, 3) - TILES(0x14E4A, 8) - SHOW_FRAME(3, 4) + TILES(0x14E4A, 8) SHOW_FRAME(3, 4) - END() + END() }; const s32 anim_0691__v3_l0[] = { // 0x080F7E44 - PALETTE(90, 16, 0x80) - TILES(0x14E52, 8) - SHOW_FRAME(6, 5) + PALETTE(90, 16, 0x80) TILES(0x14E52, 8) SHOW_FRAME(6, 5) - TILES(0x14E5A, 8) - SHOW_FRAME(6, 6) + TILES(0x14E5A, 8) SHOW_FRAME(6, 6) - TILES(0x14E52, 8) - SHOW_FRAME(6, 5) + TILES(0x14E52, 8) SHOW_FRAME(6, 5) - TILES(0x14E5A, 8) - SHOW_FRAME(6, 6) + TILES(0x14E5A, 8) SHOW_FRAME(6, 6) - TILES(0x14E52, 8) - SHOW_FRAME(6, 5) + TILES(0x14E52, 8) SHOW_FRAME(6, 5) - TILES(0x14E5A, 8) - SHOW_FRAME(6, 6) + TILES(0x14E5A, 8) SHOW_FRAME(6, 6) - END() + END() }; -const s32 * const anim_0691[4] = { +const s32 *const anim_0691[4] = { anim_0691__v0_l0, anim_0691__v1_l0, anim_0691__v2_l0, @@ -20332,1852 +14304,1295 @@ const s32 * const anim_0691[4] = { }; const s32 anim_0692__v0_l0[] = { // 0x080F7EDC - PALETTE(113, 16, 0xE0) - TILES(0x14E62, 16) - HITBOX(0, -13, -13, 13, 13) - SHOW_FRAME(1, 0) + PALETTE(113, 16, 0xE0) TILES(0x14E62, 16) HITBOX(0, -13, -13, 13, 13) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0692[1] = { +const s32 *const anim_0692[1] = { anim_0692__v0_l0, }; const s32 anim_0693__v0_l0[] = { // 0x080F7F10 - PALETTE(114, 16, 0xC0) - TILES(0x14E72, 30) - SHOW_FRAME(3, 0) + PALETTE(114, 16, 0xC0) TILES(0x14E72, 30) SHOW_FRAME(3, 0) - TILES(0x14E90, 30) - SHOW_FRAME(2, 1) + TILES(0x14E90, 30) SHOW_FRAME(2, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0693__v1_l0[] = { // 0x080F7F4C - PALETTE(114, 16, 0xC0) - TILES(0x14EAE, 30) - SHOW_FRAME(3, 2) + PALETTE(114, 16, 0xC0) TILES(0x14EAE, 30) SHOW_FRAME(3, 2) - TILES(0x14ECC, 30) - SHOW_FRAME(2, 3) + TILES(0x14ECC, 30) SHOW_FRAME(2, 3) - TILES(0x14EAE, 30) - SHOW_FRAME(3, 4) + TILES(0x14EAE, 30) SHOW_FRAME(3, 4) - TILES(0x14ECC, 30) - SHOW_FRAME(2, 5) + TILES(0x14ECC, 30) SHOW_FRAME(2, 5) - END() + END() }; -const s32 * const anim_0693[2] = { +const s32 *const anim_0693[2] = { anim_0693__v0_l0, anim_0693__v1_l0, }; const s32 anim_0694__v0_l0[] = { // 0x080F7FB4 - PALETTE(90, 16, 0x80) - TILES(0x14EEA, 8) - SHOW_FRAME(1, 0) + PALETTE(90, 16, 0x80) TILES(0x14EEA, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0694__v1_l0[] = { // 0x080F7FD8 - PALETTE(90, 16, 0x80) - TILES(0x14EF2, 8) - SHOW_FRAME(1, 1) + PALETTE(90, 16, 0x80) TILES(0x14EF2, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0694__v2_l0[] = { // 0x080F7FFC - PALETTE(90, 16, 0x80) - TILES(0x14EFA, 12) - SHOW_FRAME(45, 2) + PALETTE(90, 16, 0x80) TILES(0x14EFA, 12) SHOW_FRAME(45, 2) - TILES(0x14EEA, 8) - SHOW_FRAME(8, 0) + TILES(0x14EEA, 8) SHOW_FRAME(8, 0) - TILES(0x14F06, 12) - SHOW_FRAME(6, 3) + TILES(0x14F06, 12) SHOW_FRAME(6, 3) - TILES(0x14F12, 12) - SHOW_FRAME(8, 4) + TILES(0x14F12, 12) SHOW_FRAME(8, 4) - TILES(0x14F06, 12) - SHOW_FRAME(6, 3) + TILES(0x14F06, 12) SHOW_FRAME(6, 3) - TILES(0x14F12, 12) - SHOW_FRAME(8, 4) + TILES(0x14F12, 12) SHOW_FRAME(8, 4) - TILES(0x14F06, 12) - SHOW_FRAME(6, 3) + TILES(0x14F06, 12) SHOW_FRAME(6, 3) - TILES(0x14F12, 12) - SHOW_FRAME(8, 4) + TILES(0x14F12, 12) SHOW_FRAME(8, 4) - END() + END() }; const s32 anim_0694__v3_l0[] = { // 0x080F80AC - PALETTE(90, 16, 0x80) - TILES(0x14F1E, 12) - SHOW_FRAME(7, 5) + PALETTE(90, 16, 0x80) TILES(0x14F1E, 12) SHOW_FRAME(7, 5) - TILES(0x14F12, 12) - SHOW_FRAME(6, 4) + TILES(0x14F12, 12) SHOW_FRAME(6, 4) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0694__v4_l0[] = { // 0x080F80E8 - PALETTE(90, 16, 0x80) - TILES(0x14F2A, 12) - SHOW_FRAME(7, 6) + PALETTE(90, 16, 0x80) TILES(0x14F2A, 12) SHOW_FRAME(7, 6) - TILES(0x14F36, 12) - SHOW_FRAME(7, 7) + TILES(0x14F36, 12) SHOW_FRAME(7, 7) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0694__v5_l0[] = { // 0x080F8124 - PALETTE(90, 16, 0x80) - TILES(0x14F42, 12) - SHOW_FRAME(7, 8) + PALETTE(90, 16, 0x80) TILES(0x14F42, 12) SHOW_FRAME(7, 8) - TILES(0x14F4E, 12) - SHOW_FRAME(7, 9) + TILES(0x14F4E, 12) SHOW_FRAME(7, 9) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0694__v6_l0[] = { // 0x080F8160 - PALETTE(90, 16, 0x80) - TILES(0x14F5A, 8) - SHOW_FRAME(6, 10) + PALETTE(90, 16, 0x80) TILES(0x14F5A, 8) SHOW_FRAME(6, 10) - TILES(0x14F62, 12) - SHOW_FRAME(5, 11) + TILES(0x14F62, 12) SHOW_FRAME(5, 11) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0694__v7_l0[] = { // 0x080F819C - PALETTE(90, 16, 0x80) - TILES(0x14F6E, 8) - SHOW_FRAME(5, 12) + PALETTE(90, 16, 0x80) TILES(0x14F6E, 8) SHOW_FRAME(5, 12) - TILES(0x14F76, 12) - SHOW_FRAME(6, 13) + TILES(0x14F76, 12) SHOW_FRAME(6, 13) - END() + END() }; const s32 anim_0694__v8_l0[] = { // 0x080F81D4 - PALETTE(90, 16, 0x80) - TILES(0x14F82, 8) - SHOW_FRAME(6, 14) + PALETTE(90, 16, 0x80) TILES(0x14F82, 8) SHOW_FRAME(6, 14) - TILES(0x14F8A, 12) - SHOW_FRAME(5, 15) + TILES(0x14F8A, 12) SHOW_FRAME(5, 15) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0694__v9_l0[] = { // 0x080F8210 - PALETTE(90, 16, 0x80) - TILES(0x14EF2, 8) - SHOW_FRAME(5, 1) + PALETTE(90, 16, 0x80) TILES(0x14EF2, 8) SHOW_FRAME(5, 1) - TILES(0x14F96, 8) - SHOW_FRAME(5, 16) + TILES(0x14F96, 8) SHOW_FRAME(5, 16) - END() + END() }; -const s32 * const anim_0694[10] = { - anim_0694__v0_l0, - anim_0694__v1_l0, - anim_0694__v2_l0, - anim_0694__v3_l0, - anim_0694__v4_l0, - anim_0694__v5_l0, - anim_0694__v6_l0, - anim_0694__v7_l0, - anim_0694__v8_l0, - anim_0694__v9_l0, +const s32 *const anim_0694[10] = { + anim_0694__v0_l0, anim_0694__v1_l0, anim_0694__v2_l0, anim_0694__v3_l0, anim_0694__v4_l0, + anim_0694__v5_l0, anim_0694__v6_l0, anim_0694__v7_l0, anim_0694__v8_l0, anim_0694__v9_l0, }; const s32 anim_0695__v0_l0[] = { // 0x080F8270 - PALETTE(115, 16, 0xD0) - TILES(0x14F9E, 4) - SHOW_FRAME(1, 0) + PALETTE(115, 16, 0xD0) TILES(0x14F9E, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0695__v1_l0[] = { // 0x080F8294 - PALETTE(115, 16, 0xD0) - TILES(0x14FA2, 4) - SHOW_FRAME(1, 1) + PALETTE(115, 16, 0xD0) TILES(0x14FA2, 4) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0695[2] = { +const s32 *const anim_0695[2] = { anim_0695__v0_l0, anim_0695__v1_l0, }; const s32 anim_0696__v0_l0[] = { // 0x080F82C0 - PALETTE(115, 16, 0xD0) - TILES(0x14FA6, 16) - SHOW_FRAME(1, 0) + PALETTE(115, 16, 0xD0) TILES(0x14FA6, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0696__v1_l0[] = { // 0x080F82E4 - PALETTE(115, 16, 0xD0) - TILES(0x14FB6, 12) - SHOW_FRAME(1, 1) + PALETTE(115, 16, 0xD0) TILES(0x14FB6, 12) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0696[2] = { +const s32 *const anim_0696[2] = { anim_0696__v0_l0, anim_0696__v1_l0, }; const s32 anim_0697__v0_l0[] = { // 0x080F8310 - PALETTE(115, 16, 0xD0) - TILES(0x14FC2, 1) - SHOW_FRAME(1, 0) + PALETTE(115, 16, 0xD0) TILES(0x14FC2, 1) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0697__v1_l0[] = { // 0x080F8334 - PALETTE(115, 16, 0xD0) - TILES(0x14FC3, 1) - SHOW_FRAME(1, 1) + PALETTE(115, 16, 0xD0) TILES(0x14FC3, 1) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0697[2] = { +const s32 *const anim_0697[2] = { anim_0697__v0_l0, anim_0697__v1_l0, }; const s32 anim_0698__v0_l0[] = { // 0x080F8360 - PALETTE(116, 16, 0xC0) - TILES(0x14FC4, 8) - SHOW_FRAME(4, 0) + PALETTE(116, 16, 0xC0) TILES(0x14FC4, 8) SHOW_FRAME(4, 0) - CHANGE_ANIM(698, 1) + CHANGE_ANIM(698, 1) }; const s32 anim_0698__v1_l0[] = { // 0x080F8388 - PALETTE(116, 16, 0xC0) - TILES(0x14FCC, 16) - SHOW_FRAME(4, 1) + PALETTE(116, 16, 0xC0) TILES(0x14FCC, 16) SHOW_FRAME(4, 1) - TILES(0x14FDC, 16) - SHOW_FRAME(4, 2) + TILES(0x14FDC, 16) SHOW_FRAME(4, 2) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0698__v2_l0[] = { // 0x080F83C4 - PALETTE(116, 16, 0xC0) - TILES(0x14FEC, 12) - SHOW_FRAME(4, 3) + PALETTE(116, 16, 0xC0) TILES(0x14FEC, 12) SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0698[3] = { +const s32 *const anim_0698[3] = { anim_0698__v0_l0, anim_0698__v1_l0, anim_0698__v2_l0, }; const s32 anim_0699__v0_l0[] = { // 0x080F83F4 - PALETTE(116, 16, 0xC0) - TILES(0x14FF8, 12) - SHOW_FRAME(5, 0) + PALETTE(116, 16, 0xC0) TILES(0x14FF8, 12) SHOW_FRAME(5, 0) - TILES(0x15004, 12) - SHOW_FRAME(5, 1) + TILES(0x15004, 12) SHOW_FRAME(5, 1) - TILES(0x15010, 12) - SHOW_FRAME(5, 2) + TILES(0x15010, 12) SHOW_FRAME(5, 2) - TILES(0x1501C, 12) - SHOW_FRAME(5, 3) + TILES(0x1501C, 12) SHOW_FRAME(5, 3) - TILES(0x15010, 12) - SHOW_FRAME(5, 2) + TILES(0x15010, 12) SHOW_FRAME(5, 2) - TILES(0x15004, 12) - SHOW_FRAME(5, 1) + TILES(0x15004, 12) SHOW_FRAME(5, 1) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0699[1] = { +const s32 *const anim_0699[1] = { anim_0699__v0_l0, }; const s32 anim_0700__v0_l0[] = { // 0x080F8484 - PALETTE(116, 16, 0xC0) - TILES(0x15028, 8) - SHOW_FRAME(1, 0) + PALETTE(116, 16, 0xC0) TILES(0x15028, 8) SHOW_FRAME(1, 0) - TILES(0x15028, 8) - SHOW_FRAME(1, 1) + TILES(0x15028, 8) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0700[1] = { +const s32 *const anim_0700[1] = { anim_0700__v0_l0, }; const s32 anim_0701__v0_l0[] = { // 0x080F84C0 - PALETTE(116, 16, 0xC0) - TILES(0x15030, 8) - SHOW_FRAME(1, 0) + PALETTE(116, 16, 0xC0) TILES(0x15030, 8) SHOW_FRAME(1, 0) - TILES(0x15038, 8) - SHOW_FRAME(1, 1) + TILES(0x15038, 8) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0701[1] = { +const s32 *const anim_0701[1] = { anim_0701__v0_l0, }; const s32 anim_0702__v0_l0[] = { // 0x080F84FC - PALETTE(116, 16, 0xC0) - TILES(0x15040, 8) - SHOW_FRAME(5, 0) + PALETTE(116, 16, 0xC0) TILES(0x15040, 8) SHOW_FRAME(5, 0) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - TILES(0x15050, 8) - SHOW_FRAME(5, 2) + TILES(0x15050, 8) SHOW_FRAME(5, 2) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - TILES(0x15040, 8) - SHOW_FRAME(5, 0) + TILES(0x15040, 8) SHOW_FRAME(5, 0) - TILES(0x15058, 8) - SHOW_FRAME(5, 3) + TILES(0x15058, 8) SHOW_FRAME(5, 3) - TILES(0x15060, 8) - SHOW_FRAME(5, 4) + TILES(0x15060, 8) SHOW_FRAME(5, 4) - TILES(0x15058, 8) - SHOW_FRAME(5, 3) + TILES(0x15058, 8) SHOW_FRAME(5, 3) - TILES(0x15040, 8) - SHOW_FRAME(5, 0) + TILES(0x15040, 8) SHOW_FRAME(5, 0) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - TILES(0x15050, 8) - SHOW_FRAME(5, 2) + TILES(0x15050, 8) SHOW_FRAME(5, 2) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - TILES(0x15040, 8) - SHOW_FRAME(5, 0) + TILES(0x15040, 8) SHOW_FRAME(5, 0) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - TILES(0x15050, 8) - SHOW_FRAME(5, 2) + TILES(0x15050, 8) SHOW_FRAME(5, 2) - TILES(0x15048, 8) - SHOW_FRAME(5, 1) + TILES(0x15048, 8) SHOW_FRAME(5, 1) - JUMP_BACK(83) + JUMP_BACK(83) }; -const s32 * const anim_0702[1] = { +const s32 *const anim_0702[1] = { anim_0702__v0_l0, }; const s32 anim_0703__v0_l0[] = { // 0x080F8654 - PALETTE(116, 16, 0xC0) - TILES(0x15068, 8) - SHOW_FRAME(12, 0) + PALETTE(116, 16, 0xC0) TILES(0x15068, 8) SHOW_FRAME(12, 0) - TILES(0x15070, 8) - SHOW_FRAME(12, 1) + TILES(0x15070, 8) SHOW_FRAME(12, 1) - TILES(0x15078, 12) - SHOW_FRAME(12, 2) + TILES(0x15078, 12) SHOW_FRAME(12, 2) - TILES(0x15084, 8) - SHOW_FRAME(12, 3) + TILES(0x15084, 8) SHOW_FRAME(12, 3) - TILES(0x1508C, 8) - SHOW_FRAME(12, 4) + TILES(0x1508C, 8) SHOW_FRAME(12, 4) - TILES(0x15084, 8) - SHOW_FRAME(12, 3) + TILES(0x15084, 8) SHOW_FRAME(12, 3) - TILES(0x15078, 12) - SHOW_FRAME(12, 2) + TILES(0x15078, 12) SHOW_FRAME(12, 2) - TILES(0x15070, 8) - SHOW_FRAME(12, 1) + TILES(0x15070, 8) SHOW_FRAME(12, 1) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0703[1] = { +const s32 *const anim_0703[1] = { anim_0703__v0_l0, }; const s32 anim_0704__v0_l0[] = { // 0x080F870C - PALETTE(116, 16, 0xC0) - TILES(0x15094, 12) - HITBOX(0, -8, -5, 8, 15) - SHOW_FRAME(45, 0) + PALETTE(116, 16, 0xC0) TILES(0x15094, 12) HITBOX(0, -8, -5, 8, 15) SHOW_FRAME(45, 0) - TILES(0x150A0, 12) - SHOW_FRAME(6, 1) + TILES(0x150A0, 12) SHOW_FRAME(6, 1) - TILES(0x150AC, 12) - SHOW_FRAME(8, 2) + TILES(0x150AC, 12) SHOW_FRAME(8, 2) - TILES(0x150B8, 12) - SHOW_FRAME(8, 3) + TILES(0x150B8, 12) SHOW_FRAME(8, 3) - TILES(0x150C4, 12) - SHOW_FRAME(8, 4) + TILES(0x150C4, 12) SHOW_FRAME(8, 4) - TILES(0x150B8, 12) - SHOW_FRAME(8, 3) + TILES(0x150B8, 12) SHOW_FRAME(8, 3) - TILES(0x150C4, 12) - SHOW_FRAME(8, 4) + TILES(0x150C4, 12) SHOW_FRAME(8, 4) - TILES(0x150B8, 12) - SHOW_FRAME(8, 3) + TILES(0x150B8, 12) SHOW_FRAME(8, 3) - TILES(0x150C4, 12) - SHOW_FRAME(8, 4) + TILES(0x150C4, 12) SHOW_FRAME(8, 4) - TILES(0x150B8, 12) - SHOW_FRAME(8, 3) + TILES(0x150B8, 12) SHOW_FRAME(8, 3) - TILES(0x150C4, 12) - SHOW_FRAME(8, 4) + TILES(0x150C4, 12) SHOW_FRAME(8, 4) - TILES(0x150AC, 12) - SHOW_FRAME(6, 2) + TILES(0x150AC, 12) SHOW_FRAME(6, 2) - TILES(0x150A0, 12) - SHOW_FRAME(5, 1) + TILES(0x150A0, 12) SHOW_FRAME(5, 1) - JUMP_BACK(71) + JUMP_BACK(71) }; -const s32 * const anim_0704[1] = { +const s32 *const anim_0704[1] = { anim_0704__v0_l0, }; const s32 anim_0705__v0_l0[] = { // 0x080F8834 - TILES(0x150D0, 16) - PALETTE(33, 16, 0x70) - HITBOX(0, -13, -24, 13, 4) - SHOW_FRAME(1, 0) + TILES(0x150D0, 16) PALETTE(33, 16, 0x70) HITBOX(0, -13, -24, 13, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0705[1] = { +const s32 *const anim_0705[1] = { anim_0705__v0_l0, }; const s32 anim_0706__v0_l0[] = { // 0x080F8868 - PALETTE(0, 16, 0x0) - TILES(0x150E0, 4) - SHOW_FRAME(1, 0) + PALETTE(0, 16, 0x0) TILES(0x150E0, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0706__v1_l0[] = { // 0x080F888C - PALETTE(2, 16, 0x10) - TILES(0x150E4, 4) - SHOW_FRAME(1, 1) + PALETTE(2, 16, 0x10) TILES(0x150E4, 4) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0706__v2_l0[] = { // 0x080F88B0 - PALETTE(5, 16, 0x20) - TILES(0x150E8, 4) - SHOW_FRAME(1, 2) + PALETTE(5, 16, 0x20) TILES(0x150E8, 4) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0706__v3_l0[] = { // 0x080F88D4 - PALETTE(7, 16, 0x30) - TILES(0x150EC, 4) - SHOW_FRAME(1, 3) + PALETTE(7, 16, 0x30) TILES(0x150EC, 4) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0706__v4_l0[] = { // 0x080F88F8 - PALETTE(1, 16, 0x50) - TILES(0x150F0, 4) - SHOW_FRAME(1, 4) + PALETTE(1, 16, 0x50) TILES(0x150F0, 4) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0706__v5_l0[] = { // 0x080F891C - PALETTE(117, 16, 0xA0) - TILES(0x150F4, 4) - SHOW_FRAME(1, 5) + PALETTE(117, 16, 0xA0) TILES(0x150F4, 4) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0706__v6_l0[] = { // 0x080F8940 - PALETTE(117, 16, 0xA0) - TILES(0x150F8, 4) - SHOW_FRAME(1, 6) + PALETTE(117, 16, 0xA0) TILES(0x150F8, 4) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0706__v7_l0[] = { // 0x080F8964 - PALETTE(117, 16, 0xA0) - TILES(0x150FC, 4) - SHOW_FRAME(1, 7) + PALETTE(117, 16, 0xA0) TILES(0x150FC, 4) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0706__v8_l0[] = { // 0x080F8988 - PALETTE(68, 16, 0x60) - TILES(0x15100, 4) - SHOW_FRAME(1, 8) + PALETTE(68, 16, 0x60) TILES(0x15100, 4) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0706__v9_l0[] = { // 0x080F89AC - PALETTE(68, 16, 0x60) - TILES(0x15104, 4) - SHOW_FRAME(1, 9) + PALETTE(68, 16, 0x60) TILES(0x15104, 4) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0706__v10_l0[] = { // 0x080F89D0 - PALETTE(68, 16, 0x60) - TILES(0x15108, 4) - SHOW_FRAME(1, 10) + PALETTE(68, 16, 0x60) TILES(0x15108, 4) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0706__v11_l0[] = { // 0x080F89F4 - PALETTE(68, 16, 0x60) - TILES(0x1510C, 4) - SHOW_FRAME(1, 11) + PALETTE(68, 16, 0x60) TILES(0x1510C, 4) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0706__v12_l0[] = { // 0x080F8A18 - PALETTE(117, 16, 0xA0) - TILES(0x15110, 4) - SHOW_FRAME(1, 12) + PALETTE(117, 16, 0xA0) TILES(0x15110, 4) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0706__v13_l0[] = { // 0x080F8A3C - PALETTE(117, 16, 0xA0) - TILES(0x15114, 4) - SHOW_FRAME(1, 13) + PALETTE(117, 16, 0xA0) TILES(0x15114, 4) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0706__v14_l0[] = { // 0x080F8A60 - PALETTE(117, 16, 0xA0) - TILES(0x15118, 4) - SHOW_FRAME(1, 14) + PALETTE(117, 16, 0xA0) TILES(0x15118, 4) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0706__v15_l0[] = { // 0x080F8A84 - PALETTE(1, 16, 0x50) - TILES(0x1511C, 4) - SHOW_FRAME(1, 15) + PALETTE(1, 16, 0x50) TILES(0x1511C, 4) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0706__v16_l0[] = { // 0x080F8AA8 - PALETTE(117, 16, 0xA0) - TILES(0x15120, 4) - SHOW_FRAME(1, 16) + PALETTE(117, 16, 0xA0) TILES(0x15120, 4) SHOW_FRAME(1, 16) - END() + END() }; -const s32 * const anim_0706[17] = { - anim_0706__v0_l0, - anim_0706__v1_l0, - anim_0706__v2_l0, - anim_0706__v3_l0, - anim_0706__v4_l0, - anim_0706__v5_l0, - anim_0706__v6_l0, - anim_0706__v7_l0, - anim_0706__v8_l0, - anim_0706__v9_l0, - anim_0706__v10_l0, - anim_0706__v11_l0, - anim_0706__v12_l0, - anim_0706__v13_l0, - anim_0706__v14_l0, - anim_0706__v15_l0, - anim_0706__v16_l0, +const s32 *const anim_0706[17] = { + anim_0706__v0_l0, anim_0706__v1_l0, anim_0706__v2_l0, anim_0706__v3_l0, anim_0706__v4_l0, anim_0706__v5_l0, + anim_0706__v6_l0, anim_0706__v7_l0, anim_0706__v8_l0, anim_0706__v9_l0, anim_0706__v10_l0, anim_0706__v11_l0, + anim_0706__v12_l0, anim_0706__v13_l0, anim_0706__v14_l0, anim_0706__v15_l0, anim_0706__v16_l0, }; const s32 anim_0707__v0_l0[] = { // 0x080F8B10 - TILES(0x15124, 16) - PALETTE(68, 16, 0x60) - SHOW_FRAME(8, 0) + TILES(0x15124, 16) PALETTE(68, 16, 0x60) SHOW_FRAME(8, 0) - SHOW_FRAME(8, 1) + SHOW_FRAME(8, 1) - SHOW_FRAME(8, 2) + SHOW_FRAME(8, 2) - SHOW_FRAME(8, 3) + SHOW_FRAME(8, 3) - JUMP_BACK(11) + JUMP_BACK(11) }; -const s32 * const anim_0707[1] = { +const s32 *const anim_0707[1] = { anim_0707__v0_l0, }; const s32 anim_0708__v0_l0[] = { // 0x080F8B54 - TILES(0x15134, 16) - PALETTE(68, 16, 0x60) - PLAY_SOUND(117) - SHOW_FRAME(8, 0) + TILES(0x15134, 16) PALETTE(68, 16, 0x60) PLAY_SOUND(117) SHOW_FRAME(8, 0) - SHOW_FRAME(8, 1) + SHOW_FRAME(8, 1) - SHOW_FRAME(8, 2) + SHOW_FRAME(8, 2) - SHOW_FRAME(8, 3) + SHOW_FRAME(8, 3) - END() + END() }; -const s32 * const anim_0708[1] = { +const s32 *const anim_0708[1] = { anim_0708__v0_l0, }; const s32 anim_0709__v0_l0[] = { // 0x080F8B9C - PALETTE(68, 16, 0x60) - TILES(0x15144, 2) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x15144, 2) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0709__v1_l0[] = { // 0x080F8BC0 - PALETTE(68, 16, 0x60) - TILES(0x15146, 2) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x15146, 2) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0709__v2_l0[] = { // 0x080F8BE4 - PALETTE(68, 16, 0x60) - TILES(0x15148, 2) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x15148, 2) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0709__v3_l0[] = { // 0x080F8C08 - PALETTE(68, 16, 0x60) - TILES(0x1514A, 2) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x1514A, 2) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0709__v4_l0[] = { // 0x080F8C2C - PALETTE(68, 16, 0x60) - TILES(0x1514C, 2) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x1514C, 2) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0709[5] = { - anim_0709__v0_l0, - anim_0709__v1_l0, - anim_0709__v2_l0, - anim_0709__v3_l0, - anim_0709__v4_l0, +const s32 *const anim_0709[5] = { + anim_0709__v0_l0, anim_0709__v1_l0, anim_0709__v2_l0, anim_0709__v3_l0, anim_0709__v4_l0, }; const s32 anim_0710__v0_l0[] = { // 0x080F8C64 - PALETTE(118, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(118, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v1_l0[] = { // 0x080F8D5C - PALETTE(119, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(119, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v2_l0[] = { // 0x080F8E54 - PALETTE(120, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(120, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v3_l0[] = { // 0x080F8F4C - PALETTE(121, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(121, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v4_l0[] = { // 0x080F9044 - PALETTE(122, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(122, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v5_l0[] = { // 0x080F913C - PALETTE(123, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(123, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; const s32 anim_0710__v6_l0[] = { // 0x080F9234 - PALETTE(124, 16, 0x0) - SHOW_FRAME(21, -1) + PALETTE(124, 16, 0x0) SHOW_FRAME(21, -1) - TILES(0x1514E, 4) - SHOW_FRAME(2, 0) + TILES(0x1514E, 4) SHOW_FRAME(2, 0) - TILES(0x15152, 4) - SHOW_FRAME(20, 1) - TILES(0x15156, 4) - SHOW_FRAME(6, 2) + TILES(0x15152, 4) SHOW_FRAME(20, 1) TILES(0x15156, 4) SHOW_FRAME(6, 2) - TILES(0x1515A, 4) - SHOW_FRAME(6, 3) + TILES(0x1515A, 4) SHOW_FRAME(6, 3) - TILES(0x1515E, 4) - SHOW_FRAME(6, 4) + TILES(0x1515E, 4) SHOW_FRAME(6, 4) - TILES(0x15162, 4) - SHOW_FRAME(3, 5) + TILES(0x15162, 4) SHOW_FRAME(3, 5) - TILES(0x15166, 4) - SHOW_FRAME(3, 6) + TILES(0x15166, 4) SHOW_FRAME(3, 6) - TILES(0x1516A, 4) - SHOW_FRAME(3, 7) + TILES(0x1516A, 4) SHOW_FRAME(3, 7) - TILES(0x1516E, 4) - SHOW_FRAME(3, 8) + TILES(0x1516E, 4) SHOW_FRAME(3, 8) - TILES(0x15172, 4) - SHOW_FRAME(3, 9) + TILES(0x15172, 4) SHOW_FRAME(3, 9) - TILES(0x1515A, 4) - SHOW_FRAME(3, 3) + TILES(0x1515A, 4) SHOW_FRAME(3, 3) - JUMP_BACK(45) + JUMP_BACK(45) }; -const s32 * const anim_0710[7] = { - anim_0710__v0_l0, - anim_0710__v1_l0, - anim_0710__v2_l0, - anim_0710__v3_l0, - anim_0710__v4_l0, - anim_0710__v5_l0, - anim_0710__v6_l0, +const s32 *const anim_0710[7] = { + anim_0710__v0_l0, anim_0710__v1_l0, anim_0710__v2_l0, anim_0710__v3_l0, anim_0710__v4_l0, anim_0710__v5_l0, anim_0710__v6_l0, }; const s32 anim_0711__v0_l0[] = { // 0x080F9348 - PALETTE(118, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(118, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v1_l0[] = { // 0x080F94B8 - PALETTE(119, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(119, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v2_l0[] = { // 0x080F9628 - PALETTE(120, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(120, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(0, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(0, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v3_l0[] = { // 0x080F9798 - PALETTE(121, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(121, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v4_l0[] = { // 0x080F9908 - PALETTE(122, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(122, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v5_l0[] = { // 0x080F9A78 - PALETTE(123, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(123, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; const s32 anim_0711__v6_l0[] = { // 0x080F9BE8 - PALETTE(124, 16, 0x0) - SHOW_FRAME(10, -1) + PALETTE(124, 16, 0x0) SHOW_FRAME(10, -1) - TILES(0x15176, 2) - SHOW_FRAME(3, 0) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15176, 2) SHOW_FRAME(3, 0) TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - TILES(0x15178, 4) - SHOW_FRAME(6, 1) + TILES(0x15178, 4) SHOW_FRAME(6, 1) - JUMP_BACK(80) + JUMP_BACK(80) }; -const s32 * const anim_0711[7] = { - anim_0711__v0_l0, - anim_0711__v1_l0, - anim_0711__v2_l0, - anim_0711__v3_l0, - anim_0711__v4_l0, - anim_0711__v5_l0, - anim_0711__v6_l0, +const s32 *const anim_0711[7] = { + anim_0711__v0_l0, anim_0711__v1_l0, anim_0711__v2_l0, anim_0711__v3_l0, anim_0711__v4_l0, anim_0711__v5_l0, anim_0711__v6_l0, }; const s32 anim_0712__v0_l0[] = { // 0x080F9D74 - PALETTE(118, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(118, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v1_l0[] = { // 0x080F9DA0 - PALETTE(119, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(119, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v2_l0[] = { // 0x080F9DCC - PALETTE(120, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(120, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v3_l0[] = { // 0x080F9DF8 - PALETTE(121, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(121, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v4_l0[] = { // 0x080F9E24 - PALETTE(122, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(122, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v5_l0[] = { // 0x080F9E50 - PALETTE(123, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(123, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0712__v6_l0[] = { // 0x080F9E7C - PALETTE(124, 16, 0x0) - SHOW_FRAME(34, -1) + PALETTE(124, 16, 0x0) SHOW_FRAME(34, -1) - TILES(0x1517C, 4) - SHOW_FRAME(1, 0) + TILES(0x1517C, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0712[7] = { - anim_0712__v0_l0, - anim_0712__v1_l0, - anim_0712__v2_l0, - anim_0712__v3_l0, - anim_0712__v4_l0, - anim_0712__v5_l0, - anim_0712__v6_l0, +const s32 *const anim_0712[7] = { + anim_0712__v0_l0, anim_0712__v1_l0, anim_0712__v2_l0, anim_0712__v3_l0, anim_0712__v4_l0, anim_0712__v5_l0, anim_0712__v6_l0, }; const s32 anim_0713__v0_l0[] = { // 0x080F9EC4 - PALETTE(118, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(118, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v1_l0[] = { // 0x080F9F6C - PALETTE(119, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(119, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v2_l0[] = { // 0x080FA014 - PALETTE(120, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(120, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v3_l0[] = { // 0x080FA0BC - PALETTE(121, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(121, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v4_l0[] = { // 0x080FA164 - PALETTE(122, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(122, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v5_l0[] = { // 0x080FA20C - PALETTE(123, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(123, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; const s32 anim_0713__v6_l0[] = { // 0x080FA2B4 - PALETTE(124, 16, 0x0) - SHOW_FRAME(30, -1) + PALETTE(124, 16, 0x0) SHOW_FRAME(30, -1) - TILES(0x15180, 2) - SHOW_FRAME(3, 0) + TILES(0x15180, 2) SHOW_FRAME(3, 0) - TILES(0x15182, 4) - SHOW_FRAME(3, 1) + TILES(0x15182, 4) SHOW_FRAME(3, 1) - TILES(0x15186, 2) - SHOW_FRAME(3, 2) - TILES(0x15188, 4) - SHOW_FRAME(25, 3) + TILES(0x15186, 2) SHOW_FRAME(3, 2) TILES(0x15188, 4) SHOW_FRAME(25, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - TILES(0x15188, 4) - SHOW_FRAME(6, 3) + TILES(0x15188, 4) SHOW_FRAME(6, 3) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0713[7] = { - anim_0713__v0_l0, - anim_0713__v1_l0, - anim_0713__v2_l0, - anim_0713__v3_l0, - anim_0713__v4_l0, - anim_0713__v5_l0, - anim_0713__v6_l0, +const s32 *const anim_0713[7] = { + anim_0713__v0_l0, anim_0713__v1_l0, anim_0713__v2_l0, anim_0713__v3_l0, anim_0713__v4_l0, anim_0713__v5_l0, anim_0713__v6_l0, }; const s32 anim_0714__v0_l0[] = { // 0x080FA378 - PALETTE(88, 16, 0x0) - TILES(0x1518C, 12) - SHOW_FRAME(1, 0) + PALETTE(88, 16, 0x0) TILES(0x1518C, 12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0714[1] = { +const s32 *const anim_0714[1] = { anim_0714__v0_l0, }; const s32 anim_0715__v0_l0[] = { // 0x080FA3A0 - PALETTE(68, 16, 0x60) - TILES(0x15198, 64) - HITBOX(0, 71, 69, 71, 70) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x15198, 64) HITBOX(0, 71, 69, 71, 70) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0715__v1_l0[] = { // 0x080FA3D0 - PALETTE(68, 16, 0x60) - TILES(0x151D8, 64) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x151D8, 64) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0715__v2_l0[] = { // 0x080FA3F4 - PALETTE(68, 16, 0x60) - TILES(0x15218, 64) - HITBOX(0, 0, -1, 0, -1) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x15218, 64) HITBOX(0, 0, -1, 0, -1) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0715__v3_l0[] = { // 0x080FA424 - PALETTE(68, 16, 0x60) - TILES(0x15258, 64) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x15258, 64) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0715__v4_l0[] = { // 0x080FA448 - PALETTE(68, 16, 0x60) - TILES(0x15298, 14) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x15298, 14) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0715[5] = { - anim_0715__v0_l0, - anim_0715__v1_l0, - anim_0715__v2_l0, - anim_0715__v3_l0, - anim_0715__v4_l0, +const s32 *const anim_0715[5] = { + anim_0715__v0_l0, anim_0715__v1_l0, anim_0715__v2_l0, anim_0715__v3_l0, anim_0715__v4_l0, }; const s32 anim_0716__v0_l0[] = { // 0x080FA480 - PALETTE(125, 16, 0x0) - TILES(0x152A6, 42) - SHOW_FRAME(1, 0) + PALETTE(125, 16, 0x0) TILES(0x152A6, 42) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0716[1] = { +const s32 *const anim_0716[1] = { anim_0716__v0_l0, }; const s32 anim_0717__v0_l0[] = { // 0x080FA4A8 - PALETTE(126, 16, 0x0) - TILES(0x152D0, 56) - SHOW_FRAME(1, 0) + PALETTE(126, 16, 0x0) TILES(0x152D0, 56) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0717__v1_l0[] = { // 0x080FA4CC - PALETTE(126, 16, 0x0) - TILES(0x15308, 56) - SHOW_FRAME(1, 1) + PALETTE(126, 16, 0x0) TILES(0x15308, 56) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0717__v2_l0[] = { // 0x080FA4F0 - PALETTE(126, 16, 0x0) - TILES(0x15340, 56) - SHOW_FRAME(1, 2) + PALETTE(126, 16, 0x0) TILES(0x15340, 56) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0717[3] = { +const s32 *const anim_0717[3] = { anim_0717__v0_l0, anim_0717__v1_l0, anim_0717__v2_l0, }; const s32 anim_0718__v0_l0[] = { // 0x080FA520 - PALETTE(68, 16, 0x60) - TILES(0x15378, 20) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x15378, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0718[1] = { +const s32 *const anim_0718[1] = { anim_0718__v0_l0, }; const s32 anim_0719__v0_l0[] = { // 0x080FA548 - PALETTE(68, 16, 0x60) - TILES(0x1538C, 16) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x1538C, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0719__v1_l0[] = { // 0x080FA56C - PALETTE(68, 16, 0x60) - TILES(0x1539C, 16) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x1539C, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0719__v2_l0[] = { // 0x080FA590 - PALETTE(68, 16, 0x60) - TILES(0x153AC, 16) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x153AC, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0719__v3_l0[] = { // 0x080FA5B4 - PALETTE(68, 16, 0x60) - TILES(0x153BC, 16) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x153BC, 16) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0719[4] = { +const s32 *const anim_0719[4] = { anim_0719__v0_l0, anim_0719__v1_l0, anim_0719__v2_l0, @@ -22185,179 +15600,131 @@ const s32 * const anim_0719[4] = { }; const s32 anim_0720__v0_l0[] = { // 0x080FA5E8 - PALETTE(68, 16, 0x60) - TILES(0x153CC, 48) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x153CC, 48) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0720[1] = { +const s32 *const anim_0720[1] = { anim_0720__v0_l0, }; const s32 anim_0721__v0_l0[] = { // 0x080FA610 - PALETTE(68, 16, 0x60) - TILES(0x153FC, 3) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x153FC, 3) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0721[1] = { +const s32 *const anim_0721[1] = { anim_0721__v0_l0, }; const s32 anim_0722__v0_l0[] = { // 0x080FA638 - PALETTE(127, 16, 0x70) - TILES(0x153FF, 80) - SHOW_FRAME(1, 0) + PALETTE(127, 16, 0x70) TILES(0x153FF, 80) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0722__v1_l0[] = { // 0x080FA65C - PALETTE(127, 16, 0x70) - TILES(0x1544F, 80) - SHOW_FRAME(8, 1) + PALETTE(127, 16, 0x70) TILES(0x1544F, 80) SHOW_FRAME(8, 1) - TILES(0x1549F, 80) - SHOW_FRAME(3, 2) + TILES(0x1549F, 80) SHOW_FRAME(3, 2) - TILES(0x154EF, 80) - SHOW_FRAME(15, 3) + TILES(0x154EF, 80) SHOW_FRAME(15, 3) - END() + END() }; const s32 anim_0722__v2_l0[] = { // 0x080FA6A8 - PALETTE(128, 16, 0x80) - TILES(0x1553F, 72) - SHOW_FRAME(1, 4) + PALETTE(128, 16, 0x80) TILES(0x1553F, 72) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0722__v3_l0[] = { // 0x080FA6CC - PALETTE(128, 16, 0x80) - TILES(0x15587, 81) - SHOW_FRAME(4, 5) + PALETTE(128, 16, 0x80) TILES(0x15587, 81) SHOW_FRAME(4, 5) - TILES(0x155D8, 81) - SHOW_FRAME(4, 6) + TILES(0x155D8, 81) SHOW_FRAME(4, 6) - TILES(0x15629, 81) - SHOW_FRAME(3, 7) + TILES(0x15629, 81) SHOW_FRAME(3, 7) - TILES(0x1567A, 72) - SHOW_FRAME(15, 8) + TILES(0x1567A, 72) SHOW_FRAME(15, 8) - END() + END() }; const s32 anim_0722__v4_l0[] = { // 0x080FA72C - PALETTE(129, 16, 0x90) - TILES(0x156C2, 70) - SHOW_FRAME(1, 9) + PALETTE(129, 16, 0x90) TILES(0x156C2, 70) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0722__v5_l0[] = { // 0x080FA750 - PALETTE(129, 16, 0x90) - TILES(0x15708, 90) - SHOW_FRAME(4, 10) + PALETTE(129, 16, 0x90) TILES(0x15708, 90) SHOW_FRAME(4, 10) - TILES(0x15762, 90) - SHOW_FRAME(4, 11) + TILES(0x15762, 90) SHOW_FRAME(4, 11) - TILES(0x157BC, 90) - SHOW_FRAME(2, 12) + TILES(0x157BC, 90) SHOW_FRAME(2, 12) - TILES(0x15816, 80) - SHOW_FRAME(15, 13) + TILES(0x15816, 80) SHOW_FRAME(15, 13) - END() + END() }; const s32 anim_0722__v6_l0[] = { // 0x080FA7B0 - PALETTE(130, 16, 0xA0) - TILES(0x15866, 63) - SHOW_FRAME(1, 14) + PALETTE(130, 16, 0xA0) TILES(0x15866, 63) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0722__v7_l0[] = { // 0x080FA7D4 - PALETTE(130, 16, 0xA0) - TILES(0x158A5, 63) - SHOW_FRAME(3, 15) + PALETTE(130, 16, 0xA0) TILES(0x158A5, 63) SHOW_FRAME(3, 15) - TILES(0x158E4, 63) - SHOW_FRAME(3, 16) + TILES(0x158E4, 63) SHOW_FRAME(3, 16) - TILES(0x15923, 70) - SHOW_FRAME(3, 17) + TILES(0x15923, 70) SHOW_FRAME(3, 17) - TILES(0x15969, 70) - SHOW_FRAME(6, 18) + TILES(0x15969, 70) SHOW_FRAME(6, 18) - TILES(0x159AF, 70) - SHOW_FRAME(4, 19) + TILES(0x159AF, 70) SHOW_FRAME(4, 19) - TILES(0x159F5, 70) - SHOW_FRAME(2, 20) + TILES(0x159F5, 70) SHOW_FRAME(2, 20) - TILES(0x15A3B, 80) - SHOW_FRAME(15, 21) + TILES(0x15A3B, 80) SHOW_FRAME(15, 21) - END() + END() }; -const s32 * const anim_0722[8] = { - anim_0722__v0_l0, - anim_0722__v1_l0, - anim_0722__v2_l0, - anim_0722__v3_l0, - anim_0722__v4_l0, - anim_0722__v5_l0, - anim_0722__v6_l0, - anim_0722__v7_l0, +const s32 *const anim_0722[8] = { + anim_0722__v0_l0, anim_0722__v1_l0, anim_0722__v2_l0, anim_0722__v3_l0, + anim_0722__v4_l0, anim_0722__v5_l0, anim_0722__v6_l0, anim_0722__v7_l0, }; const s32 anim_0723__v0_l0[] = { // 0x080FA890 - PALETTE(131, 16, 0x0) - TILES(0x15A8B, 600) - SHOW_FRAME(2, 0) + PALETTE(131, 16, 0x0) TILES(0x15A8B, 600) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0723__v1_l0[] = { // 0x080FA8B4 - PALETTE(132, 16, 0x0) - TILES(0x15CE3, 600) - SHOW_FRAME(2, 1) + PALETTE(132, 16, 0x0) TILES(0x15CE3, 600) SHOW_FRAME(2, 1) - END() + END() }; const s32 anim_0723__v2_l0[] = { // 0x080FA8D8 - PALETTE(133, 16, 0x0) - TILES(0x15F3B, 600) - SHOW_FRAME(2, 2) + PALETTE(133, 16, 0x0) TILES(0x15F3B, 600) SHOW_FRAME(2, 2) - END() + END() }; const s32 anim_0723__v3_l0[] = { // 0x080FA8FC - PALETTE(132, 16, 0x0) - TILES(0x16193, 600) - SHOW_FRAME(2, 3) + PALETTE(132, 16, 0x0) TILES(0x16193, 600) SHOW_FRAME(2, 3) - END() + END() }; -const s32 * const anim_0723[4] = { +const s32 *const anim_0723[4] = { anim_0723__v0_l0, anim_0723__v1_l0, anim_0723__v2_l0, @@ -22365,397 +15732,300 @@ const s32 * const anim_0723[4] = { }; const s32 anim_0724__v0_l0[] = { // 0x080FA930 - PALETTE(134, 16, 0x30) - SHOW_FRAME(1, -1) + PALETTE(134, 16, 0x30) SHOW_FRAME(1, -1) - JUMP_BACK(5) + JUMP_BACK(5) }; const s32 anim_0724__v1_l0[] = { // 0x080FA94C - PALETTE(135, 16, 0x20) - TILES(0x163EB, 28) - SHOW_FRAME(1, 0) + PALETTE(135, 16, 0x20) TILES(0x163EB, 28) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0724__v2_l0[] = { // 0x080FA970 - PALETTE(135, 16, 0x20) - TILES(0x16407, 30) - SHOW_FRAME(1, 1) + PALETTE(135, 16, 0x20) TILES(0x16407, 30) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0724__v3_l0[] = { // 0x080FA994 - PALETTE(135, 16, 0x20) - TILES(0x16425, 28) - SHOW_FRAME(1, 2) + PALETTE(135, 16, 0x20) TILES(0x16425, 28) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0724__v4_l0[] = { // 0x080FA9B8 - PALETTE(135, 16, 0x20) - TILES(0x16441, 30) - SHOW_FRAME(1, 3) + PALETTE(135, 16, 0x20) TILES(0x16441, 30) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0724__v5_l0[] = { // 0x080FA9DC - PALETTE(135, 16, 0x20) - TILES(0x1645F, 28) - SHOW_FRAME(1, 4) + PALETTE(135, 16, 0x20) TILES(0x1645F, 28) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0724__v6_l0[] = { // 0x080FAA00 - PALETTE(135, 16, 0x20) - TILES(0x1647B, 30) - SHOW_FRAME(1, 5) + PALETTE(135, 16, 0x20) TILES(0x1647B, 30) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0724__v7_l0[] = { // 0x080FAA24 - PALETTE(135, 16, 0x20) - TILES(0x16499, 28) - SHOW_FRAME(1, 6) + PALETTE(135, 16, 0x20) TILES(0x16499, 28) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0724__v8_l0[] = { // 0x080FAA48 - PALETTE(135, 16, 0x20) - TILES(0x164B5, 30) - SHOW_FRAME(1, 7) + PALETTE(135, 16, 0x20) TILES(0x164B5, 30) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0724__v9_l0[] = { // 0x080FAA6C - PALETTE(135, 16, 0x20) - TILES(0x164D3, 28) - SHOW_FRAME(1, 8) + PALETTE(135, 16, 0x20) TILES(0x164D3, 28) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0724__v10_l0[] = { // 0x080FAA90 - PALETTE(135, 16, 0x20) - TILES(0x164EF, 30) - SHOW_FRAME(1, 9) + PALETTE(135, 16, 0x20) TILES(0x164EF, 30) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0724__v11_l0[] = { // 0x080FAAB4 - PALETTE(135, 16, 0x20) - TILES(0x1650D, 28) - SHOW_FRAME(1, 10) + PALETTE(135, 16, 0x20) TILES(0x1650D, 28) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0724__v12_l0[] = { // 0x080FAAD8 - PALETTE(135, 16, 0x20) - TILES(0x16529, 30) - SHOW_FRAME(1, 11) + PALETTE(135, 16, 0x20) TILES(0x16529, 30) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0724__v13_l0[] = { // 0x080FAAFC - PALETTE(135, 16, 0x20) - TILES(0x16547, 28) - SHOW_FRAME(1, 12) + PALETTE(135, 16, 0x20) TILES(0x16547, 28) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0724__v14_l0[] = { // 0x080FAB20 - PALETTE(135, 16, 0x20) - TILES(0x16563, 28) - SHOW_FRAME(1, 13) + PALETTE(135, 16, 0x20) TILES(0x16563, 28) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0724__v15_l0[] = { // 0x080FAB44 - PALETTE(135, 16, 0x20) - TILES(0x1657F, 26) - SHOW_FRAME(1, 14) + PALETTE(135, 16, 0x20) TILES(0x1657F, 26) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0724__v16_l0[] = { // 0x080FAB68 - PALETTE(135, 16, 0x20) - TILES(0x16599, 26) - SHOW_FRAME(1, 15) + PALETTE(135, 16, 0x20) TILES(0x16599, 26) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0724__v17_l0[] = { // 0x080FAB8C - PALETTE(135, 16, 0x20) - TILES(0x165B3, 26) - SHOW_FRAME(1, 16) + PALETTE(135, 16, 0x20) TILES(0x165B3, 26) SHOW_FRAME(1, 16) - END() + END() }; const s32 anim_0724__v18_l0[] = { // 0x080FABB0 - PALETTE(135, 16, 0x20) - TILES(0x165CD, 26) - SHOW_FRAME(1, 17) + PALETTE(135, 16, 0x20) TILES(0x165CD, 26) SHOW_FRAME(1, 17) - END() + END() }; -const s32 * const anim_0724[19] = { - anim_0724__v0_l0, - anim_0724__v1_l0, - anim_0724__v2_l0, - anim_0724__v3_l0, - anim_0724__v4_l0, - anim_0724__v5_l0, - anim_0724__v6_l0, - anim_0724__v7_l0, - anim_0724__v8_l0, - anim_0724__v9_l0, - anim_0724__v10_l0, - anim_0724__v11_l0, - anim_0724__v12_l0, - anim_0724__v13_l0, - anim_0724__v14_l0, - anim_0724__v15_l0, - anim_0724__v16_l0, - anim_0724__v17_l0, - anim_0724__v18_l0, +const s32 *const anim_0724[19] = { + anim_0724__v0_l0, anim_0724__v1_l0, anim_0724__v2_l0, anim_0724__v3_l0, anim_0724__v4_l0, anim_0724__v5_l0, anim_0724__v6_l0, + anim_0724__v7_l0, anim_0724__v8_l0, anim_0724__v9_l0, anim_0724__v10_l0, anim_0724__v11_l0, anim_0724__v12_l0, anim_0724__v13_l0, + anim_0724__v14_l0, anim_0724__v15_l0, anim_0724__v16_l0, anim_0724__v17_l0, anim_0724__v18_l0, }; const s32 anim_0725__v0_l0[] = { // 0x080FAC20 - PALETTE(136, 16, 0x70) - TILES(0x165E7, 36) - SHOW_FRAME(1, 0) + PALETTE(136, 16, 0x70) TILES(0x165E7, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0725[1] = { +const s32 *const anim_0725[1] = { anim_0725__v0_l0, }; const s32 anim_0726__v0_l0[] = { // 0x080FAC48 - PALETTE(137, 16, 0x80) - TILES(0x1660B, 36) - SHOW_FRAME(1, 0) + PALETTE(137, 16, 0x80) TILES(0x1660B, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0726[1] = { +const s32 *const anim_0726[1] = { anim_0726__v0_l0, }; const s32 anim_0727__v0_l0[] = { // 0x080FAC70 - PALETTE(138, 16, 0x90) - TILES(0x1662F, 36) - SHOW_FRAME(1, 0) + PALETTE(138, 16, 0x90) TILES(0x1662F, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0727[1] = { +const s32 *const anim_0727[1] = { anim_0727__v0_l0, }; const s32 anim_0728__v0_l0[] = { // 0x080FAC98 - PALETTE(139, 16, 0xE0) - TILES(0x16653, 18) - SHOW_FRAME(1, 0) + PALETTE(139, 16, 0xE0) TILES(0x16653, 18) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0728[1] = { +const s32 *const anim_0728[1] = { anim_0728__v0_l0, }; const s32 anim_0729__v0_l0[] = { // 0x080FACC0 - PALETTE(140, 16, 0xD0) - TILES(0x16665, 18) - SHOW_FRAME(1, 0) + PALETTE(140, 16, 0xD0) TILES(0x16665, 18) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0729[1] = { +const s32 *const anim_0729[1] = { anim_0729__v0_l0, }; const s32 anim_0730__v0_l0[] = { // 0x080FACE8 - PALETTE(117, 16, 0xB0) - TILES(0x16677, 16) - SHOW_FRAME(1, 0) + PALETTE(117, 16, 0xB0) TILES(0x16677, 16) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0730[1] = { +const s32 *const anim_0730[1] = { anim_0730__v0_l0, }; const s32 anim_0731__v0_l0[] = { // 0x080FAD10 - PALETTE(141, 16, 0x20) - TILES(0x16687, 4) - SHOW_FRAME(4, 0) + PALETTE(141, 16, 0x20) TILES(0x16687, 4) SHOW_FRAME(4, 0) - TILES(0x1668B, 4) - SHOW_FRAME(4, 1) + TILES(0x1668B, 4) SHOW_FRAME(4, 1) - TILES(0x1668F, 4) - SHOW_FRAME(4, 2) + TILES(0x1668F, 4) SHOW_FRAME(4, 2) - TILES(0x16693, 4) - SHOW_FRAME(4, 3) + TILES(0x16693, 4) SHOW_FRAME(4, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0731[1] = { +const s32 *const anim_0731[1] = { anim_0731__v0_l0, }; const s32 anim_0732__v0_l0[] = { // 0x080FAD78 - PALETTE(1, 16, 0xE0) - TILES(0x16697, 16) - SHOW_FRAME(2, 0) + PALETTE(1, 16, 0xE0) TILES(0x16697, 16) SHOW_FRAME(2, 0) - TILES(0x166A7, 16) - SHOW_FRAME(2, 1) + TILES(0x166A7, 16) SHOW_FRAME(2, 1) - TILES(0x166B7, 16) - SHOW_FRAME(2, 2) + TILES(0x166B7, 16) SHOW_FRAME(2, 2) - TILES(0x166C7, 16) - SHOW_FRAME(2, 3) + TILES(0x166C7, 16) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0732[1] = { +const s32 *const anim_0732[1] = { anim_0732__v0_l0, }; const s32 anim_0733__v0_l0[] = { // 0x080FADE0 - PALETTE(142, 16, 0xE0) - TILES(0x166D7, 192) - SHOW_FRAME(1, 0) + PALETTE(142, 16, 0xE0) TILES(0x166D7, 192) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0733__v1_l0[] = { // 0x080FAE04 - PALETTE(142, 16, 0xE0) - TILES(0x16797, 192) - SHOW_FRAME(1, 1) + PALETTE(142, 16, 0xE0) TILES(0x16797, 192) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0733[2] = { +const s32 *const anim_0733[2] = { anim_0733__v0_l0, anim_0733__v1_l0, }; const s32 anim_0734__v0_l0[] = { // 0x080FAE30 - PALETTE(143, 16, 0xE0) - TILES(0x16857, 192) - SHOW_FRAME(1, 0) + PALETTE(143, 16, 0xE0) TILES(0x16857, 192) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0734__v1_l0[] = { // 0x080FAE54 - PALETTE(144, 16, 0xE0) - TILES(0x16917, 192) - SHOW_FRAME(1, 1) + PALETTE(144, 16, 0xE0) TILES(0x16917, 192) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0734[2] = { +const s32 *const anim_0734[2] = { anim_0734__v0_l0, anim_0734__v1_l0, }; const s32 anim_0735__v0_l0[] = { // 0x080FAE80 - PALETTE(145, 16, 0x60) - TILES(0x169D7, 64) - SHOW_FRAME(2, 0) + PALETTE(145, 16, 0x60) TILES(0x169D7, 64) SHOW_FRAME(2, 0) - TILES(0x16A17, 32) - SHOW_FRAME(2, 1) + TILES(0x16A17, 32) SHOW_FRAME(2, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0735[1] = { +const s32 *const anim_0735[1] = { anim_0735__v0_l0, }; const s32 anim_0736__v0_l0[] = { // 0x080FAEC0 - PALETTE(145, 16, 0x60) - TILES(0x16A37, 120) - SHOW_FRAME(2, 0) + PALETTE(145, 16, 0x60) TILES(0x16A37, 120) SHOW_FRAME(2, 0) - TILES(0x16AAF, 120) - SHOW_FRAME(2, 1) + TILES(0x16AAF, 120) SHOW_FRAME(2, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0736[1] = { +const s32 *const anim_0736[1] = { anim_0736__v0_l0, }; const s32 anim_0737__v0_l0[] = { // 0x080FAF00 - PALETTE(146, 256, 0x0) - TILES(0x80000090, 192) - SHOW_FRAME(1, 0) + PALETTE(146, 256, 0x0) TILES(0x80000090, 192) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0737__v1_l0[] = { // 0x080FAF24 - PALETTE(146, 256, 0x0) - TILES(0x80000150, 192) - SHOW_FRAME(1, 1) + PALETTE(146, 256, 0x0) TILES(0x80000150, 192) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0737__v2_l0[] = { // 0x080FAF48 - PALETTE(146, 256, 0x0) - TILES(0x80000210, 192) - SHOW_FRAME(1, 2) + PALETTE(146, 256, 0x0) TILES(0x80000210, 192) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0737__v3_l0[] = { // 0x080FAF6C - PALETTE(146, 256, 0x0) - TILES(0x800002D0, 192) - SHOW_FRAME(1, 3) + PALETTE(146, 256, 0x0) TILES(0x800002D0, 192) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0737[4] = { +const s32 *const anim_0737[4] = { anim_0737__v0_l0, anim_0737__v1_l0, anim_0737__v2_l0, @@ -22763,38 +16033,30 @@ const s32 * const anim_0737[4] = { }; const s32 anim_0738__v0_l0[] = { // 0x080FAFA0 - PALETTE(146, 64, 0x0) - TILES(0x80000390, 225) - SHOW_FRAME(1, 0) + PALETTE(146, 64, 0x0) TILES(0x80000390, 225) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0738__v1_l0[] = { // 0x080FAFC4 - PALETTE(146, 64, 0x0) - TILES(0x80000471, 182) - SHOW_FRAME(1, 1) + PALETTE(146, 64, 0x0) TILES(0x80000471, 182) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0738__v2_l0[] = { // 0x080FAFE8 - PALETTE(146, 64, 0x0) - TILES(0x80000527, 192) - SHOW_FRAME(1, 2) + PALETTE(146, 64, 0x0) TILES(0x80000527, 192) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0738__v3_l0[] = { // 0x080FB00C - PALETTE(146, 64, 0x0) - TILES(0x800005E7, 196) - SHOW_FRAME(1, 3) + PALETTE(146, 64, 0x0) TILES(0x800005E7, 196) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0738[4] = { +const s32 *const anim_0738[4] = { anim_0738__v0_l0, anim_0738__v1_l0, anim_0738__v2_l0, @@ -22802,59 +16064,47 @@ const s32 * const anim_0738[4] = { }; const s32 anim_0739__v0_l0[] = { // 0x080FB040 - PALETTE(162, 16, 0x70) - TILES(0x16B27, 72) - SHOW_FRAME(1, 0) + PALETTE(162, 16, 0x70) TILES(0x16B27, 72) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0739__v1_l0[] = { // 0x080FB064 - PALETTE(163, 16, 0x80) - TILES(0x16B6F, 20) - SHOW_FRAME(1, 1) + PALETTE(163, 16, 0x80) TILES(0x16B6F, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0739[2] = { +const s32 *const anim_0739[2] = { anim_0739__v0_l0, anim_0739__v1_l0, }; const s32 anim_0740__v0_l0[] = { // 0x080FB090 - PALETTE(164, 16, 0x0) - TILES(0x16B83, 56) - SHOW_FRAME(1, 0) + PALETTE(164, 16, 0x0) TILES(0x16B83, 56) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0740__v1_l0[] = { // 0x080FB0B4 - PALETTE(164, 16, 0x0) - TILES(0x16BBB, 78) - SHOW_FRAME(1, 1) + PALETTE(164, 16, 0x0) TILES(0x16BBB, 78) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0740__v2_l0[] = { // 0x080FB0D8 - PALETTE(164, 16, 0x0) - TILES(0x16C09, 60) - SHOW_FRAME(1, 2) + PALETTE(164, 16, 0x0) TILES(0x16C09, 60) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0740__v3_l0[] = { // 0x080FB0FC - PALETTE(164, 16, 0x0) - TILES(0x16C45, 96) - SHOW_FRAME(1, 3) + PALETTE(164, 16, 0x0) TILES(0x16C45, 96) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0740[4] = { +const s32 *const anim_0740[4] = { anim_0740__v0_l0, anim_0740__v1_l0, anim_0740__v2_l0, @@ -22862,989 +16112,733 @@ const s32 * const anim_0740[4] = { }; const s32 anim_0741__v0_l0[] = { // 0x080FB130 - PALETTE(165, 16, 0x30) - TILES(0x16CA5, 63) - SHOW_FRAME(1, 0) + PALETTE(165, 16, 0x30) TILES(0x16CA5, 63) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0741__v1_l0[] = { // 0x080FB154 - PALETTE(165, 16, 0x30) - TILES(0x16CE4, 63) - SHOW_FRAME(1, 1) + PALETTE(165, 16, 0x30) TILES(0x16CE4, 63) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0741[2] = { +const s32 *const anim_0741[2] = { anim_0741__v0_l0, anim_0741__v1_l0, }; const s32 anim_0742__v0_l0[] = { // 0x080FB180 - PALETTE(166, 16, 0xA0) - TILES(0x16D23, 36) - SHOW_FRAME(1, 0) + PALETTE(166, 16, 0xA0) TILES(0x16D23, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0742[1] = { +const s32 *const anim_0742[1] = { anim_0742__v0_l0, }; const s32 anim_0743__v0_l0[] = { // 0x080FB1A8 - PALETTE(167, 16, 0xB0) - TILES(0x16D47, 36) - SHOW_FRAME(1, 0) + PALETTE(167, 16, 0xB0) TILES(0x16D47, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0743[1] = { +const s32 *const anim_0743[1] = { anim_0743__v0_l0, }; const s32 anim_0744__v0_l0[] = { // 0x080FB1D0 - PALETTE(168, 16, 0xC0) - TILES(0x16D6B, 36) - SHOW_FRAME(1, 0) + PALETTE(168, 16, 0xC0) TILES(0x16D6B, 36) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0744[1] = { +const s32 *const anim_0744[1] = { anim_0744__v0_l0, }; const s32 anim_0745__v0_l0[] = { // 0x080FB1F8 - PALETTE(169, 16, 0xF0) - TILES(0x16D8F, 6) - SHOW_FRAME(10, 0) + PALETTE(169, 16, 0xF0) TILES(0x16D8F, 6) SHOW_FRAME(10, 0) - TILES(0x16D95, 6) - SHOW_FRAME(10, 1) + TILES(0x16D95, 6) SHOW_FRAME(10, 1) - TILES(0x16D9B, 6) - SHOW_FRAME(10, 2) + TILES(0x16D9B, 6) SHOW_FRAME(10, 2) - TILES(0x16DA1, 6) - SHOW_FRAME(10, 3) + TILES(0x16DA1, 6) SHOW_FRAME(10, 3) - TILES(0x16DA7, 6) - SHOW_FRAME(10, 4) + TILES(0x16DA7, 6) SHOW_FRAME(10, 4) - JUMP_BACK(28) + JUMP_BACK(28) }; -const s32 * const anim_0745[1] = { +const s32 *const anim_0745[1] = { anim_0745__v0_l0, }; const s32 anim_0746__v0_l0[] = { // 0x080FB274 - PALETTE(6, 16, 0x40) - TILES(0x16DAD, 8) - SHOW_FRAME(2, 0) + PALETTE(6, 16, 0x40) TILES(0x16DAD, 8) SHOW_FRAME(2, 0) - TILES(0x16DB5, 12) - SHOW_FRAME(2, 1) + TILES(0x16DB5, 12) SHOW_FRAME(2, 1) - TILES(0x16DC1, 12) - SHOW_FRAME(2, 2) + TILES(0x16DC1, 12) SHOW_FRAME(2, 2) - TILES(0x16DCD, 12) - SHOW_FRAME(2, 3) + TILES(0x16DCD, 12) SHOW_FRAME(2, 3) - TILES(0x16DD9, 12) - SHOW_FRAME(2, 4) + TILES(0x16DD9, 12) SHOW_FRAME(2, 4) - TILES(0x16DE5, 12) - SHOW_FRAME(2, 5) + TILES(0x16DE5, 12) SHOW_FRAME(2, 5) - TILES(0x16DF1, 12) - SHOW_FRAME(2, 6) + TILES(0x16DF1, 12) SHOW_FRAME(2, 6) - TILES(0x16DFD, 8) - SHOW_FRAME(2, 7) + TILES(0x16DFD, 8) SHOW_FRAME(2, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0746[1] = { +const s32 *const anim_0746[1] = { anim_0746__v0_l0, }; const s32 anim_0747__v0_l0[] = { // 0x080FB32C - PALETTE(6, 16, 0x40) - TILES(0x16E05, 20) - SHOW_FRAME(2, 0) + PALETTE(6, 16, 0x40) TILES(0x16E05, 20) SHOW_FRAME(2, 0) - TILES(0x16E19, 20) - SHOW_FRAME(2, 1) + TILES(0x16E19, 20) SHOW_FRAME(2, 1) - TILES(0x16E2D, 16) - SHOW_FRAME(2, 2) + TILES(0x16E2D, 16) SHOW_FRAME(2, 2) - TILES(0x16E3D, 20) - SHOW_FRAME(2, 3) + TILES(0x16E3D, 20) SHOW_FRAME(2, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0747[1] = { +const s32 *const anim_0747[1] = { anim_0747__v0_l0, }; const s32 anim_0748__v0_l0[] = { // 0x080FB394 - TILES(0x16E51, 32) - PALETTE(6, 16, 0x40) - SHOW_FRAME(2, 0) + TILES(0x16E51, 32) PALETTE(6, 16, 0x40) SHOW_FRAME(2, 0) - SHOW_FRAME(2, 1) + SHOW_FRAME(2, 1) - SHOW_FRAME(2, 2) + SHOW_FRAME(2, 2) - HITBOX(0, 65, 39, 65, 39) - SHOW_FRAME(2, 3) + HITBOX(0, 65, 39, 65, 39) SHOW_FRAME(2, 3) - SHOW_FRAME(2, 4) + SHOW_FRAME(2, 4) - SHOW_FRAME(2, 5) + SHOW_FRAME(2, 5) - SHOW_FRAME(2, 6) + SHOW_FRAME(2, 6) - SHOW_FRAME(2, 7) + SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0748[1] = { +const s32 *const anim_0748[1] = { anim_0748__v0_l0, }; const s32 anim_0749__v0_l0[] = { // 0x080FB400 - PALETTE(170, 16, 0x70) - TILES(0x16E71, 16) - SHOW_FRAME(1, 0) + PALETTE(170, 16, 0x70) TILES(0x16E71, 16) SHOW_FRAME(1, 0) - TILES(0x16E81, 4) - SHOW_FRAME(1, 1) + TILES(0x16E81, 4) SHOW_FRAME(1, 1) - TILES(0x16E85, 6) - SHOW_FRAME(1, 2) + TILES(0x16E85, 6) SHOW_FRAME(1, 2) - TILES(0x16E8B, 9) - SHOW_FRAME(1, 3) + TILES(0x16E8B, 9) SHOW_FRAME(1, 3) - TILES(0x16E94, 12) - SHOW_FRAME(1, 4) + TILES(0x16E94, 12) SHOW_FRAME(1, 4) - TILES(0x16EA0, 16) - SHOW_FRAME(1, 5) + TILES(0x16EA0, 16) SHOW_FRAME(1, 5) - TILES(0x16EB0, 16) - SHOW_FRAME(1, 6) + TILES(0x16EB0, 16) SHOW_FRAME(1, 6) - TILES(0x16EC0, 16) - SHOW_FRAME(1, 7) + TILES(0x16EC0, 16) SHOW_FRAME(1, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0749[1] = { +const s32 *const anim_0749[1] = { anim_0749__v0_l0, }; const s32 anim_0750__v0_l0[] = { // 0x080FB4B8 - PALETTE(1, 16, 0x50) - TILES(0x16ED0, 36) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x16ED0, 36) SHOW_FRAME(3, 0) - TILES(0x16EF4, 36) - SHOW_FRAME(3, 1) + TILES(0x16EF4, 36) SHOW_FRAME(3, 1) - TILES(0x16F18, 36) - SHOW_FRAME(3, 2) + TILES(0x16F18, 36) SHOW_FRAME(3, 2) - TILES(0x16F3C, 36) - SHOW_FRAME(3, 3) + TILES(0x16F3C, 36) SHOW_FRAME(3, 3) - TILES(0x16F60, 36) - SHOW_FRAME(3, 4) + TILES(0x16F60, 36) SHOW_FRAME(3, 4) - TILES(0x16F84, 36) - SHOW_FRAME(3, 5) + TILES(0x16F84, 36) SHOW_FRAME(3, 5) - JUMP_BACK(33) + JUMP_BACK(33) }; -const s32 * const anim_0750[1] = { +const s32 *const anim_0750[1] = { anim_0750__v0_l0, }; const s32 anim_0751__v0_l0[] = { // 0x080FB548 - PALETTE(1, 16, 0x50) - TILES(0x16FA8, 36) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x16FA8, 36) SHOW_FRAME(3, 0) - TILES(0x16FCC, 36) - SHOW_FRAME(3, 1) + TILES(0x16FCC, 36) SHOW_FRAME(3, 1) - TILES(0x16FA8, 36) - SHOW_FRAME(3, 0) + TILES(0x16FA8, 36) SHOW_FRAME(3, 0) - TILES(0x16FCC, 36) - SHOW_FRAME(3, 1) + TILES(0x16FCC, 36) SHOW_FRAME(3, 1) - TILES(0x16FF0, 36) - SHOW_FRAME(3, 2) + TILES(0x16FF0, 36) SHOW_FRAME(3, 2) - TILES(0x17014, 36) - SHOW_FRAME(3, 3) + TILES(0x17014, 36) SHOW_FRAME(3, 3) - TILES(0x16FF0, 36) - SHOW_FRAME(3, 2) + TILES(0x16FF0, 36) SHOW_FRAME(3, 2) - TILES(0x17014, 36) - SHOW_FRAME(3, 3) + TILES(0x17014, 36) SHOW_FRAME(3, 3) - TILES(0x17038, 36) - SHOW_FRAME(3, 4) + TILES(0x17038, 36) SHOW_FRAME(3, 4) - TILES(0x1705C, 36) - SHOW_FRAME(3, 5) + TILES(0x1705C, 36) SHOW_FRAME(3, 5) - TILES(0x17038, 36) - SHOW_FRAME(3, 4) + TILES(0x17038, 36) SHOW_FRAME(3, 4) - TILES(0x1705C, 36) - SHOW_FRAME(3, 5) + TILES(0x1705C, 36) SHOW_FRAME(3, 5) - TILES(0x17080, 36) - SHOW_FRAME(3, 6) + TILES(0x17080, 36) SHOW_FRAME(3, 6) - TILES(0x170A4, 36) - SHOW_FRAME(3, 7) + TILES(0x170A4, 36) SHOW_FRAME(3, 7) - TILES(0x17080, 36) - SHOW_FRAME(3, 6) + TILES(0x17080, 36) SHOW_FRAME(3, 6) - TILES(0x170A4, 36) - SHOW_FRAME(3, 7) + TILES(0x170A4, 36) SHOW_FRAME(3, 7) - JUMP_BACK(83) + JUMP_BACK(83) }; -const s32 * const anim_0751[1] = { +const s32 *const anim_0751[1] = { anim_0751__v0_l0, }; const s32 anim_0752__v0_l0[] = { // 0x080FB6A0 - PALETTE(1, 16, 0x50) - TILES(0x170C8, 36) - SHOW_FRAME(2, 0) + PALETTE(1, 16, 0x50) TILES(0x170C8, 36) SHOW_FRAME(2, 0) - TILES(0x170EC, 36) - SHOW_FRAME(2, 1) + TILES(0x170EC, 36) SHOW_FRAME(2, 1) - TILES(0x17110, 36) - SHOW_FRAME(2, 2) + TILES(0x17110, 36) SHOW_FRAME(2, 2) - TILES(0x17134, 36) - SHOW_FRAME(2, 3) + TILES(0x17134, 36) SHOW_FRAME(2, 3) - TILES(0x17158, 36) - SHOW_FRAME(2, 4) + TILES(0x17158, 36) SHOW_FRAME(2, 4) - TILES(0x1717C, 36) - SHOW_FRAME(2, 5) + TILES(0x1717C, 36) SHOW_FRAME(2, 5) - JUMP_BACK(33) + JUMP_BACK(33) }; const s32 anim_0752__v1_l0[] = { // 0x080FB72C - PALETTE(1, 16, 0x50) - TILES(0x171A0, 6) - SHOW_FRAME(2, 6) + PALETTE(1, 16, 0x50) TILES(0x171A0, 6) SHOW_FRAME(2, 6) - TILES(0x171A6, 6) - SHOW_FRAME(2, 7) + TILES(0x171A6, 6) SHOW_FRAME(2, 7) - TILES(0x171AC, 9) - SHOW_FRAME(2, 8) + TILES(0x171AC, 9) SHOW_FRAME(2, 8) - TILES(0x171B5, 9) - SHOW_FRAME(2, 9) + TILES(0x171B5, 9) SHOW_FRAME(2, 9) - TILES(0x171BE, 9) - SHOW_FRAME(2, 10) + TILES(0x171BE, 9) SHOW_FRAME(2, 10) - TILES(0x171C7, 9) - SHOW_FRAME(2, 11) + TILES(0x171C7, 9) SHOW_FRAME(2, 11) - TILES(0x171D0, 1) - SHOW_FRAME(2, 12) + TILES(0x171D0, 1) SHOW_FRAME(2, 12) - TILES(0x171D1, 1) - SHOW_FRAME(2, 13) + TILES(0x171D1, 1) SHOW_FRAME(2, 13) - TILES(0x171D2, 4) - SHOW_FRAME(2, 14) + TILES(0x171D2, 4) SHOW_FRAME(2, 14) - TILES(0x171D6, 4) - SHOW_FRAME(2, 15) + TILES(0x171D6, 4) SHOW_FRAME(2, 15) - TILES(0x171DA, 4) - SHOW_FRAME(2, 16) + TILES(0x171DA, 4) SHOW_FRAME(2, 16) - TILES(0x171DE, 4) - SHOW_FRAME(2, 17) + TILES(0x171DE, 4) SHOW_FRAME(2, 17) - END() + END() }; -const s32 * const anim_0752[2] = { +const s32 *const anim_0752[2] = { anim_0752__v0_l0, anim_0752__v1_l0, }; const s32 anim_0753__v0_l0[] = { // 0x080FB834 - TILES(0x171E2, 4) - PALETTE(1, 16, 0x50) - SHOW_FRAME(12, 0) + TILES(0x171E2, 4) PALETTE(1, 16, 0x50) SHOW_FRAME(12, 0) - SHOW_FRAME(12, 1) + SHOW_FRAME(12, 1) - SHOW_FRAME(12, 2) + SHOW_FRAME(12, 2) - SHOW_FRAME(12, 3) + SHOW_FRAME(12, 3) - JUMP_BACK(11) + JUMP_BACK(11) }; -const s32 * const anim_0753[1] = { +const s32 *const anim_0753[1] = { anim_0753__v0_l0, }; const s32 anim_0754__v0_l0[] = { // 0x080FB878 - TILES(0x171E6, 16) - PALETTE(1, 16, 0x50) - SHOW_FRAME(12, 0) + TILES(0x171E6, 16) PALETTE(1, 16, 0x50) SHOW_FRAME(12, 0) - SHOW_FRAME(12, 1) + SHOW_FRAME(12, 1) - SHOW_FRAME(12, 2) + SHOW_FRAME(12, 2) - SHOW_FRAME(12, 3) + SHOW_FRAME(12, 3) - JUMP_BACK(11) + JUMP_BACK(11) }; -const s32 * const anim_0754[1] = { +const s32 *const anim_0754[1] = { anim_0754__v0_l0, }; const s32 anim_0755__v0_l0[] = { // 0x080FB8BC - PALETTE(68, 16, 0x60) - TILES(0x171F6, 9) - SHOW_FRAME(3, 0) + PALETTE(68, 16, 0x60) TILES(0x171F6, 9) SHOW_FRAME(3, 0) - TILES(0x171FF, 12) - SHOW_FRAME(3, 1) + TILES(0x171FF, 12) SHOW_FRAME(3, 1) - TILES(0x1720B, 12) - SHOW_FRAME(3, 2) + TILES(0x1720B, 12) SHOW_FRAME(3, 2) - TILES(0x17217, 12) - SHOW_FRAME(3, 3) + TILES(0x17217, 12) SHOW_FRAME(3, 3) - END() + END() }; -const s32 * const anim_0755[1] = { +const s32 *const anim_0755[1] = { anim_0755__v0_l0, }; const s32 anim_0756__v0_l0[] = { // 0x080FB920 - PALETTE(1, 16, 0x50) - TILES(0x17223, 2) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x17223, 2) SHOW_FRAME(3, 0) - TILES(0x17225, 8) - SHOW_FRAME(3, 1) + TILES(0x17225, 8) SHOW_FRAME(3, 1) - TILES(0x1722D, 10) - SHOW_FRAME(3, 2) + TILES(0x1722D, 10) SHOW_FRAME(3, 2) - TILES(0x17237, 10) - SHOW_FRAME(3, 3) + TILES(0x17237, 10) SHOW_FRAME(3, 3) - TILES(0x17241, 4) - SHOW_FRAME(3, 4) + TILES(0x17241, 4) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0756[1] = { +const s32 *const anim_0756[1] = { anim_0756__v0_l0, }; const s32 anim_0757__v0_l0[] = { // 0x080FB998 - PALETTE(1, 16, 0x50) - TILES(0x17245, 2) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x17245, 2) SHOW_FRAME(3, 0) - TILES(0x17247, 8) - SHOW_FRAME(3, 1) + TILES(0x17247, 8) SHOW_FRAME(3, 1) - TILES(0x1724F, 8) - SHOW_FRAME(3, 2) + TILES(0x1724F, 8) SHOW_FRAME(3, 2) - TILES(0x17257, 5) - SHOW_FRAME(3, 3) + TILES(0x17257, 5) SHOW_FRAME(3, 3) - TILES(0x1725C, 5) - SHOW_FRAME(3, 4) + TILES(0x1725C, 5) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0757[1] = { +const s32 *const anim_0757[1] = { anim_0757__v0_l0, }; const s32 anim_0758__v0_l0[] = { // 0x080FBA10 - PALETTE(1, 16, 0x50) - TILES(0x17261, 2) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x17261, 2) SHOW_FRAME(3, 0) - TILES(0x17263, 8) - SHOW_FRAME(3, 1) + TILES(0x17263, 8) SHOW_FRAME(3, 1) - TILES(0x1726B, 8) - SHOW_FRAME(3, 2) + TILES(0x1726B, 8) SHOW_FRAME(3, 2) - TILES(0x17273, 4) - SHOW_FRAME(3, 3) + TILES(0x17273, 4) SHOW_FRAME(3, 3) - TILES(0x17277, 4) - SHOW_FRAME(3, 4) + TILES(0x17277, 4) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0758[1] = { +const s32 *const anim_0758[1] = { anim_0758__v0_l0, }; const s32 anim_0759__v0_l0[] = { // 0x080FBA88 - PALETTE(171, 16, 0x40) - TILES(0x1727B, 4) - SHOW_FRAME(3, 0) + PALETTE(171, 16, 0x40) TILES(0x1727B, 4) SHOW_FRAME(3, 0) - TILES(0x1727F, 4) - SHOW_FRAME(3, 1) + TILES(0x1727F, 4) SHOW_FRAME(3, 1) - TILES(0x17283, 4) - SHOW_FRAME(3, 2) + TILES(0x17283, 4) SHOW_FRAME(3, 2) - TILES(0x17287, 4) - SHOW_FRAME(3, 3) + TILES(0x17287, 4) SHOW_FRAME(3, 3) - TILES(0x1728B, 2) - SHOW_FRAME(3, 4) + TILES(0x1728B, 2) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0759[1] = { +const s32 *const anim_0759[1] = { anim_0759__v0_l0, }; const s32 anim_0760__v0_l0[] = { // 0x080FBB00 - PALETTE(171, 16, 0x40) - TILES(0x1728D, 2) - SHOW_FRAME(3, 0) + PALETTE(171, 16, 0x40) TILES(0x1728D, 2) SHOW_FRAME(3, 0) - TILES(0x1728F, 4) - SHOW_FRAME(3, 1) + TILES(0x1728F, 4) SHOW_FRAME(3, 1) - TILES(0x17293, 4) - SHOW_FRAME(3, 2) + TILES(0x17293, 4) SHOW_FRAME(3, 2) - TILES(0x17297, 4) - SHOW_FRAME(3, 3) + TILES(0x17297, 4) SHOW_FRAME(3, 3) - TILES(0x1729B, 2) - SHOW_FRAME(3, 4) + TILES(0x1729B, 2) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0760[1] = { +const s32 *const anim_0760[1] = { anim_0760__v0_l0, }; const s32 anim_0761__v0_l0[] = { // 0x080FBB78 - PALETTE(171, 16, 0x40) - TILES(0x1729D, 2) - SHOW_FRAME(3, 0) + PALETTE(171, 16, 0x40) TILES(0x1729D, 2) SHOW_FRAME(3, 0) - TILES(0x1729F, 4) - SHOW_FRAME(3, 1) + TILES(0x1729F, 4) SHOW_FRAME(3, 1) - TILES(0x172A3, 4) - SHOW_FRAME(3, 2) + TILES(0x172A3, 4) SHOW_FRAME(3, 2) - TILES(0x172A7, 4) - SHOW_FRAME(3, 3) + TILES(0x172A7, 4) SHOW_FRAME(3, 3) - TILES(0x172AB, 2) - SHOW_FRAME(3, 4) + TILES(0x172AB, 2) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0761[1] = { +const s32 *const anim_0761[1] = { anim_0761__v0_l0, }; const s32 anim_0762__v0_l0[] = { // 0x080FBBF0 - PALETTE(68, 16, 0x60) - TILES(0x172AD, 6) - SHOW_FRAME(3, 0) + PALETTE(68, 16, 0x60) TILES(0x172AD, 6) SHOW_FRAME(3, 0) - TILES(0x172B3, 12) - SHOW_FRAME(3, 1) + TILES(0x172B3, 12) SHOW_FRAME(3, 1) - TILES(0x172BF, 12) - SHOW_FRAME(3, 2) + TILES(0x172BF, 12) SHOW_FRAME(3, 2) - TILES(0x172CB, 8) - SHOW_FRAME(3, 3) + TILES(0x172CB, 8) SHOW_FRAME(3, 3) - TILES(0x172D3, 4) - SHOW_FRAME(3, 4) + TILES(0x172D3, 4) SHOW_FRAME(3, 4) - TILES(0x172D7, 6) - SHOW_FRAME(3, 5) + TILES(0x172D7, 6) SHOW_FRAME(3, 5) - TILES(0x172DD, 6) - SHOW_FRAME(3, 6) + TILES(0x172DD, 6) SHOW_FRAME(3, 6) - TILES(0x172E3, 4) - SHOW_FRAME(3, 7) + TILES(0x172E3, 4) SHOW_FRAME(3, 7) - END() + END() }; -const s32 * const anim_0762[1] = { +const s32 *const anim_0762[1] = { anim_0762__v0_l0, }; const s32 anim_0763__v0_l0[] = { // 0x080FBCA4 - PALETTE(68, 16, 0x60) - TILES(0x172E7, 9) - SHOW_FRAME(3, 0) + PALETTE(68, 16, 0x60) TILES(0x172E7, 9) SHOW_FRAME(3, 0) - TILES(0x172F0, 16) - SHOW_FRAME(3, 1) + TILES(0x172F0, 16) SHOW_FRAME(3, 1) - TILES(0x17300, 16) - SHOW_FRAME(3, 2) + TILES(0x17300, 16) SHOW_FRAME(3, 2) - TILES(0x17310, 16) - SHOW_FRAME(3, 3) + TILES(0x17310, 16) SHOW_FRAME(3, 3) - TILES(0x17320, 16) - SHOW_FRAME(3, 4) + TILES(0x17320, 16) SHOW_FRAME(3, 4) - END() + END() }; -const s32 * const anim_0763[1] = { +const s32 *const anim_0763[1] = { anim_0763__v0_l0, }; const s32 anim_0764__v0_l0[] = { // 0x080FBD1C - PALETTE(172, 16, 0x40) - TILES(0x17330, 4) - SHOW_FRAME(3, 0) + PALETTE(172, 16, 0x40) TILES(0x17330, 4) SHOW_FRAME(3, 0) - TILES(0x17334, 4) - SHOW_FRAME(3, 1) + TILES(0x17334, 4) SHOW_FRAME(3, 1) - TILES(0x17338, 4) - SHOW_FRAME(3, 2) + TILES(0x17338, 4) SHOW_FRAME(3, 2) - TILES(0x1733C, 4) - SHOW_FRAME(3, 3) + TILES(0x1733C, 4) SHOW_FRAME(3, 3) - TILES(0x17340, 4) - SHOW_FRAME(3, 4) + TILES(0x17340, 4) SHOW_FRAME(3, 4) - TILES(0x17344, 1) - SHOW_FRAME(3, 5) + TILES(0x17344, 1) SHOW_FRAME(3, 5) - END() + END() }; -const s32 * const anim_0764[1] = { +const s32 *const anim_0764[1] = { anim_0764__v0_l0, }; const s32 anim_0765__v0_l0[] = { // 0x080FBDA8 - PALETTE(6, 16, 0x40) - TILES(0x17345, 9) - SHOW_FRAME(3, 0) + PALETTE(6, 16, 0x40) TILES(0x17345, 9) SHOW_FRAME(3, 0) - TILES(0x1734E, 16) - SHOW_FRAME(3, 1) + TILES(0x1734E, 16) SHOW_FRAME(3, 1) - TILES(0x1735E, 16) - SHOW_FRAME(3, 2) + TILES(0x1735E, 16) SHOW_FRAME(3, 2) - TILES(0x1736E, 16) - SHOW_FRAME(3, 3) + TILES(0x1736E, 16) SHOW_FRAME(3, 3) - TILES(0x1737E, 16) - SHOW_FRAME(3, 4) + TILES(0x1737E, 16) SHOW_FRAME(3, 4) - TILES(0x1738E, 16) - SHOW_FRAME(3, 5) + TILES(0x1738E, 16) SHOW_FRAME(3, 5) - TILES(0x1739E, 12) - SHOW_FRAME(3, 6) + TILES(0x1739E, 12) SHOW_FRAME(3, 6) - END() + END() }; -const s32 * const anim_0765[1] = { +const s32 *const anim_0765[1] = { anim_0765__v0_l0, }; const s32 anim_0766__v0_l0[] = { // 0x080FBE48 - PALETTE(1, 16, 0x50) - TILES(0x173AA, 4) - SHOW_FRAME(2, 0) + PALETTE(1, 16, 0x50) TILES(0x173AA, 4) SHOW_FRAME(2, 0) - TILES(0x173AE, 4) - SHOW_FRAME(2, 1) + TILES(0x173AE, 4) SHOW_FRAME(2, 1) - TILES(0x173B2, 4) - SHOW_FRAME(2, 2) + TILES(0x173B2, 4) SHOW_FRAME(2, 2) - TILES(0x173B6, 4) - SHOW_FRAME(2, 3) + TILES(0x173B6, 4) SHOW_FRAME(2, 3) - TILES(0x173BA, 4) - SHOW_FRAME(2, 4) + TILES(0x173BA, 4) SHOW_FRAME(2, 4) - TILES(0x173BE, 4) - SHOW_FRAME(2, 5) + TILES(0x173BE, 4) SHOW_FRAME(2, 5) - TILES(0x173C2, 4) - SHOW_FRAME(2, 6) + TILES(0x173C2, 4) SHOW_FRAME(2, 6) - TILES(0x173AA, 4) - SHOW_FRAME(2, 0) + TILES(0x173AA, 4) SHOW_FRAME(2, 0) - END() + END() }; const s32 anim_0766__v1_l0[] = { // 0x080FBEF8 - PALETTE(1, 16, 0x50) - TILES(0x173C6, 1) - SHOW_FRAME(2, 7) + PALETTE(1, 16, 0x50) TILES(0x173C6, 1) SHOW_FRAME(2, 7) - TILES(0x173AA, 4) - SHOW_FRAME(2, 0) + TILES(0x173AA, 4) SHOW_FRAME(2, 0) - TILES(0x173C7, 4) - SHOW_FRAME(2, 8) + TILES(0x173C7, 4) SHOW_FRAME(2, 8) - TILES(0x173CB, 4) - SHOW_FRAME(2, 9) + TILES(0x173CB, 4) SHOW_FRAME(2, 9) - TILES(0x173CF, 4) - SHOW_FRAME(2, 10) + TILES(0x173CF, 4) SHOW_FRAME(2, 10) - TILES(0x173D3, 4) - SHOW_FRAME(2, 11) + TILES(0x173D3, 4) SHOW_FRAME(2, 11) - TILES(0x173AA, 4) - SHOW_FRAME(2, 0) + TILES(0x173AA, 4) SHOW_FRAME(2, 0) - TILES(0x173C6, 1) - SHOW_FRAME(2, 7) + TILES(0x173C6, 1) SHOW_FRAME(2, 7) - END() + END() }; -const s32 * const anim_0766[2] = { +const s32 *const anim_0766[2] = { anim_0766__v0_l0, anim_0766__v1_l0, }; const s32 anim_0767__v0_l0[] = { // 0x080FBFB0 - PALETTE(88, 16, 0x0) - TILES(0x173D7, 4) - SHOW_FRAME(3, 0) + PALETTE(88, 16, 0x0) TILES(0x173D7, 4) SHOW_FRAME(3, 0) - TILES(0x173DB, 4) - SHOW_FRAME(3, 1) + TILES(0x173DB, 4) SHOW_FRAME(3, 1) - TILES(0x173DF, 4) - SHOW_FRAME(3, 2) + TILES(0x173DF, 4) SHOW_FRAME(3, 2) - TILES(0x173E3, 4) - SHOW_FRAME(3, 3) + TILES(0x173E3, 4) SHOW_FRAME(3, 3) - TILES(0x173E7, 4) - SHOW_FRAME(3, 4) + TILES(0x173E7, 4) SHOW_FRAME(3, 4) - TILES(0x173EB, 4) - SHOW_FRAME(3, 5) + TILES(0x173EB, 4) SHOW_FRAME(3, 5) - TILES(0x173EF, 4) - SHOW_FRAME(3, 6) + TILES(0x173EF, 4) SHOW_FRAME(3, 6) - TILES(0x173F3, 4) - SHOW_FRAME(3, 7) + TILES(0x173F3, 4) SHOW_FRAME(3, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0767[1] = { +const s32 *const anim_0767[1] = { anim_0767__v0_l0, }; const s32 anim_0768__v0_l0[] = { // 0x080FC068 - PALETTE(68, 16, 0x60) - TILES(0x173F7, 30) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x173F7, 30) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0768__v1_l0[] = { // 0x080FC08C - PALETTE(68, 16, 0x60) - TILES(0x17415, 14) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x17415, 14) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0768__v2_l0[] = { // 0x080FC0B0 - PALETTE(68, 16, 0x60) - TILES(0x17423, 10) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x17423, 10) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0768__v3_l0[] = { // 0x080FC0D4 - PALETTE(68, 16, 0x60) - TILES(0x1742D, 14) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x1742D, 14) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0768__v4_l0[] = { // 0x080FC0F8 - PALETTE(68, 16, 0x60) - TILES(0x1743B, 10) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x1743B, 10) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0768__v5_l0[] = { // 0x080FC11C - PALETTE(68, 16, 0x60) - TILES(0x17445, 16) - SHOW_FRAME(1, 5) + PALETTE(68, 16, 0x60) TILES(0x17445, 16) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0768__v6_l0[] = { // 0x080FC140 - PALETTE(68, 16, 0x60) - TILES(0x17455, 16) - SHOW_FRAME(1, 6) + PALETTE(68, 16, 0x60) TILES(0x17455, 16) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0768__v7_l0[] = { // 0x080FC164 - PALETTE(68, 16, 0x60) - TILES(0x17465, 16) - SHOW_FRAME(1, 7) + PALETTE(68, 16, 0x60) TILES(0x17465, 16) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0768__v8_l0[] = { // 0x080FC188 - PALETTE(68, 16, 0x60) - TILES(0x17475, 6) - SHOW_FRAME(1, 8) + PALETTE(68, 16, 0x60) TILES(0x17475, 6) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0768__v9_l0[] = { // 0x080FC1AC - PALETTE(68, 16, 0x60) - TILES(0x1747B, 8) - SHOW_FRAME(1, 9) + PALETTE(68, 16, 0x60) TILES(0x1747B, 8) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0768__v10_l0[] = { // 0x080FC1D0 - PALETTE(68, 16, 0x60) - TILES(0x17483, 14) - SHOW_FRAME(1, 10) + PALETTE(68, 16, 0x60) TILES(0x17483, 14) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0768__v11_l0[] = { // 0x080FC1F4 - PALETTE(68, 16, 0x60) - TILES(0x17491, 28) - SHOW_FRAME(1, 11) + PALETTE(68, 16, 0x60) TILES(0x17491, 28) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0768__v12_l0[] = { // 0x080FC218 - PALETTE(68, 16, 0x60) - TILES(0x174AD, 24) - SHOW_FRAME(1, 12) + PALETTE(68, 16, 0x60) TILES(0x174AD, 24) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0768__v13_l0[] = { // 0x080FC23C - PALETTE(68, 16, 0x60) - TILES(0x174C5, 4) - SHOW_FRAME(1, 13) + PALETTE(68, 16, 0x60) TILES(0x174C5, 4) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0768__v14_l0[] = { // 0x080FC260 - PALETTE(68, 16, 0x60) - TILES(0x174C9, 6) - SHOW_FRAME(1, 14) + PALETTE(68, 16, 0x60) TILES(0x174C9, 6) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0768__v15_l0[] = { // 0x080FC284 - PALETTE(68, 16, 0x60) - TILES(0x174CF, 16) - SHOW_FRAME(1, 15) + PALETTE(68, 16, 0x60) TILES(0x174CF, 16) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0768__v16_l0[] = { // 0x080FC2A8 - PALETTE(68, 16, 0x60) - TILES(0x174DF, 12) - SHOW_FRAME(1, 16) + PALETTE(68, 16, 0x60) TILES(0x174DF, 12) SHOW_FRAME(1, 16) - END() + END() }; const s32 anim_0768__v17_l0[] = { // 0x080FC2CC - PALETTE(68, 16, 0x60) - TILES(0x174EB, 14) - SHOW_FRAME(1, 17) + PALETTE(68, 16, 0x60) TILES(0x174EB, 14) SHOW_FRAME(1, 17) - END() + END() }; const s32 anim_0768__v18_l0[] = { // 0x080FC2F0 - PALETTE(68, 16, 0x60) - TILES(0x174F9, 18) - SHOW_FRAME(1, 18) + PALETTE(68, 16, 0x60) TILES(0x174F9, 18) SHOW_FRAME(1, 18) - END() + END() }; const s32 anim_0768__v19_l0[] = { // 0x080FC314 - PALETTE(68, 16, 0x60) - TILES(0x1750B, 12) - SHOW_FRAME(1, 19) + PALETTE(68, 16, 0x60) TILES(0x1750B, 12) SHOW_FRAME(1, 19) - END() + END() }; const s32 anim_0768__v20_l0[] = { // 0x080FC338 - PALETTE(68, 16, 0x60) - TILES(0x17517, 6) - SHOW_FRAME(1, 20) + PALETTE(68, 16, 0x60) TILES(0x17517, 6) SHOW_FRAME(1, 20) - END() + END() }; -const s32 * const anim_0768[21] = { - anim_0768__v0_l0, - anim_0768__v1_l0, - anim_0768__v2_l0, - anim_0768__v3_l0, - anim_0768__v4_l0, - anim_0768__v5_l0, - anim_0768__v6_l0, - anim_0768__v7_l0, - anim_0768__v8_l0, - anim_0768__v9_l0, - anim_0768__v10_l0, - anim_0768__v11_l0, - anim_0768__v12_l0, - anim_0768__v13_l0, - anim_0768__v14_l0, - anim_0768__v15_l0, - anim_0768__v16_l0, - anim_0768__v17_l0, - anim_0768__v18_l0, - anim_0768__v19_l0, - anim_0768__v20_l0, +const s32 *const anim_0768[21] = { + anim_0768__v0_l0, anim_0768__v1_l0, anim_0768__v2_l0, anim_0768__v3_l0, anim_0768__v4_l0, anim_0768__v5_l0, anim_0768__v6_l0, + anim_0768__v7_l0, anim_0768__v8_l0, anim_0768__v9_l0, anim_0768__v10_l0, anim_0768__v11_l0, anim_0768__v12_l0, anim_0768__v13_l0, + anim_0768__v14_l0, anim_0768__v15_l0, anim_0768__v16_l0, anim_0768__v17_l0, anim_0768__v18_l0, anim_0768__v19_l0, anim_0768__v20_l0, }; const s32 anim_0769__v0_l0[] = { // 0x080FC3B0 - PALETTE(173, 16, 0x0) - TILES(0x1751D, 80) - SHOW_FRAME(1, 0) + PALETTE(173, 16, 0x0) TILES(0x1751D, 80) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0769__v1_l0[] = { // 0x080FC3D4 - PALETTE(174, 16, 0x40) - TILES(0x1756D, 90) - SHOW_FRAME(1, 1) + PALETTE(174, 16, 0x40) TILES(0x1756D, 90) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0769__v2_l0[] = { // 0x080FC3F8 - PALETTE(175, 16, 0x50) - TILES(0x175C7, 100) - SHOW_FRAME(1, 2) + PALETTE(175, 16, 0x50) TILES(0x175C7, 100) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0769__v3_l0[] = { // 0x080FC41C - PALETTE(176, 16, 0x30) - TILES(0x1762B, 80) - SHOW_FRAME(1, 3) + PALETTE(176, 16, 0x30) TILES(0x1762B, 80) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0769[4] = { +const s32 *const anim_0769[4] = { anim_0769__v0_l0, anim_0769__v1_l0, anim_0769__v2_l0, @@ -23852,236 +16846,169 @@ const s32 * const anim_0769[4] = { }; const s32 anim_0770__v0_l0[] = { // 0x080FC450 - PALETTE(177, 16, 0xD0) - TILES(0x1767B, 12) - SHOW_FRAME(1, 0) + PALETTE(177, 16, 0xD0) TILES(0x1767B, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0770__v1_l0[] = { // 0x080FC474 - PALETTE(177, 16, 0xD0) - TILES(0x17687, 16) - SHOW_FRAME(1, 1) + PALETTE(177, 16, 0xD0) TILES(0x17687, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0770__v2_l0[] = { // 0x080FC498 - PALETTE(177, 16, 0xD0) - TILES(0x17697, 12) - SHOW_FRAME(1, 2) + PALETTE(177, 16, 0xD0) TILES(0x17697, 12) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0770__v3_l0[] = { // 0x080FC4BC - PALETTE(177, 16, 0xD0) - TILES(0x176A3, 8) - SHOW_FRAME(1, 3) + PALETTE(177, 16, 0xD0) TILES(0x176A3, 8) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0770__v4_l0[] = { // 0x080FC4E0 - PALETTE(177, 16, 0xD0) - TILES(0x176AB, 12) - SHOW_FRAME(1, 4) + PALETTE(177, 16, 0xD0) TILES(0x176AB, 12) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0770__v5_l0[] = { // 0x080FC504 - PALETTE(177, 16, 0xD0) - TILES(0x176B7, 30) - SHOW_FRAME(1, 5) + PALETTE(177, 16, 0xD0) TILES(0x176B7, 30) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0770[6] = { - anim_0770__v0_l0, - anim_0770__v1_l0, - anim_0770__v2_l0, - anim_0770__v3_l0, - anim_0770__v4_l0, - anim_0770__v5_l0, +const s32 *const anim_0770[6] = { + anim_0770__v0_l0, anim_0770__v1_l0, anim_0770__v2_l0, anim_0770__v3_l0, anim_0770__v4_l0, anim_0770__v5_l0, }; const s32 anim_0771__v0_l0[] = { // 0x080FC540 - PALETTE(177, 16, 0xD0) - TILES(0x176D5, 12) - SHOW_FRAME(1, 0) + PALETTE(177, 16, 0xD0) TILES(0x176D5, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0771__v1_l0[] = { // 0x080FC564 - PALETTE(177, 16, 0xD0) - TILES(0x176E1, 16) - SHOW_FRAME(1, 1) + PALETTE(177, 16, 0xD0) TILES(0x176E1, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0771__v2_l0[] = { // 0x080FC588 - PALETTE(177, 16, 0xD0) - TILES(0x176F1, 8) - SHOW_FRAME(1, 2) + PALETTE(177, 16, 0xD0) TILES(0x176F1, 8) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0771__v3_l0[] = { // 0x080FC5AC - PALETTE(177, 16, 0xD0) - TILES(0x176F9, 12) - SHOW_FRAME(1, 3) + PALETTE(177, 16, 0xD0) TILES(0x176F9, 12) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0771__v4_l0[] = { // 0x080FC5D0 - PALETTE(177, 16, 0xD0) - TILES(0x17705, 16) - SHOW_FRAME(1, 4) + PALETTE(177, 16, 0xD0) TILES(0x17705, 16) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0771__v5_l0[] = { // 0x080FC5F4 - PALETTE(177, 16, 0xD0) - TILES(0x17715, 30) - SHOW_FRAME(1, 5) + PALETTE(177, 16, 0xD0) TILES(0x17715, 30) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0771[6] = { - anim_0771__v0_l0, - anim_0771__v1_l0, - anim_0771__v2_l0, - anim_0771__v3_l0, - anim_0771__v4_l0, - anim_0771__v5_l0, +const s32 *const anim_0771[6] = { + anim_0771__v0_l0, anim_0771__v1_l0, anim_0771__v2_l0, anim_0771__v3_l0, anim_0771__v4_l0, anim_0771__v5_l0, }; const s32 anim_0772__v0_l0[] = { // 0x080FC630 - PALETTE(177, 16, 0xD0) - TILES(0x17733, 8) - SHOW_FRAME(1, 0) + PALETTE(177, 16, 0xD0) TILES(0x17733, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0772__v1_l0[] = { // 0x080FC654 - PALETTE(177, 16, 0xD0) - TILES(0x1773B, 8) - SHOW_FRAME(1, 1) + PALETTE(177, 16, 0xD0) TILES(0x1773B, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0772__v2_l0[] = { // 0x080FC678 - PALETTE(177, 16, 0xD0) - TILES(0x17743, 8) - SHOW_FRAME(1, 2) + PALETTE(177, 16, 0xD0) TILES(0x17743, 8) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0772__v3_l0[] = { // 0x080FC69C - PALETTE(177, 16, 0xD0) - TILES(0x1774B, 12) - SHOW_FRAME(1, 3) + PALETTE(177, 16, 0xD0) TILES(0x1774B, 12) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0772__v4_l0[] = { // 0x080FC6C0 - PALETTE(177, 16, 0xD0) - TILES(0x17757, 12) - SHOW_FRAME(1, 4) + PALETTE(177, 16, 0xD0) TILES(0x17757, 12) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0772__v5_l0[] = { // 0x080FC6E4 - PALETTE(177, 16, 0xD0) - TILES(0x17763, 12) - SHOW_FRAME(1, 5) + PALETTE(177, 16, 0xD0) TILES(0x17763, 12) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0772__v6_l0[] = { // 0x080FC708 - PALETTE(177, 16, 0xD0) - TILES(0x1776F, 8) - SHOW_FRAME(1, 6) + PALETTE(177, 16, 0xD0) TILES(0x1776F, 8) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0772__v7_l0[] = { // 0x080FC72C - PALETTE(177, 16, 0xD0) - TILES(0x17777, 8) - SHOW_FRAME(1, 7) + PALETTE(177, 16, 0xD0) TILES(0x17777, 8) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0772__v8_l0[] = { // 0x080FC750 - PALETTE(177, 16, 0xD0) - TILES(0x1777F, 30) - SHOW_FRAME(1, 8) + PALETTE(177, 16, 0xD0) TILES(0x1777F, 30) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0772[9] = { - anim_0772__v0_l0, - anim_0772__v1_l0, - anim_0772__v2_l0, - anim_0772__v3_l0, - anim_0772__v4_l0, - anim_0772__v5_l0, - anim_0772__v6_l0, - anim_0772__v7_l0, - anim_0772__v8_l0, +const s32 *const anim_0772[9] = { + anim_0772__v0_l0, anim_0772__v1_l0, anim_0772__v2_l0, anim_0772__v3_l0, anim_0772__v4_l0, + anim_0772__v5_l0, anim_0772__v6_l0, anim_0772__v7_l0, anim_0772__v8_l0, }; const s32 anim_0773__v0_l0[] = { // 0x080FC798 - PALETTE(177, 16, 0xD0) - TILES(0x1779D, 20) - SHOW_FRAME(1, 0) + PALETTE(177, 16, 0xD0) TILES(0x1779D, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0773__v1_l0[] = { // 0x080FC7BC - PALETTE(177, 16, 0xD0) - TILES(0x177B1, 20) - SHOW_FRAME(1, 1) + PALETTE(177, 16, 0xD0) TILES(0x177B1, 20) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0773__v2_l0[] = { // 0x080FC7E0 - PALETTE(177, 16, 0xD0) - TILES(0x177C5, 20) - SHOW_FRAME(1, 2) + PALETTE(177, 16, 0xD0) TILES(0x177C5, 20) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0773__v3_l0[] = { // 0x080FC804 - PALETTE(177, 16, 0xD0) - TILES(0x177D9, 30) - SHOW_FRAME(1, 3) + PALETTE(177, 16, 0xD0) TILES(0x177D9, 30) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0773[4] = { +const s32 *const anim_0773[4] = { anim_0773__v0_l0, anim_0773__v1_l0, anim_0773__v2_l0, @@ -24089,2513 +17016,1908 @@ const s32 * const anim_0773[4] = { }; const s32 anim_0774__v0_l0[] = { // 0x080FC838 - PALETTE(163, 16, 0x80) - TILES(0x177F7, 30) - SHOW_FRAME(6, 0) + PALETTE(163, 16, 0x80) TILES(0x177F7, 30) SHOW_FRAME(6, 0) - TILES(0x17815, 30) - SHOW_FRAME(6, 1) + TILES(0x17815, 30) SHOW_FRAME(6, 1) - TILES(0x17833, 30) - SHOW_FRAME(6, 2) + TILES(0x17833, 30) SHOW_FRAME(6, 2) - TILES(0x17851, 30) - SHOW_FRAME(6, 3) + TILES(0x17851, 30) SHOW_FRAME(6, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0774[1] = { +const s32 *const anim_0774[1] = { anim_0774__v0_l0, }; const s32 anim_0775__v0_l0[] = { // 0x080FC8A0 - PALETTE(1, 16, 0x50) - TILES(0x1786F, 4) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x1786F, 4) SHOW_FRAME(3, 0) - TILES(0x17873, 4) - SHOW_FRAME(3, 1) + TILES(0x17873, 4) SHOW_FRAME(3, 1) - TILES(0x17877, 4) - SHOW_FRAME(3, 2) + TILES(0x17877, 4) SHOW_FRAME(3, 2) - TILES(0x1787B, 4) - SHOW_FRAME(3, 3) + TILES(0x1787B, 4) SHOW_FRAME(3, 3) - TILES(0x1787F, 4) - SHOW_FRAME(3, 4) + TILES(0x1787F, 4) SHOW_FRAME(3, 4) - TILES(0x17883, 4) - SHOW_FRAME(3, 5) + TILES(0x17883, 4) SHOW_FRAME(3, 5) - TILES(0x17887, 4) - SHOW_FRAME(3, 6) + TILES(0x17887, 4) SHOW_FRAME(3, 6) - TILES(0x1786F, 4) - SHOW_FRAME(3, 0) + TILES(0x1786F, 4) SHOW_FRAME(3, 0) - END() + END() }; const s32 anim_0775__v1_l0[] = { // 0x080FC950 - PALETTE(1, 16, 0x50) - TILES(0x1788B, 1) - SHOW_FRAME(3, 7) + PALETTE(1, 16, 0x50) TILES(0x1788B, 1) SHOW_FRAME(3, 7) - TILES(0x1786F, 4) - SHOW_FRAME(3, 0) + TILES(0x1786F, 4) SHOW_FRAME(3, 0) - TILES(0x1788C, 4) - SHOW_FRAME(3, 8) + TILES(0x1788C, 4) SHOW_FRAME(3, 8) - TILES(0x17877, 4) - SHOW_FRAME(3, 2) + TILES(0x17877, 4) SHOW_FRAME(3, 2) - TILES(0x17890, 4) - SHOW_FRAME(3, 9) + TILES(0x17890, 4) SHOW_FRAME(3, 9) - TILES(0x17894, 4) - SHOW_FRAME(3, 10) + TILES(0x17894, 4) SHOW_FRAME(3, 10) - TILES(0x1786F, 4) - SHOW_FRAME(3, 0) + TILES(0x1786F, 4) SHOW_FRAME(3, 0) - TILES(0x1788B, 1) - SHOW_FRAME(3, 7) + TILES(0x1788B, 1) SHOW_FRAME(3, 7) - END() + END() }; -const s32 * const anim_0775[2] = { +const s32 *const anim_0775[2] = { anim_0775__v0_l0, anim_0775__v1_l0, }; const s32 anim_0776__v0_l0[] = { // 0x080FCA08 - PALETTE(157, 16, 0xB0) - TILES(0x800006AB, 15) - SHOW_FRAME(1, 0) + PALETTE(157, 16, 0xB0) TILES(0x800006AB, 15) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0776[1] = { +const s32 *const anim_0776[1] = { anim_0776__v0_l0, }; const s32 anim_0777__v0_l0[] = { // 0x080FCA30 SHOW_FRAME(12, -1) - PALETTE(1, 16, 0x50) - TILES(0x17898, 12) - SHOW_FRAME(3, 0) + PALETTE(1, 16, 0x50) TILES(0x17898, 12) SHOW_FRAME(3, 0) - TILES(0x178A4, 15) - SHOW_FRAME(4, 1) + TILES(0x178A4, 15) SHOW_FRAME(4, 1) - TILES(0x178B3, 12) - SHOW_FRAME(3, 2) + TILES(0x178B3, 12) SHOW_FRAME(3, 2) - TILES(0x178BF, 9) - SHOW_FRAME(2, 3) + TILES(0x178BF, 9) SHOW_FRAME(2, 3) - END() + END() }; -const s32 * const anim_0777[1] = { +const s32 *const anim_0777[1] = { anim_0777__v0_l0, }; const s32 anim_0778__v0_l0[] = { // 0x080FCA9C - PALETTE(68, 16, 0x60) - TILES(0x178C8, 46) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x178C8, 46) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0778__v1_l0[] = { // 0x080FCAC0 - PALETTE(178, 16, 0x40) - TILES(0x178F6, 20) - SHOW_FRAME(1, 1) + PALETTE(178, 16, 0x40) TILES(0x178F6, 20) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0778__v2_l0[] = { // 0x080FCAE4 - PALETTE(179, 16, 0x30) - TILES(0x1790A, 16) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x30) TILES(0x1790A, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0778__v3_l0[] = { // 0x080FCB08 - PALETTE(179, 16, 0x30) - TILES(0x1791A, 20) - SHOW_FRAME(1, 3) + PALETTE(179, 16, 0x30) TILES(0x1791A, 20) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0778__v4_l0[] = { // 0x080FCB2C - PALETTE(179, 16, 0x30) - TILES(0x1792E, 16) - SHOW_FRAME(1, 4) + PALETTE(179, 16, 0x30) TILES(0x1792E, 16) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0778__v5_l0[] = { // 0x080FCB50 - PALETTE(179, 16, 0x30) - TILES(0x1793E, 32) - SHOW_FRAME(1, 5) + PALETTE(179, 16, 0x30) TILES(0x1793E, 32) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0778[6] = { - anim_0778__v0_l0, - anim_0778__v1_l0, - anim_0778__v2_l0, - anim_0778__v3_l0, - anim_0778__v4_l0, - anim_0778__v5_l0, +const s32 *const anim_0778[6] = { + anim_0778__v0_l0, anim_0778__v1_l0, anim_0778__v2_l0, anim_0778__v3_l0, anim_0778__v4_l0, anim_0778__v5_l0, }; const s32 anim_0779__v0_l0[] = { // 0x080FCB8C - PALETTE(68, 16, 0x60) - TILES(0x1795E, 28) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x1795E, 28) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0779__v1_l0[] = { // 0x080FCBB0 - PALETTE(178, 16, 0x40) - TILES(0x1797A, 28) - SHOW_FRAME(1, 1) + PALETTE(178, 16, 0x40) TILES(0x1797A, 28) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0779__v2_l0[] = { // 0x080FCBD4 - PALETTE(179, 16, 0x30) - TILES(0x17996, 8) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x30) TILES(0x17996, 8) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0779__v3_l0[] = { // 0x080FCBF8 - PALETTE(179, 16, 0x30) - TILES(0x1799E, 28) - SHOW_FRAME(1, 3) + PALETTE(179, 16, 0x30) TILES(0x1799E, 28) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0779__v4_l0[] = { // 0x080FCC1C - PALETTE(179, 16, 0x30) - TILES(0x179BA, 20) - SHOW_FRAME(1, 4) + PALETTE(179, 16, 0x30) TILES(0x179BA, 20) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0779__v5_l0[] = { // 0x080FCC40 - PALETTE(179, 16, 0x30) - TILES(0x179CE, 40) - SHOW_FRAME(1, 5) + PALETTE(179, 16, 0x30) TILES(0x179CE, 40) SHOW_FRAME(1, 5) - END() + END() }; -const s32 * const anim_0779[6] = { - anim_0779__v0_l0, - anim_0779__v1_l0, - anim_0779__v2_l0, - anim_0779__v3_l0, - anim_0779__v4_l0, - anim_0779__v5_l0, +const s32 *const anim_0779[6] = { + anim_0779__v0_l0, anim_0779__v1_l0, anim_0779__v2_l0, anim_0779__v3_l0, anim_0779__v4_l0, anim_0779__v5_l0, }; const s32 anim_0780__v0_l0[] = { // 0x080FCC7C - PALETTE(179, 16, 0x30) - TILES(0x179F6, 90) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x30) TILES(0x179F6, 90) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0780__v1_l0[] = { // 0x080FCCA0 - PALETTE(179, 16, 0x30) - TILES(0x17A50, 90) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x30) TILES(0x17A50, 90) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0780[2] = { +const s32 *const anim_0780[2] = { anim_0780__v0_l0, anim_0780__v1_l0, }; const s32 anim_0781__v0_l0[] = { // 0x080FCCCC - PALETTE(68, 16, 0x60) - TILES(0x17AAA, 4) - SHOW_FRAME(60, 0) + PALETTE(68, 16, 0x60) TILES(0x17AAA, 4) SHOW_FRAME(60, 0) - END() + END() }; const s32 anim_0781__v1_l0[] = { // 0x080FCCF0 - PALETTE(68, 16, 0x60) - TILES(0x17AAE, 4) - SHOW_FRAME(60, 1) + PALETTE(68, 16, 0x60) TILES(0x17AAE, 4) SHOW_FRAME(60, 1) - END() + END() }; const s32 anim_0781__v2_l0[] = { // 0x080FCD14 - PALETTE(68, 16, 0x60) - TILES(0x17AB2, 4) - SHOW_FRAME(60, 2) + PALETTE(68, 16, 0x60) TILES(0x17AB2, 4) SHOW_FRAME(60, 2) - END() + END() }; const s32 anim_0781__v3_l0[] = { // 0x080FCD38 - PALETTE(68, 16, 0x60) - TILES(0x17AB6, 4) - SHOW_FRAME(60, 3) + PALETTE(68, 16, 0x60) TILES(0x17AB6, 4) SHOW_FRAME(60, 3) - END() + END() }; const s32 anim_0781__v4_l0[] = { // 0x080FCD5C - PALETTE(68, 16, 0x60) - TILES(0x17ABA, 4) - SHOW_FRAME(60, 4) + PALETTE(68, 16, 0x60) TILES(0x17ABA, 4) SHOW_FRAME(60, 4) - END() + END() }; const s32 anim_0781__v5_l0[] = { // 0x080FCD80 - PALETTE(68, 16, 0x60) - TILES(0x17ABE, 4) - SHOW_FRAME(60, 5) + PALETTE(68, 16, 0x60) TILES(0x17ABE, 4) SHOW_FRAME(60, 5) - END() + END() }; -const s32 * const anim_0781[6] = { - anim_0781__v0_l0, - anim_0781__v1_l0, - anim_0781__v2_l0, - anim_0781__v3_l0, - anim_0781__v4_l0, - anim_0781__v5_l0, +const s32 *const anim_0781[6] = { + anim_0781__v0_l0, anim_0781__v1_l0, anim_0781__v2_l0, anim_0781__v3_l0, anim_0781__v4_l0, anim_0781__v5_l0, }; const s32 anim_0782__v0_l0[] = { // 0x080FCDBC - PALETTE(1, 16, 0x50) - TILES(0x17AC2, 4) - SHOW_FRAME(8, 0) + PALETTE(1, 16, 0x50) TILES(0x17AC2, 4) SHOW_FRAME(8, 0) - TILES(0x17AC6, 8) - SHOW_FRAME(8, 1) + TILES(0x17AC6, 8) SHOW_FRAME(8, 1) - TILES(0x17ACE, 8) - SHOW_FRAME(8, 2) + TILES(0x17ACE, 8) SHOW_FRAME(8, 2) - TILES(0x17AD6, 8) - SHOW_FRAME(8, 3) + TILES(0x17AD6, 8) SHOW_FRAME(8, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0782[1] = { +const s32 *const anim_0782[1] = { anim_0782__v0_l0, }; const s32 anim_0783__v0_l0[] = { // 0x080FCE24 - PALETTE(179, 16, 0x0) - TILES(0x17ADE, 28) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x17ADE, 28) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0783[1] = { +const s32 *const anim_0783[1] = { anim_0783__v0_l0, }; const s32 anim_0784__v0_l0[] = { // 0x080FCE4C - PALETTE(180, 16, 0x0) - TILES(0x17AFA, 100) - SHOW_FRAME(1, 0) + PALETTE(180, 16, 0x0) TILES(0x17AFA, 100) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0784[1] = { +const s32 *const anim_0784[1] = { anim_0784__v0_l0, }; const s32 anim_0785__v0_l0[] = { // 0x080FCE74 - PALETTE(68, 16, 0xF0) - TILES(0x17B5E, 69) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0xF0) TILES(0x17B5E, 69) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0785__v1_l0[] = { // 0x080FCE98 - PALETTE(68, 16, 0xF0) - TILES(0x17BA3, 39) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0xF0) TILES(0x17BA3, 39) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0785__v2_l0[] = { // 0x080FCEBC - PALETTE(68, 16, 0xF0) - TILES(0x17BCA, 51) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0xF0) TILES(0x17BCA, 51) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0785[3] = { +const s32 *const anim_0785[3] = { anim_0785__v0_l0, anim_0785__v1_l0, anim_0785__v2_l0, }; const s32 anim_0786__v0_l0[] = { // 0x080FCEEC - PALETTE(179, 16, 0x0) - TILES(0x17BFD, 20) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x17BFD, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0786[1] = { +const s32 *const anim_0786[1] = { anim_0786__v0_l0, }; const s32 anim_0787__v0_l0[] = { // 0x080FCF14 - PALETTE(180, 16, 0x0) - TILES(0x17C11, 46) - SHOW_FRAME(1, 0) + PALETTE(180, 16, 0x0) TILES(0x17C11, 46) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0787[1] = { +const s32 *const anim_0787[1] = { anim_0787__v0_l0, }; const s32 anim_0788__v0_l0[] = { // 0x080FCF3C - PALETTE(32, 16, 0xD0) - TILES(0x17C3F, 4) - SHOW_FRAME(3, 0) + PALETTE(32, 16, 0xD0) TILES(0x17C3F, 4) SHOW_FRAME(3, 0) - TILES(0x17C43, 4) - SHOW_FRAME(3, 1) + TILES(0x17C43, 4) SHOW_FRAME(3, 1) - TILES(0x17C47, 4) - SHOW_FRAME(3, 2) + TILES(0x17C47, 4) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0788[1] = { +const s32 *const anim_0788[1] = { anim_0788__v0_l0, }; const s32 anim_0789__v0_l0[] = { // 0x080FCF90 - PALETTE(32, 16, 0xD0) - TILES(0x17C4B, 4) - SHOW_FRAME(3, 0) + PALETTE(32, 16, 0xD0) TILES(0x17C4B, 4) SHOW_FRAME(3, 0) - TILES(0x17C4F, 4) - SHOW_FRAME(3, 1) + TILES(0x17C4F, 4) SHOW_FRAME(3, 1) - TILES(0x17C53, 4) - SHOW_FRAME(3, 2) + TILES(0x17C53, 4) SHOW_FRAME(3, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0789[1] = { +const s32 *const anim_0789[1] = { anim_0789__v0_l0, }; const s32 anim_0790__v0_l0[] = { // 0x080FCFE4 - PALETTE(181, 16, 0xC0) - TILES(0x17C57, 10) - SHOW_FRAME(1, 0) + PALETTE(181, 16, 0xC0) TILES(0x17C57, 10) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0790[1] = { +const s32 *const anim_0790[1] = { anim_0790__v0_l0, }; const s32 anim_0791__v0_l0[] = { // 0x080FD00C - PALETTE(181, 16, 0xC0) - TILES(0x17C61, 21) - SHOW_FRAME(1, 0) + PALETTE(181, 16, 0xC0) TILES(0x17C61, 21) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0791[1] = { +const s32 *const anim_0791[1] = { anim_0791__v0_l0, }; const s32 anim_0792__v0_l0[] = { // 0x080FD034 - PALETTE(182, 16, 0xC0) - TILES(0x17C76, 30) - SHOW_FRAME(1, 0) + PALETTE(182, 16, 0xC0) TILES(0x17C76, 30) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0792[1] = { +const s32 *const anim_0792[1] = { anim_0792__v0_l0, }; const s32 anim_0793__v0_l0[] = { // 0x080FD05C - PALETTE(181, 16, 0xC0) - TILES(0x17C94, 80) - SHOW_FRAME(1, 0) + PALETTE(181, 16, 0xC0) TILES(0x17C94, 80) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0793[1] = { +const s32 *const anim_0793[1] = { anim_0793__v0_l0, }; const s32 anim_0794__v0_l0[] = { // 0x080FD084 - PALETTE(1, 16, 0x50) - TILES(0x17CE4, 8) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 0) + PALETTE(1, 16, 0x50) TILES(0x17CE4, 8) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 0) - TILES(0x17CEC, 8) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 1) + TILES(0x17CEC, 8) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 1) - TILES(0x17CF4, 8) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 2) + TILES(0x17CF4, 8) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 2) - TILES(0x17CFC, 8) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 3) + TILES(0x17CFC, 8) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 3) - TILES(0x17D04, 6) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 4) + TILES(0x17D04, 6) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 4) - TILES(0x17D0A, 8) - HITBOX(0, 1, -18, 1, -18) - SHOW_FRAME(5, 5) + TILES(0x17D0A, 8) HITBOX(0, 1, -18, 1, -18) SHOW_FRAME(5, 5) - JUMP_BACK(51) + JUMP_BACK(51) }; -const s32 * const anim_0794[1] = { +const s32 *const anim_0794[1] = { anim_0794__v0_l0, }; const s32 anim_0795__v0_l0[] = { // 0x080FD15C - TILES(0x17D12, 16) - PALETTE(68, 16, 0x60) - HITBOX(0, -12, -12, 12, 12) - SHOW_FRAME(6, 0) + TILES(0x17D12, 16) PALETTE(68, 16, 0x60) HITBOX(0, -12, -12, 12, 12) SHOW_FRAME(6, 0) - SHOW_FRAME(6, 1) + SHOW_FRAME(6, 1) - SHOW_FRAME(6, 2) + SHOW_FRAME(6, 2) - SHOW_FRAME(6, 3) + SHOW_FRAME(6, 3) - JUMP_BACK(14) + JUMP_BACK(14) }; -const s32 * const anim_0795[1] = { +const s32 *const anim_0795[1] = { anim_0795__v0_l0, }; const s32 anim_0796__v0_l0[] = { // 0x080FD1AC - TILES(0x17D22, 16) - PALETTE(68, 16, 0x60) - SHOW_FRAME(4, 0) + TILES(0x17D22, 16) PALETTE(68, 16, 0x60) SHOW_FRAME(4, 0) - SHOW_FRAME(4, 1) + SHOW_FRAME(4, 1) - SHOW_FRAME(4, 2) + SHOW_FRAME(4, 2) - SHOW_FRAME(4, 3) + SHOW_FRAME(4, 3) - END() + END() }; -const s32 * const anim_0796[1] = { +const s32 *const anim_0796[1] = { anim_0796__v0_l0, }; const s32 anim_0797__v0_l0[] = { // 0x080FD1EC - PALETTE(183, 16, 0x60) - TILES(0x17D32, 64) - HITBOX(0, -10, -10, 10, 10) - SHOW_FRAME(2, 0) + PALETTE(183, 16, 0x60) TILES(0x17D32, 64) HITBOX(0, -10, -10, 10, 10) SHOW_FRAME(2, 0) - TILES(0x17D72, 64) - SHOW_FRAME(2, 1) + TILES(0x17D72, 64) SHOW_FRAME(2, 1) - TILES(0x17DB2, 64) - SHOW_FRAME(2, 2) + TILES(0x17DB2, 64) SHOW_FRAME(2, 2) - TILES(0x17DF2, 64) - SHOW_FRAME(2, 3) + TILES(0x17DF2, 64) SHOW_FRAME(2, 3) - TILES(0x17E32, 64) - SHOW_FRAME(2, 4) + TILES(0x17E32, 64) SHOW_FRAME(2, 4) - TILES(0x17E72, 64) - SHOW_FRAME(2, 5) + TILES(0x17E72, 64) SHOW_FRAME(2, 5) - TILES(0x17EB2, 64) - SHOW_FRAME(2, 6) + TILES(0x17EB2, 64) SHOW_FRAME(2, 6) - JUMP_BACK(41) + JUMP_BACK(41) }; -const s32 * const anim_0797[1] = { +const s32 *const anim_0797[1] = { anim_0797__v0_l0, }; const s32 anim_0798__v0_l0[] = { // 0x080FD29C - TILES(0x17EF2, 24) - PALETTE(68, 16, 0x60) - SHOW_FRAME(2, 0) + TILES(0x17EF2, 24) PALETTE(68, 16, 0x60) SHOW_FRAME(2, 0) - SHOW_FRAME(2, 1) + SHOW_FRAME(2, 1) - SHOW_FRAME(2, 2) + SHOW_FRAME(2, 2) - SHOW_FRAME(2, 3) + SHOW_FRAME(2, 3) - SHOW_FRAME(2, 4) + SHOW_FRAME(2, 4) - SHOW_FRAME(2, 5) + SHOW_FRAME(2, 5) - END() + END() }; -const s32 * const anim_0798[1] = { +const s32 *const anim_0798[1] = { anim_0798__v0_l0, }; const s32 anim_0799__v0_l0[] = { // 0x080FD2EC - TILES(0x17F0A, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 0) + TILES(0x17F0A, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 0) - SHOW_FRAME(2, 1) + SHOW_FRAME(2, 1) - SHOW_FRAME(2, 2) + SHOW_FRAME(2, 2) - SHOW_FRAME(2, 3) + SHOW_FRAME(2, 3) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0799__v1_l0[] = { // 0x080FD338 - TILES(0x17F4A, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 4) + TILES(0x17F4A, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 4) - SHOW_FRAME(2, 5) + SHOW_FRAME(2, 5) - SHOW_FRAME(2, 6) + SHOW_FRAME(2, 6) - SHOW_FRAME(2, 7) + SHOW_FRAME(2, 7) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0799__v2_l0[] = { // 0x080FD384 - TILES(0x17F8A, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 8) + TILES(0x17F8A, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 8) - SHOW_FRAME(2, 9) + SHOW_FRAME(2, 9) - SHOW_FRAME(2, 10) + SHOW_FRAME(2, 10) - SHOW_FRAME(2, 11) + SHOW_FRAME(2, 11) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0799__v3_l0[] = { // 0x080FD3D0 - TILES(0x17FCA, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 12) + TILES(0x17FCA, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 12) - SHOW_FRAME(2, 13) + SHOW_FRAME(2, 13) - SHOW_FRAME(2, 14) + SHOW_FRAME(2, 14) - SHOW_FRAME(2, 15) + SHOW_FRAME(2, 15) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0799__v4_l0[] = { // 0x080FD41C - TILES(0x1800A, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 16) + TILES(0x1800A, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 16) - SHOW_FRAME(2, 17) + SHOW_FRAME(2, 17) - SHOW_FRAME(2, 18) + SHOW_FRAME(2, 18) - SHOW_FRAME(2, 19) + SHOW_FRAME(2, 19) - JUMP_BACK(14) + JUMP_BACK(14) }; const s32 anim_0799__v5_l0[] = { // 0x080FD468 - TILES(0x1804A, 64) - PALETTE(33, 16, 0x70) - HITBOX(0, -9, -9, 10, 10) - SHOW_FRAME(2, 20) + TILES(0x1804A, 64) PALETTE(33, 16, 0x70) HITBOX(0, -9, -9, 10, 10) SHOW_FRAME(2, 20) - SHOW_FRAME(2, 21) + SHOW_FRAME(2, 21) - SHOW_FRAME(2, 22) + SHOW_FRAME(2, 22) - SHOW_FRAME(2, 23) + SHOW_FRAME(2, 23) - JUMP_BACK(14) + JUMP_BACK(14) }; -const s32 * const anim_0799[6] = { - anim_0799__v0_l0, - anim_0799__v1_l0, - anim_0799__v2_l0, - anim_0799__v3_l0, - anim_0799__v4_l0, - anim_0799__v5_l0, +const s32 *const anim_0799[6] = { + anim_0799__v0_l0, anim_0799__v1_l0, anim_0799__v2_l0, anim_0799__v3_l0, anim_0799__v4_l0, anim_0799__v5_l0, }; const s32 anim_0800__v0_l0[] = { // 0x080FD4CC - TILES(0x1808A, 160) - PALETTE(116, 16, 0xF0) - HITBOX(0, -15, -15, 14, 15) - SHOW_FRAME(3, 0) + TILES(0x1808A, 160) PALETTE(116, 16, 0xF0) HITBOX(0, -15, -15, 14, 15) SHOW_FRAME(3, 0) - SHOW_FRAME(3, 1) + SHOW_FRAME(3, 1) - SHOW_FRAME(3, 2) + SHOW_FRAME(3, 2) - SHOW_FRAME(3, 3) + SHOW_FRAME(3, 3) - SHOW_FRAME(3, 4) + SHOW_FRAME(3, 4) - SHOW_FRAME(3, 5) + SHOW_FRAME(3, 5) - SHOW_FRAME(3, 6) + SHOW_FRAME(3, 6) - SHOW_FRAME(3, 7) + SHOW_FRAME(3, 7) - SHOW_FRAME(3, 8) + SHOW_FRAME(3, 8) - SHOW_FRAME(3, 9) + SHOW_FRAME(3, 9) - JUMP_BACK(26) + JUMP_BACK(26) }; -const s32 * const anim_0800[1] = { +const s32 *const anim_0800[1] = { anim_0800__v0_l0, }; const s32 anim_0801__v0_l0[] = { // 0x080FD54C - TILES(0x1812A, 32) - PALETTE(33, 16, 0x70) - HITBOX(0, -7, -7, 7, 7) - SHOW_FRAME(2, 0) + TILES(0x1812A, 32) PALETTE(33, 16, 0x70) HITBOX(0, -7, -7, 7, 7) SHOW_FRAME(2, 0) - SHOW_FRAME(2, 1) + SHOW_FRAME(2, 1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0801[1] = { +const s32 *const anim_0801[1] = { anim_0801__v0_l0, }; const s32 anim_0802__v0_l0[] = { // 0x080FD58C - TILES(0x1814A, 80) - PALETTE(33, 16, 0x70) - SHOW_FRAME(4, 0) + TILES(0x1814A, 80) PALETTE(33, 16, 0x70) SHOW_FRAME(4, 0) - SHOW_FRAME(4, 1) + SHOW_FRAME(4, 1) - SHOW_FRAME(4, 2) + SHOW_FRAME(4, 2) - SHOW_FRAME(4, 3) + SHOW_FRAME(4, 3) - SHOW_FRAME(4, 4) + SHOW_FRAME(4, 4) - END() + END() }; -const s32 * const anim_0802[1] = { +const s32 *const anim_0802[1] = { anim_0802__v0_l0, }; const s32 anim_0805__v0_l0[] = { // 0x080FD5D4 - PALETTE(0, 16, 0x70) - TILES(0x1819A, 9) - SHOW_FRAME(3, 0) + PALETTE(0, 16, 0x70) TILES(0x1819A, 9) SHOW_FRAME(3, 0) - TILES(0x181A3, 9) - SHOW_FRAME(3, 1) + TILES(0x181A3, 9) SHOW_FRAME(3, 1) - JUMP_BACK(13) + JUMP_BACK(13) }; const s32 anim_0805__v1_l0[] = { // 0x080FD610 - PALETTE(3, 16, 0x80) - TILES(0x181AC, 9) - SHOW_FRAME(3, 2) + PALETTE(3, 16, 0x80) TILES(0x181AC, 9) SHOW_FRAME(3, 2) - TILES(0x181B5, 9) - SHOW_FRAME(3, 3) + TILES(0x181B5, 9) SHOW_FRAME(3, 3) - JUMP_BACK(13) + JUMP_BACK(13) }; -const s32 * const anim_0805[2] = { +const s32 *const anim_0805[2] = { anim_0805__v0_l0, anim_0805__v1_l0, }; const s32 anim_0806__v0_l0[] = { // 0x080FD654 - PALETTE(184, 16, 0x50) - TILES(0x181BE, 6) - SHOW_FRAME(1, 0) + PALETTE(184, 16, 0x50) TILES(0x181BE, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0806__v1_l0[] = { // 0x080FD678 - PALETTE(184, 16, 0x50) - TILES(0x181C4, 6) - SHOW_FRAME(1, 1) + PALETTE(184, 16, 0x50) TILES(0x181C4, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0806__v2_l0[] = { // 0x080FD69C - PALETTE(184, 16, 0x60) - TILES(0x181BE, 6) - SHOW_FRAME(1, 0) + PALETTE(184, 16, 0x60) TILES(0x181BE, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0806__v3_l0[] = { // 0x080FD6C0 - PALETTE(184, 16, 0x60) - TILES(0x181C4, 6) - SHOW_FRAME(1, 1) + PALETTE(184, 16, 0x60) TILES(0x181C4, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0806__v4_l0[] = { // 0x080FD6E4 - PALETTE(184, 16, 0x70) - TILES(0x181BE, 6) - SHOW_FRAME(1, 0) + PALETTE(184, 16, 0x70) TILES(0x181BE, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0806__v5_l0[] = { // 0x080FD708 - PALETTE(184, 16, 0x70) - TILES(0x181C4, 6) - SHOW_FRAME(1, 1) + PALETTE(184, 16, 0x70) TILES(0x181C4, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0806__v6_l0[] = { // 0x080FD72C - PALETTE(184, 16, 0x80) - TILES(0x181BE, 6) - SHOW_FRAME(1, 0) + PALETTE(184, 16, 0x80) TILES(0x181BE, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0806__v7_l0[] = { // 0x080FD750 - PALETTE(184, 16, 0x70) - TILES(0x181CA, 6) - SHOW_FRAME(1, 2) + PALETTE(184, 16, 0x70) TILES(0x181CA, 6) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0806[8] = { - anim_0806__v0_l0, - anim_0806__v1_l0, - anim_0806__v2_l0, - anim_0806__v3_l0, - anim_0806__v4_l0, - anim_0806__v5_l0, - anim_0806__v6_l0, - anim_0806__v7_l0, +const s32 *const anim_0806[8] = { + anim_0806__v0_l0, anim_0806__v1_l0, anim_0806__v2_l0, anim_0806__v3_l0, + anim_0806__v4_l0, anim_0806__v5_l0, anim_0806__v6_l0, anim_0806__v7_l0, }; const s32 anim_0807__v0_l0[] = { // 0x080FD794 - PALETTE(185, 16, 0x20) - TILES(0x181D0, 20) - SHOW_FRAME(1, 0) + PALETTE(185, 16, 0x20) TILES(0x181D0, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0807__v1_l0[] = { // 0x080FD7B8 - PALETTE(185, 16, 0x20) - TILES(0x181E4, 22) - SHOW_FRAME(1, 1) + PALETTE(185, 16, 0x20) TILES(0x181E4, 22) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0807__v2_l0[] = { // 0x080FD7DC - PALETTE(185, 16, 0x20) - TILES(0x181FA, 22) - SHOW_FRAME(1, 2) + PALETTE(185, 16, 0x20) TILES(0x181FA, 22) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0807__v3_l0[] = { // 0x080FD800 - PALETTE(185, 16, 0x20) - TILES(0x18210, 16) - SHOW_FRAME(1, 3) + PALETTE(185, 16, 0x20) TILES(0x18210, 16) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0807__v4_l0[] = { // 0x080FD824 - PALETTE(185, 16, 0x20) - TILES(0x18220, 4) - SHOW_FRAME(1, 4) + PALETTE(185, 16, 0x20) TILES(0x18220, 4) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0807__v5_l0[] = { // 0x080FD848 - PALETTE(185, 16, 0x20) - TILES(0x18224, 4) - SHOW_FRAME(1, 5) + PALETTE(185, 16, 0x20) TILES(0x18224, 4) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0807__v6_l0[] = { // 0x080FD86C - PALETTE(185, 16, 0x20) - TILES(0x18228, 4) - SHOW_FRAME(1, 6) + PALETTE(185, 16, 0x20) TILES(0x18228, 4) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0807__v7_l0[] = { // 0x080FD890 - PALETTE(185, 16, 0x20) - TILES(0x1822C, 4) - SHOW_FRAME(1, 7) + PALETTE(185, 16, 0x20) TILES(0x1822C, 4) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0807__v8_l0[] = { // 0x080FD8B4 - PALETTE(185, 16, 0x20) - TILES(0x18230, 4) - SHOW_FRAME(1, 8) + PALETTE(185, 16, 0x20) TILES(0x18230, 4) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0807[9] = { - anim_0807__v0_l0, - anim_0807__v1_l0, - anim_0807__v2_l0, - anim_0807__v3_l0, - anim_0807__v4_l0, - anim_0807__v5_l0, - anim_0807__v6_l0, - anim_0807__v7_l0, - anim_0807__v8_l0, +const s32 *const anim_0807[9] = { + anim_0807__v0_l0, anim_0807__v1_l0, anim_0807__v2_l0, anim_0807__v3_l0, anim_0807__v4_l0, + anim_0807__v5_l0, anim_0807__v6_l0, anim_0807__v7_l0, anim_0807__v8_l0, }; const s32 anim_0808__v0_l0[] = { // 0x080FD8FC - PALETTE(186, 16, 0x60) - TILES(0x18234, 10) - SHOW_FRAME(1, 0) + PALETTE(186, 16, 0x60) TILES(0x18234, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0808__v1_l0[] = { // 0x080FD920 - PALETTE(186, 16, 0x60) - TILES(0x1823E, 21) - SHOW_FRAME(1, 1) + PALETTE(186, 16, 0x60) TILES(0x1823E, 21) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0808__v2_l0[] = { // 0x080FD944 - PALETTE(186, 16, 0x60) - TILES(0x18253, 51) - SHOW_FRAME(1, 2) + PALETTE(186, 16, 0x60) TILES(0x18253, 51) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0808__v3_l0[] = { // 0x080FD968 - PALETTE(186, 16, 0x60) - TILES(0x18286, 38) - SHOW_FRAME(1, 3) + PALETTE(186, 16, 0x60) TILES(0x18286, 38) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0808__v4_l0[] = { // 0x080FD98C - PALETTE(186, 16, 0x60) - TILES(0x182AC, 84) - SHOW_FRAME(1, 4) + PALETTE(186, 16, 0x60) TILES(0x182AC, 84) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0808[5] = { - anim_0808__v0_l0, - anim_0808__v1_l0, - anim_0808__v2_l0, - anim_0808__v3_l0, - anim_0808__v4_l0, +const s32 *const anim_0808[5] = { + anim_0808__v0_l0, anim_0808__v1_l0, anim_0808__v2_l0, anim_0808__v3_l0, anim_0808__v4_l0, }; const s32 anim_0809__v0_l0[] = { // 0x080FD9C4 - PALETTE(187, 16, 0x60) - TILES(0x18300, 96) - SHOW_FRAME(1, 0) + PALETTE(187, 16, 0x60) TILES(0x18300, 96) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0809[1] = { +const s32 *const anim_0809[1] = { anim_0809__v0_l0, }; const s32 anim_0810__v0_l0[] = { // 0x080FD9EC - PALETTE(35, 16, 0x90) - TILES(0x18360, 40) - SHOW_FRAME(1, 0) + PALETTE(35, 16, 0x90) TILES(0x18360, 40) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0810__v1_l0[] = { // 0x080FDA10 - PALETTE(35, 16, 0x90) - TILES(0x18388, 64) - SHOW_FRAME(1, 1) + PALETTE(35, 16, 0x90) TILES(0x18388, 64) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0810[2] = { +const s32 *const anim_0810[2] = { anim_0810__v0_l0, anim_0810__v1_l0, }; const s32 anim_0811__v0_l0[] = { // 0x080FDA3C - PALETTE(179, 16, 0x0) - TILES(0x183C8, 80) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x183C8, 80) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0811[1] = { +const s32 *const anim_0811[1] = { anim_0811__v0_l0, }; const s32 anim_0812__v0_l0[] = { // 0x080FDA64 - PALETTE(188, 16, 0xC0) - TILES(0x18418, 38) - SHOW_FRAME(1, 0) + PALETTE(188, 16, 0xC0) TILES(0x18418, 38) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0812__v1_l0[] = { // 0x080FDA88 - PALETTE(188, 16, 0xC0) - TILES(0x1843E, 30) - SHOW_FRAME(1, 1) + PALETTE(188, 16, 0xC0) TILES(0x1843E, 30) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0812__v2_l0[] = { // 0x080FDAAC - PALETTE(188, 16, 0xC0) - TILES(0x1845C, 18) - SHOW_FRAME(1, 2) + PALETTE(188, 16, 0xC0) TILES(0x1845C, 18) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0812[3] = { +const s32 *const anim_0812[3] = { anim_0812__v0_l0, anim_0812__v1_l0, anim_0812__v2_l0, }; const s32 anim_0813__v0_l0[] = { // 0x080FDADC - PALETTE(189, 16, 0xB0) - TILES(0x1846E, 60) - SHOW_FRAME(1, 0) + PALETTE(189, 16, 0xB0) TILES(0x1846E, 60) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0813__v1_l0[] = { // 0x080FDB00 - PALETTE(189, 16, 0xB0) - TILES(0x184AA, 60) - SHOW_FRAME(1, 1) + PALETTE(189, 16, 0xB0) TILES(0x184AA, 60) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0813[2] = { +const s32 *const anim_0813[2] = { anim_0813__v0_l0, anim_0813__v1_l0, }; const s32 anim_0814__v0_l0[] = { // 0x080FDB2C - PALETTE(190, 16, 0xF0) - SHOW_FRAME(16, -1) + PALETTE(190, 16, 0xF0) SHOW_FRAME(16, -1) - PALETTE(191, 16, 0xF0) - SHOW_FRAME(16, -1) + PALETTE(191, 16, 0xF0) SHOW_FRAME(16, -1) - PALETTE(192, 16, 0xF0) - SHOW_FRAME(16, -1) + PALETTE(192, 16, 0xF0) SHOW_FRAME(16, -1) - PALETTE(193, 16, 0xF0) - SHOW_FRAME(16, -1) + PALETTE(193, 16, 0xF0) SHOW_FRAME(16, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0814[1] = { +const s32 *const anim_0814[1] = { anim_0814__v0_l0, }; const s32 anim_0815__v0_l0[] = { // 0x080FDB88 - PALETTE(194, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(194, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(195, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(195, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(196, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(196, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(197, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(197, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(198, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(198, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(199, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(199, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(200, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(200, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(201, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(201, 16, 0xA0) SHOW_FRAME(1, -1) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0815[1] = { +const s32 *const anim_0815[1] = { anim_0815__v0_l0, }; const s32 anim_0816__v0_l0[] = { // 0x080FDC34 - PALETTE(202, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(202, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(203, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(203, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(204, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(204, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(205, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(205, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(206, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(206, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(207, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(207, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(208, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(208, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - PALETTE(209, 16, 0x80) - TILES(0x184E6, 4) - SHOW_FRAME(6, 0) + PALETTE(209, 16, 0x80) TILES(0x184E6, 4) SHOW_FRAME(6, 0) - JUMP_BACK(64) + JUMP_BACK(64) }; -const s32 * const anim_0816[1] = { +const s32 *const anim_0816[1] = { anim_0816__v0_l0, }; const s32 anim_0817__v0_l0[] = { // 0x080FDD40 - PALETTE(210, 16, 0x30) - TILES(0x184EA, 4) - SHOW_FRAME(5, 0) + PALETTE(210, 16, 0x30) TILES(0x184EA, 4) SHOW_FRAME(5, 0) - PALETTE(211, 16, 0x30) - TILES(0x184EA, 4) - SHOW_FRAME(5, 0) + PALETTE(211, 16, 0x30) TILES(0x184EA, 4) SHOW_FRAME(5, 0) - PALETTE(212, 16, 0x30) - TILES(0x184EA, 4) - SHOW_FRAME(5, 0) + PALETTE(212, 16, 0x30) TILES(0x184EA, 4) SHOW_FRAME(5, 0) - PALETTE(213, 16, 0x30) - TILES(0x184EA, 4) - SHOW_FRAME(5, 0) + PALETTE(213, 16, 0x30) TILES(0x184EA, 4) SHOW_FRAME(5, 0) - JUMP_BACK(32) + JUMP_BACK(32) }; -const s32 * const anim_0817[1] = { +const s32 *const anim_0817[1] = { anim_0817__v0_l0, }; const s32 anim_0818__v0_l0[] = { // 0x080FDDCC - PALETTE(214, 16, 0x10) - TILES(0x184EE, 4) - SHOW_FRAME(16, 0) + PALETTE(214, 16, 0x10) TILES(0x184EE, 4) SHOW_FRAME(16, 0) - PALETTE(215, 16, 0x10) - TILES(0x184EE, 4) - SHOW_FRAME(16, 0) + PALETTE(215, 16, 0x10) TILES(0x184EE, 4) SHOW_FRAME(16, 0) - PALETTE(216, 16, 0x10) - TILES(0x184EE, 4) - SHOW_FRAME(16, 0) + PALETTE(216, 16, 0x10) TILES(0x184EE, 4) SHOW_FRAME(16, 0) - PALETTE(217, 16, 0x10) - TILES(0x184EE, 4) - SHOW_FRAME(16, 0) + PALETTE(217, 16, 0x10) TILES(0x184EE, 4) SHOW_FRAME(16, 0) - JUMP_BACK(32) + JUMP_BACK(32) }; -const s32 * const anim_0818[1] = { +const s32 *const anim_0818[1] = { anim_0818__v0_l0, }; const s32 anim_0819__v0_l0[] = { // 0x080FDE58 - PALETTE(218, 16, 0x50) - TILES(0x184F2, 16) - SHOW_FRAME(4, 0) + PALETTE(218, 16, 0x50) TILES(0x184F2, 16) SHOW_FRAME(4, 0) - PALETTE(219, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(219, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(220, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(220, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(221, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(221, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(222, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(222, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(223, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(223, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(224, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(224, 16, 0x50) SHOW_FRAME(4, 0) - PALETTE(225, 16, 0x50) - SHOW_FRAME(4, 0) + PALETTE(225, 16, 0x50) SHOW_FRAME(4, 0) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0819[1] = { +const s32 *const anim_0819[1] = { anim_0819__v0_l0, }; const s32 anim_0820__v0_l0[] = { // 0x080FDF10 - PALETTE(226, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(226, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(227, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(227, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(228, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(228, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(229, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(229, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(230, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(230, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(231, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(231, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(232, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(232, 16, 0xC0) SHOW_FRAME(2, -1) - PALETTE(233, 16, 0xC0) - SHOW_FRAME(2, -1) + PALETTE(233, 16, 0xC0) SHOW_FRAME(2, -1) - JUMP_BACK(40) + JUMP_BACK(40) }; const s32 anim_0820__v1_l0[] = { // 0x080FDFB8 - PALETTE(234, 16, 0xD0) - TILES(0x18502, 8) - SHOW_FRAME(2, 0) + PALETTE(234, 16, 0xD0) TILES(0x18502, 8) SHOW_FRAME(2, 0) - PALETTE(235, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(235, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(236, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(236, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(237, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(237, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(238, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(238, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(239, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(239, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(240, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(240, 16, 0xD0) SHOW_FRAME(2, 0) - PALETTE(241, 16, 0xD0) - SHOW_FRAME(2, 0) + PALETTE(241, 16, 0xD0) SHOW_FRAME(2, 0) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0820[2] = { +const s32 *const anim_0820[2] = { anim_0820__v0_l0, anim_0820__v1_l0, }; const s32 anim_0821__v0_l0[] = { // 0x080FE074 - PALETTE(242, 16, 0x0) - SHOW_FRAME(100, -1) + PALETTE(242, 16, 0x0) SHOW_FRAME(100, -1) - PALETTE(242, 16, 0x0) - SHOW_FRAME(3, -1) + PALETTE(242, 16, 0x0) SHOW_FRAME(3, -1) - PALETTE(243, 16, 0x0) - SHOW_FRAME(3, -1) + PALETTE(243, 16, 0x0) SHOW_FRAME(3, -1) - PALETTE(244, 16, 0x0) - SHOW_FRAME(3, -1) + PALETTE(244, 16, 0x0) SHOW_FRAME(3, -1) - PALETTE(245, 16, 0x0) - SHOW_FRAME(3, -1) + PALETTE(245, 16, 0x0) SHOW_FRAME(3, -1) - PALETTE(246, 16, 0x0) - SHOW_FRAME(3, -1) + PALETTE(246, 16, 0x0) SHOW_FRAME(3, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0821[1] = { +const s32 *const anim_0821[1] = { anim_0821__v0_l0, }; const s32 anim_0822__v0_l0[] = { // 0x080FE0F8 - PALETTE(247, 16, 0x10) - SHOW_FRAME(60, -1) + PALETTE(247, 16, 0x10) SHOW_FRAME(60, -1) - PALETTE(247, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(247, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(248, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(248, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(249, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(249, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(250, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(250, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(251, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(251, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0822[1] = { +const s32 *const anim_0822[1] = { anim_0822__v0_l0, }; const s32 anim_0823__v0_l0[] = { // 0x080FE17C - PALETTE(252, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(252, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(253, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(253, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(254, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(254, 16, 0xA0) SHOW_FRAME(1, -1) - PALETTE(255, 16, 0xA0) - SHOW_FRAME(1, -1) + PALETTE(255, 16, 0xA0) SHOW_FRAME(1, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0823[1] = { +const s32 *const anim_0823[1] = { anim_0823__v0_l0, }; const s32 anim_0824__v0_l0[] = { // 0x080FE1D8 - PALETTE(256, 16, 0x60) - SHOW_FRAME(10, -1) + PALETTE(256, 16, 0x60) SHOW_FRAME(10, -1) - PALETTE(257, 16, 0x60) - SHOW_FRAME(10, -1) + PALETTE(257, 16, 0x60) SHOW_FRAME(10, -1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0824[1] = { +const s32 *const anim_0824[1] = { anim_0824__v0_l0, }; const s32 anim_0825__v0_l0[] = { // 0x080FE20C - PALETTE(258, 16, 0x90) - SHOW_FRAME(8, -1) + PALETTE(258, 16, 0x90) SHOW_FRAME(8, -1) - PALETTE(259, 16, 0x90) - SHOW_FRAME(8, -1) + PALETTE(259, 16, 0x90) SHOW_FRAME(8, -1) - PALETTE(260, 16, 0x90) - SHOW_FRAME(8, -1) + PALETTE(260, 16, 0x90) SHOW_FRAME(8, -1) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0825[1] = { +const s32 *const anim_0825[1] = { anim_0825__v0_l0, }; const s32 anim_0826__v0_l0[] = { // 0x080FE254 - PALETTE(261, 16, 0x70) - SHOW_FRAME(6, -1) + PALETTE(261, 16, 0x70) SHOW_FRAME(6, -1) - PALETTE(262, 16, 0x70) - SHOW_FRAME(6, -1) + PALETTE(262, 16, 0x70) SHOW_FRAME(6, -1) - PALETTE(263, 16, 0x70) - SHOW_FRAME(6, -1) + PALETTE(263, 16, 0x70) SHOW_FRAME(6, -1) - PALETTE(264, 16, 0x70) - SHOW_FRAME(6, -1) + PALETTE(264, 16, 0x70) SHOW_FRAME(6, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0826[1] = { +const s32 *const anim_0826[1] = { anim_0826__v0_l0, }; const s32 anim_0827__v0_l0[] = { // 0x080FE2B0 - PALETTE(265, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(265, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(266, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(266, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(267, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(267, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(268, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(268, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(269, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(269, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(270, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(270, 16, 0xE0) SHOW_FRAME(8, -1) - PALETTE(271, 16, 0xE0) - SHOW_FRAME(8, -1) + PALETTE(271, 16, 0xE0) SHOW_FRAME(8, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0827[1] = { +const s32 *const anim_0827[1] = { anim_0827__v0_l0, }; const s32 anim_0828__v0_l0[] = { // 0x080FE348 - PALETTE(272, 16, 0xA0) - SHOW_FRAME(8, -1) + PALETTE(272, 16, 0xA0) SHOW_FRAME(8, -1) - PALETTE(273, 16, 0xA0) - SHOW_FRAME(8, -1) + PALETTE(273, 16, 0xA0) SHOW_FRAME(8, -1) - PALETTE(274, 16, 0xA0) - SHOW_FRAME(8, -1) + PALETTE(274, 16, 0xA0) SHOW_FRAME(8, -1) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0828[1] = { +const s32 *const anim_0828[1] = { anim_0828__v0_l0, }; const s32 anim_0829__v0_l0[] = { // 0x080FE390 - PALETTE(275, 16, 0x10) - SHOW_FRAME(8, -1) + PALETTE(275, 16, 0x10) SHOW_FRAME(8, -1) - PALETTE(276, 16, 0x10) - SHOW_FRAME(8, -1) + PALETTE(276, 16, 0x10) SHOW_FRAME(8, -1) - PALETTE(277, 16, 0x10) - SHOW_FRAME(8, -1) + PALETTE(277, 16, 0x10) SHOW_FRAME(8, -1) - JUMP_BACK(15) + JUMP_BACK(15) }; -const s32 * const anim_0829[1] = { +const s32 *const anim_0829[1] = { anim_0829__v0_l0, }; const s32 anim_0830__v0_l0[] = { // 0x080FE3D8 - PALETTE(278, 16, 0x20) - SHOW_FRAME(5, -1) + PALETTE(278, 16, 0x20) SHOW_FRAME(5, -1) - PALETTE(279, 16, 0x20) - SHOW_FRAME(5, -1) + PALETTE(279, 16, 0x20) SHOW_FRAME(5, -1) - PALETTE(280, 16, 0x20) - SHOW_FRAME(5, -1) + PALETTE(280, 16, 0x20) SHOW_FRAME(5, -1) - PALETTE(281, 16, 0x20) - SHOW_FRAME(5, -1) + PALETTE(281, 16, 0x20) SHOW_FRAME(5, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0830[1] = { +const s32 *const anim_0830[1] = { anim_0830__v0_l0, }; const s32 anim_0831__v0_l0[] = { // 0x080FE434 - PALETTE(282, 16, 0xE0) - SHOW_FRAME(10, -1) + PALETTE(282, 16, 0xE0) SHOW_FRAME(10, -1) - PALETTE(283, 16, 0xE0) - SHOW_FRAME(10, -1) + PALETTE(283, 16, 0xE0) SHOW_FRAME(10, -1) - PALETTE(284, 16, 0xE0) - SHOW_FRAME(10, -1) + PALETTE(284, 16, 0xE0) SHOW_FRAME(10, -1) - PALETTE(285, 16, 0xE0) - SHOW_FRAME(10, -1) + PALETTE(285, 16, 0xE0) SHOW_FRAME(10, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0831[1] = { +const s32 *const anim_0831[1] = { anim_0831__v0_l0, }; const s32 anim_0832__v0_l0[] = { // 0x080FE490 - PALETTE(286, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(286, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(287, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(287, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(288, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(288, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(289, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(289, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(290, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(290, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(291, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(291, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(292, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(292, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0832__v1_l0[] = { // 0x080FE524 - PALETTE(293, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(293, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(294, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(294, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(295, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(295, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(296, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(296, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(295, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(295, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(294, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(294, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0832[2] = { +const s32 *const anim_0832[2] = { anim_0832__v0_l0, anim_0832__v1_l0, }; const s32 anim_0833__v0_l0[] = { // 0x080FE5AC - PALETTE(297, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(297, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(298, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(298, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(299, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(299, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(300, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(300, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(301, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(301, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(302, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(302, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(303, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(303, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0833__v1_l0[] = { // 0x080FE640 - PALETTE(304, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(304, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(305, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(305, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(306, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(306, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(307, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(307, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(306, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(306, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(305, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(305, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0833[2] = { +const s32 *const anim_0833[2] = { anim_0833__v0_l0, anim_0833__v1_l0, }; const s32 anim_0834__v0_l0[] = { // 0x080FE6C8 - PALETTE(308, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(308, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(309, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(309, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(310, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(310, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(311, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(311, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(312, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(312, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(313, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(313, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(314, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(314, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0834__v1_l0[] = { // 0x080FE75C - PALETTE(315, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(315, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(316, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(316, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(317, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(317, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(318, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(318, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(317, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(317, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(316, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(316, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0834[2] = { +const s32 *const anim_0834[2] = { anim_0834__v0_l0, anim_0834__v1_l0, }; const s32 anim_0835__v0_l0[] = { // 0x080FE7E4 - PALETTE(319, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(319, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(320, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(320, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(321, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(321, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(322, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(322, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(323, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(323, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(324, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(324, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(325, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(325, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0835__v1_l0[] = { // 0x080FE878 - PALETTE(326, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(326, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(327, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(327, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(328, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(328, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(329, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(329, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(328, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(328, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(327, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(327, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0835[2] = { +const s32 *const anim_0835[2] = { anim_0835__v0_l0, anim_0835__v1_l0, }; const s32 anim_0836__v0_l0[] = { // 0x080FE900 - PALETTE(330, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(330, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(331, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(331, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(332, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(332, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(333, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(333, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(334, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(334, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(335, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(335, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(336, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(336, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0836__v1_l0[] = { // 0x080FE994 - PALETTE(337, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(337, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(338, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(338, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(339, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(339, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(340, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(340, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(339, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(339, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(338, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(338, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0836[2] = { +const s32 *const anim_0836[2] = { anim_0836__v0_l0, anim_0836__v1_l0, }; const s32 anim_0837__v0_l0[] = { // 0x080FEA1C - PALETTE(341, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(341, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(342, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(342, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(343, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(343, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(344, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(344, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(345, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(345, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(346, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(346, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(347, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(347, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0837__v1_l0[] = { // 0x080FEAB0 - PALETTE(348, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(348, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(349, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(349, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(350, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(350, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(351, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(351, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(350, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(350, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(349, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(349, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0837[2] = { +const s32 *const anim_0837[2] = { anim_0837__v0_l0, anim_0837__v1_l0, }; const s32 anim_0838__v0_l0[] = { // 0x080FEB38 - PALETTE(352, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(352, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(353, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(353, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(354, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(354, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(355, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(355, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(356, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(356, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(357, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(357, 16, 0x10) SHOW_FRAME(3, -1) - PALETTE(358, 16, 0x10) - SHOW_FRAME(3, -1) + PALETTE(358, 16, 0x10) SHOW_FRAME(3, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; const s32 anim_0838__v1_l0[] = { // 0x080FEBCC - PALETTE(359, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(359, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(360, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(360, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(361, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(361, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(362, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(362, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(361, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(361, 16, 0x0) SHOW_FRAME(5, -1) - PALETTE(360, 16, 0x0) - SHOW_FRAME(5, -1) + PALETTE(360, 16, 0x0) SHOW_FRAME(5, -1) - JUMP_BACK(30) + JUMP_BACK(30) }; -const s32 * const anim_0838[2] = { +const s32 *const anim_0838[2] = { anim_0838__v0_l0, anim_0838__v1_l0, }; const s32 anim_0839__v0_l0[] = { // 0x080FEC54 - PALETTE(363, 16, 0xD0) - SHOW_FRAME(4, -1) + PALETTE(363, 16, 0xD0) SHOW_FRAME(4, -1) - PALETTE(364, 16, 0xD0) - SHOW_FRAME(4, -1) + PALETTE(364, 16, 0xD0) SHOW_FRAME(4, -1) - PALETTE(365, 16, 0xD0) - SHOW_FRAME(4, -1) + PALETTE(365, 16, 0xD0) SHOW_FRAME(4, -1) - PALETTE(366, 16, 0xD0) - SHOW_FRAME(4, -1) + PALETTE(366, 16, 0xD0) SHOW_FRAME(4, -1) - PALETTE(367, 16, 0xD0) - SHOW_FRAME(4, -1) + PALETTE(367, 16, 0xD0) SHOW_FRAME(4, -1) - JUMP_BACK(25) + JUMP_BACK(25) }; -const s32 * const anim_0839[1] = { +const s32 *const anim_0839[1] = { anim_0839__v0_l0, }; const s32 anim_0840__v0_l0[] = { // 0x080FECC4 - PALETTE(368, 16, 0xC0) - SHOW_FRAME(7, -1) + PALETTE(368, 16, 0xC0) SHOW_FRAME(7, -1) - PALETTE(369, 16, 0xC0) - SHOW_FRAME(7, -1) + PALETTE(369, 16, 0xC0) SHOW_FRAME(7, -1) - PALETTE(370, 16, 0xC0) - SHOW_FRAME(7, -1) + PALETTE(370, 16, 0xC0) SHOW_FRAME(7, -1) - PALETTE(371, 16, 0xC0) - SHOW_FRAME(7, -1) + PALETTE(371, 16, 0xC0) SHOW_FRAME(7, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0840[1] = { +const s32 *const anim_0840[1] = { anim_0840__v0_l0, }; const s32 anim_0841__v0_l0[] = { // 0x080FED20 - PALETTE(372, 16, 0xA0) - SHOW_FRAME(3, -1) + PALETTE(372, 16, 0xA0) SHOW_FRAME(3, -1) - PALETTE(373, 16, 0xA0) - SHOW_FRAME(3, -1) + PALETTE(373, 16, 0xA0) SHOW_FRAME(3, -1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0841[1] = { +const s32 *const anim_0841[1] = { anim_0841__v0_l0, }; const s32 anim_0842__v0_l0[] = { // 0x080FED54 - PALETTE(363, 16, 0xD0) - SHOW_FRAME(6, -1) + PALETTE(363, 16, 0xD0) SHOW_FRAME(6, -1) - PALETTE(374, 16, 0xD0) - SHOW_FRAME(6, -1) + PALETTE(374, 16, 0xD0) SHOW_FRAME(6, -1) - PALETTE(375, 16, 0xD0) - SHOW_FRAME(6, -1) + PALETTE(375, 16, 0xD0) SHOW_FRAME(6, -1) - PALETTE(376, 16, 0xD0) - SHOW_FRAME(6, -1) + PALETTE(376, 16, 0xD0) SHOW_FRAME(6, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0842[1] = { +const s32 *const anim_0842[1] = { anim_0842__v0_l0, }; const s32 anim_0843__v0_l0[] = { // 0x080FEDB0 - PALETTE(377, 16, 0xB0) - SHOW_FRAME(10, -1) + PALETTE(377, 16, 0xB0) SHOW_FRAME(10, -1) - PALETTE(378, 16, 0xB0) - SHOW_FRAME(10, -1) + PALETTE(378, 16, 0xB0) SHOW_FRAME(10, -1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0843[1] = { +const s32 *const anim_0843[1] = { anim_0843__v0_l0, }; const s32 anim_0844__v0_l0[] = { // 0x080FEDE4 - PALETTE(379, 16, 0xC0) - SHOW_FRAME(8, -1) + PALETTE(379, 16, 0xC0) SHOW_FRAME(8, -1) - PALETTE(380, 16, 0xC0) - SHOW_FRAME(8, -1) + PALETTE(380, 16, 0xC0) SHOW_FRAME(8, -1) - PALETTE(381, 16, 0xC0) - SHOW_FRAME(8, -1) + PALETTE(381, 16, 0xC0) SHOW_FRAME(8, -1) - PALETTE(382, 16, 0xC0) - SHOW_FRAME(8, -1) + PALETTE(382, 16, 0xC0) SHOW_FRAME(8, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0844[1] = { +const s32 *const anim_0844[1] = { anim_0844__v0_l0, }; const s32 anim_0845__v0_l0[] = { // 0x080FEE40 - PALETTE(383, 16, 0xA0) - SHOW_FRAME(10, -1) + PALETTE(383, 16, 0xA0) SHOW_FRAME(10, -1) - PALETTE(384, 16, 0xA0) - SHOW_FRAME(10, -1) + PALETTE(384, 16, 0xA0) SHOW_FRAME(10, -1) - PALETTE(385, 16, 0xA0) - SHOW_FRAME(10, -1) + PALETTE(385, 16, 0xA0) SHOW_FRAME(10, -1) - PALETTE(386, 16, 0xA0) - SHOW_FRAME(10, -1) + PALETTE(386, 16, 0xA0) SHOW_FRAME(10, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0845[1] = { +const s32 *const anim_0845[1] = { anim_0845__v0_l0, }; const s32 anim_0846__v0_l0[] = { // 0x080FEE9C - PALETTE(387, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(387, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(388, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(388, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(389, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(389, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(390, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(390, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(391, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(391, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(392, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(392, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(393, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(393, 16, 0x40) SHOW_FRAME(10, -1) - PALETTE(394, 16, 0x40) - SHOW_FRAME(10, -1) + PALETTE(394, 16, 0x40) SHOW_FRAME(10, -1) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0846[1] = { +const s32 *const anim_0846[1] = { anim_0846__v0_l0, }; const s32 anim_0847__v0_l0[] = { // 0x080FEF48 - PALETTE(395, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(395, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(396, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(396, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(397, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(397, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(398, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(398, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(399, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(399, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(400, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(400, 16, 0x60) SHOW_FRAME(20, -1) - PALETTE(401, 16, 0x60) - SHOW_FRAME(20, -1) + PALETTE(401, 16, 0x60) SHOW_FRAME(20, -1) - JUMP_BACK(35) + JUMP_BACK(35) }; -const s32 * const anim_0847[1] = { +const s32 *const anim_0847[1] = { anim_0847__v0_l0, }; const s32 anim_0848__v0_l0[] = { // 0x080FEFE0 - PALETTE(402, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(402, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(403, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(403, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(404, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(404, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(405, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(405, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(406, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(406, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(407, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(407, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(408, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(408, 16, 0x50) SHOW_FRAME(20, -1) - PALETTE(409, 16, 0x50) - SHOW_FRAME(20, -1) + PALETTE(409, 16, 0x50) SHOW_FRAME(20, -1) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0848[1] = { +const s32 *const anim_0848[1] = { anim_0848__v0_l0, }; const s32 anim_0849__v0_l0[] = { // 0x080FF08C - PALETTE(410, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(410, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(411, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(411, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(412, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(412, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(413, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(413, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(410, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(410, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(414, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(414, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(415, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(415, 16, 0xD0) SHOW_FRAME(10, -1) - PALETTE(416, 16, 0xD0) - SHOW_FRAME(10, -1) + PALETTE(416, 16, 0xD0) SHOW_FRAME(10, -1) - JUMP_BACK(40) + JUMP_BACK(40) }; -const s32 * const anim_0849[1] = { +const s32 *const anim_0849[1] = { anim_0849__v0_l0, }; const s32 anim_0850__v0_l0[] = { // 0x080FF138 - PALETTE(417, 16, 0xC0) - SHOW_FRAME(14, -1) + PALETTE(417, 16, 0xC0) SHOW_FRAME(14, -1) - PALETTE(418, 16, 0xC0) - SHOW_FRAME(14, -1) + PALETTE(418, 16, 0xC0) SHOW_FRAME(14, -1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0850[1] = { +const s32 *const anim_0850[1] = { anim_0850__v0_l0, }; const s32 anim_0851__v0_l0[] = { // 0x080FF16C - PALETTE(419, 16, 0xF0) - SHOW_FRAME(6, -1) + PALETTE(419, 16, 0xF0) SHOW_FRAME(6, -1) - PALETTE(420, 16, 0xF0) - SHOW_FRAME(6, -1) + PALETTE(420, 16, 0xF0) SHOW_FRAME(6, -1) - PALETTE(421, 16, 0xF0) - SHOW_FRAME(6, -1) + PALETTE(421, 16, 0xF0) SHOW_FRAME(6, -1) - PALETTE(422, 16, 0xF0) - SHOW_FRAME(6, -1) + PALETTE(422, 16, 0xF0) SHOW_FRAME(6, -1) - JUMP_BACK(20) + JUMP_BACK(20) }; -const s32 * const anim_0851[1] = { +const s32 *const anim_0851[1] = { anim_0851__v0_l0, }; const s32 anim_0852__v0_l0[] = { // 0x080FF1C8 - PALETTE(423, 256, 0x0) - SHOW_FRAME(1, -1) + PALETTE(423, 256, 0x0) SHOW_FRAME(1, -1) - END() + END() }; -const s32 * const anim_0852[1] = { +const s32 *const anim_0852[1] = { anim_0852__v0_l0, }; const s32 anim_0853__v0_l0[] = { // 0x080FF1E4 - PALETTE(439, 16, 0x50) - TILES(0x1850A, 63) - SHOW_FRAME(5, 0) + PALETTE(439, 16, 0x50) TILES(0x1850A, 63) SHOW_FRAME(5, 0) - TILES(0x18549, 63) - SHOW_FRAME(5, 1) + TILES(0x18549, 63) SHOW_FRAME(5, 1) - TILES(0x18588, 63) - SHOW_FRAME(5, 2) + TILES(0x18588, 63) SHOW_FRAME(5, 2) - TILES(0x185C7, 72) - SHOW_FRAME(5, 3) + TILES(0x185C7, 72) SHOW_FRAME(5, 3) - TILES(0x1860F, 63) - SHOW_FRAME(5, 4) + TILES(0x1860F, 63) SHOW_FRAME(5, 4) - TILES(0x1864E, 63) - SHOW_FRAME(5, 5) + TILES(0x1864E, 63) SHOW_FRAME(5, 5) - TILES(0x1868D, 54) - SHOW_FRAME(5, 6) + TILES(0x1868D, 54) SHOW_FRAME(5, 6) - TILES(0x1864E, 63) - SHOW_FRAME(5, 5) + TILES(0x1864E, 63) SHOW_FRAME(5, 5) - JUMP_BACK(43) + JUMP_BACK(43) }; -const s32 * const anim_0853[1] = { +const s32 *const anim_0853[1] = { anim_0853__v0_l0, }; const s32 anim_0854__v0_l0[] = { // 0x080FF29C - PALETTE(439, 16, 0x50) - TILES(0x186C3, 36) - SHOW_FRAME(5, 0) + PALETTE(439, 16, 0x50) TILES(0x186C3, 36) SHOW_FRAME(5, 0) - TILES(0x186E7, 54) - SHOW_FRAME(5, 1) + TILES(0x186E7, 54) SHOW_FRAME(5, 1) - TILES(0x1871D, 54) - SHOW_FRAME(5, 2) + TILES(0x1871D, 54) SHOW_FRAME(5, 2) - TILES(0x18753, 63) - SHOW_FRAME(5, 3) + TILES(0x18753, 63) SHOW_FRAME(5, 3) - TILES(0x18792, 54) - SHOW_FRAME(5, 4) + TILES(0x18792, 54) SHOW_FRAME(5, 4) - TILES(0x187C8, 54) - SHOW_FRAME(5, 5) + TILES(0x187C8, 54) SHOW_FRAME(5, 5) - TILES(0x187FE, 36) - SHOW_FRAME(5, 6) + TILES(0x187FE, 36) SHOW_FRAME(5, 6) - TILES(0x18822, 54) - SHOW_FRAME(5, 7) + TILES(0x18822, 54) SHOW_FRAME(5, 7) - TILES(0x18858, 63) - SHOW_FRAME(5, 8) + TILES(0x18858, 63) SHOW_FRAME(5, 8) - TILES(0x18897, 63) - SHOW_FRAME(5, 9) + TILES(0x18897, 63) SHOW_FRAME(5, 9) - TILES(0x188D6, 63) - SHOW_FRAME(5, 10) + TILES(0x188D6, 63) SHOW_FRAME(5, 10) - TILES(0x18915, 54) - SHOW_FRAME(5, 11) + TILES(0x18915, 54) SHOW_FRAME(5, 11) - TILES(0x186C3, 36) - SHOW_FRAME(5, 0) + TILES(0x186C3, 36) SHOW_FRAME(5, 0) - TILES(0x1894B, 54) - SHOW_FRAME(5, 12) + TILES(0x1894B, 54) SHOW_FRAME(5, 12) - TILES(0x18981, 54) - SHOW_FRAME(5, 13) + TILES(0x18981, 54) SHOW_FRAME(5, 13) - TILES(0x189B7, 63) - SHOW_FRAME(5, 14) + TILES(0x189B7, 63) SHOW_FRAME(5, 14) - TILES(0x18792, 54) - SHOW_FRAME(5, 4) + TILES(0x18792, 54) SHOW_FRAME(5, 4) - TILES(0x187C8, 54) - SHOW_FRAME(5, 5) + TILES(0x187C8, 54) SHOW_FRAME(5, 5) - TILES(0x187FE, 36) - SHOW_FRAME(5, 6) + TILES(0x187FE, 36) SHOW_FRAME(5, 6) - TILES(0x18822, 54) - SHOW_FRAME(5, 7) + TILES(0x18822, 54) SHOW_FRAME(5, 7) - TILES(0x18858, 63) - SHOW_FRAME(5, 8) + TILES(0x18858, 63) SHOW_FRAME(5, 8) - TILES(0x18897, 63) - SHOW_FRAME(5, 9) + TILES(0x18897, 63) SHOW_FRAME(5, 9) - TILES(0x188D6, 63) - SHOW_FRAME(5, 10) + TILES(0x188D6, 63) SHOW_FRAME(5, 10) - TILES(0x18915, 54) - SHOW_FRAME(5, 11) + TILES(0x18915, 54) SHOW_FRAME(5, 11) - JUMP_BACK(123) + JUMP_BACK(123) }; -const s32 * const anim_0854[1] = { +const s32 *const anim_0854[1] = { anim_0854__v0_l0, }; const s32 anim_0855__v0_l0[] = { // 0x080FF494 - PALETTE(439, 16, 0x50) - TILES(0x189F6, 99) - SHOW_FRAME(5, 0) + PALETTE(439, 16, 0x50) TILES(0x189F6, 99) SHOW_FRAME(5, 0) - TILES(0x18A59, 90) - SHOW_FRAME(5, 1) + TILES(0x18A59, 90) SHOW_FRAME(5, 1) - TILES(0x18AB3, 90) - SHOW_FRAME(5, 2) + TILES(0x18AB3, 90) SHOW_FRAME(5, 2) - TILES(0x18B0D, 99) - SHOW_FRAME(5, 3) + TILES(0x18B0D, 99) SHOW_FRAME(5, 3) - TILES(0x18B70, 90) - SHOW_FRAME(5, 4) + TILES(0x18B70, 90) SHOW_FRAME(5, 4) - TILES(0x18BCA, 99) - SHOW_FRAME(5, 5) + TILES(0x18BCA, 99) SHOW_FRAME(5, 5) - TILES(0x18C2D, 99) - SHOW_FRAME(5, 6) + TILES(0x18C2D, 99) SHOW_FRAME(5, 6) - TILES(0x18C90, 99) - SHOW_FRAME(5, 7) + TILES(0x18C90, 99) SHOW_FRAME(5, 7) - JUMP_BACK(43) + JUMP_BACK(43) }; const s32 anim_0855__v1_l0[] = { // 0x080FF548 - PALETTE(439, 16, 0x50) - TILES(0x18CF3, 72) - SHOW_FRAME(5, 8) + PALETTE(439, 16, 0x50) TILES(0x18CF3, 72) SHOW_FRAME(5, 8) - END() + END() }; -const s32 * const anim_0855[2] = { +const s32 *const anim_0855[2] = { anim_0855__v0_l0, anim_0855__v1_l0, }; const s32 anim_0856__v0_l0[] = { // 0x080FF574 - PALETTE(439, 16, 0x50) - TILES(0x18D3B, 32) - SHOW_FRAME(6, 0) + PALETTE(439, 16, 0x50) TILES(0x18D3B, 32) SHOW_FRAME(6, 0) - TILES(0x18D5B, 32) - SHOW_FRAME(4, 1) + TILES(0x18D5B, 32) SHOW_FRAME(4, 1) - TILES(0x18D7B, 48) - SHOW_FRAME(4, 2) + TILES(0x18D7B, 48) SHOW_FRAME(4, 2) - TILES(0x18DAB, 48) - SHOW_FRAME(4, 3) + TILES(0x18DAB, 48) SHOW_FRAME(4, 3) - TILES(0x18DDB, 48) - SHOW_FRAME(12, 4) + TILES(0x18DDB, 48) SHOW_FRAME(12, 4) - END() + END() }; -const s32 * const anim_0856[1] = { +const s32 *const anim_0856[1] = { anim_0856__v0_l0, }; const s32 anim_0857__v0_l0[] = { // 0x080FF5EC - PALETTE(68, 16, 0x70) - TILES(0x18E0B, 4) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x70) TILES(0x18E0B, 4) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0857[1] = { +const s32 *const anim_0857[1] = { anim_0857__v0_l0, }; const s32 anim_0858__v0_l0[] = { // 0x080FF614 - PALETTE(68, 16, 0x20) - TILES(0x18E0F, 28) - SHOW_FRAME(8, 0) + PALETTE(68, 16, 0x20) TILES(0x18E0F, 28) SHOW_FRAME(8, 0) - TILES(0x18E2B, 28) - SHOW_FRAME(8, 1) + TILES(0x18E2B, 28) SHOW_FRAME(8, 1) - TILES(0x18E47, 28) - SHOW_FRAME(8, 2) + TILES(0x18E47, 28) SHOW_FRAME(8, 2) - TILES(0x18E63, 28) - SHOW_FRAME(8, 3) + TILES(0x18E63, 28) SHOW_FRAME(8, 3) - JUMP_BACK(23) + JUMP_BACK(23) }; -const s32 * const anim_0858[1] = { +const s32 *const anim_0858[1] = { anim_0858__v0_l0, }; const s32 anim_0859__v0_l0[] = { // 0x080FF67C - PALETTE(440, 16, 0x20) - TILES(0x18E7F, 8) - SHOW_FRAME(1, 0) + PALETTE(440, 16, 0x20) TILES(0x18E7F, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0859[1] = { +const s32 *const anim_0859[1] = { anim_0859__v0_l0, }; const s32 anim_0860__v0_l0[] = { // 0x080FF6A4 - PALETTE(179, 16, 0x0) - TILES(0x18E87, 12) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x18E87, 12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0860[1] = { +const s32 *const anim_0860[1] = { anim_0860__v0_l0, }; const s32 anim_0861__v0_l0[] = { // 0x080FF6CC - PALETTE(441, 16, 0x0) - TILES(0x18E93, 18) - SHOW_FRAME(1, 0) + PALETTE(441, 16, 0x0) TILES(0x18E93, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0861__v1_l0[] = { // 0x080FF6F0 - PALETTE(441, 16, 0x0) - TILES(0x18EA5, 10) - SHOW_FRAME(1, 1) + PALETTE(441, 16, 0x0) TILES(0x18EA5, 10) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0861__v2_l0[] = { // 0x080FF714 - PALETTE(441, 16, 0x0) - TILES(0x18EAF, 14) - SHOW_FRAME(1, 2) + PALETTE(441, 16, 0x0) TILES(0x18EAF, 14) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0861__v3_l0[] = { // 0x080FF738 - PALETTE(441, 16, 0x0) - TILES(0x18EBD, 26) - SHOW_FRAME(1, 3) + PALETTE(441, 16, 0x0) TILES(0x18EBD, 26) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0861[4] = { +const s32 *const anim_0861[4] = { anim_0861__v0_l0, anim_0861__v1_l0, anim_0861__v2_l0, @@ -26603,38 +18925,30 @@ const s32 * const anim_0861[4] = { }; const s32 anim_0862__v0_l0[] = { // 0x080FF76C - PALETTE(442, 16, 0x0) - TILES(0x18ED7, 20) - SHOW_FRAME(1, 0) + PALETTE(442, 16, 0x0) TILES(0x18ED7, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0862__v1_l0[] = { // 0x080FF790 - PALETTE(442, 16, 0x0) - TILES(0x18EEB, 20) - SHOW_FRAME(1, 1) + PALETTE(442, 16, 0x0) TILES(0x18EEB, 20) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0862__v2_l0[] = { // 0x080FF7B4 - PALETTE(442, 16, 0x0) - TILES(0x18EFF, 16) - SHOW_FRAME(1, 2) + PALETTE(442, 16, 0x0) TILES(0x18EFF, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0862__v3_l0[] = { // 0x080FF7D8 - PALETTE(442, 16, 0x0) - TILES(0x18F0F, 32) - SHOW_FRAME(1, 3) + PALETTE(442, 16, 0x0) TILES(0x18F0F, 32) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0862[4] = { +const s32 *const anim_0862[4] = { anim_0862__v0_l0, anim_0862__v1_l0, anim_0862__v2_l0, @@ -26642,563 +18956,424 @@ const s32 * const anim_0862[4] = { }; const s32 anim_0863__v0_l0[] = { // 0x080FF80C - PALETTE(179, 16, 0x0) - TILES(0x18F2F, 26) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x18F2F, 26) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0863__v1_l0[] = { // 0x080FF830 - PALETTE(179, 16, 0x0) - TILES(0x18F49, 12) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x18F49, 12) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0863__v2_l0[] = { // 0x080FF854 - PALETTE(179, 16, 0x0) - TILES(0x18F55, 16) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x18F55, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0863__v3_l0[] = { // 0x080FF878 - PALETTE(179, 16, 0x0) - TILES(0x18F65, 24) - SHOW_FRAME(1, 3) + PALETTE(179, 16, 0x0) TILES(0x18F65, 24) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0863__v4_l0[] = { // 0x080FF89C - PALETTE(179, 16, 0x0) - TILES(0x18F7D, 20) - SHOW_FRAME(1, 4) + PALETTE(179, 16, 0x0) TILES(0x18F7D, 20) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0863__v5_l0[] = { // 0x080FF8C0 - PALETTE(179, 16, 0x0) - TILES(0x18F91, 30) - SHOW_FRAME(1, 5) + PALETTE(179, 16, 0x0) TILES(0x18F91, 30) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0863__v6_l0[] = { // 0x080FF8E4 - PALETTE(179, 16, 0x0) - TILES(0x18FAF, 36) - SHOW_FRAME(1, 6) + PALETTE(179, 16, 0x0) TILES(0x18FAF, 36) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0863__v7_l0[] = { // 0x080FF908 - PALETTE(179, 16, 0x0) - TILES(0x18FD3, 8) - SHOW_FRAME(1, 7) + PALETTE(179, 16, 0x0) TILES(0x18FD3, 8) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0863__v8_l0[] = { // 0x080FF92C - PALETTE(179, 16, 0x0) - TILES(0x18FDB, 6) - SHOW_FRAME(1, 8) + PALETTE(179, 16, 0x0) TILES(0x18FDB, 6) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0863__v9_l0[] = { // 0x080FF950 - PALETTE(179, 16, 0x0) - TILES(0x18FE1, 8) - SHOW_FRAME(1, 9) + PALETTE(179, 16, 0x0) TILES(0x18FE1, 8) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0863__v10_l0[] = { // 0x080FF974 - PALETTE(179, 16, 0x0) - TILES(0x18FE9, 16) - SHOW_FRAME(1, 10) + PALETTE(179, 16, 0x0) TILES(0x18FE9, 16) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0863__v11_l0[] = { // 0x080FF998 - PALETTE(179, 16, 0x0) - TILES(0x18FF9, 16) - SHOW_FRAME(1, 11) + PALETTE(179, 16, 0x0) TILES(0x18FF9, 16) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0863__v12_l0[] = { // 0x080FF9BC - PALETTE(179, 16, 0x0) - TILES(0x19009, 10) - SHOW_FRAME(1, 12) + PALETTE(179, 16, 0x0) TILES(0x19009, 10) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0863__v13_l0[] = { // 0x080FF9E0 - PALETTE(179, 16, 0x0) - TILES(0x18FF9, 16) - SHOW_FRAME(1, 11) + PALETTE(179, 16, 0x0) TILES(0x18FF9, 16) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0863__v14_l0[] = { // 0x080FFA04 - PALETTE(179, 16, 0x0) - TILES(0x19013, 16) - SHOW_FRAME(1, 13) + PALETTE(179, 16, 0x0) TILES(0x19013, 16) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0863__v15_l0[] = { // 0x080FFA28 - PALETTE(178, 16, 0x10) - SHOW_FRAME(1, -1) + PALETTE(178, 16, 0x10) SHOW_FRAME(1, -1) - END() + END() }; -const s32 * const anim_0863[16] = { - anim_0863__v0_l0, - anim_0863__v1_l0, - anim_0863__v2_l0, - anim_0863__v3_l0, - anim_0863__v4_l0, - anim_0863__v5_l0, - anim_0863__v6_l0, - anim_0863__v7_l0, - anim_0863__v8_l0, - anim_0863__v9_l0, - anim_0863__v10_l0, - anim_0863__v11_l0, - anim_0863__v12_l0, - anim_0863__v13_l0, - anim_0863__v14_l0, - anim_0863__v15_l0, +const s32 *const anim_0863[16] = { + anim_0863__v0_l0, anim_0863__v1_l0, anim_0863__v2_l0, anim_0863__v3_l0, anim_0863__v4_l0, anim_0863__v5_l0, + anim_0863__v6_l0, anim_0863__v7_l0, anim_0863__v8_l0, anim_0863__v9_l0, anim_0863__v10_l0, anim_0863__v11_l0, + anim_0863__v12_l0, anim_0863__v13_l0, anim_0863__v14_l0, anim_0863__v15_l0, }; const s32 anim_0864__v0_l0[] = { // 0x080FFA80 - PALETTE(443, 16, 0x60) - TILES(0x19023, 22) - SHOW_FRAME(1, 0) + PALETTE(443, 16, 0x60) TILES(0x19023, 22) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0864__v1_l0[] = { // 0x080FFAA4 - PALETTE(443, 16, 0x0) - TILES(0x19039, 51) - SHOW_FRAME(1, 1) + PALETTE(443, 16, 0x0) TILES(0x19039, 51) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0864__v2_l0[] = { // 0x080FFAC8 - PALETTE(443, 16, 0xF0) - TILES(0x1906C, 26) - SHOW_FRAME(1, 2) + PALETTE(443, 16, 0xF0) TILES(0x1906C, 26) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0864[3] = { +const s32 *const anim_0864[3] = { anim_0864__v0_l0, anim_0864__v1_l0, anim_0864__v2_l0, }; const s32 anim_0865__v0_l0[] = { // 0x080FFAF8 - PALETTE(444, 16, 0x0) - TILES(0x19086, 16) - SHOW_FRAME(1, 0) + PALETTE(444, 16, 0x0) TILES(0x19086, 16) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0865__v1_l0[] = { // 0x080FFB1C - PALETTE(444, 16, 0x0) - SHOW_FRAME(1, -1) + PALETTE(444, 16, 0x0) SHOW_FRAME(1, -1) - END() + END() }; const s32 anim_0865__v2_l0[] = { // 0x080FFB34 - PALETTE(444, 16, 0x0) - TILES(0x19096, 24) - SHOW_FRAME(1, 1) + PALETTE(444, 16, 0x0) TILES(0x19096, 24) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0865[3] = { +const s32 *const anim_0865[3] = { anim_0865__v0_l0, anim_0865__v1_l0, anim_0865__v2_l0, }; const s32 anim_0866__v0_l0[] = { // 0x080FFB64 - PALETTE(179, 16, 0x0) - TILES(0x190AE, 22) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x190AE, 22) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0866__v1_l0[] = { // 0x080FFB88 - PALETTE(179, 16, 0x0) - TILES(0x190C4, 12) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x190C4, 12) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0866__v2_l0[] = { // 0x080FFBAC - PALETTE(179, 16, 0x0) - TILES(0x190D0, 14) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x190D0, 14) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0866__v3_l0[] = { // 0x080FFBD0 - PALETTE(179, 16, 0x0) - TILES(0x190DE, 18) - SHOW_FRAME(1, 3) + PALETTE(179, 16, 0x0) TILES(0x190DE, 18) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0866__v4_l0[] = { // 0x080FFBF4 - PALETTE(179, 16, 0x0) - TILES(0x190F0, 20) - SHOW_FRAME(1, 4) + PALETTE(179, 16, 0x0) TILES(0x190F0, 20) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0866__v5_l0[] = { // 0x080FFC18 - PALETTE(179, 16, 0x0) - TILES(0x19104, 16) - SHOW_FRAME(1, 5) + PALETTE(179, 16, 0x0) TILES(0x19104, 16) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0866__v6_l0[] = { // 0x080FFC3C - PALETTE(179, 16, 0x0) - TILES(0x19114, 16) - SHOW_FRAME(1, 6) + PALETTE(179, 16, 0x0) TILES(0x19114, 16) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0866__v7_l0[] = { // 0x080FFC60 - PALETTE(179, 16, 0x0) - TILES(0x19124, 8) - SHOW_FRAME(1, 7) + PALETTE(179, 16, 0x0) TILES(0x19124, 8) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0866__v8_l0[] = { // 0x080FFC84 - PALETTE(179, 16, 0x0) - TILES(0x1912C, 6) - SHOW_FRAME(1, 8) + PALETTE(179, 16, 0x0) TILES(0x1912C, 6) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0866__v9_l0[] = { // 0x080FFCA8 - PALETTE(179, 16, 0x0) - TILES(0x19132, 6) - SHOW_FRAME(1, 9) + PALETTE(179, 16, 0x0) TILES(0x19132, 6) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0866__v10_l0[] = { // 0x080FFCCC - PALETTE(179, 16, 0x0) - TILES(0x19138, 12) - SHOW_FRAME(1, 10) + PALETTE(179, 16, 0x0) TILES(0x19138, 12) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0866__v11_l0[] = { // 0x080FFCF0 - PALETTE(179, 16, 0x0) - TILES(0x19144, 8) - SHOW_FRAME(1, 11) + PALETTE(179, 16, 0x0) TILES(0x19144, 8) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0866__v12_l0[] = { // 0x080FFD14 - PALETTE(179, 16, 0x0) - TILES(0x1914C, 12) - SHOW_FRAME(1, 12) + PALETTE(179, 16, 0x0) TILES(0x1914C, 12) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0866__v13_l0[] = { // 0x080FFD38 - PALETTE(179, 16, 0x0) - TILES(0x19158, 12) - SHOW_FRAME(1, 13) + PALETTE(179, 16, 0x0) TILES(0x19158, 12) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0866__v14_l0[] = { // 0x080FFD5C - PALETTE(179, 16, 0x0) - TILES(0x19164, 12) - SHOW_FRAME(1, 14) + PALETTE(179, 16, 0x0) TILES(0x19164, 12) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0866__v15_l0[] = { // 0x080FFD80 - PALETTE(178, 16, 0x10) - SHOW_FRAME(1, -1) + PALETTE(178, 16, 0x10) SHOW_FRAME(1, -1) - END() + END() }; -const s32 * const anim_0866[16] = { - anim_0866__v0_l0, - anim_0866__v1_l0, - anim_0866__v2_l0, - anim_0866__v3_l0, - anim_0866__v4_l0, - anim_0866__v5_l0, - anim_0866__v6_l0, - anim_0866__v7_l0, - anim_0866__v8_l0, - anim_0866__v9_l0, - anim_0866__v10_l0, - anim_0866__v11_l0, - anim_0866__v12_l0, - anim_0866__v13_l0, - anim_0866__v14_l0, - anim_0866__v15_l0, +const s32 *const anim_0866[16] = { + anim_0866__v0_l0, anim_0866__v1_l0, anim_0866__v2_l0, anim_0866__v3_l0, anim_0866__v4_l0, anim_0866__v5_l0, + anim_0866__v6_l0, anim_0866__v7_l0, anim_0866__v8_l0, anim_0866__v9_l0, anim_0866__v10_l0, anim_0866__v11_l0, + anim_0866__v12_l0, anim_0866__v13_l0, anim_0866__v14_l0, anim_0866__v15_l0, }; const s32 anim_0867__v0_l0[] = { // 0x080FFDD8 - PALETTE(445, 16, 0x30) - TILES(0x19170, 12) - SHOW_FRAME(1, 0) + PALETTE(445, 16, 0x30) TILES(0x19170, 12) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0867[1] = { +const s32 *const anim_0867[1] = { anim_0867__v0_l0, }; const s32 anim_0868__v0_l0[] = { // 0x080FFE00 - PALETTE(179, 16, 0x20) - TILES(0x1917C, 18) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x20) TILES(0x1917C, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0868__v1_l0[] = { // 0x080FFE24 - PALETTE(179, 16, 0x20) - TILES(0x1918E, 8) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x20) TILES(0x1918E, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0868__v2_l0[] = { // 0x080FFE48 - PALETTE(179, 16, 0x20) - TILES(0x19196, 4) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x20) TILES(0x19196, 4) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0868[3] = { +const s32 *const anim_0868[3] = { anim_0868__v0_l0, anim_0868__v1_l0, anim_0868__v2_l0, }; const s32 anim_0869__v0_l0[] = { // 0x080FFE78 - PALETTE(446, 16, 0x0) - TILES(0x1919A, 18) - SHOW_FRAME(1, 0) + PALETTE(446, 16, 0x0) TILES(0x1919A, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0869__v1_l0[] = { // 0x080FFE9C - PALETTE(446, 16, 0x0) - TILES(0x191AC, 8) - SHOW_FRAME(1, 1) + PALETTE(446, 16, 0x0) TILES(0x191AC, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0869__v2_l0[] = { // 0x080FFEC0 - PALETTE(446, 16, 0x0) - TILES(0x191B4, 14) - SHOW_FRAME(1, 2) + PALETTE(446, 16, 0x0) TILES(0x191B4, 14) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0869[3] = { +const s32 *const anim_0869[3] = { anim_0869__v0_l0, anim_0869__v1_l0, anim_0869__v2_l0, }; const s32 anim_0870__v0_l0[] = { // 0x080FFEF0 - PALETTE(68, 16, 0x20) - TILES(0x191C2, 8) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x20) TILES(0x191C2, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0870__v1_l0[] = { // 0x080FFF14 - PALETTE(68, 16, 0x20) - TILES(0x191CA, 8) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x20) TILES(0x191CA, 8) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0870__v2_l0[] = { // 0x080FFF38 - PALETTE(68, 16, 0x80) - TILES(0x191D2, 1) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x80) TILES(0x191D2, 1) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0870[3] = { +const s32 *const anim_0870[3] = { anim_0870__v0_l0, anim_0870__v1_l0, anim_0870__v2_l0, }; const s32 anim_0871__v0_l0[] = { // 0x080FFF68 - PALETTE(68, 16, 0x20) - TILES(0x191D3, 28) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x20) TILES(0x191D3, 28) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0871[1] = { +const s32 *const anim_0871[1] = { anim_0871__v0_l0, }; const s32 anim_0872__v0_l0[] = { // 0x080FFF90 - PALETTE(447, 16, 0x0) - TILES(0x191EF, 8) - SHOW_FRAME(1, 0) + PALETTE(447, 16, 0x0) TILES(0x191EF, 8) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0872[1] = { +const s32 *const anim_0872[1] = { anim_0872__v0_l0, }; const s32 anim_0873__v0_l0[] = { // 0x080FFFB8 - PALETTE(68, 16, 0x20) - TILES(0x191F7, 18) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x20) TILES(0x191F7, 18) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0873[1] = { +const s32 *const anim_0873[1] = { anim_0873__v0_l0, }; const s32 anim_0874__v0_l0[] = { // 0x080FFFE0 - PALETTE(448, 16, 0x70) - TILES(0x19209, 96) - SHOW_FRAME(1, 0) + PALETTE(448, 16, 0x70) TILES(0x19209, 96) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0874[1] = { +const s32 *const anim_0874[1] = { anim_0874__v0_l0, }; const s32 anim_0875__v0_l0[] = { // 0x08100008 - PALETTE(449, 16, 0x60) - TILES(0x19269, 20) - SHOW_FRAME(1, 0) + PALETTE(449, 16, 0x60) TILES(0x19269, 20) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0875[1] = { +const s32 *const anim_0875[1] = { anim_0875__v0_l0, }; const s32 anim_0876__v0_l0[] = { // 0x08100030 - PALETTE(450, 16, 0x70) - TILES(0x1927D, 64) - SHOW_FRAME(1, 0) + PALETTE(450, 16, 0x70) TILES(0x1927D, 64) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0876[1] = { +const s32 *const anim_0876[1] = { anim_0876__v0_l0, }; const s32 anim_0877__v0_l0[] = { // 0x08100058 - PALETTE(451, 16, 0x40) - TILES(0x192BD, 144) - SHOW_FRAME(1, 0) + PALETTE(451, 16, 0x40) TILES(0x192BD, 144) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0877__v1_l0[] = { // 0x0810007C - PALETTE(451, 16, 0x40) - TILES(0x1934D, 144) - SHOW_FRAME(1, 1) + PALETTE(451, 16, 0x40) TILES(0x1934D, 144) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0877__v2_l0[] = { // 0x081000A0 - PALETTE(451, 16, 0x40) - TILES(0x193DD, 144) - SHOW_FRAME(1, 2) + PALETTE(451, 16, 0x40) TILES(0x193DD, 144) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0877__v3_l0[] = { // 0x081000C4 - PALETTE(451, 16, 0x40) - TILES(0x1946D, 144) - SHOW_FRAME(1, 3) + PALETTE(451, 16, 0x40) TILES(0x1946D, 144) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0877[4] = { +const s32 *const anim_0877[4] = { anim_0877__v0_l0, anim_0877__v1_l0, anim_0877__v2_l0, @@ -27206,950 +19381,678 @@ const s32 * const anim_0877[4] = { }; const s32 anim_0878__v0_l0[] = { // 0x081000F8 - PALETTE(179, 16, 0x0) - TILES(0x194FD, 18) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x194FD, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0878__v1_l0[] = { // 0x0810011C - PALETTE(179, 16, 0x0) - TILES(0x1950F, 16) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x1950F, 16) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0878__v2_l0[] = { // 0x08100140 - PALETTE(179, 16, 0x0) - TILES(0x1951F, 16) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x1951F, 16) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0878[3] = { +const s32 *const anim_0878[3] = { anim_0878__v0_l0, anim_0878__v1_l0, anim_0878__v2_l0, }; const s32 anim_0879__v0_l0[] = { // 0x08100170 - PALETTE(179, 16, 0x0) - TILES(0x1952F, 115) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x1952F, 115) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0879__v1_l0[] = { // 0x08100194 - PALETTE(179, 16, 0x0) - TILES(0x195A2, 130) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x195A2, 130) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0879__v2_l0[] = { // 0x081001B8 - PALETTE(179, 16, 0x0) - TILES(0x19624, 120) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x19624, 120) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0879[3] = { +const s32 *const anim_0879[3] = { anim_0879__v0_l0, anim_0879__v1_l0, anim_0879__v2_l0, }; const s32 anim_0880__v0_l0[] = { // 0x081001E8 - PALETTE(179, 16, 0x0) - TILES(0x1969C, 40) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x1969C, 40) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0880__v1_l0[] = { // 0x0810020C - PALETTE(179, 16, 0x0) - TILES(0x196C4, 34) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x196C4, 34) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0880__v2_l0[] = { // 0x08100230 - PALETTE(179, 16, 0x0) - TILES(0x196E6, 42) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x196E6, 42) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0880__v3_l0[] = { // 0x08100254 - PALETTE(179, 16, 0x0) - TILES(0x19710, 36) - SHOW_FRAME(1, 3) + PALETTE(179, 16, 0x0) TILES(0x19710, 36) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0880__v4_l0[] = { // 0x08100278 - PALETTE(179, 16, 0x0) - TILES(0x19734, 36) - SHOW_FRAME(1, 4) + PALETTE(179, 16, 0x0) TILES(0x19734, 36) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0880__v5_l0[] = { // 0x0810029C - PALETTE(179, 16, 0x0) - TILES(0x19758, 34) - SHOW_FRAME(1, 5) + PALETTE(179, 16, 0x0) TILES(0x19758, 34) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0880__v6_l0[] = { // 0x081002C0 - PALETTE(179, 16, 0x0) - TILES(0x1977A, 36) - SHOW_FRAME(1, 6) + PALETTE(179, 16, 0x0) TILES(0x1977A, 36) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0880__v7_l0[] = { // 0x081002E4 - PALETTE(179, 16, 0x0) - TILES(0x1979E, 16) - SHOW_FRAME(1, 7) + PALETTE(179, 16, 0x0) TILES(0x1979E, 16) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0880__v8_l0[] = { // 0x08100308 - PALETTE(179, 16, 0x0) - TILES(0x197AE, 30) - SHOW_FRAME(1, 8) + PALETTE(179, 16, 0x0) TILES(0x197AE, 30) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0880__v9_l0[] = { // 0x0810032C - PALETTE(179, 16, 0xF0) - TILES(0x197CC, 20) - SHOW_FRAME(1, 9) + PALETTE(179, 16, 0xF0) TILES(0x197CC, 20) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0880__v10_l0[] = { // 0x08100350 - PALETTE(179, 16, 0xF0) - TILES(0x197E0, 38) - SHOW_FRAME(1, 10) + PALETTE(179, 16, 0xF0) TILES(0x197E0, 38) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0880__v11_l0[] = { // 0x08100374 - PALETTE(179, 16, 0xF0) - TILES(0x19806, 24) - SHOW_FRAME(1, 11) + PALETTE(179, 16, 0xF0) TILES(0x19806, 24) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0880__v12_l0[] = { // 0x08100398 - PALETTE(179, 16, 0xF0) - TILES(0x1981E, 8) - SHOW_FRAME(1, 12) + PALETTE(179, 16, 0xF0) TILES(0x1981E, 8) SHOW_FRAME(1, 12) - END() + END() }; -const s32 * const anim_0880[13] = { - anim_0880__v0_l0, - anim_0880__v1_l0, - anim_0880__v2_l0, - anim_0880__v3_l0, - anim_0880__v4_l0, - anim_0880__v5_l0, - anim_0880__v6_l0, - anim_0880__v7_l0, - anim_0880__v8_l0, - anim_0880__v9_l0, - anim_0880__v10_l0, - anim_0880__v11_l0, - anim_0880__v12_l0, +const s32 *const anim_0880[13] = { + anim_0880__v0_l0, anim_0880__v1_l0, anim_0880__v2_l0, anim_0880__v3_l0, anim_0880__v4_l0, anim_0880__v5_l0, anim_0880__v6_l0, + anim_0880__v7_l0, anim_0880__v8_l0, anim_0880__v9_l0, anim_0880__v10_l0, anim_0880__v11_l0, anim_0880__v12_l0, }; const s32 anim_0881__v0_l0[] = { // 0x081003F0 - PALETTE(135, 16, 0x20) - TILES(0x19826, 24) - SHOW_FRAME(1, 0) + PALETTE(135, 16, 0x20) TILES(0x19826, 24) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0881__v1_l0[] = { // 0x08100414 - PALETTE(135, 16, 0x20) - TILES(0x1983E, 21) - SHOW_FRAME(1, 1) + PALETTE(135, 16, 0x20) TILES(0x1983E, 21) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0881__v2_l0[] = { // 0x08100438 - PALETTE(135, 16, 0x20) - TILES(0x19853, 16) - SHOW_FRAME(1, 2) + PALETTE(135, 16, 0x20) TILES(0x19853, 16) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0881__v3_l0[] = { // 0x0810045C - PALETTE(135, 16, 0x20) - TILES(0x19863, 16) - SHOW_FRAME(1, 3) + PALETTE(135, 16, 0x20) TILES(0x19863, 16) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0881__v4_l0[] = { // 0x08100480 - PALETTE(135, 16, 0x20) - TILES(0x19873, 16) - SHOW_FRAME(1, 4) + PALETTE(135, 16, 0x20) TILES(0x19873, 16) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0881__v5_l0[] = { // 0x081004A4 - PALETTE(135, 16, 0x20) - TILES(0x19883, 16) - SHOW_FRAME(1, 5) + PALETTE(135, 16, 0x20) TILES(0x19883, 16) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0881__v6_l0[] = { // 0x081004C8 - PALETTE(135, 16, 0x20) - TILES(0x19893, 16) - SHOW_FRAME(1, 6) + PALETTE(135, 16, 0x20) TILES(0x19893, 16) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0881__v7_l0[] = { // 0x081004EC - PALETTE(135, 16, 0x20) - TILES(0x198A3, 16) - SHOW_FRAME(1, 7) + PALETTE(135, 16, 0x20) TILES(0x198A3, 16) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0881__v8_l0[] = { // 0x08100510 - PALETTE(452, 16, 0x40) - TILES(0x198B3, 20) - SHOW_FRAME(1, 8) + PALETTE(452, 16, 0x40) TILES(0x198B3, 20) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0881__v9_l0[] = { // 0x08100534 - PALETTE(452, 16, 0x40) - TILES(0x198C7, 20) - SHOW_FRAME(1, 9) + PALETTE(452, 16, 0x40) TILES(0x198C7, 20) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0881__v10_l0[] = { // 0x08100558 - PALETTE(452, 16, 0x40) - TILES(0x198DB, 18) - SHOW_FRAME(1, 10) + PALETTE(452, 16, 0x40) TILES(0x198DB, 18) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0881__v11_l0[] = { // 0x0810057C - PALETTE(452, 16, 0x40) - TILES(0x198ED, 20) - SHOW_FRAME(1, 11) + PALETTE(452, 16, 0x40) TILES(0x198ED, 20) SHOW_FRAME(1, 11) - END() + END() }; -const s32 * const anim_0881[12] = { - anim_0881__v0_l0, - anim_0881__v1_l0, - anim_0881__v2_l0, - anim_0881__v3_l0, - anim_0881__v4_l0, - anim_0881__v5_l0, - anim_0881__v6_l0, - anim_0881__v7_l0, - anim_0881__v8_l0, - anim_0881__v9_l0, - anim_0881__v10_l0, - anim_0881__v11_l0, +const s32 *const anim_0881[12] = { + anim_0881__v0_l0, anim_0881__v1_l0, anim_0881__v2_l0, anim_0881__v3_l0, anim_0881__v4_l0, anim_0881__v5_l0, + anim_0881__v6_l0, anim_0881__v7_l0, anim_0881__v8_l0, anim_0881__v9_l0, anim_0881__v10_l0, anim_0881__v11_l0, }; const s32 anim_0882__v0_l0[] = { // 0x081005D0 - PALETTE(453, 16, 0x0) - TILES(0x19901, 10) - SHOW_FRAME(1, 0) + PALETTE(453, 16, 0x0) TILES(0x19901, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0882__v1_l0[] = { // 0x081005F4 - PALETTE(453, 16, 0x0) - TILES(0x1990B, 12) - SHOW_FRAME(1, 1) + PALETTE(453, 16, 0x0) TILES(0x1990B, 12) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0882[2] = { +const s32 *const anim_0882[2] = { anim_0882__v0_l0, anim_0882__v1_l0, }; const s32 anim_0883__v0_l0[] = { // 0x08100620 - PALETTE(454, 16, 0x0) - TILES(0x19917, 30) - SHOW_FRAME(1, 0) + PALETTE(454, 16, 0x0) TILES(0x19917, 30) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0883__v1_l0[] = { // 0x08100644 - PALETTE(454, 16, 0x0) - TILES(0x19935, 32) - SHOW_FRAME(1, 1) + PALETTE(454, 16, 0x0) TILES(0x19935, 32) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0883__v2_l0[] = { // 0x08100668 - PALETTE(454, 16, 0x0) - TILES(0x19955, 30) - SHOW_FRAME(1, 2) + PALETTE(454, 16, 0x0) TILES(0x19955, 30) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0883__v3_l0[] = { // 0x0810068C - PALETTE(454, 16, 0x0) - TILES(0x19973, 30) - SHOW_FRAME(1, 3) + PALETTE(454, 16, 0x0) TILES(0x19973, 30) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0883__v4_l0[] = { // 0x081006B0 - PALETTE(454, 16, 0x0) - TILES(0x19991, 34) - SHOW_FRAME(1, 4) + PALETTE(454, 16, 0x0) TILES(0x19991, 34) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0883__v5_l0[] = { // 0x081006D4 - PALETTE(454, 16, 0x0) - TILES(0x199B3, 26) - SHOW_FRAME(1, 5) + PALETTE(454, 16, 0x0) TILES(0x199B3, 26) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0883__v6_l0[] = { // 0x081006F8 - PALETTE(454, 16, 0x0) - TILES(0x199CD, 34) - SHOW_FRAME(1, 6) + PALETTE(454, 16, 0x0) TILES(0x199CD, 34) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0883__v7_l0[] = { // 0x0810071C - PALETTE(454, 16, 0x0) - TILES(0x199EF, 12) - SHOW_FRAME(1, 7) + PALETTE(454, 16, 0x0) TILES(0x199EF, 12) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0883__v8_l0[] = { // 0x08100740 - PALETTE(454, 16, 0x0) - TILES(0x199FB, 22) - SHOW_FRAME(1, 8) + PALETTE(454, 16, 0x0) TILES(0x199FB, 22) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0883__v9_l0[] = { // 0x08100764 - PALETTE(454, 16, 0xF0) - TILES(0x19A11, 18) - SHOW_FRAME(1, 9) + PALETTE(454, 16, 0xF0) TILES(0x19A11, 18) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0883__v10_l0[] = { // 0x08100788 - PALETTE(454, 16, 0xF0) - TILES(0x19A23, 18) - SHOW_FRAME(1, 10) + PALETTE(454, 16, 0xF0) TILES(0x19A23, 18) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0883__v11_l0[] = { // 0x081007AC - PALETTE(454, 16, 0xF0) - TILES(0x19A35, 18) - SHOW_FRAME(1, 11) + PALETTE(454, 16, 0xF0) TILES(0x19A35, 18) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0883__v12_l0[] = { // 0x081007D0 - PALETTE(454, 16, 0xF0) - TILES(0x19A47, 10) - SHOW_FRAME(1, 12) + PALETTE(454, 16, 0xF0) TILES(0x19A47, 10) SHOW_FRAME(1, 12) - END() + END() }; -const s32 * const anim_0883[13] = { - anim_0883__v0_l0, - anim_0883__v1_l0, - anim_0883__v2_l0, - anim_0883__v3_l0, - anim_0883__v4_l0, - anim_0883__v5_l0, - anim_0883__v6_l0, - anim_0883__v7_l0, - anim_0883__v8_l0, - anim_0883__v9_l0, - anim_0883__v10_l0, - anim_0883__v11_l0, - anim_0883__v12_l0, +const s32 *const anim_0883[13] = { + anim_0883__v0_l0, anim_0883__v1_l0, anim_0883__v2_l0, anim_0883__v3_l0, anim_0883__v4_l0, anim_0883__v5_l0, anim_0883__v6_l0, + anim_0883__v7_l0, anim_0883__v8_l0, anim_0883__v9_l0, anim_0883__v10_l0, anim_0883__v11_l0, anim_0883__v12_l0, }; const s32 anim_0884__v0_l0[] = { // 0x08100828 - PALETTE(179, 16, 0x0) - TILES(0x19A51, 10) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x19A51, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0884__v1_l0[] = { // 0x0810084C - PALETTE(179, 16, 0x0) - TILES(0x19A5B, 10) - SHOW_FRAME(1, 1) + PALETTE(179, 16, 0x0) TILES(0x19A5B, 10) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0884__v2_l0[] = { // 0x08100870 - PALETTE(179, 16, 0x0) - TILES(0x19A65, 12) - SHOW_FRAME(1, 2) + PALETTE(179, 16, 0x0) TILES(0x19A65, 12) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0884__v3_l0[] = { // 0x08100894 - PALETTE(68, 16, 0x60) - TILES(0x19A71, 8) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x19A71, 8) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0884__v4_l0[] = { // 0x081008B8 - PALETTE(68, 16, 0x60) - TILES(0x19A79, 24) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x19A79, 24) SHOW_FRAME(1, 4) - END() + END() }; -const s32 * const anim_0884[5] = { - anim_0884__v0_l0, - anim_0884__v1_l0, - anim_0884__v2_l0, - anim_0884__v3_l0, - anim_0884__v4_l0, +const s32 *const anim_0884[5] = { + anim_0884__v0_l0, anim_0884__v1_l0, anim_0884__v2_l0, anim_0884__v3_l0, anim_0884__v4_l0, }; const s32 anim_0885__v0_l0[] = { // 0x081008F0 - PALETTE(455, 16, 0x0) - TILES(0x19A91, 18) - SHOW_FRAME(1, 0) + PALETTE(455, 16, 0x0) TILES(0x19A91, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0885__v1_l0[] = { // 0x08100914 - PALETTE(455, 16, 0x0) - TILES(0x19AA3, 18) - SHOW_FRAME(1, 1) + PALETTE(455, 16, 0x0) TILES(0x19AA3, 18) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0885__v2_l0[] = { // 0x08100938 - PALETTE(455, 16, 0x0) - TILES(0x19AB5, 22) - SHOW_FRAME(1, 2) + PALETTE(455, 16, 0x0) TILES(0x19AB5, 22) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0885__v3_l0[] = { // 0x0810095C - PALETTE(455, 16, 0x0) - TILES(0x19ACB, 18) - SHOW_FRAME(1, 3) + PALETTE(455, 16, 0x0) TILES(0x19ACB, 18) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0885__v4_l0[] = { // 0x08100980 - PALETTE(455, 16, 0x0) - TILES(0x19ADD, 26) - SHOW_FRAME(1, 4) + PALETTE(455, 16, 0x0) TILES(0x19ADD, 26) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0885__v5_l0[] = { // 0x081009A4 - PALETTE(455, 16, 0x0) - TILES(0x19AF7, 10) - SHOW_FRAME(1, 5) + PALETTE(455, 16, 0x0) TILES(0x19AF7, 10) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0885__v6_l0[] = { // 0x081009C8 - PALETTE(455, 16, 0x0) - TILES(0x19B01, 14) - SHOW_FRAME(1, 6) + PALETTE(455, 16, 0x0) TILES(0x19B01, 14) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0885__v7_l0[] = { // 0x081009EC - PALETTE(455, 16, 0x0) - TILES(0x19B0F, 10) - SHOW_FRAME(1, 7) + PALETTE(455, 16, 0x0) TILES(0x19B0F, 10) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0885__v8_l0[] = { // 0x08100A10 - PALETTE(455, 16, 0x0) - TILES(0x19B19, 10) - SHOW_FRAME(1, 8) + PALETTE(455, 16, 0x0) TILES(0x19B19, 10) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0885__v9_l0[] = { // 0x08100A34 - PALETTE(455, 16, 0x0) - TILES(0x19B23, 10) - SHOW_FRAME(1, 9) + PALETTE(455, 16, 0x0) TILES(0x19B23, 10) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0885__v10_l0[] = { // 0x08100A58 - PALETTE(455, 16, 0x0) - TILES(0x19B2D, 10) - SHOW_FRAME(1, 10) + PALETTE(455, 16, 0x0) TILES(0x19B2D, 10) SHOW_FRAME(1, 10) - END() + END() }; -const s32 * const anim_0885[11] = { - anim_0885__v0_l0, - anim_0885__v1_l0, - anim_0885__v2_l0, - anim_0885__v3_l0, - anim_0885__v4_l0, - anim_0885__v5_l0, - anim_0885__v6_l0, - anim_0885__v7_l0, - anim_0885__v8_l0, - anim_0885__v9_l0, - anim_0885__v10_l0, +const s32 *const anim_0885[11] = { + anim_0885__v0_l0, anim_0885__v1_l0, anim_0885__v2_l0, anim_0885__v3_l0, anim_0885__v4_l0, anim_0885__v5_l0, + anim_0885__v6_l0, anim_0885__v7_l0, anim_0885__v8_l0, anim_0885__v9_l0, anim_0885__v10_l0, }; const s32 anim_0886__v0_l0[] = { // 0x08100AA8 - PALETTE(456, 16, 0x90) - TILES(0x19B37, 35) - SHOW_FRAME(1, 0) + PALETTE(456, 16, 0x90) TILES(0x19B37, 35) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0886[1] = { +const s32 *const anim_0886[1] = { anim_0886__v0_l0, }; const s32 anim_0887__v0_l0[] = { // 0x08100AD0 - PALETTE(457, 16, 0x90) - TILES(0x19B5A, 40) - SHOW_FRAME(15, 0) + PALETTE(457, 16, 0x90) TILES(0x19B5A, 40) SHOW_FRAME(15, 0) - TILES(0x19B82, 40) - SHOW_FRAME(15, 1) + TILES(0x19B82, 40) SHOW_FRAME(15, 1) - TILES(0x19BAA, 35) - SHOW_FRAME(15, 2) + TILES(0x19BAA, 35) SHOW_FRAME(15, 2) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v1_l0[] = { // 0x08100B20 - PALETTE(457, 16, 0x90) - TILES(0x19BCD, 35) - SHOW_FRAME(15, 3) + PALETTE(457, 16, 0x90) TILES(0x19BCD, 35) SHOW_FRAME(15, 3) - TILES(0x19BF0, 35) - SHOW_FRAME(15, 4) + TILES(0x19BF0, 35) SHOW_FRAME(15, 4) - TILES(0x19C13, 35) - SHOW_FRAME(15, 5) + TILES(0x19C13, 35) SHOW_FRAME(15, 5) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v2_l0[] = { // 0x08100B70 - PALETTE(457, 16, 0x90) - TILES(0x19C36, 40) - SHOW_FRAME(15, 6) + PALETTE(457, 16, 0x90) TILES(0x19C36, 40) SHOW_FRAME(15, 6) - TILES(0x19C5E, 40) - SHOW_FRAME(15, 7) + TILES(0x19C5E, 40) SHOW_FRAME(15, 7) - TILES(0x19C86, 40) - SHOW_FRAME(15, 8) + TILES(0x19C86, 40) SHOW_FRAME(15, 8) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v3_l0[] = { // 0x08100BC0 - PALETTE(457, 16, 0x90) - TILES(0x19CAE, 30) - SHOW_FRAME(15, 9) + PALETTE(457, 16, 0x90) TILES(0x19CAE, 30) SHOW_FRAME(15, 9) - TILES(0x19CCC, 30) - SHOW_FRAME(30, 10) + TILES(0x19CCC, 30) SHOW_FRAME(30, 10) - TILES(0x19CAE, 30) - SHOW_FRAME(15, 9) + TILES(0x19CAE, 30) SHOW_FRAME(15, 9) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v4_l0[] = { // 0x08100C10 - PALETTE(457, 16, 0x90) - TILES(0x19CEA, 30) - SHOW_FRAME(8, 11) + PALETTE(457, 16, 0x90) TILES(0x19CEA, 30) SHOW_FRAME(8, 11) - TILES(0x19D08, 30) - SHOW_FRAME(8, 12) + TILES(0x19D08, 30) SHOW_FRAME(8, 12) - TILES(0x19CEA, 30) - SHOW_FRAME(8, 11) + TILES(0x19CEA, 30) SHOW_FRAME(8, 11) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v5_l0[] = { // 0x08100C60 - PALETTE(457, 16, 0x90) - TILES(0x19D26, 40) - SHOW_FRAME(15, 13) + PALETTE(457, 16, 0x90) TILES(0x19D26, 40) SHOW_FRAME(15, 13) - TILES(0x19D4E, 40) - SHOW_FRAME(30, 14) + TILES(0x19D4E, 40) SHOW_FRAME(30, 14) - TILES(0x19D76, 35) - SHOW_FRAME(15, 15) + TILES(0x19D76, 35) SHOW_FRAME(15, 15) - JUMP_BACK(18) + JUMP_BACK(18) }; const s32 anim_0887__v6_l0[] = { // 0x08100CB0 - PALETTE(457, 16, 0x90) - TILES(0x19D99, 30) - SHOW_FRAME(15, 16) + PALETTE(457, 16, 0x90) TILES(0x19D99, 30) SHOW_FRAME(15, 16) - TILES(0x19DB7, 30) - SHOW_FRAME(30, 17) + TILES(0x19DB7, 30) SHOW_FRAME(30, 17) - TILES(0x19DD5, 30) - SHOW_FRAME(15, 18) + TILES(0x19DD5, 30) SHOW_FRAME(15, 18) - JUMP_BACK(18) + JUMP_BACK(18) }; -const s32 * const anim_0887[7] = { - anim_0887__v0_l0, - anim_0887__v1_l0, - anim_0887__v2_l0, - anim_0887__v3_l0, - anim_0887__v4_l0, - anim_0887__v5_l0, - anim_0887__v6_l0, +const s32 *const anim_0887[7] = { + anim_0887__v0_l0, anim_0887__v1_l0, anim_0887__v2_l0, anim_0887__v3_l0, anim_0887__v4_l0, anim_0887__v5_l0, anim_0887__v6_l0, }; const s32 anim_0888__v0_l0[] = { // 0x08100D1C - PALETTE(456, 16, 0x90) - TILES(0x19DF3, 35) - SHOW_FRAME(50, 0) + PALETTE(456, 16, 0x90) TILES(0x19DF3, 35) SHOW_FRAME(50, 0) - TILES(0x19E16, 35) - SHOW_FRAME(8, 1) + TILES(0x19E16, 35) SHOW_FRAME(8, 1) - TILES(0x19E39, 35) - SHOW_FRAME(8, 2) + TILES(0x19E39, 35) SHOW_FRAME(8, 2) - TILES(0x19E5C, 35) - SHOW_FRAME(8, 3) + TILES(0x19E5C, 35) SHOW_FRAME(8, 3) - TILES(0x19E7F, 35) - SHOW_FRAME(8, 4) + TILES(0x19E7F, 35) SHOW_FRAME(8, 4) - TILES(0x19EA2, 35) - SHOW_FRAME(8, 5) + TILES(0x19EA2, 35) SHOW_FRAME(8, 5) - TILES(0x19EC5, 35) - SHOW_FRAME(50, 6) + TILES(0x19EC5, 35) SHOW_FRAME(50, 6) - TILES(0x19EE8, 35) - SHOW_FRAME(8, 7) + TILES(0x19EE8, 35) SHOW_FRAME(8, 7) - TILES(0x19F0B, 35) - SHOW_FRAME(8, 8) + TILES(0x19F0B, 35) SHOW_FRAME(8, 8) - TILES(0x19F2E, 35) - SHOW_FRAME(8, 9) + TILES(0x19F2E, 35) SHOW_FRAME(8, 9) - TILES(0x19F51, 35) - SHOW_FRAME(8, 10) + TILES(0x19F51, 35) SHOW_FRAME(8, 10) - TILES(0x19F74, 35) - SHOW_FRAME(8, 11) + TILES(0x19F74, 35) SHOW_FRAME(8, 11) - JUMP_BACK(63) + JUMP_BACK(63) }; const s32 anim_0888__v1_l0[] = { // 0x08100E20 - PALETTE(456, 16, 0x90) - TILES(0x19E16, 35) - SHOW_FRAME(8, 1) + PALETTE(456, 16, 0x90) TILES(0x19E16, 35) SHOW_FRAME(8, 1) - TILES(0x19E39, 35) - SHOW_FRAME(8, 2) + TILES(0x19E39, 35) SHOW_FRAME(8, 2) - TILES(0x19E5C, 35) - SHOW_FRAME(8, 3) + TILES(0x19E5C, 35) SHOW_FRAME(8, 3) - TILES(0x19E7F, 35) - SHOW_FRAME(8, 4) + TILES(0x19E7F, 35) SHOW_FRAME(8, 4) - TILES(0x19EA2, 35) - SHOW_FRAME(8, 5) + TILES(0x19EA2, 35) SHOW_FRAME(8, 5) - TILES(0x19EC5, 35) - SHOW_FRAME(8, 6) + TILES(0x19EC5, 35) SHOW_FRAME(8, 6) - END() + END() }; const s32 anim_0888__v2_l0[] = { // 0x08100EA8 - PALETTE(456, 16, 0x90) - TILES(0x19EE8, 35) - SHOW_FRAME(8, 7) + PALETTE(456, 16, 0x90) TILES(0x19EE8, 35) SHOW_FRAME(8, 7) - TILES(0x19F0B, 35) - SHOW_FRAME(8, 8) + TILES(0x19F0B, 35) SHOW_FRAME(8, 8) - TILES(0x19F2E, 35) - SHOW_FRAME(8, 9) + TILES(0x19F2E, 35) SHOW_FRAME(8, 9) - TILES(0x19F51, 35) - SHOW_FRAME(8, 10) + TILES(0x19F51, 35) SHOW_FRAME(8, 10) - TILES(0x19F74, 35) - SHOW_FRAME(8, 11) + TILES(0x19F74, 35) SHOW_FRAME(8, 11) - TILES(0x19DF3, 35) - SHOW_FRAME(8, 0) + TILES(0x19DF3, 35) SHOW_FRAME(8, 0) - END() + END() }; -const s32 * const anim_0888[3] = { +const s32 *const anim_0888[3] = { anim_0888__v0_l0, anim_0888__v1_l0, anim_0888__v2_l0, }; const s32 anim_0889__v0_l0[] = { // 0x08100F3C - PALETTE(456, 16, 0x90) - TILES(0x19F97, 42) - SHOW_FRAME(1, 0) + PALETTE(456, 16, 0x90) TILES(0x19F97, 42) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0889[1] = { +const s32 *const anim_0889[1] = { anim_0889__v0_l0, }; const s32 anim_0890__v0_l0[] = { // 0x08100F64 - PALETTE(458, 16, 0x20) - TILES(0x19FC1, 24) - SHOW_FRAME(1, 0) + PALETTE(458, 16, 0x20) TILES(0x19FC1, 24) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0890[1] = { +const s32 *const anim_0890[1] = { anim_0890__v0_l0, }; const s32 anim_0891__v0_l0[] = { // 0x08100F8C - PALETTE(68, 16, 0x20) - TILES(0x19FD9, 40) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x20) TILES(0x19FD9, 40) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0891__v1_l0[] = { // 0x08100FB0 - PALETTE(68, 16, 0x20) - TILES(0x1A001, 28) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x20) TILES(0x1A001, 28) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0891__v2_l0[] = { // 0x08100FD4 - PALETTE(68, 16, 0x20) - TILES(0x1A01D, 12) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x20) TILES(0x1A01D, 12) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0891__v3_l0[] = { // 0x08100FF8 - PALETTE(68, 16, 0x20) - TILES(0x1A029, 8) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x20) TILES(0x1A029, 8) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0891__v4_l0[] = { // 0x0810101C - PALETTE(68, 16, 0x20) - TILES(0x1A031, 4) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x20) TILES(0x1A031, 4) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0891__v5_l0[] = { // 0x08101040 - PALETTE(68, 16, 0x20) - TILES(0x1A035, 4) - SHOW_FRAME(1, 5) + PALETTE(68, 16, 0x20) TILES(0x1A035, 4) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0891__v6_l0[] = { // 0x08101064 - PALETTE(68, 16, 0x20) - TILES(0x1A039, 4) - SHOW_FRAME(1, 6) + PALETTE(68, 16, 0x20) TILES(0x1A039, 4) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0891__v7_l0[] = { // 0x08101088 - PALETTE(68, 16, 0x20) - TILES(0x1A03D, 4) - SHOW_FRAME(1, 7) + PALETTE(68, 16, 0x20) TILES(0x1A03D, 4) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0891__v8_l0[] = { // 0x081010AC - PALETTE(68, 16, 0x20) - TILES(0x1A041, 12) - SHOW_FRAME(1, 8) + PALETTE(68, 16, 0x20) TILES(0x1A041, 12) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0891__v9_l0[] = { // 0x081010D0 - PALETTE(68, 16, 0x20) - TILES(0x1A04D, 10) - SHOW_FRAME(1, 9) + PALETTE(68, 16, 0x20) TILES(0x1A04D, 10) SHOW_FRAME(1, 9) - END() + END() }; -const s32 * const anim_0891[10] = { - anim_0891__v0_l0, - anim_0891__v1_l0, - anim_0891__v2_l0, - anim_0891__v3_l0, - anim_0891__v4_l0, - anim_0891__v5_l0, - anim_0891__v6_l0, - anim_0891__v7_l0, - anim_0891__v8_l0, - anim_0891__v9_l0, +const s32 *const anim_0891[10] = { + anim_0891__v0_l0, anim_0891__v1_l0, anim_0891__v2_l0, anim_0891__v3_l0, anim_0891__v4_l0, + anim_0891__v5_l0, anim_0891__v6_l0, anim_0891__v7_l0, anim_0891__v8_l0, anim_0891__v9_l0, }; const s32 anim_0892__v0_l0[] = { // 0x0810111C - PALETTE(453, 16, 0x0) - TILES(0x1A057, 42) - SHOW_FRAME(1, 0) + PALETTE(453, 16, 0x0) TILES(0x1A057, 42) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0892__v1_l0[] = { // 0x08101140 - PALETTE(453, 16, 0x0) - TILES(0x1A081, 42) - SHOW_FRAME(1, 1) + PALETTE(453, 16, 0x0) TILES(0x1A081, 42) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0892__v2_l0[] = { // 0x08101164 - PALETTE(453, 16, 0x0) - TILES(0x1A0AB, 10) - SHOW_FRAME(1, 2) + PALETTE(453, 16, 0x0) TILES(0x1A0AB, 10) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0892__v3_l0[] = { // 0x08101188 - PALETTE(453, 16, 0x0) - TILES(0x1A0B5, 12) - SHOW_FRAME(1, 3) + PALETTE(453, 16, 0x0) TILES(0x1A0B5, 12) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0892[4] = { +const s32 *const anim_0892[4] = { anim_0892__v0_l0, anim_0892__v1_l0, anim_0892__v2_l0, @@ -28157,305 +20060,222 @@ const s32 * const anim_0892[4] = { }; const s32 anim_0893__v0_l0[] = { // 0x081011BC - PALETTE(179, 16, 0x0) - TILES(0x1A0C1, 46) - SHOW_FRAME(1, 0) + PALETTE(179, 16, 0x0) TILES(0x1A0C1, 46) SHOW_FRAME(1, 0) - JUMP_BACK(8) + JUMP_BACK(8) }; -const s32 * const anim_0893[1] = { +const s32 *const anim_0893[1] = { anim_0893__v0_l0, }; const s32 anim_0894__v0_l0[] = { // 0x081011E8 - PALETTE(68, 16, 0x20) - TILES(0x1A0EF, 18) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x20) TILES(0x1A0EF, 18) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0894__v1_l0[] = { // 0x0810120C - PALETTE(68, 16, 0x20) - TILES(0x1A101, 22) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x20) TILES(0x1A101, 22) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0894__v2_l0[] = { // 0x08101230 - PALETTE(68, 16, 0x20) - TILES(0x1A117, 26) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x20) TILES(0x1A117, 26) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0894__v3_l0[] = { // 0x08101254 - PALETTE(68, 16, 0x20) - TILES(0x1A131, 32) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x20) TILES(0x1A131, 32) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0894__v4_l0[] = { // 0x08101278 - PALETTE(68, 16, 0x20) - TILES(0x1A151, 15) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x20) TILES(0x1A151, 15) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0894__v5_l0[] = { // 0x0810129C - PALETTE(68, 16, 0x20) - TILES(0x1A160, 8) - SHOW_FRAME(1, 5) + PALETTE(68, 16, 0x20) TILES(0x1A160, 8) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0894__v6_l0[] = { // 0x081012C0 - PALETTE(68, 16, 0x20) - TILES(0x1A168, 8) - SHOW_FRAME(1, 6) + PALETTE(68, 16, 0x20) TILES(0x1A168, 8) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0894__v7_l0[] = { // 0x081012E4 - PALETTE(68, 16, 0x20) - TILES(0x1A170, 8) - SHOW_FRAME(1, 7) + PALETTE(68, 16, 0x20) TILES(0x1A170, 8) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0894__v8_l0[] = { // 0x08101308 - PALETTE(68, 16, 0x20) - TILES(0x1A178, 8) - SHOW_FRAME(1, 8) + PALETTE(68, 16, 0x20) TILES(0x1A178, 8) SHOW_FRAME(1, 8) - END() + END() }; -const s32 * const anim_0894[9] = { - anim_0894__v0_l0, - anim_0894__v1_l0, - anim_0894__v2_l0, - anim_0894__v3_l0, - anim_0894__v4_l0, - anim_0894__v5_l0, - anim_0894__v6_l0, - anim_0894__v7_l0, - anim_0894__v8_l0, +const s32 *const anim_0894[9] = { + anim_0894__v0_l0, anim_0894__v1_l0, anim_0894__v2_l0, anim_0894__v3_l0, anim_0894__v4_l0, + anim_0894__v5_l0, anim_0894__v6_l0, anim_0894__v7_l0, anim_0894__v8_l0, }; const s32 anim_0895__v0_l0[] = { // 0x08101350 - PALETTE(459, 16, 0x0) - TILES(0x1A180, 10) - SHOW_FRAME(1, 0) + PALETTE(459, 16, 0x0) TILES(0x1A180, 10) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0895__v1_l0[] = { // 0x08101374 - PALETTE(459, 16, 0x0) - TILES(0x1A18A, 20) - SHOW_FRAME(1, 1) + PALETTE(459, 16, 0x0) TILES(0x1A18A, 20) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0895[2] = { +const s32 *const anim_0895[2] = { anim_0895__v0_l0, anim_0895__v1_l0, }; const s32 anim_0896__v0_l0[] = { // 0x081013A0 - PALETTE(460, 16, 0x90) - TILES(0x1A19E, 8) - SHOW_FRAME(1, 0) + PALETTE(460, 16, 0x90) TILES(0x1A19E, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0896__v1_l0[] = { // 0x081013C4 - PALETTE(460, 16, 0x90) - TILES(0x1A1A6, 10) - SHOW_FRAME(1, 1) + PALETTE(460, 16, 0x90) TILES(0x1A1A6, 10) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0896__v2_l0[] = { // 0x081013E8 - PALETTE(460, 16, 0x90) - TILES(0x1A1B0, 10) - SHOW_FRAME(1, 2) + PALETTE(460, 16, 0x90) TILES(0x1A1B0, 10) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0896__v3_l0[] = { // 0x0810140C - PALETTE(460, 16, 0x90) - TILES(0x1A1BA, 4) - SHOW_FRAME(1, 3) + PALETTE(460, 16, 0x90) TILES(0x1A1BA, 4) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0896__v4_l0[] = { // 0x08101430 - PALETTE(460, 16, 0x90) - TILES(0x1A1BE, 2) - SHOW_FRAME(1, 4) + PALETTE(460, 16, 0x90) TILES(0x1A1BE, 2) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0896__v5_l0[] = { // 0x08101454 - PALETTE(460, 16, 0x90) - TILES(0x1A1C0, 4) - SHOW_FRAME(1, 5) + PALETTE(460, 16, 0x90) TILES(0x1A1C0, 4) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0896__v6_l0[] = { // 0x08101478 - PALETTE(460, 16, 0x90) - TILES(0x1A1C4, 4) - SHOW_FRAME(1, 6) + PALETTE(460, 16, 0x90) TILES(0x1A1C4, 4) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0896__v7_l0[] = { // 0x0810149C - PALETTE(460, 16, 0x90) - TILES(0x1A1C8, 4) - SHOW_FRAME(1, 7) + PALETTE(460, 16, 0x90) TILES(0x1A1C8, 4) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0896__v8_l0[] = { // 0x081014C0 - PALETTE(460, 16, 0x90) - TILES(0x1A1CC, 4) - SHOW_FRAME(1, 8) + PALETTE(460, 16, 0x90) TILES(0x1A1CC, 4) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0896__v9_l0[] = { // 0x081014E4 - PALETTE(460, 16, 0x90) - TILES(0x1A1D0, 4) - SHOW_FRAME(1, 9) + PALETTE(460, 16, 0x90) TILES(0x1A1D0, 4) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0896__v10_l0[] = { // 0x08101508 - PALETTE(460, 16, 0x90) - TILES(0x1A1D4, 4) - SHOW_FRAME(1, 10) + PALETTE(460, 16, 0x90) TILES(0x1A1D4, 4) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0896__v11_l0[] = { // 0x0810152C - PALETTE(460, 16, 0x90) - TILES(0x1A1D8, 4) - SHOW_FRAME(1, 11) + PALETTE(460, 16, 0x90) TILES(0x1A1D8, 4) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0896__v12_l0[] = { // 0x08101550 - PALETTE(460, 16, 0x90) - TILES(0x1A1DC, 4) - SHOW_FRAME(1, 12) + PALETTE(460, 16, 0x90) TILES(0x1A1DC, 4) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0896__v13_l0[] = { // 0x08101574 - PALETTE(460, 16, 0x90) - TILES(0x1A1E0, 14) - SHOW_FRAME(1, 13) + PALETTE(460, 16, 0x90) TILES(0x1A1E0, 14) SHOW_FRAME(1, 13) - END() + END() }; -const s32 * const anim_0896[14] = { - anim_0896__v0_l0, - anim_0896__v1_l0, - anim_0896__v2_l0, - anim_0896__v3_l0, - anim_0896__v4_l0, - anim_0896__v5_l0, - anim_0896__v6_l0, - anim_0896__v7_l0, - anim_0896__v8_l0, - anim_0896__v9_l0, - anim_0896__v10_l0, - anim_0896__v11_l0, - anim_0896__v12_l0, - anim_0896__v13_l0, +const s32 *const anim_0896[14] = { + anim_0896__v0_l0, anim_0896__v1_l0, anim_0896__v2_l0, anim_0896__v3_l0, anim_0896__v4_l0, anim_0896__v5_l0, anim_0896__v6_l0, + anim_0896__v7_l0, anim_0896__v8_l0, anim_0896__v9_l0, anim_0896__v10_l0, anim_0896__v11_l0, anim_0896__v12_l0, anim_0896__v13_l0, }; const s32 anim_0897__v0_l0[] = { // 0x081015D0 - PALETTE(461, 16, 0x0) - TILES(0x1A1EE, 38) - SHOW_FRAME(1, 0) + PALETTE(461, 16, 0x0) TILES(0x1A1EE, 38) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0897__v1_l0[] = { // 0x081015F4 - PALETTE(461, 16, 0x0) - TILES(0x1A214, 40) - SHOW_FRAME(1, 1) + PALETTE(461, 16, 0x0) TILES(0x1A214, 40) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0897[2] = { +const s32 *const anim_0897[2] = { anim_0897__v0_l0, anim_0897__v1_l0, }; const s32 anim_0898__v0_l0[] = { // 0x08101620 - PALETTE(88, 16, 0x0) - TILES(0x1A23C, 20) - SHOW_FRAME(1, 0) + PALETTE(88, 16, 0x0) TILES(0x1A23C, 20) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0898__v1_l0[] = { // 0x08101644 - PALETTE(2, 16, 0x10) - TILES(0x1A250, 24) - SHOW_FRAME(1, 1) + PALETTE(2, 16, 0x10) TILES(0x1A250, 24) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0898__v2_l0[] = { // 0x08101668 - PALETTE(462, 16, 0x20) - TILES(0x1A268, 20) - SHOW_FRAME(1, 2) + PALETTE(462, 16, 0x20) TILES(0x1A268, 20) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0898__v3_l0[] = { // 0x0810168C - PALETTE(7, 16, 0x30) - TILES(0x1A27C, 20) - SHOW_FRAME(1, 3) + PALETTE(7, 16, 0x30) TILES(0x1A27C, 20) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0898[4] = { +const s32 *const anim_0898[4] = { anim_0898__v0_l0, anim_0898__v1_l0, anim_0898__v2_l0, @@ -28463,191 +20283,142 @@ const s32 * const anim_0898[4] = { }; const s32 anim_0899__v0_l0[] = { // 0x081016C0 - PALETTE(453, 16, 0x0) - TILES(0x1A290, 22) - SHOW_FRAME(1, 0) + PALETTE(453, 16, 0x0) TILES(0x1A290, 22) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0899__v1_l0[] = { // 0x081016E4 - PALETTE(453, 16, 0x0) - TILES(0x1A2A6, 18) - SHOW_FRAME(1, 1) + PALETTE(453, 16, 0x0) TILES(0x1A2A6, 18) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0899__v2_l0[] = { // 0x08101708 - PALETTE(453, 16, 0x0) - TILES(0x1A2B8, 18) - SHOW_FRAME(1, 2) + PALETTE(453, 16, 0x0) TILES(0x1A2B8, 18) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0899__v3_l0[] = { // 0x0810172C - PALETTE(453, 16, 0x0) - TILES(0x1A2CA, 16) - SHOW_FRAME(1, 3) + PALETTE(453, 16, 0x0) TILES(0x1A2CA, 16) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0899__v4_l0[] = { // 0x08101750 - PALETTE(453, 16, 0x0) - TILES(0x1A2DA, 26) - SHOW_FRAME(1, 4) + PALETTE(453, 16, 0x0) TILES(0x1A2DA, 26) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0899__v5_l0[] = { // 0x08101774 - PALETTE(453, 16, 0x0) - TILES(0x1A2F4, 14) - SHOW_FRAME(1, 5) + PALETTE(453, 16, 0x0) TILES(0x1A2F4, 14) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0899__v6_l0[] = { // 0x08101798 - PALETTE(455, 16, 0x0) - TILES(0x1A302, 14) - SHOW_FRAME(1, 6) + PALETTE(455, 16, 0x0) TILES(0x1A302, 14) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0899__v7_l0[] = { // 0x081017BC - PALETTE(453, 16, 0x0) - TILES(0x1A310, 10) - SHOW_FRAME(1, 7) + PALETTE(453, 16, 0x0) TILES(0x1A310, 10) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0899__v8_l0[] = { // 0x081017E0 - PALETTE(453, 16, 0x0) - TILES(0x1A31A, 10) - SHOW_FRAME(1, 8) + PALETTE(453, 16, 0x0) TILES(0x1A31A, 10) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0899__v9_l0[] = { // 0x08101804 - PALETTE(453, 16, 0x0) - TILES(0x1A324, 10) - SHOW_FRAME(1, 9) + PALETTE(453, 16, 0x0) TILES(0x1A324, 10) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0899__v10_l0[] = { // 0x08101828 - PALETTE(453, 16, 0x0) - TILES(0x1A32E, 10) - SHOW_FRAME(1, 10) + PALETTE(453, 16, 0x0) TILES(0x1A32E, 10) SHOW_FRAME(1, 10) - END() + END() }; -const s32 * const anim_0899[11] = { - anim_0899__v0_l0, - anim_0899__v1_l0, - anim_0899__v2_l0, - anim_0899__v3_l0, - anim_0899__v4_l0, - anim_0899__v5_l0, - anim_0899__v6_l0, - anim_0899__v7_l0, - anim_0899__v8_l0, - anim_0899__v9_l0, - anim_0899__v10_l0, +const s32 *const anim_0899[11] = { + anim_0899__v0_l0, anim_0899__v1_l0, anim_0899__v2_l0, anim_0899__v3_l0, anim_0899__v4_l0, anim_0899__v5_l0, + anim_0899__v6_l0, anim_0899__v7_l0, anim_0899__v8_l0, anim_0899__v9_l0, anim_0899__v10_l0, }; const s32 anim_0900__v0_l0[] = { // 0x08101878 - PALETTE(460, 16, 0x90) - TILES(0x1A338, 6) - SHOW_FRAME(1, 0) + PALETTE(460, 16, 0x90) TILES(0x1A338, 6) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0900__v1_l0[] = { // 0x0810189C - PALETTE(460, 16, 0x90) - TILES(0x1A33E, 6) - SHOW_FRAME(1, 1) + PALETTE(460, 16, 0x90) TILES(0x1A33E, 6) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0900__v2_l0[] = { // 0x081018C0 - PALETTE(460, 16, 0x90) - TILES(0x1A344, 14) - SHOW_FRAME(1, 2) + PALETTE(460, 16, 0x90) TILES(0x1A344, 14) SHOW_FRAME(1, 2) - END() + END() }; -const s32 * const anim_0900[3] = { +const s32 *const anim_0900[3] = { anim_0900__v0_l0, anim_0900__v1_l0, anim_0900__v2_l0, }; const s32 anim_0901__v0_l0[] = { // 0x081018F0 - PALETTE(461, 16, 0x0) - TILES(0x1A352, 34) - SHOW_FRAME(1, 0) + PALETTE(461, 16, 0x0) TILES(0x1A352, 34) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0901__v1_l0[] = { // 0x08101914 - PALETTE(461, 16, 0x0) - TILES(0x1A374, 30) - SHOW_FRAME(1, 1) + PALETTE(461, 16, 0x0) TILES(0x1A374, 30) SHOW_FRAME(1, 1) - END() + END() }; -const s32 * const anim_0901[2] = { +const s32 *const anim_0901[2] = { anim_0901__v0_l0, anim_0901__v1_l0, }; const s32 anim_0902__v0_l0[] = { // 0x08101940 - PALETTE(463, 16, 0x60) - TILES(0x1A392, 42) - SHOW_FRAME(1, 0) + PALETTE(463, 16, 0x60) TILES(0x1A392, 42) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0902__v1_l0[] = { // 0x08101964 - PALETTE(463, 16, 0x60) - TILES(0x1A3BC, 44) - SHOW_FRAME(1, 1) + PALETTE(463, 16, 0x60) TILES(0x1A3BC, 44) SHOW_FRAME(1, 1) - JUMP_BACK(8) + JUMP_BACK(8) }; const s32 anim_0902__v2_l0[] = { // 0x0810198C - PALETTE(463, 16, 0x60) - TILES(0x1A3E8, 44) - SHOW_FRAME(1, 2) + PALETTE(463, 16, 0x60) TILES(0x1A3E8, 44) SHOW_FRAME(1, 2) - JUMP_BACK(8) + JUMP_BACK(8) }; const s32 anim_0902__v3_l0[] = { // 0x081019B4 - PALETTE(463, 16, 0x60) - TILES(0x1A414, 40) - SHOW_FRAME(1, 3) + PALETTE(463, 16, 0x60) TILES(0x1A414, 40) SHOW_FRAME(1, 3) - JUMP_BACK(8) + JUMP_BACK(8) }; -const s32 * const anim_0902[4] = { +const s32 *const anim_0902[4] = { anim_0902__v0_l0, anim_0902__v1_l0, anim_0902__v2_l0, @@ -28655,38 +20426,30 @@ const s32 * const anim_0902[4] = { }; const s32 anim_0903__v0_l0[] = { // 0x081019EC - PALETTE(68, 16, 0x60) - TILES(0x1A43C, 12) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x1A43C, 12) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0903__v1_l0[] = { // 0x08101A10 - PALETTE(68, 16, 0x60) - TILES(0x1A448, 13) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x1A448, 13) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0903__v2_l0[] = { // 0x08101A34 - PALETTE(68, 16, 0x60) - TILES(0x1A455, 12) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x1A455, 12) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0903__v3_l0[] = { // 0x08101A58 - PALETTE(68, 16, 0x60) - TILES(0x1A461, 11) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x1A461, 11) SHOW_FRAME(1, 3) - END() + END() }; -const s32 * const anim_0903[4] = { +const s32 *const anim_0903[4] = { anim_0903__v0_l0, anim_0903__v1_l0, anim_0903__v2_l0, @@ -28694,296 +20457,208 @@ const s32 * const anim_0903[4] = { }; const s32 anim_0904__v0_l0[] = { // 0x08101A8C - PALETTE(68, 16, 0x60) - TILES(0x1A46C, 8) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x1A46C, 8) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0904__v1_l0[] = { // 0x08101AB0 - PALETTE(68, 16, 0x60) - TILES(0x1A474, 12) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x1A474, 12) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0904__v2_l0[] = { // 0x08101AD4 - PALETTE(68, 16, 0x60) - TILES(0x1A480, 12) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x1A480, 12) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0904__v3_l0[] = { // 0x08101AF8 - PALETTE(68, 16, 0x60) - TILES(0x1A48C, 8) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x1A48C, 8) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0904__v4_l0[] = { // 0x08101B1C - PALETTE(68, 16, 0x60) - TILES(0x1A494, 8) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x1A494, 8) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0904__v5_l0[] = { // 0x08101B40 - PALETTE(68, 16, 0x60) - TILES(0x1A49C, 8) - SHOW_FRAME(1, 5) + PALETTE(68, 16, 0x60) TILES(0x1A49C, 8) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0904__v6_l0[] = { // 0x08101B64 - PALETTE(68, 16, 0x60) - TILES(0x1A4A4, 8) - SHOW_FRAME(1, 6) + PALETTE(68, 16, 0x60) TILES(0x1A4A4, 8) SHOW_FRAME(1, 6) - END() + END() }; -const s32 * const anim_0904[7] = { - anim_0904__v0_l0, - anim_0904__v1_l0, - anim_0904__v2_l0, - anim_0904__v3_l0, - anim_0904__v4_l0, - anim_0904__v5_l0, - anim_0904__v6_l0, +const s32 *const anim_0904[7] = { + anim_0904__v0_l0, anim_0904__v1_l0, anim_0904__v2_l0, anim_0904__v3_l0, anim_0904__v4_l0, anim_0904__v5_l0, anim_0904__v6_l0, }; const s32 anim_0905__v0_l0[] = { // 0x08101BA4 - PALETTE(68, 16, 0x20) - TILES(0x1A4AC, 24) - SHOW_FRAME(60, 0) + PALETTE(68, 16, 0x20) TILES(0x1A4AC, 24) SHOW_FRAME(60, 0) - SHOW_FRAME(60, -1) + SHOW_FRAME(60, -1) - JUMP_BACK(10) + JUMP_BACK(10) }; -const s32 * const anim_0905[1] = { +const s32 *const anim_0905[1] = { anim_0905__v0_l0, }; const s32 anim_0906__v0_l0[] = { // 0x08101BD8 - PALETTE(38, 16, 0xB0) - TILES(0x1A4C4, 32) - HITBOX(0, 0, 3, 64, 23) - SHOW_FRAME(1, 0) + PALETTE(38, 16, 0xB0) TILES(0x1A4C4, 32) HITBOX(0, 0, 3, 64, 23) SHOW_FRAME(1, 0) - END() + END() }; -const s32 * const anim_0906[1] = { +const s32 *const anim_0906[1] = { anim_0906__v0_l0, }; const s32 anim_0907__v0_l0[] = { // 0x08101C0C - PALETTE(68, 16, 0x60) - TILES(0x1A4E4, 2) - SHOW_FRAME(1, 0) + PALETTE(68, 16, 0x60) TILES(0x1A4E4, 2) SHOW_FRAME(1, 0) - END() + END() }; const s32 anim_0907__v1_l0[] = { // 0x08101C30 - PALETTE(68, 16, 0x60) - TILES(0x1A4E6, 2) - SHOW_FRAME(1, 1) + PALETTE(68, 16, 0x60) TILES(0x1A4E6, 2) SHOW_FRAME(1, 1) - END() + END() }; const s32 anim_0907__v2_l0[] = { // 0x08101C54 - PALETTE(68, 16, 0x60) - TILES(0x1A4E8, 2) - SHOW_FRAME(1, 2) + PALETTE(68, 16, 0x60) TILES(0x1A4E8, 2) SHOW_FRAME(1, 2) - END() + END() }; const s32 anim_0907__v3_l0[] = { // 0x08101C78 - PALETTE(68, 16, 0x60) - TILES(0x1A4EA, 2) - SHOW_FRAME(1, 3) + PALETTE(68, 16, 0x60) TILES(0x1A4EA, 2) SHOW_FRAME(1, 3) - END() + END() }; const s32 anim_0907__v4_l0[] = { // 0x08101C9C - PALETTE(68, 16, 0x60) - TILES(0x1A4EC, 2) - SHOW_FRAME(1, 4) + PALETTE(68, 16, 0x60) TILES(0x1A4EC, 2) SHOW_FRAME(1, 4) - END() + END() }; const s32 anim_0907__v5_l0[] = { // 0x08101CC0 - PALETTE(68, 16, 0x60) - TILES(0x1A4EE, 2) - SHOW_FRAME(1, 5) + PALETTE(68, 16, 0x60) TILES(0x1A4EE, 2) SHOW_FRAME(1, 5) - END() + END() }; const s32 anim_0907__v6_l0[] = { // 0x08101CE4 - PALETTE(68, 16, 0x60) - TILES(0x1A4F0, 2) - SHOW_FRAME(1, 6) + PALETTE(68, 16, 0x60) TILES(0x1A4F0, 2) SHOW_FRAME(1, 6) - END() + END() }; const s32 anim_0907__v7_l0[] = { // 0x08101D08 - PALETTE(68, 16, 0x60) - TILES(0x1A4F2, 2) - SHOW_FRAME(1, 7) + PALETTE(68, 16, 0x60) TILES(0x1A4F2, 2) SHOW_FRAME(1, 7) - END() + END() }; const s32 anim_0907__v8_l0[] = { // 0x08101D2C - PALETTE(68, 16, 0x60) - TILES(0x1A4F4, 2) - SHOW_FRAME(1, 8) + PALETTE(68, 16, 0x60) TILES(0x1A4F4, 2) SHOW_FRAME(1, 8) - END() + END() }; const s32 anim_0907__v9_l0[] = { // 0x08101D50 - PALETTE(68, 16, 0x60) - TILES(0x1A4F6, 2) - SHOW_FRAME(1, 9) + PALETTE(68, 16, 0x60) TILES(0x1A4F6, 2) SHOW_FRAME(1, 9) - END() + END() }; const s32 anim_0907__v10_l0[] = { // 0x08101D74 - PALETTE(68, 16, 0x60) - TILES(0x1A4F8, 2) - SHOW_FRAME(1, 10) + PALETTE(68, 16, 0x60) TILES(0x1A4F8, 2) SHOW_FRAME(1, 10) - END() + END() }; const s32 anim_0907__v11_l0[] = { // 0x08101D98 - PALETTE(68, 16, 0x60) - TILES(0x1A4FA, 2) - SHOW_FRAME(1, 11) + PALETTE(68, 16, 0x60) TILES(0x1A4FA, 2) SHOW_FRAME(1, 11) - END() + END() }; const s32 anim_0907__v12_l0[] = { // 0x08101DBC - PALETTE(68, 16, 0x60) - TILES(0x1A4FC, 2) - SHOW_FRAME(1, 12) + PALETTE(68, 16, 0x60) TILES(0x1A4FC, 2) SHOW_FRAME(1, 12) - END() + END() }; const s32 anim_0907__v13_l0[] = { // 0x08101DE0 - PALETTE(68, 16, 0x60) - TILES(0x1A4FE, 2) - SHOW_FRAME(1, 13) + PALETTE(68, 16, 0x60) TILES(0x1A4FE, 2) SHOW_FRAME(1, 13) - END() + END() }; const s32 anim_0907__v14_l0[] = { // 0x08101E04 - PALETTE(68, 16, 0x60) - TILES(0x1A500, 2) - SHOW_FRAME(1, 14) + PALETTE(68, 16, 0x60) TILES(0x1A500, 2) SHOW_FRAME(1, 14) - END() + END() }; const s32 anim_0907__v15_l0[] = { // 0x08101E28 - PALETTE(68, 16, 0x60) - TILES(0x1A502, 2) - SHOW_FRAME(1, 15) + PALETTE(68, 16, 0x60) TILES(0x1A502, 2) SHOW_FRAME(1, 15) - END() + END() }; const s32 anim_0907__v16_l0[] = { // 0x08101E4C - PALETTE(68, 16, 0x60) - TILES(0x1A504, 2) - SHOW_FRAME(1, 16) + PALETTE(68, 16, 0x60) TILES(0x1A504, 2) SHOW_FRAME(1, 16) - END() + END() }; const s32 anim_0907__v17_l0[] = { // 0x08101E70 - PALETTE(68, 16, 0x60) - TILES(0x1A506, 2) - SHOW_FRAME(1, 17) + PALETTE(68, 16, 0x60) TILES(0x1A506, 2) SHOW_FRAME(1, 17) - END() + END() }; const s32 anim_0907__v18_l0[] = { // 0x08101E94 - PALETTE(68, 16, 0x60) - TILES(0x1A508, 2) - SHOW_FRAME(1, 18) + PALETTE(68, 16, 0x60) TILES(0x1A508, 2) SHOW_FRAME(1, 18) - END() + END() }; const s32 anim_0907__v19_l0[] = { // 0x08101EB8 - PALETTE(68, 16, 0x60) - TILES(0x1A50A, 2) - SHOW_FRAME(1, 19) + PALETTE(68, 16, 0x60) TILES(0x1A50A, 2) SHOW_FRAME(1, 19) - END() + END() }; const s32 anim_0907__v20_l0[] = { // 0x08101EDC - PALETTE(68, 16, 0x60) - TILES(0x1A50C, 2) - SHOW_FRAME(1, 20) + PALETTE(68, 16, 0x60) TILES(0x1A50C, 2) SHOW_FRAME(1, 20) - END() + END() }; const s32 anim_0907__v21_l0[] = { // 0x08101F00 - PALETTE(68, 16, 0x60) - TILES(0x1A50E, 2) - SHOW_FRAME(1, 21) + PALETTE(68, 16, 0x60) TILES(0x1A50E, 2) SHOW_FRAME(1, 21) - END() + END() }; -const s32 * const anim_0907[22] = { - anim_0907__v0_l0, - anim_0907__v1_l0, - anim_0907__v2_l0, - anim_0907__v3_l0, - anim_0907__v4_l0, - anim_0907__v5_l0, - anim_0907__v6_l0, - anim_0907__v7_l0, - anim_0907__v8_l0, - anim_0907__v9_l0, - anim_0907__v10_l0, - anim_0907__v11_l0, - anim_0907__v12_l0, - anim_0907__v13_l0, - anim_0907__v14_l0, - anim_0907__v15_l0, - anim_0907__v16_l0, - anim_0907__v17_l0, - anim_0907__v18_l0, - anim_0907__v19_l0, - anim_0907__v20_l0, - anim_0907__v21_l0, +const s32 *const anim_0907[22] = { + anim_0907__v0_l0, anim_0907__v1_l0, anim_0907__v2_l0, anim_0907__v3_l0, anim_0907__v4_l0, anim_0907__v5_l0, + anim_0907__v6_l0, anim_0907__v7_l0, anim_0907__v8_l0, anim_0907__v9_l0, anim_0907__v10_l0, anim_0907__v11_l0, + anim_0907__v12_l0, anim_0907__v13_l0, anim_0907__v14_l0, anim_0907__v15_l0, anim_0907__v16_l0, anim_0907__v17_l0, + anim_0907__v18_l0, anim_0907__v19_l0, anim_0907__v20_l0, anim_0907__v21_l0, }; - diff --git a/sa1/src/data/sa1/entity_tables.c b/sa1/src/data/sa1/entity_tables.c index a8252e7e4..565162c76 100644 --- a/sa1/src/data/sa1/entity_tables.c +++ b/sa1/src/data/sa1/entity_tables.c @@ -1,5 +1,5 @@ #include "global.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" extern const u8 zone_1_act_1_rings[]; extern const u8 zone_1_act_2_rings[]; @@ -78,58 +78,37 @@ extern u8 chao_hunt_vs_zone_c_enemies[]; extern u8 chao_hunt_vs_zone_d_enemies[]; const RLCompressed *const gSpritePosData_rings[NUM_LEVEL_IDS] = { - (void *)&zone_1_act_1_rings, (void *)&zone_1_act_2_rings, - (void *)&zone_2_act_1_rings, (void *)&zone_2_act_2_rings, - (void *)&zone_3_act_1_rings, (void *)&zone_3_act_2_rings, - (void *)&zone_4_act_1_rings, (void *)&zone_4_act_2_rings, - (void *)&zone_5_act_1_rings, (void *)&zone_5_act_2_rings, - (void *)&zone_6_act_1_rings, (void *)&zone_6_act_2_rings, - (void *)&zone_7_act_1_rings, (void *)&zone_7_act_2_rings, - (void *)&chao_hunt_vs_zone_a_rings, (void *)&chao_hunt_vs_zone_b_rings, - (void *)&chao_hunt_vs_zone_c_rings, (void *)&chao_hunt_vs_zone_d_rings, + (void *)&zone_1_act_1_rings, (void *)&zone_1_act_2_rings, (void *)&zone_2_act_1_rings, + (void *)&zone_2_act_2_rings, (void *)&zone_3_act_1_rings, (void *)&zone_3_act_2_rings, + (void *)&zone_4_act_1_rings, (void *)&zone_4_act_2_rings, (void *)&zone_5_act_1_rings, + (void *)&zone_5_act_2_rings, (void *)&zone_6_act_1_rings, (void *)&zone_6_act_2_rings, + (void *)&zone_7_act_1_rings, (void *)&zone_7_act_2_rings, (void *)&chao_hunt_vs_zone_a_rings, + (void *)&chao_hunt_vs_zone_b_rings, (void *)&chao_hunt_vs_zone_c_rings, (void *)&chao_hunt_vs_zone_d_rings, }; const RLCompressed *const gSpritePosData_interactables[NUM_LEVEL_IDS] = { - (void *)&zone_1_act_1_interactables, - (void *)&zone_1_act_2_interactables, - (void *)&zone_2_act_1_interactables, - (void *)&zone_2_act_2_interactables, - (void *)&zone_3_act_1_interactables, - (void *)&zone_3_act_2_interactables, - (void *)&zone_4_act_1_interactables, - (void *)&zone_4_act_2_interactables, - (void *)&zone_5_act_1_interactables, - (void *)&zone_5_act_2_interactables, - (void *)&zone_6_act_1_interactables, - (void *)&zone_6_act_2_interactables, - (void *)&zone_7_act_1_interactables, - (void *)&zone_7_act_2_interactables, - (void *)&chao_hunt_vs_zone_a_interactables, - (void *)&chao_hunt_vs_zone_b_interactables, - (void *)&chao_hunt_vs_zone_c_interactables, - (void *)&chao_hunt_vs_zone_d_interactables, + (void *)&zone_1_act_1_interactables, (void *)&zone_1_act_2_interactables, (void *)&zone_2_act_1_interactables, + (void *)&zone_2_act_2_interactables, (void *)&zone_3_act_1_interactables, (void *)&zone_3_act_2_interactables, + (void *)&zone_4_act_1_interactables, (void *)&zone_4_act_2_interactables, (void *)&zone_5_act_1_interactables, + (void *)&zone_5_act_2_interactables, (void *)&zone_6_act_1_interactables, (void *)&zone_6_act_2_interactables, + (void *)&zone_7_act_1_interactables, (void *)&zone_7_act_2_interactables, (void *)&chao_hunt_vs_zone_a_interactables, + (void *)&chao_hunt_vs_zone_b_interactables, (void *)&chao_hunt_vs_zone_c_interactables, (void *)&chao_hunt_vs_zone_d_interactables, }; const RLCompressed *const gSpritePosData_itemboxes[NUM_LEVEL_IDS] = { - (void *)&zone_1_act_1_itemboxes, (void *)&zone_1_act_2_itemboxes, - (void *)&zone_2_act_1_itemboxes, (void *)&zone_2_act_2_itemboxes, - (void *)&zone_3_act_1_itemboxes, (void *)&zone_3_act_2_itemboxes, - (void *)&zone_4_act_1_itemboxes, (void *)&zone_4_act_2_itemboxes, - (void *)&zone_5_act_1_itemboxes, (void *)&zone_5_act_2_itemboxes, - (void *)&zone_6_act_1_itemboxes, (void *)&zone_6_act_2_itemboxes, - (void *)&zone_7_act_1_itemboxes, (void *)&zone_7_act_2_itemboxes, - (void *)&chao_hunt_vs_zone_a_itemboxes, (void *)&chao_hunt_vs_zone_b_itemboxes, - (void *)&chao_hunt_vs_zone_c_itemboxes, (void *)&chao_hunt_vs_zone_d_itemboxes, + (void *)&zone_1_act_1_itemboxes, (void *)&zone_1_act_2_itemboxes, (void *)&zone_2_act_1_itemboxes, + (void *)&zone_2_act_2_itemboxes, (void *)&zone_3_act_1_itemboxes, (void *)&zone_3_act_2_itemboxes, + (void *)&zone_4_act_1_itemboxes, (void *)&zone_4_act_2_itemboxes, (void *)&zone_5_act_1_itemboxes, + (void *)&zone_5_act_2_itemboxes, (void *)&zone_6_act_1_itemboxes, (void *)&zone_6_act_2_itemboxes, + (void *)&zone_7_act_1_itemboxes, (void *)&zone_7_act_2_itemboxes, (void *)&chao_hunt_vs_zone_a_itemboxes, + (void *)&chao_hunt_vs_zone_b_itemboxes, (void *)&chao_hunt_vs_zone_c_itemboxes, (void *)&chao_hunt_vs_zone_d_itemboxes, }; const RLCompressed *const gSpritePosData_enemies[NUM_LEVEL_IDS] = { - (void *)&zone_1_act_1_enemies, (void *)&zone_1_act_2_enemies, - (void *)&zone_2_act_1_enemies, (void *)&zone_2_act_2_enemies, - (void *)&zone_3_act_1_enemies, (void *)&zone_3_act_2_enemies, - (void *)&zone_4_act_1_enemies, (void *)&zone_4_act_2_enemies, - (void *)&zone_5_act_1_enemies, (void *)&zone_5_act_2_enemies, - (void *)&zone_6_act_1_enemies, (void *)&zone_6_act_2_enemies, - (void *)&zone_7_act_1_enemies, (void *)&zone_7_act_2_enemies, - (void *)&chao_hunt_vs_zone_a_enemies, (void *)&chao_hunt_vs_zone_b_enemies, - (void *)&chao_hunt_vs_zone_c_enemies, (void *)&chao_hunt_vs_zone_d_enemies, + (void *)&zone_1_act_1_enemies, (void *)&zone_1_act_2_enemies, (void *)&zone_2_act_1_enemies, + (void *)&zone_2_act_2_enemies, (void *)&zone_3_act_1_enemies, (void *)&zone_3_act_2_enemies, + (void *)&zone_4_act_1_enemies, (void *)&zone_4_act_2_enemies, (void *)&zone_5_act_1_enemies, + (void *)&zone_5_act_2_enemies, (void *)&zone_6_act_1_enemies, (void *)&zone_6_act_2_enemies, + (void *)&zone_7_act_1_enemies, (void *)&zone_7_act_2_enemies, (void *)&chao_hunt_vs_zone_a_enemies, + (void *)&chao_hunt_vs_zone_b_enemies, (void *)&chao_hunt_vs_zone_c_enemies, (void *)&chao_hunt_vs_zone_d_enemies, }; diff --git a/sa1/src/data/sa1/tilemap_table.c b/sa1/src/data/sa1/tilemap_table.c index d8da67553..a97b8449e 100644 --- a/sa1/src/data/sa1/tilemap_table.c +++ b/sa1/src/data/sa1/tilemap_table.c @@ -91,10 +91,10 @@ extern struct MapHeader *tilemap_89; #include "global.h" #include "tilemap.h" -#include "constants/tilemaps.h" +#include "constants/sa1/tilemaps.h" // 0x084ADD40 -const Tilemap * const gTilemaps[] = { +const Tilemap *const gTilemaps[] = { [0] = (Tilemap *)&zone_1_act_1_fg0, [1] = (Tilemap *)&zone_1_act_1_fg1, [2] = (Tilemap *)&zone_1_act_1_bg, diff --git a/sa1/src/game/sa1/menus/mp_mode_select.c b/sa1/src/game/sa1/menus/mp_mode_select.c index b159598cc..9d9c2aa0b 100644 --- a/sa1/src/game/sa1/menus/mp_mode_select.c +++ b/sa1/src/game/sa1/menus/mp_mode_select.c @@ -8,10 +8,10 @@ #include "game/sa1/save.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/text.h" /* NOTE: This module was split into two, because Task_800F9BC() would compile diff --git a/sa1/src/game/sa1/menus/mp_mode_select_2.c b/sa1/src/game/sa1/menus/mp_mode_select_2.c index 390d82fca..2b95205d7 100644 --- a/sa1/src/game/sa1/menus/mp_mode_select_2.c +++ b/sa1/src/game/sa1/menus/mp_mode_select_2.c @@ -17,10 +17,10 @@ #include "game/shared/stage/stage.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/text.h" /* NOTE: This module was split into two, because sa2__sub_80818B8() would compile diff --git a/sa1/src/game/sa1/menus/options.c b/sa1/src/game/sa1/menus/options.c index d05ff2b70..03a38897a 100644 --- a/sa1/src/game/sa1/menus/options.c +++ b/sa1/src/game/sa1/menus/options.c @@ -11,10 +11,10 @@ #include "game/sa1/stage/stage_ui.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" -#include "constants/text.h" // for UILANG_COUNT +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" // for UILANG_COUNT typedef struct OptionsMenu { /* 0x000 */ Sprite s0; diff --git a/sa1/src/game/sa1/menus/player_data.c b/sa1/src/game/sa1/menus/player_data.c index 3238c90e3..ba4458582 100644 --- a/sa1/src/game/sa1/menus/player_data.c +++ b/sa1/src/game/sa1/menus/player_data.c @@ -8,10 +8,10 @@ #include "game/sa1/save.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" -#include "constants/text.h" // for UILANG_COUNT +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" // for UILANG_COUNT typedef enum EPDM_Options { PDM_OPTION_SELECT_NAME, diff --git a/sa1/src/game/sa1/menus/time_attack.c b/sa1/src/game/sa1/menus/time_attack.c index 586a59c22..38f85bf61 100644 --- a/sa1/src/game/sa1/menus/time_attack.c +++ b/sa1/src/game/sa1/menus/time_attack.c @@ -8,8 +8,8 @@ #include "game/sa1/menus/title_screen.h" // CreateMainMenu #include "game/sa1/stage/stage_ui.h" // sub_805423C -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" typedef struct TimeAttackMenu { StrcUi_805423C unk0; diff --git a/sa1/src/game/sa1/menus/title_screen.c b/sa1/src/game/sa1/menus/title_screen.c index 15b8bcb07..26539bf84 100644 --- a/sa1/src/game/sa1/menus/title_screen.c +++ b/sa1/src/game/sa1/menus/title_screen.c @@ -24,12 +24,12 @@ #include "../chao_garden/include/program_params.h" #include "game/sa1/assets/compressed/roms.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/zones.h" #define MENU_ITEMS_TOP_Y 93 #define MENU_ITEMS_SPACE 14 diff --git a/sa1/src/game/sa1/multiplayer/chao_message.c b/sa1/src/game/sa1/multiplayer/chao_message.c index e6156e6e2..3cd2e3586 100644 --- a/sa1/src/game/sa1/multiplayer/chao_message.c +++ b/sa1/src/game/sa1/multiplayer/chao_message.c @@ -11,10 +11,10 @@ #include "game/sa1/save.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" +#include "constants/sa1/tilemaps.h" #define CM_BACKGROUND_COLOR RGB16_REV(0, 27, 30) diff --git a/sa1/src/game/sa1/special_stage/main.c b/sa1/src/game/sa1/special_stage/main.c index c13a38901..fcc8ca939 100644 --- a/sa1/src/game/sa1/special_stage/main.c +++ b/sa1/src/game/sa1/special_stage/main.c @@ -15,10 +15,10 @@ extern struct MP2KSongHeader se_ring_copy; -#include "constants/animations.h" -#include "constants/tilemaps.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct Strc_30055E0 { u8 unk0; diff --git a/sa1/src/game/sa1/stage/backgrounds/zone_4_init.c b/sa1/src/game/sa1/stage/backgrounds/zone_4_init.c index 92e0df4e1..76a9f8e99 100644 --- a/sa1/src/game/sa1/stage/backgrounds/zone_4_init.c +++ b/sa1/src/game/sa1/stage/backgrounds/zone_4_init.c @@ -5,7 +5,7 @@ #include "game/shared/stage/camera.h" #include "game/sa1/stage/backgrounds/zone_5.h" -#include "constants/tilemaps.h" +#include "constants/sa1/tilemaps.h" void CreateStageBg_Zone4(void) { diff --git a/sa1/src/game/sa1/stage/backgrounds/zone_5_init.c b/sa1/src/game/sa1/stage/backgrounds/zone_5_init.c index 4acb173c9..bf14788b3 100644 --- a/sa1/src/game/sa1/stage/backgrounds/zone_5_init.c +++ b/sa1/src/game/sa1/stage/backgrounds/zone_5_init.c @@ -5,7 +5,7 @@ #include "game/shared/stage/camera.h" #include "game/sa1/stage/backgrounds/zone_5.h" -#include "constants/tilemaps.h" +#include "constants/sa1/tilemaps.h" void CreateStageBg_Zone5(void) { diff --git a/sa1/src/game/sa1/stage/camera_destroy.c b/sa1/src/game/sa1/stage/camera_destroy.c index 9115dd286..73968a8d4 100644 --- a/sa1/src/game/sa1/stage/camera_destroy.c +++ b/sa1/src/game/sa1/stage/camera_destroy.c @@ -4,7 +4,7 @@ #include "game/shared/stage/camera.h" #include "game/globals.h" #include "game/shared/stage/camera.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" static void Task_CallUpdateCameraInternal(void); diff --git a/sa1/src/game/sa1/stage/egg_rocket_transitions.c b/sa1/src/game/sa1/stage/egg_rocket_transitions.c index 52c8b32a4..f3795e2b2 100644 --- a/sa1/src/game/sa1/stage/egg_rocket_transitions.c +++ b/sa1/src/game/sa1/stage/egg_rocket_transitions.c @@ -12,9 +12,9 @@ #include "game/shared/stage/screen_shake.h" #include "lib/m4a/m4a.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ struct Task *t; diff --git a/sa1/src/game/sa1/stage/enemies/boss_1_egg_hammer_tank.c b/sa1/src/game/sa1/stage/enemies/boss_1_egg_hammer_tank.c index 45c7666c3..bb05db11d 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_1_egg_hammer_tank.c +++ b/sa1/src/game/sa1/stage/enemies/boss_1_egg_hammer_tank.c @@ -12,9 +12,9 @@ #include "game/shared/stage/screen_shake.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" typedef struct EHTArm { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/enemies/boss_2_egg_press.c b/sa1/src/game/sa1/stage/enemies/boss_2_egg_press.c index 312d401a9..68144e990 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_2_egg_press.c +++ b/sa1/src/game/sa1/stage/enemies/boss_2_egg_press.c @@ -12,10 +12,10 @@ #include "game/shared/stage/screen_shake.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct EggPress { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/enemies/boss_3_egg_ball.c b/sa1/src/game/sa1/stage/enemies/boss_3_egg_ball.c index 9e21f9cf3..112ef5632 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_3_egg_ball.c +++ b/sa1/src/game/sa1/stage/enemies/boss_3_egg_ball.c @@ -12,10 +12,10 @@ #include "game/shared/stage/screen_shake.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct EggBall { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/enemies/boss_4_egg_spider.c b/sa1/src/game/sa1/stage/enemies/boss_4_egg_spider.c index c3303d49d..2c6753ecc 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_4_egg_spider.c +++ b/sa1/src/game/sa1/stage/enemies/boss_4_egg_spider.c @@ -14,10 +14,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" #include "game/shared/stage/underwater_effects.h" typedef struct EggSpider { diff --git a/sa1/src/game/sa1/stage/enemies/boss_5_mecha_knuckles.c b/sa1/src/game/sa1/stage/enemies/boss_5_mecha_knuckles.c index 66f27b246..537fdefaf 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_5_mecha_knuckles.c +++ b/sa1/src/game/sa1/stage/enemies/boss_5_mecha_knuckles.c @@ -15,10 +15,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" #include "game/shared/stage/underwater_effects.h" // TODO: Automate inserting 'MECHA_KNUX_PARTS_VARIANTS' from animation itself! diff --git a/sa1/src/game/sa1/stage/enemies/boss_6_egg_snake.c b/sa1/src/game/sa1/stage/enemies/boss_6_egg_snake.c index cd476b39d..8b42a3066 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_6_egg_snake.c +++ b/sa1/src/game/sa1/stage/enemies/boss_6_egg_snake.c @@ -11,9 +11,9 @@ #include "game/sa1/ui/stage_results.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" #define NUM_SEGMENTS 9 diff --git a/sa1/src/game/sa1/stage/enemies/boss_x1_egg_wrecker.c b/sa1/src/game/sa1/stage/enemies/boss_x1_egg_wrecker.c index ccb74ca7c..4b18e8f8b 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_x1_egg_wrecker.c +++ b/sa1/src/game/sa1/stage/enemies/boss_x1_egg_wrecker.c @@ -9,9 +9,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" /* Sonic 1's Green Hill Zone Boss */ diff --git a/sa1/src/game/sa1/stage/enemies/boss_x2_egg_drillster.c b/sa1/src/game/sa1/stage/enemies/boss_x2_egg_drillster.c index 3044ba0ad..ef5384b2a 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_x2_egg_drillster.c +++ b/sa1/src/game/sa1/stage/enemies/boss_x2_egg_drillster.c @@ -9,9 +9,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" /* Sonic 2 - emerald hill boss */ diff --git a/sa1/src/game/sa1/stage/enemies/boss_x3_egg_x.c b/sa1/src/game/sa1/stage/enemies/boss_x3_egg_x.c index 467b68996..f3835b17a 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_x3_egg_x.c +++ b/sa1/src/game/sa1/stage/enemies/boss_x3_egg_x.c @@ -16,11 +16,11 @@ #include "game/shared/stage/stage.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" // for ALL_ZONE_CHAOS_EMERALDS +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" // for ALL_ZONE_CHAOS_EMERALDS /* X-Zone Final Boss */ diff --git a/sa1/src/game/sa1/stage/enemies/boss_xtra_super_egg_robot.c b/sa1/src/game/sa1/stage/enemies/boss_xtra_super_egg_robot.c index 356075a88..471e88fa3 100644 --- a/sa1/src/game/sa1/stage/enemies/boss_xtra_super_egg_robot.c +++ b/sa1/src/game/sa1/stage/enemies/boss_xtra_super_egg_robot.c @@ -15,10 +15,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/stage/enemies/boss_xtra_super_egg_robo.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" /* Extra Zone Boss - Super Egg Robot */ diff --git a/sa1/src/game/sa1/stage/enemies/bosses_egg_mobile.c b/sa1/src/game/sa1/stage/enemies/bosses_egg_mobile.c index 0d8c814ef..aec51ac14 100644 --- a/sa1/src/game/sa1/stage/enemies/bosses_egg_mobile.c +++ b/sa1/src/game/sa1/stage/enemies/bosses_egg_mobile.c @@ -7,11 +7,11 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" /* TODO: Maybe inline this file into bosses_misc.c ? */ diff --git a/sa1/src/game/sa1/stage/enemies/bosses_misc.c b/sa1/src/game/sa1/stage/enemies/bosses_misc.c index 06fa97ab6..fdc2cf63a 100644 --- a/sa1/src/game/sa1/stage/enemies/bosses_misc.c +++ b/sa1/src/game/sa1/stage/enemies/bosses_misc.c @@ -12,12 +12,12 @@ #include "game/sa1/ui/stage_results.h" // CreateStageResults #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct BossCapsule { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/enemies/buzzer.c b/sa1/src/game/sa1/stage/enemies/buzzer.c index ee4d7ecec..01bb6dceb 100644 --- a/sa1/src/game/sa1/stage/enemies/buzzer.c +++ b/sa1/src/game/sa1/stage/enemies/buzzer.c @@ -8,9 +8,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { EntityShared shared; diff --git a/sa1/src/game/sa1/stage/enemies/drisame.c b/sa1/src/game/sa1/stage/enemies/drisame.c index 8b7d250c2..e2dc63459 100644 --- a/sa1/src/game/sa1/stage/enemies/drisame.c +++ b/sa1/src/game/sa1/stage/enemies/drisame.c @@ -5,9 +5,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/enemies/fireball.c b/sa1/src/game/sa1/stage/enemies/fireball.c index ba5ffc9a1..add63137d 100644 --- a/sa1/src/game/sa1/stage/enemies/fireball.c +++ b/sa1/src/game/sa1/stage/enemies/fireball.c @@ -4,9 +4,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" #define NUM_SPARKS 2 #define FIREBALL_SPAWN_RATE TIME(0, 4) diff --git a/sa1/src/game/sa1/stage/enemies/gamigami.c b/sa1/src/game/sa1/stage/enemies/gamigami.c index 09128f077..36ff51bc5 100644 --- a/sa1/src/game/sa1/stage/enemies/gamigami.c +++ b/sa1/src/game/sa1/stage/enemies/gamigami.c @@ -5,9 +5,9 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ EntityShared shared; diff --git a/sa1/src/game/sa1/stage/enemies/hanabii.c b/sa1/src/game/sa1/stage/enemies/hanabii.c index cdc577464..1a9e5d6c5 100644 --- a/sa1/src/game/sa1/stage/enemies/hanabii.c +++ b/sa1/src/game/sa1/stage/enemies/hanabii.c @@ -6,8 +6,8 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/kerokero.c b/sa1/src/game/sa1/stage/enemies/kerokero.c index f79d9098f..d9a8af423 100644 --- a/sa1/src/game/sa1/stage/enemies/kerokero.c +++ b/sa1/src/game/sa1/stage/enemies/kerokero.c @@ -6,7 +6,7 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { EntityShared shared; diff --git a/sa1/src/game/sa1/stage/enemies/kiki.c b/sa1/src/game/sa1/stage/enemies/kiki.c index f260d0879..3e9b41ada 100644 --- a/sa1/src/game/sa1/stage/enemies/kiki.c +++ b/sa1/src/game/sa1/stage/enemies/kiki.c @@ -6,9 +6,9 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" /* TODO: Streamline all the gamespecific differences (using const etc.) */ diff --git a/sa1/src/game/sa1/stage/enemies/kuraa.c b/sa1/src/game/sa1/stage/enemies/kuraa.c index a5f7cb836..de34a98ac 100644 --- a/sa1/src/game/sa1/stage/enemies/kuraa.c +++ b/sa1/src/game/sa1/stage/enemies/kuraa.c @@ -4,8 +4,8 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/leon.c b/sa1/src/game/sa1/stage/enemies/leon.c index dbc230167..da0c78069 100644 --- a/sa1/src/game/sa1/stage/enemies/leon.c +++ b/sa1/src/game/sa1/stage/enemies/leon.c @@ -7,8 +7,8 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/mirror.c b/sa1/src/game/sa1/stage/enemies/mirror.c index 17333e9e4..5a8f0181b 100644 --- a/sa1/src/game/sa1/stage/enemies/mirror.c +++ b/sa1/src/game/sa1/stage/enemies/mirror.c @@ -6,9 +6,9 @@ #include "game/shared/stage/entities_manager.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef enum { DIR_LEFT = 0, diff --git a/sa1/src/game/sa1/stage/enemies/mole.c b/sa1/src/game/sa1/stage/enemies/mole.c index c918b1b4a..763dcf772 100644 --- a/sa1/src/game/sa1/stage/enemies/mole.c +++ b/sa1/src/game/sa1/stage/enemies/mole.c @@ -4,8 +4,8 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/oct.c b/sa1/src/game/sa1/stage/enemies/oct.c index 5f0a85de5..11bdc1a2a 100644 --- a/sa1/src/game/sa1/stage/enemies/oct.c +++ b/sa1/src/game/sa1/stage/enemies/oct.c @@ -5,9 +5,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/pen_mk1.c b/sa1/src/game/sa1/stage/enemies/pen_mk1.c index 56f73bfba..f80691495 100644 --- a/sa1/src/game/sa1/stage/enemies/pen_mk1.c +++ b/sa1/src/game/sa1/stage/enemies/pen_mk1.c @@ -7,9 +7,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" // NOTE: Not the same jet-powered Pen enemy as in SA2. // This one shoots ice balls that slide on the ground. diff --git a/sa1/src/game/sa1/stage/enemies/pierrot.c b/sa1/src/game/sa1/stage/enemies/pierrot.c index e28f9ae8f..6e84949d1 100644 --- a/sa1/src/game/sa1/stage/enemies/pierrot.c +++ b/sa1/src/game/sa1/stage/enemies/pierrot.c @@ -6,9 +6,9 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/move_states.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/rhinotank.c b/sa1/src/game/sa1/stage/enemies/rhinotank.c index f3c7fcde0..d9d5003ba 100644 --- a/sa1/src/game/sa1/stage/enemies/rhinotank.c +++ b/sa1/src/game/sa1/stage/enemies/rhinotank.c @@ -7,7 +7,7 @@ #include "game/shared/stage/entities_manager.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/enemies/senbon.c b/sa1/src/game/sa1/stage/enemies/senbon.c index 0abd509c9..82dd21fc8 100644 --- a/sa1/src/game/sa1/stage/enemies/senbon.c +++ b/sa1/src/game/sa1/stage/enemies/senbon.c @@ -5,8 +5,8 @@ #include "game/sa1/save.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ EntityShared shared; diff --git a/sa1/src/game/sa1/stage/enemies/slot.c b/sa1/src/game/sa1/stage/enemies/slot.c index f2c7e4cbd..f8a066769 100644 --- a/sa1/src/game/sa1/stage/enemies/slot.c +++ b/sa1/src/game/sa1/stage/enemies/slot.c @@ -7,9 +7,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/enemies/tentou.c b/sa1/src/game/sa1/stage/enemies/tentou.c index 54bf0b0b7..ce28b4fee 100644 --- a/sa1/src/game/sa1/stage/enemies/tentou.c +++ b/sa1/src/game/sa1/stage/enemies/tentou.c @@ -7,9 +7,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" #define NUM_PROJECTILES 2 #define TENTOU_ATTACK_INIT_DISTANCE 80 diff --git a/sa1/src/game/sa1/stage/enemies/wamu.c b/sa1/src/game/sa1/stage/enemies/wamu.c index 68aa74be4..59aed6c55 100644 --- a/sa1/src/game/sa1/stage/enemies/wamu.c +++ b/sa1/src/game/sa1/stage/enemies/wamu.c @@ -7,9 +7,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" #define NUM_STORED_POSITIONS 64 diff --git a/sa1/src/game/sa1/stage/enemies/yukimaru.c b/sa1/src/game/sa1/stage/enemies/yukimaru.c index 5664315b8..1aaac570b 100644 --- a/sa1/src/game/sa1/stage/enemies/yukimaru.c +++ b/sa1/src/game/sa1/stage/enemies/yukimaru.c @@ -7,9 +7,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/interactables/034.c b/sa1/src/game/sa1/stage/interactables/034.c index 582340129..750a2bcce 100644 --- a/sa1/src/game/sa1/stage/interactables/034.c +++ b/sa1/src/game/sa1/stage/interactables/034.c @@ -5,8 +5,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/entity.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ MapEntity *me; diff --git a/sa1/src/game/sa1/stage/interactables/096.c b/sa1/src/game/sa1/stage/interactables/096.c index ce53d77d3..e7d418af7 100644 --- a/sa1/src/game/sa1/stage/interactables/096.c +++ b/sa1/src/game/sa1/stage/interactables/096.c @@ -3,7 +3,7 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/player.h" -#include "constants/char_states.h" +#include "constants/sa1/char_states.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/107.c b/sa1/src/game/sa1/stage/interactables/107.c index 57cef5472..5ddc3e0fd 100644 --- a/sa1/src/game/sa1/stage/interactables/107.c +++ b/sa1/src/game/sa1/stage/interactables/107.c @@ -7,10 +7,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/113.c b/sa1/src/game/sa1/stage/interactables/113.c index dc26ea3e2..0861c4236 100644 --- a/sa1/src/game/sa1/stage/interactables/113.c +++ b/sa1/src/game/sa1/stage/interactables/113.c @@ -3,7 +3,7 @@ #include "game/shared/stage/entity.h" #include "game/sa1/stage/player_controls.h" -#include "constants/move_states.h" +#include "constants/sa1/move_states.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/air_bubbles.c b/sa1/src/game/sa1/stage/interactables/air_bubbles.c index 84074d177..848182046 100644 --- a/sa1/src/game/sa1/stage/interactables/air_bubbles.c +++ b/sa1/src/game/sa1/stage/interactables/air_bubbles.c @@ -7,11 +7,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/booster.c b/sa1/src/game/sa1/stage/interactables/booster.c index f53e459ea..8252f0535 100644 --- a/sa1/src/game/sa1/stage/interactables/booster.c +++ b/sa1/src/game/sa1/stage/interactables/booster.c @@ -9,10 +9,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/boulder_spawner.c b/sa1/src/game/sa1/stage/interactables/boulder_spawner.c index 463ef44b3..1c535e648 100644 --- a/sa1/src/game/sa1/stage/interactables/boulder_spawner.c +++ b/sa1/src/game/sa1/stage/interactables/boulder_spawner.c @@ -10,12 +10,12 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" #define BOULDER_SPAWN_RATE TIME(0, 2) diff --git a/sa1/src/game/sa1/stage/interactables/bounce_block.c b/sa1/src/game/sa1/stage/interactables/bounce_block.c index f6a7ae3c2..92108faae 100644 --- a/sa1/src/game/sa1/stage/interactables/bounce_block.c +++ b/sa1/src/game/sa1/stage/interactables/bounce_block.c @@ -7,10 +7,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/bowl.c b/sa1/src/game/sa1/stage/interactables/bowl.c index f62410d79..a8445821c 100644 --- a/sa1/src/game/sa1/stage/interactables/bowl.c +++ b/sa1/src/game/sa1/stage/interactables/bowl.c @@ -7,12 +7,12 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/breakable_wall.c b/sa1/src/game/sa1/stage/interactables/breakable_wall.c index 6169b06eb..159925525 100644 --- a/sa1/src/game/sa1/stage/interactables/breakable_wall.c +++ b/sa1/src/game/sa1/stage/interactables/breakable_wall.c @@ -8,10 +8,10 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" // TODO: Rename #define NUM_OUTER_ELEMS 8 diff --git a/sa1/src/game/sa1/stage/interactables/bumpers.c b/sa1/src/game/sa1/stage/interactables/bumpers.c index deccde6b3..93f5d1295 100644 --- a/sa1/src/game/sa1/stage/interactables/bumpers.c +++ b/sa1/src/game/sa1/stage/interactables/bumpers.c @@ -11,12 +11,12 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/carousel.c b/sa1/src/game/sa1/stage/interactables/carousel.c index cdaaff02b..635412d8e 100644 --- a/sa1/src/game/sa1/stage/interactables/carousel.c +++ b/sa1/src/game/sa1/stage/interactables/carousel.c @@ -10,11 +10,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/checkpoint.c b/sa1/src/game/sa1/stage/interactables/checkpoint.c index 35c166ab7..051726f4c 100644 --- a/sa1/src/game/sa1/stage/interactables/checkpoint.c +++ b/sa1/src/game/sa1/stage/interactables/checkpoint.c @@ -7,9 +7,9 @@ #include "game/shared/stage/entities_manager.h" #include "game/sa1/stage/egg_rocket_transitions.h" -#include "constants/animations.h" -#include "constants/move_states.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/interactables/conveyor_belt_movement.c b/sa1/src/game/sa1/stage/interactables/conveyor_belt_movement.c index e725506a8..1e40e68d1 100644 --- a/sa1/src/game/sa1/stage/interactables/conveyor_belt_movement.c +++ b/sa1/src/game/sa1/stage/interactables/conveyor_belt_movement.c @@ -3,7 +3,7 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/conveyor_belt_object.c b/sa1/src/game/sa1/stage/interactables/conveyor_belt_object.c index 5d4c32177..d3de230bf 100644 --- a/sa1/src/game/sa1/stage/interactables/conveyor_belt_object.c +++ b/sa1/src/game/sa1/stage/interactables/conveyor_belt_object.c @@ -4,8 +4,8 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/crane_claw_and_lift.c b/sa1/src/game/sa1/stage/interactables/crane_claw_and_lift.c index 69440d75f..b91c84818 100644 --- a/sa1/src/game/sa1/stage/interactables/crane_claw_and_lift.c +++ b/sa1/src/game/sa1/stage/interactables/crane_claw_and_lift.c @@ -10,11 +10,11 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/decoration.c b/sa1/src/game/sa1/stage/interactables/decoration.c index f0381bc07..36a667ce2 100644 --- a/sa1/src/game/sa1/stage/interactables/decoration.c +++ b/sa1/src/game/sa1/stage/interactables/decoration.c @@ -14,12 +14,12 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/interactables/ferris_wheel.c b/sa1/src/game/sa1/stage/interactables/ferris_wheel.c index eb3faa340..755bee14b 100644 --- a/sa1/src/game/sa1/stage/interactables/ferris_wheel.c +++ b/sa1/src/game/sa1/stage/interactables/ferris_wheel.c @@ -8,10 +8,10 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/flipper_small_blue.c b/sa1/src/game/sa1/stage/interactables/flipper_small_blue.c index 5f81e2f70..f419c17e5 100644 --- a/sa1/src/game/sa1/stage/interactables/flipper_small_blue.c +++ b/sa1/src/game/sa1/stage/interactables/flipper_small_blue.c @@ -9,11 +9,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/flippers.c b/sa1/src/game/sa1/stage/interactables/flippers.c index d9b83e74d..c5d6c7885 100644 --- a/sa1/src/game/sa1/stage/interactables/flippers.c +++ b/sa1/src/game/sa1/stage/interactables/flippers.c @@ -7,9 +7,9 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/forced_slide.c b/sa1/src/game/sa1/stage/interactables/forced_slide.c index 28869a1f7..5e09841df 100644 --- a/sa1/src/game/sa1/stage/interactables/forced_slide.c +++ b/sa1/src/game/sa1/stage/interactables/forced_slide.c @@ -7,10 +7,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/grind_rail.c b/sa1/src/game/sa1/stage/interactables/grind_rail.c index 73a69ef83..552b16ae3 100644 --- a/sa1/src/game/sa1/stage/interactables/grind_rail.c +++ b/sa1/src/game/sa1/stage/interactables/grind_rail.c @@ -7,8 +7,8 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/player_controls.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { u16 frameCount; diff --git a/sa1/src/game/sa1/stage/interactables/half_pipe.c b/sa1/src/game/sa1/stage/interactables/half_pipe.c index 3e7bc16aa..3908a3615 100644 --- a/sa1/src/game/sa1/stage/interactables/half_pipe.c +++ b/sa1/src/game/sa1/stage/interactables/half_pipe.c @@ -4,7 +4,7 @@ #include "game/shared/stage/entity.h" #include "game/sa1/stage/player_controls.h" -#include "constants/char_states.h" +#include "constants/sa1/char_states.h" typedef struct { /* 0x00 */ MapEntity *me; diff --git a/sa1/src/game/sa1/stage/interactables/hang_bar.c b/sa1/src/game/sa1/stage/interactables/hang_bar.c index 45556c290..cee1c8089 100644 --- a/sa1/src/game/sa1/stage/interactables/hang_bar.c +++ b/sa1/src/game/sa1/stage/interactables/hang_bar.c @@ -8,9 +8,9 @@ #include "game/shared/stage/collision.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/hook_rail.c b/sa1/src/game/sa1/stage/interactables/hook_rail.c index 4523e9638..0cc3c4ad6 100644 --- a/sa1/src/game/sa1/stage/interactables/hook_rail.c +++ b/sa1/src/game/sa1/stage/interactables/hook_rail.c @@ -5,10 +5,10 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/ice_block.c b/sa1/src/game/sa1/stage/interactables/ice_block.c index dc5beedb4..24dd9d472 100644 --- a/sa1/src/game/sa1/stage/interactables/ice_block.c +++ b/sa1/src/game/sa1/stage/interactables/ice_block.c @@ -12,11 +12,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ EntityShared shared; diff --git a/sa1/src/game/sa1/stage/interactables/incline_ramp.c b/sa1/src/game/sa1/stage/interactables/incline_ramp.c index bd5e54f55..489239b9e 100644 --- a/sa1/src/game/sa1/stage/interactables/incline_ramp.c +++ b/sa1/src/game/sa1/stage/interactables/incline_ramp.c @@ -5,9 +5,9 @@ #include "game/shared/stage/player.h" #include "lib/m4a/m4a.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" typedef struct { // SpriteBase-ish diff --git a/sa1/src/game/sa1/stage/interactables/iron_ball.c b/sa1/src/game/sa1/stage/interactables/iron_ball.c index 71e7d213d..73632c985 100644 --- a/sa1/src/game/sa1/stage/interactables/iron_ball.c +++ b/sa1/src/game/sa1/stage/interactables/iron_ball.c @@ -5,8 +5,8 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/lava.c b/sa1/src/game/sa1/stage/interactables/lava.c index e2919b372..85b848ce3 100644 --- a/sa1/src/game/sa1/stage/interactables/lava.c +++ b/sa1/src/game/sa1/stage/interactables/lava.c @@ -3,7 +3,7 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/move_states.h" +#include "constants/sa1/move_states.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/marble_track.c b/sa1/src/game/sa1/stage/interactables/marble_track.c index 11d50b236..1040dd75c 100644 --- a/sa1/src/game/sa1/stage/interactables/marble_track.c +++ b/sa1/src/game/sa1/stage/interactables/marble_track.c @@ -11,11 +11,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/maze_air_corner.c b/sa1/src/game/sa1/stage/interactables/maze_air_corner.c index 422d01f6f..bdfd5f1a6 100644 --- a/sa1/src/game/sa1/stage/interactables/maze_air_corner.c +++ b/sa1/src/game/sa1/stage/interactables/maze_air_corner.c @@ -3,9 +3,9 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/vram_hardcoded.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/moving_spring.c b/sa1/src/game/sa1/stage/interactables/moving_spring.c index ab050a896..b23f5c4c7 100644 --- a/sa1/src/game/sa1/stage/interactables/moving_spring.c +++ b/sa1/src/game/sa1/stage/interactables/moving_spring.c @@ -11,12 +11,12 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/panel_gate.c b/sa1/src/game/sa1/stage/interactables/panel_gate.c index c635a3748..250895fb1 100644 --- a/sa1/src/game/sa1/stage/interactables/panel_gate.c +++ b/sa1/src/game/sa1/stage/interactables/panel_gate.c @@ -8,10 +8,10 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/party_balloon.c b/sa1/src/game/sa1/stage/interactables/party_balloon.c index 2c3f44db5..795dbec17 100644 --- a/sa1/src/game/sa1/stage/interactables/party_balloon.c +++ b/sa1/src/game/sa1/stage/interactables/party_balloon.c @@ -8,9 +8,9 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" void Task_PartyBalloon(void); void Task_PartyBalloonPopped(void); diff --git a/sa1/src/game/sa1/stage/interactables/pipe.c b/sa1/src/game/sa1/stage/interactables/pipe.c index f93e6acfe..dfbbdb0c4 100644 --- a/sa1/src/game/sa1/stage/interactables/pipe.c +++ b/sa1/src/game/sa1/stage/interactables/pipe.c @@ -14,12 +14,12 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/platform_crumbling.c b/sa1/src/game/sa1/stage/interactables/platform_crumbling.c index 1ee5644ac..91477c638 100644 --- a/sa1/src/game/sa1/stage/interactables/platform_crumbling.c +++ b/sa1/src/game/sa1/stage/interactables/platform_crumbling.c @@ -11,11 +11,11 @@ #include "game/shared/stage/collision.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/platform_spiked.c b/sa1/src/game/sa1/stage/interactables/platform_spiked.c index 93a7a3e43..5839ea8db 100644 --- a/sa1/src/game/sa1/stage/interactables/platform_spiked.c +++ b/sa1/src/game/sa1/stage/interactables/platform_spiked.c @@ -10,12 +10,12 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/platform_square.c b/sa1/src/game/sa1/stage/interactables/platform_square.c index 8c7b4d404..87e98fd8d 100644 --- a/sa1/src/game/sa1/stage/interactables/platform_square.c +++ b/sa1/src/game/sa1/stage/interactables/platform_square.c @@ -9,10 +9,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/platform_thin.c b/sa1/src/game/sa1/stage/interactables/platform_thin.c index 481e1f355..66f24285f 100644 --- a/sa1/src/game/sa1/stage/interactables/platform_thin.c +++ b/sa1/src/game/sa1/stage/interactables/platform_thin.c @@ -9,12 +9,12 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/platforms_085_089.c b/sa1/src/game/sa1/stage/interactables/platforms_085_089.c index 545f85ec2..d4094688c 100644 --- a/sa1/src/game/sa1/stage/interactables/platforms_085_089.c +++ b/sa1/src/game/sa1/stage/interactables/platforms_085_089.c @@ -10,10 +10,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/stage/stage_ui.h" // for sub_80549FC -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" /* Platform that falls and slides once the player steps on it */ diff --git a/sa1/src/game/sa1/stage/interactables/propeller.c b/sa1/src/game/sa1/stage/interactables/propeller.c index 017202746..25075e974 100644 --- a/sa1/src/game/sa1/stage/interactables/propeller.c +++ b/sa1/src/game/sa1/stage/interactables/propeller.c @@ -2,8 +2,8 @@ #include "malloc_vram.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/red_flag_and_pole.c b/sa1/src/game/sa1/stage/interactables/red_flag_and_pole.c index 53b8c62f3..4abf049f2 100644 --- a/sa1/src/game/sa1/stage/interactables/red_flag_and_pole.c +++ b/sa1/src/game/sa1/stage/interactables/red_flag_and_pole.c @@ -5,10 +5,10 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/run_wheel.c b/sa1/src/game/sa1/stage/interactables/run_wheel.c index 7891a85b2..072a3f1e4 100644 --- a/sa1/src/game/sa1/stage/interactables/run_wheel.c +++ b/sa1/src/game/sa1/stage/interactables/run_wheel.c @@ -7,10 +7,10 @@ #include "game/shared/stage/collision.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/security_gate.c b/sa1/src/game/sa1/stage/interactables/security_gate.c index e855f0ccf..17b0e5f8a 100644 --- a/sa1/src/game/sa1/stage/interactables/security_gate.c +++ b/sa1/src/game/sa1/stage/interactables/security_gate.c @@ -5,7 +5,7 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/sega_sonic_letters.c b/sa1/src/game/sa1/stage/interactables/sega_sonic_letters.c index 346d70f1b..ba83286cc 100644 --- a/sa1/src/game/sa1/stage/interactables/sega_sonic_letters.c +++ b/sa1/src/game/sa1/stage/interactables/sega_sonic_letters.c @@ -5,7 +5,7 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/ship_swing.c b/sa1/src/game/sa1/stage/interactables/ship_swing.c index ca3334126..2bd52eb21 100644 --- a/sa1/src/game/sa1/stage/interactables/ship_swing.c +++ b/sa1/src/game/sa1/stage/interactables/ship_swing.c @@ -6,7 +6,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/shrubbery.c b/sa1/src/game/sa1/stage/interactables/shrubbery.c index 1547efbed..b1b5162df 100644 --- a/sa1/src/game/sa1/stage/interactables/shrubbery.c +++ b/sa1/src/game/sa1/stage/interactables/shrubbery.c @@ -4,8 +4,8 @@ #include "lib/m4a/m4a.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ u8 filler0[0x0C]; diff --git a/sa1/src/game/sa1/stage/interactables/skating_stone.c b/sa1/src/game/sa1/stage/interactables/skating_stone.c index eac4278a4..ef4cd7da2 100644 --- a/sa1/src/game/sa1/stage/interactables/skating_stone.c +++ b/sa1/src/game/sa1/stage/interactables/skating_stone.c @@ -10,10 +10,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa1/stage/stage_ui.h" // for sub_80549FC -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" /* Platform that falls and slides once the player steps on it */ diff --git a/sa1/src/game/sa1/stage/interactables/small_fall_block.c b/sa1/src/game/sa1/stage/interactables/small_fall_block.c index b8f9bf50d..aa6e83232 100644 --- a/sa1/src/game/sa1/stage/interactables/small_fall_block.c +++ b/sa1/src/game/sa1/stage/interactables/small_fall_block.c @@ -6,7 +6,7 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/mp_event_mgr.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" /* Blocks that fall down after stepping on them, in X-Zone */ diff --git a/sa1/src/game/sa1/stage/interactables/special_spring.c b/sa1/src/game/sa1/stage/interactables/special_spring.c index b9343256e..33b59e0fe 100644 --- a/sa1/src/game/sa1/stage/interactables/special_spring.c +++ b/sa1/src/game/sa1/stage/interactables/special_spring.c @@ -8,10 +8,10 @@ #include "game/shared/stage/player.h" #include "game/sa1/special_stage/main.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/spiked_barrel.c b/sa1/src/game/sa1/stage/interactables/spiked_barrel.c index a6b8932d7..a72e29575 100644 --- a/sa1/src/game/sa1/stage/interactables/spiked_barrel.c +++ b/sa1/src/game/sa1/stage/interactables/spiked_barrel.c @@ -6,8 +6,8 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/spikes.c b/sa1/src/game/sa1/stage/interactables/spikes.c index e890d60ca..8f4ef8a40 100644 --- a/sa1/src/game/sa1/stage/interactables/spikes.c +++ b/sa1/src/game/sa1/stage/interactables/spikes.c @@ -11,12 +11,12 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/spring.c b/sa1/src/game/sa1/stage/interactables/spring.c index d13c082f2..976b7c4f5 100644 --- a/sa1/src/game/sa1/stage/interactables/spring.c +++ b/sa1/src/game/sa1/stage/interactables/spring.c @@ -10,10 +10,10 @@ #include "game/shared/stage/collision.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/spring_hiding.c b/sa1/src/game/sa1/stage/interactables/spring_hiding.c index d2654924a..7ff78ad1d 100644 --- a/sa1/src/game/sa1/stage/interactables/spring_hiding.c +++ b/sa1/src/game/sa1/stage/interactables/spring_hiding.c @@ -6,9 +6,9 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/stage_goal.c b/sa1/src/game/sa1/stage/interactables/stage_goal.c index 75a671a7d..2c8426313 100644 --- a/sa1/src/game/sa1/stage/interactables/stage_goal.c +++ b/sa1/src/game/sa1/stage/interactables/stage_goal.c @@ -11,10 +11,10 @@ #include "game/shared/stage/player.h" #include "game/sa1/ui/stage_results.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { // NOTE: EntityShared HAS to be the first element, diff --git a/sa1/src/game/sa1/stage/interactables/steam_exhaust.c b/sa1/src/game/sa1/stage/interactables/steam_exhaust.c index 9af855332..d98f5284c 100644 --- a/sa1/src/game/sa1/stage/interactables/steam_exhaust.c +++ b/sa1/src/game/sa1/stage/interactables/steam_exhaust.c @@ -10,11 +10,11 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/swing_rope.c b/sa1/src/game/sa1/stage/interactables/swing_rope.c index dde1280f9..7d8af5555 100644 --- a/sa1/src/game/sa1/stage/interactables/swing_rope.c +++ b/sa1/src/game/sa1/stage/interactables/swing_rope.c @@ -5,8 +5,8 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/char_states.h" -#include "constants/move_states.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/swinging_hook.c b/sa1/src/game/sa1/stage/interactables/swinging_hook.c index 10647ea0f..6cdfbe328 100644 --- a/sa1/src/game/sa1/stage/interactables/swinging_hook.c +++ b/sa1/src/game/sa1/stage/interactables/swinging_hook.c @@ -10,11 +10,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/teleport_orb.c b/sa1/src/game/sa1/stage/interactables/teleport_orb.c index cd7d110d8..3a8306122 100644 --- a/sa1/src/game/sa1/stage/interactables/teleport_orb.c +++ b/sa1/src/game/sa1/stage/interactables/teleport_orb.c @@ -7,9 +7,9 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/toggle_player_float.c b/sa1/src/game/sa1/stage/interactables/toggle_player_float.c index 54e0c19cc..02041c948 100644 --- a/sa1/src/game/sa1/stage/interactables/toggle_player_float.c +++ b/sa1/src/game/sa1/stage/interactables/toggle_player_float.c @@ -6,8 +6,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ MapEntity *me; diff --git a/sa1/src/game/sa1/stage/interactables/toggle_player_layer.c b/sa1/src/game/sa1/stage/interactables/toggle_player_layer.c index e83a78a15..b98ac8c1d 100644 --- a/sa1/src/game/sa1/stage/interactables/toggle_player_layer.c +++ b/sa1/src/game/sa1/stage/interactables/toggle_player_layer.c @@ -4,7 +4,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/entity.h" -#include "constants/interactables.h" +#include "constants/sa1/interactables.h" typedef struct { /* 0x00 */ u8 x; diff --git a/sa1/src/game/sa1/stage/interactables/torch.c b/sa1/src/game/sa1/stage/interactables/torch.c index 738bcda55..13bb719ea 100644 --- a/sa1/src/game/sa1/stage/interactables/torch.c +++ b/sa1/src/game/sa1/stage/interactables/torch.c @@ -2,8 +2,8 @@ #include "malloc_vram.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/track.c b/sa1/src/game/sa1/stage/interactables/track.c index ee22534dc..4268fa415 100644 --- a/sa1/src/game/sa1/stage/interactables/track.c +++ b/sa1/src/game/sa1/stage/interactables/track.c @@ -14,12 +14,12 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/interactables.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/trampoline.c b/sa1/src/game/sa1/stage/interactables/trampoline.c index 4b0eefc06..8880672e5 100644 --- a/sa1/src/game/sa1/stage/interactables/trampoline.c +++ b/sa1/src/game/sa1/stage/interactables/trampoline.c @@ -6,10 +6,10 @@ #include "game/shared/stage/collision.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/underwater_lava_platform.c b/sa1/src/game/sa1/stage/interactables/underwater_lava_platform.c index 5e42d59de..a7b8851e7 100644 --- a/sa1/src/game/sa1/stage/interactables/underwater_lava_platform.c +++ b/sa1/src/game/sa1/stage/interactables/underwater_lava_platform.c @@ -10,11 +10,11 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" #define LAVA_SPURT_RATE TIME(0, 1.7) diff --git a/sa1/src/game/sa1/stage/interactables/updraft.c b/sa1/src/game/sa1/stage/interactables/updraft.c index aa454386a..1a37054d4 100644 --- a/sa1/src/game/sa1/stage/interactables/updraft.c +++ b/sa1/src/game/sa1/stage/interactables/updraft.c @@ -2,7 +2,7 @@ #include "malloc_vram.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/wall_bumper.c b/sa1/src/game/sa1/stage/interactables/wall_bumper.c index a51eb2158..36cf737f9 100644 --- a/sa1/src/game/sa1/stage/interactables/wall_bumper.c +++ b/sa1/src/game/sa1/stage/interactables/wall_bumper.c @@ -5,7 +5,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/collision.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/sa1/src/game/sa1/stage/interactables/water_bridge.c b/sa1/src/game/sa1/stage/interactables/water_bridge.c index 9db8d3998..352dd52a4 100644 --- a/sa1/src/game/sa1/stage/interactables/water_bridge.c +++ b/sa1/src/game/sa1/stage/interactables/water_bridge.c @@ -7,9 +7,9 @@ #include "game/shared/stage/player.h" #include "game/sa1/stage/player_controls.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" // Visual diameter of the bridge's water arc, in pixels #define WATER_BRIDGE_DIAMETER 32 diff --git a/sa1/src/game/sa1/stage/interactables/water_bridge_splash.c b/sa1/src/game/sa1/stage/interactables/water_bridge_splash.c index d3c0fe912..0c7a59a99 100644 --- a/sa1/src/game/sa1/stage/interactables/water_bridge_splash.c +++ b/sa1/src/game/sa1/stage/interactables/water_bridge_splash.c @@ -2,7 +2,7 @@ #include "malloc_vram.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { /* 0x00 */ MapEntity *me; diff --git a/sa1/src/game/sa1/stage/interactables/waterfall.c b/sa1/src/game/sa1/stage/interactables/waterfall.c index 233a2042f..82b011ef4 100644 --- a/sa1/src/game/sa1/stage/interactables/waterfall.c +++ b/sa1/src/game/sa1/stage/interactables/waterfall.c @@ -7,10 +7,10 @@ #include "game/sa1/stage/player_controls.h" // for gPlayerControls #include "game/sa1/stage/stage_ui.h" // sub_80549FC -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct { /* 0x00 */ MapEntity *me; diff --git a/sa1/src/game/sa1/stage/itembox.c b/sa1/src/game/sa1/stage/itembox.c index 44a671513..6f09f3279 100644 --- a/sa1/src/game/sa1/stage/itembox.c +++ b/sa1/src/game/sa1/stage/itembox.c @@ -19,12 +19,12 @@ #include "game/shared/stage/mp_event_mgr.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/items.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/items.h" +#include "constants/sa1/player_transitions.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" #define ITEM_DURATION_INVINCIBILITY TIME(0, 20) #define ITEM_DURATION_SPEED_UP TIME(0, 20) diff --git a/sa1/src/game/sa1/stage/mp_chao.c b/sa1/src/game/sa1/stage/mp_chao.c index 820aad2cb..d438b3347 100644 --- a/sa1/src/game/sa1/stage/mp_chao.c +++ b/sa1/src/game/sa1/stage/mp_chao.c @@ -9,8 +9,8 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" /* Chao that spawns in the Chao Hunt minigame */ diff --git a/sa1/src/game/sa1/stage/mp_hud.c b/sa1/src/game/sa1/stage/mp_hud.c index a98ccffda..3d7757b80 100644 --- a/sa1/src/game/sa1/stage/mp_hud.c +++ b/sa1/src/game/sa1/stage/mp_hud.c @@ -5,11 +5,11 @@ #include "game/globals.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/zones.h" /* Used by Chao Hunt and Collect Rings as HUD task */ diff --git a/sa1/src/game/sa1/stage/mp_results.c b/sa1/src/game/sa1/stage/mp_results.c index 8186c7492..b45cef209 100644 --- a/sa1/src/game/sa1/stage/mp_results.c +++ b/sa1/src/game/sa1/stage/mp_results.c @@ -6,9 +6,9 @@ #include "game/globals.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" typedef struct MPResults { /* 0x00 */ Background bg; diff --git a/sa1/src/game/sa1/stage/mp_results_b.c b/sa1/src/game/sa1/stage/mp_results_b.c index ca2729578..aa28bf2e2 100644 --- a/sa1/src/game/sa1/stage/mp_results_b.c +++ b/sa1/src/game/sa1/stage/mp_results_b.c @@ -8,9 +8,9 @@ #include "game/globals.h" #include "game/sa1/save.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" typedef struct MPResultsB { /* 0x00 */ Background bg; diff --git a/sa1/src/game/sa1/stage/mp_unk_1.c b/sa1/src/game/sa1/stage/mp_unk_1.c index 1613d6f7d..b69bcba6b 100644 --- a/sa1/src/game/sa1/stage/mp_unk_1.c +++ b/sa1/src/game/sa1/stage/mp_unk_1.c @@ -15,9 +15,9 @@ #include "game/shared/stage/stage.h" #include "game/sa1/save.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" -#include "constants/ui_graphics.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/ui_graphics.h" typedef struct SpriteStrc { Sprite s; diff --git a/sa1/src/game/sa1/stage/mystery_itembox.c b/sa1/src/game/sa1/stage/mystery_itembox.c index 01a87cc64..7fe74eb9f 100644 --- a/sa1/src/game/sa1/stage/mystery_itembox.c +++ b/sa1/src/game/sa1/stage/mystery_itembox.c @@ -13,11 +13,11 @@ #include "game/shared/stage/terrain_collision.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/player_transitions.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" /* While you can tell the SA2 version stems from SA1's, * it's clear they heavily modified it during SA2's development. diff --git a/sa1/src/game/sa1/stage/player_amy.c b/sa1/src/game/sa1/stage/player_amy.c index 9a6b2affd..1c3dd1728 100644 --- a/sa1/src/game/sa1/stage/player_amy.c +++ b/sa1/src/game/sa1/stage/player_amy.c @@ -12,9 +12,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/underwater_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" /* Amy Start */ diff --git a/sa1/src/game/sa1/stage/player_knuckles.c b/sa1/src/game/sa1/stage/player_knuckles.c index 9ef0662b2..26d4f06c4 100644 --- a/sa1/src/game/sa1/stage/player_knuckles.c +++ b/sa1/src/game/sa1/stage/player_knuckles.c @@ -14,9 +14,9 @@ #include "game/shared/stage/underwater_effects.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" /* Knuckles Start */ extern void SA2_LABEL(sub_8022318)(Player *p); diff --git a/sa1/src/game/sa1/stage/player_sonic.c b/sa1/src/game/sa1/stage/player_sonic.c index 16b4e59e5..82ed0b7d2 100644 --- a/sa1/src/game/sa1/stage/player_sonic.c +++ b/sa1/src/game/sa1/stage/player_sonic.c @@ -10,9 +10,9 @@ #include "game/sa1/stage/player_controls.h" #include "game/sa1/stage/player_sonic.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" /* Sonic */ diff --git a/sa1/src/game/sa1/stage/player_super_sonic.c b/sa1/src/game/sa1/stage/player_super_sonic.c index 86085032b..fbce52028 100644 --- a/sa1/src/game/sa1/stage/player_super_sonic.c +++ b/sa1/src/game/sa1/stage/player_super_sonic.c @@ -16,10 +16,10 @@ #include "game/shared/stage/terrain_collision.h" #include "game/shared/stage/underwater_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" /* Start of Super Sonic ? */ #include "game/sa1/stage/enemies/boss_xtra_super_egg_robo.h" diff --git a/sa1/src/game/sa1/stage/player_tails.c b/sa1/src/game/sa1/stage/player_tails.c index 4295cfde6..bdc6383d8 100644 --- a/sa1/src/game/sa1/stage/player_tails.c +++ b/sa1/src/game/sa1/stage/player_tails.c @@ -10,10 +10,10 @@ #include "game/sa1/stage/player_controls.h" #include "game/shared/stage/underwater_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" /* Tails Start */ void Player_Tails_8047A3C(Player *p); diff --git a/sa1/src/game/sa1/stage/some_task_manager.c b/sa1/src/game/sa1/stage/some_task_manager.c index c15ba0d97..afec99d36 100644 --- a/sa1/src/game/sa1/stage/some_task_manager.c +++ b/sa1/src/game/sa1/stage/some_task_manager.c @@ -6,7 +6,7 @@ #include "game/shared/stage/camera.h" #include "game/sa1/stage/some_task_manager.h" -#include "constants/move_states.h" +#include "constants/sa1/move_states.h" void sub_804CD80(SomeTaskManager_60 *taskData, GfxInfo *gfx); void sub_804CF5C(SomeTaskManager_7C *taskData, GfxInfo *gfx); diff --git a/sa1/src/game/sa1/stage/stage_ui.c b/sa1/src/game/sa1/stage/stage_ui.c index 37a219efb..4b7b4dd34 100644 --- a/sa1/src/game/sa1/stage/stage_ui.c +++ b/sa1/src/game/sa1/stage/stage_ui.c @@ -12,10 +12,10 @@ #include "game/sa1/stage/stage_ui.h" #include "game/shared/stage/water_effects.h" -#include "constants/songs.h" -#include "constants/ui_graphics.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/ui_graphics.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" extern void sub_804C40C(void); // TODO: Move to correct Header! diff --git a/sa1/src/game/sa1/stage/stage_ui_z.c b/sa1/src/game/sa1/stage/stage_ui_z.c index 998133423..94baa648d 100644 --- a/sa1/src/game/sa1/stage/stage_ui_z.c +++ b/sa1/src/game/sa1/stage/stage_ui_z.c @@ -11,9 +11,9 @@ #include "game/shared/stage/underwater_effects.h" #include "game/shared/stage/water_effects.h" -#include "constants/ui_graphics.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/ui_graphics.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" void Task_8055458(void); void Task_8055730(void); diff --git a/sa1/src/game/sa1/stage/temporary_sound_play_task.c b/sa1/src/game/sa1/stage/temporary_sound_play_task.c index 7c67b2746..45a6a0e50 100644 --- a/sa1/src/game/sa1/stage/temporary_sound_play_task.c +++ b/sa1/src/game/sa1/stage/temporary_sound_play_task.c @@ -4,7 +4,7 @@ #include "game/sa1/special_stage/main.h" #include "game/shared/stage/player.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" typedef struct { struct MP2KPlayerState *songInfo; diff --git a/sa1/src/game/sa1/stage/to_be_continued_screen.c b/sa1/src/game/sa1/stage/to_be_continued_screen.c index 573e00621..9afcbf1f9 100644 --- a/sa1/src/game/sa1/stage/to_be_continued_screen.c +++ b/sa1/src/game/sa1/stage/to_be_continued_screen.c @@ -5,8 +5,8 @@ #include "flags.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/stage/trapped_animals.c b/sa1/src/game/sa1/stage/trapped_animals.c index bff24dd21..a7f3e0c9b 100644 --- a/sa1/src/game/sa1/stage/trapped_animals.c +++ b/sa1/src/game/sa1/stage/trapped_animals.c @@ -8,8 +8,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct { s32 vramOffset; diff --git a/sa1/src/game/sa1/ui/character_select.c b/sa1/src/game/sa1/ui/character_select.c index e9f05def5..fb609eb6e 100644 --- a/sa1/src/game/sa1/ui/character_select.c +++ b/sa1/src/game/sa1/ui/character_select.c @@ -13,8 +13,8 @@ #include "game/sa1/menus/time_attack.h" #include "game/sa1/menus/title_screen.h" -#include "constants/characters.h" -#include "constants/songs.h" +#include "constants/sa1/characters.h" +#include "constants/sa1/songs.h" // Character Indices #define CIDX_LEFT 0 diff --git a/sa1/src/game/sa1/ui/collect_chaos_emeralds_msg.c b/sa1/src/game/sa1/ui/collect_chaos_emeralds_msg.c index 8ccd4a0d8..f320d3a57 100644 --- a/sa1/src/game/sa1/ui/collect_chaos_emeralds_msg.c +++ b/sa1/src/game/sa1/ui/collect_chaos_emeralds_msg.c @@ -7,7 +7,7 @@ #include "game/sa1/stage/stage_ui.h" #include "data/sa1/ui_graphics.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct CollectEmeraldsScreen { Sprite sprites[3]; diff --git a/sa1/src/game/sa1/ui/course_select.c b/sa1/src/game/sa1/ui/course_select.c index bac18d158..8082f57c4 100644 --- a/sa1/src/game/sa1/ui/course_select.c +++ b/sa1/src/game/sa1/ui/course_select.c @@ -11,9 +11,9 @@ #include "game/sa1/stage/stage_ui.h" #include "game/sa1/menus/time_attack.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/ui_graphics.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/ui_graphics.h" typedef struct CourseSelectState { StrcUi_805423C strc0; diff --git a/sa1/src/game/sa1/ui/edit_language_screen.c b/sa1/src/game/sa1/ui/edit_language_screen.c index 579146de0..3ad29add2 100644 --- a/sa1/src/game/sa1/ui/edit_language_screen.c +++ b/sa1/src/game/sa1/ui/edit_language_screen.c @@ -8,9 +8,9 @@ #include "game/sa1/save.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/tilemaps.h" #define LANGSCRN_BG_SCREENBASE 30 diff --git a/sa1/src/game/sa1/ui/extra_stage_results.c b/sa1/src/game/sa1/ui/extra_stage_results.c index 1e83085d1..d84f263e4 100644 --- a/sa1/src/game/sa1/ui/extra_stage_results.c +++ b/sa1/src/game/sa1/ui/extra_stage_results.c @@ -11,9 +11,9 @@ #include "game/sa1/stage/stage_ui.h" #include "data/sa1/ui_graphics.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" typedef struct CongratulationsAnim_48 { StrcUi_805423C strc0; diff --git a/sa1/src/game/sa1/ui/game_2_0.c b/sa1/src/game/sa1/ui/game_2_0.c index 451678e67..bec4a835a 100644 --- a/sa1/src/game/sa1/ui/game_2_0.c +++ b/sa1/src/game/sa1/ui/game_2_0.c @@ -12,7 +12,7 @@ #include "game/sa1/stage/stage_ui.h" #include "data/sa1/ui_graphics.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct Game_2_0_Sub { union { diff --git a/sa1/src/game/sa1/ui/game_2_1.c b/sa1/src/game/sa1/ui/game_2_1.c index 15faa6c5e..e6d69065b 100644 --- a/sa1/src/game/sa1/ui/game_2_1.c +++ b/sa1/src/game/sa1/ui/game_2_1.c @@ -10,10 +10,10 @@ #include "game/sa1/special_stage/main.h" #include "game/shared/stage/stage.h" -#include "constants/ui_graphics.h" -#include "constants/vram_hardcoded.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/ui_graphics.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct Game_2_1_2C { u8 filler0[0xC]; diff --git a/sa1/src/game/sa1/ui/game_2_3.c b/sa1/src/game/sa1/ui/game_2_3.c index ae94f21f6..21a12ad47 100644 --- a/sa1/src/game/sa1/ui/game_2_3.c +++ b/sa1/src/game/sa1/ui/game_2_3.c @@ -8,9 +8,9 @@ #include "game/shared/stage/stage.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct Game_2_3_54 { u8 filler0[0x48]; diff --git a/sa1/src/game/sa1/ui/game_over.c b/sa1/src/game/sa1/ui/game_over.c index 59e4d789e..1f219e2ae 100644 --- a/sa1/src/game/sa1/ui/game_over.c +++ b/sa1/src/game/sa1/ui/game_over.c @@ -17,9 +17,9 @@ #include "game/sa1/menus/title_screen.h" #include "data/sa1/ui_graphics.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" void Task_GameOverScreenInit(void); void Task_8056100(void); diff --git a/sa1/src/game/sa1/ui/intro_animation.c b/sa1/src/game/sa1/ui/intro_animation.c index 5f0563eab..851777c81 100644 --- a/sa1/src/game/sa1/ui/intro_animation.c +++ b/sa1/src/game/sa1/ui/intro_animation.c @@ -3,7 +3,7 @@ #include "flags.h" #include "trig.h" #include "lib/m4a/m4a.h" -#include "constants/ui_graphics.h" +#include "constants/sa1/ui_graphics.h" #include "game/shared/stage/entity.h" #include "game/sa1/ui/game_over.h" #include "game/sa1/stage/ui_rendering.h" @@ -11,8 +11,8 @@ #include "game/sa1/stage/stage_ui.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" #define INTRO_SPOTLIGHT_COUNT 2 diff --git a/sa1/src/game/sa1/ui/multiplayer_continue_screen.c b/sa1/src/game/sa1/ui/multiplayer_continue_screen.c index 4055a1896..a13366592 100644 --- a/sa1/src/game/sa1/ui/multiplayer_continue_screen.c +++ b/sa1/src/game/sa1/ui/multiplayer_continue_screen.c @@ -9,7 +9,7 @@ #include "game/sa1/save.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/text.h" +#include "constants/sa1/text.h" typedef struct ContinueScreen { Background bg; diff --git a/sa1/src/game/sa1/ui/player_name_input_menu.c b/sa1/src/game/sa1/ui/player_name_input_menu.c index 79ec02838..d9bd28491 100644 --- a/sa1/src/game/sa1/ui/player_name_input_menu.c +++ b/sa1/src/game/sa1/ui/player_name_input_menu.c @@ -10,7 +10,7 @@ #include "game/sa1/menus/mp_mode_select.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" /* NOTE(Jace): This whole module needs to be considered to be redone. */ diff --git a/sa1/src/game/sa1/ui/sound_test.c b/sa1/src/game/sa1/ui/sound_test.c index 0eebd2ccd..4421f8f66 100644 --- a/sa1/src/game/sa1/ui/sound_test.c +++ b/sa1/src/game/sa1/ui/sound_test.c @@ -8,8 +8,8 @@ #include "game/sa1/save.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" #ifndef BUG_FIX #define DoSpriteTransformAndDisplay(s, tf) \ diff --git a/sa1/src/game/sa1/ui/special_stage_intro.c b/sa1/src/game/sa1/ui/special_stage_intro.c index 7fdb68e46..35c5352ee 100644 --- a/sa1/src/game/sa1/ui/special_stage_intro.c +++ b/sa1/src/game/sa1/ui/special_stage_intro.c @@ -7,10 +7,10 @@ #include "game/sa1/special_stage/main.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/characters.h" -#include "constants/ui_graphics.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/characters.h" +#include "constants/sa1/ui_graphics.h" +#include "constants/sa1/zones.h" #define FRAME_RELAY_A 90 #define FRAME_RELAY_B 150 diff --git a/sa1/src/game/sa1/ui/staff_credits.c b/sa1/src/game/sa1/ui/staff_credits.c index a4d318bba..848cf1869 100644 --- a/sa1/src/game/sa1/ui/staff_credits.c +++ b/sa1/src/game/sa1/ui/staff_credits.c @@ -9,10 +9,10 @@ #include "game/sa1/save.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/anim_sizes.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" extern const u8 gUnknown_0868483C[0x500]; diff --git a/sa1/src/game/sa1/ui/stage_results.c b/sa1/src/game/sa1/ui/stage_results.c index e8f440214..75773f589 100644 --- a/sa1/src/game/sa1/ui/stage_results.c +++ b/sa1/src/game/sa1/ui/stage_results.c @@ -13,9 +13,9 @@ #include "game/sa1/stage/stage_ui.h" #include "data/sa1/ui_graphics.h" -#include "constants/ui_graphics.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/ui_graphics.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct VramPtrs { /* 0x00 */ void *vram0; diff --git a/sa1/src/game/sa1/ui/time_attack_lobby.c b/sa1/src/game/sa1/ui/time_attack_lobby.c index 6b96ca90c..f35f0e8c0 100644 --- a/sa1/src/game/sa1/ui/time_attack_lobby.c +++ b/sa1/src/game/sa1/ui/time_attack_lobby.c @@ -9,8 +9,8 @@ #include "game/sa1/stage/stage_ui.h" #include "game/sa1/menus/title_screen.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" typedef struct TimeAttackLobby { /* 0x000 */ Sprite sprites[4]; diff --git a/sa1/src/game/sa1/ui/time_attack_record.c b/sa1/src/game/sa1/ui/time_attack_record.c index 7638918f0..6e11ebd3b 100644 --- a/sa1/src/game/sa1/ui/time_attack_record.c +++ b/sa1/src/game/sa1/ui/time_attack_record.c @@ -7,9 +7,9 @@ #include "game/sa1/save.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/ui_graphics.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/ui_graphics.h" typedef struct TimeAttackRecord_58 { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/ui/time_attack_records.c b/sa1/src/game/sa1/ui/time_attack_records.c index d084895b3..c7b683542 100644 --- a/sa1/src/game/sa1/ui/time_attack_records.c +++ b/sa1/src/game/sa1/ui/time_attack_records.c @@ -9,11 +9,11 @@ #include "game/shared/stage/stage.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/characters.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/characters.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" +#include "constants/sa1/zones.h" /* These are the records appearing after selecting / before starting to play a stage */ diff --git a/sa1/src/game/sa1/ui/time_attack_results.c b/sa1/src/game/sa1/ui/time_attack_results.c index 40ff7d0a6..61dc6ab1a 100644 --- a/sa1/src/game/sa1/ui/time_attack_results.c +++ b/sa1/src/game/sa1/ui/time_attack_results.c @@ -10,7 +10,7 @@ #include "game/sa1/stage/stage_ui.h" #include "data/sa1/ui_graphics.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct Game2_5 { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/sa1/ui/time_over.c b/sa1/src/game/sa1/ui/time_over.c index a4f939557..59a38a387 100644 --- a/sa1/src/game/sa1/ui/time_over.c +++ b/sa1/src/game/sa1/ui/time_over.c @@ -7,8 +7,8 @@ #include "game/shared/stage/stage.h" #include "game/sa1/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" typedef struct TimeOverState { StrcUi_805423C strc0; diff --git a/sa1/src/game/shared/collect_rings/results.c b/sa1/src/game/shared/collect_rings/results.c index 4f86e9ea7..0a5539553 100644 --- a/sa1/src/game/shared/collect_rings/results.c +++ b/sa1/src/game/shared/collect_rings/results.c @@ -17,11 +17,11 @@ #include "game/sa1/save.h" #include "game/sa1/stage/tilemap_table.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/zones.h" extern u8 gUnknown_087D7E80[0x3400]; extern u8 gUnknown_087E3610[0x2000]; diff --git a/sa1/src/game/shared/menus/unused_level_select.c b/sa1/src/game/shared/menus/unused_level_select.c index e212ca28c..a104c618c 100644 --- a/sa1/src/game/shared/menus/unused_level_select.c +++ b/sa1/src/game/shared/menus/unused_level_select.c @@ -25,7 +25,7 @@ #include "animation_commands_bg.h" #include "data/sa1/tileset_debug_ascii.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" #if (GAME == GAME_SA1) #define LEFT_INPUT(value) (value)++ diff --git a/sa1/src/game/shared/multiplayer/communication_outcome.c b/sa1/src/game/shared/multiplayer/communication_outcome.c index e6a0a062d..6ab2b1c2b 100644 --- a/sa1/src/game/shared/multiplayer/communication_outcome.c +++ b/sa1/src/game/shared/multiplayer/communication_outcome.c @@ -17,10 +17,10 @@ #include "game/sa1/stage/tilemap_table.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/text.h" +#include "constants/sa1/tilemaps.h" struct CommunicationOutcomeScreen { Background unk0; diff --git a/sa1/src/game/shared/stage/amy_attack_heart_effect.c b/sa1/src/game/shared/stage/amy_attack_heart_effect.c index c4f078bd2..efa9541cf 100644 --- a/sa1/src/game/shared/stage/amy_attack_heart_effect.c +++ b/sa1/src/game/shared/stage/amy_attack_heart_effect.c @@ -8,9 +8,9 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" #if (GAME == GAME_SA2) -#include "constants/char_states.h" +#include "constants/sa1/char_states.h" #endif typedef struct { diff --git a/sa1/src/game/shared/stage/camera.c b/sa1/src/game/shared/stage/camera.c index 90bdad68c..74a68db15 100644 --- a/sa1/src/game/shared/stage/camera.c +++ b/sa1/src/game/shared/stage/camera.c @@ -25,10 +25,10 @@ #include "game/sa1/stage/background/zone_final.h" #endif -#include "constants/animations.h" -#include "constants/characters.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/characters.h" +#include "constants/sa1/tilemaps.h" +#include "constants/sa1/zones.h" // Probably a array (as it's aligned 16) struct Backgrounds ALIGNED(16) gStageBackgroundsRam = {}; diff --git a/sa1/src/game/shared/stage/collect_ring_effect.c b/sa1/src/game/shared/stage/collect_ring_effect.c index ee00801b9..83366e781 100644 --- a/sa1/src/game/shared/stage/collect_ring_effect.c +++ b/sa1/src/game/shared/stage/collect_ring_effect.c @@ -9,7 +9,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { Sprite s; diff --git a/sa1/src/game/shared/stage/collision.c b/sa1/src/game/shared/stage/collision.c index 16ab6bd1a..05af6b6e7 100644 --- a/sa1/src/game/shared/stage/collision.c +++ b/sa1/src/game/shared/stage/collision.c @@ -19,11 +19,11 @@ #include "game/shared/stage/rings_scatter.h" #include "game/sa1/stage/trapped_animals.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/player_transitions.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" bool32 Coll_DamageSuperSonic(Player *p); diff --git a/sa1/src/game/shared/stage/collision_0.c b/sa1/src/game/shared/stage/collision_0.c index 9be377ecc..caf95bbef 100644 --- a/sa1/src/game/shared/stage/collision_0.c +++ b/sa1/src/game/shared/stage/collision_0.c @@ -6,7 +6,7 @@ #include "game/shared/stage/mp_player.h" #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/char_states.h" +#include "constants/sa1/char_states.h" #endif #include "game/globals.h" #include "game/shared/stage/collision.h" diff --git a/sa1/src/game/shared/stage/demo_manager.c b/sa1/src/game/shared/stage/demo_manager.c index 4fa3a9e02..e44fb1afc 100644 --- a/sa1/src/game/shared/stage/demo_manager.c +++ b/sa1/src/game/shared/stage/demo_manager.c @@ -16,7 +16,7 @@ #include "game/sa1/save.h" #include "game/sa1/menus/title_screen.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" #if (GAME == GAME_SA1) #define DEMO_SPRITE_PRIO 1 diff --git a/sa1/src/game/shared/stage/dust_cloud.c b/sa1/src/game/shared/stage/dust_cloud.c index fcf381e1c..bd4811439 100644 --- a/sa1/src/game/shared/stage/dust_cloud.c +++ b/sa1/src/game/shared/stage/dust_cloud.c @@ -3,7 +3,7 @@ #include "task.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" static void Task_DustCloud(void); diff --git a/sa1/src/game/shared/stage/dust_effect_braking.c b/sa1/src/game/shared/stage/dust_effect_braking.c index 3d2079fbd..e389b5c8e 100644 --- a/sa1/src/game/shared/stage/dust_effect_braking.c +++ b/sa1/src/game/shared/stage/dust_effect_braking.c @@ -5,8 +5,8 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/dust_effect_braking.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" DustEffectBraking ALIGNED(8) gDustEffectBrakingTask = {}; diff --git a/sa1/src/game/shared/stage/dust_effect_spindash.c b/sa1/src/game/shared/stage/dust_effect_spindash.c index 6acd74b3e..10f950d6b 100644 --- a/sa1/src/game/shared/stage/dust_effect_spindash.c +++ b/sa1/src/game/shared/stage/dust_effect_spindash.c @@ -9,7 +9,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { Sprite s; diff --git a/sa1/src/game/shared/stage/enemy_defeat_score.c b/sa1/src/game/shared/stage/enemy_defeat_score.c index bbce53e62..c45be9ddf 100644 --- a/sa1/src/game/shared/stage/enemy_defeat_score.c +++ b/sa1/src/game/shared/stage/enemy_defeat_score.c @@ -5,7 +5,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" void Task_CreateEnemyDefeatScore_MoveUp(void); void Task_CreateEnemyDefeatScore_Hold(void); diff --git a/sa1/src/game/shared/stage/entities_manager.c b/sa1/src/game/shared/stage/entities_manager.c index 8963b890e..f8d6ae5a8 100644 --- a/sa1/src/game/shared/stage/entities_manager.c +++ b/sa1/src/game/shared/stage/entities_manager.c @@ -113,8 +113,8 @@ #include "game/sa1/assets/compressed/entities.h" #endif -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" // Unknown task extern void CreateEnemyDefeatScore(s16, s16); diff --git a/sa1/src/game/shared/stage/grind_effect_1.c b/sa1/src/game/shared/stage/grind_effect_1.c index 172ab2ff1..58da69534 100644 --- a/sa1/src/game/shared/stage/grind_effect_1.c +++ b/sa1/src/game/shared/stage/grind_effect_1.c @@ -5,7 +5,7 @@ #include "malloc_vram.h" #include "task.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { Sprite s; diff --git a/sa1/src/game/shared/stage/item_tasks.c b/sa1/src/game/shared/stage/item_tasks.c index 87fb88d3b..53ad7ccf0 100644 --- a/sa1/src/game/shared/stage/item_tasks.c +++ b/sa1/src/game/shared/stage/item_tasks.c @@ -13,8 +13,8 @@ #include "game/shared/stage/item_tasks.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" typedef struct { Sprite s; diff --git a/sa1/src/game/shared/stage/magnetic_ring.c b/sa1/src/game/shared/stage/magnetic_ring.c index ef4c0bd1e..7b787d987 100644 --- a/sa1/src/game/shared/stage/magnetic_ring.c +++ b/sa1/src/game/shared/stage/magnetic_ring.c @@ -10,8 +10,8 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" #define PLAYER_TOUCHING_RING_HB(p, hb, ringIntX, ringIntY) \ ((((ringIntX - TILE_WIDTH) <= HB_LEFT(I(p.qWorldX), hb) && (ringIntX + TILE_WIDTH) >= HB_LEFT(I(p.qWorldX), hb)) \ diff --git a/sa1/src/game/shared/stage/mp_event_mgr.c b/sa1/src/game/shared/stage/mp_event_mgr.c index 304f98637..f6f6ca5f8 100644 --- a/sa1/src/game/shared/stage/mp_event_mgr.c +++ b/sa1/src/game/shared/stage/mp_event_mgr.c @@ -13,9 +13,9 @@ #include "lib/m4a/m4a.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" void Task_MultiplayerEventMgr_Send(void); void Task_MultiplayerEventMgr_Receive(void); diff --git a/sa1/src/game/shared/stage/mp_event_recv_mgr.c b/sa1/src/game/shared/stage/mp_event_recv_mgr.c index 85fc312a1..9a24fe3e1 100644 --- a/sa1/src/game/shared/stage/mp_event_recv_mgr.c +++ b/sa1/src/game/shared/stage/mp_event_recv_mgr.c @@ -8,7 +8,7 @@ #include "game/shared/stage/rings_scatter.h" #include "game/shared/stage/entities_manager.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" void *CreateRoomEvent(void) { diff --git a/sa1/src/game/shared/stage/mp_finish.c b/sa1/src/game/shared/stage/mp_finish.c index 536827c1f..79128d34e 100644 --- a/sa1/src/game/shared/stage/mp_finish.c +++ b/sa1/src/game/shared/stage/mp_finish.c @@ -16,8 +16,8 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/text.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/text.h" #if (GAME == GAME_SA1) && !(defined NON_MATCHING) // Once CreateMultiplayerFinishHandler matches in SA1, diff --git a/sa1/src/game/shared/stage/mp_indicators.c b/sa1/src/game/shared/stage/mp_indicators.c index 97c7e4006..aff1cb1bb 100644 --- a/sa1/src/game/shared/stage/mp_indicators.c +++ b/sa1/src/game/shared/stage/mp_indicators.c @@ -7,8 +7,8 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" typedef struct { /* 0x00 */ u8 playerId; diff --git a/sa1/src/game/shared/stage/mp_player.c b/sa1/src/game/shared/stage/mp_player.c index c4ba33411..ebe1ed469 100644 --- a/sa1/src/game/shared/stage/mp_player.c +++ b/sa1/src/game/shared/stage/mp_player.c @@ -25,10 +25,10 @@ #endif #include "game/shared/multiplayer/communication_outcome.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/move_states.h" +#include "constants/sa1/songs.h" // TODO: Names #if (GAME == GAME_SA1) diff --git a/sa1/src/game/shared/stage/mp_sprite_task.c b/sa1/src/game/shared/stage/mp_sprite_task.c index c93671944..fc0f85e6e 100644 --- a/sa1/src/game/shared/stage/mp_sprite_task.c +++ b/sa1/src/game/shared/stage/mp_sprite_task.c @@ -14,7 +14,7 @@ #include "game/shared/stage/water_effects.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" #if (GAME == GAME_SA2) const u16 sAnimData_StageGoalScoreBonus[][3] = { diff --git a/sa1/src/game/shared/stage/music_manager.c b/sa1/src/game/shared/stage/music_manager.c index 5bfec02f7..b36e93e84 100644 --- a/sa1/src/game/shared/stage/music_manager.c +++ b/sa1/src/game/shared/stage/music_manager.c @@ -7,7 +7,7 @@ #include "lib/m4a/m4a.h" -#include "constants/songs.h" +#include "constants/sa1/songs.h" static void MusManager_UpdateBgmParams(void); void MusManager_Fadeout(u16 fadeoutSpeed); diff --git a/sa1/src/game/shared/stage/pause_menu.c b/sa1/src/game/shared/stage/pause_menu.c index 18752c88c..f43651de5 100644 --- a/sa1/src/game/shared/stage/pause_menu.c +++ b/sa1/src/game/shared/stage/pause_menu.c @@ -7,8 +7,8 @@ #include "game/sa1/save.h" #include "game/sa1/ui/time_attack_lobby.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/sa1/src/game/shared/stage/player.c b/sa1/src/game/shared/stage/player.c index 08d0647a1..e5dc2df7f 100644 --- a/sa1/src/game/shared/stage/player.c +++ b/sa1/src/game/shared/stage/player.c @@ -30,11 +30,11 @@ #include "game/shared/stage/underwater_effects.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/vram_hardcoded.h" -#include "constants/zones.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/char_states.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/vram_hardcoded.h" +#include "constants/sa1/zones.h" Player ALIGNED(8) gPlayer = {}; #if (GAME == GAME_SA1) diff --git a/sa1/src/game/shared/stage/rings_manager.c b/sa1/src/game/shared/stage/rings_manager.c index acb2c1bd3..abc18346a 100644 --- a/sa1/src/game/shared/stage/rings_manager.c +++ b/sa1/src/game/shared/stage/rings_manager.c @@ -18,7 +18,7 @@ #include "game/sa1/assets/compressed/entities.h" -#include "constants/animations.h" +#include "constants/sa1/animations.h" typedef struct { Sprite s; diff --git a/sa1/src/game/shared/stage/rings_scatter.c b/sa1/src/game/shared/stage/rings_scatter.c index 88f4c988a..2cb60c7d1 100644 --- a/sa1/src/game/shared/stage/rings_scatter.c +++ b/sa1/src/game/shared/stage/rings_scatter.c @@ -14,8 +14,14 @@ #include "game/shared/stage/collect_ring_effect.h" #include "game/shared/stage/rings_manager.h" // for RESERVED_RING_TILES_VRAM -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/songs.h" + +#if (GAME == GAME_SA1) +#define UNK10_CONDITION 1 +#elif (GAME == GAME_SA2) +#define UNK10_CONDITION !(ring->unk10 & 0x7) +#endif // NOTE: It is possible that rings_scatter.c was part of // player.c originally, due to it being directly above it in both, diff --git a/sa1/src/game/shared/stage/stage.c b/sa1/src/game/shared/stage/stage.c index 3d8acc0c2..8707903b7 100644 --- a/sa1/src/game/shared/stage/stage.c +++ b/sa1/src/game/shared/stage/stage.c @@ -28,9 +28,9 @@ #include "game/sa1/ui/time_over.h" #endif -#include "constants/characters.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa1/characters.h" +#include "constants/sa1/songs.h" +#include "constants/sa1/zones.h" typedef struct Struct_sub_80550F8 { u8 filler0[0x27]; diff --git a/sa1/src/game/shared/stage/terrain_collision.c b/sa1/src/game/shared/stage/terrain_collision.c index 68e1d41f4..df9990507 100644 --- a/sa1/src/game/shared/stage/terrain_collision.c +++ b/sa1/src/game/shared/stage/terrain_collision.c @@ -4,7 +4,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/zones.h" +#include "constants/sa1/zones.h" const Collision *gRefCollision = NULL; diff --git a/sa1/src/game/shared/stage/underwater_effects.c b/sa1/src/game/shared/stage/underwater_effects.c index 8507fd474..fd9e8b39d 100644 --- a/sa1/src/game/shared/stage/underwater_effects.c +++ b/sa1/src/game/shared/stage/underwater_effects.c @@ -11,8 +11,8 @@ #include "game/shared/stage/underwater_effects.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/vram_hardcoded.h" #define MAX_SMALL_BUBBLE_COUNT 11 diff --git a/sa1/src/game/shared/stage/water_effects.c b/sa1/src/game/shared/stage/water_effects.c index b91065298..6ac273d87 100644 --- a/sa1/src/game/shared/stage/water_effects.c +++ b/sa1/src/game/shared/stage/water_effects.c @@ -16,9 +16,9 @@ #include "data/sa1/sprite_data.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/zones.h" -#include "constants/vram_hardcoded.h" +#include "constants/sa1/animations.h" +#include "constants/sa1/zones.h" +#include "constants/sa1/vram_hardcoded.h" typedef struct { /* 0x00 */ s32 x; diff --git a/src/data/sa2/animations/animations.c b/src/data/sa2/animations/animations.c index 23b87f85f..038e926e0 100644 --- a/src/data/sa2/animations/animations.c +++ b/src/data/sa2/animations/animations.c @@ -1,5 +1,5 @@ #include "global.h" -#include "constants/anim_commands.h" +#include "constants/sa2/anim_commands.h" const s32 anim_0000__v0_l0[] = { // 0x080F40EC PALETTE(0, 16, 0x0) diff --git a/src/data/sa2/input_combos.c b/src/data/sa2/input_combos.c index 598e4bfa2..11fe86721 100644 --- a/src/data/sa2/input_combos.c +++ b/src/data/sa2/input_combos.c @@ -1,4 +1,4 @@ -#include "constants/characters.h" +#include "constants/sa2/characters.h" #include "game/sa2/stage/input_buffer.h" // Unsure if this spacing is applied here diff --git a/src/game/decomp_credits.c b/src/game/decomp_credits.c index aeded2ab9..11af31a88 100644 --- a/src/game/decomp_credits.c +++ b/src/game/decomp_credits.c @@ -10,9 +10,9 @@ #include "game/sa2/title_screen.h" #include "game/sa2/stage/debug_text_printer.h" -#include "constants/animations.h" -#include "constants/characters.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/characters.h" +#include "constants/sa2/songs.h" #if ENABLE_DECOMP_CREDITS typedef struct { diff --git a/src/game/sa2/collect_rings/singlepak_connection.c b/src/game/sa2/collect_rings/singlepak_connection.c index 6253ca274..9b90b727b 100644 --- a/src/game/sa2/collect_rings/singlepak_connection.c +++ b/src/game/sa2/collect_rings/singlepak_connection.c @@ -24,10 +24,10 @@ #include "data/sa2/collect_rings.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" #define SomeSioCheck() ((*(vu8 *)REG_ADDR_SIOCNT) & SIO_ID) #define MB_SUBGAME_LOADER_SIZE 0x314C diff --git a/src/game/sa2/collect_rings/time_display.c b/src/game/sa2/collect_rings/time_display.c index efc92e317..887d24d12 100644 --- a/src/game/sa2/collect_rings/time_display.c +++ b/src/game/sa2/collect_rings/time_display.c @@ -5,8 +5,8 @@ #include "game/globals.h" #include "game/sa2/collect_rings/time_display.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" typedef struct { Sprite unk0; diff --git a/src/game/sa2/cutscenes/credits.c b/src/game/sa2/cutscenes/credits.c index d994b9197..96526329b 100644 --- a/src/game/sa2/cutscenes/credits.c +++ b/src/game/sa2/cutscenes/credits.c @@ -9,7 +9,7 @@ #include "lib/m4a/m4a.h" #include "game/sa2/save.h" -#include "constants/tilemaps.h" +#include "constants/sa2/tilemaps.h" struct CreditsCutScene { Background unk0; diff --git a/src/game/sa2/cutscenes/credits_end.c b/src/game/sa2/cutscenes/credits_end.c index 4c57fb781..fb604cf46 100644 --- a/src/game/sa2/cutscenes/credits_end.c +++ b/src/game/sa2/cutscenes/credits_end.c @@ -11,10 +11,10 @@ #include "game/sa2/stage/screen_fade.h" #include "game/sa2/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct CreditsEndCutScene { Background unk0; diff --git a/src/game/sa2/cutscenes/credits_slides.c b/src/game/sa2/cutscenes/credits_slides.c index 04c239588..721fb769f 100644 --- a/src/game/sa2/cutscenes/credits_slides.c +++ b/src/game/sa2/cutscenes/credits_slides.c @@ -8,8 +8,8 @@ #include "lib/m4a/m4a.h" #include "game/sa2/save.h" -#include "constants/animations.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/tilemaps.h" typedef struct { Background unk0; diff --git a/src/game/sa2/cutscenes/endings.c b/src/game/sa2/cutscenes/endings.c index f98973775..b4d92362e 100644 --- a/src/game/sa2/cutscenes/endings.c +++ b/src/game/sa2/cutscenes/endings.c @@ -11,7 +11,7 @@ #include "trig.h" #include "game/sa2/save.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" struct EndingCutSceneTransition { u8 filler0[0x6C]; diff --git a/src/game/sa2/cutscenes/extra_ending_fall.c b/src/game/sa2/cutscenes/extra_ending_fall.c index e564a68af..da20d2d00 100644 --- a/src/game/sa2/cutscenes/extra_ending_fall.c +++ b/src/game/sa2/cutscenes/extra_ending_fall.c @@ -10,9 +10,9 @@ #include "game/sa2/save.h" #include "game/math.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" struct ExtraEndingCutScene { Background unk0; diff --git a/src/game/sa2/cutscenes/extra_ending_slides.c b/src/game/sa2/cutscenes/extra_ending_slides.c index 7252ae5cf..8cc153412 100644 --- a/src/game/sa2/cutscenes/extra_ending_slides.c +++ b/src/game/sa2/cutscenes/extra_ending_slides.c @@ -7,9 +7,9 @@ #include "lib/m4a/m4a.h" #include "game/sa2/save.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" struct ExtraEndingCutSceneSlides { Background unk0; diff --git a/src/game/sa2/cutscenes/final_ending_fall.c b/src/game/sa2/cutscenes/final_ending_fall.c index 244167f85..006a82b04 100644 --- a/src/game/sa2/cutscenes/final_ending_fall.c +++ b/src/game/sa2/cutscenes/final_ending_fall.c @@ -10,9 +10,9 @@ #include "game/sa2/save.h" #include "game/math.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" struct FinalEndingFallCutScene { Background unk0; diff --git a/src/game/sa2/cutscenes/final_ending_land.c b/src/game/sa2/cutscenes/final_ending_land.c index 8de97c2ef..a5a602fd9 100644 --- a/src/game/sa2/cutscenes/final_ending_land.c +++ b/src/game/sa2/cutscenes/final_ending_land.c @@ -11,10 +11,10 @@ #include "game/sa2/title_screen.h" #include "game/math.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct FinalEndingLandCutScene { Background unk0; diff --git a/src/game/sa2/cutscenes/level_endings.c b/src/game/sa2/cutscenes/level_endings.c index fca829313..c69a04ba7 100644 --- a/src/game/sa2/cutscenes/level_endings.c +++ b/src/game/sa2/cutscenes/level_endings.c @@ -19,11 +19,11 @@ #include "game/sa2/title_screen.h" #endif -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" typedef struct { Player *unk0; diff --git a/src/game/sa2/cutscenes/missing_emeralds.c b/src/game/sa2/cutscenes/missing_emeralds.c index 916cab4f8..c513e6ef4 100644 --- a/src/game/sa2/cutscenes/missing_emeralds.c +++ b/src/game/sa2/cutscenes/missing_emeralds.c @@ -8,9 +8,9 @@ #include "game/sa2/save.h" #include "game/sa2/title_screen.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" void Task_8094360(void); void TaskDestructor_80945A0(struct Task *); diff --git a/src/game/sa2/multiplayer/mode_select.c b/src/game/sa2/multiplayer/mode_select.c index 65e9a7505..f08a92a34 100644 --- a/src/game/sa2/multiplayer/mode_select.c +++ b/src/game/sa2/multiplayer/mode_select.c @@ -16,10 +16,10 @@ #include "game/sa2/title_screen.h" #include "game/sa2/stage/screen_mask.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" #define PAK_MODE_MULTI 0 #define PAK_MODE_SINGLE 1 diff --git a/src/game/sa2/multiplayer/multipak_connection.c b/src/game/sa2/multiplayer/multipak_connection.c index 1cbce792f..2477ae115 100644 --- a/src/game/sa2/multiplayer/multipak_connection.c +++ b/src/game/sa2/multiplayer/multipak_connection.c @@ -15,16 +15,16 @@ #include "game/sa2/stage/screen_fade.h" #include "game/sa2/stage/tilemap_table.h" #include "lib/m4a/m4a.h" -#include "constants/text.h" +#include "constants/sa2/text.h" #include "flags.h" #include "game/sa2/ui/character_select.h" #include "data/sa2/sprite_tables.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" struct MultiPakConnectScreen { ScreenFade fade; diff --git a/src/game/sa2/multiplayer/results.c b/src/game/sa2/multiplayer/results.c index 402700d56..52db7c2de 100644 --- a/src/game/sa2/multiplayer/results.c +++ b/src/game/sa2/multiplayer/results.c @@ -16,10 +16,10 @@ #endif #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct MultiplayerResultsScreen { Background unk0; diff --git a/src/game/sa2/multiplayer/team_play.c b/src/game/sa2/multiplayer/team_play.c index c6426d0bd..b03c3fa4c 100644 --- a/src/game/sa2/multiplayer/team_play.c +++ b/src/game/sa2/multiplayer/team_play.c @@ -11,10 +11,10 @@ #include "game/sa2/ui/course_select.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct MultiplayerTeamPlayScreen { Sprite unk0[4]; diff --git a/src/game/sa2/options_screen.c b/src/game/sa2/options_screen.c index 1112d0167..7a756462d 100644 --- a/src/game/sa2/options_screen.c +++ b/src/game/sa2/options_screen.c @@ -8,8 +8,8 @@ #include "game/math.h" #include "sprite.h" #include "game/sa2/stage/screen_fade.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" #include "game/sa2/title_screen.h" #include "game/sa2/sound_test.h" #include "game/shared/stage/stage.h" @@ -17,7 +17,7 @@ #include "game/sa2/multiplayer/mode_select.h" #include "game/sa2/ui/character_select.h" -#include "constants/tilemaps.h" +#include "constants/sa2/tilemaps.h" #define NUM_PLAYER_DATA_MENU_ITEMS 4 diff --git a/src/game/sa2/save.c b/src/game/sa2/save.c index c8c383f6d..436c6c741 100644 --- a/src/game/sa2/save.c +++ b/src/game/sa2/save.c @@ -5,8 +5,8 @@ #include "game/sa2/save.h" #include "lib/m4a/m4a.h" #include "game/math.h" -#include "constants/text.h" -#include "constants/zones.h" +#include "constants/sa2/text.h" +#include "constants/sa2/zones.h" struct SaveSectorHeader { u32 security, version; diff --git a/src/game/sa2/sound_test.c b/src/game/sa2/sound_test.c index ffb92a527..f7a242898 100644 --- a/src/game/sa2/sound_test.c +++ b/src/game/sa2/sound_test.c @@ -10,9 +10,9 @@ #include "game/sa2/stage/screen_fade.h" #include "data/sa2/palettes.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" #define MAX_SOUND_NAME_LENGTH 16 #define NUM_SPEAKER_CONE_SECTIONS 4 diff --git a/src/game/sa2/special_stage/collectables.c b/src/game/sa2/special_stage/collectables.c index 279e713b9..73b1642fe 100644 --- a/src/game/sa2/special_stage/collectables.c +++ b/src/game/sa2/special_stage/collectables.c @@ -8,8 +8,8 @@ #include "lib/m4a/m4a.h" #include "trig.h" #include "game/math.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" // Maybe same as SpecialStageCollectables_UNK874 or UNK_806CB84 struct UNK_806DEA4 { diff --git a/src/game/sa2/special_stage/guard_robo.c b/src/game/sa2/special_stage/guard_robo.c index 5494cefc7..c8ddba74f 100644 --- a/src/game/sa2/special_stage/guard_robo.c +++ b/src/game/sa2/special_stage/guard_robo.c @@ -10,7 +10,7 @@ #include "game/sa2/special_stage/data.h" #include "trig.h" #include "lib/m4a/m4a.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" void sub_80714C4(void); void sub_80710B0(void); diff --git a/src/game/sa2/special_stage/main.c b/src/game/sa2/special_stage/main.c index 77a58d0a7..7bb903182 100644 --- a/src/game/sa2/special_stage/main.c +++ b/src/game/sa2/special_stage/main.c @@ -15,10 +15,10 @@ #include "lib/m4a/m4a.h" #include "task.h" #include "game/sa2/title_screen.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" #define MAX_POINTS 99900 diff --git a/src/game/sa2/special_stage/physics.c b/src/game/sa2/special_stage/physics.c index 80ebd9bf4..603cc5cad 100644 --- a/src/game/sa2/special_stage/physics.c +++ b/src/game/sa2/special_stage/physics.c @@ -9,8 +9,8 @@ #include "trig.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #define MIN_BOUNCE_SPEED 1536 diff --git a/src/game/sa2/special_stage/player.c b/src/game/sa2/special_stage/player.c index 51b863b1f..b36313706 100644 --- a/src/game/sa2/special_stage/player.c +++ b/src/game/sa2/special_stage/player.c @@ -5,8 +5,8 @@ #include "game/sa2/special_stage/tables.h" #include "game/sa2/special_stage/data.h" -#include "constants/animations.h" -#include "constants/characters.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/characters.h" void sub_806D788(void); void sub_806D2C8(void); diff --git a/src/game/sa2/special_stage/tables.c b/src/game/sa2/special_stage/tables.c index a57b9ad2e..87fd8fda0 100644 --- a/src/game/sa2/special_stage/tables.c +++ b/src/game/sa2/special_stage/tables.c @@ -1,6 +1,6 @@ #include "global.h" #include "game/sa2/special_stage/tables.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" // bearing, acceleration, rotateSpeed, maxSpeed const u16 gUnknown_080DF968[][4] = { diff --git a/src/game/sa2/special_stage/ui.c b/src/game/sa2/special_stage/ui.c index 55feb9073..94cbb816d 100644 --- a/src/game/sa2/special_stage/ui.c +++ b/src/game/sa2/special_stage/ui.c @@ -7,9 +7,9 @@ #include "game/sa2/special_stage/utils.h" #include "game/sa2/special_stage/data.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" void RenderTime(void); void RenderRingCounters(void); diff --git a/src/game/sa2/special_stage/world.c b/src/game/sa2/special_stage/world.c index 590109509..f1cd9e57d 100644 --- a/src/game/sa2/special_stage/world.c +++ b/src/game/sa2/special_stage/world.c @@ -11,9 +11,9 @@ #include "trig.h" #include "flags.h" #include "malloc_ewram.h" -#include "constants/zones.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" void sub_806EA04(void); void sub_806E7C0(struct SpecialStageWorld *world); diff --git a/src/game/sa2/stage/boost_effect.c b/src/game/sa2/stage/boost_effect.c index 801dcb0e6..1cca767da 100644 --- a/src/game/sa2/stage/boost_effect.c +++ b/src/game/sa2/stage/boost_effect.c @@ -11,9 +11,9 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/boost_effect.h" -#include "constants/animations.h" -#include "constants/anim_commands.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/anim_commands.h" +#include "constants/sa2/zones.h" // TODO: Rename struct! typedef struct { diff --git a/src/game/sa2/stage/boost_mode_particles.c b/src/game/sa2/stage/boost_mode_particles.c index d7239538d..c4a2d6331 100644 --- a/src/game/sa2/stage/boost_mode_particles.c +++ b/src/game/sa2/stage/boost_mode_particles.c @@ -9,7 +9,7 @@ #include "game/sa2/stage/boost_mode_particles.h" #include "trig.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #define NUM_PARTICLES 16 diff --git a/src/game/sa2/stage/boss_results_transition.c b/src/game/sa2/stage/boss_results_transition.c index 5442f0877..3fa255f2f 100644 --- a/src/game/sa2/stage/boss_results_transition.c +++ b/src/game/sa2/stage/boss_results_transition.c @@ -13,8 +13,8 @@ #include "game/sa2/ui/time_attack_results.h" #include "game/sa2/stage/boss_results_transition.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" // Seven unknown x/y positions const u16 gUnknown_080D6DE4[][2] = { diff --git a/src/game/sa2/stage/bosses/boss_1.c b/src/game/sa2/stage/bosses/boss_1.c index ba2526a31..a95f4a938 100644 --- a/src/game/sa2/stage/bosses/boss_1.c +++ b/src/game/sa2/stage/bosses/boss_1.c @@ -25,10 +25,10 @@ #include "game/shared/stage/screen_shake.h" #include "game/sa2/ui/time_attack_results.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define EGG_HAMMER_TANK_II_STATE_RESET 0 #define EGG_HAMMER_TANK_II_STATE_EXTEND 1 diff --git a/src/game/sa2/stage/bosses/boss_2.c b/src/game/sa2/stage/bosses/boss_2.c index 1776d34d4..289e429fa 100644 --- a/src/game/sa2/stage/bosses/boss_2.c +++ b/src/game/sa2/stage/bosses/boss_2.c @@ -17,9 +17,9 @@ #include "lib/m4a/m4a.h" -#include "constants/zones.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #define NUM_WHEELS 6 #define CANNON_MOVE_SPEED 82 diff --git a/src/game/sa2/stage/bosses/boss_3.c b/src/game/sa2/stage/bosses/boss_3.c index 6dc60f7a0..db4401c0c 100644 --- a/src/game/sa2/stage/bosses/boss_3.c +++ b/src/game/sa2/stage/bosses/boss_3.c @@ -17,9 +17,9 @@ #include "game/sa2/save.h" #include "game/shared/stage/screen_shake.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ s32 qWorldX; diff --git a/src/game/sa2/stage/bosses/boss_4.c b/src/game/sa2/stage/bosses/boss_4.c index df083b50f..b861a1c26 100644 --- a/src/game/sa2/stage/bosses/boss_4.c +++ b/src/game/sa2/stage/bosses/boss_4.c @@ -21,10 +21,10 @@ #include "game/shared/stage/screen_shake.h" #include "game/sa2/stage/boss_results_transition.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define NUM_TAIL_SEGMENTS 3 diff --git a/src/game/sa2/stage/bosses/boss_5.c b/src/game/sa2/stage/bosses/boss_5.c index e8f6c6a55..f421e4f2f 100644 --- a/src/game/sa2/stage/bosses/boss_5.c +++ b/src/game/sa2/stage/bosses/boss_5.c @@ -21,9 +21,9 @@ #include "game/sa2/stage/screen_fade.h" #include "lib/m4a/m4a.h" -#include "constants/songs.h" -#include "constants/zones.h" -#include "constants/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/animations.h" #include "flags.h" typedef struct { diff --git a/src/game/sa2/stage/bosses/boss_6.c b/src/game/sa2/stage/bosses/boss_6.c index 78fb48d1b..b6781dd47 100644 --- a/src/game/sa2/stage/bosses/boss_6.c +++ b/src/game/sa2/stage/bosses/boss_6.c @@ -18,9 +18,9 @@ #include "game/shared/stage/terrain_collision.h" #include "game/sa2/stage/player_callbacks.h" -#include "constants/move_states.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/move_states.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #define NUM_PLATFORMS 4 #define NUM_LINKS 3 diff --git a/src/game/sa2/stage/bosses/boss_7.c b/src/game/sa2/stage/bosses/boss_7.c index 8283710af..8bc427c45 100644 --- a/src/game/sa2/stage/bosses/boss_7.c +++ b/src/game/sa2/stage/bosses/boss_7.c @@ -20,8 +20,8 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { u32 unk0; diff --git a/src/game/sa2/stage/bosses/boss_8.c b/src/game/sa2/stage/bosses/boss_8.c index 243339a0f..d5d17f875 100644 --- a/src/game/sa2/stage/bosses/boss_8.c +++ b/src/game/sa2/stage/bosses/boss_8.c @@ -25,12 +25,12 @@ #include "game/sa2/stage/screen_fade.h" #include "game/shared/stage/screen_shake.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/move_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" #define ARM_LEFT 0 #define ARM_RIGHT 1 diff --git a/src/game/sa2/stage/bosses/boss_9.c b/src/game/sa2/stage/bosses/boss_9.c index c81afa1e4..4f7ab1cea 100644 --- a/src/game/sa2/stage/bosses/boss_9.c +++ b/src/game/sa2/stage/bosses/boss_9.c @@ -16,9 +16,9 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" typedef struct { /* 0x00 */ s32 unk0; diff --git a/src/game/sa2/stage/bosses/common.c b/src/game/sa2/stage/bosses/common.c index 46c8927fd..c4540258b 100644 --- a/src/game/sa2/stage/bosses/common.c +++ b/src/game/sa2/stage/bosses/common.c @@ -17,9 +17,9 @@ #include "game/sa2/stage/bosses/boss_8.h" #include "game/sa2/stage/bosses/boss_9.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/zones.h" struct Task *gActiveBossTask = NULL; diff --git a/src/game/sa2/stage/bosses/eggmobile_escape_sequence.c b/src/game/sa2/stage/bosses/eggmobile_escape_sequence.c index 19b793ff5..b89a03887 100644 --- a/src/game/sa2/stage/bosses/eggmobile_escape_sequence.c +++ b/src/game/sa2/stage/bosses/eggmobile_escape_sequence.c @@ -4,8 +4,8 @@ #include "task.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #define EGGMOBILE_DIR_LEFT 0 #define EGGMOBILE_DIR_RIGHT 1 diff --git a/src/game/sa2/stage/bosses/explosion_parts.c b/src/game/sa2/stage/bosses/explosion_parts.c index 234313b30..7ee8e187f 100644 --- a/src/game/sa2/stage/bosses/explosion_parts.c +++ b/src/game/sa2/stage/bosses/explosion_parts.c @@ -15,8 +15,8 @@ #include "game/sa2/stage/bosses/boss_8.h" #include "game/sa2/stage/bosses/boss_9.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" void Task_BossParticleWithExplosionUpdate(void); void Task_BossParticleStatic(void); diff --git a/src/game/sa2/stage/bosses/final_intro.c b/src/game/sa2/stage/bosses/final_intro.c index 7ab3b3f84..bfb8e7017 100644 --- a/src/game/sa2/stage/bosses/final_intro.c +++ b/src/game/sa2/stage/bosses/final_intro.c @@ -15,10 +15,10 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/stage.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" +#include "constants/sa2/zones.h" typedef struct { u8 cameraY; diff --git a/src/game/sa2/stage/cheese.c b/src/game/sa2/stage/cheese.c index bd2446d34..0417ddbc6 100644 --- a/src/game/sa2/stage/cheese.c +++ b/src/game/sa2/stage/cheese.c @@ -9,10 +9,10 @@ #include "lib/m4a/m4a.h" -#include "constants/zones.h" -#include "constants/characters.h" -#include "constants/songs.h" -#include "constants/animations.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/characters.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/animations.h" typedef struct { Sprite s; diff --git a/src/game/sa2/stage/debug_text_printer.c b/src/game/sa2/stage/debug_text_printer.c index 22952a196..603ce8c39 100644 --- a/src/game/sa2/stage/debug_text_printer.c +++ b/src/game/sa2/stage/debug_text_printer.c @@ -4,7 +4,7 @@ #include "task.h" #include "gba/syscall.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { Sprite chars[SA2_ANIM_NUM_ASCII_CHARS]; diff --git a/src/game/sa2/stage/enemies/balloon.c b/src/game/sa2/stage/enemies/balloon.c index dd74ee135..3e1ddfc05 100644 --- a/src/game/sa2/stage/enemies/balloon.c +++ b/src/game/sa2/stage/enemies/balloon.c @@ -7,7 +7,7 @@ #include "task.h" #include "trig.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/bell.c b/src/game/sa2/stage/enemies/bell.c index 0defa9511..bd7706d59 100644 --- a/src/game/sa2/stage/enemies/bell.c +++ b/src/game/sa2/stage/enemies/bell.c @@ -9,7 +9,7 @@ #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/bullet_buzzer.c b/src/game/sa2/stage/enemies/bullet_buzzer.c index 4725ea09c..8422eed43 100644 --- a/src/game/sa2/stage/enemies/bullet_buzzer.c +++ b/src/game/sa2/stage/enemies/bullet_buzzer.c @@ -9,7 +9,7 @@ #include "task.h" #include "trig.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/buzzer.c b/src/game/sa2/stage/enemies/buzzer.c index 3d28a36a2..64d4e28f4 100644 --- a/src/game/sa2/stage/enemies/buzzer.c +++ b/src/game/sa2/stage/enemies/buzzer.c @@ -7,7 +7,7 @@ #include "task.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/circus.c b/src/game/sa2/stage/enemies/circus.c index 9dbcc40dd..3f0e74ff8 100644 --- a/src/game/sa2/stage/enemies/circus.c +++ b/src/game/sa2/stage/enemies/circus.c @@ -4,7 +4,7 @@ #include "game/shared/stage/entities_manager.h" #include "task.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/flickey.c b/src/game/sa2/stage/enemies/flickey.c index 73c810e98..e0ed3cfe4 100644 --- a/src/game/sa2/stage/enemies/flickey.c +++ b/src/game/sa2/stage/enemies/flickey.c @@ -8,7 +8,7 @@ #include "task.h" #include "sprite.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/geji_geji.c b/src/game/sa2/stage/enemies/geji_geji.c index 37232e3c3..e888cb464 100644 --- a/src/game/sa2/stage/enemies/geji_geji.c +++ b/src/game/sa2/stage/enemies/geji_geji.c @@ -9,7 +9,7 @@ #include "malloc_vram.h" #include "sprite.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/gohla.c b/src/game/sa2/stage/enemies/gohla.c index 07c856294..a61a24bad 100644 --- a/src/game/sa2/stage/enemies/gohla.c +++ b/src/game/sa2/stage/enemies/gohla.c @@ -8,7 +8,7 @@ #include "sprite.h" #include "trig.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/hammerhead.c b/src/game/sa2/stage/enemies/hammerhead.c index 50d5d6bb2..95a9d3ef3 100644 --- a/src/game/sa2/stage/enemies/hammerhead.c +++ b/src/game/sa2/stage/enemies/hammerhead.c @@ -8,7 +8,7 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/collision.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/kiki.c b/src/game/sa2/stage/enemies/kiki.c index 5f3936035..c6ca6369d 100644 --- a/src/game/sa2/stage/enemies/kiki.c +++ b/src/game/sa2/stage/enemies/kiki.c @@ -8,7 +8,7 @@ #include "malloc_vram.h" #include "sprite.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/koura.c b/src/game/sa2/stage/enemies/koura.c index c35693a73..de2e5ac29 100644 --- a/src/game/sa2/stage/enemies/koura.c +++ b/src/game/sa2/stage/enemies/koura.c @@ -8,8 +8,8 @@ #include "game/shared/stage/entities_manager.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/kubinaga.c b/src/game/sa2/stage/enemies/kubinaga.c index db094d656..849ef9b90 100644 --- a/src/game/sa2/stage/enemies/kubinaga.c +++ b/src/game/sa2/stage/enemies/kubinaga.c @@ -13,8 +13,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/kura_kura.c b/src/game/sa2/stage/enemies/kura_kura.c index 4977cd22d..edee7533b 100644 --- a/src/game/sa2/stage/enemies/kura_kura.c +++ b/src/game/sa2/stage/enemies/kura_kura.c @@ -12,7 +12,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/kyura.c b/src/game/sa2/stage/enemies/kyura.c index 9ed541166..e50ee12e0 100644 --- a/src/game/sa2/stage/enemies/kyura.c +++ b/src/game/sa2/stage/enemies/kyura.c @@ -10,7 +10,7 @@ #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/enemies/madillo.c b/src/game/sa2/stage/enemies/madillo.c index d11e3f76c..8fdaa441b 100644 --- a/src/game/sa2/stage/enemies/madillo.c +++ b/src/game/sa2/stage/enemies/madillo.c @@ -7,7 +7,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/mon.c b/src/game/sa2/stage/enemies/mon.c index ecf42a258..926f0e551 100644 --- a/src/game/sa2/stage/enemies/mon.c +++ b/src/game/sa2/stage/enemies/mon.c @@ -10,7 +10,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" // TODO: Name the tasks accordingly diff --git a/src/game/sa2/stage/enemies/mouse.c b/src/game/sa2/stage/enemies/mouse.c index f4dff077b..58483a478 100644 --- a/src/game/sa2/stage/enemies/mouse.c +++ b/src/game/sa2/stage/enemies/mouse.c @@ -10,7 +10,7 @@ #include "malloc_vram.h" #include "sprite.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/pen.c b/src/game/sa2/stage/enemies/pen.c index af4024717..35a82a690 100644 --- a/src/game/sa2/stage/enemies/pen.c +++ b/src/game/sa2/stage/enemies/pen.c @@ -7,7 +7,7 @@ #include "game/sa2/stage/enemies/pen.h" #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/piko_piko.c b/src/game/sa2/stage/enemies/piko_piko.c index c4fcb161b..c9b2e7ad2 100644 --- a/src/game/sa2/stage/enemies/piko_piko.c +++ b/src/game/sa2/stage/enemies/piko_piko.c @@ -8,7 +8,7 @@ #include "game/shared/stage/entity.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/spinner.c b/src/game/sa2/stage/enemies/spinner.c index d7d3b1232..2318adb4b 100644 --- a/src/game/sa2/stage/enemies/spinner.c +++ b/src/game/sa2/stage/enemies/spinner.c @@ -7,7 +7,7 @@ #include "game/shared/stage/entities_manager.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/star.c b/src/game/sa2/stage/enemies/star.c index 9407a745c..56e30728d 100644 --- a/src/game/sa2/stage/enemies/star.c +++ b/src/game/sa2/stage/enemies/star.c @@ -8,7 +8,7 @@ #include "game/shared/stage/entity.h" #include "game/sa2/stage/enemies/star.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/enemies/straw.c b/src/game/sa2/stage/enemies/straw.c index f4100af72..9404310db 100644 --- a/src/game/sa2/stage/enemies/straw.c +++ b/src/game/sa2/stage/enemies/straw.c @@ -13,7 +13,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/enemies/yado.c b/src/game/sa2/stage/enemies/yado.c index 0604819cc..df32d209f 100644 --- a/src/game/sa2/stage/enemies/yado.c +++ b/src/game/sa2/stage/enemies/yado.c @@ -10,10 +10,10 @@ #include "game/shared/stage/mp_event_mgr.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/heart_particles_effect.c b/src/game/sa2/stage/heart_particles_effect.c index 98ae232e5..db29983b8 100644 --- a/src/game/sa2/stage/heart_particles_effect.c +++ b/src/game/sa2/stage/heart_particles_effect.c @@ -8,7 +8,7 @@ #include "game/shared/stage/camera.h" #include "sprite.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #define NUM_HEARTS 4 diff --git a/src/game/sa2/stage/interactables/ceiling_slope.c b/src/game/sa2/stage/interactables/ceiling_slope.c index 7a3602444..2b568b440 100644 --- a/src/game/sa2/stage/interactables/ceiling_slope.c +++ b/src/game/sa2/stage/interactables/ceiling_slope.c @@ -8,8 +8,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/player_transitions.h" -#include "constants/interactables.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/interactables.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/collect_rings_lap_trigger.c b/src/game/sa2/stage/interactables/collect_rings_lap_trigger.c index ecda95851..9149fa052 100644 --- a/src/game/sa2/stage/interactables/collect_rings_lap_trigger.c +++ b/src/game/sa2/stage/interactables/collect_rings_lap_trigger.c @@ -10,9 +10,9 @@ #include "sprite.h" #include "task.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ s32 posX; diff --git a/src/game/sa2/stage/interactables/egg_utopia/cannon.c b/src/game/sa2/stage/interactables/egg_utopia/cannon.c index 744192253..373fcf706 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/cannon.c +++ b/src/game/sa2/stage/interactables/egg_utopia/cannon.c @@ -11,10 +11,10 @@ #include "trig.h" #include "game/math.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { // Completely unused, maybe the base? diff --git a/src/game/sa2/stage/interactables/egg_utopia/flying_handle.c b/src/game/sa2/stage/interactables/egg_utopia/flying_handle.c index e49947b51..60793aa84 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/flying_handle.c +++ b/src/game/sa2/stage/interactables/egg_utopia/flying_handle.c @@ -10,10 +10,10 @@ #include "trig.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" #define FLYING_HANDLE_VRAM_TILES 25 diff --git a/src/game/sa2/stage/interactables/egg_utopia/iron_ball.c b/src/game/sa2/stage/interactables/egg_utopia/iron_ball.c index 8e5d26195..ec98ca39f 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/iron_ball.c +++ b/src/game/sa2/stage/interactables/egg_utopia/iron_ball.c @@ -10,7 +10,7 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/egg_utopia/iron_ball.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/egg_utopia/launcher.c b/src/game/sa2/stage/interactables/egg_utopia/launcher.c index 767fc39f0..7e6814b71 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/launcher.c +++ b/src/game/sa2/stage/interactables/egg_utopia/launcher.c @@ -12,10 +12,10 @@ #include "task.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/egg_utopia/pole.c b/src/game/sa2/stage/interactables/egg_utopia/pole.c index d03e96687..b48fb3b60 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/pole.c +++ b/src/game/sa2/stage/interactables/egg_utopia/pole.c @@ -8,9 +8,9 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/egg_utopia/pole.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { s32 worldX; diff --git a/src/game/sa2/stage/interactables/egg_utopia/speeding_platform.c b/src/game/sa2/stage/interactables/egg_utopia/speeding_platform.c index 55653b662..78aa626ad 100644 --- a/src/game/sa2/stage/interactables/egg_utopia/speeding_platform.c +++ b/src/game/sa2/stage/interactables/egg_utopia/speeding_platform.c @@ -13,9 +13,9 @@ #include "game/sa2/stage/interactables/egg_utopia/speeding_platform.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/grind_rail.c b/src/game/sa2/stage/interactables/grind_rail.c index 199dc1fa1..528e8df82 100644 --- a/src/game/sa2/stage/interactables/grind_rail.c +++ b/src/game/sa2/stage/interactables/grind_rail.c @@ -9,8 +9,8 @@ #include "lib/m4a/m4a.h" -#include "constants/songs.h" -#include "constants/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/player_transitions.h" // Same def as SpriteBase typedef struct { diff --git a/src/game/sa2/stage/interactables/hot_crater/crane.c b/src/game/sa2/stage/interactables/hot_crater/crane.c index 918e8b13b..9f5991355 100644 --- a/src/game/sa2/stage/interactables/hot_crater/crane.c +++ b/src/game/sa2/stage/interactables/hot_crater/crane.c @@ -12,9 +12,9 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/hot_crater/crane.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" #define CRANE_MAX_ACCELERATION (Q_8_8(12)) #define CHAIN_LENGTH 6 diff --git a/src/game/sa2/stage/interactables/hot_crater/dash_ring.c b/src/game/sa2/stage/interactables/hot_crater/dash_ring.c index a4de3acdd..04802a892 100644 --- a/src/game/sa2/stage/interactables/hot_crater/dash_ring.c +++ b/src/game/sa2/stage/interactables/hot_crater/dash_ring.c @@ -11,11 +11,11 @@ #include "game/sa2/stage/interactables/hot_crater/dash_ring.h" #include "sprite.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define IA_DASH_RING_ACCELERATION 8 diff --git a/src/game/sa2/stage/interactables/hot_crater/floating_spring.c b/src/game/sa2/stage/interactables/hot_crater/floating_spring.c index df82f4110..1c969c923 100644 --- a/src/game/sa2/stage/interactables/hot_crater/floating_spring.c +++ b/src/game/sa2/stage/interactables/hot_crater/floating_spring.c @@ -9,10 +9,10 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/hot_crater/floating_spring.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/hot_crater/hook_rail.c b/src/game/sa2/stage/interactables/hot_crater/hook_rail.c index 69399fb1c..6233467b7 100644 --- a/src/game/sa2/stage/interactables/hot_crater/hook_rail.c +++ b/src/game/sa2/stage/interactables/hot_crater/hook_rail.c @@ -11,11 +11,11 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/hot_crater/hook_rail.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { s32 x; diff --git a/src/game/sa2/stage/interactables/hot_crater/turnaround_bar.c b/src/game/sa2/stage/interactables/hot_crater/turnaround_bar.c index 3611cd3bf..1e49e5d6b 100644 --- a/src/game/sa2/stage/interactables/hot_crater/turnaround_bar.c +++ b/src/game/sa2/stage/interactables/hot_crater/turnaround_bar.c @@ -9,9 +9,9 @@ #include "sprite.h" #include "malloc_vram.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/hot_crater/windup_stick.c b/src/game/sa2/stage/interactables/hot_crater/windup_stick.c index dd8b5320c..056338c9a 100644 --- a/src/game/sa2/stage/interactables/hot_crater/windup_stick.c +++ b/src/game/sa2/stage/interactables/hot_crater/windup_stick.c @@ -7,9 +7,9 @@ #include "sprite.h" #include "malloc_vram.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" typedef struct { s32 unk0; diff --git a/src/game/sa2/stage/interactables/ice_paradise/big_snowball.c b/src/game/sa2/stage/interactables/ice_paradise/big_snowball.c index cdeea477d..29f4960c3 100644 --- a/src/game/sa2/stage/interactables/ice_paradise/big_snowball.c +++ b/src/game/sa2/stage/interactables/ice_paradise/big_snowball.c @@ -9,10 +9,10 @@ #include "game/shared/stage/entity.h" #include "game/sa2/stage/interactables/ice_paradise/big_snowball.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" struct Test { s16 unk0; diff --git a/src/game/sa2/stage/interactables/ice_paradise/funnel_sphere.c b/src/game/sa2/stage/interactables/ice_paradise/funnel_sphere.c index 28b79e339..ae6a93d17 100644 --- a/src/game/sa2/stage/interactables/ice_paradise/funnel_sphere.c +++ b/src/game/sa2/stage/interactables/ice_paradise/funnel_sphere.c @@ -11,10 +11,10 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/ice_paradise/funnel_sphere.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { s32 x; /* 0x0 */ diff --git a/src/game/sa2/stage/interactables/ice_paradise/half_pipe.c b/src/game/sa2/stage/interactables/ice_paradise/half_pipe.c index bac90d8d5..71e3ba0f9 100644 --- a/src/game/sa2/stage/interactables/ice_paradise/half_pipe.c +++ b/src/game/sa2/stage/interactables/ice_paradise/half_pipe.c @@ -10,8 +10,8 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/ice_paradise/half_pipe.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" typedef struct { s32 x; diff --git a/src/game/sa2/stage/interactables/leaf_forest/booster.c b/src/game/sa2/stage/interactables/leaf_forest/booster.c index e6ddb7609..8295df2f6 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/booster.c +++ b/src/game/sa2/stage/interactables/leaf_forest/booster.c @@ -11,9 +11,9 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/bouncy_bar.c b/src/game/sa2/stage/interactables/leaf_forest/bouncy_bar.c index bf0047d4c..9aa99e959 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/bouncy_bar.c +++ b/src/game/sa2/stage/interactables/leaf_forest/bouncy_bar.c @@ -8,10 +8,10 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x0 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/checkpoint.c b/src/game/sa2/stage/interactables/leaf_forest/checkpoint.c index d9e1405ce..3d0dc6719 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/checkpoint.c +++ b/src/game/sa2/stage/interactables/leaf_forest/checkpoint.c @@ -17,10 +17,10 @@ #include "data/sa2/sprite_data.h" -#include "constants/animations.h" -#include "constants/anim_commands.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/anim_commands.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/corkscrew.c b/src/game/sa2/stage/interactables/leaf_forest/corkscrew.c index d82ed319c..b29a3d275 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/corkscrew.c +++ b/src/game/sa2/stage/interactables/leaf_forest/corkscrew.c @@ -11,10 +11,10 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/corkscrew_3d.c b/src/game/sa2/stage/interactables/leaf_forest/corkscrew_3d.c index c0411b57e..54da74c0a 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/corkscrew_3d.c +++ b/src/game/sa2/stage/interactables/leaf_forest/corkscrew_3d.c @@ -11,10 +11,10 @@ #include "trig.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/decoration.c b/src/game/sa2/stage/interactables/leaf_forest/decoration.c index 39e19173a..6b4148971 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/decoration.c +++ b/src/game/sa2/stage/interactables/leaf_forest/decoration.c @@ -7,7 +7,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/entity.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/incline_ramp.c b/src/game/sa2/stage/interactables/leaf_forest/incline_ramp.c index 810ebb232..449fce1db 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/incline_ramp.c +++ b/src/game/sa2/stage/interactables/leaf_forest/incline_ramp.c @@ -8,9 +8,9 @@ #include "sprite.h" #include "task.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/platform_crumbling.c b/src/game/sa2/stage/interactables/leaf_forest/platform_crumbling.c index 6536c5a23..6577c00bd 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/platform_crumbling.c +++ b/src/game/sa2/stage/interactables/leaf_forest/platform_crumbling.c @@ -12,8 +12,8 @@ #include "data/sa2/sprite_data.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/rotating_handle.c b/src/game/sa2/stage/interactables/leaf_forest/rotating_handle.c index 9ced166db..4cf9e5cee 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/rotating_handle.c +++ b/src/game/sa2/stage/interactables/leaf_forest/rotating_handle.c @@ -17,10 +17,10 @@ #include "task.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/spikes.c b/src/game/sa2/stage/interactables/leaf_forest/spikes.c index e7ce38b9e..b00aae6c6 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/spikes.c +++ b/src/game/sa2/stage/interactables/leaf_forest/spikes.c @@ -12,10 +12,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/interactables.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/interactables.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #ifndef COLLECT_RINGS_ROM #define SPIKES_VRAM_ADDRESS (void *)(OBJ_VRAM0 + 204 * TILE_SIZE_4BPP); diff --git a/src/game/sa2/stage/interactables/leaf_forest/spring_bouncy.c b/src/game/sa2/stage/interactables/leaf_forest/spring_bouncy.c index 1bae7beb5..372b7a771 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/spring_bouncy.c +++ b/src/game/sa2/stage/interactables/leaf_forest/spring_bouncy.c @@ -11,11 +11,11 @@ #include "sprite.h" #include "task.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/stage_goal.c b/src/game/sa2/stage/interactables/leaf_forest/stage_goal.c index bbf589a46..6dfc2d422 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/stage_goal.c +++ b/src/game/sa2/stage/interactables/leaf_forest/stage_goal.c @@ -19,8 +19,8 @@ #include "sprite.h" #include "task.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.c b/src/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.c index 92e800c5e..954b48cf3 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.c +++ b/src/game/sa2/stage/interactables/leaf_forest/toggle_player_layer.c @@ -6,7 +6,7 @@ #include "game/shared/stage/entity.h" #include "sprite.h" -#include "constants/interactables.h" +#include "constants/sa2/interactables.h" typedef struct { /* 0x00 */ u8 x; diff --git a/src/game/sa2/stage/interactables/leaf_forest/windmill.c b/src/game/sa2/stage/interactables/leaf_forest/windmill.c index 2174f573a..d6c54f298 100644 --- a/src/game/sa2/stage/interactables/leaf_forest/windmill.c +++ b/src/game/sa2/stage/interactables/leaf_forest/windmill.c @@ -6,7 +6,7 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/leaf_forest/windmill.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/src/game/sa2/stage/interactables/music_plant/chord.c b/src/game/sa2/stage/interactables/music_plant/chord.c index 7f71e0b03..7452a1d27 100644 --- a/src/game/sa2/stage/interactables/music_plant/chord.c +++ b/src/game/sa2/stage/interactables/music_plant/chord.c @@ -10,10 +10,10 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/music_plant/chord.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" #define NUM_CHORD_ELEMENTS 6 #define CHORD_WIDTH_PX (NUM_CHORD_ELEMENTS * TILE_WIDTH) diff --git a/src/game/sa2/stage/interactables/music_plant/french_horn.c b/src/game/sa2/stage/interactables/music_plant/french_horn.c index def845dfe..675f4e867 100644 --- a/src/game/sa2/stage/interactables/music_plant/french_horn.c +++ b/src/game/sa2/stage/interactables/music_plant/french_horn.c @@ -5,10 +5,10 @@ #include "game/sa2/stage/interactables/music_plant/french_horn.h" #include "game/sa2/stage/interactables/music_plant/pipe_sequence.h" -#include "constants/move_states.h" -#include "constants/player_transitions.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa2/move_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" #include "data/sa2/handlers_ia_pipe_horn_sequences.h" diff --git a/src/game/sa2/stage/interactables/music_plant/german_flute.c b/src/game/sa2/stage/interactables/music_plant/german_flute.c index 3efd4835f..41eebac48 100644 --- a/src/game/sa2/stage/interactables/music_plant/german_flute.c +++ b/src/game/sa2/stage/interactables/music_plant/german_flute.c @@ -11,9 +11,9 @@ #include "game/sa2/stage/interactables/note_particle.h" #include "game/sa2/stage/interactables/music_plant/german_flute.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ s32 posX; diff --git a/src/game/sa2/stage/interactables/music_plant/keyboard.c b/src/game/sa2/stage/interactables/music_plant/keyboard.c index 283bcfd4f..6136d55ca 100644 --- a/src/game/sa2/stage/interactables/music_plant/keyboard.c +++ b/src/game/sa2/stage/interactables/music_plant/keyboard.c @@ -9,10 +9,10 @@ #include "game/sa2/stage/interactables/note_particle.h" #include "game/sa2/stage/interactables/music_plant/keyboard.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ u8 kbType; diff --git a/src/game/sa2/stage/interactables/music_plant/note_block.c b/src/game/sa2/stage/interactables/music_plant/note_block.c index 944a7a722..c06cee16a 100644 --- a/src/game/sa2/stage/interactables/music_plant/note_block.c +++ b/src/game/sa2/stage/interactables/music_plant/note_block.c @@ -9,10 +9,10 @@ #include "game/sa2/stage/interactables/note_particle.h" #include "game/sa2/stage/interactables/music_plant/note_block.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" #define NUM_NOTE_BLOCK_TYPES 7 diff --git a/src/game/sa2/stage/interactables/music_plant/note_sphere.c b/src/game/sa2/stage/interactables/music_plant/note_sphere.c index baf019fa2..ec6172802 100644 --- a/src/game/sa2/stage/interactables/music_plant/note_sphere.c +++ b/src/game/sa2/stage/interactables/music_plant/note_sphere.c @@ -13,9 +13,9 @@ #include "game/sa2/stage/interactables/note_particle.h" #include "game/sa2/stage/interactables/music_plant/note_sphere.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/music_plant/pipe_horn.c b/src/game/sa2/stage/interactables/music_plant/pipe_horn.c index 52429f937..68e7fdff8 100644 --- a/src/game/sa2/stage/interactables/music_plant/pipe_horn.c +++ b/src/game/sa2/stage/interactables/music_plant/pipe_horn.c @@ -11,9 +11,9 @@ #include "data/sa2/handlers_ia_pipe_horn_sequences.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ PipeSequence pipeSequence; diff --git a/src/game/sa2/stage/interactables/music_plant/pipe_sequence.c b/src/game/sa2/stage/interactables/music_plant/pipe_sequence.c index b094abb9a..3456e4cb0 100644 --- a/src/game/sa2/stage/interactables/music_plant/pipe_sequence.c +++ b/src/game/sa2/stage/interactables/music_plant/pipe_sequence.c @@ -10,9 +10,9 @@ #include "data/sa2/handlers_ia_pipe_horn_sequences.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" static void PipeSegmentHandler_Translate(PipeSequence *, const PipeSegment *); static void Handler_MusicPlant_Pipe_1(PipeSequence *, const PipeSegment *); diff --git a/src/game/sa2/stage/interactables/note_particle.c b/src/game/sa2/stage/interactables/note_particle.c index 9001daab7..fe89fbe2e 100644 --- a/src/game/sa2/stage/interactables/note_particle.c +++ b/src/game/sa2/stage/interactables/note_particle.c @@ -11,7 +11,7 @@ #include "game/sa2/stage/interactables/note_particle.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/src/game/sa2/stage/interactables/pipe.c b/src/game/sa2/stage/interactables/pipe.c index 41d58679d..050e7e11c 100644 --- a/src/game/sa2/stage/interactables/pipe.c +++ b/src/game/sa2/stage/interactables/pipe.c @@ -9,7 +9,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/player_transitions.h" +#include "constants/sa2/player_transitions.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/platform.c b/src/game/sa2/stage/interactables/platform.c index d0ad0b578..6b908f460 100644 --- a/src/game/sa2/stage/interactables/platform.c +++ b/src/game/sa2/stage/interactables/platform.c @@ -12,9 +12,9 @@ #include "game/shared/stage/entity.h" #include "game/shared/stage/mp_event_mgr.h" -#include "constants/animations.h" -#include "constants/interactables.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/interactables.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/platform_square.c b/src/game/sa2/stage/interactables/platform_square.c index 5cdf8e63b..b8820bc2e 100644 --- a/src/game/sa2/stage/interactables/platform_square.c +++ b/src/game/sa2/stage/interactables/platform_square.c @@ -12,10 +12,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/interactables.h" -#include "constants/player_transitions.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/interactables.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/platform_thin.c b/src/game/sa2/stage/interactables/platform_thin.c index 4c976895e..5f2b029e4 100644 --- a/src/game/sa2/stage/interactables/platform_thin.c +++ b/src/game/sa2/stage/interactables/platform_thin.c @@ -13,10 +13,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/ramp.c b/src/game/sa2/stage/interactables/ramp.c index 7ccd10eff..b808f5986 100644 --- a/src/game/sa2/stage/interactables/ramp.c +++ b/src/game/sa2/stage/interactables/ramp.c @@ -11,9 +11,9 @@ #include "game/shared/stage/entity.h" #include "game/sa2/stage/interactables/ramp.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/sky_canyon/fan.c b/src/game/sa2/stage/interactables/sky_canyon/fan.c index 1ed7297f7..6942803a0 100644 --- a/src/game/sa2/stage/interactables/sky_canyon/fan.c +++ b/src/game/sa2/stage/interactables/sky_canyon/fan.c @@ -11,8 +11,8 @@ #include "malloc_vram.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" /* This is the small propellers appearing in Sky Canyon, which you can run at while keeping a distance from them and increasing your speed. diff --git a/src/game/sa2/stage/interactables/sky_canyon/propeller.c b/src/game/sa2/stage/interactables/sky_canyon/propeller.c index dc0deb43a..17d26d457 100644 --- a/src/game/sa2/stage/interactables/sky_canyon/propeller.c +++ b/src/game/sa2/stage/interactables/sky_canyon/propeller.c @@ -15,10 +15,10 @@ #include "game/sa2/stage/interactables/sky_canyon/propeller.h" #include "game/sa2/stage/interactables/sky_canyon_init.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/sky_canyon/propeller_spring.c b/src/game/sa2/stage/interactables/sky_canyon/propeller_spring.c index 7a332f0b9..5fb627326 100644 --- a/src/game/sa2/stage/interactables/sky_canyon/propeller_spring.c +++ b/src/game/sa2/stage/interactables/sky_canyon/propeller_spring.c @@ -12,8 +12,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/sky_canyon/small_windmill.c b/src/game/sa2/stage/interactables/sky_canyon/small_windmill.c index 9404d9309..534fefb31 100644 --- a/src/game/sa2/stage/interactables/sky_canyon/small_windmill.c +++ b/src/game/sa2/stage/interactables/sky_canyon/small_windmill.c @@ -10,10 +10,10 @@ #include "game/sa2/stage/interactables/sky_canyon/small_windmill.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/sky_canyon/whirlwind.c b/src/game/sa2/stage/interactables/sky_canyon/whirlwind.c index 672fa6bb1..16d4d7929 100644 --- a/src/game/sa2/stage/interactables/sky_canyon/whirlwind.c +++ b/src/game/sa2/stage/interactables/sky_canyon/whirlwind.c @@ -10,10 +10,10 @@ #include "malloc_vram.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ s32 posX; diff --git a/src/game/sa2/stage/interactables/sky_canyon_init.c b/src/game/sa2/stage/interactables/sky_canyon_init.c index b610dca9a..bde55bed6 100644 --- a/src/game/sa2/stage/interactables/sky_canyon_init.c +++ b/src/game/sa2/stage/interactables/sky_canyon_init.c @@ -4,7 +4,7 @@ #include "game/sa2/stage/interactables/sky_canyon_init.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" static void Task_80808DC(void); diff --git a/src/game/sa2/stage/interactables/special_ring.c b/src/game/sa2/stage/interactables/special_ring.c index dd574f34e..072b812f1 100644 --- a/src/game/sa2/stage/interactables/special_ring.c +++ b/src/game/sa2/stage/interactables/special_ring.c @@ -13,8 +13,8 @@ #include "game/shared/stage/entity.h" #include "sprite.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/spring.c b/src/game/sa2/stage/interactables/spring.c index 76c63976a..1dfaca976 100644 --- a/src/game/sa2/stage/interactables/spring.c +++ b/src/game/sa2/stage/interactables/spring.c @@ -11,10 +11,10 @@ #include "game/shared/stage/entity.h" #include "game/sa2/stage/interactables/spring.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ SpriteBase base; diff --git a/src/game/sa2/stage/interactables/techno_base/arrow_platform.c b/src/game/sa2/stage/interactables/techno_base/arrow_platform.c index 1ff9c39f6..92f1f6acc 100644 --- a/src/game/sa2/stage/interactables/techno_base/arrow_platform.c +++ b/src/game/sa2/stage/interactables/techno_base/arrow_platform.c @@ -10,10 +10,10 @@ #include "game/shared/stage/camera.h" #include "game/sa2/stage/interactables/techno_base/arrow_platform.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" // Probably arrow screen diff --git a/src/game/sa2/stage/interactables/techno_base/bounce_block.c b/src/game/sa2/stage/interactables/techno_base/bounce_block.c index 70e8b100c..6106909a9 100644 --- a/src/game/sa2/stage/interactables/techno_base/bounce_block.c +++ b/src/game/sa2/stage/interactables/techno_base/bounce_block.c @@ -5,10 +5,10 @@ #include "game/shared/stage/camera.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/techno_base/light_bridge.c b/src/game/sa2/stage/interactables/techno_base/light_bridge.c index ff1275cf7..06477299d 100644 --- a/src/game/sa2/stage/interactables/techno_base/light_bridge.c +++ b/src/game/sa2/stage/interactables/techno_base/light_bridge.c @@ -8,9 +8,9 @@ #include "malloc_vram.h" #include "lib/m4a/m4a.h" -#include "constants/interactables.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/interactables.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #define MACRO_F7C(a, b, c) \ ({ \ diff --git a/src/game/sa2/stage/interactables/techno_base/light_globe.c b/src/game/sa2/stage/interactables/techno_base/light_globe.c index 0a398a8c9..3cfa8826d 100644 --- a/src/game/sa2/stage/interactables/techno_base/light_globe.c +++ b/src/game/sa2/stage/interactables/techno_base/light_globe.c @@ -9,9 +9,9 @@ #include "malloc_vram.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/interactables/techno_base/spike_platform.c b/src/game/sa2/stage/interactables/techno_base/spike_platform.c index c5bbc97e9..8317037f1 100644 --- a/src/game/sa2/stage/interactables/techno_base/spike_platform.c +++ b/src/game/sa2/stage/interactables/techno_base/spike_platform.c @@ -11,8 +11,8 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/entity.h" #include "game/sa2/stage/interactables/techno_base/spike_platform.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { SpriteBase base; diff --git a/src/game/sa2/stage/itembox.c b/src/game/sa2/stage/itembox.c index a377de2c2..0e81c9ddd 100644 --- a/src/game/sa2/stage/itembox.c +++ b/src/game/sa2/stage/itembox.c @@ -17,12 +17,12 @@ #include "game/shared/stage/mp_event_mgr.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/items.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/items.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define ITEM_DURATION_INVINCIBILITY TIME(0, 20) #define ITEM_DURATION_SPEED_UP TIME(0, 20) diff --git a/src/game/sa2/stage/mp_attack_1_effect.c b/src/game/sa2/stage/mp_attack_1_effect.c index e117b154f..d75dbef51 100644 --- a/src/game/sa2/stage/mp_attack_1_effect.c +++ b/src/game/sa2/stage/mp_attack_1_effect.c @@ -6,7 +6,7 @@ #include "game/shared/stage/entity.h" #include "lib/m4a/m4a.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" struct MPAttack1Effect { /* 0x00 */ u8 unk0; diff --git a/src/game/sa2/stage/mp_attack_2_effect.c b/src/game/sa2/stage/mp_attack_2_effect.c index 83cf86eac..e242a5cb4 100644 --- a/src/game/sa2/stage/mp_attack_2_effect.c +++ b/src/game/sa2/stage/mp_attack_2_effect.c @@ -5,7 +5,7 @@ #include "game/sa2/stage/mp_attack_2_effect.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" #ifndef COLLECT_RINGS_ROM // Not clear why this is 16 aligned in the main game diff --git a/src/game/sa2/stage/mystery_itembox.c b/src/game/sa2/stage/mystery_itembox.c index 569c678fd..d690ff4f6 100644 --- a/src/game/sa2/stage/mystery_itembox.c +++ b/src/game/sa2/stage/mystery_itembox.c @@ -10,11 +10,11 @@ #include "game/shared/stage/camera.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define ITEM_ICON_DISPLAY_TIME (1 * GBA_FRAMES_PER_SECOND) #define ITEM_ICON_DISPLAY_DELAY (int)(0.5 * GBA_FRAMES_PER_SECOND) diff --git a/src/game/sa2/stage/player_callbacks.c b/src/game/sa2/stage/player_callbacks.c index f986c3d5b..beb335540 100644 --- a/src/game/sa2/stage/player_callbacks.c +++ b/src/game/sa2/stage/player_callbacks.c @@ -16,10 +16,10 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" // NOTE: It seems like this was supposed to store 5 positions for displaying/storing bound motion frames // but actually none of the positions are used. diff --git a/src/game/sa2/stage/player_super_sonic.c b/src/game/sa2/stage/player_super_sonic.c index f0481fb2b..f052ffe29 100644 --- a/src/game/sa2/stage/player_super_sonic.c +++ b/src/game/sa2/stage/player_super_sonic.c @@ -15,11 +15,11 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/characters.h" -#include "constants/move_states.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/characters.h" +#include "constants/sa2/move_states.h" +#include "constants/sa2/songs.h" static void Task_802BC10(void); static void sub_802BE1C(struct SuperSonic *sonic); diff --git a/src/game/sa2/stage/race_progress.c b/src/game/sa2/stage/race_progress.c index 86d3a17e1..6713242fd 100644 --- a/src/game/sa2/stage/race_progress.c +++ b/src/game/sa2/stage/race_progress.c @@ -9,8 +9,8 @@ #include "game/shared/stage/mp_player.h" #include "game/sa2/stage/screen_fade.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" struct RaceProgressIndicator { Sprite avatars[4]; diff --git a/src/game/sa2/stage/spawn_positions.c b/src/game/sa2/stage/spawn_positions.c index e04c9a2c2..84df1f2c9 100644 --- a/src/game/sa2/stage/spawn_positions.c +++ b/src/game/sa2/stage/spawn_positions.c @@ -1,5 +1,5 @@ #include "global.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" ALIGNED(4) const s16 gSpawnPositions[][2] = { diff --git a/src/game/sa2/stage/stage_ui.c b/src/game/sa2/stage/stage_ui.c index fb55c3bdc..196cf4a2d 100644 --- a/src/game/sa2/stage/stage_ui.c +++ b/src/game/sa2/stage/stage_ui.c @@ -10,9 +10,9 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #define UI_ASCII_COLON 10 #define UI_ASCII_SP_RING 11 diff --git a/src/game/sa2/stage/tilemap_table.c b/src/game/sa2/stage/tilemap_table.c index f62281415..46757e009 100644 --- a/src/game/sa2/stage/tilemap_table.c +++ b/src/game/sa2/stage/tilemap_table.c @@ -3,8 +3,8 @@ #include "data/sa2/tilemap_data.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" +#include "constants/sa2/tilemaps.h" +#include "constants/sa2/zones.h" const Tilemap *const gTilemaps[] = { [0] = &MapHeader_zone_1_act_1_fg0.tileset, diff --git a/src/game/sa2/stage/trapped_animals.c b/src/game/sa2/stage/trapped_animals.c index f4e46fc78..3316971e4 100644 --- a/src/game/sa2/stage/trapped_animals.c +++ b/src/game/sa2/stage/trapped_animals.c @@ -8,8 +8,8 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" typedef struct { s32 vramOffset; diff --git a/src/game/sa2/title_screen.c b/src/game/sa2/title_screen.c index b6fde55b1..a55205a42 100644 --- a/src/game/sa2/title_screen.c +++ b/src/game/sa2/title_screen.c @@ -31,16 +31,16 @@ #endif #if (GAME == GAME_SA1) -#include "constants/songs.h" +#include "constants/sa2/songs.h" #endif -#include "constants/zones.h" +#include "constants/sa2/zones.h" #include "game/sa2/assets/compressed/roms.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" typedef struct { // Possibly an array of ui elements? diff --git a/src/game/sa2/ui/character_select.c b/src/game/sa2/ui/character_select.c index 486652953..f3139caf7 100644 --- a/src/game/sa2/ui/character_select.c +++ b/src/game/sa2/ui/character_select.c @@ -18,10 +18,10 @@ #include "game/sa2/ui/time_attack_lobby.h" #include "game/sa2/ui/time_attack_mode_select.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct CharacterSelectionScreen { /* 0x00 */ ScreenFade fade; diff --git a/src/game/sa2/ui/countdown.c b/src/game/sa2/ui/countdown.c index d657c6597..a93f757a6 100644 --- a/src/game/sa2/ui/countdown.c +++ b/src/game/sa2/ui/countdown.c @@ -11,10 +11,10 @@ #include "game/shared/stage/mp_player.h" #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" #define ALIGN_DIGITS_HORIZONTALLY TRUE #define ALIGN_DIGITS_VERTICALLY !TRUE diff --git a/src/game/sa2/ui/course_select.c b/src/game/sa2/ui/course_select.c index 670210f03..b4fc90103 100644 --- a/src/game/sa2/ui/course_select.c +++ b/src/game/sa2/ui/course_select.c @@ -8,16 +8,16 @@ #include "lib/m4a/m4a.h" #include "game/sa2/ui/character_select.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" #include "task.h" #include "malloc_vram.h" #include "game/sa2/multiplayer/multipak_connection.h" #include "game/sa2/stage/bosses/final_intro.h" #include "trig.h" -#include "constants/animations.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/tilemaps.h" struct CourseSelectionScreen { ScreenFade fade; diff --git a/src/game/sa2/ui/game_over.c b/src/game/sa2/ui/game_over.c index f69e5f2c8..12e4902e4 100644 --- a/src/game/sa2/ui/game_over.c +++ b/src/game/sa2/ui/game_over.c @@ -16,9 +16,9 @@ #include "game/shared/stage/stage.h" #include "game/sa2/stage/debug_text_printer.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" // NOTE: // The prefixes indicate their relation to the specific "over" screen: diff --git a/src/game/sa2/ui/multiplayer_lobby.c b/src/game/sa2/ui/multiplayer_lobby.c index 49970b851..b8d8c35e4 100644 --- a/src/game/sa2/ui/multiplayer_lobby.c +++ b/src/game/sa2/ui/multiplayer_lobby.c @@ -5,16 +5,16 @@ #include "sprite.h" #include "game/sa2/stage/screen_fade.h" #include "lib/m4a/m4a.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" #include "game/sa2/save.h" #include "malloc_vram.h" #include "game/sa2/collect_rings/singlepak_connection.h" #include "game/sa2/title_screen.h" #include "game/sa2/ui/character_select.h" -#include "constants/animations.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct MultiplayerLobbyScreen { Sprite chao; diff --git a/src/game/sa2/ui/stage_intro.c b/src/game/sa2/ui/stage_intro.c index 0f393e8d2..2f9fb8154 100644 --- a/src/game/sa2/ui/stage_intro.c +++ b/src/game/sa2/ui/stage_intro.c @@ -15,8 +15,8 @@ #include "game/sa2/stage/boss_results_transition.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" #define INTRO_ICON_LEAF_FOREST 0 #define INTRO_ICON_HOT_CRATAER 1 diff --git a/src/game/sa2/ui/stage_results.c b/src/game/sa2/ui/stage_results.c index c63933ab8..ce29aa525 100644 --- a/src/game/sa2/ui/stage_results.c +++ b/src/game/sa2/ui/stage_results.c @@ -15,10 +15,10 @@ #include "game/sa2/ui/stage_results.h" #include "game/sa2/stage/stage_ui.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" typedef struct { StageResultsBase base; diff --git a/src/game/sa2/ui/time_attack_lobby.c b/src/game/sa2/ui/time_attack_lobby.c index 6ede645fc..97ffbc0d9 100644 --- a/src/game/sa2/ui/time_attack_lobby.c +++ b/src/game/sa2/ui/time_attack_lobby.c @@ -10,12 +10,12 @@ #include "game/sa2/ui/course_select.h" #include "game/sa2/options_screen.h" #include "game/sa2/title_screen.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" #include "task.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/tilemaps.h" struct TimeAttackLobbyScreen { Background unk0; diff --git a/src/game/sa2/ui/time_attack_mode_select.c b/src/game/sa2/ui/time_attack_mode_select.c index 922afc0df..2cf9052ee 100644 --- a/src/game/sa2/ui/time_attack_mode_select.c +++ b/src/game/sa2/ui/time_attack_mode_select.c @@ -13,10 +13,10 @@ #include "game/sa2/title_screen.h" #include "game/sa2/stage/screen_mask.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct TimeAttackModeSelectionScreen { Background unk0; diff --git a/src/game/sa2/ui/time_attack_results.c b/src/game/sa2/ui/time_attack_results.c index 825d024bc..d56d117c0 100644 --- a/src/game/sa2/ui/time_attack_results.c +++ b/src/game/sa2/ui/time_attack_results.c @@ -12,9 +12,9 @@ #include "game/sa2/ui/stage_results.h" #include "game/sa2/ui/time_attack_lobby.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" typedef struct { StageResultsBase base; diff --git a/src/game/shared/collect_rings/results.c b/src/game/shared/collect_rings/results.c index 43edb4ff7..50914fd7c 100644 --- a/src/game/shared/collect_rings/results.c +++ b/src/game/shared/collect_rings/results.c @@ -25,10 +25,10 @@ #include "data/sa2/collect_rings.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct MultiplayerSinglePakResultsScreen_UNK80 { Sprite unk0; diff --git a/src/game/shared/menus/unused_level_select.c b/src/game/shared/menus/unused_level_select.c index f0bcd8257..30d5884a5 100644 --- a/src/game/shared/menus/unused_level_select.c +++ b/src/game/shared/menus/unused_level_select.c @@ -21,7 +21,7 @@ #include "animation_commands_bg.h" #include "data/sa2/tileset_debug_ascii.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" typedef struct { void *vram; diff --git a/src/game/shared/multiplayer/communication_outcome.c b/src/game/shared/multiplayer/communication_outcome.c index eb06c8225..b770ecda2 100644 --- a/src/game/shared/multiplayer/communication_outcome.c +++ b/src/game/shared/multiplayer/communication_outcome.c @@ -18,10 +18,10 @@ #include "game/sa2/stage/tilemap_table.h" -#include "constants/animations.h" -#include "constants/songs.h" -#include "constants/text.h" -#include "constants/tilemaps.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" +#include "constants/sa2/tilemaps.h" struct CommunicationOutcomeScreen { Background unk0; diff --git a/src/game/shared/stage/amy_attack_heart_effect.c b/src/game/shared/stage/amy_attack_heart_effect.c index f9ccb3cdc..72c702e18 100644 --- a/src/game/shared/stage/amy_attack_heart_effect.c +++ b/src/game/shared/stage/amy_attack_heart_effect.c @@ -8,9 +8,9 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #if (GAME == GAME_SA2) -#include "constants/char_states.h" +#include "constants/sa2/char_states.h" #endif typedef struct { diff --git a/src/game/shared/stage/camera.c b/src/game/shared/stage/camera.c index d97da0c26..8bd285850 100644 --- a/src/game/shared/stage/camera.c +++ b/src/game/shared/stage/camera.c @@ -14,9 +14,9 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/terrain_collision.h" -#include "constants/tilemaps.h" -#include "constants/zones.h" -#include "constants/characters.h" +#include "constants/sa2/tilemaps.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/characters.h" #define BOSS_CAM_FRAME_DELTA_PIXELS 5 diff --git a/src/game/shared/stage/collect_ring_effect.c b/src/game/shared/stage/collect_ring_effect.c index 66c3ca091..a7e235137 100644 --- a/src/game/shared/stage/collect_ring_effect.c +++ b/src/game/shared/stage/collect_ring_effect.c @@ -9,7 +9,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/collision.c b/src/game/shared/stage/collision.c index 89a4bae73..c9e48e7a3 100644 --- a/src/game/shared/stage/collision.c +++ b/src/game/shared/stage/collision.c @@ -14,9 +14,9 @@ #include "game/shared/stage/rings_scatter.h" #include "game/sa2/stage/trapped_animals.h" -#include "constants/animations.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" #ifndef COLLECT_RINGS_ROM u32 Coll_Player_Entity_RectIntersection(Sprite *s, s32 sx, s32 sy, Player *p, Rect8 *rectPlayer) diff --git a/src/game/shared/stage/demo_manager.c b/src/game/shared/stage/demo_manager.c index 3cc8749e5..a3d86b7ad 100644 --- a/src/game/shared/stage/demo_manager.c +++ b/src/game/shared/stage/demo_manager.c @@ -16,8 +16,8 @@ #include "game/sa2/save.h" #include "game/sa2/title_screen.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/anim_sizes.h" #if (GAME == GAME_SA1) #define DEMO_SPRITE_PRIO 1 diff --git a/src/game/shared/stage/dust_cloud.c b/src/game/shared/stage/dust_cloud.c index 0f4918336..19edd8077 100644 --- a/src/game/shared/stage/dust_cloud.c +++ b/src/game/shared/stage/dust_cloud.c @@ -3,7 +3,7 @@ #include "task.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #ifndef COLLECT_RINGS_ROM #define DUST_CLOUD_VRAM_ADDRESS (void *)(OBJ_VRAM0 + 0x1000); diff --git a/src/game/shared/stage/dust_effect_braking.c b/src/game/shared/stage/dust_effect_braking.c index 16dc9a93a..a32457c30 100644 --- a/src/game/shared/stage/dust_effect_braking.c +++ b/src/game/shared/stage/dust_effect_braking.c @@ -5,7 +5,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/dust_effect_braking.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" DustEffectBraking ALIGNED(8) gDustEffectBrakingTask = {}; diff --git a/src/game/shared/stage/dust_effect_spindash.c b/src/game/shared/stage/dust_effect_spindash.c index 6b2dc023e..f5a5eb965 100644 --- a/src/game/shared/stage/dust_effect_spindash.c +++ b/src/game/shared/stage/dust_effect_spindash.c @@ -9,7 +9,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/enemy_defeat_score.c b/src/game/shared/stage/enemy_defeat_score.c index 06e289a91..b66986724 100644 --- a/src/game/shared/stage/enemy_defeat_score.c +++ b/src/game/shared/stage/enemy_defeat_score.c @@ -5,7 +5,7 @@ #include "game/shared/stage/player.h" #include "game/shared/stage/camera.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" void Task_CreateEnemyDefeatScore_MoveUp(void); void Task_CreateEnemyDefeatScore_Hold(void); diff --git a/src/game/shared/stage/entities_manager.c b/src/game/shared/stage/entities_manager.c index 3ac44acc2..72547b4be 100644 --- a/src/game/shared/stage/entities_manager.c +++ b/src/game/shared/stage/entities_manager.c @@ -112,8 +112,8 @@ #include "game/sa2/assets/compressed/entities.h" -#include "constants/zones.h" -#include "constants/songs.h" +#include "constants/sa2/zones.h" +#include "constants/sa2/songs.h" #define NUM_ENEMY_DEFEAT_SCORES 5 #define READ_START_INDEX(p, hrc, rx, ry) (*((u32 *)((((u8 *)(p)) + (((hrc) * (ry)) * (sizeof(u32)))) + ((rx) * (sizeof(u32)))))) diff --git a/src/game/shared/stage/grind_effect_1.c b/src/game/shared/stage/grind_effect_1.c index ab24353f0..082aea96f 100644 --- a/src/game/shared/stage/grind_effect_1.c +++ b/src/game/shared/stage/grind_effect_1.c @@ -5,8 +5,8 @@ #include "malloc_vram.h" #include "task.h" -#include "constants/animations.h" -#include "constants/anim_sizes.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/anim_sizes.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/item_tasks.c b/src/game/shared/stage/item_tasks.c index 5bd090ce1..8b94a5344 100644 --- a/src/game/shared/stage/item_tasks.c +++ b/src/game/shared/stage/item_tasks.c @@ -11,8 +11,8 @@ #include "game/shared/stage/item_tasks.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/magnetic_ring.c b/src/game/shared/stage/magnetic_ring.c index 0299602ef..aeef81d1e 100644 --- a/src/game/shared/stage/magnetic_ring.c +++ b/src/game/shared/stage/magnetic_ring.c @@ -9,8 +9,8 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/mp_event_mgr.c b/src/game/shared/stage/mp_event_mgr.c index 6cd244ea9..71e65139f 100644 --- a/src/game/shared/stage/mp_event_mgr.c +++ b/src/game/shared/stage/mp_event_mgr.c @@ -12,8 +12,8 @@ #include "lib/m4a/m4a.h" -#include "constants/char_states.h" -#include "constants/songs.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/songs.h" void ReceiveRoomEvent_ReachedStageGoal(union MultiSioData *recv, u8 i); void ReceiveRoomEvent_ItemEffect(union MultiSioData *recv, u8 i); diff --git a/src/game/shared/stage/mp_finish.c b/src/game/shared/stage/mp_finish.c index 58d60420d..52c27acae 100644 --- a/src/game/shared/stage/mp_finish.c +++ b/src/game/shared/stage/mp_finish.c @@ -16,8 +16,8 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/text.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/text.h" #if (GAME == GAME_SA1) && !(defined NON_MATCHING) // Once CreateMultiplayerFinishHandler matches in SA1, diff --git a/src/game/shared/stage/mp_indicators.c b/src/game/shared/stage/mp_indicators.c index 1762f7847..615b0969d 100644 --- a/src/game/shared/stage/mp_indicators.c +++ b/src/game/shared/stage/mp_indicators.c @@ -7,7 +7,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/mp_player.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #ifndef COLLECT_RINGS_ROM #define RESERVED_INDICATOR_TILES_VRAM (void *)(OBJ_VRAM0 + 0x2700) diff --git a/src/game/shared/stage/mp_player.c b/src/game/shared/stage/mp_player.c index edda0584a..d778ad9a3 100644 --- a/src/game/shared/stage/mp_player.c +++ b/src/game/shared/stage/mp_player.c @@ -26,10 +26,10 @@ #endif #include "game/sa2/multiplayer/multipak_connection.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/move_states.h" -#include "constants/songs.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/move_states.h" +#include "constants/sa2/songs.h" // TODO: Names #if (GAME == GAME_SA1) diff --git a/src/game/shared/stage/mp_sprite_task.c b/src/game/shared/stage/mp_sprite_task.c index fe650930d..6cd104c64 100644 --- a/src/game/shared/stage/mp_sprite_task.c +++ b/src/game/shared/stage/mp_sprite_task.c @@ -12,7 +12,7 @@ #include "game/shared/stage/stage.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #if (GAME == GAME_SA2) const u16 sAnimData_StageGoalScoreBonus[][3] = { diff --git a/src/game/shared/stage/music_manager.c b/src/game/shared/stage/music_manager.c index e6cb782cd..2481f92d2 100644 --- a/src/game/shared/stage/music_manager.c +++ b/src/game/shared/stage/music_manager.c @@ -7,7 +7,7 @@ #include "lib/m4a/m4a.h" -#include "constants/songs.h" +#include "constants/sa2/songs.h" static void MusManager_UpdateBgmParams(void); void MusManager_Fadeout(u16 fadeoutSpeed); diff --git a/src/game/shared/stage/pause_menu.c b/src/game/shared/stage/pause_menu.c index 782484efb..7d5eed9c3 100644 --- a/src/game/shared/stage/pause_menu.c +++ b/src/game/shared/stage/pause_menu.c @@ -11,10 +11,10 @@ #include "game/sa2/title_screen.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #include "flags.h" -#include "constants/songs.h" -#include "constants/text.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/text.h" typedef struct { /* 0x00 */ Sprite s; diff --git a/src/game/shared/stage/player.c b/src/game/shared/stage/player.c index 1ded468df..6248d1db6 100644 --- a/src/game/shared/stage/player.c +++ b/src/game/shared/stage/player.c @@ -35,11 +35,11 @@ #include "game/sa2/stage/mp_attack_1_effect.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/char_states.h" -#include "constants/player_transitions.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/char_states.h" +#include "constants/sa2/player_transitions.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" // >> acceleration = (sin(angle) * 3) / 32 #define GET_ROTATED_ACCEL(angle) ((SIN_24_8((angle)*4) * 3) >> 5) diff --git a/src/game/shared/stage/rings_manager.c b/src/game/shared/stage/rings_manager.c index d6c30fad9..0c6b83331 100644 --- a/src/game/shared/stage/rings_manager.c +++ b/src/game/shared/stage/rings_manager.c @@ -16,7 +16,7 @@ #include "game/sa2/assets/compressed/entities.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" typedef struct { Sprite s; diff --git a/src/game/shared/stage/rings_scatter.c b/src/game/shared/stage/rings_scatter.c index a31b8eeeb..a1ed6b82c 100644 --- a/src/game/shared/stage/rings_scatter.c +++ b/src/game/shared/stage/rings_scatter.c @@ -14,16 +14,8 @@ #include "game/shared/stage/collect_ring_effect.h" #include "game/shared/stage/rings_manager.h" -#include "constants/animations.h" -#include "constants/songs.h" - -#if (GAME == GAME_SA1) -#define MAX_SCATTERING_RINGS_COUNT_SP 48 -#define MAX_SCATTERING_RINGS_COUNT_MP 32 -#elif (GAME == GAME_SA2) -#define MAX_SCATTERING_RINGS_COUNT_SP 32 -#define MAX_SCATTERING_RINGS_COUNT_MP 16 -#endif +#include "constants/sa2/animations.h" +#include "constants/sa2/songs.h" #if (GAME == GAME_SA1) #define UNK10_CONDITION 1 @@ -41,26 +33,6 @@ #define HB_ALT_HEIGHT(hb) ((hb)->bottom - (hb)->top) #define HB_ALT_BOTTOM(p, hb) (I((p)->qWorldY) + HB_ALT_HEIGHT(hb)) -typedef struct { - /* 0x00 */ s32 x; - /* 0x04 */ s32 y; - /* 0x08 */ s16 velX; - /* 0x0A */ s16 velY; - /* 0x0C */ u16 unkC; - /* 0x0E */ s16 unkE; -#if (GAME == GAME_SA2) - /* 0x10 */ u16 unk10; -#endif -} ScatterRing; /* size: 0x14 */ - -typedef struct { - /* 0x000 */ Sprite sprRing; - /* 0x030 */ ScatterRing rings[MAX_SCATTERING_RINGS_COUNT_SP]; - /* 0x2B0 */ u32 unk2B0; - /* 0x2B4 */ u16 unk2B4; - /* 0x2B6 */ u16 unk2B6; -} RingsScatter; /* size: 0x2B8 */ - struct Task *gRingsScatterTask = NULL; void Task_RingsScatter_Singleplayer(void); diff --git a/src/game/shared/stage/stage.c b/src/game/shared/stage/stage.c index f41a527c4..02a0c4398 100644 --- a/src/game/shared/stage/stage.c +++ b/src/game/shared/stage/stage.c @@ -28,10 +28,10 @@ #include "lib/m4a/m4a.h" -#include "constants/animations.h" -#include "constants/characters.h" -#include "constants/songs.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/characters.h" +#include "constants/sa2/songs.h" +#include "constants/sa2/zones.h" #include "game/shared/stage/mp_event_mgr.h" diff --git a/src/game/shared/stage/terrain_collision.c b/src/game/shared/stage/terrain_collision.c index d51ae4c36..8a102b639 100644 --- a/src/game/shared/stage/terrain_collision.c +++ b/src/game/shared/stage/terrain_collision.c @@ -4,7 +4,7 @@ #include "game/shared/stage/camera.h" #include "game/shared/stage/player.h" -#include "constants/zones.h" +#include "constants/sa2/zones.h" const Collision *gRefCollision = NULL; diff --git a/src/game/shared/stage/underwater_effects.c b/src/game/shared/stage/underwater_effects.c index 35b9bcd07..9441a5bb2 100644 --- a/src/game/shared/stage/underwater_effects.c +++ b/src/game/shared/stage/underwater_effects.c @@ -11,7 +11,7 @@ #include "game/shared/stage/underwater_effects.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" +#include "constants/sa2/animations.h" #define MAX_SMALL_BUBBLE_COUNT 11 diff --git a/src/game/shared/stage/water_effects.c b/src/game/shared/stage/water_effects.c index 1bc4a9369..fd6039741 100644 --- a/src/game/shared/stage/water_effects.c +++ b/src/game/shared/stage/water_effects.c @@ -12,8 +12,8 @@ #include "data/sa2/sprite_data.h" #include "game/shared/stage/water_effects.h" -#include "constants/animations.h" -#include "constants/zones.h" +#include "constants/sa2/animations.h" +#include "constants/sa2/zones.h" typedef struct { /* 0x00 */ s32 x; diff --git a/tools/BriBaSA_ex/src/drawing.c b/tools/BriBaSA_ex/src/drawing.c index 4d487f973..8d316bd2a 100644 --- a/tools/BriBaSA_ex/src/drawing.c +++ b/tools/BriBaSA_ex/src/drawing.c @@ -23,8 +23,8 @@ #define BRIDGE_TYPE_CURVED 1 -#include "../../../include/constants/interactables.h" -#include "../../../include/constants/zones.h" +#include "../../../include/constants/sa2/interactables.h" +#include "../../../include/constants/sa2/zones.h" static void DrawEntInteractableSA2(AppState *state, int x, int y, int kind, char data[4]); static inline bool DrawOnOffButton(UiContext *ui, UiIdent *id, Rectangle rec, char *text, bool cond); diff --git a/tools/BriBaSA_ex/src/main.c b/tools/BriBaSA_ex/src/main.c index 9ce87ccee..b6d8d0bea 100644 --- a/tools/BriBaSA_ex/src/main.c +++ b/tools/BriBaSA_ex/src/main.c @@ -14,8 +14,8 @@ #include // from raylib, for MAX_FILEPATH_LENGTH #include -#include "../../../include/constants/interactables.h" -#include "../../../include/constants/zones.h" +#include "../../../include/constants/sa2/interactables.h" +#include "../../../include/constants/sa2/zones.h" #include "global.h" #include "drawing.h"