Up to sub 0x80ce580

1 files changed, 3 insertions, 438 deletions

diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index 83344022f..a49793c74 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -4,441 +4,6 @@
 	.section .rodata
 
 
-	.align 2
-PCGfx_Arrow: @ 8577678
-	.incbin "graphics/pokemon_storage/arrow.4bpp"
-
-	.align 2
-gWallpaperPalettes_Zigzagoon:: @ 85776F8
-	.incbin "graphics/pokemon_storage/friends_frame1.gbapal"
-	.incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Zigzagoon: @ 8577738
-	.incbin "graphics/pokemon_storage/zigzagoon.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Zigzagoon: @ 857792C
-	.incbin "graphics/pokemon_storage/zigzagoon.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Screen:: @ 8577A44
-	.incbin "graphics/pokemon_storage/friends_frame1.gbapal"
-	.incbin "graphics/pokemon_storage/screen_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Screen: @ 8577A84
-	.incbin "graphics/pokemon_storage/screen.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Screen: @ 8577D00
-	.incbin "graphics/pokemon_storage/screen.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Diagonal:: @ 8577E2C
-	.incbin "graphics/pokemon_storage/friends_frame1.gbapal"
-	.incbin "graphics/pokemon_storage/diagonal_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Diagonal: @ 8577E6C
-	.incbin "graphics/pokemon_storage/diagonal.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Diagonal: @ 8578058
-	.incbin "graphics/pokemon_storage/diagonal.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Block:: @ 8578148
-	.incbin "graphics/pokemon_storage/block_bg.gbapal"
-	.incbin "graphics/pokemon_storage/block_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Block: @ 8578188
-	.incbin "graphics/pokemon_storage/block.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Block: @ 8578358
-	.incbin "graphics/pokemon_storage/block.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Pokecenter2:: @ 8578450
-	.incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal"
-	.incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Pokecenter2: @ 8578490
-	.incbin "graphics/pokemon_storage/pokecenter2.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Pokecenter2: @ 85786D0
-	.incbin "graphics/pokemon_storage/pokecenter2.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Frame:: @ 85787E4
-	.incbin "graphics/pokemon_storage/frame_bg.gbapal"
-	.incbin "graphics/pokemon_storage/frame_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Frame: @ 8578824
-	.incbin "graphics/pokemon_storage/frame.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Frame: @ 8578A34
-	.incbin "graphics/pokemon_storage/frame.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Blank:: @ 8578B48
-	.incbin "graphics/pokemon_storage/friends_frame1.gbapal"
-	.incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Blank: @ 8578B88
-	.incbin "graphics/pokemon_storage/blank.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Blank: @ 8578D34
-	.incbin "graphics/pokemon_storage/blank.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Circles:: @ 8578E10
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/circles_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Circles: @ 8578E50
-	.incbin "graphics/pokemon_storage/circles.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Circles: @ 85790A4
-	.incbin "graphics/pokemon_storage/circles.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Azumarill:: @ 85791A0
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/azumarill_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Azumarill: @ 85791E0
-	.incbin "graphics/pokemon_storage/azumarill.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Azumarill: @ 85793CC
-	.incbin "graphics/pokemon_storage/azumarill.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Pikachu:: @ 85794C4
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/pikachu_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Pikachu: @ 8579504
-	.incbin "graphics/pokemon_storage/pikachu.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Pikachu: @ 8579738
-	.incbin "graphics/pokemon_storage/pikachu.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Legendary:: @ 8579860
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/legendary_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Legendary: @ 85798A0
-	.incbin "graphics/pokemon_storage/legendary.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Legendary: @ 8579B80
-	.incbin "graphics/pokemon_storage/legendary.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Dusclops:: @ 8579CC4
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/dusclops_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Dusclops: @ 8579D04
-	.incbin "graphics/pokemon_storage/dusclops.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Dusclops: @ 8579F50
-	.incbin "graphics/pokemon_storage/dusclops.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Ludicolo:: @ 857A048
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/ludicolo_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Ludicolo: @ 857A088
-	.incbin "graphics/pokemon_storage/ludicolo.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Ludicolo: @ 857A348
-	.incbin "graphics/pokemon_storage/ludicolo.bin.lz"
-
-	.align 2
-gWallpaperPalettes_Whiscash:: @ 857A468
-	.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
-	.incbin "graphics/pokemon_storage/whiscash_bg.gbapal"
-
-	.align 2
-gWallpaperTiles_Whiscash: @ 857A4A8
-	.incbin "graphics/pokemon_storage/whiscash.4bpp.lz"
-
-	.align 2
-gWallpaperTilemap_Whiscash: @ 857A6F0
-	.incbin "graphics/pokemon_storage/whiscash.bin.lz"
-
-	.align 2
-gWallpaperIcon_Aqua: @ 857A81C
-	.incbin "graphics/pokemon_storage/aqua_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Heart: @ 857A860
-	.incbin "graphics/pokemon_storage/heart_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_FiveStar: @ 857A89C
-	.incbin "graphics/pokemon_storage/five_star_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Brick: @ 857A8DC
-	.incbin "graphics/pokemon_storage/brick_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_FourStar: @ 857A904
-	.incbin "graphics/pokemon_storage/four_star_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Asterisk: @ 857A940
-	.incbin "graphics/pokemon_storage/asterisk_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Dot: @ 857A990
-	.incbin "graphics/pokemon_storage/dot_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_LineCircle: @ 857A9C0
-	.incbin "graphics/pokemon_storage/line_circle_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_PokeBall: @ 857A9EC
-	.incbin "graphics/pokemon_storage/pokeball_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Maze: @ 857AA38
-	.incbin "graphics/pokemon_storage/maze_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Footprint: @ 857AA7C
-	.incbin "graphics/pokemon_storage/footprint_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_BigAsterisk: @ 857AAC4
-	.incbin "graphics/pokemon_storage/big_asterisk_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Circle: @ 857AB08
-	.incbin "graphics/pokemon_storage/circle_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Koffing: @ 857AB48
-	.incbin "graphics/pokemon_storage/koffing_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Ribbon: @ 857AB98
-	.incbin "graphics/pokemon_storage/ribbon_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_FourCircles: @ 857AC00
-	.incbin "graphics/pokemon_storage/four_circles_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Lotad: @ 857AC30
-	.incbin "graphics/pokemon_storage/lotad_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Crystal: @ 857AC74
-	.incbin "graphics/pokemon_storage/crystal_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Pichu: @ 857ACBC
-	.incbin "graphics/pokemon_storage/pichu_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Diglett: @ 857ACF4
-	.incbin "graphics/pokemon_storage/diglett_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Luvdisc: @ 857AD44
-	.incbin "graphics/pokemon_storage/luvdisc_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_StarInCircle: @ 857AD88
-	.incbin "graphics/pokemon_storage/star_in_circle_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Spinda: @ 857ADCC
-	.incbin "graphics/pokemon_storage/spinda_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Latis: @ 857AE20
-	.incbin "graphics/pokemon_storage/latis_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Minun: @ 857AE64
-	.incbin "graphics/pokemon_storage/minun_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Togepi: @ 857AEAC
-	.incbin "graphics/pokemon_storage/togepi_icon.4bpp.lz"
-
-	.align 2
-gWallpaperIcon_Magma: @ 857AF08
-	.incbin "graphics/pokemon_storage/magma_icon.4bpp.lz"
-
-	.align 2
-gUnknown_0857AF44:: @ 857AF44
-	.4byte gWallpaperTiles_Zigzagoon, gWallpaperTilemap_Zigzagoon, gWallpaperPalettes_Zigzagoon
-	.4byte gWallpaperTiles_Screen, gWallpaperTilemap_Screen, gWallpaperPalettes_Screen
-	.4byte gWallpaperTiles_Horizontal, gWallpaperTilemap_Horizontal, gWallpaperPalettes_Horizontal
-	.4byte gWallpaperTiles_Diagonal, gWallpaperTilemap_Diagonal, gWallpaperPalettes_Diagonal
-	.4byte gWallpaperTiles_Block, gWallpaperTilemap_Block, gWallpaperPalettes_Block
-	.4byte gWallpaperTiles_Ribbon, gWallpaperTilemap_Ribbon, gWallpaperPalettes_Ribbon
-	.4byte gWallpaperTiles_Pokecenter2, gWallpaperTilemap_Pokecenter2, gWallpaperPalettes_Pokecenter2
-	.4byte gWallpaperTiles_Frame, gWallpaperTilemap_Frame, gWallpaperPalettes_Frame
-	.4byte gWallpaperTiles_Blank, gWallpaperTilemap_Blank, gWallpaperPalettes_Blank
-	.4byte gWallpaperTiles_Circles, gWallpaperTilemap_Circles, gWallpaperPalettes_Circles
-	.4byte gWallpaperTiles_Azumarill, gWallpaperTilemap_Azumarill, gWallpaperPalettes_Azumarill
-	.4byte gWallpaperTiles_Pikachu, gWallpaperTilemap_Pikachu, gWallpaperPalettes_Pikachu
-	.4byte gWallpaperTiles_Legendary, gWallpaperTilemap_Legendary, gWallpaperPalettes_Legendary
-	.4byte gWallpaperTiles_Dusclops, gWallpaperTilemap_Dusclops, gWallpaperPalettes_Dusclops
-	.4byte gWallpaperTiles_Ludicolo, gWallpaperTilemap_Ludicolo, gWallpaperPalettes_Ludicolo
-	.4byte gWallpaperTiles_Whiscash, gWallpaperTilemap_Whiscash, gWallpaperPalettes_Whiscash
-
-	.align 2
-gUnknown_0857B004:: @ 857B004
-    .4byte gWallpaperIcon_Aqua
-    .4byte gWallpaperIcon_Heart
-    .4byte gWallpaperIcon_FiveStar
-    .4byte gWallpaperIcon_Brick
-    .4byte gWallpaperIcon_FourStar
-    .4byte gWallpaperIcon_Asterisk
-    .4byte gWallpaperIcon_Dot
-    .4byte gWallpaperIcon_Cross
-    .4byte gWallpaperIcon_LineCircle
-    .4byte gWallpaperIcon_PokeBall
-    .4byte gWallpaperIcon_Maze
-    .4byte gWallpaperIcon_Footprint
-    .4byte gWallpaperIcon_BigAsterisk
-    .4byte gWallpaperIcon_Circle
-    .4byte gWallpaperIcon_Koffing
-    .4byte gWallpaperIcon_Ribbon
-    .4byte gWallpaperIcon_Bolt
-    .4byte gWallpaperIcon_FourCircles
-    .4byte gWallpaperIcon_Lotad
-    .4byte gWallpaperIcon_Crystal
-    .4byte gWallpaperIcon_Pichu
-    .4byte gWallpaperIcon_Diglett
-    .4byte gWallpaperIcon_Luvdisc
-    .4byte gWallpaperIcon_StarInCircle
-    .4byte gWallpaperIcon_Spinda
-    .4byte gWallpaperIcon_Latis
-    .4byte gWallpaperIcon_Plusle
-    .4byte gWallpaperIcon_Minun
-    .4byte gWallpaperIcon_Togepi
-    .4byte gWallpaperIcon_Magma
-
-	.align 2
-gUnknown_0857B07C:: @ 857B07C
-	.4byte 0x23BA
-
-	.align 2
-gUnknown_0857B080:: @ 857B080
-	obj_tiles PCGfx_Arrow, 128, 0x0006
-
-	.align 2
-gOamData_857B088:: @ 857B088
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0800
-
-	.align 2
-gSpriteAnim_857B090:: @ 857B090
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_857B098:: @ 857B098
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_857B0A0:: @ 857B0A0
-	.4byte gSpriteAnim_857B090
-	.4byte gSpriteAnim_857B098
-
-	.align 2
-gSpriteTemplate_857B0A8:: @ 857B0A8
-	spr_template 0x0003, 0xDAC9, gOamData_857B088, gSpriteAnimTable_857B0A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_857B0C0:: @ 857B0C0
-	.2byte 0x8000
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gSpriteAnim_857B0C8:: @ 857B0C8
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_857B0D0:: @ 857B0D0
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_857B0D8:: @ 857B0D8
-	.4byte gSpriteAnim_857B0C8
-	.4byte gSpriteAnim_857B0D0
-
-gUnknown_0857B0E0:: @ 857B0E0
-	spr_template 0x0006, 0xDACA, gOamData_857B0C0, gSpriteAnimTable_857B0D8, NULL, gDummySpriteAffineAnimTable, sub_80CD210
-
-	.align 2
-HandCursorPalette: @ 857B0F8
-	.incbin "graphics/pokemon_storage/hand_cursor.gbapal"
-
-	.align 2
-HandCursorTiles: @ 857B118
-	.incbin "graphics/pokemon_storage/hand_cursor.4bpp"
-
-	.align 2
-HandCursorShadowTiles: @ 857B918
-	.incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp"
-
-	.align 2
-gUnknown_0857B998:: @ 857B998
-	.4byte sub_80CDCCC
-	.4byte sub_80CDD5C
-	.4byte sub_80CDDD8
-
-	.align 2
-gUnknown_0857B9A4:: @ 857B9A4
-	.byte 0x22, 0x00
-	.2byte 0x0039
-	.byte 0x22, 0x00
-	.2byte 0x0123
-	.byte 0x10, 0x0a
-	.2byte 0x0046
-	.byte 0x10, 0x0a
-	.2byte 0x00f9
-	.byte 0x10, 0x0e
-	.2byte 0x0046
-	.byte 0x10, 0x0e
-	.2byte 0x00f9
 
 	.align 2
 gUnknown_0857B9BC:: @ 857B9BC
@@ -450,13 +15,13 @@ gUnknown_0857B9BC:: @ 857B9BC
 
 	.align 2
 gHandCursorSpriteSheets:: @ 857B9E4
-	obj_tiles HandCursorTiles, 0x0800, 0x0000
-	obj_tiles HandCursorShadowTiles, 0x0080, 0x0001
+	obj_tiles gHandCursorTiles, 0x0800, 0x0000
+	obj_tiles gHandCursorShadowTiles, 0x0080, 0x0001
 	null_obj_tiles
 
 	.align 2
 gHandCursorSpritePalettes:: @ 857B9FC
-	obj_pal HandCursorPalette, 0xDAC7
+	obj_pal gHandCursorPalette, 0xDAC7
 	null_obj_pal
 
 	.align 2