From 6b145ed77c01dd3ea8d18709ff818a85f6b3a392 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Fri, 24 Aug 2018 04:21:07 +0100 Subject: Move data from graphics.s to C --- data/graphics.s | 5178 ----------- data/graphics/berries/berry_graphics.inc | 343 - data/graphics/decorations/decoration_graphics.inc | 252 - data/graphics/items/item_graphics.inc | 1883 ---- .../pokemon/circled_question_mark_graphics.inc | 15 - data/graphics/pokemon/graphics.inc | 9619 -------------------- data/graphics/trainers/graphics.inc | 783 -- 7 files changed, 18073 deletions(-) delete mode 100644 data/graphics/berries/berry_graphics.inc delete mode 100644 data/graphics/decorations/decoration_graphics.inc delete mode 100644 data/graphics/items/item_graphics.inc delete mode 100644 data/graphics/pokemon/circled_question_mark_graphics.inc delete mode 100644 data/graphics/pokemon/graphics.inc delete mode 100644 data/graphics/trainers/graphics.inc (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 01e8c3b2c..2c1a98924 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,5183 +1,5 @@ .section gfx_data, "aw", %progbits - .align 2 -gBattleTextboxTiles:: @ 8C00000 - .incbin "graphics/interface/menu.4bpp.lz" @ menu window and arrows - - .align 2 -gBattleTextboxPalette:: @ 8C004E0 - .incbin "graphics/interface/menu.gbapal.lz" - - .align 2 -gBattleTextboxTilemap:: @ 8C00524 - .incbin "graphics/interface/menu_map.bin.lz" - -@ 8C00750 - .include "data/graphics/pokemon/circled_question_mark_graphics.inc" - -@ 8C00C10 - .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/old_charmap.bin.lz" - .incbin "graphics/unused/old_charmap.gbapal.lz" - - .align 2 -gSmokescreenImpactTiles:: @ 8C01644 - .incbin "graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz" - - .align 2 -gSmokescreenImpactPalette:: @ 8C01724 - .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" - - .align 2 -gInterfaceGfx_PokeBall:: - .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_PokeBall:: - .incbin "graphics/interface/ball/poke.gbapal.lz" - - .align 2 -gInterfaceGfx_GreatBall:: - .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_GreatBall:: - .incbin "graphics/interface/ball/great.gbapal.lz" - - .align 2 -gInterfaceGfx_SafariBall:: - .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_SafariBall:: - .incbin "graphics/interface/ball/safari.gbapal.lz" - - .align 2 -gInterfaceGfx_UltraBall:: - .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_UltraBall:: - .incbin "graphics/interface/ball/ultra.gbapal.lz" - - .align 2 -gInterfaceGfx_MasterBall:: - .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_MasterBall:: - .incbin "graphics/interface/ball/master.gbapal.lz" - - .align 2 -gInterfaceGfx_NetBall:: - .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_NetBall:: - .incbin "graphics/interface/ball/net.gbapal.lz" - - .align 2 -gInterfaceGfx_DiveBall:: - .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_DiveBall:: - .incbin "graphics/interface/ball/dive.gbapal.lz" - - .align 2 -gInterfaceGfx_NestBall:: - .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_NestBall:: - .incbin "graphics/interface/ball/nest.gbapal.lz" - - .align 2 -gInterfaceGfx_RepeatBall:: - .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_RepeatBall:: - .incbin "graphics/interface/ball/repeat.gbapal.lz" - - .align 2 -gInterfaceGfx_TimerBall:: - .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_TimerBall:: - .incbin "graphics/interface/ball/timer.gbapal.lz" - - .align 2 -gInterfaceGfx_LuxuryBall:: - .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_LuxuryBall:: - .incbin "graphics/interface/ball/luxury.gbapal.lz" - - .align 2 -gInterfaceGfx_PremierBall:: - .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC - - .align 2 -gInterfacePal_PremierBall:: - .incbin "graphics/interface/ball/premier.gbapal.lz" - - .align 2 -gOpenPokeballGfx:: @ 8C02300 - .incbin "graphics/interface/ball_open.4bpp.lz" - - .align 2 -gBlankGfxCompressed:: @ 8C0237C - .incbin "graphics/interface/blank.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_146:: - .incbin "graphics/battle_anims/sprites/146.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_000:: - .incbin "graphics/battle_anims/sprites/000.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_003:: - .incbin "graphics/battle_anims/sprites/003.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_004:: - .incbin "graphics/battle_anims/sprites/004.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_005:: - .incbin "graphics/battle_anims/sprites/005.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_006:: - .incbin "graphics/battle_anims/sprites/006.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_115:: - .incbin "graphics/battle_anims/sprites/115.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_000:: - .incbin "graphics/battle_anims/sprites/000.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_003:: - .incbin "graphics/battle_anims/sprites/003.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_004:: - .incbin "graphics/battle_anims/sprites/004.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_005:: - .incbin "graphics/battle_anims/sprites/005.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_006:: - .incbin "graphics/battle_anims/sprites/006.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_161:: - .incbin "graphics/battle_anims/sprites/161.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_161:: - .incbin "graphics/battle_anims/sprites/161.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_007:: - .incbin "graphics/battle_anims/sprites/007.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_007:: - .incbin "graphics/battle_anims/sprites/007.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_008:: - .incbin "graphics/battle_anims/sprites/008.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_008:: - .incbin "graphics/battle_anims/sprites/008.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_010:: - .incbin "graphics/battle_anims/sprites/010.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_010:: - .incbin "graphics/battle_anims/sprites/010.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_009:: - .incbin "graphics/battle_anims/sprites/009.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_009:: - .incbin "graphics/battle_anims/sprites/009.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_011:: - .incbin "graphics/battle_anims/sprites/011.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_011:: - .incbin "graphics/battle_anims/sprites/011.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_012:: - .incbin "graphics/battle_anims/sprites/012.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_012:: - .incbin "graphics/battle_anims/sprites/012.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_152:: - .incbin "graphics/battle_anims/sprites/152.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_152:: - .incbin "graphics/battle_anims/sprites/152.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_013:: - .incbin "graphics/battle_anims/sprites/013.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_013:: - .incbin "graphics/battle_anims/sprites/013.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_015:: - .incbin "graphics/battle_anims/sprites/015.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_015:: - .incbin "graphics/battle_anims/sprites/015.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_016:: - .incbin "graphics/battle_anims/sprites/016.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_016:: - .incbin "graphics/battle_anims/sprites/016.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_017:: - .incbin "graphics/battle_anims/sprites/017.4bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C035B8.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_019:: - .incbin "graphics/battle_anims/sprites/019.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_019:: - .incbin "graphics/battle_anims/sprites/019.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_020:: - .incbin "graphics/battle_anims/sprites/020.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_020:: - .incbin "graphics/battle_anims/sprites/020.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_023:: - .incbin "graphics/battle_anims/sprites/023.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_023:: - .incbin "graphics/battle_anims/sprites/023.4bpp.lz" - - .align 2 - .incbin "graphics/unused/battle_anim_023.gbapal.lz" - - .align 2 - .incbin "graphics/unused/music_notes.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_021:: - .incbin "graphics/battle_anims/sprites/021.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_021:: - .incbin "graphics/battle_anims/sprites/021.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_022:: - .incbin "graphics/battle_anims/sprites/022.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_025:: - .incbin "graphics/battle_anims/sprites/025.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_025:: - .incbin "graphics/battle_anims/sprites/025.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_024:: - .incbin "graphics/battle_anims/sprites/024.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_024:: - .incbin "graphics/battle_anims/sprites/024.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_031:: - .incbin "graphics/battle_anims/sprites/031.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_031:: - .incbin "graphics/battle_anims/sprites/031.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_032:: - .incbin "graphics/battle_anims/sprites/032.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_032:: - .incbin "graphics/battle_anims/sprites/032.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_026:: - .incbin "graphics/battle_anims/sprites/026.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_026:: - .incbin "graphics/battle_anims/sprites/026.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_027:: - .incbin "graphics/battle_anims/sprites/027.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_027:: - .incbin "graphics/battle_anims/sprites/027.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_028:: - .incbin "graphics/battle_anims/sprites/028.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_028:: - .incbin "graphics/battle_anims/sprites/028.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_029:: - .incbin "graphics/battle_anims/sprites/029.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_029:: - .incbin "graphics/battle_anims/sprites/029.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_030:: - .incbin "graphics/battle_anims/sprites/030.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_030:: - .incbin "graphics/battle_anims/sprites/030.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_033:: - .incbin "graphics/battle_anims/sprites/033.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_033:: - .incbin "graphics/battle_anims/sprites/033.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_034:: - .incbin "graphics/battle_anims/sprites/034.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_035:: - .incbin "graphics/battle_anims/sprites/035.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_036:: - .incbin "graphics/battle_anims/sprites/036.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_036:: - .incbin "graphics/battle_anims/sprites/036.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_037:: - .incbin "graphics/battle_anims/sprites/037.4bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C06D98.4bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C06D98.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C06D98_2.gbapal.lz" - -@ old battle interface data, unused - - .align 2 - .incbin "graphics/unused/obi1.4bpp.lz" - - .align 2 - .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 - - .align 2 - .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself - - .align 2 - .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 - - .align 2 - .incbin "graphics/unused/obi2.4bpp.lz" - - .align 2 - .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" - - .align 2 -gBattleAnimSpritePalette_038:: - .incbin "graphics/battle_anims/sprites/038.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_039:: - .incbin "graphics/battle_anims/sprites/039.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_038:: - .incbin "graphics/battle_anims/sprites/038.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_039:: - .incbin "graphics/battle_anims/sprites/039.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_040:: - .incbin "graphics/battle_anims/sprites/040.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_041:: - .incbin "graphics/battle_anims/sprites/041.4bpp.lz" - - @ why is this way up here? - - .align 2 -gPartyMenuHpBar_Gfx:: - .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_042:: - .incbin "graphics/battle_anims/sprites/042.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_042:: - .incbin "graphics/battle_anims/sprites/042.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_043:: - .incbin "graphics/battle_anims/sprites/043.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_043:: - .incbin "graphics/battle_anims/sprites/043.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_044:: - .incbin "graphics/battle_anims/sprites/044.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_044:: - .incbin "graphics/battle_anims/sprites/044.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_045:: - .incbin "graphics/battle_anims/sprites/045.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_045:: - .incbin "graphics/battle_anims/sprites/045.4bpp.lz" - - @ two unused window frames. - - .align 2 -gUnknown_08C08F0C:: - .incbin "graphics/battle_interface/unused_window.4bpp.lz" - - .align 2 -gUnknown_08C093C8:: - .incbin "graphics/battle_interface/unused_window.gbapal.lz" - - .align 2 -gUnknown_08C093F0:: @ 8C093F0 - .incbin "graphics/interface/hp_numbers.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_046:: - .incbin "graphics/battle_anims/sprites/046.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_046:: - .incbin "graphics/battle_anims/sprites/046.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_047:: - .incbin "graphics/battle_anims/sprites/047.gbapal.lz" - - @ more unused windows - .align 2 - .incbin "graphics/battle_interface/unused_window2.4bpp.lz" - - .align 2 - .incbin "graphics/battle_interface/unused_window2bar.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_048:: - .incbin "graphics/battle_anims/sprites/048.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_048:: - .incbin "graphics/battle_anims/sprites/048.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_049:: - .incbin "graphics/battle_anims/sprites/049.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_050:: - .incbin "graphics/battle_anims/sprites/050.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_050:: - .incbin "graphics/battle_anims/sprites/050.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_051:: - .incbin "graphics/battle_anims/sprites/051.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_052:: - .incbin "graphics/battle_anims/sprites/052.4bpp.lz" - - .align 2 - .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused - - .align 2 - .incbin "graphics/unused/line_sketch.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_054:: - .incbin "graphics/battle_anims/sprites/054.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_054:: - .incbin "graphics/battle_anims/sprites/054.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_056:: - .incbin "graphics/battle_anims/sprites/056.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_056:: - .incbin "graphics/battle_anims/sprites/056.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_055:: - .incbin "graphics/battle_anims/sprites/055.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_057:: - .incbin "graphics/battle_anims/sprites/057.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_057:: - .incbin "graphics/battle_anims/sprites/057.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_058:: - .incbin "graphics/battle_anims/sprites/058.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_058:: - .incbin "graphics/battle_anims/sprites/058.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_059:: - .incbin "graphics/battle_anims/sprites/059.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_059:: - .incbin "graphics/battle_anims/sprites/059.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_060:: - .incbin "graphics/battle_anims/sprites/060.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_060:: - .incbin "graphics/battle_anims/sprites/060.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_061:: - .incbin "graphics/battle_anims/sprites/061.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_061:: - .incbin "graphics/battle_anims/sprites/061.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_062:: - .incbin "graphics/battle_anims/sprites/062.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_062:: - .incbin "graphics/battle_anims/sprites/062.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_063:: - .incbin "graphics/battle_anims/sprites/063.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_063:: - .incbin "graphics/battle_anims/sprites/063.gbapal.lz" - - .align 2 - .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point - - .align 2 -gBattleAnimSpritePalette_091:: - .incbin "graphics/battle_anims/sprites/091.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_065:: - .incbin "graphics/battle_anims/sprites/065.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_065:: - .incbin "graphics/battle_anims/sprites/065.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_066:: - .incbin "graphics/battle_anims/sprites/066.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_066:: - .incbin "graphics/battle_anims/sprites/066.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_070:: - .incbin "graphics/battle_anims/sprites/070.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_070:: - .incbin "graphics/battle_anims/sprites/070.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_071:: - .incbin "graphics/battle_anims/sprites/071.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_072:: - .incbin "graphics/battle_anims/sprites/072.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_072:: - .incbin "graphics/battle_anims/sprites/072.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_073:: - .incbin "graphics/battle_anims/sprites/073.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_073:: - .incbin "graphics/battle_anims/sprites/073.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_075:: - .incbin "graphics/battle_anims/sprites/075.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_075:: - .incbin "graphics/battle_anims/sprites/075.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_078:: - .incbin "graphics/battle_anims/sprites/078.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_078:: - .incbin "graphics/battle_anims/sprites/078.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_079:: - .incbin "graphics/battle_anims/sprites/079.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_080:: - .incbin "graphics/battle_anims/sprites/080.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_080:: - .incbin "graphics/battle_anims/sprites/080.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_081:: - .incbin "graphics/battle_anims/sprites/081.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_081:: - .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C0CA1C.bin" - - .align 2 - .incbin "graphics/unknown/unknown_C0CA40.bin" - - .align 2 - .incbin "graphics/unknown/unknown_C0CA64.bin" - - .align 2 - .incbin "graphics/unused/line_sketch_2.8bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C0CAE0.bin" - - .align 2 - .incbin "graphics/unused/line_sketch_2.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_082:: - .incbin "graphics/battle_anims/sprites/082.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_082:: - .incbin "graphics/battle_anims/sprites/082.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_083:: - .incbin "graphics/battle_anims/sprites/083.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_084:: - .incbin "graphics/battle_anims/sprites/084.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_085:: - .incbin "graphics/battle_anims/sprites/085.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_086:: - .incbin "graphics/battle_anims/sprites/086.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_088:: - .incbin "graphics/battle_anims/sprites/088.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_089:: - .incbin "graphics/battle_anims/sprites/089.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_090:: - .incbin "graphics/battle_anims/sprites/090.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_092:: - .incbin "graphics/battle_anims/sprites/092.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_093:: - .incbin "graphics/battle_anims/sprites/093.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_094:: - .incbin "graphics/battle_anims/sprites/094.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" - - .align 2 -gBattleAnimSpritePalette_095:: - .incbin "graphics/battle_anims/sprites/095.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_096:: - .incbin "graphics/battle_anims/sprites/096.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_097:: - .incbin "graphics/battle_anims/sprites/097.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_100:: - .incbin "graphics/battle_anims/sprites/100.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_101:: - .incbin "graphics/battle_anims/sprites/101.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_103:: - .incbin "graphics/battle_anims/sprites/103.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_083:: - .incbin "graphics/battle_anims/sprites/083.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_084:: - .incbin "graphics/battle_anims/sprites/084.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_085:: - .incbin "graphics/battle_anims/sprites/085.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_086:: - .incbin "graphics/battle_anims/sprites/086.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_088:: - .incbin "graphics/battle_anims/sprites/088.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_089:: - .incbin "graphics/battle_anims/sprites/089.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_090:: - .incbin "graphics/battle_anims/sprites/090.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_091:: - .incbin "graphics/battle_anims/sprites/091.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_092:: - .incbin "graphics/battle_anims/sprites/092.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_093:: - .incbin "graphics/battle_anims/sprites/093.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_094:: - .incbin "graphics/battle_anims/sprites/094.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_095:: - .incbin "graphics/battle_anims/sprites/095.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_096:: - .incbin "graphics/battle_anims/sprites/096.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_097:: - .incbin "graphics/battle_anims/sprites/097.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_098:: - .incbin "graphics/battle_anims/sprites/098.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_100:: - .incbin "graphics/battle_anims/sprites/100.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_101:: - .incbin "graphics/battle_anims/sprites/101.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_102:: - .incbin "graphics/battle_anims/sprites/102.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_103:: - .incbin "graphics/battle_anims/sprites/103.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_104:: - .incbin "graphics/battle_anims/sprites/104.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_104:: - .incbin "graphics/battle_anims/sprites/104.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_105:: - .incbin "graphics/battle_anims/sprites/105.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_105:: - .incbin "graphics/battle_anims/sprites/105.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_106:: - .incbin "graphics/battle_anims/sprites/106.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_107:: - .incbin "graphics/battle_anims/sprites/107.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_107:: - .incbin "graphics/battle_anims/sprites/107.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_108:: - .incbin "graphics/battle_anims/sprites/108.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_109:: - .incbin "graphics/battle_anims/sprites/109.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_109:: - .incbin "graphics/battle_anims/sprites/109.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_110:: - .incbin "graphics/battle_anims/sprites/110.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_111:: - .incbin "graphics/battle_anims/sprites/111.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_111:: - .incbin "graphics/battle_anims/sprites/111.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_112:: - .incbin "graphics/battle_anims/sprites/112.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_112:: - .incbin "graphics/battle_anims/sprites/112.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_113:: - .incbin "graphics/battle_anims/sprites/113.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_113:: - .incbin "graphics/battle_anims/sprites/113.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_114:: - .incbin "graphics/battle_anims/sprites/114.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_114:: - .incbin "graphics/battle_anims/sprites/114.gbapal.lz" - - .align 2 - .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? - - .align 2 - .incbin "graphics/unused/redyellowgreen_frame.bin.lz" - - .align 2 - .incbin "graphics/unused/color_frames.4bpp.lz" - - .align 2 - .incbin "graphics/unused/color_frames.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_115:: - .incbin "graphics/battle_anims/sprites/115.4bpp.lz" - - .align 2 - .incbin "graphics/unused/water_splash.8bpp.lz" - - .align 2 - .incbin "graphics/unused/water_splash.bin.lz" - - .align 2 - .incbin "graphics/unused/water_splash.gbapal.lz" - - .align 2 - .incbin "graphics/unused/basic_frame.4bpp.lz" - - .align 2 - .incbin "graphics/unused/basic_frame.gbapal.lz" - - .align 2 - .incbin "graphics/unused/basic_frame.bin.lz" - - .align 2 -gBattleInterface_BallStatusBarPal:: @ 8C11B9C - .incbin "graphics/battle_interface/ball_status_bar.gbapal" - - .align 2 -gBattleInterface_BallDisplayPal:: @ 8C11BBC - .incbin "graphics/battle_interface/ball_display.gbapal" - - .align 2 -gHealthboxElementsGfxTable:: @ 8C11BDC - .incbin "graphics/battle_interface/hpbar.4bpp" - .incbin "graphics/battle_interface/expbar.4bpp" - .incbin "graphics/battle_interface/status_psn.4bpp" - .incbin "graphics/battle_interface/status_par.4bpp" - .incbin "graphics/battle_interface/status_slp.4bpp" - .incbin "graphics/battle_interface/status_frz.4bpp" - .incbin "graphics/battle_interface/status_brn.4bpp" - .incbin "graphics/battle_interface/misc.4bpp" - .incbin "graphics/battle_interface/hpbar_anim.4bpp" - .incbin "graphics/battle_interface/misc_frameend.4bpp" - - .align 2 -gBattleInterface_BallDisplayGfx:: @ 8C1241C - .incbin "graphics/battle_interface/ball_display.4bpp" - - .align 2 -gUnknown_08C1249C:: @ 8C1249C - .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" - .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. - .incbin "graphics/battle_interface/status3.4bpp" - .incbin "graphics/battle_interface/status4.4bpp" - .incbin "graphics/unknown/unknown_D12FEC.4bpp" - .incbin "graphics/unknown/unknown_D1300C.4bpp" - - @ even more seemingly unused windows. lovely. - .incbin "graphics/battle_interface/unused_window3.4bpp.lz" - .incbin "graphics/battle_interface/unused_window4.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_116:: - .incbin "graphics/battle_anims/sprites/116.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_116:: - .incbin "graphics/battle_anims/sprites/116.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_117:: - .incbin "graphics/battle_anims/sprites/117.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_117:: - .incbin "graphics/battle_anims/sprites/117.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_118:: - .incbin "graphics/battle_anims/sprites/118.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_118:: - .incbin "graphics/battle_anims/sprites/118.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_119:: - .incbin "graphics/battle_anims/sprites/119.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_119:: - .incbin "graphics/battle_anims/sprites/119.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_120:: - .incbin "graphics/battle_anims/sprites/120.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_120:: - .incbin "graphics/battle_anims/sprites/120.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_121:: - .incbin "graphics/battle_anims/sprites/121.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_121:: - .incbin "graphics/battle_anims/sprites/121.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_122:: - .incbin "graphics/battle_anims/sprites/122.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_122:: - .incbin "graphics/battle_anims/sprites/122.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_123:: - .incbin "graphics/battle_anims/sprites/123.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_124:: - .incbin "graphics/battle_anims/sprites/124.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_124:: - .incbin "graphics/battle_anims/sprites/124.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_125:: - .incbin "graphics/battle_anims/sprites/125.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_125:: - .incbin "graphics/battle_anims/sprites/125.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_126:: - .incbin "graphics/battle_anims/sprites/126.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_126:: - .incbin "graphics/battle_anims/sprites/126.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_127:: - .incbin "graphics/battle_anims/sprites/127.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_127:: - .incbin "graphics/battle_anims/sprites/127.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_128:: - .incbin "graphics/battle_anims/sprites/128.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_128:: - .incbin "graphics/battle_anims/sprites/128.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_129:: - .incbin "graphics/battle_anims/sprites/129.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_130:: - .incbin "graphics/battle_anims/sprites/130.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_130:: - .incbin "graphics/battle_anims/sprites/130.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_131:: - .incbin "graphics/battle_anims/sprites/131.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_132:: - .incbin "graphics/battle_anims/sprites/132.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_132:: - .incbin "graphics/battle_anims/sprites/132.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_133:: - .incbin "graphics/battle_anims/sprites/133.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_133:: - .incbin "graphics/battle_anims/sprites/133.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_134:: - .incbin "graphics/battle_anims/sprites/134.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_076:: - .incbin "graphics/battle_anims/sprites/076.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_076:: - .incbin "graphics/battle_anims/sprites/076.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_077:: - .incbin "graphics/battle_anims/sprites/077.4bpp.lz" - - .align 2 - .incbin "graphics/unused/old_contest.4bpp.lz" - - .align 2 - .incbin "graphics/unused/old_contest.gbapal.lz" - - .align 2 - .incbin "graphics/unused/old_contest.bin.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C15BC0.bin.lz" - - .align 2 - .incbin "graphics/unused/old_contest_2.4bpp.lz" - - .align 2 -gUnknown_08C16E90:: @ 8C16E90 - .incbin "graphics/unused/old_contest_2.gbapal.lz" - - .align 2 -gUnknown_08C16FA8:: @ 8C16FA8 - .incbin "graphics/unused/old_contest_2.bin.lz" - - .align 2 -gUnknown_08C17170:: @ 8C17170 - .incbin "graphics/unknown/unknown_C17170.bin.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C17410.bin.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C1751C.bin.lz" - - .align 2 -gUnknown_08C17980:: @ 8C17980 - .incbin "graphics/unknown/unknown_C17980.bin.lz" - - .align 2 -gContestMiscGfx:: @ 8C17AB0 - .incbin "graphics/contest/misc.4bpp.lz" - - .align 2 -gContestAudienceGfx:: @ 8C1850C - .incbin "graphics/contest/audience.4bpp.lz" - - .align 2 -gUnknown_08C19168:: - .incbin "graphics/contest/faces.4bpp.lz" - - .align 2 -gContestJudgeSymbolsGfx:: - .incbin "graphics/contest/judge_symbols.4bpp.lz" - - .align 2 -gContest3Pal:: - .incbin "graphics/contest/judge_symbols.gbapal.lz" - - .align 2 -gTiles_8C19450:: - .incbin "graphics/contest/heart.4bpp" - - .align 2 - .incbin "graphics/unknown/unknown_C19470.4bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_C19470.gbapal.lz" - - .align 2 -gUnknown_08C19588:: @ 8C19588 - .incbin "graphics/contest/misc_2.4bpp.lz" - - .align 2 -gUnknown_08C19EEC:: @ 8C19EEC - .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" - - .align 2 -gUnknown_08C1A000:: @ 8C1A000 - .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" - - .align 2 -gUnknown_08C1A12C:: @ 8C1A12C - .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" - - .align 2 -gUnknown_08C1A2B4:: @ 8C1A2B4 - .incbin "graphics/contest/misc_2.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_135:: - .incbin "graphics/battle_anims/sprites/135.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_135:: - .incbin "graphics/battle_anims/sprites/135.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_Particles:: - .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_136:: - .incbin "graphics/battle_anims/sprites/136.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_136:: - .incbin "graphics/battle_anims/sprites/136.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_137:: - .incbin "graphics/battle_anims/sprites/137.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_139:: - .incbin "graphics/battle_anims/sprites/139.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_139:: - .incbin "graphics/battle_anims/sprites/139.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_145:: - .incbin "graphics/battle_anims/sprites/145.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_138:: - .incbin "graphics/battle_anims/sprites/138.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_140:: - .incbin "graphics/battle_anims/sprites/140.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_140:: - .incbin "graphics/battle_anims/sprites/140.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_141:: - .incbin "graphics/battle_anims/sprites/141.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_141:: - .incbin "graphics/battle_anims/sprites/141.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_142:: - .incbin "graphics/battle_anims/sprites/142.4bpp.lz" - - .align 2 - .incbin "graphics/unused/old_beatup.4bpp.lz" - - .align 2 - .incbin "graphics/unused/old_beatup.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_147:: - .incbin "graphics/battle_anims/sprites/147.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_147:: - .incbin "graphics/battle_anims/sprites/147.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_149:: - .incbin "graphics/battle_anims/sprites/149.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_148:: - .incbin "graphics/battle_anims/sprites/148.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_148:: - .incbin "graphics/battle_anims/sprites/148.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_259:: - .incbin "graphics/battle_anims/sprites/259.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_074:: - .incbin "graphics/battle_anims/sprites/074.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_074:: - .incbin "graphics/battle_anims/sprites/074.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_150:: - .incbin "graphics/battle_anims/sprites/150.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_150:: - .incbin "graphics/battle_anims/sprites/150.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_151:: - .incbin "graphics/battle_anims/sprites/151.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_153:: - .incbin "graphics/battle_anims/sprites/153.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_153:: - .incbin "graphics/battle_anims/sprites/153.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_154:: - .incbin "graphics/battle_anims/sprites/154.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_154:: - .incbin "graphics/battle_anims/sprites/154.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_155:: - .incbin "graphics/battle_anims/sprites/155.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_155:: - .incbin "graphics/battle_anims/sprites/155.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_156:: - .incbin "graphics/battle_anims/sprites/156.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_156:: - .incbin "graphics/battle_anims/sprites/156.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_157:: - .incbin "graphics/battle_anims/sprites/157.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_157:: - .incbin "graphics/battle_anims/sprites/157.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_158:: - .incbin "graphics/battle_anims/sprites/158.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_158:: - .incbin "graphics/battle_anims/sprites/158.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_159:: - .incbin "graphics/battle_anims/sprites/159.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_159:: - .incbin "graphics/battle_anims/sprites/159.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_160:: - .incbin "graphics/battle_anims/sprites/160.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_160:: - .incbin "graphics/battle_anims/sprites/160.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_144:: - .incbin "graphics/battle_anims/sprites/144.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_144:: - .incbin "graphics/battle_anims/sprites/144.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" - - .align 2 - .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_D1C060.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_162:: - .incbin "graphics/battle_anims/sprites/162.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_162:: - .incbin "graphics/battle_anims/sprites/162.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_163:: - .incbin "graphics/battle_anims/sprites/163.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_163:: - .incbin "graphics/battle_anims/sprites/163.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_288:: - .incbin "graphics/battle_anims/sprites/288.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_164:: - .incbin "graphics/battle_anims/sprites/164.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_165:: - .incbin "graphics/battle_anims/sprites/165.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_166:: - .incbin "graphics/battle_anims/sprites/166.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_166:: - .incbin "graphics/battle_anims/sprites/166.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_167:: - .incbin "graphics/battle_anims/sprites/167.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_168:: - .incbin "graphics/battle_anims/sprites/168.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_169:: - .incbin "graphics/battle_anims/sprites/169.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_170:: - .incbin "graphics/battle_anims/sprites/170.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_171:: - .incbin "graphics/battle_anims/sprites/171.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_171:: - .incbin "graphics/battle_anims/sprites/171.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_172:: - .incbin "graphics/battle_anims/sprites/172.gbapal.lz" - - .align 2 -gContestJudgeGfx:: - .incbin "graphics/contest/judge.4bpp.lz" - - .align 2 -gContest2Pal:: @ 8C1C6B8 - .incbin "graphics/contest/judge.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_001:: - .incbin "graphics/battle_anims/sprites/001.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_001:: - .incbin "graphics/battle_anims/sprites/001.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_173:: - .incbin "graphics/battle_anims/sprites/173.4bpp.lz" - - .align 2 -gBattleAnimBackgroundImage_00:: - .incbin "graphics/battle_anims/backgrounds/00.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_00:: - .incbin "graphics/battle_anims/backgrounds/00.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_00:: - .incbin "graphics/battle_anims/backgrounds/00.bin.lz" - - .align 2 -gUnknown_08C1D0AC:: @ 8C1D0AC - .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" - - .align 2 -gUnknown_08C1D1E8:: @ 8C1D1E8 - .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" - - .align 2 -gUnknown_08C1D210:: @ 8C1D210 - .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" - - .align 2 - .incbin "graphics/unused/goosuto.4bpp.lz" @ ghost - - .align 2 - .incbin "graphics/unused/goosuto.gbapal.lz" - - .align 2 - .incbin "graphics/unused/goosuto.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_174:: - .incbin "graphics/battle_anims/sprites/174.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_174:: - .incbin "graphics/battle_anims/sprites/174.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_175:: - .incbin "graphics/battle_anims/sprites/175.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_175:: - .incbin "graphics/battle_anims/sprites/175.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_176:: - .incbin "graphics/battle_anims/sprites/176.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_176:: - .incbin "graphics/battle_anims/sprites/176.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_177:: - .incbin "graphics/battle_anims/sprites/177.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_177:: - .incbin "graphics/battle_anims/sprites/177.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_178:: - .incbin "graphics/battle_anims/sprites/178.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_178:: - .incbin "graphics/battle_anims/sprites/178.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_179:: - .incbin "graphics/battle_anims/sprites/179.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_179:: - .incbin "graphics/battle_anims/sprites/179.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_180:: - .incbin "graphics/battle_anims/sprites/180.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_181:: - .incbin "graphics/battle_anims/sprites/181.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_182:: - .incbin "graphics/battle_anims/sprites/182.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_182:: - .incbin "graphics/battle_anims/sprites/182.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_183:: - .incbin "graphics/battle_anims/sprites/183.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_183:: - .incbin "graphics/battle_anims/sprites/183.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_184:: - .incbin "graphics/battle_anims/sprites/184.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_184:: - .incbin "graphics/battle_anims/sprites/184.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_185:: - .incbin "graphics/battle_anims/sprites/185.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_185:: - .incbin "graphics/battle_anims/sprites/185.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_03:: - .incbin "graphics/battle_anims/backgrounds/03.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_03:: - .incbin "graphics/battle_anims/backgrounds/03.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_03:: - .incbin "graphics/battle_anims/backgrounds/03.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_187:: - .incbin "graphics/battle_anims/sprites/187.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_187:: - .incbin "graphics/battle_anims/sprites/187.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_186:: - .incbin "graphics/battle_anims/sprites/186.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_186:: - .incbin "graphics/battle_anims/sprites/186.gbapal.lz" - - .align 2 -gUnknown_08C1F1C8:: @ 8C1F1C8 - .incbin "graphics/battle_interface/window.4bpp.lz" - - .align 2 -gUnknown_08C1F46C:: @ 8C1F46C - .incbin "graphics/battle_interface/window2.4bpp.lz" - - .align 2 -gUnknown_08C1F5E8:: @ 8C1F5E8 - .incbin "graphics/battle_interface/window3.4bpp.lz" - - .align 2 -gUnknown_08C1F76C:: @ 8C1F76C - .incbin "graphics/battle_interface/window4.4bpp.lz" - - .align 2 -gUnknown_08C1F8E8:: @ 8C1F8E8 - .incbin "graphics/battle_interface/window5.4bpp.lz" - - .align 2 - .incbin "graphics/unused/shadow.4bpp.lz" - - .align 2 - .incbin "graphics/unused/shadow.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_014:: - .incbin "graphics/battle_anims/sprites/014.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_014:: - .incbin "graphics/battle_anims/sprites/014.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_190:: - .incbin "graphics/battle_anims/sprites/190.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_190:: - .incbin "graphics/battle_anims/sprites/190.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_191:: - .incbin "graphics/battle_anims/sprites/191.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_191:: - .incbin "graphics/battle_anims/sprites/191.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_189:: - .incbin "graphics/battle_anims/sprites/189.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_189:: - .incbin "graphics/battle_anims/sprites/189.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_192:: - .incbin "graphics/battle_anims/sprites/192.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_192:: - .incbin "graphics/battle_anims/sprites/192.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_193:: - .incbin "graphics/battle_anims/sprites/193.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_193:: - .incbin "graphics/battle_anims/sprites/193.gbapal.lz" - - .align 2 -gUnknown_08C20668:: @ 8C20668 - .incbin "graphics/battle_anims/masks/curse.4bpp.lz" - - .align 2 -gUnknown_08C20684:: @ 8C20684 - .incbin "graphics/battle_anims/masks/curse.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_002:: @ 8D20B30 - .incbin "graphics/battle_anims/sprites/002.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_002:: @ 8D20C14 - .incbin "graphics/battle_anims/sprites/002.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_196:: @ 8D20C3C - .incbin "graphics/battle_anims/sprites/196.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_196:: @ 8D20FE0 - .incbin "graphics/battle_anims/sprites/196.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_194:: @ 8D20FF8 - .incbin "graphics/battle_anims/sprites/194.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_194:: @ 8D21330 - .incbin "graphics/battle_anims/sprites/194.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_195:: @ 8D21358 - .incbin "graphics/battle_anims/sprites/195.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_195:: @ 8D21410 - .incbin "graphics/battle_anims/sprites/195.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_197:: @ 8D21430 - .incbin "graphics/battle_anims/sprites/197.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_197:: @ 8D215A0 - .incbin "graphics/battle_anims/sprites/197.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_198:: @ 8D215C8 - .incbin "graphics/battle_anims/sprites/198.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_198:: @ 8D219B8 - .incbin "graphics/battle_anims/sprites/198.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_199:: @ 8D219E0 - .incbin "graphics/battle_anims/sprites/199.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_199:: @ 8D21AA8 - .incbin "graphics/battle_anims/sprites/199.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_200:: @ 8D21AC4 - .incbin "graphics/battle_anims/sprites/200.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_200:: @ 8D21C04 - .incbin "graphics/battle_anims/sprites/200.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_201:: @ 8D21C20 - .incbin "graphics/battle_anims/sprites/201.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_201:: @ 8D22290 - .incbin "graphics/battle_anims/sprites/201.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_204:: @ 8D222B8 - .incbin "graphics/battle_anims/sprites/204.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_204:: @ 8D2242C - .incbin "graphics/battle_anims/sprites/204.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_202:: @ 8D22454 - .incbin "graphics/battle_anims/sprites/202.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_202:: @ 8D225BC - .incbin "graphics/battle_anims/sprites/202.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_203:: @ 8D225E0 - .incbin "graphics/battle_anims/sprites/203.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_203:: @ 8D2278C - .incbin "graphics/battle_anims/sprites/203.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_206:: @ 8D227B0 - .incbin "graphics/battle_anims/sprites/206.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_206:: @ 8D229BC - .incbin "graphics/battle_anims/sprites/206.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_205:: @ 8D22A50 - .incbin "graphics/battle_anims/sprites/205.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_205:: @ 8D22C84 - .incbin "graphics/battle_anims/sprites/205.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_207:: @ 8D22CA8 - .incbin "graphics/battle_anims/sprites/207.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_207:: @ 8D22D74 - .incbin "graphics/battle_anims/sprites/207.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_208:: @ 8D22D98 - .incbin "graphics/battle_anims/sprites/208.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_209:: @ 8D23188 - .incbin "graphics/battle_anims/sprites/209.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_209:: @ 8D23490 - .incbin "graphics/battle_anims/sprites/209.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_064:: @ 8D234B0 - .incbin "graphics/battle_anims/sprites/064.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_064:: @ 8D235A0 - .incbin "graphics/battle_anims/sprites/064.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_210:: @ 8D235C4 - .incbin "graphics/battle_anims/sprites/210.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_219:: @ 8D2362C - .incbin "graphics/battle_anims/sprites/219.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_210:: @ 8D2364C - .incbin "graphics/battle_anims/sprites/210.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_216:: @ 8D2366C - .incbin "graphics/battle_anims/sprites/216.gbapal.lz" - - .align 2 -gUnknown_08C232E0:: @ 8C232E0 - .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" - - .align 2 -gUnknown_08C23D50:: @ 8C23D50 - .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" - - .align 2 -gUnknown_08C23D78:: @ 8C23D78 - .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_217:: @ 8D243A0 - .incbin "graphics/battle_anims/sprites/217.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_217:: @ 8D24408 - .incbin "graphics/battle_anims/sprites/217.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_212:: @ 8D24428 - .incbin "graphics/battle_anims/sprites/212.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_211:: @ 8D2465C - .incbin "graphics/battle_anims/sprites/211.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_213:: @ 8D246AC - .incbin "graphics/battle_anims/sprites/213.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_211:: @ 8D24918 - .incbin "graphics/battle_anims/sprites/211.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_214:: @ 8D2493C - .incbin "graphics/battle_anims/sprites/214.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_215:: @ 8D24BCC - .incbin "graphics/battle_anims/sprites/215.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_215:: @ 8D24D58 - .incbin "graphics/battle_anims/sprites/215.gbapal.lz" - - .align 2 -gUnknown_08C249D0:: @ 8C249D0 - .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" - - .align 2 -gUnknown_08C249F8:: @ 8C249F8 - .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_218:: @ 8D24FD4 - .incbin "graphics/battle_anims/sprites/218.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_218:: @ 8D24FFC - .incbin "graphics/battle_anims/sprites/218.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_087:: @ 8D250A8 - .incbin "graphics/battle_anims/sprites/087.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_087:: @ 8D25100 - .incbin "graphics/battle_anims/sprites/087.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_018:: @ 8D25128 - .incbin "graphics/battle_anims/sprites/018.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_018:: @ 8D25164 - .incbin "graphics/battle_anims/sprites/018.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_220:: @ 8D25180 - .incbin "graphics/battle_anims/sprites/220.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_220:: @ 8D251A8 - .incbin "graphics/battle_anims/sprites/220.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_221:: @ 8D252D4 - .incbin "graphics/battle_anims/sprites/221.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_221:: @ 8D252F4 - .incbin "graphics/battle_anims/sprites/221.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_222:: @ 8D25558 - .incbin "graphics/battle_anims/sprites/222.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_222:: @ 8D25844 - .incbin "graphics/battle_anims/sprites/222.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_223:: @ 8D2586C - .incbin "graphics/battle_anims/sprites/223.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_223:: @ 8D2588C - .incbin "graphics/battle_anims/sprites/223.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_224:: @ 8D25B20 - .incbin "graphics/battle_anims/sprites/224.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_224:: @ 8D25B40 - .incbin "graphics/battle_anims/sprites/224.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_230:: @ 8D25C3C - .incbin "graphics/battle_anims/sprites/230.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_230:: @ 8D25C64 - .incbin "graphics/battle_anims/sprites/230.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_228:: @ 8D25EA8 - .incbin "graphics/battle_anims/sprites/228.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_228:: @ 8D25EC8 - .incbin "graphics/battle_anims/sprites/228.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_04:: @ 8D25F70 - .incbin "graphics/battle_anims/backgrounds/04.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_04:: @ 8D25F98 - .incbin "graphics/battle_anims/backgrounds/04.4bpp.lz" - - .align 2 -gBattleAnimBackgroundTilemap_04:: @ 8D26D04 - .incbin "graphics/battle_anims/backgrounds/04.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_05:: @ 8D27200 - .incbin "graphics/battle_anims/backgrounds/05.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_06:: @ 8D276D0 - .incbin "graphics/battle_anims/backgrounds/06.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_225:: @ 8D27B10 - .incbin "graphics/battle_anims/sprites/225.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_225:: @ 8D27C94 - .incbin "graphics/battle_anims/sprites/225.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_227:: @ 8D27CBC - .incbin "graphics/battle_anims/sprites/227.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_226:: @ 8D27E04 - .incbin "graphics/battle_anims/sprites/226.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_226:: @ 8D27E90 - .incbin "graphics/battle_anims/sprites/226.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_229:: @ 8D27EB4 - .incbin "graphics/battle_anims/sprites/229.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_229:: @ 8D28070 - .incbin "graphics/battle_anims/sprites/229.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_099:: @ 8D28098 - .incbin "graphics/battle_anims/sprites/099.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_099:: @ 8D281B8 - .incbin "graphics/battle_anims/sprites/099.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_232:: @ 8D281E0 - .incbin "graphics/battle_anims/sprites/232.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_231:: @ 8D28718 - .incbin "graphics/battle_anims/sprites/231.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_231:: @ 8D28740 - .incbin "graphics/battle_anims/sprites/231.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_233:: @ 8D28910 - .incbin "graphics/battle_anims/sprites/233.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_233:: @ 8D28994 - .incbin "graphics/battle_anims/sprites/233.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_234:: @ 8D289BC - .incbin "graphics/battle_anims/sprites/234.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_234:: @ 8D28B7C - .incbin "graphics/battle_anims/sprites/234.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_238:: @ 8D28BA0 - .incbin "graphics/battle_anims/sprites/238.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_238:: @ 8D28C08 - .incbin "graphics/battle_anims/sprites/238.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_235:: @ 8D28C2C - .incbin "graphics/battle_anims/sprites/235.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_235:: @ 8D28C7C - .incbin "graphics/battle_anims/sprites/235.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_236:: @ 8D28C98 - .incbin "graphics/battle_anims/sprites/236.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_237:: @ 8D28CB4 - .incbin "graphics/battle_anims/sprites/237.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_07:: @ 8D28CD0 - .incbin "graphics/battle_anims/backgrounds/07.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_07:: @ 8D28E78 - .incbin "graphics/battle_anims/backgrounds/07.gbapal.lz" - - .align 2 -gBattleAnimBackgroundPalette_18:: @ 8D28EA0 - .incbin "graphics/battle_anims/backgrounds/18.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_07:: @ 8D28EC8 - .incbin "graphics/battle_anims/backgrounds/07.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_08:: @ 8D29058 - .incbin "graphics/battle_anims/backgrounds/08.bin.lz" - - .align 2 -gBattleAnimBackgroundImage_20:: @ 8D291E4 - .incbin "graphics/battle_anims/backgrounds/20.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_20:: @ 8D29C0C - .incbin "graphics/battle_anims/backgrounds/20.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_20:: @ 8D29C2C - .incbin "graphics/battle_anims/backgrounds/20.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_09:: @ 8D29E30 - .incbin "graphics/battle_anims/backgrounds/09.bin.lz" - - .align 2 -gBattleAnimBackgroundPalette_09:: @ 8D2A128 - .incbin "graphics/battle_anims/backgrounds/09.gbapal.lz" - - .align 2 -gBattleAnimBackgroundPalette_22:: @ 8D2A148 - .incbin "graphics/battle_anims/backgrounds/22.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_09:: @ 8D2A168 - .incbin "graphics/battle_anims/backgrounds/09.4bpp.lz" - - .align 2 -gBattleAnimBackgroundTilemap_10:: @ 8D2A6E8 - .incbin "graphics/battle_anims/backgrounds/10.bin.lz" - - .align 2 -gUnknown_08C2A634:: @ 8C2A634 - .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" - - .align 2 -gUnknown_08C2A6D4:: @ 8C2A6D4 - .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" - - .align 2 -gUnknown_08C2A6EC:: @ 8C2A6EC - .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_12:: @ 8D2ABB4 - .incbin "graphics/battle_anims/backgrounds/12.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_13:: @ 8D2AE7C - .incbin "graphics/battle_anims/backgrounds/13.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_14:: @ 8D2B178 - .incbin "graphics/battle_anims/backgrounds/14.bin.lz" - - .align 2 -gBattleAnimBackgroundImage_12:: @ 8D2B408 - .incbin "graphics/battle_anims/backgrounds/12.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_12:: @ 8D2C170 - .incbin "graphics/battle_anims/backgrounds/12.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_11:: @ 8D2C190 - .incbin "graphics/battle_anims/backgrounds/11.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_11:: @ 8D2CB2C - .incbin "graphics/battle_anims/backgrounds/11.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_11:: @ 8D2CB54 - .incbin "graphics/battle_anims/backgrounds/11.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_239:: @ 8D2CE4C - .incbin "graphics/battle_anims/sprites/239.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_239:: @ 8D2CF30 - .incbin "graphics/battle_anims/sprites/239.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_143:: @ 8D2CF58 - .incbin "graphics/battle_anims/sprites/143.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_143:: @ 8D2D188 - .incbin "graphics/battle_anims/sprites/143.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_240:: @ 8D2D1A0 - .incbin "graphics/battle_anims/sprites/240.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_240:: @ 8D2D240 - .incbin "graphics/battle_anims/sprites/240.gbapal.lz" - - .align 2 -gSubstituteDollPal:: @ 8C2CEBC - .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" - - .align 2 -gSubstituteDollGfx:: @ 8C2CEE0 - .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" - - .align 2 -gSubstituteDollTilemap:: @ 8C2D120 - .incbin "graphics/battle_anims/sprites/substitute.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_241:: @ 8C2D348 - .incbin "graphics/battle_anims/sprites/241.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_241:: @ 8C2D40C - .incbin "graphics/battle_anims/sprites/241.gbapal.lz" - - .align 2 -gContestConfetti_Gfx:: @ 8C2D428 - .incbin "graphics/misc/confetti.4bpp.lz" - - .align 2 -gContestConfetti_Pal:: @ 8C2D548 - .incbin "graphics/misc/confetti.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_242:: @ 8C2D570 - .incbin "graphics/battle_anims/sprites/242.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_242:: @ 8C2D6AC - .incbin "graphics/battle_anims/sprites/242.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_243:: @ 8C2D6D0 - .incbin "graphics/battle_anims/sprites/243.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_243:: @ 8C2D6F8 - .incbin "graphics/battle_anims/sprites/243.gbapal.lz" - - .align 2 -gUnknown_08C2D720:: @ 8C2D720 - .incbin "graphics/battle_anims/masks/stat.4bpp.lz" - - .align 2 -gUnknown_08C2D930:: @ 8C2D930 - .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" - - .align 2 -gUnknown_08C2DA4C:: @ 8C2DA4C - .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" - - .align 2 -gUnknown_08C2DB68:: @ 8C2DB68 - .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" - - .align 2 -gUnknown_08C2DB88:: @ 8C2DB88 - .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" - - .align 2 -gUnknown_08C2DBA8:: @ 8C2DBA8 - .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" - - .align 2 -gUnknown_08C2DBC8:: @ 8C2DBC8 - .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" - - .align 2 -gUnknown_08C2DBE8:: @ 8C2DBE8 - .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" - - .align 2 -gUnknown_08C2DC08:: @ 8C2DC08 - .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" - - .align 2 -gUnknown_08C2DC28:: @ 8C2DC28 - .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" - - .align 2 -gUnknown_08C2DC48:: @ 8C2DC48 - .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" - - .align 2 -gUnknown_08C2DC68:: @ 8C2DC68 - .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" - - .align 2 -gUnknown_08C2DDA4:: @ 8C2DDA4 - .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" - - .align 2 -gUnknown_08C2DDC4:: @ 8C2DDC4 - .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" - - .align 2 -gBattleAnimSpritePalette_245:: @ 8D2E28C - .incbin "graphics/battle_anims/sprites/245.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_245:: @ 8D2E2B4 - .incbin "graphics/battle_anims/sprites/245.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_246:: @ 8D2E458 - .incbin "graphics/battle_anims/sprites/246.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_244:: @ 8D2E900 - .incbin "graphics/battle_anims/sprites/244.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_244:: @ 8D2E9DC - .incbin "graphics/battle_anims/sprites/244.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_247:: @ 8D2E9F8 - .incbin "graphics/battle_anims/sprites/247.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_053:: @ 8D2EBDC - .incbin "graphics/battle_anims/sprites/053.4bpp.lz" - - .align 2 -gUnknown_08C2EA50:: @ 8C2EA50 - .incbin "graphics/battle_anims/masks/unknown_C2EA50.4bpp.lz" - - .align 2 -gUnknown_08C2EA9C:: @ 8C2EA9C - .incbin "graphics/battle_anims/masks/unknown_C2EA50.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_248:: @ 8D2EF50 - .incbin "graphics/battle_anims/sprites/248.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_248:: @ 8D2EF68 - .incbin "graphics/battle_anims/sprites/248.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_249:: @ 8D2EF80 - .incbin "graphics/battle_anims/sprites/249.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_249:: @ 8D2EFD0 - .incbin "graphics/battle_anims/sprites/249.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_250:: @ 8D2EFF0 - .incbin "graphics/battle_anims/sprites/250.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_251:: @ 8D2F1E4 - .incbin "graphics/battle_anims/sprites/251.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_251:: @ 8D2F248 - .incbin "graphics/battle_anims/sprites/251.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_252:: @ 8D2F260 - .incbin "graphics/battle_anims/sprites/252.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_252:: @ 8D2F378 - .incbin "graphics/battle_anims/sprites/252.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_253:: @ 8D2F39C - .incbin "graphics/battle_anims/sprites/253.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_253:: @ 8D2F578 - .incbin "graphics/battle_anims/sprites/253.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_254:: @ 8D2F5A0 - .incbin "graphics/battle_anims/sprites/254.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_254:: @ 8D2F6D8 - .incbin "graphics/battle_anims/sprites/254.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_255:: @ 8D2F700 - .incbin "graphics/battle_anims/sprites/255.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_255:: @ 8D2F778 - .incbin "graphics/battle_anims/sprites/255.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_258:: @ 8D2F78C - .incbin "graphics/battle_anims/sprites/258.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_258:: @ 8D2F874 - .incbin "graphics/battle_anims/sprites/258.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_256:: @ 8D2F89C - .incbin "graphics/battle_anims/sprites/256.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_256:: @ 8D2FC28 - .incbin "graphics/battle_anims/sprites/256.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_257:: @ 8D2FC50 - .incbin "graphics/battle_anims/sprites/257.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_257:: @ 8D2FD6C - .incbin "graphics/battle_anims/sprites/257.gbapal.lz" - - .incbin "graphics/unknown/unknown_C2F9E0.gbapal.lz" @ likely a palette - -@ 8C2FA08 - .include "data/graphics/pokemon/graphics.inc" - -@ 8D51DC8 - .include "data/graphics/trainers/graphics.inc" - - .align 2 -gMonIcon_QuestionMark:: @ 8D774D0 - .incbin "graphics/pokemon/icons/question_mark_icon.4bpp" - - .align 2 -gMonFootprint_QuestionMark:: @ 8D778D0 - .incbin "graphics/pokemon/footprints/question_mark_footprint.1bpp" - - .align 2 -gUnknown_08D778F0:: @ 8D778F0 - .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" - - .align 2 -gUnknown_08D779D8:: @ 8D779D8 - .incbin "graphics/battle_transitions/vs_frame.bin.lz" - - .align 2 -gUnknown_08D77AE4:: @ 8D77AE4 - .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" - - .align 2 -gUnknown_08D77B0C:: @ 8D77B0C - .incbin "graphics/battle_transitions/vs.4bpp.lz" - - .align 2 -gBattleTerrainTiles_TallGrass:: @ 8D77D68 - .incbin "graphics/battle_terrain/tall_grass/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_TallGrass:: @ 8D78318 - .incbin "graphics/battle_terrain/tall_grass/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_TallGrass:: @ 8D78350 - .incbin "graphics/battle_terrain/tall_grass/map.bin.lz" - - .align 2 -gBattleTerrainTiles_LongGrass:: @ 8D78600 - .incbin "graphics/battle_terrain/long_grass/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_LongGrass:: @ 8D78C78 - .incbin "graphics/battle_terrain/long_grass/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_LongGrass:: @ 8D78CB8 - .incbin "graphics/battle_terrain/long_grass/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Sand:: @ 8D78F68 - .incbin "graphics/battle_terrain/sand/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Sand:: @ 8D79560 - .incbin "graphics/battle_terrain/sand/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_Sand:: @ 8D795A8 - .incbin "graphics/battle_terrain/sand/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Underwater:: @ 8D79858 - .incbin "graphics/battle_terrain/underwater/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Underwater:: @ 8D79E10 - .incbin "graphics/battle_terrain/underwater/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_Underwater:: @ 8D79E58 - .incbin "graphics/battle_terrain/underwater/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Water:: @ 8D7A108 - .incbin "graphics/battle_terrain/water/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Water:: @ 8D7A6DC - .incbin "graphics/battle_terrain/water/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_Water:: @ 8D7A720 - .incbin "graphics/battle_terrain/water/map.bin.lz" - - .align 2 -gBattleTerrainTiles_PondWater:: @ 8D7A9D0 - .incbin "graphics/battle_terrain/pond_water/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_PondWater:: @ 8D7AF78 - .incbin "graphics/battle_terrain/pond_water/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_PondWater:: @ 8D7AFB8 - .incbin "graphics/battle_terrain/pond_water/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Rock:: @ 8D7B268 - .incbin "graphics/battle_terrain/rock/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Rock:: @ 8D7B828 - .incbin "graphics/battle_terrain/rock/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_Rock:: @ 8D7B864 - .incbin "graphics/battle_terrain/rock/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Cave:: @ 8D7BB14 - .incbin "graphics/battle_terrain/cave/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Cave:: @ 8D7C10C - .incbin "graphics/battle_terrain/cave/palette.gbapal.lz" - - .align 2 -gBattleTerrainTilemap_Cave:: @ 8D7C154 - .incbin "graphics/battle_terrain/cave/map.bin.lz" - - .align 2 -gBattleTerrainPalette_Plain:: @ 8D7C404 - .incbin "graphics/battle_terrain/plain/palette.gbapal.lz" - - .align 2 -gBattleTerrainTiles_Building:: @ 8D7C440 - .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" - - .align 2 -gBattleTerrainPalette_Frontier:: @ 8D7C9EC - .incbin "graphics/battle_terrain/stadium/battle_frontier.gbapal.lz" @ this is also used for link battles - - .align 2 -gBattleTerrainTilemap_Building:: @ 8D7CA28 - .incbin "graphics/battle_terrain/building/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Stadium:: @ 8D7CCD8 - .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" - - .align 2 -gBattleTerrainTilemap_Stadium:: @ 8D7D2E0 - .incbin "graphics/battle_terrain/stadium/map.bin.lz" - - .align 2 -gBattleTerrainTiles_Rayquaza:: @ 8D7D590 - .incbin "graphics/battle_terrain/sky/tiles.4bpp.lz" - - .align 2 -gBattleTerrainTilemap_Rayquaza:: @ 8D7DC04 - .incbin "graphics/battle_terrain/sky/map.bin.lz" - - .align 2 -gBattleTerrainPalette_Building:: @ 8D7DEB4 - .incbin "graphics/battle_terrain/building/palette.gbapal.lz" - - .align 2 -gBattleTerrainPalette_Kyogre:: @ 8D7DEF4 - .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" - - .align 2 -gBattleTerrainPalette_Groudon:: @ 8D7DF30 - .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" - - .align 2 -gBattleTerrainPalette_BuildingGym:: @ 8D7DF88 - .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" - - .align 2 -gBattleTerrainPalette_BuildingLeader:: @ 8D7DFC4 - .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumAqua:: @ 8D7E000 - .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumMagma:: @ 8D7E060 - .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumSidney:: @ 8D7E0CC - .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumPhoebe:: @ 8D7E11C - .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumGlacia:: @ 8D7E164 - .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumDrake:: @ 8D7E1A8 - .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" - - .align 2 -gBattleTerrainPalette_StadiumWallace:: @ 8D7E1F8 - .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" - - .align 2 -gBattleTerrainPalette_Rayquaza:: @ 8D7E234 - .incbin "graphics/battle_terrain/sky/palette.gbapal.lz" - - .align 2 -gBattleTerrainAnimTiles_TallGrass:: @ 8D7E280 - .incbin "graphics/battle_terrain/tall_grass/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_TallGrass:: @ 8D7E808 - .incbin "graphics/battle_terrain/tall_grass/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_LongGrass:: @ 8D7E9C4 - .incbin "graphics/battle_terrain/long_grass/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_LongGrass:: @ 8D7F0D4 - .incbin "graphics/battle_terrain/long_grass/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Sand:: @ 8D7F30C - .incbin "graphics/battle_terrain/sand/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Sand:: @ 8D7F850 - .incbin "graphics/battle_terrain/sand/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Underwater:: @ 8D7F9F8 - .incbin "graphics/battle_terrain/underwater/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Underwater:: @ 8D7FEC4 - .incbin "graphics/battle_terrain/underwater/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Water:: @ 8D80054 - .incbin "graphics/battle_terrain/water/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Water:: @ 8D80660 - .incbin "graphics/battle_terrain/water/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_PondWater:: @ 8D80804 - .incbin "graphics/battle_terrain/pond_water/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_PondWater:: @ 8D80D50 - .incbin "graphics/battle_terrain/pond_water/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Rock:: @ 8D80E9C - .incbin "graphics/battle_terrain/rock/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Rock:: @ 8D8147C - .incbin "graphics/battle_terrain/rock/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Cave:: @ 8D81610 - .incbin "graphics/battle_terrain/cave/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Cave:: @ 8D81E2C - .incbin "graphics/battle_terrain/cave/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Building:: @ 8D820D4 - .incbin "graphics/battle_terrain/building/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Building:: @ 8D824E4 - .incbin "graphics/battle_terrain/building/anim_map.bin.lz" - - .align 2 -gBattleTerrainAnimTiles_Rayquaza:: @ 8D82608 - .incbin "graphics/battle_terrain/sky/anim_tiles.4bpp.lz" - - .align 2 -gBattleTerrainAnimTilemap_Rayquaza:: @ 8D82C70 - .incbin "graphics/battle_terrain/sky/anim_map.bin.lz" - - .align 2 -gUnknown_08D82F10:: @ 8D82F10 - .incbin "graphics/battle_frontier/tourney_bg.4bpp.lz" - - .align 2 -gUnknown_08D834FC:: @ 8D834FC - .incbin "graphics/battle_frontier/tourney_line.4bpp.lz" @ the red glow mask for the tourney advancement lines - - .align 2 -gUnknown_08D83900:: @ 8D83900 - .incbin "graphics/unknown/unknown_D83900.bin.lz" @ tilemaps likely - - .align 2 -gUnknown_08D83B2C:: @ 8D83B2C - .incbin "graphics/unknown/unknown_D83B2C.bin.lz" - - .align 2 -gUnknown_08D83C3C:: @ 8D83C3C - .incbin "graphics/unknown/unknown_D83C3C.bin.lz" - - .align 2 -gUnknown_08D83D50:: @ 8D83D50 - .incbin "graphics/battle_frontier/misc1.4bpp.lz" - - .align 2 -gUnknown_08D84970:: @ 8D84970 - .incbin "graphics/unknown/unknown_D84970.bin.lz" - - .align 2 -gUnknown_08D84F00:: @ 8D84F00 - .incbin "graphics/unknown/unknown_D84F00.bin.lz" - - .align 2 -gBattleFrontierGfx_DomeOptions:: @ 8D85058 - .incbin "graphics/battle_frontier/options.4bpp.lz" - - .align 2 -gUnknown_08D85358:: @ 8D85358 - .incbin "graphics/battle_frontier/options_pal1.gbapal.lz" - - .align 2 -gUnknown_08D85444:: @ 8D85444 - .incbin "graphics/battle_frontier/options_pal2.gbapal.lz" @ pokeball pal - - .align 2 -gUnknown_08D854C8:: @ 8D854C8 - .incbin "graphics/battle_frontier/options_pal3.gbapal.lz" @ arrow pal - - .align 2 -gUnknown_08D854E8:: @ 8D854E8 - .incbin "graphics/battle_frontier/symbols.4bpp.lz" - - .align 2 -gUnknown_08D855E8:: @ 8D855E8 - .incbin "graphics/battle_frontier/symbols.gbapal.lz" - - .align 2 -gUnknown_08D85600:: @ 8D85600 - .incbin "graphics/battle_frontier/text.gbapal.lz" @ text palette for frontier text. - - .align 2 -gUnknown_08D85620:: @ 8D85620 - .incbin "graphics/battle_frontier/text_pp.gbapal" @ text palette for PP text - - @ dome anim pals - - .align 2 -gTilesetAnims_BattleDomePals0_0:: @ 8D85640 - .incbin "graphics/battle_frontier/dome_anim1.gbapal" - - .align 2 -gTilesetAnims_BattleDomePals0_1:: @ 8D85660 - .incbin "graphics/battle_frontier/dome_anim2.gbapal" - - .align 2 -gTilesetAnims_BattleDomePals0_2:: @ 8D85680 - .incbin "graphics/battle_frontier/dome_anim3.gbapal" - - .align 2 -gTilesetAnims_BattleDomePals0_3:: @ 8D856A0 - .incbin "graphics/battle_frontier/dome_anim4.gbapal" - - @ 8D856C0 - .2byte 0x013F, 0x0119, 0x0113, 0x010E @ unused? - - .align 2 -gUnknown_08D856C8:: @ 8D856C8 - .incbin "graphics/battle_frontier/pyramid_light.gbapal" @ unfaded pal for the player light in battle pyramid - - .align 2 -gUnknown_08D857A8:: @ 8D857A8 - .incbin "graphics/battle_frontier/battle_tilemap1.bin.lz" - - .align 2 -gUnknown_08D85A1C:: @ 8D85A1C - .incbin "graphics/battle_frontier/battle_tilemap2.bin.lz" - - .align 2 -gIntro1GameFreakTextFadePal:: @ 8D85C50 - .incbin "graphics/intro/intro1_text.gbapal" @ game freak text blue fade - - .align 2 -gIntro2BrendanNoTurnPal:: @ 8D85CB0 - .incbin "graphics/intro/intro2_brendan_noturn.gbapal" - - .align 2 -gIntro3BgPal:: @ 8D85CD0 - .incbin "graphics/intro/intro3.gbapal" - - .align 2 -gIntro2VolbeatPal:: @ 8D85ED0 - .incbin "graphics/intro/intro2_volbeat.gbapal" - - .align 2 -gIntro2TorchicPal:: @ 8D85EF0 - .incbin "graphics/intro/intro2_torchic.gbapal" - - .align 2 -gIntro2ManectricPal:: @ 8D85ED0 - .incbin "graphics/intro/intro2_manectric.gbapal" - - .align 2 -gIntro2FlygonPal:: @ 8D85F30 - .incbin "graphics/intro/intro2_flygon.gbapal" - - .align 2 -gIntro2VolbeatGfx:: @ 8D85F50 - .incbin "graphics/intro/intro2_volbeat.4bpp.lz" - - .align 2 -gIntro2TorchicGfx:: @ 8D86130 - .incbin "graphics/intro/intro2_torchic.4bpp.lz" - - .align 2 -gIntro2ManectricGfx:: @ 8D86550 - .incbin "graphics/intro/intro2_manectric.4bpp.lz" - - .align 2 -gIntro2FlygonGfx:: @ 8D8702C - .incbin "graphics/intro/intro2_flygon.4bpp.lz" - - .align 2 -gIntro2BrendanNoTurnGfx:: @ 8D87568 - .incbin "graphics/intro/intro2_brendan_noturn.4bpp.lz" - - .align 2 -gIntro2MayNoTurnGfx:: @ 8D87CA4 - .incbin "graphics/intro/intro2_may_noturn.4bpp.lz" - - .align 2 -gIntro3GroudonGfx:: @ 8D88494 - .incbin "graphics/intro/intro3_groudon.8bpp.lz" - - .align 2 -gIntro3GroudonTilemap:: @ 8D88D40 - .incbin "graphics/intro/intro3_groudon.bin.lz" - - .align 2 -gIntro3KyogreGfx:: @ 8D89224 - .incbin "graphics/intro/intro3_kyogre.8bpp.lz" - - .align 2 -gIntro3KyogreTilemap:: @ 8D89ABC - .incbin "graphics/intro/intro3_kyogre.bin.lz" - - .align 2 -gIntro3LegendBgGfx:: @ 8D89F7C - .incbin "graphics/intro/legend_bg.4bpp.lz" @ groudon/kyogre/bg - - .align 2 -gIntro3GroudonBgTilemap:: @ 8D8A818 - .incbin "graphics/intro/legend_bg1.bin.lz" - - .align 2 -gIntro3KyogreBgTilemap:: @ 8D8A934 - .incbin "graphics/intro/legend_bg2.bin.lz" - - .align 2 -gIntro3CloudsGfx:: @ 8D8AA54 - .incbin "graphics/intro/intro3_clouds.4bpp.lz" - - .align 2 -gIntro3Clouds1Tilemap:: @ 8D8B180 - .incbin "graphics/intro/intro3_clouds1.bin.lz" - - .align 2 -gIntro3Clouds2Tilemap:: @ 8D8B440 - .incbin "graphics/intro/intro3_clouds2.bin.lz" - - .align 2 -gIntro3Clouds3Tilemap:: @ 8D8B6E8 - .incbin "graphics/intro/intro3_clouds3.bin.lz" - - .align 2 -gIntro3LightningGfx:: @ 8D8B80C - .incbin "graphics/intro/intro3_lightning.4bpp.lz" - - .align 2 -gIntro3LightningPal:: @ 8D8BA54 - .incbin "graphics/intro/intro3_lightning.gbapal" - - .align 2 -gIntro3RayquazaGfx:: @ 8D8BA74 - .incbin "graphics/intro/intro3_rayquaza.4bpp.lz" - - .align 2 -gIntro3RayquazaTilemap:: @ 8D8C16C - .incbin "graphics/intro/intro3_rayquaza.bin.lz" - - @ seems to be 2 unused tilemaps - .align 2 - .incbin "graphics/unknown/unknown_D8C374.bin.lz" - - .align 2 - .incbin "graphics/unknown/unknown_D8C5C4.bin.lz" - - .align 2 -gIntro3Clouds2Gfx:: @ 8D8C838 - .incbin "graphics/intro/intro3_clouds2.4bpp.lz" @ clouds 2, during the rayquaza flash - - .align 2 -gIntro3Clouds4Tilemap:: @ 8D8CCC8 - .incbin "graphics/intro/intro3_clouds4.bin.lz" @ this is the tilemap for clouds 2, but clouds - - .align 2 -gIntro2BubblesGfx:: @ 8D8CF44 - .incbin "graphics/intro/intro2_bubbles.4bpp.lz" - - .align 2 -gIntro2BubblesPal:: @ 8D8D110 - .incbin "graphics/intro/intro2_bubbles.gbapal" - - .align 2 -gIntro1FlygonGfx:: @ 8D8D130 - .incbin "graphics/intro/intro1_flygon.4bpp.lz" - - .align 2 -gIntro1SparkleGfx:: @ 8D8D208 - .incbin "graphics/intro/intro1_sparkle.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_261:: - .incbin "graphics/battle_anims/sprites/261.4bpp.lz" - - .align 2 -gUnknown_08D8D410:: @ 8D8D410 - .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" - - .align 2 -gUnknown_08D8D58C:: @ 8D8D58C - .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_261:: @ 8E68580 - .incbin "graphics/battle_anims/sprites/261.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_260:: @ 8E685A8 - .incbin "graphics/battle_anims/sprites/260.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_260:: @ 8E68764 - .incbin "graphics/battle_anims/sprites/260.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_15:: @ 8E6877C - .incbin "graphics/battle_anims/backgrounds/15.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_15:: @ 8E690EC - .incbin "graphics/battle_anims/backgrounds/15.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_15:: @ 8E69110 - .incbin "graphics/battle_anims/backgrounds/15.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_262:: @ 8E69308 - .incbin "graphics/battle_anims/sprites/262.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_262:: @ 8E693DC - .incbin "graphics/battle_anims/sprites/262.gbapal.lz" - - .align 2 -gContestNextTurnGfx:: - .incbin "graphics/contest/nextturn.4bpp.lz" - - .align 2 -gUnknown_08D8E9B4:: @ 8D8E9B4 - .incbin "graphics/contest/nextturn_numbers.4bpp" - - .align 2 -gUnknown_08D8EA34:: @ 8D8EA34 - .incbin "graphics/contest/nextturn_random.4bpp" - - .align 2 -gBattleAnimSpriteSheet_264:: @ 8E695B8 - .incbin "graphics/battle_anims/sprites/264.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_264:: @ 8E695D8 - .incbin "graphics/battle_anims/sprites/264.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_265:: @ 8E695F0 - .incbin "graphics/battle_anims/sprites/265.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_067:: @ 8E69608 - .incbin "graphics/battle_anims/sprites/067.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_068:: @ 8E69628 - .incbin "graphics/battle_anims/sprites/068.gbapal.lz" - - .align 2 -gContestApplauseGfx:: @ 8D8EAE4 - .incbin "graphics/contest/applause.4bpp.lz" - - .align 2 -gContestApplauseMeterGfx:: @ 8D8EC24 - .incbin "graphics/contest/applause_meter.4bpp" - - .align 2 -gContestPal:: @ 8D8ECA4 - .incbin "graphics/contest/nextturn.gbapal" - - .align 2 -gBattleAnimSpriteSheet_272:: @ 8E6982C - .incbin "graphics/battle_anims/sprites/272.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_272:: @ 8E69A48 - .incbin "graphics/battle_anims/sprites/272.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_273:: @ 8E69A6C - .incbin "graphics/battle_anims/sprites/273.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_269:: @ 8E69A94 - .incbin "graphics/battle_anims/sprites/269.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_269:: @ 8E69AE8 - .incbin "graphics/battle_anims/sprites/269.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_274:: @ 8E69B00 - .incbin "graphics/battle_anims/sprites/274.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_275:: @ 8E69C80 - .incbin "graphics/battle_anims/sprites/275.4bpp.lz" - - .align 2 -gBattleAnimSpriteSheet_276:: @ 8E69DEC - .incbin "graphics/battle_anims/sprites/276.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_274:: @ 8E69F54 - .incbin "graphics/battle_anims/sprites/274.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_17:: @ 8E69F7C - .incbin "graphics/battle_anims/backgrounds/17.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_17:: @ 8E6A0D8 - .incbin "graphics/battle_anims/backgrounds/17.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_17:: @ 8E6A100 - .incbin "graphics/battle_anims/backgrounds/17.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_280:: @ 8E6A2E8 - .incbin "graphics/battle_anims/sprites/280.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_280:: @ 8E6A6E4 - .incbin "graphics/battle_anims/sprites/280.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImageMuddyWater_Pal:: @ 8D8FB9C - .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" - - .align 2 -gEnemyMonShadow_Gfx:: @ 8D8FBC0 - .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" - - .align 2 -gBattleInterface_BallStatusBarGfx:: @ 8D8FBF0 - .incbin "graphics/battle_interface/ball_status_bar.4bpp.lz" - - .align 2 -gMonIcon_Egg:: @ 8D8FC74 - .incbin "graphics/pokemon/icons/egg_icon.4bpp" - - .align 2 -gBattleAnimBackgroundImage_02:: @ 8E6ABDC - .incbin "graphics/battle_anims/backgrounds/02.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_02:: @ 8E6B8A4 - .incbin "graphics/battle_anims/backgrounds/02.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_02:: @ 8E6B8C0 - .incbin "graphics/battle_anims/backgrounds/02.bin.lz" - - .align 2 -gBattleAnimSpritePalette_287:: @ 8E6BBB4 - .incbin "graphics/battle_anims/sprites/287.gbapal.lz" - - .align 2 -gBattleAnimBackgroundPalette_24:: @ 8E6BBDC - .incbin "graphics/battle_anims/backgrounds/24.gbapal.lz" - - .align 2 - .incbin "graphics/unknown/unknown_E6BC04.bin.lz" @ TODO: rename - - .align 2 -sBlenderCenterGfx:: @ 8D91598 - .incbin "graphics/berry_blender/center.8bpp.lz" - - .align 2 -gUnknown_08D91DB8:: @ 8D91DB8 - .incbin "graphics/berry_blender/outer.4bpp.lz" - - .align 2 -gUnknown_08D927EC:: @ 8D927EC - .incbin "graphics/berry_blender/outer_map.bin.lz" - - .align 2 -gBattleAnimBackgroundPalette_16:: @ 8E6D668 - .incbin "graphics/battle_anims/backgrounds/16.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_16:: @ 8E6D690 - .incbin "graphics/battle_anims/backgrounds/16.4bpp.lz" - - .align 2 -gBattleAnimBackgroundTilemap_16:: @ 8E6D8F0 - .incbin "graphics/battle_anims/backgrounds/16.bin.lz" - - .align 2 -gBattleAnimSpritePalette_277:: @ 8E6DA2C - .incbin "graphics/battle_anims/sprites/277.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_277:: @ 8E6DA54 - .incbin "graphics/battle_anims/sprites/277.4bpp.lz" - - .align 2 -gBattleAnimFogTilemap:: @ 8E6DE48 - .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" - - .align 2 -gBattleAnimSpritePalette_283:: @ 8E6DFC0 - .incbin "graphics/battle_anims/sprites/283.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_283:: @ 8E6DFDC - .incbin "graphics/battle_anims/sprites/283.4bpp.lz" - - .align 2 -gBattleAnimBackgroundTilemap_ScaryFacePlayer:: @ 8D93598 - .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_ScaryFaceOpponent:: @ 8D9377C - .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" - - .align 2 -gBattleAnimBackgroundTilemap_ScaryFaceContest:: @ 8D93960 - .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_263:: @ 8E6E6AC - .incbin "graphics/battle_anims/sprites/263.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_263:: @ 8E6E6EC - .incbin "graphics/battle_anims/sprites/263.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_266:: @ 8E6E704 - .incbin "graphics/battle_anims/sprites/266.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_266:: @ 8E6E744 - .incbin "graphics/battle_anims/sprites/266.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_267:: @ 8E6E75C - .incbin "graphics/battle_anims/sprites/267.gbapal.lz" - - .align 2 -gBattleAnimSpritePalette_268:: @ 8E6E774 - .incbin "graphics/battle_anims/sprites/268.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_278:: @ 8E6E78C - .incbin "graphics/battle_anims/sprites/278.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_278:: @ 8E6E998 - .incbin "graphics/battle_anims/sprites/278.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_279:: @ 8E6E9B4 - .incbin "graphics/battle_anims/sprites/279.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_279:: @ 8E6EA00 - .incbin "graphics/battle_anims/sprites/279.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_281:: @ 8E6EA1C - .incbin "graphics/battle_anims/sprites/281.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_281:: @ 8E6EBA4 - .incbin "graphics/battle_anims/sprites/281.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_21:: @ 8E6EBC4 - .incbin "graphics/battle_anims/backgrounds/21.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_21:: @ 8E6EEB8 - .incbin "graphics/battle_anims/backgrounds/21.gbapal.lz" - - .align 2 -gBattleAnimBackgroundTilemap_21:: @ 8E6EED4 - .incbin "graphics/battle_anims/backgrounds/21.bin.lz" - - .align 2 -gBattleAnimSpriteSheet_284:: @ 8E6F1C0 - .incbin "graphics/battle_anims/sprites/284.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_284:: @ 8E6F53C - .incbin "graphics/battle_anims/sprites/284.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_285:: @ 8E6F558 - .incbin "graphics/battle_anims/sprites/285.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_285:: @ 8E6F5F8 - .incbin "graphics/battle_anims/sprites/285.gbapal.lz" - - .align 2 -gBattleAnimBackgroundImage_Surf:: @ 8D94AB8 - .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" - - .align 2 -gBattleAnimBackgroundPalette_Surf:: @ 8D95DD8 - .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" - - .align 2 -gUnknown_08D95E00:: @ 8D95E00 - .incbin "graphics/unknown/unknown_D95E00.bin.lz" - - .align 2 -gUnknown_08D960D0:: @ 8D960D0 - .incbin "graphics/unknown/unknown_D960D0.bin.lz" - - .align 2 -gUnknown_08D963A4:: @ 8D963A4 - .incbin "graphics/unknown/unknown_D963A4.bin.lz" - - .align 2 -gBattleAnimSpritePalette_286:: @ 8E71200 - .incbin "graphics/battle_anims/sprites/286.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_188:: @ 8E71228 - .incbin "graphics/battle_anims/sprites/188.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_188:: @ 8E7133C - .incbin "graphics/battle_anims/sprites/188.gbapal.lz" - - .align 2 -gPartyMenuMisc_Gfx:: @ 8D967EC - .incbin "graphics/interface/party_menu_misc.4bpp.lz" - - .align 2 -gPartyMenuMisc_Pal:: @ 8D96AB4 - .incbin "graphics/interface/party_menu_misc.gbapal.lz" - - .align 2 -gPartyMenuMisc_Tilemap:: @ 8D96BA0 - .incbin "graphics/interface/party_menu_misc.bin.lz" - - .align 2 -gPartyMenuPokeball_Gfx:: @ 8D96CD8 - .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" - - .align 2 -gPartyMenuPokeballSmall_Gfx:: @ 8D96E58 - .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" @ unused - - .align 2 -gPartyMenuPokeball_Pal:: @ 8D96F6C - .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" - - .align 2 -gStatusGfx_Icons:: @ 8D96F90 - .incbin "graphics/interface/status_icons.4bpp.lz" - - .align 2 -gStatusPal_Icons:: @ 8D97188 - .incbin "graphics/interface/status_icons.gbapal.lz" - - .align 2 -gMoveTypes_Gfx:: @ 8D971B0 - .incbin "graphics/types/move_types.4bpp.lz" - - .align 2 -gMoveTypes_Pal:: @ 8D97B84 - .incbin "graphics/types/move_types.gbapal.lz" - - .align 2 -gUnknown_08D97BEC:: @ 8D97BEC - .incbin "graphics/interface/summary_frames.4bpp.lz" - - .align 2 -gUnknown_08D97CF4:: @ 8D97CF4 - .incbin "graphics/interface/summary_frames.gbapal.lz" - - .align 2 -gUnknown_08D97D0C:: @ 8D97D0C - .incbin "graphics/interface/status_screen.4bpp.lz" - - .align 2 -gUnknown_08D9853C:: @ 8D9853C - .incbin "graphics/interface/status_screen.gbapal.lz" - - .align 2 -gUnknown_08D9862C:: @ 8D9862C - .incbin "graphics/interface/status_screen.bin.lz" - - .align 2 -gUnknown_08D987FC:: @ 8D987FC - .incbin "graphics/interface/status_tilemap1.bin.lz" - - .align 2 -gUnknown_08D9898C:: @ 8D9898C - .incbin "graphics/interface/status_tilemap2.bin.lz" - - .align 2 -gUnknown_08D98B28:: @ 8D98B28 - .incbin "graphics/interface/status_tilemap3.bin.lz" - - .align 2 -gUnknown_08D98CC8:: @ 8D98CC8 - .incbin "graphics/interface/status_tilemap0.bin.lz" - - .align 2 -gBagMaleTiles:: @ 8E75024 - .incbin "graphics/misc/bag_male.4bpp.lz" - - .align 2 -gBagFemaleTiles:: @ 8E75BA0 - .incbin "graphics/misc/bag_female.4bpp.lz" - - .align 2 -gBagPalette:: @ 8E76700 - .incbin "graphics/misc/bag.gbapal.lz" - - .align 2 -gBagScreenMale_Pal:: @ 8D9A588 - .incbin "graphics/interface/bag_screen_male.gbapal.lz" - - .align 2 -gBagScreenFemale_Pal:: @ 8D9A5D4 - .incbin "graphics/interface/bag_screen_female.gbapal.lz" - - .align 2 -gBagScreen_Gfx:: @ 8D9A620 - .incbin "graphics/interface/bag_screen.4bpp.lz" - - .align 2 -gUnknown_08D9A88C:: @ 8D9A88C - .incbin "graphics/unknown/unknown_D9A88C.bin.lz" - - .align 2 -gBattleFrontierGfx_PyramidBag:: @ 8D9A9EC - .incbin "graphics/interface/bag_pyramid.4bpp.lz" - - .align 2 -gUnknown_08D9ADD0:: @ 8D9ADD0 - .incbin "graphics/interface/bag_pyramid.gbapal.lz" @ female palette is first and male is second. - - .align 2 -gUnknown_08D9AE04:: @ 8D9AE04 - .incbin "graphics/unknown/unknown_D9AE04.bin.lz" @ tilemap? - - .align 2 -gUnknown_08D9AF44:: @ 8D9AF44 - .incbin "graphics/unknown/unknown_D9AF44.gbapal.lz" - - .align 2 -gBagSwapLineGfx:: @ 8D9AF6C - .incbin "graphics/interface/bag_swap.4bpp.lz" - - .align 2 -gBagSwapLinePal:: @ 8D9AFAC - .incbin "graphics/interface/bag_swap.gbapal.lz" - - .align 2 -gBuyMenuFrame_Gfx:: @ 8D9AFBC - .incbin "graphics/interface/mart_frame.4bpp.lz" - - .align 2 -gMenuMoneyPal:: @ 8D9B0C8 - .incbin "graphics/interface/mart_frame.gbapal.lz" - - .align 2 -gBuyMenuFrame_Tilemap:: @ 8D9B0F0 - .incbin "graphics/interface/mart_frame.bin.lz" - - .align 2 -gMenuMoneyGfx:: @ 8D9B230 - .incbin "graphics/interface/money.4bpp.lz" - - .align 2 -gMenuPokeblock_Gfx:: @ 8D9B2B4 - .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" - - .align 2 -gMenuPokeblock_Pal:: @ 8D9B470 - .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" - - .align 2 -gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 - .incbin "graphics/interface/pokeblock_device.4bpp.lz" - - .align 2 -gMenuPokeblockDevice_Pal:: @ 8D9B7A0 - .incbin "graphics/interface/pokeblock_device.gbapal.lz" - - .align 2 -gMenuPokeblock_Tilemap:: @ 8D9B7C8 - .incbin "graphics/interface/pokeblock.bin.lz" - - .align 2 -gPokeblock_Gfx:: - .incbin "graphics/pokeblock/pokeblock.4bpp.lz" - - .align 2 -gPokeblockRed_Pal:: - .incbin "graphics/pokeblock/red.gbapal.lz" - - .align 2 -gPokeblockBlue_Pal:: - .incbin "graphics/pokeblock/blue.gbapal.lz" - - .align 2 -gPokeblockPink_Pal:: - .incbin "graphics/pokeblock/pink.gbapal.lz" - - .align 2 -gPokeblockGreen_Pal:: - .incbin "graphics/pokeblock/green.gbapal.lz" - - .align 2 -gPokeblockYellow_Pal:: - .incbin "graphics/pokeblock/yellow.gbapal.lz" - - .align 2 -gPokeblockPurple_Pal:: - .incbin "graphics/pokeblock/purple.gbapal.lz" - - .align 2 -gPokeblockIndigo_Pal:: - .incbin "graphics/pokeblock/indigo.gbapal.lz" - - .align 2 -gPokeblockBrown_Pal:: - .incbin "graphics/pokeblock/brown.gbapal.lz" - - .align 2 -gPokeblockLiteBlue_Pal:: - .incbin "graphics/pokeblock/liteblue.gbapal.lz" - - .align 2 -gPokeblockOlive_Pal:: - .incbin "graphics/pokeblock/olive.gbapal.lz" - - .align 2 -gPokeblockGray_Pal:: - .incbin "graphics/pokeblock/gray.gbapal.lz" - - .align 2 -gPokeblockBlack_Pal:: - .incbin "graphics/pokeblock/black.gbapal.lz" - - .align 2 -gPokeblockWhite_Pal:: - .incbin "graphics/pokeblock/white.gbapal.lz" - - .align 2 -gPokeblockGold_Pal:: - .incbin "graphics/pokeblock/gold.gbapal.lz" - - .align 2 -gUnknown_08D9BA44:: @ 8D9BA44 - .incbin "graphics/interface/pokeblock_feeding_bg_map.bin.lz" - - .align 2 -gUnknown_08D9BB44:: @ 8D9BB44 - .incbin "graphics/interface/check_berry.4bpp.lz" - - .align 2 -gUnknown_08D9BEF0:: @ 8D9BEF0 - .incbin "graphics/interface/check_berry.gbapal.lz" - - .align 2 -gUnknown_08D9BF98:: @ 8D9BF98 - .incbin "graphics/interface/berry_tag.bin.lz" - - .align 2 -gUnknown_08D9C13C:: @ 8D9C13C - .incbin "graphics/interface/berry_tag_title.bin.lz" - - .align 2 -gBerryCheckCircle_Gfx:: @ 8D9C24C - .incbin "graphics/interface/check_berry_circle.4bpp.lz" - -@ 8D9C3A8 - .include "data/graphics/berries/berry_graphics.inc" - - .align 2 -gRaySceneGroudon_Gfx:: @ 8DA1E78 - .incbin "graphics/rayquaza_scene/groudon.4bpp.lz" - - .align 2 -gRaySceneGroudon2_Gfx:: @ 8DA2A5C - .incbin "graphics/rayquaza_scene/groudon_shoulder.4bpp.lz" - - .align 2 -gRaySceneGroudon3_Gfx:: @ 8DA2B28 - .incbin "graphics/rayquaza_scene/groudon_claw.4bpp.lz" - - .align 2 -gRaySceneKyogre_Gfx:: @ 8DA2D1C - .incbin "graphics/rayquaza_scene/kyogre.4bpp.lz" - - .align 2 -gRaySceneKyogre2_Gfx:: @ 8DA3250 - .incbin "graphics/rayquaza_scene/kyogre_shoulder.4bpp.lz" - - .align 2 -gRaySceneKyogre3_Gfx:: @ 8DA32A4 - .incbin "graphics/rayquaza_scene/kyogre_fin.4bpp.lz" - - .align 2 -gRaySceneGroudon_Pal:: @ 8DA3370 - .incbin "graphics/rayquaza_scene/groudon.gbapal.lz" - - .align 2 -gRaySceneKyogre_Pal:: @ 8DA3398 - .incbin "graphics/rayquaza_scene/kyogre.gbapal.lz" - - .align 2 -gRaySceneClouds_Gfx:: @ 8DA33C0 - .incbin "graphics/rayquaza_scene/clouds.4bpp.lz" - - .align 2 -gRaySceneClouds_Pal:: @ 8DA37E8 - .incbin "graphics/rayquaza_scene/clouds.gbapal.lz" @ pal 1 clouds, pal 2 rain - - .align 2 -gRaySceneClouds1_Tilemap:: @ 8DA3824 - .incbin "graphics/rayquaza_scene/clouds1.bin.lz" - - .align 2 -gRaySceneClouds2_Tilemap:: @ 8DA3988 - .incbin "graphics/rayquaza_scene/clouds2.bin.lz" - - .align 2 -gRaySceneClouds3_Tilemap:: @ 8DA3A88 - .incbin "graphics/rayquaza_scene/clouds3.bin.lz" - - .align 2 -gRaySceneSmoke_Gfx:: @ 8DA3BC0 - .incbin "graphics/rayquaza_scene/smoke.4bpp.lz" - - .align 2 -gRaySceneSmoke_Pal:: @ 8DA3C7C - .incbin "graphics/rayquaza_scene/smoke.gbapal.lz" - - .align 2 -gRaySceneRayquaza_Gfx:: @ 8DA3C94 - .incbin "graphics/rayquaza_scene/rayquaza.8bpp.lz" - - .align 2 -gRaySceneRayquaza_Pal:: @ 8DA4DA8 - .incbin "graphics/rayquaza_scene/rayquaza.gbapal.lz" - - .align 2 -gRaySceneRayquaza_Tilemap:: @ 8DA4DEC - .incbin "graphics/rayquaza_scene/rayquaza.bin.lz" - - .align 2 -gRaySceneOvercast_Gfx:: @ 8DA4F70 - .incbin "graphics/rayquaza_scene/overcast.4bpp.lz" @ uses pal 2 of gRaySceneRayquaza_Pal - - .align 2 -gRaySceneOvercast_Tilemap:: @ 8DA60B8 - .incbin "graphics/rayquaza_scene/overcast.bin.lz" - - .align 2 -gRaySceneRayquazaFly1_Gfx:: @ 8DA6440 - .incbin "graphics/rayquaza_scene/rayquaza_fly1.4bpp.lz" - - .align 2 -gRaySceneRayquazaTail_Gfx:: @ 8DA68AC - .incbin "graphics/rayquaza_scene/rayquaza_tail_fix.4bpp.lz" @ for some reason there are an extra 0xC bytes at the end of the original 4bpp, so in order to produce the correct lz, we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. - - .align 2 -gRaySceneOvercast2_Gfx:: @ 8DA69BC - .incbin "graphics/rayquaza_scene/overcast2.4bpp.lz" - - .align 2 -gRaySceneRayquazaLight_Gfx:: @ 8DA7528 - .incbin "graphics/rayquaza_scene/rayquaza_light.4bpp.lz" @ uses pal 2 of gRaySceneOvercast2_Pal - - .align 2 -gRaySceneOvercast2_Pal:: @ 8DA7744 - .incbin "graphics/rayquaza_scene/overcast2.gbapal.lz" - - .align 2 -gRaySceneOvercast2_Tilemap:: @ 8DA7784 - .incbin "graphics/rayquaza_scene/overcast2.bin.lz" - - .align 2 -gRaySceneRayquazaLight_Tilemap:: @ 8DA7AAC - .incbin "graphics/rayquaza_scene/rayquaza_light.bin.lz" - - .align 2 -gRaySceneChaseBg_Gfx:: @ 8DA7C30 - .incbin "graphics/rayquaza_scene/chase_bg.4bpp.lz" - - .align 2 -gRaySceneChaseBg_Tilemap:: @ 8DA7D6C - .incbin "graphics/rayquaza_scene/chase_bg.bin.lz" - - .align 2 -gRaySceneChaseStreaks_Gfx:: @ 8DA7EAC - .incbin "graphics/rayquaza_scene/chase_streaks.4bpp.lz" - - .align 2 -gRaySceneChaseStreaks_Tilemap:: @ 8DA7FB4 - .incbin "graphics/rayquaza_scene/chase_streaks.bin.lz" - - .align 2 -gRaySceneRayquazaChase_Gfx:: @ 8DA80BC - .incbin "graphics/rayquaza_scene/rayquaza_chase.4bpp.lz" - - .align 2 -gRayChaseRayquazaChase_Tilemap:: @ 8DA8B40 - .incbin "graphics/rayquaza_scene/rayquaza_chase.bin.lz" - - .align 2 -gRayChaseRayquazaChase2_Tilemap:: @ 8DA8D6C - .incbin "graphics/rayquaza_scene/rayquaza_chase2.bin.lz" - - .align 2 -gRaySceneChase_Pal:: @ 8DA8E84 - .incbin "graphics/rayquaza_scene/chase.gbapal.lz" - - .align 2 -gRaySceneGroudonLeft_Gfx:: @ 8DA8ED8 - .incbin "graphics/rayquaza_scene/groudon_left.4bpp.lz" - - .align 2 -gRaySceneGroudonTail_Gfx:: @ 8DA9670 - .incbin "graphics/rayquaza_scene/groudon_tail.4bpp.lz" - - .align 2 -gRaySceneKyogreRight_Gfx:: @ 8DA96B4 - .incbin "graphics/rayquaza_scene/kyogre_right.4bpp.lz" - - .align 2 -gRaySceneRayquazaHover_Gfx:: @ 8DA98FC - .incbin "graphics/rayquaza_scene/rayquaza_hover.4bpp.lz" - - .align 2 -gRaySceneRayquazaFlyIn_Gfx:: @ 8DAA5A4 - .incbin "graphics/rayquaza_scene/rayquaza_flyin.4bpp.lz" - - .align 2 -gRaySceneSplash_Gfx:: @ 8DAA794 - .incbin "graphics/rayquaza_scene/splash.4bpp.lz" - - .align 2 -gRaySceneGroudonLeft_Pal:: @ 8DAA82C - .incbin "graphics/rayquaza_scene/groudon_left.gbapal.lz" - - .align 2 -gRaySceneKyogreRight_Pal:: @ 8DAA854 - .incbin "graphics/rayquaza_scene/kyogre_right.gbapal.lz" - - .align 2 -gRaySceneRayquazaHover_Pal:: @ 8DAA87C - .incbin "graphics/rayquaza_scene/rayquaza_hover.gbapal.lz" - - .align 2 -gRaySceneSplash_Pal:: @ 8DAA8A4 - .incbin "graphics/rayquaza_scene/splash.gbapal.lz" - - .align 2 -gRaySceneHushBg_Gfx:: @ 8DAA8B4 - .incbin "graphics/rayquaza_scene/hush_bg.4bpp.lz" - - .align 2 -gRaySceneHushRing_Gfx:: @ 8DAAB24 - .incbin "graphics/rayquaza_scene/hush_ring.8bpp.lz" - - .align 2 -gRaySceneHushBg_Tilemap:: @ 8DAAC1C - .incbin "graphics/rayquaza_scene/hush_bg.bin.lz" - - .align 2 -gRaySceneHushRing_Tilemap:: @ 8DAAE54 - .incbin "graphics/rayquaza_scene/hush_ring.bin.lz" - - .align 2 -gRaySceneHushRing_Map:: @ 8DAAF98 - .incbin "graphics/rayquaza_scene/hush_ring_map.bin.lz" - - .align 2 -gRaySceneHushBg_Pal:: @ 8DAAFEC - .incbin "graphics/rayquaza_scene/hush_bg.gbapal.lz" - -@ 8DAB058 - .include "data/graphics/items/item_graphics.inc" - -@ 8DB7AA0 - .include "data/graphics/decorations/decoration_graphics.inc" - - .align 2 -gBattleAnimSpritePalette_282:: @ 8E7E7D0 - .incbin "graphics/battle_anims/sprites/282.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_282:: @ 8E7E7F8 - .incbin "graphics/battle_anims/sprites/282.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_270:: @ 8E7E9E0 - .incbin "graphics/battle_anims/sprites/270.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_270:: @ 8E7E9FC - .incbin "graphics/battle_anims/sprites/270.4bpp.lz" - - .align 2 -gBattleAnimSpritePalette_271:: @ 8E7EB24 - .incbin "graphics/battle_anims/sprites/271.gbapal.lz" - - .align 2 -gBattleAnimSpriteSheet_271:: @ 8E7EB3C - .incbin "graphics/battle_anims/sprites/271.4bpp.lz" - - .align 2 -gUnknown_08DBA518:: @ 8DBA518 - .incbin "graphics/misc/cable_car_bg.gbapal" - - .align 2 -gCableCar_Pal:: @ 8DBA598 - .incbin "graphics/misc/cable_car.gbapal" - - .align 2 -gUnknown_08DBA5B8:: @ 8DBA5B8 - .incbin "graphics/misc/cable_car_bg.4bpp.lz" - - .align 2 -gCableCar_Gfx:: @ 8DBBF90 - .incbin "graphics/misc/cable_car.4bpp.lz" - - .align 2 -gCableCarDoor_Gfx:: @ 8DBC290 - .incbin "graphics/misc/cable_car_door.4bpp.lz" - - .align 2 -gCableCarCord_Gfx:: @ 8DBC2C0 - .incbin "graphics/misc/cable_car_cord.4bpp.lz" - - .align 2 -gRouletteMenuTiles:: @ 8DBC2E8 - .incbin "graphics/roulette/window.4bpp.lz" - - .align 2 -gRouletteWheelTiles:: - .incbin "graphics/roulette/wheel.8bpp.lz" - - .align 2 -gRouletteCenter_Gfx:: - .incbin "graphics/roulette/center.4bpp.lz" - - .align 2 -gRouletteHeadersTiles:: @ 8E824BC - .incbin "graphics/roulette/headers.4bpp.lz" - - .align 2 -gRouletteCreditTiles:: @ 8E82AE0 - .incbin "graphics/roulette/credit.4bpp.lz" - - .align 2 -gRouletteNumbersTiles:: @ 8E82C30 - .incbin "graphics/roulette/numbers.4bpp.lz" - - .align 2 -gRouletteMultiplierTiles:: @ 8E82D14 - .incbin "graphics/roulette/multiplier.4bpp.lz" - - .align 2 -gMailPalette_Orange:: @ 0x08DBE818 - .incbin "graphics/mail/orange/palette.gbapal" - - .align 2 -gMailPalette_Harbor:: @ 0x08DBE838 - .incbin "graphics/mail/harbor/palette.gbapal" - - .align 2 -gMailPalette_Glitter:: @ 0x08DBE858 - .incbin "graphics/mail/glitter/palette.gbapal" - - .align 2 -gMailPalette_Mech:: @ 0x08DBE878 - .incbin "graphics/mail/mech/palette.gbapal" - - .align 2 -gMailPalette_Wood:: @ 0x08DBE898 - .incbin "graphics/mail/wood/palette.gbapal" - - .align 2 -gMailPalette_Wave:: @ 0x08DBE8B8 - .incbin "graphics/mail/wave/palette.gbapal" - - .align 2 -gMailPalette_Bead:: @ 0x08DBE8D8 - .incbin "graphics/mail/bead/palette.gbapal" - - .align 2 -gMailPalette_Shadow:: @ 0x08DBE8F8 - .incbin "graphics/mail/shadow/palette.gbapal" - - .align 2 -gMailPalette_Tropic:: @ 0x08DBE918 - .incbin "graphics/mail/tropic/palette.gbapal" - - .align 2 -gMailPalette_Dream:: @ 0x08DBE938 - .incbin "graphics/mail/dream/palette.gbapal" - - .align 2 -gMailPalette_Fab:: @ 0x08DBE958 - .incbin "graphics/mail/fab/palette.gbapal" - - .align 2 -gMailPalette_Retro:: @ 0x08DBE978 - .incbin "graphics/mail/retro/palette.gbapal" - - .align 2 -gMailTiles_Orange:: @ 0x08DBE998 - .incbin "graphics/mail/orange/tiles.4bpp.lz" - - .align 2 -gMailTiles_Harbor:: @ 0x08DBEB38 - .incbin "graphics/mail/harbor/tiles.4bpp.lz" - - .align 2 -gMailTiles_Glitter:: @ 0x08DBEC74 - .incbin "graphics/mail/glitter/tiles.4bpp.lz" - - .align 2 -gMailTiles_Mech:: @ 0x08DBEE84 - .incbin "graphics/mail/mech/tiles.4bpp.lz" - - .align 2 -gMailTiles_Wood:: @ 0x08DBEF5C - .incbin "graphics/mail/wood/tiles.4bpp.lz" - - .align 2 -gMailTiles_Wave:: @ 0x08DBF154 - .incbin "graphics/mail/wave/tiles.4bpp.lz" - - .align 2 -gMailTiles_Bead:: @ 0x08DBF2D4 - .incbin "graphics/mail/bead/tiles.4bpp.lz" - - .align 2 -gMailTiles_Shadow:: @ 0x08DBF37C - .incbin "graphics/mail/shadow/tiles.4bpp.lz" - - .align 2 -gMailTiles_Tropic:: @ 0x08DBF50C - .incbin "graphics/mail/tropic/tiles.4bpp.lz" - - .align 2 -gMailTiles_Dream:: @ 0x08DBF64C - .incbin "graphics/mail/dream/tiles.4bpp.lz" - - .align 2 -gMailTiles_Fab:: @ 0x08DBF7B4 - .incbin "graphics/mail/fab/tiles.4bpp.lz" - - .align 2 -gMailTiles_Retro:: @ 0x08DBF904 - .incbin "graphics/mail/retro/tiles.4bpp.lz" - - .align 2 -gMailTilemap_Orange:: @ 0x08DBFBA4 - .incbin "graphics/mail/orange/map.bin.lz" - - .align 2 -gMailTilemap_Harbor:: @ 0x08DBFC7C - .incbin "graphics/mail/harbor/map.bin.lz" - - .align 2 -gMailTilemap_Glitter:: @ 0x08DBFD5C - .incbin "graphics/mail/glitter/map.bin.lz" - - .align 2 -gMailTilemap_Mech:: @ 0x08DBFE68 - .incbin "graphics/mail/mech/map.bin.lz" - - .align 2 -gMailTilemap_Wood:: @ 0x08DBFF44 - .incbin "graphics/mail/wood/map.bin.lz" - - .align 2 -gMailTilemap_Wave:: @ 0x08DC0034 - .incbin "graphics/mail/wave/map.bin.lz" - - .align 2 -gMailTilemap_Bead:: @ 0x08DC0114 - .incbin "graphics/mail/bead/map.bin.lz" - - .align 2 -gMailTilemap_Shadow:: @ 0x08DC01F4 - .incbin "graphics/mail/shadow/map.bin.lz" - - .align 2 -gMailTilemap_Tropic:: @ 0x08DC0300 - .incbin "graphics/mail/tropic/map.bin.lz" - - .align 2 -gMailTilemap_Dream:: @ 0x08DC03F0 - .incbin "graphics/mail/dream/map.bin.lz" - - .align 2 -gMailTilemap_Fab:: @ 0x08DC04E8 - .incbin "graphics/mail/fab/map.bin.lz" - - .align 2 -gMailTilemap_Retro:: @ 0x08DC0600 - .incbin "graphics/mail/retro/map.bin.lz" - - .align 2 -gFrontierFactorySelectMenu_Pal:: @ 8DC0714 - .incbin "graphics/battle_frontier/factory_menu1.gbapal" - .incbin "graphics/battle_frontier/factory_menu2.gbapal" - - .align 2 -gFrontierFactorySelectMenu_Gfx:: @ 8DC0754 - .incbin "graphics/battle_frontier/factory_menu1.4bpp" - .incbin "graphics/battle_frontier/factory_menu2.4bpp" - - .align 2 -gFrontierFactorySelectMenu_Tilemap:: @ 8DC0B94 - .incbin "graphics/battle_frontier/factory_menu.bin" - - .align 2 -gFrontierPassMedals_Gfx:: @ 8DC1394 - .incbin "graphics/frontier_pass/medals.4bpp.lz" @ battle frontier medals - - .align 2 -gFrontierPassCursor_Pal:: @ 8DC1674 - .incbin "graphics/frontier_pass/cursor.gbapal" @ frontier pass cursor pal - - .align 2 -gFrontierPassMapCursor_Pal:: @ 8DC1694 - .incbin "graphics/frontier_pass/map_cursor.gbapal" @ frontier pass map cursor pal - - .align 2 -gFrontierPassMedalsSilver_Pal:: @ 8DC16B4 - .incbin "graphics/frontier_pass/silver.gbapal" - - .align 2 -gFrontierPassMedalsGold_Pal:: @ 8DC16D4 - .incbin "graphics/frontier_pass/gold.gbapal" - - .align 2 -gPokedexText_Pal:: @ 8DC16F4 - .incbin "graphics/pokedex/text.gbapal" - - .align 2 -gPokedexCaughtScreenFade_Pal:: @ 8DC1756 - .incbin "graphics/pokedex/fade.gbapal" - - .align 2 -gPokedexHoennBg_Pal:: @ 8DC17B6 - .incbin "graphics/pokedex/hoenn_bg.gbapal" - - .align 2 -gPokedexNationalBg_Pal:: @ 8DC1876 - .incbin "graphics/pokedex/national_bg.gbapal" - - .align 2 -gPokedexMenu_Gfx:: @ 8DC1934 - .incbin "graphics/pokedex/menu.4bpp.lz" - - .align 2 -gPokedexMenu2_Gfx:: @ 8DC234C - .incbin "graphics/pokedex/menu2.4bpp.lz" - - .align 2 - .incbin "graphics/pokedex/noball_unused.4bpp.lz" @ unused - - @ these are a series of 9 tilemaps used for something pokedex related. - - .align 2 -gUnknown_08DC2A08:: @ 8DC2A08 - .incbin "graphics/pokedex/tilemap1.bin.lz" - - .align 2 -gUnknown_08DC2B1C:: @ 8DC2B1C - .incbin "graphics/pokedex/tilemap2.bin.lz" - - .align 2 -gUnknown_08DC2C5C:: @ 8DC2C5C - .incbin "graphics/pokedex/tilemap3.bin.lz" - - .align 2 -gUnknown_08DC2DAC:: @ 8DC2DAC - .incbin "graphics/pokedex/tilemap4.bin.lz" - - .align 2 -gUnknown_08DC2E6C:: @ 8DC2E6C - .incbin "graphics/pokedex/tilemap5.bin.lz" - - .align 2 -gUnknown_08DC2F5C:: @ 8DC2F5C - .incbin "graphics/pokedex/tilemap6.bin.lz" - - .align 2 -gUnknown_08DC2FEC:: @ 8DC2FEC - .incbin "graphics/pokedex/tilemap7.bin.lz" - - .align 2 -gUnknown_08DC3080:: @ 8DC3080 - .incbin "graphics/pokedex/tilemap8.bin.lz" - - .align 2 -gUnknown_08DC3198:: @ 8DC3198 - .incbin "graphics/pokedex/tilemap9.bin.lz" @ all tilemaps - - .align 2 -gPokedexSearchMenu_Pal:: @ 8DC3284 - .incbin "graphics/pokedex/search_menu.gbapal" - - .align 2 -gPokedexSearchMenu_Gfx:: @ 8DC3304 - .incbin "graphics/pokedex/search_menu.4bpp.lz" - - .align 2 -gPokedexSearch1_Tilemap:: @ 8DC3870 - .incbin "graphics/pokedex/search1.bin.lz" - - .align 2 -gPokedexSearch2_Tilemap:: @ 8DC3A0C - .incbin "graphics/pokedex/search2.bin.lz" - - .align 2 -gSummaryScreenPowAcc_Tilemap:: @ 8DC3B94 - .incbin "graphics/interface/powacc_tilemap.bin" @ pow/acc tilemap - - .align 2 -gUnknown_08DC3C34:: @ 8DC3C34 - .incbin "graphics/interface/unk_tilemap.bin" @ probably trade summary screen related? cant check - - .align 2 -gSummaryScreenWindow_Tilemap:: @ 8DC3CD4 - .incbin "graphics/interface/summary.bin" - - .align 2 -gIntroCopyright_Pal:: @ 8DC3D54 - .incbin "graphics/intro/copyright.gbapal" - - .align 2 -gIntroCopyright_Gfx:: @ 8DC3D74 - .incbin "graphics/intro/copyright.4bpp.lz" - - .align 2 -gIntroCopyright_Tilemap:: @ 8DC3FD4 - .incbin "graphics/intro/copyright.bin.lz" - - .align 2 -gPokedexAreaScreenAreaUnknown_Pal:: @ 8DC4120 - .incbin "graphics/pokedex/area_unknown.gbapal" - - .align 2 -gPokedexAreaScreenAreaUnknown_Gfx:: @ 8DC4140 - .incbin "graphics/pokedex/area_unknown.4bpp.lz" - - @ seems to be fire red leftovers, but the menu elements is reused in the item menu for TM descriptions. - - .align 2 -gFireRedMenuElements1_Pal:: @ 8DC4318 - .incbin "graphics/interface_fr/menu1.gbapal" - - .align 2 -gFireRedMenuElements2_Pal:: @ 8DC4338 - .incbin "graphics/interface_fr/menu2.gbapal" - - .align 2 -gFireRedMenuElements3_Pal:: @ 8DC4358 - .incbin "graphics/interface_fr/menu3.gbapal" - - .align 2 -gFireRedMenuElements_Gfx:: @ 8DC4378 - .incbin "graphics/interface_fr/menu.4bpp" @ the types are reused for item menu - - .align 2 -gBagMenuHMIcon_Gfx:: @ 8DC6378 - .incbin "graphics/interface/hm.4bpp" - - @ contest link stuff, appears to be a set of tilemaps - - .align 2 -gUnknown_08DC63F8:: @ 8DC63F8 - .incbin "graphics/contest/clink_tilemap1.bin" - - .align 2 -gUnknown_08DC6420:: @ 8DC6420 - .incbin "graphics/contest/clink_tilemap2.bin" - - .align 2 -gUnknown_08DC6448:: @ 8DC6448 - .incbin "graphics/contest/clink_tilemap3.bin" - - .align 2 -gUnknown_08DC6470:: @ 8DC6470 - .incbin "graphics/contest/clink_tilemap4.bin" - - .align 2 -gUnknown_08DC6498:: @ 8DC6498 - .incbin "graphics/contest/clink_tilemap5.bin" - - .align 2 -gUnknown_08DC64AC:: @ 8DC64AC - .incbin "graphics/contest/clink_tilemap6.bin" - - .align 2 -gUnknown_08DC64C0:: @ 8DC64C0 - .incbin "graphics/contest/clink_tilemap7.bin" - - .align 2 -gUnknown_08DC64D4:: @ 8DC64D4 - .incbin "graphics/contest/clink_tilemap8.bin" - - .align 2 -gUnknown_08DC64E8:: @ 8DC64E8 - .incbin "graphics/contest/clink_tilemap9.bin" - - .align 2 -gUnknown_08DC64FC:: @ 8DC64FC - .incbin "graphics/contest/clink_tilemap10.bin" - - .align 2 -gUnknown_08DC6510:: @ 8DC6510 - .incbin "graphics/contest/clink_tilemap11.bin" - - @ pokenav - - .align 2 -gPokenavCondition_Pal:: @ 8DC6528 - .incbin "graphics/pokenav/condition.gbapal" - - .align 2 -gPokenavCondition_Gfx:: @ 8DC6548 - .incbin "graphics/pokenav/condition.4bpp.lz" - - .align 2 -gPokenavCondition_Tilemap:: @ 8DC6DFC - .incbin "graphics/pokenav/condition.bin.lz" - - .align 2 -gPokenavOptions_Tilemap:: @ 8DC7070 - .incbin "graphics/pokenav/options/options.bin" - - .align 2 -gPokenavOptions_Gfx:: - .incbin "graphics/pokenav/options/options.4bpp.lz" - - .align 2 -gPokenavOptions_Pal:: - .incbin "graphics/pokenav/options/options.gbapal" - - .align 2 -gPokenavHeader_Pal:: @ 8DC7B60 - .incbin "graphics/pokenav/header.gbapal" - - .align 2 -gPokenavHeader_Gfx:: @ 8DC7B80 - .incbin "graphics/pokenav/header.4bpp.lz" @ TODO: use width 9 and makefile rule for cleanliness, make wasnt behaving, didnt want to apply num_tiles to this - - .align 2 -gPokenavHeader_Tilemap:: @ 8DC7D84 - .incbin "graphics/pokenav/header.bin.lz" - - .align 2 -gPokenavLeftHeader_Pal:: @ 8DC7F00 - .incbin "graphics/pokenav/left_headers/palette.gbapal" - - .align 2 -gPokenavLeftHeaderBeauty_Gfx:: @ 8DC7FA0 - .incbin "graphics/pokenav/left_headers/beauty.4bpp.lz" - - .align 2 -gPokenavLeftHeaderSmart_Gfx:: @ 8DC80DC - .incbin "graphics/pokenav/left_headers/smart.4bpp.lz" - - .align 2 -gPokenavLeftHeaderCondition_Gfx:: @ 8DC8208 - .incbin "graphics/pokenav/left_headers/condition.4bpp.lz" - - .align 2 -gPokenavLeftHeaderCute_Gfx:: @ 8DC838C - .incbin "graphics/pokenav/left_headers/cute.4bpp.lz" - - .align 2 -gPokenavLeftHeaderMatchCall_Gfx:: @ 8DC84AC - .incbin "graphics/pokenav/left_headers/match_call.4bpp.lz" - - .align 2 -gPokenavLeftHeaderMainMenu_Gfx:: @ 8DC864C - .incbin "graphics/pokenav/left_headers/main_menu.4bpp.lz" - - .align 2 -gPokenavLeftHeaderHoennMap_Gfx:: @ 8DC87F8 - .incbin "graphics/pokenav/left_headers/hoenn_map.4bpp.lz" - - .align 2 -gPokenavLeftHeaderRibbons_Gfx:: @ 8DC8AA4 - .incbin "graphics/pokenav/left_headers/ribbons.4bpp.lz" - - .align 2 -gPokenavLeftHeaderSearch_Gfx:: @ 8DC8C14 - .incbin "graphics/pokenav/left_headers/search.4bpp.lz" - - .align 2 -gPokenavLeftHeaderTough_Gfx:: @ 8DC8D50 - .incbin "graphics/pokenav/left_headers/tough.4bpp.lz" - - .align 2 -gPokenavLeftHeaderCool_Gfx:: @ 8DC8E64 - .incbin "graphics/pokenav/left_headers/cool.4bpp.lz" - - .align 2 -gPokenavLeftHeaderParty_Gfx:: @ 8DC8F64 - .incbin "graphics/pokenav/left_headers/party.4bpp.lz" - - .align 2 -gPokenavMessageBox_Pal:: @ 8DC90C0 - .incbin "graphics/pokenav/message.gbapal" - - .align 2 -gPokenavMessageBox_Gfx:: @ 8DC90E0 - .incbin "graphics/pokenav/message.4bpp.lz" - - .align 2 -gPokenavMessageBox_Tilemap:: @ 8DC9130 - .incbin "graphics/pokenav/message.bin.lz" - - .align 2 -gHoennMapZoomIcons_Pal:: @ 8DC91E8 - .incbin "graphics/pokenav/zoom.gbapal" - - .align 2 -gHoennMapZoomIcons_Gfx:: @ 8DC9208 - .incbin "graphics/pokenav/zoom.4bpp.lz" - - .align 2 -gPokenavConditionCancel_Pal:: - .incbin "graphics/pokenav/cancel.gbapal" - - .align 2 -gPokenavConditionCancel_Gfx:: - .incbin "graphics/pokenav/cancel.4bpp" - - .align 2 -gPokenavConditionMarker_Pal:: @ 8DC9608 - .incbin "graphics/pokenav/marker.gbapal" - - .align 2 -gPokenavConditionMarker_Gfx:: @ 8DC9628 - .incbin "graphics/pokenav/marker.4bpp" - - .align 2 -gBerryBlenderMiscPalette:: @ 8DCAB88 - .incbin "graphics/berry_blender/misc.gbapal" - - .align 2 -gBerryBlenderArrowPalette:: @ 8DC9948 - .incbin "graphics/berry_blender/arrow.gbapal" - - .align 2 -gBerryBlenderBetaArrow_Gfx:: @ 8DC9988 - .incbin "graphics/berry_blender/arrow_old.4bpp" @ unused - - .align 2 -gBerryBlenderMarubatsuTiles:: @ 8DC9B88 - .incbin "graphics/berry_blender/marubatsu.4bpp" - - .align 2 -gBerryBlenderParticlesTiles:: @ 8E90818 - .incbin "graphics/berry_blender/particles.4bpp" - - .space 0x120 - - .align 2 -gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88 - .incbin "graphics/berry_blender/countdown_numbers.4bpp" - - .align 2 -gBerryBlenderStartTiles:: @ 8DCA588 - .incbin "graphics/berry_blender/start.4bpp" - - .space 0x200 - - .align 2 -gBerryBlenderArrowTiles:: @ 8DCAB88 - .incbin "graphics/berry_blender/arrow.4bpp" - - .space 0x2C0 - - .align 2 -gEasyChatCursor_Pal:: @ 8DCB648 - .incbin "graphics/easy_chat/cursor.gbapal" - - .align 2 -gEasyChatCursor_Gfx:: @ 8DCB668 - .incbin "graphics/easy_chat/cursor.4bpp.lz" - - .align 2 -gEasyChatRightWindow_Pal:: @ 8DCB86C - .incbin "graphics/easy_chat/rwindow.gbapal" - - .align 2 -gEasyChatRightWindow_Gfx:: @ 8DCB88C - .incbin "graphics/easy_chat/rwindow.4bpp.lz" - - .align 2 -gEasyChatMode_Gfx:: @ 8DCBAB0 - .incbin "graphics/easy_chat/mode.4bpp.lz" - - .align 2 -gEasyChatMode_Pal:: @ 8DCBDB0 - .incbin "graphics/easy_chat/mode.gbapal" - - .align 2 -gEasyChatWindow_Gfx:: @ 8DCBDD0 - .incbin "graphics/easy_chat/window.4bpp.lz" @ uses mode pal - - .align 2 -gEasyChatWindow_Tilemap:: @ 8DCBF10 - .incbin "graphics/easy_chat/window.bin.lz" - - .align 2 -gWallclockMale_Pal:: @ 8DCC01C - .incbin "graphics/interface/wallclock_male.gbapal" - - .align 2 -gWallclockFemale_Pal:: @ 8DCC03C - .incbin "graphics/interface/wallclock_female.gbapal" - - .align 2 -gWallclock_Gfx:: @ 8DCC05C - .incbin "graphics/interface/wallclock.4bpp.lz" - - .align 2 -gUnknown_08DCC648:: @ 8DCC648 - .incbin "graphics/interface/wallclock1.bin.lz" - - .align 2 -gUnknown_08DCC908:: @ 8DCC908 - .incbin "graphics/interface/wallclock2.bin.lz" - - .align 2 -gUsePokeblockCondition_Pal:: @ 8DCCB98 - .incbin "graphics/pokeblock/use_screen/condition.gbapal" - - .align 2 -gUsePokeblockCondition_Gfx:: @ 8DCCBB8 - .incbin "graphics/pokeblock/use_screen/condition.4bpp.lz" - - .align 2 -gUsePokeblockUpDown_Pal:: @ 8DCCD3C - .incbin "graphics/pokeblock/use_screen/updown.gbapal" - - .align 2 -gUsePokeblockUpDown_Gfx:: @ 8DCCD5C - .incbin "graphics/pokeblock/use_screen/updown.4bpp" - - .align 2 -gUsePokeblockGraph_Pal:: @ 8DCCF5C - .incbin "graphics/pokeblock/use_screen/graph.gbapal" - - .align 2 -gUsePokeblockGraph_Gfx:: @ 8DCCF7C - .incbin "graphics/pokeblock/use_screen/graph.4bpp.lz" - - .align 2 -gUsePokeblockGraph_Tilemap:: @ 8DCD81C - .incbin "graphics/pokeblock/use_screen/graph.bin.lz" - - .align 2 -gUsePokeblockNatureWin_Pal:: @ 8DCDA30 - .incbin "graphics/pokeblock/use_screen/nature.gbapal" - - @ slot machine - - .align 2 -gSlotMachineMenu_Pal:: @ 8DCDA90 - .incbin "graphics/slot_machine/menu.gbapal" - - .align 2 -gSlotMachineMenu_Gfx:: @ 8DCDB30 - .incbin "graphics/slot_machine/menu.4bpp.lz" - - .align 2 -gSlotMachineMenu_Tilemap:: @ 8DCE770 - .incbin "graphics/slot_machine/menu.bin" - - .align 2 -gUnknown_08DCEC70:: @ 8DCEC70 - .incbin "graphics/slot_machine/slots_layout.bin" - - .align 2 -gUnknown_08DCF170:: - .incbin "graphics/slot_machine/reel_symbols/1.gbapal" - - .align 2 -gUnknown_08DCF190:: - .incbin "graphics/slot_machine/reel_pikachu.gbapal" - - .align 2 -gUnknown_08DCF1B0:: - .incbin "graphics/slot_machine/shadow.gbapal" - - .align 2 -gSlotMachineReelTime_Pal:: - .incbin "graphics/slot_machine/reel_time.gbapal" - - .align 2 -gUnknown_08DCF1F0:: - .incbin "graphics/slot_machine/smoke.gbapal" @ also duck and pika aura - - .align 2 -gUnknown_08DCF210:: - .incbin "graphics/slot_machine/reel_time_explosion/0.gbapal" - - .align 2 -gUnknown_08DCF230:: - .incbin "graphics/slot_machine/spr6.gbapal" @ huh? - - .align 2 -gSlotMachineReelSymbol1Tiles:: @ 8DCF250 - .incbin "graphics/slot_machine/reel_symbols/1.4bpp" - - .align 2 -gSlotMachineReelSymbol2Tiles:: - .incbin "graphics/slot_machine/reel_symbols/2.4bpp" - - .align 2 -gSlotMachineReelSymbol3Tiles:: - .incbin "graphics/slot_machine/reel_symbols/3.4bpp" - - .align 2 -gSlotMachineReelSymbol4Tiles:: - .incbin "graphics/slot_machine/reel_symbols/4.4bpp" - - .align 2 -gSlotMachineReelSymbol5Tiles:: - .incbin "graphics/slot_machine/reel_symbols/5.4bpp" - - .align 2 -gSlotMachineReelSymbol6Tiles:: - .incbin "graphics/slot_machine/reel_symbols/6.4bpp" - - .align 2 -gSlotMachineReelSymbol7Tiles:: - .incbin "graphics/slot_machine/reel_symbols/7.4bpp" - - .align 2 -gSlotMachineReelTime_Gfx:: @ 8DD0050 - .incbin "graphics/slot_machine/reel_time.4bpp.lz" - - .align 2 -gSlotMachineNumber0Tiles:: - .incbin "graphics/slot_machine/numbers/0.4bpp" - - .align 2 -gSlotMachineNumber1Tiles:: - .incbin "graphics/slot_machine/numbers/1.4bpp" - - .align 2 -gSlotMachineNumber2Tiles:: - .incbin "graphics/slot_machine/numbers/2.4bpp" - - .align 2 -gSlotMachineNumber3Tiles:: - .incbin "graphics/slot_machine/numbers/3.4bpp" - - .align 2 -gSlotMachineNumber4Tiles:: - .incbin "graphics/slot_machine/numbers/4.4bpp" - - .align 2 -gSlotMachineNumber5Tiles:: - .incbin "graphics/slot_machine/numbers/5.4bpp" - - .align 2 -gSlotMachineNumber6Tiles:: - .incbin "graphics/slot_machine/numbers/6.4bpp" - - .align 2 -gSlotMachineNumber7Tiles:: - .incbin "graphics/slot_machine/numbers/7.4bpp" - - .align 2 -gSlotMachineNumber8Tiles:: - .incbin "graphics/slot_machine/numbers/8.4bpp" - - .align 2 -gSlotMachineNumber9Tiles:: - .incbin "graphics/slot_machine/numbers/9.4bpp" - - .align 2 -gSlotMachineReelTimeBolt:: - .incbin "graphics/slot_machine/bolt.4bpp" - - .align 2 -gSlotMachineReelTimeDuck:: - .incbin "graphics/slot_machine/duck.4bpp" - - .align 2 -gSlotMachineReelTimeSmoke:: - .incbin "graphics/slot_machine/smoke.4bpp" - - .align 2 -gSlotMachineReelTimeNumber0:: - .incbin "graphics/slot_machine/reel_time_numbers/0.4bpp" - - .align 2 -gSlotMachineReelTimeNumber1:: - .incbin "graphics/slot_machine/reel_time_numbers/1.4bpp" - - .align 2 -gSlotMachineReelTimeNumber2:: - .incbin "graphics/slot_machine/reel_time_numbers/2.4bpp" - - .align 2 -gSlotMachineReelTimeNumber3:: - .incbin "graphics/slot_machine/reel_time_numbers/3.4bpp" - - .align 2 -gSlotMachineReelTimeNumber4:: - .incbin "graphics/slot_machine/reel_time_numbers/4.4bpp" - - .align 2 -gSlotMachineReelTimeNumber5:: - .incbin "graphics/slot_machine/reel_time_numbers/5.4bpp" - - .align 2 -gSlotMachineReelTimeLargeBolt0:: - .incbin "graphics/slot_machine/large_bolt/0.4bpp" - - .align 2 -gSlotMachineReelTimeLargeBolt1:: - .incbin "graphics/slot_machine/large_bolt/1.4bpp" - - .align 2 -gSlotMachineReelTimeExplosion0:: - .incbin "graphics/slot_machine/reel_time_explosion/0.4bpp" - - .align 2 -gSlotMachineReelTimeExplosion1:: - .incbin "graphics/slot_machine/reel_time_explosion/1.4bpp" - - .align 2 -gSlotMachineReelTimeShadow:: - .incbin "graphics/slot_machine/shadow.4bpp" - - .align 2 -gSlotMachineReelTimePikaAura:: - .incbin "graphics/slot_machine/pika_aura.4bpp" - - .align 2 -gUnknown_08DD19F8:: - .incbin "graphics/unknown/unknown_DD19F8.bin" @ might be a palette? - - .align 2 -gUnknown_08DD1A18:: - .incbin "graphics/unknown/unknown_DD1A18.4bpp" - - @ trainer card - - .align 2 -gEmeraldTrainerCard0Star_Pal:: @ 8DD1A58 - .incbin "graphics/trainer_card/0star.gbapal" - - .align 2 -gEmeraldTrainerCard_Gfx:: @ 8DD1AB8 - .incbin "graphics/trainer_card/card.4bpp.lz" - - @ what are these? lz compressed files used for something, cant tell if tilemaps - - .align 2 -gUnknown_08DD1F78:: @ 8DD1F78 - .incbin "graphics/unknown/unknown_DD1F78.bin.lz" - - .align 2 -gUnknown_08DD2010:: @ 8DD2010 - .incbin "graphics/unknown/unknown_DD2010.bin.lz" - - .align 2 -gUnknown_08DD21B0:: @ 8DD21B0 - .incbin "graphics/unknown/unknown_DD21B0.bin.lz" - - .align 2 -gUnknown_08DD228C:: @ 8DD228C - .incbin "graphics/unknown/unknown_DD228C.bin.lz" - - .align 2 -gFireRedTrainerCard0Star_Pal:: @ 8DD240C - .incbin "graphics/trainer_card/0star_fr.gbapal" - - .align 2 -gFireRedTrainerCard_Gfx:: @ 8DD246C - .incbin "graphics/trainer_card/card_fr.4bpp.lz" - - @ more of these weird compressed files, probably for the FR trainer card - - .align 2 -gUnknown_08DD2AE0:: @ 8DD2AE0 - .incbin "graphics/unknown/unknown_DD2AE0.bin.lz" - - .align 2 -gUnknown_08DD2B78:: @ 8DD2B78 - .incbin "graphics/unknown/unknown_DD2B78.bin.lz" - - .align 2 -gUnknown_08DD2D30:: @ 8DD2D30 - .incbin "graphics/unknown/unknown_DD2D30.bin.lz" - - .align 2 -gUnknown_08DD2E5C:: @ 8DD2E5C - .incbin "graphics/unknown/unknown_DD2E5C.bin.lz" - - @ pokemon storage system - - .align 2 -gPSSMenu_Gfx:: @ 8DD2FE8 - .incbin "graphics/pokemon_storage/menu.4bpp.lz" - - .align 2 -gPSSMenu_Pal:: @ 8DD36A8 - .incbin "graphics/pokemon_storage/menu.gbapal" @ pal for the options in the gfx - - .align 2 -gUnknown_08DD36C8:: @ 8DD36C8 - .incbin "graphics/unknown/unknown_DD36C8.bin.lz" - - @ naming screen - - .align 2 -gNamingScreenMenu_Pal:: @ 8DD3778 - .incbin "graphics/naming_screen/menu.gbapal" - - .align 2 -gNamingScreenMenu_Gfx:: @ 8DD3838 - .incbin "graphics/naming_screen/menu.4bpp.lz" - - .align 2 -gNamingScreenRWindow_Gfx:: @ 8DD3A04 - .incbin "graphics/naming_screen/rwindow.4bpp" - - .align 2 -gNamingScreenROptions_Gfx:: @ 8DD4044 - .incbin "graphics/naming_screen/roptions.4bpp" - - .align 2 -gNamingScreenCursor_Gfx:: @ 8DD4224 - .incbin "graphics/naming_screen/cursor.4bpp" - - .align 2 -gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4 - .incbin "graphics/naming_screen/keyboard_button.4bpp" - - .align 2 -gNamingScreenRightPointingTriangleTiles:: @ 8DD4504 - .incbin "graphics/naming_screen/right_pointing_triangle.4bpp" - - .align 2 -gNamingScreenUnderscoreTiles:: @ 8DD4524 - .incbin "graphics/naming_screen/underscore.4bpp" - - .align 2 -gUnknown_08DD4544:: @ 8DD4544 - .incbin "graphics/unknown/unknown_DD4544.bin.lz" - - .align 2 -gUnknown_08DD4620:: @ 8DD4620 - .incbin "graphics/unknown/unknown_DD4620.bin.lz" - - .align 2 -gUnknown_08DD46E0:: @ 8DD46E0 - .incbin "graphics/unknown/unknown_DD46E0.bin.lz" - - .align 2 -gUnknown_08DD47A0:: @ 8DD47A0 - .incbin "graphics/unknown/unknown_DD47A0.bin.lz" - - @ link - - .align 2 -gLinkMiscMenu_Pal:: @ 8DD4860 - .incbin "graphics/link/misc.gbapal" - - .align 2 -gLinkMiscMenu_Gfx:: @ 8DD4880 - .incbin "graphics/link/misc.4bpp.lz" @ dont know where this is used - - .align 2 -gLinkMiscMenu_Tilemap:: @ 8DD4AB8 - .incbin "graphics/link/misc.bin.lz" - - .align 2 -gUnknown_08DD4BB0:: @ 8DD4BB0 - .incbin "graphics/link/link1.gbapal" - - .align 2 -gUnknown_08DD4BD0:: @ 8DD4BD0 - .incbin "graphics/link/link2.gbapal" - - .align 2 -gUnknown_08DD4BF0:: @ 8DD4BF0 - .incbin "graphics/link/link_winedge.4bpp.lz" - - .align 2 -gUnknown_08DD4C4C:: @ 8DD4C4C - .incbin "graphics/link/link_winedge.bin.lz" - - .align 2 -gUnknown_08DD4CF8:: @ 8DD4CF8 - .incbin "graphics/interface/unk_change_case.4bpp.lz" - - .align 2 -gTilesetPalettes_General:: @ 8DD4E10 - .incbin "data/tilesets/primary/general/palettes/00.gbapal" - .incbin "data/tilesets/primary/general/palettes/01.gbapal" - .incbin "data/tilesets/primary/general/palettes/02.gbapal" - .incbin "data/tilesets/primary/general/palettes/03.gbapal" - .incbin "data/tilesets/primary/general/palettes/04.gbapal" - .incbin "data/tilesets/primary/general/palettes/05.gbapal" - .incbin "data/tilesets/primary/general/palettes/06.gbapal" - .incbin "data/tilesets/primary/general/palettes/07.gbapal" - .incbin "data/tilesets/primary/general/palettes/08.gbapal" - .incbin "data/tilesets/primary/general/palettes/09.gbapal" - .incbin "data/tilesets/primary/general/palettes/10.gbapal" - .incbin "data/tilesets/primary/general/palettes/11.gbapal" - .incbin "data/tilesets/primary/general/palettes/12.gbapal" - .incbin "data/tilesets/primary/general/palettes/13.gbapal" - .incbin "data/tilesets/primary/general/palettes/14.gbapal" - .incbin "data/tilesets/primary/general/palettes/15.gbapal" - - .align 2 -gTilesetTiles_General:: @ 8DD5010 - .incbin "data/tilesets/primary/general/tiles.4bpp.lz" - - @ trade/egg hatch - - .align 2 -gTradeGba_Pal:: @ 8DD72E0 - .incbin "graphics/link/gba.gbapal" - - .align 2 -gTradeGba2_Pal:: @ 8DD7300 - .incbin "graphics/link/gba_pal2.gbapal" @ used for in-game trade GBA? - - .align 2 -gTradeGba_Gfx:: @ 8DD7360 - .incbin "graphics/link/gba.4bpp" - - @ 8DD8760 - .space 0x20 @ blank palette?? - - @ berry fix program - - .align 2 -gBerryFixGameboy_Pal:: @ 8DD8780 - .incbin "graphics/berry_fix/gba_small.gbapal" - - .align 2 -gBerryFixGameboy_Gfx:: @ 8DD87C0 - .incbin "graphics/berry_fix/gba_small.4bpp.lz" - - .align 2 -gBerryFixGameboy_Tilemap:: @ 8DD8EE0 - .incbin "graphics/berry_fix/gba_small.bin.lz" - - .align 2 -gBerryFixGameboyLogo_Pal:: @ 8DD9080 - .incbin "graphics/berry_fix/logo.gbapal" - - .align 2 -gBerryFixGameboyLogo_Gfx:: @ 8DD90E0 - .incbin "graphics/berry_fix/logo.4bpp.lz" - - .align 2 -gBerryFixGameboyLogo_Tilemap:: @ 8DD9718 - .incbin "graphics/berry_fix/logo.bin.lz" - - .align 2 -gBerryFixGbaTransfer_Pal:: @ 8DD9874 - .incbin "graphics/berry_fix/gba_transfer.gbapal" - - .align 2 -gBerryFixGbaTransfer_Gfx:: @ 8DD98B4 - .incbin "graphics/berry_fix/gba_transfer.4bpp.lz" - - .align 2 -gBerryFixGbaTransfer_Tilemap:: @ 8DD9E58 - .incbin "graphics/berry_fix/gba_transfer.bin.lz" - - .align 2 -gBerryFixGbaTransferHighlight_Pal:: @ 8DD9FEC - .incbin "graphics/berry_fix/gba_transfer_highlight.gbapal" - - .align 2 -gBerryFixGbaTransferHighlight_Gfx:: @ 8DDA02C - .incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz" - - .align 2 -gBerryFixGbaTransferHighlight_Tilemap:: @ 8DDA63C - .incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz" - - .align 2 -gBerryFixGbaTransferError_Pal:: @ 8DDA800 - .incbin "graphics/berry_fix/gba_transfer_error.gbapal" - - .align 2 -gBerryFixGbaTransferError_Gfx:: @ 8DDA840 - .incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz" - - .align 2 -gBerryFixGbaTransferError_Tilemap:: @ 8DDAE40 - .incbin "graphics/berry_fix/gba_transfer_error.bin.lz" - - .align 2 -gBerryFixWindow_Pal:: @ 8DDAFE0 - .incbin "graphics/berry_fix/window.gbapal" - - .align 2 -gBerryFixWindow_Gfx:: @ 8DDB020 - .incbin "graphics/berry_fix/window.4bpp.lz" @ why the absurd length? - - .align 2 -gBerryFixWindow_Tilemap:: @ 8DDB2C4 - .incbin "graphics/berry_fix/window.bin.lz" - - @ more trade stuff? - - .align 2 -gUnknown_08DDB3E4:: @ 8DDB3E4 - .incbin "graphics/trade/menu.gbapal" - - .align 2 -gUnknown_08DDB444:: @ 8DDB444 - .incbin "graphics/unknown/unknown_DDB444.gbapal" - - .align 2 -gUnknown_08DDB464:: @ 8DDB464 - .incbin "graphics/trade/menu.4bpp" - - .align 2 -gUnknown_08DDC6E4:: @ 8DDC6E4 - .incbin "graphics/trade/buttons.4bpp" - - .align 2 - .incbin "graphics/unused/unused_DDCEE4.bin" @ unused - - .align 2 -gUnknown_08DDCF04:: @ 8DDCF04 - .incbin "graphics/unknown/unknown_DDCF04.bin" @ tilemap - - .align 2 -gUnknown_08DDD704:: @ 8DDD704 - .incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap?? - - .align 2 -gMessageBox_Pal:: @ 8DDD728 - .incbin "graphics/text_window/message_box.gbapal" - - .align 2 -gMessageBox_Gfx:: @ 8DDD748 - .incbin "graphics/text_window/message_box.4bpp" - - .align 2 -gWallpaperIcon_Cross:: - .incbin "graphics/pokemon_storage/cross_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Bolt:: - .incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Plusle:: - .incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz" - - .align 2 -gWallpaperPalettes_Horizontal:: @ 8DDD950 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/horizontal_bg.gbapal" - - .align 2 -gWallpaperTiles_Horizontal:: @ 8DDD990 - .incbin "graphics/pokemon_storage/horizontal.4bpp.lz" - - .align 2 -gWallpaperTilemap_Horizontal:: @ 8DDDB80 - .incbin "graphics/pokemon_storage/horizontal.bin.lz" - - .align 2 -gWallpaperPalettes_Ribbon:: @ 8DDDC8C - .incbin "graphics/pokemon_storage/ribbon_frame.gbapal" - .incbin "graphics/pokemon_storage/ribbon_bg.gbapal" - - .align 2 -gWallpaperTiles_Ribbon:: @ 8DDDCCC - .incbin "graphics/pokemon_storage/ribbon.4bpp.lz" - - .align 2 -gWallpaperTilemap_Ribbon:: @ 8DDDEDC - .incbin "graphics/pokemon_storage/ribbon.bin.lz" - - @ pokenav - - .align 2 -gUnknown_08DDE010:: @ 8DDE010 - .incbin "graphics/pokenav/ribbons.gbapal" - - .align 2 -gUnknown_08DDE030:: @ 8DDE030 - .incbin "graphics/pokenav/ribbons.4bpp.lz" - - .align 2 -gUnknown_08DDE12C:: @ 8DDE12C - .incbin "graphics/pokenav/ribbons.bin.lz" - - .align 2 -gMonIconPalettes:: @ 8DDE1F8 - .incbin "graphics/pokemon/icon_palettes/icon_palette_0.gbapal" - .incbin "graphics/pokemon/icon_palettes/icon_palette_1.gbapal" - .incbin "graphics/pokemon/icon_palettes/icon_palette_2.gbapal" - - .align 2 -gTitleScreenBgPalettes:: @ 8DDE258 - .incbin "graphics/title_screen/pokemon_logo.gbapal" - .incbin "graphics/title_screen/rayquaza_and_clouds.gbapal" - - .align 2 -gTitleScreenEmeraldVersionPal:: @ 8DDE438 - .incbin "graphics/title_screen/emerald_version.gbapal" - - .align 2 -gUnknown_08DDE458:: @ 8DDE458 - .incbin "graphics/title_screen/title_screen1.bin.lz" - -gTitleScreenPokemonLogoGfx:: @ 8DDE690 - .incbin "graphics/title_screen/pokemon_logo.8bpp.lz" - - .align 2 -gTitleScreenEmeraldVersionGfx:: @ 8DDFD94 - .incbin "graphics/title_screen/emerald_version.8bpp.lz" - - .align 2 -gTitleScreenPressStartPal:: @ 8DE03C8 - .incbin "graphics/title_screen/press_start.gbapal" - - .align 2 -gTitleScreenPressStartGfx:: @ 8DE03E8 - .incbin "graphics/title_screen/press_start.4bpp.lz" - - .align 2 -gUnknown_08DE0644:: @ 8DE0644 - .incbin "graphics/title_screen/title_screen2.bin.lz" - - @ more trainer card stuff - - .align 2 -gUnknown_08DE07C8:: @ 8DE07C8 - .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well - - .align 2 -gUnknown_08DE08C8:: @ 8DE08C8 - .incbin "graphics/frontier_pass/tiles.4bpp.lz" - - .align 2 -gUnknown_08DE2084:: @ 8DE2084 - .incbin "graphics/frontier_pass/tiles2.8bpp.lz" - - .align 2 -gUnknown_08DE3060:: @ 8DE3060 - .incbin "graphics/frontier_pass/tiles.bin.lz" - - .align 2 -gUnknown_08DE3350:: @ 8DE3350 - .incbin "graphics/frontier_pass/tilemap1.bin" - - .align 2 -gUnknown_08DE3374:: @ 8DE3374 - .incbin "graphics/frontier_pass/tilemap2.bin" - - @ berry crusher - - .align 2 -gUnknown_08DE3398:: @ 8DE3398 - .incbin "graphics/berry_crusher/tiles.gbapal" - - .align 2 -gUnknown_08DE34B8:: @ 8DE34B8 - .incbin "graphics/berry_crusher/tiles.4bpp.lz" - - .align 2 -gUnknown_08DE3FD4:: @ 8DE3FD4 - .incbin "graphics/berry_crusher/tiles.bin.lz" - @ random garbage at the end. why, game freak? .space 0x54BAC .byte 0x0D, 0x00, 0x58, 0x02 @ why? diff --git a/data/graphics/berries/berry_graphics.inc b/data/graphics/berries/berry_graphics.inc deleted file mode 100644 index 358cc8fc1..000000000 --- a/data/graphics/berries/berry_graphics.inc +++ /dev/null @@ -1,343 +0,0 @@ - .align 2 -gBerryPic_Cheri:: @ 8D9C3A8 - .incbin "graphics/berries/cheri.4bpp.lz" - - .align 2 -gBerryPic_Oran:: @ 8D9C4FC - .incbin "graphics/berries/oran.4bpp.lz" - - .align 2 -gBerryPic_Pecha:: @ 8D9C670 - .incbin "graphics/berries/pecha.4bpp.lz" - - .align 2 -gBerryPic_Rawst:: @ 8D9C7E4 - .incbin "graphics/berries/rawst.4bpp.lz" - - .align 2 -gBerryPic_Aspear:: @ 8D9C97C - .incbin "graphics/berries/aspear.4bpp.lz" - - .align 2 -gBerryPic_Leppa:: @ 8D9CB24 - .incbin "graphics/berries/leppa.4bpp.lz" - - .align 2 -gBerryPic_Chesto:: @ 8D9CC94 - .incbin "graphics/berries/chesto.4bpp.lz" - - .align 2 -gBerryPic_Persim:: @ 8D9CE78 - .incbin "graphics/berries/persim.4bpp.lz" - - .align 2 -gBerryPic_Lum:: @ 8D9CFC8 - .incbin "graphics/berries/lum.4bpp.lz" - - .align 2 -gBerryPic_Sitrus:: @ 8D9D0E4 - .incbin "graphics/berries/sitrus.4bpp.lz" - - .align 2 -gBerryPic_Figy:: @ 8D9D288 - .incbin "graphics/berries/figy.4bpp.lz" - - .align 2 -gBerryPic_Wiki:: @ 8D9D434 - .incbin "graphics/berries/wiki.4bpp.lz" - - .align 2 -gBerryPic_Mago:: @ 8D9D628 - .incbin "graphics/berries/mago.4bpp.lz" - - .align 2 -gBerryPic_Aguav:: @ 8D9D7DC - .incbin "graphics/berries/aguav.4bpp.lz" - - .align 2 -gBerryPic_Iapapa:: @ 8D9D950 - .incbin "graphics/berries/iapapa.4bpp.lz" - - .align 2 -gBerryPic_Razz:: @ 8D9DC08 - .incbin "graphics/berries/razz.4bpp.lz" - - .align 2 -gBerryPic_Bluk:: @ 8D9DE38 - .incbin "graphics/berries/bluk.4bpp.lz" - - .align 2 -gBerryPic_Nanab:: @ 8D9E020 - .incbin "graphics/berries/nanab.4bpp.lz" - - .align 2 -gBerryPic_Wepear:: @ 8D9E194 - .incbin "graphics/berries/wepear.4bpp.lz" - - .align 2 -gBerryPic_Pinap:: @ 8D9E35C - .incbin "graphics/berries/pinap.4bpp.lz" - - .align 2 -gBerryPic_Pomeg:: @ 8D9E570 - .incbin "graphics/berries/pomeg.4bpp.lz" - - .align 2 -gBerryPic_Kelpsy:: @ 8D9E718 - .incbin "graphics/berries/kelpsy.4bpp.lz" - - .align 2 -gBerryPic_Qualot:: @ 8D9E8C0 - .incbin "graphics/berries/qualot.4bpp.lz" - - .align 2 -gBerryPic_Hondew:: @ 8D9EA8C - .incbin "graphics/berries/hondew.4bpp.lz" - - .align 2 -gBerryPic_Grepa:: @ 8D9ECE4 - .incbin "graphics/berries/grepa.4bpp.lz" - - .align 2 -gBerryPic_Tamato:: @ 8D9EE74 - .incbin "graphics/berries/tamato.4bpp.lz" - - .align 2 -gBerryPic_Cornn:: @ 8D9F138 - .incbin "graphics/berries/cornn.4bpp.lz" - - .align 2 -gBerryPic_Magost:: @ 8D9F33C - .incbin "graphics/berries/magost.4bpp.lz" - - .align 2 -gBerryPic_Rabuta:: @ 8D9F4E0 - .incbin "graphics/berries/rabuta.4bpp.lz" - - .align 2 -gBerryPic_Nomel:: @ 8D9F7D4 - .incbin "graphics/berries/nomel.4bpp.lz" - - .align 2 -gBerryPic_Spelon:: @ 8D9F9B0 - .incbin "graphics/berries/spelon.4bpp.lz" - - .align 2 -gBerryPic_Pamtre:: @ 8D9FBA0 - .incbin "graphics/berries/pamtre.4bpp.lz" - - .align 2 -gBerryPic_Watmel:: @ 8D9FDF0 - .incbin "graphics/berries/watmel.4bpp.lz" - - .align 2 -gBerryPic_Durin:: @ 8DA00D4 - .incbin "graphics/berries/durin.4bpp.lz" - - .align 2 -gBerryPic_Belue:: @ 8DA04A0 - .incbin "graphics/berries/belue.4bpp.lz" - - .align 2 -gBerryPic_Liechi:: @ 8DA0778 - .incbin "graphics/berries/liechi.4bpp.lz" - - .align 2 -gBerryPic_Ganlon:: @ 8DA09D0 - .incbin "graphics/berries/ganlon.4bpp.lz" - - .align 2 -gBerryPic_Salac:: @ 8DA0B68 - .incbin "graphics/berries/salac.4bpp.lz" - - .align 2 -gBerryPic_Petaya:: @ 8DA0DAC - .incbin "graphics/berries/petaya.4bpp.lz" - - .align 2 -gBerryPic_Apicot:: @ 8DA1054 - .incbin "graphics/berries/apicot.4bpp.lz" - - .align 2 -gBerryPic_Lansat:: @ 8DA11E4 - .incbin "graphics/berries/lansat.4bpp.lz" - - .align 2 -gBerryPic_Starf:: @ 8DA13D8 - .incbin "graphics/berries/starf.4bpp.lz" - - .align 2 -gBerryPic_Enigma:: @ 8DA15A8 - .incbin "graphics/berries/enigma.4bpp.lz" - - .align 2 -gBerryPalette_Cheri:: @ 8DA17C0 - .incbin "graphics/berries/cheri.gbapal.lz" - - .align 2 -gBerryPalette_Oran:: @ 8DA17E8 - .incbin "graphics/berries/oran.gbapal.lz" - - .align 2 -gBerryPalette_Pecha:: @ 8DA1810 - .incbin "graphics/berries/pecha.gbapal.lz" - - .align 2 -gBerryPalette_Rawst:: @ 8DA1838 - .incbin "graphics/berries/rawst.gbapal.lz" - - .align 2 -gBerryPalette_Aspear:: @ 8DA1860 - .incbin "graphics/berries/aspear.gbapal.lz" - - .align 2 -gBerryPalette_Leppa:: @ 8DA1888 - .incbin "graphics/berries/leppa.gbapal.lz" - - .align 2 -gBerryPalette_Chesto:: @ 8DA18B0 - .incbin "graphics/berries/chesto.gbapal.lz" - - .align 2 -gBerryPalette_Persim:: @ 8DA18D8 - .incbin "graphics/berries/persim.gbapal.lz" - - .align 2 -gBerryPalette_Lum:: @ 8DA1900 - .incbin "graphics/berries/lum.gbapal.lz" - - .align 2 -gBerryPalette_Sitrus:: @ 8DA1928 - .incbin "graphics/berries/sitrus.gbapal.lz" - - .align 2 -gBerryPalette_Figy:: @ 8DA1950 - .incbin "graphics/berries/figy.gbapal.lz" - - .align 2 -gBerryPalette_Wiki:: @ 8DA1978 - .incbin "graphics/berries/wiki.gbapal.lz" - - .align 2 -gBerryPalette_Mago:: @ 8DA19A0 - .incbin "graphics/berries/mago.gbapal.lz" - - .align 2 -gBerryPalette_Aguav:: @ 8DA19C8 - .incbin "graphics/berries/aguav.gbapal.lz" - - .align 2 -gBerryPalette_Iapapa:: @ 8DA19F0 - .incbin "graphics/berries/iapapa.gbapal.lz" - - .align 2 -gBerryPalette_Razz:: @ 8DA1A18 - .incbin "graphics/berries/razz.gbapal.lz" - - .align 2 -gBerryPalette_Bluk:: @ 8DA1A40 - .incbin "graphics/berries/bluk.gbapal.lz" - - .align 2 -gBerryPalette_Nanab:: @ 8DA1A68 - .incbin "graphics/berries/nanab.gbapal.lz" - - .align 2 -gBerryPalette_Wepear:: @ 8DA1A90 - .incbin "graphics/berries/wepear.gbapal.lz" - - .align 2 -gBerryPalette_Pinap:: @ 8DA1AB8 - .incbin "graphics/berries/pinap.gbapal.lz" - - .align 2 -gBerryPalette_Pomeg:: @ 8DA1AE0 - .incbin "graphics/berries/pomeg.gbapal.lz" - - .align 2 -gBerryPalette_Kelpsy:: @ 8DA1B08 - .incbin "graphics/berries/kelpsy.gbapal.lz" - - .align 2 -gBerryPalette_Qualot:: @ 8DA1B30 - .incbin "graphics/berries/qualot.gbapal.lz" - - .align 2 -gBerryPalette_Hondew:: @ 8DA1B58 - .incbin "graphics/berries/hondew.gbapal.lz" - - .align 2 -gBerryPalette_Grepa:: @ 8DA1B80 - .incbin "graphics/berries/grepa.gbapal.lz" - - .align 2 -gBerryPalette_Tamato:: @ 8DA1BA8 - .incbin "graphics/berries/tamato.gbapal.lz" - - .align 2 -gBerryPalette_Cornn:: @ 8DA1BD0 - .incbin "graphics/berries/cornn.gbapal.lz" - - .align 2 -gBerryPalette_Magost:: @ 8DA1BF8 - .incbin "graphics/berries/magost.gbapal.lz" - - .align 2 -gBerryPalette_Rabuta:: @ 8DA1C20 - .incbin "graphics/berries/rabuta.gbapal.lz" - - .align 2 -gBerryPalette_Nomel:: @ 8DA1C48 - .incbin "graphics/berries/nomel.gbapal.lz" - - .align 2 -gBerryPalette_Spelon:: @ 8DA1C70 - .incbin "graphics/berries/spelon.gbapal.lz" - - .align 2 -gBerryPalette_Pamtre:: @ 8DA1C98 - .incbin "graphics/berries/pamtre.gbapal.lz" - - .align 2 -gBerryPalette_Watmel:: @ 8DA1CC0 - .incbin "graphics/berries/watmel.gbapal.lz" - - .align 2 -gBerryPalette_Durin:: @ 8DA1CE8 - .incbin "graphics/berries/durin.gbapal.lz" - - .align 2 -gBerryPalette_Belue:: @ 8DA1D10 - .incbin "graphics/berries/belue.gbapal.lz" - - .align 2 -gBerryPalette_Liechi:: @ 8DA1D38 - .incbin "graphics/berries/liechi.gbapal.lz" - - .align 2 -gBerryPalette_Ganlon:: @ 8DA1D60 - .incbin "graphics/berries/ganlon.gbapal.lz" - - .align 2 -gBerryPalette_Salac:: @ 8DA1D88 - .incbin "graphics/berries/salac.gbapal.lz" - - .align 2 -gBerryPalette_Petaya:: @ 8DA1DB0 - .incbin "graphics/berries/petaya.gbapal.lz" - - .align 2 -gBerryPalette_Apicot:: @ 8DA1DD8 - .incbin "graphics/berries/apicot.gbapal.lz" - - .align 2 -gBerryPalette_Lansat:: @ 8DA1E00 - .incbin "graphics/berries/lansat.gbapal.lz" - - .align 2 -gBerryPalette_Starf:: @ 8DA1E28 - .incbin "graphics/berries/starf.gbapal.lz" - - .align 2 -gBerryPalette_Enigma:: @ 8DA1E50 - .incbin "graphics/berries/enigma.gbapal.lz" diff --git a/data/graphics/decorations/decoration_graphics.inc b/data/graphics/decorations/decoration_graphics.inc deleted file mode 100644 index c7ea9be70..000000000 --- a/data/graphics/decorations/decoration_graphics.inc +++ /dev/null @@ -1,252 +0,0 @@ -gUnknown_08DB7AA0:: - .incbin "graphics/decorations/decor_heavy_desk.4bpp.lz" - -gUnknown_08DB7B34:: - .incbin "graphics/decorations/decor_heavy_desk.gbapal.lz" - -gUnknown_08DB7B5C:: - .incbin "graphics/decorations/decor_ragged_desk.4bpp.lz" - -gUnknown_08DB7BEC:: - .incbin "graphics/decorations/decor_ragged_desk.gbapal.lz" - -gUnknown_08DB7C08:: - .incbin "graphics/decorations/decor_comfort_desk.4bpp.lz" - -gUnknown_08DB7CE8:: - .incbin "graphics/decorations/decor_comfort_desk.gbapal.lz" - -gUnknown_08DB7D08:: - .incbin "graphics/decorations/decor_pretty_desk.4bpp.lz" - -gUnknown_08DB7DCC:: - .incbin "graphics/decorations/decor_pretty_desk.gbapal.lz" - -gUnknown_08DB7DF4:: - .incbin "graphics/decorations/decor_brick_desk.4bpp.lz" - -gUnknown_08DB7EA0:: - .incbin "graphics/decorations/decor_brick_desk.gbapal.lz" - -gUnknown_08DB7EC4:: - .incbin "graphics/decorations/decor_camp_desk.4bpp.lz" - -gUnknown_08DB7F60:: - .incbin "graphics/decorations/decor_camp_desk.gbapal.lz" - -gUnknown_08DB7F7C:: - .incbin "graphics/decorations/decor_hard_desk.4bpp.lz" - -gUnknown_08DB8070:: - .incbin "graphics/decorations/decor_hard_desk.gbapal.lz" - -gUnknown_08DB808C:: - .incbin "graphics/decorations/decor_red_plant.4bpp.lz" - -gUnknown_08DB8138:: - .incbin "graphics/decorations/decor_red_plant.gbapal.lz" - -gUnknown_08DB8160:: - .incbin "graphics/decorations/decor_tropical_plant.4bpp.lz" - -gUnknown_08DB8218:: - .incbin "graphics/decorations/decor_tropical_plant.gbapal.lz" - -gUnknown_08DB823C:: - .incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz" - -gUnknown_08DB8300:: - .incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz" - -gUnknown_08DB8328:: - .incbin "graphics/decorations/decor_colorful_plant.4bpp.lz" - -gUnknown_08DB8430:: - .incbin "graphics/decorations/decor_colorful_plant.gbapal.lz" - -gUnknown_08DB8458:: - .incbin "graphics/decorations/decor_big_plant.4bpp.lz" - -gUnknown_08DB8528:: - .incbin "graphics/decorations/decor_big_plant.gbapal.lz" - -gUnknown_08DB854C:: - .incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz" - -gUnknown_08DB862C:: - .incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz" - -gUnknown_08DB8654:: - .incbin "graphics/decorations/decor_red_brick.4bpp.lz" - -gUnknown_08DB86C4:: - .incbin "graphics/decorations/decor_red_brick.gbapal.lz" - -gUnknown_08DB86E0:: - .incbin "graphics/decorations/decor_yellow_brick.4bpp.lz" - -gUnknown_08DB8750:: - .incbin "graphics/decorations/decor_yellow_brick.gbapal.lz" - -gUnknown_08DB876C:: - .incbin "graphics/decorations/decor_blue_brick.4bpp.lz" - -gUnknown_08DB87DC:: - .incbin "graphics/decorations/decor_blue_brick.gbapal.lz" - -gUnknown_08DB87F8:: - .incbin "graphics/decorations/decor_red_tent.4bpp.lz" - -gUnknown_08DB88D8:: - .incbin "graphics/decorations/decor_red_tent.gbapal.lz" - -gUnknown_08DB8900:: - .incbin "graphics/decorations/decor_blue_tent.4bpp.lz" - -gUnknown_08DB89E0:: - .incbin "graphics/decorations/decor_blue_tent.gbapal.lz" - -gUnknown_08DB8A08:: - .incbin "graphics/decorations/decor_solid_board.4bpp.lz" - -gUnknown_08DB8A68:: - .incbin "graphics/decorations/decor_solid_board.gbapal.lz" - -gUnknown_08DB8A84:: - .incbin "graphics/decorations/decor_slide.4bpp.lz" - -gUnknown_08DB8B40:: - .incbin "graphics/decorations/decor_slide.gbapal.lz" - -gUnknown_08DB8B68:: - .incbin "graphics/decorations/decor_tire.4bpp.lz" - -gUnknown_08DB8C40:: - .incbin "graphics/decorations/decor_tire.gbapal.lz" - -gUnknown_08DB8C5C:: - .incbin "graphics/decorations/decor_stand.4bpp.lz" - -gUnknown_08DB8CF4:: - .incbin "graphics/decorations/decor_stand.gbapal.lz" - -gUnknown_08DB8D18:: - .incbin "graphics/decorations/decor_breakable_door.4bpp.lz" - -gUnknown_08DB8DB0:: - .incbin "graphics/decorations/decor_breakable_door.gbapal.lz" - -gUnknown_08DB8DD4:: - .incbin "graphics/decorations/decor_sand_ornament.4bpp.lz" - -gUnknown_08DB8E80:: - .incbin "graphics/decorations/decor_sand_ornament.gbapal.lz" - -gUnknown_08DB8EA0:: - .incbin "graphics/decorations/decor_glass_ornament.4bpp.lz" - -gUnknown_08DB8F58:: - .incbin "graphics/decorations/decor_glass_ornament.gbapal.lz" - -gUnknown_08DB8F7C:: - .incbin "graphics/decorations/decor_surf_mat.4bpp.lz" - -gUnknown_08DB9038:: - .incbin "graphics/decorations/decor_surf_mat.gbapal.lz" - -gUnknown_08DB9058:: - .incbin "graphics/decorations/decor_thunder_mat.4bpp.lz" - -gUnknown_08DB9130:: - .incbin "graphics/decorations/decor_thunder_mat.gbapal.lz" - -gUnknown_08DB9154:: - .incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz" - -gUnknown_08DB9218:: - .incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz" - -gUnknown_08DB9234:: - .incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz" - -gUnknown_08DB92FC:: - .incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz" - -gUnknown_08DB931C:: - .incbin "graphics/decorations/decor_attract_mat.4bpp.lz" - -gUnknown_08DB93E8:: - .incbin "graphics/decorations/decor_attract_mat.gbapal.lz" - -gUnknown_08DB940C:: - .incbin "graphics/decorations/decor_fissure_mat.4bpp.lz" - -gUnknown_08DB94CC:: - .incbin "graphics/decorations/decor_fissure_mat.gbapal.lz" - -gUnknown_08DB94E8:: - .incbin "graphics/decorations/decor_spikes_mat.4bpp.lz" - -gUnknown_08DB95AC:: - .incbin "graphics/decorations/decor_spikes_mat.gbapal.lz" - -gUnknown_08DB95D0:: - .incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz" - -gUnknown_08DB96C4:: - .incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz" - -gUnknown_08DB96EC:: - .incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz" - -gUnknown_08DB97F4:: - .incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz" - -gUnknown_08DB981C:: - .incbin "graphics/decorations/decor_lapras_doll.4bpp.lz" - -gUnknown_08DB9908:: - .incbin "graphics/decorations/decor_lapras_doll.gbapal.lz" - -gUnknown_08DB9930:: - .incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz" - -gUnknown_08DB9A54:: - .incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz" - -gUnknown_08DB9A7C:: - .incbin "graphics/decorations/decor_charizard_doll.4bpp.lz" - -gUnknown_08DB9B7C:: - .incbin "graphics/decorations/decor_charizard_doll.gbapal.lz" - -gUnknown_08DB9BA4:: - .incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz" - -gUnknown_08DB9CB0:: - .incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz" - -gUnknown_08DB9CD8:: - .incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz" - -gUnknown_08DB9DAC:: - .incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz" - -gUnknown_08DB9DD4:: - .incbin "graphics/decorations/decor_regice_doll.4bpp.lz" - -gUnknown_08DB9EE4:: - .incbin "graphics/decorations/decor_regice_doll.gbapal.lz" - -gUnknown_08DB9F08:: - .incbin "graphics/decorations/decor_regirock_doll.4bpp.lz" - -gUnknown_08DB9FFC:: - .incbin "graphics/decorations/decor_regirock_doll.gbapal.lz" - -gUnknown_08DBA020:: - .incbin "graphics/decorations/decor_registeel_doll.4bpp.lz" - -gUnknown_08DBA12C:: - .incbin "graphics/decorations/decor_registeel_doll.gbapal.lz" - diff --git a/data/graphics/items/item_graphics.inc b/data/graphics/items/item_graphics.inc deleted file mode 100644 index 08aa00328..000000000 --- a/data/graphics/items/item_graphics.inc +++ /dev/null @@ -1,1883 +0,0 @@ - .align 2 -gItemIcon_QuestionMark:: @ 8DAB058 - .incbin "graphics/items/icons/question_mark.4bpp.lz" - - .align 2 -gItemIconPalette_QuestionMark:: @ 8DAB0D0 - .incbin "graphics/items/icon_palettes/question_mark.gbapal.lz" - - .align 2 -gItemIcon_ReturnToFieldArrow:: @ 8DAB0E4 - .incbin "graphics/items/icons/return_to_field_arrow.4bpp.lz" - - .align 2 -gItemIconPalette_ReturnToFieldArrow:: @ 8DAB16C - .incbin "graphics/items/icon_palettes/return_to_field_arrow.gbapal.lz" - - .align 2 -gItemIcon_MasterBall:: @ 8DAB184 - .incbin "graphics/items/icons/master_ball.4bpp.lz" - - .align 2 -gItemIconPalette_MasterBall:: @ 8DAB254 - .incbin "graphics/items/icon_palettes/master_ball.gbapal.lz" - - .align 2 -gItemIcon_UltraBall:: @ 8DAB27C - .incbin "graphics/items/icons/ultra_ball.4bpp.lz" - - .align 2 -gItemIconPalette_UltraBall:: @ 8DAB33C - .incbin "graphics/items/icon_palettes/ultra_ball.gbapal.lz" - - .align 2 -gItemIcon_GreatBall:: @ 8DAB364 - .incbin "graphics/items/icons/great_ball.4bpp.lz" - - .align 2 -gItemIconPalette_GreatBall:: @ 8DAB434 - .incbin "graphics/items/icon_palettes/great_ball.gbapal.lz" - - .align 2 -gItemIcon_PokeBall:: @ 8DAB45C - .incbin "graphics/items/icons/poke_ball.4bpp.lz" - - .align 2 -gItemIconPalette_PokeBall:: @ 8DAB50C - .incbin "graphics/items/icon_palettes/poke_ball.gbapal.lz" - - .align 2 -gItemIcon_SafariBall:: @ 8DAB530 - .incbin "graphics/items/icons/safari_ball.4bpp.lz" - - .align 2 -gItemIconPalette_SafariBall:: @ 8DAB600 - .incbin "graphics/items/icon_palettes/safari_ball.gbapal.lz" - - .align 2 -gItemIcon_NetBall:: @ 8DAB628 - .incbin "graphics/items/icons/net_ball.4bpp.lz" - - .align 2 -gItemIconPalette_NetBall:: @ 8DAB6FC - .incbin "graphics/items/icon_palettes/net_ball.gbapal.lz" - - .align 2 -gItemIcon_DiveBall:: @ 8DAB720 - .incbin "graphics/items/icons/dive_ball.4bpp.lz" - - .align 2 -gItemIconPalette_DiveBall:: @ 8DAB7E8 - .incbin "graphics/items/icon_palettes/dive_ball.gbapal.lz" - - .align 2 -gItemIcon_NestBall:: @ 8DAB80C - .incbin "graphics/items/icons/nest_ball.4bpp.lz" - - .align 2 -gItemIconPalette_NestBall:: @ 8DAB8D0 - .incbin "graphics/items/icon_palettes/nest_ball.gbapal.lz" - - .align 2 -gItemIcon_RepeatBall:: @ 8DAB8F8 - .incbin "graphics/items/icons/repeat_ball.4bpp.lz" - - .align 2 -gItemIconPalette_RepeatBall:: @ 8DAB9BC - .incbin "graphics/items/icon_palettes/repeat_ball.gbapal.lz" - - .align 2 -gItemIcon_TimerBall:: @ 8DAB9E4 - .incbin "graphics/items/icons/timer_ball.4bpp.lz" - - .align 2 -gItemIcon_LuxuryBall:: @ 8DABAAC - .incbin "graphics/items/icons/luxury_ball.4bpp.lz" - - .align 2 -gItemIconPalette_LuxuryBall:: @ 8DABB68 - .incbin "graphics/items/icon_palettes/luxury_ball.gbapal.lz" - - .align 2 -gItemIcon_PremierBall:: @ 8DABB90 - .incbin "graphics/items/icons/premier_ball.4bpp.lz" - - .align 2 -gItemIcon_Potion:: @ 8DABC34 - .incbin "graphics/items/icons/potion.4bpp.lz" - - .align 2 -gItemIconPalette_Potion:: @ 8DABCFC - .incbin "graphics/items/icon_palettes/potion.gbapal.lz" - - .align 2 -gItemIcon_Antidote:: @ 8DABD20 - .incbin "graphics/items/icons/antidote.4bpp.lz" - - .align 2 -gItemIconPalette_Antidote:: @ 8DABDD0 - .incbin "graphics/items/icon_palettes/antidote.gbapal.lz" - - .align 2 -gItemIconPalette_BurnHeal:: @ 8DABDF4 - .incbin "graphics/items/icon_palettes/burn_heal.gbapal.lz" - - .align 2 -gItemIconPalette_IceHeal:: @ 8DABE18 - .incbin "graphics/items/icon_palettes/ice_heal.gbapal.lz" - - .align 2 -gItemIcon_StatusHeal:: @ 8DABE3C - .incbin "graphics/items/icons/status_heal.4bpp.lz" - - .align 2 -gItemIconPalette_Awakening:: @ 8DABEEC - .incbin "graphics/items/icon_palettes/awakening.gbapal.lz" - - .align 2 -gItemIconPalette_ParalyzeHeal:: @ 8DABF10 - .incbin "graphics/items/icon_palettes/paralyze_heal.gbapal.lz" - - .align 2 -gItemIcon_LargePotion:: @ 8DABF34 - .incbin "graphics/items/icons/large_potion.4bpp.lz" - - .align 2 -gItemIconPalette_FullRestore:: @ 8DAC018 - .incbin "graphics/items/icon_palettes/full_restore.gbapal.lz" - - .align 2 -gItemIconPalette_MaxPotion:: @ 8DAC03C - .incbin "graphics/items/icon_palettes/max_potion.gbapal.lz" - - .align 2 -gItemIconPalette_HyperPotion:: @ 8DAC060 - .incbin "graphics/items/icon_palettes/hyper_potion.gbapal.lz" - - .align 2 -gItemIconPalette_SuperPotion:: @ 8DAC084 - .incbin "graphics/items/icon_palettes/super_potion.gbapal.lz" - - .align 2 -gItemIcon_FullHeal:: @ 8DAC0A8 - .incbin "graphics/items/icons/full_heal.4bpp.lz" - - .align 2 -gItemIconPalette_FullHeal:: @ 8DAC150 - .incbin "graphics/items/icon_palettes/full_heal.gbapal.lz" - - .align 2 -gItemIcon_Revive:: @ 8DAC178 - .incbin "graphics/items/icons/revive.4bpp.lz" - - .align 2 -gItemIcon_MaxRevive:: @ 8DAC1D4 - .incbin "graphics/items/icons/max_revive.4bpp.lz" - - .align 2 -gItemIconPalette_Revive:: @ 8DAC2A0 - .incbin "graphics/items/icon_palettes/revive.gbapal.lz" - - .align 2 -gItemIcon_FreshWater:: @ 8DAC2BC - .incbin "graphics/items/icons/fresh_water.4bpp.lz" - - .align 2 -gItemIconPalette_FreshWater:: @ 8DAC36C - .incbin "graphics/items/icon_palettes/fresh_water.gbapal.lz" - - .align 2 -gItemIcon_SodaPop:: @ 8DAC390 - .incbin "graphics/items/icons/soda_pop.4bpp.lz" - - .align 2 -gItemIconPalette_SodaPop:: @ 8DAC424 - .incbin "graphics/items/icon_palettes/soda_pop.gbapal.lz" - - .align 2 -gItemIcon_Lemonade:: @ 8DAC44C - .incbin "graphics/items/icons/lemonade.4bpp.lz" - - .align 2 -gItemIconPalette_Lemonade:: @ 8DAC50C - .incbin "graphics/items/icon_palettes/lemonade.gbapal.lz" - - .align 2 -gItemIcon_MoomooMilk:: @ 8DAC534 - .incbin "graphics/items/icons/moomoo_milk.4bpp.lz" - - .align 2 -gItemIconPalette_MoomooMilk:: @ 8DAC5E4 - .incbin "graphics/items/icon_palettes/moomoo_milk.gbapal.lz" - - .align 2 -gItemIcon_Powder:: @ 8DAC60C - .incbin "graphics/items/icons/powder.4bpp.lz" - - .align 2 -gItemIconPalette_EnergyPowder:: @ 8DAC698 - .incbin "graphics/items/icon_palettes/energy_powder.gbapal.lz" - - .align 2 -gItemIcon_EnergyRoot:: @ 8DAC6B8 - .incbin "graphics/items/icons/energy_root.4bpp.lz" - - .align 2 -gItemIconPalette_EnergyRoot:: @ 8DAC784 - .incbin "graphics/items/icon_palettes/energy_root.gbapal.lz" - - .align 2 -gItemIconPalette_HealPowder:: @ 8DAC7A0 - .incbin "graphics/items/icon_palettes/heal_powder.gbapal.lz" - - .align 2 -gItemIcon_RevivalHerb:: @ 8DAC7C0 - .incbin "graphics/items/icons/revival_herb.4bpp.lz" - - .align 2 -gItemIconPalette_RevivalHerb:: @ 8DAC890 - .incbin "graphics/items/icon_palettes/revival_herb.gbapal.lz" - - .align 2 -gItemIcon_Ether:: @ 8DAC8B0 - .incbin "graphics/items/icons/ether.4bpp.lz" - - .align 2 -gItemIconPalette_Ether:: @ 8DAC970 - .incbin "graphics/items/icon_palettes/ether.gbapal.lz" - - .align 2 -gItemIconPalette_MaxEther:: @ 8DAC994 - .incbin "graphics/items/icon_palettes/max_ether.gbapal.lz" - - .align 2 -gItemIconPalette_Elixir:: @ 8DAC9B8 - .incbin "graphics/items/icon_palettes/elixir.gbapal.lz" - - .align 2 -gItemIconPalette_MaxElixir:: @ 8DAC9DC - .incbin "graphics/items/icon_palettes/max_elixir.gbapal.lz" - - .align 2 -gItemIcon_LavaCookie:: @ 8DACA00 - .incbin "graphics/items/icons/lava_cookie.4bpp.lz" - - .align 2 -gItemIconPalette_LavaCookieAndLetter:: @ 8DACACC - .incbin "graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz" - - .align 2 -gItemIcon_Flute:: @ 8DACAF0 - .incbin "graphics/items/icons/flute.4bpp.lz" - - .align 2 -gItemIconPalette_BlueFlute:: @ 8DACBA4 - .incbin "graphics/items/icon_palettes/blue_flute.gbapal.lz" - - .align 2 -gItemIconPalette_YellowFlute:: @ 8DACBC8 - .incbin "graphics/items/icon_palettes/yellow_flute.gbapal.lz" - - .align 2 -gItemIconPalette_RedFlute:: @ 8DACBEC - .incbin "graphics/items/icon_palettes/red_flute.gbapal.lz" - - .align 2 -gItemIconPalette_BlackFlute:: @ 8DACC10 - .incbin "graphics/items/icon_palettes/black_flute.gbapal.lz" - - .align 2 -gItemIconPalette_WhiteFlute:: @ 8DACC34 - .incbin "graphics/items/icon_palettes/white_flute.gbapal.lz" - - .align 2 -gItemIcon_BerryJuice:: @ 8DACC58 - .incbin "graphics/items/icons/berry_juice.4bpp.lz" - - .align 2 -gItemIconPalette_BerryJuice:: @ 8DACD38 - .incbin "graphics/items/icon_palettes/berry_juice.gbapal.lz" - - .align 2 -gItemIcon_SacredAsh:: @ 8DACD60 - .incbin "graphics/items/icons/sacred_ash.4bpp.lz" - - .align 2 -gItemIconPalette_SacredAsh:: @ 8DACE20 - .incbin "graphics/items/icon_palettes/sacred_ash.gbapal.lz" - - .align 2 -gItemIconPalette_ShoalSalt:: @ 8DACE44 - .incbin "graphics/items/icon_palettes/shoal_salt.gbapal.lz" - - .align 2 -gItemIcon_ShoalShell:: @ 8DACE64 - .incbin "graphics/items/icons/shoal_shell.4bpp.lz" - - .align 2 -gItemIconPalette_Shell:: @ 8DACF58 - .incbin "graphics/items/icon_palettes/shell.gbapal.lz" - - .align 2 -gItemIcon_Shard:: @ 8DACF80 - .incbin "graphics/items/icons/shard.4bpp.lz" - - .align 2 -gItemIconPalette_RedShard:: @ 8DACFDC - .incbin "graphics/items/icon_palettes/red_shard.gbapal.lz" - - .align 2 -gItemIconPalette_BlueShard:: @ 8DACFF4 - .incbin "graphics/items/icon_palettes/blue_shard.gbapal.lz" - - .align 2 -gItemIconPalette_YellowShard:: @ 8DAD00C - .incbin "graphics/items/icon_palettes/yellow_shard.gbapal.lz" - - .align 2 -gItemIconPalette_GreenShard:: @ 8DAD024 - .incbin "graphics/items/icon_palettes/green_shard.gbapal.lz" - - .align 2 -gItemIcon_HPUp:: @ 8DAD03C - .incbin "graphics/items/icons/hp_up.4bpp.lz" - - .align 2 -gItemIconPalette_HPUp:: @ 8DAD0F4 - .incbin "graphics/items/icon_palettes/hp_up.gbapal.lz" - - .align 2 -gItemIcon_Vitamin:: @ 8DAD11C - .incbin "graphics/items/icons/vitamin.4bpp.lz" - - .align 2 -gItemIconPalette_Protein:: @ 8DAD1CC - .incbin "graphics/items/icon_palettes/protein.gbapal.lz" - - .align 2 -gItemIconPalette_Iron:: @ 8DAD1F4 - .incbin "graphics/items/icon_palettes/iron.gbapal.lz" - - .align 2 -gItemIconPalette_Carbos:: @ 8DAD21C - .incbin "graphics/items/icon_palettes/carbos.gbapal.lz" - - .align 2 -gItemIconPalette_Calcium:: @ 8DAD244 - .incbin "graphics/items/icon_palettes/calcium.gbapal.lz" - - .align 2 -gItemIcon_RareCandy:: @ 8DAD26C - .incbin "graphics/items/icons/rare_candy.4bpp.lz" - - .align 2 -gItemIconPalette_RareCandy:: @ 8DAD330 - .incbin "graphics/items/icon_palettes/rare_candy.gbapal.lz" - - .align 2 -gItemIcon_PPUp:: @ 8DAD34C - .incbin "graphics/items/icons/pp_up.4bpp.lz" - - .align 2 -gItemIconPalette_PPUp:: @ 8DAD3FC - .incbin "graphics/items/icon_palettes/pp_up.gbapal.lz" - - .align 2 -gItemIconPalette_Zinc:: @ 8DAD424 - .incbin "graphics/items/icon_palettes/zinc.gbapal.lz" - - .align 2 -gItemIcon_PPMax:: @ 8DAD44C - .incbin "graphics/items/icons/pp_max.4bpp.lz" - - .align 2 -gItemIconPalette_PPMax:: @ 8DAD4F4 - .incbin "graphics/items/icon_palettes/pp_max.gbapal.lz" - - .align 2 -gItemIconPalette_GuardSpec:: @ 8DAD51C - .incbin "graphics/items/icon_palettes/guard_spec.gbapal.lz" - - .align 2 -gItemIconPalette_DireHit:: @ 8DAD540 - .incbin "graphics/items/icon_palettes/dire_hit.gbapal.lz" - - .align 2 -gItemIconPalette_XAttack:: @ 8DAD564 - .incbin "graphics/items/icon_palettes/x_attack.gbapal.lz" - - .align 2 -gItemIcon_BattleStatItem:: @ 8DAD588 - .incbin "graphics/items/icons/battle_stat_item.4bpp.lz" - - .align 2 -gItemIconPalette_XDefend:: @ 8DAD66C - .incbin "graphics/items/icon_palettes/x_defend.gbapal.lz" - - .align 2 -gItemIconPalette_XSpeed:: @ 8DAD690 - .incbin "graphics/items/icon_palettes/x_speed.gbapal.lz" - - .align 2 -gItemIconPalette_XAccuracy:: @ 8DAD6B4 - .incbin "graphics/items/icon_palettes/x_accuracy.gbapal.lz" - - .align 2 -gItemIconPalette_XSpecial:: @ 8DAD6D8 - .incbin "graphics/items/icon_palettes/x_special.gbapal.lz" - - .align 2 -gItemIcon_PokeDoll:: @ 8DAD6FC - .incbin "graphics/items/icons/poke_doll.4bpp.lz" - - .align 2 -gItemIconPalette_PokeDoll:: @ 8DAD7EC - .incbin "graphics/items/icon_palettes/poke_doll.gbapal.lz" - - .align 2 -gItemIcon_FluffyTail:: @ 8DAD808 - .incbin "graphics/items/icons/fluffy_tail.4bpp.lz" - - .align 2 -gItemIconPalette_FluffyTail:: @ 8DAD8F8 - .incbin "graphics/items/icon_palettes/fluffy_tail.gbapal.lz" - - .align 2 -gItemIcon_Repel:: @ 8DAD91C - .incbin "graphics/items/icons/repel.4bpp.lz" - - .align 2 -gItemIconPalette_SuperRepel:: @ 8DAD9BC - .incbin "graphics/items/icon_palettes/super_repel.gbapal.lz" - - .align 2 -gItemIconPalette_MaxRepel:: @ 8DAD9E4 - .incbin "graphics/items/icon_palettes/max_repel.gbapal.lz" - - .align 2 -gItemIcon_EscapeRope:: @ 8DADA0C - .incbin "graphics/items/icons/escape_rope.4bpp.lz" - - .align 2 -gItemIconPalette_EscapeRope:: @ 8DADAC0 - .incbin "graphics/items/icon_palettes/escape_rope.gbapal.lz" - - .align 2 -gItemIconPalette_Repel:: @ 8DADAE4 - .incbin "graphics/items/icon_palettes/repel.gbapal.lz" - - .align 2 -gItemIcon_SunStone:: @ 8DADB0C - .incbin "graphics/items/icons/sun_stone.4bpp.lz" - - .align 2 -gItemIconPalette_SunStone:: @ 8DADC04 - .incbin "graphics/items/icon_palettes/sun_stone.gbapal.lz" - - .align 2 -gItemIcon_MoonStone:: @ 8DADC20 - .incbin "graphics/items/icons/moon_stone.4bpp.lz" - - .align 2 -gItemIconPalette_MoonStone:: @ 8DADCF4 - .incbin "graphics/items/icon_palettes/moon_stone.gbapal.lz" - - .align 2 -gItemIcon_FireStone:: @ 8DADD14 - .incbin "graphics/items/icons/fire_stone.4bpp.lz" - - .align 2 -gItemIconPalette_FireStone:: @ 8DADE08 - .incbin "graphics/items/icon_palettes/fire_stone.gbapal.lz" - - .align 2 -gItemIcon_ThunderStone:: @ 8DADE30 - .incbin "graphics/items/icons/thunder_stone.4bpp.lz" - - .align 2 -gItemIconPalette_ThunderStone:: @ 8DADF18 - .incbin "graphics/items/icon_palettes/thunder_stone.gbapal.lz" - - .align 2 -gItemIcon_WaterStone:: @ 8DADF38 - .incbin "graphics/items/icons/water_stone.4bpp.lz" - - .align 2 -gItemIconPalette_WaterStone:: @ 8DAE018 - .incbin "graphics/items/icon_palettes/water_stone.gbapal.lz" - - .align 2 -gItemIcon_LeafStone:: @ 8DAE03C - .incbin "graphics/items/icons/leaf_stone.4bpp.lz" - - .align 2 -gItemIconPalette_LeafStone:: @ 8DAE130 - .incbin "graphics/items/icon_palettes/leaf_stone.gbapal.lz" - - .align 2 -gItemIcon_TinyMushroom:: @ 8DAE158 - .incbin "graphics/items/icons/tiny_mushroom.4bpp.lz" - - .align 2 -gItemIcon_BigMushroom:: @ 8DAE1D8 - .incbin "graphics/items/icons/big_mushroom.4bpp.lz" - - .align 2 -gItemIconPalette_Mushroom:: @ 8DAE290 - .incbin "graphics/items/icon_palettes/mushroom.gbapal.lz" - - .align 2 -gItemIcon_Pearl:: @ 8DAE2B4 - .incbin "graphics/items/icons/pearl.4bpp.lz" - - .align 2 -gItemIconPalette_Pearl:: @ 8DAE330 - .incbin "graphics/items/icon_palettes/pearl.gbapal.lz" - - .align 2 -gItemIcon_BigPearl:: @ 8DAE358 - .incbin "graphics/items/icons/big_pearl.4bpp.lz" - - .align 2 -gItemIcon_Stardust:: @ 8DAE410 - .incbin "graphics/items/icons/stardust.4bpp.lz" - - .align 2 -gItemIconPalette_Star:: @ 8DAE4D0 - .incbin "graphics/items/icon_palettes/star.gbapal.lz" - - .align 2 -gItemIcon_StarPiece:: @ 8DAE4F4 - .incbin "graphics/items/icons/star_piece.4bpp.lz" - - .align 2 -gItemIcon_Nugget:: @ 8DAE578 - .incbin "graphics/items/icons/nugget.4bpp.lz" - - .align 2 -gItemIconPalette_Nugget:: @ 8DAE604 - .incbin "graphics/items/icon_palettes/nugget.gbapal.lz" - - .align 2 -gItemIcon_HeartScale:: @ 8DAE624 - .incbin "graphics/items/icons/heart_scale.4bpp.lz" - - .align 2 -gItemIconPalette_HeartScale:: @ 8DAE6C4 - .incbin "graphics/items/icon_palettes/heart_scale.gbapal.lz" - - .align 2 -gItemIcon_OrangeMail:: @ 8DAE6E0 - .incbin "graphics/items/icons/orange_mail.4bpp.lz" - - .align 2 -gItemIconPalette_OrangeMail:: @ 8DAE7B4 - .incbin "graphics/items/icon_palettes/orange_mail.gbapal.lz" - - .align 2 -gItemIcon_HarborMail:: @ 8DAE7D4 - .incbin "graphics/items/icons/harbor_mail.4bpp.lz" - - .align 2 -gItemIconPalette_HarborMail:: @ 8DAE89C - .incbin "graphics/items/icon_palettes/harbor_mail.gbapal.lz" - - .align 2 -gItemIcon_GlitterMail:: @ 8DAE8BC - .incbin "graphics/items/icons/glitter_mail.4bpp.lz" - - .align 2 -gItemIconPalette_GlitterMail:: @ 8DAE998 - .incbin "graphics/items/icon_palettes/glitter_mail.gbapal.lz" - - .align 2 -gItemIcon_MechMail:: @ 8DAE9C0 - .incbin "graphics/items/icons/mech_mail.4bpp.lz" - - .align 2 -gItemIconPalette_MechMail:: @ 8DAEA9C - .incbin "graphics/items/icon_palettes/mech_mail.gbapal.lz" - - .align 2 -gItemIcon_WoodMail:: @ 8DAEABC - .incbin "graphics/items/icons/wood_mail.4bpp.lz" - - .align 2 -gItemIconPalette_WoodMail:: @ 8DAEB9C - .incbin "graphics/items/icon_palettes/wood_mail.gbapal.lz" - - .align 2 -gItemIcon_WaveMail:: @ 8DAEBBC - .incbin "graphics/items/icons/wave_mail.4bpp.lz" - - .align 2 -gItemIconPalette_WaveMail:: @ 8DAEC94 - .incbin "graphics/items/icon_palettes/wave_mail.gbapal.lz" - - .align 2 -gItemIcon_BeadMail:: @ 8DAECB4 - .incbin "graphics/items/icons/bead_mail.4bpp.lz" - - .align 2 -gItemIconPalette_BeadMail:: @ 8DAED74 - .incbin "graphics/items/icon_palettes/bead_mail.gbapal.lz" - - .align 2 -gItemIcon_ShadowMail:: @ 8DAED94 - .incbin "graphics/items/icons/shadow_mail.4bpp.lz" - - .align 2 -gItemIconPalette_ShadowMail:: @ 8DAEE68 - .incbin "graphics/items/icon_palettes/shadow_mail.gbapal.lz" - - .align 2 -gItemIcon_TropicMail:: @ 8DAEE8C - .incbin "graphics/items/icons/tropic_mail.4bpp.lz" - - .align 2 -gItemIconPalette_TropicMail:: @ 8DAEF70 - .incbin "graphics/items/icon_palettes/tropic_mail.gbapal.lz" - - .align 2 -gItemIcon_DreamMail:: @ 8DAEF94 - .incbin "graphics/items/icons/dream_mail.4bpp.lz" - - .align 2 -gItemIconPalette_DreamMail:: @ 8DAF074 - .incbin "graphics/items/icon_palettes/dream_mail.gbapal.lz" - - .align 2 -gItemIcon_FabMail:: @ 8DAF094 - .incbin "graphics/items/icons/fab_mail.4bpp.lz" - - .align 2 -gItemIconPalette_FabMail:: @ 8DAF15C - .incbin "graphics/items/icon_palettes/fab_mail.gbapal.lz" - - .align 2 -gItemIcon_RetroMail:: @ 8DAF178 - .incbin "graphics/items/icons/retro_mail.4bpp.lz" - - .align 2 -gItemIconPalette_RetroMail:: @ 8DAF210 - .incbin "graphics/items/icon_palettes/retro_mail.gbapal.lz" - - .align 2 -gItemIcon_CheriBerry:: @ 8DAF230 - .incbin "graphics/items/icons/cheri_berry.4bpp.lz" - - .align 2 -gItemIconPalette_CheriBerry:: @ 8DAF318 - .incbin "graphics/items/icon_palettes/cheri_berry.gbapal.lz" - - .align 2 -gItemIcon_ChestoBerry:: @ 8DAF340 - .incbin "graphics/items/icons/chesto_berry.4bpp.lz" - - .align 2 -gItemIconPalette_ChestoBerry:: @ 8DAF400 - .incbin "graphics/items/icon_palettes/chesto_berry.gbapal.lz" - - .align 2 -gItemIcon_PechaBerry:: @ 8DAF424 - .incbin "graphics/items/icons/pecha_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PechaBerry:: @ 8DAF4E4 - .incbin "graphics/items/icon_palettes/pecha_berry.gbapal.lz" - - .align 2 -gItemIcon_RawstBerry:: @ 8DAF508 - .incbin "graphics/items/icons/rawst_berry.4bpp.lz" - - .align 2 -gItemIconPalette_RawstBerry:: @ 8DAF5EC - .incbin "graphics/items/icon_palettes/rawst_berry.gbapal.lz" - - .align 2 -gItemIcon_AspearBerry:: @ 8DAF610 - .incbin "graphics/items/icons/aspear_berry.4bpp.lz" - - .align 2 -gItemIconPalette_AspearBerry:: @ 8DAF6F8 - .incbin "graphics/items/icon_palettes/aspear_berry.gbapal.lz" - - .align 2 -gItemIcon_LeppaBerry:: @ 8DAF71C - .incbin "graphics/items/icons/leppa_berry.4bpp.lz" - - .align 2 -gItemIconPalette_LeppaBerry:: @ 8DAF7D4 - .incbin "graphics/items/icon_palettes/leppa_berry.gbapal.lz" - - .align 2 -gItemIcon_OranBerry:: @ 8DAF7F8 - .incbin "graphics/items/icons/oran_berry.4bpp.lz" - - .align 2 -gItemIconPalette_OranBerry:: @ 8DAF8BC - .incbin "graphics/items/icon_palettes/oran_berry.gbapal.lz" - - .align 2 -gItemIcon_PersimBerry:: @ 8DAF8E0 - .incbin "graphics/items/icons/persim_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PersimBerry:: @ 8DAF9B4 - .incbin "graphics/items/icon_palettes/persim_berry.gbapal.lz" - - .align 2 -gItemIcon_LumBerry:: @ 8DAF9D8 - .incbin "graphics/items/icons/lum_berry.4bpp.lz" - - .align 2 -gItemIconPalette_LumBerry:: @ 8DAFA90 - .incbin "graphics/items/icon_palettes/lum_berry.gbapal.lz" - - .align 2 -gItemIcon_SitrusBerry:: @ 8DAFAAC - .incbin "graphics/items/icons/sitrus_berry.4bpp.lz" - - .align 2 -gItemIconPalette_SitrusBerry:: @ 8DAFB78 - .incbin "graphics/items/icon_palettes/sitrus_berry.gbapal.lz" - - .align 2 -gItemIcon_FigyBerry:: @ 8DAFB9C - .incbin "graphics/items/icons/figy_berry.4bpp.lz" - - .align 2 -gItemIconPalette_FigyBerry:: @ 8DAFC64 - .incbin "graphics/items/icon_palettes/figy_berry.gbapal.lz" - - .align 2 -gItemIcon_WikiBerry:: @ 8DAFC88 - .incbin "graphics/items/icons/wiki_berry.4bpp.lz" - - .align 2 -gItemIconPalette_WikiBerry:: @ 8DAFD6C - .incbin "graphics/items/icon_palettes/wiki_berry.gbapal.lz" - - .align 2 -gItemIcon_MagoBerry:: @ 8DAFD90 - .incbin "graphics/items/icons/mago_berry.4bpp.lz" - - .align 2 -gItemIconPalette_MagoBerry:: @ 8DAFE4C - .incbin "graphics/items/icon_palettes/mago_berry.gbapal.lz" - - .align 2 -gItemIcon_AguavBerry:: @ 8DAFE70 - .incbin "graphics/items/icons/aguav_berry.4bpp.lz" - - .align 2 -gItemIconPalette_AguavBerry:: @ 8DAFF5C - .incbin "graphics/items/icon_palettes/aguav_berry.gbapal.lz" - - .align 2 -gItemIcon_IapapaBerry:: @ 8DAFF7C - .incbin "graphics/items/icons/iapapa_berry.4bpp.lz" - - .align 2 -gItemIconPalette_IapapaBerry:: @ 8DB0064 - .incbin "graphics/items/icon_palettes/iapapa_berry.gbapal.lz" - - .align 2 -gItemIcon_RazzBerry:: @ 8DB0088 - .incbin "graphics/items/icons/razz_berry.4bpp.lz" - - .align 2 -gItemIconPalette_RazzBerry:: @ 8DB0168 - .incbin "graphics/items/icon_palettes/razz_berry.gbapal.lz" - - .align 2 -gItemIcon_BlukBerry:: @ 8DB018C - .incbin "graphics/items/icons/bluk_berry.4bpp.lz" - - .align 2 -gItemIconPalette_BlukBerry:: @ 8DB027C - .incbin "graphics/items/icon_palettes/bluk_berry.gbapal.lz" - - .align 2 -gItemIcon_NanabBerry:: @ 8DB02A0 - .incbin "graphics/items/icons/nanab_berry.4bpp.lz" - - .align 2 -gItemIconPalette_NanabBerry:: @ 8DB0384 - .incbin "graphics/items/icon_palettes/nanab_berry.gbapal.lz" - - .align 2 -gItemIcon_WepearBerry:: @ 8DB03A8 - .incbin "graphics/items/icons/wepear_berry.4bpp.lz" - - .align 2 -gItemIconPalette_WepearBerry:: @ 8DB0470 - .incbin "graphics/items/icon_palettes/wepear_berry.gbapal.lz" - - .align 2 -gItemIcon_PinapBerry:: @ 8DB048C - .incbin "graphics/items/icons/pinap_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PinapBerry:: @ 8DB0580 - .incbin "graphics/items/icon_palettes/pinap_berry.gbapal.lz" - - .align 2 -gItemIcon_PomegBerry:: @ 8DB05A4 - .incbin "graphics/items/icons/pomeg_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PomegBerry:: @ 8DB0658 - .incbin "graphics/items/icon_palettes/pomeg_berry.gbapal.lz" - - .align 2 -gItemIcon_KelpsyBerry:: @ 8DB067C - .incbin "graphics/items/icons/kelpsy_berry.4bpp.lz" - - .align 2 -gItemIconPalette_KelpsyBerry:: @ 8DB074C - .incbin "graphics/items/icon_palettes/kelpsy_berry.gbapal.lz" - - .align 2 -gItemIcon_QualotBerry:: @ 8DB076C - .incbin "graphics/items/icons/qualot_berry.4bpp.lz" - - .align 2 -gItemIconPalette_QualotBerry:: @ 8DB0838 - .incbin "graphics/items/icon_palettes/qualot_berry.gbapal.lz" - - .align 2 -gItemIcon_HondewBerry:: @ 8DB085C - .incbin "graphics/items/icons/hondew_berry.4bpp.lz" - - .align 2 -gItemIconPalette_HondewBerry:: @ 8DB093C - .incbin "graphics/items/icon_palettes/hondew_berry.gbapal.lz" - - .align 2 -gItemIcon_GrepaBerry:: @ 8DB0960 - .incbin "graphics/items/icons/grepa_berry.4bpp.lz" - - .align 2 -gItemIconPalette_GrepaBerry:: @ 8DB0A14 - .incbin "graphics/items/icon_palettes/grepa_berry.gbapal.lz" - - .align 2 -gItemIcon_TamatoBerry:: @ 8DB0A38 - .incbin "graphics/items/icons/tamato_berry.4bpp.lz" - - .align 2 -gItemIconPalette_TamatoBerry:: @ 8DB0B14 - .incbin "graphics/items/icon_palettes/tamato_berry.gbapal.lz" - - .align 2 -gItemIcon_CornnBerry:: @ 8DB0B38 - .incbin "graphics/items/icons/cornn_berry.4bpp.lz" - - .align 2 -gItemIconPalette_CornnBerry:: @ 8DB0C24 - .incbin "graphics/items/icon_palettes/cornn_berry.gbapal.lz" - - .align 2 -gItemIcon_MagostBerry:: @ 8DB0C4C - .incbin "graphics/items/icons/magost_berry.4bpp.lz" - - .align 2 -gItemIconPalette_MagostBerry:: @ 8DB0CF4 - .incbin "graphics/items/icon_palettes/magost_berry.gbapal.lz" - - .align 2 -gItemIcon_RabutaBerry:: @ 8DB0D18 - .incbin "graphics/items/icons/rabuta_berry.4bpp.lz" - - .align 2 -gItemIconPalette_RabutaBerry:: @ 8DB0E14 - .incbin "graphics/items/icon_palettes/rabuta_berry.gbapal.lz" - - .align 2 -gItemIcon_NomelBerry:: @ 8DB0E38 - .incbin "graphics/items/icons/nomel_berry.4bpp.lz" - - .align 2 -gItemIconPalette_NomelBerry:: @ 8DB0EDC - .incbin "graphics/items/icon_palettes/nomel_berry.gbapal.lz" - - .align 2 -gItemIcon_SpelonBerry:: @ 8DB0EF8 - .incbin "graphics/items/icons/spelon_berry.4bpp.lz" - - .align 2 -gItemIconPalette_SpelonBerry:: @ 8DB0FBC - .incbin "graphics/items/icon_palettes/spelon_berry.gbapal.lz" - - .align 2 -gItemIcon_PamtreBerry:: @ 8DB0FDC - .incbin "graphics/items/icons/pamtre_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PamtreBerry:: @ 8DB10BC - .incbin "graphics/items/icon_palettes/pamtre_berry.gbapal.lz" - - .align 2 -gItemIcon_WatmelBerry:: @ 8DB10E4 - .incbin "graphics/items/icons/watmel_berry.4bpp.lz" - - .align 2 -gItemIconPalette_WatmelBerry:: @ 8DB11F4 - .incbin "graphics/items/icon_palettes/watmel_berry.gbapal.lz" - - .align 2 -gItemIcon_DurinBerry:: @ 8DB1218 - .incbin "graphics/items/icons/durin_berry.4bpp.lz" - - .align 2 -gItemIconPalette_DurinBerry:: @ 8DB131C - .incbin "graphics/items/icon_palettes/durin_berry.gbapal.lz" - - .align 2 -gItemIcon_BelueBerry:: @ 8DB1340 - .incbin "graphics/items/icons/belue_berry.4bpp.lz" - - .align 2 -gItemIconPalette_BelueBerry:: @ 8DB1424 - .incbin "graphics/items/icon_palettes/belue_berry.gbapal.lz" - - .align 2 -gItemIcon_LiechiBerry:: @ 8DB1448 - .incbin "graphics/items/icons/liechi_berry.4bpp.lz" - - .align 2 -gItemIconPalette_LiechiBerry:: @ 8DB1528 - .incbin "graphics/items/icon_palettes/liechi_berry.gbapal.lz" - - .align 2 -gItemIcon_GanlonBerry:: @ 8DB1548 - .incbin "graphics/items/icons/ganlon_berry.4bpp.lz" - - .align 2 -gItemIconPalette_GanlonBerry:: @ 8DB1628 - .incbin "graphics/items/icon_palettes/ganlon_berry.gbapal.lz" - - .align 2 -gItemIcon_SalacBerry:: @ 8DB1648 - .incbin "graphics/items/icons/salac_berry.4bpp.lz" - - .align 2 -gItemIconPalette_SalacBerry:: @ 8DB1730 - .incbin "graphics/items/icon_palettes/salac_berry.gbapal.lz" - - .align 2 -gItemIcon_PetayaBerry:: @ 8DB1750 - .incbin "graphics/items/icons/petaya_berry.4bpp.lz" - - .align 2 -gItemIconPalette_PetayaBerry:: @ 8DB1848 - .incbin "graphics/items/icon_palettes/petaya_berry.gbapal.lz" - - .align 2 -gItemIcon_ApicotBerry:: @ 8DB186C - .incbin "graphics/items/icons/apicot_berry.4bpp.lz" - - .align 2 -gItemIconPalette_ApicotBerry:: @ 8DB1924 - .incbin "graphics/items/icon_palettes/apicot_berry.gbapal.lz" - - .align 2 -gItemIcon_LansatBerry:: @ 8DB194C - .incbin "graphics/items/icons/lansat_berry.4bpp.lz" - - .align 2 -gItemIconPalette_LansatBerry:: @ 8DB1A2C - .incbin "graphics/items/icon_palettes/lansat_berry.gbapal.lz" - - .align 2 -gItemIcon_StarfBerry:: @ 8DB1A50 - .incbin "graphics/items/icons/starf_berry.4bpp.lz" - - .align 2 -gItemIconPalette_StarfBerry:: @ 8DB1B20 - .incbin "graphics/items/icon_palettes/starf_berry.gbapal.lz" - - .align 2 -gItemIcon_EnigmaBerry:: @ 8DB1B44 - .incbin "graphics/items/icons/enigma_berry.4bpp.lz" - - .align 2 -gItemIconPalette_EnigmaBerry:: @ 8DB1C10 - .incbin "graphics/items/icon_palettes/enigma_berry.gbapal.lz" - - .align 2 -gItemIcon_BrightPowder:: @ 8DB1C30 - .incbin "graphics/items/icons/bright_powder.4bpp.lz" - - .align 2 -gItemIconPalette_BrightPowder:: @ 8DB1CEC - .incbin "graphics/items/icon_palettes/bright_powder.gbapal.lz" - - .align 2 -gItemIcon_InBattleHerb:: @ 8DB1D0C - .incbin "graphics/items/icons/in_battle_herb.4bpp.lz" - - .align 2 -gItemIconPalette_WhiteHerb:: @ 8DB1DB8 - .incbin "graphics/items/icon_palettes/white_herb.gbapal.lz" - - .align 2 -gItemIcon_MachoBrace:: @ 8DB1DD8 - .incbin "graphics/items/icons/macho_brace.4bpp.lz" - - .align 2 -gItemIconPalette_MachoBrace:: @ 8DB1EC4 - .incbin "graphics/items/icon_palettes/macho_brace.gbapal.lz" - - .align 2 -gItemIcon_ExpShare:: @ 8DB1EEC - .incbin "graphics/items/icons/exp_share.4bpp.lz" - - .align 2 -gItemIconPalette_ExpShare:: @ 8DB1FD8 - .incbin "graphics/items/icon_palettes/exp_share.gbapal.lz" - - .align 2 -gItemIcon_QuickClaw:: @ 8DB2000 - .incbin "graphics/items/icons/quick_claw.4bpp.lz" - - .align 2 -gItemIconPalette_QuickClaw:: @ 8DB2098 - .incbin "graphics/items/icon_palettes/quick_claw.gbapal.lz" - - .align 2 -gItemIcon_SootheBell:: @ 8DB20B8 - .incbin "graphics/items/icons/soothe_bell.4bpp.lz" - - .align 2 -gItemIconPalette_SootheBell:: @ 8DB217C - .incbin "graphics/items/icon_palettes/soothe_bell.gbapal.lz" - - .align 2 -gItemIconPalette_MentalHerb:: @ 8DB21A0 - .incbin "graphics/items/icon_palettes/mental_herb.gbapal.lz" - - .align 2 -gItemIcon_ChoiceBand:: @ 8DB21C0 - .incbin "graphics/items/icons/choice_band.4bpp.lz" - - .align 2 -gItemIconPalette_ChoiceBand:: @ 8DB22AC - .incbin "graphics/items/icon_palettes/choice_band.gbapal.lz" - - .align 2 -gItemIcon_KingsRock:: @ 8DB22D4 - .incbin "graphics/items/icons/kings_rock.4bpp.lz" - - .align 2 -gItemIconPalette_KingsRock:: @ 8DB23C4 - .incbin "graphics/items/icon_palettes/kings_rock.gbapal.lz" - - .align 2 -gItemIcon_SilverPowder:: @ 8DB23E0 - .incbin "graphics/items/icons/silver_powder.4bpp.lz" - - .align 2 -gItemIconPalette_SilverPowder:: @ 8DB246C - .incbin "graphics/items/icon_palettes/silver_powder.gbapal.lz" - - .align 2 -gItemIcon_AmuletCoin:: @ 8DB2490 - .incbin "graphics/items/icons/amulet_coin.4bpp.lz" - - .align 2 -gItemIconPalette_AmuletCoin:: @ 8DB2528 - .incbin "graphics/items/icon_palettes/amulet_coin.gbapal.lz" - - .align 2 -gItemIcon_CleanseTag:: @ 8DB254C - .incbin "graphics/items/icons/cleanse_tag.4bpp.lz" - - .align 2 -gItemIconPalette_CleanseTag:: @ 8DB25F0 - .incbin "graphics/items/icon_palettes/cleanse_tag.gbapal.lz" - - .align 2 -gItemIcon_SoulDew:: @ 8DB2610 - .incbin "graphics/items/icons/soul_dew.4bpp.lz" - - .align 2 -gItemIconPalette_SoulDew:: @ 8DB26A4 - .incbin "graphics/items/icon_palettes/soul_dew.gbapal.lz" - - .align 2 -gItemIcon_DeepSeaTooth:: @ 8DB26C4 - .incbin "graphics/items/icons/deep_sea_tooth.4bpp.lz" - - .align 2 -gItemIconPalette_DeepSeaTooth:: @ 8DB2778 - .incbin "graphics/items/icon_palettes/deep_sea_tooth.gbapal.lz" - - .align 2 -gItemIcon_DeepSeaScale:: @ 8DB279C - .incbin "graphics/items/icons/deep_sea_scale.4bpp.lz" - - .align 2 -gItemIconPalette_DeepSeaScale:: @ 8DB2844 - .incbin "graphics/items/icon_palettes/deep_sea_scale.gbapal.lz" - - .align 2 -gItemIcon_SmokeBall:: @ 8DB2864 - .incbin "graphics/items/icons/smoke_ball.4bpp.lz" - - .align 2 -gItemIconPalette_SmokeBall:: @ 8DB291C - .incbin "graphics/items/icon_palettes/smoke_ball.gbapal.lz" - - .align 2 -gItemIcon_Everstone:: @ 8DB2940 - .incbin "graphics/items/icons/everstone.4bpp.lz" - - .align 2 -gItemIconPalette_Everstone:: @ 8DB29F4 - .incbin "graphics/items/icon_palettes/everstone.gbapal.lz" - - .align 2 -gItemIcon_FocusBand:: @ 8DB2A10 - .incbin "graphics/items/icons/focus_band.4bpp.lz" - - .align 2 -gItemIconPalette_FocusBand:: @ 8DB2B00 - .incbin "graphics/items/icon_palettes/focus_band.gbapal.lz" - - .align 2 -gItemIcon_LuckyEgg:: @ 8DB2B28 - .incbin "graphics/items/icons/lucky_egg.4bpp.lz" - - .align 2 -gItemIconPalette_LuckyEgg:: @ 8DB2BB0 - .incbin "graphics/items/icon_palettes/lucky_egg.gbapal.lz" - - .align 2 -gItemIcon_ScopeLens:: @ 8DB2BC8 - .incbin "graphics/items/icons/scope_lens.4bpp.lz" - - .align 2 -gItemIconPalette_ScopeLens:: @ 8DB2CC8 - .incbin "graphics/items/icon_palettes/scope_lens.gbapal.lz" - - .align 2 -gItemIcon_MetalCoat:: @ 8DB2CF0 - .incbin "graphics/items/icons/metal_coat.4bpp.lz" - - .align 2 -gItemIconPalette_MetalCoat:: @ 8DB2DAC - .incbin "graphics/items/icon_palettes/metal_coat.gbapal.lz" - - .align 2 -gItemIcon_Leftovers:: @ 8DB2DCC - .incbin "graphics/items/icons/leftovers.4bpp.lz" - - .align 2 -gItemIconPalette_Leftovers:: @ 8DB2E70 - .incbin "graphics/items/icon_palettes/leftovers.gbapal.lz" - - .align 2 -gItemIcon_DragonScale:: @ 8DB2E94 - .incbin "graphics/items/icons/dragon_scale.4bpp.lz" - - .align 2 -gItemIconPalette_DragonScale:: @ 8DB2F48 - .incbin "graphics/items/icon_palettes/dragon_scale.gbapal.lz" - - .align 2 -gItemIcon_LightBall:: @ 8DB2F68 - .incbin "graphics/items/icons/light_ball.4bpp.lz" - - .align 2 -gItemIconPalette_LightBall:: @ 8DB2FFC - .incbin "graphics/items/icon_palettes/light_ball.gbapal.lz" - - .align 2 -gItemIcon_SoftSand:: @ 8DB3020 - .incbin "graphics/items/icons/soft_sand.4bpp.lz" - - .align 2 -gItemIconPalette_SoftSand:: @ 8DB30DC - .incbin "graphics/items/icon_palettes/soft_sand.gbapal.lz" - - .align 2 -gItemIcon_HardStone:: @ 8DB30FC - .incbin "graphics/items/icons/hard_stone.4bpp.lz" - - .align 2 -gItemIconPalette_HardStone:: @ 8DB31B0 - .incbin "graphics/items/icon_palettes/hard_stone.gbapal.lz" - - .align 2 -gItemIcon_MiracleSeed:: @ 8DB31D4 - .incbin "graphics/items/icons/miracle_seed.4bpp.lz" - - .align 2 -gItemIconPalette_MiracleSeed:: @ 8DB3284 - .incbin "graphics/items/icon_palettes/miracle_seed.gbapal.lz" - - .align 2 -gItemIcon_BlackGlasses:: @ 8DB32A0 - .incbin "graphics/items/icons/black_glasses.4bpp.lz" - - .align 2 -gItemIconPalette_BlackTypeEnhancingItem:: @ 8DB3328 - .incbin "graphics/items/icon_palettes/black_type_enhancing_item.gbapal.lz" - - .align 2 -gItemIcon_BlackBelt:: @ 8DB3340 - .incbin "graphics/items/icons/black_belt.4bpp.lz" - - .align 2 -gItemIcon_Magnet:: @ 8DB3408 - .incbin "graphics/items/icons/magnet.4bpp.lz" - - .align 2 -gItemIconPalette_Magnet:: @ 8DB34B8 - .incbin "graphics/items/icon_palettes/magnet.gbapal.lz" - - .align 2 -gItemIcon_MysticWater:: @ 8DB34E0 - .incbin "graphics/items/icons/mystic_water.4bpp.lz" - - .align 2 -gItemIconPalette_MysticWater:: @ 8DB3578 - .incbin "graphics/items/icon_palettes/mystic_water.gbapal.lz" - - .align 2 -gItemIcon_SharpBeak:: @ 8DB3598 - .incbin "graphics/items/icons/sharp_beak.4bpp.lz" - - .align 2 -gItemIconPalette_SharpBeak:: @ 8DB3654 - .incbin "graphics/items/icon_palettes/sharp_beak.gbapal.lz" - - .align 2 -gItemIcon_PoisonBarb:: @ 8DB3674 - .incbin "graphics/items/icons/poison_barb.4bpp.lz" - - .align 2 -gItemIconPalette_PoisonBarb:: @ 8DB36FC - .incbin "graphics/items/icon_palettes/poison_barb.gbapal.lz" - - .align 2 -gItemIcon_NeverMeltIce:: @ 8DB371C - .incbin "graphics/items/icons/never_melt_ice.4bpp.lz" - - .align 2 -gItemIconPalette_NeverMeltIce:: @ 8DB37E8 - .incbin "graphics/items/icon_palettes/never_melt_ice.gbapal.lz" - - .align 2 -gItemIcon_SpellTag:: @ 8DB3804 - .incbin "graphics/items/icons/spell_tag.4bpp.lz" - - .align 2 -gItemIconPalette_SpellTag:: @ 8DB38A4 - .incbin "graphics/items/icon_palettes/spell_tag.gbapal.lz" - - .align 2 -gItemIcon_TwistedSpoon:: @ 8DB38C4 - .incbin "graphics/items/icons/twisted_spoon.4bpp.lz" - - .align 2 -gItemIconPalette_TwistedSpoon:: @ 8DB3964 - .incbin "graphics/items/icon_palettes/twisted_spoon.gbapal.lz" - - .align 2 -gItemIcon_Charcoal:: @ 8DB397C - .incbin "graphics/items/icons/charcoal.4bpp.lz" - - .align 2 -gItemIconPalette_Charcoal:: @ 8DB3A4C - .incbin "graphics/items/icon_palettes/charcoal.gbapal.lz" - - .align 2 -gItemIcon_DragonFang:: @ 8DB3A68 - .incbin "graphics/items/icons/dragon_fang.4bpp.lz" - - .align 2 -gItemIconPalette_DragonFang:: @ 8DB3B1C - .incbin "graphics/items/icon_palettes/dragon_fang.gbapal.lz" - - .align 2 -gItemIcon_SilkScarf:: @ 8DB3B3C - .incbin "graphics/items/icons/silk_scarf.4bpp.lz" - - .align 2 -gItemIconPalette_SilkScarf:: @ 8DB3C44 - .incbin "graphics/items/icon_palettes/silk_scarf.gbapal.lz" - - .align 2 -gItemIcon_UpGrade:: @ 8DB3C64 - .incbin "graphics/items/icons/up_grade.4bpp.lz" - - .align 2 -gItemIconPalette_UpGrade:: @ 8DB3D20 - .incbin "graphics/items/icon_palettes/up_grade.gbapal.lz" - - .align 2 -gItemIcon_ShellBell:: @ 8DB3D48 - .incbin "graphics/items/icons/shell_bell.4bpp.lz" - - .align 2 -gItemIcon_SeaIncense:: @ 8DB3E28 - .incbin "graphics/items/icons/sea_incense.4bpp.lz" - - .align 2 -gItemIconPalette_SeaIncense:: @ 8DB3F10 - .incbin "graphics/items/icon_palettes/sea_incense.gbapal.lz" - - .align 2 -gItemIcon_LaxIncense:: @ 8DB3F38 - .incbin "graphics/items/icons/lax_incense.4bpp.lz" - - .align 2 -gItemIconPalette_LaxIncense:: @ 8DB4020 - .incbin "graphics/items/icon_palettes/lax_incense.gbapal.lz" - - .align 2 -gItemIcon_LuckyPunch:: @ 8DB4048 - .incbin "graphics/items/icons/lucky_punch.4bpp.lz" - - .align 2 -gItemIconPalette_LuckyPunch:: @ 8DB410C - .incbin "graphics/items/icon_palettes/lucky_punch.gbapal.lz" - - .align 2 -gItemIcon_MetalPowder:: @ 8DB412C - .incbin "graphics/items/icons/metal_powder.4bpp.lz" - - .align 2 -gItemIconPalette_MetalPowder:: @ 8DB41EC - .incbin "graphics/items/icon_palettes/metal_powder.gbapal.lz" - - .align 2 -gItemIcon_ThickClub:: @ 8DB4210 - .incbin "graphics/items/icons/thick_club.4bpp.lz" - - .align 2 -gItemIconPalette_ThickClub:: @ 8DB42A4 - .incbin "graphics/items/icon_palettes/thick_club.gbapal.lz" - - .align 2 -gItemIcon_Stick:: @ 8DB42C0 - .incbin "graphics/items/icons/stick.4bpp.lz" - - .align 2 -gItemIconPalette_Stick:: @ 8DB4360 - .incbin "graphics/items/icon_palettes/stick.gbapal.lz" - - .align 2 -gItemIcon_Scarf:: @ 8DB4384 - .incbin "graphics/items/icons/scarf.4bpp.lz" - - .align 2 -gItemIconPalette_RedScarf:: @ 8DB4450 - .incbin "graphics/items/icon_palettes/red_scarf.gbapal.lz" - - .align 2 -gItemIconPalette_BlueScarf:: @ 8DB446C - .incbin "graphics/items/icon_palettes/blue_scarf.gbapal.lz" - - .align 2 -gItemIconPalette_PinkScarf:: @ 8DB4488 - .incbin "graphics/items/icon_palettes/pink_scarf.gbapal.lz" - - .align 2 -gItemIconPalette_GreenScarf:: @ 8DB44A4 - .incbin "graphics/items/icon_palettes/green_scarf.gbapal.lz" - - .align 2 -gItemIconPalette_YellowScarf:: @ 8DB44C0 - .incbin "graphics/items/icon_palettes/yellow_scarf.gbapal.lz" - - .align 2 -gItemIcon_MachBike:: @ 8DB44DC - .incbin "graphics/items/icons/mach_bike.4bpp.lz" - - .align 2 -gItemIconPalette_MachBike:: @ 8DB45E4 - .incbin "graphics/items/icon_palettes/mach_bike.gbapal.lz" - - .align 2 -gItemIcon_CoinCase:: @ 8DB4608 - .incbin "graphics/items/icons/coin_case.4bpp.lz" - - .align 2 -gItemIconPalette_CoinCase:: @ 8DB46C8 - .incbin "graphics/items/icon_palettes/coin_case.gbapal.lz" - - .align 2 -gItemIcon_Itemfinder:: @ 8DB46E8 - .incbin "graphics/items/icons/itemfinder.4bpp.lz" - - .align 2 -gItemIconPalette_Itemfinder:: @ 8DB47A4 - .incbin "graphics/items/icon_palettes/itemfinder.gbapal.lz" - - .align 2 -gItemIcon_OldRod:: @ 8DB47CC - .incbin "graphics/items/icons/old_rod.4bpp.lz" - - .align 2 -gItemIconPalette_OldRod:: @ 8DB4878 - .incbin "graphics/items/icon_palettes/old_rod.gbapal.lz" - - .align 2 -gItemIcon_GoodRod:: @ 8DB489C - .incbin "graphics/items/icons/good_rod.4bpp.lz" - - .align 2 -gItemIconPalette_GoodRod:: @ 8DB4938 - .incbin "graphics/items/icon_palettes/good_rod.gbapal.lz" - - .align 2 -gItemIcon_SuperRod:: @ 8DB4960 - .incbin "graphics/items/icons/super_rod.4bpp.lz" - - .align 2 -gItemIconPalette_SuperRod:: @ 8DB4A10 - .incbin "graphics/items/icon_palettes/super_rod.gbapal.lz" - - .align 2 -gItemIcon_SSTicket:: @ 8DB4A38 - .incbin "graphics/items/icons/ss_ticket.4bpp.lz" - - .align 2 -gItemIconPalette_SSTicket:: @ 8DB4ACC - .incbin "graphics/items/icon_palettes/ss_ticket.gbapal.lz" - - .align 2 -gItemIcon_ContestPass:: @ 8DB4AE4 - .incbin "graphics/items/icons/contest_pass.4bpp.lz" - - .align 2 -gItemIconPalette_ContestPass:: @ 8DB4B90 - .incbin "graphics/items/icon_palettes/contest_pass.gbapal.lz" - - .align 2 -gItemIcon_WailmerPail:: @ 8DB4BB8 - .incbin "graphics/items/icons/wailmer_pail.4bpp.lz" - - .align 2 -gItemIconPalette_WailmerPail:: @ 8DB4C84 - .incbin "graphics/items/icon_palettes/wailmer_pail.gbapal.lz" - - .align 2 -gItemIcon_DevonGoods:: @ 8DB4CA8 - .incbin "graphics/items/icons/devon_goods.4bpp.lz" - - .align 2 -gItemIconPalette_DevonGoods:: @ 8DB4D50 - .incbin "graphics/items/icon_palettes/devon_goods.gbapal.lz" - - .align 2 -gItemIcon_SootSack:: @ 8DB4D6C - .incbin "graphics/items/icons/soot_sack.4bpp.lz" - - .align 2 -gItemIconPalette_SootSack:: @ 8DB4E44 - .incbin "graphics/items/icon_palettes/soot_sack.gbapal.lz" - - .align 2 -gItemIcon_BasementKey:: @ 8DB4E6C - .incbin "graphics/items/icons/basement_key.4bpp.lz" - - .align 2 -gItemIconPalette_OldKey:: @ 8DB4F14 - .incbin "graphics/items/icon_palettes/old_key.gbapal.lz" - - .align 2 -gItemIcon_AcroBike:: @ 8DB4F3C - .incbin "graphics/items/icons/acro_bike.4bpp.lz" - - .align 2 -gItemIconPalette_AcroBike:: @ 8DB5038 - .incbin "graphics/items/icon_palettes/acro_bike.gbapal.lz" - - .align 2 -gItemIcon_PokeblockCase:: @ 8DB5058 - .incbin "graphics/items/icons/pokeblock_case.4bpp.lz" - - .align 2 -gItemIconPalette_PokeblockCase:: @ 8DB5140 - .incbin "graphics/items/icon_palettes/pokeblock_case.gbapal.lz" - - .align 2 -gItemIcon_Letter:: @ 8DB5168 - .incbin "graphics/items/icons/letter.4bpp.lz" - - .align 2 -gItemIcon_EonTicket:: @ 8DB51E8 - .incbin "graphics/items/icons/eon_ticket.4bpp.lz" - - .align 2 -gItemIconPalette_EonTicket:: @ 8DB5284 - .incbin "graphics/items/icon_palettes/eon_ticket.gbapal.lz" - - .align 2 -gItemIcon_Orb:: @ 8DB52A8 - .incbin "graphics/items/icons/orb.4bpp.lz" - - .align 2 -gItemIconPalette_RedOrb:: @ 8DB5360 - .incbin "graphics/items/icon_palettes/red_orb.gbapal.lz" - - .align 2 -gItemIconPalette_BlueOrb:: @ 8DB537C - .incbin "graphics/items/icon_palettes/blue_orb.gbapal.lz" - - .align 2 -gItemIcon_Scanner:: @ 8DB5398 - .incbin "graphics/items/icons/scanner.4bpp.lz" - - .align 2 -gItemIconPalette_Scanner:: @ 8DB5460 - .incbin "graphics/items/icon_palettes/scanner.gbapal.lz" - - .align 2 -gItemIcon_GoGoggles:: @ 8DB5484 - .incbin "graphics/items/icons/go_goggles.4bpp.lz" - - .align 2 -gItemIconPalette_GoGoggles:: @ 8DB5538 - .incbin "graphics/items/icon_palettes/go_goggles.gbapal.lz" - - .align 2 -gItemIcon_Meteorite:: @ 8DB5558 - .incbin "graphics/items/icons/meteorite.4bpp.lz" - - .align 2 -gItemIconPalette_Meteorite:: @ 8DB5638 - .incbin "graphics/items/icon_palettes/meteorite.gbapal.lz" - - .align 2 -gItemIcon_Room1Key:: @ 8DB5658 - .incbin "graphics/items/icons/room1_key.4bpp.lz" - - .align 2 -gItemIcon_Room2Key:: @ 8DB5710 - .incbin "graphics/items/icons/room2_key.4bpp.lz" - - .align 2 -gItemIcon_Room4Key:: @ 8DB57CC - .incbin "graphics/items/icons/room4_key.4bpp.lz" - - .align 2 -gItemIcon_Room6Key:: @ 8DB588C - .incbin "graphics/items/icons/room6_key.4bpp.lz" - - .align 2 -gItemIcon_StorageKey:: @ 8DB5948 - .incbin "graphics/items/icons/storage_key.4bpp.lz" - - .align 2 -gItemIcon_RootFossil:: @ 8DB59F0 - .incbin "graphics/items/icons/root_fossil.4bpp.lz" - - .align 2 -gItemIconPalette_HoennFossil:: @ 8DB5AFC - .incbin "graphics/items/icon_palettes/hoenn_fossil.gbapal.lz" - - .align 2 -gItemIcon_ClawFossil:: @ 8DB5B24 - .incbin "graphics/items/icons/claw_fossil.4bpp.lz" - - .align 2 -gItemIcon_DevonScope:: @ 8DB5C14 - .incbin "graphics/items/icons/devon_scope.4bpp.lz" - - .align 2 -gItemIconPalette_DevonScope:: @ 8DB5CD0 - .incbin "graphics/items/icon_palettes/devon_scope.gbapal.lz" - - .align 2 -gItemIcon_TM:: @ 8DB5CF8 - .incbin "graphics/items/icons/tm.4bpp.lz" - - .align 2 -gItemIconPalette_FightingTMHM:: @ 8DB5DF4 - .incbin "graphics/items/icon_palettes/fighting_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_DragonTMHM:: @ 8DB5E1C - .incbin "graphics/items/icon_palettes/dragon_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_WaterTMHM:: @ 8DB5E44 - .incbin "graphics/items/icon_palettes/water_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_PsychicTMHM:: @ 8DB5E6C - .incbin "graphics/items/icon_palettes/psychic_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_NormalTMHM:: @ 8DB5E94 - .incbin "graphics/items/icon_palettes/normal_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_PoisonTMHM:: @ 8DB5EBC - .incbin "graphics/items/icon_palettes/poison_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_IceTMHM:: @ 8DB5EE4 - .incbin "graphics/items/icon_palettes/ice_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_GrassTMHM:: @ 8DB5F0C - .incbin "graphics/items/icon_palettes/grass_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_FireTMHM:: @ 8DB5F34 - .incbin "graphics/items/icon_palettes/fire_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_DarkTMHM:: @ 8DB5F5C - .incbin "graphics/items/icon_palettes/dark_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_SteelTMHM:: @ 8DB5F84 - .incbin "graphics/items/icon_palettes/steel_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_ElectricTMHM:: @ 8DB5FAC - .incbin "graphics/items/icon_palettes/electric_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_GroundTMHM:: @ 8DB5FD4 - .incbin "graphics/items/icon_palettes/ground_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_GhostTMHM:: @ 8DB5FFC - .incbin "graphics/items/icon_palettes/ghost_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_RockTMHM:: @ 8DB6024 - .incbin "graphics/items/icon_palettes/rock_tm_hm.gbapal.lz" - - .align 2 -gItemIconPalette_FlyingTMHM:: @ 8DB604C - .incbin "graphics/items/icon_palettes/flying_tm_hm.gbapal.lz" - - .align 2 -gItemIcon_HM:: @ 8DB6074 - .incbin "graphics/items/icons/hm.4bpp.lz" - - .align 2 -gItemIcon_OaksParcel:: @ 8DB6174 - .incbin "graphics/items/icons/oaks_parcel.4bpp.lz" - - .align 2 -gItemIconPalette_OaksParcel:: @ 8DB622C - .incbin "graphics/items/icon_palettes/oaks_parcel.gbapal.lz" - - .align 2 -gItemIcon_PokeFlute:: @ 8DB624C - .incbin "graphics/items/icons/poke_flute.4bpp.lz" - - .align 2 -gItemIconPalette_PokeFlute:: @ 8DB6310 - .incbin "graphics/items/icon_palettes/poke_flute.gbapal.lz" - - .align 2 -gItemIcon_SecretKey:: @ 8DB6338 - .incbin "graphics/items/icons/secret_key.4bpp.lz" - - .align 2 -gItemIconPalette_SecretKey:: @ 8DB6404 - .incbin "graphics/items/icon_palettes/secret_key.gbapal.lz" - - .align 2 -gItemIcon_BikeVoucher:: @ 8DB642C - .incbin "graphics/items/icons/bike_voucher.4bpp.lz" - - .align 2 -gItemIconPalette_BikeVoucher:: @ 8DB64CC - .incbin "graphics/items/icon_palettes/bike_voucher.gbapal.lz" - - .align 2 -gItemIcon_GoldTeeth:: @ 8DB64EC - .incbin "graphics/items/icons/gold_teeth.4bpp.lz" - - .align 2 -gItemIconPalette_GoldTeeth:: @ 8DB65D8 - .incbin "graphics/items/icon_palettes/gold_teeth.gbapal.lz" - - .align 2 -gItemIcon_OldAmber:: @ 8DB65FC - .incbin "graphics/items/icons/old_amber.4bpp.lz" - - .align 2 -gItemIconPalette_OldAmber:: @ 8DB66DC - .incbin "graphics/items/icon_palettes/old_amber.gbapal.lz" - - .align 2 -gItemIcon_CardKey:: @ 8DB6700 - .incbin "graphics/items/icons/card_key.4bpp.lz" - - .align 2 -gItemIconPalette_CardKey:: @ 8DB67A8 - .incbin "graphics/items/icon_palettes/card_key.gbapal.lz" - - .align 2 -gItemIcon_LiftKey:: @ 8DB67C8 - .incbin "graphics/items/icons/lift_key.4bpp.lz" - - .align 2 -gItemIconPalette_Key:: @ 8DB6884 - .incbin "graphics/items/icon_palettes/key.gbapal.lz" - - .align 2 -gItemIcon_HelixFossil:: @ 8DB68A4 - .incbin "graphics/items/icons/helix_fossil.4bpp.lz" - - .align 2 -gItemIconPalette_KantoFossil:: @ 8DB6998 - .incbin "graphics/items/icon_palettes/kanto_fossil.gbapal.lz" - - .align 2 -gItemIcon_DomeFossil:: @ 8DB69B8 - .incbin "graphics/items/icons/dome_fossil.4bpp.lz" - - .align 2 -gItemIcon_SilphScope:: @ 8DB6AA8 - .incbin "graphics/items/icons/silph_scope.4bpp.lz" - - .align 2 -gItemIconPalette_SilphScope:: @ 8DB6B7C - .incbin "graphics/items/icon_palettes/silph_scope.gbapal.lz" - - .align 2 -gItemIcon_Bicycle:: @ 8DB6BA0 - .incbin "graphics/items/icons/bicycle.4bpp.lz" - - .align 2 -gItemIconPalette_Bicycle:: @ 8DB6CA4 - .incbin "graphics/items/icon_palettes/bicycle.gbapal.lz" - - .align 2 -gItemIcon_TownMap:: @ 8DB6CC4 - .incbin "graphics/items/icons/town_map.4bpp.lz" - - .align 2 -gItemIconPalette_TownMap:: @ 8DB6D80 - .incbin "graphics/items/icon_palettes/town_map.gbapal.lz" - - .align 2 -gItemIcon_VSSeeker:: @ 8DB6DA8 - .incbin "graphics/items/icons/vs_seeker.4bpp.lz" - - .align 2 -gItemIconPalette_VSSeeker:: @ 8DB6E70 - .incbin "graphics/items/icon_palettes/vs_seeker.gbapal.lz" - - .align 2 -gItemIcon_FameChecker:: @ 8DB6E90 - .incbin "graphics/items/icons/fame_checker.4bpp.lz" - - .align 2 -gItemIconPalette_FameChecker:: @ 8DB6F48 - .incbin "graphics/items/icon_palettes/fame_checker.gbapal.lz" - - .align 2 -gItemIcon_TMCase:: @ 8DB6F6C - .incbin "graphics/items/icons/tm_case.4bpp.lz" - - .align 2 -gItemIconPalette_TMCase:: @ 8DB7030 - .incbin "graphics/items/icon_palettes/tm_case.gbapal.lz" - - .align 2 -gItemIcon_BerryPouch:: @ 8DB7058 - .incbin "graphics/items/icons/berry_pouch.4bpp.lz" - - .align 2 -gItemIconPalette_BerryPouch:: @ 8DB7158 - .incbin "graphics/items/icon_palettes/berry_pouch.gbapal.lz" - - .align 2 -gItemIcon_TeachyTV:: @ 8DB7180 - .incbin "graphics/items/icons/teachy_tv.4bpp.lz" - - .align 2 -gItemIconPalette_TeachyTV:: @ 8DB7278 - .incbin "graphics/items/icon_palettes/teachy_tv.gbapal.lz" - - .align 2 -gItemIcon_TriPass:: @ 8DB72A0 - .incbin "graphics/items/icons/tri_pass.4bpp.lz" - - .align 2 -gItemIconPalette_TriPass:: @ 8DB7344 - .incbin "graphics/items/icon_palettes/tri_pass.gbapal.lz" - - .align 2 -gItemIcon_RainbowPass:: @ 8DB7364 - .incbin "graphics/items/icons/rainbow_pass.4bpp.lz" - - .align 2 -gItemIconPalette_RainbowPass:: @ 8DB740C - .incbin "graphics/items/icon_palettes/rainbow_pass.gbapal.lz" - - .align 2 -gItemIcon_Tea:: @ 8DB7434 - .incbin "graphics/items/icons/tea.4bpp.lz" - - .align 2 -gItemIconPalette_Tea:: @ 8DB74FC - .incbin "graphics/items/icon_palettes/tea.gbapal.lz" - - .align 2 -gItemIcon_MysticTicket:: @ 8DB7520 - .incbin "graphics/items/icons/mystic_ticket.4bpp.lz" - - .align 2 -gItemIconPalette_MysticTicket:: @ 8DB75B8 - .incbin "graphics/items/icon_palettes/mystic_ticket.gbapal.lz" - - .align 2 -gItemIcon_AuroraTicket:: @ 8DB75D8 - .incbin "graphics/items/icons/aurora_ticket.4bpp.lz" - - .align 2 -gItemIconPalette_AuroraTicket:: @ 8DB7674 - .incbin "graphics/items/icon_palettes/aurora_ticket.gbapal.lz" - - .align 2 -gItemIcon_PowderJar:: @ 8DB7698 - .incbin "graphics/items/icons/powder_jar.4bpp.lz" - - .align 2 -gItemIconPalette_PowderJar:: @ 8DB7738 - .incbin "graphics/items/icon_palettes/powder_jar.gbapal.lz" - - .align 2 -gItemIconPalette_Ruby:: @ 8DB7760 - .incbin "graphics/items/icon_palettes/ruby.gbapal.lz" - - .align 2 -gItemIcon_Gem:: @ 8DB7788 - .incbin "graphics/items/icons/gem.4bpp.lz" - - .align 2 -gItemIconPalette_Sapphire:: @ 8DB7850 - .incbin "graphics/items/icon_palettes/sapphire.gbapal.lz" - - .align 2 -gItemIcon_MagmaEmblem:: @ 8DB7878 - .incbin "graphics/items/icons/magma_emblem.4bpp.lz" - - .align 2 -gItemIconPalette_MagmaEmblem:: @ 8DB794C - .incbin "graphics/items/icon_palettes/magma_emblem.gbapal.lz" - - .align 2 -gItemIcon_OldSeaMap:: @ 8DB7974 - .incbin "graphics/items/icons/old_sea_map.4bpp.lz" - - .align 2 -gItemIconPalette_OldSeaMap:: @ 8DB7A78 - .incbin "graphics/items/icon_palettes/old_sea_map.gbapal.lz" diff --git a/data/graphics/pokemon/circled_question_mark_graphics.inc b/data/graphics/pokemon/circled_question_mark_graphics.inc deleted file mode 100644 index dea14ad8a..000000000 --- a/data/graphics/pokemon/circled_question_mark_graphics.inc +++ /dev/null @@ -1,15 +0,0 @@ - .align 2 -gMonStillFrontPic_CircledQuestionMark:: @ 8C00750 - .incbin "graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_CircledQuestionMark:: @ 8C00998 - .incbin "graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz" - - .align 2 -gMonPalette_CircledQuestionMark:: @ 8C00BE0 - .incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz" - - .align 2 -gMonShinyPalette_CircledQuestionMark:: @ 8C00BF8 - .incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz" diff --git a/data/graphics/pokemon/graphics.inc b/data/graphics/pokemon/graphics.inc deleted file mode 100644 index 4c4a0f57b..000000000 --- a/data/graphics/pokemon/graphics.inc +++ /dev/null @@ -1,9619 +0,0 @@ - .align 2 -gMonStillFrontPic_Bulbasaur:: @ 8C2FA08 - .incbin "graphics/pokemon/front_pics/bulbasaur_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Bulbasaur:: @ 8C2FCA0 - .incbin "graphics/pokemon/palettes/bulbasaur_palette.gbapal.lz" - - .align 2 -gMonBackPic_Bulbasaur:: @ 8C2FCC8 - .incbin "graphics/pokemon/back_pics/bulbasaur_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Bulbasaur:: @ 8C2FF78 - .incbin "graphics/pokemon/palettes/bulbasaur_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Bulbasaur:: @ 8C2FFA0 - .incbin "graphics/pokemon/icons/bulbasaur_icon.4bpp" - - .align 2 -gMonFootprint_Bulbasaur:: @ 8C303A0 - .incbin "graphics/pokemon/footprints/bulbasaur_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ivysaur:: @ 8C303C0 - .incbin "graphics/pokemon/front_pics/ivysaur_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ivysaur:: @ 8C30734 - .incbin "graphics/pokemon/palettes/ivysaur_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ivysaur:: @ 8C3075C - .incbin "graphics/pokemon/back_pics/ivysaur_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ivysaur:: @ 8C30AE8 - .incbin "graphics/pokemon/palettes/ivysaur_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ivysaur:: @ 8C30B10 - .incbin "graphics/pokemon/icons/ivysaur_icon.4bpp" - - .align 2 -gMonFootprint_Ivysaur:: @ 8C30F10 - .incbin "graphics/pokemon/footprints/ivysaur_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Venusaur:: @ 8C30F30 - .incbin "graphics/pokemon/front_pics/venusaur_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Venusaur:: @ 8C314BC - .incbin "graphics/pokemon/palettes/venusaur_palette.gbapal.lz" - - .align 2 -gMonBackPic_Venusaur:: @ 8C314E4 - .incbin "graphics/pokemon/back_pics/venusaur_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Venusaur:: @ 8C319B4 - .incbin "graphics/pokemon/palettes/venusaur_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Venusaur:: @ 8C319DC - .incbin "graphics/pokemon/icons/venusaur_icon.4bpp" - - .align 2 -gMonFootprint_Venusaur:: @ 8C31DDC - .incbin "graphics/pokemon/footprints/venusaur_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Charmander:: @ 8C31DFC - .incbin "graphics/pokemon/front_pics/charmander_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Charmander:: @ 8C320AC - .incbin "graphics/pokemon/palettes/charmander_palette.gbapal.lz" - - .align 2 -gMonBackPic_Charmander:: @ 8C320D4 - .incbin "graphics/pokemon/back_pics/charmander_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Charmander:: @ 8C32368 - .incbin "graphics/pokemon/palettes/charmander_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Charmander:: @ 8C32390 - .incbin "graphics/pokemon/icons/charmander_icon.4bpp" - - .align 2 -gMonFootprint_Charmander:: @ 8C32790 - .incbin "graphics/pokemon/footprints/charmander_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Charmeleon:: @ 8C327B0 - .incbin "graphics/pokemon/front_pics/charmeleon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Charmeleon:: @ 8C32B58 - .incbin "graphics/pokemon/palettes/charmeleon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Charmeleon:: @ 8C32B80 - .incbin "graphics/pokemon/back_pics/charmeleon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Charmeleon:: @ 8C32E60 - .incbin "graphics/pokemon/palettes/charmeleon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Charmeleon:: @ 8C32E88 - .incbin "graphics/pokemon/icons/charmeleon_icon.4bpp" - - .align 2 -gMonFootprint_Charmeleon:: @ 8C33288 - .incbin "graphics/pokemon/footprints/charmeleon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Charizard:: @ 8C332A8 - .incbin "graphics/pokemon/front_pics/charizard_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Charizard:: @ 8C337F8 - .incbin "graphics/pokemon/palettes/charizard_palette.gbapal.lz" - - .align 2 -gMonBackPic_Charizard:: @ 8C33820 - .incbin "graphics/pokemon/back_pics/charizard_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Charizard:: @ 8C33C3C - .incbin "graphics/pokemon/palettes/charizard_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Charizard:: @ 8C33C64 - .incbin "graphics/pokemon/icons/charizard_icon.4bpp" - - .align 2 -gMonFootprint_Charizard:: @ 8C34064 - .incbin "graphics/pokemon/footprints/charizard_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Squirtle:: @ 8C34084 - .incbin "graphics/pokemon/front_pics/squirtle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Squirtle:: @ 8C34360 - .incbin "graphics/pokemon/palettes/squirtle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Squirtle:: @ 8C34388 - .incbin "graphics/pokemon/back_pics/squirtle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Squirtle:: @ 8C34608 - .incbin "graphics/pokemon/palettes/squirtle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Squirtle:: @ 8C34630 - .incbin "graphics/pokemon/icons/squirtle_icon.4bpp" - - .align 2 -gMonFootprint_Squirtle:: @ 8C34A30 - .incbin "graphics/pokemon/footprints/squirtle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wartortle:: @ 8C34A50 - .incbin "graphics/pokemon/front_pics/wartortle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wartortle:: @ 8C34DCC - .incbin "graphics/pokemon/palettes/wartortle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wartortle:: @ 8C34DF4 - .incbin "graphics/pokemon/back_pics/wartortle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wartortle:: @ 8C35128 - .incbin "graphics/pokemon/palettes/wartortle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wartortle:: @ 8C35150 - .incbin "graphics/pokemon/icons/wartortle_icon.4bpp" - - .align 2 -gMonFootprint_Wartortle:: @ 8C35550 - .incbin "graphics/pokemon/footprints/wartortle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Blastoise:: @ 8C35570 - .incbin "graphics/pokemon/front_pics/blastoise_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Blastoise:: @ 8C35A74 - .incbin "graphics/pokemon/palettes/blastoise_palette.gbapal.lz" - - .align 2 -gMonBackPic_Blastoise:: @ 8C35A9C - .incbin "graphics/pokemon/back_pics/blastoise_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Blastoise:: @ 8C35EB8 - .incbin "graphics/pokemon/palettes/blastoise_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Blastoise:: @ 8C35EE0 - .incbin "graphics/pokemon/icons/blastoise_icon.4bpp" - - .align 2 -gMonFootprint_Blastoise:: @ 8C362E0 - .incbin "graphics/pokemon/footprints/blastoise_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Caterpie:: @ 8C36300 - .incbin "graphics/pokemon/front_pics/caterpie_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Caterpie:: @ 8C36560 - .incbin "graphics/pokemon/palettes/caterpie_palette.gbapal.lz" - - .align 2 -gMonBackPic_Caterpie:: @ 8C36588 - .incbin "graphics/pokemon/back_pics/caterpie_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Caterpie:: @ 8C36810 - .incbin "graphics/pokemon/palettes/caterpie_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Caterpie:: @ 8C36838 - .incbin "graphics/pokemon/icons/caterpie_icon.4bpp" - - .align 2 -gMonFootprint_Caterpie:: @ 8C36C38 - .incbin "graphics/pokemon/footprints/caterpie_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Metapod:: @ 8C36C58 - .incbin "graphics/pokemon/front_pics/metapod_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Metapod:: @ 8C36E70 - .incbin "graphics/pokemon/palettes/metapod_palette.gbapal.lz" - - .align 2 -gMonBackPic_Metapod:: @ 8C36E90 - .incbin "graphics/pokemon/back_pics/metapod_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Metapod:: @ 8C370D0 - .incbin "graphics/pokemon/palettes/metapod_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Metapod:: @ 8C370F0 - .incbin "graphics/pokemon/icons/metapod_icon.4bpp" - - .align 2 -gMonFootprint_Metapod:: @ 8C374F0 - .incbin "graphics/pokemon/footprints/metapod_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Butterfree:: @ 8C37510 - .incbin "graphics/pokemon/front_pics/butterfree_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Butterfree:: @ 8C37870 - .incbin "graphics/pokemon/palettes/butterfree_palette.gbapal.lz" - - .align 2 -gMonBackPic_Butterfree:: @ 8C37898 - .incbin "graphics/pokemon/back_pics/butterfree_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Butterfree:: @ 8C37CA8 - .incbin "graphics/pokemon/palettes/butterfree_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Butterfree:: @ 8C37CD0 - .incbin "graphics/pokemon/icons/butterfree_icon.4bpp" - - .align 2 -gMonFootprint_Butterfree:: @ 8C380D0 - .incbin "graphics/pokemon/footprints/butterfree_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Weedle:: @ 8C380F0 - .incbin "graphics/pokemon/front_pics/weedle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Weedle:: @ 8C38330 - .incbin "graphics/pokemon/palettes/weedle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Weedle:: @ 8C38358 - .incbin "graphics/pokemon/back_pics/weedle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Weedle:: @ 8C385C0 - .incbin "graphics/pokemon/palettes/weedle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Weedle:: @ 8C385E8 - .incbin "graphics/pokemon/icons/weedle_icon.4bpp" - - .align 2 -gMonFootprint_Weedle:: @ 8C389E8 - .incbin "graphics/pokemon/footprints/weedle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kakuna:: @ 8C38A08 - .incbin "graphics/pokemon/front_pics/kakuna_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kakuna:: @ 8C38C54 - .incbin "graphics/pokemon/palettes/kakuna_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kakuna:: @ 8C38C78 - .incbin "graphics/pokemon/back_pics/kakuna_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kakuna:: @ 8C38EFC - .incbin "graphics/pokemon/palettes/kakuna_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kakuna:: @ 8C38F20 - .incbin "graphics/pokemon/icons/kakuna_icon.4bpp" - - .align 2 -gMonFootprint_Kakuna:: @ 8C39320 - .incbin "graphics/pokemon/footprints/kakuna_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Beedrill:: @ 8C39340 - .incbin "graphics/pokemon/front_pics/beedrill_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Beedrill:: @ 8C39750 - .incbin "graphics/pokemon/palettes/beedrill_palette.gbapal.lz" - - .align 2 -gMonBackPic_Beedrill:: @ 8C39778 - .incbin "graphics/pokemon/back_pics/beedrill_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Beedrill:: @ 8C39AEC - .incbin "graphics/pokemon/palettes/beedrill_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Beedrill:: @ 8C39B14 - .incbin "graphics/pokemon/icons/beedrill_icon.4bpp" - - .align 2 -gMonFootprint_Beedrill:: @ 8C39F14 - .incbin "graphics/pokemon/footprints/beedrill_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pidgey:: @ 8C39F34 - .incbin "graphics/pokemon/front_pics/pidgey_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pidgey:: @ 8C3A220 - .incbin "graphics/pokemon/palettes/pidgey_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pidgey:: @ 8C3A248 - .incbin "graphics/pokemon/back_pics/pidgey_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgey:: @ 8C3A59C - .incbin "graphics/pokemon/palettes/pidgey_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pidgey:: @ 8C3A5C4 - .incbin "graphics/pokemon/icons/pidgey_icon.4bpp" - - .align 2 -gMonFootprint_Pidgey:: @ 8C3A9C4 - .incbin "graphics/pokemon/footprints/pidgey_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pidgeotto:: @ 8C3A9E4 - .incbin "graphics/pokemon/front_pics/pidgeotto_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pidgeotto:: @ 8C3AD58 - .incbin "graphics/pokemon/palettes/pidgeotto_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pidgeotto:: @ 8C3AD80 - .incbin "graphics/pokemon/back_pics/pidgeotto_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgeotto:: @ 8C3B0CC - .incbin "graphics/pokemon/palettes/pidgeotto_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pidgeotto:: @ 8C3B0F4 - .incbin "graphics/pokemon/icons/pidgeotto_icon.4bpp" - - .align 2 -gMonFootprint_Pidgeotto:: @ 8C3B4F4 - .incbin "graphics/pokemon/footprints/pidgeotto_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pidgeot:: @ 8C3B514 - .incbin "graphics/pokemon/front_pics/pidgeot_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pidgeot:: @ 8C3BA10 - .incbin "graphics/pokemon/palettes/pidgeot_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pidgeot:: @ 8C3BA38 - .incbin "graphics/pokemon/back_pics/pidgeot_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pidgeot:: @ 8C3BDC0 - .incbin "graphics/pokemon/palettes/pidgeot_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pidgeot:: @ 8C3BDE8 - .incbin "graphics/pokemon/icons/pidgeot_icon.4bpp" - - .align 2 -gMonFootprint_Pidgeot:: @ 8C3C1E8 - .incbin "graphics/pokemon/footprints/pidgeot_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Rattata:: @ 8C3C208 - .incbin "graphics/pokemon/front_pics/rattata_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Rattata:: @ 8C3C454 - .incbin "graphics/pokemon/palettes/rattata_palette.gbapal.lz" - - .align 2 -gMonBackPic_Rattata:: @ 8C3C47C - .incbin "graphics/pokemon/back_pics/rattata_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Rattata:: @ 8C3C758 - .incbin "graphics/pokemon/palettes/rattata_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Rattata:: @ 8C3C780 - .incbin "graphics/pokemon/icons/rattata_icon.4bpp" - - .align 2 -gMonFootprint_Rattata:: @ 8C3CB80 - .incbin "graphics/pokemon/footprints/rattata_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Raticate:: @ 8C3CBA0 - .incbin "graphics/pokemon/front_pics/raticate_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Raticate:: @ 8C3CF28 - .incbin "graphics/pokemon/palettes/raticate_palette.gbapal.lz" - - .align 2 -gMonBackPic_Raticate:: @ 8C3CF50 - .incbin "graphics/pokemon/back_pics/raticate_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Raticate:: @ 8C3D280 - .incbin "graphics/pokemon/palettes/raticate_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Raticate:: @ 8C3D2A8 - .incbin "graphics/pokemon/icons/raticate_icon.4bpp" - - .align 2 -gMonFootprint_Raticate:: @ 8C3D6A8 - .incbin "graphics/pokemon/footprints/raticate_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Spearow:: @ 8C3D6C8 - .incbin "graphics/pokemon/front_pics/spearow_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Spearow:: @ 8C3D950 - .incbin "graphics/pokemon/palettes/spearow_palette.gbapal.lz" - - .align 2 -gMonBackPic_Spearow:: @ 8C3D978 - .incbin "graphics/pokemon/back_pics/spearow_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Spearow:: @ 8C3DC54 - .incbin "graphics/pokemon/palettes/spearow_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Spearow:: @ 8C3DC7C - .incbin "graphics/pokemon/icons/spearow_icon.4bpp" - - .align 2 -gMonFootprint_Spearow:: @ 8C3E07C - .incbin "graphics/pokemon/footprints/spearow_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Fearow:: @ 8C3E09C - .incbin "graphics/pokemon/front_pics/fearow_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Fearow:: @ 8C3E530 - .incbin "graphics/pokemon/palettes/fearow_palette.gbapal.lz" - - .align 2 -gMonBackPic_Fearow:: @ 8C3E558 - .incbin "graphics/pokemon/back_pics/fearow_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Fearow:: @ 8C3E850 - .incbin "graphics/pokemon/palettes/fearow_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Fearow:: @ 8C3E878 - .incbin "graphics/pokemon/icons/fearow_icon.4bpp" - - .align 2 -gMonFootprint_Fearow:: @ 8C3EC78 - .incbin "graphics/pokemon/footprints/fearow_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ekans:: @ 8C3EC98 - .incbin "graphics/pokemon/front_pics/ekans_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ekans:: @ 8C3EF98 - .incbin "graphics/pokemon/palettes/ekans_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ekans:: @ 8C3EFC0 - .incbin "graphics/pokemon/back_pics/ekans_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ekans:: @ 8C3F2B0 - .incbin "graphics/pokemon/palettes/ekans_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ekans:: @ 8C3F2D8 - .incbin "graphics/pokemon/icons/ekans_icon.4bpp" - - .align 2 -gMonFootprint_Ekans:: @ 8C3F6D8 - .incbin "graphics/pokemon/footprints/ekans_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Arbok:: @ 8C3F6F8 - .incbin "graphics/pokemon/front_pics/arbok_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Arbok:: @ 8C3FB44 - .incbin "graphics/pokemon/palettes/arbok_palette.gbapal.lz" - - .align 2 -gMonBackPic_Arbok:: @ 8C3FB6C - .incbin "graphics/pokemon/back_pics/arbok_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Arbok:: @ 8C3FE0C - .incbin "graphics/pokemon/palettes/arbok_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Arbok:: @ 8C3FE34 - .incbin "graphics/pokemon/icons/arbok_icon.4bpp" - - .align 2 -gMonFootprint_Arbok:: @ 8C40234 - .incbin "graphics/pokemon/footprints/arbok_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pikachu:: @ 8C40254 - .incbin "graphics/pokemon/front_pics/pikachu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pikachu:: @ 8C40524 - .incbin "graphics/pokemon/palettes/pikachu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pikachu:: @ 8C4054C - .incbin "graphics/pokemon/back_pics/pikachu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pikachu:: @ 8C40824 - .incbin "graphics/pokemon/palettes/pikachu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pikachu:: @ 8C4084C - .incbin "graphics/pokemon/icons/pikachu_icon.4bpp" - - .align 2 -gMonFootprint_Pikachu:: @ 8C40C4C - .incbin "graphics/pokemon/footprints/pikachu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Raichu:: @ 8C40C6C - .incbin "graphics/pokemon/front_pics/raichu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Raichu:: @ 8C41018 - .incbin "graphics/pokemon/palettes/raichu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Raichu:: @ 8C41040 - .incbin "graphics/pokemon/back_pics/raichu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Raichu:: @ 8C41360 - .incbin "graphics/pokemon/palettes/raichu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Raichu:: @ 8C41388 - .incbin "graphics/pokemon/icons/raichu_icon.4bpp" - - .align 2 -gMonFootprint_Raichu:: @ 8C41788 - .incbin "graphics/pokemon/footprints/raichu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sandshrew:: @ 8C417A8 - .incbin "graphics/pokemon/front_pics/sandshrew_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sandshrew:: @ 8C41A68 - .incbin "graphics/pokemon/palettes/sandshrew_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sandshrew:: @ 8C41A90 - .incbin "graphics/pokemon/back_pics/sandshrew_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sandshrew:: @ 8C41DB8 - .incbin "graphics/pokemon/palettes/sandshrew_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sandshrew:: @ 8C41DE0 - .incbin "graphics/pokemon/icons/sandshrew_icon.4bpp" - - .align 2 -gMonFootprint_Sandshrew:: @ 8C421E0 - .incbin "graphics/pokemon/footprints/sandshrew_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sandslash:: @ 8C42200 - .incbin "graphics/pokemon/front_pics/sandslash_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sandslash:: @ 8C425EC - .incbin "graphics/pokemon/palettes/sandslash_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sandslash:: @ 8C42614 - .incbin "graphics/pokemon/back_pics/sandslash_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sandslash:: @ 8C42A30 - .incbin "graphics/pokemon/palettes/sandslash_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sandslash:: @ 8C42A58 - .incbin "graphics/pokemon/icons/sandslash_icon.4bpp" - - .align 2 -gMonFootprint_Sandslash:: @ 8C42E58 - .incbin "graphics/pokemon/footprints/sandslash_footprint.1bpp" - - .align 2 -gMonStillFrontPic_NidoranF:: @ 8C42E78 - .incbin "graphics/pokemon/front_pics/nidoran_f_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_NidoranF:: @ 8C430F0 - .incbin "graphics/pokemon/palettes/nidoran_f_palette.gbapal.lz" - - .align 2 -gMonBackPic_NidoranF:: @ 8C43118 - .incbin "graphics/pokemon/back_pics/nidoran_f_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_NidoranF:: @ 8C433F0 - .incbin "graphics/pokemon/palettes/nidoran_f_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_NidoranF:: @ 8C43418 - .incbin "graphics/pokemon/icons/nidoran_f_icon.4bpp" - - .align 2 -gMonFootprint_NidoranF:: @ 8C43818 - .incbin "graphics/pokemon/footprints/nidoran_f_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nidorina:: @ 8C43838 - .incbin "graphics/pokemon/front_pics/nidorina_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nidorina:: @ 8C43B64 - .incbin "graphics/pokemon/palettes/nidorina_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nidorina:: @ 8C43B8C - .incbin "graphics/pokemon/back_pics/nidorina_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidorina:: @ 8C43F20 - .incbin "graphics/pokemon/palettes/nidorina_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nidorina:: @ 8C43F48 - .incbin "graphics/pokemon/icons/nidorina_icon.4bpp" - - .align 2 -gMonFootprint_Nidorina:: @ 8C44348 - .incbin "graphics/pokemon/footprints/nidorina_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nidoqueen:: @ 8C44368 - .incbin "graphics/pokemon/front_pics/nidoqueen_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nidoqueen:: @ 8C447F4 - .incbin "graphics/pokemon/palettes/nidoqueen_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nidoqueen:: @ 8C4481C - .incbin "graphics/pokemon/back_pics/nidoqueen_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidoqueen:: @ 8C44BE0 - .incbin "graphics/pokemon/palettes/nidoqueen_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nidoqueen:: @ 8C44C08 - .incbin "graphics/pokemon/icons/nidoqueen_icon.4bpp" - - .align 2 -gMonFootprint_Nidoqueen:: @ 8C45008 - .incbin "graphics/pokemon/footprints/nidoqueen_footprint.1bpp" - - .align 2 -gMonStillFrontPic_NidoranM:: @ 8C45028 - .incbin "graphics/pokemon/front_pics/nidoran_m_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_NidoranM:: @ 8C452F8 - .incbin "graphics/pokemon/palettes/nidoran_m_palette.gbapal.lz" - - .align 2 -gMonBackPic_NidoranM:: @ 8C45320 - .incbin "graphics/pokemon/back_pics/nidoran_m_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_NidoranM:: @ 8C45654 - .incbin "graphics/pokemon/palettes/nidoran_m_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_NidoranM:: @ 8C4567C - .incbin "graphics/pokemon/icons/nidoran_m_icon.4bpp" - - .align 2 -gMonFootprint_NidoranM:: @ 8C45A7C - .incbin "graphics/pokemon/footprints/nidoran_m_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nidorino:: @ 8C45A9C - .incbin "graphics/pokemon/front_pics/nidorino_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nidorino:: @ 8C45E30 - .incbin "graphics/pokemon/palettes/nidorino_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nidorino:: @ 8C45E58 - .incbin "graphics/pokemon/back_pics/nidorino_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidorino:: @ 8C46214 - .incbin "graphics/pokemon/palettes/nidorino_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nidorino:: @ 8C4623C - .incbin "graphics/pokemon/icons/nidorino_icon.4bpp" - - .align 2 -gMonFootprint_Nidorino:: @ 8C4663C - .incbin "graphics/pokemon/footprints/nidorino_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nidoking:: @ 8C4665C - .incbin "graphics/pokemon/front_pics/nidoking_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nidoking:: @ 8C46B54 - .incbin "graphics/pokemon/palettes/nidoking_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nidoking:: @ 8C46B7C - .incbin "graphics/pokemon/back_pics/nidoking_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nidoking:: @ 8C46FB8 - .incbin "graphics/pokemon/palettes/nidoking_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nidoking:: @ 8C46FE0 - .incbin "graphics/pokemon/icons/nidoking_icon.4bpp" - - .align 2 -gMonFootprint_Nidoking:: @ 8C473E0 - .incbin "graphics/pokemon/footprints/nidoking_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Clefairy:: @ 8C47400 - .incbin "graphics/pokemon/front_pics/clefairy_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Clefairy:: @ 8C47688 - .incbin "graphics/pokemon/palettes/clefairy_palette.gbapal.lz" - - .align 2 -gMonBackPic_Clefairy:: @ 8C476B0 - .incbin "graphics/pokemon/back_pics/clefairy_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Clefairy:: @ 8C47980 - .incbin "graphics/pokemon/palettes/clefairy_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Clefairy:: @ 8C479A8 - .incbin "graphics/pokemon/icons/clefairy_icon.4bpp" - - .align 2 -gMonFootprint_Clefairy:: @ 8C47DA8 - .incbin "graphics/pokemon/footprints/clefairy_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Clefable:: @ 8C47DC8 - .incbin "graphics/pokemon/front_pics/clefable_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Clefable:: @ 8C48104 - .incbin "graphics/pokemon/palettes/clefable_palette.gbapal.lz" - - .align 2 -gMonBackPic_Clefable:: @ 8C4812C - .incbin "graphics/pokemon/back_pics/clefable_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Clefable:: @ 8C48464 - .incbin "graphics/pokemon/palettes/clefable_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Clefable:: @ 8C4848C - .incbin "graphics/pokemon/icons/clefable_icon.4bpp" - - .align 2 -gMonFootprint_Clefable:: @ 8C4888C - .incbin "graphics/pokemon/footprints/clefable_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Vulpix:: @ 8C488AC - .incbin "graphics/pokemon/front_pics/vulpix_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Vulpix:: @ 8C48BE8 - .incbin "graphics/pokemon/palettes/vulpix_palette.gbapal.lz" - - .align 2 -gMonBackPic_Vulpix:: @ 8C48C10 - .incbin "graphics/pokemon/back_pics/vulpix_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Vulpix:: @ 8C48F0C - .incbin "graphics/pokemon/palettes/vulpix_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Vulpix:: @ 8C48F34 - .incbin "graphics/pokemon/icons/vulpix_icon.4bpp" - - .align 2 -gMonFootprint_Vulpix:: @ 8C49334 - .incbin "graphics/pokemon/footprints/vulpix_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ninetales:: @ 8C49354 - .incbin "graphics/pokemon/front_pics/ninetales_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ninetales:: @ 8C49790 - .incbin "graphics/pokemon/palettes/ninetales_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ninetales:: @ 8C497B0 - .incbin "graphics/pokemon/back_pics/ninetales_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ninetales:: @ 8C49B30 - .incbin "graphics/pokemon/palettes/ninetales_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ninetales:: @ 8C49B50 - .incbin "graphics/pokemon/icons/ninetales_icon.4bpp" - - .align 2 -gMonFootprint_Ninetales:: @ 8C49F50 - .incbin "graphics/pokemon/footprints/ninetales_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Jigglypuff:: @ 8C49F70 - .incbin "graphics/pokemon/front_pics/jigglypuff_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Jigglypuff:: @ 8C4A1E8 - .incbin "graphics/pokemon/palettes/jigglypuff_palette.gbapal.lz" - - .align 2 -gMonBackPic_Jigglypuff:: @ 8C4A210 - .incbin "graphics/pokemon/back_pics/jigglypuff_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Jigglypuff:: @ 8C4A46C - .incbin "graphics/pokemon/palettes/jigglypuff_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Jigglypuff:: @ 8C4A494 - .incbin "graphics/pokemon/icons/jigglypuff_icon.4bpp" - - .align 2 -gMonFootprint_Jigglypuff:: @ 8C4A894 - .incbin "graphics/pokemon/footprints/jigglypuff_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wigglytuff:: @ 8C4A8B4 - .incbin "graphics/pokemon/front_pics/wigglytuff_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wigglytuff:: @ 8C4AC08 - .incbin "graphics/pokemon/palettes/wigglytuff_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wigglytuff:: @ 8C4AC30 - .incbin "graphics/pokemon/back_pics/wigglytuff_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wigglytuff:: @ 8C4AED8 - .incbin "graphics/pokemon/palettes/wigglytuff_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wigglytuff:: @ 8C4AF00 - .incbin "graphics/pokemon/icons/wigglytuff_icon.4bpp" - - .align 2 -gMonFootprint_Wigglytuff:: @ 8C4B300 - .incbin "graphics/pokemon/footprints/wigglytuff_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Zubat:: @ 8C4B320 - .incbin "graphics/pokemon/front_pics/zubat_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Zubat:: @ 8C4B5F8 - .incbin "graphics/pokemon/palettes/zubat_palette.gbapal.lz" - - .align 2 -gMonBackPic_Zubat:: @ 8C4B620 - .incbin "graphics/pokemon/back_pics/zubat_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Zubat:: @ 8C4B8DC - .incbin "graphics/pokemon/palettes/zubat_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Zubat:: @ 8C4B904 - .incbin "graphics/pokemon/icons/zubat_icon.4bpp" - - .align 2 -gMonFootprint_Zubat:: @ 8C4BD04 - .incbin "graphics/pokemon/footprints/zubat_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Golbat:: @ 8C4BD24 - .incbin "graphics/pokemon/front_pics/golbat_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Golbat:: @ 8C4C0C0 - .incbin "graphics/pokemon/palettes/golbat_palette.gbapal.lz" - - .align 2 -gMonBackPic_Golbat:: @ 8C4C0E8 - .incbin "graphics/pokemon/back_pics/golbat_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Golbat:: @ 8C4C3A4 - .incbin "graphics/pokemon/palettes/golbat_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Golbat:: @ 8C4C3CC - .incbin "graphics/pokemon/icons/golbat_icon.4bpp" - - .align 2 -gMonFootprint_Golbat:: @ 8C4C7CC - .incbin "graphics/pokemon/footprints/golbat_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Oddish:: @ 8C4C7EC - .incbin "graphics/pokemon/front_pics/oddish_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Oddish:: @ 8C4CA20 - .incbin "graphics/pokemon/palettes/oddish_palette.gbapal.lz" - - .align 2 -gMonBackPic_Oddish:: @ 8C4CA48 - .incbin "graphics/pokemon/back_pics/oddish_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Oddish:: @ 8C4CCC0 - .incbin "graphics/pokemon/palettes/oddish_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Oddish:: @ 8C4CCE8 - .incbin "graphics/pokemon/icons/oddish_icon.4bpp" - - .align 2 -gMonFootprint_Oddish:: @ 8C4D0E8 - .incbin "graphics/pokemon/footprints/oddish_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gloom:: @ 8C4D108 - .incbin "graphics/pokemon/front_pics/gloom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gloom:: @ 8C4D480 - .incbin "graphics/pokemon/palettes/gloom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gloom:: @ 8C4D4A8 - .incbin "graphics/pokemon/back_pics/gloom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gloom:: @ 8C4D810 - .incbin "graphics/pokemon/palettes/gloom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gloom:: @ 8C4D838 - .incbin "graphics/pokemon/icons/gloom_icon.4bpp" - - .align 2 -gMonFootprint_Gloom:: @ 8C4DC38 - .incbin "graphics/pokemon/footprints/gloom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Vileplume:: @ 8C4DC58 - .incbin "graphics/pokemon/front_pics/vileplume_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Vileplume:: @ 8C4DFD4 - .incbin "graphics/pokemon/palettes/vileplume_palette.gbapal.lz" - - .align 2 -gMonBackPic_Vileplume:: @ 8C4DFFC - .incbin "graphics/pokemon/back_pics/vileplume_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Vileplume:: @ 8C4E414 - .incbin "graphics/pokemon/palettes/vileplume_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Vileplume:: @ 8C4E43C - .incbin "graphics/pokemon/icons/vileplume_icon.4bpp" - - .align 2 -gMonFootprint_Vileplume:: @ 8C4E83C - .incbin "graphics/pokemon/footprints/vileplume_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Paras:: @ 8C4E85C - .incbin "graphics/pokemon/front_pics/paras_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Paras:: @ 8C4EAC8 - .incbin "graphics/pokemon/palettes/paras_palette.gbapal.lz" - - .align 2 -gMonBackPic_Paras:: @ 8C4EAF0 - .incbin "graphics/pokemon/back_pics/paras_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Paras:: @ 8C4ED90 - .incbin "graphics/pokemon/palettes/paras_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Paras:: @ 8C4EDB8 - .incbin "graphics/pokemon/icons/paras_icon.4bpp" - - .align 2 -gMonFootprint_Paras:: @ 8C4F1B8 - .incbin "graphics/pokemon/footprints/paras_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Parasect:: @ 8C4F1D8 - .incbin "graphics/pokemon/front_pics/parasect_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Parasect:: @ 8C4F59C - .incbin "graphics/pokemon/palettes/parasect_palette.gbapal.lz" - - .align 2 -gMonBackPic_Parasect:: @ 8C4F5C4 - .incbin "graphics/pokemon/back_pics/parasect_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Parasect:: @ 8C4F8C0 - .incbin "graphics/pokemon/palettes/parasect_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Parasect:: @ 8C4F8E8 - .incbin "graphics/pokemon/icons/parasect_icon.4bpp" - - .align 2 -gMonFootprint_Parasect:: @ 8C4FCE8 - .incbin "graphics/pokemon/footprints/parasect_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Venonat:: @ 8C4FD08 - .incbin "graphics/pokemon/front_pics/venonat_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Venonat:: @ 8C50080 - .incbin "graphics/pokemon/palettes/venonat_palette.gbapal.lz" - - .align 2 -gMonBackPic_Venonat:: @ 8C500A8 - .incbin "graphics/pokemon/back_pics/venonat_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Venonat:: @ 8C503D8 - .incbin "graphics/pokemon/palettes/venonat_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Venonat:: @ 8C50400 - .incbin "graphics/pokemon/icons/venonat_icon.4bpp" - - .align 2 -gMonFootprint_Venonat:: @ 8C50800 - .incbin "graphics/pokemon/footprints/venonat_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Venomoth:: @ 8C50820 - .incbin "graphics/pokemon/front_pics/venomoth_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Venomoth:: @ 8C50CC4 - .incbin "graphics/pokemon/palettes/venomoth_palette.gbapal.lz" - - .align 2 -gMonBackPic_Venomoth:: @ 8C50CEC - .incbin "graphics/pokemon/back_pics/venomoth_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Venomoth:: @ 8C510B0 - .incbin "graphics/pokemon/palettes/venomoth_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Venomoth:: @ 8C510D8 - .incbin "graphics/pokemon/icons/venomoth_icon.4bpp" - - .align 2 -gMonFootprint_Venomoth:: @ 8C514D8 - .incbin "graphics/pokemon/footprints/venomoth_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Diglett:: @ 8C514F8 - .incbin "graphics/pokemon/front_pics/diglett_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Diglett:: @ 8C51704 - .incbin "graphics/pokemon/palettes/diglett_palette.gbapal.lz" - - .align 2 -gMonBackPic_Diglett:: @ 8C5172C - .incbin "graphics/pokemon/back_pics/diglett_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Diglett:: @ 8C51938 - .incbin "graphics/pokemon/palettes/diglett_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Diglett:: @ 8C51960 - .incbin "graphics/pokemon/icons/diglett_icon.4bpp" - - .align 2 -gMonFootprint_Diglett:: @ 8C51D60 - .incbin "graphics/pokemon/footprints/diglett_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dugtrio:: @ 8C51D80 - .incbin "graphics/pokemon/front_pics/dugtrio_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dugtrio:: @ 8C520A4 - .incbin "graphics/pokemon/palettes/dugtrio_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dugtrio:: @ 8C520CC - .incbin "graphics/pokemon/back_pics/dugtrio_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dugtrio:: @ 8C52378 - .incbin "graphics/pokemon/palettes/dugtrio_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dugtrio:: @ 8C523A0 - .incbin "graphics/pokemon/icons/dugtrio_icon.4bpp" - - .align 2 -gMonFootprint_Dugtrio:: @ 8C527A0 - .incbin "graphics/pokemon/footprints/dugtrio_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Meowth:: @ 8C527C0 - .incbin "graphics/pokemon/front_pics/meowth_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Meowth:: @ 8C52AAC - .incbin "graphics/pokemon/palettes/meowth_palette.gbapal.lz" - - .align 2 -gMonBackPic_Meowth:: @ 8C52AD4 - .incbin "graphics/pokemon/back_pics/meowth_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Meowth:: @ 8C52DB8 - .incbin "graphics/pokemon/palettes/meowth_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Meowth:: @ 8C52DE0 - .incbin "graphics/pokemon/icons/meowth_icon.4bpp" - - .align 2 -gMonFootprint_Meowth:: @ 8C531E0 - .incbin "graphics/pokemon/footprints/meowth_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Persian:: @ 8C53200 - .incbin "graphics/pokemon/front_pics/persian_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Persian:: @ 8C535B4 - .incbin "graphics/pokemon/palettes/persian_palette.gbapal.lz" - - .align 2 -gMonBackPic_Persian:: @ 8C535DC - .incbin "graphics/pokemon/back_pics/persian_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Persian:: @ 8C53940 - .incbin "graphics/pokemon/palettes/persian_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Persian:: @ 8C53968 - .incbin "graphics/pokemon/icons/persian_icon.4bpp" - - .align 2 -gMonFootprint_Persian:: @ 8C53D68 - .incbin "graphics/pokemon/footprints/persian_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Psyduck:: @ 8C53D88 - .incbin "graphics/pokemon/front_pics/psyduck_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Psyduck:: @ 8C54060 - .incbin "graphics/pokemon/palettes/psyduck_palette.gbapal.lz" - - .align 2 -gMonBackPic_Psyduck:: @ 8C54088 - .incbin "graphics/pokemon/back_pics/psyduck_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Psyduck:: @ 8C54324 - .incbin "graphics/pokemon/palettes/psyduck_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Psyduck:: @ 8C5434C - .incbin "graphics/pokemon/icons/psyduck_icon.4bpp" - - .align 2 -gMonFootprint_Psyduck:: @ 8C5474C - .incbin "graphics/pokemon/footprints/psyduck_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Golduck:: @ 8C5476C - .incbin "graphics/pokemon/front_pics/golduck_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Golduck:: @ 8C54B44 - .incbin "graphics/pokemon/palettes/golduck_palette.gbapal.lz" - - .align 2 -gMonBackPic_Golduck:: @ 8C54B6C - .incbin "graphics/pokemon/back_pics/golduck_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Golduck:: @ 8C54E98 - .incbin "graphics/pokemon/palettes/golduck_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Golduck:: @ 8C54EC0 - .incbin "graphics/pokemon/icons/golduck_icon.4bpp" - - .align 2 -gMonFootprint_Golduck:: @ 8C552C0 - .incbin "graphics/pokemon/footprints/golduck_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mankey:: @ 8C552E0 - .incbin "graphics/pokemon/front_pics/mankey_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mankey:: @ 8C555F8 - .incbin "graphics/pokemon/palettes/mankey_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mankey:: @ 8C55620 - .incbin "graphics/pokemon/back_pics/mankey_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mankey:: @ 8C55988 - .incbin "graphics/pokemon/palettes/mankey_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mankey:: @ 8C559B0 - .incbin "graphics/pokemon/icons/mankey_icon.4bpp" - - .align 2 -gMonFootprint_Mankey:: @ 8C55DB0 - .incbin "graphics/pokemon/footprints/mankey_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Primeape:: @ 8C55DD0 - .incbin "graphics/pokemon/front_pics/primeape_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Primeape:: @ 8C56180 - .incbin "graphics/pokemon/palettes/primeape_palette.gbapal.lz" - - .align 2 -gMonBackPic_Primeape:: @ 8C561A8 - .incbin "graphics/pokemon/back_pics/primeape_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Primeape:: @ 8C56518 - .incbin "graphics/pokemon/palettes/primeape_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Primeape:: @ 8C56540 - .incbin "graphics/pokemon/icons/primeape_icon.4bpp" - - .align 2 -gMonFootprint_Primeape:: @ 8C56940 - .incbin "graphics/pokemon/footprints/primeape_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Growlithe:: @ 8C56960 - .incbin "graphics/pokemon/front_pics/growlithe_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Growlithe:: @ 8C56CB8 - .incbin "graphics/pokemon/palettes/growlithe_palette.gbapal.lz" - - .align 2 -gMonBackPic_Growlithe:: @ 8C56CE0 - .incbin "graphics/pokemon/back_pics/growlithe_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Growlithe:: @ 8C5701C - .incbin "graphics/pokemon/palettes/growlithe_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Growlithe:: @ 8C57044 - .incbin "graphics/pokemon/icons/growlithe_icon.4bpp" - - .align 2 -gMonFootprint_Growlithe:: @ 8C57444 - .incbin "graphics/pokemon/footprints/growlithe_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Arcanine:: @ 8C57464 - .incbin "graphics/pokemon/front_pics/arcanine_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Arcanine:: @ 8C57998 - .incbin "graphics/pokemon/palettes/arcanine_palette.gbapal.lz" - - .align 2 -gMonBackPic_Arcanine:: @ 8C579C0 - .incbin "graphics/pokemon/back_pics/arcanine_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Arcanine:: @ 8C57DA0 - .incbin "graphics/pokemon/palettes/arcanine_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Arcanine:: @ 8C57DC8 - .incbin "graphics/pokemon/icons/arcanine_icon.4bpp" - - .align 2 -gMonFootprint_Arcanine:: @ 8C581C8 - .incbin "graphics/pokemon/footprints/arcanine_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Poliwag:: @ 8C581E8 - .incbin "graphics/pokemon/front_pics/poliwag_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Poliwag:: @ 8C58470 - .incbin "graphics/pokemon/palettes/poliwag_palette.gbapal.lz" - - .align 2 -gMonBackPic_Poliwag:: @ 8C58498 - .incbin "graphics/pokemon/back_pics/poliwag_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwag:: @ 8C58708 - .incbin "graphics/pokemon/palettes/poliwag_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Poliwag:: @ 8C58730 - .incbin "graphics/pokemon/icons/poliwag_icon.4bpp" - - .align 2 -gMonFootprint_Poliwag:: @ 8C58B30 - .incbin "graphics/pokemon/footprints/poliwag_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Poliwhirl:: @ 8C58B50 - .incbin "graphics/pokemon/front_pics/poliwhirl_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Poliwhirl:: @ 8C58F14 - .incbin "graphics/pokemon/palettes/poliwhirl_palette.gbapal.lz" - - .align 2 -gMonBackPic_Poliwhirl:: @ 8C58F3C - .incbin "graphics/pokemon/back_pics/poliwhirl_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwhirl:: @ 8C591FC - .incbin "graphics/pokemon/palettes/poliwhirl_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Poliwhirl:: @ 8C59224 - .incbin "graphics/pokemon/icons/poliwhirl_icon.4bpp" - - .align 2 -gMonFootprint_Poliwhirl:: @ 8C59624 - .incbin "graphics/pokemon/footprints/poliwhirl_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Poliwrath:: @ 8C59644 - .incbin "graphics/pokemon/front_pics/poliwrath_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Poliwrath:: @ 8C59A0C - .incbin "graphics/pokemon/palettes/poliwrath_palette.gbapal.lz" - - .align 2 -gMonBackPic_Poliwrath:: @ 8C59A34 - .incbin "graphics/pokemon/back_pics/poliwrath_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Poliwrath:: @ 8C59D54 - .incbin "graphics/pokemon/palettes/poliwrath_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Poliwrath:: @ 8C59D7C - .incbin "graphics/pokemon/icons/poliwrath_icon.4bpp" - - .align 2 -gMonFootprint_Poliwrath:: @ 8C5A17C - .incbin "graphics/pokemon/footprints/poliwrath_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Abra:: @ 8C5A19C - .incbin "graphics/pokemon/front_pics/abra_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Abra:: @ 8C5A480 - .incbin "graphics/pokemon/palettes/abra_palette.gbapal.lz" - - .align 2 -gMonBackPic_Abra:: @ 8C5A4A4 - .incbin "graphics/pokemon/back_pics/abra_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Abra:: @ 8C5A7B8 - .incbin "graphics/pokemon/palettes/abra_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Abra:: @ 8C5A7DC - .incbin "graphics/pokemon/icons/abra_icon.4bpp" - - .align 2 -gMonFootprint_Abra:: @ 8C5ABDC - .incbin "graphics/pokemon/footprints/abra_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kadabra:: @ 8C5ABFC - .incbin "graphics/pokemon/front_pics/kadabra_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kadabra:: @ 8C5B060 - .incbin "graphics/pokemon/palettes/kadabra_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kadabra:: @ 8C5B088 - .incbin "graphics/pokemon/back_pics/kadabra_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kadabra:: @ 8C5B464 - .incbin "graphics/pokemon/palettes/kadabra_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kadabra:: @ 8C5B48C - .incbin "graphics/pokemon/icons/kadabra_icon.4bpp" - - .align 2 -gMonFootprint_Kadabra:: @ 8C5B88C - .incbin "graphics/pokemon/footprints/kadabra_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Alakazam:: @ 8C5B8AC - .incbin "graphics/pokemon/front_pics/alakazam_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Alakazam:: @ 8C5BCA8 - .incbin "graphics/pokemon/palettes/alakazam_palette.gbapal.lz" - - .align 2 -gMonBackPic_Alakazam:: @ 8C5BCD0 - .incbin "graphics/pokemon/back_pics/alakazam_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Alakazam:: @ 8C5C114 - .incbin "graphics/pokemon/palettes/alakazam_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Alakazam:: @ 8C5C13C - .incbin "graphics/pokemon/icons/alakazam_icon.4bpp" - - .align 2 -gMonFootprint_Alakazam:: @ 8C5C53C - .incbin "graphics/pokemon/footprints/alakazam_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Machop:: @ 8C5C55C - .incbin "graphics/pokemon/front_pics/machop_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Machop:: @ 8C5C800 - .incbin "graphics/pokemon/palettes/machop_palette.gbapal.lz" - - .align 2 -gMonBackPic_Machop:: @ 8C5C828 - .incbin "graphics/pokemon/back_pics/machop_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Machop:: @ 8C5CB08 - .incbin "graphics/pokemon/palettes/machop_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Machop:: @ 8C5CB30 - .incbin "graphics/pokemon/icons/machop_icon.4bpp" - - .align 2 -gMonFootprint_Machop:: @ 8C5CF30 - .incbin "graphics/pokemon/footprints/machop_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Machoke:: @ 8C5CF50 - .incbin "graphics/pokemon/front_pics/machoke_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Machoke:: @ 8C5D300 - .incbin "graphics/pokemon/palettes/machoke_palette.gbapal.lz" - - .align 2 -gMonBackPic_Machoke:: @ 8C5D328 - .incbin "graphics/pokemon/back_pics/machoke_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Machoke:: @ 8C5D678 - .incbin "graphics/pokemon/palettes/machoke_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Machoke:: @ 8C5D6A0 - .incbin "graphics/pokemon/icons/machoke_icon.4bpp" - - .align 2 -gMonFootprint_Machoke:: @ 8C5DAA0 - .incbin "graphics/pokemon/footprints/machoke_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Machamp:: @ 8C5DAC0 - .incbin "graphics/pokemon/front_pics/machamp_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Machamp:: @ 8C5E010 - .incbin "graphics/pokemon/palettes/machamp_palette.gbapal.lz" - - .align 2 -gMonBackPic_Machamp:: @ 8C5E038 - .incbin "graphics/pokemon/back_pics/machamp_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Machamp:: @ 8C5E494 - .incbin "graphics/pokemon/palettes/machamp_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Machamp:: @ 8C5E4BC - .incbin "graphics/pokemon/icons/machamp_icon.4bpp" - - .align 2 -gMonFootprint_Machamp:: @ 8C5E8BC - .incbin "graphics/pokemon/footprints/machamp_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Bellsprout:: @ 8C5E8DC - .incbin "graphics/pokemon/front_pics/bellsprout_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Bellsprout:: @ 8C5EB5C - .incbin "graphics/pokemon/palettes/bellsprout_palette.gbapal.lz" - - .align 2 -gMonBackPic_Bellsprout:: @ 8C5EB84 - .incbin "graphics/pokemon/back_pics/bellsprout_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Bellsprout:: @ 8C5EE20 - .incbin "graphics/pokemon/palettes/bellsprout_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Bellsprout:: @ 8C5EE48 - .incbin "graphics/pokemon/icons/bellsprout_icon.4bpp" - - .align 2 -gMonFootprint_Bellsprout:: @ 8C5F248 - .incbin "graphics/pokemon/footprints/bellsprout_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Weepinbell:: @ 8C5F268 - .incbin "graphics/pokemon/front_pics/weepinbell_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Weepinbell:: @ 8C5F58C - .incbin "graphics/pokemon/palettes/weepinbell_palette.gbapal.lz" - - .align 2 -gMonBackPic_Weepinbell:: @ 8C5F5B4 - .incbin "graphics/pokemon/back_pics/weepinbell_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Weepinbell:: @ 8C5F8B0 - .incbin "graphics/pokemon/palettes/weepinbell_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Weepinbell:: @ 8C5F8D8 - .incbin "graphics/pokemon/icons/weepinbell_icon.4bpp" - - .align 2 -gMonFootprint_Weepinbell:: @ 8C5FCD8 - .incbin "graphics/pokemon/footprints/weepinbell_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Victreebel:: @ 8C5FCF8 - .incbin "graphics/pokemon/front_pics/victreebel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Victreebel:: @ 8C60124 - .incbin "graphics/pokemon/palettes/victreebel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Victreebel:: @ 8C6014C - .incbin "graphics/pokemon/back_pics/victreebel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Victreebel:: @ 8C604E4 - .incbin "graphics/pokemon/palettes/victreebel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Victreebel:: @ 8C6050C - .incbin "graphics/pokemon/icons/victreebel_icon.4bpp" - - .align 2 -gMonFootprint_Victreebel:: @ 8C6090C - .incbin "graphics/pokemon/footprints/victreebel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tentacool:: @ 8C6092C - .incbin "graphics/pokemon/front_pics/tentacool_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tentacool:: @ 8C60BCC - .incbin "graphics/pokemon/palettes/tentacool_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tentacool:: @ 8C60BF4 - .incbin "graphics/pokemon/back_pics/tentacool_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tentacool:: @ 8C60EC0 - .incbin "graphics/pokemon/palettes/tentacool_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tentacool:: @ 8C60EE8 - .incbin "graphics/pokemon/icons/tentacool_icon.4bpp" - - .align 2 -gMonFootprint_Tentacool:: @ 8C612E8 - .incbin "graphics/pokemon/footprints/tentacool_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tentacruel:: @ 8C61308 - .incbin "graphics/pokemon/front_pics/tentacruel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tentacruel:: @ 8C617A4 - .incbin "graphics/pokemon/palettes/tentacruel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tentacruel:: @ 8C617CC - .incbin "graphics/pokemon/back_pics/tentacruel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tentacruel:: @ 8C61B68 - .incbin "graphics/pokemon/palettes/tentacruel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tentacruel:: @ 8C61B90 - .incbin "graphics/pokemon/icons/tentacruel_icon.4bpp" - - .align 2 -gMonFootprint_Tentacruel:: @ 8C61F90 - .incbin "graphics/pokemon/footprints/tentacruel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Geodude:: @ 8C61FB0 - .incbin "graphics/pokemon/front_pics/geodude_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Geodude:: @ 8C6221C - .incbin "graphics/pokemon/palettes/geodude_palette.gbapal.lz" - - .align 2 -gMonBackPic_Geodude:: @ 8C62238 - .incbin "graphics/pokemon/back_pics/geodude_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Geodude:: @ 8C624CC - .incbin "graphics/pokemon/palettes/geodude_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Geodude:: @ 8C624E8 - .incbin "graphics/pokemon/icons/geodude_icon.4bpp" - - .align 2 -gMonFootprint_Geodude:: @ 8C628E8 - .incbin "graphics/pokemon/footprints/geodude_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Graveler:: @ 8C62908 - .incbin "graphics/pokemon/front_pics/graveler_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Graveler:: @ 8C62D10 - .incbin "graphics/pokemon/palettes/graveler_palette.gbapal.lz" - - .align 2 -gMonBackPic_Graveler:: @ 8C62D30 - .incbin "graphics/pokemon/back_pics/graveler_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Graveler:: @ 8C62FAC - .incbin "graphics/pokemon/palettes/graveler_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Graveler:: @ 8C62FCC - .incbin "graphics/pokemon/icons/graveler_icon.4bpp" - - .align 2 -gMonFootprint_Graveler:: @ 8C633CC - .incbin "graphics/pokemon/footprints/graveler_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Golem:: @ 8C633EC - .incbin "graphics/pokemon/front_pics/golem_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Golem:: @ 8C63868 - .incbin "graphics/pokemon/palettes/golem_palette.gbapal.lz" - - .align 2 -gMonBackPic_Golem:: @ 8C63890 - .incbin "graphics/pokemon/back_pics/golem_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Golem:: @ 8C63B50 - .incbin "graphics/pokemon/palettes/golem_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Golem:: @ 8C63B78 - .incbin "graphics/pokemon/icons/golem_icon.4bpp" - - .align 2 -gMonFootprint_Golem:: @ 8C63F78 - .incbin "graphics/pokemon/footprints/golem_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ponyta:: @ 8C63F98 - .incbin "graphics/pokemon/front_pics/ponyta_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ponyta:: @ 8C64340 - .incbin "graphics/pokemon/palettes/ponyta_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ponyta:: @ 8C64368 - .incbin "graphics/pokemon/back_pics/ponyta_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ponyta:: @ 8C646A4 - .incbin "graphics/pokemon/palettes/ponyta_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ponyta:: @ 8C646CC - .incbin "graphics/pokemon/icons/ponyta_icon.4bpp" - - .align 2 -gMonFootprint_Ponyta:: @ 8C64ACC - .incbin "graphics/pokemon/footprints/ponyta_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Rapidash:: @ 8C64AEC - .incbin "graphics/pokemon/front_pics/rapidash_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Rapidash:: @ 8C64FBC - .incbin "graphics/pokemon/palettes/rapidash_palette.gbapal.lz" - - .align 2 -gMonBackPic_Rapidash:: @ 8C64FE4 - .incbin "graphics/pokemon/back_pics/rapidash_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Rapidash:: @ 8C653F4 - .incbin "graphics/pokemon/palettes/rapidash_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Rapidash:: @ 8C6541C - .incbin "graphics/pokemon/icons/rapidash_icon.4bpp" - - .align 2 -gMonFootprint_Rapidash:: @ 8C6581C - .incbin "graphics/pokemon/footprints/rapidash_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slowpoke:: @ 8C6583C - .incbin "graphics/pokemon/front_pics/slowpoke_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slowpoke:: @ 8C65B48 - .incbin "graphics/pokemon/palettes/slowpoke_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slowpoke:: @ 8C65B70 - .incbin "graphics/pokemon/back_pics/slowpoke_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowpoke:: @ 8C65DD4 - .incbin "graphics/pokemon/palettes/slowpoke_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slowpoke:: @ 8C65DFC - .incbin "graphics/pokemon/icons/slowpoke_icon.4bpp" - - .align 2 -gMonFootprint_Slowpoke:: @ 8C661FC - .incbin "graphics/pokemon/footprints/slowpoke_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slowbro:: @ 8C6621C - .incbin "graphics/pokemon/front_pics/slowbro_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slowbro:: @ 8C666DC - .incbin "graphics/pokemon/palettes/slowbro_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slowbro:: @ 8C66704 - .incbin "graphics/pokemon/back_pics/slowbro_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowbro:: @ 8C66AA0 - .incbin "graphics/pokemon/palettes/slowbro_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slowbro:: @ 8C66AC8 - .incbin "graphics/pokemon/icons/slowbro_icon.4bpp" - - .align 2 -gMonFootprint_Slowbro:: @ 8C66EC8 - .incbin "graphics/pokemon/footprints/slowbro_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magnemite:: @ 8C66EE8 - .incbin "graphics/pokemon/front_pics/magnemite_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magnemite:: @ 8C670C0 - .incbin "graphics/pokemon/palettes/magnemite_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magnemite:: @ 8C670E8 - .incbin "graphics/pokemon/back_pics/magnemite_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magnemite:: @ 8C672D0 - .incbin "graphics/pokemon/palettes/magnemite_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magnemite:: @ 8C672F4 - .incbin "graphics/pokemon/icons/magnemite_icon.4bpp" - - .align 2 -gMonFootprint_Magnemite:: @ 8C676F4 - .incbin "graphics/pokemon/footprints/magnemite_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magneton:: @ 8C67714 - .incbin "graphics/pokemon/front_pics/magneton_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magneton:: @ 8C67B18 - .incbin "graphics/pokemon/palettes/magneton_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magneton:: @ 8C67B40 - .incbin "graphics/pokemon/back_pics/magneton_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magneton:: @ 8C67EC0 - .incbin "graphics/pokemon/palettes/magneton_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magneton:: @ 8C67EE8 - .incbin "graphics/pokemon/icons/magneton_icon.4bpp" - - .align 2 -gMonFootprint_Magneton:: @ 8C682E8 - .incbin "graphics/pokemon/footprints/magneton_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Farfetchd:: @ 8C68308 - .incbin "graphics/pokemon/front_pics/farfetch_d_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Farfetchd:: @ 8C68684 - .incbin "graphics/pokemon/palettes/farfetch_d_palette.gbapal.lz" - - .align 2 -gMonBackPic_Farfetchd:: @ 8C686AC - .incbin "graphics/pokemon/back_pics/farfetch_d_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Farfetchd:: @ 8C68A18 - .incbin "graphics/pokemon/palettes/farfetch_d_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Farfetchd:: @ 8C68A40 - .incbin "graphics/pokemon/icons/farfetch_d_icon.4bpp" - - .align 2 -gMonFootprint_Farfetchd:: @ 8C68E40 - .incbin "graphics/pokemon/footprints/farfetch_d_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Doduo:: @ 8C68E60 - .incbin "graphics/pokemon/front_pics/doduo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Doduo:: @ 8C691B4 - .incbin "graphics/pokemon/palettes/doduo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Doduo:: @ 8C691D8 - .incbin "graphics/pokemon/back_pics/doduo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Doduo:: @ 8C694F0 - .incbin "graphics/pokemon/palettes/doduo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Doduo:: @ 8C69514 - .incbin "graphics/pokemon/icons/doduo_icon.4bpp" - - .align 2 -gMonFootprint_Doduo:: @ 8C69914 - .incbin "graphics/pokemon/footprints/doduo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dodrio:: @ 8C69934 - .incbin "graphics/pokemon/front_pics/dodrio_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dodrio:: @ 8C69E10 - .incbin "graphics/pokemon/palettes/dodrio_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dodrio:: @ 8C69E38 - .incbin "graphics/pokemon/back_pics/dodrio_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dodrio:: @ 8C6A29C - .incbin "graphics/pokemon/palettes/dodrio_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dodrio:: @ 8C6A2C4 - .incbin "graphics/pokemon/icons/dodrio_icon.4bpp" - - .align 2 -gMonFootprint_Dodrio:: @ 8C6A6C4 - .incbin "graphics/pokemon/footprints/dodrio_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Seel:: @ 8C6A6E4 - .incbin "graphics/pokemon/front_pics/seel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Seel:: @ 8C6A9EC - .incbin "graphics/pokemon/palettes/seel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Seel:: @ 8C6AA14 - .incbin "graphics/pokemon/back_pics/seel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Seel:: @ 8C6AD00 - .incbin "graphics/pokemon/palettes/seel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Seel:: @ 8C6AD28 - .incbin "graphics/pokemon/icons/seel_icon.4bpp" - - .align 2 -gMonFootprint_Seel:: @ 8C6B128 - .incbin "graphics/pokemon/footprints/seel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dewgong:: @ 8C6B148 - .incbin "graphics/pokemon/front_pics/dewgong_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dewgong:: @ 8C6B510 - .incbin "graphics/pokemon/palettes/dewgong_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dewgong:: @ 8C6B530 - .incbin "graphics/pokemon/back_pics/dewgong_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dewgong:: @ 8C6B7C4 - .incbin "graphics/pokemon/palettes/dewgong_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dewgong:: @ 8C6B7E4 - .incbin "graphics/pokemon/icons/dewgong_icon.4bpp" - - .align 2 -gMonFootprint_Dewgong:: @ 8C6BBE4 - .incbin "graphics/pokemon/footprints/dewgong_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Grimer:: @ 8C6BC04 - .incbin "graphics/pokemon/front_pics/grimer_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Grimer:: @ 8C6BF20 - .incbin "graphics/pokemon/palettes/grimer_palette.gbapal.lz" - - .align 2 -gMonBackPic_Grimer:: @ 8C6BF44 - .incbin "graphics/pokemon/back_pics/grimer_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Grimer:: @ 8C6C228 - .incbin "graphics/pokemon/palettes/grimer_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Grimer:: @ 8C6C24C - .incbin "graphics/pokemon/icons/grimer_icon.4bpp" - - .align 2 -gMonFootprint_Grimer:: @ 8C6C64C - .incbin "graphics/pokemon/footprints/grimer_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Muk:: @ 8C6C66C - .incbin "graphics/pokemon/front_pics/muk_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Muk:: @ 8C6CAB8 - .incbin "graphics/pokemon/palettes/muk_palette.gbapal.lz" - - .align 2 -gMonBackPic_Muk:: @ 8C6CADC - .incbin "graphics/pokemon/back_pics/muk_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Muk:: @ 8C6CE34 - .incbin "graphics/pokemon/palettes/muk_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Muk:: @ 8C6CE58 - .incbin "graphics/pokemon/icons/muk_icon.4bpp" - - .align 2 -gMonFootprint_Muk:: @ 8C6D258 - .incbin "graphics/pokemon/footprints/muk_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shellder:: @ 8C6D278 - .incbin "graphics/pokemon/front_pics/shellder_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shellder:: @ 8C6D4E0 - .incbin "graphics/pokemon/palettes/shellder_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shellder:: @ 8C6D504 - .incbin "graphics/pokemon/back_pics/shellder_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shellder:: @ 8C6D818 - .incbin "graphics/pokemon/palettes/shellder_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shellder:: @ 8C6D83C - .incbin "graphics/pokemon/icons/shellder_icon.4bpp" - - .align 2 -gMonFootprint_Shellder:: @ 8C6DC3C - .incbin "graphics/pokemon/footprints/shellder_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cloyster:: @ 8C6DC5C - .incbin "graphics/pokemon/front_pics/cloyster_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cloyster:: @ 8C6E094 - .incbin "graphics/pokemon/palettes/cloyster_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cloyster:: @ 8C6E0B8 - .incbin "graphics/pokemon/back_pics/cloyster_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cloyster:: @ 8C6E4C4 - .incbin "graphics/pokemon/palettes/cloyster_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cloyster:: @ 8C6E4E8 - .incbin "graphics/pokemon/icons/cloyster_icon.4bpp" - - .align 2 -gMonFootprint_Cloyster:: @ 8C6E8E8 - .incbin "graphics/pokemon/footprints/cloyster_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gastly:: @ 8C6E908 - .incbin "graphics/pokemon/front_pics/gastly_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gastly:: @ 8C6ECC0 - .incbin "graphics/pokemon/palettes/gastly_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gastly:: @ 8C6ECE8 - .incbin "graphics/pokemon/back_pics/gastly_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gastly:: @ 8C6F00C - .incbin "graphics/pokemon/palettes/gastly_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gastly:: @ 8C6F034 - .incbin "graphics/pokemon/icons/gastly_icon.4bpp" - - .align 2 -gMonFootprint_Gastly:: @ 8C6F434 - .incbin "graphics/pokemon/footprints/gastly_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Haunter:: @ 8C6F454 - .incbin "graphics/pokemon/front_pics/haunter_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Haunter:: @ 8C6F854 - .incbin "graphics/pokemon/palettes/haunter_palette.gbapal.lz" - - .align 2 -gMonBackPic_Haunter:: @ 8C6F878 - .incbin "graphics/pokemon/back_pics/haunter_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Haunter:: @ 8C6FBA0 - .incbin "graphics/pokemon/palettes/haunter_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Haunter:: @ 8C6FBC4 - .incbin "graphics/pokemon/icons/haunter_icon.4bpp" - - .align 2 -gMonFootprint_Haunter:: @ 8C6FFC4 - .incbin "graphics/pokemon/footprints/haunter_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gengar:: @ 8C6FFE4 - .incbin "graphics/pokemon/front_pics/gengar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gengar:: @ 8C70380 - .incbin "graphics/pokemon/palettes/gengar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gengar:: @ 8C703A4 - .incbin "graphics/pokemon/back_pics/gengar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gengar:: @ 8C7068C - .incbin "graphics/pokemon/palettes/gengar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gengar:: @ 8C706B0 - .incbin "graphics/pokemon/icons/gengar_icon.4bpp" - - .align 2 -gMonFootprint_Gengar:: @ 8C70AB0 - .incbin "graphics/pokemon/footprints/gengar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Onix:: @ 8C70AD0 - .incbin "graphics/pokemon/front_pics/onix_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Onix:: @ 8C70F48 - .incbin "graphics/pokemon/palettes/onix_palette.gbapal.lz" - - .align 2 -gMonBackPic_Onix:: @ 8C70F64 - .incbin "graphics/pokemon/back_pics/onix_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Onix:: @ 8C712E0 - .incbin "graphics/pokemon/palettes/onix_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Onix:: @ 8C712FC - .incbin "graphics/pokemon/icons/onix_icon.4bpp" - - .align 2 -gMonFootprint_Onix:: @ 8C716FC - .incbin "graphics/pokemon/footprints/onix_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Drowzee:: @ 8C7171C - .incbin "graphics/pokemon/front_pics/drowzee_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Drowzee:: @ 8C71A94 - .incbin "graphics/pokemon/palettes/drowzee_palette.gbapal.lz" - - .align 2 -gMonBackPic_Drowzee:: @ 8C71AB8 - .incbin "graphics/pokemon/back_pics/drowzee_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Drowzee:: @ 8C71D14 - .incbin "graphics/pokemon/palettes/drowzee_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Drowzee:: @ 8C71D38 - .incbin "graphics/pokemon/icons/drowzee_icon.4bpp" - - .align 2 -gMonFootprint_Drowzee:: @ 8C72138 - .incbin "graphics/pokemon/footprints/drowzee_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hypno:: @ 8C72158 - .incbin "graphics/pokemon/front_pics/hypno_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hypno:: @ 8C72544 - .incbin "graphics/pokemon/palettes/hypno_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hypno:: @ 8C72568 - .incbin "graphics/pokemon/back_pics/hypno_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hypno:: @ 8C72898 - .incbin "graphics/pokemon/palettes/hypno_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hypno:: @ 8C728BC - .incbin "graphics/pokemon/icons/hypno_icon.4bpp" - - .align 2 -gMonFootprint_Hypno:: @ 8C72CBC - .incbin "graphics/pokemon/footprints/hypno_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Krabby:: @ 8C72CDC - .incbin "graphics/pokemon/front_pics/krabby_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Krabby:: @ 8C72F94 - .incbin "graphics/pokemon/palettes/krabby_palette.gbapal.lz" - - .align 2 -gMonBackPic_Krabby:: @ 8C72FBC - .incbin "graphics/pokemon/back_pics/krabby_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Krabby:: @ 8C73348 - .incbin "graphics/pokemon/palettes/krabby_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Krabby:: @ 8C73370 - .incbin "graphics/pokemon/icons/krabby_icon.4bpp" - - .align 2 -gMonFootprint_Krabby:: @ 8C73770 - .incbin "graphics/pokemon/footprints/krabby_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kingler:: @ 8C73790 - .incbin "graphics/pokemon/front_pics/kingler_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kingler:: @ 8C73CC4 - .incbin "graphics/pokemon/palettes/kingler_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kingler:: @ 8C73CE8 - .incbin "graphics/pokemon/back_pics/kingler_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kingler:: @ 8C7406C - .incbin "graphics/pokemon/palettes/kingler_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kingler:: @ 8C74090 - .incbin "graphics/pokemon/icons/kingler_icon.4bpp" - - .align 2 -gMonFootprint_Kingler:: @ 8C74490 - .incbin "graphics/pokemon/footprints/kingler_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Voltorb:: @ 8C744B0 - .incbin "graphics/pokemon/front_pics/voltorb_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Voltorb:: @ 8C746B8 - .incbin "graphics/pokemon/palettes/voltorb_palette.gbapal.lz" - - .align 2 -gMonBackPic_Voltorb:: @ 8C746DC - .incbin "graphics/pokemon/back_pics/voltorb_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Voltorb:: @ 8C74950 - .incbin "graphics/pokemon/palettes/voltorb_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Voltorb:: @ 8C74974 - .incbin "graphics/pokemon/icons/voltorb_icon.4bpp" - - .align 2 -gMonFootprint_Voltorb:: @ 8C74D74 - .incbin "graphics/pokemon/footprints/voltorb_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Electrode:: @ 8C74D94 - .incbin "graphics/pokemon/front_pics/electrode_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Electrode:: @ 8C75000 - .incbin "graphics/pokemon/palettes/electrode_palette.gbapal.lz" - - .align 2 -gMonBackPic_Electrode:: @ 8C75024 - .incbin "graphics/pokemon/back_pics/electrode_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Electrode:: @ 8C75294 - .incbin "graphics/pokemon/palettes/electrode_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Electrode:: @ 8C752B8 - .incbin "graphics/pokemon/icons/electrode_icon.4bpp" - - .align 2 -gMonFootprint_Electrode:: @ 8C756B8 - .incbin "graphics/pokemon/footprints/electrode_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Exeggcute:: @ 8C756D8 - .incbin "graphics/pokemon/front_pics/exeggcute_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Exeggcute:: @ 8C75ADC - .incbin "graphics/pokemon/palettes/exeggcute_palette.gbapal.lz" - - .align 2 -gMonBackPic_Exeggcute:: @ 8C75B00 - .incbin "graphics/pokemon/back_pics/exeggcute_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Exeggcute:: @ 8C75E08 - .incbin "graphics/pokemon/palettes/exeggcute_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Exeggcute:: @ 8C75E2C - .incbin "graphics/pokemon/icons/exeggcute_icon.4bpp" - - .align 2 -gMonFootprint_Exeggcute:: @ 8C7622C - .incbin "graphics/pokemon/footprints/exeggcute_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Exeggutor:: @ 8C7624C - .incbin "graphics/pokemon/front_pics/exeggutor_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Exeggutor:: @ 8C7674C - .incbin "graphics/pokemon/palettes/exeggutor_palette.gbapal.lz" - - .align 2 -gMonBackPic_Exeggutor:: @ 8C76774 - .incbin "graphics/pokemon/back_pics/exeggutor_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Exeggutor:: @ 8C76C14 - .incbin "graphics/pokemon/palettes/exeggutor_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Exeggutor:: @ 8C76C3C - .incbin "graphics/pokemon/icons/exeggutor_icon.4bpp" - - .align 2 -gMonFootprint_Exeggutor:: @ 8C7703C - .incbin "graphics/pokemon/footprints/exeggutor_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cubone:: @ 8C7705C - .incbin "graphics/pokemon/front_pics/cubone_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cubone:: @ 8C7732C - .incbin "graphics/pokemon/palettes/cubone_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cubone:: @ 8C77354 - .incbin "graphics/pokemon/back_pics/cubone_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cubone:: @ 8C77694 - .incbin "graphics/pokemon/palettes/cubone_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cubone:: @ 8C776BC - .incbin "graphics/pokemon/icons/cubone_icon.4bpp" - - .align 2 -gMonFootprint_Cubone:: @ 8C77ABC - .incbin "graphics/pokemon/footprints/cubone_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Marowak:: @ 8C77ADC - .incbin "graphics/pokemon/front_pics/marowak_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Marowak:: @ 8C77E64 - .incbin "graphics/pokemon/palettes/marowak_palette.gbapal.lz" - - .align 2 -gMonBackPic_Marowak:: @ 8C77E8C - .incbin "graphics/pokemon/back_pics/marowak_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Marowak:: @ 8C781D4 - .incbin "graphics/pokemon/palettes/marowak_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Marowak:: @ 8C781FC - .incbin "graphics/pokemon/icons/marowak_icon.4bpp" - - .align 2 -gMonFootprint_Marowak:: @ 8C785FC - .incbin "graphics/pokemon/footprints/marowak_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hitmonlee:: @ 8C7861C - .incbin "graphics/pokemon/front_pics/hitmonlee_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hitmonlee:: @ 8C78A1C - .incbin "graphics/pokemon/palettes/hitmonlee_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hitmonlee:: @ 8C78A44 - .incbin "graphics/pokemon/back_pics/hitmonlee_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmonlee:: @ 8C78CE8 - .incbin "graphics/pokemon/palettes/hitmonlee_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hitmonlee:: @ 8C78D10 - .incbin "graphics/pokemon/icons/hitmonlee_icon.4bpp" - - .align 2 -gMonFootprint_Hitmonlee:: @ 8C79110 - .incbin "graphics/pokemon/footprints/hitmonlee_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hitmonchan:: @ 8C79130 - .incbin "graphics/pokemon/front_pics/hitmonchan_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hitmonchan:: @ 8C79470 - .incbin "graphics/pokemon/palettes/hitmonchan_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hitmonchan:: @ 8C79498 - .incbin "graphics/pokemon/back_pics/hitmonchan_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmonchan:: @ 8C797DC - .incbin "graphics/pokemon/palettes/hitmonchan_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hitmonchan:: @ 8C79804 - .incbin "graphics/pokemon/icons/hitmonchan_icon.4bpp" - - .align 2 -gMonFootprint_Hitmonchan:: @ 8C79C04 - .incbin "graphics/pokemon/footprints/hitmonchan_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lickitung:: @ 8C79C24 - .incbin "graphics/pokemon/front_pics/lickitung_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lickitung:: @ 8C79FDC - .incbin "graphics/pokemon/palettes/lickitung_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lickitung:: @ 8C7A004 - .incbin "graphics/pokemon/back_pics/lickitung_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lickitung:: @ 8C7A2C4 - .incbin "graphics/pokemon/palettes/lickitung_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lickitung:: @ 8C7A2EC - .incbin "graphics/pokemon/icons/lickitung_icon.4bpp" - - .align 2 -gMonFootprint_Lickitung:: @ 8C7A6EC - .incbin "graphics/pokemon/footprints/lickitung_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Koffing:: @ 8C7A70C - .incbin "graphics/pokemon/front_pics/koffing_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Koffing:: @ 8C7AA68 - .incbin "graphics/pokemon/palettes/koffing_palette.gbapal.lz" - - .align 2 -gMonBackPic_Koffing:: @ 8C7AA90 - .incbin "graphics/pokemon/back_pics/koffing_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Koffing:: @ 8C7AD90 - .incbin "graphics/pokemon/palettes/koffing_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Koffing:: @ 8C7ADB8 - .incbin "graphics/pokemon/icons/koffing_icon.4bpp" - - .align 2 -gMonFootprint_Koffing:: @ 8C7B1B8 - .incbin "graphics/pokemon/footprints/koffing_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Weezing:: @ 8C7B1D8 - .incbin "graphics/pokemon/front_pics/weezing_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Weezing:: @ 8C7B660 - .incbin "graphics/pokemon/palettes/weezing_palette.gbapal.lz" - - .align 2 -gMonBackPic_Weezing:: @ 8C7B688 - .incbin "graphics/pokemon/back_pics/weezing_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Weezing:: @ 8C7B9B8 - .incbin "graphics/pokemon/palettes/weezing_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Weezing:: @ 8C7B9E0 - .incbin "graphics/pokemon/icons/weezing_icon.4bpp" - - .align 2 -gMonFootprint_Weezing:: @ 8C7BDE0 - .incbin "graphics/pokemon/footprints/weezing_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Rhyhorn:: @ 8C7BE00 - .incbin "graphics/pokemon/front_pics/rhyhorn_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Rhyhorn:: @ 8C7C204 - .incbin "graphics/pokemon/palettes/rhyhorn_palette.gbapal.lz" - - .align 2 -gMonBackPic_Rhyhorn:: @ 8C7C224 - .incbin "graphics/pokemon/back_pics/rhyhorn_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Rhyhorn:: @ 8C7C56C - .incbin "graphics/pokemon/palettes/rhyhorn_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Rhyhorn:: @ 8C7C58C - .incbin "graphics/pokemon/icons/rhyhorn_icon.4bpp" - - .align 2 -gMonFootprint_Rhyhorn:: @ 8C7C98C - .incbin "graphics/pokemon/footprints/rhyhorn_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Rhydon:: @ 8C7C9AC - .incbin "graphics/pokemon/front_pics/rhydon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Rhydon:: @ 8C7CEB4 - .incbin "graphics/pokemon/palettes/rhydon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Rhydon:: @ 8C7CEDC - .incbin "graphics/pokemon/back_pics/rhydon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Rhydon:: @ 8C7D32C - .incbin "graphics/pokemon/palettes/rhydon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Rhydon:: @ 8C7D354 - .incbin "graphics/pokemon/icons/rhydon_icon.4bpp" - - .align 2 -gMonFootprint_Rhydon:: @ 8C7D754 - .incbin "graphics/pokemon/footprints/rhydon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Chansey:: @ 8C7D774 - .incbin "graphics/pokemon/front_pics/chansey_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Chansey:: @ 8C7DAC8 - .incbin "graphics/pokemon/palettes/chansey_palette.gbapal.lz" - - .align 2 -gMonBackPic_Chansey:: @ 8C7DAEC - .incbin "graphics/pokemon/back_pics/chansey_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Chansey:: @ 8C7DDC0 - .incbin "graphics/pokemon/palettes/chansey_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Chansey:: @ 8C7DDE4 - .incbin "graphics/pokemon/icons/chansey_icon.4bpp" - - .align 2 -gMonFootprint_Chansey:: @ 8C7E1E4 - .incbin "graphics/pokemon/footprints/chansey_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tangela:: @ 8C7E204 - .incbin "graphics/pokemon/front_pics/tangela_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tangela:: @ 8C7E5D8 - .incbin "graphics/pokemon/palettes/tangela_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tangela:: @ 8C7E5FC - .incbin "graphics/pokemon/back_pics/tangela_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tangela:: @ 8C7E9A8 - .incbin "graphics/pokemon/palettes/tangela_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tangela:: @ 8C7E9CC - .incbin "graphics/pokemon/icons/tangela_icon.4bpp" - - .align 2 -gMonFootprint_Tangela:: @ 8C7EDCC - .incbin "graphics/pokemon/footprints/tangela_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kangaskhan:: @ 8C7EDEC - .incbin "graphics/pokemon/front_pics/kangaskhan_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kangaskhan:: @ 8C7F2E4 - .incbin "graphics/pokemon/palettes/kangaskhan_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kangaskhan:: @ 8C7F30C - .incbin "graphics/pokemon/back_pics/kangaskhan_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kangaskhan:: @ 8C7F73C - .incbin "graphics/pokemon/palettes/kangaskhan_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kangaskhan:: @ 8C7F764 - .incbin "graphics/pokemon/icons/kangaskhan_icon.4bpp" - - .align 2 -gMonFootprint_Kangaskhan:: @ 8C7FB64 - .incbin "graphics/pokemon/footprints/kangaskhan_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Horsea:: @ 8C7FB84 - .incbin "graphics/pokemon/front_pics/horsea_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Horsea:: @ 8C7FDFC - .incbin "graphics/pokemon/palettes/horsea_palette.gbapal.lz" - - .align 2 -gMonBackPic_Horsea:: @ 8C7FE24 - .incbin "graphics/pokemon/back_pics/horsea_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Horsea:: @ 8C80104 - .incbin "graphics/pokemon/palettes/horsea_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Horsea:: @ 8C8012C - .incbin "graphics/pokemon/icons/horsea_icon.4bpp" - - .align 2 -gMonFootprint_Horsea:: @ 8C8052C - .incbin "graphics/pokemon/footprints/horsea_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Seadra:: @ 8C8054C - .incbin "graphics/pokemon/front_pics/seadra_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Seadra:: @ 8C8090C - .incbin "graphics/pokemon/palettes/seadra_palette.gbapal.lz" - - .align 2 -gMonBackPic_Seadra:: @ 8C80934 - .incbin "graphics/pokemon/back_pics/seadra_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Seadra:: @ 8C80CD4 - .incbin "graphics/pokemon/palettes/seadra_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Seadra:: @ 8C80CFC - .incbin "graphics/pokemon/icons/seadra_icon.4bpp" - - .align 2 -gMonFootprint_Seadra:: @ 8C810FC - .incbin "graphics/pokemon/footprints/seadra_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Goldeen:: @ 8C8111C - .incbin "graphics/pokemon/front_pics/goldeen_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Goldeen:: @ 8C81484 - .incbin "graphics/pokemon/palettes/goldeen_palette.gbapal.lz" - - .align 2 -gMonBackPic_Goldeen:: @ 8C814AC - .incbin "graphics/pokemon/back_pics/goldeen_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Goldeen:: @ 8C8181C - .incbin "graphics/pokemon/palettes/goldeen_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Goldeen:: @ 8C81844 - .incbin "graphics/pokemon/icons/goldeen_icon.4bpp" - - .align 2 -gMonFootprint_Goldeen:: @ 8C81C44 - .incbin "graphics/pokemon/footprints/goldeen_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Seaking:: @ 8C81C64 - .incbin "graphics/pokemon/front_pics/seaking_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Seaking:: @ 8C820D8 - .incbin "graphics/pokemon/palettes/seaking_palette.gbapal.lz" - - .align 2 -gMonBackPic_Seaking:: @ 8C82100 - .incbin "graphics/pokemon/back_pics/seaking_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Seaking:: @ 8C82450 - .incbin "graphics/pokemon/palettes/seaking_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Seaking:: @ 8C82478 - .incbin "graphics/pokemon/icons/seaking_icon.4bpp" - - .align 2 -gMonFootprint_Seaking:: @ 8C82878 - .incbin "graphics/pokemon/footprints/seaking_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Staryu:: @ 8C82898 - .incbin "graphics/pokemon/front_pics/staryu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Staryu:: @ 8C82B7C - .incbin "graphics/pokemon/palettes/staryu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Staryu:: @ 8C82BA4 - .incbin "graphics/pokemon/back_pics/staryu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Staryu:: @ 8C82E30 - .incbin "graphics/pokemon/palettes/staryu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Staryu:: @ 8C82E58 - .incbin "graphics/pokemon/icons/staryu_icon.4bpp" - - .align 2 -gMonFootprint_Staryu:: @ 8C83258 - .incbin "graphics/pokemon/footprints/staryu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Starmie:: @ 8C83278 - .incbin "graphics/pokemon/front_pics/starmie_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Starmie:: @ 8C836A0 - .incbin "graphics/pokemon/palettes/starmie_palette.gbapal.lz" - - .align 2 -gMonBackPic_Starmie:: @ 8C836C8 - .incbin "graphics/pokemon/back_pics/starmie_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Starmie:: @ 8C8396C - .incbin "graphics/pokemon/palettes/starmie_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Starmie:: @ 8C83994 - .incbin "graphics/pokemon/icons/starmie_icon.4bpp" - - .align 2 -gMonFootprint_Starmie:: @ 8C83D94 - .incbin "graphics/pokemon/footprints/starmie_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mrmime:: @ 8C83DB4 - .incbin "graphics/pokemon/front_pics/mr_mime_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mrmime:: @ 8C84164 - .incbin "graphics/pokemon/palettes/mr_mime_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mrmime:: @ 8C8418C - .incbin "graphics/pokemon/back_pics/mr_mime_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mrmime:: @ 8C844C0 - .incbin "graphics/pokemon/palettes/mr_mime_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mrmime:: @ 8C844E8 - .incbin "graphics/pokemon/icons/mr_mime_icon.4bpp" - - .align 2 -gMonFootprint_Mrmime:: @ 8C848E8 - .incbin "graphics/pokemon/footprints/mr_mime_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Scyther:: @ 8C84908 - .incbin "graphics/pokemon/front_pics/scyther_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Scyther:: @ 8C84DB4 - .incbin "graphics/pokemon/palettes/scyther_palette.gbapal.lz" - - .align 2 -gMonBackPic_Scyther:: @ 8C84DDC - .incbin "graphics/pokemon/back_pics/scyther_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Scyther:: @ 8C85184 - .incbin "graphics/pokemon/palettes/scyther_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Scyther:: @ 8C851AC - .incbin "graphics/pokemon/icons/scyther_icon.4bpp" - - .align 2 -gMonFootprint_Scyther:: @ 8C855AC - .incbin "graphics/pokemon/footprints/scyther_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Jynx:: @ 8C855CC - .incbin "graphics/pokemon/front_pics/jynx_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Jynx:: @ 8C85A68 - .incbin "graphics/pokemon/palettes/jynx_palette.gbapal.lz" - - .align 2 -gMonBackPic_Jynx:: @ 8C85A90 - .incbin "graphics/pokemon/back_pics/jynx_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Jynx:: @ 8C85D88 - .incbin "graphics/pokemon/palettes/jynx_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Jynx:: @ 8C85DB0 - .incbin "graphics/pokemon/icons/jynx_icon.4bpp" - - .align 2 -gMonFootprint_Jynx:: @ 8C861B0 - .incbin "graphics/pokemon/footprints/jynx_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Electabuzz:: @ 8C861D0 - .incbin "graphics/pokemon/front_pics/electabuzz_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Electabuzz:: @ 8C8664C - .incbin "graphics/pokemon/palettes/electabuzz_palette.gbapal.lz" - - .align 2 -gMonBackPic_Electabuzz:: @ 8C86674 - .incbin "graphics/pokemon/back_pics/electabuzz_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Electabuzz:: @ 8C86984 - .incbin "graphics/pokemon/palettes/electabuzz_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Electabuzz:: @ 8C869AC - .incbin "graphics/pokemon/icons/electabuzz_icon.4bpp" - - .align 2 -gMonFootprint_Electabuzz:: @ 8C86DAC - .incbin "graphics/pokemon/footprints/electabuzz_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magmar:: @ 8C86DCC - .incbin "graphics/pokemon/front_pics/magmar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magmar:: @ 8C87274 - .incbin "graphics/pokemon/palettes/magmar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magmar:: @ 8C8729C - .incbin "graphics/pokemon/back_pics/magmar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magmar:: @ 8C875E4 - .incbin "graphics/pokemon/palettes/magmar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magmar:: @ 8C8760C - .incbin "graphics/pokemon/icons/magmar_icon.4bpp" - - .align 2 -gMonFootprint_Magmar:: @ 8C87A0C - .incbin "graphics/pokemon/footprints/magmar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pinsir:: @ 8C87A2C - .incbin "graphics/pokemon/front_pics/pinsir_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pinsir:: @ 8C87E54 - .incbin "graphics/pokemon/palettes/pinsir_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pinsir:: @ 8C87E78 - .incbin "graphics/pokemon/back_pics/pinsir_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pinsir:: @ 8C881CC - .incbin "graphics/pokemon/palettes/pinsir_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pinsir:: @ 8C881F0 - .incbin "graphics/pokemon/icons/pinsir_icon.4bpp" - - .align 2 -gMonFootprint_Pinsir:: @ 8C885F0 - .incbin "graphics/pokemon/footprints/pinsir_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tauros:: @ 8C88610 - .incbin "graphics/pokemon/front_pics/tauros_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tauros:: @ 8C88AE0 - .incbin "graphics/pokemon/palettes/tauros_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tauros:: @ 8C88B08 - .incbin "graphics/pokemon/back_pics/tauros_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tauros:: @ 8C88DBC - .incbin "graphics/pokemon/palettes/tauros_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tauros:: @ 8C88DE4 - .incbin "graphics/pokemon/icons/tauros_icon.4bpp" - - .align 2 -gMonFootprint_Tauros:: @ 8C891E4 - .incbin "graphics/pokemon/footprints/tauros_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magikarp:: @ 8C89204 - .incbin "graphics/pokemon/front_pics/magikarp_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magikarp:: @ 8C89554 - .incbin "graphics/pokemon/palettes/magikarp_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magikarp:: @ 8C8957C - .incbin "graphics/pokemon/back_pics/magikarp_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magikarp:: @ 8C898AC - .incbin "graphics/pokemon/palettes/magikarp_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magikarp:: @ 8C898D4 - .incbin "graphics/pokemon/icons/magikarp_icon.4bpp" - - .align 2 -gMonFootprint_Magikarp:: @ 8C89CD4 - .incbin "graphics/pokemon/footprints/magikarp_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gyarados:: @ 8C89CF4 - .incbin "graphics/pokemon/front_pics/gyarados_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gyarados:: @ 8C8A25C - .incbin "graphics/pokemon/palettes/gyarados_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gyarados:: @ 8C8A284 - .incbin "graphics/pokemon/back_pics/gyarados_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gyarados:: @ 8C8A758 - .incbin "graphics/pokemon/palettes/gyarados_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gyarados:: @ 8C8A780 - .incbin "graphics/pokemon/icons/gyarados_icon.4bpp" - - .align 2 -gMonFootprint_Gyarados:: @ 8C8AB80 - .incbin "graphics/pokemon/footprints/gyarados_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lapras:: @ 8C8ABA0 - .incbin "graphics/pokemon/front_pics/lapras_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lapras:: @ 8C8AF60 - .incbin "graphics/pokemon/palettes/lapras_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lapras:: @ 8C8AF88 - .incbin "graphics/pokemon/back_pics/lapras_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lapras:: @ 8C8B2CC - .incbin "graphics/pokemon/palettes/lapras_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lapras:: @ 8C8B2F4 - .incbin "graphics/pokemon/icons/lapras_icon.4bpp" - - .align 2 -gMonFootprint_Lapras:: @ 8C8B6F4 - .incbin "graphics/pokemon/footprints/lapras_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ditto:: @ 8C8B714 - .incbin "graphics/pokemon/front_pics/ditto_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ditto:: @ 8C8B904 - .incbin "graphics/pokemon/palettes/ditto_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ditto:: @ 8C8B924 - .incbin "graphics/pokemon/back_pics/ditto_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ditto:: @ 8C8BB24 - .incbin "graphics/pokemon/palettes/ditto_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ditto:: @ 8C8BB44 - .incbin "graphics/pokemon/icons/ditto_icon.4bpp" - - .align 2 -gMonFootprint_Ditto:: @ 8C8BF44 - .incbin "graphics/pokemon/footprints/ditto_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Eevee:: @ 8C8BF64 - .incbin "graphics/pokemon/front_pics/eevee_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Eevee:: @ 8C8C208 - .incbin "graphics/pokemon/palettes/eevee_palette.gbapal.lz" - - .align 2 -gMonBackPic_Eevee:: @ 8C8C22C - .incbin "graphics/pokemon/back_pics/eevee_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Eevee:: @ 8C8C554 - .incbin "graphics/pokemon/palettes/eevee_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Eevee:: @ 8C8C578 - .incbin "graphics/pokemon/icons/eevee_icon.4bpp" - - .align 2 -gMonFootprint_Eevee:: @ 8C8C978 - .incbin "graphics/pokemon/footprints/eevee_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Vaporeon:: @ 8C8C998 - .incbin "graphics/pokemon/front_pics/vaporeon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Vaporeon:: @ 8C8CD2C - .incbin "graphics/pokemon/palettes/vaporeon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Vaporeon:: @ 8C8CD54 - .incbin "graphics/pokemon/back_pics/vaporeon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Vaporeon:: @ 8C8D01C - .incbin "graphics/pokemon/palettes/vaporeon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Vaporeon:: @ 8C8D044 - .incbin "graphics/pokemon/icons/vaporeon_icon.4bpp" - - .align 2 -gMonFootprint_Vaporeon:: @ 8C8D444 - .incbin "graphics/pokemon/footprints/vaporeon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Jolteon:: @ 8C8D464 - .incbin "graphics/pokemon/front_pics/jolteon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Jolteon:: @ 8C8D804 - .incbin "graphics/pokemon/palettes/jolteon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Jolteon:: @ 8C8D82C - .incbin "graphics/pokemon/back_pics/jolteon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Jolteon:: @ 8C8DBBC - .incbin "graphics/pokemon/palettes/jolteon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Jolteon:: @ 8C8DBE4 - .incbin "graphics/pokemon/icons/jolteon_icon.4bpp" - - .align 2 -gMonFootprint_Jolteon:: @ 8C8DFE4 - .incbin "graphics/pokemon/footprints/jolteon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Flareon:: @ 8C8E004 - .incbin "graphics/pokemon/front_pics/flareon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Flareon:: @ 8C8E380 - .incbin "graphics/pokemon/palettes/flareon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Flareon:: @ 8C8E3A8 - .incbin "graphics/pokemon/back_pics/flareon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Flareon:: @ 8C8E738 - .incbin "graphics/pokemon/palettes/flareon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Flareon:: @ 8C8E760 - .incbin "graphics/pokemon/icons/flareon_icon.4bpp" - - .align 2 -gMonFootprint_Flareon:: @ 8C8EB60 - .incbin "graphics/pokemon/footprints/flareon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Porygon:: @ 8C8EB80 - .incbin "graphics/pokemon/front_pics/porygon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Porygon:: @ 8C8EE3C - .incbin "graphics/pokemon/palettes/porygon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Porygon:: @ 8C8EE60 - .incbin "graphics/pokemon/back_pics/porygon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Porygon:: @ 8C8F118 - .incbin "graphics/pokemon/palettes/porygon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Porygon:: @ 8C8F13C - .incbin "graphics/pokemon/icons/porygon_icon.4bpp" - - .align 2 -gMonFootprint_Porygon:: @ 8C8F53C - .incbin "graphics/pokemon/footprints/porygon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Omanyte:: @ 8C8F55C - .incbin "graphics/pokemon/front_pics/omanyte_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Omanyte:: @ 8C8F804 - .incbin "graphics/pokemon/palettes/omanyte_palette.gbapal.lz" - - .align 2 -gMonBackPic_Omanyte:: @ 8C8F82C - .incbin "graphics/pokemon/back_pics/omanyte_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Omanyte:: @ 8C8FB78 - .incbin "graphics/pokemon/palettes/omanyte_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Omanyte:: @ 8C8FBA0 - .incbin "graphics/pokemon/icons/omanyte_icon.4bpp" - - .align 2 -gMonFootprint_Omanyte:: @ 8C8FFA0 - .incbin "graphics/pokemon/footprints/omanyte_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Omastar:: @ 8C8FFC0 - .incbin "graphics/pokemon/front_pics/omastar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Omastar:: @ 8C90380 - .incbin "graphics/pokemon/palettes/omastar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Omastar:: @ 8C903A8 - .incbin "graphics/pokemon/back_pics/omastar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Omastar:: @ 8C906E8 - .incbin "graphics/pokemon/palettes/omastar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Omastar:: @ 8C90710 - .incbin "graphics/pokemon/icons/omastar_icon.4bpp" - - .align 2 -gMonFootprint_Omastar:: @ 8C90B10 - .incbin "graphics/pokemon/footprints/omastar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kabuto:: @ 8C90B30 - .incbin "graphics/pokemon/front_pics/kabuto_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kabuto:: @ 8C90DA0 - .incbin "graphics/pokemon/palettes/kabuto_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kabuto:: @ 8C90DC8 - .incbin "graphics/pokemon/back_pics/kabuto_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kabuto:: @ 8C91060 - .incbin "graphics/pokemon/palettes/kabuto_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kabuto:: @ 8C91088 - .incbin "graphics/pokemon/icons/kabuto_icon.4bpp" - - .align 2 -gMonFootprint_Kabuto:: @ 8C91488 - .incbin "graphics/pokemon/footprints/kabuto_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kabutops:: @ 8C914A8 - .incbin "graphics/pokemon/front_pics/kabutops_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kabutops:: @ 8C918A8 - .incbin "graphics/pokemon/palettes/kabutops_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kabutops:: @ 8C918CC - .incbin "graphics/pokemon/back_pics/kabutops_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kabutops:: @ 8C91C70 - .incbin "graphics/pokemon/palettes/kabutops_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kabutops:: @ 8C91C94 - .incbin "graphics/pokemon/icons/kabutops_icon.4bpp" - - .align 2 -gMonFootprint_Kabutops:: @ 8C92094 - .incbin "graphics/pokemon/footprints/kabutops_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Aerodactyl:: @ 8C920B4 - .incbin "graphics/pokemon/front_pics/aerodactyl_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Aerodactyl:: @ 8C92534 - .incbin "graphics/pokemon/palettes/aerodactyl_palette.gbapal.lz" - - .align 2 -gMonBackPic_Aerodactyl:: @ 8C9255C - .incbin "graphics/pokemon/back_pics/aerodactyl_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Aerodactyl:: @ 8C92860 - .incbin "graphics/pokemon/palettes/aerodactyl_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Aerodactyl:: @ 8C92888 - .incbin "graphics/pokemon/icons/aerodactyl_icon.4bpp" - - .align 2 -gMonFootprint_Aerodactyl:: @ 8C92C88 - .incbin "graphics/pokemon/footprints/aerodactyl_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Snorlax:: @ 8C92CA8 - .incbin "graphics/pokemon/front_pics/snorlax_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Snorlax:: @ 8C930EC - .incbin "graphics/pokemon/palettes/snorlax_palette.gbapal.lz" - - .align 2 -gMonBackPic_Snorlax:: @ 8C93114 - .incbin "graphics/pokemon/back_pics/snorlax_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Snorlax:: @ 8C93330 - .incbin "graphics/pokemon/palettes/snorlax_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Snorlax:: @ 8C93358 - .incbin "graphics/pokemon/icons/snorlax_icon.4bpp" - - .align 2 -gMonFootprint_Snorlax:: @ 8C93758 - .incbin "graphics/pokemon/footprints/snorlax_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Articuno:: @ 8C93778 - .incbin "graphics/pokemon/front_pics/articuno_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Articuno:: @ 8C93C70 - .incbin "graphics/pokemon/palettes/articuno_palette.gbapal.lz" - - .align 2 -gMonBackPic_Articuno:: @ 8C93C98 - .incbin "graphics/pokemon/back_pics/articuno_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Articuno:: @ 8C93EF4 - .incbin "graphics/pokemon/palettes/articuno_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Articuno:: @ 8C93F1C - .incbin "graphics/pokemon/icons/articuno_icon.4bpp" - - .align 2 -gMonFootprint_Articuno:: @ 8C9431C - .incbin "graphics/pokemon/footprints/articuno_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Zapdos:: @ 8C9433C - .incbin "graphics/pokemon/front_pics/zapdos_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Zapdos:: @ 8C947B0 - .incbin "graphics/pokemon/palettes/zapdos_palette.gbapal.lz" - - .align 2 -gMonBackPic_Zapdos:: @ 8C947D8 - .incbin "graphics/pokemon/back_pics/zapdos_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Zapdos:: @ 8C94B14 - .incbin "graphics/pokemon/palettes/zapdos_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Zapdos:: @ 8C94B3C - .incbin "graphics/pokemon/icons/zapdos_icon.4bpp" - - .align 2 -gMonFootprint_Zapdos:: @ 8C94F3C - .incbin "graphics/pokemon/footprints/zapdos_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Moltres:: @ 8C94F5C - .incbin "graphics/pokemon/front_pics/moltres_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Moltres:: @ 8C9550C - .incbin "graphics/pokemon/palettes/moltres_palette.gbapal.lz" - - .align 2 -gMonBackPic_Moltres:: @ 8C95534 - .incbin "graphics/pokemon/back_pics/moltres_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Moltres:: @ 8C95870 - .incbin "graphics/pokemon/palettes/moltres_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Moltres:: @ 8C95898 - .incbin "graphics/pokemon/icons/moltres_icon.4bpp" - - .align 2 -gMonFootprint_Moltres:: @ 8C95C98 - .incbin "graphics/pokemon/footprints/moltres_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dratini:: @ 8C95CB8 - .incbin "graphics/pokemon/front_pics/dratini_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dratini:: @ 8C95F70 - .incbin "graphics/pokemon/palettes/dratini_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dratini:: @ 8C95F94 - .incbin "graphics/pokemon/back_pics/dratini_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dratini:: @ 8C96224 - .incbin "graphics/pokemon/palettes/dratini_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dratini:: @ 8C96248 - .incbin "graphics/pokemon/icons/dratini_icon.4bpp" - - .align 2 -gMonFootprint_Dratini:: @ 8C96648 - .incbin "graphics/pokemon/footprints/dratini_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dragonair:: @ 8C96668 - .incbin "graphics/pokemon/front_pics/dragonair_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dragonair:: @ 8C969C8 - .incbin "graphics/pokemon/palettes/dragonair_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dragonair:: @ 8C969F0 - .incbin "graphics/pokemon/back_pics/dragonair_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dragonair:: @ 8C96D00 - .incbin "graphics/pokemon/palettes/dragonair_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dragonair:: @ 8C96D28 - .incbin "graphics/pokemon/icons/dragonair_icon.4bpp" - - .align 2 -gMonFootprint_Dragonair:: @ 8C97128 - .incbin "graphics/pokemon/footprints/dragonair_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dragonite:: @ 8C97148 - .incbin "graphics/pokemon/front_pics/dragonite_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dragonite:: @ 8C976B8 - .incbin "graphics/pokemon/palettes/dragonite_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dragonite:: @ 8C976E0 - .incbin "graphics/pokemon/back_pics/dragonite_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dragonite:: @ 8C979DC - .incbin "graphics/pokemon/palettes/dragonite_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dragonite:: @ 8C97A04 - .incbin "graphics/pokemon/icons/dragonite_icon.4bpp" - - .align 2 -gMonFootprint_Dragonite:: @ 8C97E04 - .incbin "graphics/pokemon/footprints/dragonite_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mewtwo:: @ 8C97E24 - .incbin "graphics/pokemon/front_pics/mewtwo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mewtwo:: @ 8C98260 - .incbin "graphics/pokemon/palettes/mewtwo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mewtwo:: @ 8C98284 - .incbin "graphics/pokemon/back_pics/mewtwo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mewtwo:: @ 8C98650 - .incbin "graphics/pokemon/palettes/mewtwo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mewtwo:: @ 8C98674 - .incbin "graphics/pokemon/icons/mewtwo_icon.4bpp" - - .align 2 -gMonFootprint_Mewtwo:: @ 8C98A74 - .incbin "graphics/pokemon/footprints/mewtwo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mew:: @ 8C98A94 - .incbin "graphics/pokemon/front_pics/mew_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mew:: @ 8C98D14 - .incbin "graphics/pokemon/palettes/mew_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mew:: @ 8C98D38 - .incbin "graphics/pokemon/back_pics/mew_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mew:: @ 8C99004 - .incbin "graphics/pokemon/palettes/mew_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mew:: @ 8C99028 - .incbin "graphics/pokemon/icons/mew_icon.4bpp" - - .align 2 -gMonFootprint_Mew:: @ 8C99428 - .incbin "graphics/pokemon/footprints/mew_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Chikorita:: @ 8C99448 - .incbin "graphics/pokemon/front_pics/chikorita_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Chikorita:: @ 8C996B0 - .incbin "graphics/pokemon/palettes/chikorita_palette.gbapal.lz" - - .align 2 -gMonBackPic_Chikorita:: @ 8C996D8 - .incbin "graphics/pokemon/back_pics/chikorita_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Chikorita:: @ 8C9999C - .incbin "graphics/pokemon/palettes/chikorita_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Chikorita:: @ 8C999C4 - .incbin "graphics/pokemon/icons/chikorita_icon.4bpp" - - .align 2 -gMonFootprint_Chikorita:: @ 8C99DC4 - .incbin "graphics/pokemon/footprints/chikorita_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Bayleef:: @ 8C99DE4 - .incbin "graphics/pokemon/front_pics/bayleef_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Bayleef:: @ 8C9A1B8 - .incbin "graphics/pokemon/palettes/bayleef_palette.gbapal.lz" - - .align 2 -gMonBackPic_Bayleef:: @ 8C9A1E0 - .incbin "graphics/pokemon/back_pics/bayleef_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Bayleef:: @ 8C9A570 - .incbin "graphics/pokemon/palettes/bayleef_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Bayleef:: @ 8C9A598 - .incbin "graphics/pokemon/icons/bayleef_icon.4bpp" - - .align 2 -gMonFootprint_Bayleef:: @ 8C9A998 - .incbin "graphics/pokemon/footprints/bayleef_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Meganium:: @ 8C9A9B8 - .incbin "graphics/pokemon/front_pics/meganium_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Meganium:: @ 8C9AF14 - .incbin "graphics/pokemon/palettes/meganium_palette.gbapal.lz" - - .align 2 -gMonBackPic_Meganium:: @ 8C9AF3C - .incbin "graphics/pokemon/back_pics/meganium_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Meganium:: @ 8C9B28C - .incbin "graphics/pokemon/palettes/meganium_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Meganium:: @ 8C9B2B4 - .incbin "graphics/pokemon/icons/meganium_icon.4bpp" - - .align 2 -gMonFootprint_Meganium:: @ 8C9B6B4 - .incbin "graphics/pokemon/footprints/meganium_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cyndaquil:: @ 8C9B6D4 - .incbin "graphics/pokemon/front_pics/cyndaquil_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cyndaquil:: @ 8C9B960 - .incbin "graphics/pokemon/palettes/cyndaquil_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cyndaquil:: @ 8C9B988 - .incbin "graphics/pokemon/back_pics/cyndaquil_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cyndaquil:: @ 8C9BCB4 - .incbin "graphics/pokemon/palettes/cyndaquil_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cyndaquil:: @ 8C9BCDC - .incbin "graphics/pokemon/icons/cyndaquil_icon.4bpp" - - .align 2 -gMonFootprint_Cyndaquil:: @ 8C9C0DC - .incbin "graphics/pokemon/footprints/cyndaquil_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Quilava:: @ 8C9C0FC - .incbin "graphics/pokemon/front_pics/quilava_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Quilava:: @ 8C9C418 - .incbin "graphics/pokemon/palettes/quilava_palette.gbapal.lz" - - .align 2 -gMonBackPic_Quilava:: @ 8C9C440 - .incbin "graphics/pokemon/back_pics/quilava_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Quilava:: @ 8C9C7B4 - .incbin "graphics/pokemon/palettes/quilava_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Quilava:: @ 8C9C7DC - .incbin "graphics/pokemon/icons/quilava_icon.4bpp" - - .align 2 -gMonFootprint_Quilava:: @ 8C9CBDC - .incbin "graphics/pokemon/footprints/quilava_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Typhlosion:: @ 8C9CBFC - .incbin "graphics/pokemon/front_pics/typhlosion_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Typhlosion:: @ 8C9D024 - .incbin "graphics/pokemon/palettes/typhlosion_palette.gbapal.lz" - - .align 2 -gMonBackPic_Typhlosion:: @ 8C9D04C - .incbin "graphics/pokemon/back_pics/typhlosion_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Typhlosion:: @ 8C9D450 - .incbin "graphics/pokemon/palettes/typhlosion_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Typhlosion:: @ 8C9D478 - .incbin "graphics/pokemon/icons/typhlosion_icon.4bpp" - - .align 2 -gMonFootprint_Typhlosion:: @ 8C9D878 - .incbin "graphics/pokemon/footprints/typhlosion_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Totodile:: @ 8C9D898 - .incbin "graphics/pokemon/front_pics/totodile_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Totodile:: @ 8C9DB3C - .incbin "graphics/pokemon/palettes/totodile_palette.gbapal.lz" - - .align 2 -gMonBackPic_Totodile:: @ 8C9DB64 - .incbin "graphics/pokemon/back_pics/totodile_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Totodile:: @ 8C9DE44 - .incbin "graphics/pokemon/palettes/totodile_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Totodile:: @ 8C9DE6C - .incbin "graphics/pokemon/icons/totodile_icon.4bpp" - - .align 2 -gMonFootprint_Totodile:: @ 8C9E26C - .incbin "graphics/pokemon/footprints/totodile_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Croconaw:: @ 8C9E28C - .incbin "graphics/pokemon/front_pics/croconaw_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Croconaw:: @ 8C9E5F4 - .incbin "graphics/pokemon/palettes/croconaw_palette.gbapal.lz" - - .align 2 -gMonBackPic_Croconaw:: @ 8C9E61C - .incbin "graphics/pokemon/back_pics/croconaw_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Croconaw:: @ 8C9E96C - .incbin "graphics/pokemon/palettes/croconaw_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Croconaw:: @ 8C9E994 - .incbin "graphics/pokemon/icons/croconaw_icon.4bpp" - - .align 2 -gMonFootprint_Croconaw:: @ 8C9ED94 - .incbin "graphics/pokemon/footprints/croconaw_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Feraligatr:: @ 8C9EDB4 - .incbin "graphics/pokemon/front_pics/feraligatr_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Feraligatr:: @ 8C9F320 - .incbin "graphics/pokemon/palettes/feraligatr_palette.gbapal.lz" - - .align 2 -gMonBackPic_Feraligatr:: @ 8C9F348 - .incbin "graphics/pokemon/back_pics/feraligatr_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Feraligatr:: @ 8C9F814 - .incbin "graphics/pokemon/palettes/feraligatr_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Feraligatr:: @ 8C9F83C - .incbin "graphics/pokemon/icons/feraligatr_icon.4bpp" - - .align 2 -gMonFootprint_Feraligatr:: @ 8C9FC3C - .incbin "graphics/pokemon/footprints/feraligatr_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sentret:: @ 8C9FC5C - .incbin "graphics/pokemon/front_pics/sentret_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sentret:: @ 8C9FF38 - .incbin "graphics/pokemon/palettes/sentret_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sentret:: @ 8C9FF60 - .incbin "graphics/pokemon/back_pics/sentret_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sentret:: @ 8CA0204 - .incbin "graphics/pokemon/palettes/sentret_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sentret:: @ 8CA022C - .incbin "graphics/pokemon/icons/sentret_icon.4bpp" - - .align 2 -gMonFootprint_Sentret:: @ 8CA062C - .incbin "graphics/pokemon/footprints/sentret_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Furret:: @ 8CA064C - .incbin "graphics/pokemon/front_pics/furret_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Furret:: @ 8CA0980 - .incbin "graphics/pokemon/palettes/furret_palette.gbapal.lz" - - .align 2 -gMonBackPic_Furret:: @ 8CA09A8 - .incbin "graphics/pokemon/back_pics/furret_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Furret:: @ 8CA0CD0 - .incbin "graphics/pokemon/palettes/furret_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Furret:: @ 8CA0CF8 - .incbin "graphics/pokemon/icons/furret_icon.4bpp" - - .align 2 -gMonFootprint_Furret:: @ 8CA10F8 - .incbin "graphics/pokemon/footprints/furret_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hoothoot:: @ 8CA1118 - .incbin "graphics/pokemon/front_pics/hoothoot_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hoothoot:: @ 8CA139C - .incbin "graphics/pokemon/palettes/hoothoot_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hoothoot:: @ 8CA13C4 - .incbin "graphics/pokemon/back_pics/hoothoot_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hoothoot:: @ 8CA16CC - .incbin "graphics/pokemon/palettes/hoothoot_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hoothoot:: @ 8CA16F4 - .incbin "graphics/pokemon/icons/hoothoot_icon.4bpp" - - .align 2 -gMonFootprint_Hoothoot:: @ 8CA1AF4 - .incbin "graphics/pokemon/footprints/hoothoot_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Noctowl:: @ 8CA1B14 - .incbin "graphics/pokemon/front_pics/noctowl_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Noctowl:: @ 8CA1E68 - .incbin "graphics/pokemon/palettes/noctowl_palette.gbapal.lz" - - .align 2 -gMonBackPic_Noctowl:: @ 8CA1E90 - .incbin "graphics/pokemon/back_pics/noctowl_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Noctowl:: @ 8CA21EC - .incbin "graphics/pokemon/palettes/noctowl_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Noctowl:: @ 8CA2214 - .incbin "graphics/pokemon/icons/noctowl_icon.4bpp" - - .align 2 -gMonFootprint_Noctowl:: @ 8CA2614 - .incbin "graphics/pokemon/footprints/noctowl_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ledyba:: @ 8CA2634 - .incbin "graphics/pokemon/front_pics/ledyba_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ledyba:: @ 8CA2928 - .incbin "graphics/pokemon/palettes/ledyba_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ledyba:: @ 8CA2950 - .incbin "graphics/pokemon/back_pics/ledyba_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ledyba:: @ 8CA2C80 - .incbin "graphics/pokemon/palettes/ledyba_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ledyba:: @ 8CA2CA8 - .incbin "graphics/pokemon/icons/ledyba_icon.4bpp" - - .align 2 -gMonFootprint_Ledyba:: @ 8CA30A8 - .incbin "graphics/pokemon/footprints/ledyba_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ledian:: @ 8CA30C8 - .incbin "graphics/pokemon/front_pics/ledian_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ledian:: @ 8CA3450 - .incbin "graphics/pokemon/palettes/ledian_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ledian:: @ 8CA3478 - .incbin "graphics/pokemon/back_pics/ledian_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ledian:: @ 8CA37D0 - .incbin "graphics/pokemon/palettes/ledian_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ledian:: @ 8CA37F8 - .incbin "graphics/pokemon/icons/ledian_icon.4bpp" - - .align 2 -gMonFootprint_Ledian:: @ 8CA3BF8 - .incbin "graphics/pokemon/footprints/ledian_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Spinarak:: @ 8CA3C18 - .incbin "graphics/pokemon/front_pics/spinarak_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Spinarak:: @ 8CA3E8C - .incbin "graphics/pokemon/palettes/spinarak_palette.gbapal.lz" - - .align 2 -gMonBackPic_Spinarak:: @ 8CA3EB4 - .incbin "graphics/pokemon/back_pics/spinarak_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Spinarak:: @ 8CA4118 - .incbin "graphics/pokemon/palettes/spinarak_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Spinarak:: @ 8CA4140 - .incbin "graphics/pokemon/icons/spinarak_icon.4bpp" - - .align 2 -gMonFootprint_Spinarak:: @ 8CA4540 - .incbin "graphics/pokemon/footprints/spinarak_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ariados:: @ 8CA4560 - .incbin "graphics/pokemon/front_pics/ariados_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ariados:: @ 8CA4920 - .incbin "graphics/pokemon/palettes/ariados_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ariados:: @ 8CA4948 - .incbin "graphics/pokemon/back_pics/ariados_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ariados:: @ 8CA4CC0 - .incbin "graphics/pokemon/palettes/ariados_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ariados:: @ 8CA4CE8 - .incbin "graphics/pokemon/icons/ariados_icon.4bpp" - - .align 2 -gMonFootprint_Ariados:: @ 8CA50E8 - .incbin "graphics/pokemon/footprints/ariados_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Crobat:: @ 8CA5108 - .incbin "graphics/pokemon/front_pics/crobat_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Crobat:: @ 8CA54B8 - .incbin "graphics/pokemon/palettes/crobat_palette.gbapal.lz" - - .align 2 -gMonBackPic_Crobat:: @ 8CA54E0 - .incbin "graphics/pokemon/back_pics/crobat_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Crobat:: @ 8CA57E8 - .incbin "graphics/pokemon/palettes/crobat_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Crobat:: @ 8CA5810 - .incbin "graphics/pokemon/icons/crobat_icon.4bpp" - - .align 2 -gMonFootprint_Crobat:: @ 8CA5C10 - .incbin "graphics/pokemon/footprints/crobat_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Chinchou:: @ 8CA5C30 - .incbin "graphics/pokemon/front_pics/chinchou_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Chinchou:: @ 8CA5F08 - .incbin "graphics/pokemon/palettes/chinchou_palette.gbapal.lz" - - .align 2 -gMonBackPic_Chinchou:: @ 8CA5F30 - .incbin "graphics/pokemon/back_pics/chinchou_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Chinchou:: @ 8CA6228 - .incbin "graphics/pokemon/palettes/chinchou_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Chinchou:: @ 8CA6250 - .incbin "graphics/pokemon/icons/chinchou_icon.4bpp" - - .align 2 -gMonFootprint_Chinchou:: @ 8CA6650 - .incbin "graphics/pokemon/footprints/chinchou_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lanturn:: @ 8CA6670 - .incbin "graphics/pokemon/front_pics/lanturn_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lanturn:: @ 8CA69E0 - .incbin "graphics/pokemon/palettes/lanturn_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lanturn:: @ 8CA6A08 - .incbin "graphics/pokemon/back_pics/lanturn_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lanturn:: @ 8CA6D08 - .incbin "graphics/pokemon/palettes/lanturn_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lanturn:: @ 8CA6D30 - .incbin "graphics/pokemon/icons/lanturn_icon.4bpp" - - .align 2 -gMonFootprint_Lanturn:: @ 8CA7130 - .incbin "graphics/pokemon/footprints/lanturn_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pichu:: @ 8CA7150 - .incbin "graphics/pokemon/front_pics/pichu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pichu:: @ 8CA736C - .incbin "graphics/pokemon/palettes/pichu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pichu:: @ 8CA7394 - .incbin "graphics/pokemon/back_pics/pichu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pichu:: @ 8CA75F0 - .incbin "graphics/pokemon/palettes/pichu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pichu:: @ 8CA7618 - .incbin "graphics/pokemon/icons/pichu_icon.4bpp" - - .align 2 -gMonFootprint_Pichu:: @ 8CA7A18 - .incbin "graphics/pokemon/footprints/pichu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cleffa:: @ 8CA7A38 - .incbin "graphics/pokemon/front_pics/cleffa_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cleffa:: @ 8CA7C18 - .incbin "graphics/pokemon/palettes/cleffa_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cleffa:: @ 8CA7C40 - .incbin "graphics/pokemon/back_pics/cleffa_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cleffa:: @ 8CA7E7C - .incbin "graphics/pokemon/palettes/cleffa_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cleffa:: @ 8CA7EA4 - .incbin "graphics/pokemon/icons/cleffa_icon.4bpp" - - .align 2 -gMonFootprint_Cleffa:: @ 8CA82A4 - .incbin "graphics/pokemon/footprints/cleffa_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Igglybuff:: @ 8CA82C4 - .incbin "graphics/pokemon/front_pics/igglybuff_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Igglybuff:: @ 8CA84AC - .incbin "graphics/pokemon/palettes/igglybuff_palette.gbapal.lz" - - .align 2 -gMonBackPic_Igglybuff:: @ 8CA84D4 - .incbin "graphics/pokemon/back_pics/igglybuff_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Igglybuff:: @ 8CA8710 - .incbin "graphics/pokemon/palettes/igglybuff_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Igglybuff:: @ 8CA8738 - .incbin "graphics/pokemon/icons/igglybuff_icon.4bpp" - - .align 2 -gMonFootprint_Igglybuff:: @ 8CA8B38 - .incbin "graphics/pokemon/footprints/igglybuff_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Togepi:: @ 8CA8B58 - .incbin "graphics/pokemon/front_pics/togepi_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Togepi:: @ 8CA8D2C - .incbin "graphics/pokemon/palettes/togepi_palette.gbapal.lz" - - .align 2 -gMonBackPic_Togepi:: @ 8CA8D54 - .incbin "graphics/pokemon/back_pics/togepi_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Togepi:: @ 8CA8FC8 - .incbin "graphics/pokemon/palettes/togepi_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Togepi:: @ 8CA8FF0 - .incbin "graphics/pokemon/icons/togepi_icon.4bpp" - - .align 2 -gMonFootprint_Togepi:: @ 8CA93F0 - .incbin "graphics/pokemon/footprints/togepi_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Togetic:: @ 8CA9410 - .incbin "graphics/pokemon/front_pics/togetic_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Togetic:: @ 8CA9684 - .incbin "graphics/pokemon/palettes/togetic_palette.gbapal.lz" - - .align 2 -gMonBackPic_Togetic:: @ 8CA96AC - .incbin "graphics/pokemon/back_pics/togetic_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Togetic:: @ 8CA99D8 - .incbin "graphics/pokemon/palettes/togetic_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Togetic:: @ 8CA9A00 - .incbin "graphics/pokemon/icons/togetic_icon.4bpp" - - .align 2 -gMonFootprint_Togetic:: @ 8CA9E00 - .incbin "graphics/pokemon/footprints/togetic_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Natu:: @ 8CA9E20 - .incbin "graphics/pokemon/front_pics/natu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Natu:: @ 8CA9FEC - .incbin "graphics/pokemon/palettes/natu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Natu:: @ 8CAA014 - .incbin "graphics/pokemon/back_pics/natu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Natu:: @ 8CAA228 - .incbin "graphics/pokemon/palettes/natu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Natu:: @ 8CAA250 - .incbin "graphics/pokemon/icons/natu_icon.4bpp" - - .align 2 -gMonFootprint_Natu:: @ 8CAA650 - .incbin "graphics/pokemon/footprints/natu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Xatu:: @ 8CAA670 - .incbin "graphics/pokemon/front_pics/xatu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Xatu:: @ 8CAA94C - .incbin "graphics/pokemon/palettes/xatu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Xatu:: @ 8CAA974 - .incbin "graphics/pokemon/back_pics/xatu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Xatu:: @ 8CAACEC - .incbin "graphics/pokemon/palettes/xatu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Xatu:: @ 8CAAD14 - .incbin "graphics/pokemon/icons/xatu_icon.4bpp" - - .align 2 -gMonFootprint_Xatu:: @ 8CAB114 - .incbin "graphics/pokemon/footprints/xatu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mareep:: @ 8CAB134 - .incbin "graphics/pokemon/front_pics/mareep_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mareep:: @ 8CAB3E8 - .incbin "graphics/pokemon/palettes/mareep_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mareep:: @ 8CAB410 - .incbin "graphics/pokemon/back_pics/mareep_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mareep:: @ 8CAB704 - .incbin "graphics/pokemon/palettes/mareep_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mareep:: @ 8CAB72C - .incbin "graphics/pokemon/icons/mareep_icon.4bpp" - - .align 2 -gMonFootprint_Mareep:: @ 8CABB2C - .incbin "graphics/pokemon/footprints/mareep_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Flaaffy:: @ 8CABB4C - .incbin "graphics/pokemon/front_pics/flaaffy_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Flaaffy:: @ 8CABE4C - .incbin "graphics/pokemon/palettes/flaaffy_palette.gbapal.lz" - - .align 2 -gMonBackPic_Flaaffy:: @ 8CABE74 - .incbin "graphics/pokemon/back_pics/flaaffy_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Flaaffy:: @ 8CAC190 - .incbin "graphics/pokemon/palettes/flaaffy_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Flaaffy:: @ 8CAC1B8 - .incbin "graphics/pokemon/icons/flaaffy_icon.4bpp" - - .align 2 -gMonFootprint_Flaaffy:: @ 8CAC5B8 - .incbin "graphics/pokemon/footprints/flaaffy_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ampharos:: @ 8CAC5D8 - .incbin "graphics/pokemon/front_pics/ampharos_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ampharos:: @ 8CAC934 - .incbin "graphics/pokemon/palettes/ampharos_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ampharos:: @ 8CAC95C - .incbin "graphics/pokemon/back_pics/ampharos_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ampharos:: @ 8CACCD4 - .incbin "graphics/pokemon/palettes/ampharos_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ampharos:: @ 8CACCFC - .incbin "graphics/pokemon/icons/ampharos_icon.4bpp" - - .align 2 -gMonFootprint_Ampharos:: @ 8CAD0FC - .incbin "graphics/pokemon/footprints/ampharos_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Bellossom:: @ 8CAD11C - .incbin "graphics/pokemon/front_pics/bellossom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Bellossom:: @ 8CAD38C - .incbin "graphics/pokemon/palettes/bellossom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Bellossom:: @ 8CAD3B4 - .incbin "graphics/pokemon/back_pics/bellossom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Bellossom:: @ 8CAD6D8 - .incbin "graphics/pokemon/palettes/bellossom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Bellossom:: @ 8CAD700 - .incbin "graphics/pokemon/icons/bellossom_icon.4bpp" - - .align 2 -gMonFootprint_Bellossom:: @ 8CADB00 - .incbin "graphics/pokemon/footprints/bellossom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Marill:: @ 8CADB20 - .incbin "graphics/pokemon/front_pics/marill_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Marill:: @ 8CADDE4 - .incbin "graphics/pokemon/palettes/marill_palette.gbapal.lz" - - .align 2 -gMonBackPic_Marill:: @ 8CADE0C - .incbin "graphics/pokemon/back_pics/marill_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Marill:: @ 8CAE0B8 - .incbin "graphics/pokemon/palettes/marill_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Marill:: @ 8CAE0E0 - .incbin "graphics/pokemon/icons/marill_icon.4bpp" - - .align 2 -gMonFootprint_Marill:: @ 8CAE4E0 - .incbin "graphics/pokemon/footprints/marill_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Azumarill:: @ 8CAE500 - .incbin "graphics/pokemon/front_pics/azumarill_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Azumarill:: @ 8CAE800 - .incbin "graphics/pokemon/palettes/azumarill_palette.gbapal.lz" - - .align 2 -gMonBackPic_Azumarill:: @ 8CAE828 - .incbin "graphics/pokemon/back_pics/azumarill_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Azumarill:: @ 8CAEAE4 - .incbin "graphics/pokemon/palettes/azumarill_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Azumarill:: @ 8CAEB0C - .incbin "graphics/pokemon/icons/azumarill_icon.4bpp" - - .align 2 -gMonFootprint_Azumarill:: @ 8CAEF0C - .incbin "graphics/pokemon/footprints/azumarill_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sudowoodo:: @ 8CAEF2C - .incbin "graphics/pokemon/front_pics/sudowoodo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sudowoodo:: @ 8CAF244 - .incbin "graphics/pokemon/palettes/sudowoodo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sudowoodo:: @ 8CAF26C - .incbin "graphics/pokemon/back_pics/sudowoodo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sudowoodo:: @ 8CAF5C8 - .incbin "graphics/pokemon/palettes/sudowoodo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sudowoodo:: @ 8CAF5F0 - .incbin "graphics/pokemon/icons/sudowoodo_icon.4bpp" - - .align 2 -gMonFootprint_Sudowoodo:: @ 8CAF9F0 - .incbin "graphics/pokemon/footprints/sudowoodo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Politoed:: @ 8CAFA10 - .incbin "graphics/pokemon/front_pics/politoed_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Politoed:: @ 8CAFD4C - .incbin "graphics/pokemon/palettes/politoed_palette.gbapal.lz" - - .align 2 -gMonBackPic_Politoed:: @ 8CAFD74 - .incbin "graphics/pokemon/back_pics/politoed_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Politoed:: @ 8CB0030 - .incbin "graphics/pokemon/palettes/politoed_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Politoed:: @ 8CB0058 - .incbin "graphics/pokemon/icons/politoed_icon.4bpp" - - .align 2 -gMonFootprint_Politoed:: @ 8CB0458 - .incbin "graphics/pokemon/footprints/politoed_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hoppip:: @ 8CB0478 - .incbin "graphics/pokemon/front_pics/hoppip_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hoppip:: @ 8CB072C - .incbin "graphics/pokemon/palettes/hoppip_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hoppip:: @ 8CB0754 - .incbin "graphics/pokemon/back_pics/hoppip_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hoppip:: @ 8CB0A34 - .incbin "graphics/pokemon/palettes/hoppip_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hoppip:: @ 8CB0A5C - .incbin "graphics/pokemon/icons/hoppip_icon.4bpp" - - .align 2 -gMonFootprint_Hoppip:: @ 8CB0E5C - .incbin "graphics/pokemon/footprints/hoppip_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Skiploom:: @ 8CB0E7C - .incbin "graphics/pokemon/front_pics/skiploom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Skiploom:: @ 8CB1104 - .incbin "graphics/pokemon/palettes/skiploom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Skiploom:: @ 8CB112C - .incbin "graphics/pokemon/back_pics/skiploom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Skiploom:: @ 8CB140C - .incbin "graphics/pokemon/palettes/skiploom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Skiploom:: @ 8CB1434 - .incbin "graphics/pokemon/icons/skiploom_icon.4bpp" - - .align 2 -gMonFootprint_Skiploom:: @ 8CB1834 - .incbin "graphics/pokemon/footprints/skiploom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Jumpluff:: @ 8CB1854 - .incbin "graphics/pokemon/front_pics/jumpluff_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Jumpluff:: @ 8CB1BC0 - .incbin "graphics/pokemon/palettes/jumpluff_palette.gbapal.lz" - - .align 2 -gMonBackPic_Jumpluff:: @ 8CB1BE8 - .incbin "graphics/pokemon/back_pics/jumpluff_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Jumpluff:: @ 8CB1FE0 - .incbin "graphics/pokemon/palettes/jumpluff_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Jumpluff:: @ 8CB2008 - .incbin "graphics/pokemon/icons/jumpluff_icon.4bpp" - - .align 2 -gMonFootprint_Jumpluff:: @ 8CB2408 - .incbin "graphics/pokemon/footprints/jumpluff_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Aipom:: @ 8CB2428 - .incbin "graphics/pokemon/front_pics/aipom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Aipom:: @ 8CB2724 - .incbin "graphics/pokemon/palettes/aipom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Aipom:: @ 8CB274C - .incbin "graphics/pokemon/back_pics/aipom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Aipom:: @ 8CB2A40 - .incbin "graphics/pokemon/palettes/aipom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Aipom:: @ 8CB2A68 - .incbin "graphics/pokemon/icons/aipom_icon.4bpp" - - .align 2 -gMonFootprint_Aipom:: @ 8CB2E68 - .incbin "graphics/pokemon/footprints/aipom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sunkern:: @ 8CB2E88 - .incbin "graphics/pokemon/front_pics/sunkern_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sunkern:: @ 8CB30C0 - .incbin "graphics/pokemon/palettes/sunkern_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sunkern:: @ 8CB30E8 - .incbin "graphics/pokemon/back_pics/sunkern_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sunkern:: @ 8CB33AC - .incbin "graphics/pokemon/palettes/sunkern_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sunkern:: @ 8CB33D4 - .incbin "graphics/pokemon/icons/sunkern_icon.4bpp" - - .align 2 -gMonFootprint_Sunkern:: @ 8CB37D4 - .incbin "graphics/pokemon/footprints/sunkern_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sunflora:: @ 8CB37F4 - .incbin "graphics/pokemon/front_pics/sunflora_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sunflora:: @ 8CB3B4C - .incbin "graphics/pokemon/palettes/sunflora_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sunflora:: @ 8CB3B74 - .incbin "graphics/pokemon/back_pics/sunflora_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sunflora:: @ 8CB3F14 - .incbin "graphics/pokemon/palettes/sunflora_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sunflora:: @ 8CB3F3C - .incbin "graphics/pokemon/icons/sunflora_icon.4bpp" - - .align 2 -gMonFootprint_Sunflora:: @ 8CB433C - .incbin "graphics/pokemon/footprints/sunflora_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Yanma:: @ 8CB435C - .incbin "graphics/pokemon/front_pics/yanma_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Yanma:: @ 8CB46E0 - .incbin "graphics/pokemon/palettes/yanma_palette.gbapal.lz" - - .align 2 -gMonBackPic_Yanma:: @ 8CB4708 - .incbin "graphics/pokemon/back_pics/yanma_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Yanma:: @ 8CB4ABC - .incbin "graphics/pokemon/palettes/yanma_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Yanma:: @ 8CB4AE4 - .incbin "graphics/pokemon/icons/yanma_icon.4bpp" - - .align 2 -gMonFootprint_Yanma:: @ 8CB4EE4 - .incbin "graphics/pokemon/footprints/yanma_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wooper:: @ 8CB4F04 - .incbin "graphics/pokemon/front_pics/wooper_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wooper:: @ 8CB5144 - .incbin "graphics/pokemon/palettes/wooper_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wooper:: @ 8CB516C - .incbin "graphics/pokemon/back_pics/wooper_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wooper:: @ 8CB53F8 - .incbin "graphics/pokemon/palettes/wooper_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wooper:: @ 8CB5420 - .incbin "graphics/pokemon/icons/wooper_icon.4bpp" - - .align 2 -gMonFootprint_Wooper:: @ 8CB5820 - .incbin "graphics/pokemon/footprints/wooper_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Quagsire:: @ 8CB5840 - .incbin "graphics/pokemon/front_pics/quagsire_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Quagsire:: @ 8CB5BB4 - .incbin "graphics/pokemon/palettes/quagsire_palette.gbapal.lz" - - .align 2 -gMonBackPic_Quagsire:: @ 8CB5BDC - .incbin "graphics/pokemon/back_pics/quagsire_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Quagsire:: @ 8CB5ED8 - .incbin "graphics/pokemon/palettes/quagsire_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Quagsire:: @ 8CB5F00 - .incbin "graphics/pokemon/icons/quagsire_icon.4bpp" - - .align 2 -gMonFootprint_Quagsire:: @ 8CB6300 - .incbin "graphics/pokemon/footprints/quagsire_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Espeon:: @ 8CB6320 - .incbin "graphics/pokemon/front_pics/espeon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Espeon:: @ 8CB6660 - .incbin "graphics/pokemon/palettes/espeon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Espeon:: @ 8CB6684 - .incbin "graphics/pokemon/back_pics/espeon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Espeon:: @ 8CB6960 - .incbin "graphics/pokemon/palettes/espeon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Espeon:: @ 8CB6984 - .incbin "graphics/pokemon/icons/espeon_icon.4bpp" - - .align 2 -gMonFootprint_Espeon:: @ 8CB6D84 - .incbin "graphics/pokemon/footprints/espeon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Umbreon:: @ 8CB6DA4 - .incbin "graphics/pokemon/front_pics/umbreon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Umbreon:: @ 8CB70B8 - .incbin "graphics/pokemon/palettes/umbreon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Umbreon:: @ 8CB70E0 - .incbin "graphics/pokemon/back_pics/umbreon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Umbreon:: @ 8CB73F4 - .incbin "graphics/pokemon/palettes/umbreon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Umbreon:: @ 8CB741C - .incbin "graphics/pokemon/icons/umbreon_icon.4bpp" - - .align 2 -gMonFootprint_Umbreon:: @ 8CB781C - .incbin "graphics/pokemon/footprints/umbreon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Murkrow:: @ 8CB783C - .incbin "graphics/pokemon/front_pics/murkrow_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Murkrow:: @ 8CB7B1C - .incbin "graphics/pokemon/palettes/murkrow_palette.gbapal.lz" - - .align 2 -gMonBackPic_Murkrow:: @ 8CB7B44 - .incbin "graphics/pokemon/back_pics/murkrow_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Murkrow:: @ 8CB7E5C - .incbin "graphics/pokemon/palettes/murkrow_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Murkrow:: @ 8CB7E84 - .incbin "graphics/pokemon/icons/murkrow_icon.4bpp" - - .align 2 -gMonFootprint_Murkrow:: @ 8CB8284 - .incbin "graphics/pokemon/footprints/murkrow_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slowking:: @ 8CB82A4 - .incbin "graphics/pokemon/front_pics/slowking_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slowking:: @ 8CB8658 - .incbin "graphics/pokemon/palettes/slowking_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slowking:: @ 8CB8680 - .incbin "graphics/pokemon/back_pics/slowking_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slowking:: @ 8CB8A0C - .incbin "graphics/pokemon/palettes/slowking_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slowking:: @ 8CB8A34 - .incbin "graphics/pokemon/icons/slowking_icon.4bpp" - - .align 2 -gMonFootprint_Slowking:: @ 8CB8E34 - .incbin "graphics/pokemon/footprints/slowking_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Misdreavus:: @ 8CB8E54 - .incbin "graphics/pokemon/front_pics/misdreavus_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Misdreavus:: @ 8CB9114 - .incbin "graphics/pokemon/palettes/misdreavus_palette.gbapal.lz" - - .align 2 -gMonBackPic_Misdreavus:: @ 8CB913C - .incbin "graphics/pokemon/back_pics/misdreavus_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Misdreavus:: @ 8CB9460 - .incbin "graphics/pokemon/palettes/misdreavus_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Misdreavus:: @ 8CB9488 - .incbin "graphics/pokemon/icons/misdreavus_icon.4bpp" - - .align 2 -gMonFootprint_Misdreavus:: @ 8CB9888 - .incbin "graphics/pokemon/footprints/misdreavus_footprint.1bpp" - - .align 2 -gMonStillFrontPic_UnownA:: @ 8CB98A8 - .incbin "graphics/pokemon/front_pics/unown_a_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Unown:: @ 8CB9A7C - .incbin "graphics/pokemon/palettes/unown_palette.gbapal.lz" - - .align 2 -gMonBackPic_UnownA:: @ 8CB9A9C - .incbin "graphics/pokemon/back_pics/unown_a_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Unown:: @ 8CB9C9C - .incbin "graphics/pokemon/palettes/unown_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_UnownA:: @ 8CB9CBC - .incbin "graphics/pokemon/icons/unown_a_icon.4bpp" - - .align 2 -gMonFootprint_Unown:: @ 8CBA0BC - .incbin "graphics/pokemon/footprints/unown_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wobbuffet:: @ 8CBA0DC - .incbin "graphics/pokemon/front_pics/wobbuffet_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wobbuffet:: @ 8CBA42C - .incbin "graphics/pokemon/palettes/wobbuffet_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wobbuffet:: @ 8CBA454 - .incbin "graphics/pokemon/back_pics/wobbuffet_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wobbuffet:: @ 8CBA698 - .incbin "graphics/pokemon/palettes/wobbuffet_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wobbuffet:: @ 8CBA6C0 - .incbin "graphics/pokemon/icons/wobbuffet_icon.4bpp" - - .align 2 -gMonFootprint_Wobbuffet:: @ 8CBAAC0 - .incbin "graphics/pokemon/footprints/wobbuffet_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Girafarig:: @ 8CBAAE0 - .incbin "graphics/pokemon/front_pics/girafarig_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Girafarig:: @ 8CBAEE4 - .incbin "graphics/pokemon/palettes/girafarig_palette.gbapal.lz" - - .align 2 -gMonBackPic_Girafarig:: @ 8CBAF0C - .incbin "graphics/pokemon/back_pics/girafarig_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Girafarig:: @ 8CBB2B8 - .incbin "graphics/pokemon/palettes/girafarig_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Girafarig:: @ 8CBB2E0 - .incbin "graphics/pokemon/icons/girafarig_icon.4bpp" - - .align 2 -gMonFootprint_Girafarig:: @ 8CBB6E0 - .incbin "graphics/pokemon/footprints/girafarig_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pineco:: @ 8CBB700 - .incbin "graphics/pokemon/front_pics/pineco_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pineco:: @ 8CBBA40 - .incbin "graphics/pokemon/palettes/pineco_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pineco:: @ 8CBBA64 - .incbin "graphics/pokemon/back_pics/pineco_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pineco:: @ 8CBBD3C - .incbin "graphics/pokemon/palettes/pineco_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pineco:: @ 8CBBD60 - .incbin "graphics/pokemon/icons/pineco_icon.4bpp" - - .align 2 -gMonFootprint_Pineco:: @ 8CBC160 - .incbin "graphics/pokemon/footprints/pineco_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Forretress:: @ 8CBC180 - .incbin "graphics/pokemon/front_pics/forretress_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Forretress:: @ 8CBC59C - .incbin "graphics/pokemon/palettes/forretress_palette.gbapal.lz" - - .align 2 -gMonBackPic_Forretress:: @ 8CBC5C4 - .incbin "graphics/pokemon/back_pics/forretress_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Forretress:: @ 8CBC884 - .incbin "graphics/pokemon/palettes/forretress_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Forretress:: @ 8CBC8AC - .incbin "graphics/pokemon/icons/forretress_icon.4bpp" - - .align 2 -gMonFootprint_Forretress:: @ 8CBCCAC - .incbin "graphics/pokemon/footprints/forretress_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dunsparce:: @ 8CBCCCC - .incbin "graphics/pokemon/front_pics/dunsparce_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dunsparce:: @ 8CBCFDC - .incbin "graphics/pokemon/palettes/dunsparce_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dunsparce:: @ 8CBD004 - .incbin "graphics/pokemon/back_pics/dunsparce_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dunsparce:: @ 8CBD300 - .incbin "graphics/pokemon/palettes/dunsparce_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dunsparce:: @ 8CBD328 - .incbin "graphics/pokemon/icons/dunsparce_icon.4bpp" - - .align 2 -gMonFootprint_Dunsparce:: @ 8CBD728 - .incbin "graphics/pokemon/footprints/dunsparce_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gligar:: @ 8CBD748 - .incbin "graphics/pokemon/front_pics/gligar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gligar:: @ 8CBDB70 - .incbin "graphics/pokemon/palettes/gligar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gligar:: @ 8CBDB98 - .incbin "graphics/pokemon/back_pics/gligar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gligar:: @ 8CBDF70 - .incbin "graphics/pokemon/palettes/gligar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gligar:: @ 8CBDF98 - .incbin "graphics/pokemon/icons/gligar_icon.4bpp" - - .align 2 -gMonFootprint_Gligar:: @ 8CBE398 - .incbin "graphics/pokemon/footprints/gligar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Steelix:: @ 8CBE3B8 - .incbin "graphics/pokemon/front_pics/steelix_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Steelix:: @ 8CBE880 - .incbin "graphics/pokemon/palettes/steelix_palette.gbapal.lz" - - .align 2 -gMonBackPic_Steelix:: @ 8CBE8A4 - .incbin "graphics/pokemon/back_pics/steelix_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Steelix:: @ 8CBECB0 - .incbin "graphics/pokemon/palettes/steelix_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Steelix:: @ 8CBECD4 - .incbin "graphics/pokemon/icons/steelix_icon.4bpp" - - .align 2 -gMonFootprint_Steelix:: @ 8CBF0D4 - .incbin "graphics/pokemon/footprints/steelix_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Snubbull:: @ 8CBF0F4 - .incbin "graphics/pokemon/front_pics/snubbull_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Snubbull:: @ 8CBF3C8 - .incbin "graphics/pokemon/palettes/snubbull_palette.gbapal.lz" - - .align 2 -gMonBackPic_Snubbull:: @ 8CBF3F0 - .incbin "graphics/pokemon/back_pics/snubbull_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Snubbull:: @ 8CBF718 - .incbin "graphics/pokemon/palettes/snubbull_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Snubbull:: @ 8CBF740 - .incbin "graphics/pokemon/icons/snubbull_icon.4bpp" - - .align 2 -gMonFootprint_Snubbull:: @ 8CBFB40 - .incbin "graphics/pokemon/footprints/snubbull_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Granbull:: @ 8CBFB60 - .incbin "graphics/pokemon/front_pics/granbull_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Granbull:: @ 8CBFEEC - .incbin "graphics/pokemon/palettes/granbull_palette.gbapal.lz" - - .align 2 -gMonBackPic_Granbull:: @ 8CBFF14 - .incbin "graphics/pokemon/back_pics/granbull_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Granbull:: @ 8CC0238 - .incbin "graphics/pokemon/palettes/granbull_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Granbull:: @ 8CC0260 - .incbin "graphics/pokemon/icons/granbull_icon.4bpp" - - .align 2 -gMonFootprint_Granbull:: @ 8CC0660 - .incbin "graphics/pokemon/footprints/granbull_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Qwilfish:: @ 8CC0680 - .incbin "graphics/pokemon/front_pics/qwilfish_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Qwilfish:: @ 8CC0940 - .incbin "graphics/pokemon/palettes/qwilfish_palette.gbapal.lz" - - .align 2 -gMonBackPic_Qwilfish:: @ 8CC0968 - .incbin "graphics/pokemon/back_pics/qwilfish_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Qwilfish:: @ 8CC0C48 - .incbin "graphics/pokemon/palettes/qwilfish_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Qwilfish:: @ 8CC0C70 - .incbin "graphics/pokemon/icons/qwilfish_icon.4bpp" - - .align 2 -gMonFootprint_Qwilfish:: @ 8CC1070 - .incbin "graphics/pokemon/footprints/qwilfish_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Scizor:: @ 8CC1090 - .incbin "graphics/pokemon/front_pics/scizor_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Scizor:: @ 8CC1578 - .incbin "graphics/pokemon/palettes/scizor_palette.gbapal.lz" - - .align 2 -gMonBackPic_Scizor:: @ 8CC15A0 - .incbin "graphics/pokemon/back_pics/scizor_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Scizor:: @ 8CC1920 - .incbin "graphics/pokemon/palettes/scizor_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Scizor:: @ 8CC1948 - .incbin "graphics/pokemon/icons/scizor_icon.4bpp" - - .align 2 -gMonFootprint_Scizor:: @ 8CC1D48 - .incbin "graphics/pokemon/footprints/scizor_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shuckle:: @ 8CC1D68 - .incbin "graphics/pokemon/front_pics/shuckle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shuckle:: @ 8CC2030 - .incbin "graphics/pokemon/palettes/shuckle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shuckle:: @ 8CC2058 - .incbin "graphics/pokemon/back_pics/shuckle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shuckle:: @ 8CC22B0 - .incbin "graphics/pokemon/palettes/shuckle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shuckle:: @ 8CC22D8 - .incbin "graphics/pokemon/icons/shuckle_icon.4bpp" - - .align 2 -gMonFootprint_Shuckle:: @ 8CC26D8 - .incbin "graphics/pokemon/footprints/shuckle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Heracross:: @ 8CC26F8 - .incbin "graphics/pokemon/front_pics/heracross_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Heracross:: @ 8CC2AE8 - .incbin "graphics/pokemon/palettes/heracross_palette.gbapal.lz" - - .align 2 -gMonBackPic_Heracross:: @ 8CC2B10 - .incbin "graphics/pokemon/back_pics/heracross_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Heracross:: @ 8CC2E80 - .incbin "graphics/pokemon/palettes/heracross_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Heracross:: @ 8CC2EA8 - .incbin "graphics/pokemon/icons/heracross_icon.4bpp" - - .align 2 -gMonFootprint_Heracross:: @ 8CC32A8 - .incbin "graphics/pokemon/footprints/heracross_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sneasel:: @ 8CC32C8 - .incbin "graphics/pokemon/front_pics/sneasel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sneasel:: @ 8CC360C - .incbin "graphics/pokemon/palettes/sneasel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sneasel:: @ 8CC3634 - .incbin "graphics/pokemon/back_pics/sneasel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sneasel:: @ 8CC3958 - .incbin "graphics/pokemon/palettes/sneasel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sneasel:: @ 8CC3980 - .incbin "graphics/pokemon/icons/sneasel_icon.4bpp" - - .align 2 -gMonFootprint_Sneasel:: @ 8CC3D80 - .incbin "graphics/pokemon/footprints/sneasel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Teddiursa:: @ 8CC3DA0 - .incbin "graphics/pokemon/front_pics/teddiursa_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Teddiursa:: @ 8CC400C - .incbin "graphics/pokemon/palettes/teddiursa_palette.gbapal.lz" - - .align 2 -gMonBackPic_Teddiursa:: @ 8CC4034 - .incbin "graphics/pokemon/back_pics/teddiursa_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Teddiursa:: @ 8CC42AC - .incbin "graphics/pokemon/palettes/teddiursa_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Teddiursa:: @ 8CC42D4 - .incbin "graphics/pokemon/icons/teddiursa_icon.4bpp" - - .align 2 -gMonFootprint_Teddiursa:: @ 8CC46D4 - .incbin "graphics/pokemon/footprints/teddiursa_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ursaring:: @ 8CC46F4 - .incbin "graphics/pokemon/front_pics/ursaring_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ursaring:: @ 8CC4B2C - .incbin "graphics/pokemon/palettes/ursaring_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ursaring:: @ 8CC4B54 - .incbin "graphics/pokemon/back_pics/ursaring_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ursaring:: @ 8CC4EDC - .incbin "graphics/pokemon/palettes/ursaring_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ursaring:: @ 8CC4F04 - .incbin "graphics/pokemon/icons/ursaring_icon.4bpp" - - .align 2 -gMonFootprint_Ursaring:: @ 8CC5304 - .incbin "graphics/pokemon/footprints/ursaring_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slugma:: @ 8CC5324 - .incbin "graphics/pokemon/front_pics/slugma_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slugma:: @ 8CC5598 - .incbin "graphics/pokemon/palettes/slugma_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slugma:: @ 8CC55BC - .incbin "graphics/pokemon/back_pics/slugma_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slugma:: @ 8CC58A4 - .incbin "graphics/pokemon/palettes/slugma_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slugma:: @ 8CC58C8 - .incbin "graphics/pokemon/icons/slugma_icon.4bpp" - - .align 2 -gMonFootprint_Slugma:: @ 8CC5CC8 - .incbin "graphics/pokemon/footprints/slugma_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magcargo:: @ 8CC5CE8 - .incbin "graphics/pokemon/front_pics/magcargo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magcargo:: @ 8CC6030 - .incbin "graphics/pokemon/palettes/magcargo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magcargo:: @ 8CC6058 - .incbin "graphics/pokemon/back_pics/magcargo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magcargo:: @ 8CC6470 - .incbin "graphics/pokemon/palettes/magcargo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magcargo:: @ 8CC6498 - .incbin "graphics/pokemon/icons/magcargo_icon.4bpp" - - .align 2 -gMonFootprint_Magcargo:: @ 8CC6898 - .incbin "graphics/pokemon/footprints/magcargo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Swinub:: @ 8CC68B8 - .incbin "graphics/pokemon/front_pics/swinub_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Swinub:: @ 8CC6AB4 - .incbin "graphics/pokemon/palettes/swinub_palette.gbapal.lz" - - .align 2 -gMonBackPic_Swinub:: @ 8CC6ADC - .incbin "graphics/pokemon/back_pics/swinub_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Swinub:: @ 8CC6D18 - .incbin "graphics/pokemon/palettes/swinub_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Swinub:: @ 8CC6D40 - .incbin "graphics/pokemon/icons/swinub_icon.4bpp" - - .align 2 -gMonFootprint_Swinub:: @ 8CC7140 - .incbin "graphics/pokemon/footprints/swinub_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Piloswine:: @ 8CC7160 - .incbin "graphics/pokemon/front_pics/piloswine_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Piloswine:: @ 8CC7488 - .incbin "graphics/pokemon/palettes/piloswine_palette.gbapal.lz" - - .align 2 -gMonBackPic_Piloswine:: @ 8CC74B0 - .incbin "graphics/pokemon/back_pics/piloswine_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Piloswine:: @ 8CC76FC - .incbin "graphics/pokemon/palettes/piloswine_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Piloswine:: @ 8CC7724 - .incbin "graphics/pokemon/icons/piloswine_icon.4bpp" - - .align 2 -gMonFootprint_Piloswine:: @ 8CC7B24 - .incbin "graphics/pokemon/footprints/piloswine_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Corsola:: @ 8CC7B44 - .incbin "graphics/pokemon/front_pics/corsola_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Corsola:: @ 8CC7E2C - .incbin "graphics/pokemon/palettes/corsola_palette.gbapal.lz" - - .align 2 -gMonBackPic_Corsola:: @ 8CC7E54 - .incbin "graphics/pokemon/back_pics/corsola_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Corsola:: @ 8CC8114 - .incbin "graphics/pokemon/palettes/corsola_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Corsola:: @ 8CC813C - .incbin "graphics/pokemon/icons/corsola_icon.4bpp" - - .align 2 -gMonFootprint_Corsola:: @ 8CC853C - .incbin "graphics/pokemon/footprints/corsola_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Remoraid:: @ 8CC855C - .incbin "graphics/pokemon/front_pics/remoraid_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Remoraid:: @ 8CC87C4 - .incbin "graphics/pokemon/palettes/remoraid_palette.gbapal.lz" - - .align 2 -gMonBackPic_Remoraid:: @ 8CC87EC - .incbin "graphics/pokemon/back_pics/remoraid_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Remoraid:: @ 8CC8B00 - .incbin "graphics/pokemon/palettes/remoraid_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Remoraid:: @ 8CC8B28 - .incbin "graphics/pokemon/icons/remoraid_icon.4bpp" - - .align 2 -gMonFootprint_Remoraid:: @ 8CC8F28 - .incbin "graphics/pokemon/footprints/remoraid_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Octillery:: @ 8CC8F48 - .incbin "graphics/pokemon/front_pics/octillery_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Octillery:: @ 8CC927C - .incbin "graphics/pokemon/palettes/octillery_palette.gbapal.lz" - - .align 2 -gMonBackPic_Octillery:: @ 8CC92A4 - .incbin "graphics/pokemon/back_pics/octillery_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Octillery:: @ 8CC955C - .incbin "graphics/pokemon/palettes/octillery_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Octillery:: @ 8CC9584 - .incbin "graphics/pokemon/icons/octillery_icon.4bpp" - - .align 2 -gMonFootprint_Octillery:: @ 8CC9984 - .incbin "graphics/pokemon/footprints/octillery_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Delibird:: @ 8CC99A4 - .incbin "graphics/pokemon/front_pics/delibird_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Delibird:: @ 8CC9D14 - .incbin "graphics/pokemon/palettes/delibird_palette.gbapal.lz" - - .align 2 -gMonBackPic_Delibird:: @ 8CC9D3C - .incbin "graphics/pokemon/back_pics/delibird_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Delibird:: @ 8CCA0FC - .incbin "graphics/pokemon/palettes/delibird_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Delibird:: @ 8CCA124 - .incbin "graphics/pokemon/icons/delibird_icon.4bpp" - - .align 2 -gMonFootprint_Delibird:: @ 8CCA524 - .incbin "graphics/pokemon/footprints/delibird_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mantine:: @ 8CCA544 - .incbin "graphics/pokemon/front_pics/mantine_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mantine:: @ 8CCA9E0 - .incbin "graphics/pokemon/palettes/mantine_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mantine:: @ 8CCAA08 - .incbin "graphics/pokemon/back_pics/mantine_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mantine:: @ 8CCACA8 - .incbin "graphics/pokemon/palettes/mantine_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mantine:: @ 8CCACD0 - .incbin "graphics/pokemon/icons/mantine_icon.4bpp" - - .align 2 -gMonFootprint_Mantine:: @ 8CCB0D0 - .incbin "graphics/pokemon/footprints/mantine_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Skarmory:: @ 8CCB0F0 - .incbin "graphics/pokemon/front_pics/skarmory_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Skarmory:: @ 8CCB5D0 - .incbin "graphics/pokemon/palettes/skarmory_palette.gbapal.lz" - - .align 2 -gMonBackPic_Skarmory:: @ 8CCB5F8 - .incbin "graphics/pokemon/back_pics/skarmory_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Skarmory:: @ 8CCB8FC - .incbin "graphics/pokemon/palettes/skarmory_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Skarmory:: @ 8CCB924 - .incbin "graphics/pokemon/icons/skarmory_icon.4bpp" - - .align 2 -gMonFootprint_Skarmory:: @ 8CCBD24 - .incbin "graphics/pokemon/footprints/skarmory_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Houndour:: @ 8CCBD44 - .incbin "graphics/pokemon/front_pics/houndour_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Houndour:: @ 8CCBFFC - .incbin "graphics/pokemon/palettes/houndour_palette.gbapal.lz" - - .align 2 -gMonBackPic_Houndour:: @ 8CCC024 - .incbin "graphics/pokemon/back_pics/houndour_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Houndour:: @ 8CCC2A4 - .incbin "graphics/pokemon/palettes/houndour_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Houndour:: @ 8CCC2CC - .incbin "graphics/pokemon/icons/houndour_icon.4bpp" - - .align 2 -gMonFootprint_Houndour:: @ 8CCC6CC - .incbin "graphics/pokemon/footprints/houndour_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Houndoom:: @ 8CCC6EC - .incbin "graphics/pokemon/front_pics/houndoom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Houndoom:: @ 8CCCAEC - .incbin "graphics/pokemon/palettes/houndoom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Houndoom:: @ 8CCCB14 - .incbin "graphics/pokemon/back_pics/houndoom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Houndoom:: @ 8CCCE38 - .incbin "graphics/pokemon/palettes/houndoom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Houndoom:: @ 8CCCE60 - .incbin "graphics/pokemon/icons/houndoom_icon.4bpp" - - .align 2 -gMonFootprint_Houndoom:: @ 8CCD260 - .incbin "graphics/pokemon/footprints/houndoom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kingdra:: @ 8CCD280 - .incbin "graphics/pokemon/front_pics/kingdra_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kingdra:: @ 8CCD6A0 - .incbin "graphics/pokemon/palettes/kingdra_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kingdra:: @ 8CCD6C8 - .incbin "graphics/pokemon/back_pics/kingdra_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kingdra:: @ 8CCDA7C - .incbin "graphics/pokemon/palettes/kingdra_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kingdra:: @ 8CCDAA4 - .incbin "graphics/pokemon/icons/kingdra_icon.4bpp" - - .align 2 -gMonFootprint_Kingdra:: @ 8CCDEA4 - .incbin "graphics/pokemon/footprints/kingdra_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Phanpy:: @ 8CCDEC4 - .incbin "graphics/pokemon/front_pics/phanpy_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Phanpy:: @ 8CCE120 - .incbin "graphics/pokemon/palettes/phanpy_palette.gbapal.lz" - - .align 2 -gMonBackPic_Phanpy:: @ 8CCE148 - .incbin "graphics/pokemon/back_pics/phanpy_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Phanpy:: @ 8CCE40C - .incbin "graphics/pokemon/palettes/phanpy_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Phanpy:: @ 8CCE434 - .incbin "graphics/pokemon/icons/phanpy_icon.4bpp" - - .align 2 -gMonFootprint_Phanpy:: @ 8CCE834 - .incbin "graphics/pokemon/footprints/phanpy_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Donphan:: @ 8CCE854 - .incbin "graphics/pokemon/front_pics/donphan_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Donphan:: @ 8CCECC8 - .incbin "graphics/pokemon/palettes/donphan_palette.gbapal.lz" - - .align 2 -gMonBackPic_Donphan:: @ 8CCECF0 - .incbin "graphics/pokemon/back_pics/donphan_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Donphan:: @ 8CCEFEC - .incbin "graphics/pokemon/palettes/donphan_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Donphan:: @ 8CCF014 - .incbin "graphics/pokemon/icons/donphan_icon.4bpp" - - .align 2 -gMonFootprint_Donphan:: @ 8CCF414 - .incbin "graphics/pokemon/footprints/donphan_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Porygon2:: @ 8CCF434 - .incbin "graphics/pokemon/front_pics/porygon2_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Porygon2:: @ 8CCF6BC - .incbin "graphics/pokemon/palettes/porygon2_palette.gbapal.lz" - - .align 2 -gMonBackPic_Porygon2:: @ 8CCF6E4 - .incbin "graphics/pokemon/back_pics/porygon2_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Porygon2:: @ 8CCFA00 - .incbin "graphics/pokemon/palettes/porygon2_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Porygon2:: @ 8CCFA28 - .incbin "graphics/pokemon/icons/porygon2_icon.4bpp" - - .align 2 -gMonFootprint_Porygon2:: @ 8CCFE28 - .incbin "graphics/pokemon/footprints/porygon2_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Stantler:: @ 8CCFE48 - .incbin "graphics/pokemon/front_pics/stantler_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Stantler:: @ 8CD025C - .incbin "graphics/pokemon/palettes/stantler_palette.gbapal.lz" - - .align 2 -gMonBackPic_Stantler:: @ 8CD0284 - .incbin "graphics/pokemon/back_pics/stantler_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Stantler:: @ 8CD05D0 - .incbin "graphics/pokemon/palettes/stantler_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Stantler:: @ 8CD05F8 - .incbin "graphics/pokemon/icons/stantler_icon.4bpp" - - .align 2 -gMonFootprint_Stantler:: @ 8CD09F8 - .incbin "graphics/pokemon/footprints/stantler_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Smeargle:: @ 8CD0A18 - .incbin "graphics/pokemon/front_pics/smeargle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Smeargle:: @ 8CD0DAC - .incbin "graphics/pokemon/palettes/smeargle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Smeargle:: @ 8CD0DD4 - .incbin "graphics/pokemon/back_pics/smeargle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Smeargle:: @ 8CD10F8 - .incbin "graphics/pokemon/palettes/smeargle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Smeargle:: @ 8CD1120 - .incbin "graphics/pokemon/icons/smeargle_icon.4bpp" - - .align 2 -gMonFootprint_Smeargle:: @ 8CD1520 - .incbin "graphics/pokemon/footprints/smeargle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tyrogue:: @ 8CD1540 - .incbin "graphics/pokemon/front_pics/tyrogue_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tyrogue:: @ 8CD17CC - .incbin "graphics/pokemon/palettes/tyrogue_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tyrogue:: @ 8CD17F4 - .incbin "graphics/pokemon/back_pics/tyrogue_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tyrogue:: @ 8CD1B10 - .incbin "graphics/pokemon/palettes/tyrogue_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tyrogue:: @ 8CD1B38 - .incbin "graphics/pokemon/icons/tyrogue_icon.4bpp" - - .align 2 -gMonFootprint_Tyrogue:: @ 8CD1F38 - .incbin "graphics/pokemon/footprints/tyrogue_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hitmontop:: @ 8CD1F58 - .incbin "graphics/pokemon/front_pics/hitmontop_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hitmontop:: @ 8CD22E4 - .incbin "graphics/pokemon/palettes/hitmontop_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hitmontop:: @ 8CD230C - .incbin "graphics/pokemon/back_pics/hitmontop_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hitmontop:: @ 8CD2734 - .incbin "graphics/pokemon/palettes/hitmontop_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hitmontop:: @ 8CD275C - .incbin "graphics/pokemon/icons/hitmontop_icon.4bpp" - - .align 2 -gMonFootprint_Hitmontop:: @ 8CD2B5C - .incbin "graphics/pokemon/footprints/hitmontop_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Smoochum:: @ 8CD2B7C - .incbin "graphics/pokemon/front_pics/smoochum_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Smoochum:: @ 8CD2DD4 - .incbin "graphics/pokemon/palettes/smoochum_palette.gbapal.lz" - - .align 2 -gMonBackPic_Smoochum:: @ 8CD2DFC - .incbin "graphics/pokemon/back_pics/smoochum_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Smoochum:: @ 8CD3074 - .incbin "graphics/pokemon/palettes/smoochum_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Smoochum:: @ 8CD309C - .incbin "graphics/pokemon/icons/smoochum_icon.4bpp" - - .align 2 -gMonFootprint_Smoochum:: @ 8CD349C - .incbin "graphics/pokemon/footprints/smoochum_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Elekid:: @ 8CD34BC - .incbin "graphics/pokemon/front_pics/elekid_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Elekid:: @ 8CD37C4 - .incbin "graphics/pokemon/palettes/elekid_palette.gbapal.lz" - - .align 2 -gMonBackPic_Elekid:: @ 8CD37EC - .incbin "graphics/pokemon/back_pics/elekid_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Elekid:: @ 8CD3B44 - .incbin "graphics/pokemon/palettes/elekid_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Elekid:: @ 8CD3B6C - .incbin "graphics/pokemon/icons/elekid_icon.4bpp" - - .align 2 -gMonFootprint_Elekid:: @ 8CD3F6C - .incbin "graphics/pokemon/footprints/elekid_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Magby:: @ 8CD3F8C - .incbin "graphics/pokemon/front_pics/magby_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Magby:: @ 8CD4210 - .incbin "graphics/pokemon/palettes/magby_palette.gbapal.lz" - - .align 2 -gMonBackPic_Magby:: @ 8CD4238 - .incbin "graphics/pokemon/back_pics/magby_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Magby:: @ 8CD44E4 - .incbin "graphics/pokemon/palettes/magby_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Magby:: @ 8CD450C - .incbin "graphics/pokemon/icons/magby_icon.4bpp" - - .align 2 -gMonFootprint_Magby:: @ 8CD490C - .incbin "graphics/pokemon/footprints/magby_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Miltank:: @ 8CD492C - .incbin "graphics/pokemon/front_pics/miltank_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Miltank:: @ 8CD4CDC - .incbin "graphics/pokemon/palettes/miltank_palette.gbapal.lz" - - .align 2 -gMonBackPic_Miltank:: @ 8CD4D04 - .incbin "graphics/pokemon/back_pics/miltank_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Miltank:: @ 8CD50A0 - .incbin "graphics/pokemon/palettes/miltank_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Miltank:: @ 8CD50C8 - .incbin "graphics/pokemon/icons/miltank_icon.4bpp" - - .align 2 -gMonFootprint_Miltank:: @ 8CD54C8 - .incbin "graphics/pokemon/footprints/miltank_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Blissey:: @ 8CD54E8 - .incbin "graphics/pokemon/front_pics/blissey_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Blissey:: @ 8CD58D0 - .incbin "graphics/pokemon/palettes/blissey_palette.gbapal.lz" - - .align 2 -gMonBackPic_Blissey:: @ 8CD58F8 - .incbin "graphics/pokemon/back_pics/blissey_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Blissey:: @ 8CD5BC4 - .incbin "graphics/pokemon/palettes/blissey_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Blissey:: @ 8CD5BEC - .incbin "graphics/pokemon/icons/blissey_icon.4bpp" - - .align 2 -gMonFootprint_Blissey:: @ 8CD5FEC - .incbin "graphics/pokemon/footprints/blissey_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Raikou:: @ 8CD600C - .incbin "graphics/pokemon/front_pics/raikou_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Raikou:: @ 8CD6588 - .incbin "graphics/pokemon/palettes/raikou_palette.gbapal.lz" - - .align 2 -gMonBackPic_Raikou:: @ 8CD65B0 - .incbin "graphics/pokemon/back_pics/raikou_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Raikou:: @ 8CD6958 - .incbin "graphics/pokemon/palettes/raikou_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Raikou:: @ 8CD6980 - .incbin "graphics/pokemon/icons/raikou_icon.4bpp" - - .align 2 -gMonFootprint_Raikou:: @ 8CD6D80 - .incbin "graphics/pokemon/footprints/raikou_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Entei:: @ 8CD6DA0 - .incbin "graphics/pokemon/front_pics/entei_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Entei:: @ 8CD739C - .incbin "graphics/pokemon/palettes/entei_palette.gbapal.lz" - - .align 2 -gMonBackPic_Entei:: @ 8CD73C4 - .incbin "graphics/pokemon/back_pics/entei_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Entei:: @ 8CD77E8 - .incbin "graphics/pokemon/palettes/entei_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Entei:: @ 8CD7810 - .incbin "graphics/pokemon/icons/entei_icon.4bpp" - - .align 2 -gMonFootprint_Entei:: @ 8CD7C10 - .incbin "graphics/pokemon/footprints/entei_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Suicune:: @ 8CD7C30 - .incbin "graphics/pokemon/front_pics/suicune_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Suicune:: @ 8CD81B4 - .incbin "graphics/pokemon/palettes/suicune_palette.gbapal.lz" - - .align 2 -gMonBackPic_Suicune:: @ 8CD81DC - .incbin "graphics/pokemon/back_pics/suicune_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Suicune:: @ 8CD86B8 - .incbin "graphics/pokemon/palettes/suicune_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Suicune:: @ 8CD86E0 - .incbin "graphics/pokemon/icons/suicune_icon.4bpp" - - .align 2 -gMonFootprint_Suicune:: @ 8CD8AE0 - .incbin "graphics/pokemon/footprints/suicune_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Larvitar:: @ 8CD8B00 - .incbin "graphics/pokemon/front_pics/larvitar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Larvitar:: @ 8CD8D5C - .incbin "graphics/pokemon/palettes/larvitar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Larvitar:: @ 8CD8D84 - .incbin "graphics/pokemon/back_pics/larvitar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Larvitar:: @ 8CD9030 - .incbin "graphics/pokemon/palettes/larvitar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Larvitar:: @ 8CD9058 - .incbin "graphics/pokemon/icons/larvitar_icon.4bpp" - - .align 2 -gMonFootprint_Larvitar:: @ 8CD9458 - .incbin "graphics/pokemon/footprints/larvitar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pupitar:: @ 8CD9478 - .incbin "graphics/pokemon/front_pics/pupitar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pupitar:: @ 8CD9768 - .incbin "graphics/pokemon/palettes/pupitar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pupitar:: @ 8CD9790 - .incbin "graphics/pokemon/back_pics/pupitar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pupitar:: @ 8CD9AC8 - .incbin "graphics/pokemon/palettes/pupitar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pupitar:: @ 8CD9AF0 - .incbin "graphics/pokemon/icons/pupitar_icon.4bpp" - - .align 2 -gMonFootprint_Pupitar:: @ 8CD9EF0 - .incbin "graphics/pokemon/footprints/pupitar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tyranitar:: @ 8CD9F10 - .incbin "graphics/pokemon/front_pics/tyranitar_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tyranitar:: @ 8CDA44C - .incbin "graphics/pokemon/palettes/tyranitar_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tyranitar:: @ 8CDA474 - .incbin "graphics/pokemon/back_pics/tyranitar_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tyranitar:: @ 8CDA860 - .incbin "graphics/pokemon/palettes/tyranitar_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tyranitar:: @ 8CDA888 - .incbin "graphics/pokemon/icons/tyranitar_icon.4bpp" - - .align 2 -gMonFootprint_Tyranitar:: @ 8CDAC88 - .incbin "graphics/pokemon/footprints/tyranitar_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lugia:: @ 8CDACA8 - .incbin "graphics/pokemon/front_pics/lugia_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lugia:: @ 8CDB16C - .incbin "graphics/pokemon/palettes/lugia_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lugia:: @ 8CDB194 - .incbin "graphics/pokemon/back_pics/lugia_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lugia:: @ 8CDB568 - .incbin "graphics/pokemon/palettes/lugia_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lugia:: @ 8CDB590 - .incbin "graphics/pokemon/icons/lugia_icon.4bpp" - - .align 2 -gMonFootprint_Lugia:: @ 8CDB990 - .incbin "graphics/pokemon/footprints/lugia_footprint.1bpp" - - .align 2 -gMonStillFrontPic_HoOh:: @ 8CDB9B0 - .incbin "graphics/pokemon/front_pics/ho_oh_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_HoOh:: @ 8CDC004 - .incbin "graphics/pokemon/palettes/ho_oh_palette.gbapal.lz" - - .align 2 -gMonBackPic_HoOh:: @ 8CDC02C - .incbin "graphics/pokemon/back_pics/ho_oh_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_HoOh:: @ 8CDC43C - .incbin "graphics/pokemon/palettes/ho_oh_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_HoOh:: @ 8CDC464 - .incbin "graphics/pokemon/icons/ho_oh_icon.4bpp" - - .align 2 -gMonFootprint_HoOh:: @ 8CDC864 - .incbin "graphics/pokemon/footprints/ho_oh_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Celebi:: @ 8CDC884 - .incbin "graphics/pokemon/front_pics/celebi_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Celebi:: @ 8CDCAFC - .incbin "graphics/pokemon/palettes/celebi_palette.gbapal.lz" - - .align 2 -gMonBackPic_Celebi:: @ 8CDCB24 - .incbin "graphics/pokemon/back_pics/celebi_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Celebi:: @ 8CDCED0 - .incbin "graphics/pokemon/palettes/celebi_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Celebi:: @ 8CDCEF8 - .incbin "graphics/pokemon/icons/celebi_icon.4bpp" - - .align 2 -gMonFootprint_Celebi:: @ 8CDD2F8 - .incbin "graphics/pokemon/footprints/celebi_footprint.1bpp" - - .align 2 -gMonStillFrontPic_DoubleQuestionMark:: @ 8CDD318 - .incbin "graphics/pokemon/front_pics/double_question_mark_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_DoubleQuestionMark:: @ 8CDD498 - .incbin "graphics/pokemon/palettes/double_question_mark_palette.gbapal.lz" - - .align 2 -gMonBackPic_DoubleQuestionMark:: @ 8CDD4AC - .incbin "graphics/pokemon/back_pics/double_question_mark_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_DoubleQuestionMark:: @ 8CDD630 - .incbin "graphics/pokemon/palettes/double_question_mark_shiny_palette.gbapal.lz" - - .align 2 -gMonStillFrontPic_Treecko:: @ 8CDD644 - .incbin "graphics/pokemon/front_pics/treecko_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Treecko:: @ 8CDD94C - .incbin "graphics/pokemon/palettes/treecko_palette.gbapal.lz" - - .align 2 -gMonBackPic_Treecko:: @ 8CDD974 - .incbin "graphics/pokemon/back_pics/treecko_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Treecko:: @ 8CDDC74 - .incbin "graphics/pokemon/palettes/treecko_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Treecko:: @ 8CDDC9C - .incbin "graphics/pokemon/icons/treecko_icon.4bpp" - - .align 2 -gMonFootprint_Treecko:: @ 8CDE09C - .incbin "graphics/pokemon/footprints/treecko_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Grovyle:: @ 8CDE0BC - .incbin "graphics/pokemon/front_pics/grovyle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Grovyle:: @ 8CDE548 - .incbin "graphics/pokemon/palettes/grovyle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Grovyle:: @ 8CDE570 - .incbin "graphics/pokemon/back_pics/grovyle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Grovyle:: @ 8CDE8AC - .incbin "graphics/pokemon/palettes/grovyle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Grovyle:: @ 8CDE8D4 - .incbin "graphics/pokemon/icons/grovyle_icon.4bpp" - - .align 2 -gMonFootprint_Grovyle:: @ 8CDECD4 - .incbin "graphics/pokemon/footprints/grovyle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sceptile:: @ 8CDECF4 - .incbin "graphics/pokemon/front_pics/sceptile_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sceptile:: @ 8CDF1F8 - .incbin "graphics/pokemon/palettes/sceptile_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sceptile:: @ 8CDF220 - .incbin "graphics/pokemon/back_pics/sceptile_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sceptile:: @ 8CDF61C - .incbin "graphics/pokemon/palettes/sceptile_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sceptile:: @ 8CDF644 - .incbin "graphics/pokemon/icons/sceptile_icon.4bpp" - - .align 2 -gMonFootprint_Sceptile:: @ 8CDFA44 - .incbin "graphics/pokemon/footprints/sceptile_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Torchic:: @ 8CDFA64 - .incbin "graphics/pokemon/front_pics/torchic_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Torchic:: @ 8CDFD00 - .incbin "graphics/pokemon/palettes/torchic_palette.gbapal.lz" - - .align 2 -gMonBackPic_Torchic:: @ 8CDFD28 - .incbin "graphics/pokemon/back_pics/torchic_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Torchic:: @ 8CE0000 - .incbin "graphics/pokemon/palettes/torchic_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Torchic:: @ 8CE0028 - .incbin "graphics/pokemon/icons/torchic_icon.4bpp" - - .align 2 -gMonFootprint_Torchic:: @ 8CE0428 - .incbin "graphics/pokemon/footprints/torchic_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Combusken:: @ 8CE0448 - .incbin "graphics/pokemon/front_pics/combusken_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Combusken:: @ 8CE0834 - .incbin "graphics/pokemon/palettes/combusken_palette.gbapal.lz" - - .align 2 -gMonBackPic_Combusken:: @ 8CE085C - .incbin "graphics/pokemon/back_pics/combusken_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Combusken:: @ 8CE0C2C - .incbin "graphics/pokemon/palettes/combusken_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Combusken:: @ 8CE0C54 - .incbin "graphics/pokemon/icons/combusken_icon.4bpp" - - .align 2 -gMonFootprint_Combusken:: @ 8CE1054 - .incbin "graphics/pokemon/footprints/combusken_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Blaziken:: @ 8CE1074 - .incbin "graphics/pokemon/front_pics/blaziken_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Blaziken:: @ 8CE17C4 - .incbin "graphics/pokemon/palettes/blaziken_palette.gbapal.lz" - - .align 2 -gMonBackPic_Blaziken:: @ 8CE17EC - .incbin "graphics/pokemon/back_pics/blaziken_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Blaziken:: @ 8CE1BC8 - .incbin "graphics/pokemon/palettes/blaziken_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Blaziken:: @ 8CE1BF0 - .incbin "graphics/pokemon/icons/blaziken_icon.4bpp" - - .align 2 -gMonFootprint_Blaziken:: @ 8CE1FF0 - .incbin "graphics/pokemon/footprints/blaziken_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mudkip:: @ 8CE2010 - .incbin "graphics/pokemon/front_pics/mudkip_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mudkip:: @ 8CE22C8 - .incbin "graphics/pokemon/palettes/mudkip_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mudkip:: @ 8CE22F0 - .incbin "graphics/pokemon/back_pics/mudkip_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mudkip:: @ 8CE25D0 - .incbin "graphics/pokemon/palettes/mudkip_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mudkip:: @ 8CE25F8 - .incbin "graphics/pokemon/icons/mudkip_icon.4bpp" - - .align 2 -gMonFootprint_Mudkip:: @ 8CE29F8 - .incbin "graphics/pokemon/footprints/mudkip_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Marshtomp:: @ 8CE2A18 - .incbin "graphics/pokemon/front_pics/marshtomp_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Marshtomp:: @ 8CE3078 - .incbin "graphics/pokemon/palettes/marshtomp_palette.gbapal.lz" - - .align 2 -gMonBackPic_Marshtomp:: @ 8CE30A0 - .incbin "graphics/pokemon/back_pics/marshtomp_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Marshtomp:: @ 8CE3450 - .incbin "graphics/pokemon/palettes/marshtomp_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Marshtomp:: @ 8CE3478 - .incbin "graphics/pokemon/icons/marshtomp_icon.4bpp" - - .align 2 -gMonFootprint_Marshtomp:: @ 8CE3878 - .incbin "graphics/pokemon/footprints/marshtomp_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Swampert:: @ 8CE3898 - .incbin "graphics/pokemon/front_pics/swampert_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Swampert:: @ 8CE3E14 - .incbin "graphics/pokemon/palettes/swampert_palette.gbapal.lz" - - .align 2 -gMonBackPic_Swampert:: @ 8CE3E3C - .incbin "graphics/pokemon/back_pics/swampert_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Swampert:: @ 8CE41F0 - .incbin "graphics/pokemon/palettes/swampert_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Swampert:: @ 8CE4218 - .incbin "graphics/pokemon/icons/swampert_icon.4bpp" - - .align 2 -gMonFootprint_Swampert:: @ 8CE4618 - .incbin "graphics/pokemon/footprints/swampert_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Poochyena:: @ 8CE4638 - .incbin "graphics/pokemon/front_pics/poochyena_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Poochyena:: @ 8CE4BDC - .incbin "graphics/pokemon/palettes/poochyena_palette.gbapal.lz" - - .align 2 -gMonBackPic_Poochyena:: @ 8CE4C04 - .incbin "graphics/pokemon/back_pics/poochyena_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Poochyena:: @ 8CE4F30 - .incbin "graphics/pokemon/palettes/poochyena_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Poochyena:: @ 8CE4F58 - .incbin "graphics/pokemon/icons/poochyena_icon.4bpp" - - .align 2 -gMonFootprint_Poochyena:: @ 8CE5358 - .incbin "graphics/pokemon/footprints/poochyena_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mightyena:: @ 8CE5378 - .incbin "graphics/pokemon/front_pics/mightyena_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mightyena:: @ 8CE57B0 - .incbin "graphics/pokemon/palettes/mightyena_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mightyena:: @ 8CE57D8 - .incbin "graphics/pokemon/back_pics/mightyena_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mightyena:: @ 8CE5B50 - .incbin "graphics/pokemon/palettes/mightyena_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mightyena:: @ 8CE5B78 - .incbin "graphics/pokemon/icons/mightyena_icon.4bpp" - - .align 2 -gMonFootprint_Mightyena:: @ 8CE5F78 - .incbin "graphics/pokemon/footprints/mightyena_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Zigzagoon:: @ 8CE5F98 - .incbin "graphics/pokemon/front_pics/zigzagoon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Zigzagoon:: @ 8CE6368 - .incbin "graphics/pokemon/palettes/zigzagoon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Zigzagoon:: @ 8CE6390 - .incbin "graphics/pokemon/back_pics/zigzagoon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Zigzagoon:: @ 8CE66D0 - .incbin "graphics/pokemon/palettes/zigzagoon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Zigzagoon:: @ 8CE66F8 - .incbin "graphics/pokemon/icons/zigzagoon_icon.4bpp" - - .align 2 -gMonFootprint_Zigzagoon:: @ 8CE6AF8 - .incbin "graphics/pokemon/footprints/zigzagoon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Linoone:: @ 8CE6B18 - .incbin "graphics/pokemon/front_pics/linoone_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Linoone:: @ 8CE6E88 - .incbin "graphics/pokemon/palettes/linoone_palette.gbapal.lz" - - .align 2 -gMonBackPic_Linoone:: @ 8CE6EB0 - .incbin "graphics/pokemon/back_pics/linoone_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Linoone:: @ 8CE7184 - .incbin "graphics/pokemon/palettes/linoone_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Linoone:: @ 8CE71AC - .incbin "graphics/pokemon/icons/linoone_icon.4bpp" - - .align 2 -gMonFootprint_Linoone:: @ 8CE75AC - .incbin "graphics/pokemon/footprints/linoone_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wurmple:: @ 8CE75CC - .incbin "graphics/pokemon/front_pics/wurmple_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wurmple:: @ 8CE7854 - .incbin "graphics/pokemon/palettes/wurmple_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wurmple:: @ 8CE787C - .incbin "graphics/pokemon/back_pics/wurmple_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wurmple:: @ 8CE7AC8 - .incbin "graphics/pokemon/palettes/wurmple_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wurmple:: @ 8CE7AF0 - .incbin "graphics/pokemon/icons/wurmple_icon.4bpp" - - .align 2 -gMonFootprint_Wurmple:: @ 8CE7EF0 - .incbin "graphics/pokemon/footprints/wurmple_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Silcoon:: @ 8CE7F10 - .incbin "graphics/pokemon/front_pics/silcoon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Silcoon:: @ 8CE8190 - .incbin "graphics/pokemon/palettes/silcoon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Silcoon:: @ 8CE81B8 - .incbin "graphics/pokemon/back_pics/silcoon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Silcoon:: @ 8CE83D4 - .incbin "graphics/pokemon/palettes/silcoon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Silcoon:: @ 8CE83FC - .incbin "graphics/pokemon/icons/silcoon_icon.4bpp" - - .align 2 -gMonFootprint_Silcoon:: @ 8CE87FC - .incbin "graphics/pokemon/footprints/silcoon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Beautifly:: @ 8CE881C - .incbin "graphics/pokemon/front_pics/beautifly_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Beautifly:: @ 8CE8B74 - .incbin "graphics/pokemon/palettes/beautifly_palette.gbapal.lz" - - .align 2 -gMonBackPic_Beautifly:: @ 8CE8B9C - .incbin "graphics/pokemon/back_pics/beautifly_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Beautifly:: @ 8CE8F4C - .incbin "graphics/pokemon/palettes/beautifly_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Beautifly:: @ 8CE8F74 - .incbin "graphics/pokemon/icons/beautifly_icon.4bpp" - - .align 2 -gMonFootprint_Beautifly:: @ 8CE9374 - .incbin "graphics/pokemon/footprints/beautifly_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cascoon:: @ 8CE9394 - .incbin "graphics/pokemon/front_pics/cascoon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cascoon:: @ 8CE9600 - .incbin "graphics/pokemon/palettes/cascoon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cascoon:: @ 8CE9628 - .incbin "graphics/pokemon/back_pics/cascoon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cascoon:: @ 8CE9838 - .incbin "graphics/pokemon/palettes/cascoon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cascoon:: @ 8CE9860 - .incbin "graphics/pokemon/icons/cascoon_icon.4bpp" - - .align 2 -gMonFootprint_Cascoon:: @ 8CE9C60 - .incbin "graphics/pokemon/footprints/cascoon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dustox:: @ 8CE9C80 - .incbin "graphics/pokemon/front_pics/dustox_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dustox:: @ 8CE9FE8 - .incbin "graphics/pokemon/palettes/dustox_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dustox:: @ 8CEA010 - .incbin "graphics/pokemon/back_pics/dustox_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dustox:: @ 8CEA268 - .incbin "graphics/pokemon/palettes/dustox_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dustox:: @ 8CEA290 - .incbin "graphics/pokemon/icons/dustox_icon.4bpp" - - .align 2 -gMonFootprint_Dustox:: @ 8CEA690 - .incbin "graphics/pokemon/footprints/dustox_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lotad:: @ 8CEA6B0 - .incbin "graphics/pokemon/front_pics/lotad_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lotad:: @ 8CEA910 - .incbin "graphics/pokemon/palettes/lotad_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lotad:: @ 8CEA938 - .incbin "graphics/pokemon/back_pics/lotad_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lotad:: @ 8CEAC20 - .incbin "graphics/pokemon/palettes/lotad_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lotad:: @ 8CEAC48 - .incbin "graphics/pokemon/icons/lotad_icon.4bpp" - - .align 2 -gMonFootprint_Lotad:: @ 8CEB048 - .incbin "graphics/pokemon/footprints/lotad_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lombre:: @ 8CEB068 - .incbin "graphics/pokemon/front_pics/lombre_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lombre:: @ 8CEB380 - .incbin "graphics/pokemon/palettes/lombre_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lombre:: @ 8CEB3A8 - .incbin "graphics/pokemon/back_pics/lombre_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lombre:: @ 8CEB6A4 - .incbin "graphics/pokemon/palettes/lombre_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lombre:: @ 8CEB6CC - .incbin "graphics/pokemon/icons/lombre_icon.4bpp" - - .align 2 -gMonFootprint_Lombre:: @ 8CEBACC - .incbin "graphics/pokemon/footprints/lombre_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ludicolo:: @ 8CEBAEC - .incbin "graphics/pokemon/front_pics/ludicolo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ludicolo:: @ 8CEBFD0 - .incbin "graphics/pokemon/palettes/ludicolo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ludicolo:: @ 8CEBFF8 - .incbin "graphics/pokemon/back_pics/ludicolo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ludicolo:: @ 8CEC2F4 - .incbin "graphics/pokemon/palettes/ludicolo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ludicolo:: @ 8CEC31C - .incbin "graphics/pokemon/icons/ludicolo_icon.4bpp" - - .align 2 -gMonFootprint_Ludicolo:: @ 8CEC71C - .incbin "graphics/pokemon/footprints/ludicolo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Seedot:: @ 8CEC73C - .incbin "graphics/pokemon/front_pics/seedot_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Seedot:: @ 8CEC9D0 - .incbin "graphics/pokemon/palettes/seedot_palette.gbapal.lz" - - .align 2 -gMonBackPic_Seedot:: @ 8CEC9F8 - .incbin "graphics/pokemon/back_pics/seedot_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Seedot:: @ 8CECCD8 - .incbin "graphics/pokemon/palettes/seedot_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Seedot:: @ 8CECD00 - .incbin "graphics/pokemon/icons/seedot_icon.4bpp" - - .align 2 -gMonFootprint_Seedot:: @ 8CED100 - .incbin "graphics/pokemon/footprints/seedot_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nuzleaf:: @ 8CED120 - .incbin "graphics/pokemon/front_pics/nuzleaf_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nuzleaf:: @ 8CED40C - .incbin "graphics/pokemon/palettes/nuzleaf_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nuzleaf:: @ 8CED434 - .incbin "graphics/pokemon/back_pics/nuzleaf_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nuzleaf:: @ 8CED6FC - .incbin "graphics/pokemon/palettes/nuzleaf_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nuzleaf:: @ 8CED724 - .incbin "graphics/pokemon/icons/nuzleaf_icon.4bpp" - - .align 2 -gMonFootprint_Nuzleaf:: @ 8CEDB24 - .incbin "graphics/pokemon/footprints/nuzleaf_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shiftry:: @ 8CEDB44 - .incbin "graphics/pokemon/front_pics/shiftry_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shiftry:: @ 8CEE000 - .incbin "graphics/pokemon/palettes/shiftry_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shiftry:: @ 8CEE028 - .incbin "graphics/pokemon/back_pics/shiftry_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shiftry:: @ 8CEE2EC - .incbin "graphics/pokemon/palettes/shiftry_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shiftry:: @ 8CEE314 - .incbin "graphics/pokemon/icons/shiftry_icon.4bpp" - - .align 2 -gMonFootprint_Shiftry:: @ 8CEE714 - .incbin "graphics/pokemon/footprints/shiftry_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nincada:: @ 8CEE734 - .incbin "graphics/pokemon/front_pics/nincada_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nincada:: @ 8CEE9D4 - .incbin "graphics/pokemon/palettes/nincada_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nincada:: @ 8CEE9FC - .incbin "graphics/pokemon/back_pics/nincada_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nincada:: @ 8CEECB4 - .incbin "graphics/pokemon/palettes/nincada_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nincada:: @ 8CEECDC - .incbin "graphics/pokemon/icons/nincada_icon.4bpp" - - .align 2 -gMonFootprint_Nincada:: @ 8CEF0DC - .incbin "graphics/pokemon/footprints/nincada_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ninjask:: @ 8CEF0FC - .incbin "graphics/pokemon/front_pics/ninjask_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ninjask:: @ 8CEF46C - .incbin "graphics/pokemon/palettes/ninjask_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ninjask:: @ 8CEF494 - .incbin "graphics/pokemon/back_pics/ninjask_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ninjask:: @ 8CEF860 - .incbin "graphics/pokemon/palettes/ninjask_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ninjask:: @ 8CEF888 - .incbin "graphics/pokemon/icons/ninjask_icon.4bpp" - - .align 2 -gMonFootprint_Ninjask:: @ 8CEFC88 - .incbin "graphics/pokemon/footprints/ninjask_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shedinja:: @ 8CEFCA8 - .incbin "graphics/pokemon/front_pics/shedinja_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shedinja:: @ 8CEFFC8 - .incbin "graphics/pokemon/palettes/shedinja_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shedinja:: @ 8CEFFF0 - .incbin "graphics/pokemon/back_pics/shedinja_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shedinja:: @ 8CF0390 - .incbin "graphics/pokemon/palettes/shedinja_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shedinja:: @ 8CF03B8 - .incbin "graphics/pokemon/icons/shedinja_icon.4bpp" - - .align 2 -gMonFootprint_Shedinja:: @ 8CF07B8 - .incbin "graphics/pokemon/footprints/shedinja_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Taillow:: @ 8CF07D8 - .incbin "graphics/pokemon/front_pics/taillow_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Taillow:: @ 8CF0A30 - .incbin "graphics/pokemon/palettes/taillow_palette.gbapal.lz" - - .align 2 -gMonBackPic_Taillow:: @ 8CF0A58 - .incbin "graphics/pokemon/back_pics/taillow_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Taillow:: @ 8CF0C78 - .incbin "graphics/pokemon/palettes/taillow_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Taillow:: @ 8CF0CA0 - .incbin "graphics/pokemon/icons/taillow_icon.4bpp" - - .align 2 -gMonFootprint_Taillow:: @ 8CF10A0 - .incbin "graphics/pokemon/footprints/taillow_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Swellow:: @ 8CF10C0 - .incbin "graphics/pokemon/front_pics/swellow_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Swellow:: @ 8CF1484 - .incbin "graphics/pokemon/palettes/swellow_palette.gbapal.lz" - - .align 2 -gMonBackPic_Swellow:: @ 8CF14AC - .incbin "graphics/pokemon/back_pics/swellow_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Swellow:: @ 8CF17E4 - .incbin "graphics/pokemon/palettes/swellow_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Swellow:: @ 8CF180C - .incbin "graphics/pokemon/icons/swellow_icon.4bpp" - - .align 2 -gMonFootprint_Swellow:: @ 8CF1C0C - .incbin "graphics/pokemon/footprints/swellow_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shroomish:: @ 8CF1C2C - .incbin "graphics/pokemon/front_pics/shroomish_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shroomish:: @ 8CF1E94 - .incbin "graphics/pokemon/palettes/shroomish_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shroomish:: @ 8CF1EBC - .incbin "graphics/pokemon/back_pics/shroomish_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shroomish:: @ 8CF219C - .incbin "graphics/pokemon/palettes/shroomish_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shroomish:: @ 8CF21C4 - .incbin "graphics/pokemon/icons/shroomish_icon.4bpp" - - .align 2 -gMonFootprint_Shroomish:: @ 8CF25C4 - .incbin "graphics/pokemon/footprints/shroomish_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Breloom:: @ 8CF25E4 - .incbin "graphics/pokemon/front_pics/breloom_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Breloom:: @ 8CF29CC - .incbin "graphics/pokemon/palettes/breloom_palette.gbapal.lz" - - .align 2 -gMonBackPic_Breloom:: @ 8CF29F4 - .incbin "graphics/pokemon/back_pics/breloom_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Breloom:: @ 8CF2DD4 - .incbin "graphics/pokemon/palettes/breloom_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Breloom:: @ 8CF2DFC - .incbin "graphics/pokemon/icons/breloom_icon.4bpp" - - .align 2 -gMonFootprint_Breloom:: @ 8CF31FC - .incbin "graphics/pokemon/footprints/breloom_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Spinda:: @ 8CF321C - .incbin "graphics/pokemon/front_pics/spinda_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Spinda:: @ 8CF3510 - .incbin "graphics/pokemon/palettes/spinda_palette.gbapal.lz" - - .align 2 -gMonBackPic_Spinda:: @ 8CF3538 - .incbin "graphics/pokemon/back_pics/spinda_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Spinda:: @ 8CF3874 - .incbin "graphics/pokemon/palettes/spinda_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Spinda:: @ 8CF389C - .incbin "graphics/pokemon/icons/spinda_icon.4bpp" - - .align 2 -gMonFootprint_Spinda:: @ 8CF3C9C - .incbin "graphics/pokemon/footprints/spinda_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wingull:: @ 8CF3CBC - .incbin "graphics/pokemon/front_pics/wingull_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wingull:: @ 8CF3EF8 - .incbin "graphics/pokemon/palettes/wingull_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wingull:: @ 8CF3F20 - .incbin "graphics/pokemon/back_pics/wingull_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wingull:: @ 8CF4270 - .incbin "graphics/pokemon/palettes/wingull_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wingull:: @ 8CF4298 - .incbin "graphics/pokemon/icons/wingull_icon.4bpp" - - .align 2 -gMonFootprint_Wingull:: @ 8CF4698 - .incbin "graphics/pokemon/footprints/wingull_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Pelipper:: @ 8CF46B8 - .incbin "graphics/pokemon/front_pics/pelipper_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Pelipper:: @ 8CF4A50 - .incbin "graphics/pokemon/palettes/pelipper_palette.gbapal.lz" - - .align 2 -gMonBackPic_Pelipper:: @ 8CF4A78 - .incbin "graphics/pokemon/back_pics/pelipper_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Pelipper:: @ 8CF4DF8 - .incbin "graphics/pokemon/palettes/pelipper_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Pelipper:: @ 8CF4E20 - .incbin "graphics/pokemon/icons/pelipper_icon.4bpp" - - .align 2 -gMonFootprint_Pelipper:: @ 8CF5220 - .incbin "graphics/pokemon/footprints/pelipper_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Surskit:: @ 8CF5240 - .incbin "graphics/pokemon/front_pics/surskit_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Surskit:: @ 8CF544C - .incbin "graphics/pokemon/palettes/surskit_palette.gbapal.lz" - - .align 2 -gMonBackPic_Surskit:: @ 8CF5474 - .incbin "graphics/pokemon/back_pics/surskit_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Surskit:: @ 8CF56AC - .incbin "graphics/pokemon/palettes/surskit_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Surskit:: @ 8CF56D4 - .incbin "graphics/pokemon/icons/surskit_icon.4bpp" - - .align 2 -gMonFootprint_Surskit:: @ 8CF5AD4 - .incbin "graphics/pokemon/footprints/surskit_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Masquerain:: @ 8CF5AF4 - .incbin "graphics/pokemon/front_pics/masquerain_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Masquerain:: @ 8CF5E90 - .incbin "graphics/pokemon/palettes/masquerain_palette.gbapal.lz" - - .align 2 -gMonBackPic_Masquerain:: @ 8CF5EB8 - .incbin "graphics/pokemon/back_pics/masquerain_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Masquerain:: @ 8CF6210 - .incbin "graphics/pokemon/palettes/masquerain_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Masquerain:: @ 8CF6238 - .incbin "graphics/pokemon/icons/masquerain_icon.4bpp" - - .align 2 -gMonFootprint_Masquerain:: @ 8CF6638 - .incbin "graphics/pokemon/footprints/masquerain_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wailmer:: @ 8CF6658 - .incbin "graphics/pokemon/front_pics/wailmer_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wailmer:: @ 8CF6938 - .incbin "graphics/pokemon/palettes/wailmer_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wailmer:: @ 8CF6960 - .incbin "graphics/pokemon/back_pics/wailmer_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wailmer:: @ 8CF6B44 - .incbin "graphics/pokemon/palettes/wailmer_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wailmer:: @ 8CF6B6C - .incbin "graphics/pokemon/icons/wailmer_icon.4bpp" - - .align 2 -gMonFootprint_Wailmer:: @ 8CF6F6C - .incbin "graphics/pokemon/footprints/wailmer_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wailord:: @ 8CF6F8C - .incbin "graphics/pokemon/front_pics/wailord_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wailord:: @ 8CF7350 - .incbin "graphics/pokemon/palettes/wailord_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wailord:: @ 8CF7378 - .incbin "graphics/pokemon/back_pics/wailord_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wailord:: @ 8CF7590 - .incbin "graphics/pokemon/palettes/wailord_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wailord:: @ 8CF75B8 - .incbin "graphics/pokemon/icons/wailord_icon.4bpp" - - .align 2 -gMonFootprint_Wailord:: @ 8CF79B8 - .incbin "graphics/pokemon/footprints/wailord_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Skitty:: @ 8CF79D8 - .incbin "graphics/pokemon/front_pics/skitty_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Skitty:: @ 8CF7CD8 - .incbin "graphics/pokemon/palettes/skitty_palette.gbapal.lz" - - .align 2 -gMonBackPic_Skitty:: @ 8CF7D00 - .incbin "graphics/pokemon/back_pics/skitty_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Skitty:: @ 8CF8048 - .incbin "graphics/pokemon/palettes/skitty_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Skitty:: @ 8CF8070 - .incbin "graphics/pokemon/icons/skitty_icon.4bpp" - - .align 2 -gMonFootprint_Skitty:: @ 8CF8470 - .incbin "graphics/pokemon/footprints/skitty_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Delcatty:: @ 8CF8490 - .incbin "graphics/pokemon/front_pics/delcatty_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Delcatty:: @ 8CF881C - .incbin "graphics/pokemon/palettes/delcatty_palette.gbapal.lz" - - .align 2 -gMonBackPic_Delcatty:: @ 8CF8844 - .incbin "graphics/pokemon/back_pics/delcatty_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Delcatty:: @ 8CF8BE0 - .incbin "graphics/pokemon/palettes/delcatty_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Delcatty:: @ 8CF8C08 - .incbin "graphics/pokemon/icons/delcatty_icon.4bpp" - - .align 2 -gMonFootprint_Delcatty:: @ 8CF9008 - .incbin "graphics/pokemon/footprints/delcatty_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kecleon:: @ 8CF9028 - .incbin "graphics/pokemon/front_pics/kecleon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kecleon:: @ 8CF93A8 - .incbin "graphics/pokemon/palettes/kecleon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kecleon:: @ 8CF93D0 - .incbin "graphics/pokemon/back_pics/kecleon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kecleon:: @ 8CF97A8 - .incbin "graphics/pokemon/palettes/kecleon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kecleon:: @ 8CF97D0 - .incbin "graphics/pokemon/icons/kecleon_icon.4bpp" - - .align 2 -gMonFootprint_Kecleon:: @ 8CF9BD0 - .incbin "graphics/pokemon/footprints/kecleon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Baltoy:: @ 8CF9BF0 - .incbin "graphics/pokemon/front_pics/baltoy_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Baltoy:: @ 8CF9E14 - .incbin "graphics/pokemon/palettes/baltoy_palette.gbapal.lz" - - .align 2 -gMonBackPic_Baltoy:: @ 8CF9E34 - .incbin "graphics/pokemon/back_pics/baltoy_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Baltoy:: @ 8CFA0DC - .incbin "graphics/pokemon/palettes/baltoy_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Baltoy:: @ 8CFA0FC - .incbin "graphics/pokemon/icons/baltoy_icon.4bpp" - - .align 2 -gMonFootprint_Baltoy:: @ 8CFA4FC - .incbin "graphics/pokemon/footprints/baltoy_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Claydol:: @ 8CFA51C - .incbin "graphics/pokemon/front_pics/claydol_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Claydol:: @ 8CFA8D4 - .incbin "graphics/pokemon/palettes/claydol_palette.gbapal.lz" - - .align 2 -gMonBackPic_Claydol:: @ 8CFA8FC - .incbin "graphics/pokemon/back_pics/claydol_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Claydol:: @ 8CFACD0 - .incbin "graphics/pokemon/palettes/claydol_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Claydol:: @ 8CFACF8 - .incbin "graphics/pokemon/icons/claydol_icon.4bpp" - - .align 2 -gMonFootprint_Claydol:: @ 8CFB0F8 - .incbin "graphics/pokemon/footprints/claydol_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Nosepass:: @ 8CFB118 - .incbin "graphics/pokemon/front_pics/nosepass_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Nosepass:: @ 8CFB3E4 - .incbin "graphics/pokemon/palettes/nosepass_palette.gbapal.lz" - - .align 2 -gMonBackPic_Nosepass:: @ 8CFB40C - .incbin "graphics/pokemon/back_pics/nosepass_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Nosepass:: @ 8CFB6AC - .incbin "graphics/pokemon/palettes/nosepass_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Nosepass:: @ 8CFB6D4 - .incbin "graphics/pokemon/icons/nosepass_icon.4bpp" - - .align 2 -gMonFootprint_Nosepass:: @ 8CFBAD4 - .incbin "graphics/pokemon/footprints/nosepass_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Torkoal:: @ 8CFBAF4 - .incbin "graphics/pokemon/front_pics/torkoal_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Torkoal:: @ 8CFBFA0 - .incbin "graphics/pokemon/palettes/torkoal_palette.gbapal.lz" - - .align 2 -gMonBackPic_Torkoal:: @ 8CFBFC8 - .incbin "graphics/pokemon/back_pics/torkoal_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Torkoal:: @ 8CFC290 - .incbin "graphics/pokemon/palettes/torkoal_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Torkoal:: @ 8CFC2B8 - .incbin "graphics/pokemon/icons/torkoal_icon.4bpp" - - .align 2 -gMonFootprint_Torkoal:: @ 8CFC6B8 - .incbin "graphics/pokemon/footprints/torkoal_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sableye:: @ 8CFC6D8 - .incbin "graphics/pokemon/front_pics/sableye_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sableye:: @ 8CFC9AC - .incbin "graphics/pokemon/palettes/sableye_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sableye:: @ 8CFC9D4 - .incbin "graphics/pokemon/back_pics/sableye_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sableye:: @ 8CFCCFC - .incbin "graphics/pokemon/palettes/sableye_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sableye:: @ 8CFCD24 - .incbin "graphics/pokemon/icons/sableye_icon.4bpp" - - .align 2 -gMonFootprint_Sableye:: @ 8CFD124 - .incbin "graphics/pokemon/footprints/sableye_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Barboach:: @ 8CFD144 - .incbin "graphics/pokemon/front_pics/barboach_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Barboach:: @ 8CFD3D4 - .incbin "graphics/pokemon/palettes/barboach_palette.gbapal.lz" - - .align 2 -gMonBackPic_Barboach:: @ 8CFD3FC - .incbin "graphics/pokemon/back_pics/barboach_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Barboach:: @ 8CFD68C - .incbin "graphics/pokemon/palettes/barboach_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Barboach:: @ 8CFD6B4 - .incbin "graphics/pokemon/icons/barboach_icon.4bpp" - - .align 2 -gMonFootprint_Barboach:: @ 8CFDAB4 - .incbin "graphics/pokemon/footprints/barboach_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Whiscash:: @ 8CFDAD4 - .incbin "graphics/pokemon/front_pics/whiscash_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Whiscash:: @ 8CFDE4C - .incbin "graphics/pokemon/palettes/whiscash_palette.gbapal.lz" - - .align 2 -gMonBackPic_Whiscash:: @ 8CFDE74 - .incbin "graphics/pokemon/back_pics/whiscash_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Whiscash:: @ 8CFE1C0 - .incbin "graphics/pokemon/palettes/whiscash_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Whiscash:: @ 8CFE1E8 - .incbin "graphics/pokemon/icons/whiscash_icon.4bpp" - - .align 2 -gMonFootprint_Whiscash:: @ 8CFE5E8 - .incbin "graphics/pokemon/footprints/whiscash_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Luvdisc:: @ 8CFE608 - .incbin "graphics/pokemon/front_pics/luvdisc_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Luvdisc:: @ 8CFE7C8 - .incbin "graphics/pokemon/palettes/luvdisc_palette.gbapal.lz" - - .align 2 -gMonBackPic_Luvdisc:: @ 8CFE7EC - .incbin "graphics/pokemon/back_pics/luvdisc_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Luvdisc:: @ 8CFE9C0 - .incbin "graphics/pokemon/palettes/luvdisc_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Luvdisc:: @ 8CFE9E4 - .incbin "graphics/pokemon/icons/luvdisc_icon.4bpp" - - .align 2 -gMonFootprint_Luvdisc:: @ 8CFEDE4 - .incbin "graphics/pokemon/footprints/luvdisc_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Corphish:: @ 8CFEE04 - .incbin "graphics/pokemon/front_pics/corphish_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Corphish:: @ 8CFF160 - .incbin "graphics/pokemon/palettes/corphish_palette.gbapal.lz" - - .align 2 -gMonBackPic_Corphish:: @ 8CFF188 - .incbin "graphics/pokemon/back_pics/corphish_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Corphish:: @ 8CFF4A4 - .incbin "graphics/pokemon/palettes/corphish_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Corphish:: @ 8CFF4CC - .incbin "graphics/pokemon/icons/corphish_icon.4bpp" - - .align 2 -gMonFootprint_Corphish:: @ 8CFF8CC - .incbin "graphics/pokemon/footprints/corphish_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Crawdaunt:: @ 8CFF8EC - .incbin "graphics/pokemon/front_pics/crawdaunt_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Crawdaunt:: @ 8CFFD7C - .incbin "graphics/pokemon/palettes/crawdaunt_palette.gbapal.lz" - - .align 2 -gMonBackPic_Crawdaunt:: @ 8CFFDA4 - .incbin "graphics/pokemon/back_pics/crawdaunt_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Crawdaunt:: @ 8D00188 - .incbin "graphics/pokemon/palettes/crawdaunt_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Crawdaunt:: @ 8D001B0 - .incbin "graphics/pokemon/icons/crawdaunt_icon.4bpp" - - .align 2 -gMonFootprint_Crawdaunt:: @ 8D005B0 - .incbin "graphics/pokemon/footprints/crawdaunt_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Feebas:: @ 8D005D0 - .incbin "graphics/pokemon/front_pics/feebas_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Feebas:: @ 8D0085C - .incbin "graphics/pokemon/palettes/feebas_palette.gbapal.lz" - - .align 2 -gMonBackPic_Feebas:: @ 8D00884 - .incbin "graphics/pokemon/back_pics/feebas_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Feebas:: @ 8D00BBC - .incbin "graphics/pokemon/palettes/feebas_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Feebas:: @ 8D00BE4 - .incbin "graphics/pokemon/icons/feebas_icon.4bpp" - - .align 2 -gMonFootprint_Feebas:: @ 8D00FE4 - .incbin "graphics/pokemon/footprints/feebas_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Milotic:: @ 8D01004 - .incbin "graphics/pokemon/front_pics/milotic_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Milotic:: @ 8D01494 - .incbin "graphics/pokemon/palettes/milotic_palette.gbapal.lz" - - .align 2 -gMonBackPic_Milotic:: @ 8D014BC - .incbin "graphics/pokemon/back_pics/milotic_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Milotic:: @ 8D017B0 - .incbin "graphics/pokemon/palettes/milotic_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Milotic:: @ 8D017D8 - .incbin "graphics/pokemon/icons/milotic_icon.4bpp" - - .align 2 -gMonFootprint_Milotic:: @ 8D01BD8 - .incbin "graphics/pokemon/footprints/milotic_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Carvanha:: @ 8D01BF8 - .incbin "graphics/pokemon/front_pics/carvanha_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Carvanha:: @ 8D01F24 - .incbin "graphics/pokemon/palettes/carvanha_palette.gbapal.lz" - - .align 2 -gMonBackPic_Carvanha:: @ 8D01F4C - .incbin "graphics/pokemon/back_pics/carvanha_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Carvanha:: @ 8D0225C - .incbin "graphics/pokemon/palettes/carvanha_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Carvanha:: @ 8D02284 - .incbin "graphics/pokemon/icons/carvanha_icon.4bpp" - - .align 2 -gMonFootprint_Carvanha:: @ 8D02684 - .incbin "graphics/pokemon/footprints/carvanha_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sharpedo:: @ 8D026A4 - .incbin "graphics/pokemon/front_pics/sharpedo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sharpedo:: @ 8D02A34 - .incbin "graphics/pokemon/palettes/sharpedo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sharpedo:: @ 8D02A5C - .incbin "graphics/pokemon/back_pics/sharpedo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sharpedo:: @ 8D02DB4 - .incbin "graphics/pokemon/palettes/sharpedo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sharpedo:: @ 8D02DDC - .incbin "graphics/pokemon/icons/sharpedo_icon.4bpp" - - .align 2 -gMonFootprint_Sharpedo:: @ 8D031DC - .incbin "graphics/pokemon/footprints/sharpedo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Trapinch:: @ 8D031FC - .incbin "graphics/pokemon/front_pics/trapinch_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Trapinch:: @ 8D03418 - .incbin "graphics/pokemon/palettes/trapinch_palette.gbapal.lz" - - .align 2 -gMonBackPic_Trapinch:: @ 8D03440 - .incbin "graphics/pokemon/back_pics/trapinch_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Trapinch:: @ 8D03660 - .incbin "graphics/pokemon/palettes/trapinch_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Trapinch:: @ 8D03688 - .incbin "graphics/pokemon/icons/trapinch_icon.4bpp" - - .align 2 -gMonFootprint_Trapinch:: @ 8D03A88 - .incbin "graphics/pokemon/footprints/trapinch_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Vibrava:: @ 8D03AA8 - .incbin "graphics/pokemon/front_pics/vibrava_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Vibrava:: @ 8D03E18 - .incbin "graphics/pokemon/palettes/vibrava_palette.gbapal.lz" - - .align 2 -gMonBackPic_Vibrava:: @ 8D03E40 - .incbin "graphics/pokemon/back_pics/vibrava_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Vibrava:: @ 8D040B8 - .incbin "graphics/pokemon/palettes/vibrava_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Vibrava:: @ 8D040E0 - .incbin "graphics/pokemon/icons/vibrava_icon.4bpp" - - .align 2 -gMonFootprint_Vibrava:: @ 8D044E0 - .incbin "graphics/pokemon/footprints/vibrava_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Flygon:: @ 8D04500 - .incbin "graphics/pokemon/front_pics/flygon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Flygon:: @ 8D049F0 - .incbin "graphics/pokemon/palettes/flygon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Flygon:: @ 8D04A18 - .incbin "graphics/pokemon/back_pics/flygon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Flygon:: @ 8D04E54 - .incbin "graphics/pokemon/palettes/flygon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Flygon:: @ 8D04E7C - .incbin "graphics/pokemon/icons/flygon_icon.4bpp" - - .align 2 -gMonFootprint_Flygon:: @ 8D0527C - .incbin "graphics/pokemon/footprints/flygon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Makuhita:: @ 8D0529C - .incbin "graphics/pokemon/front_pics/makuhita_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Makuhita:: @ 8D055B4 - .incbin "graphics/pokemon/palettes/makuhita_palette.gbapal.lz" - - .align 2 -gMonBackPic_Makuhita:: @ 8D055DC - .incbin "graphics/pokemon/back_pics/makuhita_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Makuhita:: @ 8D058CC - .incbin "graphics/pokemon/palettes/makuhita_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Makuhita:: @ 8D058F0 - .incbin "graphics/pokemon/icons/makuhita_icon.4bpp" - - .align 2 -gMonFootprint_Makuhita:: @ 8D05CF0 - .incbin "graphics/pokemon/footprints/makuhita_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Hariyama:: @ 8D05D10 - .incbin "graphics/pokemon/front_pics/hariyama_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Hariyama:: @ 8D061C0 - .incbin "graphics/pokemon/palettes/hariyama_palette.gbapal.lz" - - .align 2 -gMonBackPic_Hariyama:: @ 8D061E8 - .incbin "graphics/pokemon/back_pics/hariyama_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Hariyama:: @ 8D065C8 - .incbin "graphics/pokemon/palettes/hariyama_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Hariyama:: @ 8D065F0 - .incbin "graphics/pokemon/icons/hariyama_icon.4bpp" - - .align 2 -gMonFootprint_Hariyama:: @ 8D069F0 - .incbin "graphics/pokemon/footprints/hariyama_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Electrike:: @ 8D06A10 - .incbin "graphics/pokemon/front_pics/electrike_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Electrike:: @ 8D06CA0 - .incbin "graphics/pokemon/palettes/electrike_palette.gbapal.lz" - - .align 2 -gMonBackPic_Electrike:: @ 8D06CC8 - .incbin "graphics/pokemon/back_pics/electrike_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Electrike:: @ 8D06F54 - .incbin "graphics/pokemon/palettes/electrike_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Electrike:: @ 8D06F7C - .incbin "graphics/pokemon/icons/electrike_icon.4bpp" - - .align 2 -gMonFootprint_Electrike:: @ 8D0737C - .incbin "graphics/pokemon/footprints/electrike_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Manectric:: @ 8D0739C - .incbin "graphics/pokemon/front_pics/manectric_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Manectric:: @ 8D076CC - .incbin "graphics/pokemon/palettes/manectric_palette.gbapal.lz" - - .align 2 -gMonBackPic_Manectric:: @ 8D076F4 - .incbin "graphics/pokemon/back_pics/manectric_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Manectric:: @ 8D07920 - .incbin "graphics/pokemon/palettes/manectric_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Manectric:: @ 8D07948 - .incbin "graphics/pokemon/icons/manectric_icon.4bpp" - - .align 2 -gMonFootprint_Manectric:: @ 8D07D48 - .incbin "graphics/pokemon/footprints/manectric_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Numel:: @ 8D07D68 - .incbin "graphics/pokemon/front_pics/numel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Numel:: @ 8D08038 - .incbin "graphics/pokemon/palettes/numel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Numel:: @ 8D08060 - .incbin "graphics/pokemon/back_pics/numel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Numel:: @ 8D0831C - .incbin "graphics/pokemon/palettes/numel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Numel:: @ 8D08344 - .incbin "graphics/pokemon/icons/numel_icon.4bpp" - - .align 2 -gMonFootprint_Numel:: @ 8D08744 - .incbin "graphics/pokemon/footprints/numel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Camerupt:: @ 8D08764 - .incbin "graphics/pokemon/front_pics/camerupt_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Camerupt:: @ 8D08B7C - .incbin "graphics/pokemon/palettes/camerupt_palette.gbapal.lz" - - .align 2 -gMonBackPic_Camerupt:: @ 8D08BA4 - .incbin "graphics/pokemon/back_pics/camerupt_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Camerupt:: @ 8D08E68 - .incbin "graphics/pokemon/palettes/camerupt_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Camerupt:: @ 8D08E90 - .incbin "graphics/pokemon/icons/camerupt_icon.4bpp" - - .align 2 -gMonFootprint_Camerupt:: @ 8D09290 - .incbin "graphics/pokemon/footprints/camerupt_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Spheal:: @ 8D092B0 - .incbin "graphics/pokemon/front_pics/spheal_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Spheal:: @ 8D09524 - .incbin "graphics/pokemon/palettes/spheal_palette.gbapal.lz" - - .align 2 -gMonBackPic_Spheal:: @ 8D0954C - .incbin "graphics/pokemon/back_pics/spheal_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Spheal:: @ 8D09748 - .incbin "graphics/pokemon/palettes/spheal_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Spheal:: @ 8D09770 - .incbin "graphics/pokemon/icons/spheal_icon.4bpp" - - .align 2 -gMonFootprint_Spheal:: @ 8D09B70 - .incbin "graphics/pokemon/footprints/spheal_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Sealeo:: @ 8D09B90 - .incbin "graphics/pokemon/front_pics/sealeo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Sealeo:: @ 8D09F10 - .incbin "graphics/pokemon/palettes/sealeo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Sealeo:: @ 8D09F38 - .incbin "graphics/pokemon/back_pics/sealeo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Sealeo:: @ 8D0A1B4 - .incbin "graphics/pokemon/palettes/sealeo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Sealeo:: @ 8D0A1DC - .incbin "graphics/pokemon/icons/sealeo_icon.4bpp" - - .align 2 -gMonFootprint_Sealeo:: @ 8D0A5DC - .incbin "graphics/pokemon/footprints/sealeo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Walrein:: @ 8D0A5FC - .incbin "graphics/pokemon/front_pics/walrein_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Walrein:: @ 8D0AD70 - .incbin "graphics/pokemon/palettes/walrein_palette.gbapal.lz" - - .align 2 -gMonBackPic_Walrein:: @ 8D0AD98 - .incbin "graphics/pokemon/back_pics/walrein_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Walrein:: @ 8D0B120 - .incbin "graphics/pokemon/palettes/walrein_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Walrein:: @ 8D0B148 - .incbin "graphics/pokemon/icons/walrein_icon.4bpp" - - .align 2 -gMonFootprint_Walrein:: @ 8D0B548 - .incbin "graphics/pokemon/footprints/walrein_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cacnea:: @ 8D0B568 - .incbin "graphics/pokemon/front_pics/cacnea_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cacnea:: @ 8D0B878 - .incbin "graphics/pokemon/palettes/cacnea_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cacnea:: @ 8D0B8A0 - .incbin "graphics/pokemon/back_pics/cacnea_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cacnea:: @ 8D0BC00 - .incbin "graphics/pokemon/palettes/cacnea_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cacnea:: @ 8D0BC28 - .incbin "graphics/pokemon/icons/cacnea_icon.4bpp" - - .align 2 -gMonFootprint_Cacnea:: @ 8D0C028 - .incbin "graphics/pokemon/footprints/cacnea_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cacturne:: @ 8D0C048 - .incbin "graphics/pokemon/front_pics/cacturne_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cacturne:: @ 8D0C480 - .incbin "graphics/pokemon/palettes/cacturne_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cacturne:: @ 8D0C4A8 - .incbin "graphics/pokemon/back_pics/cacturne_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cacturne:: @ 8D0C7A8 - .incbin "graphics/pokemon/palettes/cacturne_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cacturne:: @ 8D0C7D0 - .incbin "graphics/pokemon/icons/cacturne_icon.4bpp" - - .align 2 -gMonFootprint_Cacturne:: @ 8D0CBD0 - .incbin "graphics/pokemon/footprints/cacturne_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Snorunt:: @ 8D0CBF0 - .incbin "graphics/pokemon/front_pics/snorunt_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Snorunt:: @ 8D0CEB4 - .incbin "graphics/pokemon/palettes/snorunt_palette.gbapal.lz" - - .align 2 -gMonBackPic_Snorunt:: @ 8D0CEDC - .incbin "graphics/pokemon/back_pics/snorunt_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Snorunt:: @ 8D0D1C0 - .incbin "graphics/pokemon/palettes/snorunt_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Snorunt:: @ 8D0D1E8 - .incbin "graphics/pokemon/icons/snorunt_icon.4bpp" - - .align 2 -gMonFootprint_Snorunt:: @ 8D0D5E8 - .incbin "graphics/pokemon/footprints/snorunt_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Glalie:: @ 8D0D608 - .incbin "graphics/pokemon/front_pics/glalie_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Glalie:: @ 8D0D9D0 - .incbin "graphics/pokemon/palettes/glalie_palette.gbapal.lz" - - .align 2 -gMonBackPic_Glalie:: @ 8D0D9F8 - .incbin "graphics/pokemon/back_pics/glalie_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Glalie:: @ 8D0DDA8 - .incbin "graphics/pokemon/palettes/glalie_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Glalie:: @ 8D0DDD0 - .incbin "graphics/pokemon/icons/glalie_icon.4bpp" - - .align 2 -gMonFootprint_Glalie:: @ 8D0E1D0 - .incbin "graphics/pokemon/footprints/glalie_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lunatone:: @ 8D0E1F0 - .incbin "graphics/pokemon/front_pics/lunatone_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lunatone:: @ 8D0E518 - .incbin "graphics/pokemon/palettes/lunatone_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lunatone:: @ 8D0E540 - .incbin "graphics/pokemon/back_pics/lunatone_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lunatone:: @ 8D0E898 - .incbin "graphics/pokemon/palettes/lunatone_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lunatone:: @ 8D0E8C0 - .incbin "graphics/pokemon/icons/lunatone_icon.4bpp" - - .align 2 -gMonFootprint_Lunatone:: @ 8D0ECC0 - .incbin "graphics/pokemon/footprints/lunatone_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Solrock:: @ 8D0ECE0 - .incbin "graphics/pokemon/front_pics/solrock_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Solrock:: @ 8D0F12C - .incbin "graphics/pokemon/palettes/solrock_palette.gbapal.lz" - - .align 2 -gMonBackPic_Solrock:: @ 8D0F154 - .incbin "graphics/pokemon/back_pics/solrock_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Solrock:: @ 8D0F540 - .incbin "graphics/pokemon/palettes/solrock_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Solrock:: @ 8D0F568 - .incbin "graphics/pokemon/icons/solrock_icon.4bpp" - - .align 2 -gMonFootprint_Solrock:: @ 8D0F968 - .incbin "graphics/pokemon/footprints/solrock_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Azurill:: @ 8D0F988 - .incbin "graphics/pokemon/front_pics/azurill_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Azurill:: @ 8D0FC50 - .incbin "graphics/pokemon/palettes/azurill_palette.gbapal.lz" - - .align 2 -gMonBackPic_Azurill:: @ 8D0FC78 - .incbin "graphics/pokemon/back_pics/azurill_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Azurill:: @ 8D0FF90 - .incbin "graphics/pokemon/palettes/azurill_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Azurill:: @ 8D0FFB8 - .incbin "graphics/pokemon/icons/azurill_icon.4bpp" - - .align 2 -gMonFootprint_Azurill:: @ 8D103B8 - .incbin "graphics/pokemon/footprints/azurill_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Spoink:: @ 8D103D8 - .incbin "graphics/pokemon/front_pics/spoink_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Spoink:: @ 8D10644 - .incbin "graphics/pokemon/palettes/spoink_palette.gbapal.lz" - - .align 2 -gMonBackPic_Spoink:: @ 8D1066C - .incbin "graphics/pokemon/back_pics/spoink_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Spoink:: @ 8D108AC - .incbin "graphics/pokemon/palettes/spoink_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Spoink:: @ 8D108D4 - .incbin "graphics/pokemon/icons/spoink_icon.4bpp" - - .align 2 -gMonFootprint_Spoink:: @ 8D10CD4 - .incbin "graphics/pokemon/footprints/spoink_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Grumpig:: @ 8D10CF4 - .incbin "graphics/pokemon/front_pics/grumpig_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Grumpig:: @ 8D110B0 - .incbin "graphics/pokemon/palettes/grumpig_palette.gbapal.lz" - - .align 2 -gMonBackPic_Grumpig:: @ 8D110D8 - .incbin "graphics/pokemon/back_pics/grumpig_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Grumpig:: @ 8D11438 - .incbin "graphics/pokemon/palettes/grumpig_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Grumpig:: @ 8D11460 - .incbin "graphics/pokemon/icons/grumpig_icon.4bpp" - - .align 2 -gMonFootprint_Grumpig:: @ 8D11860 - .incbin "graphics/pokemon/footprints/grumpig_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Plusle:: @ 8D11880 - .incbin "graphics/pokemon/front_pics/plusle_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Plusle:: @ 8D11B0C - .incbin "graphics/pokemon/palettes/plusle_palette.gbapal.lz" - - .align 2 -gMonBackPic_Plusle:: @ 8D11B34 - .incbin "graphics/pokemon/back_pics/plusle_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Plusle:: @ 8D11DEC - .incbin "graphics/pokemon/palettes/plusle_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Plusle:: @ 8D11E14 - .incbin "graphics/pokemon/icons/plusle_icon.4bpp" - - .align 2 -gMonFootprint_Plusle:: @ 8D12214 - .incbin "graphics/pokemon/footprints/plusle_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Minun:: @ 8D12234 - .incbin "graphics/pokemon/front_pics/minun_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Minun:: @ 8D1249C - .incbin "graphics/pokemon/palettes/minun_palette.gbapal.lz" - - .align 2 -gMonBackPic_Minun:: @ 8D124C4 - .incbin "graphics/pokemon/back_pics/minun_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Minun:: @ 8D1278C - .incbin "graphics/pokemon/palettes/minun_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Minun:: @ 8D127B4 - .incbin "graphics/pokemon/icons/minun_icon.4bpp" - - .align 2 -gMonFootprint_Minun:: @ 8D12BB4 - .incbin "graphics/pokemon/footprints/minun_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Mawile:: @ 8D12BD4 - .incbin "graphics/pokemon/front_pics/mawile_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Mawile:: @ 8D12F90 - .incbin "graphics/pokemon/palettes/mawile_palette.gbapal.lz" - - .align 2 -gMonBackPic_Mawile:: @ 8D12FB8 - .incbin "graphics/pokemon/back_pics/mawile_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Mawile:: @ 8D133B8 - .incbin "graphics/pokemon/palettes/mawile_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Mawile:: @ 8D133E0 - .incbin "graphics/pokemon/icons/mawile_icon.4bpp" - - .align 2 -gMonFootprint_Mawile:: @ 8D137E0 - .incbin "graphics/pokemon/footprints/mawile_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Meditite:: @ 8D13800 - .incbin "graphics/pokemon/front_pics/meditite_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Meditite:: @ 8D13AB8 - .incbin "graphics/pokemon/palettes/meditite_palette.gbapal.lz" - - .align 2 -gMonBackPic_Meditite:: @ 8D13AE0 - .incbin "graphics/pokemon/back_pics/meditite_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Meditite:: @ 8D13DA8 - .incbin "graphics/pokemon/palettes/meditite_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Meditite:: @ 8D13DCC - .incbin "graphics/pokemon/icons/meditite_icon.4bpp" - - .align 2 -gMonFootprint_Meditite:: @ 8D141CC - .incbin "graphics/pokemon/footprints/meditite_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Medicham:: @ 8D141EC - .incbin "graphics/pokemon/front_pics/medicham_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Medicham:: @ 8D1451C - .incbin "graphics/pokemon/palettes/medicham_palette.gbapal.lz" - - .align 2 -gMonBackPic_Medicham:: @ 8D14544 - .incbin "graphics/pokemon/back_pics/medicham_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Medicham:: @ 8D1487C - .incbin "graphics/pokemon/palettes/medicham_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Medicham:: @ 8D148A4 - .incbin "graphics/pokemon/icons/medicham_icon.4bpp" - - .align 2 -gMonFootprint_Medicham:: @ 8D14CA4 - .incbin "graphics/pokemon/footprints/medicham_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Swablu:: @ 8D14CC4 - .incbin "graphics/pokemon/front_pics/swablu_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Swablu:: @ 8D15274 - .incbin "graphics/pokemon/palettes/swablu_palette.gbapal.lz" - - .align 2 -gMonBackPic_Swablu:: @ 8D1529C - .incbin "graphics/pokemon/back_pics/swablu_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Swablu:: @ 8D15654 - .incbin "graphics/pokemon/palettes/swablu_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Swablu:: @ 8D1567C - .incbin "graphics/pokemon/icons/swablu_icon.4bpp" - - .align 2 -gMonFootprint_Swablu:: @ 8D15A7C - .incbin "graphics/pokemon/footprints/swablu_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Altaria:: @ 8D15A9C - .incbin "graphics/pokemon/front_pics/altaria_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Altaria:: @ 8D15E78 - .incbin "graphics/pokemon/palettes/altaria_palette.gbapal.lz" - - .align 2 -gMonBackPic_Altaria:: @ 8D15EA0 - .incbin "graphics/pokemon/back_pics/altaria_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Altaria:: @ 8D16218 - .incbin "graphics/pokemon/palettes/altaria_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Altaria:: @ 8D16240 - .incbin "graphics/pokemon/icons/altaria_icon.4bpp" - - .align 2 -gMonFootprint_Altaria:: @ 8D16640 - .incbin "graphics/pokemon/footprints/altaria_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Wynaut:: @ 8D16660 - .incbin "graphics/pokemon/front_pics/wynaut_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Wynaut:: @ 8D168F8 - .incbin "graphics/pokemon/palettes/wynaut_palette.gbapal.lz" - - .align 2 -gMonBackPic_Wynaut:: @ 8D16920 - .incbin "graphics/pokemon/back_pics/wynaut_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Wynaut:: @ 8D16BB0 - .incbin "graphics/pokemon/palettes/wynaut_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Wynaut:: @ 8D16BD8 - .incbin "graphics/pokemon/icons/wynaut_icon.4bpp" - - .align 2 -gMonFootprint_Wynaut:: @ 8D16FD8 - .incbin "graphics/pokemon/footprints/wynaut_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Duskull:: @ 8D16FF8 - .incbin "graphics/pokemon/front_pics/duskull_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Duskull:: @ 8D172E8 - .incbin "graphics/pokemon/palettes/duskull_palette.gbapal.lz" - - .align 2 -gMonBackPic_Duskull:: @ 8D17310 - .incbin "graphics/pokemon/back_pics/duskull_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Duskull:: @ 8D175C0 - .incbin "graphics/pokemon/palettes/duskull_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Duskull:: @ 8D175E8 - .incbin "graphics/pokemon/icons/duskull_icon.4bpp" - - .align 2 -gMonFootprint_Duskull:: @ 8D179E8 - .incbin "graphics/pokemon/footprints/duskull_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Dusclops:: @ 8D17A08 - .incbin "graphics/pokemon/front_pics/dusclops_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Dusclops:: @ 8D17DA8 - .incbin "graphics/pokemon/palettes/dusclops_palette.gbapal.lz" - - .align 2 -gMonBackPic_Dusclops:: @ 8D17DD0 - .incbin "graphics/pokemon/back_pics/dusclops_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Dusclops:: @ 8D180BC - .incbin "graphics/pokemon/palettes/dusclops_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Dusclops:: @ 8D180E4 - .incbin "graphics/pokemon/icons/dusclops_icon.4bpp" - - .align 2 -gMonFootprint_Dusclops:: @ 8D184E4 - .incbin "graphics/pokemon/footprints/dusclops_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Roselia:: @ 8D18504 - .incbin "graphics/pokemon/front_pics/roselia_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Roselia:: @ 8D18870 - .incbin "graphics/pokemon/palettes/roselia_palette.gbapal.lz" - - .align 2 -gMonBackPic_Roselia:: @ 8D18898 - .incbin "graphics/pokemon/back_pics/roselia_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Roselia:: @ 8D18C60 - .incbin "graphics/pokemon/palettes/roselia_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Roselia:: @ 8D18C88 - .incbin "graphics/pokemon/icons/roselia_icon.4bpp" - - .align 2 -gMonFootprint_Roselia:: @ 8D19088 - .incbin "graphics/pokemon/footprints/roselia_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slakoth:: @ 8D190A8 - .incbin "graphics/pokemon/front_pics/slakoth_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slakoth:: @ 8D19390 - .incbin "graphics/pokemon/palettes/slakoth_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slakoth:: @ 8D193B8 - .incbin "graphics/pokemon/back_pics/slakoth_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slakoth:: @ 8D196A0 - .incbin "graphics/pokemon/palettes/slakoth_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slakoth:: @ 8D196C8 - .incbin "graphics/pokemon/icons/slakoth_icon.4bpp" - - .align 2 -gMonFootprint_Slakoth:: @ 8D19AC8 - .incbin "graphics/pokemon/footprints/slakoth_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Vigoroth:: @ 8D19AE8 - .incbin "graphics/pokemon/front_pics/vigoroth_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Vigoroth:: @ 8D19EE4 - .incbin "graphics/pokemon/palettes/vigoroth_palette.gbapal.lz" - - .align 2 -gMonBackPic_Vigoroth:: @ 8D19F0C - .incbin "graphics/pokemon/back_pics/vigoroth_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Vigoroth:: @ 8D1A1D4 - .incbin "graphics/pokemon/palettes/vigoroth_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Vigoroth:: @ 8D1A1FC - .incbin "graphics/pokemon/icons/vigoroth_icon.4bpp" - - .align 2 -gMonFootprint_Vigoroth:: @ 8D1A5FC - .incbin "graphics/pokemon/footprints/vigoroth_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Slaking:: @ 8D1A61C - .incbin "graphics/pokemon/front_pics/slaking_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Slaking:: @ 8D1AAF0 - .incbin "graphics/pokemon/palettes/slaking_palette.gbapal.lz" - - .align 2 -gMonBackPic_Slaking:: @ 8D1AB18 - .incbin "graphics/pokemon/back_pics/slaking_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Slaking:: @ 8D1AEDC - .incbin "graphics/pokemon/palettes/slaking_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Slaking:: @ 8D1AF04 - .incbin "graphics/pokemon/icons/slaking_icon.4bpp" - - .align 2 -gMonFootprint_Slaking:: @ 8D1B304 - .incbin "graphics/pokemon/footprints/slaking_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gulpin:: @ 8D1B324 - .incbin "graphics/pokemon/front_pics/gulpin_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gulpin:: @ 8D1B53C - .incbin "graphics/pokemon/palettes/gulpin_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gulpin:: @ 8D1B564 - .incbin "graphics/pokemon/back_pics/gulpin_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gulpin:: @ 8D1B7E8 - .incbin "graphics/pokemon/palettes/gulpin_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gulpin:: @ 8D1B810 - .incbin "graphics/pokemon/icons/gulpin_icon.4bpp" - - .align 2 -gMonFootprint_Gulpin:: @ 8D1BC10 - .incbin "graphics/pokemon/footprints/gulpin_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Swalot:: @ 8D1BC30 - .incbin "graphics/pokemon/front_pics/swalot_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Swalot:: @ 8D1BF74 - .incbin "graphics/pokemon/palettes/swalot_palette.gbapal.lz" - - .align 2 -gMonBackPic_Swalot:: @ 8D1BF9C - .incbin "graphics/pokemon/back_pics/swalot_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Swalot:: @ 8D1C2E4 - .incbin "graphics/pokemon/palettes/swalot_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Swalot:: @ 8D1C30C - .incbin "graphics/pokemon/icons/swalot_icon.4bpp" - - .align 2 -gMonFootprint_Swalot:: @ 8D1C70C - .incbin "graphics/pokemon/footprints/swalot_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Tropius:: @ 8D1C72C - .incbin "graphics/pokemon/front_pics/tropius_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Tropius:: @ 8D1CCA4 - .incbin "graphics/pokemon/palettes/tropius_palette.gbapal.lz" - - .align 2 -gMonBackPic_Tropius:: @ 8D1CCCC - .incbin "graphics/pokemon/back_pics/tropius_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Tropius:: @ 8D1CFF0 - .incbin "graphics/pokemon/palettes/tropius_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Tropius:: @ 8D1D018 - .incbin "graphics/pokemon/icons/tropius_icon.4bpp" - - .align 2 -gMonFootprint_Tropius:: @ 8D1D418 - .incbin "graphics/pokemon/footprints/tropius_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Whismur:: @ 8D1D438 - .incbin "graphics/pokemon/front_pics/whismur_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Whismur:: @ 8D1D6CC - .incbin "graphics/pokemon/palettes/whismur_palette.gbapal.lz" - - .align 2 -gMonBackPic_Whismur:: @ 8D1D6F4 - .incbin "graphics/pokemon/back_pics/whismur_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Whismur:: @ 8D1D964 - .incbin "graphics/pokemon/palettes/whismur_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Whismur:: @ 8D1D98C - .incbin "graphics/pokemon/icons/whismur_icon.4bpp" - - .align 2 -gMonFootprint_Whismur:: @ 8D1DD8C - .incbin "graphics/pokemon/footprints/whismur_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Loudred:: @ 8D1DDAC - .incbin "graphics/pokemon/front_pics/loudred_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Loudred:: @ 8D1E224 - .incbin "graphics/pokemon/palettes/loudred_palette.gbapal.lz" - - .align 2 -gMonBackPic_Loudred:: @ 8D1E24C - .incbin "graphics/pokemon/back_pics/loudred_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Loudred:: @ 8D1E5BC - .incbin "graphics/pokemon/palettes/loudred_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Loudred:: @ 8D1E5E4 - .incbin "graphics/pokemon/icons/loudred_icon.4bpp" - - .align 2 -gMonFootprint_Loudred:: @ 8D1E9E4 - .incbin "graphics/pokemon/footprints/loudred_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Exploud:: @ 8D1EA04 - .incbin "graphics/pokemon/front_pics/exploud_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Exploud:: @ 8D1EF6C - .incbin "graphics/pokemon/palettes/exploud_palette.gbapal.lz" - - .align 2 -gMonBackPic_Exploud:: @ 8D1EF94 - .incbin "graphics/pokemon/back_pics/exploud_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Exploud:: @ 8D1F3A0 - .incbin "graphics/pokemon/palettes/exploud_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Exploud:: @ 8D1F3C8 - .incbin "graphics/pokemon/icons/exploud_icon.4bpp" - - .align 2 -gMonFootprint_Exploud:: @ 8D1F7C8 - .incbin "graphics/pokemon/footprints/exploud_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Clamperl:: @ 8D1F7E8 - .incbin "graphics/pokemon/front_pics/clamperl_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Clamperl:: @ 8D1FAC0 - .incbin "graphics/pokemon/palettes/clamperl_palette.gbapal.lz" - - .align 2 -gMonBackPic_Clamperl:: @ 8D1FAE8 - .incbin "graphics/pokemon/back_pics/clamperl_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Clamperl:: @ 8D1FD7C - .incbin "graphics/pokemon/palettes/clamperl_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Clamperl:: @ 8D1FDA4 - .incbin "graphics/pokemon/icons/clamperl_icon.4bpp" - - .align 2 -gMonFootprint_Clamperl:: @ 8D201A4 - .incbin "graphics/pokemon/footprints/clamperl_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Huntail:: @ 8D201C4 - .incbin "graphics/pokemon/front_pics/huntail_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Huntail:: @ 8D20590 - .incbin "graphics/pokemon/palettes/huntail_palette.gbapal.lz" - - .align 2 -gMonBackPic_Huntail:: @ 8D205B8 - .incbin "graphics/pokemon/back_pics/huntail_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Huntail:: @ 8D2090C - .incbin "graphics/pokemon/palettes/huntail_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Huntail:: @ 8D20934 - .incbin "graphics/pokemon/icons/huntail_icon.4bpp" - - .align 2 -gMonFootprint_Huntail:: @ 8D20D34 - .incbin "graphics/pokemon/footprints/huntail_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gorebyss:: @ 8D20D54 - .incbin "graphics/pokemon/front_pics/gorebyss_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gorebyss:: @ 8D21064 - .incbin "graphics/pokemon/palettes/gorebyss_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gorebyss:: @ 8D2108C - .incbin "graphics/pokemon/back_pics/gorebyss_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gorebyss:: @ 8D21374 - .incbin "graphics/pokemon/palettes/gorebyss_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gorebyss:: @ 8D2139C - .incbin "graphics/pokemon/icons/gorebyss_icon.4bpp" - - .align 2 -gMonFootprint_Gorebyss:: @ 8D2179C - .incbin "graphics/pokemon/footprints/gorebyss_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Absol:: @ 8D217BC - .incbin "graphics/pokemon/front_pics/absol_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Absol:: @ 8D21BEC - .incbin "graphics/pokemon/palettes/absol_palette.gbapal.lz" - - .align 2 -gMonBackPic_Absol:: @ 8D21C14 - .incbin "graphics/pokemon/back_pics/absol_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Absol:: @ 8D21F74 - .incbin "graphics/pokemon/palettes/absol_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Absol:: @ 8D21F9C - .incbin "graphics/pokemon/icons/absol_icon.4bpp" - - .align 2 -gMonFootprint_Absol:: @ 8D2239C - .incbin "graphics/pokemon/footprints/absol_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shuppet:: @ 8D223BC - .incbin "graphics/pokemon/front_pics/shuppet_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shuppet:: @ 8D225F4 - .incbin "graphics/pokemon/palettes/shuppet_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shuppet:: @ 8D2261C - .incbin "graphics/pokemon/back_pics/shuppet_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shuppet:: @ 8D228B4 - .incbin "graphics/pokemon/palettes/shuppet_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shuppet:: @ 8D228DC - .incbin "graphics/pokemon/icons/shuppet_icon.4bpp" - - .align 2 -gMonFootprint_Shuppet:: @ 8D22CDC - .incbin "graphics/pokemon/footprints/shuppet_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Banette:: @ 8D22CFC - .incbin "graphics/pokemon/front_pics/banette_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Banette:: @ 8D22FB0 - .incbin "graphics/pokemon/palettes/banette_palette.gbapal.lz" - - .align 2 -gMonBackPic_Banette:: @ 8D22FD8 - .incbin "graphics/pokemon/back_pics/banette_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Banette:: @ 8D23254 - .incbin "graphics/pokemon/palettes/banette_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Banette:: @ 8D2327C - .incbin "graphics/pokemon/icons/banette_icon.4bpp" - - .align 2 -gMonFootprint_Banette:: @ 8D2367C - .incbin "graphics/pokemon/footprints/banette_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Seviper:: @ 8D2369C - .incbin "graphics/pokemon/front_pics/seviper_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Seviper:: @ 8D23ABC - .incbin "graphics/pokemon/palettes/seviper_palette.gbapal.lz" - - .align 2 -gMonBackPic_Seviper:: @ 8D23AE4 - .incbin "graphics/pokemon/back_pics/seviper_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Seviper:: @ 8D23F70 - .incbin "graphics/pokemon/palettes/seviper_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Seviper:: @ 8D23F98 - .incbin "graphics/pokemon/icons/seviper_icon.4bpp" - - .align 2 -gMonFootprint_Seviper:: @ 8D24398 - .incbin "graphics/pokemon/footprints/seviper_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Zangoose:: @ 8D243B8 - .incbin "graphics/pokemon/front_pics/zangoose_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Zangoose:: @ 8D24784 - .incbin "graphics/pokemon/palettes/zangoose_palette.gbapal.lz" - - .align 2 -gMonBackPic_Zangoose:: @ 8D247AC - .incbin "graphics/pokemon/back_pics/zangoose_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Zangoose:: @ 8D24B20 - .incbin "graphics/pokemon/palettes/zangoose_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Zangoose:: @ 8D24B48 - .incbin "graphics/pokemon/icons/zangoose_icon.4bpp" - - .align 2 -gMonFootprint_Zangoose:: @ 8D24F48 - .incbin "graphics/pokemon/footprints/zangoose_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Relicanth:: @ 8D24F68 - .incbin "graphics/pokemon/front_pics/relicanth_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Relicanth:: @ 8D252FC - .incbin "graphics/pokemon/palettes/relicanth_palette.gbapal.lz" - - .align 2 -gMonBackPic_Relicanth:: @ 8D25324 - .incbin "graphics/pokemon/back_pics/relicanth_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Relicanth:: @ 8D2567C - .incbin "graphics/pokemon/palettes/relicanth_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Relicanth:: @ 8D256A4 - .incbin "graphics/pokemon/icons/relicanth_icon.4bpp" - - .align 2 -gMonFootprint_Relicanth:: @ 8D25AA4 - .incbin "graphics/pokemon/footprints/relicanth_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Aron:: @ 8D25AC4 - .incbin "graphics/pokemon/front_pics/aron_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Aron:: @ 8D25CAC - .incbin "graphics/pokemon/palettes/aron_palette.gbapal.lz" - - .align 2 -gMonBackPic_Aron:: @ 8D25CD4 - .incbin "graphics/pokemon/back_pics/aron_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Aron:: @ 8D25EFC - .incbin "graphics/pokemon/palettes/aron_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Aron:: @ 8D25F24 - .incbin "graphics/pokemon/icons/aron_icon.4bpp" - - .align 2 -gMonFootprint_Aron:: @ 8D26324 - .incbin "graphics/pokemon/footprints/aron_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lairon:: @ 8D26344 - .incbin "graphics/pokemon/front_pics/lairon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lairon:: @ 8D26710 - .incbin "graphics/pokemon/palettes/lairon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lairon:: @ 8D26738 - .incbin "graphics/pokemon/back_pics/lairon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lairon:: @ 8D26A24 - .incbin "graphics/pokemon/palettes/lairon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lairon:: @ 8D26A4C - .incbin "graphics/pokemon/icons/lairon_icon.4bpp" - - .align 2 -gMonFootprint_Lairon:: @ 8D26E4C - .incbin "graphics/pokemon/footprints/lairon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Aggron:: @ 8D26E6C - .incbin "graphics/pokemon/front_pics/aggron_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Aggron:: @ 8D273E8 - .incbin "graphics/pokemon/palettes/aggron_palette.gbapal.lz" - - .align 2 -gMonBackPic_Aggron:: @ 8D27410 - .incbin "graphics/pokemon/back_pics/aggron_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Aggron:: @ 8D27838 - .incbin "graphics/pokemon/palettes/aggron_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Aggron:: @ 8D27860 - .incbin "graphics/pokemon/icons/aggron_icon.4bpp" - - .align 2 -gMonFootprint_Aggron:: @ 8D27C60 - .incbin "graphics/pokemon/footprints/aggron_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Castform:: @ 8D27C80 - .incbin "graphics/pokemon/front_pics/castform_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Castform:: @ 8D28708 - .incbin "graphics/pokemon/palettes/castform_palette.gbapal.lz" - - .align 2 -gMonBackPic_Castform:: @ 8D28788 - .incbin "graphics/pokemon/back_pics/castform_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Castform:: @ 8D29144 - .incbin "graphics/pokemon/palettes/castform_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Castform:: @ 8D291C0 - .incbin "graphics/pokemon/icons/castform_icon.4bpp" - - .align 2 -gMonFootprint_Castform:: @ 8D295C0 - .incbin "graphics/pokemon/footprints/castform_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Volbeat:: @ 8D295E0 - .incbin "graphics/pokemon/front_pics/volbeat_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Volbeat:: @ 8D29970 - .incbin "graphics/pokemon/palettes/volbeat_palette.gbapal.lz" - - .align 2 -gMonBackPic_Volbeat:: @ 8D29998 - .incbin "graphics/pokemon/back_pics/volbeat_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Volbeat:: @ 8D29CF8 - .incbin "graphics/pokemon/palettes/volbeat_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Volbeat:: @ 8D29D20 - .incbin "graphics/pokemon/icons/volbeat_icon.4bpp" - - .align 2 -gMonFootprint_Volbeat:: @ 8D2A120 - .incbin "graphics/pokemon/footprints/volbeat_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Illumise:: @ 8D2A140 - .incbin "graphics/pokemon/front_pics/illumise_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Illumise:: @ 8D2A4B4 - .incbin "graphics/pokemon/palettes/illumise_palette.gbapal.lz" - - .align 2 -gMonBackPic_Illumise:: @ 8D2A4DC - .incbin "graphics/pokemon/back_pics/illumise_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Illumise:: @ 8D2A7F8 - .incbin "graphics/pokemon/palettes/illumise_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Illumise:: @ 8D2A820 - .incbin "graphics/pokemon/icons/illumise_icon.4bpp" - - .align 2 -gMonFootprint_Illumise:: @ 8D2AC20 - .incbin "graphics/pokemon/footprints/illumise_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Lileep:: @ 8D2AC40 - .incbin "graphics/pokemon/front_pics/lileep_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Lileep:: @ 8D2AF84 - .incbin "graphics/pokemon/palettes/lileep_palette.gbapal.lz" - - .align 2 -gMonBackPic_Lileep:: @ 8D2AFAC - .incbin "graphics/pokemon/back_pics/lileep_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Lileep:: @ 8D2B2F0 - .incbin "graphics/pokemon/palettes/lileep_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Lileep:: @ 8D2B318 - .incbin "graphics/pokemon/icons/lileep_icon.4bpp" - - .align 2 -gMonFootprint_Lileep:: @ 8D2B718 - .incbin "graphics/pokemon/footprints/lileep_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Cradily:: @ 8D2B738 - .incbin "graphics/pokemon/front_pics/cradily_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Cradily:: @ 8D2BB54 - .incbin "graphics/pokemon/palettes/cradily_palette.gbapal.lz" - - .align 2 -gMonBackPic_Cradily:: @ 8D2BB7C - .incbin "graphics/pokemon/back_pics/cradily_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Cradily:: @ 8D2BF78 - .incbin "graphics/pokemon/palettes/cradily_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Cradily:: @ 8D2BFA0 - .incbin "graphics/pokemon/icons/cradily_icon.4bpp" - - .align 2 -gMonFootprint_Cradily:: @ 8D2C3A0 - .incbin "graphics/pokemon/footprints/cradily_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Anorith:: @ 8D2C3C0 - .incbin "graphics/pokemon/front_pics/anorith_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Anorith:: @ 8D2C6E4 - .incbin "graphics/pokemon/palettes/anorith_palette.gbapal.lz" - - .align 2 -gMonBackPic_Anorith:: @ 8D2C70C - .incbin "graphics/pokemon/back_pics/anorith_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Anorith:: @ 8D2C954 - .incbin "graphics/pokemon/palettes/anorith_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Anorith:: @ 8D2C97C - .incbin "graphics/pokemon/icons/anorith_icon.4bpp" - - .align 2 -gMonFootprint_Anorith:: @ 8D2CD7C - .incbin "graphics/pokemon/footprints/anorith_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Armaldo:: @ 8D2CD9C - .incbin "graphics/pokemon/front_pics/armaldo_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Armaldo:: @ 8D2D31C - .incbin "graphics/pokemon/palettes/armaldo_palette.gbapal.lz" - - .align 2 -gMonBackPic_Armaldo:: @ 8D2D344 - .incbin "graphics/pokemon/back_pics/armaldo_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Armaldo:: @ 8D2D77C - .incbin "graphics/pokemon/palettes/armaldo_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Armaldo:: @ 8D2D7A4 - .incbin "graphics/pokemon/icons/armaldo_icon.4bpp" - - .align 2 -gMonFootprint_Armaldo:: @ 8D2DBA4 - .incbin "graphics/pokemon/footprints/armaldo_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Ralts:: @ 8D2DBC4 - .incbin "graphics/pokemon/front_pics/ralts_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Ralts:: @ 8D2DDF4 - .incbin "graphics/pokemon/palettes/ralts_palette.gbapal.lz" - - .align 2 -gMonBackPic_Ralts:: @ 8D2DE1C - .incbin "graphics/pokemon/back_pics/ralts_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Ralts:: @ 8D2E058 - .incbin "graphics/pokemon/palettes/ralts_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Ralts:: @ 8D2E080 - .incbin "graphics/pokemon/icons/ralts_icon.4bpp" - - .align 2 -gMonFootprint_Ralts:: @ 8D2E480 - .incbin "graphics/pokemon/footprints/ralts_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kirlia:: @ 8D2E4A0 - .incbin "graphics/pokemon/front_pics/kirlia_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kirlia:: @ 8D2E79C - .incbin "graphics/pokemon/palettes/kirlia_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kirlia:: @ 8D2E7C4 - .incbin "graphics/pokemon/back_pics/kirlia_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kirlia:: @ 8D2EB38 - .incbin "graphics/pokemon/palettes/kirlia_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kirlia:: @ 8D2EB60 - .incbin "graphics/pokemon/icons/kirlia_icon.4bpp" - - .align 2 -gMonFootprint_Kirlia:: @ 8D2EF60 - .incbin "graphics/pokemon/footprints/kirlia_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Gardevoir:: @ 8D2EF80 - .incbin "graphics/pokemon/front_pics/gardevoir_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Gardevoir:: @ 8D2F2FC - .incbin "graphics/pokemon/palettes/gardevoir_palette.gbapal.lz" - - .align 2 -gMonBackPic_Gardevoir:: @ 8D2F324 - .incbin "graphics/pokemon/back_pics/gardevoir_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Gardevoir:: @ 8D2F658 - .incbin "graphics/pokemon/palettes/gardevoir_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Gardevoir:: @ 8D2F680 - .incbin "graphics/pokemon/icons/gardevoir_icon.4bpp" - - .align 2 -gMonFootprint_Gardevoir:: @ 8D2FA80 - .incbin "graphics/pokemon/footprints/gardevoir_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Bagon:: @ 8D2FAA0 - .incbin "graphics/pokemon/front_pics/bagon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Bagon:: @ 8D2FD18 - .incbin "graphics/pokemon/palettes/bagon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Bagon:: @ 8D2FD40 - .incbin "graphics/pokemon/back_pics/bagon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Bagon:: @ 8D30028 - .incbin "graphics/pokemon/palettes/bagon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Bagon:: @ 8D30050 - .incbin "graphics/pokemon/icons/bagon_icon.4bpp" - - .align 2 -gMonFootprint_Bagon:: @ 8D30450 - .incbin "graphics/pokemon/footprints/bagon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Shelgon:: @ 8D30470 - .incbin "graphics/pokemon/front_pics/shelgon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Shelgon:: @ 8D30774 - .incbin "graphics/pokemon/palettes/shelgon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Shelgon:: @ 8D3079C - .incbin "graphics/pokemon/back_pics/shelgon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Shelgon:: @ 8D30A84 - .incbin "graphics/pokemon/palettes/shelgon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Shelgon:: @ 8D30AAC - .incbin "graphics/pokemon/icons/shelgon_icon.4bpp" - - .align 2 -gMonFootprint_Shelgon:: @ 8D30EAC - .incbin "graphics/pokemon/footprints/shelgon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Salamence:: @ 8D30ECC - .incbin "graphics/pokemon/front_pics/salamence_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Salamence:: @ 8D31330 - .incbin "graphics/pokemon/palettes/salamence_palette.gbapal.lz" - - .align 2 -gMonBackPic_Salamence:: @ 8D31358 - .incbin "graphics/pokemon/back_pics/salamence_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Salamence:: @ 8D3163C - .incbin "graphics/pokemon/palettes/salamence_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Salamence:: @ 8D31664 - .incbin "graphics/pokemon/icons/salamence_icon.4bpp" - - .align 2 -gMonFootprint_Salamence:: @ 8D31A64 - .incbin "graphics/pokemon/footprints/salamence_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Beldum:: @ 8D31A84 - .incbin "graphics/pokemon/front_pics/beldum_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Beldum:: @ 8D31CF4 - .incbin "graphics/pokemon/palettes/beldum_palette.gbapal.lz" - - .align 2 -gMonBackPic_Beldum:: @ 8D31D1C - .incbin "graphics/pokemon/back_pics/beldum_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Beldum:: @ 8D3200C - .incbin "graphics/pokemon/palettes/beldum_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Beldum:: @ 8D32034 - .incbin "graphics/pokemon/icons/beldum_icon.4bpp" - - .align 2 -gMonFootprint_Beldum:: @ 8D32434 - .incbin "graphics/pokemon/footprints/beldum_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Metang:: @ 8D32454 - .incbin "graphics/pokemon/front_pics/metang_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Metang:: @ 8D328B0 - .incbin "graphics/pokemon/palettes/metang_palette.gbapal.lz" - - .align 2 -gMonBackPic_Metang:: @ 8D328D8 - .incbin "graphics/pokemon/back_pics/metang_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Metang:: @ 8D32BFC - .incbin "graphics/pokemon/palettes/metang_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Metang:: @ 8D32C24 - .incbin "graphics/pokemon/icons/metang_icon.4bpp" - - .align 2 -gMonFootprint_Metang:: @ 8D33024 - .incbin "graphics/pokemon/footprints/metang_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Metagross:: @ 8D33044 - .incbin "graphics/pokemon/front_pics/metagross_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Metagross:: @ 8D334A8 - .incbin "graphics/pokemon/palettes/metagross_palette.gbapal.lz" - - .align 2 -gMonBackPic_Metagross:: @ 8D334D0 - .incbin "graphics/pokemon/back_pics/metagross_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Metagross:: @ 8D3379C - .incbin "graphics/pokemon/palettes/metagross_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Metagross:: @ 8D337C4 - .incbin "graphics/pokemon/icons/metagross_icon.4bpp" - - .align 2 -gMonFootprint_Metagross:: @ 8D33BC4 - .incbin "graphics/pokemon/footprints/metagross_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Regirock:: @ 8D33BE4 - .incbin "graphics/pokemon/front_pics/regirock_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Regirock:: @ 8D340A0 - .incbin "graphics/pokemon/palettes/regirock_palette.gbapal.lz" - - .align 2 -gMonBackPic_Regirock:: @ 8D340C8 - .incbin "graphics/pokemon/back_pics/regirock_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Regirock:: @ 8D34514 - .incbin "graphics/pokemon/palettes/regirock_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Regirock:: @ 8D3453C - .incbin "graphics/pokemon/icons/regirock_icon.4bpp" - - .align 2 -gMonFootprint_Regirock:: @ 8D3493C - .incbin "graphics/pokemon/footprints/regirock_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Regice:: @ 8D3495C - .incbin "graphics/pokemon/front_pics/regice_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Regice:: @ 8D34DA4 - .incbin "graphics/pokemon/palettes/regice_palette.gbapal.lz" - - .align 2 -gMonBackPic_Regice:: @ 8D34DCC - .incbin "graphics/pokemon/back_pics/regice_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Regice:: @ 8D350BC - .incbin "graphics/pokemon/palettes/regice_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Regice:: @ 8D350E4 - .incbin "graphics/pokemon/icons/regice_icon.4bpp" - - .align 2 -gMonFootprint_Regice:: @ 8D354E4 - .incbin "graphics/pokemon/footprints/regice_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Registeel:: @ 8D35504 - .incbin "graphics/pokemon/front_pics/registeel_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Registeel:: @ 8D3598C - .incbin "graphics/pokemon/palettes/registeel_palette.gbapal.lz" - - .align 2 -gMonBackPic_Registeel:: @ 8D359B4 - .incbin "graphics/pokemon/back_pics/registeel_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Registeel:: @ 8D35CEC - .incbin "graphics/pokemon/palettes/registeel_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Registeel:: @ 8D35D14 - .incbin "graphics/pokemon/icons/registeel_icon.4bpp" - - .align 2 -gMonFootprint_Registeel:: @ 8D36114 - .incbin "graphics/pokemon/footprints/registeel_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Kyogre:: @ 8D36134 - .incbin "graphics/pokemon/front_pics/kyogre_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Kyogre:: @ 8D365A4 - .incbin "graphics/pokemon/palettes/kyogre_palette.gbapal.lz" - - .align 2 -gMonBackPic_Kyogre:: @ 8D365CC - .incbin "graphics/pokemon/back_pics/kyogre_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Kyogre:: @ 8D36844 - .incbin "graphics/pokemon/palettes/kyogre_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Kyogre:: @ 8D3686C - .incbin "graphics/pokemon/icons/kyogre_icon.4bpp" - - .align 2 -gMonFootprint_Kyogre:: @ 8D36C6C - .incbin "graphics/pokemon/footprints/kyogre_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Groudon:: @ 8D36C8C - .incbin "graphics/pokemon/front_pics/groudon_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Groudon:: @ 8D37220 - .incbin "graphics/pokemon/palettes/groudon_palette.gbapal.lz" - - .align 2 -gMonBackPic_Groudon:: @ 8D37248 - .incbin "graphics/pokemon/back_pics/groudon_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Groudon:: @ 8D376B0 - .incbin "graphics/pokemon/palettes/groudon_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Groudon:: @ 8D376D8 - .incbin "graphics/pokemon/icons/groudon_icon.4bpp" - - .align 2 -gMonFootprint_Groudon:: @ 8D37AD8 - .incbin "graphics/pokemon/footprints/groudon_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Rayquaza:: @ 8D37AF8 - .incbin "graphics/pokemon/front_pics/rayquaza_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Rayquaza:: @ 8D382E4 - .incbin "graphics/pokemon/palettes/rayquaza_palette.gbapal.lz" - - .align 2 -gMonBackPic_Rayquaza:: @ 8D3830C - .incbin "graphics/pokemon/back_pics/rayquaza_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Rayquaza:: @ 8D38644 - .incbin "graphics/pokemon/palettes/rayquaza_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Rayquaza:: @ 8D3866C - .incbin "graphics/pokemon/icons/rayquaza_icon.4bpp" - - .align 2 -gMonFootprint_Rayquaza:: @ 8D38A6C - .incbin "graphics/pokemon/footprints/rayquaza_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Latias:: @ 8D38A8C - .incbin "graphics/pokemon/front_pics/latias_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Latias:: @ 8D38EB0 - .incbin "graphics/pokemon/palettes/latias_palette.gbapal.lz" - - .align 2 -gMonBackPic_Latias:: @ 8D38ED8 - .incbin "graphics/pokemon/back_pics/latias_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Latias:: @ 8D391D4 - .incbin "graphics/pokemon/palettes/latias_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Latias:: @ 8D391FC - .incbin "graphics/pokemon/icons/latias_icon.4bpp" - - .align 2 -gMonFootprint_Latias:: @ 8D395FC - .incbin "graphics/pokemon/footprints/latias_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Latios:: @ 8D3961C - .incbin "graphics/pokemon/front_pics/latios_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Latios:: @ 8D39A70 - .incbin "graphics/pokemon/palettes/latios_palette.gbapal.lz" - - .align 2 -gMonBackPic_Latios:: @ 8D39A98 - .incbin "graphics/pokemon/back_pics/latios_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Latios:: @ 8D39DF8 - .incbin "graphics/pokemon/palettes/latios_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Latios:: @ 8D39E20 - .incbin "graphics/pokemon/icons/latios_icon.4bpp" - - .align 2 -gMonFootprint_Latios:: @ 8D3A220 - .incbin "graphics/pokemon/footprints/latios_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Jirachi:: @ 8D3A240 - .incbin "graphics/pokemon/front_pics/jirachi_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Jirachi:: @ 8D3A54C - .incbin "graphics/pokemon/palettes/jirachi_palette.gbapal.lz" - - .align 2 -gMonBackPic_Jirachi:: @ 8D3A574 - .incbin "graphics/pokemon/back_pics/jirachi_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Jirachi:: @ 8D3A914 - .incbin "graphics/pokemon/palettes/jirachi_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Jirachi:: @ 8D3A93C - .incbin "graphics/pokemon/icons/jirachi_icon.4bpp" - - .align 2 -gMonFootprint_Jirachi:: @ 8D3AD3C - .incbin "graphics/pokemon/footprints/jirachi_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Deoxys:: @ 8D3AD5C - .incbin "graphics/pokemon/front_pics/deoxys_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Deoxys:: @ 8D3B138 - .incbin "graphics/pokemon/palettes/deoxys_palette.gbapal.lz" - - .align 2 -gMonBackPic_Deoxys:: @ 8D3B160 - .incbin "graphics/pokemon/back_pics/deoxys_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Deoxys:: @ 8D3B7D0 - .incbin "graphics/pokemon/palettes/deoxys_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Deoxys:: @ 8D3B7F8 - .incbin "graphics/pokemon/icons/deoxys_icon.4bpp" - - .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp" - - .incbin "graphics/unused/deoxys_speed_icon_wide.4bpp" - - .space 0x6800 - - .incbin "graphics/unknown/unknown_D437F8.bin" - - .align 2 -gMonFootprint_Deoxys:: @ 8D43BF8 - .incbin "graphics/pokemon/footprints/deoxys_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Chimecho:: @ 8D43C18 - .incbin "graphics/pokemon/front_pics/chimecho_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Chimecho:: @ 8D43E64 - .incbin "graphics/pokemon/palettes/chimecho_palette.gbapal.lz" - - .align 2 -gMonBackPic_Chimecho:: @ 8D43E8C - .incbin "graphics/pokemon/back_pics/chimecho_back_pic.4bpp.lz" - - .align 2 -gMonShinyPalette_Chimecho:: @ 8D44100 - .incbin "graphics/pokemon/palettes/chimecho_shiny_palette.gbapal.lz" - - .align 2 -gMonIcon_Chimecho:: @ 8D44128 - .incbin "graphics/pokemon/icons/chimecho_icon.4bpp" - - .align 2 -gMonFootprint_Chimecho:: @ 8D44528 - .incbin "graphics/pokemon/footprints/chimecho_footprint.1bpp" - - .align 2 -gMonStillFrontPic_Egg:: @ 8D44548 - .incbin "graphics/pokemon/front_pics/egg_still_front_pic.4bpp.lz" - - .align 2 -gMonPalette_Egg:: @ 8D446FC - .incbin "graphics/pokemon/palettes/egg_palette.gbapal.lz" - - .align 2 -gMonStillFrontPic_UnownB:: @ 8D4471C - .incbin "graphics/pokemon/front_pics/unown_b_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownB:: @ 8D448F4 - .incbin "graphics/pokemon/back_pics/unown_b_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownB:: @ 8D44AF8 - .incbin "graphics/pokemon/icons/unown_B_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownC:: @ 8D44EF8 - .incbin "graphics/pokemon/front_pics/unown_c_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownC:: @ 8D4510C - .incbin "graphics/pokemon/back_pics/unown_c_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownC:: @ 8D453B8 - .incbin "graphics/pokemon/icons/unown_C_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownD:: @ 8D457B8 - .incbin "graphics/pokemon/front_pics/unown_d_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownD:: @ 8D459B0 - .incbin "graphics/pokemon/back_pics/unown_d_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownD:: @ 8D45C08 - .incbin "graphics/pokemon/icons/unown_D_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownE:: @ 8D46008 - .incbin "graphics/pokemon/front_pics/unown_e_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownE:: @ 8D461C0 - .incbin "graphics/pokemon/back_pics/unown_e_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownE:: @ 8D463C0 - .incbin "graphics/pokemon/icons/unown_E_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownF:: @ 8D467C0 - .incbin "graphics/pokemon/front_pics/unown_f_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownF:: @ 8D469B4 - .incbin "graphics/pokemon/back_pics/unown_f_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownF:: @ 8D46BD0 - .incbin "graphics/pokemon/icons/unown_F_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownG:: @ 8D46FD0 - .incbin "graphics/pokemon/front_pics/unown_g_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownG:: @ 8D471AC - .incbin "graphics/pokemon/back_pics/unown_g_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownG:: @ 8D473F8 - .incbin "graphics/pokemon/icons/unown_G_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownH:: @ 8D477F8 - .incbin "graphics/pokemon/front_pics/unown_h_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownH:: @ 8D47A3C - .incbin "graphics/pokemon/back_pics/unown_h_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownH:: @ 8D47D00 - .incbin "graphics/pokemon/icons/unown_H_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownI:: @ 8D48100 - .incbin "graphics/pokemon/front_pics/unown_i_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownI:: @ 8D48298 - .incbin "graphics/pokemon/back_pics/unown_i_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownI:: @ 8D48440 - .incbin "graphics/pokemon/icons/unown_I_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownJ:: @ 8D48840 - .incbin "graphics/pokemon/front_pics/unown_j_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownJ:: @ 8D48A04 - .incbin "graphics/pokemon/back_pics/unown_j_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownJ:: @ 8D48BEC - .incbin "graphics/pokemon/icons/unown_J_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownK:: @ 8D48FEC - .incbin "graphics/pokemon/front_pics/unown_k_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownK:: @ 8D491BC - .incbin "graphics/pokemon/back_pics/unown_k_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownK:: @ 8D493B4 - .incbin "graphics/pokemon/icons/unown_K_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownL:: @ 8D497B4 - .incbin "graphics/pokemon/front_pics/unown_l_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownL:: @ 8D49964 - .incbin "graphics/pokemon/back_pics/unown_l_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownL:: @ 8D49B38 - .incbin "graphics/pokemon/icons/unown_L_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownM:: @ 8D49F38 - .incbin "graphics/pokemon/front_pics/unown_m_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownM:: @ 8D4A15C - .incbin "graphics/pokemon/back_pics/unown_m_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownM:: @ 8D4A404 - .incbin "graphics/pokemon/icons/unown_M_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownN:: @ 8D4A804 - .incbin "graphics/pokemon/front_pics/unown_n_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownN:: @ 8D4A9FC - .incbin "graphics/pokemon/back_pics/unown_n_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownN:: @ 8D4AC68 - .incbin "graphics/pokemon/icons/unown_N_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownO:: @ 8D4B068 - .incbin "graphics/pokemon/front_pics/unown_o_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownO:: @ 8D4B2A0 - .incbin "graphics/pokemon/back_pics/unown_o_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownO:: @ 8D4B560 - .incbin "graphics/pokemon/icons/unown_O_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownP:: @ 8D4B960 - .incbin "graphics/pokemon/front_pics/unown_p_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownP:: @ 8D4BB00 - .incbin "graphics/pokemon/back_pics/unown_p_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownP:: @ 8D4BCC4 - .incbin "graphics/pokemon/icons/unown_P_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownQ:: @ 8D4C0C4 - .incbin "graphics/pokemon/front_pics/unown_q_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownQ:: @ 8D4C278 - .incbin "graphics/pokemon/back_pics/unown_q_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownQ:: @ 8D4C444 - .incbin "graphics/pokemon/icons/unown_Q_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownR:: @ 8D4C844 - .incbin "graphics/pokemon/front_pics/unown_r_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownR:: @ 8D4C9E8 - .incbin "graphics/pokemon/back_pics/unown_r_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownR:: @ 8D4CBB0 - .incbin "graphics/pokemon/icons/unown_R_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownS:: @ 8D4CFB0 - .incbin "graphics/pokemon/front_pics/unown_s_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownS:: @ 8D4D198 - .incbin "graphics/pokemon/back_pics/unown_s_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownS:: @ 8D4D3EC - .incbin "graphics/pokemon/icons/unown_S_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownT:: @ 8D4D7EC - .incbin "graphics/pokemon/front_pics/unown_t_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownT:: @ 8D4D99C - .incbin "graphics/pokemon/back_pics/unown_t_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownT:: @ 8D4DB50 - .incbin "graphics/pokemon/icons/unown_T_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownU:: @ 8D4DF50 - .incbin "graphics/pokemon/front_pics/unown_u_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownU:: @ 8D4E168 - .incbin "graphics/pokemon/back_pics/unown_u_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownU:: @ 8D4E3BC - .incbin "graphics/pokemon/icons/unown_U_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownV:: @ 8D4E7BC - .incbin "graphics/pokemon/front_pics/unown_v_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownV:: @ 8D4E9A0 - .incbin "graphics/pokemon/back_pics/unown_v_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownV:: @ 8D4EBD0 - .incbin "graphics/pokemon/icons/unown_V_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownW:: @ 8D4EFD0 - .incbin "graphics/pokemon/front_pics/unown_w_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownW:: @ 8D4F1A4 - .incbin "graphics/pokemon/back_pics/unown_w_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownW:: @ 8D4F3A8 - .incbin "graphics/pokemon/icons/unown_W_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownX:: @ 8D4F7A8 - .incbin "graphics/pokemon/front_pics/unown_x_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownX:: @ 8D4F96C - .incbin "graphics/pokemon/back_pics/unown_x_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownX:: @ 8D4FB5C - .incbin "graphics/pokemon/icons/unown_X_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownY:: @ 8D4FF5C - .incbin "graphics/pokemon/front_pics/unown_y_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownY:: @ 8D50134 - .incbin "graphics/pokemon/back_pics/unown_y_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownY:: @ 8D50328 - .incbin "graphics/pokemon/icons/unown_Y_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownZ:: @ 8D50728 - .incbin "graphics/pokemon/front_pics/unown_z_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownZ:: @ 8D508D8 - .incbin "graphics/pokemon/back_pics/unown_z_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownZ:: @ 8D50AB4 - .incbin "graphics/pokemon/icons/unown_Z_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownExclamationMark:: @ 8D50EB4 - .incbin "graphics/pokemon/front_pics/unown_exclamation_mark_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownExclamationMark:: @ 8D51044 - .incbin "graphics/pokemon/back_pics/unown_exclamation_mark_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownExclamationMark:: @ 8D5120C - .incbin "graphics/pokemon/icons/unown_exclamation_mark_icon.4bpp" - - .align 2 -gMonStillFrontPic_UnownQuestionMark:: @ 8D5160C - .incbin "graphics/pokemon/front_pics/unown_question_mark_still_front_pic.4bpp.lz" - - .align 2 -gMonBackPic_UnownQuestionMark:: @ 8D517C8 - .incbin "graphics/pokemon/back_pics/unown_question_mark_back_pic.4bpp.lz" - - .align 2 -gMonIcon_UnownQuestionMark:: @ 8D519C8 - .incbin "graphics/pokemon/icons/unown_question_mark_icon.4bpp" diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc deleted file mode 100644 index 897cb9ffb..000000000 --- a/data/graphics/trainers/graphics.inc +++ /dev/null @@ -1,783 +0,0 @@ - .align 2 -gTrainerFrontPic_Hiker:: @ 8D51DC8 - .incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Hiker:: @ 8D52248 - .incbin "graphics/trainers/palettes/hiker.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaGruntM:: @ 8D52270 - .incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaGruntM:: @ 8D525D0 - .incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonBreederF:: @ 8D525F8 - .incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonBreederF:: @ 8D5292C - .incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_CoolTrainerM:: @ 8D52954 - .incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CoolTrainerM:: @ 8D52C3C - .incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_BirdKeeper:: @ 8D52C64 - .incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BirdKeeper:: @ 8D52F9C - .incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz" - - .align 2 -gTrainerFrontPic_Collector:: @ 8D52FC4 - .incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Collector:: @ 8D533C8 - .incbin "graphics/trainers/palettes/collector.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaGruntF:: @ 8D533F0 - .incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaGruntF:: @ 8D5372C - .incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmerM:: @ 8D53754 - .incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmerM:: @ 8D53A14 - .incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaGruntM:: @ 8D53A3C - .incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaGruntM:: @ 8D53DBC - .incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_ExpertM:: @ 8D53DE4 - .incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ExpertM:: @ 8D54124 - .incbin "graphics/trainers/palettes/expert_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaAdminM:: @ 8D5414C - .incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaAdminM:: @ 8D54500 - .incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_BlackBelt:: @ 8D54528 - .incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BlackBelt:: @ 8D5488C - .incbin "graphics/trainers/palettes/black_belt.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaAdminF:: @ 8D548B4 - .incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaAdminF:: @ 8D54C78 - .incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_AquaLeaderArchie:: @ 8D54CA0 - .incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AquaLeaderArchie:: @ 8D54FDC - .incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz" - - .align 2 -gTrainerFrontPic_HexManiac:: @ 8D55004 - .incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_HexManiac:: @ 8D55370 - .incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_AromaLady:: @ 8D55398 - .incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_AromaLady:: @ 8D5565C - .incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_RuinManiac:: @ 8D55684 - .incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RuinManiac:: @ 8D55A20 - .incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_Interviewer:: @ 8D55A48 - .incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Interviewer:: @ 8D55EEC - .incbin "graphics/trainers/palettes/interviewer.gbapal.lz" - - .align 2 -gTrainerFrontPic_TuberF:: @ 8D55F14 - .incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_TuberF:: @ 8D561B8 - .incbin "graphics/trainers/palettes/tuber_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_TuberM:: @ 8D561E0 - .incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_TuberM:: @ 8D5646C - .incbin "graphics/trainers/palettes/tuber_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CoolTrainerF:: @ 8D56494 - .incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CoolTrainerF:: @ 8D567A8 - .incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Lady:: @ 8D567D0 - .incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Lady:: @ 8D56B84 - .incbin "graphics/trainers/palettes/lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_Beauty:: @ 8D56BAC - .incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Beauty:: @ 8D56E94 - .incbin "graphics/trainers/palettes/beauty.gbapal.lz" - - .align 2 -gTrainerFrontPic_RichBoy:: @ 8D56EBC - .incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RichBoy:: @ 8D57170 - .incbin "graphics/trainers/palettes/rich_boy.gbapal.lz" - - .align 2 -gTrainerFrontPic_ExpertF:: @ 8D57198 - .incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ExpertF:: @ 8D574B4 - .incbin "graphics/trainers/palettes/expert_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Pokemaniac:: @ 8D574DC - .incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Pokemaniac:: @ 8D5784C - .incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaGruntF:: @ 8D57874 - .incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaGruntF:: @ 8D57C00 - .incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Guitarist:: @ 8D57C28 - .incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Guitarist:: @ 8D57FAC - .incbin "graphics/trainers/palettes/guitarist.gbapal.lz" - - .align 2 -gTrainerFrontPic_Kindler:: @ 8D57FD4 - .incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Kindler:: @ 8D58340 - .incbin "graphics/trainers/palettes/kindler.gbapal.lz" - - .align 2 -gTrainerFrontPic_Camper:: @ 8D58368 - .incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Camper:: @ 8D58650 - .incbin "graphics/trainers/palettes/camper.gbapal.lz" - - .align 2 -gTrainerFrontPic_Picnicker:: @ 8D58678 - .incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Picnicker:: @ 8D58958 - .incbin "graphics/trainers/palettes/picnicker.gbapal.lz" - - .align 2 -gTrainerFrontPic_BugManiac:: @ 8D58980 - .incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BugManiac:: @ 8D58DD0 - .incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonBreederM:: @ 8D58DF8 - .incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonBreederM:: @ 8D59128 - .incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PsychicM:: @ 8D59150 - .incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PsychicM:: @ 8D5947C - .incbin "graphics/trainers/palettes/psychic_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PsychicF:: @ 8D594A4 - .incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PsychicF:: @ 8D597CC - .incbin "graphics/trainers/palettes/psychic_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Gentleman:: @ 8D597F4 - .incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Gentleman:: @ 8D59AF4 - .incbin "graphics/trainers/palettes/gentleman.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourSidney:: @ 8D59B1C - .incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourSidney:: @ 8D59E50 - .incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourPhoebe:: @ 8D59E78 - .incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourPhoebe:: @ 8D5A178 - .incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourGlacia:: @ 8D5A1A0 - .incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourGlacia:: @ 8D5A524 - .incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz" - - .align 2 -gTrainerFrontPic_EliteFourDrake:: @ 8D5A54C - .incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_EliteFourDrake:: @ 8D5A8F4 - .incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderRoxanne:: @ 8D5A91C - .incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderRoxanne:: @ 8D5AC08 - .incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderBrawly:: @ 8D5AC30 - .incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderBrawly:: @ 8D5AFC4 - .incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderWattson:: @ 8D5AFEC - .incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderWattson:: @ 8D5B334 - .incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderFlannery:: @ 8D5B35C - .incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderFlannery:: @ 8D5B6DC - .incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderNorman:: @ 8D5B704 - .incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderNorman:: @ 8D5BA40 - .incbin "graphics/trainers/palettes/leader_norman.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderWinona:: @ 8D5BA68 - .incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderWinona:: @ 8D5BDE8 - .incbin "graphics/trainers/palettes/leader_winona.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderTateAndLiza:: @ 8D5BE10 - .incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderTateAndLiza:: @ 8D5C254 - .incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz" - - .align 2 -gTrainerFrontPic_LeaderJuan:: @ 8D5C27C - .incbin "graphics/trainers/front_pics/leader_juan_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_LeaderJuan:: @ 8D5C624 - .incbin "graphics/trainers/palettes/leader_juan.gbapal.lz" - - .align 2 -gTrainerFrontPic_SchoolKidM:: @ 8D5C64C - .incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SchoolKidM:: @ 8D5C90C - .incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_SchoolKidF:: @ 8D5C934 - .incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SchoolKidF:: @ 8D5CBD0 - .incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_SrAndJr:: @ 8D5CBF8 - .incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SrAndJr:: @ 8D5D068 - .incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz" - - .align 2 -gTrainerFrontPic_WinstrateM:: @ 8D5D090 - .incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_WinstrateM:: @ 8D5D44C - .incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_WinstrateF:: @ 8D5D474 - .incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_WinstrateF:: @ 8D5D840 - .incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Youngster:: @ 8D5D868 - .incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Youngster:: @ 8D5DB10 - .incbin "graphics/trainers/palettes/youngster.gbapal.lz" - - .align 2 -gTrainerFrontPic_ChampionWallace:: @ 8D5DB38 - .incbin "graphics/trainers/front_pics/champion_wallace_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ChampionWallace:: @ 8D5DF8C - .incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz" - - .align 2 -gTrainerFrontPic_Fisherman:: @ 8D5DFB4 - .incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Fisherman:: @ 8D5E398 - .incbin "graphics/trainers/palettes/fisherman.gbapal.lz" - - .align 2 -gTrainerFrontPic_CyclingTriathleteM:: @ 8D5E3C0 - .incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CyclingTriathleteM:: @ 8D5E7D0 - .incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_CyclingTriathleteF:: @ 8D5E7F8 - .incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_CyclingTriathleteF:: @ 8D5EC04 - .incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_RunningTriathleteM:: @ 8D5EC2C - .incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RunningTriathleteM:: @ 8D5EEE4 - .incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_RunningTriathleteF:: @ 8D5EF0C - .incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RunningTriathleteF:: @ 8D5F1B0 - .incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmingTriathleteM:: @ 8D5F1D8 - .incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmingTriathleteM:: @ 8D5F504 - .incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmingTriathleteF:: @ 8D5F52C - .incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmingTriathleteF:: @ 8D5F808 - .incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_DragonTamer:: @ 8D5F830 - .incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_DragonTamer:: @ 8D5FB84 - .incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz" - - .align 2 -gTrainerFrontPic_NinjaBoy:: @ 8D5FBAC - .incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_NinjaBoy:: @ 8D5FE88 - .incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz" - - .align 2 -gTrainerFrontPic_BattleGirl:: @ 8D5FEB0 - .incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BattleGirl:: @ 8D601D0 - .incbin "graphics/trainers/palettes/battle_girl.gbapal.lz" - - .align 2 -gTrainerFrontPic_ParasolLady:: @ 8D601F8 - .incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ParasolLady:: @ 8D60530 - .incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz" - - .align 2 -gTrainerFrontPic_SwimmerF:: @ 8D60558 - .incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SwimmerF:: @ 8D60828 - .incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_Twins:: @ 8D60850 - .incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Twins:: @ 8D60C14 - .incbin "graphics/trainers/palettes/twins.gbapal.lz" - - .align 2 -gTrainerFrontPic_Sailor:: @ 8D60C3C - .incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Sailor:: @ 8D60FEC - .incbin "graphics/trainers/palettes/sailor.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaAdmin:: @ 8D61014 - .incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaAdmin:: @ 8D613EC - .incbin "graphics/trainers/palettes/magma_admin.gbapal.lz" - - .align 2 -gTrainerFrontPic_Wally:: @ 8D61414 - .incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Wally:: @ 8D616E4 - .incbin "graphics/trainers/palettes/wally.gbapal.lz" - - .align 2 -gTrainerFrontPic_Brendan:: @ 8D6170C - .incbin "graphics/trainers/front_pics/brendan_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Brendan:: @ 8D61A30 - .incbin "graphics/trainers/palettes/brendan.gbapal.lz" - - .align 2 -gTrainerFrontPic_May:: @ 8D61A58 - .incbin "graphics/trainers/front_pics/may_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_May:: @ 8D61D58 - .incbin "graphics/trainers/palettes/may.gbapal.lz" - - .align 2 -gTrainerFrontPic_BugCatcher:: @ 8D61D80 - .incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_BugCatcher:: @ 8D620AC - .incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonRangerM:: @ 8D620D4 - .incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonRangerM:: @ 8D6241C - .incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz" - - .align 2 -gTrainerFrontPic_PokemonRangerF:: @ 8D62444 - .incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PokemonRangerF:: @ 8D62778 - .incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz" - - .align 2 -gTrainerFrontPic_MagmaLeaderMaxie:: @ 8D627A0 - .incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_MagmaLeaderMaxie:: @ 8D62A94 - .incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz" - - .align 2 -gTrainerFrontPic_Lass:: @ 8D62ABC - .incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Lass:: @ 8D62D94 - .incbin "graphics/trainers/palettes/lass.gbapal.lz" - - .align 2 -gTrainerFrontPic_YoungCouple:: @ 8D62DBC - .incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_YoungCouple:: @ 8D6317C - .incbin "graphics/trainers/palettes/young_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_OldCouple:: @ 8D631A4 - .incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_OldCouple:: @ 8D636B4 - .incbin "graphics/trainers/palettes/old_couple.gbapal.lz" - - .align 2 -gTrainerFrontPic_SisAndBro:: @ 8D636DC - .incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SisAndBro:: @ 8D63B28 - .incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz" - - .align 2 -gTrainerFrontPic_Steven:: @ 8D63B50 - .incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Steven:: @ 8D63E88 - .incbin "graphics/trainers/palettes/steven.gbapal.lz" - - .align 2 -gTrainerFrontPic_SalonMaidenAnabel:: @ 8D63EB0 - .incbin "graphics/trainers/front_pics/salon_maiden_anabel_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_SalonMaidenAnabel:: @ 8D641B8 - .incbin "graphics/trainers/palettes/salon_maiden_anabel.gbapal.lz" - - .align 2 -gTrainerFrontPic_DomeAceTucker:: @ 8D641E0 - .incbin "graphics/trainers/front_pics/dome_ace_tucker_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_DomeAceTucker:: @ 8D645E4 - .incbin "graphics/trainers/palettes/dome_ace_tucker.gbapal.lz" - - .align 2 -gTrainerFrontPic_PalaceMavenSpenser:: @ 8D6460C - .incbin "graphics/trainers/front_pics/palace_maven_spenser_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PalaceMavenSpenser:: @ 8D649B0 - .incbin "graphics/trainers/palettes/palace_maven_spenser.gbapal.lz" - - .align 2 -gTrainerFrontPic_ArenaTycoonGreta:: @ 8D649D8 - .incbin "graphics/trainers/front_pics/arena_tycoon_greta_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_ArenaTycoonGreta:: @ 8D64D08 - .incbin "graphics/trainers/palettes/arena_tycoon_greta.gbapal.lz" - - .align 2 -gTrainerFrontPic_FactoryHeadNoland:: @ 8D64D30 - .incbin "graphics/trainers/front_pics/factory_head_noland_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_FactoryHeadNoland:: @ 8D650AC - .incbin "graphics/trainers/palettes/factory_head_noland.gbapal.lz" - - .align 2 -gTrainerFrontPic_PikeQueenLucy:: @ 8D650D4 - .incbin "graphics/trainers/front_pics/pike_queen_lucy_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PikeQueenLucy:: @ 8D653C8 - .incbin "graphics/trainers/palettes/pike_queen_lucy.gbapal.lz" - - .align 2 -gTrainerFrontPic_PyramidKingBrandon:: @ 8D653F0 - .incbin "graphics/trainers/front_pics/pyramid_king_brandon_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_PyramidKingBrandon:: @ 8D6575C - .incbin "graphics/trainers/palettes/pyramid_king_brandon.gbapal.lz" - - .align 2 -gTrainerFrontPic_Red:: @ 8D65784 - .incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Red:: @ 8D65A90 - .incbin "graphics/trainers/palettes/red.gbapal.lz" - - .align 2 -gTrainerFrontPic_Leaf:: @ 8D65AB8 - .incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_Leaf:: @ 8D65DF4 - .incbin "graphics/trainers/palettes/leaf.gbapal.lz" - - .align 2 -gTrainerFrontPic_RubySapphireBrendan:: @ 8D65E1C - .incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RubySapphireBrendan:: @ 8D66130 - .incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz" - - .align 2 -gTrainerFrontPic_RubySapphireMay:: @ 8D66158 - .incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz" - - .align 2 -gTrainerPalette_RubySapphireMay:: @ 8D66458 - .incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz" - - .align 2 -gTrainerBackPic_Brendan:: @ 8D66480 - .incbin "graphics/trainers/back_pics/brendan_back_pic.4bpp" - - .align 2 -gTrainerBackPic_May:: @ 8D68480 - .incbin "graphics/trainers/back_pics/may_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Red:: @ 8D6A480 - .incbin "graphics/trainers/back_pics/red_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Leaf:: @ 8D6CC80 - .incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp" - - .align 2 -gTrainerBackPic_RubySapphireBrendan:: @ 8D6F480 - .incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp" - - .align 2 -gTrainerBackPic_RubySapphireMay:: @ 8D71480 - .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Wally:: @ 8D73480 - .incbin "graphics/trainers/back_pics/wally_back_pic.4bpp" - - .align 2 -gTrainerBackPic_Steven:: @ 8D75480 - .incbin "graphics/trainers/back_pics/steven_back_pic.4bpp" - - .align 2 -gTrainerBackPicPalette_Red:: @ 8D77480 - .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" - - .align 2 -gTrainerBackPicPalette_Leaf:: @ 8D774A8 - .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" -- cgit v1.2.3 From ead21250a6e1ef3ebb4f7e69fd22dcb09be31ef8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Sep 2018 19:05:06 +0200 Subject: Label all battle ai scripts --- data/battle_ai_scripts.s | 176 +++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 2db1c5728..c227391ca 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -13,8 +13,8 @@ .align 2 gBattleAI_ScriptsTable:: @ 82DBEF8 .4byte AI_CheckBadMove - .4byte AI_CheckViability .4byte AI_TryToFaint + .4byte AI_CheckViability .4byte AI_SetupFirstTurn .4byte AI_Risky .4byte AI_PreferStrongestMove @@ -47,12 +47,12 @@ gBattleAI_ScriptsTable:: @ 82DBEF8 AI_CheckBadMove: if_target_is_ally AI_Ret - if_move MOVE_FISSURE, BattleAIScript_82DBF92 - if_move MOVE_HORN_DRILL, BattleAIScript_82DBF92 + if_move MOVE_FISSURE, AI_CBM_CheckIfNegatesType + if_move MOVE_HORN_DRILL, AI_CBM_CheckIfNegatesType get_how_powerful_move_is if_equal 0, AI_CheckBadMove_CheckSoundproof -BattleAIScript_82DBF92: @ 82DBF92 +AI_CBM_CheckIfNegatesType: @ 82DBF92 if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric @@ -60,32 +60,32 @@ BattleAIScript_82DBF92: @ 82DBF92 if_equal ABILITY_FLASH_FIRE, CheckIfFlashFireCancelsFire if_equal ABILITY_WONDER_GUARD, CheckIfWonderGuardCancelsMove if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove - goto BattleAIScript_82DBFF7 + goto AI_CheckBadMove_CheckSoundproof_ CheckIfVoltAbsorbCancelsElectric: @ 82DBFBD get_curr_move_type if_equal_ TYPE_ELECTRIC, Score_Minus12 - goto BattleAIScript_82DBFF7 + goto AI_CheckBadMove_CheckSoundproof_ CheckIfWaterAbsorbCancelsWater: @ 82DBFCA get_curr_move_type if_equal_ TYPE_WATER, Score_Minus12 - goto BattleAIScript_82DBFF7 + goto AI_CheckBadMove_CheckSoundproof_ CheckIfFlashFireCancelsFire: @ 82DBFD7 get_curr_move_type if_equal_ TYPE_FIRE, Score_Minus12 - goto BattleAIScript_82DBFF7 + goto AI_CheckBadMove_CheckSoundproof_ CheckIfWonderGuardCancelsMove: @ 82DBFE4 - if_type_effectiveness AI_EFFECTIVENESS_x2, BattleAIScript_82DBFF7 + if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CheckBadMove_CheckSoundproof_ goto Score_Minus10 CheckIfLevitateCancelsGroundMove: @ 82DBFEF get_curr_move_type if_equal_ TYPE_GROUND, Score_Minus10 -BattleAIScript_82DBFF7: @ 82DBFF7 +AI_CheckBadMove_CheckSoundproof_: @ 82DBFF7 get_how_powerful_move_is if_equal 0, AI_CheckBadMove_CheckSoundproof @@ -654,7 +654,7 @@ Score_Plus10: score +10 end -AI_TryToFaint: +AI_CheckViability: if_target_is_ally AI_Ret if_effect EFFECT_SLEEP, AI_CV_Sleep if_effect EFFECT_ABSORB, AI_CV_Absorb @@ -707,7 +707,7 @@ AI_TryToFaint: if_effect EFFECT_REFLECT, AI_CV_Reflect if_effect EFFECT_POISON, AI_CV_Poison if_effect EFFECT_PARALYZE, AI_CV_Paralyze - if_effect EFFECT_SWAGGER, BattleAIScript_82DD286 + if_effect EFFECT_SWAGGER, AI_CV_Swagger if_effect EFFECT_SPEED_DOWN_HIT, AI_CV_SpeedDownFromChance if_effect EFFECT_SKY_ATTACK, AI_CV_ChargeUpMove if_effect EFFECT_VITAL_THROW, AI_CV_VitalThrow @@ -1547,8 +1547,8 @@ AI_CV_HighCrit2: AI_CV_HighCrit_End: end -BattleAIScript_82DD286: - if_has_move AI_USER, MOVE_PSYCH_UP, BattleAIScript_82DD2B8 +AI_CV_Swagger: + if_has_move AI_USER, MOVE_PSYCH_UP, AI_CV_SwaggerHasPsychUp AI_CV_Flatter: if_random_less_than 128, AI_CV_Confuse @@ -1568,18 +1568,18 @@ AI_CV_Confuse2: AI_CV_Confuse_End: end -BattleAIScript_82DD2B8: - if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DD2D0 +AI_CV_SwaggerHasPsychUp: + if_stat_level_more_than AI_TARGET, STAT_ATK, 3, AI_CV_SwaggerHasPsychUp_Minus5 score +3 get_turn_count - if_not_equal 0, BattleAIScript_82DD2D2 + if_not_equal 0, AI_CV_SwaggerHasPsychUp_End score +2 - goto BattleAIScript_82DD2D2 + goto AI_CV_SwaggerHasPsychUp_End -BattleAIScript_82DD2D0: +AI_CV_SwaggerHasPsychUp_Minus5: score -5 -BattleAIScript_82DD2D2: +AI_CV_SwaggerHasPsychUp_End: end AI_CV_Reflect: @@ -1735,7 +1735,7 @@ AI_CV_Counter2: score -1 AI_CV_Counter3: - if_has_move AI_USER, MOVE_MIRROR_COAT, BattleAIScript_82DD4CD + if_has_move AI_USER, MOVE_MIRROR_COAT, AI_CV_Counter7 get_last_used_bank_move AI_TARGET get_move_power_from_result if_equal 0, AI_CV_Counter5 @@ -1763,11 +1763,11 @@ AI_CV_Counter6: if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End if_random_less_than 50, AI_CV_Counter_End -BattleAIScript_82DD4CD: - if_random_less_than 100, BattleAIScript_82DD4D5 +AI_CV_Counter7: + if_random_less_than 100, AI_CV_Counter8 score +4 -BattleAIScript_82DD4D5: +AI_CV_Counter8: end AI_CV_Counter_ScoreDown1: @@ -2756,15 +2756,15 @@ AI_CV_DragonDance2: AI_CV_DragonDance_End: end -AI_CheckViability: +AI_TryToFaint: if_target_is_ally AI_Ret if_can_faint AI_TryToFaint_TryToEncourageQuickAttack get_how_powerful_move_is - if_equal 1, Score_Minus1 - if_type_effectiveness AI_EFFECTIVENESS_x4, BattleAIScript_82DDE57 + if_equal MOVE_NOT_MOST_POWERFUL, Score_Minus1 + if_type_effectiveness AI_EFFECTIVENESS_x4, AI_TryToFaint_DoubleSuperEffective end -BattleAIScript_82DDE57: +AI_TryToFaint_DoubleSuperEffective: if_random_less_than 80, AI_TryToFaint_End score +2 end @@ -2895,9 +2895,9 @@ AI_Risky_EffectsToEncourage: AI_PreferBatonPass: if_target_is_ally AI_Ret count_usable_party_mons AI_USER - if_equal 0, BattleAIScript_82DDFB3 + if_equal 0, AI_PreferBatonPassEnd get_how_powerful_move_is - if_not_equal 0, BattleAIScript_82DDFB3 + if_not_equal 0, AI_PreferBatonPassEnd if_has_move_with_effect AI_USER, EFFECT_BATON_PASS, AI_PreferBatonPass_GoForBatonPass if_random_less_than 80, AI_Risky_End @@ -2906,7 +2906,7 @@ AI_PreferBatonPass_GoForBatonPass: if_move MOVE_DRAGON_DANCE, AI_PreferBatonPass2 if_move MOVE_CALM_MIND, AI_PreferBatonPass2 if_effect EFFECT_PROTECT, AI_PreferBatonPass_End - if_move MOVE_BATON_PASS, BattleAIScript_82DDF7B + if_move MOVE_BATON_PASS, AI_PreferBatonPass_EncourageIfHighStats if_random_less_than 20, AI_Risky_End score +3 @@ -2918,16 +2918,16 @@ AI_PreferBatonPass2: AI_PreferBatonPass_End: get_last_used_bank_move AI_USER - if_in_hwords sMovesTable_82DDF75, Score_Minus2 + if_in_hwords sMovesTable_ProtectMoves, Score_Minus2 score +2 end -sMovesTable_82DDF75: +sMovesTable_ProtectMoves: .2byte MOVE_PROTECT .2byte MOVE_DETECT .2byte -1 -BattleAIScript_82DDF7B: +AI_PreferBatonPass_EncourageIfHighStats: get_turn_count if_equal 0, Score_Minus2 if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3 @@ -2938,39 +2938,39 @@ BattleAIScript_82DDF7B: if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1 end -BattleAIScript_82DDFB3: +AI_PreferBatonPassEnd: end AI_DoubleBattle: if_target_is_ally AI_TryOnAlly - if_move MOVE_SKILL_SWAP, BattleAIScript_82DE04B + if_move MOVE_SKILL_SWAP, AI_DoubleBattleSkillSwap get_curr_move_type - if_move MOVE_EARTHQUAKE, BattleAIScript_82DE010 - if_move MOVE_MAGNITUDE, BattleAIScript_82DE010 - if_equal 13, BattleAIScript_82DE062 - if_equal 10, BattleAIScript_82DE079 + if_move MOVE_EARTHQUAKE, AI_DoubleBattleAllHittingGroundMove + if_move MOVE_MAGNITUDE, AI_DoubleBattleAllHittingGroundMove + if_equal TYPE_ELECTRIC, AI_DoubleBattleElectricMove + if_equal TYPE_FIRE, AI_DoubleBattleFireMove get_ability AI_USER - if_not_equal ABILITY_GUTS, BattleAIScript_82DDFF5 - if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, BattleAIScript_82DDFED + if_not_equal ABILITY_GUTS, AI_DoubleBattleCheckUserStatus + if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, AI_DoubleBattlePartnerHasHelpingHand end -BattleAIScript_82DDFED: +AI_DoubleBattlePartnerHasHelpingHand: get_how_powerful_move_is if_not_equal 0, Score_Plus1 end -BattleAIScript_82DDFF5: - if_status AI_USER, STATUS1_ANY, BattleAIScript_82DE000 +AI_DoubleBattleCheckUserStatus: + if_status AI_USER, STATUS1_ANY, AI_DoubleBattleCheckUserStatus2 end -BattleAIScript_82DE000: +AI_DoubleBattleCheckUserStatus2: get_how_powerful_move_is - if_equal 0, Score_Minus5 + if_equal MOVE_POWER_DISCOURAGED, Score_Minus5 score +1 - if_equal 2, Score_Plus2 + if_equal MOVE_MOST_POWERFUL, Score_Plus2 end -BattleAIScript_82DE010: +AI_DoubleBattleAllHittingGroundMove: if_ability AI_USER_PARTNER, ABILITY_LEVITATE, Score_Plus2 if_type AI_USER_PARTNER, TYPE_FLYING, Score_Plus2 if_type AI_USER_PARTNER, TYPE_FIRE, Score_Minus10 @@ -2979,7 +2979,7 @@ BattleAIScript_82DE010: if_type AI_USER_PARTNER, TYPE_ROCK, Score_Minus10 goto Score_Minus3 -BattleAIScript_82DE04B: +AI_DoubleBattleSkillSwap: get_ability AI_USER if_equal ABILITY_TRUANT, Score_Plus5 get_ability AI_TARGET @@ -2987,96 +2987,96 @@ BattleAIScript_82DE04B: if_equal ABILITY_PURE_POWER, Score_Plus2 end -BattleAIScript_82DE062: - if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, BattleAIScript_82DE078 +AI_DoubleBattleElectricMove: + if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, AI_DoubleBattleElectricMoveEnd score -2 - if_no_type AI_TARGET_PARTNER, TYPE_GROUND, BattleAIScript_82DE078 + if_no_type AI_TARGET_PARTNER, TYPE_GROUND, AI_DoubleBattleElectricMoveEnd score -8 -BattleAIScript_82DE078: +AI_DoubleBattleElectricMoveEnd: end -BattleAIScript_82DE079: - if_flash_fired AI_USER, BattleAIScript_82DE080 +AI_DoubleBattleFireMove: + if_flash_fired AI_USER, AI_DoubleBattleFireMove2 end -BattleAIScript_82DE080: +AI_DoubleBattleFireMove2: goto Score_Plus1 AI_TryOnAlly: get_how_powerful_move_is - if_equal 0, BattleAIScript_82DE0B2 + if_equal 0, AI_TryStatusMoveOnAlly get_curr_move_type - if_equal TYPE_FIRE, BattleAIScript_82DE099 + if_equal TYPE_FIRE, AI_TryFireMoveOnAlly AI_DiscourageOnAlly: goto Score_Minus30 -BattleAIScript_82DE099: - if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, BattleAIScript_82DE0A7 +AI_TryFireMoveOnAlly: + if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, AI_TryFireMoveOnAlly_FlashFire goto AI_DiscourageOnAlly -BattleAIScript_82DE0A7: +AI_TryFireMoveOnAlly_FlashFire: if_flash_fired AI_USER_PARTNER, AI_DiscourageOnAlly goto Score_Plus3 -BattleAIScript_82DE0B2: - if_move MOVE_SKILL_SWAP, BattleAIScript_82DE0DA - if_move MOVE_WILL_O_WISP, BattleAIScript_82DE14F - if_move MOVE_TOXIC, BattleAIScript_82DE14F - if_move MOVE_HELPING_HAND, BattleAIScript_82DE16D - if_move MOVE_SWAGGER, BattleAIScript_82DE178 +AI_TryStatusMoveOnAlly: + if_move MOVE_SKILL_SWAP, AI_TrySkillSwapOnAlly + if_move MOVE_WILL_O_WISP, AI_TryStatusOnAlly + if_move MOVE_TOXIC, AI_TryStatusOnAlly + if_move MOVE_HELPING_HAND, AI_TryHelpingHandOnAlly + if_move MOVE_SWAGGER, AI_TrySwaggerOnAlly goto Score_Minus30_ -BattleAIScript_82DE0DA: +AI_TrySkillSwapOnAlly: get_ability AI_TARGET if_equal ABILITY_TRUANT, Score_Plus10 get_ability AI_USER - if_not_equal ABILITY_LEVITATE, BattleAIScript_82DE107 + if_not_equal ABILITY_LEVITATE, AI_TrySkillSwapOnAlly2 get_ability AI_TARGET if_equal ABILITY_LEVITATE, Score_Minus30_ get_target_type1 - if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107 + if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2 score +1 get_target_type2 - if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107 + if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2 score +1 end -BattleAIScript_82DE107: +AI_TrySkillSwapOnAlly2: if_not_equal 14, Score_Minus30_ - if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_THUNDER, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, BattleAIScript_82DE14A - if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, BattleAIScript_82DE14A + if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_THUNDER, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, AI_TrySkillSwapOnAllyEnd + if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, AI_TrySkillSwapOnAllyEnd goto Score_Minus30_ -BattleAIScript_82DE14A: +AI_TrySkillSwapOnAllyEnd: goto Score_Plus3 -BattleAIScript_82DE14F: +AI_TryStatusOnAlly: get_ability AI_TARGET if_not_equal ABILITY_GUTS, Score_Minus30_ if_status AI_TARGET, STATUS1_ANY, Score_Minus30_ if_hp_less_than AI_USER, 91, Score_Minus30_ goto Score_Plus5 -BattleAIScript_82DE16D: +AI_TryHelpingHandOnAlly: if_random_less_than 64, Score_Minus1 goto Score_Plus2 -BattleAIScript_82DE178: - if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, BattleAIScript_82DE185 +AI_TrySwaggerOnAlly: + if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, AI_TrySwaggerOnAlly2 goto Score_Minus30_ -BattleAIScript_82DE185: - if_stat_level_more_than AI_TARGET, STAT_ATK, 7, BattleAIScript_82DE18F +AI_TrySwaggerOnAlly2: + if_stat_level_more_than AI_TARGET, STAT_ATK, 7, AI_TrySwaggerOnAlly_End score +3 -BattleAIScript_82DE18F: +AI_TrySwaggerOnAlly_End: end Score_Minus30_: -- cgit v1.2.3 From 44ba432dadc1d370cf02d4e6d64dbb55afdc3e0f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Sep 2018 20:00:13 +0200 Subject: Label various battle scripts --- data/battle_ai_scripts.s | 18 ++++---- data/battle_scripts_1.s | 106 +++++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 63 deletions(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index c227391ca..8f3cfb657 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3044,17 +3044,17 @@ AI_TrySkillSwapOnAlly: end AI_TrySkillSwapOnAlly2: - if_not_equal 14, Score_Minus30_ - if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_THUNDER, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, AI_TrySkillSwapOnAllyEnd - if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, AI_TrySkillSwapOnAllyEnd + if_not_equal ABILITY_COMPOUND_EYES, Score_Minus30_ + if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_THUNDER, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, AI_TrySkillSwapOnAllyPlus3 + if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, AI_TrySkillSwapOnAllyPlus3 goto Score_Minus30_ -AI_TrySkillSwapOnAllyEnd: +AI_TrySkillSwapOnAllyPlus3: goto Score_Plus3 AI_TryStatusOnAlly: diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 2125fc47e..fec030bb5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -399,19 +399,19 @@ BattleScript_EffectExplosion:: faintifabilitynotdamp setatkhptozero waitstate - jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94 - call BattleScript_82D8BEA - goto BattleScript_82D8B96 -BattleScript_82D8B94:: + jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop + call BattleScript_PreserveMissedBitDoMoveAnim + goto BattleScript_ExplosionLoop +BattleScript_ExplosionDoAnimStartLoop: attackanimation waitanimation -BattleScript_82D8B96:: +BattleScript_ExplosionLoop: movevaluescleanup critcalc damagecalc typecalc adjustnormaldamage - accuracycheck BattleScript_82D8BCF, ACC_CURR_MOVE + accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE effectivenesssound hitanimation BS_TARGET waitstate @@ -424,20 +424,20 @@ BattleScript_82D8B96:: tryfaintmon BS_TARGET, FALSE, NULL setbyte sMOVEEND_STATE, 0x0 moveend 0x2, 0x10 - jumpifnexttargetvalid BattleScript_82D8B96 + jumpifnexttargetvalid BattleScript_ExplosionLoop tryfaintmon BS_ATTACKER, FALSE, NULL end -BattleScript_82D8BCF:: +BattleScript_ExplosionMissed: effectivenesssound resultmessage waitmessage 0x40 setbyte sMOVEEND_STATE, 0x0 moveend 0x2, 0x10 - jumpifnexttargetvalid BattleScript_82D8B96 + jumpifnexttargetvalid BattleScript_ExplosionLoop tryfaintmon BS_ATTACKER, FALSE, NULL end -BattleScript_82D8BEA:: +BattleScript_PreserveMissedBitDoMoveAnim: bicbyte gMoveResultFlags, MOVE_RESULT_MISSED attackanimation waitanimation @@ -446,14 +446,14 @@ BattleScript_82D8BEA:: BattleScript_EffectDreamEater:: attackcanceler - jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E - jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_82D8C18 -BattleScript_82D8C0E:: + jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_DreamEaterNoEffect + jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked +BattleScript_DreamEaterNoEffect: attackstring ppreduce waitmessage 0x40 goto BattleScript_WasntAffected -BattleScript_82D8C18:: +BattleScript_DreamEaterWorked: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce @@ -479,7 +479,7 @@ BattleScript_82D8C18:: jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd printstring STRINGID_PKMNDREAMEATEN waitmessage 0x40 -BattleScript_DreamEaterTryFaintEnd:: +BattleScript_DreamEaterTryFaintEnd: tryfaintmon BS_TARGET, FALSE, NULL goto BattleScript_MoveEnd @@ -606,9 +606,9 @@ BattleScript_EffectRampage:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring - jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D8DAE + jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2 ppreduce -BattleScript_82D8DAE:: +BattleScript_EffectRampage2: confuseifrepeatingattackends goto BattleScript_HitFromCritCalc @@ -2297,8 +2297,7 @@ BattleScript_EffectSmellingsalt:: setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg goto BattleScript_EffectHit - -BattleScript_SmellingsaltDoubleDmg:: +BattleScript_SmellingsaltDoubleDmg: setbyte sDMG_MULTIPLIER, 0x2 goto BattleScript_EffectHit @@ -2593,7 +2592,7 @@ BattleScript_EffectSecretPower:: goto BattleScript_EffectHit BattleScript_EffectDoubleEdge:: - setmoveeffect MOVE_EFFECT_RECOIL_33_PARALYSIS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN + setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN goto BattleScript_EffectHit BattleScript_EffectTeeterDance:: @@ -3050,12 +3049,12 @@ BattleScript_82DAA83:: BattleScript_FrontierTrainerBattleWon:: jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_PayDayMoneyAndPickUpItems - jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAAAB + jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_FrontierTrainerBattleWon_TwoDefeated printstring STRINGID_PLAYERDEFEATEDTRAINER1 - goto BattleScript_82DAAAE -BattleScript_82DAAAB:: + goto BattleScript_FrontierTrainerBattleWon_LoseTexts +BattleScript_FrontierTrainerBattleWon_TwoDefeated: printstring STRINGID_TWOENEMIESDEFEATED -BattleScript_82DAAAE:: +BattleScript_FrontierTrainerBattleWon_LoseTexts: trainerslidein BS_ATTACKER waitstate printstring STRINGID_TRAINER1LOSETEXT @@ -3065,10 +3064,10 @@ BattleScript_82DAAAE:: trainerslidein BS_FAINTED waitstate printstring STRINGID_TRAINER2LOSETEXT -BattleScript_82DAACB:: - jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_82DAADA +BattleScript_82DAACB: + jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End pickup -BattleScript_82DAADA:: +BattleScript_FrontierTrainerBattleWon_End: end2 BattleScript_SmokeBallEscape:: @@ -3172,7 +3171,7 @@ BattleScript_PursuitDmgOnSwitchOut:: jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet setbyte sGIVEEXP_STATE, 0x0 getexp BS_TARGET -BattleScript_PursuitDmgOnSwitchOutRet:: +BattleScript_PursuitDmgOnSwitchOutRet: return BattleScript_Pausex20:: @@ -3968,17 +3967,17 @@ BattleScript_MoveEffectConfusion:: waitmessage 0x40 return -BattleScript_MoveEffectRecoil33:: - jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33 - jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End -BattleScript_DoRecoil33:: +BattleScript_MoveEffectRecoil:: + jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil + jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd +BattleScript_DoRecoil:: orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNHITWITHRECOIL waitmessage 0x40 tryfaintmon BS_ATTACKER, FALSE, NULL -BattleScript_Recoil33End:: +BattleScript_RecoilEnd:: return BattleScript_ItemSteal:: @@ -4048,38 +4047,37 @@ BattleScript_82DB4AF:: waitmessage 0x40 return -BattleScript_82DB4B8:: - call BattleScript_82DB4BE +BattleScript_IntimidateActivatesEnd3:: + call BattleScript_PauseIntimidateActivates end3 -BattleScript_82DB4BE:: +BattleScript_PauseIntimidateActivates: pause 0x20 -BattleScript_82DB4C1:: +BattleScript_IntimidateActivates:: setbyte gBattlerTarget, 0x0 setstatchanger STAT_ATK, 1, TRUE -BattleScript_82DB4CD:: - trygetintimidatetarget BattleScript_82DB51B - jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DB510 - jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_82DB51C - jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_82DB51C - jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_82DB51C - statbuffchange 0x21, BattleScript_82DB510 - jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510 +BattleScript_IntimidateActivatesLoop: + trygetintimidatetarget BattleScript_IntimidateActivatesReturn + jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateActivatesLoopIncrement + jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented + jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented + jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented + statbuffchange 0x21, BattleScript_IntimidateActivatesLoopIncrement + jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printstring STRINGID_PKMNCUTSATTACKWITH waitmessage 0x40 -BattleScript_82DB510:: +BattleScript_IntimidateActivatesLoopIncrement: addbyte gBattlerTarget, 0x1 - goto BattleScript_82DB4CD -BattleScript_82DB51B:: + goto BattleScript_IntimidateActivatesLoop +BattleScript_IntimidateActivatesReturn: return - -BattleScript_82DB51C:: +BattleScript_IntimidatePrevented: pause 0x20 printstring STRINGID_PREVENTEDFROMWORKING waitmessage 0x40 - goto BattleScript_82DB510 + goto BattleScript_IntimidateActivatesLoopIncrement BattleScript_DroughtActivates:: pause 0x20 @@ -4252,7 +4250,7 @@ BattleScript_AbilityCuredStatus:: updatestatusicon BS_SCRIPTING return -BattleScript_82DB695:: +BattleScript_IgnoresWhileAsleep:: printstring STRINGID_PKMNIGNORESASLEEP waitmessage 0x40 setbyte sMOVEEND_STATE, 0x0 @@ -4285,7 +4283,7 @@ BattleScript_IgnoresAndFallsAsleep:: moveend 0x2, 0x10 end -BattleScript_82DB6F0:: +BattleScript_IgnoresAndHitsItself:: printstring STRINGID_PKMNWONTOBEY waitmessage 0x40 goto BattleScript_DoSelfConfusionDmg @@ -4463,7 +4461,7 @@ BattleScript_ActionSelectionItemsCantBeUsed:: printselectionstring STRINGID_ITEMSCANTBEUSEDNOW endselectionscript -BattleScript_82DB87D:: +BattleScript_FlushMessageBox:: printstring STRINGID_EMPTYSTRING3 return -- cgit v1.2.3 From 75384546b51fa87fe4c3fe768fbe4e72149af8e7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 5 Sep 2018 23:30:15 +0200 Subject: More factory decomp and documentation. --- data/battle_frontier_2.s | 90 ------------------------------------------------ 1 file changed, 90 deletions(-) (limited to 'data') diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index bbb2a2c62..c03c9c368 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -6,96 +6,6 @@ .section .rodata - .align 2 -gUnknown_0860F13C:: @ 860F13C - .incbin "graphics/unknown/unknown_60F13C.gbapal" - - .align 2 -gUnknown_0860F15C:: @ 860F15C - .incbin "graphics/unknown/unknown_60F15C.gbapal" - - .align 2 -gUnknown_0860F17C:: @ 860F17C - .incbin "graphics/unknown/unknown_60F17C.gbapal" - - .align 2 -gUnknown_0860F1BC:: @ 860F1BC - .incbin "graphics/unknown/unknown_60F1BC.4bpp" - - .align 2 -gUnknown_0860F3BC:: @ 860F3BC - .incbin "graphics/unknown/unknown_60F3BC.4bpp" - - .align 2 -gUnknown_0860F43C:: @ 860F43C - .incbin "graphics/unknown/unknown_60F43C.4bpp" - - .align 2 -gUnknown_0860F53C:: @ 860F53C - .incbin "graphics/unknown/unknown_60F53C.4bpp" - - .align 2 -gUnknown_0860F63C:: @ 860F63C - .incbin "graphics/unknown/unknown_60F63C.4bpp" - - .align 2 -gUnknown_0860F6BC:: @ 860F6BC - .incbin "graphics/unknown/unknown_60F6BC.4bpp" - - .align 2 -gUnknown_0860F7BC:: @ 860F7BC - .incbin "graphics/unknown/unknown_60F7BC.4bpp" - - .align 2 -gUnknown_0860F83C:: @ 860F83C - .incbin "graphics/unknown/unknown_60F83C.4bpp" - - .align 2 -gUnknown_0860F93C:: @ 860F93C - .incbin "graphics/unknown/unknown_60F93C.4bpp" - - .align 2 -gUnknown_0860FA3C:: @ 860FA3C - .incbin "graphics/unknown/unknown_60FA3C.4bpp" - - .align 2 -gUnknown_0861023C:: @ 861023C - .incbin "graphics/unknown/unknown_61023C.bin" - - .align 2 -gUnknown_0861033C:: @ 861033C - .incbin "graphics/unknown/unknown_61033C.4bpp" - - .align 2 -gUnknown_0861039C:: @ 861039C - .incbin "graphics/unknown/unknown_61039C.gbapal" - - .align 2 -gUnknown_086103BC:: @ 86103BC - obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 - obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 - obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 - obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d - null_obj_tiles - - .align 2 -gUnknown_086103E4:: @ 86103E4 - obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 - null_obj_tiles - - .align 2 -gUnknown_086103F4:: @ 86103F4 - obj_pal gUnknown_0860F13C, 0x0064 - obj_pal gUnknown_0860F15C, 0x0065 - obj_pal gUnknown_0860F17C, 0x0066 - obj_pal gUnknown_0861039C, 0x0067 - null_obj_pal - - .align 2 -gUnknown_0861041C:: @ 861041C - .4byte sub_819BCCC - .4byte sub_819BC30 - .4byte sub_819BCD0 .align 2 gUnknown_08610428:: @ 8610428 -- cgit v1.2.3 From 5656ceab6c87a52c5eb397a93242ac6c37650716 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 5 Sep 2018 23:53:54 +0100 Subject: Move graphics to src/data/graphics --- data/anim_mon_front_pics.s | 1665 -------------------------------------------- data/graphics.s | 11 - 2 files changed, 1676 deletions(-) delete mode 100644 data/anim_mon_front_pics.s delete mode 100644 data/graphics.s (limited to 'data') diff --git a/data/anim_mon_front_pics.s b/data/anim_mon_front_pics.s deleted file mode 100644 index 5833c274a..000000000 --- a/data/anim_mon_front_pics.s +++ /dev/null @@ -1,1665 +0,0 @@ - .section anim_mon_front_pic_data, "aw", %progbits - - .align 2 -gMonFrontPic_CircledQuestionMark:: @ 8B00000 - .incbin "graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Bulbasaur:: @ 8B00338 - .incbin "graphics/pokemon/anim_front_pics/bulbasaur_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ivysaur:: @ 8B007B0 - .incbin "graphics/pokemon/anim_front_pics/ivysaur_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Venusaur:: @ 8B00E10 - .incbin "graphics/pokemon/anim_front_pics/venusaur_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Charmander:: @ 8B017CC - .incbin "graphics/pokemon/anim_front_pics/charmander_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Charmeleon:: @ 8B01C7C - .incbin "graphics/pokemon/anim_front_pics/charmeleon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Charizard:: @ 8B02368 - .incbin "graphics/pokemon/anim_front_pics/charizard_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Squirtle:: @ 8B02D68 - .incbin "graphics/pokemon/anim_front_pics/squirtle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wartortle:: @ 8B03260 - .incbin "graphics/pokemon/anim_front_pics/wartortle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Blastoise:: @ 8B03944 - .incbin "graphics/pokemon/anim_front_pics/blastoise_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Caterpie:: @ 8B04280 - .incbin "graphics/pokemon/anim_front_pics/caterpie_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Metapod:: @ 8B046FC - .incbin "graphics/pokemon/anim_front_pics/metapod_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Butterfree:: @ 8B04AA8 - .incbin "graphics/pokemon/anim_front_pics/butterfree_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Weedle:: @ 8B05080 - .incbin "graphics/pokemon/anim_front_pics/weedle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kakuna:: @ 8B05444 - .incbin "graphics/pokemon/anim_front_pics/kakuna_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Beedrill:: @ 8B05820 - .incbin "graphics/pokemon/anim_front_pics/beedrill_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pidgey:: @ 8B05F38 - .incbin "graphics/pokemon/anim_front_pics/pidgey_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pidgeotto:: @ 8B0644C - .incbin "graphics/pokemon/anim_front_pics/pidgeotto_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pidgeot:: @ 8B06B24 - .incbin "graphics/pokemon/anim_front_pics/pidgeot_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Rattata:: @ 8B073DC - .incbin "graphics/pokemon/anim_front_pics/rattata_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Raticate:: @ 8B07828 - .incbin "graphics/pokemon/anim_front_pics/raticate_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Spearow:: @ 8B07EA4 - .incbin "graphics/pokemon/anim_front_pics/spearow_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Fearow:: @ 8B08388 - .incbin "graphics/pokemon/anim_front_pics/fearow_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ekans:: @ 8B08BC4 - .incbin "graphics/pokemon/anim_front_pics/ekans_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Arbok:: @ 8B0918C - .incbin "graphics/pokemon/anim_front_pics/arbok_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pikachu:: @ 8B09964 - .incbin "graphics/pokemon/anim_front_pics/pikachu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Raichu:: @ 8B09E3C - .incbin "graphics/pokemon/anim_front_pics/raichu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sandshrew:: @ 8B0A554 - .incbin "graphics/pokemon/anim_front_pics/sandshrew_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sandslash:: @ 8B0AA6C - .incbin "graphics/pokemon/anim_front_pics/sandslash_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_NidoranF:: @ 8B0B1C4 - .incbin "graphics/pokemon/anim_front_pics/nidoran_f_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nidorina:: @ 8B0B628 - .incbin "graphics/pokemon/anim_front_pics/nidorina_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nidoqueen:: @ 8B0BC5C - .incbin "graphics/pokemon/anim_front_pics/nidoqueen_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_NidoranM:: @ 8B0C4E8 - .incbin "graphics/pokemon/anim_front_pics/nidoran_m_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nidorino:: @ 8B0CA54 - .incbin "graphics/pokemon/anim_front_pics/nidorino_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nidoking:: @ 8B0D10C - .incbin "graphics/pokemon/anim_front_pics/nidoking_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Clefairy:: @ 8B0D9A8 - .incbin "graphics/pokemon/anim_front_pics/clefairy_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Clefable:: @ 8B0DE24 - .incbin "graphics/pokemon/anim_front_pics/clefable_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Vulpix:: @ 8B0E3A4 - .incbin "graphics/pokemon/anim_front_pics/vulpix_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ninetales:: @ 8B0EA08 - .incbin "graphics/pokemon/anim_front_pics/ninetales_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Jigglypuff:: @ 8B0F1CC - .incbin "graphics/pokemon/anim_front_pics/jigglypuff_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wigglytuff:: @ 8B0F67C - .incbin "graphics/pokemon/anim_front_pics/wigglytuff_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Zubat:: @ 8B0FCD0 - .incbin "graphics/pokemon/anim_front_pics/zubat_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Golbat:: @ 8B10188 - .incbin "graphics/pokemon/anim_front_pics/golbat_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Oddish:: @ 8B10780 - .incbin "graphics/pokemon/anim_front_pics/oddish_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gloom:: @ 8B10B78 - .incbin "graphics/pokemon/anim_front_pics/gloom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Vileplume:: @ 8B111B0 - .incbin "graphics/pokemon/anim_front_pics/vileplume_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Paras:: @ 8B11750 - .incbin "graphics/pokemon/anim_front_pics/paras_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Parasect:: @ 8B11BAC - .incbin "graphics/pokemon/anim_front_pics/parasect_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Venonat:: @ 8B121BC - .incbin "graphics/pokemon/anim_front_pics/venonat_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Venomoth:: @ 8B127A8 - .incbin "graphics/pokemon/anim_front_pics/venomoth_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Diglett:: @ 8B12F74 - .incbin "graphics/pokemon/anim_front_pics/diglett_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dugtrio:: @ 8B13338 - .incbin "graphics/pokemon/anim_front_pics/dugtrio_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Meowth:: @ 8B137CC - .incbin "graphics/pokemon/anim_front_pics/meowth_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Persian:: @ 8B13CB4 - .incbin "graphics/pokemon/anim_front_pics/persian_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Psyduck:: @ 8B1439C - .incbin "graphics/pokemon/anim_front_pics/psyduck_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Golduck:: @ 8B14904 - .incbin "graphics/pokemon/anim_front_pics/golduck_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mankey:: @ 8B14F9C - .incbin "graphics/pokemon/anim_front_pics/mankey_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Primeape:: @ 8B15550 - .incbin "graphics/pokemon/anim_front_pics/primeape_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Growlithe:: @ 8B15BFC - .incbin "graphics/pokemon/anim_front_pics/growlithe_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Arcanine:: @ 8B161E8 - .incbin "graphics/pokemon/anim_front_pics/arcanine_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Poliwag:: @ 8B16BF4 - .incbin "graphics/pokemon/anim_front_pics/poliwag_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Poliwhirl:: @ 8B170C8 - .incbin "graphics/pokemon/anim_front_pics/poliwhirl_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Poliwrath:: @ 8B176B4 - .incbin "graphics/pokemon/anim_front_pics/poliwrath_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Abra:: @ 8B17D38 - .incbin "graphics/pokemon/anim_front_pics/abra_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kadabra:: @ 8B18144 - .incbin "graphics/pokemon/anim_front_pics/kadabra_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Alakazam:: @ 8B18910 - .incbin "graphics/pokemon/anim_front_pics/alakazam_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Machop:: @ 8B190CC - .incbin "graphics/pokemon/anim_front_pics/machop_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Machoke:: @ 8B194FC - .incbin "graphics/pokemon/anim_front_pics/machoke_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Machamp:: @ 8B19BB4 - .incbin "graphics/pokemon/anim_front_pics/machamp_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Bellsprout:: @ 8B1A2C0 - .incbin "graphics/pokemon/anim_front_pics/bellsprout_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Weepinbell:: @ 8B1A798 - .incbin "graphics/pokemon/anim_front_pics/weepinbell_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Victreebel:: @ 8B1AD20 - .incbin "graphics/pokemon/anim_front_pics/victreebel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tentacool:: @ 8B1B474 - .incbin "graphics/pokemon/anim_front_pics/tentacool_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tentacruel:: @ 8B1B8F4 - .incbin "graphics/pokemon/anim_front_pics/tentacruel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Geodude:: @ 8B1C018 - .incbin "graphics/pokemon/anim_front_pics/geodude_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Graveler:: @ 8B1C4A8 - .incbin "graphics/pokemon/anim_front_pics/graveler_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Golem:: @ 8B1CA7C - .incbin "graphics/pokemon/anim_front_pics/golem_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ponyta:: @ 8B1D160 - .incbin "graphics/pokemon/anim_front_pics/ponyta_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Rapidash:: @ 8B1D820 - .incbin "graphics/pokemon/anim_front_pics/rapidash_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slowpoke:: @ 8B1E188 - .incbin "graphics/pokemon/anim_front_pics/slowpoke_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slowbro:: @ 8B1E650 - .incbin "graphics/pokemon/anim_front_pics/slowbro_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magnemite:: @ 8B1EDC8 - .incbin "graphics/pokemon/anim_front_pics/magnemite_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magneton:: @ 8B1F160 - .incbin "graphics/pokemon/anim_front_pics/magneton_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Farfetchd:: @ 8B1F814 - .incbin "graphics/pokemon/anim_front_pics/farfetch_d_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Doduo:: @ 8B1FD9C - .incbin "graphics/pokemon/anim_front_pics/doduo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dodrio:: @ 8B20398 - .incbin "graphics/pokemon/anim_front_pics/dodrio_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Seel:: @ 8B20CAC - .incbin "graphics/pokemon/anim_front_pics/seel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dewgong:: @ 8B211F4 - .incbin "graphics/pokemon/anim_front_pics/dewgong_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Grimer:: @ 8B21894 - .incbin "graphics/pokemon/anim_front_pics/grimer_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Muk:: @ 8B21E1C - .incbin "graphics/pokemon/anim_front_pics/muk_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shellder:: @ 8B22538 - .incbin "graphics/pokemon/anim_front_pics/shellder_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cloyster:: @ 8B2298C - .incbin "graphics/pokemon/anim_front_pics/cloyster_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gastly:: @ 8B23138 - .incbin "graphics/pokemon/anim_front_pics/gastly_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Haunter:: @ 8B237DC - .incbin "graphics/pokemon/anim_front_pics/haunter_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gengar:: @ 8B23ED0 - .incbin "graphics/pokemon/anim_front_pics/gengar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Onix:: @ 8B2456C - .incbin "graphics/pokemon/anim_front_pics/onix_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Drowzee:: @ 8B24DEC - .incbin "graphics/pokemon/anim_front_pics/drowzee_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hypno:: @ 8B253D4 - .incbin "graphics/pokemon/anim_front_pics/hypno_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Krabby:: @ 8B25A20 - .incbin "graphics/pokemon/anim_front_pics/krabby_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kingler:: @ 8B25EE4 - .incbin "graphics/pokemon/anim_front_pics/kingler_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Voltorb:: @ 8B267F4 - .incbin "graphics/pokemon/anim_front_pics/voltorb_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Electrode:: @ 8B26B68 - .incbin "graphics/pokemon/anim_front_pics/electrode_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Exeggcute:: @ 8B26F7C - .incbin "graphics/pokemon/anim_front_pics/exeggcute_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Exeggutor:: @ 8B27614 - .incbin "graphics/pokemon/anim_front_pics/exeggutor_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cubone:: @ 8B27E24 - .incbin "graphics/pokemon/anim_front_pics/cubone_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Marowak:: @ 8B282A8 - .incbin "graphics/pokemon/anim_front_pics/marowak_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hitmonlee:: @ 8B28948 - .incbin "graphics/pokemon/anim_front_pics/hitmonlee_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hitmonchan:: @ 8B29068 - .incbin "graphics/pokemon/anim_front_pics/hitmonchan_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lickitung:: @ 8B29678 - .incbin "graphics/pokemon/anim_front_pics/lickitung_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Koffing:: @ 8B29D50 - .incbin "graphics/pokemon/anim_front_pics/koffing_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Weezing:: @ 8B2A368 - .incbin "graphics/pokemon/anim_front_pics/weezing_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Rhyhorn:: @ 8B2ABC8 - .incbin "graphics/pokemon/anim_front_pics/rhyhorn_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Rhydon:: @ 8B2B2A4 - .incbin "graphics/pokemon/anim_front_pics/rhydon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Chansey:: @ 8B2BBA4 - .incbin "graphics/pokemon/anim_front_pics/chansey_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tangela:: @ 8B2C128 - .incbin "graphics/pokemon/anim_front_pics/tangela_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kangaskhan:: @ 8B2C800 - .incbin "graphics/pokemon/anim_front_pics/kangaskhan_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Horsea:: @ 8B2D0B4 - .incbin "graphics/pokemon/anim_front_pics/horsea_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Seadra:: @ 8B2D4D0 - .incbin "graphics/pokemon/anim_front_pics/seadra_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Goldeen:: @ 8B2DBB4 - .incbin "graphics/pokemon/anim_front_pics/goldeen_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Seaking:: @ 8B2E18C - .incbin "graphics/pokemon/anim_front_pics/seaking_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Staryu:: @ 8B2E930 - .incbin "graphics/pokemon/anim_front_pics/staryu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Starmie:: @ 8B2EE64 - .incbin "graphics/pokemon/anim_front_pics/starmie_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mrmime:: @ 8B2F4D0 - .incbin "graphics/pokemon/anim_front_pics/mr_mime_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Scyther:: @ 8B2FB0C - .incbin "graphics/pokemon/anim_front_pics/scyther_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Jynx:: @ 8B3034C - .incbin "graphics/pokemon/anim_front_pics/jynx_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Electabuzz:: @ 8B30BE0 - .incbin "graphics/pokemon/anim_front_pics/electabuzz_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magmar:: @ 8B313C8 - .incbin "graphics/pokemon/anim_front_pics/magmar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pinsir:: @ 8B31C40 - .incbin "graphics/pokemon/anim_front_pics/pinsir_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tauros:: @ 8B323D8 - .incbin "graphics/pokemon/anim_front_pics/tauros_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magikarp:: @ 8B32C7C - .incbin "graphics/pokemon/anim_front_pics/magikarp_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gyarados:: @ 8B332A4 - .incbin "graphics/pokemon/anim_front_pics/gyarados_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lapras:: @ 8B33B74 - .incbin "graphics/pokemon/anim_front_pics/lapras_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ditto:: @ 8B341D4 - .incbin "graphics/pokemon/anim_front_pics/ditto_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Eevee:: @ 8B34548 - .incbin "graphics/pokemon/anim_front_pics/eevee_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Vaporeon:: @ 8B34A68 - .incbin "graphics/pokemon/anim_front_pics/vaporeon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Jolteon:: @ 8B35098 - .incbin "graphics/pokemon/anim_front_pics/jolteon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Flareon:: @ 8B35774 - .incbin "graphics/pokemon/anim_front_pics/flareon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Porygon:: @ 8B35DB8 - .incbin "graphics/pokemon/anim_front_pics/porygon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Omanyte:: @ 8B36248 - .incbin "graphics/pokemon/anim_front_pics/omanyte_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Omastar:: @ 8B36670 - .incbin "graphics/pokemon/anim_front_pics/omastar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kabuto:: @ 8B36CB4 - .incbin "graphics/pokemon/anim_front_pics/kabuto_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kabutops:: @ 8B37088 - .incbin "graphics/pokemon/anim_front_pics/kabutops_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Aerodactyl:: @ 8B377DC - .incbin "graphics/pokemon/anim_front_pics/aerodactyl_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Snorlax:: @ 8B37F64 - .incbin "graphics/pokemon/anim_front_pics/snorlax_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Articuno:: @ 8B3868C - .incbin "graphics/pokemon/anim_front_pics/articuno_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Zapdos:: @ 8B39004 - .incbin "graphics/pokemon/anim_front_pics/zapdos_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Moltres:: @ 8B39800 - .incbin "graphics/pokemon/anim_front_pics/moltres_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dratini:: @ 8B3A0A8 - .incbin "graphics/pokemon/anim_front_pics/dratini_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dragonair:: @ 8B3A5B4 - .incbin "graphics/pokemon/anim_front_pics/dragonair_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dragonite:: @ 8B3AC44 - .incbin "graphics/pokemon/anim_front_pics/dragonite_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mewtwo:: @ 8B3B56C - .incbin "graphics/pokemon/anim_front_pics/mewtwo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mew:: @ 8B3BD14 - .incbin "graphics/pokemon/anim_front_pics/mew_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Chikorita:: @ 8B3C1F4 - .incbin "graphics/pokemon/anim_front_pics/chikorita_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Bayleef:: @ 8B3C68C - .incbin "graphics/pokemon/anim_front_pics/bayleef_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Meganium:: @ 8B3CCA0 - .incbin "graphics/pokemon/anim_front_pics/meganium_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cyndaquil:: @ 8B3D5D4 - .incbin "graphics/pokemon/anim_front_pics/cyndaquil_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Quilava:: @ 8B3DA94 - .incbin "graphics/pokemon/anim_front_pics/quilava_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Typhlosion:: @ 8B3E080 - .incbin "graphics/pokemon/anim_front_pics/typhlosion_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Totodile:: @ 8B3E798 - .incbin "graphics/pokemon/anim_front_pics/totodile_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Croconaw:: @ 8B3EC60 - .incbin "graphics/pokemon/anim_front_pics/croconaw_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Feraligatr:: @ 8B3F2BC - .incbin "graphics/pokemon/anim_front_pics/feraligatr_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sentret:: @ 8B3FB90 - .incbin "graphics/pokemon/anim_front_pics/sentret_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Furret:: @ 8B4005C - .incbin "graphics/pokemon/anim_front_pics/furret_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hoothoot:: @ 8B40650 - .incbin "graphics/pokemon/anim_front_pics/hoothoot_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Noctowl:: @ 8B40A4C - .incbin "graphics/pokemon/anim_front_pics/noctowl_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ledyba:: @ 8B41100 - .incbin "graphics/pokemon/anim_front_pics/ledyba_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ledian:: @ 8B4161C - .incbin "graphics/pokemon/anim_front_pics/ledian_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Spinarak:: @ 8B41AEC - .incbin "graphics/pokemon/anim_front_pics/spinarak_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ariados:: @ 8B41F34 - .incbin "graphics/pokemon/anim_front_pics/ariados_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Crobat:: @ 8B42628 - .incbin "graphics/pokemon/anim_front_pics/crobat_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Chinchou:: @ 8B42BFC - .incbin "graphics/pokemon/anim_front_pics/chinchou_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lanturn:: @ 8B43100 - .incbin "graphics/pokemon/anim_front_pics/lanturn_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pichu:: @ 8B43748 - .incbin "graphics/pokemon/anim_front_pics/pichu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cleffa:: @ 8B43B00 - .incbin "graphics/pokemon/anim_front_pics/cleffa_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Igglybuff:: @ 8B43EBC - .incbin "graphics/pokemon/anim_front_pics/igglybuff_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Togepi:: @ 8B44228 - .incbin "graphics/pokemon/anim_front_pics/togepi_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Togetic:: @ 8B4454C - .incbin "graphics/pokemon/anim_front_pics/togetic_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Natu:: @ 8B449DC - .incbin "graphics/pokemon/anim_front_pics/natu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Xatu:: @ 8B44D08 - .incbin "graphics/pokemon/anim_front_pics/xatu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mareep:: @ 8B4529C - .incbin "graphics/pokemon/anim_front_pics/mareep_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Flaaffy:: @ 8B45744 - .incbin "graphics/pokemon/anim_front_pics/flaaffy_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ampharos:: @ 8B45C34 - .incbin "graphics/pokemon/anim_front_pics/ampharos_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Bellossom:: @ 8B462C0 - .incbin "graphics/pokemon/anim_front_pics/bellossom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Marill:: @ 8B46758 - .incbin "graphics/pokemon/anim_front_pics/marill_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Azumarill:: @ 8B46C84 - .incbin "graphics/pokemon/anim_front_pics/azumarill_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sudowoodo:: @ 8B47228 - .incbin "graphics/pokemon/anim_front_pics/sudowoodo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Politoed:: @ 8B477E4 - .incbin "graphics/pokemon/anim_front_pics/politoed_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hoppip:: @ 8B47DEC - .incbin "graphics/pokemon/anim_front_pics/hoppip_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Skiploom:: @ 8B482B4 - .incbin "graphics/pokemon/anim_front_pics/skiploom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Jumpluff:: @ 8B486F8 - .incbin "graphics/pokemon/anim_front_pics/jumpluff_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Aipom:: @ 8B48C78 - .incbin "graphics/pokemon/anim_front_pics/aipom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sunkern:: @ 8B49178 - .incbin "graphics/pokemon/anim_front_pics/sunkern_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sunflora:: @ 8B49518 - .incbin "graphics/pokemon/anim_front_pics/sunflora_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Yanma:: @ 8B49AB0 - .incbin "graphics/pokemon/anim_front_pics/yanma_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wooper:: @ 8B4A03C - .incbin "graphics/pokemon/anim_front_pics/wooper_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Quagsire:: @ 8B4A3FC - .incbin "graphics/pokemon/anim_front_pics/quagsire_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Espeon:: @ 8B4AA80 - .incbin "graphics/pokemon/anim_front_pics/espeon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Umbreon:: @ 8B4B060 - .incbin "graphics/pokemon/anim_front_pics/umbreon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Murkrow:: @ 8B4B610 - .incbin "graphics/pokemon/anim_front_pics/murkrow_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slowking:: @ 8B4BB6C - .incbin "graphics/pokemon/anim_front_pics/slowking_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Misdreavus:: @ 8B4C234 - .incbin "graphics/pokemon/anim_front_pics/misdreavus_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownA:: @ 8B4C730 - .incbin "graphics/pokemon/anim_front_pics/unown_a_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wobbuffet:: @ 8B4C9F4 - .incbin "graphics/pokemon/anim_front_pics/wobbuffet_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Girafarig:: @ 8B4CFC4 - .incbin "graphics/pokemon/anim_front_pics/girafarig_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pineco:: @ 8B4D75C - .incbin "graphics/pokemon/anim_front_pics/pineco_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Forretress:: @ 8B4DBE4 - .incbin "graphics/pokemon/anim_front_pics/forretress_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dunsparce:: @ 8B4E1E8 - .incbin "graphics/pokemon/anim_front_pics/dunsparce_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gligar:: @ 8B4E73C - .incbin "graphics/pokemon/anim_front_pics/gligar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Steelix:: @ 8B4EE6C - .incbin "graphics/pokemon/anim_front_pics/steelix_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Snubbull:: @ 8B4F73C - .incbin "graphics/pokemon/anim_front_pics/snubbull_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Granbull:: @ 8B4FC2C - .incbin "graphics/pokemon/anim_front_pics/granbull_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Qwilfish:: @ 8B502CC - .incbin "graphics/pokemon/anim_front_pics/qwilfish_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Scizor:: @ 8B50780 - .incbin "graphics/pokemon/anim_front_pics/scizor_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shuckle:: @ 8B5100C - .incbin "graphics/pokemon/anim_front_pics/shuckle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Heracross:: @ 8B51470 - .incbin "graphics/pokemon/anim_front_pics/heracross_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sneasel:: @ 8B51B04 - .incbin "graphics/pokemon/anim_front_pics/sneasel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Teddiursa:: @ 8B52114 - .incbin "graphics/pokemon/anim_front_pics/teddiursa_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ursaring:: @ 8B524C0 - .incbin "graphics/pokemon/anim_front_pics/ursaring_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slugma:: @ 8B52C4C - .incbin "graphics/pokemon/anim_front_pics/slugma_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magcargo:: @ 8B5307C - .incbin "graphics/pokemon/anim_front_pics/magcargo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Swinub:: @ 8B536DC - .incbin "graphics/pokemon/anim_front_pics/swinub_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Piloswine:: @ 8B53A7C - .incbin "graphics/pokemon/anim_front_pics/piloswine_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Corsola:: @ 8B53FB8 - .incbin "graphics/pokemon/anim_front_pics/corsola_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Remoraid:: @ 8B5450C - .incbin "graphics/pokemon/anim_front_pics/remoraid_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Octillery:: @ 8B54960 - .incbin "graphics/pokemon/anim_front_pics/octillery_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Delibird:: @ 8B54EE4 - .incbin "graphics/pokemon/anim_front_pics/delibird_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mantine:: @ 8B55514 - .incbin "graphics/pokemon/anim_front_pics/mantine_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Skarmory:: @ 8B55D60 - .incbin "graphics/pokemon/anim_front_pics/skarmory_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Houndour:: @ 8B5656C - .incbin "graphics/pokemon/anim_front_pics/houndour_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Houndoom:: @ 8B56A70 - .incbin "graphics/pokemon/anim_front_pics/houndoom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kingdra:: @ 8B57164 - .incbin "graphics/pokemon/anim_front_pics/kingdra_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Phanpy:: @ 8B57900 - .incbin "graphics/pokemon/anim_front_pics/phanpy_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Donphan:: @ 8B57D74 - .incbin "graphics/pokemon/anim_front_pics/donphan_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Porygon2:: @ 8B5846C - .incbin "graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Stantler:: @ 8B588E8 - .incbin "graphics/pokemon/anim_front_pics/stantler_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Smeargle:: @ 8B5905C - .incbin "graphics/pokemon/anim_front_pics/smeargle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tyrogue:: @ 8B5970C - .incbin "graphics/pokemon/anim_front_pics/tyrogue_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hitmontop:: @ 8B59BD4 - .incbin "graphics/pokemon/anim_front_pics/hitmontop_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Smoochum:: @ 8B5A1B4 - .incbin "graphics/pokemon/anim_front_pics/smoochum_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Elekid:: @ 8B5A5A4 - .incbin "graphics/pokemon/anim_front_pics/elekid_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Magby:: @ 8B5AB58 - .incbin "graphics/pokemon/anim_front_pics/magby_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Miltank:: @ 8B5B004 - .incbin "graphics/pokemon/anim_front_pics/miltank_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Blissey:: @ 8B5B6C0 - .incbin "graphics/pokemon/anim_front_pics/blissey_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Raikou:: @ 8B5BD2C - .incbin "graphics/pokemon/anim_front_pics/raikou_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Entei:: @ 8B5C738 - .incbin "graphics/pokemon/anim_front_pics/entei_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Suicune:: @ 8B5CFCC - .incbin "graphics/pokemon/anim_front_pics/suicune_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Larvitar:: @ 8B5DA34 - .incbin "graphics/pokemon/anim_front_pics/larvitar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pupitar:: @ 8B5DEC0 - .incbin "graphics/pokemon/anim_front_pics/pupitar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tyranitar:: @ 8B5E308 - .incbin "graphics/pokemon/anim_front_pics/tyranitar_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lugia:: @ 8B5EC68 - .incbin "graphics/pokemon/anim_front_pics/lugia_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_HoOh:: @ 8B5F4FC - .incbin "graphics/pokemon/anim_front_pics/ho_oh_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Celebi:: @ 8B60090 - .incbin "graphics/pokemon/anim_front_pics/celebi_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_DoubleQuestionMark:: @ 8B60544 - .incbin "graphics/pokemon/anim_front_pics/double_question_mark_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Treecko:: @ 8B607B4 - .incbin "graphics/pokemon/anim_front_pics/treecko_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Grovyle:: @ 8B60D28 - .incbin "graphics/pokemon/anim_front_pics/grovyle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sceptile:: @ 8B6157C - .incbin "graphics/pokemon/anim_front_pics/sceptile_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Torchic:: @ 8B61C9C - .incbin "graphics/pokemon/anim_front_pics/torchic_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Combusken:: @ 8B6218C - .incbin "graphics/pokemon/anim_front_pics/combusken_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Blaziken:: @ 8B62964 - .incbin "graphics/pokemon/anim_front_pics/blaziken_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mudkip:: @ 8B630B0 - .incbin "graphics/pokemon/anim_front_pics/mudkip_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Marshtomp:: @ 8B635E4 - .incbin "graphics/pokemon/anim_front_pics/marshtomp_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Swampert:: @ 8B63BF4 - .incbin "graphics/pokemon/anim_front_pics/swampert_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Poochyena:: @ 8B64564 - .incbin "graphics/pokemon/anim_front_pics/poochyena_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mightyena:: @ 8B64AC0 - .incbin "graphics/pokemon/anim_front_pics/mightyena_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Zigzagoon:: @ 8B65294 - .incbin "graphics/pokemon/anim_front_pics/zigzagoon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Linoone:: @ 8B659B0 - .incbin "graphics/pokemon/anim_front_pics/linoone_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wurmple:: @ 8B65F9C - .incbin "graphics/pokemon/anim_front_pics/wurmple_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Silcoon:: @ 8B66498 - .incbin "graphics/pokemon/anim_front_pics/silcoon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Beautifly:: @ 8B66830 - .incbin "graphics/pokemon/anim_front_pics/beautifly_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cascoon:: @ 8B66DBC - .incbin "graphics/pokemon/anim_front_pics/cascoon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dustox:: @ 8B67130 - .incbin "graphics/pokemon/anim_front_pics/dustox_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lotad:: @ 8B67734 - .incbin "graphics/pokemon/anim_front_pics/lotad_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lombre:: @ 8B67B7C - .incbin "graphics/pokemon/anim_front_pics/lombre_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ludicolo:: @ 8B68120 - .incbin "graphics/pokemon/anim_front_pics/ludicolo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Seedot:: @ 8B688F0 - .incbin "graphics/pokemon/anim_front_pics/seedot_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nuzleaf:: @ 8B68DB4 - .incbin "graphics/pokemon/anim_front_pics/nuzleaf_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shiftry:: @ 8B69278 - .incbin "graphics/pokemon/anim_front_pics/shiftry_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nincada:: @ 8B69878 - .incbin "graphics/pokemon/anim_front_pics/nincada_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ninjask:: @ 8B69D04 - .incbin "graphics/pokemon/anim_front_pics/ninjask_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shedinja:: @ 8B6A23C - .incbin "graphics/pokemon/anim_front_pics/shedinja_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Taillow:: @ 8B6A81C - .incbin "graphics/pokemon/anim_front_pics/taillow_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Swellow:: @ 8B6AD5C - .incbin "graphics/pokemon/anim_front_pics/swellow_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shroomish:: @ 8B6B2C8 - .incbin "graphics/pokemon/anim_front_pics/shroomish_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Breloom:: @ 8B6B690 - .incbin "graphics/pokemon/anim_front_pics/breloom_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Spinda:: @ 8B6BD3C - .incbin "graphics/pokemon/anim_front_pics/spinda_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wingull:: @ 8B6C130 - .incbin "graphics/pokemon/anim_front_pics/wingull_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Pelipper:: @ 8B6C514 - .incbin "graphics/pokemon/anim_front_pics/pelipper_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Surskit:: @ 8B6CB0C - .incbin "graphics/pokemon/anim_front_pics/surskit_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Masquerain:: @ 8B6CEB0 - .incbin "graphics/pokemon/anim_front_pics/masquerain_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wailmer:: @ 8B6D4F0 - .incbin "graphics/pokemon/anim_front_pics/wailmer_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wailord:: @ 8B6D9A4 - .incbin "graphics/pokemon/anim_front_pics/wailord_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Skitty:: @ 8B6E01C - .incbin "graphics/pokemon/anim_front_pics/skitty_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Delcatty:: @ 8B6E588 - .incbin "graphics/pokemon/anim_front_pics/delcatty_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kecleon:: @ 8B6EBE0 - .incbin "graphics/pokemon/anim_front_pics/kecleon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Baltoy:: @ 8B6F274 - .incbin "graphics/pokemon/anim_front_pics/baltoy_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Claydol:: @ 8B6F62C - .incbin "graphics/pokemon/anim_front_pics/claydol_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Nosepass:: @ 8B6FD08 - .incbin "graphics/pokemon/anim_front_pics/nosepass_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Torkoal:: @ 8B70268 - .incbin "graphics/pokemon/anim_front_pics/torkoal_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sableye:: @ 8B70A58 - .incbin "graphics/pokemon/anim_front_pics/sableye_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Barboach:: @ 8B70EF8 - .incbin "graphics/pokemon/anim_front_pics/barboach_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Whiscash:: @ 8B71400 - .incbin "graphics/pokemon/anim_front_pics/whiscash_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Luvdisc:: @ 8B7197C - .incbin "graphics/pokemon/anim_front_pics/luvdisc_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Corphish:: @ 8B71CB0 - .incbin "graphics/pokemon/anim_front_pics/corphish_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Crawdaunt:: @ 8B721E4 - .incbin "graphics/pokemon/anim_front_pics/crawdaunt_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Feebas:: @ 8B72920 - .incbin "graphics/pokemon/anim_front_pics/feebas_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Milotic:: @ 8B72E30 - .incbin "graphics/pokemon/anim_front_pics/milotic_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Carvanha:: @ 8B736FC - .incbin "graphics/pokemon/anim_front_pics/carvanha_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sharpedo:: @ 8B73D1C - .incbin "graphics/pokemon/anim_front_pics/sharpedo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Trapinch:: @ 8B7434C - .incbin "graphics/pokemon/anim_front_pics/trapinch_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Vibrava:: @ 8B74720 - .incbin "graphics/pokemon/anim_front_pics/vibrava_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Flygon:: @ 8B74DB0 - .incbin "graphics/pokemon/anim_front_pics/flygon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Makuhita:: @ 8B75614 - .incbin "graphics/pokemon/anim_front_pics/makuhita_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Hariyama:: @ 8B75AD0 - .incbin "graphics/pokemon/anim_front_pics/hariyama_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Electrike:: @ 8B763D0 - .incbin "graphics/pokemon/anim_front_pics/electrike_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Manectric:: @ 8B768A0 - .incbin "graphics/pokemon/anim_front_pics/manectric_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Numel:: @ 8B76E9C - .incbin "graphics/pokemon/anim_front_pics/numel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Camerupt:: @ 8B773B8 - .incbin "graphics/pokemon/anim_front_pics/camerupt_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Spheal:: @ 8B779DC - .incbin "graphics/pokemon/anim_front_pics/spheal_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Sealeo:: @ 8B77E0C - .incbin "graphics/pokemon/anim_front_pics/sealeo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Walrein:: @ 8B78484 - .incbin "graphics/pokemon/anim_front_pics/walrein_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cacnea:: @ 8B78C54 - .incbin "graphics/pokemon/anim_front_pics/cacnea_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cacturne:: @ 8B7916C - .incbin "graphics/pokemon/anim_front_pics/cacturne_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Snorunt:: @ 8B79928 - .incbin "graphics/pokemon/anim_front_pics/snorunt_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Glalie:: @ 8B79E44 - .incbin "graphics/pokemon/anim_front_pics/glalie_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lunatone:: @ 8B7A568 - .incbin "graphics/pokemon/anim_front_pics/lunatone_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Solrock:: @ 8B7AA90 - .incbin "graphics/pokemon/anim_front_pics/solrock_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Azurill:: @ 8B7B264 - .incbin "graphics/pokemon/anim_front_pics/azurill_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Spoink:: @ 8B7B7B4 - .incbin "graphics/pokemon/anim_front_pics/spoink_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Grumpig:: @ 8B7BBA0 - .incbin "graphics/pokemon/anim_front_pics/grumpig_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Plusle:: @ 8B7C258 - .incbin "graphics/pokemon/anim_front_pics/plusle_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Minun:: @ 8B7C6F4 - .incbin "graphics/pokemon/anim_front_pics/minun_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Mawile:: @ 8B7CB14 - .incbin "graphics/pokemon/anim_front_pics/mawile_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Meditite:: @ 8B7D2A4 - .incbin "graphics/pokemon/anim_front_pics/meditite_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Medicham:: @ 8B7D6E4 - .incbin "graphics/pokemon/anim_front_pics/medicham_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Swablu:: @ 8B7DC3C - .incbin "graphics/pokemon/anim_front_pics/swablu_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Altaria:: @ 8B7E128 - .incbin "graphics/pokemon/anim_front_pics/altaria_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Wynaut:: @ 8B7E844 - .incbin "graphics/pokemon/anim_front_pics/wynaut_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Duskull:: @ 8B7ECB8 - .incbin "graphics/pokemon/anim_front_pics/duskull_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Dusclops:: @ 8B7F228 - .incbin "graphics/pokemon/anim_front_pics/dusclops_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Roselia:: @ 8B7F8D8 - .incbin "graphics/pokemon/anim_front_pics/roselia_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slakoth:: @ 8B7FEE8 - .incbin "graphics/pokemon/anim_front_pics/slakoth_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Vigoroth:: @ 8B802D8 - .incbin "graphics/pokemon/anim_front_pics/vigoroth_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Slaking:: @ 8B80A88 - .incbin "graphics/pokemon/anim_front_pics/slaking_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gulpin:: @ 8B81134 - .incbin "graphics/pokemon/anim_front_pics/gulpin_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Swalot:: @ 8B814E4 - .incbin "graphics/pokemon/anim_front_pics/swalot_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Tropius:: @ 8B81A78 - .incbin "graphics/pokemon/anim_front_pics/tropius_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Whismur:: @ 8B8239C - .incbin "graphics/pokemon/anim_front_pics/whismur_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Loudred:: @ 8B82808 - .incbin "graphics/pokemon/anim_front_pics/loudred_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Exploud:: @ 8B82F00 - .incbin "graphics/pokemon/anim_front_pics/exploud_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Clamperl:: @ 8B83908 - .incbin "graphics/pokemon/anim_front_pics/clamperl_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Huntail:: @ 8B83DB4 - .incbin "graphics/pokemon/anim_front_pics/huntail_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gorebyss:: @ 8B844A8 - .incbin "graphics/pokemon/anim_front_pics/gorebyss_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Absol:: @ 8B84A50 - .incbin "graphics/pokemon/anim_front_pics/absol_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shuppet:: @ 8B851C0 - .incbin "graphics/pokemon/anim_front_pics/shuppet_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Banette:: @ 8B855C0 - .incbin "graphics/pokemon/anim_front_pics/banette_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Seviper:: @ 8B85ACC - .incbin "graphics/pokemon/anim_front_pics/seviper_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Zangoose:: @ 8B8625C - .incbin "graphics/pokemon/anim_front_pics/zangoose_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Relicanth:: @ 8B86978 - .incbin "graphics/pokemon/anim_front_pics/relicanth_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Aron:: @ 8B86EBC - .incbin "graphics/pokemon/anim_front_pics/aron_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lairon:: @ 8B87260 - .incbin "graphics/pokemon/anim_front_pics/lairon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Aggron:: @ 8B87878 - .incbin "graphics/pokemon/anim_front_pics/aggron_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Castform:: @ 8B8824C - .incbin "graphics/pokemon/anim_front_pics/castform_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Volbeat:: @ 8B88CD4 - .incbin "graphics/pokemon/anim_front_pics/volbeat_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Illumise:: @ 8B892EC - .incbin "graphics/pokemon/anim_front_pics/illumise_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Lileep:: @ 8B8996C - .incbin "graphics/pokemon/anim_front_pics/lileep_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Cradily:: @ 8B89F64 - .incbin "graphics/pokemon/anim_front_pics/cradily_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Anorith:: @ 8B8A6B4 - .incbin "graphics/pokemon/anim_front_pics/anorith_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Armaldo:: @ 8B8ACA0 - .incbin "graphics/pokemon/anim_front_pics/armaldo_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Ralts:: @ 8B8B618 - .incbin "graphics/pokemon/anim_front_pics/ralts_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kirlia:: @ 8B8BA24 - .incbin "graphics/pokemon/anim_front_pics/kirlia_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Gardevoir:: @ 8B8BF74 - .incbin "graphics/pokemon/anim_front_pics/gardevoir_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Bagon:: @ 8B8C4A8 - .incbin "graphics/pokemon/anim_front_pics/bagon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Shelgon:: @ 8B8C93C - .incbin "graphics/pokemon/anim_front_pics/shelgon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Salamence:: @ 8B8CEA8 - .incbin "graphics/pokemon/anim_front_pics/salamence_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Beldum:: @ 8B8D608 - .incbin "graphics/pokemon/anim_front_pics/beldum_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Metang:: @ 8B8DA6C - .incbin "graphics/pokemon/anim_front_pics/metang_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Metagross:: @ 8B8E23C - .incbin "graphics/pokemon/anim_front_pics/metagross_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Regirock:: @ 8B8E920 - .incbin "graphics/pokemon/anim_front_pics/regirock_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Regice:: @ 8B8F1E8 - .incbin "graphics/pokemon/anim_front_pics/regice_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Registeel:: @ 8B8F994 - .incbin "graphics/pokemon/anim_front_pics/registeel_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Kyogre:: @ 8B90170 - .incbin "graphics/pokemon/anim_front_pics/kyogre_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Groudon:: @ 8B90948 - .incbin "graphics/pokemon/anim_front_pics/groudon_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Rayquaza:: @ 8B9135C - .incbin "graphics/pokemon/anim_front_pics/rayquaza_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Latias:: @ 8B91CF0 - .incbin "graphics/pokemon/anim_front_pics/latias_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Latios:: @ 8B92378 - .incbin "graphics/pokemon/anim_front_pics/latios_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Jirachi:: @ 8B92BA8 - .incbin "graphics/pokemon/anim_front_pics/jirachi_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Deoxys:: @ 8B93154 - .incbin "graphics/pokemon/anim_front_pics/deoxys_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Chimecho:: @ 8B938C0 - .incbin "graphics/pokemon/anim_front_pics/chimecho_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_Egg:: @ 8B93D08 - .incbin "graphics/pokemon/anim_front_pics/egg_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownB:: @ 8B93FC4 - .incbin "graphics/pokemon/anim_front_pics/unown_b_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownC:: @ 8B9428C - .incbin "graphics/pokemon/anim_front_pics/unown_c_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownD:: @ 8B94590 - .incbin "graphics/pokemon/anim_front_pics/unown_d_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownE:: @ 8B94878 - .incbin "graphics/pokemon/anim_front_pics/unown_e_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownF:: @ 8B94B20 - .incbin "graphics/pokemon/anim_front_pics/unown_f_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownG:: @ 8B94E08 - .incbin "graphics/pokemon/anim_front_pics/unown_g_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownH:: @ 8B950D4 - .incbin "graphics/pokemon/anim_front_pics/unown_h_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownI:: @ 8B9540C - .incbin "graphics/pokemon/anim_front_pics/unown_i_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownJ:: @ 8B95698 - .incbin "graphics/pokemon/anim_front_pics/unown_j_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownK:: @ 8B95950 - .incbin "graphics/pokemon/anim_front_pics/unown_k_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownL:: @ 8B95C10 - .incbin "graphics/pokemon/anim_front_pics/unown_l_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownM:: @ 8B95EB4 - .incbin "graphics/pokemon/anim_front_pics/unown_m_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownN:: @ 8B961C8 - .incbin "graphics/pokemon/anim_front_pics/unown_n_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownO:: @ 8B964B0 - .incbin "graphics/pokemon/anim_front_pics/unown_o_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownP:: @ 8B967DC - .incbin "graphics/pokemon/anim_front_pics/unown_p_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownQ:: @ 8B96A6C - .incbin "graphics/pokemon/anim_front_pics/unown_q_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownR:: @ 8B96D14 - .incbin "graphics/pokemon/anim_front_pics/unown_r_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownS:: @ 8B96FA8 - .incbin "graphics/pokemon/anim_front_pics/unown_s_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownT:: @ 8B97284 - .incbin "graphics/pokemon/anim_front_pics/unown_t_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownU:: @ 8B97528 - .incbin "graphics/pokemon/anim_front_pics/unown_u_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownV:: @ 8B97834 - .incbin "graphics/pokemon/anim_front_pics/unown_v_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownW:: @ 8B97B0C - .incbin "graphics/pokemon/anim_front_pics/unown_w_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownX:: @ 8B97DD4 - .incbin "graphics/pokemon/anim_front_pics/unown_x_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownY:: @ 8B98088 - .incbin "graphics/pokemon/anim_front_pics/unown_y_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownZ:: @ 8B98350 - .incbin "graphics/pokemon/anim_front_pics/unown_z_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownExclamationMark:: @ 8B985F4 - .incbin "graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.4bpp.lz" - - .align 2 -gMonFrontPic_UnownQuestionMark:: @ 8B98878 - .incbin "graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.4bpp.lz" diff --git a/data/graphics.s b/data/graphics.s deleted file mode 100644 index 2c1a98924..000000000 --- a/data/graphics.s +++ /dev/null @@ -1,11 +0,0 @@ - .section gfx_data, "aw", %progbits - - @ random garbage at the end. why, game freak? - .space 0x54BAC - .byte 0x0D, 0x00, 0x58, 0x02 @ why? - @ E38BC8 - .space 0x1145 - .byte 0x02 @ whyyyyy? - .space 0x3242 - .byte 0x40 @ WHYYYYYYYY - .space 0x13 -- cgit v1.2.3 From 07c28823900e52b09278798bc854afc46d15690e Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Thu, 6 Sep 2018 00:47:29 +0100 Subject: Move starter_choose data to C --- data/starter_choose.s | 159 -------------------------------------------------- 1 file changed, 159 deletions(-) delete mode 100644 data/starter_choose.s (limited to 'data') diff --git a/data/starter_choose.s b/data/starter_choose.s deleted file mode 100644 index 92b95d80c..000000000 --- a/data/starter_choose.s +++ /dev/null @@ -1,159 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .include "include/constants/species.h" - - .section .rodata - - .align 2 -gBirchBagGrassPal:: @ 85B0A00 - .incbin "graphics/misc/birch_bag.gbapal" - .incbin "graphics/misc/birch_grass.gbapal" - - .align 2 -gBirchBallarrow_Pal:: @ 85B0A40 - .incbin "graphics/misc/birch_ballarrow.gbapal" - - .align 2 -gBirchCircle_Pal:: @ 85B0A60 - .incbin "graphics/misc/birch_circle.gbapal" - - .align 2 -gBirchBagTilemap:: @ 85B0A80 - .incbin "graphics/misc/birch_bag_map.bin.lz" - - .align 2 -gBirchGrassTilemap:: @ 85B0C0C - .incbin "graphics/misc/birch_grass_map.bin.lz" - - .align 2 -gBirchHelpGfx:: @ 85B0E04 - .incbin "graphics/misc/birch_help.4bpp.lz" - - .align 2 -gUnknown_085B18AC:: @ 85B18AC - .incbin "graphics/misc/birch_ballarrow.4bpp.lz" - - .align 2 -gUnknown_085B1BCC:: @ 85B1BCC - .incbin "graphics/misc/birch_circle.4bpp.lz" - - .align 2 -gUnknown_085B1DCC:: @ 85B1DCC - window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200 - null_window_template - - .align 2 -gUnknown_085B1DDC:: @ 85B1DDC - window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260 - - .align 2 -gUnknown_085B1DE4:: @ 85B1DE4 - window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274 - -sPokeballCoords:: @ 85B1DEC - .byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40 - -gStarterChoose_LabelCoords:: @ 85B1DF2 - .byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04 - -sStarterMon:: @ 85B1DF8 - .2byte SPECIES_TREECKO - .2byte SPECIES_TORCHIC - .2byte SPECIES_MUDKIP - - .align 2 -gUnknown_085B1E00:: @ 85B1E00 - .4byte 0x000001f8, 0x00003072, 0x00001063 - -gUnknown_085B1E0C:: @ 85B1E0C - .byte 0x00, 0x01, 0x03 - - .align 2 -gOamData_85B1E10:: @ 85B1E10 - .2byte 0x00a0, 0x8000, 0x0400, 0x0000 - - .align 2 -gOamData_85B1E18:: @ 85B1E18 - .2byte 0x00a0, 0x8000, 0x0400, 0x0000 - - .align 2 -gOamData_85B1E20:: @ 85B1E20 - .2byte 0x03a0, 0xc000, 0x0400, 0x0000 - -gUnknown_085B1E28:: @ 85B1E28 - .byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00 - - .align 2 -gSpriteAnim_85B1E30:: @ 85B1E30 - .2byte 0x0030, 0x001e, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_85B1E38:: @ 85B1E38 - .2byte 0x0000, 0x001e, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_85B1E40:: @ 85B1E40 - .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 - .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 - .2byte 0x0000, 0x0008, 0xfffe, 0x0000 - - .align 2 -gSpriteAnim_85B1E88:: @ 85B1E88 - .2byte 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_85B1E90:: @ 85B1E90 - .4byte gSpriteAnim_85B1E30 - - .align 2 -gSpriteAnimTable_85B1E94:: @ 85B1E94 - .4byte gSpriteAnim_85B1E38 - .4byte gSpriteAnim_85B1E40 - - .align 2 -gSpriteAnimTable_85B1E9C:: @ 85B1E9C - .4byte gSpriteAnim_85B1E88 - - .align 2 -gSpriteAffineAnim_85B1EA0:: @ 85B1EA0 - .2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_85B1EB8:: @ 85B1EB8 - .2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_085B1ED0:: @ 85B1ED0 - .4byte gSpriteAffineAnim_85B1EA0 - - .align 2 -gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4 - .4byte gSpriteAffineAnim_85B1EB8 - - .align 2 -gUnknown_085B1ED8:: @ 85B1ED8 - obj_tiles gUnknown_085B18AC, 0x0800, 0x1000 - null_obj_tiles - - .align 2 -gUnknown_085B1EE8:: @ 85B1EE8 - obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001 - null_obj_tiles - - .align 2 -gUnknown_085B1EF8:: @ 85B1EF8 - obj_pal gBirchBallarrow_Pal, 0x1000 - obj_pal gBirchCircle_Pal, 0x1001 - null_obj_pal - - .align 2 -sSpriteTemplate_Hand:: @ 85B1F10 - spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC - - .align 2 -sSpriteTemplate_PokeBall:: @ 85B1F28 - spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C - - .align 2 -gUnknown_085B1F40:: @ 85B1F40 - spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback -- cgit v1.2.3 From 9350ac0a746b956cbfaf1c5d7a13aa28ef478127 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Thu, 6 Sep 2018 01:24:11 +0100 Subject: Move battle_pyramid_bag data to C --- data/battle_pyramid_bag.s | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 data/battle_pyramid_bag.s (limited to 'data') diff --git a/data/battle_pyramid_bag.s b/data/battle_pyramid_bag.s deleted file mode 100644 index de459075f..000000000 --- a/data/battle_pyramid_bag.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - .align 2 -gOamData_861F378:: @ 861F378 - .2byte 0x0100, 0xc000, 0x0400, 0x0000 - - .align 2 -gSpriteAnim_861F380:: @ 861F380 - .2byte 0x0000, 0x0004, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_861F388:: @ 861F388 - .4byte gSpriteAnim_861F380 - - .align 2 -gSpriteAffineAnim_861F38C:: @ 861F38C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_861F39C:: @ 861F39C - .2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnimTable_861F3C4:: @ 861F3C4 - .4byte gSpriteAffineAnim_861F38C - .4byte gSpriteAffineAnim_861F39C - - .align 2 -gUnknown_0861F3CC:: @ 861F3CC - obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024 - - .align 2 -gUnknown_0861F3D4:: @ 861F3D4 - spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy - -- cgit v1.2.3 From 26c91f1502436c2268b574720a2837a1db3e1114 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Thu, 6 Sep 2018 03:11:33 +0100 Subject: Move field_player_avatar data to C --- data/berries.inc | 689 --------------------------------------------- data/field_player_avatar.s | 82 ------ 2 files changed, 771 deletions(-) delete mode 100644 data/berries.inc (limited to 'data') diff --git a/data/berries.inc b/data/berries.inc deleted file mode 100644 index f06c32a1a..000000000 --- a/data/berries.inc +++ /dev/null @@ -1,689 +0,0 @@ - .align 2 -gBerries:: @ 858A670 - .string "CHERI$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 20 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cheri - .4byte gBerryDescriptionPart2_Cheri - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "CHESTO$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 80 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Chesto - .4byte gBerryDescriptionPart2_Chesto - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "PECHA$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 40 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pecha - .4byte gBerryDescriptionPart2_Pecha - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAWST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 32 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rawst - .4byte gBerryDescriptionPart2_Rawst - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "ASPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 50 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aspear - .4byte gBerryDescriptionPart2_Aspear - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "LEPPA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 28 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Leppa - .4byte gBerryDescriptionPart2_Leppa - .byte 4 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "ORAN$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 35 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Oran - .4byte gBerryDescriptionPart2_Oran - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PERSIM$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 47 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Persim - .4byte gBerryDescriptionPart2_Persim - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "LUM$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 34 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lum - .4byte gBerryDescriptionPart2_Lum - .byte 12 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "SITRUS$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Sitrus - .4byte gBerryDescriptionPart2_Sitrus - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "FIGY$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 100 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Figy - .4byte gBerryDescriptionPart2_Figy - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "WIKI$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 115 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Wiki - .4byte gBerryDescriptionPart2_Wiki - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "MAGO$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 126 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Mago - .4byte gBerryDescriptionPart2_Mago - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "AGUAV$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 64 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aguav - .4byte gBerryDescriptionPart2_Aguav - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "IAPAPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 223 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Iapapa - .4byte gBerryDescriptionPart2_Iapapa - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAZZ$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 120 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Razz - .4byte gBerryDescriptionPart2_Razz - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "BLUK$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 108 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Bluk - .4byte gBerryDescriptionPart2_Bluk - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "NANAB$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 77 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Nanab - .4byte gBerryDescriptionPart2_Nanab - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "WEPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 74 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Wepear - .4byte gBerryDescriptionPart2_Wepear - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PINAP$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 80 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Pinap - .4byte gBerryDescriptionPart2_Pinap - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "POMEG$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 135 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pomeg - .4byte gBerryDescriptionPart2_Pomeg - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "KELPSY$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 150 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Kelpsy - .4byte gBerryDescriptionPart2_Kelpsy - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "QUALOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 110 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Qualot - .4byte gBerryDescriptionPart2_Qualot - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "HONDEW$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 162 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Hondew - .4byte gBerryDescriptionPart2_Hondew - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "GREPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 149 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Grepa - .4byte gBerryDescriptionPart2_Grepa - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "TAMATO$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 200 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Tamato - .4byte gBerryDescriptionPart2_Tamato - .byte 6 @ stage duration (in hours) - .byte 20 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "CORNN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cornn - .4byte gBerryDescriptionPart2_Cornn - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 20 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "MAGOST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 140 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Magost - .4byte gBerryDescriptionPart2_Magost - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 20 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "RABUTA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 226 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rabuta - .4byte gBerryDescriptionPart2_Rabuta - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 20 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "NOMEL$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 285 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Nomel - .4byte gBerryDescriptionPart2_Nomel - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 20 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "SPELON$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 133 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Spelon - .4byte gBerryDescriptionPart2_Spelon - .byte 18 @ stage duration (in hours) - .byte 40 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "PAMTRE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 244 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Pamtre - .4byte gBerryDescriptionPart2_Pamtre - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "WATMEL$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 250 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Watmel - .4byte gBerryDescriptionPart2_Watmel - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "DURIN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 280 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Durin - .4byte gBerryDescriptionPart2_Durin - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 10 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "BELUE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 300 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Belue - .4byte gBerryDescriptionPart2_Belue - .byte 18 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "LIECHI$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 111 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Liechi - .4byte gBerryDescriptionPart2_Liechi - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "GANLON$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 33 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Ganlon - .4byte gBerryDescriptionPart2_Ganlon - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "SALAC$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Salac - .4byte gBerryDescriptionPart2_Salac - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "PETAYA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 237 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Petaya - .4byte gBerryDescriptionPart2_Petaya - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "APICOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Apicot - .4byte gBerryDescriptionPart2_Apicot - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "LANSAT$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 97 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lansat - .4byte gBerryDescriptionPart2_Lansat - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "STARF$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 153 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Starf - .4byte gBerryDescriptionPart2_Starf - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "ENIGMA$", 7 - .byte BERRY_FIRMNESS_UNKNOWN - .2byte 0 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Enigma - .4byte gBerryDescriptionPart2_Enigma - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 40 @ dry - .byte 40 @ sweet - .byte 40 @ bitter - .byte 40 @ sour - .byte 40 @ smoothness - .byte 0 @ padding diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index cc3ff2447..fa36390df 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -6,88 +6,6 @@ .section .rodata .align 2, 0 -gUnknown_084974B8:: @ 84974B8 - .4byte PlayerAvatarTransition_Normal - .4byte PlayerAvatarTransition_MachBike - .4byte PlayerAvatarTransition_AcroBike - .4byte PlayerAvatarTransition_Surfing - .4byte PlayerAvatarTransition_Underwater - .4byte PlayerAvatarTransition_ReturnToField - .4byte PlayerAvatarTransition_Dummy - .4byte PlayerAvatarTransition_Dummy - -gUnknown_084974D8:: @ 84974D8 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_084974E8:: @ 84974E8 - .byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0 - -gUnknown_084974F8:: @ 84974F8 - .byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0 - -gUnknown_08497508:: @ 8497508 - .byte 0xe6, 0xe7 - -gUnknown_0849750A:: @ 849750A - .byte 0xeb, 0xec - -gUnknown_0849750C:: @ 849750C - .byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10 - -gUnknown_08497520:: @ 8497520 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_08497530:: @ 8497530 - .4byte sub_808C3A4 - .4byte do_boulder_dust - .4byte sub_808C484 - -gUnknown_0849753C:: @ 849753C - .4byte sub_808C544 - -gUnknown_08497540:: @ 8497540 - .4byte sub_808C61C - .4byte sub_808C644 - .4byte sub_808C6BC - .4byte sub_808C6FC - -gUnknown_08497550:: @ 8497550 - .byte 3, 4, 2, 1 - -gUnknown_08497554:: @ 8497554 - .byte 16, 16, 17, 18, 19 - - .align 2 -gUnknown_0849755C:: @ 849755C - .4byte fish0 - .4byte fish1 - .4byte fish2 - .4byte fish3 - .4byte fish4 - .4byte fish5 - .4byte fish6 - .4byte fish7 - .4byte fish8 - .4byte fish9 - .4byte fishA_wait_for_a_pressed - .4byte fishB - .4byte fishC - .4byte fishD - .4byte fishE - .4byte fishF - -gUnknown_0849759C:: @ 849759C - .2byte 1, 1, 1 - -gUnknown_084975A2:: @ 84975A2 - .2byte 1, 3, 6 - gUnknown_084975A8:: @ 84975A8 .string "·$" -- cgit v1.2.3 From 9ad7dc9fd7c0fc6e3fe117ac6f393f8af4b9f53f Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Thu, 6 Sep 2018 12:02:37 +0100 Subject: Move remaining field_player_avatar data across --- data/field_player_avatar.s | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 data/field_player_avatar.s (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s deleted file mode 100644 index fa36390df..000000000 --- a/data/field_player_avatar.s +++ /dev/null @@ -1,21 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_084975A8:: @ 84975A8 - .string "·$" - -gUnknown_084975AA:: @ 84975AA - .2byte 36, 33, 30 - -gUnknown_084975B0:: @ 84975B0 - .2byte 0, 0 - .2byte 0x28, 10 - .2byte 0x46, 30 - -gUnknown_084975BC:: @ 84975BC - .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 -- cgit v1.2.3 From 6454740587f9a97105c45d54bf4284015a20d6d1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 9 Sep 2018 13:12:26 +0200 Subject: More battle factory --- data/battle_frontier_2.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index c03c9c368..ab2ecc058 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -236,7 +236,7 @@ gUnknown_08610894:: @ 8610894 spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy .align 2 -gUnknown_086108AC:: @ 86108AC +sSwap_MenuOptionFuncs:: @ 86108AC .4byte sub_819F114 .4byte sub_819F0CC .4byte sub_819F134 -- cgit v1.2.3 From 135e98a82493b2538c030af9b327cb104e27a3dd Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sun, 9 Sep 2018 16:06:35 +0100 Subject: Move battle factory data to C --- data/battle_frontier_2.s | 252 ----------------------------------------------- 1 file changed, 252 deletions(-) (limited to 'data') diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index ab2ecc058..f2e2dd650 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -6,258 +6,6 @@ .section .rodata - - .align 2 -gUnknown_08610428:: @ 8610428 - .4byte 0x00000180, 0x00003195, 0x000021bb - - .align 2 -gUnknown_08610434:: @ 8610434 - window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 - window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 - window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f - window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b - window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b - window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb - null_window_template - - .align 1 -gUnknown_0861046C:: @ 861046C - .incbin "graphics/unknown/unknown_61046C.gbapal" - -gUnknown_08610476:: @ 8610476 - .byte 0x00, 0x02, 0x00 - -gUnknown_08610479:: @ 8610479 - .byte 0x00, 0x04, 0x00 - - .align 2 -gUnknown_0861047C:: @ 861047C - .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 - - .align 2 -gUnknown_08610484:: @ 8610484 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 - - .align 2 -gUnknown_0861048C:: @ 861048C - .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08610494:: @ 8610494 - .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 - - .align 2 -gUnknown_0861049C:: @ 861049C - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_086104A4:: @ 86104A4 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_086104AC:: @ 86104AC - .2byte 0x0000, 0x001e, 0xffff, 0x0000 - - .align 2 -gUnknown_086104B4:: @ 86104B4 - .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 - .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 - .2byte 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gUnknown_086104FC:: @ 86104FC - .4byte gUnknown_0861049C - - .align 2 -gUnknown_08610500:: @ 8610500 - .4byte gUnknown_086104A4 - - .align 2 -gUnknown_08610504:: @ 8610504 - .4byte gUnknown_086104AC - .4byte gUnknown_086104B4 - - .align 2 -gUnknown_0861050C:: @ 861050C - .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0861056C:: @ 861056C - .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_086105BC:: @ 86105BC - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_086105CC:: @ 86105CC - .4byte gUnknown_0861050C - .4byte gUnknown_0861056C - .4byte gUnknown_086105BC - - .align 2 -gUnknown_086105D8:: @ 86105D8 - spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C - - .align 2 -gUnknown_086105F0:: @ 86105F0 - spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08610608:: @ 8610608 - spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08610620:: @ 8610620 - spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08610638:: @ 8610638 - spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy - - .align 2 -gUnknown_08610650:: @ 8610650 - obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 - obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 - obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 - obj_tiles gUnknown_0860F63C, 0x0080, 0x0068 - obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069 - obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a - obj_tiles gUnknown_0860F83C, 0x0100, 0x006b - obj_tiles gUnknown_0860F93C, 0x0100, 0x006c - obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d - null_obj_tiles - - .align 2 -gUnknown_086106A0:: @ 86106A0 - obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 - null_obj_tiles - - .align 2 -gUnknown_086106B0:: @ 86106B0 - obj_pal gUnknown_0860F13C, 0x0064 - obj_pal gUnknown_0860F15C, 0x0065 - obj_pal gUnknown_0860F17C, 0x0066 - obj_pal gUnknown_0861039C, 0x0067 - null_obj_pal - - .align 2 -gUnknown_086106D8:: @ 86106D8 - .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 - - .align 2 -gUnknown_086106E0:: @ 86106E0 - .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 - - .align 2 -gUnknown_086106E8:: @ 86106E8 - .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_086106F0:: @ 86106F0 - .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 - - .align 2 -gUnknown_086106F8:: @ 86106F8 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08610700:: @ 8610700 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gUnknown_08610708:: @ 8610708 - .2byte 0x0000, 0x001e, 0xffff, 0x0000 - - .align 2 -gUnknown_08610710:: @ 8610710 - .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 - .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 - .2byte 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gUnknown_08610758:: @ 8610758 - .4byte gUnknown_086106F8 - - .align 2 -gUnknown_0861075C:: @ 861075C - .4byte gUnknown_08610700 - - .align 2 -gUnknown_08610760:: @ 8610760 - .4byte gUnknown_08610708 - .4byte gUnknown_08610710 - - .align 2 -gUnknown_08610768:: @ 8610768 - .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_086107C8:: @ 86107C8 - .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 - .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08610818:: @ 8610818 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_08610828:: @ 8610828 - .4byte gUnknown_08610768 - .4byte gUnknown_086107C8 - .4byte gUnknown_08610818 - - .align 2 -gUnknown_08610834:: @ 8610834 - spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C - - .align 2 -gUnknown_0861084C:: @ 861084C - spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08610864:: @ 8610864 - spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0861087C:: @ 861087C - spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08610894:: @ 8610894 - spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy - - .align 2 -sSwap_MenuOptionFuncs:: @ 86108AC - .4byte sub_819F114 - .4byte sub_819F0CC - .4byte sub_819F134 - - .align 2 -gUnknown_086108B8:: @ 86108B8 - .4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb - - .align 2 -gUnknown_086108C8:: @ 86108C8 - window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 - window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 - window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f - window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b - window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1 - window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b - window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1 - window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9 - window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df - null_window_template - gUnknown_08610918:: @ 8610918 .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 -- cgit v1.2.3 From b87856b58eacd3ea7375f001427d53f096b02b68 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 10 Sep 2018 01:01:39 +0200 Subject: Battle Factory is decompiled and documented. --- data/battle_frontier_2.s | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'data') diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index f2e2dd650..dc38826a7 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -6,29 +6,6 @@ .section .rodata -gUnknown_08610918:: @ 8610918 - .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 - -gUnknown_08610922:: @ 8610922 - .byte 0x00, 0x02, 0x00 - -gUnknown_08610925:: @ 8610925 - .byte 0x00, 0x04, 0x00 - - .align 2 -gUnknown_08610928:: @ 8610928 - .4byte 0x00000001, sub_819F20C - .4byte 0x00000001, sub_819F20C - .4byte 0x00000001, sub_819F20C - .4byte 0x00000003, sub_819F1AC - - .align 2 -gUnknown_08610948:: @ 8610948 - .4byte 0x00000001, sub_819F20C - .4byte 0x00000001, sub_819F20C - .4byte 0x00000001, sub_819F20C - .4byte 0x00000002, sub_819F1DC - .4byte 0x00000003, sub_819F1AC .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data gUnknown_08610970:: @ 8610970 -- cgit v1.2.3 From 10b479a3cae98a1fa955a4fc5461bace1f630352 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 10 Sep 2018 21:19:19 +0200 Subject: Document battle animation scripts. --- data/battle_anim_scripts.s | 2317 ++++++++++++++++++++++---------------------- data/battle_scripts_1.s | 2 +- data/battle_scripts_2.s | 2 +- 3 files changed, 1142 insertions(+), 1179 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 624a5c69f..2d29d26f0 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,13 +1,16 @@ #include "constants/battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" +#include "constants/moves.h" + .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" + .include "constants/constants.inc" .section script_data, "aw", %progbits .align 2 -gUnknown_082C8D64:: @ 82C8D64 - .2byte 0x2F, 0xC3, 0x140, 0xFFFF +gMovesWithQuietBGM:: @ 82C8D64 + .2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF .align 2 gBattleAnims_Moves:: @ 82C8D6C @@ -386,7 +389,7 @@ gBattleAnims_VariousTable:: @ 82C9320 .4byte Anim_StatChange .4byte Anim_SubsituteOff .4byte Anim_SubsituteOn - .4byte Anim_Table_4 + .4byte Anim_PokeblockThrow .4byte Anim_ItemKnockOff .4byte Status_Wrap .4byte Anim_ItemEffect @@ -402,7 +405,7 @@ gBattleAnims_VariousTable:: @ 82C9320 .4byte Anim_SnatchMove .4byte Anim_FutureSightHit .4byte Anim_DoomDesireHit - .4byte Anim_Table_x14 + .4byte Anim_FocusPunchSetUp .4byte Status_Ingrain .4byte Anim_WishHeal @@ -434,9 +437,8 @@ Move_DOUBLE_SLAP: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - choosetwoturnanim AnimScript_82C93F4, AnimScript_82C9408 - -AnimScript_82C93DA: + choosetwoturnanim Anim_DoubleSlapLeft, Anim_DoubleSlapRight +Anim_DoubleSlapContinue: createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 playsewithpan SE_W003, +63 waitforvisualfinish @@ -444,13 +446,13 @@ AnimScript_82C93DA: blendoff end -AnimScript_82C93F4: +Anim_DoubleSlapLeft: createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - goto AnimScript_82C93DA + goto Anim_DoubleSlapContinue -AnimScript_82C9408: +Anim_DoubleSlapRight: createsprite gUnknown_08597358, 0x2, 8, 0, 1, 2 - goto AnimScript_82C93DA + goto Anim_DoubleSlapContinue Move_POISON_POWDER: loadspritegfx 0x2751 @@ -624,18 +626,18 @@ Move_SUPERSONIC: monbgprio_2A ANIM_ATTACKER setalpha 0x80C createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF - call AnimScript_82C99FF + call Anim_Supersonic1 + call Anim_Supersonic1 + call Anim_Supersonic1 + call Anim_Supersonic1 + call Anim_Supersonic1 + call Anim_Supersonic1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82C99FF: +Anim_Supersonic1: playsewithpan SE_W048, -64 createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 @@ -644,14 +646,14 @@ AnimScript_82C99FF: Move_SCREECH: loadspritegfx 0x27B4 createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 2, 1 - call AnimScript_82C9A4C - call AnimScript_82C9A4C + call Anim_Screech1 + call Anim_Screech1 delay 0x10 createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 2, 1 waitforvisualfinish end -AnimScript_82C9A4C: +Anim_Screech1: playsewithpan SE_W103, -64 createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 @@ -687,14 +689,14 @@ Move_FLAME_WHEEL: createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1 playsewithpan SE_W172B, +63 - call AnimScript_82D2D18 + call Anim_FireMoveEffect delay 0x7 createsprite gUnknown_0857FE58, 0x2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82C9B50: +Anim_FlameWheel1: @ Unused createsprite gUnknown_08595584, 0x3, 0, 0, 50 delay 0x4 return @@ -827,7 +829,7 @@ Move_POISON_STING: createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 playsewithpan SE_W030, +63 waitforvisualfinish - call AnimScript_82D7A71 + call Anim_PoisonEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -856,37 +858,37 @@ Move_TWINEEDLE: Move_FIRE_BLAST: loadspritegfx 0x272D createsoundtask sub_8158B30, 144, 145 - call AnimScript_82C9FE9 - call AnimScript_82C9FE9 - call AnimScript_82C9FE9 + call Anim_FireBlast1 + call Anim_FireBlast1 + call Anim_FireBlast1 delay 0x18 - createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, 0 + createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish delay 0x13 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 20, 1 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 delay 0x3 - call AnimScript_82CA02D + call Anim_FireBlast2 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, RGB_BLACK waitforvisualfinish end -AnimScript_82C9FE9: +Anim_FireBlast1: createsprite gUnknown_0859551C, 0x82, 0, 0, 0 createsprite gUnknown_0859551C, 0x82, 0, 0, 51 createsprite gUnknown_0859551C, 0x82, 0, 0, 102 @@ -895,7 +897,7 @@ AnimScript_82C9FE9: delay 0x5 return -AnimScript_82CA02D: +Anim_FireBlast2: createsprite gUnknown_0859556C, 0x82, 0, 0, 10, 0, -2 createsprite gUnknown_0859556C, 0x82, 0, 0, 13, -2, 0 createsprite gUnknown_0859556C, 0x82, 0, 0, 13, 2, 0 @@ -928,12 +930,12 @@ Move_EMBER: createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1 delay 0x10 playsewithpan SE_W172, +63 - call AnimScript_82CA135 - call AnimScript_82CA135 - call AnimScript_82CA135 + call Anim_Ember1 + call Anim_Ember1 + call Anim_Ember1 end -AnimScript_82CA135: +Anim_Ember1: createsprite gUnknown_085954EC, 0x82, -24, 24, 24, 24, 20, 1, 1 delay 0x4 return @@ -947,12 +949,12 @@ Move_MEGA_PUNCH: setalpha 0x80C playsewithpan SE_W025, +63 createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE delay 0x32 - call AnimScript_82CA1E9 + call Anim_SetImpactBackground createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish @@ -963,28 +965,28 @@ Move_MEGA_PUNCH: waitbgfadein end -AnimScript_82CA1E9: +Anim_SetImpactBackground: delay 0x2 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CA220 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82CA212 - jumpargeq 0x7, 0x1, AnimScript_82CA219 + createvisualtask AnimTask_IsContest, 0x2 + jumprettrue Anim_SetImpactContestsBG + createvisualtask AnimTask_IsTargetPlayerSide, 0x2 + jumpretfalse Anim_SetImpactOpponentBG + jumprettrue Anim_SetImpactPlayerBG -AnimScript_82CA211: +Anim_SetImpactBackgroundRet: return -AnimScript_82CA212: +Anim_SetImpactOpponentBG: changebg BG_IMPACT_OPPONENT - goto AnimScript_82CA211 + goto Anim_SetImpactBackgroundRet -AnimScript_82CA219: +Anim_SetImpactPlayerBG: changebg BG_IMPACT_PLAYER - goto AnimScript_82CA211 + goto Anim_SetImpactBackgroundRet -AnimScript_82CA220: +Anim_SetImpactContestsBG: changebg BG_IMPACT_CONTESTS - goto AnimScript_82CA211 + goto Anim_SetImpactBackgroundRet Move_MEGA_KICK: loadspritegfx 0x2797 @@ -995,13 +997,13 @@ Move_MEGA_KICK: setalpha 0x80C playsewithpan SE_W025, +63 createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE delay 0x32 playsewithpan SE_W025B, +63 - call AnimScript_82CA1E9 + call Anim_SetImpactBackground createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET @@ -1016,9 +1018,8 @@ Move_COMET_PUNCH: loadspritegfx 0x279F monbg ANIM_TARGET setalpha 0x80C - choosetwoturnanim AnimScript_82CA2F1, AnimScript_82CA316 - -AnimScript_82CA2D7: + choosetwoturnanim Anim_CometPunchLeft, Anim_CometPunchRight +Anim_CometPunchContinue: createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 playsewithpan SE_W004, +63 waitforvisualfinish @@ -1026,15 +1027,15 @@ AnimScript_82CA2D7: blendoff end -AnimScript_82CA2F1: +Anim_CometPunchLeft: createsprite gUnknown_08597358, 0x2, -8, -8, 1, 2 createsprite gUnknown_08595E98, 0x3, -8, 0, 8, 1, 0 - goto AnimScript_82CA2D7 + goto Anim_CometPunchContinue -AnimScript_82CA316: +Anim_CometPunchRight: createsprite gUnknown_08597358, 0x2, 8, -8, 1, 2 createsprite gUnknown_08595E98, 0x3, 8, 0, 8, 1, 0 - goto AnimScript_82CA2D7 + goto Anim_CometPunchContinue Move_SONIC_BOOM: loadspritegfx 0x2713 @@ -1042,23 +1043,23 @@ Move_SONIC_BOOM: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 0x80C - call AnimScript_82CA372 - call AnimScript_82CA372 - call AnimScript_82CA372 + call Anim_SonicBoom1 + call Anim_SonicBoom1 + call Anim_SonicBoom1 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 10, 1 - call AnimScript_82CA38A + call Anim_SonicBoom2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82CA372: +Anim_SonicBoom1: playsewithpan SE_W013B, -64 createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15 delay 0x4 return -AnimScript_82CA38A: +Anim_SonicBoom2: createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 delay 0x4 return @@ -1066,21 +1067,21 @@ AnimScript_82CA38A: Move_THUNDER_SHOCK: loadspritegfx 0x2711 loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 0, -44, 0 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 + createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0 + createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 0x14 - call AnimScript_82D7BEA + call Anim_ParalysisEffect waitforvisualfinish delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end @@ -1088,7 +1089,7 @@ Move_THUNDERBOLT: loadspritegfx 0x2711 loadspritegfx 0x282A loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 24, -52, 0 @@ -1100,9 +1101,9 @@ Move_THUNDERBOLT: createvisualtask sub_810A7DC, 0x5, 0, -60, 1 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, 0 + createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, 0 + createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 0x14 createsprite gUnknown_085957E0, 0x83, 44, 0, 0, 3 @@ -1116,20 +1117,20 @@ Move_THUNDERBOLT: createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, +63 delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 0x14 waitplaysewithpan SE_W085B, +63, 0x13 - call AnimScript_82D7BEA + call Anim_ParalysisEffect waitforvisualfinish delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end @@ -1137,7 +1138,7 @@ Move_THUNDER_WAVE: loadspritegfx 0x2711 loadspritegfx 0x271B loadspritegfx 0x27BD - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 0xA createvisualtask sub_810A7DC, 0x5, 0, -48, 0 @@ -1150,7 +1151,7 @@ Move_THUNDER_WAVE: delay 0x4 createsprite gUnknown_08595840, 0x82, -16, 16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end @@ -1159,15 +1160,14 @@ Move_BEAT_UP: loadspritegfx 0x279F monbg ANIM_TARGET setalpha 0x80C - choosetwoturnanim AnimScript_82CA648, AnimScript_82CA6B9 - -AnimScript_82CA643: + choosetwoturnanim Anim_BeatUpLeft, Anim_BeatUpRight +Anim_BeatUpContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -AnimScript_82CA648: +Anim_BeatUpLeft: createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2 createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 @@ -1177,9 +1177,9 @@ AnimScript_82CA648: createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto AnimScript_82CA643 + goto Anim_BeatUpContinue -AnimScript_82CA6B9: +Anim_BeatUpRight: createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2 createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 @@ -1189,7 +1189,7 @@ AnimScript_82CA6B9: createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto AnimScript_82CA643 + goto Anim_BeatUpContinue Move_STOMP: loadspritegfx 0x279F @@ -1265,7 +1265,7 @@ Move_REVERSAL: createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0 waitforvisualfinish delay 0x1E - createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, 0x7FFF + createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, RGB_WHITE delay 0xA playsewithpan SE_W179, -64 createsprite gUnknown_085CE5D8, 0x2, 26, 0 @@ -1292,9 +1292,8 @@ Move_PURSUIT: waitbgfadein delay 0x0 setalpha 0x80C - choosetwoturnanim AnimScript_82CA99F, AnimScript_82CA9C8 - -AnimScript_82CA996: + choosetwoturnanim Anim_PursuitNormal, Anim_PursuitOnSwitchout +Anim_PursuitContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1303,17 +1302,17 @@ AnimScript_82CA996: waitbgfadein end -AnimScript_82CA99F: +Anim_PursuitNormal: playsewithpan SE_W004, +63 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto AnimScript_82CA996 + goto Anim_PursuitContinue -AnimScript_82CA9C8: +Anim_PursuitOnSwitchout: playsewithpan SE_W004, +63 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto AnimScript_82CA996 + goto Anim_PursuitContinue Move_SPIKE_CANNON: loadspritegfx 0x27B1 @@ -1347,7 +1346,7 @@ Move_SWORDS_DANCE: createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4 createsprite gUnknown_08593380, 0x2, 0, 0 delay 0x16 - createvisualtask sub_8115D94, 0x2, 10005, 2, 2, 32754, 16, 0, 0 + createvisualtask sub_8115D94, 0x2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff @@ -1366,7 +1365,7 @@ Move_PSYCH_UP: delay 0x4 playsewithpan SE_W060, -64 createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, 1023 + createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, RGB_YELLOW delay 0x1E clearmonbg ANIM_ATK_PARTNER blendoff @@ -1379,7 +1378,7 @@ Move_DIZZY_PUNCH: loadspritegfx 0x2797 monbg ANIM_TARGET setalpha 0x80C - call AnimScript_82CAC77 + call Anim_DizzyPunch1 createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0 createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1 playsewithpan SE_W004, +63 @@ -1390,7 +1389,7 @@ Move_DIZZY_PUNCH: createsprite gUnknown_08595F78, 0x83, 16, 8, -128, -22 createsprite gUnknown_08595F78, 0x83, 16, 8, -384, -31 delay 0xA - call AnimScript_82CAC77 + call Anim_DizzyPunch1 createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0 createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1 playsewithpan SE_W233B, +63 @@ -1405,7 +1404,7 @@ Move_DIZZY_PUNCH: blendoff end -AnimScript_82CAC77: +Anim_DizzyPunch1: createsprite gUnknown_0857FE28, 0x2, 6, 4 delay 0x6 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 @@ -1415,13 +1414,13 @@ Move_FIRE_SPIN: loadspritegfx 0x272D playsewithpan SE_W221B, +63 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1 - call AnimScript_82CACBF - call AnimScript_82CACBF - call AnimScript_82CACBF + call Anim_FireSpinEffect + call Anim_FireSpinEffect + call Anim_FireSpinEffect waitforvisualfinish end -AnimScript_82CACBF: +Anim_FireSpinEffect: createsprite gUnknown_08596B88, 0x82, 0, 28, 528, 30, 13, 50, 1 delay 0x2 createsprite gUnknown_08596B88, 0x82, 0, 32, 480, 20, 16, -46, 1 @@ -1441,18 +1440,16 @@ Move_FURY_CUTTER: monbg ANIM_TARGET setalpha 0x80C playsewithpan SE_W013, +63 - createvisualtask sub_8107144, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82CADA7 - goto AnimScript_82CADB9 - -AnimScript_82CAD6A: - createvisualtask sub_8107168, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CAD8E - jumpargeq 0x7, 0x2, AnimScript_82CADCB - jumpargeq 0x7, 0x3, AnimScript_82CADE5 - goto AnimScript_82CADFF - -AnimScript_82CAD8E: + createvisualtask AnimTask_IsFuryCutterHitRight, 0x2 + jumpretfalse Anim_FuryCutterLeft + goto Anim_FuryCutterRight +Anim_FuryCutterContinue: + createvisualtask AnimTask_GetFuryCutterHitCount, 0x2 + jumpreteq 0x1, Anim_FuryCutterContinue2 + jumpreteq 0x2, Anim_FuryCutterMedium + jumpreteq 0x3, Anim_FuryCutterStrong + goto Anim_FuryCutterStrongest +Anim_FuryCutterContinue2: delay 0x5 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 waitforvisualfinish @@ -1461,41 +1458,41 @@ AnimScript_82CAD8E: waitforvisualfinish end -AnimScript_82CADA7: +Anim_FuryCutterLeft: createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - goto AnimScript_82CAD6A + goto Anim_FuryCutterContinue -AnimScript_82CADB9: +Anim_FuryCutterRight: createsprite gUnknown_08592A1C, 0x2, 40, -32, 1 - goto AnimScript_82CAD6A + goto Anim_FuryCutterContinue -AnimScript_82CADCB: +Anim_FuryCutterMedium: createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 10505, 4, 0, 0 - goto AnimScript_82CAD8E + goto Anim_FuryCutterContinue2 -AnimScript_82CADE5: +Anim_FuryCutterStrong: createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto AnimScript_82CAD8E + goto Anim_FuryCutterContinue2 -AnimScript_82CADFF: +Anim_FuryCutterStrongest: createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto AnimScript_82CAD8E + goto Anim_FuryCutterContinue2 Move_SELF_DESTRUCT: loadspritegfx 0x27D6 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 31 + createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_RED createvisualtask sub_80D52D0, 0x5, 4, 6, 0, 38, 1 createvisualtask sub_80D52D0, 0x5, 5, 6, 0, 38, 1 createvisualtask sub_80D52D0, 0x5, 6, 6, 0, 38, 1 createvisualtask sub_80D52D0, 0x5, 7, 6, 0, 38, 1 createvisualtask sub_80D52D0, 0x5, 8, 6, 0, 38, 1 - call AnimScript_82CAE9F - call AnimScript_82CAE9F + call Anim_SelfDestruct1 + call Anim_SelfDestruct1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, 31 + createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, RGB_RED end -AnimScript_82CAE9F: +Anim_SelfDestruct1: playsewithpan SE_W120, -64 createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 delay 0x6 @@ -1602,13 +1599,13 @@ Move_WATERFALL: delay 0xA createsprite gUnknown_0857FE28, 0x2, 6, 5 delay 0x6 - call AnimScript_82CB102 + call Anim_UnderWaterAttack1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82CB102: +Anim_UnderWaterAttack1: playsewithpan SE_W127, +63 createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1 createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1 @@ -1656,15 +1653,15 @@ Move_EXPLOSION: createvisualtask sub_80D52D0, 0x5, 6, 8, 0, 40, 1 createvisualtask sub_80D52D0, 0x5, 7, 8, 0, 40, 1 createvisualtask sub_80D52D0, 0x5, 8, 8, 0, 40, 1 - call AnimScript_82CB312 - call AnimScript_82CB312 + call Anim_Explosion1 + call Anim_Explosion1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, 0x7FFF + createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, RGB_WHITE delay 0x32 - createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, RGB_WHITE end -AnimScript_82CB312: +Anim_Explosion1: playsewithpan SE_W153, -64 createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 delay 0x6 @@ -1708,14 +1705,14 @@ Move_DETECT: loadspritegfx 0x2757 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_WHITE delay 0x12 playsewithpan SE_W197, -64 createsprite gUnknown_0853EE84, 0xD, 20, -20 waitforvisualfinish delay 0xA createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK - createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end @@ -1724,19 +1721,18 @@ Move_FRUSTRATION: loadspritegfx 0x2767 monbg ANIM_DEF_PARTNER setalpha 0x80C - createvisualtask sub_80A8140, 0x1 - jumpargeq 0x7, 0x0, AnimScript_82CB464 - jumpargeq 0x7, 0x1, AnimScript_82CB56A - jumpargeq 0x7, 0x2, AnimScript_82CB637 - goto AnimScript_82CB6B3 - -AnimScript_82CB45F: + createvisualtask AnimTask_GetHappinessPowerLevel, 0x1 + jumpreteq 0x0, Anim_Frustration_Strongest + jumpreteq 0x1, Anim_Frustration_Strong + jumpreteq 0x2, Anim_Frustration_Medium + goto Anim_Frustration_Weak +Anim_Frustration_Continue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82CB464: +Anim_Frustration_Strongest: playsewithpan SE_W082, -64 createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 @@ -1771,9 +1767,9 @@ AnimScript_82CB464: playsewithpan SE_W004, +63 waitforvisualfinish createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto AnimScript_82CB45F + goto Anim_Frustration_Continue -AnimScript_82CB56A: +Anim_Frustration_Strong: playsewithpan SE_W082, -64 createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 @@ -1798,9 +1794,9 @@ AnimScript_82CB56A: createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 waitforvisualfinish createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto AnimScript_82CB45F + goto Anim_Frustration_Continue -AnimScript_82CB637: +Anim_Frustration_Medium: playsewithpan SE_W207B, -64 createsprite gUnknown_0859368C, 0x2, 0, 20, -28 waitforvisualfinish @@ -1816,9 +1812,9 @@ AnimScript_82CB637: playsewithpan SE_W004, +63 createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - goto AnimScript_82CB45F + goto Anim_Frustration_Continue -AnimScript_82CB6B3: +Anim_Frustration_Weak: createsprite gUnknown_085CE4D0, 0x2, 20, -28 waitforvisualfinish delay 0xA @@ -1827,7 +1823,7 @@ AnimScript_82CB6B3: playsewithpan SE_W004, +63 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - goto AnimScript_82CB45F + goto Anim_Frustration_Continue Move_SAFEGUARD: loadspritegfx 0x2804 @@ -1841,7 +1837,7 @@ Move_SAFEGUARD: createsprite gUnknown_08593C64, 0x2 waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, 0x7FFF + createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -1897,7 +1893,7 @@ Move_GUILLOTINE: playsewithpan SE_W011, +63 createsprite gUnknown_085935D0, 0x2, 0 createsprite gUnknown_085935D0, 0x2, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0 + createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_BLACK delay 0x9 createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 23, 1 delay 0x2E @@ -1933,7 +1929,7 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx 0x272D loopsewithpan SE_W082, -64, 0x8, 0x3 - createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, 430 + createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4 delay 0x0 createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 @@ -1954,12 +1950,12 @@ Move_OUTRAGE: createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 delay 0x0 createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - call AnimScript_82CBA0F - call AnimScript_82CBA0F + call Anim_Outrage1 + call Anim_Outrage1 waitforvisualfinish end -AnimScript_82CBA0F: +Anim_Outrage1: delay 0x3 createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 delay 0x0 @@ -1980,25 +1976,25 @@ Move_SPARK: loadspritegfx 0x2797 loadspritegfx 0x271B delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0 delay 0x0 createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0 createsprite gUnknown_0859574C, 0x0, 156, 24, 121, 13, 0, 1, 1 delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 0xA - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 createsprite gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0 createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1 delay 0x0 createsprite gUnknown_0859574C, 0x0, 238, 24, 165, 10, 0, 1, 1 delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 0x14 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, -64 createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0 @@ -2010,15 +2006,15 @@ Move_SPARK: createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 224, 20, 2, 0 delay 0x4 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, 23551 + createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) createsprite gUnknown_0857FE28, 0x2, 4, 4 delay 0x4 playsewithpan SE_W063, +63 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, 23551 - call AnimScript_82D7BEA + createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, RGB(31, 31, 22) + call Anim_ParalysisEffect waitforvisualfinish end @@ -2048,18 +2044,18 @@ Move_ATTRACT: createsprite gUnknown_085939D0, 0x28, 112, 256, 90 createsprite gUnknown_085939D0, 0x28, 200, 272, 90 delay 0x4B - createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, 28479 + createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end Move_GROWTH: - call AnimScript_82CBDC0 + call Anim_Growth1 waitforvisualfinish - call AnimScript_82CBDC0 + call Anim_Growth1 waitforvisualfinish end -AnimScript_82CBDC0: - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF +Anim_Growth1: + createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, -64 createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0 return @@ -2169,13 +2165,13 @@ Move_ROCK_SLIDE: createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1 createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1 delay 0x2 - call AnimScript_82CC083 - call AnimScript_82CC083 + call Anim_RockSlide1 + call Anim_RockSlide1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82CC083: +Anim_RockSlide1: createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 playsewithpan SE_W088, +63 delay 0x2 @@ -2229,18 +2225,18 @@ Move_BUBBLE_BEAM: monbgprio_28 ANIM_TARGET setalpha 0x80C delay 0x1 - call AnimScript_82CC1AD + call Anim_Bulbblebeam1 createvisualtask sub_80D5EB8, 0x5, 0, 3, 3072, 8, 1 - call AnimScript_82CC1AD - call AnimScript_82CC1AD + call Anim_Bulbblebeam1 + call Anim_Bulbblebeam1 waitforvisualfinish - call AnimScript_82D7AE2 + call Anim_BulbblebeamEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -AnimScript_82CC1AD: +Anim_Bulbblebeam1: createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, -64 delay 0x3 @@ -2265,28 +2261,28 @@ Move_ICY_WIND: loadspritegfx 0x279D loadspritegfx 0x279E monbg ANIM_DEF_PARTNER - createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, 0 + createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish panse_1B SE_W016, -64, +63, +2, 0x0 - call AnimScript_82CC2A8 + call Anim_IcyWind1 delay 0x5 - call AnimScript_82CC2A8 + call Anim_IcyWind1 playsewithpan SE_W016B, +63 delay 0x37 - call AnimScript_82D78F8 + call Anim_IcyWindEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadeout - createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, 0 + createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, RGB_BLACK waitbgfadein end -AnimScript_82CC2A8: +Anim_IcyWind1: createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 delay 0x5 createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 @@ -2479,36 +2475,34 @@ Move_FURY_ATTACK: loadspritegfx 0x2797 loadspritegfx 0x2724 createvisualtask sub_80D6134, 0x2, 4, 256, 0, 2 - choosetwoturnanim AnimScript_82CC7B8, AnimScript_82CC7DE - -AnimScript_82CC7A5: + choosetwoturnanim Anim_FuryAttackRight, Anim_FuryAttackLeft +Anim_FuryAttackContinue: createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 waitforvisualfinish end -AnimScript_82CC7B8: +Anim_FuryAttackRight: createsprite gUnknown_08592F44, 0x84, 8, 8, 10 waitforvisualfinish createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto AnimScript_82CC7A5 + goto Anim_FuryAttackContinue -AnimScript_82CC7DE: +Anim_FuryAttackLeft: createsprite gUnknown_08592F44, 0x84, -8, -8, 10 waitforvisualfinish createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto AnimScript_82CC7A5 + goto Anim_FuryAttackContinue Move_HORN_DRILL: loadspritegfx 0x2797 loadspritegfx 0x2724 - jumpifcontest AnimScript_82CC96A + jumpifcontest Anim_HornDrillInContest fadetobg BG_DRILL waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82CC821: +Anim_HornDrillContinue: waitbgfadein setalpha 0x80C createsprite gUnknown_08592CD8, 0x2, 0 @@ -2562,11 +2556,11 @@ AnimScript_82CC821: waitbgfadein end -AnimScript_82CC96A: +Anim_HornDrillInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82CC821 + goto Anim_HornDrillContinue Move_THRASH: loadspritegfx 0x2797 @@ -2651,15 +2645,15 @@ Move_FISSURE: createvisualtask sub_81152DC, 0x3, 1, 10, 50 playsewithpan SE_W089, +63 delay 0x8 - call AnimScript_82CCBFF + call Anim_Fissure1 delay 0xF createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 delay 0xF - call AnimScript_82CCC50 + call Anim_Fissure2 delay 0xF createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 delay 0xF - call AnimScript_82CCBFF + call Anim_Fissure1 delay 0x32 fadetobg BG_FISSURE waitbgfadeout @@ -2672,7 +2666,7 @@ Move_FISSURE: waitbgfadein end -AnimScript_82CCBFF: +Anim_Fissure1: createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -48, -16, 24 createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24 @@ -2680,7 +2674,7 @@ AnimScript_82CCBFF: playsewithpan SE_W091, +63 return -AnimScript_82CCC50: +Anim_Fissure2: createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -24, -16, 24 createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24 createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24 @@ -2689,12 +2683,11 @@ AnimScript_82CCC50: return Move_DIG: - choosetwoturnanim AnimScript_82CCCAB, AnimScript_82CCD06 - -AnimScript_82CCCAA: + choosetwoturnanim Anim_DigSetUp, Anim_DigUnleash +Anim_DigEnd: end -AnimScript_82CCCAB: +Anim_DigSetUp: loadspritegfx 0x275A loadspritegfx 0x2829 createsprite gUnknown_08597214, 0x1, 0, 0, 180 @@ -2703,18 +2696,18 @@ AnimScript_82CCCAB: delay 0x1 createvisualtask sub_8114CBC, 0x2, 0 delay 0x6 - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A - call AnimScript_82CCD6A + call Anim_DigSetUp1 + call Anim_DigSetUp1 + call Anim_DigSetUp1 + call Anim_DigSetUp1 + call Anim_DigSetUp1 waitforvisualfinish clearmonbg_23 ANIM_ATTACKER delay 0x1 createvisualtask sub_8114CBC, 0x2, 1 - goto AnimScript_82CCCAA + goto Anim_DigEnd -AnimScript_82CCD06: +Anim_DigUnleash: loadspritegfx 0x2797 loadspritegfx 0x2829 createvisualtask sub_8114F14, 0x2, 0 @@ -2729,9 +2722,9 @@ AnimScript_82CCD06: createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 playsewithpan SE_W025B, -64 clearmonbg ANIM_ATTACKER - goto AnimScript_82CCCAA + goto Anim_DigEnd -AnimScript_82CCD6A: +Anim_DigSetUp1: createsprite gUnknown_085971FC, 0x2, 0, 0, 12, 4, -16, 18 createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18 createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18 @@ -2741,13 +2734,13 @@ AnimScript_82CCD6A: return Move_MEDITATE: - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createvisualtask sub_810F7D4, 0x2 playsewithpan SE_W029, -64 delay 0x10 playsewithpan SE_W036, -64 waitforvisualfinish - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_AGILITY: @@ -2810,11 +2803,11 @@ Move_RAGE: end Move_TELEPORT: - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createvisualtask sub_810F83C, 0x2 playsewithpan SE_W100, -64 delay 0xF - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground waitforvisualfinish end @@ -2866,18 +2859,17 @@ Move_METRONOME: end Move_SKULL_BASH: - choosetwoturnanim AnimScript_82CCF99, AnimScript_82CCFE6 - -AnimScript_82CCF98: + choosetwoturnanim Anim_SkullBashSetUp, Anim_SkullBashAttack +Anim_SkullBashEnd: end -AnimScript_82CCF99: - call AnimScript_82CCFA9 - call AnimScript_82CCFA9 +Anim_SkullBashSetUp: + call Anim_SkullBashSetUp1 + call Anim_SkullBashSetUp1 waitforvisualfinish - goto AnimScript_82CCF98 + goto Anim_SkullBashEnd -AnimScript_82CCFA9: +Anim_SkullBashSetUp1: createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, -64 waitforvisualfinish @@ -2887,7 +2879,7 @@ AnimScript_82CCFA9: waitforvisualfinish return -AnimScript_82CCFE6: +Anim_SkullBashAttack: loadspritegfx 0x2797 createvisualtask sub_8101C94, 0x2, 0 playsewithpan SE_W036, -64 @@ -2900,25 +2892,25 @@ AnimScript_82CCFE6: loopsewithpan SE_W025B, +63, 0x8, 0x3 waitforvisualfinish createvisualtask sub_8101C94, 0x2, 1 - goto AnimScript_82CCF98 + goto Anim_SkullBashEnd Move_AMNESIA: loadspritegfx 0x276D - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground delay 0x8 createsprite gUnknown_08596744, 0x14 playsewithpan SE_W118, -64 delay 0x36 loopsewithpan SE_W118, -64, 0x10, 0x3 waitforvisualfinish - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_KINESIS: loadspritegfx 0x275B loadspritegfx 0x2771 playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createsprite gUnknown_085966DC, 0x14 createsprite gUnknown_08593344, 0x13, 32, -8, 0 createsprite gUnknown_08593344, 0x13, 32, 16, 1 @@ -2930,7 +2922,7 @@ Move_KINESIS: delay 0x46 playsewithpan SE_W207B, -64 waitforvisualfinish - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_GLARE: @@ -2939,7 +2931,7 @@ Move_GLARE: createvisualtask sub_815E114, 0x5, 0 playsewithpan SE_W060B, -64 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, 0 + createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gUnknown_08593A84, 0x0, -16, -8 createsprite gUnknown_08593A84, 0x0, 16, -8 @@ -2948,7 +2940,7 @@ Move_GLARE: delay 0x2 createvisualtask sub_810A094, 0x3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, 0 + createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE: @@ -2963,59 +2955,58 @@ Move_BARRAGE: end Move_SKY_ATTACK: - choosetwoturnanim AnimScript_82CD185, AnimScript_82CD28E - -AnimScript_82CD184: + choosetwoturnanim Anim_SkyAttackSetUp, Anim_SkyAttackUnleash +Anim_SkyAttackEnd: end -AnimScript_82CD185: +Anim_SkyAttackSetUp: monbg ANIM_DEF_PARTNER setalpha 0xB0C - createvisualtask sub_81177AC, 0x5, 7 - jumpargeq 0x7, 0x0, AnimScript_82CD1A0 - goto AnimScript_82CD217 + createvisualtask AnimTask_IsTargetPartner, 0x5, ARG_RET_ID + jumpretfalse Anim_SkyAttackSetUpAgainstOpponent + goto Anim_SkyAttackSetUpAgainstPartner -AnimScript_82CD1A0: - createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, 0 +Anim_SkyAttackSetUpAgainstOpponent: + createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, RGB_BLACK waitforvisualfinish delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 + createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_81152DC, 0x5, 0, 2, 16 loopsewithpan SE_W287, -64, 0x4, 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, 0 + createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82CD184 + goto Anim_SkyAttackEnd -AnimScript_82CD217: +Anim_SkyAttackSetUpAgainstPartner: createvisualtask sub_8116664, 0xA, 1, 1, 0, 12, 0 waitforvisualfinish delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, 0 + createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_81152DC, 0x5, 0, 2, 16 playsewithpan SE_W287, -64 delay 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_8116664, 0xA, 4, 1, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82CD184 + goto Anim_SkyAttackEnd -AnimScript_82CD28E: +Anim_SkyAttackUnleash: loadspritegfx 0x2797 loadspritegfx 0x282C - call AnimScript_82D7CE5 + call Anim_SetFlyingBg monbg ANIM_ATTACKER - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE delay 0x4 createvisualtask sub_81136E8, 0x5, 0 waitforvisualfinish @@ -3027,11 +3018,11 @@ AnimScript_82CD28E: delay 0x14 createvisualtask sub_81137E4, 0x5, 1 delay 0x2 - createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER - call AnimScript_82D7D15 - goto AnimScript_82CD184 + call Anim_UnsetFlyingBg + goto Anim_SkyAttackEnd Move_FLASH: playsewithpan SE_W043, -64 @@ -3126,7 +3117,7 @@ Move_SKETCH: Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein - jumpifcontest AnimScript_82CD4CF + jumpifcontest Anim_NightmareInContest monbg ANIM_DEF_PARTNER createvisualtask sub_8111C50, 0x2 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1 @@ -3137,7 +3128,7 @@ Move_NIGHTMARE: waitbgfadein end -AnimScript_82CD4CF: +Anim_NightmareInContest: createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1 createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 playsewithpan SE_W171, +63 @@ -3166,7 +3157,7 @@ Move_SPITE: playsewithpan SE_W060, -64 waitbgfadein monbg ANIM_DEF_PARTNER - createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_8111E50, 0x2 loopsewithpan SE_W060, +63, 0x14, 0x3 waitforvisualfinish @@ -3179,11 +3170,10 @@ Move_MACH_PUNCH: loadspritegfx 0x2797 loadspritegfx 0x279F monbg ANIM_ATK_PARTNER - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CD5E6 + createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 + jumprettrue Anim_MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82CD57E: +Anim_MachPunchContinue: waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 waitbgfadein @@ -3205,9 +3195,9 @@ AnimScript_82CD57E: waitbgfadein end -AnimScript_82CD5E6: +Anim_MachPunchAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82CD57E + goto Anim_MachPunchContinue Move_FORESIGHT: loadspritegfx 0x2812 @@ -3251,17 +3241,17 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - call AnimScript_82CD6C7 + call Anim_EndureEffect waitforvisualfinish end -AnimScript_82CD6C7: +Anim_EndureEffect: createsprite gUnknown_08592D8C, 0x2, 0, -24, 26, 2 delay 0x4 createsprite gUnknown_08592D8C, 0x2, 0, 14, 28, 1 @@ -3366,26 +3356,25 @@ Move_MILK_DRINK: playsewithpan SE_W208, -64 waitforvisualfinish clearmonbg ANIM_TARGET - call AnimScript_82D7A28 + call Anim_HealingEffect2 waitforvisualfinish end Move_MAGNITUDE: - createvisualtask sub_8115600, 0x2 + createvisualtask AnimTask_IsPowerOver99, 0x2 waitforvisualfinish - jumpargeq 0xF, 0x0, AnimScript_82CD8C9 - jumpargeq 0xF, 0x1, AnimScript_82CD8EE - -AnimScript_82CD8C8: + jumpargeq 0xF, FALSE, Anim_MagnitudeRegular + jumpargeq 0xF, TRUE, Anim_MagnitudeIntense +Anim_MagnitudeEnd: end -AnimScript_82CD8C9: +Anim_MagnitudeRegular: createvisualtask sub_81152DC, 0x5, 5, 0, 50 createvisualtask sub_81152DC, 0x5, 4, 0, 50 loopsewithpan SE_W070, +63, 0x8, 0xA - goto AnimScript_82CD8C8 + goto Anim_MagnitudeEnd -AnimScript_82CD8EE: +Anim_MagnitudeIntense: createvisualtask sub_81152DC, 0x5, 5, 0, 50 createvisualtask sub_81152DC, 0x5, 4, 0, 50 loopsewithpan SE_W070, +63, 0x8, 0xA @@ -3393,7 +3382,7 @@ AnimScript_82CD8EE: createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 delay 0x10 createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - goto AnimScript_82CD8C8 + goto Anim_MagnitudeEnd Move_RAPID_SPIN: loadspritegfx 0x2797 @@ -3437,18 +3426,17 @@ Move_MOONLIGHT: delay 0x14 createvisualtask sub_81025C0, 0x2 waitforvisualfinish - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish end Move_EXTREME_SPEED: loadspritegfx 0x27DF loadspritegfx 0x2797 - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82CDAF5 + createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 + jumprettrue Anim_ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82CDA55: +Anim_ExtremeSpeedContinue: waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 waitbgfadein @@ -3487,9 +3475,9 @@ AnimScript_82CDA55: delay 0x1 end -AnimScript_82CDAF5: +Anim_ExtremeSpeedAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82CDA55 + goto Anim_ExtremeSpeedContinue Move_UPROAR: loadspritegfx 0x27F1 @@ -3543,12 +3531,12 @@ Move_HEAT_WAVE: Move_HAIL: loadspritegfx 0x2817 loadspritegfx 0x279D - createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, 0 + createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask sub_810C918, 0x5 loopsewithpan SE_W258, 0, 0x8, 0xA waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT: @@ -3764,9 +3752,8 @@ Move_BRICK_BREAK: loadspritegfx 0x2797 loadspritegfx 0x279F loadspritegfx 0x27E0 - choosetwoturnanim AnimScript_82CE0A7, AnimScript_82CE154 - -AnimScript_82CE0A7: + choosetwoturnanim Anim_BrickBreakNormal, Anim_BrickBreakShatteredWall +Anim_BrickBreakNormal: monbg ANIM_TARGET setalpha 0x80C createsprite gUnknown_0857FE28, 0x2, 3, 8 @@ -3792,7 +3779,7 @@ AnimScript_82CE0A7: clearmonbg ANIM_TARGET end -AnimScript_82CE154: +Anim_BrickBreakShatteredWall: monbg ANIM_TARGET setalpha 0x80C createsprite gUnknown_0857FE28, 0x2, 3, 8 @@ -3884,7 +3871,7 @@ Move_ERUPTION: Move_SKILL_SWAP: loadspritegfx 0x280B - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createvisualtask sub_810FBF0, 0x3, 1 createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1 loopsewithpan SE_W179, -64, 0x18, 0x3 @@ -3892,13 +3879,13 @@ Move_SKILL_SWAP: createvisualtask sub_810FBF0, 0x3, 0 createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1 waitforvisualfinish - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_IMPRISON: loadspritegfx 0x2809 loadspritegfx 0x280A - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground monbg ANIM_DEF_PARTNER createvisualtask sub_810F940, 0x5 delay 0x8 @@ -3909,7 +3896,7 @@ Move_IMPRISON: createvisualtask sub_81152DC, 0x5, 4, 1, 10 playsewithpan SE_W063, -64 clearmonbg ANIM_DEF_PARTNER - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_GRUDGE: @@ -4004,7 +3991,7 @@ Move_LUSTER_PURGE: waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_MIST_BALL: @@ -4020,11 +4007,11 @@ Move_MIST_BALL: delay 0x0 playsewithpan SE_W114, 0 createvisualtask sub_810C324, 0x5 - createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, RGB_WHITE delay 0x8 createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 70, 0 delay 0x46 - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: @@ -4164,7 +4151,7 @@ Move_SLACK_OFF: createvisualtask sub_8160544, 0x2, 0 playsewithpan SE_W281, -64 waitforvisualfinish - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish end @@ -4382,7 +4369,7 @@ Move_SHADOW_PUNCH: end Move_EXTRASENSORY: - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground monbg ANIM_DEF_PARTNER setalpha 0x80C createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 @@ -4399,7 +4386,7 @@ Move_EXTRASENSORY: waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_AERIAL_ACE: @@ -4436,7 +4423,7 @@ Move_HOWL: loadspritegfx 0x2745 createvisualtask sub_815D64C, 0x2, 0 delay 0xC - call AnimScript_82CFECB + call Anim_RoarEffect createvisualtask sub_8158D8C, 0x2, 0, 3 waitforvisualfinish delay 0x1E @@ -4475,7 +4462,7 @@ Move_VOLT_TACKLE: loadspritegfx 0x27E5 monbg ANIM_ATTACKER setalpha 0x80C - createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gUnknown_085959A4, 0x1 playsewithpan SE_W268, -64 @@ -4512,7 +4499,7 @@ Move_VOLT_TACKLE: delay 0x2 createsprite gUnknown_0859598C, 0x2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end @@ -4622,10 +4609,10 @@ Move_SHOCK_WAVE: playsewithpan SE_W161B, +63 waitforvisualfinish createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1 - createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, 0x7FFF - createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, 0 + createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, RGB_WHITE + createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, RGB_BLACK delay 0x4 - createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, 0 + createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff @@ -4642,27 +4629,27 @@ Move_BELLY_DRUM: loadspritegfx 0x27D1 createvisualtask sub_8102BE8, 0x2 waitforvisualfinish - call AnimScript_82CF5A6 + call Anim_BellyDrum1 createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0 playsewithpan SE_W187, -64 delay 0xF - call AnimScript_82CF58B + call Anim_BellyDrum2 createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0 playsewithpan SE_W187, -64 delay 0xF - call AnimScript_82CF5A6 + call Anim_BellyDrum1 createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128 playsewithpan SE_W187, -64 delay 0x7 - call AnimScript_82CF58B + call Anim_BellyDrum2 createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128 playsewithpan SE_W187, -64 delay 0x7 - call AnimScript_82CF5A6 + call Anim_BellyDrum1 createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0 playsewithpan SE_W187, -64 delay 0x7 - call AnimScript_82CF58B + call Anim_BellyDrum2 createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0 playsewithpan SE_W187, -64 waitforvisualfinish @@ -4670,12 +4657,12 @@ Move_BELLY_DRUM: waitforvisualfinish end -AnimScript_82CF58B: +Anim_BellyDrum2: createsprite gUnknown_08593068, 0x3, 0 createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 return -AnimScript_82CF5A6: +Anim_BellyDrum1: createsprite gUnknown_08593068, 0x3, 1 createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 return @@ -4690,13 +4677,13 @@ Move_MIND_READER: createsprite gUnknown_085CE094, 0x5 delay 0x28 playsewithpan SE_W043, +63 - createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, 0 - call AnimScript_82CF608 + createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, RGB_BLACK + call Anim_MindReaderEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82CF608: +Anim_MindReaderEffect: createsprite gUnknown_085CE0AC, 0x4, 70, 0, 6 createsprite gUnknown_085CE0AC, 0x4, 40, 40, 6 createsprite gUnknown_085CE0AC, 0x4, 10, -60, 6 @@ -4727,7 +4714,7 @@ Move_ICE_PUNCH: loadspritegfx 0x2797 loadspritegfx 0x279F createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588 + createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB(12, 26, 31) delay 0x14 playsewithpan SE_W081, +63 createsprite gUnknown_08595AE8, 0x2, 0 @@ -4747,9 +4734,9 @@ Move_ICE_PUNCH: createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1 waitforvisualfinish delay 0xF - call AnimScript_82D7720 + call Anim_FreezeEffect1 delay 0x5 - createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588 + createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish @@ -4770,10 +4757,10 @@ Move_REST: Move_CONFUSION: monbg ANIM_DEF_PARTNER - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground setalpha 0x808 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, +63 createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 15, 1 @@ -4782,15 +4769,15 @@ Move_CONFUSION: clearmonbg ANIM_DEF_PARTNER blendoff delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_PSYCHIC: monbg ANIM_DEF_PARTNER - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground setalpha 0x808 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 767 + createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish loopsewithpan SE_W048, +63, 0xA, 0x3 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 @@ -4799,30 +4786,30 @@ Move_PSYCHIC: clearmonbg ANIM_DEF_PARTNER blendoff delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_FUTURE_SIGHT: - goto AnimScript_82CF8F6 + goto Anim_FutureSight -AnimScript_82CF8ED: +Anim_FutureSightContinue: waitforvisualfinish delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end -AnimScript_82CF8F6: +Anim_FutureSight: monbg ANIM_ATK_PARTNER playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground setalpha 0x808 playsewithpan SE_W048, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto AnimScript_82CF8ED + goto Anim_FutureSightContinue Move_THUNDER: loadspritegfx 0x2735 @@ -4994,7 +4981,7 @@ Move_DRAGON_BREATH: delay 0x2 createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 delay 0x2 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, 31 + createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, RGB_RED createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 delay 0x2 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 21, 1 @@ -5014,7 +5001,7 @@ Move_DRAGON_BREATH: delay 0x2 createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, 31 + createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -5026,7 +5013,7 @@ Move_ROAR: setalpha 0x808 createvisualtask sub_8158E9C, 0x2, 0, 2 createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - call AnimScript_82CFECB + call Anim_RoarEffect delay 0x14 createvisualtask sub_80D5DB0, 0x5, 1, 2 waitforvisualfinish @@ -5037,7 +5024,7 @@ Move_ROAR: waitforvisualfinish end -AnimScript_82CFECB: +Anim_RoarEffect: createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 @@ -5050,7 +5037,7 @@ AnimScript_82CFECB: Move_GROWL: loadspritegfx 0x2745 createvisualtask sub_8158E9C, 0x2, 0, 255 - call AnimScript_82CFECB + call Anim_RoarEffect delay 0xA createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 @@ -5063,15 +5050,15 @@ Move_SNORE: loadspritegfx 0x27D5 monbg ANIM_ATK_PARTNER setalpha 0x808 - call AnimScript_82CFF76 + call Anim_Snore1 delay 0x1E - call AnimScript_82CFF76 + call Anim_Snore1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82CFF76: +Anim_Snore1: playsewithpan SE_W173, -64 createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 @@ -5088,13 +5075,13 @@ Move_LIGHT_SCREEN: waitplaysewithpan SE_W115, -64, 0xF createsprite gUnknown_08596560, 0x1, 40, 0, 10166 delay 0xA - call AnimScript_82D0014 + call Anim_SpecialScreenEffect waitforvisualfinish delay 0x1 blendoff end -AnimScript_82D0014: +Anim_SpecialScreenEffect: createsprite gUnknown_08596624, 0x2, 23, 0, 0, 1 delay 0x6 createsprite gUnknown_08596624, 0x2, 31, -8, 0, 1 @@ -5115,7 +5102,7 @@ Move_MIRROR_COAT: createsprite gUnknown_08596590, 0x1, 40, 0, 10168 delay 0xA playsewithpan SE_W115, -64 - call AnimScript_82D0014 + call Anim_SpecialScreenEffect waitforvisualfinish delay 0x1 blendoff @@ -5178,7 +5165,7 @@ Move_BUBBLE: playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 waitforvisualfinish - call AnimScript_82D7B53 + call Anim_BulbbleEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5190,16 +5177,16 @@ Move_SMOG: monbgprio_29 setalpha 0x80C loopsewithpan SE_W054, +63, 0x11, 0xA - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A - call AnimScript_82D024A + call Anim_Smog1 + call Anim_Smog1 + call Anim_Smog1 + call Anim_Smog1 + call Anim_Smog1 + call Anim_Smog1 + call Anim_Smog1 delay 0x78 loopsewithpan SE_W092, +63, 0x12, 0x2 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 26650 + createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 0xA createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1 waitforvisualfinish @@ -5207,7 +5194,7 @@ Move_SMOG: blendoff end -AnimScript_82D024A: +Anim_Smog1: createsprite gUnknown_08595C44, 0x2, 0, -24, 48, 240, 1, 0 delay 0x7 return @@ -5257,18 +5244,18 @@ Move_SAND_ATTACK: createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 - call AnimScript_82D0337 + call Anim_SandAttack1 + call Anim_SandAttack1 + call Anim_SandAttack1 + call Anim_SandAttack1 + call Anim_SandAttack1 + call Anim_SandAttack1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82D0337: +Anim_SandAttack1: createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 0, 0 createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 10, 10 createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -10, -10 @@ -5283,16 +5270,16 @@ Move_MUD_SLAP: createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 - call AnimScript_82D03D5 + call Anim_MudSlap1 + call Anim_MudSlap1 + call Anim_MudSlap1 + call Anim_MudSlap1 + call Anim_MudSlap1 + call Anim_MudSlap1 waitforvisualfinish end -AnimScript_82D03D5: +Anim_MudSlap1: createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 0, 0 createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 10, 5 createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -10, -5 @@ -5336,14 +5323,14 @@ Move_DRAGON_RAGE: Move_RAIN_DANCE: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 + createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_8107188, 0x2, 0, 3, 120 createvisualtask sub_8107188, 0x2, 0, 3, 120 delay 0x78 delay 0x1E waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0 + createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -5420,25 +5407,25 @@ Move_ICE_BEAM: createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 delay 0x1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31) createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 - call AnimScript_82D07C1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 + call Anim_IceBeam1 createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 delay 0x1 createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 waitforvisualfinish delay 0x14 - call AnimScript_82D7720 + call Anim_FreezeEffect1 createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31) waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK @@ -5447,7 +5434,7 @@ Move_ICE_BEAM: blendoff end -AnimScript_82D07C1: +Anim_IceBeam1: createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 @@ -5467,26 +5454,26 @@ Move_AURORA_BEAM: playsewithpan SE_W062, -64 setarg 0x7, 0x0 createvisualtask sub_8107528, 0xA, 130 - call AnimScript_82D088B + call Anim_AuroraBeam1 createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 17, 1 - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 setarg 0x7, 0xFFFF createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 40, 1 - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B - call AnimScript_82D088B + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 + call Anim_AuroraBeam1 waitforvisualfinish restorebg waitbgfadein end -AnimScript_82D088B: +Anim_AuroraBeam1: createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 delay 0x1 createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 @@ -5499,24 +5486,23 @@ AnimScript_82D088B: Move_SOLAR_BEAM: loadspritegfx 0x27A3 - choosetwoturnanim AnimScript_82D08E6, AnimScript_82D09E3 - -AnimScript_82D08E4: + choosetwoturnanim Anim_SolarBeamSetUp, Anim_SolarBeamUnleash +Anim_SolarBeamEnd: waitforvisualfinish end -AnimScript_82D08E6: +Anim_SolarBeamSetUp: monbg ANIM_ATK_PARTNER setalpha 0x80C - createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, 12287 + createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, -64 - call AnimScript_82D0910 + call Anim_SolarBeamSetUp1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto AnimScript_82D08E4 + goto Anim_SolarBeamEnd -AnimScript_82D0910: +Anim_SolarBeamSetUp1: createsprite gUnknown_085921E0, 0x2, 40, 40, 16 delay 0x2 createsprite gUnknown_085921E0, 0x2, -40, -40, 16 @@ -5547,15 +5533,15 @@ AnimScript_82D0910: delay 0x2 return -AnimScript_82D09E3: - call AnimScript_82D7D1D +Anim_SolarBeamUnleash: + call Anim_SetSolarbeamBg panse_1B SE_W076, -64, +63, +2, 0x0 createvisualtask sub_80FEA58, 0x5 createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 delay 0x4 createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 delay 0x4 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, 1017 + createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, RGB(25, 31, 0) createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 delay 0x4 createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 65, 1 @@ -5567,14 +5553,14 @@ AnimScript_82D09E3: delay 0x4 createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 delay 0x4 - call AnimScript_82D0AB5 - call AnimScript_82D0AB5 + call Anim_SolarBeamUnleash1 + call Anim_SolarBeamUnleash1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, 1017 - call AnimScript_82D7D57 - goto AnimScript_82D08E4 + createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, RGB(25, 31, 0) + call Anim_UnsetSolarbeamBg + goto Anim_SolarBeamEnd -AnimScript_82D0AB5: +Anim_SolarBeamUnleash1: createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 delay 0x4 createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 @@ -5594,21 +5580,20 @@ AnimScript_82D0AB5: Move_BLIZZARD: loadspritegfx 0x279D monbg ANIM_DEF_PARTNER - createvisualtask sub_8117754, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D0CB2 + createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 + jumprettrue Anim_BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT - -AnimScript_82D0B43: +Anim_BlizzardContinue: waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish panse_1B SE_W059, -64, +63, +2, 0x0 - call AnimScript_82D0B7D - call AnimScript_82D0B7D + call Anim_Blizzard1 + call Anim_Blizzard1 playsewithpan SE_W059B, +63 waitforvisualfinish - call AnimScript_82D77A4 + call Anim_FreezeEffect2 waitforvisualfinish delay 0x14 restorebg @@ -5618,7 +5603,7 @@ AnimScript_82D0B43: clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D0B7D: +Anim_Blizzard1: createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1 delay 0x3 @@ -5642,9 +5627,9 @@ AnimScript_82D0B7D: delay 0x3 return -AnimScript_82D0CB2: +Anim_BlizzardAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto AnimScript_82D0B43 + goto Anim_BlizzardContinue Move_POWDER_SNOW: loadspritegfx 0x279D @@ -5652,19 +5637,19 @@ Move_POWDER_SNOW: createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish panse_1B SE_W016, -64, +63, +2, 0x0 - call AnimScript_82D0D03 - call AnimScript_82D0D03 + call Anim_PowderSnow1 + call Anim_PowderSnow1 playsewithpan SE_W016B, +63 waitforvisualfinish waitsound - call AnimScript_82D77A4 + call Anim_FreezeEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 0x14 createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK end -AnimScript_82D0D03: +Anim_PowderSnow1: createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1 delay 0x3 createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1 @@ -5691,32 +5676,32 @@ Move_HYDRO_PUMP: delay 0x6 panse_1B SE_W056, -64, +63, +2, 0x0 createvisualtask sub_81076C8, 0x5, 100 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E52 + call Anim_HydroPump1 + call Anim_HydroPump1 + call Anim_HydroPump1 createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 37, 1 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - call AnimScript_82D0E52 - call AnimScript_82D0E52 - call AnimScript_82D0E93 - delay 0x1 - delay 0x1 - call AnimScript_82D0E93 + call Anim_HydroPump2 + call Anim_HydroPump1 + call Anim_HydroPump1 + call Anim_HydroPump2 + call Anim_HydroPump1 + call Anim_HydroPump1 + call Anim_HydroPump2 + call Anim_HydroPump1 + call Anim_HydroPump1 + call Anim_HydroPump2 + call Anim_HydroPump1 + call Anim_HydroPump1 + call Anim_HydroPump2 + delay 0x1 + delay 0x1 + call Anim_HydroPump2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D0E52: +Anim_HydroPump1: createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 delay 0x1 @@ -5725,7 +5710,7 @@ AnimScript_82D0E52: delay 0x1 return -AnimScript_82D0E93: +Anim_HydroPump2: createsprite gUnknown_08597388, 0x4, 0, 15, 1, 1 createsprite gUnknown_08597388, 0x4, 0, -15, 1, 1 return @@ -5738,35 +5723,35 @@ Move_SIGNAL_BEAM: delay 0x6 panse_1B SE_W062, -64, +63, +1, 0x0 createvisualtask sub_81076C8, 0x5, 100 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 25, 1 createsprite gUnknown_0859728C, 0x2, 4, 8, 5, 31, 8, 961, 8 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - call AnimScript_82D0F79 - waitforvisualfinish - end - -AnimScript_82D0F79: + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + call Anim_SignalBeam1 + waitforvisualfinish + end + +Anim_SignalBeam1: createsprite gUnknown_08595114, 0x83, 10, 10, 0, 16 createsprite gUnknown_0859512C, 0x83, 10, 10, 0, -16 delay 0x1 @@ -5787,10 +5772,10 @@ Move_ABSORB: createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 waitforvisualfinish delay 0x3 - call AnimScript_82D1009 + call Anim_AbsorbEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish @@ -5798,7 +5783,7 @@ Move_ABSORB: blendoff end -AnimScript_82D1009: +Anim_AbsorbEffect: playsewithpan SE_W152, +63 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 delay 0x4 @@ -5840,10 +5825,10 @@ Move_MEGA_DRAIN: createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 waitforvisualfinish delay 0x3 - call AnimScript_82D1121 + call Anim_MegaDrainEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish @@ -5851,7 +5836,7 @@ Move_MEGA_DRAIN: blendoff end -AnimScript_82D1121: +Anim_MegaDrainEffect: playsewithpan SE_W145C, +63 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 @@ -5901,10 +5886,10 @@ Move_GIGA_DRAIN: createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 waitforvisualfinish delay 0x3 - call AnimScript_82D12B1 + call Anim_GigaDrainEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish @@ -5912,7 +5897,7 @@ Move_GIGA_DRAIN: blendoff end -AnimScript_82D12B1: +Anim_GigaDrainEffect: playsewithpan SE_W202, +63 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 @@ -5974,10 +5959,10 @@ Move_LEECH_LIFE: waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 waitforvisualfinish - call AnimScript_82D1009 + call Anim_AbsorbEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 0 waitforvisualfinish @@ -5987,29 +5972,29 @@ Move_LEECH_LIFE: Move_SYNTHESIS: loadspritegfx 0x2741 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, 19451 + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, -64 - call AnimScript_82D79B4 + call Anim_GrantingStarsEffect waitforvisualfinish unloadspritegfx 0x2741 delay 0x1 loadspritegfx 0x272F - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish end Move_TOXIC: loadspritegfx 0x27A7 loadspritegfx 0x27A6 - call AnimScript_82D1515 - call AnimScript_82D1515 + call Anim_Toxic1 + call Anim_Toxic1 waitforvisualfinish delay 0xF - call AnimScript_82D7A71 + call Anim_PoisonEffect waitforvisualfinish end -AnimScript_82D1515: +Anim_Toxic1: createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1 playsewithpan SE_W092, +63 delay 0xF @@ -6030,25 +6015,25 @@ Move_SLUDGE: createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 waitforvisualfinish createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774 - call AnimScript_82D7A71 + createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) + call Anim_PoisonEffect waitforvisualfinish end Move_SLUDGE_BOMB: loadspritegfx 0x27A6 - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC - call AnimScript_82D16BC + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 + call Anim_SludgeBomb1 createvisualtask sub_80D52D0, 0x5, 1, 3, 0, 15, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, 31774 + createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) createsprite gUnknown_085961D8, 0x82, 42, 27, 20 createsprite gUnknown_085961D8, 0x82, -27, 44, 20 createsprite gUnknown_085961D8, 0x82, 39, -28, 20 @@ -6069,11 +6054,11 @@ Move_SLUDGE_BOMB: delay 0x0 waitsound waitforvisualfinish - call AnimScript_82D7A71 + call Anim_PoisonEffect waitforvisualfinish end -AnimScript_82D16BC: +Anim_SludgeBomb1: playsewithpan SE_W145C, -64 createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 delay 0x3 @@ -6093,7 +6078,7 @@ Move_ACID: delay 0xF createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1 createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, 31774 + createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, RGB(30, 0, 31) createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55 playsewithpan SE_W145, +63 delay 0xA @@ -6188,12 +6173,11 @@ Move_MEGAHORN: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER playsewithpan SE_W082, -64 - jumpifcontest AnimScript_82D19FA + jumpifcontest Anim_MegahornInContest fadetobg BG_DRILL waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82D1947: +Anim_MegahornContinue: waitbgfadein setalpha 0x80C createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 @@ -6222,11 +6206,11 @@ AnimScript_82D1947: waitbgfadein end -AnimScript_82D19FA: +Anim_MegahornInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82D1947 + goto Anim_MegahornContinue Move_GUST: loadspritegfx 0x2719 @@ -6282,15 +6266,15 @@ Move_AEROBLAST: loadspritegfx 0x27AA loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER - call AnimScript_82D7CE5 + call Anim_SetFlyingBg monbgprio_28 ANIM_TARGET setalpha 0x80C - call AnimScript_82D1B82 + call Anim_Aeroblast1 createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 50, 1 - call AnimScript_82D1B82 - call AnimScript_82D1B82 - call AnimScript_82D1B82 - call AnimScript_82D1B82 + call Anim_Aeroblast1 + call Anim_Aeroblast1 + call Anim_Aeroblast1 + call Anim_Aeroblast1 waitforvisualfinish createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 playsewithpan SE_W013, +63 @@ -6298,10 +6282,10 @@ Move_AEROBLAST: clearmonbg ANIM_DEF_PARTNER blendoff delay 0x0 - call AnimScript_82D7D15 + call Anim_UnsetFlyingBg end -AnimScript_82D1B82: +Anim_Aeroblast1: playsewithpan SE_W026, -64 createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0 createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0 @@ -6397,24 +6381,24 @@ Move_FLAMETHROWER: delay 0x6 createvisualtask sub_81076C8, 0x5, 100 panse_1B SE_W053, -64, +63, +2, 0x0 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 - call AnimScript_82D1E58 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 + call Anim_Flamethrower1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D1E58: +Anim_Flamethrower1: createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 delay 0x2 createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 @@ -6450,16 +6434,16 @@ Move_WHIRLPOOL: createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 - call AnimScript_82D1F5B - call AnimScript_82D1F5B - call AnimScript_82D1F5B + call Anim_WhirlpoolEffect + call Anim_WhirlpoolEffect + call Anim_WhirlpoolEffect delay 0xC createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D1F5B: +Anim_WhirlpoolEffect: createsprite gUnknown_08596B70, 0x82, 0, 28, 384, 50, 8, 50, 1 delay 0x2 createsprite gUnknown_08596B70, 0x82, 0, 32, 240, 40, 11, -46, 1 @@ -6477,18 +6461,17 @@ AnimScript_82D1F5B: Move_FLY: loadspritegfx 0x27AC loadspritegfx 0x2797 - choosetwoturnanim AnimScript_82D1FF7, AnimScript_82D200F - -AnimScript_82D1FF5: + choosetwoturnanim Anim_FlySetUp, Anim_FlyUnleash +Anim_FlyEnd: waitforvisualfinish end -AnimScript_82D1FF7: +Anim_FlySetUp: playsewithpan SE_W019, -64 createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336 - goto AnimScript_82D1FF5 + goto Anim_FlyEnd -AnimScript_82D200F: +Anim_FlyUnleash: monbg ANIM_DEF_PARTNER setalpha 0x80C playsewithpan SE_W104, -64 @@ -6500,22 +6483,21 @@ AnimScript_82D200F: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D1FF5 + goto Anim_FlyEnd Move_BOUNCE: loadspritegfx 0x27AC loadspritegfx 0x2797 - choosetwoturnanim AnimScript_82D2060, AnimScript_82D2074 - -AnimScript_82D205F: + choosetwoturnanim Anim_BounceSetUp, Anim_BounceUnleash +Anim_BounceEnd: end -AnimScript_82D2060: +Anim_BounceSetUp: playsewithpan SE_W100, -64 createsprite gUnknown_08596420, 0x2, 0, 0 - goto AnimScript_82D205F + goto Anim_BounceEnd -AnimScript_82D2074: +Anim_BounceUnleash: monbg ANIM_DEF_PARTNER setalpha 0x80C playsewithpan SE_W207, +63 @@ -6527,7 +6509,7 @@ AnimScript_82D2074: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D205F + goto Anim_BounceEnd Move_KARATE_CHOP: loadspritegfx 0x279F @@ -6627,33 +6609,32 @@ Move_TRIPLE_KICK: monbg ANIM_DEF_PARTNER setalpha 0x80C playsewithpan SE_W233B, +63 - jumpifmoveturn 0x0, AnimScript_82D22B8 - jumpifmoveturn 0x1, AnimScript_82D22EE - goto AnimScript_82D2324 - -AnimScript_82D22B3: + jumpifmoveturn 0x0, Anim_TripleKickLeft + jumpifmoveturn 0x1, Anim_TripleKickRight + goto Anim_TripleKickCenter +Anim_TripleKickContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D22B8: +Anim_TripleKickLeft: createsprite gUnknown_08595E98, 0x84, -16, -8, 20, 1, 1 createsprite gUnknown_08597358, 0x83, -16, -16, 1, 2 createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto AnimScript_82D22B3 + goto Anim_TripleKickContinue -AnimScript_82D22EE: +Anim_TripleKickRight: createsprite gUnknown_08595E98, 0x84, 8, 8, 20, 1, 1 createsprite gUnknown_08597358, 0x83, 8, 0, 1, 2 createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto AnimScript_82D22B3 + goto Anim_TripleKickContinue -AnimScript_82D2324: +Anim_TripleKickCenter: createsprite gUnknown_08595E98, 0x84, 0, 0, 20, 1, 1 createsprite gUnknown_08597358, 0x83, 0, -8, 1, 1 createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto AnimScript_82D22B3 + goto Anim_TripleKickContinue Move_DYNAMIC_PUNCH: loadspritegfx 0x279F @@ -6787,15 +6768,15 @@ Move_SUBMISSION: waitplaysewithpan SE_W004, +63, 0x5A createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4 createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4 - call AnimScript_82D26D3 - call AnimScript_82D26D3 - call AnimScript_82D26D3 + call Anim_Submission1 + call Anim_Submission1 + call Anim_Submission1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D26D3: +Anim_Submission1: createsprite gUnknown_08597358, 0x3, 0, -12, 1, 1 delay 0x8 createsprite gUnknown_08597358, 0x3, -12, 8, 1, 1 @@ -6808,21 +6789,21 @@ Move_SUNNY_DAY: loadspritegfx 0x27AD monbg ANIM_ATK_PARTNER setalpha 0x30D - createvisualtask sub_8116620, 0xA, 1921, 1, 0, 6, 0x7FFF + createvisualtask sub_8116620, 0xA, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish panse_26 SE_W080, -64, +63, +1, 0x0 - call AnimScript_82D2753 - call AnimScript_82D2753 - call AnimScript_82D2753 - call AnimScript_82D2753 + call Anim_SunnyDay1 + call Anim_SunnyDay1 + call Anim_SunnyDay1 + call Anim_SunnyDay1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 1, 6, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82D2753: +Anim_SunnyDay1: createsprite gUnknown_085954A0, 0x28 delay 0x6 return @@ -6832,14 +6813,14 @@ Move_COTTON_SPORE: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, +63, 0x12, 0xA - call AnimScript_82D277D - call AnimScript_82D277D - call AnimScript_82D277D + call Anim_CottonSpore1 + call Anim_CottonSpore1 + call Anim_CottonSpore1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D277D: +Anim_CottonSpore1: createsprite gUnknown_085922EC, 0x2, 0, -20, 85, 80, 0 delay 0xC createsprite gUnknown_085922EC, 0x2, 0, -10, 170, 80, 0 @@ -6854,16 +6835,16 @@ Move_SPORE: setalpha 0x80C createvisualtask sub_80FEE1C, 0x2 loopsewithpan SE_W077, +63, 0x10, 0xB - call AnimScript_82D27E2 - call AnimScript_82D27E2 - call AnimScript_82D27E2 + call Anim_Spore1 + call Anim_Spore1 + call Anim_Spore1 waitforvisualfinish delay 0x1 clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D27E2: +Anim_Spore1: createsprite gUnknown_085922EC, 0x82, 0, -20, 85, 80, 1 delay 0xC createsprite gUnknown_085922EC, 0x82, 0, -10, 170, 80, 1 @@ -7006,21 +6987,21 @@ Move_MIST: monbg ANIM_ATK_PARTNER setalpha 0x80C loopsewithpan SE_W054, -64, 0x14, 0xF - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 - call AnimScript_82D2C34 + call Anim_Mist1 + call Anim_Mist1 + call Anim_Mist1 + call Anim_Mist1 + call Anim_Mist1 + call Anim_Mist1 + call Anim_Mist1 delay 0x20 - createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, 0x7FFF + createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -AnimScript_82D2C34: +Anim_Mist1: createsprite gUnknown_08595C2C, 0x2, 0, -24, 48, 240, 0, 1 delay 0x7 return @@ -7030,9 +7011,9 @@ Move_HAZE: playsewithpan SE_W114, 0 createvisualtask sub_810C0A0, 0x5 delay 0x1E - createvisualtask sub_8116620, 0xA, 1920, 2, 0, 16, 0 + createvisualtask sub_8116620, 0xA, 0x780, 2, 0, 16, RGB_BLACK delay 0x5A - createvisualtask sub_8116620, 0xA, 1920, 1, 16, 0, 0 + createvisualtask sub_8116620, 0xA, 0x780, 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: @@ -7041,7 +7022,7 @@ Move_FIRE_PUNCH: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 31 + createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB_RED createsprite gUnknown_08595368, 0x81, 0 createsprite gUnknown_08595368, 0x81, 64 createsprite gUnknown_08595368, 0x81, 128 @@ -7051,17 +7032,17 @@ Move_FIRE_PUNCH: createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - call AnimScript_82D2D18 + call Anim_FireMoveEffect delay 0x4 playsewithpan SE_W007, +63 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, 31 + createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D2D18: +Anim_FireMoveEffect: createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40 createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40 createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40 @@ -7096,7 +7077,7 @@ Move_DREAM_EATER: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground setalpha 0x808 playsewithpan SE_W107, +63 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 @@ -7104,18 +7085,18 @@ Move_DREAM_EATER: waitforvisualfinish setalpha 0x80C createvisualtask sub_80D51AC, 0x2, 1, 0, 2, 25, 1 - call AnimScript_82D2E51 + call Anim_DreamEaterEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end -AnimScript_82D2E51: +Anim_DreamEaterEffect: playsewithpan SE_W207, +63 createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 @@ -7185,7 +7166,7 @@ Move_POISON_GAS: createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x28 loopsewithpan SE_W054, +63, 0x1C, 0x6 - createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, 26650 + createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -7194,65 +7175,65 @@ Move_POISON_GAS: Move_BIND: createvisualtask sub_80D5EB8, 0x5, 0, 6, 3328, 4, 0 - goto AnimScript_82D30DE + goto Anim_BindWrap -AnimScript_82D30DE: +Anim_BindWrap: playsewithpan SE_W020, +63 - call AnimScript_82D30EE - call AnimScript_82D30EE + call Anim_BindWrap1 + call Anim_BindWrap1 waitforvisualfinish end -AnimScript_82D30EE: +Anim_BindWrap1: createvisualtask sub_80D6064, 0x5, 10, -5, 5, 1, 0 delay 0x10 return Move_WRAP: createvisualtask sub_80D5830, 0x2, 0, 6, 4, 2, 4 - goto AnimScript_82D30DE + goto Anim_BindWrap Move_PSYBEAM: loadspritegfx 0x27B3 playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 - call AnimScript_82D319C - call AnimScript_82D319C + call Anim_Psybeam1 + call Anim_Psybeam1 createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 4, 1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351 - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C - call AnimScript_82D319C + createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 + call Anim_Psybeam1 waitforvisualfinish delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end -AnimScript_82D319C: +Anim_Psybeam1: createsprite gUnknown_0859663C, 0x82, 16, 0, 0, 0, 13, 0 delay 0x4 return Move_HYPNOSIS: loadspritegfx 0x27B3 - call AnimScript_82D7CD1 - call AnimScript_82D31E5 - call AnimScript_82D31E5 - call AnimScript_82D31E5 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, 32351 + call Anim_SetPsychicBackground + call Anim_Hypnosis1 + call Anim_Hypnosis1 + call Anim_Hypnosis1 + createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) waitforvisualfinish delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end -AnimScript_82D31E5: +Anim_Hypnosis1: playsewithpan SE_W048, -64 createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0 createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0 @@ -7262,22 +7243,22 @@ AnimScript_82D31E5: Move_PSYWAVE: loadspritegfx 0x27B5 playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground createvisualtask sub_81076C8, 0x5, 100 createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 - call AnimScript_82D3275 - call AnimScript_82D3275 - createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, 32351 - call AnimScript_82D3275 - call AnimScript_82D3275 - call AnimScript_82D3275 - call AnimScript_82D3275 + call Anim_Psywave1 + call Anim_Psywave1 + createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, RGB(31, 18, 31) + call Anim_Psywave1 + call Anim_Psywave1 + call Anim_Psywave1 + call Anim_Psywave1 waitforvisualfinish delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end -AnimScript_82D3275: +Anim_Psywave1: createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 delay 0x4 createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 @@ -7301,7 +7282,7 @@ Move_ZAP_CANNON: createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 delay 0xF waitplaysewithpan SE_W085B, +63, 0x13 - call AnimScript_82D7BEA + call Anim_ParalysisEffect waitforvisualfinish end @@ -7368,7 +7349,7 @@ Move_POISON_TAIL: createvisualtask sub_811489C, 0x5, 0, 1 clearmonbg ANIM_TARGET blendoff - call AnimScript_82D7A71 + call Anim_PoisonEffect waitforvisualfinish end @@ -7404,7 +7385,7 @@ Move_NIGHT_SHADE: createvisualtask sub_811188C, 0x5, 85 delay 0x46 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1 - createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, 0 + createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER delay 0x1 @@ -7464,33 +7445,32 @@ Move_LICK: Move_FOCUS_ENERGY: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_WHITE createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - call AnimScript_82CD6C7 + call Anim_EndureEffect waitforvisualfinish end Move_BIDE: - choosetwoturnanim AnimScript_82D3719, AnimScript_82D3745 + choosetwoturnanim Anim_BideSetUp, Anim_BideUnleash end - -AnimScript_82D3719: +Anim_BideSetUp: loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 waitforvisualfinish end -AnimScript_82D3745: +Anim_BideUnleash: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, 31 + createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, RGB_RED createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 waitforvisualfinish createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 4 @@ -7509,7 +7489,7 @@ AnimScript_82D3745: delay 0x5 createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, 31 + createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -7523,24 +7503,24 @@ Move_STRING_SHOT: createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 waitforvisualfinish loopsewithpan SE_W081, -64, 0x9, 0x6 - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC - call AnimScript_82D38CC + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 + call Anim_StringShot1 waitforvisualfinish playsewithpan SE_W081B, +63 createsprite gUnknown_085969F8, 0x82, 0, 10 @@ -7555,7 +7535,7 @@ Move_STRING_SHOT: createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 end -AnimScript_82D38CC: +Anim_StringShot1: createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 1 delay 0x1 return @@ -7569,20 +7549,20 @@ Move_SPIDER_WEB: waitforvisualfinish monbgprio_28 ANIM_TARGET loopsewithpan SE_W081, -64, 0x9, 0x6 - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D - call AnimScript_82D396D + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 + call Anim_SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, +63 createsprite gUnknown_08596A2C, 0x2 @@ -7592,19 +7572,18 @@ Move_SPIDER_WEB: createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 end -AnimScript_82D396D: +Anim_SpiderWeb1: createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 0 delay 0x1 return Move_RAZOR_WIND: - choosetwoturnanim AnimScript_82D398C, AnimScript_82D39DC - -AnimScript_82D398A: + choosetwoturnanim Anim_RazorWindSetUp, Anim_RazorWindUnleash +Anim_RazorWindContinue: waitforvisualfinish end -AnimScript_82D398C: +Anim_RazorWindSetUp: loadspritegfx 0x2719 playsewithpan SE_W016, -64 createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40 @@ -7612,9 +7591,9 @@ AnimScript_82D398C: createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, -64 - goto AnimScript_82D398A + goto Anim_RazorWindContinue -AnimScript_82D39DC: +Anim_RazorWindUnleash: loadspritegfx 0x27AA loadspritegfx 0x2797 monbg ANIM_TARGET @@ -7634,7 +7613,7 @@ AnimScript_82D39DC: waitforvisualfinish clearmonbg ANIM_TARGET blendoff - goto AnimScript_82D398A + goto Anim_RazorWindContinue Move_DISABLE: loadspritegfx 0x2757 @@ -7658,19 +7637,19 @@ Move_RECOVER: monbg ANIM_ATK_PARTNER setalpha 0x80C loopsewithpan SE_W025, -64, 0xD, 0x3 - createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, 12287 - call AnimScript_82D3AD5 - call AnimScript_82D3AD5 - call AnimScript_82D3AD5 + createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, RGB(31, 31, 11) + call Anim_Recover1 + call Anim_Recover1 + call Anim_Recover1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff delay 0x1 - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish end -AnimScript_82D3AD5: +Anim_Recover1: createsprite gUnknown_085921E0, 0x2, 40, -10, 13 delay 0x3 createsprite gUnknown_085921E0, 0x2, -35, -10, 13 @@ -7700,7 +7679,7 @@ Move_MIMIC: setarg 0x7, 0xFFFF waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER blendoff @@ -7724,9 +7703,8 @@ Move_CONSTRICT: end Move_CURSE: - choosetwoturnanim AnimScript_82D3BFB, AnimScript_82D3C78 - -AnimScript_82D3BFB: + choosetwoturnanim Anim_CurseGhost, Anim_CurseStats +Anim_CurseGhost: loadspritegfx 0x27D7 loadspritegfx 0x27D8 monbg ANIM_ATK_PARTNER @@ -7735,11 +7713,11 @@ AnimScript_82D3BFB: delay 0x14 createsprite gUnknown_08596DD0, 0x2 delay 0x3C - call AnimScript_82D3C62 + call Anim_CurseGhost1 delay 0x29 - call AnimScript_82D3C62 + call Anim_CurseGhost1 delay 0x29 - call AnimScript_82D3C62 + call Anim_CurseGhost1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER delay 0x1 @@ -7753,23 +7731,23 @@ AnimScript_82D3BFB: clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D3C62: +Anim_CurseGhost1: createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0 playsewithpan SE_W020, -64 return -AnimScript_82D3C78: +Anim_CurseStats: createvisualtask sub_80D5EB8, 0x5, 0, 10, 1536, 3, 0 waitforvisualfinish delay 0xA - call AnimScript_82D3C93 + call Anim_CurseStats1 waitforvisualfinish end -AnimScript_82D3C93: +Anim_CurseStats1: playsewithpan SE_W082, -64 createvisualtask sub_8116B14, 0x5 - createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, 31 + createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, RGB_RED return Move_SOFT_BOILED: @@ -7792,14 +7770,14 @@ Move_SOFT_BOILED: setarg 0x7, 0xFFFF waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - call AnimScript_82D7A28 + call Anim_HealingEffect2 end Move_HEAL_BELL: loadspritegfx 0x27DD loadspritegfx 0x27DE loadspritegfx 0x27DB - createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, 0x7FFF + createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 0x5 createsprite gUnknown_08593938, 0x2, 0, -24, 0, 1 @@ -7808,19 +7786,19 @@ Move_HEAL_BELL: createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1 createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3 - call AnimScript_82D3EF8 + call Anim_HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4 createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2 createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0 - call AnimScript_82D3EF8 + call Anim_HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3 createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1 - call AnimScript_82D3EF8 + call Anim_HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 0x5 waitforvisualfinish @@ -7837,13 +7815,13 @@ Move_HEAL_BELL: loadspritegfx 0x27DB playsewithpan SE_REAPOKE, -64 createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, RGB_WHITE createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 end -AnimScript_82D3EF8: +Anim_HealBell1: createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, 0x7FFF + createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, RGB_WHITE createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 playsewithpan SE_W215, -64 return @@ -7956,7 +7934,7 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx 0x27F0 - createvisualtask sub_815A904, 0x2 + createvisualtask AnimTask_IsHealingMove, 0x2 createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1 playsewithpan SE_W039, -64 delay 0xE @@ -7966,11 +7944,11 @@ Move_PRESENT: delay 0x14 playsewithpan SE_W145B, +63 waitforvisualfinish - jumpargeq 0x7, 0x0, AnimScript_82D41D4 - jumpargeq 0x7, 0x1, AnimScript_82D423F + jumpretfalse Anim_PresentDamage + jumprettrue Anim_PresentHeal end -AnimScript_82D41D4: +Anim_PresentDamage: loadspritegfx 0x27D6 playsewithpan SE_W120, +63 createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1 @@ -7988,7 +7966,7 @@ AnimScript_82D41D4: createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1 end -AnimScript_82D423F: +Anim_PresentHeal: loadspritegfx 0x27D3 loadspritegfx 0x272F playsewithpan SE_W234, +63 @@ -8011,13 +7989,13 @@ AnimScript_82D423F: createsprite gUnknown_08592658, 0x84, -24, 32, -3, 1 waitforvisualfinish waitsound - call AnimScript_82D7A28 + call Anim_HealingEffect2 end Move_BATON_PASS: loadspritegfx 0x27F2 playsewithpan SE_W226, -64 - createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, 31455 + createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gUnknown_085CE370, 0x2 end @@ -8089,13 +8067,12 @@ Move_HYPER_FANG: playsewithpan SE_W044, +63 delay 0x1 delay 0x2 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D458E - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D4580 - goto AnimScript_82D4587 - -AnimScript_82D455C: + createvisualtask AnimTask_IsContest, 0x2 + jumprettrue Anim_HyperFangInContest + createvisualtask AnimTask_IsTargetPlayerSide, 0x2 + jumpretfalse Anim_HyperFangOnOpponent + goto Anim_HyperFangOnPlayer +Anim_HyperFangContinue: waitbgfadeout createsprite gUnknown_085CE1DC, 0x82 waitbgfadein @@ -8107,17 +8084,17 @@ AnimScript_82D455C: waitforvisualfinish end -AnimScript_82D4580: +Anim_HyperFangOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto AnimScript_82D455C + goto Anim_HyperFangContinue -AnimScript_82D4587: +Anim_HyperFangOnPlayer: fadetobg BG_IMPACT_PLAYER - goto AnimScript_82D455C + goto Anim_HyperFangContinue -AnimScript_82D458E: +Anim_HyperFangInContest: fadetobg BG_IMPACT_CONTESTS - goto AnimScript_82D455C + goto Anim_HyperFangContinue Move_TRI_ATTACK: loadspritegfx 0x27F6 @@ -8163,7 +8140,7 @@ Move_TRI_ATTACK: createvisualtask sub_8115F10, 0x2, 257, 257, 257 waitforvisualfinish loadspritegfx 0x279D - call AnimScript_82D7720 + call Anim_FreezeEffect1 createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 waitforvisualfinish end @@ -8257,7 +8234,7 @@ Move_WISH: waitforvisualfinish delay 0x3C loopsewithpan SE_W215, -64, 0x10, 0x3 - call AnimScript_82D79B4 + call Anim_GrantingStarsEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 waitforvisualfinish @@ -8266,15 +8243,15 @@ Move_WISH: Move_STOCKPILE: loadspritegfx 0x27FB playsewithpan SE_W025, -64 - createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, 0x7FFF + createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_815B65C, 0x5 - call AnimScript_82D4972 - call AnimScript_82D4972 + call Anim_Stockpile1 + call Anim_Stockpile1 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE end -AnimScript_82D4972: +Anim_Stockpile1: createsprite gUnknown_08592244, 0x2, 55, 55, 13 delay 0x1 createsprite gUnknown_08592244, 0x2, -55, -55, 13 @@ -8311,10 +8288,9 @@ Move_SPIT_UP: createsprite gUnknown_08593A50, 0x2, 192, 12 createsprite gUnknown_08593A50, 0x2, 224, 12 delay 0x5 - jumpifmoveturn 0x2, AnimScript_82D4AB8 - jumpifmoveturn 0x3, AnimScript_82D4AE1 - -AnimScript_82D4A7B: + jumpifmoveturn 0x2, Anim_SpitUpStrong + jumpifmoveturn 0x3, Anim_SpitUpStrongest +Anim_SpitUpContinue: delay 0x5 createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 playsewithpan SE_W003, +63 @@ -8325,14 +8301,14 @@ AnimScript_82D4A7B: waitforvisualfinish end -AnimScript_82D4AB8: +Anim_SpitUpStrong: createsprite gUnknown_08593A50, 0x2, 16 createsprite gUnknown_08593A50, 0x2, 80 createsprite gUnknown_08593A50, 0x2, 144 createsprite gUnknown_08593A50, 0x2, 208 - goto AnimScript_82D4A7B + goto Anim_SpitUpContinue -AnimScript_82D4AE1: +Anim_SpitUpStrongest: createsprite gUnknown_08593A50, 0x2, 16 createsprite gUnknown_08593A50, 0x2, 48 createsprite gUnknown_08593A50, 0x2, 80 @@ -8341,7 +8317,7 @@ AnimScript_82D4AE1: createsprite gUnknown_08593A50, 0x2, 176 createsprite gUnknown_08593A50, 0x2, 208 createsprite gUnknown_08593A50, 0x2, 240 - goto AnimScript_82D4A7B + goto Anim_SpitUpContinue Move_SWALLOW: loadspritegfx 0x27FC @@ -8352,16 +8328,15 @@ Move_SWALLOW: delay 0x26 playsewithpan SE_W255, -64 createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1 - call AnimScript_82D4B7F - jumpifmoveturn 0x2, AnimScript_82D4BC1 - jumpifmoveturn 0x3, AnimScript_82D4BCB - -AnimScript_82D4B78: + call Anim_SwallowEffect + jumpifmoveturn 0x2, Anim_SwallowGood + jumpifmoveturn 0x3, Anim_SwallowBest +Anim_SwallowContinue: waitforvisualfinish - call AnimScript_82D79DF + call Anim_HealingEffect end -AnimScript_82D4B7F: +Anim_SwallowEffect: createsprite gUnknown_085CE418, 0x2, 0, -8 delay 0x1 createsprite gUnknown_085CE418, 0x2, -24, -8 @@ -8374,14 +8349,14 @@ AnimScript_82D4B7F: delay 0x1 return -AnimScript_82D4BC1: - call AnimScript_82D4B7F - goto AnimScript_82D4B78 +Anim_SwallowGood: + call Anim_SwallowEffect + goto Anim_SwallowContinue -AnimScript_82D4BCB: - call AnimScript_82D4B7F - call AnimScript_82D4B7F - goto AnimScript_82D4B78 +Anim_SwallowBest: + call Anim_SwallowEffect + call Anim_SwallowEffect + goto Anim_SwallowContinue Move_TRANSFORM: monbg ANIM_ATTACKER @@ -8397,30 +8372,30 @@ Move_MORNING_SUN: loadspritegfx 0x272F createvisualtask sub_815BB84, 0x5 delay 0x8 - createvisualtask sub_8116620, 0xA, 1921, 8, 0, 12, 0x7FFF + createvisualtask sub_8116620, 0xA, 0x781, 8, 0, 12, RGB_WHITE delay 0xE - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - call AnimScript_82D4C78 - createvisualtask sub_8116620, 0xA, 1921, 3, 12, 0, 0x7FFF + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + call Anim_MorningSun1 + createvisualtask sub_8116620, 0xA, 0x781, 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound - call AnimScript_82D79DF + call Anim_HealingEffect end -AnimScript_82D4C78: +Anim_MorningSun1: createsprite gUnknown_085CE48C, 0x2, 30, 640 delay 0x5 return @@ -8431,15 +8406,15 @@ Move_SWEET_SCENT: createsprite gUnknown_085CE544, 0x2, 100, 0, 100 delay 0x19 setpan 0 - call AnimScript_82D4CCA + call Anim_SweetScentEffect createsprite gUnknown_085CE544, 0x2, 55, 0 setpan +63 - createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, 22207 - call AnimScript_82D4CCA + createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, RGB(31, 21, 21) + call Anim_SweetScentEffect waitforvisualfinish end -AnimScript_82D4CCA: +Anim_SweetScentEffect: createsprite gUnknown_085CE544, 0x2, 70, 1, 64 delay 0x2 createsprite gUnknown_085CE544, 0x2, 60, 0, 64 @@ -8476,40 +8451,40 @@ Move_HYPER_BEAM: createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 createvisualtask sub_80D51AC, 0x2, 0, 0, 4, 50, 1 createvisualtask sub_8115D94, 0x2, 10147, 1, 12, 31, 16, 0, 0 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 50, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, 26425 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - call AnimScript_82D4EA1 - createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, 26425 + createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, RGB(25, 25, 25) + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + call Anim_HyperBeam1 + createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 4, 16, 0, 0 end -AnimScript_82D4EA1: +Anim_HyperBeam1: createsprite gUnknown_08592288, 0x82 createsprite gUnknown_08592288, 0x82 delay 0x1 @@ -8529,25 +8504,25 @@ Move_FLATTER: createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 delay 0x0 createvisualtask sub_8159210, 0x5, 229, -64 - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B - call AnimScript_82D4F9B + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 + call Anim_Flatter1 delay 0x5 createvisualtask sub_8159210, 0x5, 229, 63 waitforvisualfinish @@ -8556,14 +8531,14 @@ Move_FLATTER: createvisualtask sub_815AC8C, 0x2 end -AnimScript_82D4F9B: +Anim_Flatter1: createsprite gUnknown_085CE5A8, 0x28, 0 createsprite gUnknown_085CE5A8, 0x28, 1 return Move_ROLE_PLAY: monbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_WHITE createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0 waitforvisualfinish playsewithpan SE_W161, -64 @@ -8571,7 +8546,7 @@ Move_ROLE_PLAY: createvisualtask sub_815CED8, 0x2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE delay 0x8 createsprite gUnknown_08597274, 0x2, 1, 2, 10, 0, 0 end @@ -8583,7 +8558,7 @@ Move_REFRESH: createvisualtask sub_815DFCC, 0x2, 0 waitforvisualfinish playsewithpan SE_W234, -64 - call AnimScript_82D79B4 + call Anim_GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) @@ -8598,14 +8573,14 @@ Move_BLAZE_KICK: setalpha 0x80C playsewithpan SE_W172, +63 createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE delay 0x1E playsewithpan SE_W007, +63 createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - call AnimScript_82D2D18 + call Anim_FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8614,15 +8589,15 @@ Move_BLAZE_KICK: Move_HYPER_VOICE: loadspritegfx 0x27DB createvisualtask sub_81590B8, 0x5, 0 - call AnimScript_82D50FA + call Anim_HyperVoiceEffect waitforvisualfinish delay 0x8 createvisualtask sub_81590B8, 0x5, 1 - call AnimScript_82D50FA + call Anim_HyperVoiceEffect waitforvisualfinish end -AnimScript_82D50FA: +Anim_HyperVoiceEffect: createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0 createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1 @@ -8637,15 +8612,15 @@ Move_SAND_TOMB: createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 playsewithpan SE_W328, +63 - call AnimScript_82D51B7 - call AnimScript_82D51B7 - call AnimScript_82D51B7 + call Anim_SandTombEffect + call Anim_SandTombEffect + call Anim_SandTombEffect delay 0x16 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end -AnimScript_82D51B7: +Anim_SandTombEffect: createsprite gUnknown_08596B34, 0x82, 0, 32, 528, 30, 10, 50, 1 delay 0x2 createsprite gUnknown_08596B34, 0x82, 0, 36, 480, 20, 13, -46, 1 @@ -8692,21 +8667,20 @@ Move_ARM_THRUST: waitforvisualfinish createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1 playsewithpan SE_W003, +63 - choosetwoturnanim AnimScript_82D52D4, AnimScript_82D52E8 - -AnimScript_82D52C0: + choosetwoturnanim Anim_ArmThrustRight, Anim_ArmThrustLeft +Anim_ArmThrustContinue: createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 waitforvisualfinish blendoff end -AnimScript_82D52D4: +Anim_ArmThrustRight: createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - goto AnimScript_82D52C0 + goto Anim_ArmThrustContinue -AnimScript_82D52E8: +Anim_ArmThrustLeft: createsprite gUnknown_08597358, 0x82, -8, 0, 1, 2 - goto AnimScript_82D52C0 + goto Anim_ArmThrustContinue Move_MUDDY_WATER: panse_1B SE_W250, -64, +63, +2, 0x0 @@ -8743,10 +8717,10 @@ Move_DRAGON_CLAW: loadspritegfx 0x272D loadspritegfx 0x2737 playsewithpan SE_W221B, -64 - createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, 639 + createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1 - call AnimScript_82D5581 - call AnimScript_82D5581 + call Anim_DragonClawEffect + call Anim_DragonClawEffect createsprite gUnknown_0857FE28, 0x2, 6, 4 createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 delay 0x2 @@ -8780,11 +8754,11 @@ Move_DRAGON_CLAW: createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 delay 0x2 createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, 639 + createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end -AnimScript_82D5581: +Anim_DragonClawEffect: createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 delay 0x2 createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 @@ -8799,7 +8773,7 @@ AnimScript_82D5581: delay 0x2 return -AnimScript_82D560C: +Anim_End: end Move_MUD_SHOT: @@ -8811,24 +8785,24 @@ Move_MUD_SHOT: delay 0x6 createvisualtask sub_81076C8, 0x5, 100 panse_1B SE_W250, -64, +63, +1, 0x0 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 - call AnimScript_82D5687 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 + call Anim_MudShot1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D5687: +Anim_MudShot1: createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 delay 0x2 createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 @@ -8867,7 +8841,7 @@ Move_REVENGE: playsewithpan SE_W036, -64 createsprite gUnknown_08596088, 0x2, 10, -10 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, 31 + createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish unloadspritegfx 0x2805 loadspritegfx 0x2806 @@ -8897,8 +8871,8 @@ Move_POISON_FANG: delay 0xA createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, 26650 - call AnimScript_82D7A71 + createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, RGB(26, 0, 26) + call Anim_PoisonEffect waitforvisualfinish end @@ -8972,40 +8946,39 @@ Move_METAL_SOUND: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call AnimScript_82D59EA - call AnimScript_82D59EA - call AnimScript_82D59EA - call AnimScript_82D59EA + call Anim_MetalSound1 + call Anim_MetalSound1 + call Anim_MetalSound1 + call Anim_MetalSound1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 0x0 waitforvisualfinish end -AnimScript_82D59EA: +Anim_MetalSound1: panse_1B SE_W103, -64, +63, +2, 0x0 createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0 delay 0x2 return Move_FOCUS_PUNCH: - goto AnimScript_82D5A0E + goto Anim_FocusPunch -AnimScript_82D5A0C: +Anim_FocusPunchEnd: waitforvisualfinish end -AnimScript_82D5A0E: +Anim_FocusPunch: loadspritegfx 0x2797 loadspritegfx 0x279F delay 0x1 - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D5AC7 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D5AB9 - jumpargeq 0x7, 0x1, AnimScript_82D5AC0 - -AnimScript_82D5A3C: + createvisualtask AnimTask_IsContest, 0x2 + jumprettrue Anim_FocusPunchInContest + createvisualtask AnimTask_IsTargetPlayerSide, 0x2 + jumpretfalse Anim_FocusPunchOnOpponent + jumprettrue Anim_FocusPunchOnPlayer +Anim_FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 0x80C @@ -9028,38 +9001,37 @@ AnimScript_82D5A3C: waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D5A0C + goto Anim_FocusPunchEnd -AnimScript_82D5AB9: +Anim_FocusPunchOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto AnimScript_82D5A3C + goto Anim_FocusPunchContinue -AnimScript_82D5AC0: +Anim_FocusPunchOnPlayer: fadetobg BG_IMPACT_PLAYER - goto AnimScript_82D5A3C + goto Anim_FocusPunchContinue -AnimScript_82D5AC7: +Anim_FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS - goto AnimScript_82D5A3C + goto Anim_FocusPunchContinue Move_RETURN: loadspritegfx 0x2797 monbg ANIM_DEF_PARTNER setalpha 0x80C - createvisualtask sub_815F8A0, 0x2 + createvisualtask AnimTask_GetHappinessPowerLevel2, 0x2 delay 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D5B04 - jumpargeq 0x7, 0x1, AnimScript_82D5B56 - jumpargeq 0x7, 0x2, AnimScript_82D5BB6 - jumpargeq 0x7, 0x3, AnimScript_82D5CD1 - -AnimScript_82D5AFF: + jumpreteq 0x0, Anim_ReturnWeak + jumpreteq 0x1, Anim_ReturnMedium + jumpreteq 0x2, Anim_ReturnStrong + jumpreteq 0x3, Anim_ReturnStrongest +Anim_ReturnContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D5B04: +Anim_ReturnWeak: createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 createvisualtask sub_8159244, 0x5, 167, -64 waitforvisualfinish @@ -9068,9 +9040,9 @@ AnimScript_82D5B04: delay 0x5 createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 createvisualtask sub_8159210, 0x5, 139, 63 - goto AnimScript_82D5AFF + goto Anim_ReturnContinue -AnimScript_82D5B56: +Anim_ReturnMedium: createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 createvisualtask sub_8159244, 0x5, 167, -64 waitforvisualfinish @@ -9082,9 +9054,9 @@ AnimScript_82D5B56: delay 0x6 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createvisualtask sub_8159210, 0x5, 141, 63 - goto AnimScript_82D5AFF + goto Anim_ReturnContinue -AnimScript_82D5BB6: +Anim_ReturnStrong: createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 createvisualtask sub_8159244, 0x5, 167, -64 waitforvisualfinish @@ -9112,9 +9084,9 @@ AnimScript_82D5BB6: createsprite gUnknown_08597358, 0x2, -5, 3, 1, 2 createvisualtask sub_8159210, 0x5, 123, 63 createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto AnimScript_82D5AFF + goto Anim_ReturnContinue -AnimScript_82D5CD1: +Anim_ReturnStrongest: createsprite gUnknown_08597274, 0x2, 1, 0, 0, 6, 0 waitforvisualfinish createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 @@ -9155,10 +9127,10 @@ AnimScript_82D5CD1: createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 waitforvisualfinish - call AnimScript_82D5F09 - call AnimScript_82D5F09 - call AnimScript_82D5F09 - call AnimScript_82D5F09 + call Anim_ReturnStrongest1 + call Anim_ReturnStrongest1 + call Anim_ReturnStrongest1 + call Anim_ReturnStrongest1 createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 createvisualtask sub_8159210, 0x5, 141, 63 createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 @@ -9173,9 +9145,9 @@ AnimScript_82D5CD1: createvisualtask sub_8159210, 0x5, 141, 63 waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 0, 6, 0, 0 - goto AnimScript_82D5AFF + goto Anim_ReturnContinue -AnimScript_82D5F09: +Anim_ReturnStrongest1: createsprite gUnknown_0857FE40, 0x2, 4, 3, 0 createvisualtask sub_8159244, 0x5, 167, -64 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 @@ -9296,15 +9268,14 @@ Move_SILVER_WIND: monbgprio_29 delay 0x0 createvisualtask sub_8116664, 0xA, 1, 0, 0, 4, 0 - createvisualtask sub_8117780, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D650C + createvisualtask AnimTask_IsTargetOpponentSide, 0x2 + jumprettrue Anim_SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout createvisualtask sub_8117660, 0x5, 1536, 0, 0, -1 - -AnimScript_82D6352: +Anim_SilverWindContinue: delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, 0 + createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, RGB_BLACK waitbgfadein createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1 @@ -9340,11 +9311,11 @@ AnimScript_82D6352: waitbgfadein end -AnimScript_82D650C: +Anim_SilverWindOnPlayer: fadetobg BG_BUG_PLAYER waitbgfadeout createvisualtask sub_8117660, 0x5, -1536, 0, 0, -1 - goto AnimScript_82D6352 + goto Anim_SilverWindContinue Move_SNATCH: playsewithpan SE_W036, -64 @@ -9354,48 +9325,48 @@ Move_SNATCH: Move_DIVE: loadspritegfx 0x2820 loadspritegfx 0x2821 - choosetwoturnanim AnimScript_82D654C, AnimScript_82D65A1 + choosetwoturnanim Anim_DiveSetUp, Anim_DiveAttack -AnimScript_82D654C: +Anim_DiveSetUp: loadspritegfx 0x27AC playsewithpan SE_W029, -64 createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, -64 createsprite gUnknown_085964CC, 0x3, 0 - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A - call AnimScript_82D658A + call Anim_DiveSetUp1 + call Anim_DiveSetUp1 + call Anim_DiveSetUp1 + call Anim_DiveSetUp1 + call Anim_DiveSetUp1 end -AnimScript_82D658A: +Anim_DiveSetUp1: createsprite gUnknown_085964E4, 0x5, 0, 0 createsprite gUnknown_085964E4, 0x5, 1, 0 return -AnimScript_82D65A1: +Anim_DiveAttack: loadspritegfx 0x27A4 loadspritegfx 0x27AB monbg ANIM_DEF_PARTNER setalpha 0x80C playsewithpan SE_W153, +63 createsprite gUnknown_085964CC, 0x83, 1 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 - call AnimScript_82D65E0 + call Anim_DiveAttack1 + call Anim_DiveAttack1 + call Anim_DiveAttack1 + call Anim_DiveAttack1 + call Anim_DiveAttack1 delay 0xC - call AnimScript_82CB102 + call Anim_UnderWaterAttack1 waitforvisualfinish visible ANIM_ATTACKER clearmonbg ANIM_DEF_PARTNER blendoff end -AnimScript_82D65E0: +Anim_DiveAttack1: createsprite gUnknown_085964E4, 0x85, 0, 1 createsprite gUnknown_085964E4, 0x85, 1, 1 return @@ -9510,18 +9481,18 @@ Move_HYDRO_CANNON: createvisualtask sub_8115F10, 0x2, 257, 257, 257 delay 0x1E panse_1B SE_W056, -64, +63, +2, 0x0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call AnimScript_82D6A50 + call Anim_HydroCannon1 createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 waitforvisualfinish createvisualtask sub_8115F10, 0x2, 257, 257, 257 @@ -9530,7 +9501,7 @@ Move_HYDRO_CANNON: blendoff end -AnimScript_82D6A50: +Anim_HydroCannon1: createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 delay 0x1 createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 @@ -9571,11 +9542,10 @@ Move_SEISMIC_TOSS: waitbgfadein waitforvisualfinish createvisualtask sub_8111590, 0x3 - jumpargeq 0x7, 0x0, AnimScript_82D6B53 - jumpargeq 0x7, 0x1, AnimScript_82D6B64 - jumpargeq 0x7, 0x2, AnimScript_82D6B7C - -AnimScript_82D6B48: + jumpreteq 0x0, Anim_SeismicTossAnim1 + jumpreteq 0x1, Anim_SeismicTossAnim2 + jumpreteq 0x2, Anim_SeismicTossAnim3 +Anim_SeismicTossContinue: restorebg waitbgfadeout setarg 0x7, 0xFFF @@ -9584,31 +9554,31 @@ AnimScript_82D6B48: blendoff end -AnimScript_82D6B53: - call AnimScript_82D6B9B +Anim_SeismicTossAnim1: + call Anim_SeismicToss1 delay 0x10 - call AnimScript_82D6BFC - goto AnimScript_82D6B48 + call Anim_SeismicToss2 + goto Anim_SeismicTossContinue -AnimScript_82D6B64: - call AnimScript_82D6B9B +Anim_SeismicTossAnim2: + call Anim_SeismicToss1 delay 0xE - call AnimScript_82D6BFC + call Anim_SeismicToss2 delay 0xE - call AnimScript_82D6B9B - goto AnimScript_82D6B48 + call Anim_SeismicToss1 + goto Anim_SeismicTossContinue -AnimScript_82D6B7C: - call AnimScript_82D6BFC +Anim_SeismicTossAnim3: + call Anim_SeismicToss2 delay 0xA - call AnimScript_82D6B9B + call Anim_SeismicToss1 delay 0xA - call AnimScript_82D6BFC + call Anim_SeismicToss2 delay 0xA - call AnimScript_82D6B9B - goto AnimScript_82D6B48 + call Anim_SeismicToss1 + goto Anim_SeismicTossContinue -AnimScript_82D6B9B: +Anim_SeismicToss1: createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1 playsewithpan SE_W070, +63 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 @@ -9618,7 +9588,7 @@ AnimScript_82D6B9B: createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 return -AnimScript_82D6BFC: +Anim_SeismicToss2: createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1 playsewithpan SE_W088, +63 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 @@ -9677,7 +9647,7 @@ Move_PSYCHO_BOOST: createvisualtask sub_815A5C8, 0x5 waitbgfadein delay 0x6 - createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, 0 + createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, RGB_BLACK delay 0x0 monbgprio_28 ANIM_ATTACKER setalpha 0x808 @@ -9693,7 +9663,7 @@ Move_PSYCHO_BOOST: waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Move_KNOCK_OFF: @@ -9886,101 +9856,98 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx 0x273B loadspritegfx 0x279D - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x4, AnimScript_82D731B - -AnimScript_82D72BB: + createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 + jumpargeq 0x0, 0x4, Anim_IceBallSetIceBg +Anim_IceBallContinue: playsewithpan SE_W196, -64 createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40 delay 0x1C playsewithpan SE_W280, +63 - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x0, AnimScript_82D732C - jumpargeq 0x0, 0x1, AnimScript_82D735B - jumpargeq 0x0, 0x2, AnimScript_82D7394 - jumpargeq 0x0, 0x3, AnimScript_82D73D7 - jumpargeq 0x0, 0x4, AnimScript_82D741F - -AnimScript_82D7309: - createvisualtask sub_810CDFC, 0x5, 0 - jumpargeq 0x0, 0x4, AnimScript_82D7322 - -AnimScript_82D731A: - end - -AnimScript_82D731B: + createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 + jumpargeq 0x0, 0x0, Anim_IceBallWeakest + jumpargeq 0x0, 0x1, Anim_IceBallWeak + jumpargeq 0x0, 0x2, Anim_IceBallMediun + jumpargeq 0x0, 0x3, Anim_IceBallStrong + jumpargeq 0x0, 0x4, Anim_IceBallStrongest +Anim_IceBallContinue2: + createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 + jumpargeq 0x0, 0x4, Anim_IceBallUnsetIceBg +Anim_IceBallEnd: + end + +Anim_IceBallSetIceBg: fadetobg BG_ICE - goto AnimScript_82D72BB + goto Anim_IceBallContinue -AnimScript_82D7322: +Anim_IceBallUnsetIceBg: waitbgfadein delay 0x2D restorebg waitbgfadein - goto AnimScript_82D731A + goto Anim_IceBallEnd -AnimScript_82D732C: +Anim_IceBallWeakest: createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D735B: + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + goto Anim_IceBallContinue2 + +Anim_IceBallWeak: createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D7394: + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + goto Anim_IceBallContinue2 + +Anim_IceBallMediun: createvisualtask sub_80D6388, 0x2, 0, 1, 14, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D73D7: + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + goto Anim_IceBallContinue2 + +Anim_IceBallStrong: createvisualtask sub_80D6388, 0x2, 0, 1, 18, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D741F: + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + goto Anim_IceBallContinue2 + +Anim_IceBallStrongest: createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - call AnimScript_82D7467 - goto AnimScript_82D7309 - -AnimScript_82D7467: + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + call Anim_IceBall1 + goto Anim_IceBallContinue2 + +Anim_IceBall1: createsprite gUnknown_08595DFC, 0x84, -12, -16 return @@ -9995,15 +9962,15 @@ Move_WEATHER_BALL: playsewithpan SE_W197, 0 createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 waitforvisualfinish - createvisualtask sub_81604F0, 0x2 + createvisualtask AnimTask_GetWeather, 0x2 delay 0x1 - jumpargeq 0x7, 0x0, AnimScript_82D74DE - jumpargeq 0x7, 0x1, AnimScript_82D751B - jumpargeq 0x7, 0x2, AnimScript_82D757F - jumpargeq 0x7, 0x3, AnimScript_82D75E3 - jumpargeq 0x7, 0x4, AnimScript_82D7683 + jumpreteq ANIM_WEATHER_NONE, Anim_WeatherBallNormal + jumpreteq ANIM_WEATHER_SUN, Anim_WeatherBallFire + jumpreteq ANIM_WEATHER_RAIN, Anim_WeatherBallWater + jumpreteq ANIM_WEATHER_SANDSTORM, Anim_WeatherBallSandstorm + jumpreteq ANIM_WEATHER_HAIL, Anim_WeatherBallIce -AnimScript_82D74DE: +Anim_WeatherBallNormal: loadspritegfx 0x2797 createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0 waitforvisualfinish @@ -10013,7 +9980,7 @@ AnimScript_82D74DE: waitforvisualfinish end -AnimScript_82D751B: +Anim_WeatherBallFire: loadspritegfx 0x272D createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, +63 @@ -10029,7 +9996,7 @@ AnimScript_82D751B: waitforvisualfinish end -AnimScript_82D757F: +Anim_WeatherBallWater: loadspritegfx 0x27AB createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, +63 @@ -10045,7 +10012,7 @@ AnimScript_82D757F: waitforvisualfinish end -AnimScript_82D75E3: +Anim_WeatherBallSandstorm: loadspritegfx 0x274A createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, +63 @@ -10065,7 +10032,7 @@ AnimScript_82D75E3: waitforvisualfinish end -AnimScript_82D7683: +Anim_WeatherBallIce: loadspritegfx 0x2817 loadspritegfx 0x279D createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20 @@ -10079,7 +10046,7 @@ AnimScript_82D7683: waitforvisualfinish createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 playsewithpan SE_W196, +63 - call AnimScript_82D7720 + call Anim_FreezeEffect1 waitforvisualfinish end @@ -10095,7 +10062,7 @@ Move_COUNT: blendoff end -AnimScript_82D7720: +Anim_FreezeEffect1: createsprite gUnknown_08595B68, 0x82, -10, -10, 0 playsewithpan SE_W196, +63 delay 0x4 @@ -10118,7 +10085,7 @@ AnimScript_82D7720: playsewithpan SE_W196, +63 return -AnimScript_82D77A4: +Anim_FreezeEffect2: createsprite gUnknown_08595B68, 0x82, -10, -10, 1 playsewithpan SE_W196, +63 delay 0x4 @@ -10153,7 +10120,7 @@ AnimScript_82D77A4: playsewithpan SE_W196, +63 return -AnimScript_82D7874: +Anim_IcyWindEffect1: @ Unused loopsewithpan SE_W196, +63, 0x6, 0x4 createsprite gUnknown_08595C04, 0x82, 0, 24, 0 delay 0x4 @@ -10170,7 +10137,7 @@ AnimScript_82D7874: createsprite gUnknown_08595C04, 0x82, -32, 24, 0 return -AnimScript_82D78F8: +Anim_IcyWindEffect2: loopsewithpan SE_W196, +63, 0x6, 0x4 createsprite gUnknown_08595C04, 0x82, 0, 24, 1 delay 0x4 @@ -10193,14 +10160,14 @@ AnimScript_82D78F8: createsprite gUnknown_08595C04, 0x82, -48, 24, 1 return -AnimScript_82D79B4: +Anim_GrantingStarsEffect: createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 delay 0x8 createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 delay 0x8 return -AnimScript_82D79DF: +Anim_HealingEffect: playsewithpan SE_W071B, -64 createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0 delay 0x7 @@ -10212,7 +10179,7 @@ AnimScript_82D79DF: delay 0x7 return -AnimScript_82D7A28: +Anim_HealingEffect2: playsewithpan SE_W071B, +63 createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0 delay 0x7 @@ -10224,7 +10191,7 @@ AnimScript_82D7A28: delay 0x7 return -AnimScript_82D7A71: +Anim_PoisonEffect: createsprite gUnknown_08596240, 0x82, 10, 10, 0 playsewithpan SE_W092, +63 delay 0x6 @@ -10244,7 +10211,7 @@ AnimScript_82D7A71: playsewithpan SE_W092, +63 return -AnimScript_82D7AE2: +Anim_BulbblebeamEffect: createsprite gUnknown_08596258, 0x2, 10, 10, 0 playsewithpan SE_W145C, +63 delay 0x6 @@ -10264,7 +10231,7 @@ AnimScript_82D7AE2: playsewithpan SE_W145C, +63 return -AnimScript_82D7B53: +Anim_BulbbleEffect: createsprite gUnknown_08596258, 0x2, 10, 10, 1 playsewithpan SE_W145C, +63 delay 0x6 @@ -10290,7 +10257,7 @@ AnimScript_82D7B53: playsewithpan SE_W145C, +63 return -AnimScript_82D7BEA: +Anim_ParalysisEffect: playsewithpan SE_W085B, +63 createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0 delay 0x2 @@ -10309,7 +10276,7 @@ AnimScript_82D7BEA: createsprite gUnknown_08595810, 0x82, -20, 15, 5, 1 return -AnimScript_82D7C75: +Anim_ConfusionEffect: loopsewithpan SE_W146, +63, 0xD, 0x6 createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90 createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90 @@ -10318,67 +10285,64 @@ AnimScript_82D7C75: createsprite gUnknown_0859725C, 0x82, 0, -15, 204, 3, 90 return -AnimScript_82D7CD1: +Anim_SetPsychicBackground: fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_815A504, 0x5 waitbgfadein return -AnimScript_82D7CDD: +Anim_UnsetPsychicBackground: restorebg waitbgfadeout setarg 0x7, 0xFFFF waitbgfadein return -AnimScript_82D7CE5: - jumpifcontest AnimScript_82D7CFE +Anim_SetFlyingBg: + jumpifcontest Anim_SetBgFlyingContest fadetobg BG_FLYING waitbgfadeout createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 - -AnimScript_82D7CFC: +Anim_SetBgFlyingContinue: waitbgfadein return - -AnimScript_82D7CFE: +Anim_SetBgFlyingContest: fadetobg BG_FLYING_CONTESTS waitbgfadeout createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto AnimScript_82D7CFC + goto Anim_SetBgFlyingContinue -AnimScript_82D7D15: +Anim_UnsetFlyingBg: restorebg waitbgfadeout setarg 0x7, 0xFFFF waitbgfadein return -AnimScript_82D7D1D: - createvisualtask sub_8117E60, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D7D42 - createvisualtask sub_815A8C8, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D7D50 - goto AnimScript_82D7D49 - -AnimScript_82D7D40: +Anim_SetSolarbeamBg: + createvisualtask AnimTask_IsContest, 0x2 + jumprettrue Anim_SetSolarbeamBgContest + createvisualtask AnimTask_IsTargetPlayerSide, 0x2 + jumpretfalse Anim_SetSolarbeamBgOpponent + goto Anim_SetSolarbeamBgPlayer +Anim_SetSolarbeamBgContinue: waitbgfadein return -AnimScript_82D7D42: +Anim_SetSolarbeamBgContest: fadetobg BG_SOLARBEAM_CONTESTS - goto AnimScript_82D7D40 + goto Anim_SetSolarbeamBgContinue -AnimScript_82D7D49: +Anim_SetSolarbeamBgPlayer: fadetobg BG_SOLARBEAM_PLAYER - goto AnimScript_82D7D40 + goto Anim_SetSolarbeamBgContinue -AnimScript_82D7D50: +Anim_SetSolarbeamBgOpponent: fadetobg BG_SOLARBEAM_OPPONENT - goto AnimScript_82D7D40 + goto Anim_SetSolarbeamBgContinue -AnimScript_82D7D57: +Anim_UnsetSolarbeamBg: restorebg waitbgfadein return @@ -10386,24 +10350,24 @@ AnimScript_82D7D57: Status_Poison: loopsewithpan SE_W092, +63, 0xD, 0x6 createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, 31774 + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end Status_Confusion: loadspritegfx 0x2759 - call AnimScript_82D7C75 + call Anim_ConfusionEffect end Status_Burn: loadspritegfx 0x272D playsewithpan SE_W172, +63 - call AnimScript_82D7DA6 - call AnimScript_82D7DA6 - call AnimScript_82D7DA6 + call Anim_Burn1 + call Anim_Burn1 + call Anim_Burn1 waitforvisualfinish end -AnimScript_82D7DA6: +Anim_Burn1: createsprite gUnknown_08595504, 0x82, -24, 24, 24, 24, 20, 1, 1 delay 0x4 return @@ -10431,7 +10395,7 @@ Status_Sleep: Status_Paralysis: loadspritegfx 0x271B createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - call AnimScript_82D7BEA + call Anim_ParalysisEffect end Status_Freeze: @@ -10467,7 +10431,7 @@ Status_Nightmare: Anim_CastformTransform: createvisualtask sub_815BB18, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D7ECA + jumpreteq 0x1, AnimScript_82D7ECA goto AnimScript_82D7EB2 AnimScript_82D7EB2: @@ -10491,13 +10455,13 @@ Anim_StatChange: Anim_SubsituteOff: monbg ANIM_ATTACKER createvisualtask sub_8172D98, 0x5 - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish delay 0x1 clearmonbg ANIM_ATTACKER delay 0x2 blendoff - createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, 0x7FFF + createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, RGB_WHITE createvisualtask sub_8172BF0, 0x2, 1 end @@ -10505,7 +10469,7 @@ Anim_SubsituteOn: createvisualtask sub_815F20C, 0x2 end -Anim_Table_4: +Anim_PokeblockThrow: createvisualtask sub_817345C, 0x2, 0 createvisualtask sub_81732B0, 0x2 delay 0x0 @@ -10525,13 +10489,13 @@ Anim_ItemKnockOff: Status_Wrap: createvisualtask sub_81734B4, 0x5 - jumpargeq 0x0, 0x1, AnimScript_82D7FE9 - jumpargeq 0x0, 0x2, AnimScript_82D800E - jumpargeq 0x0, 0x3, AnimScript_82D8062 - jumpargeq 0x0, 0x4, AnimScript_82D80BF - goto AnimScript_82D7FA1 + jumpargeq 0x0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin + jumpargeq 0x0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool + jumpargeq 0x0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0x0, TRAP_ANIM_SAND_TOMB, Status_SandTomb + goto Status_BindWrap -AnimScript_82D7FA1: +Status_BindWrap: loadspritegfx 0x27CA loopsewithpan SE_W010, +63, 0x6, 0x2 createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1 @@ -10545,17 +10509,17 @@ AnimScript_82D7FA1: waitforvisualfinish end -AnimScript_82D7FE9: +Status_FireSpin: loadspritegfx 0x272D playsewithpan SE_W221B, +63 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call AnimScript_82CACBF - call AnimScript_82CACBF + call Anim_FireSpinEffect + call Anim_FireSpinEffect waitforvisualfinish stopsound end -AnimScript_82D800E: +Status_Whrilpool: loadspritegfx 0x27A5 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -10564,8 +10528,8 @@ AnimScript_82D800E: createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call AnimScript_82D1F5B - call AnimScript_82D1F5B + call Anim_WhirlpoolEffect + call Anim_WhirlpoolEffect delay 0xC createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish @@ -10573,7 +10537,7 @@ AnimScript_82D800E: clearmonbg ANIM_DEF_PARTNER end -AnimScript_82D8062: +Status_Clamp: loadspritegfx 0x27A1 loadspritegfx 0x2797 monbg ANIM_TARGET @@ -10590,13 +10554,13 @@ AnimScript_82D8062: waitforvisualfinish end -AnimScript_82D80BF: +Status_SandTomb: loadspritegfx 0x275A createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 playsewithpan SE_W328, +63 - call AnimScript_82D51B7 - call AnimScript_82D51B7 + call Anim_SandTombEffect + call Anim_SandTombEffect delay 0x16 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish @@ -10617,7 +10581,7 @@ Anim_ItemEffect: createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W234, -64 - call AnimScript_82D79B4 + call Anim_GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25) @@ -10677,13 +10641,13 @@ Anim_HangedOn: Anim_Rain: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 1921, 2, 0, 4, 0 + createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_8107188, 0x2, 0, 3, 60 createvisualtask sub_8107188, 0x2, 0, 3, 60 delay 0x32 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1921, 2, 4, 0, 0 + createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -10729,7 +10693,7 @@ Anim_SnatchMove: createvisualtask sub_80D5EB8, 0x2, 0, 5, 5120, 4, 1 waitforvisualfinish createvisualtask sub_8117EC4, 0x2 - jumpargeq 0x7, 0x0, AnimScript_82D839F + jumpreteq 0x0, AnimScript_82D839F goto AnimScript_82D83AF AnimScript_82D8398: @@ -10751,7 +10715,7 @@ Anim_FutureSightHit: createvisualtask sub_8117F10, 0x2 monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 - call AnimScript_82D7CD1 + call Anim_SetPsychicBackground setalpha 0x808 playsewithpan SE_W048, +63 waitplaysewithpan SE_W048, +63, 0x8 @@ -10764,7 +10728,7 @@ Anim_FutureSightHit: blendoff waitforvisualfinish delay 0x1 - call AnimScript_82D7CDD + call Anim_UnsetPsychicBackground end Anim_DoomDesireHit: @@ -10801,16 +10765,16 @@ Anim_DoomDesireHit: waitforvisualfinish end -Anim_Table_x14: +Anim_FocusPunchSetUp: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, 31 + createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call AnimScript_82CD6C7 + call Anim_EndureEffect delay 0x8 - call AnimScript_82CD6C7 + call Anim_EndureEffect waitforvisualfinish end @@ -10822,10 +10786,10 @@ Status_Ingrain: createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish delay 0x3 - call AnimScript_82D1009 + call Anim_AbsorbEffect waitforvisualfinish delay 0xF - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish @@ -10838,18 +10802,18 @@ Anim_WishHeal: createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 waitforvisualfinish playsewithpan SE_W025, -64 - call AnimScript_82D79B4 + call Anim_GrantingStarsEffect waitforvisualfinish unloadspritegfx 0x2741 loadspritegfx 0x272F - call AnimScript_82D79DF + call Anim_HealingEffect waitforvisualfinish createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 end AnimScript_82D85A3: createvisualtask sub_8172E9C, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D85B4 + jumpreteq 0x1, AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish @@ -10862,7 +10826,7 @@ AnimScript_82D85B4: AnimScript_82D85C3: createvisualtask sub_8172E9C, 0x2 - jumpargeq 0x7, 0x1, AnimScript_82D85D4 + jumpreteq 0x1, AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish @@ -10899,15 +10863,14 @@ Anim_BallThrow: delay 0x0 playsewithpan SE_NAGERU, 0 createvisualtask sub_8170E04, 0x2 - createvisualtask sub_8170D4C, 0x2 - jumpargeq 0x7, 0xFFFF, AnimScript_82D8652 - -AnimScript_82D8649: + createvisualtask AnimTask_IsBallBlockedByTrainer, 0x2 + jumpreteq 0xFFFF, Anim_BallThrowTrainerBlock +Anim_BallThrowEnd: waitforvisualfinish createvisualtask sub_8170D24, 0x2 end -AnimScript_82D8652: +Anim_BallThrowTrainerBlock: loadspritegfx 0x2797 delay 0x19 monbg ANIM_DEF_PARTNER @@ -10918,7 +10881,7 @@ AnimScript_82D8652: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto AnimScript_82D8649 + goto Anim_BallThrowEnd Anim_SafariBallThrow: createvisualtask sub_8170CFC, 0x2 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index fec030bb5..6e702db24 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3741,7 +3741,7 @@ BattleScript_SAtkDown2End:: BattleScript_FocusPunchSetUp:: printstring STRINGID_EMPTYSTRING3 waitmessage 0x1 - playanimation BS_ATTACKER, B_ANIM_x14, NULL + playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL printstring STRINGID_PKMNTIGHTENINGFOCUS waitmessage 0x40 end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 485847ed1..b74f557a7 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -190,7 +190,7 @@ BattleScript_ActionGetNear: BattleScript_ActionThrowPokeblock: printstring STRINGID_THREWPOKEBLOCKATPKMN waitmessage 0x40 - playanimation BS_ATTACKER, B_ANIM_x4, NULL + playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL printfromtable gSafariPokeblockResultStringIds waitmessage 0x40 end2 -- cgit v1.2.3 From bcea321494f3cab1284325e73cca7f796961d963 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 11 Sep 2018 01:35:47 +0100 Subject: Finish converting data2b data --- data/data2b.s | 219 --------------------------------------------- data/field_ground_effect.s | 6 -- 2 files changed, 225 deletions(-) delete mode 100644 data/data2b.s delete mode 100644 data/field_ground_effect.s (limited to 'data') diff --git a/data/data2b.s b/data/data2b.s deleted file mode 100644 index db378d1a5..000000000 --- a/data/data2b.s +++ /dev/null @@ -1,219 +0,0 @@ -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" -#include "constants/pokemon.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_082FF1D8:: @ 82FF1D8 - .incbin "graphics/link/minigame_digits.gbapal" - - .align 2 -gUnknown_082FF1F8:: @ 82FF1F8 - .incbin "graphics/link/minigame_digits.4bpp.lz" - - .align 2 -gUnknown_082FF2B8:: @ 82FF2B8 - .incbin "graphics/link/minigame_digits2.4bpp.lz" - - .align 2 -gUnknown_082FF3A8:: @ 82FF3A8 - obj_frame_tiles gHeap + 0x8000, 0x800 - obj_frame_tiles gHeap + 0x8800, 0x800 - obj_frame_tiles gHeap + 0x9000, 0x800 - obj_frame_tiles gHeap + 0x9800, 0x800 - - .align 2 -gUnknown_082FF3C8:: @ 82FF3C8 - obj_frame_tiles gHeap + 0xA000, 0x800 - obj_frame_tiles gHeap + 0xA800, 0x800 - obj_frame_tiles gHeap + 0xB000, 0x800 - obj_frame_tiles gHeap + 0xB800, 0x800 - - .align 2 -gUnknown_082FF3E8:: @ 82FF3E8 - obj_frame_tiles gHeap + 0xC000, 0x800 - obj_frame_tiles gHeap + 0xC800, 0x800 - obj_frame_tiles gHeap + 0xD000, 0x800 - obj_frame_tiles gHeap + 0xD800, 0x800 - - .align 2 -gUnknown_082FF408:: @ 82FF408 - obj_frame_tiles gHeap + 0xE000, 0x800 - obj_frame_tiles gHeap + 0xE800, 0x800 - obj_frame_tiles gHeap + 0xF000, 0x800 - obj_frame_tiles gHeap + 0xF800, 0x800 - - .align 2 -gUnknown_082FF428:: @ 82FF428 - obj_frame_tiles gTrainerBackPic_Brendan, 0x0800 - obj_frame_tiles gTrainerBackPic_Brendan + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_Brendan + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_Brendan + 0x1800, 0x0800 - - .align 2 -gUnknown_082FF448:: @ 82FF448 - obj_frame_tiles gTrainerBackPic_May, 0x0800 - obj_frame_tiles gTrainerBackPic_May + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_May + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_May + 0x1800, 0x0800 - - .align 2 -gUnknown_082FF468:: @ 82FF468 - obj_frame_tiles gTrainerBackPic_Red, 0x0800 - obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800 - obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800 - - .align 2 -gUnknown_082FF490:: @ 82FF490 - obj_frame_tiles gTrainerBackPic_Leaf, 0x0800 - obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800 - obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800 - - .align 2 -gUnknown_082FF4B8:: @ 82FF4B8 - obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800 - - .align 2 -gUnknown_082FF4D8:: @ 82FF4D8 - obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800 - - .align 2 -gUnknown_082FF4F8:: @ 82FF4F8 - obj_frame_tiles gTrainerBackPic_Wally, 0x0800 - obj_frame_tiles gTrainerBackPic_Wally + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_Wally + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_Wally + 0x1800, 0x0800 - - .align 2 -gUnknown_082FF518:: @ 82FF518 - obj_frame_tiles gTrainerBackPic_Steven, 0x0800 - obj_frame_tiles gTrainerBackPic_Steven + 0x0800, 0x0800 - obj_frame_tiles gTrainerBackPic_Steven + 0x1000, 0x0800 - obj_frame_tiles gTrainerBackPic_Steven + 0x1800, 0x0800 - - .align 2 -gAnimCmd_General_Frame0:: @ 82FF538 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -AnimCmd_82FF540:: @ 82FF540 - .2byte 0x0003, 0x0000, 0xffff, 0x0000 - - .align 2 -gUnknown_082FF548:: @ 82FF548 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF558:: @ 82FF558 - .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF568:: @ 82FF568 - .2byte 0x0028, 0x0028, 0x0000, 0x0000, 0x0012, 0x0012, 0x0c00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF580:: @ 82FF580 - .2byte 0xfffe, 0xfffe, 0x1200, 0x0000, 0xfff0, 0xfff0, 0x0f00, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF598:: @ 82FF598 - .2byte 0x00a0, 0x0100, 0x0000, 0x0000, 0x0004, 0x0000, 0x0800, 0x0000 - .2byte 0xfffc, 0x0000, 0x0800, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF5B8:: @ 82FF5B8 - .2byte 0x0002, 0x0002, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF5C8:: @ 82FF5C8 - .2byte 0xfffe, 0xfffe, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF5D8:: @ 82FF5D8 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x0900, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF5F0:: @ 82FF5F0 - .2byte 0x0004, 0x0004, 0x3f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF600:: @ 82FF600 - .2byte 0x0000, 0x0000, 0x05fd, 0x0000, 0x0000, 0x0000, 0x0503, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF618:: @ 82FF618 - .4byte gUnknown_082FF548 - .4byte gUnknown_082FF568 - .4byte gUnknown_082FF580 - .4byte gUnknown_082FF598 - .4byte gUnknown_082FF5B8 - .4byte gUnknown_082FF5C8 - .4byte gUnknown_082FF5F0 - .4byte gUnknown_082FF600 - .4byte gUnknown_082FF5D8 - - .align 2 -gUnknown_082FF63C:: @ 82FF63C - .2byte 0xfffc, 0xfffc, 0x3f04, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF64C:: @ 82FF64C - .2byte 0x0000, 0x0000, 0x0503, 0x0000, 0x0000, 0x0000, 0x05fd, 0x0000 - .2byte 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF664:: @ 82FF664 - .2byte 0x0000, 0x0000, 0x14fb, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000 - .2byte 0x0000, 0x0000, 0x1405, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF684:: @ 82FF684 - .2byte 0x0000, 0x0000, 0x6e09, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_082FF694:: @ 82FF694 - .4byte gUnknown_082FF548 - .4byte gUnknown_082FF568 - .4byte gUnknown_082FF580 - .4byte gUnknown_082FF598 - .4byte gUnknown_082FF5B8 - .4byte gUnknown_082FF5C8 - .4byte gUnknown_082FF63C - .4byte gUnknown_082FF64C - .4byte gUnknown_082FF664 - .4byte gUnknown_082FF5D8 - .4byte gUnknown_082FF684 - - .align 2 -gUnknown_082FF6C0:: @ 82FF6C0 - .4byte gUnknown_082FF558 - .4byte gUnknown_082FF568 - .4byte gUnknown_082FF580 - .4byte gUnknown_082FF598 - .4byte gUnknown_082FF5B8 - .4byte gUnknown_082FF5C8 - .4byte gUnknown_082FF63C - .4byte gUnknown_082FF64C - .4byte gUnknown_082FF664 - .4byte gUnknown_082FF5D8 - .4byte gUnknown_082FF684 diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s deleted file mode 100644 index 686d9396b..000000000 --- a/data/field_ground_effect.s +++ /dev/null @@ -1,6 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -- cgit v1.2.3 From b6ee8823f021a7da98cf84d5fc8a6b8609d1630f Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 11 Sep 2018 02:04:03 +0100 Subject: Move field_special_scene data to C --- data/field_special_scene.s | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 data/field_special_scene.s (limited to 'data') diff --git a/data/field_special_scene.s b/data/field_special_scene.s deleted file mode 100644 index 16e5a366d..000000000 --- a/data/field_special_scene.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2, 0 - -gTruckCamera_HorizontalTable:: @ 858E898 - .byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0 - -gUnknown_0858E8AB:: @ 858E8AB - .byte 0x18, 0xFE - -gUnknown_0858E8AD:: @ 858E8AD - .byte 0x17, 0xFE -- cgit v1.2.3 From 3c16d8c59876b2d5d84a3c9d82a7fc5718a32edb Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 11 Sep 2018 02:17:21 +0100 Subject: Move braille_puzzles data to C --- data/braille_puzzles.s | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 data/braille_puzzles.s (limited to 'data') diff --git a/data/braille_puzzles.s b/data/braille_puzzles.s deleted file mode 100644 index 55dcb3a26..000000000 --- a/data/braille_puzzles.s +++ /dev/null @@ -1,16 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085EFE74:: @ 85EFE74 - .byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15 - .byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15 - .byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17 - .byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b - .byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d - .byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d - .byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c - .byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19 - .byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16 -- cgit v1.2.3 From 991151f4613e534f73141035b054ab7914d04a14 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 11 Sep 2018 03:04:19 +0100 Subject: Move item_use data to C --- data/item_use.s | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 data/item_use.s (limited to 'data') diff --git a/data/item_use.s b/data/item_use.s deleted file mode 100644 index 6c9affbc8..000000000 --- a/data/item_use.s +++ /dev/null @@ -1,21 +0,0 @@ - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - - .align 2 -gUnknown_085920D8:: @ 85920D8 - .4byte sub_81B617C - .4byte CB2_ReturnToField - .4byte NULL - - .align 2 -gUnknown_085920E4:: @ 85920E4 - .byte 0x02, 0x04, 0x01, 0x03 - - .align 2 -gUnknown_085920E8:: @ 85920E8 - .4byte sub_80FE03C - .4byte bag_menu_inits_lists_menu -- cgit v1.2.3 From f40fa373988288ee6ca9b8938cb6c33aa409575e Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 11 Sep 2018 23:37:47 +0100 Subject: Move battle_bg data to C --- data/data2c.s | 173 ---------------------------------------------------------- 1 file changed, 173 deletions(-) (limited to 'data') diff --git a/data/data2c.s b/data/data2c.s index a661dc165..1946f5bdb 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -8,179 +8,6 @@ .section .rodata - .align 2 - .2byte 0x0300, 0x0000 - - .align 2 -gUnknown_0831A988:: @ 831A988 - .byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0831A990:: @ 831A990 - .byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0831A998:: @ 831A998 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0831A9A8:: @ 831A9A8 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000 - .2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gUnknown_0831A9C8:: @ 831A9C8 - .4byte gUnknown_0831A998 - .4byte gUnknown_0831A9A8 - - .align 2 -gUnknown_0831A9D0:: @ 831A9D0 - spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 - - .align 2 -gUnknown_0831A9E8:: @ 831A9E8 - spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17 - - .align 2 -gUnknown_0831AA00:: @ 831AA00 - obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710 - - .align 2 -gBattleBgTemplates:: @ 831AA08 - .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab - - .align 2 -gUnknown_0831AA18:: @ 831AA18 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 - window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 - window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 - window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 - window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 - window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 - window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 - window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 - window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 - window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 - window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 - window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 - window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 - window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 - window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e - window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020 - window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040 - window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020 - window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040 - window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060 - window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080 - window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 - window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 - window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 - null_window_template - - .align 2 -gUnknown_0831AAE0:: @ 831AAE0 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090 - window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0 - window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190 - window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300 - window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310 - window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320 - window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330 - window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290 - window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298 - window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298 - window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0 - window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0 - window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100 - window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100 - window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e - window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100 - window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110 - window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114 - window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124 - window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130 - window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c - window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 - null_window_template - - .align 2 -gBattleWindowTemplates:: @ 831ABA0 - .4byte gUnknown_0831AA18 - .4byte gUnknown_0831AAE0 - - .align 2 -gBattleTerrainTable:: @ 831ABA8 - @ tall_grass - .4byte gBattleTerrainTiles_TallGrass - .4byte gBattleTerrainTilemap_TallGrass - .4byte gBattleTerrainAnimTiles_TallGrass - .4byte gBattleTerrainAnimTilemap_TallGrass - .4byte gBattleTerrainPalette_TallGrass - - @ long_grass - .4byte gBattleTerrainTiles_LongGrass - .4byte gBattleTerrainTilemap_LongGrass - .4byte gBattleTerrainAnimTiles_LongGrass - .4byte gBattleTerrainAnimTilemap_LongGrass - .4byte gBattleTerrainPalette_LongGrass - - @ sand - .4byte gBattleTerrainTiles_Sand - .4byte gBattleTerrainTilemap_Sand - .4byte gBattleTerrainAnimTiles_Sand - .4byte gBattleTerrainAnimTilemap_Sand - .4byte gBattleTerrainPalette_Sand - - @ underwater - .4byte gBattleTerrainTiles_Underwater - .4byte gBattleTerrainTilemap_Underwater - .4byte gBattleTerrainAnimTiles_Underwater - .4byte gBattleTerrainAnimTilemap_Underwater - .4byte gBattleTerrainPalette_Underwater - - @ water - .4byte gBattleTerrainTiles_Water - .4byte gBattleTerrainTilemap_Water - .4byte gBattleTerrainAnimTiles_Water - .4byte gBattleTerrainAnimTilemap_Water - .4byte gBattleTerrainPalette_Water - - @ pond_water - .4byte gBattleTerrainTiles_PondWater - .4byte gBattleTerrainTilemap_PondWater - .4byte gBattleTerrainAnimTiles_PondWater - .4byte gBattleTerrainAnimTilemap_PondWater - .4byte gBattleTerrainPalette_PondWater - - @ rock - .4byte gBattleTerrainTiles_Rock - .4byte gBattleTerrainTilemap_Rock - .4byte gBattleTerrainAnimTiles_Rock - .4byte gBattleTerrainAnimTilemap_Rock - .4byte gBattleTerrainPalette_Rock - - @ cave - .4byte gBattleTerrainTiles_Cave - .4byte gBattleTerrainTilemap_Cave - .4byte gBattleTerrainAnimTiles_Cave - .4byte gBattleTerrainAnimTilemap_Cave - .4byte gBattleTerrainPalette_Cave - - @ building - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Building - - @ plain - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Plain - .align 2 gUnknown_0831AC70:: @ 831AC70 .4byte REG_BG3HOFS -- cgit v1.2.3 From 8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 12 Sep 2018 22:58:03 +0200 Subject: Sync battle anim labels with pokeruby --- data/battle_anim_80FE840.s | 92 +- data/battle_anim_815A0D4.s | 2 +- data/battle_anim_8170478.s | 2 +- data/battle_anim_scripts.s | 12360 +++++++++++++++++++++---------------------- 4 files changed, 6174 insertions(+), 6282 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s index 749db42f8..3d1c8ec15 100644 --- a/data/battle_anim_80FE840.s +++ b/data/battle_anim_80FE840.s @@ -14,15 +14,15 @@ gUnknown_08592114:: @ 8592114 .4byte gUnknown_085920F0 .align 2 -gUnknown_08592118:: @ 8592118 +gSleepPowderParticleSpriteTemplate:: @ 8592118 spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 -gUnknown_08592130:: @ 8592130 +gStunSporeParticleSpriteTemplate:: @ 8592130 spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 -gUnknown_08592148:: @ 8592148 +gPoisonPowderParticleSpriteTemplate:: @ 8592148 spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840 .align 2 @@ -142,7 +142,7 @@ gUnknown_085922B4:: @ 85922B4 .4byte gUnknown_085922A8 .align 2 -gUnknown_085922BC:: @ 85922BC +gLeechSeedSpriteTemplate:: @ 85922BC spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48 .align 2 @@ -230,7 +230,7 @@ gUnknown_08592400:: @ 8592400 .4byte gUnknown_085923F0 .align 2 -gUnknown_08592404:: @ 8592404 +gSwiftStarSpriteTemplate:: @ 8592404 spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4 .align 2 @@ -353,7 +353,7 @@ gUnknown_08592610:: @ 8592610 spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18 .align 2 -gUnknown_08592628:: @ 8592628 +gBattleAnimSpriteTemplate_8592628:: @ 8592628 spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4 .align 2 @@ -599,7 +599,7 @@ gUnknown_08592A18:: @ 8592A18 .4byte gUnknown_08592A04 .align 2 -gUnknown_08592A1C:: @ 8592A1C +gCuttingSliceSpriteTemplate:: @ 8592A1C spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0 .align 2 @@ -888,7 +888,7 @@ gUnknown_08592EE8:: @ 8592EE8 .4byte gUnknown_08592ED4 .align 2 -gUnknown_08592EEC:: @ 8592EEC +gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540 .align 2 @@ -1157,11 +1157,11 @@ gUnknown_0859337C:: @ 859337C .4byte gUnknown_0859335C .align 2 -gUnknown_08593380:: @ 8593380 +gBattleAnimSpriteTemplate_8593380:: @ 8593380 spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C .align 2 -gUnknown_08593398:: @ 8593398 +gSonicBoomSpriteTemplate:: @ 8593398 spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8 .align 2 @@ -1189,11 +1189,11 @@ gUnknown_08593424:: @ 8593424 .4byte gUnknown_085933E0 .align 2 -gUnknown_08593428:: @ 8593428 +gSupersonicWaveSpriteTemplate:: @ 8593428 spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 .align 2 -gUnknown_08593440:: @ 8593440 +gScreechWaveSpriteTemplate:: @ 8593440 spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 .align 2 @@ -1357,7 +1357,7 @@ gUnknown_08593718:: @ 8593718 .4byte gUnknown_08593704 .align 2 -gUnknown_0859371C:: @ 859371C +gBattleAnimSpriteTemplate_859371C:: @ 859371C spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 @@ -1436,7 +1436,7 @@ gUnknown_08593880:: @ 8593880 spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4 .align 2 -gUnknown_08593898:: @ 8593898 +gBattleAnimSpriteTemplate_8593898:: @ 8593898 spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8 .align 2 @@ -1497,7 +1497,7 @@ gUnknown_085939A0:: @ 85939A0 spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140 .align 2 -gUnknown_085939B8:: @ 85939B8 +gBattleAnimSpriteTemplate_85939B8:: @ 85939B8 spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 .align 2 @@ -1514,11 +1514,11 @@ gUnknown_08593A00:: @ 8593A00 .4byte gUnknown_085939E8 .align 2 -gUnknown_08593A04:: @ 8593A04 +gHiddenPowerOrbSpriteTemplate:: @ 8593A04 spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C .align 2 -gUnknown_08593A1C:: @ 8593A1C +gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878 .align 2 @@ -1620,7 +1620,7 @@ gUnknown_08593B98:: @ 8593B98 .2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 .align 2 -gUnknown_08593BB8:: @ 8593BB8 +gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8 spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00 .align 2 @@ -1703,7 +1703,7 @@ gUnknown_08595064:: @ 8595064 .4byte gUnknown_08595054 .align 2 -gUnknown_08595068:: @ 8595068 +gBattleAnimSpriteTemplate_8595068:: @ 8595068 spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260 .align 2 @@ -1990,11 +1990,11 @@ gUnknown_085954D0:: @ 85954D0 .4byte gUnknown_085954B8 .align 2 -gUnknown_085954D4:: @ 85954D4 +gEmberSpriteTemplate:: @ 85954D4 spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 .align 2 -gUnknown_085954EC:: @ 85954EC +gEmberFlareSpriteTemplate:: @ 85954EC spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198 .align 2 @@ -2031,7 +2031,7 @@ gUnknown_0859556C:: @ 859556C spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364 .align 2 -gUnknown_08595584:: @ 8595584 +gBattleAnimSpriteTemplate_8595584:: @ 8595584 spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4 .align 2 @@ -2138,7 +2138,7 @@ gUnknown_08595734:: @ 8595734 spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274 .align 2 -gUnknown_0859574C:: @ 859574C +gBattleAnimSpriteTemplate_859574C:: @ 859574C spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308 .align 2 @@ -2175,15 +2175,15 @@ gUnknown_085957DC:: @ 85957DC .4byte gUnknown_085957BC .align 2 -gUnknown_085957E0:: @ 85957E0 +gBattleAnimSpriteTemplate_85957E0:: @ 85957E0 spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC .align 2 -gUnknown_085957F8:: @ 85957F8 +gBattleAnimSpriteTemplate_85957F8:: @ 85957F8 spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628 .align 2 -gUnknown_08595810:: @ 8595810 +gElectricitySpriteTemplate:: @ 8595810 spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C .align 2 @@ -2613,7 +2613,7 @@ gUnknown_08595E80:: @ 8595E80 spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4 .align 2 -gUnknown_08595E98:: @ 8595E98 +gFistFootSpriteTemplate:: @ 8595E98 spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0 .align 2 @@ -2651,7 +2651,7 @@ gUnknown_08595F44:: @ 8595F44 .4byte gUnknown_08595F2C .align 2 -gUnknown_08595F48:: @ 8595F48 +gMegaPunchKickSpriteTemplate:: @ 8595F48 spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278 .align 2 @@ -2841,11 +2841,11 @@ gUnknown_0859623C:: @ 859623C .4byte gUnknown_08596224 .align 2 -gUnknown_08596240:: @ 8596240 +gPoisonBubbleSpriteTemplate:: @ 8596240 spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 -gUnknown_08596258:: @ 8596258 +gWaterBubbleSpriteTemplate:: @ 8596258 spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 @@ -2862,7 +2862,7 @@ gUnknown_085962A0:: @ 85962A0 .4byte gUnknown_08596288 .align 2 -gUnknown_085962A4:: @ 85962A4 +gBattleAnimSpriteTemplate_85962A4:: @ 85962A4 spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8 .align 2 @@ -3268,15 +3268,15 @@ gUnknown_08596A2C:: @ 8596A2C spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C .align 2 -gUnknown_08596A44:: @ 8596A44 +gLinearStingerSpriteTemplate:: @ 8596A44 spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720 .align 2 -gUnknown_08596A5C:: @ 8596A5C +gPinMissileSpriteTemplate:: @ 8596A5C spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 -gUnknown_08596A74:: @ 8596A74 +gIcicleSpearSpriteTemplate:: @ 8596A74 spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 @@ -3342,7 +3342,7 @@ gUnknown_08596B88:: @ 8596B88 spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38 .align 2 -gUnknown_08596BA0:: @ 8596BA0 +gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0 spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C .align 2 @@ -3500,11 +3500,11 @@ gUnknown_08596DD0:: @ 8596DD0 spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0 .align 2 -gUnknown_08596DE8:: @ 8596DE8 +gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8 spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 -gUnknown_08596E00:: @ 8596E00 +gBattleAnimSpriteTemplate_8596E00:: @ 8596E00 spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 @@ -3533,7 +3533,7 @@ gUnknown_08596E78:: @ 8596E78 .4byte gUnknown_08596E60 .align 2 -gUnknown_08596E7C:: @ 8596E7C +gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064 .align 2 @@ -3705,7 +3705,7 @@ gUnknown_08597130:: @ 8597130 .4byte gUnknown_08597118 .align 2 -gUnknown_08597138:: @ 8597138 +gBattleAnimSpriteTemplate_8597138:: @ 8597138 spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC .align 2 @@ -3774,15 +3774,15 @@ gUnknown_08597254:: @ 8597254 .4byte gUnknown_08597240 .align 2 -gUnknown_0859725C:: @ 859725C +gConfusionDuckSpriteTemplate:: @ 859725C spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C .align 2 -gUnknown_08597274:: @ 8597274 +gSimplePaletteBlendSpriteTemplate:: @ 8597274 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC .align 2 -gUnknown_0859728C:: @ 859728C +gBattleAnimSpriteTemplate_859728C:: @ 859728C spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4 .align 2 @@ -3799,7 +3799,7 @@ gUnknown_085972C0:: @ 85972C0 spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4 .align 2 -gUnknown_085972D8:: @ 85972D8 +gBattleAnimSpriteTemplate_85972D8:: @ 85972D8 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4 .align 2 @@ -3829,11 +3829,11 @@ gUnknown_08597348:: @ 8597348 .4byte gUnknown_08597330 .align 2 -gUnknown_08597358:: @ 8597358 +gBasicHitSplatSpriteTemplate:: @ 8597358 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 .align 2 -gUnknown_08597370:: @ 8597370 +gBattleAnimSpriteTemplate_8597370:: @ 8597370 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420 .align 2 @@ -3845,7 +3845,7 @@ gUnknown_085973A0:: @ 85973A0 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458 .align 2 -gUnknown_085973B8:: @ 85973B8 +gBattleAnimSpriteTemplate_85973B8:: @ 85973B8 spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0 .align 2 diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 0cb95a7e1..660e5774b 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -330,7 +330,7 @@ gUnknown_085CE5A8:: spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 gUnknown_085CE5C0:: spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 -gUnknown_085CE5D8:: +gBattleAnimSpriteTemplate_85CE5D8:: spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 .align 2 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index 07516ba35..5ccf37c54 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -140,7 +140,7 @@ gUnknown_085E5310:: @ 85E5310 .2byte 0x0100, 0x0503, 0x0506, 0x0004 .align 2 -gUnknown_085E5338:: @ 85E5338 +gBattleAnimSpriteTemplate_85E5338:: @ 85E5338 spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C .align 2 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 2d29d26f0..d39bc07c9 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,3 +1,4 @@ +#include "constants/battle.h" #include "constants/battle_anim.h" #include "constants/rgb.h" #include "constants/songs.h" @@ -8,12 +9,12 @@ .section script_data, "aw", %progbits -.align 2 -gMovesWithQuietBGM:: @ 82C8D64 + .align 2 +gMovesWithQuietBGM:: .2byte MOVE_SING, MOVE_PERISH_SONG, MOVE_GRASS_WHISTLE, 0xFFFF -.align 2 -gBattleAnims_Moves:: @ 82C8D6C + .align 2 +gBattleAnims_Moves:: .4byte Move_NONE .4byte Move_POUND .4byte Move_KARATE_CHOP @@ -371,8 +372,8 @@ gBattleAnims_Moves:: @ 82C8D6C .4byte Move_PSYCHO_BOOST .4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost -.align 2 -gBattleAnims_Statuses:: @ 82C92FC + .align 2 +gBattleAnims_StatusConditions:: .4byte Status_Poison .4byte Status_Confusion .4byte Status_Burn @@ -383,211 +384,209 @@ gBattleAnims_Statuses:: @ 82C92FC .4byte Status_Curse .4byte Status_Nightmare -.align 2 -gBattleAnims_VariousTable:: @ 82C9320 - .4byte Anim_CastformTransform - .4byte Anim_StatChange - .4byte Anim_SubsituteOff - .4byte Anim_SubsituteOn - .4byte Anim_PokeblockThrow - .4byte Anim_ItemKnockOff - .4byte Status_Wrap - .4byte Anim_ItemEffect - .4byte Anim_SmokeBallEscape - .4byte Anim_HangedOn - .4byte Anim_Rain - .4byte Anim_Sun - .4byte Anim_Sandstorm - .4byte Anim_Hail - .4byte Status_LeechSeed - .4byte Anim_Hit - .4byte Anim_ItemSteal - .4byte Anim_SnatchMove - .4byte Anim_FutureSightHit - .4byte Anim_DoomDesireHit - .4byte Anim_FocusPunchSetUp - .4byte Status_Ingrain - .4byte Anim_WishHeal - -.align 2 -gBattleAnims_Special:: @ 82C937C - .4byte Anim_LevelUp - .4byte Anim_SwitchOutPlayer - .4byte Anim_SwitchOutOpponent - .4byte Anim_BallThrow - .4byte Anim_SafariBallThrow - .4byte Anim_SubstituteToMon - .4byte Anim_MonToSubstitute + .align 2 +gBattleAnims_General:: + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal + + .align 2 +gBattleAnims_Special:: + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_DOUBLE_SLAP: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_DoubleSlapLeft, Anim_DoubleSlapRight -Anim_DoubleSlapContinue: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim DoubleSlapLeft, DoubleSlapRight +DoubleSlapContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W003, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_DoubleSlapLeft: - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - goto Anim_DoubleSlapContinue - -Anim_DoubleSlapRight: - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 2 - goto Anim_DoubleSlapContinue +DoubleSlapLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + goto DoubleSlapContinue +DoubleSlapRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 2 + goto DoubleSlapContinue Move_POISON_POWDER: loadspritegfx 0x2751 loadspritegfx 0x27A6 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592148, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592148, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592148, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592148, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592148, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592148, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592148, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592148, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592148, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 10, 6 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + delay 15 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gPoisonPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gPoisonPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE: loadspritegfx 0x2754 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592130, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592130, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592130, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592130, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592130, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592130, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592130, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592130, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592130, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 10, 6 + createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + delay 15 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gStunSporeParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gStunSporeParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER: loadspritegfx 0x2753 - loopsewithpan SE_W077, +63, 0xA, 0x6 - createsprite gUnknown_08592118, 0x82, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_08592118, 0x82, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -25, -22, 117, 112, 5, 3 - delay 0xF - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - delay 0x1E - createsprite gUnknown_08592118, 0x82, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_08592118, 0x82, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_08592118, 0x82, -5, -22, 117, 90, -8, 0 - delay 0x14 - createsprite gUnknown_08592118, 0x82, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_08592118, 0x82, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_08592118, 0x82, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_08592118, 0x82, 5, -22, 117, 80, 5, 1 + loopsewithpan SE_W077, +63, 10, 6 + createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -25, -22, 117, 112, 5, 3 + delay 15 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + delay 30 + createsprite gSleepPowderParticleSpriteTemplate, 130, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, -5, -22, 117, 90, -8, 0 + delay 20 + createsprite gSleepPowderParticleSpriteTemplate, 130, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, 130, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, 130, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SWIFT: loadspritegfx 0x27BE - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 20, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 5, 22, -18, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 5, 22, -18, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, -10, 22, 15, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 18, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, -10, 22, 15, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, -20, 1 + delay 5 playsewithpan SE_W129, -64 - createsprite gUnknown_08592404, 0x83, 20, -10, 20, 0, 22, 12, 1 - delay 0x5 + createsprite gSwiftStarSpriteTemplate, 131, 20, -10, 20, 0, 22, 12, 1 + delay 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_STRENGTH: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createvisualtask sub_80D5644, 0x5, 0, 2, 0, 96, 30 + createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 4 - createvisualtask sub_80D5830, 0x2, 1, 18, 6, 2, 4 - delay 0x4 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 4 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 16, 12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, 16, 12, 1, 1 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, -16, -12, 1, 1 - delay 0x4 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, -12, 1, 1 + delay 4 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 3, 4, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 3, 4, 1, 1 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_TACKLE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -595,26 +594,26 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE70, 0x2, 0, 26, 0, 0, 5 - delay 0x6 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0xA, 0x2 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 + delay 11 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 26, 0, 0, 5 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 + loopsewithpan SE_W025B, +63, 10, 2 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -624,107 +623,105 @@ Move_SUPERSONIC: loadspritegfx 0x27B3 monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 - call Anim_Supersonic1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 + call Supersonic1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -Anim_Supersonic1: +Supersonic1: playsewithpan SE_W048, -64 - createsprite gUnknown_08593428, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gSupersonicWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_SCREECH: loadspritegfx 0x27B4 - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 2, 1 - call Anim_Screech1 - call Anim_Screech1 - delay 0x10 - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 2, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 + call Screech1 + call Screech1 + delay 16 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_TARGET waitforvisualfinish end - -Anim_Screech1: +Screech1: playsewithpan SE_W103, -64 - createsprite gUnknown_08593440, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 + createsprite gScreechWaveSpriteTemplate, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FLAME_WHEEL: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 0 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 4 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 4 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 8 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 8 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 12 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 12 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 16 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 16 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 20 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 20 playsewithpan SE_W172, -64 - delay 0x2 - createsprite gUnknown_08595584, 0x3, 0, 0, 56, 24 + delay 2 + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 24 playsewithpan SE_W172, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 - createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + delay 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1 playsewithpan SE_W172B, +63 - call Anim_FireMoveEffect - delay 0x7 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 9 + call FireMoveEffect + delay 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 9 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_FlameWheel1: @ Unused - createsprite gUnknown_08595584, 0x3, 0, 0, 50 - delay 0x4 +FlameWheel1: @ Unused + createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 50 + delay 4 return Move_PIN_MISSILE: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W026, -64 - createsprite gUnknown_08596A5C, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A5C, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + delay 15 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 0x9 - createsprite gUnknown_08596A5C, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -732,104 +729,104 @@ Move_PIN_MISSILE: Move_ICICLE_SPEAR: loadspritegfx 0x2816 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W196, -64 - createsprite gUnknown_08596A74, 0x2, 20, -8, -8, -8, 20, -32 - delay 0xF - createsprite gUnknown_08596A74, 0x2, 20, -8, 8, 8, 20, -40 - delay 0x4 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, -8, -8, 20, -32 + delay 15 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 8, 8, 20, -40 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, -8, -8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 delay 0x9 - createsprite gUnknown_08596A74, 0x2, 20, -8, 0, 0, 20, -32 - delay 0x4 + createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 + delay 4 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 + delay 14 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 2, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_TAKE_DOWN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -24, 8, 23, 10, 40, 10 - delay 0x23 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 - createsprite gUnknown_08597358, 0x4, -10, 0, 1, 0 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 + delay 35 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 playsewithpan SE_W025B, +63 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 waitforvisualfinish - delay 0x2 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + delay 2 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_EDGE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W129, -64 - createsprite gUnknown_0859728C, 0x2, 2, 4, 2, 0x7FFF, 10, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 2, 4, 2, 0x7FFF, 10, 0, 0 waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W207, -64 - waitplaysewithpan SE_W207, -64, 0x8 - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4 + waitplaysewithpan SE_W207, -64, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 16, 16, RGB_WHITE + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 3 waitforvisualfinish playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -32, 0, 0, 3 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -32, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 0 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0 - createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE + createvisualtask sub_80D6134, 2, 8, -256, 0, 0 + createvisualtask sub_80D6134, 2, 8, -256, 1, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1 - createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1 + createvisualtask sub_80D6134, 2, 8, -256, 0, 1 + createvisualtask sub_80D6134, 2, 8, -256, 1, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish end Move_POISON_STING: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27A6 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_08596A44, 0x82, 20, 0, -8, 0, 20 + createsprite gLinearStingerSpriteTemplate, 130, 20, 0, -8, 0, 20 waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 playsewithpan SE_W030, +63 waitforvisualfinish - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -837,19 +834,19 @@ Move_POISON_STING: Move_TWINEEDLE: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W013B, -64, 0x6, 0x2 - createsprite gUnknown_08596A44, 0x82, 10, -4, 0, -4, 20 - createsprite gUnknown_08596A44, 0x82, 20, 12, 10, 12, 20 - delay 0x14 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 5, 1 - createsprite gUnknown_08597370, 0x3, 0, -4, 1, 3 - loopsewithpan SE_W030, +63, 0x5, 0x2 - delay 0x1 - createsprite gUnknown_08597370, 0x3, 10, 12, 1, 3 + setalpha 12, 8 + loopsewithpan SE_W013B, -64, 6, 2 + createsprite gLinearStingerSpriteTemplate, 130, 10, -4, 0, -4, 20 + createsprite gLinearStingerSpriteTemplate, 130, 20, 12, 10, 12, 20 + delay 20 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, -4, 1, 3 + loopsewithpan SE_W030, +63, 5, 2 + delay 1 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 10, 12, 1, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -858,349 +855,338 @@ Move_TWINEEDLE: Move_FIRE_BLAST: loadspritegfx 0x272D createsoundtask sub_8158B30, 144, 145 - call Anim_FireBlast1 - call Anim_FireBlast1 - call Anim_FireBlast1 - delay 0x18 - createvisualtask sub_8116620, 0xA, 1, 3, 0, 8, RGB_BLACK - waitforvisualfinish - delay 0x13 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 20, 1 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - delay 0x3 - call Anim_FireBlast2 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 2, 8, 0, RGB_BLACK - waitforvisualfinish - end - -Anim_FireBlast1: - createsprite gUnknown_0859551C, 0x82, 0, 0, 0 - createsprite gUnknown_0859551C, 0x82, 0, 0, 51 - createsprite gUnknown_0859551C, 0x82, 0, 0, 102 - createsprite gUnknown_0859551C, 0x82, 0, 0, 153 - createsprite gUnknown_0859551C, 0x82, 0, 0, 204 - delay 0x5 + call FireBlast1 + call FireBlast1 + call FireBlast1 + delay 24 + createvisualtask sub_8116620, 10, 1, 3, 0, 8, RGB_BLACK + waitforvisualfinish + delay 19 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 20, 1 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + delay 3 + call FireBlast2 + waitforvisualfinish + createvisualtask sub_8116620, 10, 1, 2, 8, 0, RGB_BLACK + waitforvisualfinish + end + +FireBlast1: + createsprite gUnknown_0859551C, 130, 0, 0, 0 + createsprite gUnknown_0859551C, 130, 0, 0, 51 + createsprite gUnknown_0859551C, 130, 0, 0, 102 + createsprite gUnknown_0859551C, 130, 0, 0, 153 + createsprite gUnknown_0859551C, 130, 0, 0, 204 + delay 5 return -Anim_FireBlast2: - createsprite gUnknown_0859556C, 0x82, 0, 0, 10, 0, -2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, -2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 13, 2, 0 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, -2, 2 - createsprite gUnknown_0859556C, 0x82, 0, 0, 15, 2, 2 +FireBlast2: + createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2 + createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0 + createsprite gUnknown_0859556C, 130, 0, 0, 13, 2, 0 + createsprite gUnknown_0859556C, 130, 0, 0, 15, -2, 2 + createsprite gUnknown_0859556C, 130, 0, 0, 15, 2, 2 return Move_LEECH_SEED: loadspritegfx 0x2716 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, 0, 24, 35, -32 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 + delay 8 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, -16, 24, 35, -40 - delay 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, -16, 24, 35, -40 + delay 8 playsewithpan SE_W077, -64 - createsprite gUnknown_085922BC, 0x82, 15, 0, 16, 24, 35, -37 - delay 0xC - loopsewithpan SE_W039, +63, 0xA, 0x8 + createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 16, 24, 35, -37 + delay 12 + loopsewithpan SE_W039, +63, 10, 8 waitforvisualfinish end Move_EMBER: loadspritegfx 0x272D - loopsewithpan SE_W052, -64, 0x5, 0x2 - createsprite gUnknown_085954D4, 0x82, 20, 0, -16, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 0, 24, 20, 1 - delay 0x4 - createsprite gUnknown_085954D4, 0x82, 20, 0, 16, 24, 20, 1 - delay 0x10 + loopsewithpan SE_W052, -64, 5, 2 + createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 + delay 4 + createsprite gEmberSpriteTemplate, 130, 20, 0, 0, 24, 20, 1 + delay 4 + createsprite gEmberSpriteTemplate, 130, 20, 0, 16, 24, 20, 1 + delay 16 playsewithpan SE_W172, +63 - call Anim_Ember1 - call Anim_Ember1 - call Anim_Ember1 + call Ember1 + call Ember1 + call Ember1 end -Anim_Ember1: - createsprite gUnknown_085954EC, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Ember1: + createsprite gEmberFlareSpriteTemplate, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Move_MEGA_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x32 - call Anim_SetImpactBackground - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 0, 50 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 50 + call SetImpactBackground + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end - -Anim_SetImpactBackground: - delay 0x2 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_SetImpactContestsBG - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_SetImpactOpponentBG - jumprettrue Anim_SetImpactPlayerBG - -Anim_SetImpactBackgroundRet: +SetImpactBackground: + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetImpactContestsBG + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetImpactOpponentBG + jumprettrue SetImpactPlayerBG +SetImpactBackgroundRet: return - -Anim_SetImpactOpponentBG: +SetImpactOpponentBG: changebg BG_IMPACT_OPPONENT - goto Anim_SetImpactBackgroundRet - -Anim_SetImpactPlayerBG: + goto SetImpactBackgroundRet +SetImpactPlayerBG: changebg BG_IMPACT_PLAYER - goto Anim_SetImpactBackgroundRet - -Anim_SetImpactContestsBG: + goto SetImpactBackgroundRet +SetImpactContestsBG: changebg BG_IMPACT_CONTESTS - goto Anim_SetImpactBackgroundRet + goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - delay 0x2 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK - setalpha 0x80C + delay 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x32 + createsprite gMegaPunchKickSpriteTemplate, 3, 0, 0, 1, 50 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 50 playsewithpan SE_W025B, +63 - call Anim_SetImpactBackground - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 22, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + call SetImpactBackground + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x2 + delay 2 restorebg waitbgfadein end Move_COMET_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_CometPunchLeft, Anim_CometPunchRight -Anim_CometPunchContinue: - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + choosetwoturnanim CometPunchLeft, CometPunchRight +CometPunchContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_CometPunchLeft: - createsprite gUnknown_08597358, 0x2, -8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, -8, 0, 8, 1, 0 - goto Anim_CometPunchContinue - -Anim_CometPunchRight: - createsprite gUnknown_08597358, 0x2, 8, -8, 1, 2 - createsprite gUnknown_08595E98, 0x3, 8, 0, 8, 1, 0 - goto Anim_CometPunchContinue +CometPunchLeft: + createsprite gBasicHitSplatSpriteTemplate, 2, -8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, -8, 0, 8, 1, 0 + goto CometPunchContinue +CometPunchRight: + createsprite gBasicHitSplatSpriteTemplate, 2, 8, -8, 1, 2 + createsprite gFistFootSpriteTemplate, 3, 8, 0, 8, 1, 0 + goto CometPunchContinue Move_SONIC_BOOM: - loadspritegfx 0x2713 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - call Anim_SonicBoom1 - call Anim_SonicBoom1 - call Anim_SonicBoom1 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 10, 1 - call Anim_SonicBoom2 + setalpha 12, 8 + call SonicBoom1 + call SonicBoom1 + call SonicBoom1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 + call SonicBoom2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_SonicBoom1: +SonicBoom1: playsewithpan SE_W013B, -64 - createsprite gUnknown_08593398, 0x82, 16, 0, 0, 0, 15 - delay 0x4 + createsprite gSonicBoomSpriteTemplate, 130, 16, 0, 0, 0, 15 + delay 4 return - -Anim_SonicBoom2: - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 - delay 0x4 +SonicBoom2: + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 + delay 4 return Move_THUNDER_SHOCK: - loadspritegfx 0x2711 - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_011 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -44, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -44, 0 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - call Anim_ParalysisEffect + delay 20 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDERBOLT: - loadspritegfx 0x2711 - loadspritegfx 0x282A - loadspritegfx 0x271B - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_011 + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 24, -52, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 24, -52, 0 playsewithpan SE_W085, +63 - delay 0x7 - createvisualtask sub_810A7DC, 0x5, -24, -52, 0 + delay 7 + createvisualtask sub_810A7DC, 5, -24, -52, 0 playsewithpan SE_W085, +63 - delay 0x7 - createvisualtask sub_810A7DC, 0x5, 0, -60, 1 + delay 7 + createvisualtask sub_810A7DC, 5, 0, -60, 1 playsewithpan SE_W085, +63 delay 0x9 - createvisualtask sub_8116620, 0xA, 4, 0, 0, 13, RGB_BLACK - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 13, 0, RGB_BLACK - waitforvisualfinish - delay 0x14 - createsprite gUnknown_085957E0, 0x83, 44, 0, 0, 3 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gUnknown_085957F8, 0x84, 0, 0, 16, 44, 224, 40, 2, -32765 + createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK + waitforvisualfinish + createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK + waitforvisualfinish + delay 20 + createsprite gBattleAnimSpriteTemplate_85957E0, 131, 44, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite gBattleAnimSpriteTemplate_85957F8, 132, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, +63 - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 2, 2, RGB_BLACK - delay 0x6 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 6, RGB_BLACK + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 2, 2, RGB_BLACK + delay 6 + createvisualtask sub_8116620, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish - delay 0x14 - waitplaysewithpan SE_W085B, +63, 0x13 - call Anim_ParalysisEffect + delay 20 + waitplaysewithpan SE_W085B, +63, 19 + call ElectricityEffect waitforvisualfinish - delay 0x14 - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + delay 20 + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDER_WAVE: - loadspritegfx 0x2711 - loadspritegfx 0x271B + loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_011 loadspritegfx 0x27BD - createvisualtask sub_8116620, 0xA, 1, 0, 0, 6, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish - delay 0xA - createvisualtask sub_810A7DC, 0x5, 0, -48, 0 + delay 10 + createvisualtask sub_810A7DC, 5, 0, -48, 0 playsewithpan SE_W086, +63 - delay 0x14 - loopsewithpan SE_W085B, +63, 0xA, 0x4 - createsprite gUnknown_08595840, 0x82, -16, -16 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 0 - delay 0x4 - createsprite gUnknown_08595840, 0x82, -16, 16 + delay 20 + loopsewithpan SE_W085B, +63, 10, 4 + createsprite gUnknown_08595840, 130, -16, -16 + delay 4 + createsprite gUnknown_08595840, 130, -16, 0 + delay 4 + createsprite gUnknown_08595840, 130, -16, 16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 6, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_BEAT_UP: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_TARGET - setalpha 0x80C - choosetwoturnanim Anim_BeatUpLeft, Anim_BeatUpRight -Anim_BeatUpContinue: + setalpha 12, 8 + choosetwoturnanim BeatUpLeft, BeatUpRight +BeatUpContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_BeatUpLeft: - createsprite gUnknown_08597358, 0x82, -20, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, -20, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 +BeatUpLeft: + createsprite gBasicHitSplatSpriteTemplate, 130, -20, -20, 1, 2 + createsprite gFistFootSpriteTemplate, 131, -20, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, 8, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + createsprite gFistFootSpriteTemplate, 131, 8, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto Anim_BeatUpContinue - -Anim_BeatUpRight: - createsprite gUnknown_08597358, 0x82, 12, -20, 1, 2 - createsprite gUnknown_08595E98, 0x83, 12, -12, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + goto BeatUpContinue +BeatUpRight: + createsprite gBasicHitSplatSpriteTemplate, 130, 12, -20, 1, 2 + createsprite gFistFootSpriteTemplate, 131, 12, -12, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x82, -12, 0, 1, 2 - createsprite gUnknown_08595E98, 0x83, -12, 8, 8, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 130, -12, 0, 1, 2 + createsprite gFistFootSpriteTemplate, 131, -12, 8, 8, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 - goto Anim_BeatUpContinue + goto BeatUpContinue Move_STOMP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, +63 - createsprite gUnknown_08595F60, 0x3, 0, -32, 15 - delay 0x13 - createsprite gUnknown_08597358, 0x2, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 4, 9, 1 + createsprite gUnknown_08595F60, 3, 0, -32, 15 + delay 19 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -1208,19 +1194,19 @@ Move_STOMP: end Move_TAIL_WHIP: - loopsewithpan SE_W039, -64, 0x18, 0x3 - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 2, 3 + loopsewithpan SE_W039, -64, 24, 3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3 waitforvisualfinish end Move_CUT: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W015, +63 - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1230,109 +1216,107 @@ Move_CUT: Move_HIDDEN_POWER: loadspritegfx 0x27E9 playsewithpan SE_W036, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1 - delay 0x4 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 + delay 30 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1 + delay 4 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 playsewithpan SE_W179, -64 - createsprite gUnknown_08593A04, 0x2, 26, 0 - createsprite gUnknown_08593A04, 0x2, 26, 42 - createsprite gUnknown_08593A04, 0x2, 26, 84 - createsprite gUnknown_08593A04, 0x2, 26, 126 - createsprite gUnknown_08593A04, 0x2, 26, 168 - createsprite gUnknown_08593A04, 0x2, 26, 210 - delay 0x34 - setarg 0x7, 0xFFFF + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 0 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 42 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 84 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 126 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 + createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 + delay 52 + setarg 7, 0xFFFF playsewithpan SE_W115, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 - createsprite gUnknown_08593A1C, 0x82, 0 - createsprite gUnknown_08593A1C, 0x82, 32 - createsprite gUnknown_08593A1C, 0x82, 64 - createsprite gUnknown_08593A1C, 0x82, 96 - createsprite gUnknown_08593A1C, 0x82, 128 - createsprite gUnknown_08593A1C, 0x82, 160 - createsprite gUnknown_08593A1C, 0x82, 192 - createsprite gUnknown_08593A1C, 0x82, 224 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 32 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 64 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 96 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 128 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 160 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 192 + createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 224 end Move_REVERSAL: loadspritegfx 0x27FC - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W197, -64 - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 0x7FFF, 8, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 0x7FFF, 8, 0, 0 waitforvisualfinish - delay 0x1E - createvisualtask sub_8115A04, 0x2, 31, 3, 2, 0, 10, RGB_WHITE - delay 0xA + delay 30 + createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE + delay 10 playsewithpan SE_W179, -64 - createsprite gUnknown_085CE5D8, 0x2, 26, 0 - createsprite gUnknown_085CE5D8, 0x2, 26, 42 - createsprite gUnknown_085CE5D8, 0x2, 26, 84 - createsprite gUnknown_085CE5D8, 0x2, 26, 126 - createsprite gUnknown_085CE5D8, 0x2, 26, 168 - createsprite gUnknown_085CE5D8, 0x2, 26, 210 - waitforvisualfinish - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x8 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 0 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 42 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 84 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 126 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 168 + createsprite gBattleAnimSpriteTemplate_85CE5D8, 2, 26, 210 + waitforvisualfinish + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 8 playsewithpan SE_W233B, +63 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 8, 0, 0 - createsprite gUnknown_08595E98, 0x84, 0, 0, 10, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 8, 0, 0 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 end Move_PURSUIT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - delay 0x0 - setalpha 0x80C - choosetwoturnanim Anim_PursuitNormal, Anim_PursuitOnSwitchout -Anim_PursuitContinue: + delay 0 + setalpha 12, 8 + choosetwoturnanim PursuitNormal, PursuitOnSwitchout +PursuitContinue: waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x0 + delay 0 restorebg waitbgfadein end - -Anim_PursuitNormal: +PursuitNormal: playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto Anim_PursuitContinue - -Anim_PursuitOnSwitchout: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue +PursuitOnSwitchout: playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D6388, 0x5, 0, 1, 6, 1, 0 - goto Anim_PursuitContinue + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask sub_80D6388, 5, 0, 1, 6, 1, 0 + goto PursuitContinue Move_SPIKE_CANNON: loadspritegfx 0x27B1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5C50, 0x5, 0, -4, 0, 4, 6, 8, 4 + setalpha 12, 8 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, -64, 0x5, 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - createsprite gUnknown_08596A44, 0x2, 10, -8, -8, -8, 20 - createsprite gUnknown_08596A44, 0x2, 18, 0, 0, 0, 20 - createsprite gUnknown_08596A44, 0x2, 26, 8, 8, 8, 20 + loopsewithpan SE_W013B, -64, 5, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + createsprite gLinearStingerSpriteTemplate, 2, 10, -8, -8, -8, 20 + createsprite gLinearStingerSpriteTemplate, 2, 18, 0, 0, 0, 20 + createsprite gLinearStingerSpriteTemplate, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite gUnknown_08597370, 0x3, -8, -8, 1, 2 - createsprite gUnknown_08597370, 0x3, 0, 0, 1, 2 - createsprite gUnknown_08597370, 0x3, 8, 8, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, +63, 0x5, 0x3 + createsprite gBattleAnimSpriteTemplate_8597370, 3, -8, -8, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 0, 0, 1, 2 + createsprite gBattleAnimSpriteTemplate_8597370, 3, 8, 8, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 + loopsewithpan SE_W030, +63, 5, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1341,194 +1325,188 @@ Move_SPIKE_CANNON: Move_SWORDS_DANCE: loadspritegfx 0x2715 monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W014, -64 - createvisualtask sub_80D5830, 0x2, 0, 16, 6, 1, 4 - createsprite gUnknown_08593380, 0x2, 0, 0 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 + createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 delay 0x16 - createvisualtask sub_8115D94, 0x2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 + createvisualtask sub_8115D94, 2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 end Move_PSYCH_UP: loadspritegfx 0x27D4 monbg ANIM_ATK_PARTNER - createvisualtask sub_8115B0C, 0x2, 1, 2, 6, 1, 11, 0 - setalpha 0x80C - loopsewithpan SE_W060B, -64, 0x5, 0xA - createsprite gUnknown_08596548, 0x2, 0, 0, 0, 0 - createvisualtask sub_80D5EB8, 0x5, 0, 5, 2560, 8, 0 - delay 0x7F - delay 0x4 + createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 + setalpha 12, 8 + loopsewithpan SE_W060B, -64, 5, 10 + createsprite gUnknown_08596548, 2, 0, 0, 0, 0 + createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER + delay 127 + delay 4 playsewithpan SE_W060, -64 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, RGB_YELLOW - delay 0x1E + delay 30 clearmonbg ANIM_ATK_PARTNER blendoff waitforvisualfinish end Move_DIZZY_PUNCH: - loadspritegfx 0x2759 - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - call Anim_DizzyPunch1 - createsprite gUnknown_08595E98, 0x85, 16, 8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, 16, 0, 1, 1 + setalpha 12, 8 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 0x85, 16, 8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 playsewithpan SE_W004, +63 - createsprite gUnknown_08595F78, 0x83, 16, 8, 160, -32 - createsprite gUnknown_08595F78, 0x83, 16, 8, -256, -40 - createsprite gUnknown_08595F78, 0x83, 16, 8, 128, -16 - createsprite gUnknown_08595F78, 0x83, 16, 8, 416, -38 - createsprite gUnknown_08595F78, 0x83, 16, 8, -128, -22 - createsprite gUnknown_08595F78, 0x83, 16, 8, -384, -31 - delay 0xA - call Anim_DizzyPunch1 - createsprite gUnknown_08595E98, 0x85, -16, -8, 20, 1, 0 - createsprite gUnknown_08597358, 0x84, -16, -16, 1, 1 + createsprite gUnknown_08595F78, 131, 16, 8, 160, -32 + createsprite gUnknown_08595F78, 131, 16, 8, -256, -40 + createsprite gUnknown_08595F78, 131, 16, 8, 128, -16 + createsprite gUnknown_08595F78, 131, 16, 8, 416, -38 + createsprite gUnknown_08595F78, 131, 16, 8, -128, -22 + createsprite gUnknown_08595F78, 131, 16, 8, -384, -31 + delay 10 + call DizzyPunch1 + createsprite gFistFootSpriteTemplate, 0x85, -16, -8, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08595F78, 0x83, -16, -8, 160, -32 - createsprite gUnknown_08595F78, 0x83, -16, -8, -256, -40 - createsprite gUnknown_08595F78, 0x83, -16, -8, 128, -16 - createsprite gUnknown_08595F78, 0x83, -16, -8, 416, -38 - createsprite gUnknown_08595F78, 0x83, -16, -8, -128, -22 - createsprite gUnknown_08595F78, 0x83, -16, -8, -384, -31 + createsprite gUnknown_08595F78, 131, -16, -8, 160, -32 + createsprite gUnknown_08595F78, 131, -16, -8, -256, -40 + createsprite gUnknown_08595F78, 131, -16, -8, 128, -16 + createsprite gUnknown_08595F78, 131, -16, -8, 416, -38 + createsprite gUnknown_08595F78, 131, -16, -8, -128, -22 + createsprite gUnknown_08595F78, 131, -16, -8, -384, -31 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_DizzyPunch1: - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 7, 1 +DizzyPunch1: + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 return Move_FIRE_SPIN: loadspritegfx 0x272D playsewithpan SE_W221B, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 47, 1 - call Anim_FireSpinEffect - call Anim_FireSpinEffect - call Anim_FireSpinEffect - waitforvisualfinish - end - -Anim_FireSpinEffect: - createsprite gUnknown_08596B88, 0x82, 0, 28, 528, 30, 13, 50, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 32, 480, 20, 16, -46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 576, 20, 8, 42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 31, 400, 25, 11, -42, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 28, 512, 25, 16, 46, 1 - delay 0x2 - createsprite gUnknown_08596B88, 0x82, 0, 33, 464, 30, 15, -50, 1 - delay 0x2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 + call FireSpinEffect + call FireSpinEffect + call FireSpinEffect + waitforvisualfinish + end + +FireSpinEffect: + createsprite gUnknown_08596B88, 130, 0, 28, 528, 30, 13, 50, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 32, 480, 20, 16, -46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 576, 20, 8, 42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 31, 400, 25, 11, -42, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 28, 512, 25, 16, 46, 1 + delay 2 + createsprite gUnknown_08596B88, 130, 0, 33, 464, 30, 15, -50, 1 + delay 2 return Move_FURY_CUTTER: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013, +63 - createvisualtask AnimTask_IsFuryCutterHitRight, 0x2 - jumpretfalse Anim_FuryCutterLeft - goto Anim_FuryCutterRight -Anim_FuryCutterContinue: - createvisualtask AnimTask_GetFuryCutterHitCount, 0x2 - jumpreteq 0x1, Anim_FuryCutterContinue2 - jumpreteq 0x2, Anim_FuryCutterMedium - jumpreteq 0x3, Anim_FuryCutterStrong - goto Anim_FuryCutterStrongest -Anim_FuryCutterContinue2: - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 + createvisualtask AnimTask_IsFuryCutterHitRight, 2 + jumpretfalse FuryCutterLeft + goto FuryCutterRight +FuryCutterContinue: + createvisualtask AnimTask_GetFuryCutterHitCount, 2 + jumpreteq 1, FuryCutterContinue2 + jumpreteq 2, FuryCutterMedium + jumpreteq 3, FuryCutterStrong + goto FuryCutterStrongest +FuryCutterContinue2: + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - -Anim_FuryCutterLeft: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 - goto Anim_FuryCutterContinue - -Anim_FuryCutterRight: - createsprite gUnknown_08592A1C, 0x2, 40, -32, 1 - goto Anim_FuryCutterContinue - -Anim_FuryCutterMedium: - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 - -Anim_FuryCutterStrong: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 - -Anim_FuryCutterStrongest: - createsprite gUnknown_0859728C, 0x2, 31, 3, 3, 10505, 4, 0, 0 - goto Anim_FuryCutterContinue2 +FuryCutterLeft: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 + goto FuryCutterContinue +FuryCutterRight: + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 + goto FuryCutterContinue +FuryCutterMedium: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 10505, 4, 0, 0 + goto FuryCutterContinue2 +FuryCutterStrong: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + goto FuryCutterContinue2 +FuryCutterStrongest: + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + goto FuryCutterContinue2 Move_SELF_DESTRUCT: loadspritegfx 0x27D6 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_RED - createvisualtask sub_80D52D0, 0x5, 4, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 5, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 6, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 7, 6, 0, 38, 1 - createvisualtask sub_80D52D0, 0x5, 8, 6, 0, 38, 1 - call Anim_SelfDestruct1 - call Anim_SelfDestruct1 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 9, 0, RGB_RED - end - -Anim_SelfDestruct1: + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED + createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 + call SelfDestruct1 + call SelfDestruct1 + waitforvisualfinish + createvisualtask sub_8116620, 10, 2, 1, 9, 0, RGB_RED + end +SelfDestruct1: playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W120, -64 - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_SLAM: loadspritegfx 0x2748 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W004, -64 - createsprite gUnknown_0857FE70, 0x2, 0, 20, 3, 0, 4 - delay 0x1 - createsprite gUnknown_085928D0, 0x2, 0, 0 - delay 0x3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 3, 0, 4 + delay 1 + createsprite gUnknown_085928D0, 2, 0, 0 + delay 3 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1537,157 +1515,157 @@ Move_SLAM: Move_VINE_WHIP: loadspritegfx 0x282F playsewithpan SE_W026, -64 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 6 playsewithpan SE_W010, +63 - createsprite gUnknown_085928E8, 0x82, 0, 0 - delay 0x6 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 1 + createsprite gUnknown_085928E8, 130, 0, 0 + delay 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1 end Move_DRILL_PECK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27B2 - createsprite gUnknown_08592CD8, 0x2, 0 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - delay 0x2 - loopsewithpan SE_W030, +63, 0x4, 0x8 - createvisualtask sub_810EB88, 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + delay 2 + loopsewithpan SE_W030, +63, 4, 8 + createvisualtask sub_810EB88, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_08592CD8, 0x2, 2 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 waitforvisualfinish end Move_WATERFALL: loadspritegfx 0x27A4 - loadspritegfx 0x27AB - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 23, 1 - delay 0x5 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 + delay 5 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 10, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 10, 10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -15, 0, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -15, 0, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 20, 10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 20, 10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 0, -10, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 0, -10, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -10, 15, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -10, 15, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 25, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, 25, 20, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, -20, 20, 25, 0 - delay 0x4 + createsprite gUnknown_08595238, 2, -20, 20, 25, 0 + delay 4 playsewithpan SE_W152, -64 - createsprite gUnknown_08595238, 0x2, 12, 0, 25, 0 + createsprite gUnknown_08595238, 2, 12, 0, 25, 0 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 6, 5 - delay 0x6 - call Anim_UnderWaterAttack1 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 5 + delay 6 + call UnderWaterAttack1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_UnderWaterAttack1: +UnderWaterAttack1: playsewithpan SE_W127, +63 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 17, 1 - createsprite gUnknown_08597388, 0x3, 0, 20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 20 - createsprite gUnknown_08595250, 0x4, 0, 20 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 15 - createsprite gUnknown_08595250, 0x4, 0, 15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 10 - createsprite gUnknown_08595250, 0x4, 0, 10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 5 - createsprite gUnknown_08595250, 0x4, 0, 5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, 0 - createsprite gUnknown_08595250, 0x4, 0, 0 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -5, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -5 - createsprite gUnknown_08595250, 0x4, 0, -5 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -10, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -10 - createsprite gUnknown_08595250, 0x4, 0, -10 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -15, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -15 - createsprite gUnknown_08595250, 0x4, 0, -15 - delay 0x2 - createsprite gUnknown_08597388, 0x3, 0, -20, 1, 1 - createsprite gUnknown_08595250, 0x4, 0, -20 - createsprite gUnknown_08595250, 0x4, 0, -20 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1 + createsprite gUnknown_08597388, 3, 0, 20, 1, 1 + createsprite gUnknown_08595250, 4, 0, 20 + createsprite gUnknown_08595250, 4, 0, 20 + delay 2 + createsprite gUnknown_08597388, 3, 0, 15, 1, 1 + createsprite gUnknown_08595250, 4, 0, 15 + createsprite gUnknown_08595250, 4, 0, 15 + delay 2 + createsprite gUnknown_08597388, 3, 0, 10, 1, 1 + createsprite gUnknown_08595250, 4, 0, 10 + createsprite gUnknown_08595250, 4, 0, 10 + delay 2 + createsprite gUnknown_08597388, 3, 0, 5, 1, 1 + createsprite gUnknown_08595250, 4, 0, 5 + createsprite gUnknown_08595250, 4, 0, 5 + delay 2 + createsprite gUnknown_08597388, 3, 0, 0, 1, 1 + createsprite gUnknown_08595250, 4, 0, 0 + createsprite gUnknown_08595250, 4, 0, 0 + delay 2 + createsprite gUnknown_08597388, 3, 0, -5, 1, 1 + createsprite gUnknown_08595250, 4, 0, -5 + createsprite gUnknown_08595250, 4, 0, -5 + delay 2 + createsprite gUnknown_08597388, 3, 0, -10, 1, 1 + createsprite gUnknown_08595250, 4, 0, -10 + createsprite gUnknown_08595250, 4, 0, -10 + delay 2 + createsprite gUnknown_08597388, 3, 0, -15, 1, 1 + createsprite gUnknown_08595250, 4, 0, -15 + createsprite gUnknown_08595250, 4, 0, -15 + delay 2 + createsprite gUnknown_08597388, 3, 0, -20, 1, 1 + createsprite gUnknown_08595250, 4, 0, -20 + createsprite gUnknown_08595250, 4, 0, -20 return Move_EXPLOSION: loadspritegfx 0x27D6 - createsprite gUnknown_0859728C, 0x2, 1, 8, 9, 8474, 8, 0, 8 - createvisualtask sub_80D52D0, 0x5, 4, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 5, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 6, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 7, 8, 0, 40, 1 - createvisualtask sub_80D52D0, 0x5, 8, 8, 0, 40, 1 - call Anim_Explosion1 - call Anim_Explosion1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 8, 9, 8474, 8, 0, 8 + createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 + createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 + call Explosion1 + call Explosion1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 1, 16, 16, RGB_WHITE - delay 0x32 - createvisualtask sub_8116620, 0xA, 1, 3, 16, 0, RGB_WHITE + createvisualtask sub_8116620, 10, 1, 1, 16, 16, RGB_WHITE + delay 50 + createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE end -Anim_Explosion1: +Explosion1: playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 0, 0, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 24, -24, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, -16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, -24, -12, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 0, 1 + delay 6 playsewithpan SE_W153, -64 - createsprite gUnknown_0859371C, 0x3, 16, 16, 0, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 0, 1 + delay 6 return Move_DEFENSE_CURL: loadspritegfx 0x27FA - loopsewithpan SE_W161, -64, 0x12, 0x3 - createvisualtask sub_811489C, 0x5, 0, 0 - createvisualtask sub_815B338, 0x5 + loopsewithpan SE_W161, -64, 0x12, 3 + createvisualtask sub_811489C, 5, 0, 0 + createvisualtask sub_815B338, 5 waitforvisualfinish - createsprite gUnknown_085CE338, 0x2, 0, 6, 0, 1 + createsprite gUnknown_085CE338, 2, 0, 6, 0, 1 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 waitforvisualfinish end @@ -1695,149 +1673,145 @@ Move_PROTECT: loadspritegfx 0x2828 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - waitplaysewithpan SE_W115, -64, 0x10 - createsprite gUnknown_08592ADC, 0x2, 24, 0, 90 + waitplaysewithpan SE_W115, -64, 16 + createsprite gUnknown_08592ADC, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_DETECT: loadspritegfx 0x2757 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, RGB_WHITE + createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE delay 0x12 playsewithpan SE_W197, -64 createsprite gUnknown_0853EE84, 0xD, 20, -20 waitforvisualfinish - delay 0xA - createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK - createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, RGB_WHITE + delay 10 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2767 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask AnimTask_GetHappinessPowerLevel, 0x1 - jumpreteq 0x0, Anim_Frustration_Strongest - jumpreteq 0x1, Anim_Frustration_Strong - jumpreteq 0x2, Anim_Frustration_Medium - goto Anim_Frustration_Weak -Anim_Frustration_Continue: + setalpha 12, 8 + createvisualtask AnimTask_GetFrustrationPowerLevel, 1 + jumpreteq 0, Frustration_Strongest + jumpreteq 1, Frustration_Strong + jumpreteq 2, Frustration_Medium + goto Frustration_Weak +Frustration_Continue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_Frustration_Strongest: +Frustration_Strongest: playsewithpan SE_W082, -64 - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0xA - createvisualtask sub_80D5EB8, 0x5, 0, 16, 6144, 8, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 30, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 + delay 10 + createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, ANIM_ATTACKER + delay 5 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 24, 8, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 24, 8, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, -24, -16, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -24, -16, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 8, 4, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 8, 4, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, -16, 19, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, -16, 19, 1, 0 playsewithpan SE_W004, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, -18, 1, 0 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, -18, 1, 0 playsewithpan SE_W004, +63 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto Anim_Frustration_Continue - -Anim_Frustration_Strong: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Strong: playsewithpan SE_W082, -64 - createvisualtask sub_80D52D0, 0x5, 0, 1, 0, 15, 1 - createvisualtask sub_8116620, 0xA, 2, 3, 0, 9, 31 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1 + createvisualtask sub_8116620, 10, 2, 3, 0, 9, 31 waitforvisualfinish - delay 0x14 + delay 20 playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createvisualtask sub_815C3A8, 0x5 - delay 0x7 + delay 5 + createvisualtask sub_815C3A8, 5 + delay 7 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 8, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 8, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 - delay 0xE + createsprite gBasicHitSplatSpriteTemplate, 3, 12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 + delay 14 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, -12, -6, 1, 1 - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, -6, 1, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 3, 9, 0, 31 - goto Anim_Frustration_Continue - -Anim_Frustration_Medium: + createvisualtask sub_8116620, 10, 2, 3, 9, 0, 31 + goto Frustration_Continue +Frustration_Medium: playsewithpan SE_W207B, -64 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + createsprite gUnknown_0859368C, 2, 0, 20, -28 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + delay 5 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, 10, 4, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 4, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, -10, -4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - goto Anim_Frustration_Continue - -Anim_Frustration_Weak: - createsprite gUnknown_085CE4D0, 0x2, 20, -28 - waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE28, 0x2, 10, 2 - delay 0xC + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + goto Frustration_Continue +Frustration_Weak: + createsprite gUnknown_085CE4D0, 2, 20, -28 + waitforvisualfinish + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 2, 10, 2 + delay 12 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - goto Anim_Frustration_Continue + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + goto Frustration_Continue Move_SAFEGUARD: loadspritegfx 0x2804 monbg ANIM_ATK_PARTNER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W208, -64 - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 - delay 0x4 - createsprite gUnknown_08593C64, 0x2 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 + delay 4 + createsprite gUnknown_08593C64, 2 waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8115A04, 0x2, 10, 0, 2, 0, 10, RGB_WHITE + createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -1845,61 +1819,61 @@ Move_SAFEGUARD: Move_PAIN_SPLIT: loadspritegfx 0x27FF - createsprite gUnknown_085CE590, 0x2, -8, -42, 0 - createsprite gUnknown_085CE590, 0x82, -8, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, -8, -42, 0 + createsprite gUnknown_085CE590, 130, -8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 0 - createvisualtask sub_815CA20, 0x2, 1, 0 + createvisualtask sub_815CA20, 2, 0, 0 + createvisualtask sub_815CA20, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, -24, -42, 0 - createsprite gUnknown_085CE590, 0x82, -24, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, -24, -42, 0 + createsprite gUnknown_085CE590, 130, -24, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 1 - createvisualtask sub_815CA20, 0x2, 1, 1 + createvisualtask sub_815CA20, 2, 0, 1 + createvisualtask sub_815CA20, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_085CE590, 0x2, 8, -42, 0 - createsprite gUnknown_085CE590, 0x82, 8, -42, 1 - delay 0xA + createsprite gUnknown_085CE590, 2, 8, -42, 0 + createsprite gUnknown_085CE590, 130, 8, -42, 1 + delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_815CA20, 0x2, 0, 2 - createvisualtask sub_815CA20, 0x2, 1, 2 + createvisualtask sub_815CA20, 2, 0, 2 + createvisualtask sub_815CA20, 2, 1, 2 end Move_VICE_GRIP: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08593590, 0x2, 0 - createsprite gUnknown_08593590, 0x2, 1 + createsprite gUnknown_08593590, 2, 0 + createsprite gUnknown_08593590, 2, 1 delay 0x9 - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_GUILLOTINE: - loadspritegfx 0x279A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS waitbgfadein playsewithpan SE_W011, +63 - createsprite gUnknown_085935D0, 0x2, 0 - createsprite gUnknown_085935D0, 0x2, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_BLACK + createsprite gUnknown_085935D0, 2, 0 + createsprite gUnknown_085935D0, 2, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK delay 0x9 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 23, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E - createvisualtask sub_80D52D0, 0x5, 1, 4, 0, 8, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1910,17 +1884,17 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx 0x2774 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_085934D8, 0x2, 20, 0, 0, 0, 1152 + createsprite gUnknown_085934D8, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, +63 - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 + createsprite gUnknown_085934F0, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1928,113 +1902,112 @@ Move_PAY_DAY: Move_OUTRAGE: loadspritegfx 0x272D - loopsewithpan SE_W082, -64, 0x8, 0x3 - createvisualtask sub_8115A04, 0x2, 7, 2, 5, 3, 8, RGB(14, 13, 0) - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 5, 4 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 40, 1 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 0, 3 - call Anim_Outrage1 - call Anim_Outrage1 - waitforvisualfinish - end - -Anim_Outrage1: - delay 0x3 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 0, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, 1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 0, -1280, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, 768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, 1280, -768, 3 - delay 0x0 - createsprite gUnknown_08596E7C, 0x82, 0, 0, 30, -1280, -768, 3 + loopsewithpan SE_W082, -64, 8, 3 + createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + delay 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 40, 1 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 0, 3 + call Outrage1 + call Outrage1 + waitforvisualfinish + end +Outrage1: + delay 3 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 0, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, 1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 0, -1280, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, 768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, 1280, -768, 3 + delay 0 + createsprite gBattleAnimSpriteTemplate_8596E7C, 130, 0, 0, 30, -1280, -768, 3 return Move_SPARK: - loadspritegfx 0x2797 - loadspritegfx 0x271B - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_011 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_0859574C, 0x0, 32, 24, 190, 12, 0, 1, 0 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 80, 24, 22, 12, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 156, 24, 121, 13, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - delay 0xA - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 5, 5, RGB(31, 31, 22) + createsprite gBattleAnimSpriteTemplate_859574C, 0, 32, 24, 190, 12, 0, 1, 0 + delay 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 80, 24, 22, 12, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 156, 24, 121, 13, 0, 1, 1 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + delay 10 + createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_0859574C, 0x0, 100, 24, 60, 10, 0, 1, 0 - createsprite gUnknown_0859574C, 0x0, 170, 24, 42, 11, 0, 1, 1 - delay 0x0 - createsprite gUnknown_0859574C, 0x0, 238, 24, 165, 10, 0, 1, 1 - delay 0x0 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - delay 0x14 - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 7, 7, RGB(31, 31, 22) + createsprite gBattleAnimSpriteTemplate_859574C, 0, 100, 24, 60, 10, 0, 1, 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 170, 24, 42, 11, 0, 1, 1 + delay 0 + createsprite gBattleAnimSpriteTemplate_859574C, 0, 238, 24, 165, 10, 0, 1, 1 + delay 0 + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + delay 20 + createvisualtask sub_8115A04, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, -64 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gUnknown_085957F8, 0x4, 0, 0, 16, 12, 224, 20, 2, 0 - delay 0x4 - waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 3, -31, 1, 0, 0, RGB(31, 31, 22) - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite gBattleAnimSpriteTemplate_85957F8, 4, 0, 0, 16, 12, 224, 20, 2, 0 + delay 4 + waitforvisualfinish + createvisualtask sub_8115A04, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 playsewithpan SE_W063, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, -31, 2, 0, 6, RGB(31, 31, 22) - call Anim_ParalysisEffect + createvisualtask sub_8115A04, 2, 4, -31, 2, 0, 6, RGB(31, 31, 22) + call ElectricityEffect waitforvisualfinish end Move_ATTRACT: loadspritegfx 0x27E8 - loopsewithpan SE_W204, -64, 0xC, 0x3 - createvisualtask sub_80D5EB8, 0x5, 0, 12, 4096, 4, 0 - delay 0xF - createsprite gUnknown_085939A0, 0x83, 20, -8 + loopsewithpan SE_W204, -64, 12, 3 + createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER + delay 15 + createsprite gUnknown_085939A0, 131, 20, -8 waitforvisualfinish playsewithpan SE_W213, +63 - createsprite gUnknown_085939B8, 0x83, 160, -32 - createsprite gUnknown_085939B8, 0x83, -256, -40 - createsprite gUnknown_085939B8, 0x83, 128, -16 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 - waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 0xF - createvisualtask sub_81062E8, 0x5 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -32 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -40 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -16 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 + waitforvisualfinish + waitplaysewithpan SE_W213B, 0, 15 + createvisualtask sub_81062E8, 5 createsprite gUnknown_085939D0, 0x28, 16, 256, 0 createsprite gUnknown_085939D0, 0x28, 224, 240, 15 createsprite gUnknown_085939D0, 0x28, 126, 272, 30 @@ -2044,38 +2017,37 @@ Move_ATTRACT: createsprite gUnknown_085939D0, 0x28, 112, 256, 90 createsprite gUnknown_085939D0, 0x28, 200, 272, 90 delay 0x4B - createvisualtask sub_8115A04, 0x2, 4, 4, 4, 0, 10, RGB(31, 25, 27) + createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end Move_GROWTH: - call Anim_Growth1 + call Growth1 waitforvisualfinish - call Anim_Growth1 + call Growth1 waitforvisualfinish end - -Anim_Growth1: - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE +Growth1: + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, -64 - createvisualtask sub_80D6064, 0x5, -3, -3, 16, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0 return Move_WHIRLWIND: loadspritegfx 0x27B2 - createsprite gUnknown_085963D4, 0x2, 0, -8, 1, 60, 0 - createsprite gUnknown_085963D4, 0x2, 0, 0, 1, 60, 1 - createsprite gUnknown_085963D4, 0x2, 0, 8, 1, 60, 2 - createsprite gUnknown_085963D4, 0x2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, 0x2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, 0x2, 0, 32, 1, 60, 0 - delay 0x5 - loopsewithpan SE_W104, +63, 0xA, 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 15, 1 + createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 + createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 + createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 + createsprite gUnknown_085963D4, 2, 0, 16, 1, 60, 3 + createsprite gUnknown_085963D4, 2, 0, 24, 1, 60, 4 + createsprite gUnknown_085963D4, 2, 0, 32, 1, 60, 0 + delay 5 + loopsewithpan SE_W104, +63, 10, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 delay 0x1D - createvisualtask sub_80D5830, 0x2, 1, 12, 6, 1, 5 - delay 0x7 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5 + delay 7 playsewithpan SE_W081, +63 - createvisualtask sub_80D5DB0, 0x5, 1, 8 + createvisualtask sub_80D5DB0, 5, 1, 8 waitforvisualfinish end @@ -2084,15 +2056,15 @@ Move_CONFUSE_RAY: monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 - createvisualtask sub_8115C80, 0x2, 10013, 0, 6, 0, 14, 351 - createsprite gUnknown_08596D14, 0x82, 28, 0, 288 + createvisualtask sub_8159278, 2, -64, 63, 2, 0 + createvisualtask sub_8115C80, 2, 10013, 0, 6, 0, 14, 351 + createsprite gUnknown_08596D14, 130, 28, 0, 288 waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W081B, +63 - createsprite gUnknown_08596D2C, 0x82, 0, -16 + createsprite gUnknown_08596D2C, 130, 0, -16 waitforvisualfinish - delay 0x0 + delay 0 blendoff clearmonbg ANIM_DEF_PARTNER restorebg @@ -2106,8 +2078,8 @@ Move_LOCK_ON: createsprite gUnknown_08592CB8, 0x28, 2 createsprite gUnknown_08592CB8, 0x28, 3 createsprite gUnknown_08592CB8, 0x28, 4 - delay 0x78 - setarg 0x7, 0xFFFF + delay 120 + setarg 7, 0xFFFF waitforvisualfinish end @@ -2115,103 +2087,103 @@ Move_MEAN_LOOK: loadspritegfx 0x27CB monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK - loopsewithpan SE_W109, +63, 0xF, 0x4 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK + loopsewithpan SE_W109, +63, 15, 4 waitplaysewithpan SE_W043, +63, 0x55 - createsprite gUnknown_085CE104, 0x2 - delay 0x78 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x1E + createsprite gUnknown_085CE104, 2 + delay 120 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 30 clearmonbg ANIM_DEF_PARTNER waitforvisualfinish end Move_ROCK_THROW: - loadspritegfx 0x274A - createsprite gUnknown_085972D8, 0x82, 6, 1, 15, 1 - createsprite gUnknown_08596B04, 0x82, 0, 1, 0, 0 + loadspritegfx ANIM_TAG_058 + createsprite gBattleAnimSpriteTemplate_85972D8, 130, 6, 1, 15, 1 + createsprite gUnknown_08596B04, 130, 0, 1, 0, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 0 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 20, 1 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, -15, 1, -10, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1 + delay 6 + createsprite gUnknown_08596B04, 130, -15, 1, -10, 0 playsewithpan SE_W088, +63 - delay 0x6 - createsprite gUnknown_08596B04, 0x82, 23, 2, 10, 0 + delay 6 + createsprite gUnknown_08596B04, 130, 23, 2, 10, 0 playsewithpan SE_W088, +63 waitforvisualfinish end Move_ROCK_SLIDE: - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER - createsprite gUnknown_085972D8, 0x2, 7, 1, 11, 1 - createsprite gUnknown_08596B04, 0x82, -5, 1, -5, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 7, 1, 11, 1 + createsprite gUnknown_08596B04, 130, -5, 1, -5, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 5, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 5, 0, 6, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 19, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 19, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -23, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -23, 2, -10, 1 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 5, 50, 1 - createvisualtask sub_80D51AC, 0x2, 3, 0, 5, 50, 1 - delay 0x2 - call Anim_RockSlide1 - call Anim_RockSlide1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1 + delay 2 + call RockSlide1 + call RockSlide1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_RockSlide1: - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 +RockSlide1: + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 28, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 28, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -10, 1, -5, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -10, 1, -5, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 10, 0, 6, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 10, 0, 6, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 24, 1, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 24, 1, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -32, 2, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -32, 2, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, -20, 0, -10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, -20, 0, -10, 1 playsewithpan SE_W088, +63 - delay 0x2 - createsprite gUnknown_08596B04, 0x82, 30, 2, 10, 1 + delay 2 + createsprite gUnknown_08596B04, 130, 30, 2, 10, 1 playsewithpan SE_W088, +63 - delay 0x2 + delay 2 return Move_THIEF: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - delay 0x1 + delay 1 fadetobg BG_DARK waitbgfadein - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x6 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 6 playsewithpan SE_W233, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1 waitforvisualfinish - delay 0x14 + delay 20 clearmonbg ANIM_TARGET blendoff restorebg @@ -2220,77 +2192,75 @@ Move_THIEF: Move_BUBBLE_BEAM: loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x1 - call Anim_Bulbblebeam1 - createvisualtask sub_80D5EB8, 0x5, 0, 3, 3072, 8, 1 - call Anim_Bulbblebeam1 - call Anim_Bulbblebeam1 + setalpha 12, 8 + delay 1 + call Bulbblebeam1 + createvisualtask AnimTask_SwayMon, 5, 0, 3, 3072, 8, ANIM_TARGET + call Bulbblebeam1 + call Bulbblebeam1 waitforvisualfinish - call Anim_BulbblebeamEffect + call WaterBubbleEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end - -Anim_Bulbblebeam1: - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 70, 0, 256, 50 +Bulbblebeam1: + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 40, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 40, -10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -60, 0, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -60, 0, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, -10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, -10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 256, 50 + delay 3 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 256, 50 playsewithpan SE_W145, -64 - delay 0x3 + delay 3 return Move_ICY_WIND: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 loadspritegfx 0x279E monbg ANIM_DEF_PARTNER - createvisualtask sub_8116620, 0xA, 11, 4, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 - call Anim_IcyWind1 - delay 0x5 - call Anim_IcyWind1 + panse_1B SE_W016, -64, +63, +2, 0 + call IcyWind1 + delay 5 + call IcyWind1 playsewithpan SE_W016B, +63 delay 0x37 - call Anim_IcyWindEffect2 + call IcyWindEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadeout - createvisualtask sub_8116620, 0xA, 11, 4, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end - -Anim_IcyWind1: +IcyWind1: createsprite gUnknown_08595B98, 0xA8, 0, 0, 0, 0, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 10, 0, 10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -10, 0, -10, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, 15, 0, 15, 72, 1 - delay 0x5 + delay 5 createsprite gUnknown_08595B98, 0xA8, 0, -5, 0, -5, 72, 1 return @@ -2298,23 +2268,23 @@ Move_SMOKESCREEN: loadspritegfx 0x2720 loadspritegfx 0x2721 playsewithpan SE_W104, -64 - createsprite gUnknown_085CE050, 0x82, 20, 0, 0, 0, 35, -25 + createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish - createvisualtask sub_815A160, 0x2 - delay 0x2 + createvisualtask sub_815A160, 2 + delay 2 playsewithpan SE_W028, +63 - createsprite gUnknown_085CE038, 0x84, 0, -12, 104, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, -12, 72, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, -6, 88, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 56, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 0, 88, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 6, 104, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 72, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 12, 56, 1, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 80, 0, 75 - createsprite gUnknown_085CE038, 0x84, 0, 18, 72, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -12, 104, 0, 75 + createsprite gUnknown_085CE038, 132, 0, -12, 72, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -6, 56, 1, 75 + createsprite gUnknown_085CE038, 132, 0, -6, 88, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 0, 56, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 0, 88, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 6, 72, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 6, 104, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 12, 72, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 12, 56, 1, 75 + createsprite gUnknown_085CE038, 132, 0, 18, 80, 0, 75 + createsprite gUnknown_085CE038, 132, 0, 18, 72, 1, 75 waitforvisualfinish end @@ -2322,50 +2292,50 @@ Move_CONVERSION: loadspritegfx 0x2722 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - delay 0x0 + setalpha 16, 0 + delay 0 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -24 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -24 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, -8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, -8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, -8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, -8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, -8 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 8 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 8 - delay 0x3 + createsprite gUnknown_08592E74, 2, -24, 8 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 8 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 8 + delay 3 playsewithpan SE_W129, -64 - createsprite gUnknown_08592E74, 0x2, -24, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, -8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 8, 24 - delay 0x3 - createsprite gUnknown_08592E74, 0x2, 24, 24 - delay 0x14 + createsprite gUnknown_08592E74, 2, -24, 24 + delay 3 + createsprite gUnknown_08592E74, 2, -8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 8, 24 + delay 3 + createsprite gUnknown_08592E74, 2, 24, 24 + delay 20 playsewithpan SE_W112, -64 - createvisualtask sub_8115D94, 0x2, 10018, 1, 1, 14335, 12, 0, 0 - delay 0x6 - createvisualtask sub_81022D4, 0x5 + createvisualtask sub_8115D94, 2, 10018, 1, 1, 14335, 12, 0, 0 + delay 6 + createvisualtask sub_81022D4, 5 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATK_PARTNER blendoff end @@ -2374,41 +2344,41 @@ Move_CONVERSION_2: loadspritegfx 0x2722 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x1000 - delay 0x0 + setalpha 0, 16 + delay 0 playsewithpan SE_W112, +63 - createsprite gUnknown_08592EA4, 0x2, -24, -24, 60 - createsprite gUnknown_08592EA4, 0x2, -8, -24, 65 - createsprite gUnknown_08592EA4, 0x2, 8, -24, 70 - createsprite gUnknown_08592EA4, 0x2, 24, -24, 75 - createsprite gUnknown_08592EA4, 0x2, -24, -8, 80 - createsprite gUnknown_08592EA4, 0x2, -8, -8, 85 - createsprite gUnknown_08592EA4, 0x2, 8, -8, 90 - createsprite gUnknown_08592EA4, 0x2, 24, -8, 95 - createsprite gUnknown_08592EA4, 0x2, -24, 8, 100 - createsprite gUnknown_08592EA4, 0x2, -8, 8, 105 - createsprite gUnknown_08592EA4, 0x2, 8, 8, 110 - createsprite gUnknown_08592EA4, 0x2, 24, 8, 115 - createsprite gUnknown_08592EA4, 0x2, -24, 24, 120 - createsprite gUnknown_08592EA4, 0x2, -8, 24, 125 - createsprite gUnknown_08592EA4, 0x2, 8, 24, 130 - createsprite gUnknown_08592EA4, 0x2, 24, 24, 135 - createvisualtask sub_81023E0, 0x5 - delay 0x3C + createsprite gUnknown_08592EA4, 2, -24, -24, 60 + createsprite gUnknown_08592EA4, 2, -8, -24, 65 + createsprite gUnknown_08592EA4, 2, 8, -24, 70 + createsprite gUnknown_08592EA4, 2, 24, -24, 75 + createsprite gUnknown_08592EA4, 2, -24, -8, 80 + createsprite gUnknown_08592EA4, 2, -8, -8, 85 + createsprite gUnknown_08592EA4, 2, 8, -8, 90 + createsprite gUnknown_08592EA4, 2, 24, -8, 95 + createsprite gUnknown_08592EA4, 2, -24, 8, 100 + createsprite gUnknown_08592EA4, 2, -8, 8, 105 + createsprite gUnknown_08592EA4, 2, 8, 8, 110 + createsprite gUnknown_08592EA4, 2, 24, 8, 115 + createsprite gUnknown_08592EA4, 2, -24, 24, 120 + createsprite gUnknown_08592EA4, 2, -8, 24, 125 + createsprite gUnknown_08592EA4, 2, 8, 24, 130 + createsprite gUnknown_08592EA4, 2, 24, 24, 135 + createvisualtask sub_81023E0, 5 + delay 60 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 - delay 0xA + delay 10 playsewithpan SE_W129, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -2416,364 +2386,361 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W104, -64 - delay 0x6 + delay 6 playsewithpan SE_W104, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x2, -24, 0, 48, 10, 160, 0 - delay 0x5 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 2, -24, 0, 48, 10, 160, 0 + delay 5 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 8 clearmonbg ANIM_TARGET blendoff end Move_HEADBUTT: - loadspritegfx 0x2797 - createsprite gUnknown_08592CD8, 0x2, 0 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W233B, +63 waitforvisualfinish end Move_HORN_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - createsprite gUnknown_08592CD8, 0x2, 0 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 10 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 10 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 4, 1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, 0x2, 2 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gUnknown_08592CD8, 2, 2 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 waitforvisualfinish end Move_FURY_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - createvisualtask sub_80D6134, 0x2, 4, 256, 0, 2 - choosetwoturnanim Anim_FuryAttackRight, Anim_FuryAttackLeft -Anim_FuryAttackContinue: - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createvisualtask sub_80D6134, 2, 4, 256, 0, 2 + choosetwoturnanim FuryAttackRight, FuryAttackLeft +FuryAttackContinue: + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 waitforvisualfinish end -Anim_FuryAttackRight: - createsprite gUnknown_08592F44, 0x84, 8, 8, 10 +FuryAttackRight: + createsprite gUnknown_08592F44, 132, 8, 8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto Anim_FuryAttackContinue + goto FuryAttackContinue -Anim_FuryAttackLeft: - createsprite gUnknown_08592F44, 0x84, -8, -8, 10 +FuryAttackLeft: + createsprite gUnknown_08592F44, 132, -8, -8, 10 waitforvisualfinish - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 1 playsewithpan SE_W030, +63 - goto Anim_FuryAttackContinue + goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2724 - jumpifcontest Anim_HornDrillInContest + jumpifcontest HornDrillInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_HornDrillContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +HornDrillContinue: waitbgfadein - setalpha 0x80C - createsprite gUnknown_08592CD8, 0x2, 0 + setalpha 12, 8 + createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish - delay 0x2 - createsprite gUnknown_08592CD8, 0x2, 1 - createsprite gUnknown_08592F44, 0x84, 0, 0, 12 + delay 2 + createsprite gUnknown_08592CD8, 2, 1 + createsprite gUnknown_08592F44, 132, 0, 0, 12 waitforvisualfinish playse SE_BAN - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x83, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, 131, 0, 0, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 0, 2, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 0, 2, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -4, 3, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -4, 3, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -8, -5, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, -8, -5, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 4, -12, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 4, -12, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 16, 0, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 16, 0, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 5, 18, 1, 3 + delay 4 + createsprite gUnknown_085973E8, 131, 5, 18, 1, 3 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -17, 12, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -17, 12, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, -21, -15, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, -21, -15, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 8, -27, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 8, -27, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_085973E8, 0x83, 32, 0, 1, 2 + delay 4 + createsprite gUnknown_085973E8, 131, 32, 0, 1, 2 playsewithpan SE_W030, +63 - delay 0x4 - createsprite gUnknown_08592CD8, 0x2, 2 + delay 4 + createsprite gUnknown_08592CD8, 2, 2 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_HornDrillInContest: +HornDrillInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_HornDrillContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto HornDrillContinue Move_THRASH: - loadspritegfx 0x2797 - loadspritegfx 0x279F - createvisualtask sub_8104C38, 0x2 - createvisualtask sub_8104CA4, 0x2 - createsprite gUnknown_08595EB0, 0x83, 1, 10, 0 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + createvisualtask sub_8104C38, 2 + createvisualtask sub_8104CA4, 2 + createsprite gUnknown_08595EB0, 131, 1, 10, 0 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, +63 delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 1 - createvisualtask sub_80D5484, 0x2, 1, 4, 0, 7, 1 + createsprite gUnknown_08595EB0, 131, 1, 10, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, +63 delay 0x1C - createsprite gUnknown_08595EB0, 0x83, 1, 10, 3 - createvisualtask sub_80D5484, 0x2, 1, 8, 0, 16, 1 + createsprite gUnknown_08595EB0, 131, 1, 10, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, +63 end Move_SING: - loadspritegfx 0x2758 + loadspritegfx ANIM_TAG_072 monbg ANIM_DEF_PARTNER - createvisualtask sub_8102BE8, 0x2 - waitforvisualfinish - panse_1B SE_W047, -64, +63, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 0, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 3, 12 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 3, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 0, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 2, 12 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 3, 12 - delay 0x4 + createvisualtask sub_8102BE8, 2 + waitforvisualfinish + panse_1B SE_W047, -64, +63, +2, 0 + createsprite gUnknown_08593008, 130, 7, 0, 12 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 12 + delay 5 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 5 + createsprite gUnknown_08593008, 130, 2, 3, 12 + delay 5 + createsprite gUnknown_08593008, 130, 3, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 6, 3, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 0, 12 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 12 + delay 4 + createsprite gUnknown_08593008, 130, 1, 2, 12 + delay 4 + createsprite gUnknown_08593008, 130, 5, 3, 12 + delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end Move_LOW_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - createsprite gUnknown_08595EE0, 0x82, -24, 28, 40, 8, 160, 0 - delay 0x4 - createsprite gUnknown_08597358, 0x82, -8, 8, 1, 2 - createvisualtask sub_80D6134, 0x2, 6, 384, 1, 2 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + createsprite gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 8, 1, 2 + createvisualtask sub_80D6134, 2, 6, 384, 1, 2 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 1, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 1, 4 end Move_EARTHQUAKE: - createvisualtask sub_81152DC, 0x5, 5, 10, 50 - createvisualtask sub_81152DC, 0x5, 4, 10, 50 + createvisualtask sub_81152DC, 5, 5, 10, 50 + createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 10 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 16 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 end Move_FISSURE: - loadspritegfx 0x275A - createvisualtask sub_81152DC, 0x3, 5, 10, 50 - createvisualtask sub_81152DC, 0x3, 1, 10, 50 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_81152DC, 3, 5, 10, 50 + createvisualtask sub_81152DC, 3, 1, 10, 50 playsewithpan SE_W089, +63 - delay 0x8 - call Anim_Fissure1 - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call Anim_Fissure2 - delay 0xF - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0xF - call Anim_Fissure1 - delay 0x32 + delay 8 + call Fissure1 + delay 15 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 15 + call Fissure2 + delay 15 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 15 + call Fissure1 + delay 50 fadetobg BG_FISSURE waitbgfadeout - createvisualtask sub_8115628, 0x5, 1, 5, -1 + createvisualtask sub_8115628, 5, 1, 5, -1 waitbgfadein delay 0x28 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_Fissure1: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -48, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -16, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -52, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -32, -16, 24 +Fissure1: + createsprite gUnknown_085971FC, 130, 1, 0, 12, -48, -16, 24 + createsprite gUnknown_085971FC, 130, 1, 0, 16, -16, -10, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 14, -52, -18, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 12, -32, -16, 24 playsewithpan SE_W091, +63 return -Anim_Fissure2: - createsprite gUnknown_085971FC, 0x82, 1, 0, 12, -24, -16, 24 - createsprite gUnknown_085971FC, 0x82, 1, 0, 16, -38, -10, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 14, -20, -18, 24 - createsprite gUnknown_085971FC, 0x82, 1, 1, 12, -36, -16, 24 +Fissure2: + createsprite gUnknown_085971FC, 130, 1, 0, 12, -24, -16, 24 + createsprite gUnknown_085971FC, 130, 1, 0, 16, -38, -10, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 14, -20, -18, 24 + createsprite gUnknown_085971FC, 130, 1, 1, 12, -36, -16, 24 playsewithpan SE_W091, +63 return Move_DIG: - choosetwoturnanim Anim_DigSetUp, Anim_DigUnleash -Anim_DigEnd: + choosetwoturnanim DigSetUp, DigUnleash +DigEnd: end - -Anim_DigSetUp: - loadspritegfx 0x275A +DigSetUp: + loadspritegfx ANIM_TAG_074 loadspritegfx 0x2829 - createsprite gUnknown_08597214, 0x1, 0, 0, 180 - createsprite gUnknown_08597214, 0x1, 0, 1, 180 + createsprite gUnknown_08597214, 1, 0, 0, 180 + createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 0 - delay 0x6 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 - call Anim_DigSetUp1 + delay 1 + createvisualtask sub_8114CBC, 2, 0 + delay 6 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 + call DigSetUp1 waitforvisualfinish clearmonbg_23 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8114CBC, 0x2, 1 - goto Anim_DigEnd - -Anim_DigUnleash: - loadspritegfx 0x2797 + delay 1 + createvisualtask sub_8114CBC, 2, 1 + goto DigEnd +DigUnleash: + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2829 - createvisualtask sub_8114F14, 0x2, 0 + createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER - createsprite gUnknown_08597214, 0x1, 0, 0, 48 - createsprite gUnknown_08597214, 0x1, 0, 1, 48 - delay 0x1 - createvisualtask sub_8114F14, 0x2, 1 - delay 0x10 - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 + createsprite gUnknown_08597214, 1, 0, 0, 48 + createsprite gUnknown_08597214, 1, 0, 1, 48 + delay 1 + createvisualtask sub_8114F14, 2, 1 + delay 16 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 playsewithpan SE_W025B, -64 clearmonbg ANIM_ATTACKER - goto Anim_DigEnd - -Anim_DigSetUp1: - createsprite gUnknown_085971FC, 0x2, 0, 0, 12, 4, -16, 18 - createsprite gUnknown_085971FC, 0x2, 0, 0, 16, 4, -10, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 14, 4, -18, 18 - createsprite gUnknown_085971FC, 0x2, 0, 1, 12, 4, -16, 18 + goto DigEnd +DigSetUp1: + createsprite gUnknown_085971FC, 2, 0, 0, 12, 4, -16, 18 + createsprite gUnknown_085971FC, 2, 0, 0, 16, 4, -10, 18 + createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18 + createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18 playsewithpan SE_W091, -64 delay 0x20 return Move_MEDITATE: - call Anim_SetPsychicBackground - createvisualtask sub_810F7D4, 0x2 + call SetPsychicBackground + createvisualtask sub_810F7D4, 2 playsewithpan SE_W029, -64 - delay 0x10 + delay 16 playsewithpan SE_W036, -64 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_AGILITY: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 4, 4 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 10 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4 + createvisualtask sub_81169C0, 2, 0, 4, 7, 10 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 playsewithpan SE_W104, -64 - delay 0xC + delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_QUICK_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 playsewithpan SE_W026, -64 - delay 0x4 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 1 + delay 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 1 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2782,321 +2749,317 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x2767 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2 - createsprite gUnknown_0859368C, 0x2, 0, -20, -28 + setalpha 12, 8 + createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 + createsprite gUnknown_0859368C, 2, 0, -20, -28 playsewithpan SE_W207B, -64 - delay 0x14 - createsprite gUnknown_0859368C, 0x2, 0, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 2, 0, 20, -28 playsewithpan SE_W207B, -64 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 1, 1, 10, 1, 0 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 1, 1, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_TARGET end Move_TELEPORT: - call Anim_SetPsychicBackground - createvisualtask sub_810F83C, 0x2 + call SetPsychicBackground + createvisualtask sub_810F83C, 2 playsewithpan SE_W100, -64 - delay 0xF - call Anim_UnsetPsychicBackground + delay 15 + call UnsetPsychicBackground waitforvisualfinish end Move_DOUBLE_TEAM: - createvisualtask sub_81029B4, 0x2 - setalpha 0x80C + createvisualtask sub_81029B4, 2 + setalpha 12, 8 monbg ANIM_ATK_PARTNER playsewithpan SE_W104, -64 delay 0x20 playsewithpan SE_W104, -64 - delay 0x18 + delay 24 playsewithpan SE_W104, -64 - delay 0x10 + delay 16 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 - delay 0x8 + delay 8 playsewithpan SE_W104, -64 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_MINIMIZE: - setalpha 0x80A - createvisualtask sub_8104674, 0x2 - loopsewithpan SE_W107, -64, 0x22, 0x3 + setalpha 10, 8 + createvisualtask sub_8104674, 2 + loopsewithpan SE_W107, -64, 0x22, 3 waitforvisualfinish blendoff end Move_METRONOME: loadspritegfx 0x2750 - loadspritegfx 0x27E1 - createsprite gUnknown_08593114, 0xB, 0, 100 + loadspritegfx ANIM_TAG_209 + createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, -64 - delay 0x6 - createsprite gUnknown_085931BC, 0xC, 0 - delay 0x18 - loopsewithpan SE_W039, -64, 0x16, 0x3 + delay 6 + createsprite gUnknown_085931BC, 12, 0 + delay 24 + loopsewithpan SE_W039, -64, 0x16, 3 waitforvisualfinish end Move_SKULL_BASH: - choosetwoturnanim Anim_SkullBashSetUp, Anim_SkullBashAttack -Anim_SkullBashEnd: + choosetwoturnanim SkullBashSetUp, SkullBashAttack +SkullBashEnd: end -Anim_SkullBashSetUp: - call Anim_SkullBashSetUp1 - call Anim_SkullBashSetUp1 +SkullBashSetUp: + call SkullBashSetUp1 + call SkullBashSetUp1 waitforvisualfinish - goto Anim_SkullBashEnd + goto SkullBashEnd -Anim_SkullBashSetUp1: - createsprite gUnknown_0857FE88, 0x2, 0, -24, 0, 0, 10, 0 +SkullBashSetUp1: + createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, -64 waitforvisualfinish - createvisualtask sub_80D6134, 0x2, 16, 96, 0, 2 + createvisualtask sub_80D6134, 2, 16, 96, 0, 2 waitforvisualfinish - createsprite gUnknown_0857FE88, 0x2, 0, 24, 0, 0, 10, 1 + createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return -Anim_SkullBashAttack: - loadspritegfx 0x2797 - createvisualtask sub_8101C94, 0x2, 0 +SkullBashAttack: + loadspritegfx ANIM_TAG_135 + createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, -64 waitforvisualfinish playse SE_BAN - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 40, 1 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 40, 1 - createsprite gUnknown_085973E8, 0x84, 0, 0, 1, 0 - loopsewithpan SE_W025B, +63, 0x8, 0x3 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_085973E8, 132, 0, 0, 1, 0 + loopsewithpan SE_W025B, +63, 8, 3 waitforvisualfinish - createvisualtask sub_8101C94, 0x2, 1 - goto Anim_SkullBashEnd + createvisualtask sub_8101C94, 2, 1 + goto SkullBashEnd Move_AMNESIA: loadspritegfx 0x276D - call Anim_SetPsychicBackground - delay 0x8 - createsprite gUnknown_08596744, 0x14 + call SetPsychicBackground + delay 8 + createsprite gUnknown_08596744, 20 playsewithpan SE_W118, -64 delay 0x36 - loopsewithpan SE_W118, -64, 0x10, 0x3 + loopsewithpan SE_W118, -64, 16, 3 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_KINESIS: loadspritegfx 0x275B loadspritegfx 0x2771 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - createsprite gUnknown_085966DC, 0x14 - createsprite gUnknown_08593344, 0x13, 32, -8, 0 - createsprite gUnknown_08593344, 0x13, 32, 16, 1 - loopsewithpan SE_W109, -64, 0x15, 0x2 - delay 0x3C + call SetPsychicBackground + createsprite gUnknown_085966DC, 20 + createsprite gUnknown_08593344, 19, 32, -8, 0 + createsprite gUnknown_08593344, 19, 32, 16, 1 + loopsewithpan SE_W109, -64, 0x15, 2 + delay 60 playsewithpan SE_W146, -64 - delay 0x1E - loopsewithpan SE_W146, -64, 0x14, 0x2 - delay 0x46 + delay 30 + loopsewithpan SE_W146, -64, 20, 2 + delay 70 playsewithpan SE_W207B, -64 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_GLARE: loadspritegfx 0x2808 loadspritegfx 0x27EA - createvisualtask sub_815E114, 0x5, 0 + createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, -64 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 0, 16, RGB_BLACK + createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 - createvisualtask sub_81064F8, 0x5 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 + createvisualtask sub_81064F8, 5 playsewithpan SE_W043, -64 - delay 0x2 - createvisualtask sub_810A094, 0x3, 20, 1, 0 + delay 2 + createvisualtask sub_810A094, 3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_8116620, 0x5, 1, 0, 16, 0, RGB_BLACK + createvisualtask sub_8116620, 5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE: loadspritegfx 0x280E - createvisualtask sub_815E47C, 0x3 + createvisualtask sub_815E47C, 3 playsewithpan SE_W207, -64 - delay 0x18 - createsprite gUnknown_085972D8, 0x2, 8, 1, 40, 1 - createvisualtask sub_80D51AC, 0x3, 1, 0, 4, 20, 1 - createvisualtask sub_80D51AC, 0x3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, +63, 0x8, 0x2 + delay 24 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 8, 1, 40, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1 + loopsewithpan SE_W070, +63, 8, 2 end Move_SKY_ATTACK: - choosetwoturnanim Anim_SkyAttackSetUp, Anim_SkyAttackUnleash -Anim_SkyAttackEnd: + choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash +SkyAttackEnd: end - -Anim_SkyAttackSetUp: +SkyAttackSetUp: monbg ANIM_DEF_PARTNER - setalpha 0xB0C - createvisualtask AnimTask_IsTargetPartner, 0x5, ARG_RET_ID - jumpretfalse Anim_SkyAttackSetUpAgainstOpponent - goto Anim_SkyAttackSetUpAgainstPartner - -Anim_SkyAttackSetUpAgainstOpponent: - createvisualtask sub_8116620, 0xA, 27, 1, 0, 12, RGB_BLACK - waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK - createvisualtask sub_81152DC, 0x5, 0, 2, 16 - loopsewithpan SE_W287, -64, 0x4, 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 25, 1, 8, 0, RGB_BLACK + setalpha 12, 11 + createvisualtask AnimTask_IsTargetPartner, 5, ARG_RET_ID + jumpretfalse SkyAttackSetUpAgainstOpponent + goto SkyAttackSetUpAgainstPartner +SkyAttackSetUpAgainstOpponent: + createvisualtask sub_8116620, 10, 27, 1, 0, 12, RGB_BLACK + waitforvisualfinish + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 + loopsewithpan SE_W287, -64, 4, 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE + waitforvisualfinish + createvisualtask sub_8116620, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_SkyAttackEnd - -Anim_SkyAttackSetUpAgainstPartner: - createvisualtask sub_8116664, 0xA, 1, 1, 0, 12, 0 + goto SkyAttackEnd +SkyAttackSetUpAgainstPartner: + createvisualtask sub_8116664, 10, 1, 1, 0, 12, 0 waitforvisualfinish - delay 0xC - createvisualtask sub_8116620, 0xA, 2, 1, 8, 0, RGB_BLACK - createvisualtask sub_81152DC, 0x5, 0, 2, 16 + delay 12 + createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK + createvisualtask sub_81152DC, 5, 0, 2, 16 playsewithpan SE_W287, -64 - delay 0x8 - createvisualtask sub_8116620, 0xA, 2, 1, 0, 15, RGB_WHITE - delay 0x14 - createvisualtask sub_8116620, 0xA, 2, 1, 15, 0, RGB_WHITE + delay 8 + createvisualtask sub_8116620, 10, 2, 1, 0, 15, RGB_WHITE + delay 20 + createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116664, 0xA, 4, 1, 8, 0, 0 + createvisualtask sub_8116664, 10, 4, 1, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_SkyAttackEnd - -Anim_SkyAttackUnleash: - loadspritegfx 0x2797 + goto SkyAttackEnd +SkyAttackUnleash: + loadspritegfx ANIM_TAG_135 loadspritegfx 0x282C - call Anim_SetFlyingBg + call SetFlyingBg monbg ANIM_ATTACKER - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE - delay 0x4 - createvisualtask sub_81136E8, 0x5, 0 - waitforvisualfinish - createvisualtask sub_8159244, 0x5, 238, -64 - createsprite gUnknown_08596514, 0x82 - delay 0xE - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x14 - createvisualtask sub_81137E4, 0x5, 1 - delay 0x2 - createvisualtask sub_8116620, 0xA, 2, 0, 15, 0, RGB_WHITE + createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE + delay 4 + createvisualtask sub_81136E8, 5, 0 + waitforvisualfinish + createvisualtask sub_8159244, 5, 238, -64 + createsprite gUnknown_08596514, 130 + delay 14 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 + createvisualtask sub_8159210, 5, 141, 63 + delay 20 + createvisualtask sub_81137E4, 5, 1 + delay 2 + createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER - call Anim_UnsetFlyingBg - goto Anim_SkyAttackEnd + call UnsetFlyingBg + goto SkyAttackEnd Move_FLASH: playsewithpan SE_W043, -64 - createvisualtask sub_8117494, 0x2 + createvisualtask sub_8117494, 2 waitforvisualfinish end Move_SPLASH: - createvisualtask sub_8104938, 0x2, 0, 3 - delay 0x8 - loopsewithpan SE_W039, -64, 0x26, 0x3 + createvisualtask sub_8104938, 2, 0, 3 + delay 8 + loopsewithpan SE_W039, -64, 0x26, 3 waitforvisualfinish end Move_ACID_ARMOR: monbg ANIM_ATTACKER - setalpha 0xF - createvisualtask sub_815D240, 0x2, 0 + setalpha 15, 0 + createvisualtask sub_815D240, 2, 0 playsewithpan SE_W151, -64 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHARPEN: loadspritegfx 0x27C9 - createsprite gUnknown_08592DE4, 0x2 + createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: loadspritegfx 0x27D0 - createvisualtask sub_80D5484, 0x2, 0, 1, 0, 20, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, -64 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1 - createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1 waitforvisualfinish - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x4 - createsprite gUnknown_08592F74, 0x82 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 4 + createsprite gUnknown_08592F74, 130 playsewithpan SE_W044, +63 - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 2143, 14, 0x7FFF, 14 - createvisualtask sub_80D51AC, 0x2, 1, 0, 7, 12, 1 + delay 8 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 2143, 14, 0x7FFF, 14 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: loadspritegfx 0x27C7 - createsprite gUnknown_08592D2C, 0x82, 1, -8, 0 + createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, +63 - delay 0x4 - createsprite gUnknown_08592D2C, 0x82, 1, 8, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 + delay 4 + createsprite gUnknown_08592D2C, 130, 1, 8, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, +63 waitforvisualfinish end Move_STRUGGLE: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27E7 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5484, 0x2, 0, 3, 0, 12, 4 - createsprite gUnknown_08593B80, 0x2, 0, 0, 2 - createsprite gUnknown_08593B80, 0x2, 0, 1, 2 - loopsewithpan SE_W029, -64, 0xC, 0x4 - waitforvisualfinish - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 + createsprite gUnknown_08593B80, 2, 0, 0, 2 + createsprite gUnknown_08593B80, 2, 0, 1, 2 + loopsewithpan SE_W029, -64, 12, 4 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -3106,31 +3069,30 @@ Move_STRUGGLE: Move_SKETCH: loadspritegfx 0x2712 monbg ANIM_TARGET - createvisualtask sub_8104E74, 0x2 - createsprite gUnknown_085936D4, 0x82 + createvisualtask sub_8104E74, 2 + createsprite gUnknown_085936D4, 130 waitforvisualfinish clearmonbg ANIM_TARGET - createvisualtask sub_8104938, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x26, 0x2 + createvisualtask sub_8104938, 2, 0, 2 + loopsewithpan SE_W039, -64, 0x26, 2 end Move_NIGHTMARE: fadetobg BG_GHOST waitbgfadein - jumpifcontest Anim_NightmareInContest + jumpifcontest NightmareInContest monbg ANIM_DEF_PARTNER - createvisualtask sub_8111C50, 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 40, 1 + createvisualtask sub_8111C50, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1 playsewithpan SE_W171, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg waitbgfadein end - -Anim_NightmareInContest: - createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1 - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 +NightmareInContest: + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1 playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3138,14 +3100,14 @@ Anim_NightmareInContest: end Move_FLAIL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_815C770, 0x2, 0 - loopsewithpan SE_W029, -64, 0x8, 0x2 + setalpha 12, 8 + createvisualtask sub_815C770, 2, 0 + loopsewithpan SE_W029, -64, 8, 2 waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 3 - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 + createsprite gUnknown_085973A0, 131, 1, 3 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -3157,9 +3119,9 @@ Move_SPITE: playsewithpan SE_W060, -64 waitbgfadein monbg ANIM_DEF_PARTNER - createvisualtask sub_8115A04, 0x2, 2, 2, 6, 0, 8, RGB_WHITE - createvisualtask sub_8111E50, 0x2 - loopsewithpan SE_W060, +63, 0x14, 0x3 + createvisualtask sub_8115A04, 2, 2, 2, 6, 0, 8, RGB_WHITE + createvisualtask sub_8111E50, 2 + loopsewithpan SE_W060, +63, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3167,51 +3129,50 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_ATK_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_MachPunchAgainstPlayer + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue MachPunchAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_MachPunchContinue: +MachPunchContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - delay 0x0 - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 28968, 10 + delay 0 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 28968, 10 playsewithpan SE_W026, -64 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end - -Anim_MachPunchAgainstPlayer: +MachPunchAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_MachPunchContinue + goto MachPunchContinue Move_FORESIGHT: loadspritegfx 0x2812 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x10 - createsprite gUnknown_085CE8C4, 0x82, 1 - delay 0x11 - loopsewithpan SE_W166, +63, 0x10, 0x4 - delay 0x30 - delay 0x18 + setalpha 16, 0 + createsprite gUnknown_085CE8C4, 130, 1 + delay 17 + loopsewithpan SE_W166, +63, 16, 4 + delay 48 + delay 24 playsewithpan SE_W166, +63 - delay 0xA - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1 + delay 10 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, +63 waitforvisualfinish blendoff @@ -3223,13 +3184,13 @@ Move_DESTINY_BOND: fadetobg BG_GHOST playsewithpan SE_W060, -64 waitbgfadein - createvisualtask sub_81123C4, 0x5, 0, 48 + createvisualtask sub_81123C4, 5, 0, 48 playsewithpan SE_W109, -64 - delay 0x30 - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 24, 1 - createvisualtask sub_8116664, 0x2, 6, 1, 0, 12, 30653 - delay 0x18 - createvisualtask sub_8116664, 0x2, 6, 1, 12, 0, 30653 + delay 48 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 + createvisualtask sub_8116664, 2, 6, 1, 0, 12, 30653 + delay 24 + createvisualtask sub_8116664, 2, 6, 1, 12, 0, 30653 playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3241,53 +3202,53 @@ Move_DESTINY_BOND: Move_ENDURE: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect - waitforvisualfinish - end - -Anim_EndureEffect: - createsprite gUnknown_08592D8C, 0x2, 0, -24, 26, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 14, 28, 1 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -5, 10, 2 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, 28, 26, 3 - delay 0x4 - createsprite gUnknown_08592D8C, 0x2, 0, -12, 0, 1 + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect + waitforvisualfinish + end + +EndureEffect: + createsprite gUnknown_08592D8C, 2, 0, -24, 26, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 14, 28, 1 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -5, 10, 2 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, 28, 26, 3 + delay 4 + createsprite gUnknown_08592D8C, 2, 0, -12, 0, 1 return Move_CHARM: loadspritegfx 0x27E2 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, -64 waitforvisualfinish end Move_ROLLOUT: - loadspritegfx 0x2797 - loadspritegfx 0x275A - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_8110F74, 0x2 + setalpha 12, 8 + createvisualtask sub_8110F74, 2 waitforvisualfinish - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - createsprite gUnknown_08597358, 0x4, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 4, 0, 0, 1, 2 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -3296,109 +3257,107 @@ Move_ROLLOUT: Move_FALSE_SWIPE: loadspritegfx 0x282E - loadspritegfx 0x2797 - createsprite gUnknown_08592D44, 0x82 + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, +63 - delay 0x10 - createsprite gUnknown_08592D5C, 0x82, 0 + delay 16 + createsprite gUnknown_08592D5C, 130, 0 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 16 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 32 + delay 2 + createsprite gUnknown_08592D5C, 130, 16 + delay 2 + createsprite gUnknown_08592D5C, 130, 32 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 48 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 64 + delay 2 + createsprite gUnknown_08592D5C, 130, 48 + delay 2 + createsprite gUnknown_08592D5C, 130, 64 playsewithpan SE_W104, +63 - delay 0x2 - createsprite gUnknown_08592D5C, 0x82, 80 - delay 0x2 + delay 2 + createsprite gUnknown_08592D5C, 130, 80 + delay 2 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 6, 1 - createsprite gUnknown_08597358, 0x84, 0, 0, 1, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, 0, 0, 1, 3 playsewithpan SE_W004, +63 end Move_SWAGGER: loadspritegfx 0x2766 loadspritegfx 0x2767 - createvisualtask sub_8104AB4, 0x2 + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, -64, 4, 2 waitforvisualfinish - delay 0x18 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 24 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 waitforvisualfinish end Move_MILK_DRINK: loadspritegfx 0x2773 - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_031 monbg ANIM_TARGET - createsprite gUnknown_08592B3C, 0x2 + createsprite gUnknown_08592B3C, 2 delay 0x28 playsewithpan SE_W152, -64 - delay 0xC + delay 12 playsewithpan SE_W152, -64 - delay 0x14 + delay 20 playsewithpan SE_W152, -64 waitforvisualfinish - createsprite gUnknown_0859381C, 0x3, 0, 0, 1, 0 + createsprite gUnknown_0859381C, 3, 0, 0, 1, 0 playsewithpan SE_W208, -64 waitforvisualfinish clearmonbg ANIM_TARGET - call Anim_HealingEffect2 + call HealingEffect2 waitforvisualfinish end Move_MAGNITUDE: - createvisualtask AnimTask_IsPowerOver99, 0x2 - waitforvisualfinish - jumpargeq 0xF, FALSE, Anim_MagnitudeRegular - jumpargeq 0xF, TRUE, Anim_MagnitudeIntense -Anim_MagnitudeEnd: - end - -Anim_MagnitudeRegular: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA - goto Anim_MagnitudeEnd - -Anim_MagnitudeIntense: - createvisualtask sub_81152DC, 0x5, 5, 0, 50 - createvisualtask sub_81152DC, 0x5, 4, 0, 50 - loopsewithpan SE_W070, +63, 0x8, 0xA - delay 0xA - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - delay 0x10 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, 0, 14, 0x7FFF, 14 - goto Anim_MagnitudeEnd + createvisualtask AnimTask_IsPowerOver99, 2 + waitforvisualfinish + jumpargeq 15, FALSE, MagnitudeRegular + jumpargeq 15, TRUE, MagnitudeIntense +MagnitudeEnd: + end +MagnitudeRegular: + createvisualtask sub_81152DC, 5, 5, 0, 50 + createvisualtask sub_81152DC, 5, 4, 0, 50 + loopsewithpan SE_W070, +63, 8, 10 + goto MagnitudeEnd +MagnitudeIntense: + createvisualtask sub_81152DC, 5, 5, 0, 50 + createvisualtask sub_81152DC, 5, 4, 0, 50 + loopsewithpan SE_W070, +63, 8, 10 + delay 10 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + delay 16 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27F5 monbg ANIM_ATTACKER - createsprite gUnknown_085CE288, 0x2, 0, 0, 32, -32, 40, -2 - createvisualtask sub_815ADB0, 0x2, 0, 2, 0 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 + createvisualtask sub_815ADB0, 2, 0, 2, 0 + loopsewithpan SE_W013B, -64, 8, 4 waitforvisualfinish - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 playsewithpan SE_W003, +63 waitforvisualfinish - delay 0x8 - createvisualtask sub_815ADB0, 0x2, 0, 2, 1 - loopsewithpan SE_W013B, -64, 0x8, 0x4 + delay 8 + createvisualtask sub_815ADB0, 2, 0, 2, 1 + loopsewithpan SE_W013B, -64, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3406,206 +3365,205 @@ Move_RAPID_SPIN: Move_MOONLIGHT: loadspritegfx 0x27D2 loadspritegfx 0x27D3 - loadspritegfx 0x272F - setalpha 0x1000 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK + loadspritegfx ANIM_TAG_031 + setalpha 0, 16 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592EBC, 0x2, 120, 56 - createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1 + createsprite gUnknown_08592EBC, 2, 120, 56 + createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -12, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, -24, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 21, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 0, 0 - delay 0x1E - createsprite gUnknown_08592EEC, 0x28, 10, 0 - delay 0x14 - createvisualtask sub_81025C0, 0x2 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -12, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -24, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 21, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 0, 0 + delay 30 + createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 10, 0 + delay 20 + createvisualtask sub_81025C0, 2 waitforvisualfinish - call Anim_HealingEffect + call HealingEffect waitforvisualfinish end Move_EXTREME_SPEED: loadspritegfx 0x27DF - loadspritegfx 0x2797 - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_ExtremeSpeedAgainstPlayer + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_ExtremeSpeedContinue: +ExtremeSpeedContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - createvisualtask sub_810577C, 0x2 - loopsewithpan SE_W013B, -64, 0x8, 0x3 + createvisualtask sub_810577C, 2 + loopsewithpan SE_W013B, -64, 8, 3 waitforvisualfinish - delay 0x1 - createvisualtask sub_8117F60, 0x2 + delay 1 + createvisualtask sub_8117F60, 2 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 delay 0x12 - createvisualtask sub_8105810, 0x2 - delay 0x2 + createvisualtask sub_8105810, 2 + delay 2 playsewithpan SE_W004, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, -12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, -12, 3 + delay 10 playsewithpan SE_W004, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, 12, 3 - delay 0xA + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 12, 3 + delay 10 playsewithpan SE_W233B, +63 - createsprite gUnknown_085973B8, 0x82, 1, 0, 0, 3 + createsprite gBattleAnimSpriteTemplate_85973B8, 130, 1, 0, 0, 3 waitforvisualfinish - createvisualtask sub_8105AAC, 0x2 - delay 0xA - createvisualtask sub_810599C, 0x2 - loopsewithpan SE_W104, -64, 0x8, 0x4 + createvisualtask sub_8105AAC, 2 + delay 10 + createvisualtask sub_810599C, 2 + loopsewithpan SE_W104, -64, 8, 4 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 - delay 0x1 + delay 1 + setarg 7, 0x1000 + delay 1 end - -Anim_ExtremeSpeedAgainstPlayer: +ExtremeSpeedAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_ExtremeSpeedContinue + goto ExtremeSpeedContinue Move_UPROAR: loadspritegfx 0x27F1 - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_203 monbg ANIM_DEF_PARTNER - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 29, -12, 0 - createsprite gUnknown_08593BB8, 0x2, 0, -12, -29, 1 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 29, -12, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -12, -29, 1 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 12, -29, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -29, -12, 0 - delay 0x10 - createvisualtask sub_8106D90, 0x2, 0 - createsprite gUnknown_08593898, 0x3, 0, 0, 0, 0, 31, 8 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 12, -29, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -29, -12, 0 + delay 16 + createvisualtask sub_8106D90, 2, 0 + createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, -64 - createsprite gUnknown_08593BB8, 0x2, 0, 24, -24, 1 - createsprite gUnknown_08593BB8, 0x2, 0, -24, -24, 0 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, 24, -24, 1 + createsprite gBattleAnimSpriteTemplate_8593BB8, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_HEAT_WAVE: loadspritegfx 0x2815 - createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED - createvisualtask sub_8110BCC, 0x5, 1 - createvisualtask sub_810A060, 0x6, 6, 31 - panse_1B SE_W257, -64, +63, +2, 0x0 - delay 0x4 - createvisualtask sub_8109DBC, 0x5 - delay 0xC - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 1 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 1 + createvisualtask sub_8116848, 5, 10261, 0, 6, 6, RGB_RED + createvisualtask sub_8110BCC, 5, 1 + createvisualtask sub_810A060, 6, 6, 31 + panse_1B SE_W257, -64, +63, +2, 0 + delay 4 + createvisualtask sub_8109DBC, 5 + delay 12 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 1 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 1 end Move_HAIL: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createvisualtask sub_8116620, 0xA, 1, 3, 0, 6, RGB_BLACK + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish - createvisualtask sub_810C918, 0x5 - loopsewithpan SE_W258, 0, 0x8, 0xA + createvisualtask sub_810C918, 5 + loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 3, 6, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT: loadspritegfx 0x2767 - loadspritegfx 0x27E1 - createvisualtask sub_815AFF0, 0x2 + loadspritegfx ANIM_TAG_209 + createvisualtask sub_815AFF0, 2 waitforvisualfinish - createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 - delay 0x14 - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 20 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 end Move_MEMENTO: - setalpha 0x1000 - delay 0x1 - createvisualtask sub_81143C0, 0x2 - delay 0x1 - createvisualtask sub_8113BAC, 0x5 + setalpha 0, 16 + delay 1 + createvisualtask sub_81143C0, 2 + delay 1 + createvisualtask sub_8113BAC, 5 playsewithpan SE_W060, -64 - delay 0x30 + delay 48 playsewithpan SE_W060B, -64 waitforvisualfinish - createvisualtask sub_8114470, 0x2 - delay 0xC - setalpha 0x1000 - delay 0x1 + createvisualtask sub_8114470, 2 + delay 12 + setalpha 0, 16 + delay 1 monbg_22 ANIM_TARGET - createvisualtask sub_8113E78, 0x5 + createvisualtask sub_8113E78, 5 playsewithpan SE_W060, +63 waitforvisualfinish clearmonbg_23 ANIM_TARGET - delay 0x1 + delay 1 blendoff - delay 0x1 + delay 1 end Move_FACADE: loadspritegfx 0x2803 - createvisualtask sub_815DCA4, 0x2, 0, 3 - createvisualtask sub_815DF0C, 0x2, 0, 72 - loopsewithpan SE_W207, -64, 0x18, 0x3 + createvisualtask sub_815DCA4, 2, 0, 3 + createvisualtask sub_815DF0C, 2, 0, 72 + loopsewithpan SE_W207, -64, 24, 3 end Move_SMELLING_SALT: loadspritegfx 0x2807 loadspritegfx 0x280F - createsprite gUnknown_085CE864, 0x82, 1, 0, 2 - createsprite gUnknown_085CE864, 0x82, 1, 1, 2 + createsprite gUnknown_085CE864, 130, 1, 0, 2 + createsprite gUnknown_085CE864, 130, 1, 1, 2 delay 0x20 - createvisualtask sub_815E840, 0x3, 1, 2 - loopsewithpan SE_W003, +63, 0xC, 0x2 + createvisualtask sub_815E840, 3, 1, 2 + loopsewithpan SE_W003, +63, 12, 2 waitforvisualfinish - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 6, 2 - createsprite gUnknown_085CE894, 0x82, 1, 8, 3 - loopsewithpan SE_W207B, +63, 0x10, 0x3 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 + createsprite gUnknown_085CE894, 130, 1, 8, 3 + loopsewithpan SE_W207B, +63, 16, 3 end Move_FOLLOW_ME: loadspritegfx 0x2750 - createsprite gUnknown_085931D4, 0x2, 0 + createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, -64 delay 0x12 playsewithpan SE_W213, -64 delay 0x47 - loopsewithpan SE_W039, -64, 0x16, 0x3 + loopsewithpan SE_W039, -64, 0x16, 3 end Move_CHARGE: @@ -3613,87 +3571,87 @@ Move_CHARGE: loadspritegfx 0x27E4 loadspritegfx 0x27E5 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12 + createvisualtask sub_810AAFC, 2, 0, 60, 2, 12 playsewithpan SE_W268, -64 - delay 0x1E + delay 30 playsewithpan SE_W268, -64 - delay 0x1E + delay 30 playsewithpan SE_W268, -64 - createsprite gUnknown_0859595C, 0x2, 0 - delay 0x19 + createsprite gUnknown_0859595C, 2, 0 + delay 25 playsewithpan SE_W268, -64 - delay 0x14 + delay 20 playsewithpan SE_W268, -64 - delay 0xF + delay 15 playsewithpan SE_W268, -64 - delay 0xA - delay 0x6 - loopsewithpan SE_W268, -64, 0x6, 0x5 + delay 10 + delay 6 + loopsewithpan SE_W268, -64, 6, 5 waitforvisualfinish - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 playsewithpan SE_W085B, -64 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff end Move_TAUNT: loadspritegfx 0x27E6 - loadspritegfx 0x27E1 + loadspritegfx ANIM_TAG_209 loadspritegfx 0x2767 - createsprite gUnknown_08593114, 0xB, 0, 45 + createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, -64 - delay 0x6 - createsprite gUnknown_0859324C, 0xC, 0 - delay 0x4 - loopsewithpan SE_W039, -64, 0x10, 0x2 + delay 6 + createsprite gUnknown_0859324C, 12, 0 + delay 4 + loopsewithpan SE_W039, -64, 16, 2 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0859368C, 0x82, 1, -20, -28 + delay 8 + createsprite gUnknown_0859368C, 130, 1, -20, -28 playsewithpan SE_W207B, +63 waitforvisualfinish - delay 0xC - createsprite gUnknown_0859368C, 0x82, 1, 20, -28 + delay 12 + createsprite gUnknown_0859368C, 130, 1, 20, -28 playsewithpan SE_W207B, +63 end Move_HELPING_HAND: loadspritegfx 0x2807 - createvisualtask sub_815EC48, 0x5 + createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 0x28, 0 createsprite gUnknown_085CE8AC, 0x28, 1 - delay 0x13 + delay 19 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0xE + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 14 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 2, 0, 5, 1 - delay 0x14 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 + delay 20 playsewithpan SE_W227, 0 - createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1 - createvisualtask sub_80A7B98, 0x2, 2, RGB_YELLOW, 12, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1 end Move_ASSIST: loadspritegfx 0x280C - createsprite gUnknown_085CE804, 0x32, 112, -16, 140, 128, 36 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 208, 128, -16, 48, 36 + createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 112, 256, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, 108, 128, 84, -16, 36 + delay 2 + createsprite gUnknown_085CE804, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 - delay 0x2 - createsprite gUnknown_085CE804, 0x32, -16, 56, 256, 56, 36 + delay 2 + createsprite gUnknown_085CE804, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end @@ -3703,158 +3661,158 @@ Move_SUPERPOWER: loadspritegfx 0x2811 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08595FEC, 0x82, 0 + setalpha 12, 8 + createsprite gUnknown_08595FEC, 130, 0 playsewithpan SE_W025, -64 - delay 0x14 - createsprite gUnknown_085972D8, 0x2, 4, 1, 180, 1 - createvisualtask sub_8159244, 0x5, 234, 0 + delay 20 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 + createvisualtask sub_8159244, 5, 234, 0 delay 0x28 createsprite gUnknown_08596004, 0x29, 200, 96, 1, 120 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 20, 248, 4, 112 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 130, 160, 2, 104 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 160, 192, 0, 96 - delay 0x8 + delay 8 createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88 delay 0x4A - createsprite gUnknown_0859601C, 0x83, 0 + createsprite gUnknown_0859601C, 131, 0 playsewithpan SE_W207, -64 - delay 0x10 - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 16, 1 + delay 16 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 + delay 1 end Move_RECYCLE: loadspritegfx 0x2826 monbg ANIM_ATTACKER - setalpha 0x1000 - delay 0x1 - createsprite gUnknown_085CE9B0, 0x2 - loopsewithpan SE_W036, -64, 0x18, 0x3 + setalpha 0, 16 + delay 1 + createsprite gUnknown_085CE9B0, 2 + loopsewithpan SE_W036, -64, 24, 3 waitforvisualfinish - createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, -64 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_BRICK_BREAK: - loadspritegfx 0x27B7 - loadspritegfx 0x2797 - loadspritegfx 0x279F - loadspritegfx 0x27E0 - choosetwoturnanim Anim_BrickBreakNormal, Anim_BrickBreakShatteredWall -Anim_BrickBreakNormal: + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_208 + choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall +BrickBreakNormal: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end -Anim_BrickBreakShatteredWall: +BrickBreakShatteredWall: monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x4 - createsprite gUnknown_08595F90, 0x3, 1, 0, 0, 90, 10 - delay 0x1 - createsprite gUnknown_08597358, 0x3, -18, -18, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 4 + createsprite gUnknown_08595F90, 3, 1, 0, 0, 90, 10 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, -18, -18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createsprite gUnknown_0857FE28, 0x2, 3, 8 - delay 0x5 - createsprite gUnknown_08597358, 0x3, 18, 18, 1, 1 + delay 20 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 8 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 3, 18, 18, 1, 1 playsewithpan SE_W233, +63 - delay 0x14 - createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK + delay 20 + createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK delay 0x25 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 waitforvisualfinish - createsprite gUnknown_08595FA8, 0x2, 1, 0, -8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 1, 8, -12 - createsprite gUnknown_08595FA8, 0x2, 1, 2, -8, 12 - createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12 + createsprite gUnknown_08595FA8, 2, 1, 0, -8, -12 + createsprite gUnknown_08595FA8, 2, 1, 1, 8, -12 + createsprite gUnknown_08595FA8, 2, 1, 2, -8, 12 + createsprite gUnknown_08595FA8, 2, 1, 3, 8, 12 playsewithpan SE_W280, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 6, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET end Move_YAWN: loadspritegfx 0x2802 - createvisualtask sub_815D64C, 0x2, 0 + createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish createsprite gUnknown_085CE68C, 0x85, 2 playsewithpan SE_W255, -64 - delay 0x4 + delay 4 createsprite gUnknown_085CE68C, 0x85, 1 - delay 0x4 + delay 4 createsprite gUnknown_085CE68C, 0x85, 0 waitforvisualfinish - createvisualtask sub_815D64C, 0x2, 1 + createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, +63 end Move_ENDEAVOR: loadspritegfx 0x2803 - loadspritegfx 0x2797 - createvisualtask sub_815DCA4, 0x2, 0, 2 - loopsewithpan SE_W039, -64, 0x18, 0x2 - createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2 - delay 0x6 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2 + loadspritegfx ANIM_TAG_135 + createvisualtask sub_815DCA4, 2, 0, 2 + loopsewithpan SE_W039, -64, 24, 2 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 + delay 6 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 12, -12, 1, 2 playsewithpan SE_W003, +63 - delay 0x18 - createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, -12, 12, 1, 2 + delay 24 + createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, -12, 12, 1, 2 playsewithpan SE_W004, +63 end Move_ERUPTION: loadspritegfx 0x27D9 - createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + createvisualtask sub_8109460, 2 + waitplaysewithpan SE_W153, -64, 60 waitforvisualfinish - createvisualtask sub_8109460, 0x2 - waitplaysewithpan SE_W153, -64, 0x3C + createvisualtask sub_8109460, 2 + waitplaysewithpan SE_W153, -64, 60 waitforvisualfinish - delay 0x1E + delay 30 createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0 createsprite gUnknown_085955E8, 0x28, 30, -32, 16, 90, 1 createsprite gUnknown_085955E8, 0x28, 150, -32, 32, 60, 2 @@ -3862,41 +3820,41 @@ Move_ERUPTION: createsprite gUnknown_085955E8, 0x28, 110, -32, 64, 50, 0 createsprite gUnknown_085955E8, 0x28, 60, -32, 80, 70, 1 delay 0x16 - createvisualtask sub_81152DC, 0x5, 5, 8, 60 - createvisualtask sub_81152DC, 0x5, 4, 8, 60 - loopsewithpan SE_W088, +63, 0x10, 0xC + createvisualtask sub_81152DC, 5, 5, 8, 60 + createvisualtask sub_81152DC, 5, 4, 8, 60 + loopsewithpan SE_W088, +63, 16, 12 delay 0x50 - createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 0x28, 31, 4, 4, 0, RGB_RED end Move_SKILL_SWAP: loadspritegfx 0x280B - call Anim_SetPsychicBackground - createvisualtask sub_810FBF0, 0x3, 1 - createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, -64, 0x18, 0x3 - delay 0x10 - createvisualtask sub_810FBF0, 0x3, 0 - createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1 + call SetPsychicBackground + createvisualtask sub_810FBF0, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 + loopsewithpan SE_W179, -64, 24, 3 + delay 16 + createvisualtask sub_810FBF0, 3, 0 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1 waitforvisualfinish - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_IMPRISON: loadspritegfx 0x2809 - loadspritegfx 0x280A - call Anim_SetPsychicBackground + loadspritegfx ANIM_TAG_250 + call SetPsychicBackground monbg ANIM_DEF_PARTNER - createvisualtask sub_810F940, 0x5 - delay 0x8 - loopsewithpan SE_W030, -64, 0x8, 0x5 + createvisualtask sub_810F940, 5 + delay 8 + loopsewithpan SE_W030, -64, 8, 5 waitforvisualfinish - delay 0x4 - createsprite gUnknown_085967AC, 0x5, 0, 40 - createvisualtask sub_81152DC, 0x5, 4, 1, 10 + delay 4 + createsprite gUnknown_085967AC, 5, 0, 40 + createvisualtask sub_81152DC, 5, 4, 1, 10 playsewithpan SE_W063, -64 clearmonbg ANIM_DEF_PARTNER - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_GRUDGE: @@ -3906,9 +3864,9 @@ Move_GRUDGE: fadetobg BG_GHOST playsewithpan SE_W060, -64 waitbgfadein - createvisualtask sub_8112C6C, 0x3 - loopsewithpan SE_W052, -64, 0x10, 0x4 - delay 0xA + createvisualtask sub_8112C6C, 3 + loopsewithpan SE_W052, -64, 16, 4 + delay 10 delay 0x50 playsewithpan SE_W171, +63 waitforvisualfinish @@ -3920,16 +3878,16 @@ Move_GRUDGE: Move_CAMOUFLAGE: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x10 - createvisualtask sub_811675C, 0x5, 2, 3, 0, 14 - delay 0x10 - createvisualtask sub_81136E8, 0x2, 4 + setalpha 16, 0 + createvisualtask sub_811675C, 5, 2, 3, 0, 14 + delay 16 + createvisualtask sub_81136E8, 2, 4 playsewithpan SE_W185, -64 waitforvisualfinish - delay 0x8 - createvisualtask sub_811675C, 0x5, 2, 0, 0, 0 + delay 8 + createvisualtask sub_811675C, 5, 2, 0, 0, 0 waitforvisualfinish - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish blendoff clearmonbg ANIM_ATK_PARTNER @@ -3938,80 +3896,80 @@ Move_CAMOUFLAGE: Move_TAIL_GLOW: loadspritegfx 0x27E4 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, 0x42, 0 + createsprite gUnknown_08596AC8, 66, 0 delay 0x12 - loopsewithpan SE_W234, -64, 0x10, 0x6 + loopsewithpan SE_W234, -64, 16, 6 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 end Move_LUSTER_PURGE: loadspritegfx 0x281B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein monbg ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W076, -64 createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0 - delay 0x14 - createvisualtask sub_8116664, 0x5, 5, 2, 0, 16, -1 - createvisualtask sub_8116848, 0x5, 10267, 2, 0, 16, -1 - waitforvisualfinish - createvisualtask sub_8116848, 0x5, 10135, 0, 12, 12, 23552 - waitforvisualfinish - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - delay 0x3 - createsprite gUnknown_085973A0, 0x83, 1, 2 - createvisualtask sub_8159210, 0x5, 215, 63 - waitforvisualfinish - createvisualtask sub_8116664, 0x5, 5, 2, 16, 0, -1 - createvisualtask sub_81152DC, 0x5, 1, 5, 14 + delay 20 + createvisualtask sub_8116664, 5, 5, 2, 0, 16, -1 + createvisualtask sub_8116848, 5, 10267, 2, 0, 16, -1 + waitforvisualfinish + createvisualtask sub_8116848, 5, 10135, 0, 12, 12, 23552 + waitforvisualfinish + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + delay 3 + createsprite gUnknown_085973A0, 131, 1, 2 + createvisualtask sub_8159210, 5, 215, 63 + waitforvisualfinish + createvisualtask sub_8116664, 5, 5, 2, 16, 0, -1 + createvisualtask sub_81152DC, 5, 1, 5, 14 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_MIST_BALL: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x281E - delay 0x0 + delay 0 playsewithpan SE_W081, -64 createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, +63 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 10, 0 - createsprite gUnknown_0859728C, 0x0, 1, 1, 1, 32279, 16, 0x7FFF, 16 - delay 0x0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 0, 1, 1, 1, 32279, 16, 0x7FFF, 16 + delay 0 playsewithpan SE_W114, 0 - createvisualtask sub_810C324, 0x5 - createvisualtask sub_8116620, 0xA, 4, 3, 0, 16, RGB_WHITE - delay 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 70, 0 - delay 0x46 - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE + createvisualtask sub_810C324, 5 + createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE + delay 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 + delay 70 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE: @@ -4019,157 +3977,157 @@ Move_FEATHER_DANCE: monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, +63 - delay 0x0 + delay 0 createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 32, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 0, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 224, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 128, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 192, 2, 104, 11304, 32, 1 createsprite gUnknown_08596388, 0x80, 0, -16, 160, 2, 104, 11304, 32, 1 - delay 0x6 + delay 6 createsprite gUnknown_08596388, 0x80, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_TEETER_DANCE: - loadspritegfx 0x2758 - loadspritegfx 0x2759 - createvisualtask sub_8160164, 0x5 - createsprite gUnknown_08593050, 0x2, 0, 16, -2 + loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_073 + createvisualtask sub_8160164, 5 + createsprite gUnknown_08593050, 2, 0, 16, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, 0, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, 0, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 0, -16, -2 + delay 24 + createsprite gUnknown_08593050, 2, 0, -16, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 1, -8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 1, -8, -2 playsewithpan SE_W298, -64 - delay 0x18 - createsprite gUnknown_08593050, 0x2, 2, 8, -2 + delay 24 + createsprite gUnknown_08593050, 2, 2, 8, -2 playsewithpan SE_W298, -64 end Move_MUD_SPORT: - loadspritegfx 0x275A - createvisualtask sub_8104938, 0x2, 0, 6 - delay 0x18 - createsprite gUnknown_085971E4, 0x82, 0, -4, -16 - createsprite gUnknown_085971E4, 0x82, 0, 4, -12 + loadspritegfx ANIM_TAG_074 + createvisualtask sub_8104938, 2, 0, 6 + delay 24 + createsprite gUnknown_085971E4, 130, 0, -4, -16 + createsprite gUnknown_085971E4, 130, 0, 4, -12 playsewithpan SE_W091, -64 delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -3, -12 - createsprite gUnknown_085971E4, 0x82, 0, 5, -14 + createsprite gUnknown_085971E4, 130, 0, -3, -12 + createsprite gUnknown_085971E4, 130, 0, 5, -14 playsewithpan SE_W091, -64 delay 0x20 - createsprite gUnknown_085971E4, 0x82, 0, -5, -18 - createsprite gUnknown_085971E4, 0x82, 0, 3, -14 + createsprite gUnknown_085971E4, 130, 0, -5, -18 + createsprite gUnknown_085971E4, 130, 0, 3, -14 playsewithpan SE_W091, -64 - delay 0x10 - createsprite gUnknown_085971E4, 0x82, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 0x19 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 0xE - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 0xA - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 20, 90 + delay 16 + createsprite gUnknown_085971E4, 130, 1, 220, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 60, 100 + waitplaysewithpan SE_W145B, 0, 25 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 140, 55 + waitplaysewithpan SE_W145B, 0, 14 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 180, 50 + waitplaysewithpan SE_W145B, 0, 10 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 20, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 90, 90 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 90, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 30, 90 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 160, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 30, 90 waitplaysewithpan SE_W145B, 0, 0x16 - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 0xF - delay 0x2 - createsprite gUnknown_085971E4, 0x82, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 0xA + delay 2 + createsprite gUnknown_085971E4, 130, 1, 120, 60 + waitplaysewithpan SE_W145B, 0, 15 + delay 2 + createsprite gUnknown_085971E4, 130, 1, 200, 40 + waitplaysewithpan SE_W145B, 0, 10 end Move_NEEDLE_ARM: - loadspritegfx 0x281A - loadspritegfx 0x2797 - loadspritegfx 0x279F - loopsewithpan SE_W030, +63, 0x2, 0x10 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -32, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 22, -22, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 30, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 20, 20, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, 28, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -19, 19, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -27, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, -18, -18, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 0, -25, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 17, -17, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 23, 0, 16 - delay 0x2 - createsprite gUnknown_08592888, 0x82, 1, 0, 16, 16, 16 - waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 18, 1 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + loadspritegfx ANIM_TAG_266 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + loopsewithpan SE_W030, +63, 2, 16 + createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 22, -22, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 30, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 20, 20, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, 28, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -19, 19, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -27, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, -18, -18, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 0, -25, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 17, -17, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 23, 0, 16 + delay 2 + createsprite gUnknown_08592888, 130, 1, 0, 16, 16, 16 + waitforvisualfinish + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W233B, +63 - createsprite gUnknown_08592888, 0x82, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, 0x82, 1, 1, -17, -17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 0, -24, 10 + createsprite gUnknown_08592888, 130, 1, 1, 17, -17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 24, 0, 10 + createsprite gUnknown_08592888, 130, 1, 1, 17, 17, 10 + createsprite gUnknown_08592888, 130, 1, 1, 0, 24, 10 + createsprite gUnknown_08592888, 130, 1, 1, -17, 17, 10 + createsprite gUnknown_08592888, 130, 1, 1, -24, 0, 10 + createsprite gUnknown_08592888, 130, 1, 1, -17, -17, 10 end Move_SLACK_OFF: - loadspritegfx 0x272F - createvisualtask sub_8160544, 0x2, 0 + loadspritegfx ANIM_TAG_031 + createvisualtask sub_8160544, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish - call Anim_HealingEffect + call HealingEffect waitforvisualfinish end Move_CRUSH_CLAW: - loadspritegfx 0x27B7 - loadspritegfx 0x2737 - loadspritegfx 0x27E0 + loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_208 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 18, 1 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 playsewithpan SE_W013, +63 - delay 0xC - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 + delay 12 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 playsewithpan SE_W013, +63 waitforvisualfinish blendoff @@ -4178,155 +4136,155 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx 0x27AF - loadspritegfx 0x27DB - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12) - delay 0x1 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) + delay 1 monbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_085927AC, 0x0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, 0x42, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, 0x0, 16, 24, 0, 2, 1, 0, 0 - delay 0x14 - createsprite gUnknown_085927AC, 0x42, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, 0x0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, 0x0, 74, 24, 180, 3, 2, 0, 0 - delay 0xA - createsprite gUnknown_085927AC, 0x42, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, 0x0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, 0x0, 90, 16, 0, 2, 1, 0, 0 + delay 1 + createsprite gUnknown_085927AC, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gUnknown_085927AC, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gUnknown_085927C4, 0, 16, 24, 0, 2, 1, 0, 0 + delay 20 + createsprite gUnknown_085927AC, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gUnknown_085927AC, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gUnknown_085927AC, 0, 74, 24, 180, 3, 2, 0, 0 + delay 10 + createsprite gUnknown_085927AC, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gUnknown_085927AC, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gUnknown_085927C4, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 - createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12) - delay 0x1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 7, 0, RGB(13, 31, 12) + delay 1 playsewithpan SE_W287, -64 - createvisualtask sub_815DFCC, 0x2, 1 + createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 43, 3, 10, 0, RGB(13, 31, 12) + createsprite gUnknown_08593868, 16, 0, 0, 0, 1 waitforvisualfinish end Move_FAKE_TEARS: - loadspritegfx 0x27AB - loadspritegfx 0x27E1 - loadspritegfx 0x2758 - createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31) - waitforvisualfinish - createvisualtask sub_815C478, 0x5, 0, 2, 1 - loopsewithpan SE_W039, -64, 0xC, 0x4 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 0 - createsprite gUnknown_085970E8, 0x2, 0, 1 - delay 0x8 - createsprite gUnknown_085970E8, 0x2, 0, 2 - createsprite gUnknown_085970E8, 0x2, 0, 3 + loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_072 + createvisualtask sub_8116848, 5, 10155, 0, 4, 4, RGB(12, 11, 31) + waitforvisualfinish + createvisualtask sub_815C478, 5, 0, 2, 1 + loopsewithpan SE_W039, -64, 12, 4 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 0 + createsprite gUnknown_085970E8, 2, 0, 1 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 0 + createsprite gUnknown_085970E8, 2, 0, 1 + delay 8 + createsprite gUnknown_085970E8, 2, 0, 2 + createsprite gUnknown_085970E8, 2, 0, 3 waitforvisualfinish end Move_AIR_CUTTER: - loadspritegfx 0x2713 - loadspritegfx 0x279A - loadspritegfx 0x2797 - delay 0x0 + loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_135 + delay 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 - createvisualtask sub_8103CF0, 0x2, 32, -24, 1536, 2, 128 + setalpha 12, 8 + delay 0 + createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, +63 - createsprite gUnknown_08592A34, 0x2, 40, -32, 0, 2 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 + createsprite gUnknown_08592A34, 2, 40, -32, 0, 2 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 end Move_ODOR_SLEUTH: monbg ANIM_TARGET - createvisualtask sub_815F620, 0x5 - delay 0x18 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + createvisualtask sub_815F620, 5 + delay 24 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, -64 - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 3, 4 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 3, 4 playsewithpan SE_W207, -64 waitforvisualfinish clearmonbg ANIM_TARGET - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 1, 3, 1, -1, 16, -1, 0 + delay 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, -1, 16, -1, 0 playsewithpan SE_W043, -64 end Move_GRASS_WHISTLE: - loadspritegfx 0x2758 - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12) - waitforvisualfinish - createvisualtask sub_8102BE8, 0x2 - waitforvisualfinish - panse_1B SE_W320, -64, +63, +2, 0x0 - createsprite gUnknown_08593008, 0x82, 7, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x5 - createsprite gUnknown_08593008, 0x82, 3, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 6, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 2, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 1, 1, 0 - delay 0x4 - createsprite gUnknown_08593008, 0x82, 5, 1, 0 - delay 0x4 - waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 - createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12) + loadspritegfx ANIM_TAG_072 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) + waitforvisualfinish + createvisualtask sub_8102BE8, 2 + waitforvisualfinish + panse_1B SE_W320, -64, +63, +2, 0 + createsprite gUnknown_08593008, 130, 7, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 5 + createsprite gUnknown_08593008, 130, 3, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 6, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 2, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 1, 1, 0 + delay 4 + createsprite gUnknown_08593008, 130, 5, 1, 0 + delay 4 + waitforvisualfinish + createvisualtask sub_8102CA0, 2 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end Move_TICKLE: loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 playsewithpan SE_W197, -64 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 16, 0, RGB_BLACK waitforvisualfinish - delay 0x14 - createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0 - delay 0xC - createvisualtask sub_815C478, 0x3, 1, 6, 2 - loopsewithpan SE_W039, +63, 0x8, 0x8 + delay 20 + createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER + delay 12 + createvisualtask sub_815C478, 3, 1, 6, 2 + loopsewithpan SE_W039, +63, 8, 8 waitforvisualfinish end @@ -4334,33 +4292,33 @@ Move_WATER_SPOUT: loadspritegfx 0x281C loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_81080E4, 0x5 + setalpha 12, 8 + createvisualtask sub_81080E4, 5 playsewithpan SE_W029, -64 delay 0x2C playsewithpan SE_W291, -64 waitforvisualfinish - delay 0x10 - createvisualtask sub_81085C8, 0x5 + delay 16 + createvisualtask sub_81085C8, 5 playsewithpan SE_W057, +63 clearmonbg ANIM_DEF_PARTNER blendoff end Move_SHADOW_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER - setalpha 0x809 - createvisualtask sub_80A8BC4, 0x2, 0, 13 + setalpha 9, 8 + createvisualtask sub_80A8BC4, 2, 0, 13 playsewithpan SE_W026, -64 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 playsewithpan SE_W004, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -4369,37 +4327,37 @@ Move_SHADOW_PUNCH: end Move_EXTRASENSORY: - call Anim_SetPsychicBackground + call SetPsychicBackground monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 0 + setalpha 12, 8 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask sub_810FE14, 5, 0 playsewithpan SE_W020, +63 waitforvisualfinish - createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1 - createvisualtask sub_810FE14, 0x5, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1 + createvisualtask sub_810FE14, 5, 1 playsewithpan SE_W020, +63 waitforvisualfinish - createvisualtask sub_8110034, 0x5, 0 - createvisualtask sub_810FE14, 0x5, 2 + createvisualtask sub_8110034, 5, 0 + createvisualtask sub_810FE14, 5, 2 playsewithpan SE_W043, -64 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_AERIAL_ACE: - loadspritegfx 0x279A + loadspritegfx ANIM_TAG_138 monbg ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 24, 6, 1, 5 - createvisualtask sub_81169C0, 0x2, 0, 4, 7, 3 - createsprite gUnknown_08592A1C, 0x2, 40, -32, 0 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 + createvisualtask sub_81169C0, 2, 0, 4, 7, 3 + createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 0 playsewithpan SE_W013B, -64 - delay 0x5 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 10, 1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 10, 0, 0 + delay 5 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4407,134 +4365,134 @@ Move_AERIAL_ACE: end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 - createsprite gUnknown_0859728C, 0x2, 1, 8, 2, -1, 14, -1, 0 + loopsewithpan SE_REAPOKE, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish end Move_BLOCK: - loadspritegfx 0x280A + loadspritegfx ANIM_TAG_250 createsprite gUnknown_085CE90C, 0xC2 playsewithpan SE_W207, +63 end Move_HOWL: loadspritegfx 0x2745 - createvisualtask sub_815D64C, 0x2, 0 - delay 0xC - call Anim_RoarEffect - createvisualtask sub_8158D8C, 0x2, 0, 3 + createvisualtask sub_815D64C, 2, 0 + delay 12 + call RoarEffect + createvisualtask sub_8158D8C, 2, 0, 3 waitforvisualfinish - delay 0x1E + delay 30 end Move_BULK_UP: loadspritegfx 0x2766 - createvisualtask sub_8104AB4, 0x2 + createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish - createsprite gUnknown_08593658, 0x2 - loopsewithpan SE_W207, -64, 0x4, 0x2 + createsprite gUnknown_08593658, 2 + loopsewithpan SE_W207, -64, 4, 2 waitforvisualfinish end Move_COVET: loadspritegfx 0x27E2 loadspritegfx 0x27F0 - createvisualtask sub_815C478, 0x5, 0, 2, 0 - createsprite gUnknown_08593970, 0x3, 0, 20 + createvisualtask sub_815C478, 5, 0, 2, 0 + createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, -20, 20 + delay 15 + createsprite gUnknown_08593970, 3, -20, 20 playsewithpan SE_W204, -64 - delay 0xF - createsprite gUnknown_08593970, 0x3, 20, 20 + delay 15 + createsprite gUnknown_08593970, 3, 20, 20 playsewithpan SE_W204, -64 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, +63, 0x4, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + loopsewithpan SE_W146, +63, 4, 3 end Move_VOLT_TACKLE: - loadspritegfx 0x2711 + loadspritegfx ANIM_TAG_001 loadspritegfx 0x27E4 loadspritegfx 0x27E5 monbg ANIM_ATTACKER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 1, 0, 0, 8, RGB_BLACK + setalpha 12, 8 + createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gUnknown_085959A4, 0x1 + createsprite gUnknown_085959A4, 1 playsewithpan SE_W268, -64 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x8 - createvisualtask sub_810AFCC, 0x5, 0 + delay 8 + createvisualtask sub_810AFCC, 5, 0 playsewithpan SE_W085, -64 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 1 + createvisualtask sub_810AFCC, 5, 1 playsewithpan SE_W085, +63 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 2 + createvisualtask sub_810AFCC, 5, 2 playsewithpan SE_W085, -64 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 3 + createvisualtask sub_810AFCC, 5, 3 playsewithpan SE_W085, +63 waitforvisualfinish - createvisualtask sub_810AFCC, 0x5, 4 + createvisualtask sub_810AFCC, 5, 4 playsewithpan SE_W085, -64 - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 10, 0, 18, 1 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 playsewithpan SE_W120, +63 - createsprite gUnknown_0859598C, 0x2, 1, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 1, -16, -16 - delay 0x8 - createvisualtask sub_810AE5C, 0x5 + createsprite gUnknown_0859598C, 2, 1, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 1, -16, -16 + delay 8 + createvisualtask sub_810AE5C, 5 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 0, 3, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, -64 - createsprite gUnknown_0859598C, 0x2, 0, 16, 16 - delay 0x2 - createsprite gUnknown_0859598C, 0x2, 0, -16, -16 + createsprite gUnknown_0859598C, 2, 0, 16, 16 + delay 2 + createsprite gUnknown_0859598C, 2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 1, 0, 8, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT: loadspritegfx 0x281C - createvisualtask sub_81088E4, 0x5 - delay 0x8 + createvisualtask sub_81088E4, 5 + delay 8 playsewithpan SE_W057, -64 delay 0x2C playsewithpan SE_W057, -64 delay 0x2C playsewithpan SE_W057, -64 delay 0x2C - panse_1B SE_W057, -64, +63, +2, 0x0 + panse_1B SE_W057, -64, +63, +2, 0 end Move_CALM_MIND: - loadspritegfx 0x27DB + loadspritegfx ANIM_TAG_203 monbg ANIM_ATK_PARTNER - createvisualtask sub_8116664, 0x5, 0, 0, 0, 16, 0 + createvisualtask sub_8116664, 5, 0, 0, 0, 16, 0 waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 1 + createvisualtask sub_81177E4, 5, 1 waitforvisualfinish createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 - delay 0xE + delay 14 createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 - delay 0xE + delay 14 createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 playsewithpan SE_W048, -64 waitforvisualfinish - createvisualtask sub_81177E4, 0x5, 0 + createvisualtask sub_81177E4, 5, 0 waitforvisualfinish - createvisualtask sub_8116664, 0x5, 0, 0, 16, 0, 0 + createvisualtask sub_8116664, 5, 0, 0, 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end @@ -4542,22 +4500,22 @@ Move_CALM_MIND: Move_LEAF_BLADE: loadspritegfx 0x274F loadspritegfx 0x282D - createvisualtask sub_80FFFC0, 0x5 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask sub_80FFFC0, 5 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 - delay 0x32 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + delay 50 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, +63 waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - delay 0xC - createvisualtask sub_80D52D0, 0x2, 1, 8, 0, 18, 1 - createsprite gUnknown_085973D0, 0x82, 0, 0, 1, 36 + setalpha 12, 8 + delay 12 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1 + createsprite gUnknown_085973D0, 130, 0, 0, 1, 36 playsewithpan SE_W043, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4568,103 +4526,103 @@ Move_DRAGON_DANCE: loadspritegfx 0x2809 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - delay 0x1 - createvisualtask sub_81133E8, 0x5 + delay 1 + createvisualtask sub_81133E8, 5 playsewithpan SE_W100, -64 - delay 0x8 - createvisualtask sub_80A7CB4, 0x5, 10249, 19456, 14, 0, 3 - createsprite gUnknown_08596F98, 0x2, 0 - createsprite gUnknown_08596F98, 0x2, 43 - createsprite gUnknown_08596F98, 0x2, 85 - createsprite gUnknown_08596F98, 0x2, 128 - createsprite gUnknown_08596F98, 0x2, 170 - createsprite gUnknown_08596F98, 0x2, 213 - delay 0x1E + delay 8 + createvisualtask sub_80A7CB4, 5, 10249, 19456, 14, 0, 3 + createsprite gUnknown_08596F98, 2, 0 + createsprite gUnknown_08596F98, 2, 43 + createsprite gUnknown_08596F98, 2, 85 + createsprite gUnknown_08596F98, 2, 128 + createsprite gUnknown_08596F98, 2, 170 + createsprite gUnknown_08596F98, 2, 213 + delay 30 playsewithpan SE_W100, -64 - delay 0x1E + delay 30 playsewithpan SE_W100, -64 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 end Move_SHOCK_WAVE: loadspritegfx 0x27E3 loadspritegfx 0x27E4 - loadspritegfx 0x2711 + loadspritegfx ANIM_TAG_001 loadspritegfx 0x2735 monbg ANIM_ATTACKER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2 + createvisualtask sub_810AAFC, 2, 0, 20, 0, 2 playsewithpan SE_W268, -64 - delay 0xC - createsprite gUnknown_08595A18, 0x2 - delay 0x1E - createvisualtask sub_810B29C, 0x5 - delay 0xC + delay 12 + createsprite gUnknown_08595A18, 2 + delay 30 + createvisualtask sub_810B29C, 5 + delay 12 waitforvisualfinish - createvisualtask sub_810B55C, 0x5 + createvisualtask sub_810B55C, 5 playsewithpan SE_W161B, +63 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 6, 18, 1 - createvisualtask sub_8116620, 0x5, 1, 3, 16, 0, RGB_WHITE - createvisualtask sub_8116620, 0x5, 4, 0, 16, 16, RGB_BLACK - delay 0x4 - createvisualtask sub_8116620, 0x5, 4, 0, 0, 0, RGB_BLACK + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1 + createvisualtask sub_8116620, 5, 1, 3, 16, 0, RGB_WHITE + createvisualtask sub_8116620, 5, 4, 0, 16, 16, RGB_BLACK + delay 4 + createvisualtask sub_8116620, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff end Move_HARDEN: - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish end Move_BELLY_DRUM: - loadspritegfx 0x2758 + loadspritegfx ANIM_TAG_072 loadspritegfx 0x27D1 - createvisualtask sub_8102BE8, 0x2 + createvisualtask sub_8102BE8, 2 waitforvisualfinish - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 0, 0, 0 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 0, 0, 0 playsewithpan SE_W187, -64 - delay 0xF - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 1, 1, 0 + delay 15 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 1, 1, 0 playsewithpan SE_W187, -64 - delay 0xF - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 3, 3, 128 + delay 15 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 3, 3, 128 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 2, 0, 128 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 2, 0, 128 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum1 - createsprite gUnknown_0859309C, 0x2, 0, 1, 1, 0 + delay 7 + call BellyDrum1 + createsprite gUnknown_0859309C, 2, 0, 1, 1, 0 playsewithpan SE_W187, -64 - delay 0x7 - call Anim_BellyDrum2 - createsprite gUnknown_0859309C, 0x2, 1, 0, 3, 0 + delay 7 + call BellyDrum2 + createsprite gUnknown_0859309C, 2, 1, 0, 3, 0 playsewithpan SE_W187, -64 waitforvisualfinish - createvisualtask sub_8102CA0, 0x2 + createvisualtask sub_8102CA0, 2 waitforvisualfinish end -Anim_BellyDrum2: - createsprite gUnknown_08593068, 0x3, 0 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum2: + createsprite gUnknown_08593068, 3, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return -Anim_BellyDrum1: - createsprite gUnknown_08593068, 0x3, 1 - createvisualtask sub_80D51AC, 0x2, 0, 0, 8, 2, 1 +BellyDrum1: + createsprite gUnknown_08593068, 3, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return Move_MIND_READER: @@ -4673,72 +4631,72 @@ Move_MIND_READER: loadspritegfx 0x27CF monbg ANIM_DEF_PARTNER playsewithpan SE_W109, +63 - createsprite gUnknown_085CE07C, 0x5, 0, 0, 1, 0 - createsprite gUnknown_085CE094, 0x5 + createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 + createsprite gUnknown_085CE094, 5 delay 0x28 playsewithpan SE_W043, +63 - createvisualtask sub_8115A04, 0x2, 1, 1, 2, 0, 10, RGB_BLACK - call Anim_MindReaderEffect + createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK + call MindReaderEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_MindReaderEffect: - createsprite gUnknown_085CE0AC, 0x4, 70, 0, 6 - createsprite gUnknown_085CE0AC, 0x4, 40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 10, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, -50, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, 40, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, 50, -30, 6 - createsprite gUnknown_085CE0AC, 0x4, 60, 10, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, 60, 6 - createsprite gUnknown_085CE0AC, 0x4, 0, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, -30, 6 - delay 0x2 - createsprite gUnknown_085CE0AC, 0x4, -50, 50, 6 - createsprite gUnknown_085CE0AC, 0x4, -60, 20, 6 - createsprite gUnknown_085CE0AC, 0x4, -40, -40, 6 - createsprite gUnknown_085CE0AC, 0x4, 20, -60, 6 - createsprite gUnknown_085CE0AC, 0x4, 50, -50, 6 - createsprite gUnknown_085CE0AC, 0x4, 35, 40, 6 - delay 0x2 +MindReaderEffect: + createsprite gUnknown_085CE0AC, 4, 70, 0, 6 + createsprite gUnknown_085CE0AC, 4, 40, 40, 6 + createsprite gUnknown_085CE0AC, 4, 10, -60, 6 + createsprite gUnknown_085CE0AC, 4, -50, -40, 6 + createsprite gUnknown_085CE0AC, 4, -40, 40, 6 + createsprite gUnknown_085CE0AC, 4, 50, -50, 6 + delay 2 + createsprite gUnknown_085CE0AC, 4, 50, -30, 6 + createsprite gUnknown_085CE0AC, 4, 60, 10, 6 + createsprite gUnknown_085CE0AC, 4, 0, 60, 6 + createsprite gUnknown_085CE0AC, 4, 0, -40, 6 + createsprite gUnknown_085CE0AC, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, 4, -60, -30, 6 + delay 2 + createsprite gUnknown_085CE0AC, 4, -50, 50, 6 + createsprite gUnknown_085CE0AC, 4, -60, 20, 6 + createsprite gUnknown_085CE0AC, 4, -40, -40, 6 + createsprite gUnknown_085CE0AC, 4, 20, -60, 6 + createsprite gUnknown_085CE0AC, 4, 50, -50, 6 + createsprite gUnknown_085CE0AC, 4, 35, 40, 6 + delay 2 return Move_ICE_PUNCH: monbg ANIM_DEF_PARTNER - setalpha 0x80C - loadspritegfx 0x279D - loadspritegfx 0x2797 - loadspritegfx 0x279F - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB(12, 26, 31) - delay 0x14 + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK + createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) + delay 20 playsewithpan SE_W081, +63 - createsprite gUnknown_08595AE8, 0x2, 0 - createsprite gUnknown_08595AE8, 0x2, 64 - createsprite gUnknown_08595AE8, 0x2, 128 - createsprite gUnknown_08595AE8, 0x2, 192 - delay 0x5 - createsprite gUnknown_08595AD0, 0x2, 32 - createsprite gUnknown_08595AD0, 0x2, 96 - createsprite gUnknown_08595AD0, 0x2, 160 - createsprite gUnknown_08595AD0, 0x2, 224 - delay 0x11 - createsprite gUnknown_08595E98, 0x4, 0, -10, 8, 1, 0 - createsprite gUnknown_08597358, 0x3, 0, -10, 1, 1 + createsprite gUnknown_08595AE8, 2, 0 + createsprite gUnknown_08595AE8, 2, 64 + createsprite gUnknown_08595AE8, 2, 128 + createsprite gUnknown_08595AE8, 2, 192 + delay 5 + createsprite gUnknown_08595AD0, 2, 32 + createsprite gUnknown_08595AD0, 2, 96 + createsprite gUnknown_08595AD0, 2, 160 + createsprite gUnknown_08595AD0, 2, 224 + delay 17 + createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 playsewithpan SE_W004, +63 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 3, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1 waitforvisualfinish - delay 0xF - call Anim_FreezeEffect1 - delay 0x5 - createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, RGB(12, 26, 31) + delay 15 + call FreezeEffect1 + delay 5 + createvisualtask sub_8116620, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -4747,156 +4705,154 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, -64 loadspritegfx 0x27F4 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x14 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 20 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 waitforvisualfinish end Move_CONFUSION: monbg ANIM_DEF_PARTNER - call Anim_SetPsychicBackground - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE + call SetPsychicBackground + setalpha 8, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end Move_PSYCHIC: monbg ANIM_DEF_PARTNER - call Anim_SetPsychicBackground - setalpha 0x808 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB(31, 23, 0) + call SetPsychicBackground + setalpha 8, 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0) waitforvisualfinish - loopsewithpan SE_W048, +63, 0xA, 0x3 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + loopsewithpan SE_W048, +63, 10, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end Move_FUTURE_SIGHT: - goto Anim_FutureSight - -Anim_FutureSightContinue: + goto FutureSight +FutureSightContinue: waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_FutureSight: +FutureSight: monbg ANIM_ATK_PARTNER playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 8, RGB_WHITE - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 8, RGB_WHITE + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto Anim_FutureSightContinue + goto FutureSightContinue Move_THUNDER: loadspritegfx 0x2735 fadetobg BG_THUNDER waitbgfadeout - createvisualtask sub_8117660, 0x5, -256, 0, 1, -1 + createvisualtask sub_8117660, 5, -256, 0, 1, -1 waitbgfadein - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK - delay 0x10 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 + createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W086, +63 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -36 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, -20 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 16, 12 - delay 0x14 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -36 + delay 1 + createsprite gUnknown_085956C0, 130, 16, -20 + delay 1 + createsprite gUnknown_085956C0, 130, 16, 12 + delay 20 createsprite gUnknown_085956C0, 0x86, -16, -32 playsewithpan SE_W086, +63 - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, -16 - delay 0x1 + delay 1 createsprite gUnknown_085956C0, 0x86, -16, 16 playsewithpan SE_W086, +63 - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -32 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 24, 16 - delay 0x1E - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x5 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -32 + delay 5 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -32 + delay 1 + createsprite gUnknown_085956C0, 130, 24, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 24, 16 + delay 30 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 5 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -32 playsewithpan SE_W161B, +63 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createvisualtask sub_810A094, 0x2, 30, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 10 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createvisualtask sub_810A094, 2, 30, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 130, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end Move_THUNDER_PUNCH: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 loadspritegfx 0x2735 monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK waitforvisualfinish playsewithpan SE_W004, +63 - createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x2, 0, 16 - delay 0x1 + createsprite gFistFootSpriteTemplate, 132, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 2, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 2, 0, 16 + delay 1 playsewithpan SE_W161B, +63 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK - delay 0x14 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK + delay 20 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4904,68 +4860,68 @@ Move_THUNDER_PUNCH: Move_SACRED_FIRE: loadspritegfx 0x2731 - loadspritegfx 0x2733 - loopsewithpan SE_W221, -64, 0x7, 0x5 - createsprite gUnknown_08595428, 0x2, -32, 0, 50, 5, -2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x42, -20, -10, 50, 5, -1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 0, -16, 50, 5, 0, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x42, 20, -10, 50, 5, 1, -1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 32, 0, 50, 5, 2, 0 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 20, 10, 50, 5, 1, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 - createsprite gUnknown_08595428, 0x2, 0, 16, 50, 5, 0, 1 - delay 0x1 - createsprite gUnknown_08595428, 0x2, -20, 10, 50, 5, -1, 1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + loadspritegfx ANIM_TAG_035 + loopsewithpan SE_W221, -64, 7, 5 + createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 + delay 1 + createsprite gUnknown_08595428, 66, -20, -10, 50, 5, -1, -1 + delay 1 + createsprite gUnknown_08595428, 66, 0, -16, 50, 5, 0, -1 + delay 1 + createsprite gUnknown_08595428, 66, 20, -10, 50, 5, 1, -1 + delay 1 + createsprite gUnknown_08595428, 2, 32, 0, 50, 5, 2, 0 + delay 1 + createsprite gUnknown_08595428, 2, 20, 10, 50, 5, 1, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 + createsprite gUnknown_08595428, 2, 0, 16, 50, 5, 0, 1 + delay 1 + createsprite gUnknown_08595428, 2, -20, 10, 50, 5, -1, 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 waitforvisualfinish playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, -16, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, -16, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, 0, 0, 70, 16, 0, 1 - delay 0xA + createsprite gUnknown_085953F8, 130, 0, 0, 70, 16, 0, 1 + delay 10 playsewithpan SE_W221B, +63 - createsprite gUnknown_085953F8, 0x82, 16, 0, 80, 16, 0, 1 - delay 0x1 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createsprite gUnknown_085953F8, 130, 16, 0, 80, 16, 0, 1 + delay 1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 1 playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 waitforvisualfinish end Move_SCRATCH: loadspritegfx 0x2799 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W010, +63 - createsprite gUnknown_085CE020, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gUnknown_085CE020, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -4976,32 +4932,32 @@ Move_DRAGON_BREATH: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W172, -64, 0x7, 0x7 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 9, RGB_RED - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 21, 1 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - delay 0x2 - createsprite gUnknown_08596EF4, 0x82, 0, 0, 0, 0, 20 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 9, 0, RGB_RED + loopsewithpan SE_W172, -64, 7, 7 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createvisualtask sub_8116620, 10, 4, 1, 0, 9, RGB_RED + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + delay 2 + createsprite gUnknown_08596EF4, 130, 0, 0, 0, 0, 20 + waitforvisualfinish + createvisualtask sub_8116620, 10, 4, 1, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -5010,162 +4966,161 @@ Move_ROAR: loadspritegfx 0x2745 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - createvisualtask sub_8158E9C, 0x2, 0, 2 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 - call Anim_RoarEffect - delay 0x14 - createvisualtask sub_80D5DB0, 0x5, 1, 2 + setalpha 8, 8 + createvisualtask sub_8158E9C, 2, 0, 2 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 + call RoarEffect + delay 20 + createvisualtask sub_80D5DB0, 5, 1, 2 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end -Anim_RoarEffect: - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 - delay 0xF - createsprite gUnknown_085CE7D4, 0x2, 24, -8, 0 - createsprite gUnknown_085CE7D4, 0x2, 24, 0, 2 - createsprite gUnknown_085CE7D4, 0x2, 24, 8, 1 +RoarEffect: + createsprite gUnknown_085CE7D4, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, 2, 24, 8, 1 + delay 15 + createsprite gUnknown_085CE7D4, 2, 24, -8, 0 + createsprite gUnknown_085CE7D4, 2, 24, 0, 2 + createsprite gUnknown_085CE7D4, 2, 24, 8, 1 return Move_GROWL: loadspritegfx 0x2745 - createvisualtask sub_8158E9C, 0x2, 0, 255 - call Anim_RoarEffect - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + createvisualtask sub_8158E9C, 2, 0, 255 + call RoarEffect + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish - createvisualtask sub_8159078, 0x5 + createvisualtask sub_8159078, 5 waitforvisualfinish end Move_SNORE: loadspritegfx 0x27D5 monbg ANIM_ATK_PARTNER - setalpha 0x808 - call Anim_Snore1 - delay 0x1E - call Anim_Snore1 + setalpha 8, 8 + call Snore1 + delay 30 + call Snore1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end - -Anim_Snore1: +Snore1: playsewithpan SE_W173, -64 - createvisualtask sub_80D6064, 0x5, -7, -7, 7, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 - createsprite gUnknown_085972D8, 0x2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, 0x2, 0, 0, 42, -38, 24, 0, 0 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 6, 1, 14, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gUnknown_085936EC, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN: loadspritegfx 0x2756 loadspritegfx 0x27B6 - setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF - createsprite gUnknown_08596560, 0x1, 40, 0, 10166 - delay 0xA - call Anim_SpecialScreenEffect - waitforvisualfinish - delay 0x1 - blendoff - end - -Anim_SpecialScreenEffect: - createsprite gUnknown_08596624, 0x2, 23, 0, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 31, -8, 0, 1 - delay 0x5 - createsprite gUnknown_08596624, 0x2, 30, 20, 0, 1 - delay 0x7 - createsprite gUnknown_08596624, 0x2, 10, -15, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 20, 10, 0, 1 - delay 0x6 - createsprite gUnknown_08596624, 0x2, 10, 18, 0, 1 + setalpha 0, 16 + waitplaysewithpan SE_W115, -64, 15 + createsprite gUnknown_08596560, 1, 40, 0, 10166 + delay 10 + call SpecialScreenEffect + waitforvisualfinish + delay 1 + blendoff + end + +SpecialScreenEffect: + createsprite gUnknown_08596624, 2, 23, 0, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 31, -8, 0, 1 + delay 5 + createsprite gUnknown_08596624, 2, 30, 20, 0, 1 + delay 7 + createsprite gUnknown_08596624, 2, 10, -15, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 20, 10, 0, 1 + delay 6 + createsprite gUnknown_08596624, 2, 10, 18, 0, 1 return Move_MIRROR_COAT: loadspritegfx 0x2756 loadspritegfx 0x27B8 - setalpha 0x1000 - createsprite gUnknown_08596590, 0x1, 40, 0, 10168 - delay 0xA + setalpha 0, 16 + createsprite gUnknown_08596590, 1, 40, 0, 10168 + delay 10 playsewithpan SE_W115, -64 - call Anim_SpecialScreenEffect + call SpecialScreenEffect waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_REFLECT: loadspritegfx 0x2757 - loadspritegfx 0x27B7 - setalpha 0x1000 - waitplaysewithpan SE_W115, -64, 0xF - createsprite gUnknown_08596578, 0x1, 40, 0, 10167 - delay 0x14 - createsprite gUnknown_085965F4, 0x2, 30, 0, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 19, -12, 0, 1 - delay 0x7 - createsprite gUnknown_085965F4, 0x2, 10, 20, 0, 1 + loadspritegfx ANIM_TAG_167 + setalpha 0, 16 + waitplaysewithpan SE_W115, -64, 15 + createsprite gUnknown_08596578, 1, 40, 0, 10167 + delay 20 + createsprite gUnknown_085965F4, 2, 30, 0, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 19, -12, 0, 1 + delay 7 + createsprite gUnknown_085965F4, 2, 10, 20, 0, 1 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BARRIER: loadspritegfx 0x27B9 - setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF - createsprite gUnknown_085965A8, 0x3, 40, 0, 10169 + setalpha 0, 16 + waitplaysewithpan SE_W112, -64, 15 + createsprite gUnknown_085965A8, 3, 40, 0, 10169 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_BUBBLE: loadspritegfx 0x27A2 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08595068, 0x2, 18, 0, 15, -15, 10, 128, 100 + setalpha 12, 8 + delay 1 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 35, 37, 40, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 10, -37, 30, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 30, 10, 15, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 20, 33, 20, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 - delay 0x6 - createsprite gUnknown_08595068, 0x2, 18, 0, 25, -30, 10, 128, 100 + delay 6 + createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, -64 waitplaysewithpan SE_W145B, +63, 0x64 waitforvisualfinish - call Anim_BulbbleEffect + call WaterBubbleEffect2 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5175,221 +5130,221 @@ Move_SMOG: loadspritegfx 0x27BC monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - loopsewithpan SE_W054, +63, 0x11, 0xA - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - call Anim_Smog1 - delay 0x78 - loopsewithpan SE_W092, +63, 0x12, 0x2 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(26, 0, 26) - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 15, 1 + setalpha 12, 8 + loopsewithpan SE_W054, +63, 17, 10 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + call Smog1 + delay 120 + loopsewithpan SE_W092, +63, 0x12, 2 + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Smog1: - createsprite gUnknown_08595C44, 0x2, 0, -24, 48, 240, 1, 0 - delay 0x7 +Smog1: + createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 + delay 7 return Move_FAINT_ATTACK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein - delay 0x0 + delay 0 playsewithpan SE_W185, -64 - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 3 - createvisualtask sub_81136E8, 0x2, 1 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 + createvisualtask sub_81136E8, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x1 - createvisualtask sub_8117F60, 0x2 - setalpha 0x80C + delay 1 + createvisualtask sub_8117F60, 2 + setalpha 12, 8 monbg ANIM_TARGET - delay 0x1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 9, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 - setarg 0x7, 0x1000 + delay 1 + setarg 7, 0x1000 delay 0x20 - createvisualtask sub_8113888, 0x2 + createvisualtask sub_8113888, 2 monbg ANIM_ATTACKER - createvisualtask sub_81137E4, 0x2, 1 + createvisualtask sub_81137E4, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end Move_SAND_ATTACK: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W028, -64 - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 - call Anim_SandAttack1 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 + call SandAttack1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_SandAttack1: - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 10, 10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -10, -10 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, 20, 5 - createsprite gUnknown_085971A8, 0x82, 15, 15, 20, -20, -5 - delay 0x2 +SandAttack1: + createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0 + createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10 + createsprite gUnknown_085971A8, 130, 15, 15, 20, -10, -10 + createsprite gUnknown_085971A8, 130, 15, 15, 20, 20, 5 + createsprite gUnknown_085971A8, 130, 15, 15, 20, -20, -5 + delay 2 return Move_MUD_SLAP: - loadspritegfx 0x275A + loadspritegfx ANIM_TAG_074 playsewithpan SE_W028, -64 - createsprite gUnknown_0857FE70, 0x2, 0, -10, 0, 0, 3 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 2 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 - call Anim_MudSlap1 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 2 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 + call MudSlap1 waitforvisualfinish end -Anim_MudSlap1: - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 0, 0 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 10, 5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -10, -5 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, 20, 10 - createsprite gUnknown_085971CC, 0x82, 15, 15, 20, -20, -10 - delay 0x2 +MudSlap1: + createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0 + createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5 + createsprite gUnknown_085971CC, 130, 15, 15, 20, -10, -5 + createsprite gUnknown_085971CC, 130, 15, 15, 20, 20, 10 + createsprite gUnknown_085971CC, 130, 15, 15, 20, -20, -10 + delay 2 return Move_DRAGON_RAGE: loadspritegfx 0x272D - loadspritegfx 0x2733 + loadspritegfx ANIM_TAG_035 playsewithpan SE_W082, -64 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x82, 0, 15, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 130, 0, 15, 0, 0, 4 waitforvisualfinish - createsprite gUnknown_08596F80, 0x82, 30, 15, 0, 10, 10 + createsprite gUnknown_08596F80, 130, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, +63, 0xB, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 25, 1 + loopsewithpan SE_W172B, +63, 11, 3 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 createsprite gUnknown_08596F28, 0xC2, 1, 5, 0 - delay 0x1 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, -10, -15 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 0, 25 - delay 0x1 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 0, 25 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, 15, 5 - delay 0x1 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, -25, 0 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, 30, 30 - delay 0x1 - createsprite gUnknown_08596F28, 0x82, 1, -27, 25 - delay 0x1 + delay 1 + createsprite gUnknown_08596F28, 130, 1, 30, 30 + delay 1 + createsprite gUnknown_08596F28, 130, 1, -27, 25 + delay 1 createsprite gUnknown_08596F28, 0xC2, 1, 0, 8 waitforvisualfinish - createsprite gUnknown_0857FE58, 0xC2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0xC2, 0, 0, 4 waitforvisualfinish end Move_RAIN_DANCE: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 120 - createvisualtask sub_8107188, 0x2, 0, 3, 120 - delay 0x78 - delay 0x1E + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 + delay 120 + delay 30 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end Move_BITE: loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, 0, -32, 0, 0, 819, 10 - createsprite gUnknown_08597080, 0x2, 0, 32, 4, 0, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 7, 1 + createsprite gUnknown_08597080, 2, 0, -32, 0, 0, 819, 10 + createsprite gUnknown_08597080, 2, 0, 32, 4, 0, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 7, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 end Move_CRUNCH: loadspritegfx 0x279B - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, -32, -32, 1, 819, 819, 10 - createsprite gUnknown_08597080, 0x2, 32, 32, 5, -819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, -8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 7, 5, 2 + createsprite gUnknown_08597080, 2, -32, -32, 1, 819, 819, 10 + createsprite gUnknown_08597080, 2, 32, 32, 5, -819, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, -8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2 waitforvisualfinish playsewithpan SE_W044, +63 - createsprite gUnknown_08597080, 0x2, 32, -32, 7, -819, 819, 10 - createsprite gUnknown_08597080, 0x2, -32, 32, 3, 819, -819, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 8, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 8, 4, 2 + createsprite gUnknown_08597080, 2, 32, -32, 7, -819, 819, 10 + createsprite gUnknown_08597080, 2, -32, 32, 3, 819, -819, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 8, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - delay 0x1 + delay 1 restorebg waitbgfadein end Move_CLAMP: loadspritegfx 0x27A1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -5399,51 +5354,51 @@ Move_CLAMP: Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - loadspritegfx 0x279D - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK + setalpha 12, 8 + loadspritegfx ANIM_TAG_141 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10 - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - delay 0x1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31) - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - call Anim_IceBeam1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - waitforvisualfinish - delay 0x14 - call Anim_FreezeEffect1 - createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31) - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK + createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + delay 1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, -31, 0, 7, RGB(0, 20, 31) + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + call IceBeam1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + delay 1 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + waitforvisualfinish + delay 20 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 4, 5, 7, 0, RGB(0, 20, 31) + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_IceBeam1: - createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 - createsprite gUnknown_08595B2C, 0x2, 20, -12, 0, -12, 20 - createsprite gUnknown_08595B14, 0x2, 20, 0, 0, 0, 11 - delay 0x1 +IceBeam1: + createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 + createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 + createsprite gUnknown_08595B14, 2, 20, 0, 0, 0, 11 + delay 1 return Move_WITHDRAW: playsewithpan SE_W029, -64 - createvisualtask sub_81036A0, 0x5 + createvisualtask sub_81036A0, 5 waitforvisualfinish end @@ -5452,218 +5407,218 @@ Move_AURORA_BEAM: fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, -64 - setarg 0x7, 0x0 - createvisualtask sub_8107528, 0xA, 130 - call Anim_AuroraBeam1 - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 17, 1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - setarg 0x7, 0xFFFF + setarg 7, 0 + createvisualtask sub_8107528, 10, 130 + call AuroraBeam1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 17, 1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + setarg 7, 0xFFFF createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 40, 1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 - call Anim_AuroraBeam1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 + call AuroraBeam1 waitforvisualfinish restorebg waitbgfadein end -Anim_AuroraBeam1: - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 - createsprite gUnknown_085950B4, 0x82, 20, 0, 0, 0, 17 - delay 0x1 +AuroraBeam1: + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 + createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 + delay 1 return Move_SOLAR_BEAM: loadspritegfx 0x27A3 - choosetwoturnanim Anim_SolarBeamSetUp, Anim_SolarBeamUnleash -Anim_SolarBeamEnd: + choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash +SolarBeamEnd: waitforvisualfinish end -Anim_SolarBeamSetUp: +SolarBeamSetUp: monbg ANIM_ATK_PARTNER - setalpha 0x80C - createvisualtask sub_8115A04, 0x2, 2, 1, 4, 0, 11, RGB(31, 31, 11) + setalpha 12, 8 + createvisualtask sub_8115A04, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, -64 - call Anim_SolarBeamSetUp1 + call SolarBeamSetUp1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - goto Anim_SolarBeamEnd - -Anim_SolarBeamSetUp1: - createsprite gUnknown_085921E0, 0x2, 40, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, 40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 0, -40, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, -20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 20, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -20, -30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 20, 30, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, -40, 0, 16 - delay 0x2 - createsprite gUnknown_085921E0, 0x2, 40, 0, 16 - delay 0x2 + goto SolarBeamEnd + +SolarBeamSetUp1: + createsprite gUnknown_085921E0, 2, 40, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, 40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 0, -40, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, -20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 20, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -20, -30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 20, 30, 16 + delay 2 + createsprite gUnknown_085921E0, 2, -40, 0, 16 + delay 2 + createsprite gUnknown_085921E0, 2, 40, 0, 16 + delay 2 return -Anim_SolarBeamUnleash: - call Anim_SetSolarbeamBg - panse_1B SE_W076, -64, +63, +2, 0x0 - createvisualtask sub_80FEA58, 0x5 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createvisualtask sub_8116620, 0xA, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 65, 1 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 - call Anim_SolarBeamUnleash1 - call Anim_SolarBeamUnleash1 - waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 1, 10, 0, RGB(25, 31, 0) - call Anim_UnsetSolarbeamBg - goto Anim_SolarBeamEnd - -Anim_SolarBeamUnleash1: - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 0 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 1 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 2 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 3 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 4 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 5 - delay 0x4 - createsprite gUnknown_085921F8, 0x83, 15, 0, 20, 6 - delay 0x4 +SolarBeamUnleash: + call SetSolarbeamBg + panse_1B SE_W076, -64, +63, +2, 0 + createvisualtask sub_80FEA58, 5 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + delay 4 + createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) + createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + delay 4 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 + call SolarBeamUnleash1 + call SolarBeamUnleash1 + waitforvisualfinish + createvisualtask sub_8116620, 10, 4, 1, 10, 0, RGB(25, 31, 0) + call UnsetSolarbeamBg + goto SolarBeamEnd + +SolarBeamUnleash1: + createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 1 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 2 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 3 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 4 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 5 + delay 4 + createsprite gUnknown_085921F8, 131, 15, 0, 20, 6 + delay 4 return Move_BLIZZARD: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_IsAttackerOpponentSide, 0x2 - jumprettrue Anim_BlizzardAgainstPlayer + createvisualtask AnimTask_IsAttackerOpponentSide, 2 + jumprettrue BlizzardAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT -Anim_BlizzardContinue: +BlizzardContinue: waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 0, 1, -1 + createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, -64, +63, +2, 0x0 - call Anim_Blizzard1 - call Anim_Blizzard1 + panse_1B SE_W059, -64, +63, +2, 0 + call Blizzard1 + call Blizzard1 playsewithpan SE_W059B, +63 waitforvisualfinish - call Anim_FreezeEffect2 + call FreezeEffect2 waitforvisualfinish - delay 0x14 + delay 20 restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein clearmonbg ANIM_DEF_PARTNER end -Anim_Blizzard1: +Blizzard1: createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -10, 0, -10, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -5, 0, -5, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 10, 0, 10, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -20, 0, -20, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 15, 0, 15, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595B98, 0x28, 0, -25, 0, -25, 72, 1 createsprite gUnknown_08595BB0, 0x28, 0, 20, 0, 20, 80, 0, 0, 1 - delay 0x3 + delay 3 return -Anim_BlizzardAgainstPlayer: +BlizzardAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER - goto Anim_BlizzardContinue + goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER - createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish - panse_1B SE_W016, -64, +63, +2, 0x0 - call Anim_PowderSnow1 - call Anim_PowderSnow1 + panse_1B SE_W016, -64, +63, +2, 0 + call PowderSnow1 + call PowderSnow1 playsewithpan SE_W016B, +63 waitforvisualfinish waitsound - call Anim_FreezeEffect2 + call FreezeEffect2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x14 - createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK + delay 20 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK end -Anim_PowderSnow1: +PowderSnow1: createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 10, 0, 10, 56, -4, 3, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, -4, 5, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 15, 0, 15, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, 4, 4, 1 - delay 0x3 + delay 3 createsprite gUnknown_08595BC8, 0x28, 0, 20, 0, 20, 56, 4, 4, 1 - delay 0x3 + delay 3 return Move_HYDRO_PUMP: @@ -5671,427 +5626,427 @@ Move_HYDRO_PUMP: loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 40, 1 - delay 0x6 - panse_1B SE_W056, -64, +63, +2, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 37, 1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - call Anim_HydroPump1 - call Anim_HydroPump1 - call Anim_HydroPump2 - delay 0x1 - delay 0x1 - call Anim_HydroPump2 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 + delay 6 + panse_1B SE_W056, -64, +63, +2, 0 + createvisualtask sub_81076C8, 5, 100 + call HydroPump1 + call HydroPump1 + call HydroPump1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 37, 1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + call HydroPump1 + call HydroPump1 + call HydroPump2 + delay 1 + delay 1 + call HydroPump2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_HydroPump1: - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, 16 - createsprite gUnknown_085950E4, 0x3, 10, 10, 0, -16 - delay 0x1 +HydroPump1: + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 + createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 + createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 + delay 1 return -Anim_HydroPump2: - createsprite gUnknown_08597388, 0x4, 0, 15, 1, 1 - createsprite gUnknown_08597388, 0x4, 0, -15, 1, 1 +HydroPump2: + createsprite gUnknown_08597388, 4, 0, 15, 1, 1 + createsprite gUnknown_08597388, 4, 0, -15, 1, 1 return Move_SIGNAL_BEAM: loadspritegfx 0x2818 loadspritegfx 0x2819 - loadspritegfx 0x2759 - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 25, 1 - delay 0x6 - panse_1B SE_W062, -64, +63, +1, 0x0 - createvisualtask sub_81076C8, 0x5, 100 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 25, 1 - createsprite gUnknown_0859728C, 0x2, 4, 8, 5, 31, 8, 961, 8 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - call Anim_SignalBeam1 - waitforvisualfinish - end - -Anim_SignalBeam1: - createsprite gUnknown_08595114, 0x83, 10, 10, 0, 16 - createsprite gUnknown_0859512C, 0x83, 10, 10, 0, -16 - delay 0x1 + loadspritegfx ANIM_TAG_073 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 + delay 6 + panse_1B SE_W062, -64, +63, +1, 0 + createvisualtask sub_81076C8, 5, 100 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 4, 8, 5, 31, 8, 961, 8 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + call SignalBeam1 + waitforvisualfinish + end + +SignalBeam1: + createsprite gUnknown_08595114, 131, 10, 10, 0, 16 + createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 + delay 1 return Move_ABSORB: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_AbsorbEffect + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_AbsorbEffect: +AbsorbEffect: playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W152, +63 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_MEGA_DRAIN: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 8, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_MegaDrainEffect + delay 3 + call MegaDrainEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 8, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_MegaDrainEffect: +MegaDrainEffect: playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W145C, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_GIGA_DRAIN: loadspritegfx 0x27A3 - loadspritegfx 0x272F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 12, RGB(13, 31, 12) waitforvisualfinish playsewithpan SE_W071, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - delay 0x3 - call Anim_GigaDrainEffect + delay 3 + call GigaDrainEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 12, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_GigaDrainEffect: +GigaDrainEffect: playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W202, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_LEECH_LIFE: loadspritegfx 0x27B1 loadspritegfx 0x27A3 - delay 0x1 - loadspritegfx 0x272F - loadspritegfx 0x2797 + delay 1 + loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - setalpha 0x80C - delay 0x1 - createsprite gUnknown_085969C8, 0x2, -20, 15, 12 + setalpha 12, 8 + delay 1 + createsprite gUnknown_085969C8, 2, -20, 15, 12 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W071, +63 - delay 0x2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 + delay 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish - call Anim_AbsorbEffect + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SYNTHESIS: - loadspritegfx 0x2741 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 16, RGB(27, 31, 18) + loadspritegfx ANIM_TAG_049 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - delay 0x1 - loadspritegfx 0x272F - call Anim_HealingEffect + unloadspritegfx ANIM_TAG_049 + delay 1 + loadspritegfx ANIM_TAG_031 + call HealingEffect waitforvisualfinish end Move_TOXIC: loadspritegfx 0x27A7 loadspritegfx 0x27A6 - call Anim_Toxic1 - call Anim_Toxic1 + call Toxic1 + call Toxic1 waitforvisualfinish - delay 0xF - call Anim_PoisonEffect + delay 15 + call PoisonBubblesEffect waitforvisualfinish end -Anim_Toxic1: - createsprite gUnknown_08596134, 0x82, -24, 16, 1, 1 +Toxic1: + createsprite gUnknown_08596134, 130, -24, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, 8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 8, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, -8, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, -8, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF - createsprite gUnknown_08596134, 0x82, 24, 16, 1, 1 + delay 15 + createsprite gUnknown_08596134, 130, 24, 16, 1, 1 playsewithpan SE_W092, +63 - delay 0xF + delay 15 return Move_SLUDGE: loadspritegfx 0x27A6 playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 waitforvisualfinish - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - call Anim_PoisonEffect + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 + createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) + call PoisonBubblesEffect waitforvisualfinish end Move_SLUDGE_BOMB: loadspritegfx 0x27A6 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - call Anim_SludgeBomb1 - createvisualtask sub_80D52D0, 0x5, 1, 3, 0, 15, 1 - createvisualtask sub_8115A04, 0x2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_085961D8, 0x82, 42, 27, 20 - createsprite gUnknown_085961D8, 0x82, -27, 44, 20 - createsprite gUnknown_085961D8, 0x82, 39, -28, 20 - createsprite gUnknown_085961D8, 0x82, -42, -42, 20 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + call SludgeBomb1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 + createvisualtask sub_8115A04, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) + createsprite gUnknown_085961D8, 130, 42, 27, 20 + createsprite gUnknown_085961D8, 130, -27, 44, 20 + createsprite gUnknown_085961D8, 130, 39, -28, 20 + createsprite gUnknown_085961D8, 130, -42, -42, 20 playsewithpan SE_W091, +63 - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 0, 40, 20 - createsprite gUnknown_085961D8, 0x82, -8, -44, 20 - createsprite gUnknown_085961D8, 0x82, -46, -28, 20 - createsprite gUnknown_085961D8, 0x82, 46, 9, 20 + delay 5 + createsprite gUnknown_085961D8, 130, 0, 40, 20 + createsprite gUnknown_085961D8, 130, -8, -44, 20 + createsprite gUnknown_085961D8, 130, -46, -28, 20 + createsprite gUnknown_085961D8, 130, 46, 9, 20 playsewithpan SE_W091, +63 - delay 0x5 - createsprite gUnknown_085961D8, 0x82, 42, 0, 20 - createsprite gUnknown_085961D8, 0x82, -43, -12, 20 - createsprite gUnknown_085961D8, 0x82, 16, -46, 20 - createsprite gUnknown_085961D8, 0x82, -16, 44, 20 + delay 5 + createsprite gUnknown_085961D8, 130, 42, 0, 20 + createsprite gUnknown_085961D8, 130, -43, -12, 20 + createsprite gUnknown_085961D8, 130, 16, -46, 20 + createsprite gUnknown_085961D8, 130, -16, 44, 20 playsewithpan SE_W091, +63 - delay 0x0 + delay 0 waitsound waitforvisualfinish - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish end -Anim_SludgeBomb1: +SludgeBomb1: playsewithpan SE_W145C, -64 - createsprite gUnknown_085961A8, 0x82, 20, 0, 40, 0 - delay 0x3 + createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 + delay 3 return Move_ACID: loadspritegfx 0x27A6 monbg ANIM_DEF_PARTNER - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 0, 0 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, 24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 24, 0 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_085961C0, 0x82, 20, 0, 40, 1, -24, 0 + delay 5 + createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, -24, 0 playsewithpan SE_W145C, -64 - delay 0xF - createvisualtask sub_80D52D0, 0x5, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x5, 3, 2, 0, 10, 1 - createvisualtask sub_8115A04, 0x2, 20, 2, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_0859620C, 0x82, 0, -22, 0, 15, 55 + delay 15 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1 + createvisualtask sub_8115A04, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31) + createsprite gUnknown_0859620C, 130, 0, -22, 0, 15, 55 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, -26, -24, 0, 15, 55 + delay 10 + createsprite gUnknown_0859620C, 130, -26, -24, 0, 15, 55 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, 15, -27, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 15, -27, 0, 15, 50 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, -15, -17, 0, 10, 45 + delay 10 + createsprite gUnknown_0859620C, 130, -15, -17, 0, 10, 45 playsewithpan SE_W145, +63 - delay 0xA - createsprite gUnknown_0859620C, 0x82, 27, -22, 0, 15, 50 + delay 10 + createsprite gUnknown_0859620C, 130, 27, -22, 0, 15, 50 playsewithpan SE_W145, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6099,19 +6054,19 @@ Move_ACID: Move_BONEMERANG: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, -64 - createsprite gUnknown_08597178, 0x2 - delay 0x14 + createsprite gUnknown_08597178, 2 + delay 20 playsewithpan SE_W030, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 5, 1 - delay 0x11 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1 + delay 17 playsewithpan SE_W233, -64 - createsprite gUnknown_0857FE28, 0x2, 6, -4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6119,16 +6074,16 @@ Move_BONEMERANG: Move_BONE_CLUB: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, +63 - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 5, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0, 10, 0, 0 + createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + delay 12 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0, 10, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6137,14 +6092,14 @@ Move_BONE_CLUB: Move_BONE_RUSH: loadspritegfx 0x2710 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W155, +63 - createsprite gUnknown_08597190, 0x2, -42, -25, 0, 0, 15 - delay 0xC - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 0, 3, 5, 1 + createsprite gUnknown_08597190, 2, -42, -25, 0, 0, 15 + delay 12 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1 playsewithpan SE_W030, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6156,74 +6111,74 @@ Move_SPIKES: monbg ANIM_DEF_PARTNER playsewithpan SE_W026, -64 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 0, 24, 30 - delay 0xA + createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 + delay 10 playsewithpan SE_W026, -64 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, -24, 24, 30 - delay 0xA + createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 + delay 10 waitplaysewithpan SE_W030, +63, 0x1C - createsprite gUnknown_085CE11C, 0x82, 20, 0, 24, 24, 30 + createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end Move_MEGAHORN: loadspritegfx 0x27A9 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER playsewithpan SE_W082, -64 - jumpifcontest Anim_MegahornInContest + jumpifcontest MegahornInContest fadetobg BG_DRILL waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_MegahornContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +MegahornContinue: waitbgfadein - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 - waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 - delay 0x3 - createsprite gUnknown_08596974, 0x3, -42, 25, 0, 0, 6 - delay 0x4 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 + waitforvisualfinish + delay 10 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 6 + delay 3 + createsprite gUnknown_08596974, 3, -42, 25, 0, 0, 6 + delay 4 playsewithpan SE_W011, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -16, 4, 1, 4 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 1, -4, 1, 12, 1 - createsprite gUnknown_0859728C, 0x2, 7, 5, 1, 0x7FFF, 10, 0, 0 - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 7 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0x7FFF, 10, 0, 0 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end -Anim_MegahornInContest: +MegahornInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_MegahornContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto MegahornContinue Move_GUST: loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W016, +63 - createsprite gUnknown_08596270, 0x2, 0, -16 - createvisualtask sub_810DED8, 0x5, 1, 70 + createsprite gUnknown_08596270, 2, 0, -16 + createvisualtask sub_810DED8, 5, 1, 70 waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 7, 1 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 playsewithpan SE_W016B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6232,96 +6187,96 @@ Move_GUST: Move_WING_ATTACK: loadspritegfx 0x2719 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 - loopsewithpan SE_W003, +63, 0x5, 0x2 - waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + setalpha 12, 8 + loopsewithpan SE_W017, -64, 20, 2 + createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask sub_810DED8, 5, 1, 70 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 + loopsewithpan SE_W003, +63, 5, 2 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_PECK: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W030, +63 - createvisualtask sub_80D622C, 0x2, 3, -768, 1, 2 - createsprite gUnknown_085973E8, 0x83, -12, 0, 1, 3 + createvisualtask sub_80D622C, 2, 3, -768, 1, 2 + createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 waitforvisualfinish end Move_AEROBLAST: loadspritegfx 0x27AA - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - call Anim_SetFlyingBg + call SetFlyingBg monbgprio_28 ANIM_TARGET - setalpha 0x80C - call Anim_Aeroblast1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 50, 1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 - call Anim_Aeroblast1 - waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 + setalpha 12, 8 + call Aeroblast1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 + call Aeroblast1 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x0 - call Anim_UnsetFlyingBg + delay 0 + call UnsetFlyingBg end -Anim_Aeroblast1: +Aeroblast1: playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 0, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 0, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 0, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 1, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 1, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 1, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 1, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 2, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 2, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 2, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 2, 0 + delay 3 playsewithpan SE_W026, -64 - createsprite gUnknown_085962D4, 0x2, 14, -12, 0, -12, 15, 3, 0 - createsprite gUnknown_085962D4, 0x2, 26, 8, 12, 8, 15, 3, 0 - delay 0x3 + createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 3, 0 + createsprite gUnknown_085962D4, 2, 26, 8, 12, 8, 15, 3, 0 + delay 3 return Move_WATER_GUN: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08595208, 0x2, 20, 0, 0, 0, 40, -25 + setalpha 12, 8 + createsprite gUnknown_08595208, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, -64 waitforvisualfinish - createvisualtask sub_80D52D0, 0x5, 1, 1, 0, 8, 1 - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 2 - createsprite gUnknown_08595220, 0x2, 0, -15, 0, 15, 55 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 + createsprite gUnknown_08597388, 4, 0, 0, 1, 2 + createsprite gUnknown_08595220, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, +63 - delay 0xA - createsprite gUnknown_08595220, 0x2, 15, -20, 0, 15, 50 + delay 10 + createsprite gUnknown_08595220, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, +63 - delay 0xA - createsprite gUnknown_08595220, 0x2, -15, -10, 0, 10, 45 + delay 10 + createsprite gUnknown_08595220, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6329,46 +6284,46 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx 0x279D + loadspritegfx ANIM_TAG_141 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597388, 0x4, 0, 0, 1, 0 + setalpha 12, 8 + createsprite gUnknown_08597388, 4, 0, 0, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 32429, 10, 0, 0 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 - waitforvisualfinish - delay 0x8 - waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 1, 0, 4 - waitforvisualfinish - loopsewithpan SE_W152, +63, 0x14, 0x3 - createvisualtask sub_80D51AC, 0x5, 1, 0, 4, 8, 1 - createsprite gUnknown_08595238, 0x2, 10, 10, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 20, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -15, 15, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 0, 0, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -10, -20, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 16, -8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, 5, 8, 20, 1 - delay 0x4 - createsprite gUnknown_08595238, 0x2, -16, 0, 20, 1 + delay 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 32429, 10, 0, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 + waitforvisualfinish + delay 8 + waitforvisualfinish + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 4 + waitforvisualfinish + loopsewithpan SE_W152, +63, 20, 3 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1 + createsprite gUnknown_08595238, 2, 10, 10, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 20, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -15, 15, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 0, 0, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -10, -20, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 16, -8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, 5, 8, 20, 1 + delay 4 + createsprite gUnknown_08595238, 2, -16, 0, 20, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SURF: - createvisualtask sub_8107954, 0x2, 0 - delay 0x18 - panse_1B SE_W057, -64, +63, +2, 0x0 + createvisualtask sub_8107954, 2, 0 + delay 24 + panse_1B SE_W057, -64, +63, +2, 0 waitforvisualfinish end @@ -6376,188 +6331,188 @@ Move_FLAMETHROWER: loadspritegfx 0x272D monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W053, -64, +63, +2, 0x0 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 - call Anim_Flamethrower1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + delay 6 + createvisualtask sub_81076C8, 5, 100 + panse_1B SE_W053, -64, +63, +2, 0 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 + call Flamethrower1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Flamethrower1: - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_08595158, 0x3, 10, 10, 0, 16 - delay 0x2 +Flamethrower1: + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_08595158, 3, 10, 10, 0, 16 + delay 2 return Move_SANDSTORM: loadspritegfx 0x2815 playsewithpan SE_W201, 0 - createvisualtask sub_8110BCC, 0x5, 0 - delay 0x10 - createsprite gUnknown_08596BA0, 0x28, 10, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 90, 2048, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 50, 2560, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 20, 2304, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 70, 1984, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 0, 2816, 96, 0 - delay 0xA - createsprite gUnknown_08596BA0, 0x28, 60, 2560, 96, 0 + createvisualtask sub_8110BCC, 5, 0 + delay 16 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 0 + delay 10 + createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 0 end Move_WHIRLPOOL: loadspritegfx 0x27A5 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1 + call WhirlpoolEffect + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_WhirlpoolEffect: - createsprite gUnknown_08596B70, 0x82, 0, 28, 384, 50, 8, 50, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 32, 240, 40, 11, -46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 416, 40, 4, 42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 31, 288, 45, 6, -42, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 28, 448, 45, 11, 46, 1 - delay 0x2 - createsprite gUnknown_08596B70, 0x82, 0, 33, 464, 50, 10, -50, 1 - delay 0x2 +WhirlpoolEffect: + createsprite gUnknown_08596B70, 130, 0, 28, 384, 50, 8, 50, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 32, 240, 40, 11, -46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 416, 40, 4, 42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 31, 288, 45, 6, -42, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 28, 448, 45, 11, 46, 1 + delay 2 + createsprite gUnknown_08596B70, 130, 0, 33, 464, 50, 10, -50, 1 + delay 2 return Move_FLY: loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim Anim_FlySetUp, Anim_FlyUnleash -Anim_FlyEnd: + loadspritegfx ANIM_TAG_135 + choosetwoturnanim FlySetUp, FlyUnleash +FlyEnd: waitforvisualfinish end -Anim_FlySetUp: +FlySetUp: playsewithpan SE_W019, -64 - createsprite gUnknown_08596340, 0x2, 0, 0, 13, 336 - goto Anim_FlyEnd + createsprite gUnknown_08596340, 2, 0, 0, 13, 336 + goto FlyEnd -Anim_FlyUnleash: +FlyUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, -64 - createsprite gUnknown_08596358, 0x2, 20 - delay 0x14 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 + createsprite gUnknown_08596358, 2, 20 + delay 20 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_FlyEnd + goto FlyEnd Move_BOUNCE: loadspritegfx 0x27AC - loadspritegfx 0x2797 - choosetwoturnanim Anim_BounceSetUp, Anim_BounceUnleash -Anim_BounceEnd: + loadspritegfx ANIM_TAG_135 + choosetwoturnanim BounceSetUp, BounceUnleash +BounceEnd: end -Anim_BounceSetUp: +BounceSetUp: playsewithpan SE_W100, -64 - createsprite gUnknown_08596420, 0x2, 0, 0 - goto Anim_BounceEnd + createsprite gUnknown_08596420, 2, 0, 0 + goto BounceEnd -Anim_BounceUnleash: +BounceUnleash: monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, +63 - createsprite gUnknown_0859644C, 0x83 - delay 0x7 + createsprite gUnknown_0859644C, 131 + delay 7 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 0, 5, 11, 1 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_BounceEnd + goto BounceEnd Move_KARATE_CHOP: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, +63 - createsprite gUnknown_08595E68, 0x2, -16, 0, 0, 0, 10, 1, 3, 0 + createsprite gUnknown_08595E68, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_CROSS_CHOP: - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_143 loadspritegfx 0x282D monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W025, +63 - createsprite gUnknown_08595EC8, 0x2, 0, 0, 0 - createsprite gUnknown_08595EC8, 0x2, 0, 0, 1 + createsprite gUnknown_08595EC8, 2, 0, 0, 0 + createsprite gUnknown_08595EC8, 2, 0, 0, 1 delay 0x28 playsewithpan SE_W013, +63 - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0x7FFF, 10, 0, 10 - createsprite gUnknown_085973D0, 0x3, 0, 0, 1, 20 - createvisualtask sub_80D51AC, 0x5, 1, 7, 0, 9, 1 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 10, 0, 10 + createsprite gUnknown_085973D0, 3, 0, 0, 1, 20 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x3 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 3 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, +63 waitforvisualfinish - createsprite gUnknown_08597358, 0x1, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6565,38 +6520,38 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_0857FE70, 0x2, 0, -24, 0, 0, 8 + setalpha 12, 8 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 waitforvisualfinish - delay 0xA - createsprite gUnknown_0857FE58, 0x2, 0, 0, 3 - delay 0x2 - createsprite gUnknown_08595E80, 0x2, -16, 8, 0, 0, 10, 1, 1, 1 + delay 10 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 3 + delay 2 + createsprite gUnknown_08595E80, 2, -16, 8, 0, 0, 10, 1, 1, 1 playsewithpan SE_W026, +63 waitforvisualfinish - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_0857FE70, 0x2, 1, -28, 0, 0, 3 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 11, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -28, 0, 0, 3 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_DOUBLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08595EB0, 0x3, 1, 20, 1 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + setalpha 12, 8 + createsprite gUnknown_08595EB0, 3, 1, 20, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6604,288 +6559,288 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, +63 - jumpifmoveturn 0x0, Anim_TripleKickLeft - jumpifmoveturn 0x1, Anim_TripleKickRight - goto Anim_TripleKickCenter -Anim_TripleKickContinue: + jumpifmoveturn 0, TripleKickLeft + jumpifmoveturn 1, TripleKickRight + goto TripleKickCenter +TripleKickContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_TripleKickLeft: - createsprite gUnknown_08595E98, 0x84, -16, -8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, -16, -16, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto Anim_TripleKickContinue +TripleKickLeft: + createsprite gFistFootSpriteTemplate, 132, -16, -8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, -16, -16, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + goto TripleKickContinue -Anim_TripleKickRight: - createsprite gUnknown_08595E98, 0x84, 8, 8, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 8, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 - goto Anim_TripleKickContinue +TripleKickRight: + createsprite gFistFootSpriteTemplate, 132, 8, 8, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 8, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 + goto TripleKickContinue -Anim_TripleKickCenter: - createsprite gUnknown_08595E98, 0x84, 0, 0, 20, 1, 1 - createsprite gUnknown_08597358, 0x83, 0, -8, 1, 1 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto Anim_TripleKickContinue +TripleKickCenter: + createsprite gFistFootSpriteTemplate, 132, 0, 0, 20, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, -8, 1, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27D6 loadspritegfx 0x2717 - delay 0x1 + delay 1 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233B, +63 - createsprite gUnknown_08595E98, 0x83, 0, 0, 20, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 5, 0, 7, 1 - delay 0x1 + createsprite gFistFootSpriteTemplate, 131, 0, 0, 20, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1 + delay 1 waitsound playsewithpan SE_W120, +63 - createvisualtask sub_80D52D0, 0x5, 1, 5, 0, 28, 1 - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_COUNTER: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80D5830, 0x2, 0, 18, 6, 1, 4 + setalpha 12, 8 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 playsewithpan SE_W233, -64 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x4 - createsprite gUnknown_08597358, 0x2, -15, 18, 1, 0 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 2, -15, 18, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 25, 1 - createsprite gUnknown_08595E98, 0x3, -15, 18, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 0, -4, 1, 0 + delay 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1 + createsprite gFistFootSpriteTemplate, 3, -15, 18, 8, 1, 0 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, -4, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 0, -4, 8, 1, 0 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 15, 9, 1, 0 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 0, -4, 8, 1, 0 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 15, 9, 1, 0 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_08595E98, 0x3, 15, 9, 8, 1, 0 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 + delay 1 + createsprite gFistFootSpriteTemplate, 3, 15, 9, 8, 1, 0 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_VITAL_THROW: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W233, -64 - createvisualtask sub_80D5830, 0x2, 0, 12, 4, 1, 2 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 - delay 0x2 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 playsewithpan SE_W233B, +63 - delay 0x1 - createsprite gUnknown_0857FE70, 0x2, 1, -24, 0, 0, 4 + delay 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish - delay 0x3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 - delay 0xB - createsprite gUnknown_0857FE58, 0x2, 1, 0, 10 + delay 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 + delay 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 10 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_SMASH: - loadspritegfx 0x274A - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createsprite gUnknown_08595E98, 0x2, 0, 0, 8, 1, 0 + setalpha 12, 8 + delay 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createsprite gFistFootSpriteTemplate, 2, 0, 0, 8, 1, 0 playsewithpan SE_W233B, +63 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 0x2, 0, 0, 20, 24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x2, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, -5, 0, -20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x2, 0, -5, 30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, 30, -18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, 18, 8, 2 - createsprite gUnknown_08596B1C, 0x2, 0, 0, -30, -18, 8, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 7, 1 + createsprite gUnknown_08596B1C, 2, 0, 0, 20, 24, 14, 2 + createsprite gUnknown_08596B1C, 2, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, 2, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, 2, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, 2, 0, -5, 30, 18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, 30, -18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, -30, 18, 8, 2 + createsprite gUnknown_08596B1C, 2, 0, 0, -30, -18, 8, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_SUBMISSION: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W104, -64 - waitplaysewithpan SE_W004, +63, 0xA - waitplaysewithpan SE_W104, -64, 0x14 - waitplaysewithpan SE_W004, +63, 0x1E + waitplaysewithpan SE_W004, +63, 10 + waitplaysewithpan SE_W104, -64, 20 + waitplaysewithpan SE_W004, +63, 30 waitplaysewithpan SE_W104, -64, 0x28 - waitplaysewithpan SE_W004, +63, 0x32 - waitplaysewithpan SE_W104, -64, 0x3C - waitplaysewithpan SE_W004, +63, 0x46 + waitplaysewithpan SE_W004, +63, 50 + waitplaysewithpan SE_W104, -64, 60 + waitplaysewithpan SE_W004, +63, 70 waitplaysewithpan SE_W104, -64, 0x50 waitplaysewithpan SE_W004, +63, 0x5A - createvisualtask sub_80D5738, 0x2, 0, -18, 6, 6, 4 - createvisualtask sub_80D5738, 0x2, 1, 18, 6, 6, 4 - call Anim_Submission1 - call Anim_Submission1 - call Anim_Submission1 + createvisualtask sub_80D5738, 2, 0, -18, 6, 6, 4 + createvisualtask sub_80D5738, 2, 1, 18, 6, 6, 4 + call Submission1 + call Submission1 + call Submission1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Submission1: - createsprite gUnknown_08597358, 0x3, 0, -12, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, -12, 8, 1, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x3, 12, 0, 1, 1 - delay 0x8 +Submission1: + createsprite gBasicHitSplatSpriteTemplate, 3, 0, -12, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, -12, 8, 1, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 3, 12, 0, 1, 1 + delay 8 return Move_SUNNY_DAY: loadspritegfx 0x27AD monbg ANIM_ATK_PARTNER - setalpha 0x30D - createvisualtask sub_8116620, 0xA, 0x781, 1, 0, 6, RGB_WHITE + setalpha 13, 3 + createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, -64, +63, +1, 0x0 - call Anim_SunnyDay1 - call Anim_SunnyDay1 - call Anim_SunnyDay1 - call Anim_SunnyDay1 + panse_26 SE_W080, -64, +63, +1, 0 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 + call SunnyDay1 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 1, 6, 0, RGB_WHITE + createvisualtask sub_8116620, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_SunnyDay1: +SunnyDay1: createsprite gUnknown_085954A0, 0x28 - delay 0x6 + delay 6 return Move_COTTON_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, +63, 0x12, 0xA - call Anim_CottonSpore1 - call Anim_CottonSpore1 - call Anim_CottonSpore1 + loopsewithpan SE_W077, +63, 0x12, 10 + call CottonSpore1 + call CottonSpore1 + call CottonSpore1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_CottonSpore1: - createsprite gUnknown_085922EC, 0x2, 0, -20, 85, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -10, 170, 80, 0 - delay 0xC - createsprite gUnknown_085922EC, 0x2, 0, -15, 0, 80, 0 - delay 0xC +CottonSpore1: + createsprite gUnknown_085922EC, 2, 0, -20, 85, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -10, 170, 80, 0 + delay 12 + createsprite gUnknown_085922EC, 2, 0, -15, 0, 80, 0 + delay 12 return Move_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_80FEE1C, 0x2 - loopsewithpan SE_W077, +63, 0x10, 0xB - call Anim_Spore1 - call Anim_Spore1 - call Anim_Spore1 - waitforvisualfinish - delay 0x1 + setalpha 12, 8 + createvisualtask sub_80FEE1C, 2 + loopsewithpan SE_W077, +63, 16, 11 + call Spore1 + call Spore1 + call Spore1 + waitforvisualfinish + delay 1 clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_Spore1: - createsprite gUnknown_085922EC, 0x82, 0, -20, 85, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -10, 170, 80, 1 - delay 0xC - createsprite gUnknown_085922EC, 0x82, 0, -15, 0, 80, 1 - delay 0xC +Spore1: + createsprite gUnknown_085922EC, 130, 0, -20, 85, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -10, 170, 80, 1 + delay 12 + createsprite gUnknown_085922EC, 130, 0, -15, 0, 80, 1 + delay 12 return Move_PETAL_DANCE: - loadspritegfx 0x27AF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_159 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W080, -64 - createvisualtask sub_80D5830, 0x2, 0, 12, 6, 6, 3 - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 16, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 32, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -32, -24, 8, 100 - delay 0xF - createsprite gUnknown_0859231C, 0x2, 0, -24, 8, 140 - createsprite gUnknown_08592334, 0x2, 24, -24, 8, 100 - createsprite gUnknown_08592334, 0x2, -24, -24, 8, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 16, -24, 0, 100 - createsprite gUnknown_08592334, 0x2, -16, -24, 0, 100 - delay 0x1E - createsprite gUnknown_08592334, 0x2, 20, -16, 14, 80 - createsprite gUnknown_08592334, 0x2, -20, -14, 16, 80 - waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 5 - delay 0x3 + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 16, -24, 8, 100 + createsprite gUnknown_08592334, 2, -16, -24, 8, 100 + delay 15 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 32, -24, 8, 100 + createsprite gUnknown_08592334, 2, -32, -24, 8, 100 + delay 15 + createsprite gUnknown_0859231C, 2, 0, -24, 8, 140 + createsprite gUnknown_08592334, 2, 24, -24, 8, 100 + createsprite gUnknown_08592334, 2, -24, -24, 8, 100 + delay 30 + createsprite gUnknown_08592334, 2, 16, -24, 0, 100 + createsprite gUnknown_08592334, 2, -16, -24, 0, 100 + delay 30 + createsprite gUnknown_08592334, 2, 20, -16, 14, 80 + createsprite gUnknown_08592334, 2, -20, -14, 16, 80 + waitforvisualfinish + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 5 + delay 3 playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 0 - createvisualtask sub_80D51AC, 0x2, 1, 6, 0, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1 waitforvisualfinish - delay 0x8 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 8 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6894,38 +6849,38 @@ Move_PETAL_DANCE: Move_RAZOR_LEAF: loadspritegfx 0x274F loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, -64, 10, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 22, -20, 1 - delay 0x14 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, 20, 1 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 22, -20, 1 + delay 20 playsewithpan SE_W013, +63 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6933,33 +6888,33 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: - loadspritegfx 0x274A - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_085972D8, 0x2, 4, 1, 10, 1 - createsprite gUnknown_08596C10, 0x2, 20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 0, 32, -38, 25, 5 - createsprite gUnknown_08596C10, 0x2, 32, 32, -28, 40, 3 - createsprite gUnknown_08596C10, 0x2, -20, 32, -48, 50, 2 - createsprite gUnknown_08596C10, 0x2, 20, 32, -28, 60, 1 - createsprite gUnknown_08596C10, 0x2, 0, 32, -28, 30, 4 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 30, 1 + setalpha 12, 8 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 + createsprite gUnknown_08596C10, 2, 20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, 2, 0, 32, -38, 25, 5 + createsprite gUnknown_08596C10, 2, 32, 32, -28, 40, 3 + createsprite gUnknown_08596C10, 2, -20, 32, -48, 50, 2 + createsprite gUnknown_08596C10, 2, 20, 32, -28, 60, 1 + createsprite gUnknown_08596C10, 2, 0, 32, -28, 30, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1 playsewithpan SE_W082, -64 - delay 0xA - createsprite gUnknown_08596C10, 0x2, 15, 32, -48, 25, 5 - createsprite gUnknown_08596C10, 0x2, -10, 32, -42, 30, 4 - delay 0xA - createsprite gUnknown_08596C10, 0x2, 0, 32, -42, 25, 5 - createsprite gUnknown_08596C10, 0x2, -25, 32, -48, 30, 4 - waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 16, 0, 0, 4 - delay 0x3 + delay 10 + createsprite gUnknown_08596C10, 2, 15, 32, -48, 25, 5 + createsprite gUnknown_08596C10, 2, -10, 32, -42, 30, 4 + delay 10 + createsprite gUnknown_08596C10, 2, 0, 32, -42, 25, 5 + createsprite gUnknown_08596C10, 2, -25, 32, -48, 30, 4 + waitforvisualfinish + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 16, 0, 0, 4 + delay 3 playsewithpan SE_W120, +63 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6969,80 +6924,80 @@ Move_OCTAZOOKA: loadspritegfx 0x272E loadspritegfx 0x2721 playsewithpan SE_W025B, -64 - createsprite gUnknown_08592DFC, 0x82, 20, 0, 0, 0, 20, 0 + createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, +63 - createsprite gUnknown_08592E30, 0x82, 8, 8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, 8, -8, 1, 0 - delay 0x2 - createsprite gUnknown_08592E30, 0x82, -8, 8, 1, 0 + createsprite gUnknown_08592E30, 130, 8, 8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, 8, -8, 1, 0 + delay 2 + createsprite gUnknown_08592E30, 130, -8, 8, 1, 0 waitforvisualfinish end Move_MIST: loadspritegfx 0x27A0 monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W054, -64, 0x14, 0xF - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 - call Anim_Mist1 + setalpha 12, 8 + loopsewithpan SE_W054, -64, 20, 15 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 + call Mist1 delay 0x20 - createvisualtask sub_8115A04, 0x2, 10, 8, 2, 0, 14, RGB_WHITE + createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Anim_Mist1: - createsprite gUnknown_08595C2C, 0x2, 0, -24, 48, 240, 0, 1 - delay 0x7 +Mist1: + createsprite gUnknown_08595C2C, 2, 0, -24, 48, 240, 0, 1 + delay 7 return Move_HAZE: waitforvisualfinish playsewithpan SE_W114, 0 - createvisualtask sub_810C0A0, 0x5 - delay 0x1E - createvisualtask sub_8116620, 0xA, 0x780, 2, 0, 16, RGB_BLACK + createvisualtask sub_810C0A0, 5 + delay 30 + createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK delay 0x5A - createvisualtask sub_8116620, 0xA, 0x780, 1, 16, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x780, 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH: - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_143 loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, RGB_RED + setalpha 12, 8 + createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED createsprite gUnknown_08595368, 0x81, 0 createsprite gUnknown_08595368, 0x81, 64 createsprite gUnknown_08595368, 0x81, 128 createsprite gUnknown_08595368, 0x81, 196 playsewithpan SE_W172, +63 waitforvisualfinish - createsprite gUnknown_08595E98, 0x83, 0, 0, 8, 1, 0 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 1 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 - call Anim_FireMoveEffect - delay 0x4 + createsprite gFistFootSpriteTemplate, 131, 0, 0, 8, 1, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 + call FireMoveEffect + delay 4 playsewithpan SE_W007, +63 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 4, 0, 9, 0, RGB_RED + createvisualtask sub_8116620, 10, 4, 0, 9, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_FireMoveEffect: +FireMoveEffect: createsprite gUnknown_08595380, 0x81, 0, 10, 192, 176, 40 createsprite gUnknown_08595380, 0x81, 0, 10, -192, 240, 40 createsprite gUnknown_08595380, 0x81, 0, 10, 192, -160, 40 @@ -7056,321 +7011,316 @@ Move_LEER: loadspritegfx 0x272B monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W043, -64 - createsprite gUnknown_085CE150, 0x2, 24, -12 - createvisualtask sub_80D6064, 0x5, -5, -5, 10, 0, 1 + createsprite gUnknown_085CE150, 2, 24, -12 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0xA - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 9, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 9, 1 + delay 10 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff - delay 0x1 + delay 1 waitforvisualfinish end Move_DREAM_EATER: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W107, +63 - createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -6, -6, 15, 1, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1 waitforvisualfinish - setalpha 0x80C - createvisualtask sub_80D51AC, 0x2, 1, 0, 2, 25, 1 - call Anim_DreamEaterEffect + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 2, 25, 1 + call DreamEaterEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_DreamEaterEffect: +DreamEaterEffect: playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -40, 35 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -40, 35 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 28, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 40, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 28, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 40, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -32, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -32, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 0, -15, -16, 36 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 0, -15, -16, 36 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, -5, 15, 16, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -40, 26 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, -5, 15, 16, 33 + createsprite gUnknown_08592270, 3, 10, -5, -40, 26 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, -5, 15, 36, 33 - createsprite gUnknown_08592270, 0x3, 10, -5, -8, 26 - createsprite gUnknown_08592270, 0x3, -10, 20, 20, 39 - delay 0x4 + createsprite gUnknown_08592270, 3, -5, 15, 36, 33 + createsprite gUnknown_08592270, 3, 10, -5, -8, 26 + createsprite gUnknown_08592270, 3, -10, 20, 20, 39 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 0, 5, 8, 26 - createsprite gUnknown_08592270, 0x3, 5, -18, -20, 35 - delay 0x4 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 0, 5, 8, 26 + createsprite gUnknown_08592270, 3, 5, -18, -20, 35 + delay 4 return Move_POISON_GAS: loadspritegfx 0x27BC loadspritegfx 0x27A6 - delay 0x0 + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x4 + delay 4 playsewithpan SE_W054, -64 createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 0x28 - loopsewithpan SE_W054, +63, 0x1C, 0x6 - createvisualtask sub_8115A04, 0x2, 4, 6, 2, 0, 12, RGB(26, 0, 26) + loopsewithpan SE_W054, +63, 0x1C, 6 + createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 end Move_BIND: - createvisualtask sub_80D5EB8, 0x5, 0, 6, 3328, 4, 0 - goto Anim_BindWrap + createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, ANIM_ATTACKER + goto BindWrap -Anim_BindWrap: +BindWrap: playsewithpan SE_W020, +63 - call Anim_BindWrap1 - call Anim_BindWrap1 + call BindWrap1 + call BindWrap1 waitforvisualfinish end - -Anim_BindWrap1: - createvisualtask sub_80D6064, 0x5, 10, -5, 5, 1, 0 - delay 0x10 +BindWrap1: + createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 + delay 16 return Move_WRAP: - createvisualtask sub_80D5830, 0x2, 0, 6, 4, 2, 4 - goto Anim_BindWrap + createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 6, 4, 2, 4 + goto BindWrap Move_PSYBEAM: loadspritegfx 0x27B3 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground + call SetPsychicBackground createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 - call Anim_Psybeam1 - call Anim_Psybeam1 - createvisualtask sub_80D5EB8, 0x5, 0, 6, 2048, 4, 1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - call Anim_Psybeam1 - waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground - end - -Anim_Psybeam1: - createsprite gUnknown_0859663C, 0x82, 16, 0, 0, 0, 13, 0 - delay 0x4 + call Psybeam1 + call Psybeam1 + createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + call Psybeam1 + waitforvisualfinish + delay 1 + call UnsetPsychicBackground + end +Psybeam1: + createsprite gUnknown_0859663C, 130, 16, 0, 0, 0, 13, 0 + delay 4 return Move_HYPNOSIS: loadspritegfx 0x27B3 - call Anim_SetPsychicBackground - call Anim_Hypnosis1 - call Anim_Hypnosis1 - call Anim_Hypnosis1 - createvisualtask sub_8115A04, 0x2, 4, 2, 2, 0, 12, RGB(31, 18, 31) + call SetPsychicBackground + call Hypnosis1 + call Hypnosis1 + call Hypnosis1 + createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(31, 18, 31) waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end - -Anim_Hypnosis1: +Hypnosis1: playsewithpan SE_W048, -64 - createsprite gUnknown_0859663C, 0x82, 0, 8, 0, 8, 27, 0 - createsprite gUnknown_0859663C, 0x82, 16, -8, 0, -8, 27, 0 - delay 0x6 + createsprite gUnknown_0859663C, 130, 0, 8, 0, 8, 27, 0 + createsprite gUnknown_0859663C, 130, 16, -8, 0, -8, 27, 0 + delay 6 return Move_PSYWAVE: loadspritegfx 0x27B5 playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - createvisualtask sub_81076C8, 0x5, 100 + call SetPsychicBackground + createvisualtask sub_81076C8, 5, 100 createsoundtask sub_8158C58, 203, -64, 63, 2, 9, 0, 10 - call Anim_Psywave1 - call Anim_Psywave1 - createvisualtask sub_8115A04, 0x2, 4, 1, 4, 0, 12, RGB(31, 18, 31) - call Anim_Psywave1 - call Anim_Psywave1 - call Anim_Psywave1 - call Anim_Psywave1 - waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground - end - -Anim_Psywave1: - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 - createsprite gUnknown_08595170, 0x83, 10, 10, 0, 16 - delay 0x4 + call Psywave1 + call Psywave1 + createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31) + call Psywave1 + call Psywave1 + call Psywave1 + call Psywave1 + waitforvisualfinish + delay 1 + call UnsetPsychicBackground + end +Psywave1: + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 + createsprite gUnknown_08595170, 131, 10, 10, 0, 16 + delay 4 return Move_ZAP_CANNON: loadspritegfx 0x27BB - loadspritegfx 0x271B + loadspritegfx ANIM_TAG_011 playsewithpan SE_W086, -64 - createsprite gUnknown_08595764, 0x83, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, 0x84, 10, 0, 8, 30, 224, 40, 2 + createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 64, 40, 1 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 128, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 192, 40, 2 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 32, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 96, 40, 1 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 160, 40, 0 + createsprite gUnknown_08595790, 132, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - delay 0xF - waitplaysewithpan SE_W085B, +63, 0x13 - call Anim_ParalysisEffect + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + delay 15 + waitplaysewithpan SE_W085B, +63, 19 + call ElectricityEffect waitforvisualfinish end Move_STEEL_WING: loadspritegfx 0x2719 - loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - loopsewithpan SE_W017, -64, 0x14, 0x2 - createvisualtask sub_80D5738, 0x2, 0, 12, 4, 1, 4 - createvisualtask sub_810DED8, 0x5, 1, 70 - createsprite gUnknown_085962A4, 0x2, -25, 0, 0, 0, 20 - createsprite gUnknown_085962A4, 0x2, 25, 0, 0, 0, 20 - delay 0x18 - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 9 - delay 0x11 - createsprite gUnknown_08597358, 0x2, 16, 0, 1, 1 - createsprite gUnknown_08597358, 0x2, -16, 0, 1, 1 + setalpha 12, 8 + loopsewithpan SE_W017, -64, 20, 2 + createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask sub_810DED8, 5, 1, 70 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 + createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 + delay 24 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 9 + delay 17 + createsprite gBasicHitSplatSpriteTemplate, 2, 16, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, -16, 0, 1, 1 playsewithpan SE_W013, +63 waitforvisualfinish - createsprite gUnknown_0857FE58, 0x2, 0, 0, 11 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_IRON_TAIL: - loadspritegfx 0x2797 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 0, 0 + loadspritegfx ANIM_TAG_135 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff waitforvisualfinish end Move_POISON_TAIL: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 loadspritegfx 0x27A6 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23) + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_0857FE28, 0x2, 4, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + setalpha 12, 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 playsewithpan SE_W233B, +63 waitforvisualfinish - createvisualtask sub_811489C, 0x5, 0, 1 + createvisualtask sub_811489C, 5, 0, 1 clearmonbg ANIM_TARGET blendoff - call Anim_PoisonEffect + call PoisonBubblesEffect waitforvisualfinish end Move_METAL_CLAW: - loadspritegfx 0x2737 - loopsewithpan SE_W231, -64, 0x1C, 0x2 - createvisualtask sub_81144F8, 0x5, 0, 0, 0 + loadspritegfx ANIM_TAG_039 + loopsewithpan SE_W231, -64, 0x1C, 2 + createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, +63 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - delay 0x8 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x2 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + delay 8 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 2 playsewithpan SE_W013, +63 - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 waitforvisualfinish end @@ -7380,15 +7330,15 @@ Move_NIGHT_SHADE: playsewithpan SE_W060, -64 fadetobg BG_GHOST waitbgfadein - delay 0xA + delay 10 playsewithpan SE_W043, -64 - createvisualtask sub_811188C, 0x5, 85 - delay 0x46 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 12, 1 - createvisualtask sub_8115A04, 0x2, 4, 0, 2, 0, 13, RGB_BLACK + createvisualtask sub_811188C, 5, 85 + delay 70 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1 + createvisualtask sub_8115A04, 2, 4, 0, 2, 0, 13, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATTACKER - delay 0x1 + delay 1 restorebg waitbgfadein end @@ -7397,24 +7347,24 @@ Move_EGG_BOMB: loadspritegfx 0x27D6 loadspritegfx 0x27BF playsewithpan SE_W039, -64 - createsprite gUnknown_08593488, 0x82, 10, 0, 0, 0, 25, -32 + createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 16, 1 - createsprite gUnknown_0859371C, 0x84, 6, 5, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 6, 5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -16, -15, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -16, -15, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 16, -5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 16, -5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, -12, 18, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, -12, 18, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 - createsprite gUnknown_0859371C, 0x84, 0, 5, 1, 0 + delay 3 + createsprite gBattleAnimSpriteTemplate_859371C, 132, 0, 5, 1, 0 playsewithpan SE_W120, +63 - delay 0x3 + delay 3 waitforvisualfinish end @@ -7422,12 +7372,12 @@ Move_SHADOW_BALL: loadspritegfx 0x27C0 fadetobg BG_GHOST waitbgfadein - delay 0xF + delay 15 createsoundtask sub_8158C58, 168, -64, 63, 5, 5, 0, 5 - createsprite gUnknown_08596D58, 0x82, 16, 16, 8 + createsprite gUnknown_08596D58, 130, 16, 16, 8 waitforvisualfinish playsewithpan SE_W028, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1 waitforvisualfinish restorebg waitbgfadein @@ -7435,61 +7385,61 @@ Move_SHADOW_BALL: Move_LICK: loadspritegfx 0x27C1 - delay 0xF + delay 15 playsewithpan SE_W122, +63 - createsprite gUnknown_08596D8C, 0x82, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 16, 1 + createsprite gUnknown_08596D8C, 130, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1 waitforvisualfinish end Move_FOCUS_ENERGY: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_WHITE - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_WHITE + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end Move_BIDE: - choosetwoturnanim Anim_BideSetUp, Anim_BideUnleash + choosetwoturnanim BideSetUp, BideUnleash end -Anim_BideSetUp: - loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 +BideSetUp: + loopsewithpan SE_W036, -64, 0x9, 2 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish end -Anim_BideUnleash: - loadspritegfx 0x2797 +BideUnleash: + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - loopsewithpan SE_W036, -64, 0x9, 0x2 - createvisualtask sub_8116620, 0xA, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 + setalpha 12, 8 + loopsewithpan SE_W036, -64, 0x9, 2 + createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish - createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 4 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 24, 0, 0, 4 waitforvisualfinish - createvisualtask sub_80D5484, 0x2, 0, 2, 0, 12, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 16, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, 18, -8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, 18, -8, 1, 1 + delay 5 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, -18, 8, 1, 1 - delay 0x5 + createsprite gBasicHitSplatSpriteTemplate, 1, -18, 8, 1, 1 + delay 5 playsewithpan SE_W004, +63 - createsprite gUnknown_08597358, 0x1, -8, -5, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 1, -8, -5, 1, 1 waitforvisualfinish - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 7 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 2, 2, 11, 0, RGB_RED + createvisualtask sub_8116620, 10, 2, 2, 11, 0, RGB_RED waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -7499,187 +7449,187 @@ Move_STRING_SHOT: loadspritegfx 0x27C3 loadspritegfx 0x27C4 monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 - waitforvisualfinish - loopsewithpan SE_W081, -64, 0x9, 0x6 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 - call Anim_StringShot1 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK + waitforvisualfinish + loopsewithpan SE_W081, -64, 0x9, 6 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 + call StringShot1 waitforvisualfinish playsewithpan SE_W081B, +63 - createsprite gUnknown_085969F8, 0x82, 0, 10 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, -2 - delay 0x4 - createsprite gUnknown_085969F8, 0x82, 0, 22 + createsprite gUnknown_085969F8, 130, 0, 10 + delay 4 + createsprite gUnknown_085969F8, 130, 0, -2 + delay 4 + createsprite gUnknown_085969F8, 130, 0, 22 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 + delay 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -Anim_StringShot1: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 1 - delay 0x1 +StringShot1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 1 + delay 1 return Move_SPIDER_WEB: loadspritegfx 0x27C5 loadspritegfx 0x27C4 monbg ANIM_DEF_PARTNER - delay 0x0 - createsprite gUnknown_08597274, 0x5, 1, 2, 0, 9, 0 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, -64, 0x9, 0x6 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 - call Anim_SpiderWeb1 + loopsewithpan SE_W081, -64, 0x9, 6 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 + call SpiderWeb1 waitforvisualfinish playsewithpan SE_W081B, +63 - createsprite gUnknown_08596A2C, 0x2 + createsprite gUnknown_08596A2C, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x1 - createsprite gUnknown_08597274, 0x5, 1, 2, 9, 0, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 9, 0, RGB_BLACK end -Anim_SpiderWeb1: - createsprite gUnknown_085969E0, 0x82, 20, 0, 512, 20, 0 - delay 0x1 +SpiderWeb1: + createsprite gUnknown_085969E0, 130, 20, 0, 512, 20, 0 + delay 1 return Move_RAZOR_WIND: - choosetwoturnanim Anim_RazorWindSetUp, Anim_RazorWindUnleash -Anim_RazorWindContinue: + choosetwoturnanim RazorWindSetUp, RazorWindUnleash +RazorWindContinue: waitforvisualfinish end -Anim_RazorWindSetUp: +RazorWindSetUp: loadspritegfx 0x2719 playsewithpan SE_W016, -64 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_08593550, 0x2, 32, 0, 16, 16, 170, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, -64 - goto Anim_RazorWindContinue + goto RazorWindContinue -Anim_RazorWindUnleash: +RazorWindUnleash: loadspritegfx 0x27AA - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, 8, 0, 0, 22, 2, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, 8, 0, 0, 22, 2, 1 + delay 2 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, -8, 16, 14, 22, 1, 1 - delay 0x2 + createsprite gUnknown_085962D4, 2, 14, -8, 16, 14, 22, 1, 1 + delay 2 playsewithpan SE_W013B, -64 - createsprite gUnknown_085962D4, 0x2, 14, 12, -16, -14, 22, 0, 1 - delay 0x11 + createsprite gUnknown_085962D4, 2, 14, 12, -16, -14, 22, 0, 1 + delay 17 playsewithpan SE_W013, +63 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 10, 1 - createvisualtask sub_80D52D0, 0x2, 3, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff - goto Anim_RazorWindContinue + goto RazorWindContinue Move_DISABLE: loadspritegfx 0x2757 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W197, -64 createsprite gUnknown_0853EE84, 0xD, 24, -16 waitforvisualfinish - createvisualtask sub_81045B0, 0x5 - loopsewithpan SE_W020, +63, 0xF, 0x4 + createvisualtask sub_81045B0, 5 + loopsewithpan SE_W020, +63, 15, 4 waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_TARGET blendoff end Move_RECOVER: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_ATK_PARTNER - setalpha 0x80C - loopsewithpan SE_W025, -64, 0xD, 0x3 - createvisualtask sub_8115A04, 0x2, 2, 0, 6, 0, 11, RGB(31, 31, 11) - call Anim_Recover1 - call Anim_Recover1 - call Anim_Recover1 + setalpha 12, 8 + loopsewithpan SE_W025, -64, 0xD, 3 + createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) + call Recover1 + call Recover1 + call Recover1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - delay 0x1 - call Anim_HealingEffect - waitforvisualfinish - end - -Anim_Recover1: - createsprite gUnknown_085921E0, 0x2, 40, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -35, -10, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 15, -40, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -10, -32, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 25, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, -40, -20, 13 - delay 0x3 - createsprite gUnknown_085921E0, 0x2, 5, -40, 13 - delay 0x3 + delay 1 + call HealingEffect + waitforvisualfinish + end + +Recover1: + createsprite gUnknown_085921E0, 2, 40, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -35, -10, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 15, -40, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -10, -32, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 25, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, -40, -20, 13 + delay 3 + createsprite gUnknown_085921E0, 2, 5, -40, 13 + delay 3 return Move_MIMIC: loadspritegfx 0x27A3 - setalpha 0x50B + setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 - panse_1B SE_W107, +63, -64, -3, 0x0 - createvisualtask sub_80FF458, 0x5, 128, 24 - delay 0xF - createsprite gUnknown_085924DC, 0x82, -12, 24 - delay 0xA - setarg 0x7, 0xFFFF + panse_1B SE_W107, +63, -64, -3, 0 + createvisualtask sub_80FF458, 5, 128, 24 + delay 15 + createsprite gUnknown_085924DC, 130, -12, 24 + delay 10 + setarg 7, 0xFFFF waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_8115A04, 0x2, 2, 0, 2, 0, 11, RGB_WHITE + createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 ANIM_DEF_PARTNER blendoff @@ -7687,461 +7637,457 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x4 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, 0, 0, 2 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 2 - delay 0x7 - createsprite gUnknown_08592494, 0x83, 0, -8, 1, 2 - delay 0x8 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 6, 1 - delay 0x14 + loopsewithpan SE_W010, +63, 6, 4 + createsprite gUnknown_08592494, 132, 0, 16, 0, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, 0, 0, 2 + createsprite gUnknown_08592494, 130, 0, 8, 1, 2 + delay 7 + createsprite gUnknown_08592494, 131, 0, -8, 1, 2 + delay 8 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 + delay 20 playsewithpan SE_W020, +63 - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitforvisualfinish end Move_CURSE: - choosetwoturnanim Anim_CurseGhost, Anim_CurseStats -Anim_CurseGhost: + choosetwoturnanim CurseGhost, CurseStats +CurseGhost: loadspritegfx 0x27D7 loadspritegfx 0x27D8 monbg ANIM_ATK_PARTNER - createvisualtask sub_8112758, 0x5 + createvisualtask sub_8112758, 5 waitforvisualfinish - delay 0x14 - createsprite gUnknown_08596DD0, 0x2 - delay 0x3C - call Anim_CurseGhost1 + delay 20 + createsprite gUnknown_08596DD0, 2 + delay 60 + call CurseGhost1 delay 0x29 - call Anim_CurseGhost1 + call CurseGhost1 delay 0x29 - call Anim_CurseGhost1 + call CurseGhost1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - delay 0x1 + delay 1 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end - -Anim_CurseGhost1: - createvisualtask sub_80D52D0, 0x2, 0, 4, 0, 10, 0 +CurseGhost1: + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0 playsewithpan SE_W020, -64 return - -Anim_CurseStats: - createvisualtask sub_80D5EB8, 0x5, 0, 10, 1536, 3, 0 +CurseStats: + createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER waitforvisualfinish - delay 0xA - call Anim_CurseStats1 + delay 10 + call CurseStats1 waitforvisualfinish end - -Anim_CurseStats1: +CurseStats1: playsewithpan SE_W082, -64 - createvisualtask sub_8116B14, 0x5 - createvisualtask sub_8115A04, 0x5, 2, 4, 2, 0, 10, RGB_RED + createvisualtask sub_8116B14, 5 + createvisualtask sub_8115A04, 5, 2, 4, 2, 0, 10, RGB_RED return Move_SOFT_BOILED: loadspritegfx 0x27DA - loadspritegfx 0x27DB - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_031 monbg ANIM_ATK_PARTNER playsewithpan SE_W039, -64 - createvisualtask sub_80D51AC, 0x2, 0, 0, 2, 6, 1 - createsprite gUnknown_085937B0, 0x4, 0, 16, 0 - createsprite gUnknown_085937B0, 0x4, 0, 16, 1 - delay 0x78 - delay 0x7 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 + createsprite gUnknown_085937B0, 4, 0, 16, 0 + createsprite gUnknown_085937B0, 4, 0, 16, 1 + delay 120 + delay 7 playsewithpan SE_W030, -64 - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x8 - createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 - delay 0x3C - setarg 0x7, 0xFFFF + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 8 + createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 + delay 60 + setarg 7, 0xFFFF waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - call Anim_HealingEffect2 + call HealingEffect2 end Move_HEAL_BELL: - loadspritegfx 0x27DD - loadspritegfx 0x27DE - loadspritegfx 0x27DB - createvisualtask sub_8116620, 0xA, 10, 0, 0, 10, RGB_WHITE - waitforvisualfinish - createvisualtask sub_8105CB4, 0x5 - createsprite gUnknown_08593938, 0x2, 0, -24, 0, 1 - delay 0xC + loadspritegfx ANIM_TAG_205 + loadspritegfx ANIM_TAG_206 + loadspritegfx ANIM_TAG_203 + createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE + waitforvisualfinish + createvisualtask sub_8105CB4, 5 + createsprite gUnknown_08593938, 2, 0, -24, 0, 1 + delay 12 createsprite gUnknown_08593958, 0x28, 0, -24, 48, -18, 35, 0, 0 createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1 createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3 - call Anim_HealBell1 + call HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4 createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2 createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0 - call Anim_HealBell1 + call HealBell1 delay 0x21 createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2 createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5 createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3 createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1 - call Anim_HealBell1 + call HealBell1 waitforvisualfinish - createvisualtask sub_8105D60, 0x5 + createvisualtask sub_8105D60, 5 waitforvisualfinish - unloadspritegfx 0x27DD - unloadspritegfx 0x27DE - unloadspritegfx 0x27DB - loadspritegfx 0x2741 + unloadspritegfx ANIM_TAG_205 + unloadspritegfx ANIM_TAG_206 + unloadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 playsewithpan SE_W234, -64 - createsprite gUnknown_08592B94, 0x10, -15, 0, 0, 0, 32, 60, 1 - delay 0x8 - createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 + createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 + delay 8 + createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x27DB + unloadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8116664, 0xA, 4, 3, 10, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 10, 0, RGB_WHITE - createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 + createvisualtask sub_8116664, 10, 4, 3, 10, 0, 31500 + createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE + createsprite gUnknown_08593868, 16, 0, 0, 0, 1 end - -Anim_HealBell1: - createvisualtask sub_8116664, 0xA, 4, 3, 8, 0, 31500 - createvisualtask sub_8116620, 0xA, 10, 3, 2, 10, RGB_WHITE +HealBell1: + createvisualtask sub_8116664, 10, 4, 3, 8, 0, 31500 + createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 playsewithpan SE_W215, -64 return Move_FAKE_OUT: playsewithpan SE_W260, 0 - createvisualtask sub_8105EB0, 0x5 + createvisualtask sub_8105EB0, 5 waitforvisualfinish playsewithpan SE_W166, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE: loadspritegfx 0x27EA - createsprite gUnknown_08597274, 0x2, 27, 3, 0, 16, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, -64 waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W043, -64 - createvisualtask sub_81064F8, 0x5 + createvisualtask sub_81064F8, 5 delay 0xD - createsprite gUnknown_08593A84, 0x0, -16, -8 - createsprite gUnknown_08593A84, 0x0, 16, -8 + createsprite gUnknown_08593A84, 0, -16, -8 + createsprite gUnknown_08593A84, 0, 16, -8 waitforvisualfinish - createvisualtask sub_810A094, 0x3, 20, 1, 0 + createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, +63 - createsprite gUnknown_08597274, 0x2, 27, 3, 16, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 16, 0, RGB_BLACK waitforvisualfinish end Move_SWEET_KISS: loadspritegfx 0x27E8 loadspritegfx 0x27EC - createsprite gUnknown_08593AA8, 0x82, 16, -48 + createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, +63 delay 0x17 playsewithpan SE_W215, +63 delay 0x17 playsewithpan SE_W215, +63 waitforvisualfinish - createsprite gUnknown_085939B8, 0x83, 160, -30 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 playsewithpan SE_W213, +63 - createsprite gUnknown_085939B8, 0x83, -256, -42 - createsprite gUnknown_085939B8, 0x83, 128, -14 - createsprite gUnknown_085939B8, 0x83, 416, -38 - createsprite gUnknown_085939B8, 0x83, -128, -22 - createsprite gUnknown_085939B8, 0x83, -384, -31 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -256, -42 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 128, -14 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, 416, -38 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -128, -22 + createsprite gBattleAnimSpriteTemplate_85939B8, 131, -384, -31 end Move_LOVELY_KISS: loadspritegfx 0x27EB loadspritegfx 0x27ED - createsprite gUnknown_08593AF0, 0x82, 0, -24 + createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, +63 waitforvisualfinish playsewithpan SE_W213, +63 - createsprite gUnknown_08593AC0, 0x83, -256, -42 - createsprite gUnknown_08593AC0, 0x83, 128, -14 - createsprite gUnknown_08593AC0, 0x83, 416, -38 - createsprite gUnknown_08593AC0, 0x83, -128, -22 + createsprite gUnknown_08593AC0, 131, -256, -42 + createsprite gUnknown_08593AC0, 131, 128, -14 + createsprite gUnknown_08593AC0, 131, 416, -38 + createsprite gUnknown_08593AC0, 131, -128, -22 end Move_FURY_SWIPES: loadspritegfx 0x27EE - createsprite gUnknown_0857FE28, 0x2, 5, 5 - delay 0x4 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 + delay 4 playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 0x82, 16, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 5, 1 - delay 0xA - createsprite gUnknown_0857FE28, 0x82, 5, 5 - delay 0x4 + createsprite gUnknown_08593B38, 130, 16, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 + delay 10 + createsprite gHorizontalLungeSpriteTemplate, 130, 5, 5 + delay 4 playsewithpan SE_W010, +63 - createsprite gUnknown_08593B38, 0x82, -16, 0, 0 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 7, 1 + createsprite gUnknown_08593B38, 130, -16, 0, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end Move_INGRAIN: loadspritegfx 0x27EF loadspritegfx 0x27A3 - createsprite gUnknown_0859254C, 0x2, 16, 26, -1, 2, 150 + createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, -32, 20, 1, 1, 140 + delay 10 + createsprite gUnknown_0859254C, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, 32, 22, 1, 0, 130 + delay 10 + createsprite gUnknown_0859254C, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, -64 - delay 0xA - createsprite gUnknown_0859254C, 0x2, -16, 25, -1, 3, 120 + delay 10 + createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, -64 delay 0x28 - createsprite gUnknown_0859258C, 0x3, 32, 26, -1, 3, 30 - delay 0x5 + createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 + delay 5 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_0859258C, 0x3, -48, 20, 1, 2, 30 + delay 5 + createsprite gUnknown_0859258C, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, -64 - delay 0x5 + delay 5 playsewithpan SE_W145C, -64 - delay 0x5 - createsprite gUnknown_0859258C, 0x3, 48, 26, -2, 3, 18 + delay 5 + createsprite gUnknown_0859258C, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, -64 - delay 0xA + delay 10 waitforvisualfinish end Move_PRESENT: loadspritegfx 0x27F0 - createvisualtask AnimTask_IsHealingMove, 0x2 - createsprite gUnknown_08592610, 0x82, 0, -5, 10, 2, -1 + createvisualtask AnimTask_IsHealingMove, 2 + createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, -64 - delay 0xE + delay 14 playsewithpan SE_W145B, -64 - delay 0xE + delay 14 playsewithpan SE_W145B, 0 - delay 0x14 + delay 20 playsewithpan SE_W145B, +63 waitforvisualfinish - jumpretfalse Anim_PresentDamage - jumprettrue Anim_PresentHeal + jumpretfalse PresentDamage + jumprettrue PresentHeal end -Anim_PresentDamage: +PresentDamage: loadspritegfx 0x27D6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 131, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x83, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 131, 16, 16, 1, 1 end -Anim_PresentHeal: +PresentHeal: loadspritegfx 0x27D3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 playsewithpan SE_W234, +63 - createsprite gUnknown_08592658, 0x84, -16, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 16, 32, -3, -1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -32, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 0, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -8, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, 24, 32, -3, 1 - delay 0x3 - createsprite gUnknown_08592658, 0x84, -24, 32, -3, 1 + createsprite gUnknown_08592658, 132, -16, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 16, 32, -3, -1 + delay 3 + createsprite gUnknown_08592658, 132, 32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -32, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 0, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -8, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, 24, 32, -3, 1 + delay 3 + createsprite gUnknown_08592658, 132, -24, 32, -3, 1 waitforvisualfinish waitsound - call Anim_HealingEffect2 + call HealingEffect2 end Move_BATON_PASS: loadspritegfx 0x27F2 playsewithpan SE_W226, -64 - createvisualtask sub_8115A04, 0x2, 31, 1, 2, 0, 11, RGB(31, 22, 30) - createsprite gUnknown_085CE370, 0x2 + createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) + createsprite gUnknown_085CE370, 2 end Move_PERISH_SONG: - loadspritegfx 0x27DE - createsprite gUnknown_08593C0C, 0x4, 0, 0, 0 - createsprite gUnknown_08593C0C, 0x4, 1, 1, 16 - createsprite gUnknown_08593C0C, 0x4, 2, 1, 32 - createsprite gUnknown_08593C0C, 0x4, 3, 2, 48 - createsprite gUnknown_08593C0C, 0x4, 4, 2, 64 - createsprite gUnknown_08593C0C, 0x4, 5, 0, 80 - createsprite gUnknown_08593C0C, 0x4, 6, 0, 96 - createsprite gUnknown_08593C0C, 0x4, 7, 1, 112 - createsprite gUnknown_08593C0C, 0x4, 8, 2, 128 - createsprite gUnknown_08593C0C, 0x4, 9, 0, 144 - createsprite gUnknown_08593C0C, 0x4, 10, 2, 160 - createsprite gUnknown_08593C0C, 0x4, 11, 0, 176 - createsprite gUnknown_08593C0C, 0x4, 12, 1, 192 - createsprite gUnknown_08593C0C, 0x4, 13, 3, 208 - createsprite gUnknown_08593C0C, 0x4, 14, 3, 224 - createsprite gUnknown_08593C0C, 0x4, 15, 0, 240 - createsprite gUnknown_08593C24, 0x4, 15, 0, 0 - delay 0x14 - panse_1B SE_W195, -64, +63, +2, 0x0 + loadspritegfx ANIM_TAG_206 + createsprite gUnknown_08593C0C, 4, 0, 0, 0 + createsprite gUnknown_08593C0C, 4, 1, 1, 16 + createsprite gUnknown_08593C0C, 4, 2, 1, 32 + createsprite gUnknown_08593C0C, 4, 3, 2, 48 + createsprite gUnknown_08593C0C, 4, 4, 2, 64 + createsprite gUnknown_08593C0C, 4, 5, 0, 80 + createsprite gUnknown_08593C0C, 4, 6, 0, 96 + createsprite gUnknown_08593C0C, 4, 7, 1, 112 + createsprite gUnknown_08593C0C, 4, 8, 2, 128 + createsprite gUnknown_08593C0C, 4, 9, 0, 144 + createsprite gUnknown_08593C0C, 4, 10, 2, 160 + createsprite gUnknown_08593C0C, 4, 11, 0, 176 + createsprite gUnknown_08593C0C, 4, 12, 1, 192 + createsprite gUnknown_08593C0C, 4, 13, 3, 208 + createsprite gUnknown_08593C0C, 4, 14, 3, 224 + createsprite gUnknown_08593C0C, 4, 15, 0, 240 + createsprite gUnknown_08593C24, 4, 15, 0, 0 + delay 20 + panse_1B SE_W195, -64, +63, +2, 0 delay 0x50 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0 - createvisualtask sub_811489C, 0x5, 4, 0 - createvisualtask sub_811489C, 0x5, 5, 0 - createvisualtask sub_811489C, 0x5, 6, 0 - createvisualtask sub_811489C, 0x5, 7, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK + createvisualtask sub_811489C, 5, 4, 0 + createvisualtask sub_811489C, 5, 5, 0 + createvisualtask sub_811489C, 5, 6, 0 + createvisualtask sub_811489C, 5, 7, 0 delay 0x64 - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0 - createvisualtask sub_811489C, 0x5, 4, 1 - createvisualtask sub_811489C, 0x5, 5, 1 - createvisualtask sub_811489C, 0x5, 6, 1 - createvisualtask sub_811489C, 0x5, 7, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK + createvisualtask sub_811489C, 5, 4, 1 + createvisualtask sub_811489C, 5, 5, 1 + createvisualtask sub_811489C, 5, 6, 1 + createvisualtask sub_811489C, 5, 7, 1 waitforvisualfinish end Move_SLEEP_TALK: loadspritegfx 0x27F4 - createvisualtask sub_80D5EB8, 0x5, 0, 4, 4096, 2, 0 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 + createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -1 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -5 - delay 0x14 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -5 + delay 20 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 playsewithpan SE_W173, -64 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 - delay 0x6 - createsprite gUnknown_085CE190, 0x82, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 + delay 6 + createsprite gUnknown_085CE190, 130, 0, 20, 5, -3 waitforvisualfinish end Move_HYPER_FANG: loadspritegfx 0x27D0 playsewithpan SE_W044, +63 - delay 0x1 - delay 0x2 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_HyperFangInContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_HyperFangOnOpponent - goto Anim_HyperFangOnPlayer -Anim_HyperFangContinue: + delay 1 + delay 2 + createvisualtask AnimTask_IsContest, 2 + jumprettrue HyperFangInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse HyperFangOnOpponent + goto HyperFangOnPlayer +HyperFangContinue: waitbgfadeout - createsprite gUnknown_085CE1DC, 0x82 + createsprite gUnknown_085CE1DC, 130 waitbgfadein - createvisualtask sub_80D51AC, 0x3, 1, 0, 10, 10, 1 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 playsewithpan SE_W043, +63 - delay 0x14 + delay 20 restorebg waitbgfadein waitforvisualfinish end -Anim_HyperFangOnOpponent: +HyperFangOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto Anim_HyperFangContinue + goto HyperFangContinue -Anim_HyperFangOnPlayer: +HyperFangOnPlayer: fadetobg BG_IMPACT_PLAYER - goto Anim_HyperFangContinue + goto HyperFangContinue -Anim_HyperFangInContest: +HyperFangInContest: fadetobg BG_IMPACT_CONTESTS - goto Anim_HyperFangContinue + goto HyperFangContinue Move_TRI_ATTACK: loadspritegfx 0x27F6 - createsprite gUnknown_085CE2F8, 0x82, 16, 0 + createsprite gUnknown_085CE2F8, 130, 16, 0 playsewithpan SE_W161, -64 - delay 0x14 + delay 20 playsewithpan SE_W161, -64 - delay 0x14 + delay 20 createsoundtask sub_8158C58, 220, -64, 63, 5, 6, 0, 7 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0 - delay 0x10 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK + delay 16 loadspritegfx 0x2731 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 0 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, +63 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 0, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 2, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, -1, 1 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 1, -2 - delay 0x1 - createsprite gUnknown_08595410, 0x82, 0, 0, 30, 30, 3, 1 - delay 0x2 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 2, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 1 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 1, -2 + delay 1 + createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 3, 1 + delay 2 + createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish loadspritegfx 0x2735 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, +63 - createsprite gUnknown_085956C0, 0x82, 0, -48 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, -16 - delay 0x1 - createsprite gUnknown_085956C0, 0x82, 0, 16 - delay 0x14 - createvisualtask sub_810A094, 0x2, 20, 3, 1, 0 - delay 0x2 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_085956C0, 130, 0, -48 + delay 1 + createsprite gUnknown_085956C0, 130, 0, -16 + delay 1 + createsprite gUnknown_085956C0, 130, 0, 16 + delay 20 + createvisualtask sub_810A094, 2, 20, 3, 1, 0 + delay 2 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 0x279D - call Anim_FreezeEffect1 - createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 + loadspritegfx ANIM_TAG_141 + call FreezeEffect1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end @@ -8151,27 +8097,27 @@ Move_WILL_O_WISP: monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, -64 - waitplaysewithpan SE_W052, -64, 0xA - createvisualtask sub_8159278, 0x2, -64, -64, 1, 0 - createsprite gUnknown_0859563C, 0x2, 0, 0, 0 - delay 0x3 - createsprite gUnknown_0859563C, 0x3, 0, 0, 1 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 2 - delay 0x3 - createsprite gUnknown_0859563C, 0x4, 0, 0, 3 + waitplaysewithpan SE_W052, -64, 10 + createvisualtask sub_8159278, 2, -64, -64, 1, 0 + createsprite gUnknown_0859563C, 2, 0, 0, 0 + delay 3 + createsprite gUnknown_0859563C, 3, 0, 0, 1 + delay 3 + createsprite gUnknown_0859563C, 4, 0, 0, 2 + delay 3 + createsprite gUnknown_0859563C, 4, 0, 0, 3 delay 0x28 - createvisualtask sub_8159278, 0x2, -64, 63, 2, 0 + createvisualtask sub_8159278, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, +63 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 13, 1 - createsprite gUnknown_0859566C, 0x2, 0 - createsprite gUnknown_0859566C, 0x2, 42 - createsprite gUnknown_0859566C, 0x2, 84 - createsprite gUnknown_0859566C, 0x2, 126 - createsprite gUnknown_0859566C, 0x2, 168 - createsprite gUnknown_0859566C, 0x2, 210 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 + createsprite gUnknown_0859566C, 2, 0 + createsprite gUnknown_0859566C, 2, 42 + createsprite gUnknown_0859566C, 2, 84 + createsprite gUnknown_0859566C, 2, 126 + createsprite gUnknown_0859566C, 2, 168 + createsprite gUnknown_0859566C, 2, 210 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -8179,460 +8125,454 @@ Move_WILL_O_WISP: Move_ENCORE: loadspritegfx 0x27F3 loadspritegfx 0x2807 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_085CE22C, 0x82, 0, -8 - createsprite gUnknown_085CE244, 0x2, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE244, 0x2, 2, 0, 1, 0, 9 - createsprite gUnknown_085CE25C, 0x3, -2, 0, 0, 0, 9 - createsprite gUnknown_085CE25C, 0x3, 2, 0, 1, 0, 9 - delay 0x10 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 5, 1 + createsprite gUnknown_085CE22C, 130, 0, -8 + createsprite gUnknown_085CE244, 2, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE244, 2, 2, 0, 1, 0, 9 + createsprite gUnknown_085CE25C, 3, -2, 0, 0, 0, 9 + createsprite gUnknown_085CE25C, 3, 2, 0, 1, 0, 9 + delay 16 + createvisualtask sub_8159244, 5, 223, 63 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 + createvisualtask sub_815AC8C, 2 end Move_TRICK: loadspritegfx 0x27F0 loadspritegfx 0x27DF - createsprite gUnknown_085926E8, 0x2, -40, 80 - createsprite gUnknown_085926E8, 0x2, -40, 208 - delay 0x10 + createsprite gUnknown_085926E8, 2, -40, 80 + createsprite gUnknown_085926E8, 2, -40, 208 + delay 16 playsewithpan SE_W166, 0 - createvisualtask sub_8106020, 0x3 - createvisualtask sub_81060B0, 0x3 - delay 0x1E + createvisualtask sub_8106020, 3 + createvisualtask sub_81060B0, 3 + delay 30 playsewithpan SE_W104, 0 - delay 0x18 + delay 24 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W104, 0 - delay 0x10 + delay 16 playsewithpan SE_W213, 0 - createvisualtask sub_80D51AC, 0x3, 0, 5, 0, 7, 2 - createvisualtask sub_80D51AC, 0x3, 1, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2 waitforvisualfinish end Move_WISH: loadspritegfx 0x27F9 - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish - panse_27 SE_W115, +63, -64, -3, 0x0 + panse_27 SE_W115, +63, -64, -3, 0 createsprite gUnknown_085CE388, 0x28 waitforvisualfinish - delay 0x3C - loopsewithpan SE_W215, -64, 0x10, 0x3 - call Anim_GrantingStarsEffect + delay 60 + loopsewithpan SE_W215, -64, 16, 3 + call GrantingStarsEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK waitforvisualfinish end Move_STOCKPILE: loadspritegfx 0x27FB playsewithpan SE_W025, -64 - createvisualtask sub_8115A04, 0x2, 2, 8, 1, 0, 12, RGB_WHITE - createvisualtask sub_815B65C, 0x5 - call Anim_Stockpile1 - call Anim_Stockpile1 - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE - end - -Anim_Stockpile1: - createsprite gUnknown_08592244, 0x2, 55, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, 55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 0, -55, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, 55, 34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, -34, 13 - delay 0x1 - createsprite gUnknown_08592244, 0x2, -55, 34, 13 - delay 0x1 + createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE + createvisualtask sub_815B65C, 5 + call Stockpile1 + call Stockpile1 + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 12, 0, RGB_WHITE + end +Stockpile1: + createsprite gUnknown_08592244, 2, 55, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, 55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 0, -55, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, 55, 34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, -34, 13 + delay 1 + createsprite gUnknown_08592244, 2, -55, 34, 13 + delay 1 return Move_SPIT_UP: loadspritegfx 0x27FD - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 playsewithpan SE_W036, -64 - createvisualtask sub_815B6B4, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 + createvisualtask sub_815B6B4, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 0x2D playsewithpan SE_W255, -64 - delay 0x3 - createsprite gUnknown_08593A50, 0x2, 0, 12 - createsprite gUnknown_08593A50, 0x2, 32, 12 - createsprite gUnknown_08593A50, 0x2, 64, 12 - createsprite gUnknown_08593A50, 0x2, 96, 12 - createsprite gUnknown_08593A50, 0x2, 128, 12 - createsprite gUnknown_08593A50, 0x2, 160, 12 - createsprite gUnknown_08593A50, 0x2, 192, 12 - createsprite gUnknown_08593A50, 0x2, 224, 12 - delay 0x5 - jumpifmoveturn 0x2, Anim_SpitUpStrong - jumpifmoveturn 0x3, Anim_SpitUpStrongest -Anim_SpitUpContinue: - delay 0x5 - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 + delay 3 + createsprite gUnknown_08593A50, 2, 0, 12 + createsprite gUnknown_08593A50, 2, 32, 12 + createsprite gUnknown_08593A50, 2, 64, 12 + createsprite gUnknown_08593A50, 2, 96, 12 + createsprite gUnknown_08593A50, 2, 128, 12 + createsprite gUnknown_08593A50, 2, 160, 12 + createsprite gUnknown_08593A50, 2, 192, 12 + createsprite gUnknown_08593A50, 2, 224, 12 + delay 5 + jumpifmoveturn 2, SpitUpStrong + jumpifmoveturn 3, SpitUpStrongest +SpitUpContinue: + delay 5 + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 0x83, -12, 10, 1, 1 - delay 0x5 + createsprite gUnknown_085973E8, 131, -12, 10, 1, 1 + delay 5 playsewithpan SE_W003, +63 - createsprite gUnknown_085973E8, 0x83, 12, -10, 1, 1 - waitforvisualfinish - end - -Anim_SpitUpStrong: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 208 - goto Anim_SpitUpContinue - -Anim_SpitUpStrongest: - createsprite gUnknown_08593A50, 0x2, 16 - createsprite gUnknown_08593A50, 0x2, 48 - createsprite gUnknown_08593A50, 0x2, 80 - createsprite gUnknown_08593A50, 0x2, 112 - createsprite gUnknown_08593A50, 0x2, 144 - createsprite gUnknown_08593A50, 0x2, 176 - createsprite gUnknown_08593A50, 0x2, 208 - createsprite gUnknown_08593A50, 0x2, 240 - goto Anim_SpitUpContinue + createsprite gUnknown_085973E8, 131, 12, -10, 1, 1 + waitforvisualfinish + end +SpitUpStrong: + createsprite gUnknown_08593A50, 2, 16 + createsprite gUnknown_08593A50, 2, 80 + createsprite gUnknown_08593A50, 2, 144 + createsprite gUnknown_08593A50, 2, 208 + goto SpitUpContinue +SpitUpStrongest: + createsprite gUnknown_08593A50, 2, 16 + createsprite gUnknown_08593A50, 2, 48 + createsprite gUnknown_08593A50, 2, 80 + createsprite gUnknown_08593A50, 2, 112 + createsprite gUnknown_08593A50, 2, 144 + createsprite gUnknown_08593A50, 2, 176 + createsprite gUnknown_08593A50, 2, 208 + createsprite gUnknown_08593A50, 2, 240 + goto SpitUpContinue Move_SWALLOW: loadspritegfx 0x27FC - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 playsewithpan SE_W036, -64 - createvisualtask sub_815B778, 0x5 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 8, 2 + createvisualtask sub_815B778, 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 delay 0x26 playsewithpan SE_W255, -64 - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 12, 1 - call Anim_SwallowEffect - jumpifmoveturn 0x2, Anim_SwallowGood - jumpifmoveturn 0x3, Anim_SwallowBest -Anim_SwallowContinue: - waitforvisualfinish - call Anim_HealingEffect - end - -Anim_SwallowEffect: - createsprite gUnknown_085CE418, 0x2, 0, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -24, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, -16, -8 - delay 0x1 - createsprite gUnknown_085CE418, 0x2, 24, -8 - delay 0x1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 + call SwallowEffect + jumpifmoveturn 2, SwallowGood + jumpifmoveturn 3, SwallowBest +SwallowContinue: + waitforvisualfinish + call HealingEffect + end +SwallowEffect: + createsprite gUnknown_085CE418, 2, 0, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -24, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, -16, -8 + delay 1 + createsprite gUnknown_085CE418, 2, 24, -8 + delay 1 return - -Anim_SwallowGood: - call Anim_SwallowEffect - goto Anim_SwallowContinue - -Anim_SwallowBest: - call Anim_SwallowEffect - call Anim_SwallowEffect - goto Anim_SwallowContinue +SwallowGood: + call SwallowEffect + goto SwallowContinue +SwallowBest: + call SwallowEffect + call SwallowEffect + goto SwallowContinue Move_TRANSFORM: monbg ANIM_ATTACKER playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 - createvisualtask sub_815B7D0, 0x2, 0 + waitplaysewithpan SE_W107, -64, 48 + createvisualtask sub_815B7D0, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER end Move_MORNING_SUN: loadspritegfx 0x2801 - loadspritegfx 0x272F - createvisualtask sub_815BB84, 0x5 - delay 0x8 - createvisualtask sub_8116620, 0xA, 0x781, 8, 0, 12, RGB_WHITE - delay 0xE - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - call Anim_MorningSun1 - createvisualtask sub_8116620, 0xA, 0x781, 3, 12, 0, RGB_WHITE + loadspritegfx ANIM_TAG_031 + createvisualtask sub_815BB84, 5 + delay 8 + createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE + delay 14 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + call MorningSun1 + createvisualtask sub_8116620, 10, 0x781, 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound - call Anim_HealingEffect + call HealingEffect end -Anim_MorningSun1: - createsprite gUnknown_085CE48C, 0x2, 30, 640 - delay 0x5 +MorningSun1: + createsprite gUnknown_085CE48C, 2, 30, 640 + delay 5 return Move_SWEET_SCENT: loadspritegfx 0x27FE playsewithpan SE_W230, -64 - createsprite gUnknown_085CE544, 0x2, 100, 0, 100 - delay 0x19 + createsprite gUnknown_085CE544, 2, 100, 0, 100 + delay 25 setpan 0 - call Anim_SweetScentEffect - createsprite gUnknown_085CE544, 0x2, 55, 0 + call SweetScentEffect + createsprite gUnknown_085CE544, 2, 55, 0 setpan +63 - createvisualtask sub_8115A04, 0x2, 20, 1, 5, 5, 13, RGB(31, 21, 21) - call Anim_SweetScentEffect - waitforvisualfinish - end - -Anim_SweetScentEffect: - createsprite gUnknown_085CE544, 0x2, 70, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 60, 0, 64 - delay 0x5 - createsprite gUnknown_085CE544, 0x2, 80, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 58, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 90, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 48, 0, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 95, 1, 80 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 100, 0, 120 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 75, 1, 64 - delay 0x2 - createsprite gUnknown_085CE544, 0x2, 85, 0, 120 - delay 0x2 + createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) + call SweetScentEffect + waitforvisualfinish + end + +SweetScentEffect: + createsprite gUnknown_085CE544, 2, 70, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 60, 0, 64 + delay 5 + createsprite gUnknown_085CE544, 2, 80, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 58, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 90, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 48, 0, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 95, 1, 80 + delay 2 + createsprite gUnknown_085CE544, 2, 100, 0, 120 + delay 2 + createsprite gUnknown_085CE544, 2, 75, 1, 64 + delay 2 + createsprite gUnknown_085CE544, 2, 85, 0, 120 + delay 2 return Move_HYPER_BEAM: loadspritegfx 0x27A3 - createsprite gUnknown_08597274, 0x2, 1, 4, 0, 16, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish - delay 0xA + delay 10 playsewithpan SE_W063, -64 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 4, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1 waitforvisualfinish - delay 0x1E + delay 30 createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 - createvisualtask sub_80D51AC, 0x2, 0, 0, 4, 50, 1 - createvisualtask sub_8115D94, 0x2, 10147, 1, 12, 31, 16, 0, 0 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 50, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 11, RGB(25, 25, 25) - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - call Anim_HyperBeam1 - createvisualtask sub_8116620, 0xA, 4, 2, 11, 0, RGB(25, 25, 25) - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 4, 16, 0, 0 - end - -Anim_HyperBeam1: - createsprite gUnknown_08592288, 0x82 - createsprite gUnknown_08592288, 0x82 - delay 0x1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 + createvisualtask sub_8115D94, 2, 10147, 1, 12, 31, 16, 0, 0 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 11, RGB(25, 25, 25) + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + call HyperBeam1 + createvisualtask sub_8116620, 10, 4, 2, 11, 0, RGB(25, 25, 25) + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK + end + +HyperBeam1: + createsprite gUnknown_08592288, 130 + createsprite gUnknown_08592288, 130 + delay 1 return Move_FLATTER: loadspritegfx 0x27F3 loadspritegfx 0x2800 - createvisualtask sub_8159244, 0x5, 223, 63 - createvisualtask sub_815ABEC, 0x2 - createvisualtask sub_8116960, 0x2, 248, 3, 0, 10, 0 - waitforvisualfinish - createsprite gUnknown_085CE5C0, 0x82, 0, -8, 80 - delay 0x0 - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0xA - createsprite gUnknown_0857FE40, 0x2, 5, 2, 1 - delay 0x0 - createvisualtask sub_8159210, 0x5, 229, -64 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - call Anim_Flatter1 - delay 0x5 - createvisualtask sub_8159210, 0x5, 229, 63 - waitforvisualfinish - createvisualtask sub_8116960, 0x2, 248, 3, 10, 0, 1 - waitforvisualfinish - createvisualtask sub_815AC8C, 0x2 - end - -Anim_Flatter1: + createvisualtask sub_8159244, 5, 223, 63 + createvisualtask sub_815ABEC, 2 + createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 + waitforvisualfinish + createsprite gUnknown_085CE5C0, 130, 0, -8, 80 + delay 0 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 10 + createsprite gVerticalDipSpriteTemplate, 2, 5, 2, ANIM_TARGET + delay 0 + createvisualtask sub_8159210, 5, 229, -64 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + call Flatter1 + delay 5 + createvisualtask sub_8159210, 5, 229, 63 + waitforvisualfinish + createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 + waitforvisualfinish + createvisualtask sub_815AC8C, 2 + end + +Flatter1: createsprite gUnknown_085CE5A8, 0x28, 0 createsprite gUnknown_085CE5A8, 0x28, 1 return Move_ROLE_PLAY: monbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 0, 16, RGB_WHITE - createsprite gUnknown_08597274, 0x2, 1, 2, 0, 10, 0 + createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W161, -64 - waitplaysewithpan SE_W197, -64, 0x1E - createvisualtask sub_815CED8, 0x2 + waitplaysewithpan SE_W197, -64, 30 + createvisualtask sub_815CED8, 2 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER - createvisualtask sub_8116620, 0xA, 4, 2, 16, 0, RGB_WHITE - delay 0x8 - createsprite gUnknown_08597274, 0x2, 1, 2, 10, 0, 0 + createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE + delay 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 10, 0, RGB_BLACK end Move_REFRESH: - loadspritegfx 0x27DB - loadspritegfx 0x2741 + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 playsewithpan SE_W287, -64 - createvisualtask sub_815DFCC, 0x2, 0 + createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish playsewithpan SE_W234, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 10, 0, RGB(12, 24, 30) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: - loadspritegfx 0x2797 - loadspritegfx 0x279F + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 loadspritegfx 0x272D monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W172, +63 - createsprite gUnknown_08595F14, 0x83, 0, 0, 1, 30 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 7, RGB_WHITE - delay 0x1E + createsprite gUnknown_08595F14, 131, 0, 0, 1, 30 + createvisualtask sub_8116620, 10, 4, 2, 0, 7, RGB_WHITE + delay 30 playsewithpan SE_W007, +63 - createsprite gUnknown_08597358, 0x82, 0, 0, 1, 0 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 14, 1 - createvisualtask sub_8116620, 0xA, 4, 2, 0, 0, RGB_WHITE - createsprite gUnknown_0859728C, 0x2, 31, 3, 1, 0, 8, 0, 0 - call Anim_FireMoveEffect + createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 + createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + call FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET blendoff end Move_HYPER_VOICE: - loadspritegfx 0x27DB - createvisualtask sub_81590B8, 0x5, 0 - call Anim_HyperVoiceEffect + loadspritegfx ANIM_TAG_203 + createvisualtask sub_81590B8, 5, 0 + call HyperVoiceEffect waitforvisualfinish - delay 0x8 - createvisualtask sub_81590B8, 0x5, 1 - call Anim_HyperVoiceEffect + delay 8 + createvisualtask sub_81590B8, 5, 1 + call HyperVoiceEffect waitforvisualfinish end -Anim_HyperVoiceEffect: - createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW - createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0 - createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1 - createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 - createvisualtask sub_80D52D0, 0x2, 3, 1, 0, 6, 1 - createvisualtask sub_81162A4, 0x2, 1, 0, 6, 1 - createvisualtask sub_8159078, 0x5 +HyperVoiceEffect: + createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 + createsprite gUnknown_08593880, 0, 45, 0, 0, 0, 0, 0, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 + createvisualtask sub_81162A4, 2, 1, 0, 6, 1 + createvisualtask sub_8159078, 5 return Move_SAND_TOMB: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1 playsewithpan SE_W328, +63 - call Anim_SandTombEffect - call Anim_SandTombEffect - call Anim_SandTombEffect + call SandTombEffect + call SandTombEffect + call SandTombEffect delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) - waitforvisualfinish - end - -Anim_SandTombEffect: - createsprite gUnknown_08596B34, 0x82, 0, 32, 528, 30, 10, 50, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 36, 480, 20, 13, -46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 576, 20, 5, 42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 35, 400, 25, 8, -42, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 32, 512, 25, 13, 46, 1 - delay 0x2 - createsprite gUnknown_08596B34, 0x82, 0, 37, 464, 30, 12, -50, 1 - delay 0x2 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) + waitforvisualfinish + end + +SandTombEffect: + createsprite gUnknown_08596B34, 130, 0, 32, 528, 30, 10, 50, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 36, 480, 20, 13, -46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 576, 20, 5, 42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 35, 400, 25, 8, -42, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 32, 512, 25, 13, 46, 1 + delay 2 + createsprite gUnknown_08596B34, 130, 0, 37, 464, 30, 12, -50, 1 + delay 2 return Move_SHEER_COLD: @@ -8643,9 +8583,9 @@ Move_SHEER_COLD: loadspritegfx 0x271A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80A9EF4, 0x2 - waitplaysewithpan SE_W258, +63, 0x11 + setalpha 12, 8 + createvisualtask sub_80A9EF4, 2 + waitplaysewithpan SE_W258, +63, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8654,181 +8594,179 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx 0x279F - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_135 monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 0 - delay 0x6 - createsprite gUnknown_0857FE28, 0x2, 4, 3 - delay 0x4 + setalpha 12, 8 + createvisualtask sub_80D6134, 5, 8, 5, 0, 0 + delay 6 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 3 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_08596034, 0x82, 10, -8, 14, 3 + createsprite gUnknown_08596034, 130, 10, -8, 14, 3 waitforvisualfinish - createvisualtask sub_80D6134, 0x5, 8, 5, 0, 1 + createvisualtask sub_80D6134, 5, 8, 5, 0, 1 playsewithpan SE_W003, +63 - choosetwoturnanim Anim_ArmThrustRight, Anim_ArmThrustLeft -Anim_ArmThrustContinue: - createvisualtask sub_80D51AC, 0x5, 1, 4, 0, 6, 1 + choosetwoturnanim ArmThrustRight, ArmThrustLeft +ArmThrustContinue: + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1 waitforvisualfinish blendoff end - -Anim_ArmThrustRight: - createsprite gUnknown_08597358, 0x82, 8, 0, 1, 2 - goto Anim_ArmThrustContinue - -Anim_ArmThrustLeft: - createsprite gUnknown_08597358, 0x82, -8, 0, 1, 2 - goto Anim_ArmThrustContinue +ArmThrustRight: + createsprite gBasicHitSplatSpriteTemplate, 130, 8, 0, 1, 2 + goto ArmThrustContinue +ArmThrustLeft: + createsprite gBasicHitSplatSpriteTemplate, 130, -8, 0, 1, 2 + goto ArmThrustContinue Move_MUDDY_WATER: - panse_1B SE_W250, -64, +63, +2, 0x0 - createvisualtask sub_8107954, 0x2, 1 + panse_1B SE_W250, -64, +63, +2, 0 + createvisualtask sub_8107954, 2, 1 waitforvisualfinish end Move_BULLET_SEED: loadspritegfx 0x2716 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 30, 1 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 - delay 0x5 - createsprite gUnknown_0859351C, 0x82, 20, 0 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 + delay 5 + createsprite gUnknown_0859351C, 130, 20, 0 waitforvisualfinish end Move_DRAGON_CLAW: loadspritegfx 0x272D - loadspritegfx 0x2737 + loadspritegfx ANIM_TAG_039 playsewithpan SE_W221B, -64 - createvisualtask sub_8116620, 0xA, 2, 4, 0, 8, RGB(31, 19, 0) - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 15, 1 - call Anim_DragonClawEffect - call Anim_DragonClawEffect - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, -10, -10, 0 - createsprite gUnknown_08597138, 0x82, -10, 10, 0 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createvisualtask sub_8159210, 0x5, 136, 63 - createsprite gUnknown_08597138, 0x82, 10, -10, 1 - createsprite gUnknown_08597138, 0x82, 10, 10, 1 - createsprite gUnknown_085972D8, 0x2, -4, 1, 10, 3, 1 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_8116620, 0xA, 2, 4, 8, 0, RGB(31, 19, 0) - waitforvisualfinish - end - -Anim_DragonClawEffect: - createsprite gUnknown_08596B88, 0x2, 0, 28, 528, 30, 13, 50, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 32, 480, 20, 16, -46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 576, 20, 8, 42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 31, 400, 25, 11, -42, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 28, 512, 25, 16, 46, 0 - delay 0x2 - createsprite gUnknown_08596B88, 0x2, 0, 33, 464, 30, 15, -50, 0 - delay 0x2 + createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 + call DragonClawEffect + call DragonClawEffect + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createvisualtask sub_8159210, 5, 136, 63 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, -10, 0 + createsprite gBattleAnimSpriteTemplate_8597138, 130, -10, 10, 0 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createvisualtask sub_8159210, 5, 136, 63 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, -10, 1 + createsprite gBattleAnimSpriteTemplate_8597138, 130, 10, 10, 1 + createsprite gBattleAnimSpriteTemplate_85972D8, 2, -4, 1, 10, 3, 1 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) + waitforvisualfinish + end + +DragonClawEffect: + createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 32, 480, 20, 16, -46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 576, 20, 8, 42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 31, 400, 25, 11, -42, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 28, 512, 25, 16, 46, 0 + delay 2 + createsprite gUnknown_08596B88, 2, 0, 33, 464, 30, 15, -50, 0 + delay 2 return -Anim_End: +End: end Move_MUD_SHOT: loadspritegfx 0x2813 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - createvisualtask sub_80D51AC, 0x5, 0, 0, 2, 46, 1 - delay 0x6 - createvisualtask sub_81076C8, 0x5, 100 - panse_1B SE_W250, -64, +63, +1, 0x0 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 43, 1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 - call Anim_MudShot1 + setalpha 12, 8 + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1 + delay 6 + createvisualtask sub_81076C8, 5, 100 + panse_1B SE_W250, -64, +63, +1, 0 + call MudShot1 + call MudShot1 + call MudShot1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 + call MudShot1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_MudShot1: - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 - createsprite gUnknown_085950FC, 0x3, 10, 10, 0, 16 - delay 0x2 +MudShot1: + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 + createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 + delay 2 return Move_METEOR_MASH: loadspritegfx 0x27F9 - loadspritegfx 0x2797 - loadspritegfx 0x279F - panse_1B SE_W112, -64, +63, +3, 0x0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + panse_1B SE_W112, -64, +63, +3, 0 fadetobg BG_COSMIC waitbgfadein waitforvisualfinish - createsprite gUnknown_085CE8DC, 0x83, -48, -64, 72, 32, 30 - delay 0xA - createsprite gUnknown_085CE8DC, 0x83, -112, -64, 8, 32, 30 + createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30 + delay 10 + createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30 delay 0x28 - createsprite gUnknown_08595F14, 0x83, 0, 0, 0, 30 - createsprite gUnknown_085CE8DC, 0x83, -80, -64, 40, 32, 30 - delay 0x14 + createsprite gUnknown_08595F14, 131, 0, 0, 0, 30 + createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30 + delay 20 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 5, 0, 20, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1 waitforvisualfinish - delay 0xA + delay 10 restorebg waitbgfadein waitforvisualfinish @@ -8837,26 +8775,26 @@ Move_METEOR_MASH: Move_REVENGE: loadspritegfx 0x2805 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W036, -64 - createsprite gUnknown_08596088, 0x2, 10, -10 + createsprite gUnknown_08596088, 2, 10, -10 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 2, 0, 4, 2, 8, RGB_RED + createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish unloadspritegfx 0x2805 loadspritegfx 0x2806 - createsprite gUnknown_0857FE28, 0x2, 6, 4 - delay 0x4 + createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 + delay 4 playsewithpan SE_W207, +63 - createsprite gUnknown_085960D0, 0x82, 10, -10 + createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish unloadspritegfx 0x2806 - loadspritegfx 0x2797 - createvisualtask sub_80D52D0, 0x2, 1, 3, 0, 10, 1 - createsprite gUnknown_08597400, 0x83, -10, -8, 1, 1, 8 + loadspritegfx ANIM_TAG_135 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 + createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597400, 0x83, 10, 8, 1, 1, 8 + delay 8 + createsprite gUnknown_08597400, 131, 10, 8, 1, 1, 8 playsewithpan SE_W025B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -8867,75 +8805,75 @@ Move_POISON_FANG: loadspritegfx 0x27D0 loadspritegfx 0x27A6 playsewithpan SE_W044, +63 - createsprite gUnknown_085CE1DC, 0x82 - delay 0xA - createvisualtask sub_80D51AC, 0x3, 1, 3, 0, 10, 1 + createsprite gUnknown_085CE1DC, 130 + delay 10 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_8115A04, 0x2, 4, 0, 4, 0, 12, RGB(26, 0, 26) - call Anim_PoisonEffect + createvisualtask sub_8115A04, 2, 4, 0, 4, 0, 12, RGB(26, 0, 26) + call PoisonBubblesEffect waitforvisualfinish end Move_SUBSTITUTE: playsewithpan SE_W213, -64 - createvisualtask sub_815F20C, 0x2 + createvisualtask sub_815F20C, 2 end Move_FRENZY_PLANT: loadspritegfx 0x27EF - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET - setalpha 0x80C - createsprite gUnknown_08597274, 0x0, 1, 2, 0, 5, 0 + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, 0x2, 10, 8, 2, 0, 0, 100 + createsprite gUnknown_08592564, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, -64 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 20, -8, -2, 0, 1, 95 + delay 5 + createsprite gUnknown_08592564, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 30, 8, -4, 0, 0, 90 + delay 5 + createsprite gUnknown_08592564, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 40, -8, 4, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 50, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 60, -8, -2, 0, 1, 85 + delay 5 + createsprite gUnknown_08592564, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 75, 8, 0, 0, 0, 85 + delay 5 + createsprite gUnknown_08592564, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, 16, 6, 0, 3, 80 + delay 5 + createsprite gUnknown_08592564, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08592564, 0x2, 85, -16, -6, 0, 2, 75 + delay 5 + createsprite gUnknown_08592564, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, +63 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -10, 1, 3 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -10, 1, 3 playsewithpan SE_W003, +63 - createvisualtask sub_80D51AC, 0x3, 1, 8, 0, 20, 1 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, 8, 1, 3 + createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 8, 1, 3 playsewithpan SE_W003, +63 - delay 0x3 - createsprite gUnknown_08597358, 0x2, 10, -3, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -3, 1, 2 playsewithpan SE_W003, +63 - delay 0x3 - createsprite gUnknown_08597358, 0x2, -3, 1, 1, 2 + delay 3 + createsprite gBasicHitSplatSpriteTemplate, 2, -3, 1, 1, 2 playsewithpan SE_W003, +63 - delay 0x2 - createsprite gUnknown_08597358, 0x2, -10, 1, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, 1, 1, 1 playsewithpan SE_W003, +63 - delay 0x2 - createsprite gUnknown_08597358, 0x2, 0, 10, 1, 1 + delay 2 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 10, 1, 1 playsewithpan SE_W003, +63 waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 1, 2, 5, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 2, 5, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -8945,528 +8883,519 @@ Move_METAL_SOUND: loadspritegfx 0x2814 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET - createvisualtask sub_80D52D0, 0x2, 0, 2, 0, 8, 1 - call Anim_MetalSound1 - call Anim_MetalSound1 - call Anim_MetalSound1 - call Anim_MetalSound1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 + call MetalSound1 + call MetalSound1 + call MetalSound1 + call MetalSound1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 waitforvisualfinish end -Anim_MetalSound1: - panse_1B SE_W103, -64, +63, +2, 0x0 - createsprite gUnknown_08593458, 0x82, 16, 0, 0, 0, 30, 0 - delay 0x2 +MetalSound1: + panse_1B SE_W103, -64, +63, +2, 0 + createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 + delay 2 return Move_FOCUS_PUNCH: - goto Anim_FocusPunch + goto FocusPunch -Anim_FocusPunchEnd: +FocusPunchEnd: waitforvisualfinish end -Anim_FocusPunch: - loadspritegfx 0x2797 - loadspritegfx 0x279F - delay 0x1 - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_FocusPunchInContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_FocusPunchOnOpponent - jumprettrue Anim_FocusPunchOnPlayer -Anim_FocusPunchContinue: +FocusPunch: + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_143 + delay 1 + createvisualtask AnimTask_IsContest, 2 + jumprettrue FocusPunchInContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse FocusPunchOnOpponent + jumprettrue FocusPunchOnPlayer +FocusPunchContinue: waitbgfadein monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W207, +63 - createsprite gUnknown_08596104, 0x82 - delay 0xA - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 2, 1, 0 + createsprite gUnknown_08596104, 130 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 2, 1, 0 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, -6, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, -6, 1, 0 playsewithpan SE_W233B, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 0, 8, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 8, 1, 0 playsewithpan SE_W025B, +63 waitforvisualfinish restorebg waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_FocusPunchEnd + goto FocusPunchEnd -Anim_FocusPunchOnOpponent: +FocusPunchOnOpponent: fadetobg BG_IMPACT_OPPONENT - goto Anim_FocusPunchContinue + goto FocusPunchContinue -Anim_FocusPunchOnPlayer: +FocusPunchOnPlayer: fadetobg BG_IMPACT_PLAYER - goto Anim_FocusPunchContinue + goto FocusPunchContinue -Anim_FocusPunchInContest: +FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS - goto Anim_FocusPunchContinue + goto FocusPunchContinue Move_RETURN: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createvisualtask AnimTask_GetHappinessPowerLevel2, 0x2 - delay 0x2 - jumpreteq 0x0, Anim_ReturnWeak - jumpreteq 0x1, Anim_ReturnMedium - jumpreteq 0x2, Anim_ReturnStrong - jumpreteq 0x3, Anim_ReturnStrongest -Anim_ReturnContinue: + setalpha 12, 8 + createvisualtask AnimTask_GetReturnPowerLevel, 2 + delay 2 + jumpreteq 0, ReturnWeak + jumpreteq 1, ReturnMedium + jumpreteq 2, ReturnStrong + jumpreteq 3, ReturnStrongest +ReturnContinue: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_ReturnWeak: - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 139, 63 - goto Anim_ReturnContinue - -Anim_ReturnMedium: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - delay 0xB - createsprite gUnknown_0857FE28, 0x2, 5, 4 - delay 0x6 - createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 141, 63 - goto Anim_ReturnContinue - -Anim_ReturnStrong: - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 6, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - waitforvisualfinish - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - delay 0x8 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - goto Anim_ReturnContinue - -Anim_ReturnStrongest: - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 6, 0 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 16, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x8 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 12, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - waitforvisualfinish - delay 0x4 - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - waitforvisualfinish - delay 0x2 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - createsprite gUnknown_0857FE40, 0x2, 4, 1, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - waitforvisualfinish - createsprite gUnknown_0857FE40, 0x2, 4, 2, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - delay 0x5 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 - waitforvisualfinish - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - call Anim_ReturnStrongest1 - createsprite gUnknown_08597358, 0x2, -10, -8, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - createvisualtask sub_80D51AC, 0x5, 1, 8, 0, 24, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 10, 10, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, 3, -5, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - delay 0x6 - createsprite gUnknown_08597358, 0x2, -5, 3, 1, 0 - createvisualtask sub_8159210, 0x5, 141, 63 - waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 0, 6, 0, 0 - goto Anim_ReturnContinue - -Anim_ReturnStrongest1: - createsprite gUnknown_0857FE40, 0x2, 4, 3, 0 - createvisualtask sub_8159244, 0x5, 167, -64 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_8159210, 0x5, 123, 63 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createvisualtask sub_81169C0, 0x2, 0, 4, 5, 1 +ReturnWeak: + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 139, 63 + goto ReturnContinue +ReturnMedium: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + delay 11 + createsprite gHorizontalLungeSpriteTemplate, 2, 5, 4 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 141, 63 + goto ReturnContinue +ReturnStrong: + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 6, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + goto ReturnContinue +ReturnStrongest: + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 6, RGB_BLACK + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 16, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 12, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + waitforvisualfinish + delay 4 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + waitforvisualfinish + delay 2 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + createsprite gVerticalDipSpriteTemplate, 2, 4, 1, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + waitforvisualfinish + createsprite gVerticalDipSpriteTemplate, 2, 4, 2, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + delay 5 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 + waitforvisualfinish + call ReturnStrongest1 + call ReturnStrongest1 + call ReturnStrongest1 + call ReturnStrongest1 + createsprite gBasicHitSplatSpriteTemplate, 2, -10, -8, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 10, 10, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, 3, -5, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 2, -5, 3, 1, 0 + createvisualtask sub_8159210, 5, 141, 63 + waitforvisualfinish + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 6, 0, RGB_BLACK + goto ReturnContinue +ReturnStrongest1: + createsprite gVerticalDipSpriteTemplate, 2, 4, 3, ANIM_ATTACKER + createvisualtask sub_8159244, 5, 167, -64 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask sub_8159210, 5, 123, 63 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createvisualtask sub_81169C0, 2, 0, 4, 5, 1 waitforvisualfinish return Move_COSMIC_POWER: - loadspritegfx 0x2741 - createvisualtask sub_8159244, 0x5, 243, 0 + loadspritegfx ANIM_TAG_049 + createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 - createvisualtask sub_8117610, 0x2, 0, 0, 15, 0 + createvisualtask sub_8117610, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg BG_COSMIC waitbgfadeout - createvisualtask sub_8117660, 0x2, 0, 128, 0, -1 + createvisualtask sub_8117660, 2, 0, 128, 0, -1 waitbgfadein - delay 0x46 - createvisualtask sub_8159210, 0x5, 228, -64 - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 + delay 70 + createvisualtask sub_8159210, 5, 228, -64 + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 delay 0x28 - createvisualtask sub_8117610, 0x2, 0, 15, 0, 0 + createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein waitforvisualfinish end Move_BLAST_BURN: - loadspritegfx 0x2733 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W221, -64 - createsprite gUnknown_08595428, 0x2, -32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 0, -16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, -10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 32, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 20, 10, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 16, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -20, 10, 24, 0, 0, 0 - delay 0x19 + createsprite gUnknown_08595428, 2, -32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 0, -16, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 20, -10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 32, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 20, 10, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 16, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -20, 10, 24, 0, 0, 0 + delay 25 playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 0x2, -64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -40, -20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 40, -20, 24, 0, 0, 0 - createvisualtask sub_80D51AC, 0x5, 1, 6, 0, 8, 1 - createsprite gUnknown_08595428, 0x42, 64, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 40, 20, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 32, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -40, 20, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x19 + createsprite gUnknown_08595428, 2, -64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 6, -40, -20, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 0, -32, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 40, -20, 24, 0, 0, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1 + createsprite gUnknown_08595428, 66, 64, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 40, 20, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 32, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -40, 20, 24, 0, 0, 0 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 25 playsewithpan SE_W172B, -64 - createsprite gUnknown_08595428, 0x2, -96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x6, -60, -30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 0, -48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x46, 60, -30, 24, 0, 0, 0 - createsprite gUnknown_08597358, 0x82, -4, 3, 1, 0 - createvisualtask sub_80D51AC, 0x5, 1, 12, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 - createsprite gUnknown_08595428, 0x42, 96, 0, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x42, 60, 30, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, 0, 48, 24, 0, 0, 0 - createsprite gUnknown_08595428, 0x2, -60, 30, 24, 0, 0, 0 - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_08595428, 2, -96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 6, -60, -30, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 0, -48, 24, 0, 0, 0 + createsprite gUnknown_08595428, 70, 60, -30, 24, 0, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 130, -4, 3, 1, 0 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 12, 0, 20, 1 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 + createsprite gUnknown_08595428, 66, 96, 0, 24, 0, 0, 0 + createsprite gUnknown_08595428, 66, 60, 30, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, 0, 48, 24, 0, 0, 0 + createsprite gUnknown_08595428, 2, -60, 30, 24, 0, 0, 0 + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ROCK_TOMB: - loadspritegfx 0x280A - loadspritegfx 0x274A - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_058 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish - createsprite gUnknown_08596C58, 0x82, 20, 12, 64, 114, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + createsprite gUnknown_08596C58, 130, 20, 12, 64, 114, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -20, 12, 64, 98, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -20, 12, 64, 98, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 + delay 8 createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x8 - createsprite gUnknown_08596C58, 0x82, -3, 13, 64, 66, 0 - delay 0x8 - createvisualtask sub_81162A4, 0x2, 0, 2, 3, 1 + delay 8 + createsprite gUnknown_08596C58, 130, -3, 13, 64, 66, 0 + delay 8 + createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 - delay 0x18 + delay 24 playsewithpan SE_W063, +63 createsprite gUnknown_085967AC, 0x85, 1, 50 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 20, 1 - createvisualtask sub_81162A4, 0x2, 2, 0, 10, 1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 + createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end Move_SILVER_WIND: loadspritegfx 0x281F - panse_1B SE_W016, -64, +63, +2, 0x0 + panse_1B SE_W016, -64, +63, +2, 0 playsewithpan SE_W234, 0 - delay 0x0 + delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 - delay 0x0 - createvisualtask sub_8116664, 0xA, 1, 0, 0, 4, 0 - createvisualtask AnimTask_IsTargetOpponentSide, 0x2 - jumprettrue Anim_SilverWindOnPlayer + delay 0 + createvisualtask sub_8116664, 10, 1, 0, 0, 4, 0 + createvisualtask AnimTask_IsTargetOpponentSide, 2 + jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout - createvisualtask sub_8117660, 0x5, 1536, 0, 0, -1 -Anim_SilverWindContinue: - delay 0x0 - createvisualtask sub_8116620, 0xA, 1, 0, 4, 4, RGB_BLACK + createvisualtask sub_8117660, 5, 1536, 0, 0, -1 +SilverWindContinue: + delay 0 + createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 + createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1 + delay 0 createsprite gUnknown_08592848, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592848, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x0 + createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1 + delay 0 createsprite gUnknown_08592860, 0xC2, -32, 16, 0, 6, 2, 3, 1 createsprite gUnknown_08592860, 0xC2, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, 0x78, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, 0x78, -40, 14, 128, 4, 1, 2, 1 - delay 0x6 + createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1 + delay 6 createsprite gUnknown_08592830, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592830, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 + delay 0 createsprite gUnknown_08592848, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592848, 0xC2, -16, 12, 192, 5, 2, 3, 1 - delay 0x0 + delay 0 createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1 createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, +63 clearmonbg ANIM_DEF_PARTNER - delay 0x0 + delay 0 restorebg waitbgfadeout - createvisualtask sub_8116664, 0xA, 1, 0, 4, 0, 0 - setarg 0x7, 0xFFFF + createvisualtask sub_8116664, 10, 1, 0, 4, 0, 0 + setarg 7, 0xFFFF waitbgfadein end -Anim_SilverWindOnPlayer: +SilverWindOnPlayer: fadetobg BG_BUG_PLAYER waitbgfadeout - createvisualtask sub_8117660, 0x5, -1536, 0, 0, -1 - goto Anim_SilverWindContinue + createvisualtask sub_8117660, 5, -1536, 0, 0, -1 + goto SilverWindContinue Move_SNATCH: playsewithpan SE_W036, -64 - createvisualtask sub_80D5C50, 0x5, 0, -12, 4, 10, 10, 12, 6 + createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6 end Move_DIVE: loadspritegfx 0x2820 loadspritegfx 0x2821 - choosetwoturnanim Anim_DiveSetUp, Anim_DiveAttack - -Anim_DiveSetUp: + choosetwoturnanim DiveSetUp, DiveAttack +DiveSetUp: loadspritegfx 0x27AC playsewithpan SE_W029, -64 - createsprite gUnknown_08596490, 0x2, 0, 0, 13, 336 + createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish playsewithpan SE_W291, -64 - createsprite gUnknown_085964CC, 0x3, 0 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - call Anim_DiveSetUp1 - end - -Anim_DiveSetUp1: - createsprite gUnknown_085964E4, 0x5, 0, 0 - createsprite gUnknown_085964E4, 0x5, 1, 0 + createsprite gUnknown_085964CC, 3, 0 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + call DiveSetUp1 + end +DiveSetUp1: + createsprite gUnknown_085964E4, 5, 0, 0 + createsprite gUnknown_085964E4, 5, 1, 0 return - -Anim_DiveAttack: +DiveAttack: loadspritegfx 0x27A4 - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W153, +63 - createsprite gUnknown_085964CC, 0x83, 1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - call Anim_DiveAttack1 - delay 0xC - call Anim_UnderWaterAttack1 + createsprite gUnknown_085964CC, 131, 1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + call DiveAttack1 + delay 12 + call UnderWaterAttack1 waitforvisualfinish visible ANIM_ATTACKER clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_DiveAttack1: +DiveAttack1: createsprite gUnknown_085964E4, 0x85, 0, 1 createsprite gUnknown_085964E4, 0x85, 1, 1 return Move_ROCK_BLAST: - loadspritegfx 0x274A - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x3 + loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 3 playsewithpan SE_W207, -64 - createsprite gUnknown_08596C98, 0x82, 16, 0, 0, 0, 25, 257 + createsprite gUnknown_08596C98, 130, 16, 0, 0, 0, 25, 257 waitforvisualfinish - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 playsewithpan SE_W088, +63 - createsprite gUnknown_08596B1C, 0x82, 0, 0, 20, 24, 14, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 5, 1 - createsprite gUnknown_08596B1C, 0x82, 5, 0, -20, 24, 14, 1 - createsprite gUnknown_08596B1C, 0x82, 0, 5, 20, -24, 14, 2 - createsprite gUnknown_08596B1C, 0x82, -5, 0, -20, -24, 14, 2 + createsprite gUnknown_08596B1C, 130, 0, 0, 20, 24, 14, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1 + createsprite gUnknown_08596B1C, 130, 5, 0, -20, 24, 14, 1 + createsprite gUnknown_08596B1C, 130, 0, 5, 20, -24, 14, 2 + createsprite gUnknown_08596B1C, 130, -5, 0, -20, -24, 14, 2 waitforvisualfinish end Move_OVERHEAT: loadspritegfx 0x272D - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x120C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0) + setalpha 12, 18 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) waitforvisualfinish - createvisualtask sub_8117C44, 0x5 + createvisualtask sub_8117C44, 5 waitforvisualfinish - createvisualtask sub_8117CA0, 0x5, 0, 1 - delay 0x1 - createvisualtask sub_8117DD8, 0x5, 0 - delay 0x1 + createvisualtask sub_8117CA0, 5, 0, 1 + delay 1 + createvisualtask sub_8117DD8, 5, 0 + delay 1 playsewithpan SE_W082, -64 - createvisualtask sub_8117CA0, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0) - createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 + createvisualtask sub_8117CA0, 5, 1, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 1, 0, 13, RGB(28, 0, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1 waitforvisualfinish playsewithpan SE_W172B, -64 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, -20 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, -20 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 0 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 0 - delay 0x5 - createsprite gUnknown_08596FB0, 0x2, 1, 0, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 32, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 64, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 96, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x2, 1, 128, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 160, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 192, 30, 25, 10 - createsprite gUnknown_08596FB0, 0x42, 1, 224, 30, 25, 10 - delay 0x5 - waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -5, 3, 1, 0 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, -20 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, -20 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, -20 + delay 5 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 0 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 0 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 0 + delay 5 + createsprite gUnknown_08596FB0, 2, 1, 0, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 32, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 64, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 96, 30, 25, 10 + createsprite gUnknown_08596FB0, 2, 1, 128, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 160, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 192, 30, 25, 10 + createsprite gUnknown_08596FB0, 66, 1, 224, 30, 25, 10 + delay 5 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 131, -5, 3, 1, 0 playsewithpan SE_W007, +63 - createvisualtask sub_80D51AC, 0x2, 1, 10, 0, 25, 1 - delay 0x6 - createsprite gUnknown_08597358, 0x83, 8, -5, 1, 0 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 + delay 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 8, -5, 1, 0 playsewithpan SE_W007, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x83, 10, 10, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 10, 10, 1, 0 playsewithpan SE_W007, +63 - delay 0x8 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 0 + delay 8 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 0 playsewithpan SE_W007, +63 - createvisualtask sub_8117DD8, 0x5, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18) - createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1 + createvisualtask sub_8117DD8, 5, 1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, -1, 0, 13, RGB(18, 18, 18) + createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1 waitforvisualfinish - createvisualtask sub_8117D3C, 0x5, 0, 1 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0) + createvisualtask sub_8117D3C, 5, 0, 1 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 5, 0, RGB(28, 0, 0) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0xF - createvisualtask sub_8117D3C, 0x5, 1, 0 - delay 0x1 - createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18) + delay 15 + createvisualtask sub_8117D3C, 5, 1, 0 + delay 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 13, 0, RGB(18, 18, 18) waitforvisualfinish - createvisualtask sub_8117C70, 0x5 + createvisualtask sub_8117C70, 5 waitforvisualfinish end @@ -9474,167 +9403,161 @@ Move_HYDRO_CANNON: loadspritegfx 0x27A5 loadspritegfx 0x27A4 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W057, -64 - createsprite gUnknown_085951C0, 0x82 - delay 0xA - createvisualtask sub_8115F10, 0x2, 257, 257, 257 - delay 0x1E - panse_1B SE_W056, -64, +63, +2, 0x0 - call Anim_HydroCannon1 - createvisualtask sub_80D51AC, 0x5, 1, 10, 0, 40, 1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - call Anim_HydroCannon1 - createsprite gUnknown_08597388, 0x82, 0, 0, 1, 0 - waitforvisualfinish - createvisualtask sub_8115F10, 0x2, 257, 257, 257 + createsprite gUnknown_085951C0, 130 + delay 10 + createvisualtask sub_8115F10, 2, 257, 257, 257 + delay 30 + panse_1B SE_W056, -64, +63, +2, 0 + call HydroCannon1 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + call HydroCannon1 + createsprite gUnknown_08597388, 130, 0, 0, 1, 0 + waitforvisualfinish + createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_HydroCannon1: - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 - delay 0x1 - createsprite gUnknown_085951D8, 0x82, 10, -10, 0, 0, 15, 257 +HydroCannon1: + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 + delay 1 + createsprite gUnknown_085951D8, 130, 10, -10, 0, 0, 15, 257 return Move_ASTONISH: loadspritegfx 0x2821 playsewithpan SE_W227, -64 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x19 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 25 createsprite gUnknown_085964E4, 0x85, 0, 1 playsewithpan SE_W166, +63 createsprite gUnknown_085964E4, 0x85, 1, 1 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 - createvisualtask sub_8106020, 0x3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 + createvisualtask sub_8106020, 3 waitforvisualfinish end Move_SEISMIC_TOSS: - loadspritegfx 0x2797 - loadspritegfx 0x274A - setarg 0x7, 0x0 + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 + setarg 7, 0 monbg ANIM_DEF_PARTNER - setalpha 0x80C + setalpha 12, 8 waitforvisualfinish - createvisualtask sub_81114EC, 0x3 - delay 0x1 + createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 + delay 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout - createvisualtask sub_811152C, 0x3 + createvisualtask sub_811152C, 3 playsewithpan SE_W327, 0 waitbgfadein waitforvisualfinish - createvisualtask sub_8111590, 0x3 - jumpreteq 0x0, Anim_SeismicTossAnim1 - jumpreteq 0x1, Anim_SeismicTossAnim2 - jumpreteq 0x2, Anim_SeismicTossAnim3 -Anim_SeismicTossContinue: + createvisualtask sub_8111590, 3 + jumpreteq 0, SeismicTossWeak + jumpreteq 1, SeismicTossMedium + jumpreteq 2, SeismicTossStrong +SeismicTossContinue: restorebg waitbgfadeout - setarg 0x7, 0xFFF + setarg 7, 0xFFF waitbgfadein clearmonbg ANIM_DEF_PARTNER blendoff end - -Anim_SeismicTossAnim1: - call Anim_SeismicToss1 - delay 0x10 - call Anim_SeismicToss2 - goto Anim_SeismicTossContinue - -Anim_SeismicTossAnim2: - call Anim_SeismicToss1 - delay 0xE - call Anim_SeismicToss2 - delay 0xE - call Anim_SeismicToss1 - goto Anim_SeismicTossContinue - -Anim_SeismicTossAnim3: - call Anim_SeismicToss2 - delay 0xA - call Anim_SeismicToss1 - delay 0xA - call Anim_SeismicToss2 - delay 0xA - call Anim_SeismicToss1 - goto Anim_SeismicTossContinue - -Anim_SeismicToss1: - createsprite gUnknown_08597358, 0x83, -10, -8, 1, 1 +SeismicTossWeak: + call SeismicToss1 + delay 16 + call SeismicToss2 + goto SeismicTossContinue +SeismicTossMedium: + call SeismicToss1 + delay 14 + call SeismicToss2 + delay 14 + call SeismicToss1 + goto SeismicTossContinue +SeismicTossStrong: + call SeismicToss2 + delay 10 + call SeismicToss1 + delay 10 + call SeismicToss2 + delay 10 + call SeismicToss1 + goto SeismicTossContinue +SeismicToss1: + createsprite gBasicHitSplatSpriteTemplate, 131, -10, -8, 1, 1 playsewithpan SE_W070, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 return - -Anim_SeismicToss2: - createsprite gUnknown_08597358, 0x83, 10, -8, 1, 1 +SeismicToss2: + createsprite gBasicHitSplatSpriteTemplate, 131, 10, -8, 1, 1 playsewithpan SE_W088, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 5, 1 - createsprite gUnknown_08596CB0, 0x82, -12, 32, 3, 4 - createsprite gUnknown_08596CB0, 0x82, 8, 31, 2, 2 - createsprite gUnknown_08596CB0, 0x82, -4, 28, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 30, 4, 3 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1 + createsprite gUnknown_08596CB0, 130, -12, 32, 3, 4 + createsprite gUnknown_08596CB0, 130, 8, 31, 2, 2 + createsprite gUnknown_08596CB0, 130, -4, 28, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 30, 4, 3 return Move_MAGIC_COAT: loadspritegfx 0x27BA - setalpha 0x1000 - waitplaysewithpan SE_W112, -64, 0xF - createsprite gUnknown_085965C0, 0x3, 40, 0, 10170 + setalpha 0, 16 + waitplaysewithpan SE_W112, -64, 15 + createsprite gUnknown_085965C0, 3, 40, 0, 10170 waitforvisualfinish - delay 0x1 + delay 1 blendoff end Move_WATER_PULSE: - loadspritegfx 0x27AB + loadspritegfx ANIM_TAG_155 loadspritegfx 0x2830 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, -64 - createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28) - delay 0xA - createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, 0x42, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, 0x42, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, 0x42, 140, 100, 16, 1, 20, 30, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 7, RGB(0, 25, 28) + delay 10 + createsprite gUnknown_085952F8, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite gUnknown_085952F8, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite gUnknown_085952F8, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite gUnknown_085952F8, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite gUnknown_085952F8, 66, 140, 100, 16, 1, 20, 30, 1 playsewithpan SE_W145C, +63 waitforvisualfinish playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 - delay 0x5 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 + delay 5 playsewithpan SE_W202, -64 - createsprite gUnknown_08593470, 0x82, 0, 0, 40, 15 + createsprite gUnknown_08593470, 130, 0, 0, 40, 15 delay 0xD - createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -9644,165 +9567,165 @@ Move_PSYCHO_BOOST: monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A5C8, 0x5 + createvisualtask sub_815A5C8, 5 waitbgfadein - delay 0x6 - createvisualtask sub_8115A04, 0x2, 1, 2, 8, 0, 10, RGB_BLACK - delay 0x0 + delay 6 + createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK + delay 0 monbgprio_28 ANIM_ATTACKER - setalpha 0x808 - delay 0xA - createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, -64, 0xE, 0xA - createsprite gUnknown_08596920, 0x2 + setalpha 8, 8 + delay 10 + createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 + loopsewithpan SE_W060B, -64, 14, 10 + createsprite gUnknown_08596920, 2 delay 0x6E - loopsewithpan SE_W060B, -64, 0x7, 0xA + loopsewithpan SE_W060B, -64, 7, 10 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, -8, 1, 24, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 playsewithpan SE_W043, +63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff - call Anim_UnsetPsychicBackground + call UnsetPsychicBackground end Move_KNOCK_OFF: loadspritegfx 0x2825 - loadspritegfx 0x2797 - createsprite gUnknown_0857FE28, 0x2, 4, 6 - delay 0x4 + loadspritegfx ANIM_TAG_135 + createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 + delay 4 playsewithpan SE_W233, +63 - createsprite gUnknown_085CE984, 0x82, -16, -16 - delay 0x8 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 - createsprite gUnknown_08597358, 0x83, 0, 0, 1, 2 + createsprite gUnknown_085CE984, 130, -16, -16 + delay 8 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 playsewithpan SE_W004, +63 - createsprite gUnknown_0857FE70, 0x2, 1, -12, 10, 0, 3 - createsprite gUnknown_0857FE58, 0x2, 0, 0, 5 - delay 0x3 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x5 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 - delay 0xA + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 5 + delay 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 5 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 + delay 10 waitforvisualfinish end Move_DOOM_DESIRE: - createvisualtask sub_8114960, 0x2 - delay 0x1 + createvisualtask sub_8114960, 2 + delay 1 monbg ANIM_ATK_PARTNER - createvisualtask sub_811489C, 0x5, 1, 0 - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 0 + createvisualtask sub_811489C, 5, 1, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB_BLACK waitforvisualfinish - setalpha 0x808 + setalpha 8, 8 playsewithpan SE_W060, -64 - createvisualtask sub_80D6064, 0x5, -4, -4, 15, 0, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1 waitforvisualfinish - delay 0x14 - createvisualtask sub_811489C, 0x5, 1, 1 - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 0 + delay 20 + createvisualtask sub_811489C, 5, 1, 1 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end Move_SKY_UPPERCUT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT waitbgfadeout playsewithpan SE_W327, -64 - createvisualtask sub_810DABC, 0x5, 55 + createvisualtask sub_810DABC, 5, 55 waitbgfadein - setalpha 0x80C + setalpha 12, 8 delay 0x26 - createsprite gUnknown_0857FE70, 0x2, 0, 28, 0, 0, 5 - delay 0x4 - createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 6, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 + delay 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -28, 28, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -28, 28, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -15, 8, 1, 1 + createsprite gBasicHitSplatSpriteTemplate, 131, -15, 8, 1, 1 playsewithpan SE_W233B, +63 - delay 0x1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, -5, -12, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, -5, -12, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 0, -32, 1, 1 - delay 0x1 + createsprite gBasicHitSplatSpriteTemplate, 131, 0, -32, 1, 1 + delay 1 playsewithpan SE_W233B, +63 - createsprite gUnknown_08597358, 0x83, 5, -52, 1, 1 - createsprite gUnknown_0857FE70, 0x2, 1, -26, 16, 1, 4 - delay 0x4 - createvisualtask sub_80D5484, 0x2, 1, 0, 3, 6, 1 - delay 0x1E - createsprite gUnknown_0857FE58, 0x2, 0, 0, 6 - delay 0x4 - createsprite gUnknown_0857FE58, 0x2, 1, 0, 6 + createsprite gBasicHitSplatSpriteTemplate, 131, 5, -52, 1, 1 + createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -26, 16, 1, 4 + delay 4 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1 + delay 30 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 6 + delay 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 1, 0, 6 clearmonbg ANIM_DEF_PARTNER blendoff restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein end Move_SECRET_POWER: - createvisualtask sub_8117C24, 0x5 - jumpargeq 0x0, 0x0, Move_NEEDLE_ARM - jumpargeq 0x0, 0x1, Move_MAGICAL_LEAF - jumpargeq 0x0, 0x2, Move_MUD_SHOT - jumpargeq 0x0, 0x3, Move_WATERFALL - jumpargeq 0x0, 0x4, Move_SURF - jumpargeq 0x0, 0x5, Move_BUBBLE_BEAM - jumpargeq 0x0, 0x6, Move_ROCK_THROW - jumpargeq 0x0, 0x7, Move_BITE - jumpargeq 0x0, 0x8, Move_STRENGTH + createvisualtask AnimTask_GetBattleTerrain, 5 + jumpargeq 0, BATTLE_TERRAIN_GRASS, Move_NEEDLE_ARM + jumpargeq 0, BATTLE_TERRAIN_LONG_GRASS, Move_MAGICAL_LEAF + jumpargeq 0, BATTLE_TERRAIN_SAND, Move_MUD_SHOT + jumpargeq 0, BATTLE_TERRAIN_UNDERWATER, Move_WATERFALL + jumpargeq 0, BATTLE_TERRAIN_WATER, Move_SURF + jumpargeq 0, BATTLE_TERRAIN_POND, Move_BUBBLE_BEAM + jumpargeq 0, BATTLE_TERRAIN_MOUNTAIN, Move_ROCK_THROW + jumpargeq 0, BATTLE_TERRAIN_CAVE, Move_BITE + jumpargeq 0, BATTLE_TERRAIN_BUILDING, Move_STRENGTH goto Move_SLAM Move_TWISTER: loadspritegfx 0x274F - loadspritegfx 0x2797 - loadspritegfx 0x274A + loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, +63 - createsprite gUnknown_085923A8, 0x82, 120, 70, 5, 70, 30 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 55, 6, 60, 25 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, 0x82, 115, 55, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 100, 50, 4, 50, 26 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 105, 25, 8, 60, 20 - delay 0x1 - createsprite gUnknown_085923A8, 0x82, 115, 40, 10, 48, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, 0x82, 115, 35, 10, 60, 30 - delay 0x3 - createsprite gUnknown_08596CC8, 0x82, 105, 20, 8, 40, 0 - delay 0x3 - createsprite gUnknown_085923A8, 0x82, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, 0x82, 110, 10, 8, 32, 20 - waitforvisualfinish - createsprite gUnknown_08597358, 0x83, -32, -16, 1, 3 + createsprite gUnknown_085923A8, 130, 120, 70, 5, 70, 30 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 55, 6, 60, 25 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 60, 7, 60, 30 + createsprite gUnknown_085923A8, 130, 115, 55, 10, 60, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 100, 50, 4, 50, 26 + delay 1 + createsprite gUnknown_085923A8, 130, 105, 25, 8, 60, 20 + delay 1 + createsprite gUnknown_085923A8, 130, 115, 40, 10, 48, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 120, 30, 6, 45, 25 + createsprite gUnknown_085923A8, 130, 115, 35, 10, 60, 30 + delay 3 + createsprite gUnknown_08596CC8, 130, 105, 20, 8, 40, 0 + delay 3 + createsprite gUnknown_085923A8, 130, 20, 255, 15, 32, 0 + createsprite gUnknown_085923A8, 130, 110, 10, 8, 32, 20 + waitforvisualfinish + createsprite gBasicHitSplatSpriteTemplate, 131, -32, -16, 1, 3 playsewithpan SE_W004, +63 - createvisualtask sub_80D5484, 0x2, 1, 3, 0, 12, 1 - createvisualtask sub_80D5484, 0x2, 3, 3, 0, 12, 1 - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, +63 - delay 0x4 - createsprite gUnknown_085973A0, 0x83, 1, 3 + delay 4 + createsprite gUnknown_085973A0, 131, 1, 3 playsewithpan SE_W004, +63 - delay 0x4 - createsprite gUnknown_08597358, 0x83, 32, 20, 1, 3 + delay 4 + createsprite gBasicHitSplatSpriteTemplate, 131, 32, 20, 1, 3 playsewithpan SE_W004, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -9812,42 +9735,42 @@ Move_TWISTER: Move_MAGICAL_LEAF: loadspritegfx 0x274F loadspritegfx 0x27B0 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x1 - loopsewithpan SE_W077, -64, 0xA, 0x5 - createvisualtask sub_81007C4, 0x5 - createsprite gUnknown_08592390, 0x2, -3, -2, 10 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -1, 15 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -4, -4, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 3, -3, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -1, -6, 8 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -1, 12 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -4, 13 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 4, -5, 7 - delay 0x2 - createsprite gUnknown_08592390, 0x2, 2, -6, 11 - delay 0x2 - createsprite gUnknown_08592390, 0x2, -3, -5, 8 - delay 0x3C + setalpha 12, 8 + delay 1 + loopsewithpan SE_W077, -64, 10, 5 + createvisualtask sub_81007C4, 5 + createsprite gUnknown_08592390, 2, -3, -2, 10 + delay 2 + createsprite gUnknown_08592390, 2, -1, -1, 15 + delay 2 + createsprite gUnknown_08592390, 2, -4, -4, 7 + delay 2 + createsprite gUnknown_08592390, 2, 3, -3, 11 + delay 2 + createsprite gUnknown_08592390, 2, -1, -6, 8 + delay 2 + createsprite gUnknown_08592390, 2, 2, -1, 12 + delay 2 + createsprite gUnknown_08592390, 2, -3, -4, 13 + delay 2 + createsprite gUnknown_08592390, 2, 4, -5, 7 + delay 2 + createsprite gUnknown_08592390, 2, 2, -6, 11 + delay 2 + createsprite gUnknown_08592390, 2, -3, -5, 8 + delay 60 playsewithpan SE_W013B, -64 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, 0x83, 20, -10, 20, 0, 32, -20, 0 - delay 0x1E + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, 20, 0 + createsprite gUnknown_085923D8, 131, 20, -10, 20, 0, 32, -20, 0 + delay 30 playsewithpan SE_W013, +63 - createsprite gUnknown_08597358, 0x84, -10, -4, 1, 2 - createsprite gUnknown_08597358, 0x84, 10, 4, 1, 2 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + createsprite gBasicHitSplatSpriteTemplate, 132, -10, -4, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, 0xFFFF waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9855,547 +9778,531 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx 0x273B - loadspritegfx 0x279D - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x4, Anim_IceBallSetIceBg -Anim_IceBallContinue: + loadspritegfx ANIM_TAG_141 + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallSetIceBg +IceBallContinue: playsewithpan SE_W196, -64 - createsprite gUnknown_08595DE4, 0x82, 15, 0, -12, -16, 30, -40 + createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 delay 0x1C playsewithpan SE_W280, +63 - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x0, Anim_IceBallWeakest - jumpargeq 0x0, 0x1, Anim_IceBallWeak - jumpargeq 0x0, 0x2, Anim_IceBallMediun - jumpargeq 0x0, 0x3, Anim_IceBallStrong - jumpargeq 0x0, 0x4, Anim_IceBallStrongest -Anim_IceBallContinue2: - createvisualtask AnimTask_GetRolloutCounter, 0x5, 0 - jumpargeq 0x0, 0x4, Anim_IceBallUnsetIceBg -Anim_IceBallEnd: - end - -Anim_IceBallSetIceBg: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 0, IceBallWeakest + jumpargeq 0, 1, IceBallWeak + jumpargeq 0, 2, IceBallMediun + jumpargeq 0, 3, IceBallStrong + jumpargeq 0, 4, IceBallStrongest +IceBallContinue2: + createvisualtask AnimTask_GetRolloutCounter, 5, 0 + jumpargeq 0, 4, IceBallUnsetIceBg +IceBallEnd: + end +IceBallSetIceBg: fadetobg BG_ICE - goto Anim_IceBallContinue - -Anim_IceBallUnsetIceBg: + goto IceBallContinue +IceBallUnsetIceBg: waitbgfadein delay 0x2D restorebg waitbgfadein - goto Anim_IceBallEnd - -Anim_IceBallWeakest: - createvisualtask sub_80D6388, 0x2, 0, 1, 8, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallWeak: - createvisualtask sub_80D6388, 0x2, 0, 1, 10, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallMediun: - createvisualtask sub_80D6388, 0x2, 0, 1, 14, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallStrong: - createvisualtask sub_80D6388, 0x2, 0, 1, 18, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBallStrongest: - createvisualtask sub_80D6388, 0x2, 0, 1, 30, 1, 0 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - call Anim_IceBall1 - goto Anim_IceBallContinue2 - -Anim_IceBall1: - createsprite gUnknown_08595DFC, 0x84, -12, -16 + goto IceBallEnd +IceBallWeakest: + createvisualtask sub_80D6388, 2, 0, 1, 8, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallWeak: + createvisualtask sub_80D6388, 2, 0, 1, 10, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallMediun: + createvisualtask sub_80D6388, 2, 0, 1, 14, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrong: + createvisualtask sub_80D6388, 2, 0, 1, 18, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBallStrongest: + createvisualtask sub_80D6388, 2, 0, 1, 30, 1, 0 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + call IceBall1 + goto IceBallContinue2 +IceBall1: + createsprite gUnknown_08595DFC, 132, -12, -16 return Move_WEATHER_BALL: - loadspritegfx 0x282B - createsprite gUnknown_0857FE40, 0x2, 8, 1, 0 - delay 0x8 + loadspritegfx ANIM_TAG_283 + createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER + delay 8 playsewithpan SE_W207, -64 - createsprite gUnknown_0853EE38, 0x2 + createsprite gUnknown_0853EE38, 2 waitforvisualfinish - delay 0xF + delay 15 playsewithpan SE_W197, 0 - createsprite gUnknown_0859728C, 0x2, 31, 5, 1, 0x7FFF, 10, 0, 0 - waitforvisualfinish - createvisualtask AnimTask_GetWeather, 0x2 - delay 0x1 - jumpreteq ANIM_WEATHER_NONE, Anim_WeatherBallNormal - jumpreteq ANIM_WEATHER_SUN, Anim_WeatherBallFire - jumpreteq ANIM_WEATHER_RAIN, Anim_WeatherBallWater - jumpreteq ANIM_WEATHER_SANDSTORM, Anim_WeatherBallSandstorm - jumpreteq ANIM_WEATHER_HAIL, Anim_WeatherBallIce - -Anim_WeatherBallNormal: - loadspritegfx 0x2797 - createsprite gUnknown_0853EE50, 0x82, -30, -100, 25, 1, 0, 0 + createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 + waitforvisualfinish + createvisualtask AnimTask_GetWeather, 2 + delay 1 + jumpreteq ANIM_WEATHER_NONE, WeatherBallNormal + jumpreteq ANIM_WEATHER_SUN, WeatherBallFire + jumpreteq ANIM_WEATHER_RAIN, WeatherBallWater + jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm + jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce +WeatherBallNormal: + loadspritegfx ANIM_TAG_135 + createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, +63 - createsprite gUnknown_08597358, 0x84, -10, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createsprite gBasicHitSplatSpriteTemplate, 132, -10, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -Anim_WeatherBallFire: +WeatherBallFire: loadspritegfx 0x272D - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 40, 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, +63 - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, -40, 20 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, +63 - delay 0xA - createsprite gUnknown_0859559C, 0x82, -30, -100, 25, 1, 0, 0 + delay 10 + createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, +63 waitforvisualfinish playsewithpan SE_W172B, +63 - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 waitforvisualfinish end - -Anim_WeatherBallWater: - loadspritegfx 0x27AB - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 50, 10 +WeatherBallWater: + loadspritegfx ANIM_TAG_155 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, +63 - delay 0x8 - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, -20, 20 + delay 8 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, +63 delay 0xD - createsprite gUnknown_08595328, 0x82, -30, -100, 25, 1, 0, 0 + createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, +63 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 8, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 playsewithpan SE_W202, +63 waitforvisualfinish end - -Anim_WeatherBallSandstorm: - loadspritegfx 0x274A - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 30, 0 +WeatherBallSandstorm: + loadspritegfx ANIM_TAG_058 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, +63 - delay 0x5 - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, -40, 20 + delay 5 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, +63 - delay 0xE - createsprite gUnknown_08596CE0, 0x82, -30, -100, 25, 1, 0, 0 + delay 14 + createsprite gUnknown_08596CE0, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, +63 waitforvisualfinish playsewithpan SE_W070, +63 - createsprite gUnknown_08596CB0, 0x82, -12, 27, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 8, 28, 3, 4 - createsprite gUnknown_08596CB0, 0x82, -4, 30, 2, 3 - createsprite gUnknown_08596CB0, 0x82, 12, 25, 4, 4 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createsprite gUnknown_08596CB0, 130, -12, 27, 2, 3 + createsprite gUnknown_08596CB0, 130, 8, 28, 3, 4 + createsprite gUnknown_08596CB0, 130, -4, 30, 2, 3 + createsprite gUnknown_08596CB0, 130, 12, 25, 4, 4 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 waitforvisualfinish end - -Anim_WeatherBallIce: - loadspritegfx 0x2817 - loadspritegfx 0x279D - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, -40, 20 +WeatherBallIce: + loadspritegfx ANIM_TAG_263 + loadspritegfx ANIM_TAG_141 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, +63 - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 40, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, +63 - delay 0xA - createsprite gUnknown_08595D44, 0x82, -30, -100, 25, 25, 0, 0 + delay 10 + createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, +63 waitforvisualfinish - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W196, +63 - call Anim_FreezeEffect1 + call FreezeEffect1 waitforvisualfinish end Move_COUNT: - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_FreezeEffect1: - createsprite gUnknown_08595B68, 0x82, -10, -10, 0 +FreezeEffect1: + createsprite gUnknown_08595B68, 130, -10, -10, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 0 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 0 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 0 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 0 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 0 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 0 playsewithpan SE_W196, +63 return -Anim_FreezeEffect2: - createsprite gUnknown_08595B68, 0x82, -10, -10, 1 +FreezeEffect2: + createsprite gUnknown_08595B68, 130, -10, -10, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 10, 20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 10, 20, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -29, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -29, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 29, -20, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 29, -20, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -5, 10, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -5, 10, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 17, -12, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 17, -12, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, -20, 0, 1 + delay 4 + createsprite gUnknown_08595B68, 130, -20, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, -15, 15, 1 + delay 4 + createsprite gUnknown_08595B80, 130, -15, 15, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 26, -5, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 26, -5, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B80, 0x82, 0, 0, 1 + delay 4 + createsprite gUnknown_08595B80, 130, 0, 0, 1 playsewithpan SE_W196, +63 - delay 0x4 - createsprite gUnknown_08595B68, 0x82, 20, 2, 1 + delay 4 + createsprite gUnknown_08595B68, 130, 20, 2, 1 playsewithpan SE_W196, +63 return -Anim_IcyWindEffect1: @ Unused - loopsewithpan SE_W196, +63, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 0 - createsprite gUnknown_08595C04, 0x82, -8, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 0 - createsprite gUnknown_08595C04, 0x82, -16, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 0 - createsprite gUnknown_08595C04, 0x82, -24, 24, 0 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 0 - createsprite gUnknown_08595C04, 0x82, -32, 24, 0 +IcyWindEffect1: @ Unused + loopsewithpan SE_W196, +63, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 0 + createsprite gUnknown_08595C04, 130, -8, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 0 + createsprite gUnknown_08595C04, 130, -16, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 0 + createsprite gUnknown_08595C04, 130, -24, 24, 0 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 0 + createsprite gUnknown_08595C04, 130, -32, 24, 0 return -Anim_IcyWindEffect2: - loopsewithpan SE_W196, +63, 0x6, 0x4 - createsprite gUnknown_08595C04, 0x82, 0, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 8, 24, 1 - createsprite gUnknown_08595C04, 0x82, -8, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 16, 24, 1 - createsprite gUnknown_08595C04, 0x82, -16, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 24, 24, 1 - createsprite gUnknown_08595C04, 0x82, -24, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 32, 24, 1 - createsprite gUnknown_08595C04, 0x82, -32, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 40, 24, 1 - createsprite gUnknown_08595C04, 0x82, -40, 24, 1 - delay 0x4 - createsprite gUnknown_08595C04, 0x82, 48, 24, 1 - createsprite gUnknown_08595C04, 0x82, -48, 24, 1 +IcyWindEffect2: + loopsewithpan SE_W196, +63, 6, 4 + createsprite gUnknown_08595C04, 130, 0, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 8, 24, 1 + createsprite gUnknown_08595C04, 130, -8, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 16, 24, 1 + createsprite gUnknown_08595C04, 130, -16, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 24, 24, 1 + createsprite gUnknown_08595C04, 130, -24, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 32, 24, 1 + createsprite gUnknown_08595C04, 130, -32, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 40, 24, 1 + createsprite gUnknown_08595C04, 130, -40, 24, 1 + delay 4 + createsprite gUnknown_08595C04, 130, 48, 24, 1 + createsprite gUnknown_08595C04, 130, -48, 24, 1 return -Anim_GrantingStarsEffect: - createsprite gUnknown_08592B7C, 0x2, -15, 0, 0, 0, 32, 60 - delay 0x8 - createsprite gUnknown_08592B7C, 0x2, 12, -5, 0, 0, 32, 60 - delay 0x8 +GrantingStarsEffect: + createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 + delay 8 + createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 + delay 8 return -Anim_HealingEffect: +HealingEffect: playsewithpan SE_W071B, -64 - createsprite gUnknown_08592F2C, 0x2, 0, -5, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, 10, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, -15, -15, 0, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x2, 10, -5, 0, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 2, 0, -5, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, 10, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, -15, -15, 0, 0 + delay 7 + createsprite gUnknown_08592F2C, 2, 10, -5, 0, 0 + delay 7 return -Anim_HealingEffect2: +HealingEffect2: playsewithpan SE_W071B, +63 - createsprite gUnknown_08592F2C, 0x82, 0, -5, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, 10, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, -15, -15, 1, 0 - delay 0x7 - createsprite gUnknown_08592F2C, 0x82, 10, -5, 1, 0 - delay 0x7 + createsprite gUnknown_08592F2C, 130, 0, -5, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, 10, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, -15, -15, 1, 0 + delay 7 + createsprite gUnknown_08592F2C, 130, 10, -5, 1, 0 + delay 7 return -Anim_PoisonEffect: - createsprite gUnknown_08596240, 0x82, 10, 10, 0 +PoisonBubblesEffect: + createsprite gPoisonBubbleSpriteTemplate, 130, 10, 10, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 20, -20, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, 15, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, 15, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 0, 0, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 0, 0, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, -20, -20, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, -20, -20, 0 playsewithpan SE_W092, +63 - delay 0x6 - createsprite gUnknown_08596240, 0x82, 16, -8, 0 + delay 6 + createsprite gPoisonBubbleSpriteTemplate, 130, 16, -8, 0 playsewithpan SE_W092, +63 return -Anim_BulbblebeamEffect: - createsprite gUnknown_08596258, 0x2, 10, 10, 0 +WaterBubbleEffect: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 0 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 0 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 0 playsewithpan SE_W145C, +63 return -Anim_BulbbleEffect: - createsprite gUnknown_08596258, 0x2, 10, 10, 1 +WaterBubbleEffect2: + createsprite gWaterBubbleSpriteTemplate, 2, 10, 10, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -28, -10, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -28, -10, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 20, -20, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, 15, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, 15, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 0, 0, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 0, 0, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 27, 8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 27, 8, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, -20, -20, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, -20, -20, 1 playsewithpan SE_W145C, +63 - delay 0x6 - createsprite gUnknown_08596258, 0x2, 16, -8, 1 + delay 6 + createsprite gWaterBubbleSpriteTemplate, 2, 16, -8, 1 playsewithpan SE_W145C, +63 return -Anim_ParalysisEffect: +ElectricityEffect: playsewithpan SE_W085B, +63 - createsprite gUnknown_08595810, 0x82, 5, 0, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -5, 10, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 15, 20, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -15, -10, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 25, 0, 5, 1 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -8, 8, 5, 2 - delay 0x2 - createsprite gUnknown_08595810, 0x82, 2, -8, 5, 0 - delay 0x2 - createsprite gUnknown_08595810, 0x82, -20, 15, 5, 1 + createsprite gElectricitySpriteTemplate, 130, 5, 0, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -5, 10, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 15, 20, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -15, -10, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 25, 0, 5, 1 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -8, 8, 5, 2 + delay 2 + createsprite gElectricitySpriteTemplate, 130, 2, -8, 5, 0 + delay 2 + createsprite gElectricitySpriteTemplate, 130, -20, 15, 5, 1 return -Anim_ConfusionEffect: - loopsewithpan SE_W146, +63, 0xD, 0x6 - createsprite gUnknown_0859725C, 0x82, 0, -15, 0, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 51, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 102, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 153, 3, 90 - createsprite gUnknown_0859725C, 0x82, 0, -15, 204, 3, 90 +ConfusionEffect: + loopsewithpan SE_W146, +63, 0xD, 6 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 153, 3, 90 + createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 204, 3, 90 return -Anim_SetPsychicBackground: +SetPsychicBackground: fadetobg BG_PSYCHIC waitbgfadeout - createvisualtask sub_815A504, 0x5 + createvisualtask sub_815A504, 5 waitbgfadein return -Anim_UnsetPsychicBackground: +UnsetPsychicBackground: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein return -Anim_SetFlyingBg: - jumpifcontest Anim_SetBgFlyingContest +SetFlyingBg: + jumpifcontest SetBgFlyingContest fadetobg BG_FLYING waitbgfadeout - createvisualtask sub_8117660, 0x5, -2304, 768, 1, -1 -Anim_SetBgFlyingContinue: + createvisualtask sub_8117660, 5, -2304, 768, 1, -1 +SetBgFlyingContinue: waitbgfadein return -Anim_SetBgFlyingContest: +SetBgFlyingContest: fadetobg BG_FLYING_CONTESTS waitbgfadeout - createvisualtask sub_8117660, 0x5, 2304, 768, 0, -1 - goto Anim_SetBgFlyingContinue + createvisualtask sub_8117660, 5, 2304, 768, 0, -1 + goto SetBgFlyingContinue -Anim_UnsetFlyingBg: +UnsetFlyingBg: restorebg waitbgfadeout - setarg 0x7, 0xFFFF + setarg 7, 0xFFFF waitbgfadein return -Anim_SetSolarbeamBg: - createvisualtask AnimTask_IsContest, 0x2 - jumprettrue Anim_SetSolarbeamBgContest - createvisualtask AnimTask_IsTargetPlayerSide, 0x2 - jumpretfalse Anim_SetSolarbeamBgOpponent - goto Anim_SetSolarbeamBgPlayer -Anim_SetSolarbeamBgContinue: +SetSolarbeamBg: + createvisualtask AnimTask_IsContest, 2 + jumprettrue SetSolarbeamBgContest + createvisualtask AnimTask_IsTargetPlayerSide, 2 + jumpretfalse SetSolarbeamBgOpponent + goto SetSolarbeamBgPlayer +SetSolarbeamBgContinue: waitbgfadein return - -Anim_SetSolarbeamBgContest: +SetSolarbeamBgContest: fadetobg BG_SOLARBEAM_CONTESTS - goto Anim_SetSolarbeamBgContinue - -Anim_SetSolarbeamBgPlayer: + goto SetSolarbeamBgContinue +SetSolarbeamBgPlayer: fadetobg BG_SOLARBEAM_PLAYER - goto Anim_SetSolarbeamBgContinue - -Anim_SetSolarbeamBgOpponent: + goto SetSolarbeamBgContinue +SetSolarbeamBgOpponent: fadetobg BG_SOLARBEAM_OPPONENT - goto Anim_SetSolarbeamBgContinue + goto SetSolarbeamBgContinue -Anim_UnsetSolarbeamBg: +UnsetSolarbeamBg: restorebg waitbgfadein return Status_Poison: - loopsewithpan SE_W092, +63, 0xD, 0x6 - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 18, 2 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 12, RGB(30, 0, 31) + loopsewithpan SE_W092, +63, 0xD, 6 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end Status_Confusion: - loadspritegfx 0x2759 - call Anim_ConfusionEffect + loadspritegfx ANIM_TAG_073 + call ConfusionEffect end Status_Burn: loadspritegfx 0x272D playsewithpan SE_W172, +63 - call Anim_Burn1 - call Anim_Burn1 - call Anim_Burn1 + call Burn1 + call Burn1 + call Burn1 waitforvisualfinish end -Anim_Burn1: - createsprite gUnknown_08595504, 0x82, -24, 24, 24, 24, 20, 1, 1 - delay 0x4 +Burn1: + createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 + delay 4 return Status_Infatuation: loadspritegfx 0x27E2 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, 0, 20 - delay 0xF + createsprite gUnknown_08593970, 3, 0, 20 + delay 15 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, -20, 20 - delay 0xF + createsprite gUnknown_08593970, 3, -20, 20 + delay 15 playsewithpan SE_W204, -64 - createsprite gUnknown_08593970, 0x3, 20, 20 + createsprite gUnknown_08593970, 3, 20, 20 end Status_Sleep: loadspritegfx 0x27F4 playsewithpan SE_W173, -64 - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 - delay 0x1E - createsprite gUnknown_08592C88, 0x2, 4, -10, 16, 0, 0 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 + delay 30 + createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 end Status_Paralysis: - loadspritegfx 0x271B - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 10, 1 - call Anim_ParalysisEffect + loadspritegfx ANIM_TAG_011 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 + call ElectricityEffect end Status_Freeze: @@ -10403,8 +10310,8 @@ Status_Freeze: loadspritegfx 0x271A monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - waitplaysewithpan SE_W258, +63, 0x11 - createvisualtask sub_80A9EF4, 0x2 + waitplaysewithpan SE_W258, +63, 17 + createvisualtask sub_80A9EF4, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -10413,8 +10320,8 @@ Status_Curse: loadspritegfx 0x27D8 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596DE8, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596DE8, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -10423,478 +10330,463 @@ Status_Nightmare: loadspritegfx 0x27ED monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 - createsprite gUnknown_08596E00, 0x82 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 14, 1 + createsprite gBattleAnimSpriteTemplate_8596E00, 130 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end -Anim_CastformTransform: - createvisualtask sub_815BB18, 0x2 - jumpreteq 0x1, AnimScript_82D7ECA +General_CastformChange: + createvisualtask sub_815BB18, 2 + jumpreteq 1, AnimScript_82D7ECA goto AnimScript_82D7EB2 - AnimScript_82D7EB2: monbg ANIM_ATTACKER playsewithpan SE_W100, -64 - waitplaysewithpan SE_W107, -64, 0x30 - createvisualtask sub_815B7D0, 0x2, 1 + waitplaysewithpan SE_W107, -64, 48 + createvisualtask sub_815B7D0, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER end - AnimScript_82D7ECA: - createvisualtask sub_815BB58, 0x2, 1 + createvisualtask sub_815BB58, 2, 1 end -Anim_StatChange: - createvisualtask AnimTask_StatsChange, 0x5 +General_StatsChange: + createvisualtask AnimTask_StatsChange, 5 waitforvisualfinish end -Anim_SubsituteOff: +General_SubstituteFade: monbg ANIM_ATTACKER - createvisualtask sub_8172D98, 0x5 - createvisualtask sub_8116620, 0xA, 2, 0, 0, 16, RGB_WHITE + createvisualtask sub_8172D98, 5 + createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish - delay 0x1 + delay 1 clearmonbg ANIM_ATTACKER - delay 0x2 + delay 2 blendoff - createvisualtask sub_8116620, 0xA, 2, 0, 0, 0, RGB_WHITE - createvisualtask sub_8172BF0, 0x2, 1 + createvisualtask sub_8116620, 10, 2, 0, 0, 0, RGB_WHITE + createvisualtask sub_8172BF0, 2, 1 end -Anim_SubsituteOn: - createvisualtask sub_815F20C, 0x2 +General_SubstituteAppear: + createvisualtask sub_815F20C, 2 end -Anim_PokeblockThrow: - createvisualtask sub_817345C, 0x2, 0 - createvisualtask sub_81732B0, 0x2 - delay 0x0 +General_PokeblockThrow: + createvisualtask sub_817345C, 2, 0 + createvisualtask sub_81732B0, 2 + delay 0 waitplaysewithpan SE_W026, -64, 0x16 - createsprite gUnknown_085E5338, 0x83, -18, 12, 0, 32 - delay 0x32 - loopsewithpan SE_W039, +63, 0x13, 0x2 - createvisualtask sub_80D5EB8, 0x5, 1, 8, 1536, 2, 1 + createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 + delay 50 + loopsewithpan SE_W039, +63, 19, 2 + createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish - createvisualtask sub_81732E4, 0x2 + createvisualtask sub_81732E4, 2 end -Anim_ItemKnockOff: +General_ItemKnockoff: loadspritegfx 0x27F0 - createsprite gUnknown_08592628, 0x82 + createsprite gBattleAnimSpriteTemplate_8592628, 130 end -Status_Wrap: - createvisualtask sub_81734B4, 0x5 - jumpargeq 0x0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin - jumpargeq 0x0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool - jumpargeq 0x0, TRAP_ANIM_CLAMP, Status_Clamp - jumpargeq 0x0, TRAP_ANIM_SAND_TOMB, Status_SandTomb +General_TurnTrap: + createvisualtask AnimTask_GetTrappedMoveAnimId, 5 + jumpargeq 0, TRAP_ANIM_FIRE_SPIN, Status_FireSpin + jumpargeq 0, TRAP_ANIM_WHIRLPOOL, Status_Whrilpool + jumpargeq 0, TRAP_ANIM_CLAMP, Status_Clamp + jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap - Status_BindWrap: loadspritegfx 0x27CA - loopsewithpan SE_W010, +63, 0x6, 0x2 - createsprite gUnknown_08592494, 0x84, 0, 16, 0, 1 - delay 0x7 - createsprite gUnknown_08592494, 0x82, 0, 8, 1, 1 - delay 0x3 - createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 8, 1 - delay 0x14 - setarg 0x7, 0xFFFF + loopsewithpan SE_W010, +63, 6, 2 + createsprite gUnknown_08592494, 132, 0, 16, 0, 1 + delay 7 + createsprite gUnknown_08592494, 130, 0, 8, 1, 1 + delay 3 + createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 + delay 20 + setarg 7, 0xFFFF playsewithpan SE_W020, +63 waitforvisualfinish end - Status_FireSpin: loadspritegfx 0x272D playsewithpan SE_W221B, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call Anim_FireSpinEffect - call Anim_FireSpinEffect + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call FireSpinEffect + call FireSpinEffect waitforvisualfinish stopsound end - Status_Whrilpool: loadspritegfx 0x27A5 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - setalpha 0x80C - delay 0x0 - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23) + setalpha 12, 8 + delay 0 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(0, 13, 23) playsewithpan SE_W250, +63 - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 - call Anim_WhirlpoolEffect - call Anim_WhirlpoolEffect - delay 0xC - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 + call WhirlpoolEffect + call WhirlpoolEffect + delay 12 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(0, 13, 23) waitforvisualfinish stopsound clearmonbg ANIM_DEF_PARTNER end - Status_Clamp: loadspritegfx 0x27A1 - loadspritegfx 0x2797 + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W011, +63 - createsprite gUnknown_08597098, 0x2, -32, 0, 2, 819, 0, 10 - createsprite gUnknown_08597098, 0x2, 32, 0, 6, -819, 0, 10 - delay 0xA - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x5, 1, 3, 0, 5, 1 + createsprite gUnknown_08597098, 2, -32, 0, 2, 819, 0, 10 + createsprite gUnknown_08597098, 2, 32, 0, 6, -819, 0, 10 + delay 10 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff waitforvisualfinish end - Status_SandTomb: - loadspritegfx 0x275A - createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0) - createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 + loadspritegfx ANIM_TAG_074 + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, RGB(19, 17, 0) + createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 playsewithpan SE_W328, +63 - call Anim_SandTombEffect - call Anim_SandTombEffect + call SandTombEffect + call SandTombEffect delay 0x16 - createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0) + createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound end -Anim_ItemEffect: - loadspritegfx 0x27DB - loadspritegfx 0x2741 - delay 0x0 +General_ItemEffect: + loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_049 + delay 0 playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W036, -64 - createvisualtask sub_80D622C, 0x2, 16, 128, 0, 2 + createvisualtask sub_80D622C, 2, 16, 128, 0, 2 waitforvisualfinish playsewithpan SE_W234, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish playsewithpan SE_REAPOKE, -64 - createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 3, 7, 0, RGB(17, 31, 25) + createsprite gUnknown_0859381C, 3, 0, 0, 0, 0 waitforvisualfinish end -Anim_SmokeBallEscape: +General_SmokeballEscape: loadspritegfx 0x2802 monbg ANIM_ATTACKER - setalpha 0x40C - delay 0x0 + setalpha 12, 4 + delay 0 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30 - delay 0x4 + delay 4 playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x7F, 2, 12, 20, 30 - delay 0xC + createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 + delay 12 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7E, 2, -28, 4, 30 - delay 0xC + delay 12 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7C, 2, 14, -20, 30 - delay 0x4 + delay 4 playsewithpan SE_BOWA2, +63 - createvisualtask sub_81136E8, 0x2, 2 + createvisualtask sub_81136E8, 2, 2 createsprite gUnknown_085CE734, 0x7B, 3, 4, 4, 30 - delay 0xE + delay 14 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 0x7A, 3, -14, 18, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x79, 3, 14, -14, 46 - delay 0x0 - createsprite gUnknown_085CE734, 0x78, 3, -12, -10, 46 - delay 0x0 + delay 0 + createsprite gUnknown_085CE734, 120, 3, -12, -10, 46 + delay 0 createsprite gUnknown_085CE734, 0x77, 3, 14, 14, 46 - delay 0x0 + delay 0 createsprite gUnknown_085CE734, 0x76, 3, 0, 0, 46 waitforvisualfinish clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER - delay 0x0 + delay 0 blendoff end -Anim_HangedOn: - createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED +General_HangedOn: + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 7, 0, 9, RGB_RED playsewithpan SE_W082, -64 - createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1 + createvisualtask sub_815DB90, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED + createsprite gSimplePaletteBlendSpriteTemplate, 0, 2, 4, 9, 0, RGB_RED waitforvisualfinish - delay 0x6 - createsprite gUnknown_0857FE58, 0x0, 0, 0, 15 + delay 6 + createsprite gSlideMonToOriginalPosSpriteTemplate, 0, 0, 0, 15 end -Anim_Rain: +General_Rain: loadspritegfx 0x2783 playsewithpan SE_W240, -64 - createvisualtask sub_8116620, 0xA, 0x781, 2, 0, 4, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish - createvisualtask sub_8107188, 0x2, 0, 3, 60 - createvisualtask sub_8107188, 0x2, 0, 3, 60 - delay 0x32 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 + delay 50 waitforvisualfinish - createvisualtask sub_8116620, 0xA, 0x781, 2, 4, 0, RGB_BLACK + createvisualtask sub_8116620, 10, 0x781, 2, 4, 0, RGB_BLACK waitforvisualfinish end -Anim_Sun: +General_Sun: goto Move_SUNNY_DAY -Anim_Sandstorm: +General_Sandstorm: goto Move_SANDSTORM -Anim_Hail: +General_Hail: goto Move_HAIL -Status_LeechSeed: - createvisualtask sub_817351C, 0x5 - delay 0x0 +General_LeechSeedDrain: + createvisualtask sub_817351C, 5 + delay 0 goto Move_ABSORB -Anim_Hit: - loadspritegfx 0x2797 +General_MonHit: + loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET - setalpha 0x80C + setalpha 12, 8 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 - createvisualtask sub_80D51AC, 0x2, 1, 3, 0, 6, 1 + createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 2 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET blendoff end -Anim_ItemSteal: +General_ItemSteal: loadspritegfx 0x27F0 - createvisualtask sub_8117F30, 0x2 - createvisualtask sub_8172ED0, 0x2 - delay 0x1 - createsprite gUnknown_08592670, 0x2, 0, -5, 10, 2, -1 + createvisualtask sub_8117F30, 2 + createvisualtask sub_8172ED0, 2 + delay 1 + createsprite gUnknown_08592670, 2, 0, -5, 10, 2, -1 end -Anim_SnatchMove: +General_SnatchMove: loadspritegfx 0x27F0 - createvisualtask sub_8117E94, 0x2 + createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 - delay 0x1 - createvisualtask sub_80D5EB8, 0x2, 0, 5, 5120, 4, 1 + delay 1 + createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, ANIM_TARGET waitforvisualfinish - createvisualtask sub_8117EC4, 0x2 - jumpreteq 0x0, AnimScript_82D839F - goto AnimScript_82D83AF - -AnimScript_82D8398: + createvisualtask AnimTask_IsTargetSameSide, 2 + jumpretfalse SnatchOpposingMonMove + goto SnatchPartnerMonMove +SnatchMoveContinue: waitforvisualfinish call AnimScript_82D85C3 end - -AnimScript_82D839F: +SnatchOpposingMonMove: playsewithpan SE_W104, -64 - createvisualtask sub_815F8F4, 0x2 - goto AnimScript_82D8398 - -AnimScript_82D83AF: + createvisualtask sub_815F8F4, 2 + goto SnatchMoveContinue +SnatchPartnerMonMove: playsewithpan SE_W104, -64 - createvisualtask sub_815FFC4, 0x2 - goto AnimScript_82D8398 + createvisualtask sub_815FFC4, 2 + goto SnatchMoveContinue -Anim_FutureSightHit: - createvisualtask sub_8117F10, 0x2 +General_FutureSightHit: + createvisualtask sub_8117F10, 2 monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 - call Anim_SetPsychicBackground - setalpha 0x808 + call SetPsychicBackground + setalpha 8, 8 playsewithpan SE_W048, +63 - waitplaysewithpan SE_W048, +63, 0x8 - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 15, 1 - createvisualtask sub_80D6064, 0x5, -5, -5, 15, 1, 1 + waitplaysewithpan SE_W048, +63, 8 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1 + createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1 waitforvisualfinish - createvisualtask sub_80D51AC, 0x2, 1, 4, 0, 24, 1 + createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff waitforvisualfinish - delay 0x1 - call Anim_UnsetPsychicBackground + delay 1 + call UnsetPsychicBackground end -Anim_DoomDesireHit: - createvisualtask sub_8117F10, 0x2 +General_DoomDesireHit: + createvisualtask sub_8117F10, 2 loadspritegfx 0x27D6 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish - delay 0xA - createvisualtask sub_815C0A4, 0x5 + delay 10 + createvisualtask sub_815C0A4, 5 delay 0x9 playsewithpan SE_W109, -64 delay 0x9 playsewithpan SE_W109, 0 delay 0x9 playsewithpan SE_W109, +63 - delay 0x19 - createvisualtask sub_80D5484, 0x2, 1, 10, 0, 20, 1 + delay 25 + createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 0, 0, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 24, -24, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 24, -24, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -16, 16, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -16, 16, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, -24, -12, 1, 1 - delay 0x6 + createsprite gBattleAnimSpriteTemplate_859371C, 3, -24, -12, 1, 1 + delay 6 playsewithpan SE_W120, +63 - createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 + createsprite gBattleAnimSpriteTemplate_859371C, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end -Anim_FocusPunchSetUp: +General_FocusPunchSetUp: loadspritegfx 0x27C8 playsewithpan SE_W082, -64 - call Anim_EndureEffect - delay 0x8 - createvisualtask sub_8115A04, 0x2, 2, 2, 2, 0, 11, RGB_RED - createvisualtask sub_80D52D0, 0x2, 0, 1, 0, 32, 1 - call Anim_EndureEffect - delay 0x8 - call Anim_EndureEffect + call EndureEffect + delay 8 + createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED + createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 + call EndureEffect + delay 8 + call EndureEffect waitforvisualfinish end -Status_Ingrain: +General_IngrainHeal: loadspritegfx 0x27A3 - loadspritegfx 0x272F + loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER - setalpha 0x80C - createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12) + setalpha 12, 8 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) waitforvisualfinish - delay 0x3 - call Anim_AbsorbEffect + delay 3 + call AbsorbEffect waitforvisualfinish - delay 0xF - call Anim_HealingEffect + delay 15 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12) + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 4, 0, RGB(13, 31, 12) waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Anim_WishHeal: - loadspritegfx 0x2741 - createsprite gUnknown_08597274, 0x2, 1, 3, 0, 10, 0 +General_WishHeal: + loadspritegfx ANIM_TAG_049 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, -64 - call Anim_GrantingStarsEffect + call GrantingStarsEffect waitforvisualfinish - unloadspritegfx 0x2741 - loadspritegfx 0x272F - call Anim_HealingEffect + unloadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_031 + call HealingEffect waitforvisualfinish - createsprite gUnknown_08597274, 0x2, 1, 3, 10, 0, 0 + createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK end AnimScript_82D85A3: - createvisualtask sub_8172E9C, 0x2 - jumpreteq 0x1, AnimScript_82D85B4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish return - AnimScript_82D85B4: - createvisualtask sub_8172BF0, 0x2, 1 + createvisualtask sub_8172BF0, 2, 1 waitforvisualfinish goto AnimScript_82D85B2 AnimScript_82D85C3: - createvisualtask sub_8172E9C, 0x2 - jumpreteq 0x1, AnimScript_82D85D4 - + createvisualtask sub_8172E9C, 2 + jumpreteq 1, AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish return - AnimScript_82D85D4: - createvisualtask sub_8172BF0, 0x2, 0 + createvisualtask sub_8172BF0, 2, 0 waitforvisualfinish goto AnimScript_82D85D2 -Anim_LevelUp: +Special_LevelUp: playsewithpan SE_EXPMAX, 0 - createvisualtask sub_8170920, 0x2 - delay 0x0 - createvisualtask sub_8170A0C, 0x5, 0, 0 + createvisualtask sub_8170920, 2 + delay 0 + createvisualtask sub_8170A0C, 5, 0, 0 waitforvisualfinish - createvisualtask sub_81709EC, 0x2 + createvisualtask sub_81709EC, 2 end -Anim_SwitchOutPlayer: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutPlayerMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_SwitchOutOpponent: - createvisualtask sub_8170BB0, 0x2 - delay 0xA - createvisualtask sub_8170B04, 0x2 +Special_SwitchOutOpponentMon: + createvisualtask sub_8170BB0, 2 + delay 10 + createvisualtask sub_8170B04, 2 end -Anim_BallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 +Special_BallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 playsewithpan SE_NAGERU, 0 - createvisualtask sub_8170E04, 0x2 - createvisualtask AnimTask_IsBallBlockedByTrainer, 0x2 - jumpreteq 0xFFFF, Anim_BallThrowTrainerBlock -Anim_BallThrowEnd: + createvisualtask sub_8170E04, 2 + createvisualtask AnimTask_IsBallBlockedByTrainer, 2 + jumpreteq 0xFFFF, BallThrowTrainerBlock +BallThrowEnd: waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end - -Anim_BallThrowTrainerBlock: - loadspritegfx 0x2797 - delay 0x19 +BallThrowTrainerBlock: + loadspritegfx ANIM_TAG_135 + delay 25 monbg ANIM_DEF_PARTNER - setalpha 0x80C - delay 0x0 + setalpha 12, 8 + delay 0 playsewithpan SE_W003, +63 - createsprite gUnknown_08597358, 0x82, -4, -20, 1, 2 + createsprite gBasicHitSplatSpriteTemplate, 130, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff - goto Anim_BallThrowEnd + goto BallThrowEnd -Anim_SafariBallThrow: - createvisualtask sub_8170CFC, 0x2 - delay 0x0 - createvisualtask sub_8170F2C, 0x2 +Special_SafariBallThrow: + createvisualtask sub_8170CFC, 2 + delay 0 + createvisualtask sub_8170F2C, 2 waitforvisualfinish - createvisualtask sub_8170D24, 0x2 + createvisualtask sub_8170D24, 2 end -Anim_SubstituteToMon: - createvisualtask sub_8172BF0, 0x2, 1 +Special_SubstituteToMon: + createvisualtask sub_8172BF0, 2, 1 end -Anim_MonToSubstitute: - createvisualtask sub_8172BF0, 0x2, 0 +Special_MonToSubstitute: + createvisualtask sub_8172BF0, 2, 0 end -- cgit v1.2.3 From 2a7811456a4fb96b1252906122aca2f225e57868 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 15 Sep 2018 00:30:20 +0200 Subject: Add anim tag sprite defines --- data/battle_anim_80FE840.s | 2 +- data/battle_anim_scripts.s | 1179 +++++++++++++++++++++----------------------- 2 files changed, 568 insertions(+), 613 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s index 3d1c8ec15..bce7b3540 100644 --- a/data/battle_anim_80FE840.s +++ b/data/battle_anim_80FE840.s @@ -3782,7 +3782,7 @@ gSimplePaletteBlendSpriteTemplate:: @ 8597274 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC .align 2 -gBattleAnimSpriteTemplate_859728C:: @ 859728C +gComplexPaletteBlendSpriteTemplate:: @ 859728C spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4 .align 2 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d39bc07c9..6464d8235 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -454,8 +454,8 @@ DoubleSlapRight: goto DoubleSlapContinue Move_POISON_POWDER: - loadspritegfx 0x2751 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_065 + loadspritegfx ANIM_TAG_150 loopsewithpan SE_W077, +63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -479,7 +479,7 @@ Move_POISON_POWDER: end Move_STUN_SPORE: - loadspritegfx 0x2754 + loadspritegfx ANIM_TAG_068 loopsewithpan SE_W077, +63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -503,7 +503,7 @@ Move_STUN_SPORE: end Move_SLEEP_POWDER: - loadspritegfx 0x2753 + loadspritegfx ANIM_TAG_067 loopsewithpan SE_W077, +63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -527,7 +527,7 @@ Move_SLEEP_POWDER: end Move_SWIFT: - loadspritegfx 0x27BE + loadspritegfx ANIM_TAG_174 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -620,7 +620,7 @@ Move_BODY_SLAM: end Move_SUPERSONIC: - loadspritegfx 0x27B3 + loadspritegfx ANIM_TAG_163 monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER setalpha 12, 8 @@ -642,7 +642,7 @@ Supersonic1: return Move_SCREECH: - loadspritegfx 0x27B4 + loadspritegfx ANIM_TAG_164 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 @@ -657,7 +657,7 @@ Screech1: return Move_FLAME_WHEEL: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 @@ -699,7 +699,7 @@ FlameWheel1: @ Unused return Move_PIN_MISSILE: - loadspritegfx 0x27B1 + loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -712,7 +712,7 @@ Move_PIN_MISSILE: playsewithpan SE_W030, +63 createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 - delay 0x9 + delay 9 createsprite gPinMissileSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, +63 @@ -728,7 +728,7 @@ Move_PIN_MISSILE: end Move_ICICLE_SPEAR: - loadspritegfx 0x2816 + loadspritegfx ANIM_TAG_262 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -741,7 +741,7 @@ Move_ICICLE_SPEAR: playsewithpan SE_W030, +63 createsprite gBasicHitSplatSpriteTemplate, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1 - delay 0x9 + delay 9 createsprite gIcicleSpearSpriteTemplate, 2, 20, -8, 0, 0, 20, -32 delay 4 playsewithpan SE_W030, +63 @@ -762,7 +762,7 @@ Move_TAKE_DOWN: setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 delay 35 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 4, -10, 0, 1, 0 playsewithpan SE_W025B, +63 delay 1 @@ -782,7 +782,7 @@ Move_TAKE_DOWN: Move_DOUBLE_EDGE: loadspritegfx ANIM_TAG_135 playsewithpan SE_W129, -64 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 2, 4, 2, 0x7FFF, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 playsewithpan SE_W207, -64 @@ -813,9 +813,9 @@ Move_DOUBLE_EDGE: end Move_POISON_STING: - loadspritegfx 0x27B1 + loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_150 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -833,7 +833,7 @@ Move_POISON_STING: end Move_TWINEEDLE: - loadspritegfx 0x27B1 + loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -853,7 +853,7 @@ Move_TWINEEDLE: end Move_FIRE_BLAST: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 createsoundtask sub_8158B30, 144, 145 call FireBlast1 call FireBlast1 @@ -884,7 +884,6 @@ Move_FIRE_BLAST: createvisualtask sub_8116620, 10, 1, 2, 8, 0, RGB_BLACK waitforvisualfinish end - FireBlast1: createsprite gUnknown_0859551C, 130, 0, 0, 0 createsprite gUnknown_0859551C, 130, 0, 0, 51 @@ -893,7 +892,6 @@ FireBlast1: createsprite gUnknown_0859551C, 130, 0, 0, 204 delay 5 return - FireBlast2: createsprite gUnknown_0859556C, 130, 0, 0, 10, 0, -2 createsprite gUnknown_0859556C, 130, 0, 0, 13, -2, 0 @@ -903,7 +901,7 @@ FireBlast2: return Move_LEECH_SEED: - loadspritegfx 0x2716 + loadspritegfx ANIM_TAG_006 playsewithpan SE_W077, -64 createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 delay 8 @@ -918,7 +916,7 @@ Move_LEECH_SEED: end Move_EMBER: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loopsewithpan SE_W052, -64, 5, 2 createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 delay 4 @@ -952,7 +950,7 @@ Move_MEGA_PUNCH: createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -996,7 +994,7 @@ Move_MEGA_KICK: createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1060,7 +1058,7 @@ Move_THUNDER_SHOCK: delay 10 createvisualtask sub_810A7DC, 5, 0, -44, 0 playsewithpan SE_W085, +63 - delay 0x9 + delay 9 createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK @@ -1088,7 +1086,7 @@ Move_THUNDERBOLT: delay 7 createvisualtask sub_810A7DC, 5, 0, -60, 1 playsewithpan SE_W085, +63 - delay 0x9 + delay 9 createvisualtask sub_8116620, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 4, 0, 13, 0, RGB_BLACK @@ -1125,7 +1123,7 @@ Move_THUNDERBOLT: Move_THUNDER_WAVE: loadspritegfx ANIM_TAG_001 loadspritegfx ANIM_TAG_011 - loadspritegfx 0x27BD + loadspritegfx ANIM_TAG_173 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1214,7 +1212,7 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx 0x27E9 + loadspritegfx ANIM_TAG_217 playsewithpan SE_W036, -64 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish @@ -1230,7 +1228,7 @@ Move_HIDDEN_POWER: createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 168 createsprite gHiddenPowerOrbSpriteTemplate, 2, 26, 210 delay 52 - setarg 7, 0xFFFF + setarg 7, -1 playsewithpan SE_W115, -64 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, 130, 0 @@ -1244,11 +1242,11 @@ Move_HIDDEN_POWER: end Move_REVERSAL: - loadspritegfx 0x27FC + loadspritegfx ANIM_TAG_236 loadspritegfx ANIM_TAG_143 loadspritegfx ANIM_TAG_135 playsewithpan SE_W197, -64 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 0x7FFF, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE @@ -1265,7 +1263,7 @@ Move_REVERSAL: createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 8 playsewithpan SE_W233B, +63 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, 132, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 1 createvisualtask sub_80D6388, 5, 0, 1, 8, 1, 0 @@ -1299,7 +1297,7 @@ PursuitOnSwitchout: goto PursuitContinue Move_SPIKE_CANNON: - loadspritegfx 0x27B1 + loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -1323,14 +1321,14 @@ Move_SPIKE_CANNON: end Move_SWORDS_DANCE: - loadspritegfx 0x2715 + loadspritegfx ANIM_TAG_005 monbg ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W014, -64 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 - delay 0x16 - createvisualtask sub_8115D94, 2, 0x2715, 2, 2, RGB(18, 31, 31), 16, 0, 0 + delay 22 + createvisualtask sub_8115D94, 2, ANIM_TAG_005, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff @@ -1338,7 +1336,7 @@ Move_SWORDS_DANCE: end Move_PSYCH_UP: - loadspritegfx 0x27D4 + loadspritegfx ANIM_TAG_196 monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1349,7 +1347,7 @@ Move_PSYCH_UP: delay 4 playsewithpan SE_W060, -64 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 - createvisualtask sub_8116620, 0x9, 2, 2, 10, 0, RGB_YELLOW + createvisualtask sub_8116620, 9, 2, 2, 10, 0, RGB_YELLOW delay 30 clearmonbg ANIM_ATK_PARTNER blendoff @@ -1363,7 +1361,7 @@ Move_DIZZY_PUNCH: monbg ANIM_TARGET setalpha 12, 8 call DizzyPunch1 - createsprite gFistFootSpriteTemplate, 0x85, 16, 8, 20, 1, 0 + createsprite gFistFootSpriteTemplate, 133, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 132, 16, 0, 1, 1 playsewithpan SE_W004, +63 createsprite gUnknown_08595F78, 131, 16, 8, 160, -32 @@ -1374,7 +1372,7 @@ Move_DIZZY_PUNCH: createsprite gUnknown_08595F78, 131, 16, 8, -384, -31 delay 10 call DizzyPunch1 - createsprite gFistFootSpriteTemplate, 0x85, -16, -8, 20, 1, 0 + createsprite gFistFootSpriteTemplate, 133, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 132, -16, -16, 1, 1 playsewithpan SE_W233B, +63 createsprite gUnknown_08595F78, 131, -16, -8, 160, -32 @@ -1387,7 +1385,6 @@ Move_DIZZY_PUNCH: clearmonbg ANIM_TARGET blendoff end - DizzyPunch1: createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 6 @@ -1395,7 +1392,7 @@ DizzyPunch1: return Move_FIRE_SPIN: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 playsewithpan SE_W221B, +63 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect @@ -1448,17 +1445,17 @@ FuryCutterRight: createsprite gCuttingSliceSpriteTemplate, 2, 40, -32, 1 goto FuryCutterContinue FuryCutterMedium: - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 10505, 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrong: - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 FuryCutterStrongest: - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 3, 10505, 4, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB(9, 8, 10), 4, 0, 0 goto FuryCutterContinue2 Move_SELF_DESTRUCT: - loadspritegfx 0x27D6 + loadspritegfx ANIM_TAG_198 createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 @@ -1489,7 +1486,7 @@ SelfDestruct1: return Move_SLAM: - loadspritegfx 0x2748 + loadspritegfx ANIM_TAG_056 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -1513,7 +1510,7 @@ Move_SLAM: end Move_VINE_WHIP: - loadspritegfx 0x282F + loadspritegfx ANIM_TAG_287 playsewithpan SE_W026, -64 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 @@ -1525,7 +1522,7 @@ Move_VINE_WHIP: Move_DRILL_PECK: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27B2 + loadspritegfx ANIM_TAG_162 createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish @@ -1543,7 +1540,7 @@ Move_DRILL_PECK: end Move_WATERFALL: - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_148 loadspritegfx ANIM_TAG_155 loadspritegfx ANIM_TAG_141 monbg ANIM_DEF_PARTNER @@ -1624,8 +1621,8 @@ UnderWaterAttack1: return Move_EXPLOSION: - loadspritegfx 0x27D6 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 8, 9, 8474, 8, 0, 8 + loadspritegfx ANIM_TAG_198 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 @@ -1638,7 +1635,6 @@ Move_EXPLOSION: delay 50 createvisualtask sub_8116620, 10, 1, 3, 16, 0, RGB_WHITE end - Explosion1: playsewithpan SE_W153, -64 createsprite gBattleAnimSpriteTemplate_859371C, 3, 0, 0, 0, 1 @@ -1658,8 +1654,8 @@ Explosion1: return Move_DEFENSE_CURL: - loadspritegfx 0x27FA - loopsewithpan SE_W161, -64, 0x12, 3 + loadspritegfx ANIM_TAG_234 + loopsewithpan SE_W161, -64, 18, 3 createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 waitforvisualfinish @@ -1670,7 +1666,7 @@ Move_DEFENSE_CURL: end Move_PROTECT: - loadspritegfx 0x2828 + loadspritegfx ANIM_TAG_280 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER waitplaysewithpan SE_W115, -64, 16 @@ -1680,13 +1676,13 @@ Move_PROTECT: end Move_DETECT: - loadspritegfx 0x2757 + loadspritegfx ANIM_TAG_071 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_WHITE - delay 0x12 + delay 18 playsewithpan SE_W197, -64 - createsprite gUnknown_0853EE84, 0xD, 20, -20 + createsprite gUnknown_0853EE84, 13, 20, -20 waitforvisualfinish delay 10 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 9, 0, RGB_BLACK @@ -1696,7 +1692,7 @@ Move_DETECT: Move_FRUSTRATION: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_087 monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1 @@ -1800,7 +1796,7 @@ Frustration_Weak: goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx 0x2804 + loadspritegfx ANIM_TAG_244 monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, -64 @@ -1849,7 +1845,7 @@ Move_VICE_GRIP: playsewithpan SE_W011, +63 createsprite gUnknown_08593590, 2, 0 createsprite gUnknown_08593590, 2, 1 - delay 0x9 + delay 9 createsprite gBasicHitSplatSpriteTemplate, 1, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 5, 1 waitforvisualfinish @@ -1868,12 +1864,12 @@ Move_GUILLOTINE: createsprite gUnknown_085935D0, 2, 0 createsprite gUnknown_085935D0, 2, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 16, RGB_BLACK - delay 0x9 + delay 9 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 23, 1 delay 0x2E createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -1883,7 +1879,7 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx 0x2774 + loadspritegfx ANIM_TAG_100 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -1901,7 +1897,7 @@ Move_PAY_DAY: end Move_OUTRAGE: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loopsewithpan SE_W082, -64, 8, 3 createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 @@ -1992,7 +1988,7 @@ Move_SPARK: end Move_ATTRACT: - loadspritegfx 0x27E8 + loadspritegfx ANIM_TAG_216 loopsewithpan SE_W204, -64, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 @@ -2008,14 +2004,14 @@ Move_ATTRACT: waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask sub_81062E8, 5 - createsprite gUnknown_085939D0, 0x28, 16, 256, 0 - createsprite gUnknown_085939D0, 0x28, 224, 240, 15 - createsprite gUnknown_085939D0, 0x28, 126, 272, 30 - createsprite gUnknown_085939D0, 0x28, 80, 224, 45 - createsprite gUnknown_085939D0, 0x28, 170, 272, 60 - createsprite gUnknown_085939D0, 0x28, 40, 256, 75 - createsprite gUnknown_085939D0, 0x28, 112, 256, 90 - createsprite gUnknown_085939D0, 0x28, 200, 272, 90 + createsprite gUnknown_085939D0, 40, 16, 256, 0 + createsprite gUnknown_085939D0, 40, 224, 240, 15 + createsprite gUnknown_085939D0, 40, 126, 272, 30 + createsprite gUnknown_085939D0, 40, 80, 224, 45 + createsprite gUnknown_085939D0, 40, 170, 272, 60 + createsprite gUnknown_085939D0, 40, 40, 256, 75 + createsprite gUnknown_085939D0, 40, 112, 256, 90 + createsprite gUnknown_085939D0, 40, 200, 272, 90 delay 0x4B createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end @@ -2033,7 +2029,7 @@ Growth1: return Move_WHIRLWIND: - loadspritegfx 0x27B2 + loadspritegfx ANIM_TAG_162 createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 @@ -2073,13 +2069,13 @@ Move_CONFUSE_RAY: Move_LOCK_ON: loadspritegfx 0x271E - createsprite gUnknown_08592CA0, 0x28 - createsprite gUnknown_08592CB8, 0x28, 1 - createsprite gUnknown_08592CB8, 0x28, 2 - createsprite gUnknown_08592CB8, 0x28, 3 - createsprite gUnknown_08592CB8, 0x28, 4 + createsprite gUnknown_08592CA0, 40 + createsprite gUnknown_08592CB8, 40, 1 + createsprite gUnknown_08592CB8, 40, 2 + createsprite gUnknown_08592CB8, 40, 3 + createsprite gUnknown_08592CB8, 40, 4 delay 120 - setarg 7, 0xFFFF + setarg 7, -1 waitforvisualfinish end @@ -2191,7 +2187,7 @@ Move_THIEF: end Move_BUBBLE_BEAM: - loadspritegfx 0x27A2 + loadspritegfx ANIM_TAG_146 loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -2289,7 +2285,7 @@ Move_SMOKESCREEN: end Move_CONVERSION: - loadspritegfx 0x2722 + loadspritegfx ANIM_TAG_018 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 16, 0 @@ -2331,7 +2327,7 @@ Move_CONVERSION: createsprite gUnknown_08592E74, 2, 24, 24 delay 20 playsewithpan SE_W112, -64 - createvisualtask sub_8115D94, 2, 10018, 1, 1, 14335, 12, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_81022D4, 5 waitforvisualfinish @@ -2522,7 +2518,7 @@ HornDrillContinue: waitforvisualfinish restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end @@ -2540,11 +2536,11 @@ Move_THRASH: createsprite gUnknown_08595EB0, 131, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, +63 - delay 0x1C + delay 28 createsprite gUnknown_08595EB0, 131, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W233B, +63 - delay 0x1C + delay 28 createsprite gUnknown_08595EB0, 131, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1 playsewithpan SE_W025B, +63 @@ -2604,9 +2600,9 @@ Move_EARTHQUAKE: createvisualtask sub_81152DC, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 end Move_FISSURE: @@ -2617,11 +2613,11 @@ Move_FISSURE: delay 8 call Fissure1 delay 15 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure2 delay 15 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 15 call Fissure1 delay 50 @@ -2629,10 +2625,10 @@ Move_FISSURE: waitbgfadeout createvisualtask sub_8115628, 5, 1, 5, -1 waitbgfadein - delay 0x28 + delay 40 restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end @@ -2697,7 +2693,7 @@ DigSetUp1: createsprite gUnknown_085971FC, 2, 0, 1, 14, 4, -18, 18 createsprite gUnknown_085971FC, 2, 0, 1, 12, 4, -16, 18 playsewithpan SE_W091, -64 - delay 0x20 + delay 32 return Move_MEDITATE: @@ -2750,7 +2746,7 @@ Move_QUICK_ATTACK: Move_RAGE: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_087 monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 @@ -2783,7 +2779,7 @@ Move_DOUBLE_TEAM: setalpha 12, 8 monbg ANIM_ATK_PARTNER playsewithpan SE_W104, -64 - delay 0x20 + delay 32 playsewithpan SE_W104, -64 delay 24 playsewithpan SE_W104, -64 @@ -2808,20 +2804,20 @@ Move_DOUBLE_TEAM: Move_MINIMIZE: setalpha 10, 8 createvisualtask sub_8104674, 2 - loopsewithpan SE_W107, -64, 0x22, 3 + loopsewithpan SE_W107, -64, 34, 3 waitforvisualfinish blendoff end Move_METRONOME: - loadspritegfx 0x2750 + loadspritegfx ANIM_TAG_064 loadspritegfx ANIM_TAG_209 createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, -64 delay 6 createsprite gUnknown_085931BC, 12, 0 delay 24 - loopsewithpan SE_W039, -64, 0x16, 3 + loopsewithpan SE_W039, -64, 22, 3 waitforvisualfinish end @@ -2829,13 +2825,11 @@ Move_SKULL_BASH: choosetwoturnanim SkullBashSetUp, SkullBashAttack SkullBashEnd: end - SkullBashSetUp: call SkullBashSetUp1 call SkullBashSetUp1 waitforvisualfinish goto SkullBashEnd - SkullBashSetUp1: createsprite gUnknown_0857FE88, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_W036, -64 @@ -2845,14 +2839,13 @@ SkullBashSetUp1: createsprite gUnknown_0857FE88, 2, 0, 24, 0, 0, 10, 1 waitforvisualfinish return - SkullBashAttack: loadspritegfx ANIM_TAG_135 createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, -64 waitforvisualfinish playse SE_BAN - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1 createsprite gUnknown_085973E8, 132, 0, 0, 1, 0 @@ -2862,26 +2855,26 @@ SkullBashAttack: goto SkullBashEnd Move_AMNESIA: - loadspritegfx 0x276D + loadspritegfx ANIM_TAG_093 call SetPsychicBackground delay 8 createsprite gUnknown_08596744, 20 playsewithpan SE_W118, -64 - delay 0x36 + delay 54 loopsewithpan SE_W118, -64, 16, 3 waitforvisualfinish call UnsetPsychicBackground end Move_KINESIS: - loadspritegfx 0x275B - loadspritegfx 0x2771 + loadspritegfx ANIM_TAG_075 + loadspritegfx ANIM_TAG_097 playsewithpan SE_W060, -64 call SetPsychicBackground createsprite gUnknown_085966DC, 20 createsprite gUnknown_08593344, 19, 32, -8, 0 createsprite gUnknown_08593344, 19, 32, 16, 1 - loopsewithpan SE_W109, -64, 0x15, 2 + loopsewithpan SE_W109, -64, 21, 2 delay 60 playsewithpan SE_W146, -64 delay 30 @@ -2893,8 +2886,8 @@ Move_KINESIS: end Move_GLARE: - loadspritegfx 0x2808 - loadspritegfx 0x27EA + loadspritegfx ANIM_TAG_248 + loadspritegfx ANIM_TAG_218 createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, -64 waitforvisualfinish @@ -2911,7 +2904,7 @@ Move_GLARE: end Move_BARRAGE: - loadspritegfx 0x280E + loadspritegfx ANIM_TAG_254 createvisualtask sub_815E47C, 3 playsewithpan SE_W207, -64 delay 24 @@ -2948,7 +2941,7 @@ SkyAttackSetUpAgainstOpponent: blendoff goto SkyAttackEnd SkyAttackSetUpAgainstPartner: - createvisualtask sub_8116664, 10, 1, 1, 0, 12, 0 + createvisualtask sub_8116664, 10, 1, 1, 0, 12, RGB_BLACK waitforvisualfinish delay 12 createvisualtask sub_8116620, 10, 2, 1, 8, 0, RGB_BLACK @@ -2959,14 +2952,14 @@ SkyAttackSetUpAgainstPartner: delay 20 createvisualtask sub_8116620, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_8116664, 10, 4, 1, 8, 0, 0 + createvisualtask sub_8116664, 10, 4, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff goto SkyAttackEnd SkyAttackUnleash: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x282C + loadspritegfx ANIM_TAG_284 call SetFlyingBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE @@ -2996,7 +2989,7 @@ Move_FLASH: Move_SPLASH: createvisualtask sub_8104938, 2, 0, 3 delay 8 - loopsewithpan SE_W039, -64, 0x26, 3 + loopsewithpan SE_W039, -64, 38, 3 waitforvisualfinish end @@ -3012,13 +3005,13 @@ Move_ACID_ARMOR: end Move_SHARPEN: - loadspritegfx 0x27C9 + loadspritegfx ANIM_TAG_185 createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: - loadspritegfx 0x27D0 + loadspritegfx ANIM_TAG_192 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, -64 waitforvisualfinish @@ -3031,14 +3024,14 @@ Move_SUPER_FANG: createsprite gUnknown_08592F74, 130 playsewithpan SE_W044, +63 delay 8 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 2143, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH: - loadspritegfx 0x27C7 + loadspritegfx ANIM_TAG_183 createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, +63 delay 4 @@ -3050,7 +3043,7 @@ Move_SLASH: Move_STRUGGLE: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27E7 + loadspritegfx ANIM_TAG_215 monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 @@ -3067,14 +3060,14 @@ Move_STRUGGLE: end Move_SKETCH: - loadspritegfx 0x2712 + loadspritegfx ANIM_TAG_002 monbg ANIM_TARGET createvisualtask sub_8104E74, 2 createsprite gUnknown_085936D4, 130 waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask sub_8104938, 2, 0, 2 - loopsewithpan SE_W039, -64, 0x26, 2 + loopsewithpan SE_W039, -64, 38, 2 end Move_NIGHTMARE: @@ -3153,7 +3146,7 @@ MachPunchContinue: blendoff restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end MachPunchAgainstPlayer: @@ -3161,7 +3154,7 @@ MachPunchAgainstPlayer: goto MachPunchContinue Move_FORESIGHT: - loadspritegfx 0x2812 + loadspritegfx ANIM_TAG_258 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 16, 0 @@ -3180,7 +3173,7 @@ Move_FORESIGHT: end Move_DESTINY_BOND: - loadspritegfx 0x27CC + loadspritegfx ANIM_TAG_188 fadetobg BG_GHOST playsewithpan SE_W060, -64 waitbgfadein @@ -3188,9 +3181,9 @@ Move_DESTINY_BOND: playsewithpan SE_W109, -64 delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1 - createvisualtask sub_8116664, 2, 6, 1, 0, 12, 30653 + createvisualtask sub_8116664, 2, 6, 1, 0, 12, RGB(29, 29, 29) delay 24 - createvisualtask sub_8116664, 2, 6, 1, 12, 0, 30653 + createvisualtask sub_8116664, 2, 6, 1, 12, 0, RGB(29, 29, 29) playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3200,7 +3193,7 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx 0x27C8 + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, -64 call EndureEffect delay 8 @@ -3225,7 +3218,7 @@ EndureEffect: return Move_CHARM: - loadspritegfx 0x27E2 + loadspritegfx ANIM_TAG_210 createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 @@ -3283,8 +3276,8 @@ Move_FALSE_SWIPE: end Move_SWAGGER: - loadspritegfx 0x2766 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_087 createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish @@ -3306,7 +3299,7 @@ Move_MILK_DRINK: loadspritegfx ANIM_TAG_031 monbg ANIM_TARGET createsprite gUnknown_08592B3C, 2 - delay 0x28 + delay 40 playsewithpan SE_W152, -64 delay 12 playsewithpan SE_W152, -64 @@ -3338,9 +3331,9 @@ MagnitudeIntense: createvisualtask sub_81152DC, 5, 4, 0, 50 loopsewithpan SE_W070, +63, 8, 10 delay 10 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 delay 16 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, 0, 14, 0x7FFF, 14 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14 goto MagnitudeEnd Move_RAPID_SPIN: @@ -3364,7 +3357,7 @@ Move_RAPID_SPIN: Move_MOONLIGHT: loadspritegfx 0x27D2 - loadspritegfx 0x27D3 + loadspritegfx ANIM_TAG_195 loadspritegfx ANIM_TAG_031 setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK @@ -3373,15 +3366,15 @@ Move_MOONLIGHT: createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -12, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -12, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, -24, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, -24, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 21, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 21, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 0, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 0, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, 0x28, 10, 0 + createsprite gBattleAnimSpriteTemplate_8592EEC, 40, 10, 0 delay 20 createvisualtask sub_81025C0, 2 waitforvisualfinish @@ -3390,7 +3383,7 @@ Move_MOONLIGHT: end Move_EXTREME_SPEED: - loadspritegfx 0x27DF + loadspritegfx ANIM_TAG_207 loadspritegfx ANIM_TAG_135 createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue ExtremeSpeedAgainstPlayer @@ -3406,7 +3399,7 @@ ExtremeSpeedContinue: createvisualtask sub_8117F60, 2 monbg ANIM_TARGET setalpha 12, 8 - delay 0x12 + delay 18 createvisualtask sub_8105810, 2 delay 2 playsewithpan SE_W004, +63 @@ -3425,7 +3418,7 @@ ExtremeSpeedContinue: waitforvisualfinish restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein clearmonbg ANIM_TARGET blendoff @@ -3463,27 +3456,27 @@ Move_UPROAR: end Move_HEAT_WAVE: - loadspritegfx 0x2815 - createvisualtask sub_8116848, 5, 10261, 0, 6, 6, RGB_RED - createvisualtask sub_8110BCC, 5, 1 - createvisualtask sub_810A060, 6, 6, 31 + loadspritegfx ANIM_TAG_261 + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED + createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE + createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED panse_1B SE_W257, -64, +63, +2, 0 delay 4 createvisualtask sub_8109DBC, 5 delay 12 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 1 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 1 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 1 end Move_HAIL: @@ -3498,7 +3491,7 @@ Move_HAIL: end Move_TORMENT: - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_087 loadspritegfx ANIM_TAG_209 createvisualtask sub_815AFF0, 2 waitforvisualfinish @@ -3535,18 +3528,18 @@ Move_MEMENTO: end Move_FACADE: - loadspritegfx 0x2803 + loadspritegfx ANIM_TAG_243 createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask sub_815DF0C, 2, 0, 72 loopsewithpan SE_W207, -64, 24, 3 end Move_SMELLING_SALT: - loadspritegfx 0x2807 - loadspritegfx 0x280F + loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_255 createsprite gUnknown_085CE864, 130, 1, 0, 2 createsprite gUnknown_085CE864, 130, 1, 1, 2 - delay 0x20 + delay 32 createvisualtask sub_815E840, 3, 1, 2 loopsewithpan SE_W003, +63, 12, 2 waitforvisualfinish @@ -3557,19 +3550,19 @@ Move_SMELLING_SALT: end Move_FOLLOW_ME: - loadspritegfx 0x2750 + loadspritegfx ANIM_TAG_064 createsprite gUnknown_085931D4, 2, 0 playsewithpan SE_W039, -64 - delay 0x12 + delay 18 playsewithpan SE_W213, -64 - delay 0x47 - loopsewithpan SE_W039, -64, 0x16, 3 + delay 71 + loopsewithpan SE_W039, -64, 22, 3 end Move_CHARGE: - loadspritegfx 0x27E3 - loadspritegfx 0x27E4 - loadspritegfx 0x27E5 + loadspritegfx ANIM_TAG_211 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_213 monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3602,9 +3595,9 @@ Move_CHARGE: end Move_TAUNT: - loadspritegfx 0x27E6 + loadspritegfx ANIM_TAG_214 loadspritegfx ANIM_TAG_209 - loadspritegfx 0x2767 + loadspritegfx ANIM_TAG_087 createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, -64 delay 6 @@ -3622,10 +3615,10 @@ Move_TAUNT: end Move_HELPING_HAND: - loadspritegfx 0x2807 + loadspritegfx ANIM_TAG_247 createvisualtask sub_815EC48, 5 - createsprite gUnknown_085CE8AC, 0x28, 0 - createsprite gUnknown_085CE8AC, 0x28, 1 + createsprite gUnknown_085CE8AC, 40, 0 + createsprite gUnknown_085CE8AC, 40, 1 delay 19 playsewithpan SE_W227, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 @@ -3639,7 +3632,7 @@ Move_HELPING_HAND: end Move_ASSIST: - loadspritegfx 0x280C + loadspritegfx ANIM_TAG_252 createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 delay 2 createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 @@ -3656,9 +3649,9 @@ Move_ASSIST: end Move_SUPERPOWER: - loadspritegfx 0x27E4 - loadspritegfx 0x2810 - loadspritegfx 0x2811 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_256 + loadspritegfx ANIM_TAG_257 monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -3667,17 +3660,17 @@ Move_SUPERPOWER: delay 20 createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 180, 1 createvisualtask sub_8159244, 5, 234, 0 - delay 0x28 - createsprite gUnknown_08596004, 0x29, 200, 96, 1, 120 + delay 40 + createsprite gUnknown_08596004, 41, 200, 96, 1, 120 delay 8 - createsprite gUnknown_08596004, 0x29, 20, 248, 4, 112 + createsprite gUnknown_08596004, 41, 20, 248, 4, 112 delay 8 - createsprite gUnknown_08596004, 0x29, 130, 160, 2, 104 + createsprite gUnknown_08596004, 41, 130, 160, 2, 104 delay 8 - createsprite gUnknown_08596004, 0x29, 160, 192, 0, 96 + createsprite gUnknown_08596004, 41, 160, 192, 0, 96 delay 8 - createsprite gUnknown_08596004, 0x29, 60, 288, 3, 88 - delay 0x4A + createsprite gUnknown_08596004, 41, 60, 288, 3, 88 + delay 74 createsprite gUnknown_0859601C, 131, 0 playsewithpan SE_W207, -64 delay 16 @@ -3690,7 +3683,7 @@ Move_SUPERPOWER: end Move_RECYCLE: - loadspritegfx 0x2826 + loadspritegfx ANIM_TAG_278 monbg ANIM_ATTACKER setalpha 0, 16 delay 1 @@ -3727,7 +3720,7 @@ BrickBreakNormal: delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK - delay 0x25 + delay 37 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 @@ -3736,7 +3729,6 @@ BrickBreakNormal: waitforvisualfinish clearmonbg ANIM_TARGET end - BrickBreakShatteredWall: monbg ANIM_TARGET setalpha 12, 8 @@ -3754,7 +3746,7 @@ BrickBreakShatteredWall: delay 20 createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 6, RGB_BLACK - delay 0x25 + delay 37 createsprite gBasicHitSplatSpriteTemplate, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, 4, 0, 0, 10, 1, 0 playsewithpan SE_W233B, +63 @@ -3771,23 +3763,23 @@ BrickBreakShatteredWall: end Move_YAWN: - loadspritegfx 0x2802 + loadspritegfx ANIM_TAG_242 createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish - createsprite gUnknown_085CE68C, 0x85, 2 + createsprite gUnknown_085CE68C, 133, 2 playsewithpan SE_W255, -64 delay 4 - createsprite gUnknown_085CE68C, 0x85, 1 + createsprite gUnknown_085CE68C, 133, 1 delay 4 - createsprite gUnknown_085CE68C, 0x85, 0 + createsprite gUnknown_085CE68C, 133, 0 waitforvisualfinish createvisualtask sub_815D64C, 2, 1 playsewithpan SE_W281, +63 end Move_ENDEAVOR: - loadspritegfx 0x2803 + loadspritegfx ANIM_TAG_243 loadspritegfx ANIM_TAG_135 createvisualtask sub_815DCA4, 2, 0, 2 loopsewithpan SE_W039, -64, 24, 2 @@ -3803,7 +3795,7 @@ Move_ENDEAVOR: end Move_ERUPTION: - loadspritegfx 0x27D9 + loadspritegfx ANIM_TAG_201 createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 @@ -3813,22 +3805,22 @@ Move_ERUPTION: waitplaysewithpan SE_W153, -64, 60 waitforvisualfinish delay 30 - createsprite gUnknown_085955E8, 0x28, 200, -32, 0, 100, 0 - createsprite gUnknown_085955E8, 0x28, 30, -32, 16, 90, 1 - createsprite gUnknown_085955E8, 0x28, 150, -32, 32, 60, 2 - createsprite gUnknown_085955E8, 0x28, 90, -32, 48, 80, 3 - createsprite gUnknown_085955E8, 0x28, 110, -32, 64, 50, 0 - createsprite gUnknown_085955E8, 0x28, 60, -32, 80, 70, 1 - delay 0x16 + createsprite gUnknown_085955E8, 40, 200, -32, 0, 100, 0 + createsprite gUnknown_085955E8, 40, 30, -32, 16, 90, 1 + createsprite gUnknown_085955E8, 40, 150, -32, 32, 60, 2 + createsprite gUnknown_085955E8, 40, 90, -32, 48, 80, 3 + createsprite gUnknown_085955E8, 40, 110, -32, 64, 50, 0 + createsprite gUnknown_085955E8, 40, 60, -32, 80, 70, 1 + delay 22 createvisualtask sub_81152DC, 5, 5, 8, 60 createvisualtask sub_81152DC, 5, 4, 8, 60 loopsewithpan SE_W088, +63, 16, 12 - delay 0x50 - createsprite gSimplePaletteBlendSpriteTemplate, 0x28, 31, 4, 4, 0, RGB_RED + delay 80 + createsprite gSimplePaletteBlendSpriteTemplate, 40, 31, 4, 4, 0, RGB_RED end Move_SKILL_SWAP: - loadspritegfx 0x280B + loadspritegfx ANIM_TAG_251 call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 @@ -3841,7 +3833,7 @@ Move_SKILL_SWAP: end Move_IMPRISON: - loadspritegfx 0x2809 + loadspritegfx ANIM_TAG_249 loadspritegfx ANIM_TAG_250 call SetPsychicBackground monbg ANIM_DEF_PARTNER @@ -3858,7 +3850,7 @@ Move_IMPRISON: end Move_GRUDGE: - loadspritegfx 0x280D + loadspritegfx ANIM_TAG_253 monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST @@ -3867,7 +3859,7 @@ Move_GRUDGE: createvisualtask sub_8112C6C, 3 loopsewithpan SE_W052, -64, 16, 4 delay 10 - delay 0x50 + delay 80 playsewithpan SE_W171, +63 waitforvisualfinish restorebg @@ -3894,13 +3886,13 @@ Move_CAMOUFLAGE: end Move_TAIL_GLOW: - loadspritegfx 0x27E4 + loadspritegfx ANIM_TAG_212 monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish createsprite gUnknown_08596AC8, 66, 0 - delay 0x12 + delay 18 loopsewithpan SE_W234, -64, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 4, 0, RGB_BLACK @@ -3910,7 +3902,7 @@ Move_TAIL_GLOW: end Move_LUSTER_PURGE: - loadspritegfx 0x281B + loadspritegfx ANIM_TAG_267 loadspritegfx ANIM_TAG_135 fadetobg BG_PSYCHIC waitbgfadeout @@ -3919,12 +3911,12 @@ Move_LUSTER_PURGE: monbg ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W076, -64 - createsprite gUnknown_08596898, 0x29, 0, 0, 0, 0 + createsprite gUnknown_08596898, 41, 0, 0, 0, 0 delay 20 - createvisualtask sub_8116664, 5, 5, 2, 0, 16, -1 - createvisualtask sub_8116848, 5, 10267, 2, 0, 16, -1 + createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish - createvisualtask sub_8116848, 5, 10135, 0, 12, 12, 23552 + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gUnknown_085973A0, 131, 1, 2 createvisualtask sub_8159210, 5, 215, 63 @@ -3944,7 +3936,7 @@ Move_LUSTER_PURGE: createsprite gUnknown_085973A0, 131, 1, 2 createvisualtask sub_8159210, 5, 215, 63 waitforvisualfinish - createvisualtask sub_8116664, 5, 5, 2, 16, 0, -1 + createvisualtask sub_8116664, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask sub_81152DC, 5, 1, 5, 14 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -3954,14 +3946,14 @@ Move_LUSTER_PURGE: Move_MIST_BALL: loadspritegfx ANIM_TAG_155 - loadspritegfx 0x281E + loadspritegfx ANIM_TAG_270 delay 0 playsewithpan SE_W081, -64 - createsprite gUnknown_08595C70, 0x80, 0, 0, 0, 0, 30, 0 + createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, +63 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0 - createsprite gBattleAnimSpriteTemplate_859728C, 0, 1, 1, 1, 32279, 16, 0x7FFF, 16 + createsprite gComplexPaletteBlendSpriteTemplate, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask sub_810C324, 5 @@ -3973,23 +3965,23 @@ Move_MIST_BALL: end Move_FEATHER_DANCE: - loadspritegfx 0x281E + loadspritegfx ANIM_TAG_270 monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, +63 delay 0 - createsprite gUnknown_08596388, 0x80, 0, -16, 64, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 0x80, 0, -16, 32, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 0, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 32, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 0, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 0x80, 0, -16, 224, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 128, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 224, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 128, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 0x80, 0, -16, 192, 2, 104, 11304, 32, 1 - createsprite gUnknown_08596388, 0x80, 0, -16, 160, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 192, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 160, 2, 104, 11304, 32, 1 delay 6 - createsprite gUnknown_08596388, 0x80, 0, -16, 96, 2, 104, 11304, 32, 1 + createsprite gUnknown_08596388, 128, 0, -16, 96, 2, 104, 11304, 32, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -4021,11 +4013,11 @@ Move_MUD_SPORT: createsprite gUnknown_085971E4, 130, 0, -4, -16 createsprite gUnknown_085971E4, 130, 0, 4, -12 playsewithpan SE_W091, -64 - delay 0x20 + delay 32 createsprite gUnknown_085971E4, 130, 0, -3, -12 createsprite gUnknown_085971E4, 130, 0, 5, -14 playsewithpan SE_W091, -64 - delay 0x20 + delay 32 createsprite gUnknown_085971E4, 130, 0, -5, -18 createsprite gUnknown_085971E4, 130, 0, 3, -14 playsewithpan SE_W091, -64 @@ -4043,16 +4035,16 @@ Move_MUD_SPORT: waitplaysewithpan SE_W145B, 0, 10 delay 2 createsprite gUnknown_085971E4, 130, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 0x16 + waitplaysewithpan SE_W145B, 0, 22 delay 2 createsprite gUnknown_085971E4, 130, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 0x16 + waitplaysewithpan SE_W145B, 0, 22 delay 2 createsprite gUnknown_085971E4, 130, 1, 160, 60 waitplaysewithpan SE_W145B, 0, 15 delay 2 createsprite gUnknown_085971E4, 130, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 0x16 + waitplaysewithpan SE_W145B, 0, 22 delay 2 createsprite gUnknown_085971E4, 130, 1, 120, 60 waitplaysewithpan SE_W145B, 0, 15 @@ -4177,7 +4169,7 @@ Move_FAKE_TEARS: loadspritegfx ANIM_TAG_155 loadspritegfx ANIM_TAG_209 loadspritegfx ANIM_TAG_072 - createvisualtask sub_8116848, 5, 10155, 0, 4, 4, RGB(12, 11, 31) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, -64, 12, 4 @@ -4229,7 +4221,7 @@ Move_ODOR_SLEUTH: waitforvisualfinish clearmonbg ANIM_TARGET delay 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 3, 1, -1, 16, -1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0 playsewithpan SE_W043, -64 end @@ -4271,7 +4263,7 @@ Move_GRASS_WHISTLE: end Move_TICKLE: - loadspritegfx 0x27EA + loadspritegfx ANIM_TAG_218 createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gUnknown_08593A84, 0, -16, -8 @@ -4289,13 +4281,13 @@ Move_TICKLE: end Move_WATER_SPOUT: - loadspritegfx 0x281C - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 playsewithpan SE_W029, -64 - delay 0x2C + delay 44 playsewithpan SE_W291, -64 waitforvisualfinish delay 16 @@ -4357,7 +4349,7 @@ Move_AERIAL_ACE: playsewithpan SE_W013B, -64 delay 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W013, +63 waitforvisualfinish clearmonbg ANIM_TARGET @@ -4365,20 +4357,20 @@ Move_AERIAL_ACE: end Move_IRON_DEFENSE: - loopsewithpan SE_REAPOKE, -64, 0x1C, 2 + loopsewithpan SE_REAPOKE, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 1, 8, 2, -1, 14, -1, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0 waitforvisualfinish end Move_BLOCK: loadspritegfx ANIM_TAG_250 - createsprite gUnknown_085CE90C, 0xC2 + createsprite gUnknown_085CE90C, 194 playsewithpan SE_W207, +63 end Move_HOWL: - loadspritegfx 0x2745 + loadspritegfx ANIM_TAG_053 createvisualtask sub_815D64C, 2, 0 delay 12 call RoarEffect @@ -4388,7 +4380,7 @@ Move_HOWL: end Move_BULK_UP: - loadspritegfx 0x2766 + loadspritegfx ANIM_TAG_086 createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish @@ -4398,8 +4390,8 @@ Move_BULK_UP: end Move_COVET: - loadspritegfx 0x27E2 - loadspritegfx 0x27F0 + loadspritegfx ANIM_TAG_210 + loadspritegfx ANIM_TAG_224 createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 @@ -4416,8 +4408,8 @@ Move_COVET: Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_001 - loadspritegfx 0x27E4 - loadspritegfx 0x27E5 + loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_213 monbg ANIM_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK @@ -4462,44 +4454,44 @@ Move_VOLT_TACKLE: end Move_WATER_SPORT: - loadspritegfx 0x281C + loadspritegfx ANIM_TAG_268 createvisualtask sub_81088E4, 5 delay 8 playsewithpan SE_W057, -64 - delay 0x2C + delay 44 playsewithpan SE_W057, -64 - delay 0x2C + delay 44 playsewithpan SE_W057, -64 - delay 0x2C + delay 44 panse_1B SE_W057, -64, +63, +2, 0 end Move_CALM_MIND: loadspritegfx ANIM_TAG_203 monbg ANIM_ATK_PARTNER - createvisualtask sub_8116664, 5, 0, 0, 0, 16, 0 + createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, -64 delay 14 - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, -64 delay 14 - createsprite gUnknown_08593850, 0x28, 0, 0, 0, 0 + createsprite gUnknown_08593850, 40, 0, 0, 0, 0 playsewithpan SE_W048, -64 waitforvisualfinish createvisualtask sub_81177E4, 5, 0 waitforvisualfinish - createvisualtask sub_8116664, 5, 0, 0, 16, 0, 0 + createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK waitforvisualfinish clearmonbg ANIM_ATK_PARTNER end Move_LEAF_BLADE: - loadspritegfx 0x274F - loadspritegfx 0x282D + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_285 createvisualtask sub_80FFFC0, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4523,7 +4515,7 @@ Move_LEAF_BLADE: end Move_DRAGON_DANCE: - loadspritegfx 0x2809 + loadspritegfx ANIM_TAG_249 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER delay 1 @@ -4547,10 +4539,10 @@ Move_DRAGON_DANCE: end Move_SHOCK_WAVE: - loadspritegfx 0x27E3 - loadspritegfx 0x27E4 + loadspritegfx ANIM_TAG_211 + loadspritegfx ANIM_TAG_212 loadspritegfx ANIM_TAG_001 - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_037 monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -4577,7 +4569,7 @@ Move_SHOCK_WAVE: end Move_HARDEN: - loopsewithpan SE_W231, -64, 0x1C, 2 + loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish end @@ -4633,7 +4625,7 @@ Move_MIND_READER: playsewithpan SE_W109, +63 createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 createsprite gUnknown_085CE094, 5 - delay 0x28 + delay 40 playsewithpan SE_W043, +63 createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK call MindReaderEffect @@ -4704,7 +4696,7 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, -64 - loadspritegfx 0x27F4 + loadspritegfx ANIM_TAG_228 createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 delay 20 createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 @@ -4768,7 +4760,7 @@ FutureSight: goto FutureSightContinue Move_THUNDER: - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_037 fadetobg BG_THUNDER waitbgfadeout createvisualtask sub_8117660, 5, -256, 0, 1, -1 @@ -4821,14 +4813,14 @@ Move_THUNDER: waitforvisualfinish restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end Move_THUNDER_PUNCH: loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_037 monbg ANIM_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK @@ -4929,7 +4921,7 @@ Move_SCRATCH: end Move_DRAGON_BREATH: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W172, -64, 7, 7 @@ -4963,7 +4955,7 @@ Move_DRAGON_BREATH: end Move_ROAR: - loadspritegfx 0x2745 + loadspritegfx ANIM_TAG_053 monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -4991,7 +4983,7 @@ RoarEffect: return Move_GROWL: - loadspritegfx 0x2745 + loadspritegfx ANIM_TAG_053 createvisualtask sub_8158E9C, 2, 0, 255 call RoarEffect delay 10 @@ -5025,7 +5017,7 @@ Snore1: Move_LIGHT_SCREEN: loadspritegfx 0x2756 - loadspritegfx 0x27B6 + loadspritegfx ANIM_TAG_166 setalpha 0, 16 waitplaysewithpan SE_W115, -64, 15 createsprite gUnknown_08596560, 1, 40, 0, 10166 @@ -5064,7 +5056,7 @@ Move_MIRROR_COAT: end Move_REFLECT: - loadspritegfx 0x2757 + loadspritegfx ANIM_TAG_071 loadspritegfx ANIM_TAG_167 setalpha 0, 16 waitplaysewithpan SE_W115, -64, 15 @@ -5081,7 +5073,7 @@ Move_REFLECT: end Move_BARRIER: - loadspritegfx 0x27B9 + loadspritegfx ANIM_TAG_169 setalpha 0, 16 waitplaysewithpan SE_W112, -64, 15 createsprite gUnknown_085965A8, 3, 40, 0, 10169 @@ -5091,34 +5083,34 @@ Move_BARRIER: end Move_BUBBLE: - loadspritegfx 0x27A2 + loadspritegfx ANIM_TAG_146 loadspritegfx ANIM_TAG_155 monbg ANIM_TARGET setalpha 12, 8 delay 1 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 15, -15, 10, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 delay 6 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 35, 37, 40, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 delay 6 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 10, -37, 30, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 delay 6 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 30, 10, 15, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 delay 6 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 20, 33, 20, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 delay 6 createsprite gBattleAnimSpriteTemplate_8595068, 2, 18, 0, 25, -30, 10, 128, 100 playsewithpan SE_W145, -64 - waitplaysewithpan SE_W145B, +63, 0x64 + waitplaysewithpan SE_W145B, +63, 100 waitforvisualfinish call WaterBubbleEffect2 waitforvisualfinish @@ -5127,7 +5119,7 @@ Move_BUBBLE: end Move_SMOG: - loadspritegfx 0x27BC + loadspritegfx ANIM_TAG_172 monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 @@ -5140,7 +5132,7 @@ Move_SMOG: call Smog1 call Smog1 delay 120 - loopsewithpan SE_W092, +63, 0x12, 2 + loopsewithpan SE_W092, +63, 18, 2 createvisualtask sub_8115A04, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) delay 10 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1 @@ -5148,7 +5140,6 @@ Move_SMOG: clearmonbg ANIM_DEF_PARTNER blendoff end - Smog1: createsprite gUnknown_08595C44, 2, 0, -24, 48, 240, 1, 0 delay 7 @@ -5179,7 +5170,7 @@ Move_FAINT_ATTACK: blendoff delay 1 setarg 7, 0x1000 - delay 0x20 + delay 32 createvisualtask sub_8113888, 2 monbg ANIM_ATTACKER createvisualtask sub_81137E4, 2, 1 @@ -5209,7 +5200,6 @@ Move_SAND_ATTACK: clearmonbg ANIM_ATK_PARTNER blendoff end - SandAttack1: createsprite gUnknown_085971A8, 130, 15, 15, 20, 0, 0 createsprite gUnknown_085971A8, 130, 15, 15, 20, 10, 10 @@ -5233,7 +5223,6 @@ Move_MUD_SLAP: call MudSlap1 waitforvisualfinish end - MudSlap1: createsprite gUnknown_085971CC, 130, 15, 15, 20, 0, 0 createsprite gUnknown_085971CC, 130, 15, 15, 20, 10, 5 @@ -5244,7 +5233,7 @@ MudSlap1: return Move_DRAGON_RAGE: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loadspritegfx ANIM_TAG_035 playsewithpan SE_W082, -64 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 @@ -5255,28 +5244,28 @@ Move_DRAGON_RAGE: waitforvisualfinish loopsewithpan SE_W172B, +63, 11, 3 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1 - createsprite gUnknown_08596F28, 0xC2, 1, 5, 0 + createsprite gUnknown_08596F28, 194, 1, 5, 0 delay 1 - createsprite gUnknown_08596F28, 0xC2, 1, -10, -15 + createsprite gUnknown_08596F28, 194, 1, -10, -15 delay 1 createsprite gUnknown_08596F28, 130, 1, 0, 25 delay 1 - createsprite gUnknown_08596F28, 0xC2, 1, 15, 5 + createsprite gUnknown_08596F28, 194, 1, 15, 5 delay 1 - createsprite gUnknown_08596F28, 0xC2, 1, -25, 0 + createsprite gUnknown_08596F28, 194, 1, -25, 0 delay 1 createsprite gUnknown_08596F28, 130, 1, 30, 30 delay 1 createsprite gUnknown_08596F28, 130, 1, -27, 25 delay 1 - createsprite gUnknown_08596F28, 0xC2, 1, 0, 8 + createsprite gUnknown_08596F28, 194, 1, 0, 8 waitforvisualfinish - createsprite gSlideMonToOriginalPosSpriteTemplate, 0xC2, 0, 0, 4 + createsprite gSlideMonToOriginalPosSpriteTemplate, 194, 0, 0, 4 waitforvisualfinish end Move_RAIN_DANCE: - loadspritegfx 0x2783 + loadspritegfx ANIM_TAG_115 playsewithpan SE_W240, -64 createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -5290,7 +5279,7 @@ Move_RAIN_DANCE: end Move_BITE: - loadspritegfx 0x279B + loadspritegfx ANIM_TAG_139 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -5307,7 +5296,7 @@ Move_BITE: end Move_CRUNCH: - loadspritegfx 0x279B + loadspritegfx ANIM_TAG_139 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET fadetobg BG_DARK @@ -5335,7 +5324,7 @@ Move_CRUNCH: end Move_CLAMP: - loadspritegfx 0x27A1 + loadspritegfx ANIM_TAG_145 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -5388,7 +5377,6 @@ Move_ICE_BEAM: clearmonbg ANIM_TARGET blendoff end - IceBeam1: createsprite gUnknown_08595B2C, 2, 20, 12, 0, 12, 20 createsprite gUnknown_08595B2C, 2, 20, -12, 0, -12, 20 @@ -5403,7 +5391,7 @@ Move_WITHDRAW: end Move_AURORA_BEAM: - loadspritegfx 0x279C + loadspritegfx ANIM_TAG_140 fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, -64 @@ -5414,7 +5402,7 @@ Move_AURORA_BEAM: call AuroraBeam1 call AuroraBeam1 call AuroraBeam1 - setarg 7, 0xFFFF + setarg 7, -1 createsoundtask sub_8158C58, 183, -64, 63, 3, 6, 0, 10 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1 call AuroraBeam1 @@ -5427,7 +5415,6 @@ Move_AURORA_BEAM: restorebg waitbgfadein end - AuroraBeam1: createsprite gUnknown_085950B4, 130, 20, 0, 0, 0, 17 delay 1 @@ -5440,12 +5427,11 @@ AuroraBeam1: return Move_SOLAR_BEAM: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: waitforvisualfinish end - SolarBeamSetUp: monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -5456,7 +5442,6 @@ SolarBeamSetUp: clearmonbg ANIM_ATK_PARTNER blendoff goto SolarBeamEnd - SolarBeamSetUp1: createsprite gUnknown_085921E0, 2, 40, 40, 16 delay 2 @@ -5487,7 +5472,6 @@ SolarBeamSetUp1: createsprite gUnknown_085921E0, 2, 40, 0, 16 delay 2 return - SolarBeamUnleash: call SetSolarbeamBg panse_1B SE_W076, -64, +63, +2, 0 @@ -5514,7 +5498,6 @@ SolarBeamUnleash: createvisualtask sub_8116620, 10, 4, 1, 10, 0, RGB(25, 31, 0) call UnsetSolarbeamBg goto SolarBeamEnd - SolarBeamUnleash1: createsprite gUnknown_085921F8, 131, 15, 0, 20, 0 delay 4 @@ -5553,35 +5536,33 @@ BlizzardContinue: delay 20 restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein clearmonbg ANIM_DEF_PARTNER end - Blizzard1: - createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 0, 0, 0, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -10, 0, -10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, -10, 0, -10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -5, 0, -5, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 10, 0, 10, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -5, 0, -5, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, 10, 0, 10, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -10, 0, -10, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -10, 0, -10, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -20, 0, -20, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 15, 0, 15, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -20, 0, -20, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, 15, 0, 15, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -15, 0, -15, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -15, 0, -15, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite gUnknown_08595B98, 0x28, 0, -25, 0, -25, 72, 1 - createsprite gUnknown_08595BB0, 0x28, 0, 20, 0, 20, 80, 0, 0, 1 + createsprite gUnknown_08595B98, 40, 0, -25, 0, -25, 72, 1 + createsprite gUnknown_08595BB0, 40, 0, 20, 0, 20, 80, 0, 0, 1 delay 3 return - BlizzardAgainstPlayer: fadetobg BG_HIGHSPEED_PLAYER goto BlizzardContinue @@ -5603,27 +5584,26 @@ Move_POWDER_SNOW: delay 20 createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, RGB_BLACK end - PowderSnow1: - createsprite gUnknown_08595BC8, 0x28, 0, 0, 0, 0, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, -10, 0, -10, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, 40, 0, -10, 0, -10, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, 10, 0, 10, 56, -4, 3, 1 + createsprite gUnknown_08595BC8, 40, 0, 10, 0, 10, 56, -4, 3, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, -4, 5, 1 + createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, -4, 5, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, 15, 0, 15, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, 40, 0, 15, 0, 15, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, -20, 0, -20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, 40, 0, -20, 0, -20, 56, 4, 4, 1 delay 3 - createsprite gUnknown_08595BC8, 0x28, 0, 20, 0, 20, 56, 4, 4, 1 + createsprite gUnknown_08595BC8, 40, 0, 20, 0, 20, 56, 4, 4, 1 delay 3 return Move_HYDRO_PUMP: - loadspritegfx 0x27A5 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -5655,7 +5635,6 @@ Move_HYDRO_PUMP: clearmonbg ANIM_DEF_PARTNER blendoff end - HydroPump1: createsprite gUnknown_085950E4, 3, 10, 10, 0, 16 createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 @@ -5664,7 +5643,6 @@ HydroPump1: createsprite gUnknown_085950E4, 3, 10, 10, 0, -16 delay 1 return - HydroPump2: createsprite gUnknown_08597388, 4, 0, 15, 1, 1 createsprite gUnknown_08597388, 4, 0, -15, 1, 1 @@ -5685,7 +5663,7 @@ Move_SIGNAL_BEAM: call SignalBeam1 call SignalBeam1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 25, 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 4, 8, 5, 31, 8, 961, 8 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 4, 8, 5, RGB_RED, 8, 961, 8 call SignalBeam1 call SignalBeam1 call SignalBeam1 @@ -5705,7 +5683,6 @@ Move_SIGNAL_BEAM: call SignalBeam1 waitforvisualfinish end - SignalBeam1: createsprite gUnknown_08595114, 131, 10, 10, 0, 16 createsprite gUnknown_0859512C, 131, 10, 10, 0, -16 @@ -5713,7 +5690,7 @@ SignalBeam1: return Move_ABSORB: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER @@ -5766,7 +5743,7 @@ AbsorbEffect: return Move_MEGA_DRAIN: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER @@ -5827,7 +5804,7 @@ MegaDrainEffect: return Move_GIGA_DRAIN: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER @@ -5896,8 +5873,8 @@ GigaDrainEffect: return Move_LEECH_LIFE: - loadspritegfx 0x27B1 - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_161 + loadspritegfx ANIM_TAG_147 delay 1 loadspritegfx ANIM_TAG_031 loadspritegfx ANIM_TAG_135 @@ -5939,8 +5916,8 @@ Move_SYNTHESIS: end Move_TOXIC: - loadspritegfx 0x27A7 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_151 + loadspritegfx ANIM_TAG_150 call Toxic1 call Toxic1 waitforvisualfinish @@ -5948,7 +5925,6 @@ Move_TOXIC: call PoisonBubblesEffect waitforvisualfinish end - Toxic1: createsprite gUnknown_08596134, 130, -24, 16, 1, 1 playsewithpan SE_W092, +63 @@ -5965,7 +5941,7 @@ Toxic1: return Move_SLUDGE: - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_150 playsewithpan SE_W145C, -64 createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 waitforvisualfinish @@ -5976,7 +5952,7 @@ Move_SLUDGE: end Move_SLUDGE_BOMB: - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_150 call SludgeBomb1 call SludgeBomb1 call SludgeBomb1 @@ -6012,7 +5988,6 @@ Move_SLUDGE_BOMB: call PoisonBubblesEffect waitforvisualfinish end - SludgeBomb1: playsewithpan SE_W145C, -64 createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 @@ -6020,7 +5995,7 @@ SludgeBomb1: return Move_ACID: - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_150 monbg ANIM_DEF_PARTNER createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, -64 @@ -6053,7 +6028,7 @@ Move_ACID: end Move_BONEMERANG: - loadspritegfx 0x2710 + loadspritegfx ANIM_TAG_000 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6073,7 +6048,7 @@ Move_BONEMERANG: end Move_BONE_CLUB: - loadspritegfx 0x2710 + loadspritegfx ANIM_TAG_000 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6083,7 +6058,7 @@ Move_BONE_CLUB: delay 12 createsprite gBasicHitSplatSpriteTemplate, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0 playsewithpan SE_W233B, +63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6091,7 +6066,7 @@ Move_BONE_CLUB: end Move_BONE_RUSH: - loadspritegfx 0x2710 + loadspritegfx ANIM_TAG_000 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6110,14 +6085,14 @@ Move_SPIKES: loadspritegfx 0x27A8 monbg ANIM_DEF_PARTNER playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 0x1C + waitplaysewithpan SE_W030, +63, 28 createsprite gUnknown_085CE11C, 130, 20, 0, 0, 24, 30 delay 10 playsewithpan SE_W026, -64 - waitplaysewithpan SE_W030, +63, 0x1C + waitplaysewithpan SE_W030, +63, 28 createsprite gUnknown_085CE11C, 130, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, +63, 0x1C + waitplaysewithpan SE_W030, +63, 28 createsprite gUnknown_085CE11C, 130, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6147,7 +6122,7 @@ MegahornContinue: createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -16, 4, 1, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, -4, 1, 12, 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 7, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, 2, 0, 0, 11 delay 3 @@ -6157,10 +6132,9 @@ MegahornContinue: blendoff restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end - MegahornInContest: fadetobg BG_DRILL_CONTESTS waitbgfadeout @@ -6168,7 +6142,7 @@ MegahornInContest: goto MegahornContinue Move_GUST: - loadspritegfx 0x2719 + loadspritegfx ANIM_TAG_009 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6186,7 +6160,7 @@ Move_GUST: end Move_WING_ATTACK: - loadspritegfx 0x2719 + loadspritegfx ANIM_TAG_009 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6239,7 +6213,6 @@ Move_AEROBLAST: delay 0 call UnsetFlyingBg end - Aeroblast1: playsewithpan SE_W026, -64 createsprite gUnknown_085962D4, 2, 14, -12, 0, -12, 15, 0, 0 @@ -6261,7 +6234,7 @@ Aeroblast1: Move_WATER_GUN: loadspritegfx ANIM_TAG_155 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6285,13 +6258,13 @@ Move_WATER_GUN: Move_CRABHAMMER: loadspritegfx ANIM_TAG_141 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08597388, 4, 0, 0, 1, 0 playsewithpan SE_W233B, +63 delay 1 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 32429, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -24, 0, 0, 4 waitforvisualfinish delay 8 @@ -6321,14 +6294,14 @@ Move_CRABHAMMER: end Move_SURF: - createvisualtask sub_8107954, 2, 0 + createvisualtask AnimTask_CreateSurfWave, 2, FALSE delay 24 panse_1B SE_W057, -64, +63, +2, 0 waitforvisualfinish end Move_FLAMETHROWER: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6361,27 +6334,27 @@ Flamethrower1: return Move_SANDSTORM: - loadspritegfx 0x2815 + loadspritegfx ANIM_TAG_261 playsewithpan SE_W201, 0 - createvisualtask sub_8110BCC, 5, 0 + createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 10, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 10, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 90, 2048, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 90, 2048, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 50, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 50, 2560, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 20, 2304, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 20, 2304, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 70, 1984, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 70, 1984, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 0, 2816, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 0, 2816, 96, 0 delay 10 - createsprite gBattleAnimSpriteTemplate_8596BA0, 0x28, 60, 2560, 96, 0 + createsprite gBattleAnimSpriteTemplate_8596BA0, 40, 60, 2560, 96, 0 end Move_WHIRLPOOL: - loadspritegfx 0x27A5 + loadspritegfx ANIM_TAG_149 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6414,7 +6387,7 @@ WhirlpoolEffect: return Move_FLY: - loadspritegfx 0x27AC + loadspritegfx ANIM_TAG_156 loadspritegfx ANIM_TAG_135 choosetwoturnanim FlySetUp, FlyUnleash FlyEnd: @@ -6441,7 +6414,7 @@ FlyUnleash: goto FlyEnd Move_BOUNCE: - loadspritegfx 0x27AC + loadspritegfx ANIM_TAG_156 loadspritegfx ANIM_TAG_135 choosetwoturnanim BounceSetUp, BounceUnleash BounceEnd: @@ -6485,15 +6458,15 @@ Move_KARATE_CHOP: Move_CROSS_CHOP: loadspritegfx ANIM_TAG_143 - loadspritegfx 0x282D + loadspritegfx ANIM_TAG_285 monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, +63 createsprite gUnknown_08595EC8, 2, 0, 0, 0 createsprite gUnknown_08595EC8, 2, 0, 0, 1 - delay 0x28 + delay 40 playsewithpan SE_W013, +63 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0x7FFF, 10, 0, 10 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gUnknown_085973D0, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1 waitforvisualfinish @@ -6594,8 +6567,8 @@ TripleKickCenter: Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_143 loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27D6 - loadspritegfx 0x2717 + loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_007 delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6715,11 +6688,11 @@ Move_SUBMISSION: waitplaysewithpan SE_W004, +63, 10 waitplaysewithpan SE_W104, -64, 20 waitplaysewithpan SE_W004, +63, 30 - waitplaysewithpan SE_W104, -64, 0x28 + waitplaysewithpan SE_W104, -64, 40 waitplaysewithpan SE_W004, +63, 50 waitplaysewithpan SE_W104, -64, 60 waitplaysewithpan SE_W004, +63, 70 - waitplaysewithpan SE_W104, -64, 0x50 + waitplaysewithpan SE_W104, -64, 80 waitplaysewithpan SE_W004, +63, 0x5A createvisualtask sub_80D5738, 2, 0, -18, 6, 6, 4 createvisualtask sub_80D5738, 2, 1, 18, 6, 6, 4 @@ -6741,7 +6714,7 @@ Submission1: return Move_SUNNY_DAY: - loadspritegfx 0x27AD + loadspritegfx ANIM_TAG_157 monbg ANIM_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE @@ -6759,7 +6732,7 @@ Move_SUNNY_DAY: end SunnyDay1: - createsprite gUnknown_085954A0, 0x28 + createsprite gUnknown_085954A0, 40 delay 6 return @@ -6767,7 +6740,7 @@ Move_COTTON_SPORE: loadspritegfx 0x27AE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - loopsewithpan SE_W077, +63, 0x12, 10 + loopsewithpan SE_W077, +63, 18, 10 call CottonSpore1 call CottonSpore1 call CottonSpore1 @@ -6847,8 +6820,8 @@ Move_PETAL_DANCE: end Move_RAZOR_LEAF: - loadspritegfx 0x274F - loadspritegfx 0x27B0 + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_160 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6949,7 +6922,7 @@ Move_MIST: call Mist1 call Mist1 call Mist1 - delay 0x20 + delay 32 createvisualtask sub_8115A04, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -6973,7 +6946,7 @@ Move_HAZE: Move_FIRE_PUNCH: loadspritegfx ANIM_TAG_143 - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -7027,7 +7000,7 @@ Move_LEER: end Move_DREAM_EATER: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -7094,32 +7067,32 @@ DreamEaterEffect: return Move_POISON_GAS: - loadspritegfx 0x27BC - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_150 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 delay 0 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, -64 - createsprite gUnknown_08595C9C, 0x80, 64, 0, 0, -32, -6, 4192, 1072, 0 - delay 0x28 - loopsewithpan SE_W054, +63, 0x1C, 6 + createsprite gUnknown_08595C9C, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + delay 40 + loopsewithpan SE_W054, +63, 28, 6 createvisualtask sub_8115A04, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26) waitforvisualfinish blendoff @@ -7147,7 +7120,7 @@ Move_WRAP: goto BindWrap Move_PSYBEAM: - loadspritegfx 0x27B3 + loadspritegfx ANIM_TAG_163 playsewithpan SE_W060, -64 call SetPsychicBackground createsoundtask sub_8158C58, 200, -64, 63, 3, 4, 0, 15 @@ -7174,7 +7147,7 @@ Psybeam1: return Move_HYPNOSIS: - loadspritegfx 0x27B3 + loadspritegfx ANIM_TAG_163 call SetPsychicBackground call Hypnosis1 call Hypnosis1 @@ -7192,7 +7165,7 @@ Hypnosis1: return Move_PSYWAVE: - loadspritegfx 0x27B5 + loadspritegfx ANIM_TAG_165 playsewithpan SE_W060, -64 call SetPsychicBackground createvisualtask sub_81076C8, 5, 100 @@ -7216,7 +7189,7 @@ Psywave1: return Move_ZAP_CANNON: - loadspritegfx 0x27BB + loadspritegfx ANIM_TAG_171 loadspritegfx ANIM_TAG_011 playsewithpan SE_W086, -64 createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 @@ -7237,9 +7210,9 @@ Move_ZAP_CANNON: end Move_STEEL_WING: - loadspritegfx 0x2719 + loadspritegfx ANIM_TAG_009 loadspritegfx ANIM_TAG_135 - loopsewithpan SE_W231, -64, 0x1C, 2 + loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER @@ -7265,7 +7238,7 @@ Move_STEEL_WING: Move_IRON_TAIL: loadspritegfx ANIM_TAG_135 - loopsewithpan SE_W231, -64, 0x1C, 2 + loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish monbg ANIM_TARGET @@ -7284,8 +7257,8 @@ Move_IRON_TAIL: Move_POISON_TAIL: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27A6 - loopsewithpan SE_W231, -64, 0x1C, 2 + loadspritegfx ANIM_TAG_150 + loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish monbg ANIM_TARGET @@ -7305,7 +7278,7 @@ Move_POISON_TAIL: Move_METAL_CLAW: loadspritegfx ANIM_TAG_039 - loopsewithpan SE_W231, -64, 0x1C, 2 + loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -7344,7 +7317,7 @@ Move_NIGHT_SHADE: end Move_EGG_BOMB: - loadspritegfx 0x27D6 + loadspritegfx ANIM_TAG_198 loadspritegfx 0x27BF playsewithpan SE_W039, -64 createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 @@ -7393,7 +7366,7 @@ Move_LICK: end Move_FOCUS_ENERGY: - loadspritegfx 0x27C8 + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, -64 call EndureEffect delay 8 @@ -7409,7 +7382,7 @@ Move_BIDE: choosetwoturnanim BideSetUp, BideUnleash end BideSetUp: - loopsewithpan SE_W036, -64, 0x9, 2 + loopsewithpan SE_W036, -64, 9, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7419,7 +7392,7 @@ BideUnleash: loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, -64, 0x9, 2 + loopsewithpan SE_W036, -64, 9, 2 createvisualtask sub_8116620, 10, 2, 2, 0, 11, RGB_RED createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1 waitforvisualfinish @@ -7452,7 +7425,7 @@ Move_STRING_SHOT: delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish - loopsewithpan SE_W081, -64, 0x9, 6 + loopsewithpan SE_W081, -64, 9, 6 call StringShot1 call StringShot1 call StringShot1 @@ -7498,7 +7471,7 @@ Move_SPIDER_WEB: createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish monbgprio_28 ANIM_TARGET - loopsewithpan SE_W081, -64, 0x9, 6 + loopsewithpan SE_W081, -64, 9, 6 call SpiderWeb1 call SpiderWeb1 call SpiderWeb1 @@ -7534,7 +7507,7 @@ RazorWindContinue: end RazorWindSetUp: - loadspritegfx 0x2719 + loadspritegfx ANIM_TAG_009 playsewithpan SE_W016, -64 createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 @@ -7566,12 +7539,12 @@ RazorWindUnleash: goto RazorWindContinue Move_DISABLE: - loadspritegfx 0x2757 + loadspritegfx ANIM_TAG_071 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 8, 8 playsewithpan SE_W197, -64 - createsprite gUnknown_0853EE84, 0xD, 24, -16 + createsprite gUnknown_0853EE84, 13, 24, -16 waitforvisualfinish createvisualtask sub_81045B0, 5 loopsewithpan SE_W020, +63, 15, 4 @@ -7582,11 +7555,11 @@ Move_DISABLE: end Move_RECOVER: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, -64, 0xD, 3 + loopsewithpan SE_W025, -64, 13, 3 createvisualtask sub_8115A04, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11) call Recover1 call Recover1 @@ -7617,7 +7590,7 @@ Recover1: return Move_MIMIC: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 @@ -7626,7 +7599,7 @@ Move_MIMIC: delay 15 createsprite gUnknown_085924DC, 130, -12, 24 delay 10 - setarg 7, 0xFFFF + setarg 7, -1 waitforvisualfinish playsewithpan SE_W036, -64 createvisualtask sub_8115A04, 2, 2, 0, 2, 0, 11, RGB_WHITE @@ -7636,7 +7609,7 @@ Move_MIMIC: end Move_CONSTRICT: - loadspritegfx 0x27CA + loadspritegfx ANIM_TAG_186 loopsewithpan SE_W010, +63, 6, 4 createsprite gUnknown_08592494, 132, 0, 16, 0, 2 delay 7 @@ -7648,7 +7621,7 @@ Move_CONSTRICT: createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 playsewithpan SE_W020, +63 - setarg 7, 0xFFFF + setarg 7, -1 waitforvisualfinish end @@ -7656,7 +7629,7 @@ Move_CURSE: choosetwoturnanim CurseGhost, CurseStats CurseGhost: loadspritegfx 0x27D7 - loadspritegfx 0x27D8 + loadspritegfx ANIM_TAG_200 monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish @@ -7664,9 +7637,9 @@ CurseGhost: createsprite gUnknown_08596DD0, 2 delay 60 call CurseGhost1 - delay 0x29 + delay 41 call CurseGhost1 - delay 0x29 + delay 41 call CurseGhost1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -7714,7 +7687,7 @@ Move_SOFT_BOILED: delay 8 createsprite gUnknown_0859381C, 3, 31, 16, 0, 1 delay 60 - setarg 7, 0xFFFF + setarg 7, -1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER call HealingEffect2 @@ -7729,22 +7702,22 @@ Move_HEAL_BELL: createvisualtask sub_8105CB4, 5 createsprite gUnknown_08593938, 2, 0, -24, 0, 1 delay 12 - createsprite gUnknown_08593958, 0x28, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_08593958, 0x28, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_08593958, 0x28, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, 36, 18, 30, 3, 3 + createsprite gUnknown_08593958, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite gUnknown_08593958, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite gUnknown_08593958, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite gUnknown_08593958, 40, 0, -24, 36, 18, 30, 3, 3 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 0x28, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_08593958, 0x28, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_08593958, 0x28, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, -15, 26, 32, 7, 0 + createsprite gUnknown_08593958, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite gUnknown_08593958, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite gUnknown_08593958, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite gUnknown_08593958, 40, 0, -24, -15, 26, 32, 7, 0 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, 0x28, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_08593958, 0x28, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_08593958, 0x28, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_08593958, 0x28, 0, -24, -36, -18, 30, 6, 1 + createsprite gUnknown_08593958, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite gUnknown_08593958, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite gUnknown_08593958, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite gUnknown_08593958, 40, 0, -24, -36, -18, 30, 6, 1 call HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 5 @@ -7761,14 +7734,14 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_049 loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, -64 - createvisualtask sub_8116664, 10, 4, 3, 10, 0, 31500 + createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE createsprite gUnknown_08593868, 16, 0, 0, 0, 1 end HealBell1: - createvisualtask sub_8116664, 10, 4, 3, 8, 0, 31500 + createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE - createsprite gUnknown_0859381C, 0x28, 0, -24, 0, 1 + createsprite gUnknown_0859381C, 40, 0, -24, 0, 1 playsewithpan SE_W215, -64 return @@ -7784,14 +7757,14 @@ Move_FAKE_OUT: end Move_SCARY_FACE: - loadspritegfx 0x27EA + loadspritegfx ANIM_TAG_218 createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, -64 waitforvisualfinish delay 10 playsewithpan SE_W043, -64 createvisualtask sub_81064F8, 5 - delay 0xD + delay 13 createsprite gUnknown_08593A84, 0, -16, -8 createsprite gUnknown_08593A84, 0, 16, -8 waitforvisualfinish @@ -7802,13 +7775,13 @@ Move_SCARY_FACE: end Move_SWEET_KISS: - loadspritegfx 0x27E8 - loadspritegfx 0x27EC + loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_220 createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, +63 - delay 0x17 + delay 23 playsewithpan SE_W215, +63 - delay 0x17 + delay 23 playsewithpan SE_W215, +63 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_85939B8, 131, 160, -30 @@ -7821,8 +7794,8 @@ Move_SWEET_KISS: end Move_LOVELY_KISS: - loadspritegfx 0x27EB - loadspritegfx 0x27ED + loadspritegfx ANIM_TAG_219 + loadspritegfx ANIM_TAG_221 createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, +63 waitforvisualfinish @@ -7834,7 +7807,7 @@ Move_LOVELY_KISS: end Move_FURY_SWIPES: - loadspritegfx 0x27EE + loadspritegfx ANIM_TAG_222 createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, +63 @@ -7849,8 +7822,8 @@ Move_FURY_SWIPES: end Move_INGRAIN: - loadspritegfx 0x27EF - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_223 + loadspritegfx ANIM_TAG_147 createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, -64 delay 10 @@ -7862,7 +7835,7 @@ Move_INGRAIN: delay 10 createsprite gUnknown_0859254C, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, -64 - delay 0x28 + delay 40 createsprite gUnknown_0859258C, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, -64 @@ -7879,7 +7852,7 @@ Move_INGRAIN: end Move_PRESENT: - loadspritegfx 0x27F0 + loadspritegfx ANIM_TAG_224 createvisualtask AnimTask_IsHealingMove, 2 createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, -64 @@ -7895,7 +7868,7 @@ Move_PRESENT: end PresentDamage: - loadspritegfx 0x27D6 + loadspritegfx ANIM_TAG_198 playsewithpan SE_W120, +63 createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 delay 6 @@ -7913,7 +7886,7 @@ PresentDamage: end PresentHeal: - loadspritegfx 0x27D3 + loadspritegfx ANIM_TAG_195 loadspritegfx ANIM_TAG_031 playsewithpan SE_W234, +63 createsprite gUnknown_08592658, 132, -16, 32, -3, 1 @@ -7939,7 +7912,7 @@ PresentHeal: end Move_BATON_PASS: - loadspritegfx 0x27F2 + loadspritegfx ANIM_TAG_226 playsewithpan SE_W226, -64 createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gUnknown_085CE370, 2 @@ -7966,13 +7939,13 @@ Move_PERISH_SONG: createsprite gUnknown_08593C24, 4, 15, 0, 0 delay 20 panse_1B SE_W195, -64, +63, +2, 0 - delay 0x50 + delay 80 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_BLACK createvisualtask sub_811489C, 5, 4, 0 createvisualtask sub_811489C, 5, 5, 0 createvisualtask sub_811489C, 5, 6, 0 createvisualtask sub_811489C, 5, 7, 0 - delay 0x64 + delay 100 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 16, 0, RGB_BLACK createvisualtask sub_811489C, 5, 4, 1 createvisualtask sub_811489C, 5, 5, 1 @@ -7982,7 +7955,7 @@ Move_PERISH_SONG: end Move_SLEEP_TALK: - loadspritegfx 0x27F4 + loadspritegfx ANIM_TAG_228 createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 @@ -8009,7 +7982,7 @@ Move_SLEEP_TALK: end Move_HYPER_FANG: - loadspritegfx 0x27D0 + loadspritegfx ANIM_TAG_192 playsewithpan SE_W044, +63 delay 1 delay 2 @@ -8029,21 +8002,18 @@ HyperFangContinue: waitbgfadein waitforvisualfinish end - HyperFangOnOpponent: fadetobg BG_IMPACT_OPPONENT goto HyperFangContinue - HyperFangOnPlayer: fadetobg BG_IMPACT_PLAYER goto HyperFangContinue - HyperFangInContest: fadetobg BG_IMPACT_CONTESTS goto HyperFangContinue Move_TRI_ATTACK: - loadspritegfx 0x27F6 + loadspritegfx ANIM_TAG_230 createsprite gUnknown_085CE2F8, 130, 16, 0 playsewithpan SE_W161, -64 delay 20 @@ -8072,7 +8042,7 @@ Move_TRI_ATTACK: delay 2 createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx 0x2735 + loadspritegfx ANIM_TAG_037 createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, +63 createsprite gUnknown_085956C0, 130, 0, -48 @@ -8092,8 +8062,8 @@ Move_TRI_ATTACK: end Move_WILL_O_WISP: - loadspritegfx 0x27F8 - loadspritegfx 0x27F7 + loadspritegfx ANIM_TAG_232 + loadspritegfx ANIM_TAG_231 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, -64 @@ -8106,7 +8076,7 @@ Move_WILL_O_WISP: createsprite gUnknown_0859563C, 4, 0, 0, 2 delay 3 createsprite gUnknown_0859563C, 4, 0, 0, 3 - delay 0x28 + delay 40 createvisualtask sub_8159278, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 @@ -8123,8 +8093,8 @@ Move_WILL_O_WISP: end Move_ENCORE: - loadspritegfx 0x27F3 - loadspritegfx 0x2807 + loadspritegfx ANIM_TAG_227 + loadspritegfx ANIM_TAG_247 createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8143,8 +8113,8 @@ Move_ENCORE: end Move_TRICK: - loadspritegfx 0x27F0 - loadspritegfx 0x27DF + loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_207 createsprite gUnknown_085926E8, 2, -40, 80 createsprite gUnknown_085926E8, 2, -40, 208 delay 16 @@ -8171,12 +8141,12 @@ Move_TRICK: end Move_WISH: - loadspritegfx 0x27F9 + loadspritegfx ANIM_TAG_233 loadspritegfx ANIM_TAG_049 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, +63, -64, -3, 0 - createsprite gUnknown_085CE388, 0x28 + createsprite gUnknown_085CE388, 40 waitforvisualfinish delay 60 loopsewithpan SE_W215, -64, 16, 3 @@ -8187,7 +8157,7 @@ Move_WISH: end Move_STOCKPILE: - loadspritegfx 0x27FB + loadspritegfx ANIM_TAG_235 playsewithpan SE_W025, -64 createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_815B65C, 5 @@ -8216,12 +8186,12 @@ Stockpile1: return Move_SPIT_UP: - loadspritegfx 0x27FD + loadspritegfx ANIM_TAG_237 loadspritegfx ANIM_TAG_135 playsewithpan SE_W036, -64 createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 - delay 0x2D + delay 45 playsewithpan SE_W255, -64 delay 3 createsprite gUnknown_08593A50, 2, 0, 12 @@ -8263,12 +8233,12 @@ SpitUpStrongest: goto SpitUpContinue Move_SWALLOW: - loadspritegfx 0x27FC + loadspritegfx ANIM_TAG_236 loadspritegfx ANIM_TAG_031 playsewithpan SE_W036, -64 createvisualtask sub_815B778, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 - delay 0x26 + delay 38 playsewithpan SE_W255, -64 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1 call SwallowEffect @@ -8308,7 +8278,7 @@ Move_TRANSFORM: end Move_MORNING_SUN: - loadspritegfx 0x2801 + loadspritegfx ANIM_TAG_241 loadspritegfx ANIM_TAG_031 createvisualtask sub_815BB84, 5 delay 8 @@ -8334,14 +8304,13 @@ Move_MORNING_SUN: waitsound call HealingEffect end - MorningSun1: createsprite gUnknown_085CE48C, 2, 30, 640 delay 5 return Move_SWEET_SCENT: - loadspritegfx 0x27FE + loadspritegfx ANIM_TAG_238 playsewithpan SE_W230, -64 createsprite gUnknown_085CE544, 2, 100, 0, 100 delay 25 @@ -8353,7 +8322,6 @@ Move_SWEET_SCENT: call SweetScentEffect waitforvisualfinish end - SweetScentEffect: createsprite gUnknown_085CE544, 2, 70, 1, 64 delay 2 @@ -8380,7 +8348,7 @@ SweetScentEffect: return Move_HYPER_BEAM: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 @@ -8390,7 +8358,7 @@ Move_HYPER_BEAM: delay 30 createsoundtask sub_8158C58, 247, -64, 63, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 - createvisualtask sub_8115D94, 2, 10147, 1, 12, 31, 16, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 @@ -8423,7 +8391,6 @@ Move_HYPER_BEAM: waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 16, 0, RGB_BLACK end - HyperBeam1: createsprite gUnknown_08592288, 130 createsprite gUnknown_08592288, 130 @@ -8431,8 +8398,8 @@ HyperBeam1: return Move_FLATTER: - loadspritegfx 0x27F3 - loadspritegfx 0x2800 + loadspritegfx ANIM_TAG_227 + loadspritegfx ANIM_TAG_240 createvisualtask sub_8159244, 5, 223, 63 createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 @@ -8470,10 +8437,9 @@ Move_FLATTER: waitforvisualfinish createvisualtask sub_815AC8C, 2 end - Flatter1: - createsprite gUnknown_085CE5A8, 0x28, 0 - createsprite gUnknown_085CE5A8, 0x28, 1 + createsprite gUnknown_085CE5A8, 40, 0 + createsprite gUnknown_085CE5A8, 40, 1 return Move_ROLE_PLAY: @@ -8508,7 +8474,7 @@ Move_REFRESH: Move_BLAZE_KICK: loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W172, +63 @@ -8519,7 +8485,7 @@ Move_BLAZE_KICK: createsprite gBasicHitSplatSpriteTemplate, 130, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1 createvisualtask sub_8116620, 10, 4, 2, 0, 0, RGB_WHITE - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 3, 1, 0, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0 call FireMoveEffect waitforvisualfinish clearmonbg ANIM_TARGET @@ -8536,7 +8502,6 @@ Move_HYPER_VOICE: call HyperVoiceEffect waitforvisualfinish end - HyperVoiceEffect: createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 3, 8, 0, RGB_YELLOW createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 @@ -8555,7 +8520,7 @@ Move_SAND_TOMB: call SandTombEffect call SandTombEffect call SandTombEffect - delay 0x16 + delay 22 createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish end @@ -8580,7 +8545,7 @@ Move_SHEER_COLD: waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx 0x271A + loadspritegfx ANIM_TAG_010 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8622,12 +8587,12 @@ ArmThrustLeft: Move_MUDDY_WATER: panse_1B SE_W250, -64, +63, +2, 0 - createvisualtask sub_8107954, 2, 1 + createvisualtask AnimTask_CreateSurfWave, 2, TRUE waitforvisualfinish end Move_BULLET_SEED: - loadspritegfx 0x2716 + loadspritegfx ANIM_TAG_006 createsprite gUnknown_0859351C, 130, 20, 0 delay 5 createsprite gUnknown_0859351C, 130, 20, 0 @@ -8652,7 +8617,7 @@ Move_BULLET_SEED: end Move_DRAGON_CLAW: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loadspritegfx ANIM_TAG_039 playsewithpan SE_W221B, -64 createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) @@ -8695,7 +8660,6 @@ Move_DRAGON_CLAW: createvisualtask sub_8116620, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end - DragonClawEffect: createsprite gUnknown_08596B88, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 @@ -8715,7 +8679,7 @@ End: end Move_MUD_SHOT: - loadspritegfx 0x2813 + loadspritegfx ANIM_TAG_259 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8739,7 +8703,6 @@ Move_MUD_SHOT: clearmonbg ANIM_DEF_PARTNER blendoff end - MudShot1: createsprite gUnknown_085950FC, 3, 10, 10, 0, 16 delay 2 @@ -8748,7 +8711,7 @@ MudShot1: return Move_METEOR_MASH: - loadspritegfx 0x27F9 + loadspritegfx ANIM_TAG_233 loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 panse_1B SE_W112, -64, +63, +3, 0 @@ -8758,7 +8721,7 @@ Move_METEOR_MASH: createsprite gUnknown_085CE8DC, 131, -48, -64, 72, 32, 30 delay 10 createsprite gUnknown_085CE8DC, 131, -112, -64, 8, 32, 30 - delay 0x28 + delay 40 createsprite gUnknown_08595F14, 131, 0, 0, 0, 30 createsprite gUnknown_085CE8DC, 131, -80, -64, 40, 32, 30 delay 20 @@ -8773,7 +8736,7 @@ Move_METEOR_MASH: end Move_REVENGE: - loadspritegfx 0x2805 + loadspritegfx ANIM_TAG_245 monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W036, -64 @@ -8781,14 +8744,14 @@ Move_REVENGE: waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED waitforvisualfinish - unloadspritegfx 0x2805 - loadspritegfx 0x2806 + unloadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_246 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 playsewithpan SE_W207, +63 createsprite gUnknown_085960D0, 130, 10, -10 waitforvisualfinish - unloadspritegfx 0x2806 + unloadspritegfx ANIM_TAG_246 loadspritegfx ANIM_TAG_135 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1 createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 @@ -8802,8 +8765,8 @@ Move_REVENGE: end Move_POISON_FANG: - loadspritegfx 0x27D0 - loadspritegfx 0x27A6 + loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_150 playsewithpan SE_W044, +63 createsprite gUnknown_085CE1DC, 130 delay 10 @@ -8816,11 +8779,11 @@ Move_POISON_FANG: Move_SUBSTITUTE: playsewithpan SE_W213, -64 - createvisualtask sub_815F20C, 2 + createvisualtask AnimTask_MonToSubstitute, 2 end Move_FRENZY_PLANT: - loadspritegfx 0x27EF + loadspritegfx ANIM_TAG_223 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -8880,7 +8843,7 @@ Move_FRENZY_PLANT: end Move_METAL_SOUND: - loadspritegfx 0x2814 + loadspritegfx ANIM_TAG_260 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 @@ -8893,7 +8856,6 @@ Move_METAL_SOUND: delay 0 waitforvisualfinish end - MetalSound1: panse_1B SE_W103, -64, +63, +2, 0 createsprite gUnknown_08593458, 130, 16, 0, 0, 0, 30, 0 @@ -8902,11 +8864,9 @@ MetalSound1: Move_FOCUS_PUNCH: goto FocusPunch - FocusPunchEnd: waitforvisualfinish end - FocusPunch: loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 @@ -8940,15 +8900,12 @@ FocusPunchContinue: clearmonbg ANIM_DEF_PARTNER blendoff goto FocusPunchEnd - FocusPunchOnOpponent: fadetobg BG_IMPACT_OPPONENT goto FocusPunchContinue - FocusPunchOnPlayer: fadetobg BG_IMPACT_PLAYER goto FocusPunchContinue - FocusPunchInContest: fadetobg BG_IMPACT_CONTESTS goto FocusPunchContinue @@ -9105,12 +9062,12 @@ Move_COSMIC_POWER: createsprite gUnknown_08592B7C, 2, -15, 0, 0, 0, 32, 60 delay 8 createsprite gUnknown_08592B7C, 2, 12, -5, 0, 0, 32, 60 - delay 0x28 + delay 40 createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein waitforvisualfinish end @@ -9175,7 +9132,7 @@ Move_ROCK_TOMB: createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 delay 8 - createsprite gUnknown_08596C58, 0xC2, 3, 6, 64, 82, 0 + createsprite gUnknown_08596C58, 194, 3, 6, 64, 82, 0 delay 8 createvisualtask sub_81162A4, 2, 0, 2, 3, 1 playsewithpan SE_W070, +63 @@ -9186,21 +9143,21 @@ Move_ROCK_TOMB: playsewithpan SE_W070, +63 delay 24 playsewithpan SE_W063, +63 - createsprite gUnknown_085967AC, 0x85, 1, 50 + createsprite gUnknown_085967AC, 133, 1, 50 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish end Move_SILVER_WIND: - loadspritegfx 0x281F + loadspritegfx ANIM_TAG_271 panse_1B SE_W016, -64, +63, +2, 0 playsewithpan SE_W234, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 delay 0 - createvisualtask sub_8116664, 10, 1, 0, 0, 4, 0 + createvisualtask sub_8116664, 10, 1, 0, 0, 4, RGB_BLACK createvisualtask AnimTask_IsTargetOpponentSide, 2 jumprettrue SilverWindOnPlayer fadetobg BG_BUG_OPPONENT @@ -9210,40 +9167,39 @@ SilverWindContinue: delay 0 createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite gUnknown_08592830, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592830, 0xC2, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592830, -62, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592830, -62, -8, 18, 64, 3, 2, 2, 1 createsprite gUnknown_08592830, 120, -24, 18, 90, 5, 1, 2, 1 createsprite gUnknown_08592830, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592848, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592848, 0xC2, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592848, -62, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592848, -62, -8, 18, 64, 3, 2, 2, 1 createsprite gUnknown_08592848, 120, -24, 18, 90, 5, 1, 2, 1 createsprite gUnknown_08592848, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592860, 0xC2, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592860, 0xC2, -8, 18, 64, 3, 2, 2, 1 + createsprite gUnknown_08592860, -62, -32, 16, 0, 6, 2, 3, 1 + createsprite gUnknown_08592860, -62, -8, 18, 64, 3, 2, 2, 1 createsprite gUnknown_08592860, 120, -24, 18, 90, 5, 1, 2, 1 createsprite gUnknown_08592860, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite gUnknown_08592830, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592830, 0xC2, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592830, -62, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592830, -62, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592848, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592848, 0xC2, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592848, -62, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592848, -62, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592860, 0xC2, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592860, 0xC2, -16, 12, 192, 5, 2, 3, 1 + createsprite gUnknown_08592860, -62, -4, 16, 0, 6, 1, 2, 1 + createsprite gUnknown_08592860, -62, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, +63 clearmonbg ANIM_DEF_PARTNER delay 0 restorebg waitbgfadeout - createvisualtask sub_8116664, 10, 1, 0, 4, 0, 0 - setarg 7, 0xFFFF + createvisualtask sub_8116664, 10, 1, 0, 4, 0, RGB_BLACK + setarg 7, -1 waitbgfadein end - SilverWindOnPlayer: fadetobg BG_BUG_PLAYER waitbgfadeout @@ -9256,11 +9212,11 @@ Move_SNATCH: end Move_DIVE: - loadspritegfx 0x2820 - loadspritegfx 0x2821 + loadspritegfx ANIM_TAG_272 + loadspritegfx ANIM_TAG_273 choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: - loadspritegfx 0x27AC + loadspritegfx ANIM_TAG_156 playsewithpan SE_W029, -64 createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9277,7 +9233,7 @@ DiveSetUp1: createsprite gUnknown_085964E4, 5, 1, 0 return DiveAttack: - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_148 loadspritegfx ANIM_TAG_155 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9296,8 +9252,8 @@ DiveAttack: blendoff end DiveAttack1: - createsprite gUnknown_085964E4, 0x85, 0, 1 - createsprite gUnknown_085964E4, 0x85, 1, 1 + createsprite gUnknown_085964E4, 133, 0, 1 + createsprite gUnknown_085964E4, 133, 1, 1 return Move_ROCK_BLAST: @@ -9319,7 +9275,7 @@ Move_ROCK_BLAST: end Move_OVERHEAT: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 18 @@ -9400,8 +9356,8 @@ Move_OVERHEAT: end Move_HYDRO_CANNON: - loadspritegfx 0x27A5 - loadspritegfx 0x27A4 + loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_148 monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, -64 @@ -9442,13 +9398,13 @@ HydroCannon1: return Move_ASTONISH: - loadspritegfx 0x2821 + loadspritegfx ANIM_TAG_273 playsewithpan SE_W227, -64 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 - createsprite gUnknown_085964E4, 0x85, 0, 1 + createsprite gUnknown_085964E4, -123, 0, 1 playsewithpan SE_W166, +63 - createsprite gUnknown_085964E4, 0x85, 1, 1 + createsprite gUnknown_085964E4, -123, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 createvisualtask sub_8106020, 3 waitforvisualfinish @@ -9522,7 +9478,7 @@ SeismicToss2: return Move_MAGIC_COAT: - loadspritegfx 0x27BA + loadspritegfx ANIM_TAG_170 setalpha 0, 16 waitplaysewithpan SE_W112, -64, 15 createsprite gUnknown_085965C0, 3, 40, 0, 10170 @@ -9533,7 +9489,7 @@ Move_MAGIC_COAT: Move_WATER_PULSE: loadspritegfx ANIM_TAG_155 - loadspritegfx 0x2830 + loadspritegfx ANIM_TAG_288 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, -64 @@ -9554,7 +9510,7 @@ Move_WATER_PULSE: delay 5 playsewithpan SE_W202, -64 createsprite gUnknown_08593470, 130, 0, 0, 40, 15 - delay 0xD + delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 7, 0, RGB(0, 25, 28) @@ -9563,7 +9519,7 @@ Move_WATER_PULSE: end Move_PSYCHO_BOOST: - loadspritegfx 0x27E4 + loadspritegfx ANIM_TAG_212 monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9578,7 +9534,7 @@ Move_PSYCHO_BOOST: createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0 loopsewithpan SE_W060B, -64, 14, 10 createsprite gUnknown_08596920, 2 - delay 0x6E + delay 110 loopsewithpan SE_W060B, -64, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1 @@ -9590,14 +9546,14 @@ Move_PSYCHO_BOOST: end Move_KNOCK_OFF: - loadspritegfx 0x2825 + loadspritegfx ANIM_TAG_277 loadspritegfx ANIM_TAG_135 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 playsewithpan SE_W233, +63 createsprite gUnknown_085CE984, 130, -16, -16 delay 8 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, 131, 0, 0, 1, 2 playsewithpan SE_W004, +63 createsprite gSlideMonToOffsetSpriteTemplate, 2, 1, -12, 10, 0, 3 @@ -9639,7 +9595,7 @@ Move_SKY_UPPERCUT: createvisualtask sub_810DABC, 5, 55 waitbgfadein setalpha 12, 8 - delay 0x26 + delay 38 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1 @@ -9669,7 +9625,7 @@ Move_SKY_UPPERCUT: blendoff restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein end @@ -9687,7 +9643,7 @@ Move_SECRET_POWER: goto Move_SLAM Move_TWISTER: - loadspritegfx 0x274F + loadspritegfx ANIM_TAG_063 loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_058 monbg ANIM_DEF_PARTNER @@ -9733,8 +9689,8 @@ Move_TWISTER: end Move_MAGICAL_LEAF: - loadspritegfx 0x274F - loadspritegfx 0x27B0 + loadspritegfx ANIM_TAG_063 + loadspritegfx ANIM_TAG_160 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9770,21 +9726,21 @@ Move_MAGICAL_LEAF: createsprite gBasicHitSplatSpriteTemplate, 132, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 - setarg 7, 0xFFFF + setarg 7, -1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end Move_ICE_BALL: - loadspritegfx 0x273B + loadspritegfx ANIM_TAG_043 loadspritegfx ANIM_TAG_141 createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: playsewithpan SE_W196, -64 createsprite gUnknown_08595DE4, 130, 15, 0, -12, -16, 30, -40 - delay 0x1C + delay 28 playsewithpan SE_W280, +63 createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest @@ -9802,7 +9758,7 @@ IceBallSetIceBg: goto IceBallContinue IceBallUnsetIceBg: waitbgfadein - delay 0x2D + delay 45 restorebg waitbgfadein goto IceBallEnd @@ -9875,7 +9831,7 @@ Move_WEATHER_BALL: waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite gBattleAnimSpriteTemplate_859728C, 2, 31, 5, 1, 0x7FFF, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2 delay 1 @@ -9894,7 +9850,7 @@ WeatherBallNormal: waitforvisualfinish end WeatherBallFire: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, +63 delay 10 @@ -9915,7 +9871,7 @@ WeatherBallWater: delay 8 createsprite gUnknown_08595328, 130, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, +63 - delay 0xD + delay 13 createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, +63 waitforvisualfinish @@ -10187,7 +10143,7 @@ ElectricityEffect: return ConfusionEffect: - loopsewithpan SE_W146, +63, 0xD, 6 + loopsewithpan SE_W146, +63, 13, 6 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, 130, 0, -15, 102, 3, 90 @@ -10205,7 +10161,7 @@ SetPsychicBackground: UnsetPsychicBackground: restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein return @@ -10226,7 +10182,7 @@ SetBgFlyingContest: UnsetFlyingBg: restorebg waitbgfadeout - setarg 7, 0xFFFF + setarg 7, -1 waitbgfadein return @@ -10255,7 +10211,7 @@ UnsetSolarbeamBg: return Status_Poison: - loopsewithpan SE_W092, +63, 0xD, 6 + loopsewithpan SE_W092, +63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2 createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31) end @@ -10266,21 +10222,20 @@ Status_Confusion: end Status_Burn: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 playsewithpan SE_W172, +63 call Burn1 call Burn1 call Burn1 waitforvisualfinish end - Burn1: createsprite gUnknown_08595504, 130, -24, 24, 24, 24, 20, 1, 1 delay 4 return Status_Infatuation: - loadspritegfx 0x27E2 + loadspritegfx ANIM_TAG_210 playsewithpan SE_W204, -64 createsprite gUnknown_08593970, 3, 0, 20 delay 15 @@ -10292,7 +10247,7 @@ Status_Infatuation: end Status_Sleep: - loadspritegfx 0x27F4 + loadspritegfx ANIM_TAG_228 playsewithpan SE_W173, -64 createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 delay 30 @@ -10307,7 +10262,7 @@ Status_Paralysis: Status_Freeze: playsewithpan SE_W196, 0 - loadspritegfx 0x271A + loadspritegfx ANIM_TAG_010 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET waitplaysewithpan SE_W258, +63, 17 @@ -10317,7 +10272,7 @@ Status_Freeze: end Status_Curse: - loadspritegfx 0x27D8 + loadspritegfx ANIM_TAG_200 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 createsprite gBattleAnimSpriteTemplate_8596DE8, 130 @@ -10327,7 +10282,7 @@ Status_Curse: end Status_Nightmare: - loadspritegfx 0x27ED + loadspritegfx ANIM_TAG_221 monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 createsprite gBattleAnimSpriteTemplate_8596E00, 130 @@ -10371,14 +10326,14 @@ General_SubstituteFade: end General_SubstituteAppear: - createvisualtask sub_815F20C, 2 + createvisualtask AnimTask_MonToSubstitute, 2 end General_PokeblockThrow: createvisualtask sub_817345C, 2, 0 createvisualtask sub_81732B0, 2 delay 0 - waitplaysewithpan SE_W026, -64, 0x16 + waitplaysewithpan SE_W026, -64, 22 createsprite gBattleAnimSpriteTemplate_85E5338, 131, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, +63, 19, 2 @@ -10388,7 +10343,7 @@ General_PokeblockThrow: end General_ItemKnockoff: - loadspritegfx 0x27F0 + loadspritegfx ANIM_TAG_224 createsprite gBattleAnimSpriteTemplate_8592628, 130 end @@ -10400,7 +10355,7 @@ General_TurnTrap: jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: - loadspritegfx 0x27CA + loadspritegfx ANIM_TAG_186 loopsewithpan SE_W010, +63, 6, 2 createsprite gUnknown_08592494, 132, 0, 16, 0, 1 delay 7 @@ -10408,12 +10363,12 @@ Status_BindWrap: delay 3 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 - setarg 7, 0xFFFF + setarg 7, -1 playsewithpan SE_W020, +63 waitforvisualfinish end Status_FireSpin: - loadspritegfx 0x272D + loadspritegfx ANIM_TAG_029 playsewithpan SE_W221B, +63 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect @@ -10422,7 +10377,7 @@ Status_FireSpin: stopsound end Status_Whrilpool: - loadspritegfx 0x27A5 + loadspritegfx ANIM_TAG_149 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -10439,7 +10394,7 @@ Status_Whrilpool: clearmonbg ANIM_DEF_PARTNER end Status_Clamp: - loadspritegfx 0x27A1 + loadspritegfx ANIM_TAG_145 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -10461,7 +10416,7 @@ Status_SandTomb: playsewithpan SE_W328, +63 call SandTombEffect call SandTombEffect - delay 0x16 + delay 22 createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 7, 0, RGB(19, 17, 0) waitforvisualfinish stopsound @@ -10490,12 +10445,12 @@ General_ItemEffect: end General_SmokeballEscape: - loadspritegfx 0x2802 + loadspritegfx ANIM_TAG_242 monbg ANIM_ATTACKER setalpha 12, 4 delay 0 playsewithpan SE_BOWA2, +63 - createsprite gUnknown_085CE734, 0x80, 0, 32, 28, 30 + createsprite gUnknown_085CE734, 128, 0, 32, 28, 30 delay 4 playsewithpan SE_BOWA2, +63 createsprite gUnknown_085CE734, 127, 2, 12, 20, 30 @@ -10539,7 +10494,7 @@ General_HangedOn: end General_Rain: - loadspritegfx 0x2783 + loadspritegfx ANIM_TAG_115 playsewithpan SE_W240, -64 createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -10578,7 +10533,7 @@ General_MonHit: end General_ItemSteal: - loadspritegfx 0x27F0 + loadspritegfx ANIM_TAG_224 createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 @@ -10586,7 +10541,7 @@ General_ItemSteal: end General_SnatchMove: - loadspritegfx 0x27F0 + loadspritegfx ANIM_TAG_224 createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 delay 1 @@ -10630,16 +10585,16 @@ General_FutureSightHit: General_DoomDesireHit: createvisualtask sub_8117F10, 2 - loadspritegfx 0x27D6 + loadspritegfx ANIM_TAG_198 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask sub_815C0A4, 5 - delay 0x9 + delay 9 playsewithpan SE_W109, -64 - delay 0x9 + delay 9 playsewithpan SE_W109, 0 - delay 0x9 + delay 9 playsewithpan SE_W109, +63 delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 @@ -10663,7 +10618,7 @@ General_DoomDesireHit: end General_FocusPunchSetUp: - loadspritegfx 0x27C8 + loadspritegfx ANIM_TAG_184 playsewithpan SE_W082, -64 call EndureEffect delay 8 @@ -10676,7 +10631,7 @@ General_FocusPunchSetUp: end General_IngrainHeal: - loadspritegfx 0x27A3 + loadspritegfx ANIM_TAG_147 loadspritegfx ANIM_TAG_031 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -10757,7 +10712,7 @@ Special_BallThrow: playsewithpan SE_NAGERU, 0 createvisualtask sub_8170E04, 2 createvisualtask AnimTask_IsBallBlockedByTrainer, 2 - jumpreteq 0xFFFF, BallThrowTrainerBlock + jumpreteq -1, BallThrowTrainerBlock BallThrowEnd: waitforvisualfinish createvisualtask sub_8170D24, 2 -- cgit v1.2.3 From 0547e260a4d1e89b6efac0c85c276316186d370c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 15 Sep 2018 18:01:20 +0200 Subject: More of slot machine --- data/slot_machine.s | 207 +++++----------------------------------------------- 1 file changed, 20 insertions(+), 187 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 0896d6348..bbbba9652 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -4,173 +4,6 @@ .section .rodata .align 2, 0 -gUnknown_085A7424:: @ 85A7424 - .4byte 0x1F8 - .4byte 0x11C5 - .4byte 0x21D6 - .4byte 0x11E7 - -gUnknown_085A7434:: @ 85A7434 - window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - null_window_template - -gUnknown_085A7444:: @ 85A7444 - window_template 0, 1, 3, 20, 13, 13, 1 - -gUnknown_085A744C:: @ 85A744C - .byte 3, 1, 2, 0 - -gUnknown_083ECAAC:: @ 85A7450 - .4byte sub_8101D5C - .4byte sub_8101D8C - .4byte sub_8101DB0 - .4byte sub_8101DF4 - .4byte sub_8101E10 - .4byte sub_8101E3C - .4byte sub_8101F44 - .4byte sub_8101F60 - .4byte sub_8101F88 - .4byte sub_8101FA4 - .4byte sub_8102008 - .4byte sub_8102034 - .4byte sub_8102058 - .4byte sub_8102090 - .4byte sub_81020C8 - .4byte sub_81021E0 - .4byte sub_81021FC - .4byte sub_8102264 - .4byte sub_81022A0 - .4byte sub_81022CC - .4byte sub_81022F0 - .4byte sub_8102318 - .4byte sub_8102344 - .4byte sub_810239C - .4byte sub_81023B8 - .4byte sub_81023E0_ - .4byte sub_81023FC - .4byte sub_8102424 - .4byte sub_8102460 - -gUnknown_085A74C4:: @ 85A74C4 - .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 - -gUnknown_085A74D0:: @ 85A74D0 - .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 - -gUnknown_085A74E4:: @ 85A74E4 - .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC - -gUnknown_085A74F0:: @ 85A74F0 - .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC - -gUnknown_085A74FC:: @ 85A74FC - .2byte 2, 4, 4, 4, 8, 0 - -gUnknown_085A7508:: @ 85A7508 - .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 - -gUnknown_085A7514:: @ 85A7514 - .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 - -gUnknown_085A7520:: @ 85A7520 - .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C - -gUnknown_085A752C:: @ 85A752C - .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C - -gUnknown_085A7538:: @ 85A7538 - .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 - -gUnknown_085A7544:: @ 85A7544 - .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 - -gUnknown_085A7550:: @ 85A7550 - .2byte 5, 10, 15, 0 - -gUnknown_085A7558:: @ 85A7558 - .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C - -gUnknown_085A7568:: @ 85A7568 - .2byte 0x9E - -gUnknown_085A756A:: @ 85A756A - .2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F - -gUnknown_085A7574:: @ 85A7574 - .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC - -gUnknown_085A75C0:: @ 85A75C0 - .byte 1, 1, 2, 2 - -gUnknown_085A75C4:: @ 85A75C4 - .2byte 0x40, 0x30, 0x18, 8 - -gUnknown_085A75CC:: @ 85A75CC - .2byte 10, 8, 6, 4 - -gUnknown_085A75D4:: @ 85A75D4 - .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C - -gUnknown_085A7610:: @ 85A7610 - .4byte nullsub_51 - gUnknown_085A7614:: @ 85A7614 .2byte 16 @@ -195,12 +28,12 @@ gUnknown_085A764E:: @ 85A764E gUnknown_085A765E:: @ 85A765E .2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18 -gUnknown_085A766E:: @ 85A766E +sReelSymbols:: @ 85A766E .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 -gUnknown_085A76AD:: @ 85A76AD +gUnknown_083ECCF1:: @ 85A76AD .byte 1, 0, 5, 4, 3, 2, 0 gUnknown_083ECCF8:: @ 85A76B4 @@ -505,7 +338,7 @@ gUnknown_085A79DC:: @ 85A79DC .byte 0 .2byte 0 -gUnknown_085A7A04:: @ 85A7A04 +gUnknown_083ED048:: @ 85A7A04 .4byte gUnknown_085A7954 .4byte gUnknown_085A7964 .4byte gUnknown_085A7980 @@ -514,7 +347,7 @@ gUnknown_085A7A04:: @ 85A7A04 .4byte gUnknown_085A79DC .4byte gUnknown_085A79B4 -gUnknown_085A7A20:: @ 85A7A20 +gUnknown_083ED064:: @ 85A7A20 .4byte sub_812F7C0 .4byte sub_812F784 .4byte sub_812F794 @@ -820,16 +653,16 @@ gUnknown_085A7C8C:: @ 85A7C8C gUnknown_085A7CDC:: @ 85A7CDC .4byte gUnknown_085A7C8C -gUnknown_085A7CE0:: @ 85A7CE0 - spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 +gSpriteTemplate_83ED414:: @ 85A7CE0 + spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 -gUnknown_085A7CF8:: @ 85A7CF8 - spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8 +gSpriteTemplate_83ED42C:: @ 85A7CF8 + spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C -gUnknown_085A7D10:: @ 85A7D10 +gSpriteTemplate_83ED444:: @ 85A7D10 spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D28:: @ 85A7D28 +gSpriteTemplate_83ED45C:: @ 85A7D28 spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424 gUnknown_085A7D40:: @ 85A7D40 @@ -842,7 +675,7 @@ gUnknown_085A7D70:: @ 85A7D70 spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D88:: @ 85A7D88 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C gUnknown_085A7DA0:: @ 85A7DA0 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -916,7 +749,7 @@ gUnknown_085A7FB0:: @ 85A7FB0 subsprite -64, 0, 3, 0, 64x64 subsprite 0, 0, 3, 0, 64x64 -gUnknown_085A7FC0:: @ 85A7FC0 +gSubspriteTables_83ED704:: @ 85A7FC0 .4byte 4, gUnknown_085A7FB0 gUnknown_085A7FC8:: @ 85A7FC8 @@ -1272,29 +1105,29 @@ gUnknown_085A8402:: @ 85A8402 gUnknown_085A8404:: @ 85A8404 .byte 0xBF, 0x4A, 0, 0 -gUnknown_085A8408:: @ 85A8408 +gUnknown_083EDD08:: @ 85A8408 .4byte gUnknown_085A83FC .4byte gUnknown_085A83FE .4byte gUnknown_085A8400 .4byte gUnknown_085A8402 .4byte gUnknown_085A8404 -gUnknown_085A841C:: @ 85A841C +gUnknown_083EDD1C:: @ 85A841C .4byte gSlotMachineMenu_Pal + 0x94 .4byte gSlotMachineMenu_Pal + 0x96 .4byte gSlotMachineMenu_Pal + 0x98 .4byte gSlotMachineMenu_Pal + 0x9A .4byte gSlotMachineMenu_Pal + 0x9C -gUnknown_085A8430:: @ 85A8430 +gUnknown_083EDD30:: @ 85A8430 .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D -gUnknown_085A8435:: @ 85A8435 +gUnknown_083EDD35:: @ 85A8435 .byte 0, 0 .byte 1, 2 .byte 3, 4 -gUnknown_085A843B:: @ 85A843B +gUnknown_083EDD3B:: @ 85A843B .byte 1, 2, 2 gUnknown_085A843E:: @ 85A843E @@ -1307,12 +1140,12 @@ gUnknown_085A847E:: @ 85A847E .incbin "graphics/slot_machine/85A847E.gbapal" .align 2 -gUnknown_085A84A0:: @ 85A84A0 +gUnknown_083EDDA0:: @ 85A84A0 .4byte gUnknown_085A843E .4byte gUnknown_085A845E .4byte gUnknown_085A847E -gUnknown_085A84AC:: @ 85A84AC +gUnknown_083EDDAC:: @ 85A84AC .4byte gSlotMachineMenu_Pal + 0x20 gUnknown_085A84B0:: @ 85A84B0 @@ -1351,7 +1184,7 @@ gUnknown_085A8544:: @ 85A8544 gUnknown_085A858C:: @ 85A858C .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" -gUnknown_085A96E0:: @ 85A96E0 +sReelTimeWindowTilemap:: @ 85A96E0 @if anyone knows what this tilemap is please do share .incbin "graphics/slot_machine/85A96E0.bin" -- cgit v1.2.3 From db248dada23086ed8a5fd26d7fcce52b575768d2 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 15 Sep 2018 22:59:45 +0200 Subject: slot machine is decompiled --- data/slot_machine.s | 306 ++++++++++++++-------------------------------------- 1 file changed, 78 insertions(+), 228 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index bbbba9652..1a57f6abd 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,195 +2,45 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 - -gUnknown_085A7614:: @ 85A7614 - .2byte 16 - -gUnknown_085A7616:: @ 85A7616 - .2byte 0, 0x40, 0x80, 0xC0 - -gUnknown_085A761E:: @ 85A761E - .2byte 4, -4, 4, -4 - -gUnknown_085A7626:: @ 85A7626 - .2byte 4, 4, -4, -4 - -gUnknown_085A762E:: @ 85A762E - .2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0 - -gUnknown_085A763E:: @ 85A763E - .2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0 - -gUnknown_085A764E:: @ 85A764E - .2byte 16, 12, 16, 0, 0, 4, 8, 8 - -gUnknown_085A765E:: @ 85A765E - .2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18 - -sReelSymbols:: @ 85A766E - .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 - -gUnknown_083ECCF1:: @ 85A76AD - .byte 1, 0, 5, 4, 3, 2, 0 - -gUnknown_083ECCF8:: @ 85A76B4 - .2byte 0, 6, 0, 10, 0, 2 - -gUnknown_083ECD04:: @ 85A76C0 - .byte 1, 1, 12 - .byte 1, 1, 14 - .byte 2, 2, 14 - .byte 2, 2, 14 - .byte 2, 3, 16 - .byte 3, 3, 16 - -gUnknown_083ECD16:: @ 85A76D2 - .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 - .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 - .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E - -gUnknown_083ECD28:: @ 85A76E4 - .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 - .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 - .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 - .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF - .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 - -gUnknown_083ECD46:: @ 85A7702 - .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 - .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 - .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 - .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 - .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 - .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 - -gUnknown_083ECDAC:: @ 85A7768 - .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 - .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 - .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 - .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 - .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C - -gUnknown_083ECE12:: @ 85A77CE - .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 - -gUnknown_083ECE1C:: @ 85A77D8 - .byte 10, 0, 5, 0 - .byte 10, 0, 10, 0 - .byte 10, 0, 15, 0 - .byte 10, 0, 25, 0 - .byte 10, 0, 35, 0 - -gUnknown_083ECE30:: @ 85A77EC - .byte 0, 0 - .byte 5, 0 - .byte 10, 0 - .byte 15, 0 - .byte 20, 0 - -gUnknown_083ECE3A:: @ 85A77F6 - .byte 6, 4, 3, 2, 5, 0, 0, 0 - -gUnknown_083ECE42:: @ 85A77FE - .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 - -gUnknown_083ECE48:: @ 85A7804 - .byte 16, 0 - .byte 8, 0 - .byte 4, 0 - .byte 2, 0 - .byte 1, 0 - -sSym2Match:: @ 85A780E - .byte 7, 8, 4, 3, 0, 5, 2, 0 - -sSlotMatchFlags:: @ 85A7816 - .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 - -sSlotPayouts:: @ 85A7828 - .2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C - -gUnknown_085A783A:: @ 85A783A - .2byte 0xD0, 0x38 - .2byte 0xB8, 0 - .2byte 0xC8, 8 - .2byte 0xD8, 0x10 - .2byte 0xE8, 0x18 - .2byte 0xD0, 0x48 - .2byte 0xD0, 8 - .2byte 0xD0, 0x40 - .2byte 0xD0, 0x38 - .2byte 0xC0, 0x58 - .2byte 0xE0, 0x58 - .2byte 0xC0, 0x78 - .2byte 0xE0, 0x78 - .2byte 0x90, 0x38 - .2byte 0x110, 0x58 - .2byte 0xA8, 0x70 - .2byte 0xD0, 0x54 - .2byte 0xD0, 0x70 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0x00, 0x00 - .2byte 0 - -gUnknown_085A78C8:: @ 85A78C8 - .4byte sub_812F078 - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F3B4 - .4byte sub_812F2CC - .4byte sub_812F078 - .4byte sub_812F078 - .4byte sub_812F080 - .4byte sub_812F104 - .4byte sub_812F11C - .4byte sub_812F134 - .4byte sub_812F150 - .4byte sub_812F1B8 - .4byte sub_812F21C - .4byte sub_812F078 - .4byte sub_812F470 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F648 +.align 2 + +gUnknown_083ECF0C:: @ 85A78C8 + .4byte sub_8105C64 + .4byte sub_8105F54 + .4byte sub_8105F54 + .4byte sub_8105F54 + .4byte sub_8105F54 + .4byte sub_8105F9C + .4byte sub_8105EB4 + .4byte sub_8105C64 + .4byte sub_8105C64 + .4byte sub_8105C6C + .4byte sub_8105CF0 + .4byte sub_8105D08 + .4byte sub_8105D20 + .4byte sub_8105D3C + .4byte sub_8105DA4 + .4byte sub_8105E08 + .4byte sub_8105C64 + .4byte sub_8106058 + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81060FC + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_81061C8 + .4byte sub_8106230 gUnknown_085A7954:: @ 85A7954 .byte 0x19 @@ -348,13 +198,13 @@ gUnknown_083ED048:: @ 85A7A04 .4byte gUnknown_085A79B4 gUnknown_083ED064:: @ 85A7A20 - .4byte sub_812F7C0 - .4byte sub_812F784 - .4byte sub_812F794 - .4byte nullsub_101 - .4byte nullsub_101 - .4byte sub_812F794 - .4byte sub_812F794 + .4byte sub_810639C + .4byte sub_8106364 + .4byte sub_8106370 + .4byte nullsub_70 + .4byte nullsub_70 + .4byte sub_8106370 + .4byte sub_8106370 gUnknown_085A7A3C:: @ 85A7A3C .2byte 0 @@ -663,40 +513,40 @@ gSpriteTemplate_83ED444:: @ 85A7D10 spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gSpriteTemplate_83ED45C:: @ 85A7D28 - spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424 + spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 -gUnknown_085A7D40:: @ 85A7D40 +gSpriteTemplate_83ED474:: @ 85A7D40 spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D58:: @ 85A7D58 +gSpriteTemplate_83ED48C:: @ 85A7D58 spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D70:: @ 85A7D70 +gSpriteTemplate_83ED4A4:: @ 85A7D70 spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D88:: @ 85A7D88 +gSpriteTemplate_83ED4BC:: @ 85A7D88 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C -gUnknown_085A7DA0:: @ 85A7DA0 +gSpriteTemplate_83ED4D4:: @ 85A7DA0 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7DB8:: @ 85A7DB8 +gSpriteTemplate_83ED4EC:: @ 85A7DB8 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7DD0:: @ 85A7DD0 - spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8 +gSpriteTemplate_83ED504:: @ 85A7DD0 + spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C -gUnknown_085A7DE8:: @ 85A7DE8 - spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48 +gSpriteTemplate_83ED51C:: @ 85A7DE8 + spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 -gUnknown_085A7E00:: @ 85A7E00 - spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64 +gSpriteTemplate_83ED534:: @ 85A7E00 + spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 -gUnknown_085A7E18:: @ 85A7E18 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20 +gSpriteTemplate_83ED54C:: @ 85A7E18 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C -gUnknown_085A7E30:: @ 85A7E30 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 +gSpriteTemplate_83ED564:: @ 85A7E30 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 gUnknown_085A7E48:: @ 85A7E48 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -740,8 +590,8 @@ gUnknown_085A7F68:: @ 85A7F68 gUnknown_085A7F80:: @ 85A7F80 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7F98:: @ 85A7F98 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 +gSpriteTemplate_83ED6CC:: @ 85A7F98 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 gUnknown_085A7FB0:: @ 85A7FB0 subsprite -64, -64, 3, 0, 64x64 @@ -760,7 +610,7 @@ gUnknown_085A7FC8:: @ 85A7FC8 subsprite -32, 4, 1, 16, 32x8 subsprite 0, 4, 1, 20, 32x8 -gUnknown_085A7FE0:: @ 85A7FE0 +gSubspriteTables_83ED73C:: @ 85A7FE0 .4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 @@ -768,7 +618,7 @@ gUnknown_085A7FE8:: @ 85A7FE8 subsprite -32, 12, 1, 32, 32x8 subsprite 0, 12, 1, 36, 32x8 -gUnknown_085A7FF4:: @ 85A7FF4 +gSubspriteTables_83ED75C:: @ 85A7FF4 .4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC @@ -778,7 +628,7 @@ gUnknown_085A7FFC:: @ 85A7FFC subsprite -32, 16, 1, 40, 32x8 subsprite 0, 16, 1, 44, 32x8 -gUnknown_085A8010:: @ 85A8010 +gSubspriteTables_83ED78C:: @ 85A8010 .4byte 5, gUnknown_085A7FFC gUnknown_085A8018:: @ 85A8018 @@ -787,7 +637,7 @@ gUnknown_085A8018:: @ 85A8018 subsprite -32, 0, 1, 8, 32x8 subsprite 0, 0, 1, 12, 32x8 -gUnknown_085A8028:: @ 85A8028 +gSubspriteTables_83ED7B4:: @ 85A8028 .4byte 4, gUnknown_085A8018 gUnknown_085A8030:: @ 85A8030 @@ -795,7 +645,7 @@ gUnknown_085A8030:: @ 85A8030 subsprite -8, -4, 1, 0, 16x8 subsprite -8, 4, 1, 0, 16x8 -gUnknown_085A803C:: @ 85A803C +gSubspriteTables_83ED7D4:: @ 85A803C .4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 @@ -1006,7 +856,7 @@ gUnknown_085A8244:: @ 85A8244 gUnknown_085A825C:: @ 85A825C .4byte 6, gUnknown_085A8244 -gUnknown_085A8264:: @ 85A8264 +gUnknown_083EDB5C:: @ 85A8264 .4byte gUnknown_085A7E48 .4byte gUnknown_085A7E60 .4byte gUnknown_085A7E78 @@ -1034,7 +884,7 @@ gUnknown_085A8264:: @ 85A8264 .4byte gUnknown_085A7F08 .4byte gDummySpriteTemplate -gUnknown_085A82CC:: @ 85A82CC +gUnknown_083EDBC4:: @ 85A82CC .4byte gUnknown_085A8058 .4byte gUnknown_085A8070 .4byte gUnknown_085A8088 @@ -1063,7 +913,7 @@ gUnknown_085A82CC:: @ 85A82CC .4byte NULL .align 2 -gUnknown_085A8334:: @ 85A8334 +sSlotMachineSpriteSheets:: @ 85A8334 obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 @@ -1085,7 +935,7 @@ gUnknown_085A8334:: @ 85A8334 .align 2 .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 -gUnknown_085A83E4:: @ 85A83E4 +gUnknown_083EDCDC:: @ 85A83E4 .4byte gUnknown_08DD19F8 @ might be a palette idk .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 @@ -1157,20 +1007,20 @@ gUnknown_085A84D0:: @ 85A84D0 gUnknown_085A84F0:: @ 85A84F0 .incbin "graphics/slot_machine/85A84F0.gbapal" -gUnknown_085A8510:: @ 85A8510 +gUnknown_083EDE10:: @ 85A8510 .4byte gUnknown_085A84B0 .4byte gUnknown_085A84D0 .4byte gUnknown_085A84F0 .4byte gUnknown_08DCF230 -gUnknown_085A8520:: @ 85A8520 +gUnknown_083EDE20:: @ 85A8520 .4byte gUnknown_08DCF230 -gUnknown_085A8524:: @ 85A8524 +gPalette_83EDE24:: @ 85A8524 .incbin "graphics/slot_machine/85A8524.bin" .align 2 -gUnknown_085A8544:: @ 85A8544 +gSlotMachineSpritePalettes:: @ 85A8544 obj_pal gUnknown_08DCF170, 0 obj_pal gUnknown_08DCF190, 1 obj_pal gUnknown_08DCF1B0, 2 @@ -1181,7 +1031,7 @@ gUnknown_085A8544:: @ 85A8544 obj_pal gUnknown_08DCF1F0, 7 null_obj_pal -gUnknown_085A858C:: @ 85A858C +sReelTimeGfx:: @ 85A858C .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" sReelTimeWindowTilemap:: @ 85A96E0 -- cgit v1.2.3 From 4d2637883a55d916badb0b7b6107da5b9145b529 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 15 Sep 2018 23:19:37 +0200 Subject: Slot machine is decompiled. --- data/slot_machine.s | 201 ---------------------------------------------------- 1 file changed, 201 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 1a57f6abd..4a354d71c 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -4,207 +4,6 @@ .section .rodata .align 2 - -gUnknown_083ECF0C:: @ 85A78C8 - .4byte sub_8105C64 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F9C - .4byte sub_8105EB4 - .4byte sub_8105C64 - .4byte sub_8105C64 - .4byte sub_8105C6C - .4byte sub_8105CF0 - .4byte sub_8105D08 - .4byte sub_8105D20 - .4byte sub_8105D3C - .4byte sub_8105DA4 - .4byte sub_8105E08 - .4byte sub_8105C64 - .4byte sub_8106058 - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_8106230 - -gUnknown_085A7954:: @ 85A7954 - .byte 0x19 - .byte 0x22 - .2byte 0 - .byte 0x2 - .byte 0 - .2byte 0 - .byte 0x9 - .byte 0x10 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A7964:: @ 85A7964 - .byte 0xA - .byte 0x1 - .2byte 0 - .byte 0xB - .byte 2 - .2byte 0 - .byte 0xC - .byte 0x3 - .2byte 0 - .byte 0xD - .byte 4 - .2byte 0 - .byte 0x5 - .byte 5 - .2byte 0 - .byte 0x8 - .byte 0x6 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A7980:: @ 85A7980 - .byte 0x3 - .byte 0x7 - .2byte 0 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A798C:: @ 85A798C - .byte 0x4 - .byte 0x8 - .2byte 0 - .byte 0x6 - .byte 0x9 - .2byte 0 - .byte 0x6 - .byte 0xA - .2byte 1 - .byte 0x6 - .byte 0xB - .2byte 2 - .byte 0x6 - .byte 0xC - .2byte 3 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79A4:: @ 85A79A4 - .byte 0 - .byte 0xD - .2byte 0 - .byte 1 - .byte 0xE - .2byte 0 - .byte 0x7 - .byte 0xF - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79B4:: @ 85A79B4 - .byte 0x13 - .byte 0x1A - .2byte 0 - .byte 0x14 - .byte 0x1B - .2byte 1 - .byte 0x15 - .byte 0x1C - .2byte 2 - .byte 0xE - .byte 0x1D - .2byte 3 - .byte 0xF - .byte 0x1E - .2byte 4 - .byte 0x10 - .byte 0x1F - .2byte 5 - .byte 0x11 - .byte 0x20 - .2byte 6 - .byte 0x12 - .byte 0x21 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79DC:: @ 85A79DC - .byte 0x16 - .byte 0x12 - .2byte 0 - .byte 0x17 - .byte 0x13 - .2byte 1 - .byte 0x18 - .byte 0x14 - .2byte 2 - .byte 0xE - .byte 0x15 - .2byte 3 - .byte 0xF - .byte 0x16 - .2byte 4 - .byte 0x10 - .byte 0x17 - .2byte 5 - .byte 0x11 - .byte 0x18 - .2byte 6 - .byte 0x12 - .byte 0x19 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_083ED048:: @ 85A7A04 - .4byte gUnknown_085A7954 - .4byte gUnknown_085A7964 - .4byte gUnknown_085A7980 - .4byte gUnknown_085A798C - .4byte gUnknown_085A79A4 - .4byte gUnknown_085A79DC - .4byte gUnknown_085A79B4 - -gUnknown_083ED064:: @ 85A7A20 - .4byte sub_810639C - .4byte sub_8106364 - .4byte sub_8106370 - .4byte nullsub_70 - .4byte nullsub_70 - .4byte sub_8106370 - .4byte sub_8106370 gUnknown_085A7A3C:: @ 85A7A3C .2byte 0 -- cgit v1.2.3 From f2a76b54bdb75953f7ce1372647db9d5bec8c16e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 16 Sep 2018 11:07:48 -0500 Subject: Re-dump tileset images as RGB-indexed, rather than greyscale --- data/tilesets/primary/building/anim/0.png | Bin 141 -> 179 bytes data/tilesets/primary/building/anim/1.png | Bin 144 -> 180 bytes data/tilesets/primary/building/tiles.png | Bin 1813 -> 1575 bytes data/tilesets/primary/general/anim/0/0.png | Bin 183 -> 239 bytes data/tilesets/primary/general/anim/0/1.png | Bin 182 -> 238 bytes data/tilesets/primary/general/anim/0/2.png | Bin 183 -> 241 bytes data/tilesets/primary/general/anim/1/0.png | Bin 518 -> 608 bytes data/tilesets/primary/general/anim/1/1.png | Bin 581 -> 651 bytes data/tilesets/primary/general/anim/1/2.png | Bin 534 -> 597 bytes data/tilesets/primary/general/anim/1/3.png | Bin 527 -> 610 bytes data/tilesets/primary/general/anim/1/4.png | Bin 461 -> 534 bytes data/tilesets/primary/general/anim/1/5.png | Bin 460 -> 538 bytes data/tilesets/primary/general/anim/1/6.png | Bin 480 -> 554 bytes data/tilesets/primary/general/anim/1/7.png | Bin 521 -> 612 bytes data/tilesets/primary/general/anim/2/0.png | Bin 194 -> 259 bytes data/tilesets/primary/general/anim/2/1.png | Bin 243 -> 293 bytes data/tilesets/primary/general/anim/2/2.png | Bin 262 -> 303 bytes data/tilesets/primary/general/anim/2/3.png | Bin 280 -> 320 bytes data/tilesets/primary/general/anim/2/4.png | Bin 232 -> 281 bytes data/tilesets/primary/general/anim/2/5.png | Bin 220 -> 261 bytes data/tilesets/primary/general/anim/2/6.png | Bin 203 -> 249 bytes data/tilesets/primary/general/anim/3/0.png | Bin 136 -> 199 bytes data/tilesets/primary/general/anim/3/1.png | Bin 154 -> 214 bytes data/tilesets/primary/general/anim/3/2.png | Bin 133 -> 195 bytes data/tilesets/primary/general/anim/3/3.png | Bin 130 -> 191 bytes data/tilesets/primary/general/anim/4/0.png | Bin 304 -> 333 bytes data/tilesets/primary/general/anim/4/1.png | Bin 311 -> 341 bytes data/tilesets/primary/general/anim/4/2.png | Bin 314 -> 342 bytes data/tilesets/primary/general/anim/4/3.png | Bin 328 -> 360 bytes data/tilesets/primary/general/tiles.png | Bin 7786 -> 7622 bytes data/tilesets/primary/secret_base/tiles.png | Bin 7869 -> 7144 bytes data/tilesets/primary/secret_base/unknown_tiles.png | Bin 1316 -> 1237 bytes data/tilesets/secondary/battle_arena/tiles.png | Bin 2340 -> 2116 bytes data/tilesets/secondary/battle_dome/tiles.png | Bin 3626 -> 3239 bytes data/tilesets/secondary/battle_factory/tiles.png | Bin 3694 -> 3368 bytes data/tilesets/secondary/battle_frontier/tiles.png | Bin 2647 -> 2411 bytes .../secondary/battle_frontier_outside_east/anim/0.png | Bin 191 -> 230 bytes .../secondary/battle_frontier_outside_east/anim/1.png | Bin 188 -> 227 bytes .../secondary/battle_frontier_outside_east/anim/2.png | Bin 185 -> 225 bytes .../secondary/battle_frontier_outside_east/anim/3.png | Bin 183 -> 228 bytes .../secondary/battle_frontier_outside_east/tiles.png | Bin 3834 -> 3798 bytes .../secondary/battle_frontier_outside_west/anim/0.png | Bin 191 -> 230 bytes .../secondary/battle_frontier_outside_west/anim/1.png | Bin 188 -> 227 bytes .../secondary/battle_frontier_outside_west/anim/2.png | Bin 185 -> 225 bytes .../secondary/battle_frontier_outside_west/anim/3.png | Bin 183 -> 228 bytes .../secondary/battle_frontier_outside_west/tiles.png | Bin 5892 -> 5544 bytes .../secondary/battle_frontier_ranking_hall/tiles.png | Bin 1700 -> 1503 bytes data/tilesets/secondary/battle_palace/tiles.png | Bin 1633 -> 1573 bytes data/tilesets/secondary/battle_pike/tiles.png | Bin 4013 -> 3960 bytes data/tilesets/secondary/battle_pyramid/anim/0/0.png | Bin 228 -> 265 bytes data/tilesets/secondary/battle_pyramid/anim/0/1.png | Bin 220 -> 259 bytes data/tilesets/secondary/battle_pyramid/anim/0/2.png | Bin 219 -> 254 bytes data/tilesets/secondary/battle_pyramid/anim/1/0.png | Bin 261 -> 303 bytes data/tilesets/secondary/battle_pyramid/anim/1/1.png | Bin 267 -> 307 bytes data/tilesets/secondary/battle_pyramid/anim/1/2.png | Bin 261 -> 303 bytes data/tilesets/secondary/battle_pyramid/anim/1/3.png | Bin 105 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/4.png | Bin 86 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/5.png | Bin 86 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/6.png | Bin 106 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/7.png | Bin 393 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/8.png | Bin 105 -> 0 bytes data/tilesets/secondary/battle_pyramid/anim/1/9.png | Bin 111 -> 0 bytes data/tilesets/secondary/battle_pyramid/tiles.png | Bin 3504 -> 3256 bytes data/tilesets/secondary/battle_tent/tiles.png | Bin 2084 -> 1751 bytes data/tilesets/secondary/bike_shop/anim/0.png | Bin 250 -> 290 bytes data/tilesets/secondary/bike_shop/anim/1.png | Bin 249 -> 286 bytes data/tilesets/secondary/bike_shop/anim/2.png | Bin 219 -> 0 bytes data/tilesets/secondary/bike_shop/tiles.png | Bin 3505 -> 3300 bytes data/tilesets/secondary/brendans_mays_house/tiles.png | Bin 3074 -> 2658 bytes data/tilesets/secondary/cable_club/tiles.png | Bin 2590 -> 2477 bytes data/tilesets/secondary/cable_club/unknown_tiles.png | Bin 311 -> 332 bytes data/tilesets/secondary/cave/anim/0.png | Bin 100 -> 157 bytes data/tilesets/secondary/cave/anim/1.png | Bin 126 -> 181 bytes data/tilesets/secondary/cave/anim/2.png | Bin 108 -> 173 bytes data/tilesets/secondary/cave/anim/3.png | Bin 109 -> 175 bytes data/tilesets/secondary/cave/anim/unused/0.png | Bin 100 -> 157 bytes data/tilesets/secondary/cave/anim/unused/1.png | Bin 121 -> 177 bytes data/tilesets/secondary/cave/anim/unused/2.png | Bin 108 -> 173 bytes data/tilesets/secondary/cave/anim/unused/3.png | Bin 105 -> 171 bytes data/tilesets/secondary/cave/tiles.png | Bin 5884 -> 5787 bytes data/tilesets/secondary/contest/tiles.png | Bin 1650 -> 1655 bytes data/tilesets/secondary/dewford/anim/0.png | Bin 185 -> 224 bytes data/tilesets/secondary/dewford/anim/1.png | Bin 185 -> 222 bytes data/tilesets/secondary/dewford/anim/2.png | Bin 185 -> 228 bytes data/tilesets/secondary/dewford/anim/3.png | Bin 192 -> 234 bytes data/tilesets/secondary/dewford/tiles.png | Bin 3985 -> 3810 bytes data/tilesets/secondary/dewford_gym/tiles.png | Bin 640 -> 650 bytes data/tilesets/secondary/elite_four/anim/0/0.png | Bin 91 -> 152 bytes data/tilesets/secondary/elite_four/anim/0/1.png | Bin 91 -> 152 bytes data/tilesets/secondary/elite_four/anim/0/2.png | Bin 91 -> 152 bytes data/tilesets/secondary/elite_four/anim/0/3.png | Bin 91 -> 152 bytes data/tilesets/secondary/elite_four/anim/1/0.png | Bin 135 -> 171 bytes data/tilesets/secondary/elite_four/anim/1/1.png | Bin 72 -> 129 bytes data/tilesets/secondary/elite_four/anim/1/2.png | Bin 1260 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/3.png | Bin 1184 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/4.png | Bin 1190 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/5.png | Bin 1248 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/6.png | Bin 1161 -> 0 bytes data/tilesets/secondary/elite_four/anim/1/7.png | Bin 1153 -> 0 bytes data/tilesets/secondary/elite_four/tiles.png | Bin 2876 -> 2877 bytes data/tilesets/secondary/ever_grande/anim/0.png | Bin 204 -> 257 bytes data/tilesets/secondary/ever_grande/anim/1.png | Bin 204 -> 257 bytes data/tilesets/secondary/ever_grande/anim/2.png | Bin 197 -> 253 bytes data/tilesets/secondary/ever_grande/anim/3.png | Bin 200 -> 255 bytes data/tilesets/secondary/ever_grande/anim/4.png | Bin 204 -> 257 bytes data/tilesets/secondary/ever_grande/anim/5.png | Bin 204 -> 257 bytes data/tilesets/secondary/ever_grande/anim/6.png | Bin 201 -> 254 bytes data/tilesets/secondary/ever_grande/anim/7.png | Bin 201 -> 254 bytes data/tilesets/secondary/ever_grande/tiles.png | Bin 2208 -> 2126 bytes data/tilesets/secondary/facility/tiles.png | Bin 6352 -> 5773 bytes data/tilesets/secondary/fallarbor/tiles.png | Bin 4781 -> 4653 bytes data/tilesets/secondary/fortree/tiles.png | Bin 4342 -> 4414 bytes data/tilesets/secondary/fortree_gym/tiles.png | Bin 770 -> 824 bytes data/tilesets/secondary/generic_building/tiles.png | Bin 5607 -> 4990 bytes data/tilesets/secondary/inside_of_truck/tiles.png | Bin 545 -> 572 bytes data/tilesets/secondary/inside_ship/tiles.png | Bin 2149 -> 2050 bytes data/tilesets/secondary/island_harbor/tiles.png | Bin 5639 -> 5121 bytes data/tilesets/secondary/lab/tiles.png | Bin 2844 -> 2633 bytes data/tilesets/secondary/lavaridge/anim/0.png | Bin 83 -> 140 bytes data/tilesets/secondary/lavaridge/anim/1.png | Bin 92 -> 147 bytes data/tilesets/secondary/lavaridge/anim/2.png | Bin 88 -> 143 bytes data/tilesets/secondary/lavaridge/anim/3.png | Bin 100 -> 153 bytes data/tilesets/secondary/lavaridge/tiles.png | Bin 4215 -> 4087 bytes data/tilesets/secondary/lavaridge_gym/tiles.png | Bin 713 -> 688 bytes data/tilesets/secondary/lilycove/tiles.png | Bin 3912 -> 3652 bytes data/tilesets/secondary/lilycove_museum/tiles.png | Bin 3938 -> 3391 bytes data/tilesets/secondary/mauville/anim/0/a/0.png | Bin 177 -> 234 bytes data/tilesets/secondary/mauville/anim/0/a/1.png | Bin 175 -> 229 bytes data/tilesets/secondary/mauville/anim/0/a/2.png | Bin 171 -> 224 bytes data/tilesets/secondary/mauville/anim/0/a/3.png | Bin 160 -> 216 bytes data/tilesets/secondary/mauville/anim/0/a/4.png | Bin 178 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/5.png | Bin 177 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/6.png | Bin 175 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/7.png | Bin 171 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/8.png | Bin 160 -> 0 bytes data/tilesets/secondary/mauville/anim/0/a/9.png | Bin 178 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/0.png | Bin 177 -> 234 bytes data/tilesets/secondary/mauville/anim/0/b/1.png | Bin 175 -> 229 bytes data/tilesets/secondary/mauville/anim/0/b/2.png | Bin 171 -> 224 bytes data/tilesets/secondary/mauville/anim/0/b/3.png | Bin 160 -> 216 bytes data/tilesets/secondary/mauville/anim/0/b/4.png | Bin 72 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/5.png | Bin 72 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/6.png | Bin 72 -> 0 bytes data/tilesets/secondary/mauville/anim/0/b/7.png | Bin 72 -> 0 bytes data/tilesets/secondary/mauville/anim/1/a/0.png | Bin 177 -> 0 bytes data/tilesets/secondary/mauville/anim/1/a/1.png | Bin 178 -> 232 bytes data/tilesets/secondary/mauville/anim/1/a/2.png | Bin 171 -> 0 bytes data/tilesets/secondary/mauville/anim/1/a/3.png | Bin 160 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/0.png | Bin 177 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/1.png | Bin 178 -> 232 bytes data/tilesets/secondary/mauville/anim/1/b/2.png | Bin 171 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/3.png | Bin 160 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/4.png | Bin 100 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/5.png | Bin 121 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/6.png | Bin 108 -> 0 bytes data/tilesets/secondary/mauville/anim/1/b/7.png | Bin 105 -> 0 bytes data/tilesets/secondary/mauville/tiles.png | Bin 6372 -> 6069 bytes .../tilesets/secondary/mauville_game_corner/tiles.png | Bin 1788 -> 1608 bytes data/tilesets/secondary/mauville_gym/anim/0.png | Bin 215 -> 243 bytes data/tilesets/secondary/mauville_gym/anim/1.png | Bin 218 -> 242 bytes data/tilesets/secondary/mauville_gym/anim/2.png | Bin 106 -> 0 bytes data/tilesets/secondary/mauville_gym/anim/3.png | Bin 393 -> 0 bytes data/tilesets/secondary/mauville_gym/tiles.png | Bin 1534 -> 1496 bytes data/tilesets/secondary/meteor_falls/tiles.png | Bin 6078 -> 6021 bytes data/tilesets/secondary/mirage_tower/tiles.png | Bin 5645 -> 5585 bytes data/tilesets/secondary/mossdeep/tiles.png | Bin 4269 -> 4111 bytes .../tilesets/secondary/mossdeep_game_corner/tiles.png | Bin 893 -> 895 bytes data/tilesets/secondary/mossdeep_gym/tiles.png | Bin 969 -> 978 bytes .../tilesets/secondary/mystery_events_house/tiles.png | Bin 5383 -> 4839 bytes data/tilesets/secondary/navel_rock/tiles.png | Bin 6073 -> 5989 bytes data/tilesets/secondary/oceanic_museum/tiles.png | Bin 3219 -> 2714 bytes data/tilesets/secondary/pacifidlog/anim/0/0.png | Bin 596 -> 631 bytes data/tilesets/secondary/pacifidlog/anim/0/1.png | Bin 603 -> 655 bytes data/tilesets/secondary/pacifidlog/anim/0/2.png | Bin 625 -> 664 bytes data/tilesets/secondary/pacifidlog/anim/1/0.png | Bin 198 -> 263 bytes data/tilesets/secondary/pacifidlog/anim/1/1.png | Bin 219 -> 271 bytes data/tilesets/secondary/pacifidlog/anim/1/2.png | Bin 241 -> 284 bytes data/tilesets/secondary/pacifidlog/anim/1/3.png | Bin 213 -> 266 bytes data/tilesets/secondary/pacifidlog/anim/1/4.png | Bin 138 -> 200 bytes data/tilesets/secondary/pacifidlog/anim/1/5.png | Bin 140 -> 200 bytes data/tilesets/secondary/pacifidlog/anim/1/6.png | Bin 138 -> 200 bytes data/tilesets/secondary/pacifidlog/anim/1/7.png | Bin 200 -> 261 bytes data/tilesets/secondary/pacifidlog/tiles.png | Bin 4812 -> 4718 bytes data/tilesets/secondary/petalburg/tiles.png | Bin 1910 -> 1740 bytes data/tilesets/secondary/petalburg_gym/tiles.png | Bin 1429 -> 1272 bytes data/tilesets/secondary/pokemon_center/tiles.png | Bin 3645 -> 3487 bytes data/tilesets/secondary/pokemon_day_care/tiles.png | Bin 1528 -> 1494 bytes data/tilesets/secondary/pokemon_fan_club/tiles.png | Bin 1373 -> 1285 bytes data/tilesets/secondary/pokemon_school/tiles.png | Bin 1027 -> 1021 bytes .../secondary/pretty_petal_flower_shop/tiles.png | Bin 1951 -> 1876 bytes data/tilesets/secondary/rustboro/anim/0/0.png | Bin 119 -> 180 bytes data/tilesets/secondary/rustboro/anim/0/1.png | Bin 113 -> 170 bytes data/tilesets/secondary/rustboro/anim/0/2.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/0/3.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/0/4.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/0/5.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/0/6.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/0/7.png | Bin 72 -> 132 bytes data/tilesets/secondary/rustboro/anim/1/0.png | Bin 201 -> 252 bytes data/tilesets/secondary/rustboro/anim/1/1.png | Bin 198 -> 247 bytes data/tilesets/secondary/rustboro/anim/1/2.png | Bin 185 -> 0 bytes data/tilesets/secondary/rustboro/anim/1/3.png | Bin 192 -> 0 bytes data/tilesets/secondary/rustboro/tiles.png | Bin 4108 -> 3938 bytes data/tilesets/secondary/rustboro_gym/tiles.png | Bin 768 -> 813 bytes data/tilesets/secondary/rusturf_tunnel/tiles.png | Bin 2228 -> 2180 bytes data/tilesets/secondary/seashore_house/tiles.png | Bin 1280 -> 1147 bytes .../secondary/secret_base/blue_cave/tiles.png | Bin 905 -> 964 bytes .../secondary/secret_base/blue_cave/unused_tiles.png | Bin 903 -> 964 bytes .../secondary/secret_base/brown_cave/tiles.png | Bin 1166 -> 1128 bytes .../secondary/secret_base/brown_cave/unused_tiles.png | Bin 1163 -> 1128 bytes .../tilesets/secondary/secret_base/red_cave/tiles.png | Bin 941 -> 1000 bytes .../secondary/secret_base/red_cave/unused_tiles.png | Bin 938 -> 1000 bytes data/tilesets/secondary/secret_base/shrub/tiles.png | Bin 1177 -> 1149 bytes .../secondary/secret_base/shrub/unused_tiles.png | Bin 1173 -> 1149 bytes data/tilesets/secondary/secret_base/tree/tiles.png | Bin 1098 -> 1117 bytes .../secondary/secret_base/tree/unused_tiles.png | Bin 1095 -> 1117 bytes .../secondary/secret_base/yellow_cave/tiles.png | Bin 1127 -> 1184 bytes .../secret_base/yellow_cave/unused_tiles.png | Bin 1125 -> 1184 bytes data/tilesets/secondary/shop/tiles.png | Bin 4416 -> 3899 bytes data/tilesets/secondary/slateport/anim/0.png | Bin 179 -> 227 bytes data/tilesets/secondary/slateport/anim/1.png | Bin 181 -> 234 bytes data/tilesets/secondary/slateport/anim/2.png | Bin 179 -> 231 bytes data/tilesets/secondary/slateport/anim/3.png | Bin 181 -> 234 bytes data/tilesets/secondary/slateport/tiles.png | Bin 6985 -> 6559 bytes data/tilesets/secondary/sootopolis/anim/0.png | Bin 1201 -> 1135 bytes data/tilesets/secondary/sootopolis/anim/1.png | Bin 1262 -> 1155 bytes data/tilesets/secondary/sootopolis/anim/2.png | Bin 1260 -> 1155 bytes data/tilesets/secondary/sootopolis/anim/3.png | Bin 1184 -> 1112 bytes data/tilesets/secondary/sootopolis/anim/4.png | Bin 1190 -> 1124 bytes data/tilesets/secondary/sootopolis/anim/5.png | Bin 1248 -> 1149 bytes data/tilesets/secondary/sootopolis/anim/6.png | Bin 1161 -> 1097 bytes data/tilesets/secondary/sootopolis/anim/7.png | Bin 1153 -> 1093 bytes data/tilesets/secondary/sootopolis/tiles.png | Bin 2950 -> 2695 bytes data/tilesets/secondary/sootopolis_gym/anim/0/0.png | Bin 286 -> 341 bytes data/tilesets/secondary/sootopolis_gym/anim/0/1.png | Bin 283 -> 339 bytes data/tilesets/secondary/sootopolis_gym/anim/0/2.png | Bin 294 -> 340 bytes data/tilesets/secondary/sootopolis_gym/anim/0/3.png | Bin 91 -> 0 bytes data/tilesets/secondary/sootopolis_gym/anim/1/0.png | Bin 389 -> 363 bytes data/tilesets/secondary/sootopolis_gym/anim/1/1.png | Bin 408 -> 372 bytes data/tilesets/secondary/sootopolis_gym/anim/1/2.png | Bin 399 -> 385 bytes data/tilesets/secondary/sootopolis_gym/tiles.png | Bin 2954 -> 2818 bytes data/tilesets/secondary/trainer_hill/tiles.png | Bin 3594 -> 3359 bytes data/tilesets/secondary/trick_house_puzzle/tiles.png | Bin 2797 -> 2613 bytes data/tilesets/secondary/underwater/anim/0.png | Bin 180 -> 231 bytes data/tilesets/secondary/underwater/anim/1.png | Bin 183 -> 236 bytes data/tilesets/secondary/underwater/anim/2.png | Bin 185 -> 238 bytes data/tilesets/secondary/underwater/anim/3.png | Bin 184 -> 234 bytes data/tilesets/secondary/underwater/tiles.png | Bin 2846 -> 3014 bytes data/tilesets/secondary/union_room/tiles.png | Bin 1817 -> 1763 bytes data/tilesets/secondary/unused_1/0.png | Bin 86 -> 141 bytes data/tilesets/secondary/unused_1/1.png | Bin 86 -> 141 bytes data/tilesets/secondary/unused_1/2.png | Bin 106 -> 165 bytes data/tilesets/secondary/unused_1/3.png | Bin 393 -> 539 bytes data/tilesets/secondary/unused_1/tiles.png | Bin 77 -> 139 bytes data/tilesets/secondary/unused_2/0.png | Bin 105 -> 165 bytes data/tilesets/secondary/unused_2/1.png | Bin 111 -> 169 bytes data/tilesets/secondary/unused_2/2.png | Bin 108 -> 0 bytes data/tilesets/secondary/unused_2/3.png | Bin 105 -> 0 bytes data/tilesets/secondary/unused_2/tiles.png | Bin 979 -> 917 bytes 259 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/3.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/4.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/5.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/6.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/7.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/8.png delete mode 100644 data/tilesets/secondary/battle_pyramid/anim/1/9.png delete mode 100644 data/tilesets/secondary/bike_shop/anim/2.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/2.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/3.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/4.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/5.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/6.png delete mode 100644 data/tilesets/secondary/elite_four/anim/1/7.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/4.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/5.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/6.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/7.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/8.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/a/9.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/4.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/5.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/6.png delete mode 100644 data/tilesets/secondary/mauville/anim/0/b/7.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/a/0.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/a/2.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/a/3.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/0.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/2.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/3.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/4.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/5.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/6.png delete mode 100644 data/tilesets/secondary/mauville/anim/1/b/7.png delete mode 100644 data/tilesets/secondary/mauville_gym/anim/2.png delete mode 100644 data/tilesets/secondary/mauville_gym/anim/3.png delete mode 100644 data/tilesets/secondary/rustboro/anim/1/2.png delete mode 100644 data/tilesets/secondary/rustboro/anim/1/3.png delete mode 100644 data/tilesets/secondary/sootopolis_gym/anim/0/3.png delete mode 100644 data/tilesets/secondary/unused_2/2.png delete mode 100644 data/tilesets/secondary/unused_2/3.png (limited to 'data') diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png index 004eccc67..1d98f3621 100644 Binary files a/data/tilesets/primary/building/anim/0.png and b/data/tilesets/primary/building/anim/0.png differ diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png index e28281dea..6798473b7 100644 Binary files a/data/tilesets/primary/building/anim/1.png and b/data/tilesets/primary/building/anim/1.png differ diff --git a/data/tilesets/primary/building/tiles.png b/data/tilesets/primary/building/tiles.png index 506bb7400..bd6c0f921 100644 Binary files a/data/tilesets/primary/building/tiles.png and b/data/tilesets/primary/building/tiles.png differ diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png index d535d920e..1254a7655 100644 Binary files a/data/tilesets/primary/general/anim/0/0.png and b/data/tilesets/primary/general/anim/0/0.png differ diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png index 74f93ecce..50bd949f2 100644 Binary files a/data/tilesets/primary/general/anim/0/1.png and b/data/tilesets/primary/general/anim/0/1.png differ diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png index fb0bfe89f..5d8192c9d 100644 Binary files a/data/tilesets/primary/general/anim/0/2.png and b/data/tilesets/primary/general/anim/0/2.png differ diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png index a7bb2e631..d3f2ea0da 100644 Binary files a/data/tilesets/primary/general/anim/1/0.png and b/data/tilesets/primary/general/anim/1/0.png differ diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png index c215f1683..86b0ff176 100644 Binary files a/data/tilesets/primary/general/anim/1/1.png and b/data/tilesets/primary/general/anim/1/1.png differ diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png index f8e0ee273..d2302180e 100644 Binary files a/data/tilesets/primary/general/anim/1/2.png and b/data/tilesets/primary/general/anim/1/2.png differ diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png index 6c6ce3611..f757f8253 100644 Binary files a/data/tilesets/primary/general/anim/1/3.png and b/data/tilesets/primary/general/anim/1/3.png differ diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png index cc1f9576c..950b88585 100644 Binary files a/data/tilesets/primary/general/anim/1/4.png and b/data/tilesets/primary/general/anim/1/4.png differ diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png index 3c0c57a86..4de7d4225 100644 Binary files a/data/tilesets/primary/general/anim/1/5.png and b/data/tilesets/primary/general/anim/1/5.png differ diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png index be5ecacaa..73c1cabdd 100644 Binary files a/data/tilesets/primary/general/anim/1/6.png and b/data/tilesets/primary/general/anim/1/6.png differ diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png index 85bc7561a..827fd8b74 100644 Binary files a/data/tilesets/primary/general/anim/1/7.png and b/data/tilesets/primary/general/anim/1/7.png differ diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png index 6f9f0c309..80c99c473 100644 Binary files a/data/tilesets/primary/general/anim/2/0.png and b/data/tilesets/primary/general/anim/2/0.png differ diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png index bef1f3023..52051f056 100644 Binary files a/data/tilesets/primary/general/anim/2/1.png and b/data/tilesets/primary/general/anim/2/1.png differ diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png index b5d7a9ee9..39c6e2f87 100644 Binary files a/data/tilesets/primary/general/anim/2/2.png and b/data/tilesets/primary/general/anim/2/2.png differ diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png index 42a953a83..abb5ff362 100644 Binary files a/data/tilesets/primary/general/anim/2/3.png and b/data/tilesets/primary/general/anim/2/3.png differ diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png index 112b20077..a7bde9837 100644 Binary files a/data/tilesets/primary/general/anim/2/4.png and b/data/tilesets/primary/general/anim/2/4.png differ diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png index 7f58c0b94..05f88d81e 100644 Binary files a/data/tilesets/primary/general/anim/2/5.png and b/data/tilesets/primary/general/anim/2/5.png differ diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png index 784a543b4..01f9c203d 100644 Binary files a/data/tilesets/primary/general/anim/2/6.png and b/data/tilesets/primary/general/anim/2/6.png differ diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png index 2f8bb49b6..e307d81aa 100644 Binary files a/data/tilesets/primary/general/anim/3/0.png and b/data/tilesets/primary/general/anim/3/0.png differ diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png index 5a2744a66..df6aaf3bc 100644 Binary files a/data/tilesets/primary/general/anim/3/1.png and b/data/tilesets/primary/general/anim/3/1.png differ diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png index 0ddf1cda7..560f89d06 100644 Binary files a/data/tilesets/primary/general/anim/3/2.png and b/data/tilesets/primary/general/anim/3/2.png differ diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png index f3fee8470..a8db289ae 100644 Binary files a/data/tilesets/primary/general/anim/3/3.png and b/data/tilesets/primary/general/anim/3/3.png differ diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png index 90dc0bc02..ba160b633 100644 Binary files a/data/tilesets/primary/general/anim/4/0.png and b/data/tilesets/primary/general/anim/4/0.png differ diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png index 4459a94e5..48274c9a0 100644 Binary files a/data/tilesets/primary/general/anim/4/1.png and b/data/tilesets/primary/general/anim/4/1.png differ diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png index 389875c31..9e1f98c1b 100644 Binary files a/data/tilesets/primary/general/anim/4/2.png and b/data/tilesets/primary/general/anim/4/2.png differ diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png index ac8936cce..c5b446f65 100644 Binary files a/data/tilesets/primary/general/anim/4/3.png and b/data/tilesets/primary/general/anim/4/3.png differ diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png index 121e835a2..17426ab80 100644 Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png index 9dee014ea..e19d61a9d 100644 Binary files a/data/tilesets/primary/secret_base/tiles.png and b/data/tilesets/primary/secret_base/tiles.png differ diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png index 3ca4d9e87..2511e18b0 100644 Binary files a/data/tilesets/primary/secret_base/unknown_tiles.png and b/data/tilesets/primary/secret_base/unknown_tiles.png differ diff --git a/data/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png index 7414666df..c0592a0b4 100644 Binary files a/data/tilesets/secondary/battle_arena/tiles.png and b/data/tilesets/secondary/battle_arena/tiles.png differ diff --git a/data/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png index be3708bfd..04ebc0e75 100644 Binary files a/data/tilesets/secondary/battle_dome/tiles.png and b/data/tilesets/secondary/battle_dome/tiles.png differ diff --git a/data/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png index 4d9463b20..381cddabf 100644 Binary files a/data/tilesets/secondary/battle_factory/tiles.png and b/data/tilesets/secondary/battle_factory/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png index 1b14ce555..0b39cbc02 100644 Binary files a/data/tilesets/secondary/battle_frontier/tiles.png and b/data/tilesets/secondary/battle_frontier/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png index 8a9905198..98f1a9283 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png and b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png index 836986b12..d0254e9ee 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png and b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png index 660d3080f..1be9641b8 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png and b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png index 7fe571b4a..7a536f24c 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png and b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png index da34656d1..59ac5b7e9 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png and b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png index 8a9905198..98f1a9283 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png and b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png index 836986b12..d0254e9ee 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png and b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png index 660d3080f..1be9641b8 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png and b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png index 7fe571b4a..7a536f24c 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png and b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png differ diff --git a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png index 03704bfd0..277abe7f8 100644 Binary files a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png and b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png differ diff --git a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png index 1c1f700c0..9e82b5fe2 100644 Binary files a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png and b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png differ diff --git a/data/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png index 4e11e3596..1137db188 100644 Binary files a/data/tilesets/secondary/battle_palace/tiles.png and b/data/tilesets/secondary/battle_palace/tiles.png differ diff --git a/data/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png index fc11f1d1a..7750506d8 100644 Binary files a/data/tilesets/secondary/battle_pike/tiles.png and b/data/tilesets/secondary/battle_pike/tiles.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png index c0fb59c0e..04bb8ad84 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/0.png and b/data/tilesets/secondary/battle_pyramid/anim/0/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png index 29c019209..e292686f9 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/1.png and b/data/tilesets/secondary/battle_pyramid/anim/0/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png index 7c463d9c3..fa24db001 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/0/2.png and b/data/tilesets/secondary/battle_pyramid/anim/0/2.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png index 2a0921dea..c135df824 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/0.png and b/data/tilesets/secondary/battle_pyramid/anim/1/0.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png index 3474d081f..2588bdac0 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/1.png and b/data/tilesets/secondary/battle_pyramid/anim/1/1.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png index b9f1c4423..fbbf67d2f 100644 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/2.png and b/data/tilesets/secondary/battle_pyramid/anim/1/2.png differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/3.png b/data/tilesets/secondary/battle_pyramid/anim/1/3.png deleted file mode 100644 index 8ad81b1e1..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/3.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/4.png b/data/tilesets/secondary/battle_pyramid/anim/1/4.png deleted file mode 100644 index bea921d90..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/4.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/5.png b/data/tilesets/secondary/battle_pyramid/anim/1/5.png deleted file mode 100644 index bea921d90..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/5.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/6.png b/data/tilesets/secondary/battle_pyramid/anim/1/6.png deleted file mode 100644 index 16652df19..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/6.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/7.png b/data/tilesets/secondary/battle_pyramid/anim/1/7.png deleted file mode 100644 index 8ea7a49e6..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/7.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/8.png b/data/tilesets/secondary/battle_pyramid/anim/1/8.png deleted file mode 100644 index 2895d3319..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/8.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/9.png b/data/tilesets/secondary/battle_pyramid/anim/1/9.png deleted file mode 100644 index 63c22acf2..000000000 Binary files a/data/tilesets/secondary/battle_pyramid/anim/1/9.png and /dev/null differ diff --git a/data/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png index d9609f3dd..d6784b06a 100644 Binary files a/data/tilesets/secondary/battle_pyramid/tiles.png and b/data/tilesets/secondary/battle_pyramid/tiles.png differ diff --git a/data/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png index 35e5c4b65..c9f646906 100644 Binary files a/data/tilesets/secondary/battle_tent/tiles.png and b/data/tilesets/secondary/battle_tent/tiles.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png index 069509b27..127ed4e47 100644 Binary files a/data/tilesets/secondary/bike_shop/anim/0.png and b/data/tilesets/secondary/bike_shop/anim/0.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png index 4123bb0bf..71f12a746 100644 Binary files a/data/tilesets/secondary/bike_shop/anim/1.png and b/data/tilesets/secondary/bike_shop/anim/1.png differ diff --git a/data/tilesets/secondary/bike_shop/anim/2.png b/data/tilesets/secondary/bike_shop/anim/2.png deleted file mode 100644 index 7c463d9c3..000000000 Binary files a/data/tilesets/secondary/bike_shop/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png index e068538f5..f4f48fca3 100644 Binary files a/data/tilesets/secondary/bike_shop/tiles.png and b/data/tilesets/secondary/bike_shop/tiles.png differ diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png index 6d6a5f047..f54e2ae15 100644 Binary files a/data/tilesets/secondary/brendans_mays_house/tiles.png and b/data/tilesets/secondary/brendans_mays_house/tiles.png differ diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png index c5ad4cfac..7d2378a06 100644 Binary files a/data/tilesets/secondary/cable_club/tiles.png and b/data/tilesets/secondary/cable_club/tiles.png differ diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png index 84e79f720..46e0916f3 100644 Binary files a/data/tilesets/secondary/cable_club/unknown_tiles.png and b/data/tilesets/secondary/cable_club/unknown_tiles.png differ diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png index 67f294ffe..e98a161eb 100644 Binary files a/data/tilesets/secondary/cave/anim/0.png and b/data/tilesets/secondary/cave/anim/0.png differ diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png index 9c92be807..12ffcd12c 100644 Binary files a/data/tilesets/secondary/cave/anim/1.png and b/data/tilesets/secondary/cave/anim/1.png differ diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png index 78ea00e04..c5be89c00 100644 Binary files a/data/tilesets/secondary/cave/anim/2.png and b/data/tilesets/secondary/cave/anim/2.png differ diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png index 7edd52eaa..635a81154 100644 Binary files a/data/tilesets/secondary/cave/anim/3.png and b/data/tilesets/secondary/cave/anim/3.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png index 44564e67a..cea6ece85 100644 Binary files a/data/tilesets/secondary/cave/anim/unused/0.png and b/data/tilesets/secondary/cave/anim/unused/0.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png index 47e7e17ee..01d8a300a 100644 Binary files a/data/tilesets/secondary/cave/anim/unused/1.png and b/data/tilesets/secondary/cave/anim/unused/1.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png index d1447cde2..ba13bda8c 100644 Binary files a/data/tilesets/secondary/cave/anim/unused/2.png and b/data/tilesets/secondary/cave/anim/unused/2.png differ diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png index 8ad81b1e1..117f04aa4 100644 Binary files a/data/tilesets/secondary/cave/anim/unused/3.png and b/data/tilesets/secondary/cave/anim/unused/3.png differ diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png index e8c98dd71..cd9a83701 100644 Binary files a/data/tilesets/secondary/cave/tiles.png and b/data/tilesets/secondary/cave/tiles.png differ diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png index 710654f5f..f9a1b5cd9 100644 Binary files a/data/tilesets/secondary/contest/tiles.png and b/data/tilesets/secondary/contest/tiles.png differ diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png index adf42975f..f80971c45 100644 Binary files a/data/tilesets/secondary/dewford/anim/0.png and b/data/tilesets/secondary/dewford/anim/0.png differ diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png index 6e7c23a18..b98d9cafb 100644 Binary files a/data/tilesets/secondary/dewford/anim/1.png and b/data/tilesets/secondary/dewford/anim/1.png differ diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png index 86075ffb0..6f88f493f 100644 Binary files a/data/tilesets/secondary/dewford/anim/2.png and b/data/tilesets/secondary/dewford/anim/2.png differ diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png index 6e3c57621..b95b4bc9e 100644 Binary files a/data/tilesets/secondary/dewford/anim/3.png and b/data/tilesets/secondary/dewford/anim/3.png differ diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png index 1cf4c165c..33e61b435 100644 Binary files a/data/tilesets/secondary/dewford/tiles.png and b/data/tilesets/secondary/dewford/tiles.png differ diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png index 7d923b505..2aa68bb2a 100644 Binary files a/data/tilesets/secondary/dewford_gym/tiles.png and b/data/tilesets/secondary/dewford_gym/tiles.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png index 806d26e57..108a2099b 100644 Binary files a/data/tilesets/secondary/elite_four/anim/0/0.png and b/data/tilesets/secondary/elite_four/anim/0/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png index 2a8e6a31c..64b23f061 100644 Binary files a/data/tilesets/secondary/elite_four/anim/0/1.png and b/data/tilesets/secondary/elite_four/anim/0/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png index c4e6161a6..0d9f603fc 100644 Binary files a/data/tilesets/secondary/elite_four/anim/0/2.png and b/data/tilesets/secondary/elite_four/anim/0/2.png differ diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png index 2a8e6a31c..64b23f061 100644 Binary files a/data/tilesets/secondary/elite_four/anim/0/3.png and b/data/tilesets/secondary/elite_four/anim/0/3.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png index 7822d1896..6e508308b 100644 Binary files a/data/tilesets/secondary/elite_four/anim/1/0.png and b/data/tilesets/secondary/elite_four/anim/1/0.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png index 66d60e90b..794f26195 100644 Binary files a/data/tilesets/secondary/elite_four/anim/1/1.png and b/data/tilesets/secondary/elite_four/anim/1/1.png differ diff --git a/data/tilesets/secondary/elite_four/anim/1/2.png b/data/tilesets/secondary/elite_four/anim/1/2.png deleted file mode 100644 index 09fb59fbf..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/3.png b/data/tilesets/secondary/elite_four/anim/1/3.png deleted file mode 100644 index 0c7c05034..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/3.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/4.png b/data/tilesets/secondary/elite_four/anim/1/4.png deleted file mode 100644 index 317db1714..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/4.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/5.png b/data/tilesets/secondary/elite_four/anim/1/5.png deleted file mode 100644 index d0cbfeb57..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/5.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/6.png b/data/tilesets/secondary/elite_four/anim/1/6.png deleted file mode 100644 index 4b35ededd..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/6.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/anim/1/7.png b/data/tilesets/secondary/elite_four/anim/1/7.png deleted file mode 100644 index dfe698edb..000000000 Binary files a/data/tilesets/secondary/elite_four/anim/1/7.png and /dev/null differ diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png index d16b2db03..751f5d8cd 100644 Binary files a/data/tilesets/secondary/elite_four/tiles.png and b/data/tilesets/secondary/elite_four/tiles.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png index 7536d08ad..ac03df40b 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/0.png and b/data/tilesets/secondary/ever_grande/anim/0.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png index 7536d08ad..ac03df40b 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/1.png and b/data/tilesets/secondary/ever_grande/anim/1.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png index f0835aa3b..4f8baa2a3 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/2.png and b/data/tilesets/secondary/ever_grande/anim/2.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png index c07cbbd17..f120dee16 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/3.png and b/data/tilesets/secondary/ever_grande/anim/3.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png index 7536d08ad..ac03df40b 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/4.png and b/data/tilesets/secondary/ever_grande/anim/4.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png index 7536d08ad..ac03df40b 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/5.png and b/data/tilesets/secondary/ever_grande/anim/5.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png index 9b5030306..d7cfd4529 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/6.png and b/data/tilesets/secondary/ever_grande/anim/6.png differ diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png index 9b5030306..d7cfd4529 100644 Binary files a/data/tilesets/secondary/ever_grande/anim/7.png and b/data/tilesets/secondary/ever_grande/anim/7.png differ diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png index 943a3f8f4..a8ff3a742 100644 Binary files a/data/tilesets/secondary/ever_grande/tiles.png and b/data/tilesets/secondary/ever_grande/tiles.png differ diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png index f99c24150..7f48c6a99 100644 Binary files a/data/tilesets/secondary/facility/tiles.png and b/data/tilesets/secondary/facility/tiles.png differ diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png index 21ab321ef..3582d1d03 100644 Binary files a/data/tilesets/secondary/fallarbor/tiles.png and b/data/tilesets/secondary/fallarbor/tiles.png differ diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png index 78cb1c1ae..9cd688c5e 100644 Binary files a/data/tilesets/secondary/fortree/tiles.png and b/data/tilesets/secondary/fortree/tiles.png differ diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png index 932b5c06a..aa10752cd 100644 Binary files a/data/tilesets/secondary/fortree_gym/tiles.png and b/data/tilesets/secondary/fortree_gym/tiles.png differ diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png index 6f681f837..4a79b0f04 100644 Binary files a/data/tilesets/secondary/generic_building/tiles.png and b/data/tilesets/secondary/generic_building/tiles.png differ diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png index 65a82e888..59a24b705 100644 Binary files a/data/tilesets/secondary/inside_of_truck/tiles.png and b/data/tilesets/secondary/inside_of_truck/tiles.png differ diff --git a/data/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png index 77142a755..5ddbe2859 100644 Binary files a/data/tilesets/secondary/inside_ship/tiles.png and b/data/tilesets/secondary/inside_ship/tiles.png differ diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png index 82e419e72..12ec2b1df 100644 Binary files a/data/tilesets/secondary/island_harbor/tiles.png and b/data/tilesets/secondary/island_harbor/tiles.png differ diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png index 6a213d960..cd401d24a 100644 Binary files a/data/tilesets/secondary/lab/tiles.png and b/data/tilesets/secondary/lab/tiles.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png index 303855f71..434041fbd 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/0.png and b/data/tilesets/secondary/lavaridge/anim/0.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png index 7cdee79e2..ebc028ed4 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/1.png and b/data/tilesets/secondary/lavaridge/anim/1.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png index b5810b806..aee227f05 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/2.png and b/data/tilesets/secondary/lavaridge/anim/2.png differ diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png index caf7b5698..99149ae62 100644 Binary files a/data/tilesets/secondary/lavaridge/anim/3.png and b/data/tilesets/secondary/lavaridge/anim/3.png differ diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png index 896c43194..2f6898a0f 100644 Binary files a/data/tilesets/secondary/lavaridge/tiles.png and b/data/tilesets/secondary/lavaridge/tiles.png differ diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png index 8734cc3bf..f5c25c6bb 100644 Binary files a/data/tilesets/secondary/lavaridge_gym/tiles.png and b/data/tilesets/secondary/lavaridge_gym/tiles.png differ diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png index b77f3d379..44111c448 100644 Binary files a/data/tilesets/secondary/lilycove/tiles.png and b/data/tilesets/secondary/lilycove/tiles.png differ diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png index 5bcc0ecfe..d0f0cf036 100644 Binary files a/data/tilesets/secondary/lilycove_museum/tiles.png and b/data/tilesets/secondary/lilycove_museum/tiles.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png index 88b028b52..b20c5470e 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/a/0.png and b/data/tilesets/secondary/mauville/anim/0/a/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png index ce4010db2..0587295fc 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/a/1.png and b/data/tilesets/secondary/mauville/anim/0/a/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png index 5ea20f6db..af0dd4ffe 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/a/2.png and b/data/tilesets/secondary/mauville/anim/0/a/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png index fdf4d30bf..bc132f2ef 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/a/3.png and b/data/tilesets/secondary/mauville/anim/0/a/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/4.png b/data/tilesets/secondary/mauville/anim/0/a/4.png deleted file mode 100644 index c8097808c..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/4.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/5.png b/data/tilesets/secondary/mauville/anim/0/a/5.png deleted file mode 100644 index 88b028b52..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/5.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/6.png b/data/tilesets/secondary/mauville/anim/0/a/6.png deleted file mode 100644 index ce4010db2..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/6.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/7.png b/data/tilesets/secondary/mauville/anim/0/a/7.png deleted file mode 100644 index 5ea20f6db..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/7.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/8.png b/data/tilesets/secondary/mauville/anim/0/a/8.png deleted file mode 100644 index fdf4d30bf..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/8.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/a/9.png b/data/tilesets/secondary/mauville/anim/0/a/9.png deleted file mode 100644 index c8097808c..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/a/9.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png index 88b028b52..b20c5470e 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/b/0.png and b/data/tilesets/secondary/mauville/anim/0/b/0.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png index ce4010db2..0587295fc 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/b/1.png and b/data/tilesets/secondary/mauville/anim/0/b/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png index 5ea20f6db..af0dd4ffe 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/b/2.png and b/data/tilesets/secondary/mauville/anim/0/b/2.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png index fdf4d30bf..bc132f2ef 100644 Binary files a/data/tilesets/secondary/mauville/anim/0/b/3.png and b/data/tilesets/secondary/mauville/anim/0/b/3.png differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/4.png b/data/tilesets/secondary/mauville/anim/0/b/4.png deleted file mode 100644 index 91f368cf8..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/4.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/5.png b/data/tilesets/secondary/mauville/anim/0/b/5.png deleted file mode 100644 index 91f368cf8..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/5.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/6.png b/data/tilesets/secondary/mauville/anim/0/b/6.png deleted file mode 100644 index 91f368cf8..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/6.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/0/b/7.png b/data/tilesets/secondary/mauville/anim/0/b/7.png deleted file mode 100644 index 91f368cf8..000000000 Binary files a/data/tilesets/secondary/mauville/anim/0/b/7.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/0.png b/data/tilesets/secondary/mauville/anim/1/a/0.png deleted file mode 100644 index 88b028b52..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/a/0.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png index c8097808c..911b980a3 100644 Binary files a/data/tilesets/secondary/mauville/anim/1/a/1.png and b/data/tilesets/secondary/mauville/anim/1/a/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/2.png b/data/tilesets/secondary/mauville/anim/1/a/2.png deleted file mode 100644 index 5ea20f6db..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/a/2.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/a/3.png b/data/tilesets/secondary/mauville/anim/1/a/3.png deleted file mode 100644 index fdf4d30bf..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/a/3.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/0.png b/data/tilesets/secondary/mauville/anim/1/b/0.png deleted file mode 100644 index 88b028b52..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/0.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png index c8097808c..911b980a3 100644 Binary files a/data/tilesets/secondary/mauville/anim/1/b/1.png and b/data/tilesets/secondary/mauville/anim/1/b/1.png differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/2.png b/data/tilesets/secondary/mauville/anim/1/b/2.png deleted file mode 100644 index 5ea20f6db..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/2.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/3.png b/data/tilesets/secondary/mauville/anim/1/b/3.png deleted file mode 100644 index fdf4d30bf..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/3.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/4.png b/data/tilesets/secondary/mauville/anim/1/b/4.png deleted file mode 100644 index 44564e67a..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/4.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/5.png b/data/tilesets/secondary/mauville/anim/1/b/5.png deleted file mode 100644 index 47e7e17ee..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/5.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/6.png b/data/tilesets/secondary/mauville/anim/1/b/6.png deleted file mode 100644 index d1447cde2..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/6.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/anim/1/b/7.png b/data/tilesets/secondary/mauville/anim/1/b/7.png deleted file mode 100644 index 8ad81b1e1..000000000 Binary files a/data/tilesets/secondary/mauville/anim/1/b/7.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png index e4ce0d4f8..208a052c5 100644 Binary files a/data/tilesets/secondary/mauville/tiles.png and b/data/tilesets/secondary/mauville/tiles.png differ diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png index 3f7f565c9..50e341fde 100644 Binary files a/data/tilesets/secondary/mauville_game_corner/tiles.png and b/data/tilesets/secondary/mauville_game_corner/tiles.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png index 090fe6a1a..ebf603978 100644 Binary files a/data/tilesets/secondary/mauville_gym/anim/0.png and b/data/tilesets/secondary/mauville_gym/anim/0.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png index 48f325890..34072707f 100644 Binary files a/data/tilesets/secondary/mauville_gym/anim/1.png and b/data/tilesets/secondary/mauville_gym/anim/1.png differ diff --git a/data/tilesets/secondary/mauville_gym/anim/2.png b/data/tilesets/secondary/mauville_gym/anim/2.png deleted file mode 100644 index 16652df19..000000000 Binary files a/data/tilesets/secondary/mauville_gym/anim/2.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville_gym/anim/3.png b/data/tilesets/secondary/mauville_gym/anim/3.png deleted file mode 100644 index 8ea7a49e6..000000000 Binary files a/data/tilesets/secondary/mauville_gym/anim/3.png and /dev/null differ diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png index 5606bb101..04c2f9394 100644 Binary files a/data/tilesets/secondary/mauville_gym/tiles.png and b/data/tilesets/secondary/mauville_gym/tiles.png differ diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png index 9c7532805..9d47866bd 100644 Binary files a/data/tilesets/secondary/meteor_falls/tiles.png and b/data/tilesets/secondary/meteor_falls/tiles.png differ diff --git a/data/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png index fd2904ca1..0d7ee0d68 100644 Binary files a/data/tilesets/secondary/mirage_tower/tiles.png and b/data/tilesets/secondary/mirage_tower/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png index 818406b23..cc4591f88 100644 Binary files a/data/tilesets/secondary/mossdeep/tiles.png and b/data/tilesets/secondary/mossdeep/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png index f09edf436..cfe709805 100644 Binary files a/data/tilesets/secondary/mossdeep_game_corner/tiles.png and b/data/tilesets/secondary/mossdeep_game_corner/tiles.png differ diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png index 36a0873a4..357774a42 100644 Binary files a/data/tilesets/secondary/mossdeep_gym/tiles.png and b/data/tilesets/secondary/mossdeep_gym/tiles.png differ diff --git a/data/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png index 5afa07fcf..778ca7865 100644 Binary files a/data/tilesets/secondary/mystery_events_house/tiles.png and b/data/tilesets/secondary/mystery_events_house/tiles.png differ diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png index ffbc04584..288e50b44 100644 Binary files a/data/tilesets/secondary/navel_rock/tiles.png and b/data/tilesets/secondary/navel_rock/tiles.png differ diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png index a074d4a05..bda540d6b 100644 Binary files a/data/tilesets/secondary/oceanic_museum/tiles.png and b/data/tilesets/secondary/oceanic_museum/tiles.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png index e7bcfd743..316eb500e 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/0.png and b/data/tilesets/secondary/pacifidlog/anim/0/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png index dde024f6e..ee9d4316e 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/1.png and b/data/tilesets/secondary/pacifidlog/anim/0/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png index 1a4cea24d..221a71585 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/0/2.png and b/data/tilesets/secondary/pacifidlog/anim/0/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png index beb8ee82d..6d432eb25 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/0.png and b/data/tilesets/secondary/pacifidlog/anim/1/0.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png index 594655120..7588b8a72 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/1.png and b/data/tilesets/secondary/pacifidlog/anim/1/1.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png index 747306d5c..2a11e5065 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/2.png and b/data/tilesets/secondary/pacifidlog/anim/1/2.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png index 20e0a7cdd..be4089ff4 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/3.png and b/data/tilesets/secondary/pacifidlog/anim/1/3.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png index 7b74ee349..4c16111de 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/4.png and b/data/tilesets/secondary/pacifidlog/anim/1/4.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png index b135bdfbe..93bbc6375 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/5.png and b/data/tilesets/secondary/pacifidlog/anim/1/5.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png index 4eae151e6..b08f5a0d9 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/6.png and b/data/tilesets/secondary/pacifidlog/anim/1/6.png differ diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png index f1863fdd5..1a5f0ae5c 100644 Binary files a/data/tilesets/secondary/pacifidlog/anim/1/7.png and b/data/tilesets/secondary/pacifidlog/anim/1/7.png differ diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png index 94fe6d96b..9fe620e1e 100644 Binary files a/data/tilesets/secondary/pacifidlog/tiles.png and b/data/tilesets/secondary/pacifidlog/tiles.png differ diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png index dd0e23ca4..00d6d94a4 100644 Binary files a/data/tilesets/secondary/petalburg/tiles.png and b/data/tilesets/secondary/petalburg/tiles.png differ diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png index cb7c40e5a..87cd3c556 100644 Binary files a/data/tilesets/secondary/petalburg_gym/tiles.png and b/data/tilesets/secondary/petalburg_gym/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png index 673746c5a..c54b078d4 100644 Binary files a/data/tilesets/secondary/pokemon_center/tiles.png and b/data/tilesets/secondary/pokemon_center/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png index 76cd9ab96..a45206efc 100644 Binary files a/data/tilesets/secondary/pokemon_day_care/tiles.png and b/data/tilesets/secondary/pokemon_day_care/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png index 62dd0f03f..fa42a5ef1 100644 Binary files a/data/tilesets/secondary/pokemon_fan_club/tiles.png and b/data/tilesets/secondary/pokemon_fan_club/tiles.png differ diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png index 20e3f32c8..8ea0e8fbd 100644 Binary files a/data/tilesets/secondary/pokemon_school/tiles.png and b/data/tilesets/secondary/pokemon_school/tiles.png differ diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png index f10306e7a..daf4e05b4 100644 Binary files a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png and b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png index 358745e4b..af00b97c7 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/0.png and b/data/tilesets/secondary/rustboro/anim/0/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png index f5a095b15..20b1ef630 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/1.png and b/data/tilesets/secondary/rustboro/anim/0/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/2.png and b/data/tilesets/secondary/rustboro/anim/0/2.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/3.png and b/data/tilesets/secondary/rustboro/anim/0/3.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/4.png and b/data/tilesets/secondary/rustboro/anim/0/4.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/5.png and b/data/tilesets/secondary/rustboro/anim/0/5.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/6.png and b/data/tilesets/secondary/rustboro/anim/0/6.png differ diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png index 91f368cf8..44c4b2cdc 100644 Binary files a/data/tilesets/secondary/rustboro/anim/0/7.png and b/data/tilesets/secondary/rustboro/anim/0/7.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png index 75bd2f8a4..07471595b 100644 Binary files a/data/tilesets/secondary/rustboro/anim/1/0.png and b/data/tilesets/secondary/rustboro/anim/1/0.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png index 9f8b3a02f..408f2b03a 100644 Binary files a/data/tilesets/secondary/rustboro/anim/1/1.png and b/data/tilesets/secondary/rustboro/anim/1/1.png differ diff --git a/data/tilesets/secondary/rustboro/anim/1/2.png b/data/tilesets/secondary/rustboro/anim/1/2.png deleted file mode 100644 index 86075ffb0..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/1/2.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/anim/1/3.png b/data/tilesets/secondary/rustboro/anim/1/3.png deleted file mode 100644 index 6e3c57621..000000000 Binary files a/data/tilesets/secondary/rustboro/anim/1/3.png and /dev/null differ diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png index fbfc72d46..c3a3bfbab 100644 Binary files a/data/tilesets/secondary/rustboro/tiles.png and b/data/tilesets/secondary/rustboro/tiles.png differ diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png index d4ebc14a1..82ba1c51c 100644 Binary files a/data/tilesets/secondary/rustboro_gym/tiles.png and b/data/tilesets/secondary/rustboro_gym/tiles.png differ diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png index 913935f77..8d6d13c05 100644 Binary files a/data/tilesets/secondary/rusturf_tunnel/tiles.png and b/data/tilesets/secondary/rusturf_tunnel/tiles.png differ diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png index ea48f5006..14100fa06 100644 Binary files a/data/tilesets/secondary/seashore_house/tiles.png and b/data/tilesets/secondary/seashore_house/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png index 9d820463b..ed7126297 100644 Binary files a/data/tilesets/secondary/secret_base/blue_cave/tiles.png and b/data/tilesets/secondary/secret_base/blue_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png index 1e42fed54..ed7126297 100644 Binary files a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png and b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png index a1c8bfe72..7beb706d9 100644 Binary files a/data/tilesets/secondary/secret_base/brown_cave/tiles.png and b/data/tilesets/secondary/secret_base/brown_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png index dfd187d51..7beb706d9 100644 Binary files a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png and b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png index 2652f6bbf..5146810e1 100644 Binary files a/data/tilesets/secondary/secret_base/red_cave/tiles.png and b/data/tilesets/secondary/secret_base/red_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png index 5cfebd309..5146810e1 100644 Binary files a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png and b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png index 692141b04..a64727c6e 100644 Binary files a/data/tilesets/secondary/secret_base/shrub/tiles.png and b/data/tilesets/secondary/secret_base/shrub/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png index 461d620ae..a64727c6e 100644 Binary files a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png and b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png index 94887cc1f..f07999cb0 100644 Binary files a/data/tilesets/secondary/secret_base/tree/tiles.png and b/data/tilesets/secondary/secret_base/tree/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/tree/unused_tiles.png b/data/tilesets/secondary/secret_base/tree/unused_tiles.png index 567cf7800..f07999cb0 100644 Binary files a/data/tilesets/secondary/secret_base/tree/unused_tiles.png and b/data/tilesets/secondary/secret_base/tree/unused_tiles.png differ diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png index b171b5ec6..d4535523b 100644 Binary files a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png and b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png differ diff --git a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png index f825201cc..d4535523b 100644 Binary files a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png and b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png differ diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png index f253a2e53..5911ee42c 100644 Binary files a/data/tilesets/secondary/shop/tiles.png and b/data/tilesets/secondary/shop/tiles.png differ diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png index ef62c4143..28bf60f26 100644 Binary files a/data/tilesets/secondary/slateport/anim/0.png and b/data/tilesets/secondary/slateport/anim/0.png differ diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png index 9b926bdfc..31d22f697 100644 Binary files a/data/tilesets/secondary/slateport/anim/1.png and b/data/tilesets/secondary/slateport/anim/1.png differ diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png index c5974f105..83b0e3940 100644 Binary files a/data/tilesets/secondary/slateport/anim/2.png and b/data/tilesets/secondary/slateport/anim/2.png differ diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png index 9b926bdfc..31d22f697 100644 Binary files a/data/tilesets/secondary/slateport/anim/3.png and b/data/tilesets/secondary/slateport/anim/3.png differ diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png index d8661b99a..ff7588d2d 100644 Binary files a/data/tilesets/secondary/slateport/tiles.png and b/data/tilesets/secondary/slateport/tiles.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png index 63f97ad47..6ae032652 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/0.png and b/data/tilesets/secondary/sootopolis/anim/0.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png index aa14ec04a..5bf8f7a98 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/1.png and b/data/tilesets/secondary/sootopolis/anim/1.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png index 09fb59fbf..85598e145 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/2.png and b/data/tilesets/secondary/sootopolis/anim/2.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png index 0c7c05034..c7aad10c7 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/3.png and b/data/tilesets/secondary/sootopolis/anim/3.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png index 317db1714..ec446b9db 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/4.png and b/data/tilesets/secondary/sootopolis/anim/4.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png index d0cbfeb57..cbe1769c0 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/5.png and b/data/tilesets/secondary/sootopolis/anim/5.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png index 4b35ededd..690c5fd8e 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/6.png and b/data/tilesets/secondary/sootopolis/anim/6.png differ diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png index dfe698edb..e4026a02f 100644 Binary files a/data/tilesets/secondary/sootopolis/anim/7.png and b/data/tilesets/secondary/sootopolis/anim/7.png differ diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png index 92df774ae..d27c817f0 100644 Binary files a/data/tilesets/secondary/sootopolis/tiles.png and b/data/tilesets/secondary/sootopolis/tiles.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png index f0ec1ac00..180b5522e 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png and b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png index 4fefe4598..af3ab12d2 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png and b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png index f603b3046..8481c0cde 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png and b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png deleted file mode 100644 index 2a8e6a31c..000000000 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png and /dev/null differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png index e0f807ef4..dc6cf500e 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png and b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png index 08413b63c..93dd79753 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png and b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png index 6681b5e96..30961482c 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png and b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png differ diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png index 4f6b25769..de097c92c 100644 Binary files a/data/tilesets/secondary/sootopolis_gym/tiles.png and b/data/tilesets/secondary/sootopolis_gym/tiles.png differ diff --git a/data/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png index 78d292513..bfc0a3d9a 100644 Binary files a/data/tilesets/secondary/trainer_hill/tiles.png and b/data/tilesets/secondary/trainer_hill/tiles.png differ diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png index 5ef1bf9ca..c31e0c0d7 100644 Binary files a/data/tilesets/secondary/trick_house_puzzle/tiles.png and b/data/tilesets/secondary/trick_house_puzzle/tiles.png differ diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png index 7609cc82a..fab28e54f 100644 Binary files a/data/tilesets/secondary/underwater/anim/0.png and b/data/tilesets/secondary/underwater/anim/0.png differ diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png index 64cddd371..869bc6060 100644 Binary files a/data/tilesets/secondary/underwater/anim/1.png and b/data/tilesets/secondary/underwater/anim/1.png differ diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png index ff6ff8437..64e4b267d 100644 Binary files a/data/tilesets/secondary/underwater/anim/2.png and b/data/tilesets/secondary/underwater/anim/2.png differ diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png index 2863c2261..0c1392011 100644 Binary files a/data/tilesets/secondary/underwater/anim/3.png and b/data/tilesets/secondary/underwater/anim/3.png differ diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png index 5af21f353..811b0cae4 100644 Binary files a/data/tilesets/secondary/underwater/tiles.png and b/data/tilesets/secondary/underwater/tiles.png differ diff --git a/data/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png index b38ffe9e5..f5ab3a9cb 100644 Binary files a/data/tilesets/secondary/union_room/tiles.png and b/data/tilesets/secondary/union_room/tiles.png differ diff --git a/data/tilesets/secondary/unused_1/0.png b/data/tilesets/secondary/unused_1/0.png index bea921d90..ab462ba21 100644 Binary files a/data/tilesets/secondary/unused_1/0.png and b/data/tilesets/secondary/unused_1/0.png differ diff --git a/data/tilesets/secondary/unused_1/1.png b/data/tilesets/secondary/unused_1/1.png index bea921d90..ab462ba21 100644 Binary files a/data/tilesets/secondary/unused_1/1.png and b/data/tilesets/secondary/unused_1/1.png differ diff --git a/data/tilesets/secondary/unused_1/2.png b/data/tilesets/secondary/unused_1/2.png index 16652df19..703e0109a 100644 Binary files a/data/tilesets/secondary/unused_1/2.png and b/data/tilesets/secondary/unused_1/2.png differ diff --git a/data/tilesets/secondary/unused_1/3.png b/data/tilesets/secondary/unused_1/3.png index 8ea7a49e6..50d5068d7 100644 Binary files a/data/tilesets/secondary/unused_1/3.png and b/data/tilesets/secondary/unused_1/3.png differ diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png index 3ae8bce42..9347405d4 100644 Binary files a/data/tilesets/secondary/unused_1/tiles.png and b/data/tilesets/secondary/unused_1/tiles.png differ diff --git a/data/tilesets/secondary/unused_2/0.png b/data/tilesets/secondary/unused_2/0.png index 2895d3319..2887a970d 100644 Binary files a/data/tilesets/secondary/unused_2/0.png and b/data/tilesets/secondary/unused_2/0.png differ diff --git a/data/tilesets/secondary/unused_2/1.png b/data/tilesets/secondary/unused_2/1.png index 63c22acf2..2eb2b90f1 100644 Binary files a/data/tilesets/secondary/unused_2/1.png and b/data/tilesets/secondary/unused_2/1.png differ diff --git a/data/tilesets/secondary/unused_2/2.png b/data/tilesets/secondary/unused_2/2.png deleted file mode 100644 index d1447cde2..000000000 Binary files a/data/tilesets/secondary/unused_2/2.png and /dev/null differ diff --git a/data/tilesets/secondary/unused_2/3.png b/data/tilesets/secondary/unused_2/3.png deleted file mode 100644 index 8ad81b1e1..000000000 Binary files a/data/tilesets/secondary/unused_2/3.png and /dev/null differ diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png index 2ab3b63d6..d734e826d 100644 Binary files a/data/tilesets/secondary/unused_2/tiles.png and b/data/tilesets/secondary/unused_2/tiles.png differ -- cgit v1.2.3 From 66fd9b2ddfef147159033271046f62b4f2c8adad Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 20 Sep 2018 22:00:00 +0200 Subject: Label trainer hill battle type --- data/battle_scripts_1.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index fec030bb5..0c5e172b0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText - jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd BattleScript_LocalBattleLostPrintWhiteOut:: -- cgit v1.2.3 From e362c06aea1ea68b79d23f5147549fb709c50fef Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 22 Sep 2018 18:41:00 +0200 Subject: gRandomMove to gCalledMove --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0c5e172b0..a9dfd7635 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1354,7 +1354,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledattack TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2399,7 +2399,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledattack TRUE BattleScript_EffectIngrain:: attackcanceler @@ -4260,7 +4260,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptorandomattack FALSE + jumptocalledattack FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 -- cgit v1.2.3 From 611360c29e682ee38779b6ba0ee120032903bf3a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 22 Sep 2018 19:08:41 +0200 Subject: calledattack to calledmove --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a9dfd7635..a01066be1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1354,7 +1354,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptocalledattack TRUE + jumptocalledmove TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2399,7 +2399,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptocalledattack TRUE + jumptocalledmove TRUE BattleScript_EffectIngrain:: attackcanceler @@ -4260,7 +4260,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptocalledattack FALSE + jumptocalledmove FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 -- cgit v1.2.3 From e80a53060be68428583a306f91b48fd81b8988bd Mon Sep 17 00:00:00 2001 From: Tetrable Date: Fri, 5 Oct 2018 23:00:07 +0100 Subject: Start anim tags --- data/battle_anim_scripts.s | 160 ++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 6464d8235..598cd14ba 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -657,7 +657,7 @@ Screech1: return Move_FLAME_WHEEL: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createsprite gBattleAnimSpriteTemplate_8595584, 3, 0, 0, 56, 0 @@ -853,7 +853,7 @@ Move_TWINEEDLE: end Move_FIRE_BLAST: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_8158B30, 144, 145 call FireBlast1 call FireBlast1 @@ -901,7 +901,7 @@ FireBlast2: return Move_LEECH_SEED: - loadspritegfx ANIM_TAG_006 + loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, -64 createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 delay 8 @@ -916,7 +916,7 @@ Move_LEECH_SEED: end Move_EMBER: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, -64, 5, 2 createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 delay 4 @@ -1026,7 +1026,7 @@ CometPunchRight: goto CometPunchContinue Move_SONIC_BOOM: - loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_PENCIL loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -1051,8 +1051,8 @@ SonicBoom2: return Move_THUNDER_SHOCK: - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1072,9 +1072,9 @@ Move_THUNDER_SHOCK: end Move_THUNDERBOLT: - loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_282 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1121,8 +1121,8 @@ Move_THUNDERBOLT: end Move_THUNDER_WAVE: - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_173 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish @@ -1321,14 +1321,14 @@ Move_SPIKE_CANNON: end Move_SWORDS_DANCE: - loadspritegfx ANIM_TAG_005 + loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 playsewithpan SE_W014, -64 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 createsprite gBattleAnimSpriteTemplate_8593380, 2, 0, 0 delay 22 - createvisualtask sub_8115D94, 2, ANIM_TAG_005, 2, 2, RGB(18, 31, 31), 16, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff @@ -1392,7 +1392,7 @@ DizzyPunch1: return Move_FIRE_SPIN: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, +63 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1 call FireSpinEffect @@ -1879,7 +1879,7 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx ANIM_TAG_100 + loadspritegfx ANIM_TAG_ICE_CUBE0 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -1897,7 +1897,7 @@ Move_PAY_DAY: end Move_OUTRAGE: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, -64, 8, 3 createvisualtask sub_8115A04, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0) createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4 @@ -1943,7 +1943,7 @@ Outrage1: Move_SPARK: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, -64 @@ -2285,7 +2285,7 @@ Move_SMOKESCREEN: end Move_CONVERSION: - loadspritegfx ANIM_TAG_018 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 16, 0 @@ -2327,7 +2327,7 @@ Move_CONVERSION: createsprite gUnknown_08592E74, 2, 24, 24 delay 20 playsewithpan SE_W112, -64 - createvisualtask sub_8115D94, 2, ANIM_TAG_018, 1, 1, 14335, 12, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask sub_81022D4, 5 waitforvisualfinish @@ -3060,7 +3060,7 @@ Move_STRUGGLE: end Move_SKETCH: - loadspritegfx ANIM_TAG_002 + loadspritegfx ANIM_TAG_PENCIL monbg ANIM_TARGET createvisualtask sub_8104E74, 2 createsprite gUnknown_085936D4, 130 @@ -3296,7 +3296,7 @@ Move_SWAGGER: Move_MILK_DRINK: loadspritegfx 0x2773 loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET createsprite gUnknown_08592B3C, 2 delay 40 @@ -3358,7 +3358,7 @@ Move_RAPID_SPIN: Move_MOONLIGHT: loadspritegfx 0x27D2 loadspritegfx ANIM_TAG_195 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish @@ -4097,7 +4097,7 @@ Move_NEEDLE_ARM: end Move_SLACK_OFF: - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_8160544, 2, 0 playsewithpan SE_W281, -64 waitforvisualfinish @@ -4107,7 +4107,7 @@ Move_SLACK_OFF: Move_CRUSH_CLAW: loadspritegfx ANIM_TAG_167 - loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_208 monbg ANIM_TARGET setalpha 12, 8 @@ -4130,7 +4130,7 @@ Move_AROMATHERAPY: playsewithpan SE_W080, 0 loadspritegfx ANIM_TAG_159 loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, RGB(13, 31, 12) delay 1 monbg ANIM_ATTACKER @@ -4189,7 +4189,7 @@ Move_FAKE_TEARS: end Move_AIR_CUTTER: - loadspritegfx ANIM_TAG_003 + loadspritegfx ANIM_TAG_PENCIL loadspritegfx ANIM_TAG_138 loadspritegfx ANIM_TAG_135 delay 0 @@ -4407,7 +4407,7 @@ Move_COVET: end Move_VOLT_TACKLE: - loadspritegfx ANIM_TAG_001 + loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_212 loadspritegfx ANIM_TAG_213 monbg ANIM_ATTACKER @@ -4541,8 +4541,8 @@ Move_DRAGON_DANCE: Move_SHOCK_WAVE: loadspritegfx ANIM_TAG_211 loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -4760,7 +4760,7 @@ FutureSight: goto FutureSightContinue Move_THUNDER: - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_LIGHTNING fadetobg BG_THUNDER waitbgfadeout createvisualtask sub_8117660, 5, -256, 0, 1, -1 @@ -4820,7 +4820,7 @@ Move_THUNDER: Move_THUNDER_PUNCH: loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK @@ -4921,7 +4921,7 @@ Move_SCRATCH: end Move_DRAGON_BREATH: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W172, -64, 7, 7 @@ -5233,7 +5233,7 @@ MudSlap1: return Move_DRAGON_RAGE: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_035 playsewithpan SE_W082, -64 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1 @@ -5691,7 +5691,7 @@ SignalBeam1: Move_ABSORB: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -5744,7 +5744,7 @@ AbsorbEffect: Move_MEGA_DRAIN: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -5805,7 +5805,7 @@ MegaDrainEffect: Move_GIGA_DRAIN: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -5876,7 +5876,7 @@ Move_LEECH_LIFE: loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_147 delay 1 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -5903,14 +5903,14 @@ Move_LEECH_LIFE: end Move_SYNTHESIS: - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE createvisualtask sub_8115A04, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18) playsewithpan SE_W025, -64 call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_049 + unloadspritegfx ANIM_TAG_SPARKLE delay 1 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish end @@ -6028,7 +6028,7 @@ Move_ACID: end Move_BONEMERANG: - loadspritegfx ANIM_TAG_000 + loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6048,7 +6048,7 @@ Move_BONEMERANG: end Move_BONE_CLUB: - loadspritegfx ANIM_TAG_000 + loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6066,7 +6066,7 @@ Move_BONE_CLUB: end Move_BONE_RUSH: - loadspritegfx ANIM_TAG_000 + loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6142,7 +6142,7 @@ MegahornInContest: goto MegahornContinue Move_GUST: - loadspritegfx ANIM_TAG_009 + loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6160,7 +6160,7 @@ Move_GUST: end Move_WING_ATTACK: - loadspritegfx ANIM_TAG_009 + loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -6301,7 +6301,7 @@ Move_SURF: end Move_FLAMETHROWER: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6946,7 +6946,7 @@ Move_HAZE: Move_FIRE_PUNCH: loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -7001,7 +7001,7 @@ Move_LEER: Move_DREAM_EATER: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W060, -64 @@ -7190,7 +7190,7 @@ Psywave1: Move_ZAP_CANNON: loadspritegfx ANIM_TAG_171 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, -64 createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 createsprite gUnknown_08595790, 132, 10, 0, 16, 30, 0, 40, 0 @@ -7210,7 +7210,7 @@ Move_ZAP_CANNON: end Move_STEEL_WING: - loadspritegfx ANIM_TAG_009 + loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_135 loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 @@ -7277,7 +7277,7 @@ Move_POISON_TAIL: end Move_METAL_CLAW: - loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish @@ -7507,7 +7507,7 @@ RazorWindContinue: end RazorWindSetUp: - loadspritegfx ANIM_TAG_009 + loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, -64 createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gUnknown_08593550, 2, 32, 0, 16, 16, 85, 7, 40 @@ -7556,7 +7556,7 @@ Move_DISABLE: Move_RECOVER: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W025, -64, 13, 3 @@ -7673,7 +7673,7 @@ CurseStats1: Move_SOFT_BOILED: loadspritegfx 0x27DA loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER playsewithpan SE_W039, -64 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 @@ -7725,13 +7725,13 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_205 unloadspritegfx ANIM_TAG_206 unloadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE playsewithpan SE_W234, -64 createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx ANIM_TAG_049 + unloadspritegfx ANIM_TAG_SPARKLE loadspritegfx ANIM_TAG_203 playsewithpan SE_REAPOKE, -64 createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) @@ -7887,7 +7887,7 @@ PresentDamage: PresentHeal: loadspritegfx ANIM_TAG_195 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, +63 createsprite gUnknown_08592658, 132, -16, 32, -3, 1 delay 3 @@ -8042,7 +8042,7 @@ Move_TRI_ATTACK: delay 2 createvisualtask sub_810A094, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_8115F10, 2, 257, 257, 257 playsewithpan SE_W161B, +63 createsprite gUnknown_085956C0, 130, 0, -48 @@ -8142,7 +8142,7 @@ Move_TRICK: Move_WISH: loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish panse_27 SE_W115, +63, -64, -3, 0 @@ -8234,7 +8234,7 @@ SpitUpStrongest: Move_SWALLOW: loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, -64 createvisualtask sub_815B778, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 @@ -8279,7 +8279,7 @@ Move_TRANSFORM: Move_MORNING_SUN: loadspritegfx ANIM_TAG_241 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_815BB84, 5 delay 8 createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE @@ -8459,7 +8459,7 @@ Move_ROLE_PLAY: Move_REFRESH: loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE playsewithpan SE_W287, -64 createvisualtask sub_815DFCC, 2, 0 waitforvisualfinish @@ -8474,7 +8474,7 @@ Move_REFRESH: Move_BLAZE_KICK: loadspritegfx ANIM_TAG_135 loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W172, +63 @@ -8545,7 +8545,7 @@ Move_SHEER_COLD: waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx ANIM_TAG_010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8592,7 +8592,7 @@ Move_MUDDY_WATER: end Move_BULLET_SEED: - loadspritegfx ANIM_TAG_006 + loadspritegfx ANIM_TAG_SEED createsprite gUnknown_0859351C, 130, 20, 0 delay 5 createsprite gUnknown_0859351C, 130, 20, 0 @@ -8617,8 +8617,8 @@ Move_BULLET_SEED: end Move_DRAGON_CLAW: - loadspritegfx ANIM_TAG_029 - loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, -64 createvisualtask sub_8116620, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1 @@ -9048,7 +9048,7 @@ ReturnStrongest1: return Move_COSMIC_POWER: - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE createvisualtask sub_8159244, 5, 243, 0 playsewithpan SE_W322, 0 createvisualtask sub_8117610, 2, 0, 0, 15, 0 @@ -9275,7 +9275,7 @@ Move_ROCK_BLAST: end Move_OVERHEAT: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER setalpha 12, 18 @@ -9733,7 +9733,7 @@ Move_MAGICAL_LEAF: end Move_ICE_BALL: - loadspritegfx ANIM_TAG_043 + loadspritegfx ANIM_TAG_ICE_CHUNK loadspritegfx ANIM_TAG_141 createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg @@ -9850,7 +9850,7 @@ WeatherBallNormal: waitforvisualfinish end WeatherBallFire: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gUnknown_0859559C, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, +63 delay 10 @@ -10222,7 +10222,7 @@ Status_Confusion: end Status_Burn: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, +63 call Burn1 call Burn1 @@ -10255,14 +10255,14 @@ Status_Sleep: end Status_Paralysis: - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1 call ElectricityEffect end Status_Freeze: playsewithpan SE_W196, 0 - loadspritegfx ANIM_TAG_010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET waitplaysewithpan SE_W258, +63, 17 @@ -10368,7 +10368,7 @@ Status_BindWrap: waitforvisualfinish end Status_FireSpin: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, +63 createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1 call FireSpinEffect @@ -10424,7 +10424,7 @@ Status_SandTomb: General_ItemEffect: loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE delay 0 playsewithpan SE_W036, -64 createvisualtask sub_80D622C, 2, 16, 128, 0, 2 @@ -10632,7 +10632,7 @@ General_FocusPunchSetUp: General_IngrainHeal: loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, RGB(13, 31, 12) @@ -10650,14 +10650,14 @@ General_IngrainHeal: end General_WishHeal: - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish playsewithpan SE_W025, -64 call GrantingStarsEffect waitforvisualfinish - unloadspritegfx ANIM_TAG_049 - loadspritegfx ANIM_TAG_031 + unloadspritegfx ANIM_TAG_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR call HealingEffect waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 10, 0, RGB_BLACK -- cgit v1.2.3 From 17c5b4089ae0477c8500f6d2ccd686a75aab784e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Oct 2018 09:37:52 +0200 Subject: Label most of the anim tags --- data/battle_anim_scripts.s | 234 ++++++++++++++++++++++----------------------- data/battle_scripts_1.s | 5 +- 2 files changed, 120 insertions(+), 119 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 598cd14ba..3ae637c37 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -455,7 +455,7 @@ DoubleSlapRight: Move_POISON_POWDER: loadspritegfx ANIM_TAG_065 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, +63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -815,7 +815,7 @@ Move_DOUBLE_EDGE: Move_POISON_STING: loadspritegfx ANIM_TAG_161 loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1026,7 +1026,7 @@ CometPunchRight: goto CometPunchContinue Move_SONIC_BOOM: - loadspritegfx ANIM_TAG_PENCIL + loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -1355,7 +1355,7 @@ Move_PSYCH_UP: end Move_DIZZY_PUNCH: - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_143 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET @@ -1455,7 +1455,7 @@ FuryCutterStrongest: goto FuryCutterContinue2 Move_SELF_DESTRUCT: - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createvisualtask sub_8116620, 10, 2, 1, 0, 9, RGB_RED createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 @@ -1621,7 +1621,7 @@ UnderWaterAttack1: return Move_EXPLOSION: - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, 2, 1, 8, 9, RGB(26, 8, 8), 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 @@ -1666,7 +1666,7 @@ Move_DEFENSE_CURL: end Move_PROTECT: - loadspritegfx ANIM_TAG_280 + loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER waitplaysewithpan SE_W115, -64, 16 @@ -1692,7 +1692,7 @@ Move_DETECT: Move_FRUSTRATION: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1 @@ -1814,7 +1814,7 @@ Move_SAFEGUARD: end Move_PAIN_SPLIT: - loadspritegfx 0x27FF + loadspritegfx ANIM_TAG_239 createsprite gUnknown_085CE590, 2, -8, -42, 0 createsprite gUnknown_085CE590, 130, -8, -42, 1 delay 10 @@ -1879,7 +1879,7 @@ Move_GUILLOTINE: end Move_PAY_DAY: - loadspritegfx ANIM_TAG_ICE_CUBE0 + loadspritegfx ANIM_TAG_100 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -2048,7 +2048,7 @@ Move_WHIRLWIND: end Move_CONFUSE_RAY: - loadspritegfx 0x271D + loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_DEF_PARTNER fadetobg BG_GHOST waitbgfadein @@ -2068,7 +2068,7 @@ Move_CONFUSE_RAY: end Move_LOCK_ON: - loadspritegfx 0x271E + loadspritegfx ANIM_TAG_LOCK_ON createsprite gUnknown_08592CA0, 40 createsprite gUnknown_08592CB8, 40, 1 createsprite gUnknown_08592CB8, 40, 2 @@ -2080,7 +2080,7 @@ Move_LOCK_ON: end Move_MEAN_LOOK: - loadspritegfx 0x27CB + loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER playsewithpan SE_W060, -64 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK @@ -2226,7 +2226,7 @@ Bulbblebeam1: Move_ICY_WIND: loadspritegfx ANIM_TAG_141 - loadspritegfx 0x279E + loadspritegfx ANIM_TAG_142 monbg ANIM_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE @@ -2261,8 +2261,8 @@ IcyWind1: return Move_SMOKESCREEN: - loadspritegfx 0x2720 - loadspritegfx 0x2721 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, -64 createsprite gUnknown_085CE050, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish @@ -2337,7 +2337,7 @@ Move_CONVERSION: end Move_CONVERSION_2: - loadspritegfx 0x2722 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 0, 16 @@ -2421,7 +2421,7 @@ Move_HEADBUTT: Move_HORN_ATTACK: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2724 + loadspritegfx ANIM_TAG_HORN_HIT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, -64 waitforvisualfinish @@ -2439,7 +2439,7 @@ Move_HORN_ATTACK: Move_FURY_ATTACK: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2724 + loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft FuryAttackContinue: @@ -2463,7 +2463,7 @@ FuryAttackLeft: Move_HORN_DRILL: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2724 + loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg BG_DRILL waitbgfadeout @@ -2547,7 +2547,7 @@ Move_THRASH: end Move_SING: - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 monbg ANIM_DEF_PARTNER createvisualtask sub_8102BE8, 2 waitforvisualfinish @@ -2654,7 +2654,7 @@ DigEnd: end DigSetUp: loadspritegfx ANIM_TAG_074 - loadspritegfx 0x2829 + loadspritegfx ANIM_TAG_281 createsprite gUnknown_08597214, 1, 0, 0, 180 createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER @@ -2673,7 +2673,7 @@ DigSetUp: goto DigEnd DigUnleash: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x2829 + loadspritegfx ANIM_TAG_281 createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER @@ -2746,7 +2746,7 @@ Move_QUICK_ATTACK: Move_RAGE: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2 @@ -2868,7 +2868,7 @@ Move_AMNESIA: Move_KINESIS: loadspritegfx ANIM_TAG_075 - loadspritegfx ANIM_TAG_097 + loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, -64 call SetPsychicBackground createsprite gUnknown_085966DC, 20 @@ -3154,7 +3154,7 @@ MachPunchAgainstPlayer: goto MachPunchContinue Move_FORESIGHT: - loadspritegfx ANIM_TAG_258 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 16, 0 @@ -3218,7 +3218,7 @@ EndureEffect: return Move_CHARM: - loadspritegfx ANIM_TAG_210 + loadspritegfx ANIM_TAG_PURPLE_HEART createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 @@ -3249,7 +3249,7 @@ Move_ROLLOUT: end Move_FALSE_SWIPE: - loadspritegfx 0x282E + loadspritegfx ANIM_TAG_286 loadspritegfx ANIM_TAG_135 createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, +63 @@ -3277,7 +3277,7 @@ Move_FALSE_SWIPE: Move_SWAGGER: loadspritegfx ANIM_TAG_086 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_ANGER createvisualtask sub_8104AB4, 2 playsewithpan SE_W207, -64 waitforvisualfinish @@ -3294,7 +3294,7 @@ Move_SWAGGER: end Move_MILK_DRINK: - loadspritegfx 0x2773 + loadspritegfx ANIM_TAG_MILK_BOTTLE loadspritegfx ANIM_TAG_203 loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET @@ -3338,7 +3338,7 @@ MagnitudeIntense: Move_RAPID_SPIN: loadspritegfx ANIM_TAG_135 - loadspritegfx 0x27F5 + loadspritegfx ANIM_TAG_229 monbg ANIM_ATTACKER createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 @@ -3356,8 +3356,8 @@ Move_RAPID_SPIN: end Move_MOONLIGHT: - loadspritegfx 0x27D2 - loadspritegfx ANIM_TAG_195 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, RGB_BLACK @@ -3431,7 +3431,7 @@ ExtremeSpeedAgainstPlayer: goto ExtremeSpeedContinue Move_UPROAR: - loadspritegfx 0x27F1 + loadspritegfx ANIM_TAG_225 loadspritegfx ANIM_TAG_203 monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 @@ -3491,7 +3491,7 @@ Move_HAIL: end Move_TORMENT: - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_ANGER loadspritegfx ANIM_TAG_209 createvisualtask sub_815AFF0, 2 waitforvisualfinish @@ -3535,7 +3535,7 @@ Move_FACADE: end Move_SMELLING_SALT: - loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_HAND loadspritegfx ANIM_TAG_255 createsprite gUnknown_085CE864, 130, 1, 0, 2 createsprite gUnknown_085CE864, 130, 1, 1, 2 @@ -3597,7 +3597,7 @@ Move_CHARGE: Move_TAUNT: loadspritegfx ANIM_TAG_214 loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_ANGER createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, -64 delay 6 @@ -3615,7 +3615,7 @@ Move_TAUNT: end Move_HELPING_HAND: - loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_HAND createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 40, 0 createsprite gUnknown_085CE8AC, 40, 1 @@ -3683,7 +3683,7 @@ Move_SUPERPOWER: end Move_RECYCLE: - loadspritegfx ANIM_TAG_278 + loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_ATTACKER setalpha 0, 16 delay 1 @@ -3834,7 +3834,7 @@ Move_SKILL_SWAP: Move_IMPRISON: loadspritegfx ANIM_TAG_249 - loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground monbg ANIM_DEF_PARTNER createvisualtask sub_810F940, 5 @@ -3987,8 +3987,8 @@ Move_FEATHER_DANCE: end Move_TEETER_DANCE: - loadspritegfx ANIM_TAG_072 - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_DUCK createvisualtask sub_8160164, 5 createsprite gUnknown_08593050, 2, 0, 16, -2 playsewithpan SE_W298, -64 @@ -4168,7 +4168,7 @@ Move_AROMATHERAPY: Move_FAKE_TEARS: loadspritegfx ANIM_TAG_155 loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 @@ -4189,7 +4189,7 @@ Move_FAKE_TEARS: end Move_AIR_CUTTER: - loadspritegfx ANIM_TAG_PENCIL + loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_138 loadspritegfx ANIM_TAG_135 delay 0 @@ -4226,7 +4226,7 @@ Move_ODOR_SLEUTH: end Move_GRASS_WHISTLE: - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish createvisualtask sub_8102BE8, 2 @@ -4364,7 +4364,7 @@ Move_IRON_DEFENSE: end Move_BLOCK: - loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_X_SIGN createsprite gUnknown_085CE90C, 194 playsewithpan SE_W207, +63 end @@ -4390,8 +4390,8 @@ Move_BULK_UP: end Move_COVET: - loadspritegfx ANIM_TAG_210 - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, -64 @@ -4575,8 +4575,8 @@ Move_HARDEN: end Move_BELLY_DRUM: - loadspritegfx ANIM_TAG_072 - loadspritegfx 0x27D1 + loadspritegfx ANIM_TAG_MUSIC_NOTES2 + loadspritegfx ANIM_TAG_193 createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 @@ -4618,9 +4618,9 @@ BellyDrum1: return Move_MIND_READER: - loadspritegfx 0x27CD - loadspritegfx 0x27CE - loadspritegfx 0x27CF + loadspritegfx ANIM_TAG_189 + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_191 monbg ANIM_DEF_PARTNER playsewithpan SE_W109, +63 createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 @@ -4696,7 +4696,7 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, -64 - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 delay 20 createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 @@ -4851,7 +4851,7 @@ Move_THUNDER_PUNCH: end Move_SACRED_FIRE: - loadspritegfx 0x2731 + loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_035 loopsewithpan SE_W221, -64, 7, 5 createsprite gUnknown_08595428, 2, -32, 0, 50, 5, -2, 0 @@ -4908,7 +4908,7 @@ Move_SACRED_FIRE: end Move_SCRATCH: - loadspritegfx 0x2799 + loadspritegfx ANIM_TAG_137 monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W010, +63 @@ -4995,7 +4995,7 @@ Move_GROWL: end Move_SNORE: - loadspritegfx 0x27D5 + loadspritegfx ANIM_TAG_197 monbg ANIM_ATK_PARTNER setalpha 8, 8 call Snore1 @@ -5016,7 +5016,7 @@ Snore1: return Move_LIGHT_SCREEN: - loadspritegfx 0x2756 + loadspritegfx ANIM_TAG_070 loadspritegfx ANIM_TAG_166 setalpha 0, 16 waitplaysewithpan SE_W115, -64, 15 @@ -5043,8 +5043,8 @@ SpecialScreenEffect: return Move_MIRROR_COAT: - loadspritegfx 0x2756 - loadspritegfx 0x27B8 + loadspritegfx ANIM_TAG_070 + loadspritegfx ANIM_TAG_168 setalpha 0, 16 createsprite gUnknown_08596590, 1, 40, 0, 10168 delay 10 @@ -5649,9 +5649,9 @@ HydroPump2: return Move_SIGNAL_BEAM: - loadspritegfx 0x2818 - loadspritegfx 0x2819 - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_264 + loadspritegfx ANIM_TAG_265 + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 panse_1B SE_W062, -64, +63, +1, 0 @@ -5916,8 +5916,8 @@ Move_SYNTHESIS: end Move_TOXIC: - loadspritegfx ANIM_TAG_151 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE call Toxic1 call Toxic1 waitforvisualfinish @@ -5941,7 +5941,7 @@ Toxic1: return Move_SLUDGE: - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, -64 createsprite gUnknown_085961A8, 130, 20, 0, 40, 0 waitforvisualfinish @@ -5952,7 +5952,7 @@ Move_SLUDGE: end Move_SLUDGE_BOMB: - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE call SludgeBomb1 call SludgeBomb1 call SludgeBomb1 @@ -5995,7 +5995,7 @@ SludgeBomb1: return Move_ACID: - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gUnknown_085961C0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, -64 @@ -6082,7 +6082,7 @@ Move_BONE_RUSH: end Move_SPIKES: - loadspritegfx 0x27A8 + loadspritegfx ANIM_TAG_152 monbg ANIM_DEF_PARTNER playsewithpan SE_W026, -64 waitplaysewithpan SE_W030, +63, 28 @@ -6099,7 +6099,7 @@ Move_SPIKES: end Move_MEGAHORN: - loadspritegfx 0x27A9 + loadspritegfx ANIM_TAG_153 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER playsewithpan SE_W082, -64 @@ -6192,7 +6192,7 @@ Move_PECK: end Move_AEROBLAST: - loadspritegfx 0x27AA + loadspritegfx ANIM_TAG_154 loadspritegfx ANIM_TAG_135 monbg ANIM_DEF_PARTNER call SetFlyingBg @@ -6567,7 +6567,7 @@ TripleKickCenter: Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_143 loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_007 delay 1 monbg ANIM_DEF_PARTNER @@ -6737,7 +6737,7 @@ SunnyDay1: return Move_COTTON_SPORE: - loadspritegfx 0x27AE + loadspritegfx ANIM_TAG_158 monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, +63, 18, 10 @@ -6758,7 +6758,7 @@ CottonSpore1: return Move_SPORE: - loadspritegfx 0x27AE + loadspritegfx ANIM_TAG_158 monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 @@ -6894,8 +6894,8 @@ Move_ANCIENT_POWER: end Move_OCTAZOOKA: - loadspritegfx 0x272E - loadspritegfx 0x2721 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, -64 createsprite gUnknown_08592DFC, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish @@ -6911,7 +6911,7 @@ Move_OCTAZOOKA: end Move_MIST: - loadspritegfx 0x27A0 + loadspritegfx ANIM_TAG_144 monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, -64, 20, 15 @@ -6981,7 +6981,7 @@ FireMoveEffect: return Move_LEER: - loadspritegfx 0x272B + loadspritegfx ANIM_TAG_GLARE monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER setalpha 8, 8 @@ -7068,7 +7068,7 @@ DreamEaterEffect: Move_POISON_GAS: loadspritegfx ANIM_TAG_172 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 @@ -7257,7 +7257,7 @@ Move_IRON_TAIL: Move_POISON_TAIL: loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, -64, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) waitforvisualfinish @@ -7317,8 +7317,8 @@ Move_NIGHT_SHADE: end Move_EGG_BOMB: - loadspritegfx ANIM_TAG_198 - loadspritegfx 0x27BF + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_175 playsewithpan SE_W039, -64 createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7342,7 +7342,7 @@ Move_EGG_BOMB: end Move_SHADOW_BALL: - loadspritegfx 0x27C0 + loadspritegfx ANIM_TAG_176 fadetobg BG_GHOST waitbgfadein delay 15 @@ -7357,7 +7357,7 @@ Move_SHADOW_BALL: end Move_LICK: - loadspritegfx 0x27C1 + loadspritegfx ANIM_TAG_177 delay 15 playsewithpan SE_W122, +63 createsprite gUnknown_08596D8C, 130, 0, 0 @@ -7419,8 +7419,8 @@ BideUnleash: end Move_STRING_SHOT: - loadspritegfx 0x27C3 - loadspritegfx 0x27C4 + loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK @@ -7464,8 +7464,8 @@ StringShot1: return Move_SPIDER_WEB: - loadspritegfx 0x27C5 - loadspritegfx 0x27C4 + loadspritegfx ANIM_TAG_SPIDER_WEB + loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, RGB_BLACK @@ -7517,7 +7517,7 @@ RazorWindSetUp: goto RazorWindContinue RazorWindUnleash: - loadspritegfx 0x27AA + loadspritegfx ANIM_TAG_154 loadspritegfx ANIM_TAG_135 monbg ANIM_TARGET setalpha 12, 8 @@ -7628,7 +7628,7 @@ Move_CONSTRICT: Move_CURSE: choosetwoturnanim CurseGhost, CurseStats CurseGhost: - loadspritegfx 0x27D7 + loadspritegfx ANIM_TAG_NAIL loadspritegfx ANIM_TAG_200 monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 @@ -7671,7 +7671,7 @@ CurseStats1: return Move_SOFT_BOILED: - loadspritegfx 0x27DA + loadspritegfx ANIM_TAG_BREAKING_EGG loadspritegfx ANIM_TAG_203 loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER @@ -7694,8 +7694,8 @@ Move_SOFT_BOILED: end Move_HEAL_BELL: - loadspritegfx ANIM_TAG_205 - loadspritegfx ANIM_TAG_206 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_203 createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish @@ -7722,8 +7722,8 @@ Move_HEAL_BELL: waitforvisualfinish createvisualtask sub_8105D60, 5 waitforvisualfinish - unloadspritegfx ANIM_TAG_205 - unloadspritegfx ANIM_TAG_206 + unloadspritegfx ANIM_TAG_BELL + unloadspritegfx ANIM_TAG_MUSIC_NOTES unloadspritegfx ANIM_TAG_203 loadspritegfx ANIM_TAG_SPARKLE playsewithpan SE_W234, -64 @@ -7776,7 +7776,7 @@ Move_SCARY_FACE: Move_SWEET_KISS: loadspritegfx ANIM_TAG_216 - loadspritegfx ANIM_TAG_220 + loadspritegfx ANIM_TAG_ANGEL createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, +63 delay 23 @@ -7795,7 +7795,7 @@ Move_SWEET_KISS: Move_LOVELY_KISS: loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_221 + loadspritegfx ANIM_TAG_EVIL_ANGEL createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, +63 waitforvisualfinish @@ -7852,7 +7852,7 @@ Move_INGRAIN: end Move_PRESENT: - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 createsprite gUnknown_08592610, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, -64 @@ -7868,7 +7868,7 @@ Move_PRESENT: end PresentDamage: - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, +63 createsprite gBattleAnimSpriteTemplate_859371C, 131, 0, 0, 1, 1 delay 6 @@ -7886,7 +7886,7 @@ PresentDamage: end PresentHeal: - loadspritegfx ANIM_TAG_195 + loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, +63 createsprite gUnknown_08592658, 132, -16, 32, -3, 1 @@ -7919,7 +7919,7 @@ Move_BATON_PASS: end Move_PERISH_SONG: - loadspritegfx ANIM_TAG_206 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gUnknown_08593C0C, 4, 0, 0, 0 createsprite gUnknown_08593C0C, 4, 1, 1, 16 createsprite gUnknown_08593C0C, 4, 2, 1, 32 @@ -7955,7 +7955,7 @@ Move_PERISH_SONG: end Move_SLEEP_TALK: - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER delay 20 createsprite gUnknown_085CE190, 130, 0, 20, 5, -1 @@ -8013,7 +8013,7 @@ HyperFangInContest: goto HyperFangContinue Move_TRI_ATTACK: - loadspritegfx ANIM_TAG_230 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gUnknown_085CE2F8, 130, 16, 0 playsewithpan SE_W161, -64 delay 20 @@ -8023,7 +8023,7 @@ Move_TRI_ATTACK: waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, RGB_BLACK delay 16 - loadspritegfx 0x2731 + loadspritegfx ANIM_TAG_FIRE createsprite gUnknown_08595410, 130, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, +63 createsprite gUnknown_08595410, 130, 0, 0, 30, 30, 0, 1 @@ -8094,7 +8094,7 @@ Move_WILL_O_WISP: Move_ENCORE: loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_HAND createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8113,7 +8113,7 @@ Move_ENCORE: end Move_TRICK: - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_207 createsprite gUnknown_085926E8, 2, -40, 80 createsprite gUnknown_085926E8, 2, -40, 208 @@ -8278,7 +8278,7 @@ Move_TRANSFORM: end Move_MORNING_SUN: - loadspritegfx ANIM_TAG_241 + loadspritegfx ANIM_TAG_GREEN_STAR loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_815BB84, 5 delay 8 @@ -8766,7 +8766,7 @@ Move_REVENGE: Move_POISON_FANG: loadspritegfx ANIM_TAG_192 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, +63 createsprite gUnknown_085CE1DC, 130 delay 10 @@ -9118,7 +9118,7 @@ Move_BLAST_BURN: end Move_ROCK_TOMB: - loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_X_SIGN loadspritegfx ANIM_TAG_058 createvisualtask sub_81162A4, 2, 2, 0, 10, 1 waitforvisualfinish @@ -10217,7 +10217,7 @@ Status_Poison: end Status_Confusion: - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_DUCK call ConfusionEffect end @@ -10235,7 +10235,7 @@ Burn1: return Status_Infatuation: - loadspritegfx ANIM_TAG_210 + loadspritegfx ANIM_TAG_PURPLE_HEART playsewithpan SE_W204, -64 createsprite gUnknown_08593970, 3, 0, 20 delay 15 @@ -10247,7 +10247,7 @@ Status_Infatuation: end Status_Sleep: - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, -64 createsprite gUnknown_08592C88, 2, 4, -10, 16, 0, 0 delay 30 @@ -10282,7 +10282,7 @@ Status_Curse: end Status_Nightmare: - loadspritegfx ANIM_TAG_221 + loadspritegfx ANIM_TAG_EVIL_ANGEL monbg ANIM_DEF_PARTNER playsewithpan SE_W171, +63 createsprite gBattleAnimSpriteTemplate_8596E00, 130 @@ -10343,7 +10343,7 @@ General_PokeblockThrow: end General_ItemKnockoff: - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createsprite gBattleAnimSpriteTemplate_8592628, 130 end @@ -10533,7 +10533,7 @@ General_MonHit: end General_ItemSteal: - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 @@ -10541,7 +10541,7 @@ General_ItemSteal: end General_SnatchMove: - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_8117E94, 2 call AnimScript_82D85A3 delay 1 @@ -10585,7 +10585,7 @@ General_FutureSightHit: General_DoomDesireHit: createvisualtask sub_8117F10, 2 - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 6e702db24..d6b9de0c1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6,6 +6,7 @@ #include "constants/abilities.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/game_stat.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" .include "constants/constants.inc" @@ -922,7 +923,7 @@ BattleScript_EffectFocusEnergy:: BattleScript_EffectRecoil:: setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit - incrementgamestat 0x1B + incrementgamestat GAME_STAT_USED_STRUGGLE goto BattleScript_EffectHit BattleScript_EffectConfuse:: @@ -1200,7 +1201,7 @@ BattleScript_EffectSplash:: ppreduce attackanimation waitanimation - incrementgamestat 0x1A + incrementgamestat GAME_STAT_USED_SPLASH printstring STRINGID_BUTNOTHINGHAPPENED waitmessage 0x40 goto BattleScript_MoveEnd -- cgit v1.2.3 From 54fc92bc92e78d172be51f7d11b4d746e46f8a7e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 6 Oct 2018 23:04:53 +0200 Subject: Start porting ruby battle anim file --- data/rom_8525F58.s | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 data/rom_8525F58.s (limited to 'data') diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s deleted file mode 100644 index d95af7e20..000000000 --- a/data/rom_8525F58.s +++ /dev/null @@ -1,34 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08525F58:: @ 8525F58 - .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 - .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 - .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 - .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 - - .align 2 -gCastformFrontSpriteCoords:: @ 8525F78 - .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 - .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 - - .align 2 -gUnknown_08525F88:: @ 8525F88 - .byte 0x0d, 0x0e, 0x0d, 0x0d - - .align 2 -gUnknown_08525F8C:: @ 8525F8C - .byte 0x00, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_08525F90:: @ 8525F90 - spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_08525FC0:: @ 8525FC0 - obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 - obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 -- cgit v1.2.3 From 8c834b9ae8eccaf6a95583e632f2007715271cd9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 7 Oct 2018 12:32:20 +0200 Subject: battle anim 80a5c6c decompiled --- data/battle_anim_80FE840.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s index bce7b3540..856f379d9 100644 --- a/data/battle_anim_80FE840.s +++ b/data/battle_anim_80FE840.s @@ -828,7 +828,7 @@ gUnknown_08592DE4:: @ 8592DE4 .align 2 gUnknown_08592DFC:: @ 8592DFC - spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 + spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08592E14:: @ 8592E14 @@ -1190,15 +1190,15 @@ gUnknown_08593424:: @ 8593424 .align 2 gSupersonicWaveSpriteTemplate:: @ 8593428 - spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 + spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gScreechWaveSpriteTemplate:: @ 8593440 - spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 + spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08593458:: @ 8593458 - spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820 + spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08593470:: @ 8593470 @@ -1991,7 +1991,7 @@ gUnknown_085954D0:: @ 85954D0 .align 2 gEmberSpriteTemplate:: @ 85954D4 - spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 + spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gEmberFlareSpriteTemplate:: @ 85954EC @@ -2143,7 +2143,7 @@ gBattleAnimSpriteTemplate_859574C:: @ 859574C .align 2 gUnknown_08595764:: @ 8595764 - spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 + spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_0859577C:: @ 859577C @@ -3067,7 +3067,7 @@ gUnknown_08596624:: @ 8596624 .align 2 gUnknown_0859663C:: @ 859663C - spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820 + spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08596654:: @ 8596654 -- cgit v1.2.3 From 61343d50698e035834eb276b48189d4db0a4b9b8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 7 Oct 2018 15:39:46 +0200 Subject: Decompile battle_anim_80A9C70 --- data/battle_anim_80A9C70.s | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s index 56486b8b7..892984c64 100644 --- a/data/battle_anim_80A9C70.s +++ b/data/battle_anim_80A9C70.s @@ -86,20 +86,3 @@ gUnknown_0853EF14:: @ 853EF14 .align 2 gUnknown_0853EF18:: @ 853EF18 spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C - - .align 2 -gUnknown_0853EF30:: @ 853EF30 - .byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88 - - .align 2 -gUnknown_0853EF40:: @ 853EF40 - .4byte 0x00000004, gUnknown_0853EF30 - - .align 2 -gUnknown_0853EF48:: @ 853EF48 - spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_0853EF60:: @ 853EF60 - spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44 - -- cgit v1.2.3 From 413e26e83ddecca2e8a48ae8337f3309b29a9903 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 7 Oct 2018 17:45:37 +0200 Subject: port 80d51ac --- data/battle_anim_scripts.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3ae637c37..9af3ed7a9 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6166,7 +6166,7 @@ Move_WING_ATTACK: monbgprio_28 ANIM_TARGET setalpha 12, 8 loopsewithpan SE_W017, -64, 20, 2 - createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 @@ -6694,8 +6694,8 @@ Move_SUBMISSION: waitplaysewithpan SE_W004, +63, 70 waitplaysewithpan SE_W104, -64, 80 waitplaysewithpan SE_W004, +63, 0x5A - createvisualtask sub_80D5738, 2, 0, -18, 6, 6, 4 - createvisualtask sub_80D5738, 2, 1, 18, 6, 6, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call Submission1 call Submission1 call Submission1 @@ -7219,7 +7219,7 @@ Move_STEEL_WING: monbgprio_28 ANIM_TARGET setalpha 12, 8 loopsewithpan SE_W017, -64, 20, 2 - createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 + createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask sub_810DED8, 5, 1, 70 createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 -- cgit v1.2.3