diff options
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/battle/enemy_hp_bar_border.1bpp (renamed from gfx/unknown/0f8ac0.2bpp) | bin | 32 -> 32 bytes | |||
| -rw-r--r-- | gfx/battle/expbar.2bpp (renamed from gfx/unknown/0f8b10.2bpp) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/battle/hp_exp_bar_border.1bpp (renamed from gfx/unknown/0f8ae0.2bpp) | bin | 48 -> 48 bytes | |||
| -rw-r--r-- | gfx/frames/map_entry_sign.2bpp (renamed from gfx/unknown/0f9344.2bpp) | bin | 224 -> 224 bytes | |||
| -rw-r--r-- | gfx/frames/space.2bpp (renamed from gfx/unknown/0f9204.2bpp) | bin | 16 -> 16 bytes | |||
| -rw-r--r-- | gfx/misc/cut_grass.2bpp (renamed from gfx/unknown/08c9cc.2bpp) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | gfx/misc/cut_tree.2bpp (renamed from gfx/unknown/08c98c.2bpp) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | gfx/misc/fishing.2bpp | bin | 96 -> 0 bytes | |||
| -rw-r--r-- | gfx/misc/fishing1.2bpp | 1 | ||||
| -rw-r--r-- | gfx/misc/fishing2.2bpp | bin | 0 -> 32 bytes | |||
| -rw-r--r-- | gfx/misc/fishing3.2bpp | bin | 0 -> 32 bytes | |||
| -rw-r--r-- | gfx/misc/fishing4.2bpp | 1 | ||||
| -rw-r--r-- | gfx/mobile/overworld_phone_icon.2bpp (renamed from gfx/unknown/0f8f24.2bpp) | 0 | ||||
| -rw-r--r-- | gfx/mobile/phone_tiles.2bpp (renamed from gfx/unknown/0f9214.2bpp) | bin | 304 -> 304 bytes | |||
| -rw-r--r-- | gfx/overworld/chris_fish.2bpp (renamed from gfx/unknown/0b84f2.2bpp) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/overworld/kris_fish.2bpp (renamed from gfx/unknown/0b8582.2bpp) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/overworld/sprite_headers.asm | 415 | ||||
| -rw-r--r-- | gfx/pics/animation.asm | 345 |
18 files changed, 286 insertions, 476 deletions
diff --git a/gfx/unknown/0f8ac0.2bpp b/gfx/battle/enemy_hp_bar_border.1bpp Binary files differindex 629b4770a..629b4770a 100644 --- a/gfx/unknown/0f8ac0.2bpp +++ b/gfx/battle/enemy_hp_bar_border.1bpp diff --git a/gfx/unknown/0f8b10.2bpp b/gfx/battle/expbar.2bpp Binary files differindex cf869d98b..cf869d98b 100644 --- a/gfx/unknown/0f8b10.2bpp +++ b/gfx/battle/expbar.2bpp diff --git a/gfx/unknown/0f8ae0.2bpp b/gfx/battle/hp_exp_bar_border.1bpp Binary files differindex 1e5dd7af6..1e5dd7af6 100644 --- a/gfx/unknown/0f8ae0.2bpp +++ b/gfx/battle/hp_exp_bar_border.1bpp diff --git a/gfx/unknown/0f9344.2bpp b/gfx/frames/map_entry_sign.2bpp Binary files differindex a0143875a..a0143875a 100644 --- a/gfx/unknown/0f9344.2bpp +++ b/gfx/frames/map_entry_sign.2bpp diff --git a/gfx/unknown/0f9204.2bpp b/gfx/frames/space.2bpp Binary files differindex 01d633b27..01d633b27 100644 --- a/gfx/unknown/0f9204.2bpp +++ b/gfx/frames/space.2bpp diff --git a/gfx/unknown/08c9cc.2bpp b/gfx/misc/cut_grass.2bpp Binary files differindex 1c8a3f9a8..1c8a3f9a8 100644 --- a/gfx/unknown/08c9cc.2bpp +++ b/gfx/misc/cut_grass.2bpp diff --git a/gfx/unknown/08c98c.2bpp b/gfx/misc/cut_tree.2bpp Binary files differindex aa8078f31..aa8078f31 100644 --- a/gfx/unknown/08c98c.2bpp +++ b/gfx/misc/cut_tree.2bpp diff --git a/gfx/misc/fishing.2bpp b/gfx/misc/fishing.2bpp Binary files differdeleted file mode 100644 index 0f7fd175d..000000000 --- a/gfx/misc/fishing.2bpp +++ /dev/null diff --git a/gfx/misc/fishing1.2bpp b/gfx/misc/fishing1.2bpp new file mode 100644 index 000000000..b62b99ffc --- /dev/null +++ b/gfx/misc/fishing1.2bpp @@ -0,0 +1 @@ + ????
\ No newline at end of file diff --git a/gfx/misc/fishing2.2bpp b/gfx/misc/fishing2.2bpp Binary files differnew file mode 100644 index 000000000..bb3ed2bbf --- /dev/null +++ b/gfx/misc/fishing2.2bpp diff --git a/gfx/misc/fishing3.2bpp b/gfx/misc/fishing3.2bpp Binary files differnew file mode 100644 index 000000000..f8b9f0180 --- /dev/null +++ b/gfx/misc/fishing3.2bpp diff --git a/gfx/misc/fishing4.2bpp b/gfx/misc/fishing4.2bpp new file mode 100644 index 000000000..987a4ad34 --- /dev/null +++ b/gfx/misc/fishing4.2bpp @@ -0,0 +1 @@ +@ 2 Ìd 6
\ No newline at end of file diff --git a/gfx/unknown/0f8f24.2bpp b/gfx/mobile/overworld_phone_icon.2bpp index d19ae7f12..d19ae7f12 100644 --- a/gfx/unknown/0f8f24.2bpp +++ b/gfx/mobile/overworld_phone_icon.2bpp diff --git a/gfx/unknown/0f9214.2bpp b/gfx/mobile/phone_tiles.2bpp Binary files differindex 93b085ee4..93b085ee4 100644 --- a/gfx/unknown/0f9214.2bpp +++ b/gfx/mobile/phone_tiles.2bpp diff --git a/gfx/unknown/0b84f2.2bpp b/gfx/overworld/chris_fish.2bpp Binary files differindex c3609ab54..c3609ab54 100644 --- a/gfx/unknown/0b84f2.2bpp +++ b/gfx/overworld/chris_fish.2bpp diff --git a/gfx/unknown/0b8582.2bpp b/gfx/overworld/kris_fish.2bpp Binary files differindex 9d47dc140..9d47dc140 100644 --- a/gfx/unknown/0b8582.2bpp +++ b/gfx/overworld/kris_fish.2bpp diff --git a/gfx/overworld/sprite_headers.asm b/gfx/overworld/sprite_headers.asm index 42822224a..095d7594b 100644 --- a/gfx/overworld/sprite_headers.asm +++ b/gfx/overworld/sprite_headers.asm @@ -3,614 +3,417 @@ ; Length, Bank ; Type, Palette +sprite_header: MACRO +; pointer, length, type, palette + dw \1 + db \2 * 4 tiles, BANK(\1) + db \3, \4 +ENDM + ChrisSprite: ; 14736 - dw ChrisSpriteGFX - db $3 * $40, BANK(ChrisSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1473c ChrisBikeSprite: ; 1473c - dw ChrisBikeSpriteGFX - db $3 * $40, BANK(ChrisBikeSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14742 GameboyKidSprite: ; 14742 - dw GameboyKidSpriteGFX - db $3 * $40, BANK(GameboyKidSpriteGFX) - db STANDING_SPRITE, PAL_OW_GREEN + sprite_header GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14748 SilverSprite: ; 14748 - dw SilverSpriteGFX - db $3 * $40, BANK(SilverSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1474e OakSprite: ; 1474e - dw OakSpriteGFX - db $3 * $40, BANK(OakSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14754 RedSprite: ; 14754 - dw RedSpriteGFX - db $3 * $40, BANK(RedSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1475a BlueSprite: ; 1475a - dw BlueSpriteGFX - db $3 * $40, BANK(BlueSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14760 BillSprite: ; 14760 - dw BillSpriteGFX - db $3 * $40, BANK(BillSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14766 ElderSprite: ; 14766 - dw ElderSpriteGFX - db $3 * $40, BANK(ElderSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1476c JanineSprite: ; 1476c - dw JanineSpriteGFX - db $3 * $40, BANK(JanineSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14772 KurtSprite: ; 14772 - dw KurtSpriteGFX - db $3 * $40, BANK(KurtSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14778 MomSprite: ; 14778 - dw MomSpriteGFX - db $3 * $40, BANK(MomSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1477e BlaineSprite: ; 1477e - dw BlaineSpriteGFX - db $3 * $40, BANK(BlaineSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14784 RedsMomSprite: ; 14784 - dw RedsMomSpriteGFX - db $3 * $40, BANK(RedsMomSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1478a DaisySprite: ; 1478a - dw DaisySpriteGFX - db $3 * $40, BANK(DaisySpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14790 ElmSprite: ; 14790 - dw ElmSpriteGFX - db $3 * $40, BANK(ElmSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14796 WillSprite: ; 14796 - dw WillSpriteGFX - db $3 * $40, BANK(WillSpriteGFX) - db STANDING_SPRITE, PAL_OW_RED + sprite_header WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 1479c FalknerSprite: ; 1479c - dw FalknerSpriteGFX - db $3 * $40, BANK(FalknerSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147a2 WhitneySprite: ; 147a2 - dw WhitneySpriteGFX - db $3 * $40, BANK(WhitneySpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147a8 BugsySprite: ; 147a8 - dw BugsySpriteGFX - db $3 * $40, BANK(BugsySpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147ae MortySprite: ; 147ae - dw MortySpriteGFX - db $3 * $40, BANK(MortySpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147b4 ChuckSprite: ; 147b4 - dw ChuckSpriteGFX - db $3 * $40, BANK(ChuckSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ba JasmineSprite: ; 147ba - dw JasmineSpriteGFX - db $3 * $40, BANK(JasmineSpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147c0 PryceSprite: ; 147c0 - dw PryceSpriteGFX - db $3 * $40, BANK(PryceSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147c6 ClairSprite: ; 147c6 - dw ClairSpriteGFX - db $3 * $40, BANK(ClairSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147cc BrockSprite: ; 147cc - dw BrockSpriteGFX - db $3 * $40, BANK(BrockSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147d2 KarenSprite: ; 147d2 - dw KarenSpriteGFX - db $3 * $40, BANK(KarenSpriteGFX) - db STANDING_SPRITE, PAL_OW_BLUE + sprite_header KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 147d8 BrunoSprite: ; 147d8 - dw BrunoSpriteGFX - db $3 * $40, BANK(BrunoSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147de MistySprite: ; 147de - dw MistySpriteGFX - db $3 * $40, BANK(MistySpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 147e4 LanceSprite: ; 147e4 - dw LanceSpriteGFX - db $3 * $40, BANK(LanceSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 147ea SurgeSprite: ; 147ea - dw SurgeSpriteGFX - db $3 * $40, BANK(SurgeSpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f0 ErikaSprite: ; 147f0 - dw ErikaSpriteGFX - db $3 * $40, BANK(ErikaSpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 147f6 KogaSprite: ; 147f6 - dw KogaSpriteGFX - db $3 * $40, BANK(KogaSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 147fc SabrinaSprite: ; 147fc - dw SabrinaSpriteGFX - db $3 * $40, BANK(SabrinaSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14802 CooltrainerMSprite: ; 14802 - dw CooltrainerMSpriteGFX - db $3 * $40, BANK(CooltrainerMSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14808 CooltrainerFSprite: ; 14808 - dw CooltrainerFSpriteGFX - db $3 * $40, BANK(CooltrainerFSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1480e BugCatcherSprite: ; 1480e - dw BugCatcherSpriteGFX - db $3 * $40, BANK(BugCatcherSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14814 TwinSprite: ; 14814 - dw TwinSpriteGFX - db $3 * $40, BANK(TwinSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1481a YoungsterSprite: ; 1481a - dw YoungsterSpriteGFX - db $3 * $40, BANK(YoungsterSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14820 LassSprite: ; 14820 - dw LassSpriteGFX - db $3 * $40, BANK(LassSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14826 TeacherSprite: ; 14826 - dw TeacherSpriteGFX - db $3 * $40, BANK(TeacherSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1482c BuenaSprite: ; 1482c - dw BuenaSpriteGFX - db $3 * $40, BANK(BuenaSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14832 SuperNerdSprite: ; 14832 - dw SuperNerdSpriteGFX - db $3 * $40, BANK(SuperNerdSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14838 RockerSprite: ; 14838 - dw RockerSpriteGFX - db $3 * $40, BANK(RockerSpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1483e PokefanMSprite: ; 1483e - dw PokefanMSpriteGFX - db $3 * $40, BANK(PokefanMSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14844 PokefanFSprite: ; 14844 - dw PokefanFSpriteGFX - db $3 * $40, BANK(PokefanFSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1484a GrampsSprite: ; 1484a - dw GrampsSpriteGFX - db $3 * $40, BANK(GrampsSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14850 GrannySprite: ; 14850 - dw GrannySpriteGFX - db $3 * $40, BANK(GrannySpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14856 SwimmerGuySprite: ; 14856 - dw SwimmerGuySpriteGFX - db $3 * $40, BANK(SwimmerGuySpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1485c SwimmerGirlSprite: ; 1485c - dw SwimmerGirlSpriteGFX - db $3 * $40, BANK(SwimmerGirlSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14862 BigSnorlaxSprite: ; 14862 - dw BigSnorlaxSpriteGFX - db $3 * $40, BANK(BigSnorlaxSpriteGFX) - db STANDING_SPRITE, PAL_OW_BLUE + sprite_header BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 14868 SurfingPikachuSprite: ; 14868 - dw SurfingPikachuSpriteGFX - db $3 * $40, BANK(SurfingPikachuSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1486e RocketSprite: ; 1486e - dw RocketSpriteGFX - db $3 * $40, BANK(RocketSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 14874 RocketGirlSprite: ; 14874 - dw RocketGirlSpriteGFX - db $3 * $40, BANK(RocketGirlSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 1487a NurseSprite: ; 1487a - dw NurseSpriteGFX - db $3 * $40, BANK(NurseSpriteGFX) - db STANDING_SPRITE, PAL_OW_RED + sprite_header NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14880 LinkReceptionistSprite: ; 14880 - dw LinkReceptionistSpriteGFX - db $3 * $40, BANK(LinkReceptionistSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14886 ClerkSprite: ; 14886 - dw ClerkSpriteGFX - db $3 * $40, BANK(ClerkSpriteGFX) - db WALKING_SPRITE, PAL_OW_GREEN + sprite_header ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN ; 1488c FisherSprite: ; 1488c - dw FisherSpriteGFX - db $3 * $40, BANK(FisherSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14892 FishingGuruSprite: ; 14892 - dw FishingGuruSpriteGFX - db $3 * $40, BANK(FishingGuruSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14898 ScientistSprite: ; 14898 - dw ScientistSpriteGFX - db $3 * $40, BANK(ScientistSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1489e KimonoGirlSprite: ; 1489e - dw KimonoGirlSpriteGFX - db $3 * $40, BANK(KimonoGirlSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148a4 SageSprite: ; 148a4 - dw SageSpriteGFX - db $3 * $40, BANK(SageSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148aa UnusedGuySprite: ; 148aa - dw UnusedGuySpriteGFX - db $3 * $40, BANK(UnusedGuySpriteGFX) - db STANDING_SPRITE, PAL_OW_RED + sprite_header UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 148b0 GentlemanSprite: ; 148b0 - dw GentlemanSpriteGFX - db $3 * $40, BANK(GentlemanSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148b6 BlackBeltSprite: ; 148b6 - dw BlackBeltSpriteGFX - db $3 * $40, BANK(BlackBeltSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148bc ReceptionistSprite: ; 148bc - dw ReceptionistSpriteGFX - db $3 * $40, BANK(ReceptionistSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c2 OfficerSprite: ; 148c2 - dw OfficerSpriteGFX - db $3 * $40, BANK(OfficerSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148c8 CalSprite: ; 148c8 - dw CalSpriteGFX - db $3 * $40, BANK(CalSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148ce SlowpokeSprite: ; 148ce - dw SlowpokeSpriteGFX - db $1 * $40, BANK(SlowpokeSpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 148d4 CaptainSprite: ; 148d4 - dw CaptainSpriteGFX - db $3 * $40, BANK(CaptainSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148da BigLaprasSprite: ; 148da - dw BigLaprasSpriteGFX - db $3 * $40, BANK(BigLaprasSpriteGFX) - db STANDING_SPRITE, PAL_OW_BLUE + sprite_header BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 148e0 GymGuySprite: ; 148e0 - dw GymGuySpriteGFX - db $3 * $40, BANK(GymGuySpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148e6 SailorSprite: ; 148e6 - dw SailorSpriteGFX - db $3 * $40, BANK(SailorSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148ec BikerSprite: ; 148ec - dw BikerSpriteGFX - db $3 * $40, BANK(BikerSpriteGFX) - db WALKING_SPRITE, PAL_OW_BROWN + sprite_header BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN ; 148f2 PharmacistSprite: ; 148f2 - dw PharmacistSpriteGFX - db $3 * $40, BANK(PharmacistSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 148f8 MonsterSprite: ; 148f8 - dw MonsterSpriteGFX - db $3 * $40, BANK(MonsterSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 148fe FairySprite: ; 148fe - dw FairySpriteGFX - db $3 * $40, BANK(FairySpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14904 BirdSprite: ; 14904 - dw BirdSpriteGFX - db $3 * $40, BANK(BirdSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 1490a DragonSprite: ; 1490a - dw DragonSpriteGFX - db $3 * $40, BANK(DragonSpriteGFX) - db WALKING_SPRITE, PAL_OW_RED + sprite_header DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED ; 14910 BigOnixSprite: ; 14910 - dw BigOnixSpriteGFX - db $3 * $40, BANK(BigOnixSpriteGFX) - db STANDING_SPRITE, PAL_OW_BROWN + sprite_header BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14916 N64Sprite: ; 14916 - dw N64SpriteGFX - db $1 * $40, BANK(N64SpriteGFX) - db STILL_SPRITE, PAL_OW_BROWN + sprite_header N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1491c SudowoodoSprite: ; 1491c - dw SudowoodoSpriteGFX - db $3 * $40, BANK(SudowoodoSpriteGFX) - db STANDING_SPRITE, PAL_OW_GREEN + sprite_header SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN ; 14922 SurfSprite: ; 14922 - dw SurfSpriteGFX - db $3 * $40, BANK(SurfSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14928 PokeBallSprite: ; 14928 - dw PokeBallSpriteGFX - db $1 * $40, BANK(PokeBallSpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1492e PokedexSprite: ; 1492e - dw PokedexSpriteGFX - db $1 * $40, BANK(PokedexSpriteGFX) - db STILL_SPRITE, PAL_OW_BROWN + sprite_header PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 14934 PaperSprite: ; 14934 - dw PaperSpriteGFX - db $1 * $40, BANK(PaperSpriteGFX) - db STILL_SPRITE, PAL_OW_BLUE + sprite_header PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 1493a VirtualBoySprite: ; 1493a - dw VirtualBoySpriteGFX - db $1 * $40, BANK(VirtualBoySpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14940 OldLinkReceptionistSprite: ; 14940 - dw OldLinkReceptionistSpriteGFX - db $3 * $40, BANK(OldLinkReceptionistSpriteGFX) - db STANDING_SPRITE, PAL_OW_RED + sprite_header OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED ; 14946 RockSprite: ; 14946 - dw RockSpriteGFX - db $1 * $40, BANK(RockSpriteGFX) - db STILL_SPRITE, PAL_OW_ROCK + sprite_header RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 1494c BoulderSprite: ; 1494c - dw BoulderSpriteGFX - db $1 * $40, BANK(BoulderSpriteGFX) - db STILL_SPRITE, PAL_OW_ROCK + sprite_header BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK ; 14952 SnesSprite: ; 14952 - dw SnesSpriteGFX - db $1 * $40, BANK(SnesSpriteGFX) - db STILL_SPRITE, PAL_OW_BLUE + sprite_header SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14958 FamicomSprite: ; 14958 - dw FamicomSpriteGFX - db $1 * $40, BANK(FamicomSpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1495e FruitTreeSprite: ; 1495e - dw FruitTreeSpriteGFX - db $1 * $40, BANK(FruitTreeSpriteGFX) - db STILL_SPRITE, PAL_OW_TREE + sprite_header FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE ; 14964 GoldTrophySprite: ; 14964 - dw GoldTrophySpriteGFX - db $1 * $40, BANK(GoldTrophySpriteGFX) - db STILL_SPRITE, PAL_OW_BROWN + sprite_header GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN ; 1496a SilverTrophySprite: ; 1496a - dw SilverTrophySpriteGFX - db $1 * $40, BANK(SilverTrophySpriteGFX) - db STILL_SPRITE, PAL_OW_SILVER + sprite_header SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER ; 14970 KrisSprite: ; 14970 - dw KrisSpriteGFX - db $3 * $40, BANK(KrisSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 14976 KrisBikeSprite: ; 14976 - dw KrisBikeSpriteGFX - db $3 * $40, BANK(KrisBikeSpriteGFX) - db WALKING_SPRITE, PAL_OW_BLUE + sprite_header KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE ; 1497c KurtOutsideSprite: ; 1497c - dw KurtOutsideSpriteGFX - db $3 * $40, BANK(KurtOutsideSpriteGFX) - db STANDING_SPRITE, PAL_OW_BROWN + sprite_header KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN ; 14982 SuicuneSprite: ; 14982 - dw SuicuneSpriteGFX - db $1 * $40, BANK(SuicuneSpriteGFX) - db STILL_SPRITE, PAL_OW_BLUE + sprite_header SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE ; 14988 EnteiSprite: ; 14988 - dw EnteiSpriteGFX - db $1 * $40, BANK(EnteiSpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 1498e RaikouSprite: ; 1498e - dw RaikouSpriteGFX - db $1 * $40, BANK(RaikouSpriteGFX) - db STILL_SPRITE, PAL_OW_RED + sprite_header RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED ; 14994 StandingYoungsterSprite: ; 14994 - dw StandingYoungsterSpriteGFX - db $3 * $40, BANK(StandingYoungsterSpriteGFX) - db STANDING_SPRITE, PAL_OW_BLUE + sprite_header StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE ; 1499a diff --git a/gfx/pics/animation.asm b/gfx/pics/animation.asm index 695999e82..fd37b0497 100644 --- a/gfx/pics/animation.asm +++ b/gfx/pics/animation.asm @@ -1,55 +1,55 @@ ; Pic animation arrangement. -Functiond0000: ; d0000 +AnimateMon_Slow_Normal: ; d0000 hlcoord 12, 0 ld a, [wBattleMode] - cp $1 - jr z, .asm_d0012 - ld e, $0 + cp WILD_BATTLE + jr z, .wild + ld e, ANIM_MON_SLOW ld d, $0 - call Functiond008e + call AnimateFrontpic ret -.asm_d0012 - ld e, $1 +.wild + ld e, ANIM_MON_NORMAL ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d001a -Functiond001a: ; d001a - ld e, $2 +AnimateMon_Menu: ; d001a + ld e, ANIM_MON_MENU ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d0022 -Functiond0022: ; d0022 - ld e, $3 +AnimateMon_Trade: ; d0022 + ld e, ANIM_MON_TRADE ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d002a -Functiond002a: ; d002a - ld e, $4 +AnimateMon_Evolve: ; d002a + ld e, ANIM_MON_EVOLVE ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d0032 -Functiond0032: ; d0032 - ld e, $5 +AnimateMon_Hatch: ; d0032 + ld e, ANIM_MON_HATCH ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d003a -Functiond003a: ; d003a - ld e, $6 +AnimateMon_Unused: ; d003a + ld e, ANIM_MON_UNUSED ld d, $0 - call Functiond008e + call AnimateFrontpic ret ; d0042 @@ -81,31 +81,31 @@ PokeAnims: ; d0042 dw .Egg1 dw .Egg2 -.Slow: POKEANIM Cry3, Setup2, Play -.Normal: POKEANIM Cry3, Setup, Play -.Menu: POKEANIM Cry2, Setup, Play, SetWait, Wait, Extra, Play +.Slow: POKEANIM StereoCry, Setup2, Play +.Normal: POKEANIM StereoCry, Setup, Play +.Menu: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play .Trade: POKEANIM Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play -.Evolve: POKEANIM Extra, Play, SetWait, Wait, Cry2, Setup, Play -.Hatch: POKEANIM Extra, Play, Cry2, Setup, Play, SetWait, Wait, Extra, Play -.Unused: POKEANIM Cry2, Setup, Play, SetWait, Wait, Extra, Play +.Evolve: POKEANIM Extra, Play, SetWait, Wait, CryNoWait, Setup, Play +.Hatch: POKEANIM Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play +.Unused: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play .Egg1: POKEANIM Setup, Play .Egg2: POKEANIM Extra, Play -Functiond008e: ; d008e - call Functiond01c6 +AnimateFrontpic: ; d008e + call AnimateMon_CheckIfPokemon ret c - call Functiond00a3 -.asm_d0095 + call LoadMonAnimation +.loop call Functiond00b4 push af callba Function10402d pop af - jr nc, .asm_d0095 + jr nc, .loop ret ; d00a3 -Functiond00a3: ; d00a3 +LoadMonAnimation: ; d00a3 push hl ld c, e ld b, 0 @@ -126,10 +126,10 @@ Functiond00b4: ; d00b4 push af ld a, $2 ld [rSVBK], a - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] ld c, a ld b, 0 - ld hl, w2_d169 + ld hl, wPokeAnimPointer ld a, [hli] ld h, [hl] ld l, a @@ -137,7 +137,7 @@ Functiond00b4: ; d00b4 ld a, [hl] ld hl, PokeAnim_SetupCommands rst JumpTable - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] ld c, a pop af ld [rSVBK], a @@ -162,24 +162,24 @@ endm setup_command PokeAnim_Play setup_command PokeAnim_Play2 setup_command PokeAnim_Cry - setup_command PokeAnim_Cry2 - setup_command PokeAnim_Cry3 + setup_command PokeAnim_CryNoWait + setup_command PokeAnim_StereoCry ; d00f2 PokeAnim_SetWait: ; d00f2 - ld a, $12 - ld [w2_d181], a - ld a, [w2_d168] + ld a, 18 + ld [wPokeAnimWaitCounter], a + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a PokeAnim_Wait: ; d00fe - ld hl, w2_d181 + ld hl, wPokeAnimWaitCounter dec [hl] ret nz - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d010b @@ -188,9 +188,9 @@ PokeAnim_Setup: ; d010b ld b, $0 call Functiond0228 call Functiond0504 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d011d @@ -199,9 +199,9 @@ PokeAnim_Setup2: ; d011d ld b, $4 call Functiond0228 call Functiond0504 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d012f @@ -210,9 +210,9 @@ PokeAnim_Extra: ; d012f ld b, $0 call Functiond0228 call Functiond0504 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0141 @@ -222,9 +222,9 @@ PokeAnim_Play: ; d0141 bit 7, a ret z call Functiond04bd - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0155 @@ -233,53 +233,53 @@ PokeAnim_Play2: ; d0155 ld a, [w2_d17e] bit 7, a ret z - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0166 PokeAnim_Nop: ; d0166 call Functiond01a9 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0171 PokeAnim_Finish: ; d0171 call Functiond01a9 - ld hl, w2_d168 + ld hl, wPokeAnimSceneIndex set 7, [hl] ret ; d017a PokeAnim_Cry: ; d017a - ld a, [w2_d16b] + ld a, [wPokeAnimSpecies] call _PlayCry - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0188 -PokeAnim_Cry2: ; d0188 - ld a, [w2_d16b] +PokeAnim_CryNoWait: ; d0188 + ld a, [wPokeAnimSpecies] call PlayCry2 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d0196 -PokeAnim_Cry3: ; d0196 +PokeAnim_StereoCry: ; d0196 ld a, $f ld [CryTracks], a - ld a, [w2_d16b] + ld a, [wPokeAnimSpecies] call PlayStereoCry2 - ld a, [w2_d168] + ld a, [wPokeAnimSceneIndex] inc a - ld [w2_d168], a + ld [wPokeAnimSceneIndex], a ret ; d01a9 @@ -297,16 +297,16 @@ Functiond01a9: ; d01a9 ret ; d01c6 -Functiond01c6: ; d01c6 +AnimateMon_CheckIfPokemon: ; d01c6 ld a, [CurPartySpecies] cp EGG - jr z, .asm_d01d4 + jr z, .fail call IsAPokemon - jr c, .asm_d01d4 + jr c, .fail and a ret -.asm_d01d4 +.fail scf ret ; d01d6 @@ -316,39 +316,44 @@ Functiond01d6: ; d01d6 push af ld a, $2 ld [rSVBK], a + push bc push de push hl - ld hl, w2_d168 - ld bc, $0029 + ld hl, wPokeAnimSceneIndex + ld bc, wPokeAnimStructEnd - wPokeAnimSceneIndex xor a call ByteFill pop hl pop de pop bc + +; bc contains anim pointer ld a, c - ld [w2_d169], a + ld [wPokeAnimPointer], a ld a, b - ld [w2_d16a], a + ld [wPokeAnimPointer + 1], a +; hl contains TileMap coords ld a, l - ld [w2_d16f], a + ld [wPokeAnimCoord], a ld a, h - ld [w2_d170], a + ld [wPokeAnimCoord + 1], a +; d = ????? ld a, d ld [w2_d16e], a ld a, $1 ld hl, CurPartySpecies call GetFarWRAMByte - ld [w2_d16b], a + ld [wPokeAnimSpecies], a ld a, $1 ld hl, UnownLetter call GetFarWRAMByte - ld [w2_d16c], a - call Functiond065c - ld [w2_d16d], a - call Functiond05b4 + ld [wPokeAnimUnownLetter], a + call PokeAnim_GetSpeciesOrUnown + ld [wPokeAnimSpeciesOrUnown], a + call PokeAnim_GetFrontpicDims ld a, c - ld [w2_d171], a + ld [wPokeAnimFrontpicHeight], a pop af ld [rSVBK], a ret @@ -361,7 +366,7 @@ Functiond0228: ; d0228 ld [rSVBK], a push bc ld hl, w2_d172 - ld bc, $001f + ld bc, wPokeAnimStructEnd - w2_d172 xor a call ByteFill pop bc @@ -406,13 +411,13 @@ Functiond0261: ; d0261 call Functiond02c8 ld a, [w2_d183] call Functiond02ae - ld [w2_d181], a + ld [wPokeAnimWaitCounter], a call Functiond02dc Functiond0282: ; d0282 - ld a, [w2_d181] + ld a, [wPokeAnimWaitCounter] dec a - ld [w2_d181], a + ld [wPokeAnimWaitCounter], a ret nz call Functiond02e4 ret @@ -487,14 +492,14 @@ Functiond02e4: ; d02e4 ret ; d02ec -Functiond02ec: ; d02ec - ld a, [w2_d16b] +PokeAnim_IsUnown: ; d02ec + ld a, [wPokeAnimSpecies] cp UNOWN ret ; d02f2 -Functiond02f2: ; d02f2 - ld a, [w2_d16b] +PokeAnim_IsEgg: ; d02f2 + ld a, [wPokeAnimSpecies] cp EGG ret ; d02f8 @@ -562,7 +567,7 @@ Functiond033b: ; d033b Functiond0356: ; d0356 push hl - ld a, [w2_d171] + ld a, [wPokeAnimFrontpicHeight] sub 5 ld c, a ld b, 0 @@ -581,13 +586,13 @@ Functiond036b: ; d036b ld [w2_d187], a ld [w2_d186], a ld [w2_d185], a -.asm_d0375 +.loop push hl call Functiond0392 pop hl ld a, b and a - jr z, .asm_d038a + jr z, .next ld a, [w2_d177] call GetFarByte @@ -596,11 +601,11 @@ Functiond036b: ; d036b call Functiond03bd pop hl -.asm_d038a +.next push hl call Functiond0499 pop hl - jr nc, .asm_d0375 + jr nc, .loop ret ; d0392 @@ -617,23 +622,23 @@ Functiond0392: ; d0392 ld b, [hl] ld a, [w2_d187] and 7 - jr z, .asm_d03b0 + jr z, .skip ld c, a ld a, b -.asm_d03ab +.loop rrca dec c - jr nz, .asm_d03ab + jr nz, .loop ld b, a -.asm_d03b0 +.skip xor a bit 0, b - jr z, .asm_d03b7 + jr z, .finish ld a, 1 -.asm_d03b7 +.finish ld b, a ld hl, w2_d187 inc [hl] @@ -656,18 +661,18 @@ Functiond03bd: ; d03bd Functiond03cd: ; d03cd call Functiond046c ld a, [w2_d186] - ld bc, $0014 + ld bc, SCREEN_WIDTH call AddNTimes ld a, [wc2c6] and a - jr nz, .asm_d03e8 + jr nz, .go ld a, [w2_d185] ld e, a ld d, 0 add hl, de - jr .asm_d03f3 + jr .skip -.asm_d03e8 +.go ld a, [w2_d185] ld e, a ld a, l @@ -677,7 +682,7 @@ Functiond03cd: ; d03cd sbc 0 ld h, a -.asm_d03f3 +.skip ret ; d03f4 @@ -685,18 +690,18 @@ Unknown_d03f4: db 6, 5, 4 Functiond03f7: ; d03f7 push af - ld a, [w2_d171] + ld a, [wPokeAnimFrontpicHeight] cp 5 - jr z, .asm_d0405 + jr z, .check_add_24 cp 6 - jr z, .asm_d041a + jr z, .check_add_13 pop af ret -.asm_d0405 +.check_add_24 pop af cp 5 * 5 - jr nc, .asm_d0417 + jr nc, .add_24 push hl push de ld hl, Unknown_d042f @@ -708,14 +713,14 @@ Functiond03f7: ; d03f7 pop hl ret -.asm_d0417 +.add_24 add 24 ret -.asm_d041a +.check_add_13 pop af cp 6 * 6 - jr nc, .asm_d042c + jr nc, .add_13 push hl push de ld hl, Unknown_d0448 @@ -727,7 +732,7 @@ Functiond03f7: ; d03f7 pop hl ret -.asm_d042c +.add_13 add 13 ret ; d042f @@ -749,31 +754,31 @@ Unknown_d0448: Functiond046c: ; d046c - ld hl, w2_d16f + ld hl, wPokeAnimCoord ld a, [hli] ld h, [hl] ld l, a - ld a, [w2_d171] + ld a, [wPokeAnimFrontpicHeight] ld de, 0 ld bc, 6 cp 7 - jr z, .asm_d048f + jr z, .okay ld de, 21 ld bc, 25 cp 6 - jr z, .asm_d048f + jr z, .okay ld de, 41 ld bc, 45 -.asm_d048f +.okay ld a, [wc2c6] and a - jr nz, .asm_d0497 + jr nz, .add_bc add hl, de ret -.asm_d0497 +.add_bc add hl, bc ret ; d0499 @@ -783,22 +788,22 @@ Functiond0499: ; d0499 inc a ld [w2_d186], a ld c, a - ld a, [w2_d171] + ld a, [wPokeAnimFrontpicHeight] cp c - jr nz, .asm_d04bb + jr nz, .no_carry xor a ld [w2_d186], a ld a, [w2_d185] inc a ld [w2_d185], a ld c, a - ld a, [w2_d171] + ld a, [wPokeAnimFrontpicHeight] cp c - jr nz, .asm_d04bb + jr nz, .no_carry scf ret -.asm_d04bb +.no_carry xor a ret ; d04bd @@ -807,17 +812,17 @@ Functiond04bd: ; d04bd call Functiond04f6 ld a, [wc2c6] and a - jr nz, .asm_d04ce + jr nz, .minus_one_and_six ld de, 1 ld bc, 0 - jr .asm_d04d4 + jr .okay -.asm_d04ce +.minus_one_and_six ld de, -1 ld bc, 6 -.asm_d04d4 - ld hl, w2_d16f +.okay + ld hl, wPokeAnimCoord ld a, [hli] ld h, [hl] ld l, a @@ -825,28 +830,28 @@ Functiond04bd: ; d04bd ld c, 7 ld b, 7 ld a, [w2_d16e] -.asm_d04e2 +.loop push bc push hl push de - ld de, $0014 -.asm_d04e8 + ld de, SCREEN_WIDTH +.loop2 ld [hl], a inc a add hl, de dec b - jr nz, .asm_d04e8 + jr nz, .loop2 pop de pop hl add hl, de pop bc dec c - jr nz, .asm_d04e2 + jr nz, .loop ret ; d04f6 Functiond04f6: ; d04f6 - ld hl, w2_d16f + ld hl, wPokeAnimCoord ld a, [hli] ld h, [hl] ld l, a @@ -917,7 +922,7 @@ Functiond0536: ; d0536 ; d0551 Functiond0551: ; d0551 - ld hl, w2_d16f + ld hl, wPokeAnimCoord ld a, [hli] ld h, [hl] ld l, a @@ -927,18 +932,18 @@ Functiond0551: ; d0551 ; d055c Functiond055c: ; d055c - call Functiond02f2 + call PokeAnim_IsEgg jr z, .egg ld c, BANK(UnownAnimations) ld hl, UnownAnimationPointers ld de, UnownAnimationExtraPointers - call Functiond02ec - jr z, .asm_d0576 + call PokeAnim_IsUnown + jr z, .unown ld c, BANK(PicAnimations) ld hl, AnimationPointers ld de, AnimationExtraPointers -.asm_d0576 +.unown ld a, [w2_d172] and a @@ -947,7 +952,7 @@ Functiond055c: ; d055c ld l, e .asm_d057e - ld a, [w2_d16d] + ld a, [wPokeAnimSpeciesOrUnown] dec a ld e, a ld d, 0 @@ -982,7 +987,7 @@ endr ret ; d05b4 -Functiond05b4: ; d05b4 +PokeAnim_GetFrontpicDims: ; d05b4 ld a, [rSVBK] push af ld a, $1 @@ -999,26 +1004,26 @@ Functiond05b4: ; d05b4 ; d05ce Functiond05ce: ; d05ce - call Functiond02f2 + call PokeAnim_IsEgg jr z, .egg - call Functiond02ec + call PokeAnim_IsUnown ld b, BANK(UnownFramesPointers) ld c, BANK(UnownsFrames) ld hl, UnownFramesPointers - jr z, .asm_d05ef - ld a, [w2_d16b] + jr z, .got_frames + ld a, [wPokeAnimSpecies] cp 151 + 1 ld b, BANK(FramesPointers) ld c, BANK(KantoFrames) ld hl, FramesPointers - jr c, .asm_d05ef + jr c, .got_frames ld c, BANK(JohtoFrames) -.asm_d05ef +.got_frames ld a, c ld [w2_d177], a - ld a, [w2_d16d] + ld a, [wPokeAnimSpeciesOrUnown] dec a ld e, a ld d, 0 @@ -1046,19 +1051,19 @@ endr ; d061b Functiond061b: ; d061b - call Functiond02f2 + call PokeAnim_IsEgg jr z, .egg - call Functiond02ec + call PokeAnim_IsUnown ld a, BANK(UnownBitmasksPointers) ld hl, UnownBitmasksPointers - jr z, .asm_d062f + jr z, .unown ld a, BANK(BitmasksPointers) ld hl, BitmasksPointers -.asm_d062f +.unown ld [w2_d17a], a - ld a, [w2_d16d] + ld a, [wPokeAnimSpeciesOrUnown] dec a ld e, a ld d, 0 @@ -1085,14 +1090,14 @@ endr ret ; d065c -Functiond065c: ; d065c - call Functiond02ec - jr z, .asm_d0665 - ld a, [w2_d16b] +PokeAnim_GetSpeciesOrUnown: ; d065c + call PokeAnim_IsUnown + jr z, .unown + ld a, [wPokeAnimSpecies] ret -.asm_d0665 - ld a, [w2_d16c] +.unown + ld a, [wPokeAnimUnownLetter] ret ; d0669 @@ -1101,7 +1106,7 @@ Functiond0669: ; d0669 ld [wc2c6], a Functiond066e: ; d066e - call Functiond01c6 + call AnimateMon_CheckIfPokemon jr c, .asm_d068c ld h, d ld l, e @@ -1113,7 +1118,7 @@ Functiond066e: ; d066e pop bc ld d, 0 ld e, c - call Functiond008e + call AnimateFrontpic xor a ld [wc2c6], a ret |