diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/collision_permissions.asm | 262 | ||||
| -rw-r--r-- | data/collision_stdscripts.asm | 13 | ||||
| -rw-r--r-- | data/outdoor_sprites.asm | 104 | ||||
| -rwxr-xr-x | data/sprite_anim_frames.asm | 378 | ||||
| -rw-r--r-- | data/sprite_anim_oam.asm | 1261 | ||||
| -rw-r--r-- | data/sprite_anim_seqs.asm | 135 |
6 files changed, 1189 insertions, 964 deletions
diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm new file mode 100644 index 000000000..867bacbb0 --- /dev/null +++ b/data/collision_permissions.asm @@ -0,0 +1,262 @@ +NONTALKABLE EQUS "db" +TALKABLE EQUS "db TALK +" + +TileCollisionTable:: ; 4ce1f +; entries correspond to COLL_* constants + NONTALKABLE LANDTILE ; COLL_FLOOR + NONTALKABLE LANDTILE ; COLL_01 + NONTALKABLE LANDTILE ; 02 + NONTALKABLE LANDTILE ; COLL_03 + NONTALKABLE LANDTILE ; COLL_04 + NONTALKABLE LANDTILE ; 05 + NONTALKABLE LANDTILE ; 06 + NONTALKABLE WALLTILE ; COLL_WALL + NONTALKABLE LANDTILE ; COLL_CUT_08 + NONTALKABLE LANDTILE ; 09 + NONTALKABLE LANDTILE ; 0a + NONTALKABLE LANDTILE ; 0b + NONTALKABLE LANDTILE ; 0c + NONTALKABLE LANDTILE ; 0d + NONTALKABLE LANDTILE ; 0e + NONTALKABLE WALLTILE ; 0f + NONTALKABLE LANDTILE ; COLL_TALL_GRASS_10 + NONTALKABLE LANDTILE ; 11 + TALKABLE WALLTILE ; COLL_CUT_TREE + NONTALKABLE LANDTILE ; 13 + NONTALKABLE LANDTILE ; COLL_LONG_GRASS + TALKABLE WALLTILE ; COLL_HEADBUTT_TREE + NONTALKABLE LANDTILE ; 16 + NONTALKABLE LANDTILE ; 17 + NONTALKABLE LANDTILE ; COLL_TALL_GRASS + NONTALKABLE LANDTILE ; 19 + TALKABLE WALLTILE ; COLL_CUT_TREE_1A + NONTALKABLE LANDTILE ; 1b + NONTALKABLE LANDTILE ; COLL_LONG_GRASS_1C + TALKABLE WALLTILE ; COLL_HEADBUTT_TREE_1D + NONTALKABLE LANDTILE ; 1e + NONTALKABLE LANDTILE ; 1f + NONTALKABLE WATERTILE ; 20 + NONTALKABLE WATERTILE ; COLL_WATER_21 + TALKABLE WATERTILE ; 22 + NONTALKABLE LANDTILE ; COLL_ICE + TALKABLE WATERTILE ; COLL_WHIRLPOOL + NONTALKABLE WATERTILE ; 25 + NONTALKABLE WATERTILE ; 26 + NONTALKABLE WALLTILE ; COLL_BUOY + NONTALKABLE WATERTILE ; COLL_CUT_28 + NONTALKABLE WATERTILE ; COLL_WATER + TALKABLE WATERTILE ; 2a + NONTALKABLE LANDTILE ; COLL_ICE_2B + TALKABLE WATERTILE ; COLL_WHIRLPOOL_2C + NONTALKABLE WATERTILE ; 2d + NONTALKABLE WATERTILE ; 2e + NONTALKABLE WALLTILE ; 2f + NONTALKABLE WATERTILE ; COLL_WATERFALL_RIGHT + NONTALKABLE WATERTILE ; COLL_WATERFALL_LEFT + NONTALKABLE WATERTILE ; COLL_WATERFALL_UP + NONTALKABLE WATERTILE ; COLL_WATERFALL + NONTALKABLE WATERTILE ; 34 + NONTALKABLE WATERTILE ; 35 + NONTALKABLE WATERTILE ; 36 + NONTALKABLE WATERTILE ; 37 + NONTALKABLE WATERTILE ; COLL_CURRENT_RIGHT + NONTALKABLE WATERTILE ; COLL_CURRENT_LEFT + NONTALKABLE WATERTILE ; COLL_CURRENT_UP + NONTALKABLE WATERTILE ; COLL_CURRENT_DOWN + NONTALKABLE WATERTILE ; 3c + NONTALKABLE WATERTILE ; 3d + NONTALKABLE WATERTILE ; 3e + NONTALKABLE WATERTILE ; 3f + NONTALKABLE LANDTILE ; COLL_BRAKE + NONTALKABLE LANDTILE ; COLL_WALK_RIGHT + NONTALKABLE LANDTILE ; COLL_WALK_LEFT + NONTALKABLE LANDTILE ; COLL_WALK_UP + NONTALKABLE LANDTILE ; COLL_WALK_DOWN + NONTALKABLE LANDTILE ; COLL_BRAKE_45 + NONTALKABLE LANDTILE ; COLL_BRAKE_46 + NONTALKABLE LANDTILE ; COLL_BRAKE_47 + NONTALKABLE LANDTILE ; COLL_GRASS_48 + NONTALKABLE LANDTILE ; COLL_GRASS_49 + NONTALKABLE LANDTILE ; COLL_GRASS_4A + NONTALKABLE LANDTILE ; COLL_GRASS_4B + NONTALKABLE LANDTILE ; COLL_GRASS_4C + NONTALKABLE LANDTILE ; 4d + NONTALKABLE LANDTILE ; 4e + NONTALKABLE LANDTILE ; 4f + NONTALKABLE LANDTILE ; COLL_WALK_RIGHT_ALT + NONTALKABLE LANDTILE ; COLL_WALK_LEFT_ALT + NONTALKABLE LANDTILE ; COLL_WALK_UP_ALT + NONTALKABLE LANDTILE ; COLL_WALK_DOWN_ALT + NONTALKABLE LANDTILE ; COLL_BRAKE_ALT + NONTALKABLE LANDTILE ; COLL_BRAKE_55 + NONTALKABLE LANDTILE ; COLL_BRAKE_56 + NONTALKABLE LANDTILE ; COLL_BRAKE_57 + NONTALKABLE LANDTILE ; 58 + NONTALKABLE LANDTILE ; 59 + NONTALKABLE LANDTILE ; 5a + NONTALKABLE LANDTILE ; COLL_5B + NONTALKABLE LANDTILE ; 5c + NONTALKABLE LANDTILE ; 5d + NONTALKABLE LANDTILE ; 5e + NONTALKABLE LANDTILE ; 5f + NONTALKABLE LANDTILE ; COLL_PIT + NONTALKABLE LANDTILE ; COLL_VIRTUAL_BOY + NONTALKABLE WALLTILE ; 62 + NONTALKABLE LANDTILE ; 63 + NONTALKABLE LANDTILE ; COLL_64 + NONTALKABLE LANDTILE ; COLL_65 + NONTALKABLE LANDTILE ; 66 + NONTALKABLE LANDTILE ; 67 + NONTALKABLE LANDTILE ; COLL_PIT_68 + NONTALKABLE LANDTILE ; 69 + NONTALKABLE WALLTILE ; 6a + NONTALKABLE LANDTILE ; 6b + NONTALKABLE LANDTILE ; 6c + NONTALKABLE LANDTILE ; 6d + NONTALKABLE LANDTILE ; 6e + NONTALKABLE LANDTILE ; 6f + NONTALKABLE LANDTILE ; COLL_WARP_CARPET_DOWN + NONTALKABLE LANDTILE ; COLL_DOOR + NONTALKABLE LANDTILE ; COLL_LADDER + NONTALKABLE LANDTILE ; COLL_STAIRCASE_73 + NONTALKABLE LANDTILE ; COLL_CAVE_74 + NONTALKABLE LANDTILE ; COLL_DOOR_75 + NONTALKABLE LANDTILE ; COLL_WARP_CARPET_LEFT + NONTALKABLE LANDTILE ; COLL_WARP_77 + NONTALKABLE LANDTILE ; COLL_WARP_CARPET_UP + NONTALKABLE LANDTILE ; COLL_DOOR_79 + NONTALKABLE LANDTILE ; COLL_STAIRCASE + NONTALKABLE LANDTILE ; COLL_CAVE + NONTALKABLE LANDTILE ; COLL_WARP_PANEL + NONTALKABLE LANDTILE ; COLL_DOOR_7D + NONTALKABLE LANDTILE ; COLL_WARP_CARPET_RIGHT + NONTALKABLE LANDTILE ; COLL_WARP_7F + NONTALKABLE WALLTILE ; 80 + NONTALKABLE WALLTILE ; 81 + NONTALKABLE WALLTILE ; 82 + NONTALKABLE WALLTILE ; 83 + NONTALKABLE WALLTILE ; 84 + NONTALKABLE LANDTILE ; 85 + NONTALKABLE LANDTILE ; 86 + NONTALKABLE LANDTILE ; 87 + NONTALKABLE WALLTILE ; 88 + NONTALKABLE WALLTILE ; 89 + NONTALKABLE WALLTILE ; 8a + NONTALKABLE WALLTILE ; 8b + NONTALKABLE WALLTILE ; 8c + NONTALKABLE LANDTILE ; 8d + NONTALKABLE LANDTILE ; 8e + NONTALKABLE LANDTILE ; 8f + NONTALKABLE WALLTILE ; COLL_COUNTER + NONTALKABLE WALLTILE ; COLL_BOOKSHELF + NONTALKABLE WALLTILE ; 92 + NONTALKABLE WALLTILE ; COLL_PC + NONTALKABLE WALLTILE ; COLL_RADIO + NONTALKABLE WALLTILE ; COLL_TOWN_MAP + NONTALKABLE WALLTILE ; COLL_MART_SHELF + NONTALKABLE WALLTILE ; COLL_TV + NONTALKABLE WALLTILE ; COLL_COUNTER_98 + NONTALKABLE WALLTILE ; 99 + NONTALKABLE WALLTILE ; 9a + NONTALKABLE WALLTILE ; 9b + NONTALKABLE WALLTILE ; COLL_9C + NONTALKABLE WALLTILE ; COLL_WINDOW + NONTALKABLE WALLTILE ; 9e + NONTALKABLE WALLTILE ; COLL_INCENSE_BURNER + NONTALKABLE LANDTILE ; COLL_HOP_RIGHT + NONTALKABLE LANDTILE ; COLL_HOP_LEFT + NONTALKABLE LANDTILE ; COLL_HOP_UP + NONTALKABLE LANDTILE ; COLL_HOP_DOWN + NONTALKABLE LANDTILE ; COLL_HOP_DOWN_RIGHT + NONTALKABLE LANDTILE ; COLL_HOP_DOWN_LEFT + NONTALKABLE LANDTILE ; COLL_HOP_UP_RIGHT + NONTALKABLE LANDTILE ; COLL_HOP_UP_LEFT + NONTALKABLE LANDTILE ; a8 + NONTALKABLE LANDTILE ; a9 + NONTALKABLE LANDTILE ; aa + NONTALKABLE LANDTILE ; ab + NONTALKABLE LANDTILE ; ac + NONTALKABLE LANDTILE ; ad + NONTALKABLE LANDTILE ; ae + NONTALKABLE LANDTILE ; af + NONTALKABLE LANDTILE ; COLL_RIGHT_WALL + NONTALKABLE LANDTILE ; COLL_LEFT_WALL + NONTALKABLE LANDTILE ; COLL_UP_WALL + NONTALKABLE LANDTILE ; COLL_DOWN_WALL + NONTALKABLE LANDTILE ; b4 + NONTALKABLE LANDTILE ; b5 + NONTALKABLE LANDTILE ; b6 + NONTALKABLE LANDTILE ; b7 + NONTALKABLE LANDTILE ; b8 + NONTALKABLE LANDTILE ; b9 + NONTALKABLE LANDTILE ; ba + NONTALKABLE LANDTILE ; bb + NONTALKABLE LANDTILE ; bc + NONTALKABLE LANDTILE ; bd + NONTALKABLE LANDTILE ; be + NONTALKABLE LANDTILE ; bf + NONTALKABLE WATERTILE ; c0 + NONTALKABLE WATERTILE ; c1 + NONTALKABLE WATERTILE ; c2 + NONTALKABLE WATERTILE ; c3 + NONTALKABLE WATERTILE ; c4 + NONTALKABLE WATERTILE ; c5 + NONTALKABLE WATERTILE ; c6 + NONTALKABLE WATERTILE ; c7 + NONTALKABLE WATERTILE ; c8 + NONTALKABLE WATERTILE ; c9 + NONTALKABLE WATERTILE ; ca + NONTALKABLE WATERTILE ; cb + NONTALKABLE WATERTILE ; cc + NONTALKABLE WATERTILE ; cd + NONTALKABLE WATERTILE ; ce + NONTALKABLE WATERTILE ; cf + NONTALKABLE LANDTILE ; d0 + NONTALKABLE LANDTILE ; d1 + NONTALKABLE LANDTILE ; d2 + NONTALKABLE LANDTILE ; d3 + NONTALKABLE LANDTILE ; d4 + NONTALKABLE LANDTILE ; d5 + NONTALKABLE LANDTILE ; d6 + NONTALKABLE LANDTILE ; d7 + NONTALKABLE LANDTILE ; d8 + NONTALKABLE LANDTILE ; d9 + NONTALKABLE LANDTILE ; da + NONTALKABLE LANDTILE ; db + NONTALKABLE LANDTILE ; dc + NONTALKABLE LANDTILE ; dd + NONTALKABLE LANDTILE ; de + NONTALKABLE LANDTILE ; df + NONTALKABLE LANDTILE ; e0 + NONTALKABLE LANDTILE ; e1 + NONTALKABLE LANDTILE ; e2 + NONTALKABLE LANDTILE ; e3 + NONTALKABLE LANDTILE ; e4 + NONTALKABLE LANDTILE ; e5 + NONTALKABLE LANDTILE ; e6 + NONTALKABLE LANDTILE ; e7 + NONTALKABLE LANDTILE ; e8 + NONTALKABLE LANDTILE ; e9 + NONTALKABLE LANDTILE ; ea + NONTALKABLE LANDTILE ; eb + NONTALKABLE LANDTILE ; ec + NONTALKABLE LANDTILE ; ed + NONTALKABLE LANDTILE ; ee + NONTALKABLE LANDTILE ; ef + NONTALKABLE LANDTILE ; f0 + NONTALKABLE LANDTILE ; f1 + NONTALKABLE LANDTILE ; f2 + NONTALKABLE LANDTILE ; f3 + NONTALKABLE LANDTILE ; f4 + NONTALKABLE LANDTILE ; f5 + NONTALKABLE LANDTILE ; f6 + NONTALKABLE LANDTILE ; f7 + NONTALKABLE LANDTILE ; f8 + NONTALKABLE LANDTILE ; f9 + NONTALKABLE LANDTILE ; fa + NONTALKABLE LANDTILE ; fb + NONTALKABLE LANDTILE ; fc + NONTALKABLE LANDTILE ; fd + NONTALKABLE LANDTILE ; fe + NONTALKABLE WALLTILE ; COLL_FF +; 4cf1f diff --git a/data/collision_stdscripts.asm b/data/collision_stdscripts.asm new file mode 100644 index 000000000..8156d039d --- /dev/null +++ b/data/collision_stdscripts.asm @@ -0,0 +1,13 @@ +; stdscripts associated with tile collisions + +TileCollisionStdScripts: + ; collision type, stdscript + dbw COLL_BOOKSHELF, magazinebookshelf + dbw COLL_PC, pcscript + dbw COLL_RADIO, radio1 + dbw COLL_TOWN_MAP, townmap + dbw COLL_MART_SHELF, merchandiseshelf + dbw COLL_TV, tv + dbw COLL_WINDOW, window + dbw COLL_INCENSE_BURNER, incenseburner + db -1 ; end diff --git a/data/outdoor_sprites.asm b/data/outdoor_sprites.asm index b99efcfe7..2b0cd89fe 100644 --- a/data/outdoor_sprites.asm +++ b/data/outdoor_sprites.asm @@ -2,36 +2,36 @@ ; Maps with permission ROUTE or TOWN can only use these sprites. OutdoorSprites: ; 144b8 - dw Group1Sprites - dw Group2Sprites - dw Group3Sprites - dw Group4Sprites - dw Group5Sprites - dw Group6Sprites - dw Group7Sprites - dw Group8Sprites - dw Group9Sprites - dw Group10Sprites - dw Group11Sprites - dw Group12Sprites - dw Group13Sprites - dw Group14Sprites - dw Group15Sprites - dw Group16Sprites - dw Group17Sprites - dw Group18Sprites - dw Group19Sprites - dw Group20Sprites - dw Group21Sprites - dw Group22Sprites - dw Group23Sprites - dw Group24Sprites - dw Group25Sprites - dw Group26Sprites + dw OlivineGroupSprites + dw MahoganyGroupSprites + dw DungeonsGroupSprites + dw EcruteakGroupSprites + dw BlackthornGroupSprites + dw CinnabarGroupSprites + dw CeruleanGroupSprites + dw AzaleaGroupSprites + dw LakeOfRageGroupSprites + dw VioletGroupSprites + dw GoldenrodGroupSprites + dw VermilionGroupSprites + dw PalletGroupSprites + dw PewterGroupSprites + dw FastShipGroupSprites + dw IndigoGroupSprites + dw FuchsiaGroupSprites + dw LavenderGroupSprites + dw SilverGroupSprites + dw CableClubGroupSprites + dw CeladonGroupSprites + dw CianwoodGroupSprites + dw ViridianGroupSprites + dw NewBarkGroupSprites + dw SaffronGroupSprites + dw CherrygroveGroupSprites ; 144ec -Group13Sprites: ; 144ec +PalletGroupSprites: ; 144ec db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -57,7 +57,7 @@ Group13Sprites: ; 144ec db SPRITE_FRUIT_TREE ; 14503 -Group23Sprites: ; 14503 +ViridianGroupSprites: ; 14503 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -83,7 +83,7 @@ Group23Sprites: ; 14503 db SPRITE_FRUIT_TREE ; 1451a -Group14Sprites: ; 1451a +PewterGroupSprites: ; 1451a db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -109,7 +109,7 @@ Group14Sprites: ; 1451a db SPRITE_FRUIT_TREE ; 14531 -Group6Sprites: ; 14531 +CinnabarGroupSprites: ; 14531 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -135,7 +135,7 @@ Group6Sprites: ; 14531 db SPRITE_FRUIT_TREE ; 14548 -Group7Sprites: ; 14548 +CeruleanGroupSprites: ; 14548 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -161,7 +161,7 @@ Group7Sprites: ; 14548 db SPRITE_SLOWPOKE ; 1455f -Group25Sprites: ; 1455f +SaffronGroupSprites: ; 1455f db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -187,7 +187,7 @@ Group25Sprites: ; 1455f db SPRITE_SLOWPOKE ; 14576 -Group21Sprites: ; 14576 +CeladonGroupSprites: ; 14576 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -213,7 +213,7 @@ Group21Sprites: ; 14576 db SPRITE_FRUIT_TREE ; 1458d -Group18Sprites: ; 1458d +LavenderGroupSprites: ; 1458d db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -239,7 +239,7 @@ Group18Sprites: ; 1458d db SPRITE_FRUIT_TREE ; 145a4 -Group12Sprites: ; 145a4 +VermilionGroupSprites: ; 145a4 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -265,7 +265,7 @@ Group12Sprites: ; 145a4 db SPRITE_FRUIT_TREE ; 145bb -Group17Sprites: ; 145bb +FuchsiaGroupSprites: ; 145bb db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -291,7 +291,7 @@ Group17Sprites: ; 145bb db SPRITE_FRUIT_TREE ; 145d2 -Group16Sprites: ; 145d2 +IndigoGroupSprites: ; 145d2 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -317,7 +317,7 @@ Group16Sprites: ; 145d2 db SPRITE_BOULDER ; 145e9 -Group24Sprites: ; 145e9 +NewBarkGroupSprites: ; 145e9 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -343,7 +343,7 @@ Group24Sprites: ; 145e9 db SPRITE_FRUIT_TREE ; 14600 -Group26Sprites: ; 14600 +CherrygroveGroupSprites: ; 14600 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -369,7 +369,7 @@ Group26Sprites: ; 14600 db SPRITE_FRUIT_TREE ; 14617 -Group19Sprites: ; 14617 +SilverGroupSprites: ; 14617 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -395,7 +395,7 @@ Group19Sprites: ; 14617 db SPRITE_FRUIT_TREE ; 1462e -Group10Sprites: ; 1462e +VioletGroupSprites: ; 1462e db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -421,7 +421,7 @@ Group10Sprites: ; 1462e db SPRITE_FRUIT_TREE ; 14645 -Group4Sprites: ; 14645 +EcruteakGroupSprites: ; 14645 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -447,7 +447,7 @@ Group4Sprites: ; 14645 db SPRITE_FRUIT_TREE ; 1465c -Group8Sprites: ; 1465c +AzaleaGroupSprites: ; 1465c db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -473,7 +473,7 @@ Group8Sprites: ; 1465c db SPRITE_SLOWPOKE ; 14673 -Group11Sprites: ; 14673 +GoldenrodGroupSprites: ; 14673 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_POKE_BALL @@ -499,7 +499,7 @@ Group11Sprites: ; 14673 db SPRITE_SLOWPOKE ; 1468a -Group22Sprites: ; 1468a +CianwoodGroupSprites: ; 1468a db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -525,7 +525,7 @@ Group22Sprites: ; 1468a db SPRITE_ROCK ; 146a1 -Group1Sprites: ; 146a1 +OlivineGroupSprites: ; 146a1 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -551,7 +551,7 @@ Group1Sprites: ; 146a1 db SPRITE_ROCK ; 146b8 -Group9Sprites: ; 146b8 +LakeOfRageGroupSprites: ; 146b8 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -577,7 +577,7 @@ Group9Sprites: ; 146b8 db SPRITE_POKE_BALL ; 146cf -Group2Sprites: ; 146cf +MahoganyGroupSprites: ; 146cf db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -603,7 +603,7 @@ Group2Sprites: ; 146cf db SPRITE_POKE_BALL ; 146e6 -Group5Sprites: ; 146e6 +BlackthornGroupSprites: ; 146e6 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -629,7 +629,7 @@ Group5Sprites: ; 146e6 db SPRITE_POKE_BALL ; 146fd -Group3Sprites: ; 146fd +DungeonsGroupSprites: ; 146fd db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -655,7 +655,7 @@ Group3Sprites: ; 146fd db SPRITE_BOULDER ; 14714 -Group15Sprites: ; 14714 +FastShipGroupSprites: ; 14714 db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -681,7 +681,7 @@ Group15Sprites: ; 14714 db SPRITE_ROCK ; 1472b -Group20Sprites: ; 1472b +CableClubGroupSprites: ; 1472b db SPRITE_OAK db SPRITE_FISHER db SPRITE_TEACHER diff --git a/data/sprite_anim_frames.asm b/data/sprite_anim_frames.asm index 0111a5bc2..e69792ec1 100755 --- a/data/sprite_anim_frames.asm +++ b/data/sprite_anim_frames.asm @@ -2,12 +2,12 @@ SpriteAnimFrameData: ; 8d6e6 ; entries correspond to SPRITE_ANIM_FRAMESET_* constants dw .Frameset_00 dw .Frameset_PartyMon - dw .Frameset_02 - dw .Frameset_03 - dw .Frameset_04 - dw .Frameset_05 - dw .Frameset_06 - dw .Frameset_07 + dw .Frameset_PartyMonWithMail + dw .Frameset_PartyMonWithItem + dw .Frameset_PartyMonFast + dw .Frameset_PartyMonWithMailFast + dw .Frameset_PartyMonWithItemFast + dw .Frameset_GSTitleTrail dw .Frameset_TextEntryCursor dw .Frameset_09 dw .Frameset_GameFreakLogo @@ -47,12 +47,12 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_2c dw .Frameset_BlueWalk dw .Frameset_MagnetTrainBlue - dw .Frameset_2f - dw .Frameset_30 - dw .Frameset_31 - dw .Frameset_32 - dw .Frameset_33 - dw .Frameset_34 + dw .Frameset_MobileTradeSentBall + dw .Frameset_MobileTradeOTBall + dw .Frameset_ForMobile22 + dw .Frameset_ForMobile23 + dw .Frameset_ForMobile24 + dw .Frameset_ForMobile25 dw .Frameset_IntroSuicune dw .Frameset_IntroSuicune2 dw .Frameset_IntroPichu @@ -69,150 +69,150 @@ SpriteAnimFrameData: ; 8d6e6 ; 8d76a .Frameset_00: - frame SPRITE_ANIM_FRAME_IDX_00, 32 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 32 endanim .Frameset_PartyMon: - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8 dorestart -.Frameset_02: - frame SPRITE_ANIM_FRAME_IDX_3D, 8 - frame SPRITE_ANIM_FRAME_IDX_3E, 8 +.Frameset_PartyMonWithMail: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1, 8 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2, 8 dorestart -.Frameset_03: - frame SPRITE_ANIM_FRAME_IDX_3F, 8 - frame SPRITE_ANIM_FRAME_IDX_40, 8 +.Frameset_PartyMonWithItem: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1, 8 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2, 8 dorestart -.Frameset_04: - frame SPRITE_ANIM_FRAME_IDX_00, 4 - frame SPRITE_ANIM_FRAME_IDX_01, 4 +.Frameset_PartyMonFast: + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 4 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 4 dorestart -.Frameset_05: - frame SPRITE_ANIM_FRAME_IDX_3D, 4 - frame SPRITE_ANIM_FRAME_IDX_3E, 4 +.Frameset_PartyMonWithMailFast: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1, 4 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2, 4 dorestart -.Frameset_06: - frame SPRITE_ANIM_FRAME_IDX_3F, 4 - frame SPRITE_ANIM_FRAME_IDX_40, 4 +.Frameset_PartyMonWithItemFast: + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1, 4 + frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2, 4 dorestart .Frameset_RedWalk: - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8 - frame SPRITE_ANIM_FRAME_IDX_00, 8 - frame SPRITE_ANIM_FRAME_IDX_01, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2, 8, OAM_X_FLIP dorestart .Frameset_BlueWalk: - frame SPRITE_ANIM_FRAME_IDX_63, 8 - frame SPRITE_ANIM_FRAME_IDX_64, 8 - frame SPRITE_ANIM_FRAME_IDX_63, 8 - frame SPRITE_ANIM_FRAME_IDX_64, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1, 8 + frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2, 8, OAM_X_FLIP dorestart .Frameset_MagnetTrainBlue: - frame SPRITE_ANIM_FRAME_IDX_65, 8 - frame SPRITE_ANIM_FRAME_IDX_66, 8 - frame SPRITE_ANIM_FRAME_IDX_65, 8 - frame SPRITE_ANIM_FRAME_IDX_66, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2, 8, OAM_X_FLIP dorestart -.Frameset_07: - frame SPRITE_ANIM_FRAME_IDX_1E, 1 - frame SPRITE_ANIM_FRAME_IDX_1F, 1 +.Frameset_GSTitleTrail: + frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1, 1 + frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2, 1 dorestart .Frameset_TextEntryCursor: - frame SPRITE_ANIM_FRAME_IDX_20, 1 + frame SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR, 1 dorepeat 1 dorestart .Frameset_09: - frame SPRITE_ANIM_FRAME_IDX_21, 1 + frame SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09, 1 dorepeat 1 dorestart .Frameset_GameFreakLogo: - frame SPRITE_ANIM_FRAME_IDX_81, 12 - frame SPRITE_ANIM_FRAME_IDX_82, 1 - frame SPRITE_ANIM_FRAME_IDX_83, 1 - frame SPRITE_ANIM_FRAME_IDX_82, 4 - frame SPRITE_ANIM_FRAME_IDX_81, 12 - frame SPRITE_ANIM_FRAME_IDX_82, 12 - frame SPRITE_ANIM_FRAME_IDX_83, 4 - frame SPRITE_ANIM_FRAME_IDX_84, 32 - frame SPRITE_ANIM_FRAME_IDX_85, 3 - frame SPRITE_ANIM_FRAME_IDX_86, 3 - frame SPRITE_ANIM_FRAME_IDX_87, 4 - frame SPRITE_ANIM_FRAME_IDX_88, 4 - frame SPRITE_ANIM_FRAME_IDX_89, 4 - frame SPRITE_ANIM_FRAME_IDX_8A, 10 - frame SPRITE_ANIM_FRAME_IDX_8B, 7 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 1 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3, 1 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2, 12 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4, 32 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5, 3 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6, 3 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9, 4 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10, 10 + frame SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11, 7 endanim .Frameset_GSIntroStar: - frame SPRITE_ANIM_FRAME_IDX_23, 3 - frame SPRITE_ANIM_FRAME_IDX_23, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR, 3 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR, 3, OAM_Y_FLIP dorestart .Frameset_GSIntroSparkle: - frame SPRITE_ANIM_FRAME_IDX_24, 2 - frame SPRITE_ANIM_FRAME_IDX_25, 2 - frame SPRITE_ANIM_FRAME_IDX_26, 2 - frame SPRITE_ANIM_FRAME_IDX_25, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3, 2 + frame SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2, 2 dorestart .Frameset_SlotsGolem: - frame SPRITE_ANIM_FRAME_IDX_27, 7 - frame SPRITE_ANIM_FRAME_IDX_28, 7 - frame SPRITE_ANIM_FRAME_IDX_27, 7, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_28, 7, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1, 7, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2, 7, OAM_X_FLIP dorestart .Frameset_SlotsChansey: - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2A, 7 - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2B, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3, 7 dorestart .Frameset_SlotsChansey2: - frame SPRITE_ANIM_FRAME_IDX_29, 7 - frame SPRITE_ANIM_FRAME_IDX_2C, 7 - frame SPRITE_ANIM_FRAME_IDX_2D, 7 - frame SPRITE_ANIM_FRAME_IDX_2C, 7 - frame SPRITE_ANIM_FRAME_IDX_29, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4, 7 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1, 7 endanim .Frameset_SlotsEgg: - frame SPRITE_ANIM_FRAME_IDX_2E, 20 + frame SPRITE_ANIM_FRAME_IDX_SLOTS_EGG, 20 endanim .Frameset_StillCursor: - frame SPRITE_ANIM_FRAME_IDX_2F, 32 + frame SPRITE_ANIM_FRAME_IDX_STILL_CURSOR, 32 endanim .Frameset_TradePokeBall: - frame SPRITE_ANIM_FRAME_IDX_30, 32 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 32 endanim .Frameset_TradePokeBall0: - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP dorestart .Frameset_TradePoof: - frame SPRITE_ANIM_FRAME_IDX_32, 4 - frame SPRITE_ANIM_FRAME_IDX_33, 4 - frame SPRITE_ANIM_FRAME_IDX_34, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 4 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 4 delanim .Frameset_TradeTubeBulge: @@ -221,29 +221,29 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_TrademonIcon: - frame SPRITE_ANIM_FRAME_IDX_37, 7 - frame SPRITE_ANIM_FRAME_IDX_38, 7 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1, 7 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2, 7 dorestart .Frameset_TrademonBubble: - frame SPRITE_ANIM_FRAME_IDX_39, 32 + frame SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE, 32 endanim .Frameset_EvolutionBallOfLight: - frame SPRITE_ANIM_FRAME_IDX_3B, 2 - frame SPRITE_ANIM_FRAME_IDX_3A, 2 - frame SPRITE_ANIM_FRAME_IDX_3B, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1, 2 + frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2, 2 endanim .Frameset_RadioTuningKnob: - frame SPRITE_ANIM_FRAME_IDX_3C, 32 + frame SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB, 32 endanim .Frameset_MagnetTrainRed: - frame SPRITE_ANIM_FRAME_IDX_41, 8 - frame SPRITE_ANIM_FRAME_IDX_42, 8 - frame SPRITE_ANIM_FRAME_IDX_41, 8 - frame SPRITE_ANIM_FRAME_IDX_42, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1, 8 + frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP dorestart ; XXX @@ -294,20 +294,20 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_Leaf: - frame SPRITE_ANIM_FRAME_IDX_4F, 32 + frame SPRITE_ANIM_FRAME_IDX_LEAF, 32 endanim .Frameset_CutTree: - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_51, 16 + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_2, 16 dorepeat 1 - frame SPRITE_ANIM_FRAME_IDX_52, 1 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_3, 1 dorepeat 1 - frame SPRITE_ANIM_FRAME_IDX_53, 1 + frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_4, 1 delanim .Frameset_EggCrack: - frame SPRITE_ANIM_FRAME_IDX_54, 32 + frame SPRITE_ANIM_FRAME_IDX_EGG_CRACK, 32 endanim .Frameset_EggHatch: @@ -336,10 +336,10 @@ SpriteAnimFrameData: ; 8d6e6 dorestart .Frameset_HeadbuttTree: - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_5B, 2 - frame SPRITE_ANIM_FRAME_IDX_50, 2 - frame SPRITE_ANIM_FRAME_IDX_5B, 2, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2, 2 + frame SPRITE_ANIM_FRAME_IDX_TREE_1, 2 + frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2, 2, OAM_X_FLIP dorestart .Frameset_26: @@ -370,117 +370,117 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_FRAME_IDX_62, 2 endanim -.Frameset_2f: - frame SPRITE_ANIM_FRAME_IDX_32, 3 - frame SPRITE_ANIM_FRAME_IDX_33, 3 - frame SPRITE_ANIM_FRAME_IDX_34, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - endanim - -.Frameset_30: - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3 - frame SPRITE_ANIM_FRAME_IDX_30, 3 - frame SPRITE_ANIM_FRAME_IDX_31, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_32, 3 - frame SPRITE_ANIM_FRAME_IDX_33, 3 - frame SPRITE_ANIM_FRAME_IDX_34, 3 +.Frameset_MobileTradeSentBall: + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + endanim + +.Frameset_MobileTradeOTBall: + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2, 3 + frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3, 3 delanim -.Frameset_31: - frame SPRITE_ANIM_FRAME_IDX_67, 3 - frame SPRITE_ANIM_FRAME_IDX_68, 3 +.Frameset_ForMobile22: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1, 3 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2, 3 dorestart -.Frameset_32: - frame SPRITE_ANIM_FRAME_IDX_6C, 3 +.Frameset_ForMobile23: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23, 3 endanim -.Frameset_33: - frame SPRITE_ANIM_FRAME_IDX_6D, 3 +.Frameset_ForMobile24: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24, 3 endanim -.Frameset_34: - frame SPRITE_ANIM_FRAME_IDX_69, 2 - frame SPRITE_ANIM_FRAME_IDX_6A, 2 - frame SPRITE_ANIM_FRAME_IDX_6B, 2 +.Frameset_ForMobile25: + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1, 2 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2, 2 + frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3, 2 delanim .Frameset_IntroSuicune: - frame SPRITE_ANIM_FRAME_IDX_6E, 3 - frame SPRITE_ANIM_FRAME_IDX_6F, 3 - frame SPRITE_ANIM_FRAME_IDX_70, 3 - frame SPRITE_ANIM_FRAME_IDX_71, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4, 3 dorestart .Frameset_IntroSuicune2: - frame SPRITE_ANIM_FRAME_IDX_71, 3 - frame SPRITE_ANIM_FRAME_IDX_6E, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1, 7 endanim .Frameset_IntroPichu: - frame SPRITE_ANIM_FRAME_IDX_72, 32 - frame SPRITE_ANIM_FRAME_IDX_73, 7 - frame SPRITE_ANIM_FRAME_IDX_74, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1, 32 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3, 7 endanim .Frameset_IntroWooper: - frame SPRITE_ANIM_FRAME_IDX_75, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER, 3 endanim .Frameset_IntroUnown1: - frame SPRITE_ANIM_FRAME_IDX_76, 3 - frame SPRITE_ANIM_FRAME_IDX_77, 3 - frame SPRITE_ANIM_FRAME_IDX_78, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7 delanim .Frameset_IntroUnown2: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_X_FLIP delanim .Frameset_IntroUnown3: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_Y_FLIP delanim .Frameset_IntroUnown4: - frame SPRITE_ANIM_FRAME_IDX_76, 3, OAM_X_FLIP, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_77, 3, OAM_X_FLIP, OAM_Y_FLIP - frame SPRITE_ANIM_FRAME_IDX_78, 7, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1, 3, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2, 3, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3, 7, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_IntroUnownF2: - frame SPRITE_ANIM_FRAME_IDX_79, 3 - frame SPRITE_ANIM_FRAME_IDX_7A, 3 - frame SPRITE_ANIM_FRAME_IDX_7B, 3 - frame SPRITE_ANIM_FRAME_IDX_7C, 7 - frame SPRITE_ANIM_FRAME_IDX_7D, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4, 7 + frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5, 7 endanim .Frameset_IntroSuicuneAway: - frame SPRITE_ANIM_FRAME_IDX_7E, 3 + frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY, 3 endanim .Frameset_IntroUnownF: @@ -488,12 +488,12 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_CelebiLeft: - frame SPRITE_ANIM_FRAME_IDX_7F, 8 - frame SPRITE_ANIM_FRAME_IDX_80, 8 + frame SPRITE_ANIM_FRAME_IDX_CELEBI_1, 8 + frame SPRITE_ANIM_FRAME_IDX_CELEBI_2, 8 endanim .Frameset_CelebiRight: - frame SPRITE_ANIM_FRAME_IDX_7F, 8, OAM_X_FLIP - frame SPRITE_ANIM_FRAME_IDX_80, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_CELEBI_1, 8, OAM_X_FLIP + frame SPRITE_ANIM_FRAME_IDX_CELEBI_2, 8, OAM_X_FLIP endanim ; 8d94d diff --git a/data/sprite_anim_oam.asm b/data/sprite_anim_oam.asm index 304151e8c..fea73f596 100644 --- a/data/sprite_anim_oam.asm +++ b/data/sprite_anim_oam.asm @@ -1,148 +1,148 @@ SpriteAnimOAMData: ; 8d94d ; entries correspond to SPRITE_ANIM_FRAME_IDX_* constants ; vtile offset, pointer - dbw $00, .OAMData_00 ; 00 - dbw $04, .OAMData_00 ; 01 - dbw $4c, .OAMData_02 ; 02 - dbw $5c, .OAMData_02 ; 03 - dbw $6c, .OAMData_04 ; 04 - dbw $6e, .OAMData_04 ; 05 - dbw $2d, .OAMData_06 ; 06 - dbw $4d, .OAMData_06 ; 07 - dbw $60, .OAMData_08 ; 08 - dbw $00, .OAMData_08 ; 09 - dbw $00, .OAMData_08 ; 0a - dbw $06, .OAMData_08 ; 0b - dbw $0c, .OAMData_0c ; 0c - dbw $0d, .OAMData_02 ; 0d - dbw $00, .OAMData_0e ; 0e - dbw $04, .OAMData_0e ; 0f - dbw $08, .OAMData_0e ; 10 - dbw $40, .OAMData_0e ; 11 - dbw $44, .OAMData_0e ; 12 - dbw $48, .OAMData_0e ; 13 - dbw $4c, .OAMData_0e ; 14 - dbw $80, .OAMData_15 ; 15 - dbw $85, .OAMData_15 ; 16 - dbw $8a, .OAMData_15 ; 17 - dbw $00, .OAMData_18 ; 18 - dbw $01, .OAMData_19 ; 19 - dbw $09, .OAMData_1a ; 1a - dbw $10, .OAMData_1b ; 1b - dbw $29, .OAMData_1b ; 1c - dbw $42, .OAMData_1b ; 1d - dbw $f8, .OAMData_1e ; 1e - dbw $fa, .OAMData_1e ; 1f - dbw $00, .OAMData_20 ; 20 - dbw $00, .OAMData_21 ; 21 - dbw $00, .OAMData_22 ; 22 - dbw $0f, .OAMData_23 ; 23 - dbw $11, .OAMData_02 ; 24 - dbw $12, .OAMData_02 ; 25 - dbw $13, .OAMData_02 ; 26 - dbw $00, .OAMData_27 ; 27 - dbw $08, .OAMData_27 ; 28 - dbw $10, .OAMData_29 ; 29 - dbw $10, .OAMData_2a ; 2a - dbw $10, .OAMData_2b ; 2b - dbw $10, .OAMData_2c ; 2c - dbw $10, .OAMData_2d ; 2d - dbw $3a, .OAMData_02 ; 2e - dbw $00, .OAMData_00 ; 2f - dbw $00, .OAMData_30 ; 30 - dbw $02, .OAMData_31 ; 31 - dbw $06, .OAMData_19 ; 32 - dbw $0a, .OAMData_19 ; 33 - dbw $0e, .OAMData_19 ; 34 - dbw $12, .OAMData_35 ; 35 - dbw $13, .OAMData_35 ; 36 - dbw $00, .OAMData_00 ; 37 - dbw $04, .OAMData_00 ; 38 - dbw $10, .OAMData_19 ; 39 - dbw $00, .OAMData_31 ; 3a - dbw $04, .OAMData_02 ; 3b - dbw $00, .OAMData_3c ; 3c - dbw $00, .OAMData_3d ; 3d - dbw $00, .OAMData_3e ; 3e - dbw $00, .OAMData_3f ; 3f - dbw $00, .OAMData_40 ; 40 - dbw $00, .OAMData_31 ; 41 - dbw $04, .OAMData_31 ; 42 - dbw $00, .OAMData_43 ; 43 - dbw $30, .OAMData_43 ; 44 - dbw $03, .OAMData_43 ; 45 - dbw $33, .OAMData_43 ; 46 - dbw $06, .OAMData_43 ; 47 - dbw $36, .OAMData_43 ; 48 - dbw $09, .OAMData_43 ; 49 - dbw $39, .OAMData_43 ; 4a - dbw $0c, .OAMData_4b ; 4b - dbw $0c, .OAMData_4c ; 4c - dbw $3c, .OAMData_02 ; 4d - dbw $3e, .OAMData_02 ; 4e - dbw $00, .OAMData_4f ; 4f - dbw $00, .OAMData_50 ; 50 - dbw $00, .OAMData_51 ; 51 - dbw $00, .OAMData_52 ; 52 - dbw $00, .OAMData_53 ; 53 - dbw $00, .OAMData_02 ; 54 - dbw $01, .OAMData_02 ; 55 - dbw $00, .OAMData_56 ; 56 - dbw $00, .OAMData_57 ; 57 - dbw $00, .OAMData_58 ; 58 - dbw $00, .OAMData_59 ; 59 - dbw $00, .OAMData_5a ; 5a - dbw $04, .OAMData_50 ; 5b - dbw $00, .OAMData_5c ; 5c - dbw $00, .OAMData_5d ; 5d - dbw $00, .OAMData_5e ; 5e - dbw $00, .OAMData_5f ; 5f - dbw $00, .OAMData_60 ; 60 - dbw $00, .OAMData_61 ; 61 - dbw $00, .OAMData_62 ; 62 - dbw $00, .OAMData_63 ; 63 - dbw $04, .OAMData_63 ; 64 - dbw $00, .OAMData_65 ; 65 - dbw $04, .OAMData_65 ; 66 - dbw $20, .OAMData_67 ; 67 - dbw $21, .OAMData_67 ; 68 - dbw $22, .OAMData_69 ; 69 - dbw $23, .OAMData_6a ; 6a - dbw $27, .OAMData_6b ; 6b - dbw $2a, .OAMData_6c ; 6c - dbw $2a, .OAMData_6d ; 6d - dbw $00, .OAMData_6e ; 6e - dbw $08, .OAMData_6f ; 6f - dbw $60, .OAMData_70 ; 70 - dbw $68, .OAMData_71 ; 71 - dbw $00, .OAMData_72 ; 72 - dbw $05, .OAMData_72 ; 73 - dbw $0a, .OAMData_72 ; 74 - dbw $50, .OAMData_75 ; 75 - dbw $00, .OAMData_76 ; 76 - dbw $01, .OAMData_77 ; 77 - dbw $04, .OAMData_78 ; 78 - dbw $00, .OAMData_18 ; 79 - dbw $01, .OAMData_7a ; 7a - dbw $03, .OAMData_7b ; 7b - dbw $08, .OAMData_7c ; 7c - dbw $1c, .OAMData_7c ; 7d - dbw $80, .OAMData_7e ; 7e - dbw $00, .OAMData_7f ; 7f - dbw $04, .OAMData_7f ; 80 - dbw $d0, .OAMData_81 ; 81 - dbw $d3, .OAMData_81 ; 82 - dbw $d6, .OAMData_81 ; 83 - dbw $6c, .OAMData_84 ; 84 - dbw $68, .OAMData_84 ; 85 - dbw $64, .OAMData_84 ; 86 - dbw $60, .OAMData_84 ; 87 - dbw $0c, .OAMData_84 ; 88 - dbw $08, .OAMData_84 ; 89 - dbw $04, .OAMData_84 ; 8a - dbw $00, .OAMData_84 ; 8b - -.OAMData_02: + dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_RED_WALK_1 + dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_RED_WALK_2 + dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_02 + dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_03 + dbw $6c, .OAMData_04 ; SPRITE_ANIM_FRAME_IDX_04 + dbw $6e, .OAMData_04 ; SPRITE_ANIM_FRAME_IDX_05 + dbw $2d, .OAMData_06 ; SPRITE_ANIM_FRAME_IDX_06 + dbw $4d, .OAMData_06 ; SPRITE_ANIM_FRAME_IDX_07 + dbw $60, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_08 + dbw $00, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_09 + dbw $00, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_0A + dbw $06, .OAMData_08 ; SPRITE_ANIM_FRAME_IDX_0B + dbw $0c, .OAMData_0c ; SPRITE_ANIM_FRAME_IDX_0C + dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_0D + dbw $00, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_0E + dbw $04, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_0F + dbw $08, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_10 + dbw $40, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_11 + dbw $44, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_12 + dbw $48, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_13 + dbw $4c, .OAMData_0e ; SPRITE_ANIM_FRAME_IDX_14 + dbw $80, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_15 + dbw $85, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_16 + dbw $8a, .OAMData_15 ; SPRITE_ANIM_FRAME_IDX_17 + dbw $00, .OAMData_18 ; SPRITE_ANIM_FRAME_IDX_18 + dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_19 + dbw $09, .OAMData_1a ; SPRITE_ANIM_FRAME_IDX_1A + dbw $10, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1B + dbw $29, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1C + dbw $42, .OAMData_1b ; SPRITE_ANIM_FRAME_IDX_1D + dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1 + dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2 + dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_FRAME_IDX_TEXT_ENTRY_CURSOR + dbw $00, .OAMData_ForFrameset09 ; SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09 + dbw $00, .OAMData_22 ; SPRITE_ANIM_FRAME_IDX_22 + dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_STAR + dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_1 + dbw $12, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_2 + dbw $13, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_GS_INTRO_SPARKLE_3 + dbw $00, .OAMData_SlotsGolem ; SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_1 + dbw $08, .OAMData_SlotsGolem ; SPRITE_ANIM_FRAME_IDX_SLOTS_GOLEM_2 + dbw $10, .OAMData_SlotsChansey1 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_1 + dbw $10, .OAMData_SlotsChansey2 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_2 + dbw $10, .OAMData_SlotsChansey3 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_3 + dbw $10, .OAMData_SlotsChansey4 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_4 + dbw $10, .OAMData_SlotsChansey5 ; SPRITE_ANIM_FRAME_IDX_SLOTS_CHANSEY_5 + dbw $3a, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_SLOTS_EGG + dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_STILL_CURSOR + dbw $00, .OAMData_TradePokeBall1 ; SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1 + dbw $02, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2 + dbw $06, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1 + dbw $0a, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2 + dbw $0e, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3 + dbw $12, .OAMData_35 ; SPRITE_ANIM_FRAME_IDX_35 + dbw $13, .OAMData_35 ; SPRITE_ANIM_FRAME_IDX_36 + dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1 + dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2 + dbw $10, .OAMData_TradePoofBubble ; SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE + dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1 + dbw $04, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2 + dbw $00, .OAMData_RadioTuningKnob ; SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB + dbw $00, .OAMData_PartyMonWithMail1 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1 + dbw $00, .OAMData_PartyMonWithMail2 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2 + dbw $00, .OAMData_PartyMonWithItem1 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1 + dbw $00, .OAMData_PartyMonWithItem2 ; SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2 + dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1 + dbw $04, .OAMData_MagnetTrainRed ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2 + dbw $00, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_43 + dbw $30, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_44 + dbw $03, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_45 + dbw $33, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_46 + dbw $06, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_47 + dbw $36, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_48 + dbw $09, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_49 + dbw $39, .OAMData_43 ; SPRITE_ANIM_FRAME_IDX_4A + dbw $0c, .OAMData_4b ; SPRITE_ANIM_FRAME_IDX_4B + dbw $0c, .OAMData_4c ; SPRITE_ANIM_FRAME_IDX_4C + dbw $3c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_4D + dbw $3e, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_4E + dbw $00, .OAMData_Leaf ; SPRITE_ANIM_FRAME_IDX_LEAF + dbw $00, .OAMData_Tree ; SPRITE_ANIM_FRAME_IDX_TREE_1 + dbw $00, .OAMData_CutTree2 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_2 + dbw $00, .OAMData_CutTree3 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_3 + dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_FRAME_IDX_CUT_TREE_4 + dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_EGG_CRACK + dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_FRAME_IDX_55 + dbw $00, .OAMData_56 ; SPRITE_ANIM_FRAME_IDX_56 + dbw $00, .OAMData_57 ; SPRITE_ANIM_FRAME_IDX_57 + dbw $00, .OAMData_58 ; SPRITE_ANIM_FRAME_IDX_58 + dbw $00, .OAMData_59 ; SPRITE_ANIM_FRAME_IDX_59 + dbw $00, .OAMData_5a ; SPRITE_ANIM_FRAME_IDX_5A + dbw $04, .OAMData_Tree ; SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2 + dbw $00, .OAMData_5c ; SPRITE_ANIM_FRAME_IDX_5C + dbw $00, .OAMData_5d ; SPRITE_ANIM_FRAME_IDX_5D + dbw $00, .OAMData_5e ; SPRITE_ANIM_FRAME_IDX_5E + dbw $00, .OAMData_5f ; SPRITE_ANIM_FRAME_IDX_5F + dbw $00, .OAMData_60 ; SPRITE_ANIM_FRAME_IDX_60 + dbw $00, .OAMData_61 ; SPRITE_ANIM_FRAME_IDX_61 + dbw $00, .OAMData_62 ; SPRITE_ANIM_FRAME_IDX_62 + dbw $00, .OAMData_BlueWalk ; SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1 + dbw $04, .OAMData_BlueWalk ; SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2 + dbw $00, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1 + dbw $04, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2 + dbw $20, .OAMData_ForMobile22 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1 + dbw $21, .OAMData_ForMobile22 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2 + dbw $22, .OAMData_ForMobile25_1 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1 + dbw $23, .OAMData_ForMobile25_2 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2 + dbw $27, .OAMData_ForMobile25_3 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3 + dbw $2a, .OAMData_ForMobile23 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23 + dbw $2a, .OAMData_ForMobile24 ; SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24 + dbw $00, .OAMData_IntroSuicune1 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1 + dbw $08, .OAMData_IntroSuicune2 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2 + dbw $60, .OAMData_IntroSuicune3 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3 + dbw $68, .OAMData_IntroSuicune4 ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4 + dbw $00, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1 + dbw $05, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2 + dbw $0a, .OAMData_IntroPichu ; SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3 + dbw $50, .OAMData_IntroWooper ; SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER + dbw $00, .OAMData_IntroUnown1 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1 + dbw $01, .OAMData_IntroUnown2 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2 + dbw $04, .OAMData_IntroUnown3 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3 + dbw $00, .OAMData_18 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1 + dbw $01, .OAMData_IntroUnownF2_2 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2 + dbw $03, .OAMData_IntroUnownF2_3 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3 + dbw $08, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4 + dbw $1c, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5 + dbw $80, .OAMData_IntroSuicuneAway ; SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY + dbw $00, .OAMData_Celebi ; SPRITE_ANIM_FRAME_IDX_CELEBI_1 + dbw $04, .OAMData_Celebi ; SPRITE_ANIM_FRAME_IDX_CELEBI_2 + dbw $d0, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_1 + dbw $d3, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_2 + dbw $d6, .OAMData_GameFreakLogo1_3 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_3 + dbw $6c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_4 + dbw $68, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_5 + dbw $64, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_6 + dbw $60, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_7 + dbw $0c, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_8 + dbw $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_9 + dbw $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_10 + dbw $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_FRAME_IDX_GAMEFREAK_LOGO_11 + +.OAMData_1x1_Palette0: db 1 dsprite -1, 4, -1, 4, $00, $00 @@ -153,14 +153,14 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 0, $10, $00 dsprite 0, 0, 0, 0, $11, $00 -.OAMData_23: +.OAMData_GSIntroStar: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $00, $20 - dsprite 0, 0, -1, 0, $01, $00 - dsprite 0, 0, 0, 0, $01, $20 + dsprite -1, 0, -1, 0, $00, 0 + dsprite -1, 0, 0, 0, $00, 0 | X_FLIP + dsprite 0, 0, -1, 0, $01, 0 + dsprite 0, 0, 0, 0, $01, 0 | X_FLIP -.OAMData_30: +.OAMData_TradePokeBall1: db 4 dsprite -1, 0, -1, 0, $00, $80 dsprite -1, 0, 0, 0, $00, $a0 @@ -189,24 +189,24 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 0, $00, $c0 dsprite 0, 0, 0, 0, $00, $e0 -.OAMData_19: +.OAMData_TradePoofBubble: db 16 - dsprite -2, 0, -2, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -1, 0, -2, 0, $02, $00 - dsprite -1, 0, -1, 0, $03, $00 - dsprite -2, 0, 0, 0, $01, $20 - dsprite -2, 0, 1, 0, $00, $20 - dsprite -1, 0, 0, 0, $03, $20 - dsprite -1, 0, 1, 0, $02, $20 - dsprite 0, 0, -2, 0, $02, $40 - dsprite 0, 0, -1, 0, $03, $40 - dsprite 1, 0, -2, 0, $00, $40 - dsprite 1, 0, -1, 0, $01, $40 - dsprite 0, 0, 0, 0, $03, $60 - dsprite 0, 0, 1, 0, $02, $60 - dsprite 1, 0, 0, 0, $01, $60 - dsprite 1, 0, 1, 0, $00, $60 + dsprite -2, 0, -2, 0, $00, 0 + dsprite -2, 0, -1, 0, $01, 0 + dsprite -1, 0, -2, 0, $02, 0 + dsprite -1, 0, -1, 0, $03, 0 + dsprite -2, 0, 0, 0, $01, 0 | X_FLIP + dsprite -2, 0, 1, 0, $00, 0 | X_FLIP + dsprite -1, 0, 0, 0, $03, 0 | X_FLIP + dsprite -1, 0, 1, 0, $02, 0 | X_FLIP + dsprite 0, 0, -2, 0, $02, 0 | Y_FLIP + dsprite 0, 0, -1, 0, $03, 0 | Y_FLIP + dsprite 1, 0, -2, 0, $00, 0 | Y_FLIP + dsprite 1, 0, -1, 0, $01, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $03, 0 | X_FLIP | Y_FLIP + dsprite 0, 0, 1, 0, $02, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_1a: db 36 @@ -346,52 +346,47 @@ SpriteAnimOAMData: ; 8d94d dsprite 2, 0, 1, 0, $22, $00 dsprite 2, 0, 2, 0, $23, $00 -.OAMData_00: -; party menu icons +.OAMData_RedWalk: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $02, $00 - dsprite 0, 0, 0, 0, $03, $00 + dsprite -1, 0, -1, 0, $00, PAL_OW_RED + dsprite -1, 0, 0, 0, $01, PAL_OW_RED + dsprite 0, 0, -1, 0, $02, PAL_OW_RED + dsprite 0, 0, 0, 0, $03, PAL_OW_RED -.OAMData_31: +.OAMData_MagnetTrainRed: db 4 - dsprite -1, 0, -1, 0, $00, $80 - dsprite -1, 0, 0, 0, $01, $80 - dsprite 0, 0, -1, 0, $02, $80 - dsprite 0, 0, 0, 0, $03, $80 + dsprite -1, 0, -1, 0, $00, PAL_OW_RED | BEHIND_BG + dsprite -1, 0, 0, 0, $01, PAL_OW_RED | BEHIND_BG + dsprite 0, 0, -1, 0, $02, PAL_OW_RED | BEHIND_BG + dsprite 0, 0, 0, 0, $03, PAL_OW_RED | BEHIND_BG -.OAMData_3d: -; party menu icon with mail, frame 1 +.OAMData_PartyMonWithMail1: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $08, $00 - dsprite 0, 0, 0, 0, $03, $00 + dsprite -1, 0, -1, 0, $00, PAL_OW_RED + dsprite -1, 0, 0, 0, $01, PAL_OW_RED + dsprite 0, 0, -1, 0, $08, PAL_OW_RED + dsprite 0, 0, 0, 0, $03, PAL_OW_RED -.OAMData_3e: -; party menu icon with mail, frame 2 +.OAMData_PartyMonWithMail2: db 4 - dsprite -1, 0, -1, 0, $04, $00 - dsprite -1, 0, 0, 0, $05, $00 - dsprite 0, 0, -1, 0, $08, $00 - dsprite 0, 0, 0, 0, $07, $00 + dsprite -1, 0, -1, 0, $04, PAL_OW_RED + dsprite -1, 0, 0, 0, $05, PAL_OW_RED + dsprite 0, 0, -1, 0, $08, PAL_OW_RED + dsprite 0, 0, 0, 0, $07, PAL_OW_RED -.OAMData_3f: -; party menu icon with item, frame 1 +.OAMData_PartyMonWithItem1: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $09, $00 - dsprite 0, 0, 0, 0, $03, $00 + dsprite -1, 0, -1, 0, $00, PAL_OW_RED + dsprite -1, 0, 0, 0, $01, PAL_OW_RED + dsprite 0, 0, -1, 0, $09, PAL_OW_RED + dsprite 0, 0, 0, 0, $03, PAL_OW_RED -.OAMData_40: -; party menu icon with item, frame 2 +.OAMData_PartyMonWithItem2: db 4 - dsprite -1, 0, -1, 0, $04, $00 - dsprite -1, 0, 0, 0, $05, $00 - dsprite 0, 0, -1, 0, $09, $00 - dsprite 0, 0, 0, 0, $07, $00 + dsprite -1, 0, -1, 0, $04, PAL_OW_RED + dsprite -1, 0, 0, 0, $05, PAL_OW_RED + dsprite 0, 0, -1, 0, $09, PAL_OW_RED + dsprite 0, 0, 0, 0, $07, PAL_OW_RED .OAMData_06: db 6 @@ -447,36 +442,36 @@ SpriteAnimOAMData: ; 8d94d dsprite -1, 0, 3, 0, $03, $00 dsprite 0, 0, 2, 0, $04, $00 -.OAMData_4f: +.OAMData_Leaf: db 1 - dsprite -1, 4, -1, 4, $00, $06 + dsprite -1, 4, -1, 4, $00, PAL_OW_TREE -.OAMData_50: +.OAMData_Tree: db 4 - dsprite -1, 0, -1, 0, $00, $06 - dsprite -1, 0, 0, 0, $01, $06 - dsprite 0, 0, -1, 0, $02, $06 - dsprite 0, 0, 0, 0, $03, $06 + dsprite -1, 0, -1, 0, $00, PAL_OW_TREE + dsprite -1, 0, 0, 0, $01, PAL_OW_TREE + dsprite 0, 0, -1, 0, $02, PAL_OW_TREE + dsprite 0, 0, 0, 0, $03, PAL_OW_TREE -.OAMData_20: +.OAMData_TextEntryCursor: db 4 - dsprite -1, 7, -1, 7, $00, $00 - dsprite -1, 7, 0, 0, $00, $20 - dsprite 0, 0, -1, 7, $00, $40 - dsprite 0, 0, 0, 0, $00, $60 + dsprite -1, 7, -1, 7, $00, 0 + dsprite -1, 7, 0, 0, $00, 0 | X_FLIP + dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_21: +.OAMData_ForFrameset09: db 10 - dsprite -1, 7, 0, 0, $00, $00 - dsprite -1, 7, 1, 0, $01, $00 - dsprite -1, 7, 2, 0, $01, $00 - dsprite -1, 7, 3, 0, $01, $00 - dsprite -1, 7, 4, 0, $00, $20 - dsprite 0, 0, 0, 0, $00, $40 - dsprite 0, 0, 1, 0, $01, $40 - dsprite 0, 0, 2, 0, $01, $40 - dsprite 0, 0, 3, 0, $01, $40 - dsprite 0, 0, 4, 0, $00, $60 + dsprite -1, 7, 0, 0, $00, 0 + dsprite -1, 7, 1, 0, $01, 0 + dsprite -1, 7, 2, 0, $01, 0 + dsprite -1, 7, 3, 0, $01, 0 + dsprite -1, 7, 4, 0, $00, 0 | X_FLIP + dsprite 0, 0, 0, 0, $00, 0 | Y_FLIP + dsprite 0, 0, 1, 0, $01, 0 | Y_FLIP + dsprite 0, 0, 2, 0, $01, 0 | Y_FLIP + dsprite 0, 0, 3, 0, $01, 0 | Y_FLIP + dsprite 0, 0, 4, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_22: db 15 @@ -496,65 +491,65 @@ SpriteAnimOAMData: ; 8d94d dsprite 1, 4, -1, 4, $0d, $11 dsprite 1, 4, 0, 4, $0e, $11 -.OAMData_27: +.OAMData_SlotsGolem: db 6 - dsprite -2, 4, -2, 4, $00, $15 - dsprite -2, 4, -1, 4, $02, $15 - dsprite -2, 4, 0, 4, $00, $35 - dsprite 0, 4, -2, 4, $04, $15 - dsprite 0, 4, -1, 4, $06, $15 - dsprite 0, 4, 0, 4, $04, $35 - -.OAMData_29: + dsprite -2, 4, -2, 4, $00, 5 | OBP_NUM + dsprite -2, 4, -1, 4, $02, 5 | OBP_NUM + dsprite -2, 4, 0, 4, $00, 5 | OBP_NUM | X_FLIP + dsprite 0, 4, -2, 4, $04, 5 | OBP_NUM + dsprite 0, 4, -1, 4, $06, 5 | OBP_NUM + dsprite 0, 4, 0, 4, $04, 5 | OBP_NUM | X_FLIP + +.OAMData_SlotsChansey1: db 6 - dsprite -2, 4, -2, 4, $00, $16 - dsprite -2, 4, -1, 4, $02, $16 - dsprite -2, 4, 0, 4, $04, $16 - dsprite 0, 4, -2, 4, $06, $16 - dsprite 0, 4, -1, 4, $08, $16 - dsprite 0, 4, 0, 4, $0a, $16 - -.OAMData_2a: + dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM + dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM + dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM + dsprite 0, 4, -2, 4, $06, 6 | OBP_NUM + dsprite 0, 4, -1, 4, $08, 6 | OBP_NUM + dsprite 0, 4, 0, 4, $0a, 6 | OBP_NUM + +.OAMData_SlotsChansey2: db 6 - dsprite -2, 4, -2, 4, $00, $16 - dsprite -2, 4, -1, 4, $02, $16 - dsprite -2, 4, 0, 4, $04, $16 - dsprite 0, 4, -2, 4, $0c, $16 - dsprite 0, 4, -1, 4, $0e, $16 - dsprite 0, 4, 0, 4, $10, $16 - -.OAMData_2b: + dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM + dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM + dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM + dsprite 0, 4, -2, 4, $0c, 6 | OBP_NUM + dsprite 0, 4, -1, 4, $0e, 6 | OBP_NUM + dsprite 0, 4, 0, 4, $10, 6 | OBP_NUM + +.OAMData_SlotsChansey3: db 6 - dsprite -2, 4, -2, 4, $00, $16 - dsprite -2, 4, -1, 4, $02, $16 - dsprite -2, 4, 0, 4, $04, $16 - dsprite 0, 4, -2, 4, $12, $16 - dsprite 0, 4, -1, 4, $14, $16 - dsprite 0, 4, 0, 4, $16, $16 - -.OAMData_2c: + dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM + dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM + dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM + dsprite 0, 4, -2, 4, $12, 6 | OBP_NUM + dsprite 0, 4, -1, 4, $14, 6 | OBP_NUM + dsprite 0, 4, 0, 4, $16, 6 | OBP_NUM + +.OAMData_SlotsChansey4: db 6 - dsprite -2, 4, -2, 4, $00, $16 - dsprite -2, 4, -1, 4, $02, $16 - dsprite -2, 4, 0, 4, $04, $16 - dsprite 0, 4, -2, 4, $18, $16 - dsprite 0, 4, -1, 4, $1a, $16 - dsprite 0, 4, 0, 4, $1c, $16 - -.OAMData_2d: + dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM + dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM + dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM + dsprite 0, 4, -2, 4, $18, 6 | OBP_NUM + dsprite 0, 4, -1, 4, $1a, 6 | OBP_NUM + dsprite 0, 4, 0, 4, $1c, 6 | OBP_NUM + +.OAMData_SlotsChansey5: db 6 - dsprite -2, 4, -2, 4, $1e, $16 - dsprite -2, 4, -1, 4, $20, $16 - dsprite -2, 4, 0, 4, $22, $16 - dsprite 0, 4, -2, 4, $24, $16 - dsprite 0, 4, -1, 4, $26, $16 - dsprite 0, 4, 0, 4, $28, $16 - -.OAMData_3c: + dsprite -2, 4, -2, 4, $1e, 6 | OBP_NUM + dsprite -2, 4, -1, 4, $20, 6 | OBP_NUM + dsprite -2, 4, 0, 4, $22, 6 | OBP_NUM + dsprite 0, 4, -2, 4, $24, 6 | OBP_NUM + dsprite 0, 4, -1, 4, $26, 6 | OBP_NUM + dsprite 0, 4, 0, 4, $28, 6 | OBP_NUM + +.OAMData_RadioTuningKnob: db 3 - dsprite -2, 4, -1, 4, $00, $10 - dsprite -1, 4, -1, 4, $00, $10 - dsprite 0, 4, -1, 4, $00, $10 + dsprite -2, 4, -1, 4, $00, 0 | OBP_NUM + dsprite -1, 4, -1, 4, $00, 0 | OBP_NUM + dsprite 0, 4, -1, 4, $00, 0 | OBP_NUM .OAMData_4b: db 6 @@ -572,26 +567,26 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, 2, 0, $02, $00 dsprite 0, 0, 3, 0, $03, $00 -.OAMData_51: +.OAMData_CutTree2: db 4 - dsprite -1, 0, -2, 6, $00, $06 - dsprite -1, 0, 0, 2, $01, $06 - dsprite 0, 0, -2, 6, $02, $06 - dsprite 0, 0, 0, 2, $03, $06 + dsprite -1, 0, -2, 6, $00, PAL_OW_TREE + dsprite -1, 0, 0, 2, $01, PAL_OW_TREE + dsprite 0, 0, -2, 6, $02, PAL_OW_TREE + dsprite 0, 0, 0, 2, $03, PAL_OW_TREE -.OAMData_52: +.OAMData_CutTree3: db 4 - dsprite -1, 0, -2, 4, $00, $06 - dsprite -1, 0, 0, 4, $01, $06 - dsprite 0, 0, -2, 4, $02, $06 - dsprite 0, 0, 0, 4, $03, $06 + dsprite -1, 0, -2, 4, $00, PAL_OW_TREE + dsprite -1, 0, 0, 4, $01, PAL_OW_TREE + dsprite 0, 0, -2, 4, $02, PAL_OW_TREE + dsprite 0, 0, 0, 4, $03, PAL_OW_TREE -.OAMData_53: +.OAMData_CutTree4: db 4 - dsprite -1, 0, -2, 0, $00, $06 - dsprite -1, 0, 1, 0, $01, $06 - dsprite 0, 0, -2, 0, $02, $06 - dsprite 0, 0, 1, 0, $03, $06 + dsprite -1, 0, -2, 0, $00, PAL_OW_TREE + dsprite -1, 0, 1, 0, $01, PAL_OW_TREE + dsprite 0, 0, -2, 0, $02, PAL_OW_TREE + dsprite 0, 0, 1, 0, $03, PAL_OW_TREE .OAMData_56: db 19 @@ -692,9 +687,9 @@ SpriteAnimOAMData: ; 8d94d dsprite -2, 0, 3, 0, $22, $00 dsprite 0, 0, 3, 0, $24, $00 -.OAMData_1e: +.OAMData_GSTitleTrail: db 1 - dsprite -1, 4, -1, 4, $00, $11 + dsprite -1, 4, -1, 4, $00, 1 | OBP_NUM .OAMData_5c: db 12 @@ -747,266 +742,266 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, 0, 0, $32, $00 dsprite 1, 0, 0, 0, $35, $00 -.OAMData_63: +.OAMData_BlueWalk: db 4 - dsprite -1, 0, -1, 0, $00, $01 - dsprite -1, 0, 0, 0, $01, $01 - dsprite 0, 0, -1, 0, $02, $01 - dsprite 0, 0, 0, 0, $03, $01 + dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE + dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE + dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE + dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE -.OAMData_65: +.OAMData_MagnetTrainBlue: db 4 - dsprite -1, 0, -1, 0, $00, $81 - dsprite -1, 0, 0, 0, $01, $81 - dsprite 0, 0, -1, 0, $02, $81 - dsprite 0, 0, 0, 0, $03, $81 + dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE | BEHIND_BG + dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE | BEHIND_BG + dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE | BEHIND_BG + dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE | BEHIND_BG -.OAMData_67: +.OAMData_ForMobile22: db 1 - dsprite -1, 4, -1, 4, $00, $02 + dsprite -1, 4, -1, 4, $00, 2 -.OAMData_6c: +.OAMData_ForMobile23: db 4 - dsprite -2, 0, -1, 4, $00, $03 - dsprite -1, 0, -1, 4, $01, $03 - dsprite 0, 0, -1, 4, $02, $03 - dsprite 1, 0, -1, 4, $03, $03 + dsprite -2, 0, -1, 4, $00, 3 + dsprite -1, 0, -1, 4, $01, 3 + dsprite 0, 0, -1, 4, $02, 3 + dsprite 1, 0, -1, 4, $03, 3 -.OAMData_6d: +.OAMData_ForMobile24: db 4 - dsprite -2, 0, -1, 4, $03, $44 - dsprite -1, 0, -1, 4, $02, $44 - dsprite 0, 0, -1, 4, $01, $44 - dsprite 1, 0, -1, 4, $00, $44 + dsprite -2, 0, -1, 4, $03, 4 | Y_FLIP + dsprite -1, 0, -1, 4, $02, 4 | Y_FLIP + dsprite 0, 0, -1, 4, $01, 4 | Y_FLIP + dsprite 1, 0, -1, 4, $00, 4 | Y_FLIP -.OAMData_69: +.OAMData_ForMobile25_1: db 4 - dsprite -1, 0, -1, 0, $00, $01 - dsprite -1, 0, 0, 0, $00, $21 - dsprite 0, 0, -1, 0, $00, $41 - dsprite 0, 0, 0, 0, $00, $61 + dsprite -1, 0, -1, 0, $00, 1 + dsprite -1, 0, 0, 0, $00, 1 | X_FLIP + dsprite 0, 0, -1, 0, $00, 1 | Y_FLIP + dsprite 0, 0, 0, 0, $00, 1 | X_FLIP | Y_FLIP -.OAMData_6a: +.OAMData_ForMobile25_2: db 8 - dsprite -2, 4, -2, 4, $00, $01 - dsprite -2, 4, -1, 4, $01, $01 - dsprite -2, 4, 0, 4, $00, $21 - dsprite -1, 4, -2, 4, $02, $01 - dsprite -1, 4, 0, 4, $02, $21 - dsprite 0, 4, -2, 4, $00, $41 - dsprite 0, 4, -1, 4, $01, $41 - dsprite 0, 4, 0, 4, $00, $61 - -.OAMData_6b: + dsprite -2, 4, -2, 4, $00, 1 + dsprite -2, 4, -1, 4, $01, 1 + dsprite -2, 4, 0, 4, $00, 1 | X_FLIP + dsprite -1, 4, -2, 4, $02, 1 + dsprite -1, 4, 0, 4, $02, 1 | X_FLIP + dsprite 0, 4, -2, 4, $00, 1 | Y_FLIP + dsprite 0, 4, -1, 4, $01, 1 | Y_FLIP + dsprite 0, 4, 0, 4, $00, 1 | X_FLIP | Y_FLIP + +.OAMData_ForMobile25_3: db 12 - dsprite -2, 0, -2, 0, $00, $01 - dsprite -2, 0, -1, 0, $01, $01 - dsprite -1, 0, -2, 0, $02, $01 - dsprite -2, 0, 0, 0, $01, $21 - dsprite -2, 0, 1, 0, $00, $21 - dsprite -1, 0, 1, 0, $02, $21 - dsprite 0, 0, -2, 0, $02, $41 - dsprite 1, 0, -2, 0, $00, $41 - dsprite 1, 0, -1, 0, $01, $41 - dsprite 0, 0, 1, 0, $02, $61 - dsprite 1, 0, 0, 0, $01, $61 - dsprite 1, 0, 1, 0, $00, $61 - -.OAMData_6e: + dsprite -2, 0, -2, 0, $00, 1 + dsprite -2, 0, -1, 0, $01, 1 + dsprite -1, 0, -2, 0, $02, 1 + dsprite -2, 0, 0, 0, $01, 1 | X_FLIP + dsprite -2, 0, 1, 0, $00, 1 | X_FLIP + dsprite -1, 0, 1, 0, $02, 1 | X_FLIP + dsprite 0, 0, -2, 0, $02, 1 | Y_FLIP + dsprite 1, 0, -2, 0, $00, 1 | Y_FLIP + dsprite 1, 0, -1, 0, $01, 1 | Y_FLIP + dsprite 0, 0, 1, 0, $02, 1 | X_FLIP | Y_FLIP + dsprite 1, 0, 0, 0, $01, 1 | X_FLIP | Y_FLIP + dsprite 1, 0, 1, 0, $00, 1 | X_FLIP | Y_FLIP + +.OAMData_IntroSuicune1: db 36 - dsprite -3, 0, 1, 0, $05, $00 - dsprite -3, 0, 2, 0, $06, $00 - dsprite -3, 0, 3, 0, $07, $00 - dsprite -2, 0, -3, 0, $11, $00 - dsprite -2, 0, -2, 0, $12, $00 - dsprite -2, 0, -1, 0, $13, $00 - dsprite -2, 0, 0, 0, $14, $00 - dsprite -2, 0, 1, 0, $15, $00 - dsprite -2, 0, 2, 0, $16, $00 - dsprite -2, 0, 3, 0, $17, $00 - dsprite -1, 0, -4, 0, $20, $00 - dsprite -1, 0, -3, 0, $21, $00 - dsprite -1, 0, -2, 0, $22, $00 - dsprite -1, 0, -1, 0, $23, $00 - dsprite -1, 0, 0, 0, $24, $00 - dsprite -1, 0, 1, 0, $25, $00 - dsprite -1, 0, 2, 0, $26, $00 - dsprite -1, 0, 3, 0, $27, $00 - dsprite 0, 0, -4, 0, $30, $00 - dsprite 0, 0, -3, 0, $31, $00 - dsprite 0, 0, -2, 0, $32, $00 - dsprite 0, 0, -1, 0, $33, $00 - dsprite 0, 0, 0, 0, $34, $00 - dsprite 0, 0, 1, 0, $35, $00 - dsprite 0, 0, 2, 0, $36, $00 - dsprite 1, 0, -4, 0, $40, $00 - dsprite 1, 0, -3, 0, $41, $00 - dsprite 1, 0, -2, 0, $42, $00 - dsprite 1, 0, -1, 0, $43, $00 - dsprite 1, 0, 0, 0, $44, $00 - dsprite 1, 0, 1, 0, $45, $00 - dsprite 1, 0, 2, 0, $46, $00 - dsprite 1, 0, 3, 0, $47, $00 - dsprite 2, 0, -4, 0, $50, $00 - dsprite 2, 0, -3, 0, $51, $00 - dsprite 2, 0, 3, 0, $57, $00 - -.OAMData_6f: + dsprite -3, 0, 1, 0, $05, 0 + dsprite -3, 0, 2, 0, $06, 0 + dsprite -3, 0, 3, 0, $07, 0 + dsprite -2, 0, -3, 0, $11, 0 + dsprite -2, 0, -2, 0, $12, 0 + dsprite -2, 0, -1, 0, $13, 0 + dsprite -2, 0, 0, 0, $14, 0 + dsprite -2, 0, 1, 0, $15, 0 + dsprite -2, 0, 2, 0, $16, 0 + dsprite -2, 0, 3, 0, $17, 0 + dsprite -1, 0, -4, 0, $20, 0 + dsprite -1, 0, -3, 0, $21, 0 + dsprite -1, 0, -2, 0, $22, 0 + dsprite -1, 0, -1, 0, $23, 0 + dsprite -1, 0, 0, 0, $24, 0 + dsprite -1, 0, 1, 0, $25, 0 + dsprite -1, 0, 2, 0, $26, 0 + dsprite -1, 0, 3, 0, $27, 0 + dsprite 0, 0, -4, 0, $30, 0 + dsprite 0, 0, -3, 0, $31, 0 + dsprite 0, 0, -2, 0, $32, 0 + dsprite 0, 0, -1, 0, $33, 0 + dsprite 0, 0, 0, 0, $34, 0 + dsprite 0, 0, 1, 0, $35, 0 + dsprite 0, 0, 2, 0, $36, 0 + dsprite 1, 0, -4, 0, $40, 0 + dsprite 1, 0, -3, 0, $41, 0 + dsprite 1, 0, -2, 0, $42, 0 + dsprite 1, 0, -1, 0, $43, 0 + dsprite 1, 0, 0, 0, $44, 0 + dsprite 1, 0, 1, 0, $45, 0 + dsprite 1, 0, 2, 0, $46, 0 + dsprite 1, 0, 3, 0, $47, 0 + dsprite 2, 0, -4, 0, $50, 0 + dsprite 2, 0, -3, 0, $51, 0 + dsprite 2, 0, 3, 0, $57, 0 + +.OAMData_IntroSuicune2: db 28 - dsprite -3, 0, 0, 0, $04, $00 - dsprite -3, 0, 1, 0, $05, $00 - dsprite -3, 0, 2, 0, $06, $00 - dsprite -2, 0, -3, 0, $11, $00 - dsprite -2, 0, -2, 0, $12, $00 - dsprite -2, 0, -1, 0, $13, $00 - dsprite -2, 0, 0, 0, $14, $00 - dsprite -2, 0, 1, 0, $15, $00 - dsprite -2, 0, 2, 0, $16, $00 - dsprite -1, 0, -3, 0, $21, $00 - dsprite -1, 0, -2, 0, $22, $00 - dsprite -1, 0, -1, 0, $23, $00 - dsprite -1, 0, 0, 0, $24, $00 - dsprite -1, 0, 1, 0, $25, $00 - dsprite -1, 0, 2, 0, $26, $00 - dsprite 0, 0, -4, 0, $30, $00 - dsprite 0, 0, -3, 0, $31, $00 - dsprite 0, 0, -2, 0, $32, $00 - dsprite 0, 0, -1, 0, $33, $00 - dsprite 0, 0, 0, 0, $34, $00 - dsprite 0, 0, 1, 0, $35, $00 - dsprite 1, 0, -2, 0, $42, $00 - dsprite 1, 0, -1, 0, $43, $00 - dsprite 1, 0, 0, 0, $44, $00 - dsprite 1, 0, 1, 0, $45, $00 - dsprite 2, 0, -1, 0, $53, $00 - dsprite 2, 0, 0, 0, $54, $00 - dsprite 2, 0, 1, 0, $55, $00 - -.OAMData_70: + dsprite -3, 0, 0, 0, $04, 0 + dsprite -3, 0, 1, 0, $05, 0 + dsprite -3, 0, 2, 0, $06, 0 + dsprite -2, 0, -3, 0, $11, 0 + dsprite -2, 0, -2, 0, $12, 0 + dsprite -2, 0, -1, 0, $13, 0 + dsprite -2, 0, 0, 0, $14, 0 + dsprite -2, 0, 1, 0, $15, 0 + dsprite -2, 0, 2, 0, $16, 0 + dsprite -1, 0, -3, 0, $21, 0 + dsprite -1, 0, -2, 0, $22, 0 + dsprite -1, 0, -1, 0, $23, 0 + dsprite -1, 0, 0, 0, $24, 0 + dsprite -1, 0, 1, 0, $25, 0 + dsprite -1, 0, 2, 0, $26, 0 + dsprite 0, 0, -4, 0, $30, 0 + dsprite 0, 0, -3, 0, $31, 0 + dsprite 0, 0, -2, 0, $32, 0 + dsprite 0, 0, -1, 0, $33, 0 + dsprite 0, 0, 0, 0, $34, 0 + dsprite 0, 0, 1, 0, $35, 0 + dsprite 1, 0, -2, 0, $42, 0 + dsprite 1, 0, -1, 0, $43, 0 + dsprite 1, 0, 0, 0, $44, 0 + dsprite 1, 0, 1, 0, $45, 0 + dsprite 2, 0, -1, 0, $53, 0 + dsprite 2, 0, 0, 0, $54, 0 + dsprite 2, 0, 1, 0, $55, 0 + +.OAMData_IntroSuicune3: db 30 - dsprite -3, 0, 0, 0, $04, $00 - dsprite -3, 0, 1, 0, $05, $00 - dsprite -2, 0, -3, 0, $11, $00 - dsprite -2, 0, -2, 0, $12, $00 - dsprite -2, 0, -1, 0, $13, $00 - dsprite -2, 0, 0, 0, $14, $00 - dsprite -2, 0, 1, 0, $15, $00 - dsprite -2, 0, 2, 0, $16, $00 - dsprite -2, 0, 3, 0, $17, $00 - dsprite -1, 0, -4, 0, $20, $00 - dsprite -1, 0, -3, 0, $21, $00 - dsprite -1, 0, -2, 0, $22, $00 - dsprite -1, 0, -1, 0, $23, $00 - dsprite -1, 0, 0, 0, $24, $00 - dsprite -1, 0, 1, 0, $25, $00 - dsprite -1, 0, 2, 0, $26, $00 - dsprite 0, 0, -4, 0, $30, $00 - dsprite 0, 0, -3, 0, $31, $00 - dsprite 0, 0, -2, 0, $32, $00 - dsprite 0, 0, -1, 0, $33, $00 - dsprite 0, 0, 0, 0, $34, $00 - dsprite 0, 0, 1, 0, $35, $00 - dsprite 1, 0, -2, 0, $42, $00 - dsprite 1, 0, -1, 0, $43, $00 - dsprite 1, 0, 0, 0, $44, $00 - dsprite 1, 0, 1, 0, $45, $00 - dsprite 2, 0, -2, 0, $52, $00 - dsprite 2, 0, -1, 0, $53, $00 - dsprite 2, 0, 0, 0, $54, $00 - dsprite 2, 0, 1, 0, $55, $00 - -.OAMData_71: + dsprite -3, 0, 0, 0, $04, 0 + dsprite -3, 0, 1, 0, $05, 0 + dsprite -2, 0, -3, 0, $11, 0 + dsprite -2, 0, -2, 0, $12, 0 + dsprite -2, 0, -1, 0, $13, 0 + dsprite -2, 0, 0, 0, $14, 0 + dsprite -2, 0, 1, 0, $15, 0 + dsprite -2, 0, 2, 0, $16, 0 + dsprite -2, 0, 3, 0, $17, 0 + dsprite -1, 0, -4, 0, $20, 0 + dsprite -1, 0, -3, 0, $21, 0 + dsprite -1, 0, -2, 0, $22, 0 + dsprite -1, 0, -1, 0, $23, 0 + dsprite -1, 0, 0, 0, $24, 0 + dsprite -1, 0, 1, 0, $25, 0 + dsprite -1, 0, 2, 0, $26, 0 + dsprite 0, 0, -4, 0, $30, 0 + dsprite 0, 0, -3, 0, $31, 0 + dsprite 0, 0, -2, 0, $32, 0 + dsprite 0, 0, -1, 0, $33, 0 + dsprite 0, 0, 0, 0, $34, 0 + dsprite 0, 0, 1, 0, $35, 0 + dsprite 1, 0, -2, 0, $42, 0 + dsprite 1, 0, -1, 0, $43, 0 + dsprite 1, 0, 0, 0, $44, 0 + dsprite 1, 0, 1, 0, $45, 0 + dsprite 2, 0, -2, 0, $52, 0 + dsprite 2, 0, -1, 0, $53, 0 + dsprite 2, 0, 0, 0, $54, 0 + dsprite 2, 0, 1, 0, $55, 0 + +.OAMData_IntroSuicune4: db 31 - dsprite -2, 0, -3, 0, $11, $00 - dsprite -2, 0, -2, 0, $12, $00 - dsprite -2, 0, -1, 0, $13, $00 - dsprite -2, 0, 0, 0, $14, $00 - dsprite -2, 0, 1, 0, $15, $00 - dsprite -2, 0, 2, 0, $16, $00 - dsprite -2, 0, 3, 0, $17, $00 - dsprite -1, 0, -4, 0, $20, $00 - dsprite -1, 0, -3, 0, $21, $00 - dsprite -1, 0, -2, 0, $22, $00 - dsprite -1, 0, -1, 0, $23, $00 - dsprite -1, 0, 0, 0, $24, $00 - dsprite -1, 0, 1, 0, $25, $00 - dsprite -1, 0, 2, 0, $26, $00 - dsprite -1, 0, 3, 0, $27, $00 - dsprite 0, 0, -4, 0, $30, $00 - dsprite 0, 0, -3, 0, $31, $00 - dsprite 0, 0, -2, 0, $32, $00 - dsprite 0, 0, -1, 0, $33, $00 - dsprite 0, 0, 0, 0, $34, $00 - dsprite 0, 0, 1, 0, $35, $00 - dsprite 0, 0, 2, 0, $36, $00 - dsprite 1, 0, -3, 0, $41, $00 - dsprite 1, 0, -2, 0, $42, $00 - dsprite 1, 0, -1, 0, $43, $00 - dsprite 1, 0, 0, 0, $44, $00 - dsprite 1, 0, 1, 0, $45, $00 - dsprite 2, 0, -3, 0, $51, $00 - dsprite 2, 0, -2, 0, $52, $00 - dsprite 2, 0, 0, 0, $54, $00 - dsprite 2, 0, 1, 0, $55, $00 - -.OAMData_72: + dsprite -2, 0, -3, 0, $11, 0 + dsprite -2, 0, -2, 0, $12, 0 + dsprite -2, 0, -1, 0, $13, 0 + dsprite -2, 0, 0, 0, $14, 0 + dsprite -2, 0, 1, 0, $15, 0 + dsprite -2, 0, 2, 0, $16, 0 + dsprite -2, 0, 3, 0, $17, 0 + dsprite -1, 0, -4, 0, $20, 0 + dsprite -1, 0, -3, 0, $21, 0 + dsprite -1, 0, -2, 0, $22, 0 + dsprite -1, 0, -1, 0, $23, 0 + dsprite -1, 0, 0, 0, $24, 0 + dsprite -1, 0, 1, 0, $25, 0 + dsprite -1, 0, 2, 0, $26, 0 + dsprite -1, 0, 3, 0, $27, 0 + dsprite 0, 0, -4, 0, $30, 0 + dsprite 0, 0, -3, 0, $31, 0 + dsprite 0, 0, -2, 0, $32, 0 + dsprite 0, 0, -1, 0, $33, 0 + dsprite 0, 0, 0, 0, $34, 0 + dsprite 0, 0, 1, 0, $35, 0 + dsprite 0, 0, 2, 0, $36, 0 + dsprite 1, 0, -3, 0, $41, 0 + dsprite 1, 0, -2, 0, $42, 0 + dsprite 1, 0, -1, 0, $43, 0 + dsprite 1, 0, 0, 0, $44, 0 + dsprite 1, 0, 1, 0, $45, 0 + dsprite 2, 0, -3, 0, $51, 0 + dsprite 2, 0, -2, 0, $52, 0 + dsprite 2, 0, 0, 0, $54, 0 + dsprite 2, 0, 1, 0, $55, 0 + +.OAMData_IntroPichu: db 25 - dsprite -3, 4, -3, 4, $00, $09 - dsprite -3, 4, -2, 4, $01, $09 - dsprite -3, 4, -1, 4, $02, $09 - dsprite -3, 4, 0, 4, $03, $09 - dsprite -3, 4, 1, 4, $04, $09 - dsprite -2, 4, -3, 4, $10, $09 - dsprite -2, 4, -2, 4, $11, $09 - dsprite -2, 4, -1, 4, $12, $09 - dsprite -2, 4, 0, 4, $13, $09 - dsprite -2, 4, 1, 4, $14, $09 - dsprite -1, 4, -3, 4, $20, $09 - dsprite -1, 4, -2, 4, $21, $09 - dsprite -1, 4, -1, 4, $22, $09 - dsprite -1, 4, 0, 4, $23, $09 - dsprite -1, 4, 1, 4, $24, $09 - dsprite 0, 4, -3, 4, $30, $09 - dsprite 0, 4, -2, 4, $31, $09 - dsprite 0, 4, -1, 4, $32, $09 - dsprite 0, 4, 0, 4, $33, $09 - dsprite 0, 4, 1, 4, $34, $09 - dsprite 1, 4, -3, 4, $40, $09 - dsprite 1, 4, -2, 4, $41, $09 - dsprite 1, 4, -1, 4, $42, $09 - dsprite 1, 4, 0, 4, $43, $09 - dsprite 1, 4, 1, 4, $44, $09 - -.OAMData_75: + dsprite -3, 4, -3, 4, $00, 1 | VRAM_BANK_1 + dsprite -3, 4, -2, 4, $01, 1 | VRAM_BANK_1 + dsprite -3, 4, -1, 4, $02, 1 | VRAM_BANK_1 + dsprite -3, 4, 0, 4, $03, 1 | VRAM_BANK_1 + dsprite -3, 4, 1, 4, $04, 1 | VRAM_BANK_1 + dsprite -2, 4, -3, 4, $10, 1 | VRAM_BANK_1 + dsprite -2, 4, -2, 4, $11, 1 | VRAM_BANK_1 + dsprite -2, 4, -1, 4, $12, 1 | VRAM_BANK_1 + dsprite -2, 4, 0, 4, $13, 1 | VRAM_BANK_1 + dsprite -2, 4, 1, 4, $14, 1 | VRAM_BANK_1 + dsprite -1, 4, -3, 4, $20, 1 | VRAM_BANK_1 + dsprite -1, 4, -2, 4, $21, 1 | VRAM_BANK_1 + dsprite -1, 4, -1, 4, $22, 1 | VRAM_BANK_1 + dsprite -1, 4, 0, 4, $23, 1 | VRAM_BANK_1 + dsprite -1, 4, 1, 4, $24, 1 | VRAM_BANK_1 + dsprite 0, 4, -3, 4, $30, 1 | VRAM_BANK_1 + dsprite 0, 4, -2, 4, $31, 1 | VRAM_BANK_1 + dsprite 0, 4, -1, 4, $32, 1 | VRAM_BANK_1 + dsprite 0, 4, 0, 4, $33, 1 | VRAM_BANK_1 + dsprite 0, 4, 1, 4, $34, 1 | VRAM_BANK_1 + dsprite 1, 4, -3, 4, $40, 1 | VRAM_BANK_1 + dsprite 1, 4, -2, 4, $41, 1 | VRAM_BANK_1 + dsprite 1, 4, -1, 4, $42, 1 | VRAM_BANK_1 + dsprite 1, 4, 0, 4, $43, 1 | VRAM_BANK_1 + dsprite 1, 4, 1, 4, $44, 1 | VRAM_BANK_1 + +.OAMData_IntroWooper: db 16 - dsprite -2, 0, -3, 4, $00, $0a - dsprite -2, 0, -2, 4, $01, $0a - dsprite -2, 0, -1, 4, $02, $0a - dsprite -2, 0, 0, 4, $03, $0a - dsprite -1, 0, -3, 4, $04, $0a - dsprite -1, 0, -2, 4, $05, $0a - dsprite -1, 0, -1, 4, $06, $0a - dsprite -1, 0, 0, 4, $07, $0a - dsprite 0, 0, -3, 4, $08, $0a - dsprite 0, 0, -2, 4, $09, $0a - dsprite 0, 0, -1, 4, $0a, $0a - dsprite 0, 0, 0, 4, $0b, $0a - dsprite 1, 0, -3, 4, $0c, $0a - dsprite 1, 0, -2, 4, $0d, $0a - dsprite 1, 0, -1, 4, $0e, $0a - dsprite 1, 0, 0, 4, $0f, $0a - -.OAMData_76: + dsprite -2, 0, -3, 4, $00, 2 | VRAM_BANK_1 + dsprite -2, 0, -2, 4, $01, 2 | VRAM_BANK_1 + dsprite -2, 0, -1, 4, $02, 2 | VRAM_BANK_1 + dsprite -2, 0, 0, 4, $03, 2 | VRAM_BANK_1 + dsprite -1, 0, -3, 4, $04, 2 | VRAM_BANK_1 + dsprite -1, 0, -2, 4, $05, 2 | VRAM_BANK_1 + dsprite -1, 0, -1, 4, $06, 2 | VRAM_BANK_1 + dsprite -1, 0, 0, 4, $07, 2 | VRAM_BANK_1 + dsprite 0, 0, -3, 4, $08, 2 | VRAM_BANK_1 + dsprite 0, 0, -2, 4, $09, 2 | VRAM_BANK_1 + dsprite 0, 0, -1, 4, $0a, 2 | VRAM_BANK_1 + dsprite 0, 0, 0, 4, $0b, 2 | VRAM_BANK_1 + dsprite 1, 0, -3, 4, $0c, 2 | VRAM_BANK_1 + dsprite 1, 0, -2, 4, $0d, 2 | VRAM_BANK_1 + dsprite 1, 0, -1, 4, $0e, 2 | VRAM_BANK_1 + dsprite 1, 0, 0, 4, $0f, 2 | VRAM_BANK_1 + +.OAMData_IntroUnown1: db 1 dsprite -1, 4, -1, 4, $00, $00 -.OAMData_77: +.OAMData_IntroUnown2: db 3 dsprite 0, 0, -1, 0, $00, $00 dsprite -1, 0, -1, 0, $01, $00 dsprite -1, 0, 0, 0, $02, $00 -.OAMData_78: +.OAMData_IntroUnown3: db 7 dsprite 1, 0, -2, 0, $00, $00 dsprite 0, 0, -2, 0, $01, $00 @@ -1016,121 +1011,121 @@ SpriteAnimOAMData: ; 8d94d dsprite -2, 0, 0, 0, $05, $00 dsprite -2, 0, 1, 0, $06, $00 -.OAMData_7a: +.OAMData_IntroUnownF2_2: db 8 - dsprite -1, 0, -2, 0, $00, $00 - dsprite -1, 0, -1, 0, $01, $00 - dsprite -1, 0, 0, 0, $01, $20 - dsprite -1, 0, 1, 0, $00, $20 - dsprite 0, 0, -2, 0, $00, $40 - dsprite 0, 0, -1, 0, $01, $40 - dsprite 0, 0, 0, 0, $01, $60 - dsprite 0, 0, 1, 0, $00, $60 - -.OAMData_7b: + dsprite -1, 0, -2, 0, $00, 0 + dsprite -1, 0, -1, 0, $01, 0 + dsprite -1, 0, 0, 0, $01, 0 | X_FLIP + dsprite -1, 0, 1, 0, $00, 0 | X_FLIP + dsprite 0, 0, -2, 0, $00, 0 | Y_FLIP + dsprite 0, 0, -1, 0, $01, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP + +.OAMData_IntroUnownF2_3: db 12 - dsprite -3, 0, -1, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -1, 0, -1, 0, $02, $00 - dsprite -3, 0, 0, 0, $00, $20 - dsprite -2, 0, 0, 0, $01, $20 - dsprite -1, 0, 0, 0, $02, $20 - dsprite 0, 0, -1, 0, $02, $40 - dsprite 1, 0, -1, 0, $01, $40 - dsprite 2, 0, -1, 0, $00, $40 - dsprite 0, 0, 0, 0, $02, $60 - dsprite 1, 0, 0, 0, $01, $60 - dsprite 2, 0, 0, 0, $00, $60 - -.OAMData_7c: + dsprite -3, 0, -1, 0, $00, 0 + dsprite -2, 0, -1, 0, $01, 0 + dsprite -1, 0, -1, 0, $02, 0 + dsprite -3, 0, 0, 0, $00, 0 | X_FLIP + dsprite -2, 0, 0, 0, $01, 0 | X_FLIP + dsprite -1, 0, 0, 0, $02, 0 | X_FLIP + dsprite 0, 0, -1, 0, $02, 0 | Y_FLIP + dsprite 1, 0, -1, 0, $01, 0 | Y_FLIP + dsprite 2, 0, -1, 0, $00, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dsprite 2, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP + +.OAMData_IntroUnownF2_4_5: db 20 - dsprite -3, 4, -2, 0, $00, $00 - dsprite -3, 4, -1, 0, $01, $00 - dsprite -3, 4, 0, 0, $02, $00 - dsprite -3, 4, 1, 0, $03, $00 - dsprite -2, 4, -2, 0, $04, $00 - dsprite -2, 4, -1, 0, $05, $00 - dsprite -2, 4, 0, 0, $06, $00 - dsprite -2, 4, 1, 0, $07, $00 - dsprite -1, 4, -2, 0, $08, $00 - dsprite -1, 4, -1, 0, $09, $00 - dsprite -1, 4, 0, 0, $0a, $00 - dsprite -1, 4, 1, 0, $0b, $00 - dsprite 0, 4, -2, 0, $0c, $00 - dsprite 0, 4, -1, 0, $0d, $00 - dsprite 0, 4, 0, 0, $0e, $00 - dsprite 0, 4, 1, 0, $0f, $00 - dsprite 1, 4, -2, 0, $10, $00 - dsprite 1, 4, -1, 0, $11, $00 - dsprite 1, 4, 0, 0, $12, $00 - dsprite 1, 4, 1, 0, $13, $00 - -.OAMData_7e: + dsprite -3, 4, -2, 0, $00, 0 + dsprite -3, 4, -1, 0, $01, 0 + dsprite -3, 4, 0, 0, $02, 0 + dsprite -3, 4, 1, 0, $03, 0 + dsprite -2, 4, -2, 0, $04, 0 + dsprite -2, 4, -1, 0, $05, 0 + dsprite -2, 4, 0, 0, $06, 0 + dsprite -2, 4, 1, 0, $07, 0 + dsprite -1, 4, -2, 0, $08, 0 + dsprite -1, 4, -1, 0, $09, 0 + dsprite -1, 4, 0, 0, $0a, 0 + dsprite -1, 4, 1, 0, $0b, 0 + dsprite 0, 4, -2, 0, $0c, 0 + dsprite 0, 4, -1, 0, $0d, 0 + dsprite 0, 4, 0, 0, $0e, 0 + dsprite 0, 4, 1, 0, $0f, 0 + dsprite 1, 4, -2, 0, $10, 0 + dsprite 1, 4, -1, 0, $11, 0 + dsprite 1, 4, 0, 0, $12, 0 + dsprite 1, 4, 1, 0, $13, 0 + +.OAMData_IntroSuicuneAway: db 20 - dsprite 0, 0, 1, 0, $00, $81 - dsprite 1, 0, 2, 0, $00, $81 - dsprite 2, 0, 3, 0, $00, $81 - dsprite 3, 0, 4, 0, $00, $81 - dsprite 4, 0, 5, 0, $00, $81 - dsprite 3, 0, 6, 0, $00, $81 - dsprite 2, 0, 7, 0, $00, $81 - dsprite 1, 0, 8, 0, $00, $81 - dsprite 0, 0, 9, 0, $00, $81 - dsprite 1, 0, 10, 0, $00, $81 - dsprite 2, 0, 11, 0, $00, $81 - dsprite 3, 0, 12, 0, $00, $81 - dsprite 4, 0, 13, 0, $00, $81 - dsprite 3, 0, 14, 0, $00, $81 - dsprite 2, 0, 15, 0, $00, $81 - dsprite 1, 0, 16, 0, $00, $81 - dsprite 0, 0, -15, 0, $00, $81 - dsprite 1, 0, -14, 0, $00, $81 - dsprite 2, 0, -13, 0, $00, $81 - dsprite 3, 0, -12, 0, $00, $81 - -.OAMData_7f: + dsprite 0, 0, 1, 0, $00, 1 | BEHIND_BG + dsprite 1, 0, 2, 0, $00, 1 | BEHIND_BG + dsprite 2, 0, 3, 0, $00, 1 | BEHIND_BG + dsprite 3, 0, 4, 0, $00, 1 | BEHIND_BG + dsprite 4, 0, 5, 0, $00, 1 | BEHIND_BG + dsprite 3, 0, 6, 0, $00, 1 | BEHIND_BG + dsprite 2, 0, 7, 0, $00, 1 | BEHIND_BG + dsprite 1, 0, 8, 0, $00, 1 | BEHIND_BG + dsprite 0, 0, 9, 0, $00, 1 | BEHIND_BG + dsprite 1, 0, 10, 0, $00, 1 | BEHIND_BG + dsprite 2, 0, 11, 0, $00, 1 | BEHIND_BG + dsprite 3, 0, 12, 0, $00, 1 | BEHIND_BG + dsprite 4, 0, 13, 0, $00, 1 | BEHIND_BG + dsprite 3, 0, 14, 0, $00, 1 | BEHIND_BG + dsprite 2, 0, 15, 0, $00, 1 | BEHIND_BG + dsprite 1, 0, 16, 0, $00, 1 | BEHIND_BG + dsprite 0, 0, -15, 0, $00, 1 | BEHIND_BG + dsprite 1, 0, -14, 0, $00, 1 | BEHIND_BG + dsprite 2, 0, -13, 0, $00, 1 | BEHIND_BG + dsprite 3, 0, -12, 0, $00, 1 | BEHIND_BG + +.OAMData_Celebi: db 4 - dsprite -1, 0, -1, 0, $00, $02 - dsprite -1, 0, 0, 0, $01, $02 - dsprite 0, 0, -1, 0, $02, $02 - dsprite 0, 0, 0, 0, $03, $02 + dsprite -1, 0, -1, 0, $00, PAL_OW_GREEN + dsprite -1, 0, 0, 0, $01, PAL_OW_GREEN + dsprite 0, 0, -1, 0, $02, PAL_OW_GREEN + dsprite 0, 0, 0, 0, $03, PAL_OW_GREEN -.OAMData_81: +.OAMData_GameFreakLogo1_3: db 9 - dsprite -2, 0, -2, 4, $00, $01 - dsprite -2, 0, -1, 4, $01, $01 - dsprite -2, 0, 0, 4, $02, $01 - dsprite -1, 0, -2, 4, $10, $01 - dsprite -1, 0, -1, 4, $11, $01 - dsprite -1, 0, 0, 4, $12, $01 - dsprite 0, 0, -2, 4, $20, $01 - dsprite 0, 0, -1, 4, $21, $01 - dsprite 0, 0, 0, 4, $22, $01 - -.OAMData_84: + dsprite -2, 0, -2, 4, $00, 1 + dsprite -2, 0, -1, 4, $01, 1 + dsprite -2, 0, 0, 4, $02, 1 + dsprite -1, 0, -2, 4, $10, 1 + dsprite -1, 0, -1, 4, $11, 1 + dsprite -1, 0, 0, 4, $12, 1 + dsprite 0, 0, -2, 4, $20, 1 + dsprite 0, 0, -1, 4, $21, 1 + dsprite 0, 0, 0, 4, $22, 1 + +.OAMData_GameFreakLogo4_11: db 24 - dsprite -5, 0, -2, 4, $00, $01 - dsprite -5, 0, -1, 4, $01, $01 - dsprite -5, 0, 0, 4, $02, $01 - dsprite -5, 0, 1, 4, $03, $01 - dsprite -4, 0, -2, 4, $10, $01 - dsprite -4, 0, -1, 4, $11, $01 - dsprite -4, 0, 0, 4, $12, $01 - dsprite -4, 0, 1, 4, $13, $01 - dsprite -3, 0, -2, 4, $20, $01 - dsprite -3, 0, -1, 4, $21, $01 - dsprite -3, 0, 0, 4, $22, $01 - dsprite -3, 0, 1, 4, $23, $01 - dsprite -2, 0, -2, 4, $30, $01 - dsprite -2, 0, -1, 4, $31, $01 - dsprite -2, 0, 0, 4, $32, $01 - dsprite -2, 0, 1, 4, $33, $01 - dsprite -1, 0, -2, 4, $40, $01 - dsprite -1, 0, -1, 4, $41, $01 - dsprite -1, 0, 0, 4, $42, $01 - dsprite -1, 0, 1, 4, $43, $01 - dsprite 0, 0, -2, 4, $50, $01 - dsprite 0, 0, -1, 4, $51, $01 - dsprite 0, 0, 0, 4, $52, $01 - dsprite 0, 0, 1, 4, $53, $01 + dsprite -5, 0, -2, 4, $00, 1 + dsprite -5, 0, -1, 4, $01, 1 + dsprite -5, 0, 0, 4, $02, 1 + dsprite -5, 0, 1, 4, $03, 1 + dsprite -4, 0, -2, 4, $10, 1 + dsprite -4, 0, -1, 4, $11, 1 + dsprite -4, 0, 0, 4, $12, 1 + dsprite -4, 0, 1, 4, $13, 1 + dsprite -3, 0, -2, 4, $20, 1 + dsprite -3, 0, -1, 4, $21, 1 + dsprite -3, 0, 0, 4, $22, 1 + dsprite -3, 0, 1, 4, $23, 1 + dsprite -2, 0, -2, 4, $30, 1 + dsprite -2, 0, -1, 4, $31, 1 + dsprite -2, 0, 0, 4, $32, 1 + dsprite -2, 0, 1, 4, $33, 1 + dsprite -1, 0, -2, 4, $40, 1 + dsprite -1, 0, -1, 4, $41, 1 + dsprite -1, 0, 0, 4, $42, 1 + dsprite -1, 0, 1, 4, $43, 1 + dsprite 0, 0, -2, 4, $50, 1 + dsprite 0, 0, -1, 4, $51, 1 + dsprite 0, 0, 0, 4, $52, 1 + dsprite 0, 0, 1, 4, $53, 1 ; 8e706 diff --git a/data/sprite_anim_seqs.asm b/data/sprite_anim_seqs.asm index 8f8d89aaf..70544a60a 100644 --- a/data/sprite_anim_seqs.asm +++ b/data/sprite_anim_seqs.asm @@ -1,94 +1,49 @@ SpriteAnimSeqData: ; 8d1c4 ; entries correspond to SPRITE_ANIM_INDEX_* constants ; frameset sequence, tile -; SPRITE_ANIM_INDEX_PARTY_MON - db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 -; SPRITE_ANIM_INDEX_01 - db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 -; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR - db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 -; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO - db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 -; SPRITE_ANIM_INDEX_GS_INTRO_STAR - db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR, SPRITE_ANIM_SEQ_GS_INTRO_STAR, $06 -; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE - db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE, SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE, $06 -; SPRITE_ANIM_INDEX_SLOTS_GOLEM - db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, $07 -; SPRITE_ANIM_INDEX_SLOTS_CHANSEY - db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 -; SPRITE_ANIM_INDEX_SLOTS_EGG - db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 -; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR - db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, $05 -; SPRITE_ANIM_INDEX_RED_WALK - db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_0B - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08 -; SPRITE_ANIM_INDEX_DUMMY_GAME - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08 -; SPRITE_ANIM_INDEX_0D - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08 -; SPRITE_ANIM_INDEX_TRADE_POKE_BALL - db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00 -; SPRITE_ANIM_INDEX_TRADE_POOF - db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE - db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, $00 -; SPRITE_ANIM_INDEX_TRADEMON_ICON - db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 -; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE - db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 -; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT - db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 -; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB - db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, $00 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED - db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_LEAF - db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, $00 -; SPRITE_ANIM_INDEX_CUT_TREE - db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_FLY_LEAF - db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 -; SPRITE_ANIM_INDEX_EGG_CRACK - db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_1A - db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 -; SPRITE_ANIM_INDEX_HEADBUTT - db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_EGG_HATCH - db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 -; SPRITE_ANIM_INDEX_1D - db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 -; SPRITE_ANIM_INDEX_BLUE_WALK - db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE - db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_20 - db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_21 - db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_22 - db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_23 - db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 -; SPRITE_ANIM_INDEX_24 - db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 -; SPRITE_ANIM_INDEX_25 - db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_INTRO_SUICUNE - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 -; SPRITE_ANIM_INDEX_INTRO_PICHU - db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 -; SPRITE_ANIM_INDEX_INTRO_WOOPER - db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 -; SPRITE_ANIM_INDEX_INTRO_UNOWN - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 -; SPRITE_ANIM_INDEX_INTRO_UNOWN_F - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 -; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 -; SPRITE_ANIM_INDEX_CELEBI - db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c + db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 ; SPRITE_ANIM_INDEX_PARTY_MON + db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR + db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO + db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR, SPRITE_ANIM_SEQ_GS_INTRO_STAR, $06 ; SPRITE_ANIM_INDEX_GS_INTRO_STAR + db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE, SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE, $06 ; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE + db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, $07 ; SPRITE_ANIM_INDEX_SLOTS_GOLEM + db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 ; SPRITE_ANIM_INDEX_SLOTS_CHANSEY + db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 ; SPRITE_ANIM_INDEX_SLOTS_EGG + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, $05 ; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR + db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_RED_WALK + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR, $08 ; SPRITE_ANIM_INDEX_UNUSED_CURSOR + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR, $08 ; SPRITE_ANIM_INDEX_DUMMY_GAME + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_POKEGEAR_ARROW, $08 ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW + db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL + db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_TRADE_POOF + db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, $00 ; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE + db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; SPRITE_ANIM_INDEX_TRADEMON_ICON + db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE + db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT + db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, $00 ; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED + db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, $00 ; SPRITE_ANIM_INDEX_LEAF + db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CUT_TREE + db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; SPRITE_ANIM_INDEX_FLY_LEAF + db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK + db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 ; SPRITE_ANIM_INDEX_1A + db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT + db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH + db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; SPRITE_ANIM_INDEX_1D + db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_BLUE_WALK + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL + db SPRITE_ANIM_FRAMESET_FOR_MOBILE_22, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_22 + db SPRITE_ANIM_FRAMESET_FOR_MOBILE_23, SPRITE_ANIM_SEQ_FOR_MOBILE_23, $00 ; SPRITE_ANIM_INDEX_MOBILE_23 + db SPRITE_ANIM_FRAMESET_FOR_MOBILE_24, SPRITE_ANIM_SEQ_FOR_MOBILE_24, $00 ; SPRITE_ANIM_INDEX_MOBILE_24 + db SPRITE_ANIM_FRAMESET_FOR_MOBILE_25, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_25 + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE + db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_PICHU + db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_WOOPER + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY + db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CELEBI ; 8d24b |