diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 94879764b..55b1509e0 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5393,7 +5393,7 @@ _080CA0C2: thumb_func_start sub_80CA0C8 sub_80CA0C8: @ 80CA0C8 push {lr} - ldr r0, =gUnknown_08572744 + ldr r0, =gWaveformSpritePalette bl LoadSpritePalette pop {r0} bx r0 @@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154 sub_80CA1C4: @ 80CA1C4 push {r4,lr} sub sp, 0x8 - ldr r0, =gUnknown_0857274C + ldr r0, =gWaveformSpriteSheet ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] diff --git a/data/graphics.s b/data/graphics.s index 414985125..8733869b5 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -5049,40 +5049,42 @@ gUnknown_08DDD748:: @ 8DDD748 .incbin "graphics/interface/textbox.4bpp" .align 2 -gUnknown_08DDD908:: - .incbin "graphics/unknown/unknown_DDD908.bin.lz" +gWallpaperIcon_Cross:: + .incbin "graphics/pokemon_storage/cross_icon.4bpp.lz" .align 2 -gUnknown_08DDD920:: - .incbin "graphics/unknown/unknown_DDD920.bin.lz" +gWallpaperIcon_Bolt:: + .incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz" .align 2 -gUnknown_08DDD938:: - .incbin "graphics/unknown/unknown_DDD938.bin.lz" +gWallpaperIcon_Plusle:: + .incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz" .align 2 -gUnknown_08DDD950:: - .incbin "graphics/pokemon_storage/pss_window.gbapal" +gWallpaperPalettes_Horizontal:: @ 8DDD950 + .incbin "graphics/pokemon_storage/friends_frame2.gbapal" + .incbin "graphics/pokemon_storage/horizontal_bg.gbapal" .align 2 -gUnknown_08DDD990:: - .incbin "graphics/pokemon_storage/pss_window.4bpp.lz" +gWallpaperTiles_Horizontal:: @ 8DDD990 + .incbin "graphics/pokemon_storage/horizontal.4bpp.lz" .align 2 -gUnknown_08DDDB80:: @ 8DDDB80 - .incbin "graphics/unknown/unknown_DDDB80.bin.lz" +gWallpaperTilemap_Horizontal:: @ 8DDDB80 + .incbin "graphics/pokemon_storage/horizontal.bin.lz" .align 2 -gUnknown_08DDDC8C:: - .incbin "graphics/pokemon_storage/pss_window2.gbapal" +gWallpaperPalettes_Ribbon:: @ 8DDDC8C + .incbin "graphics/pokemon_storage/ribbon_frame.gbapal" + .incbin "graphics/pokemon_storage/ribbon_bg.gbapal" .align 2 -gUnknown_08DDDCCC:: - .incbin "graphics/pokemon_storage/pss_window2.4bpp.lz" +gWallpaperTiles_Ribbon:: @ 8DDDCCC + .incbin "graphics/pokemon_storage/ribbon.4bpp.lz" .align 2 -gUnknown_08DDDEDC:: - .incbin "graphics/pokemon_storage/pss_window2.bin.lz" +gWallpaperTilemap_Ribbon:: @ 8DDDEDC + .incbin "graphics/pokemon_storage/ribbon.bin.lz" @ pokenav diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 6c2c17a4a..882dc82fc 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -67,11 +67,11 @@ gUnknown_085724BC:: @ 85724BC .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 .align 2 -gUnknown_085724D4:: @ 85724D4 +WaveformPalette:: @ 85724D4 .incbin "graphics/pokemon_storage/waveform.gbapal" .align 2 -gUnknown_085724F4:: @ 85724F4 +WaveformTiles:: @ 85724F4 .incbin "graphics/pokemon_storage/waveform.4bpp" .align 2 @@ -94,48 +94,48 @@ gUnknown_08572734:: @ 8572734 .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff .align 2 -gUnknown_08572744:: @ 8572744 - obj_pal gUnknown_085724D4, 0xDACA +gWaveformSpritePalette:: @ 8572744 + obj_pal WaveformPalette, 0xDACA .align 2 -gUnknown_0857274C:: @ 857274C - obj_tiles gUnknown_085724F4, 0x1C0, 5 +gWaveformSpriteSheet:: @ 857274C + obj_tiles WaveformTiles, 0x1C0, 5 gUnknown_08572754:: @ 8572754 spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_0857276C:: @ 857276C - .4byte gUnknown_085EB7EF, 0 - .4byte gUnknown_085EB802, 0 - .4byte gUnknown_085EB81A, 0 - .4byte gUnknown_085EB82F, 0 - .4byte gUnknown_085EB843, 1 - .4byte gUnknown_085EB853, 0 - .4byte gUnknown_085EB866, 0 - .4byte gUnknown_085EB87C, 1 - .4byte gUnknown_085EB88E, 0 - .4byte gUnknown_085EB89F, 0 - .4byte gUnknown_085EB8B5, 4 - .4byte gUnknown_085EB8C6, 6 - .4byte gUnknown_085EB8D3, 0 - .4byte gUnknown_085EB8E6, 0 - .4byte gUnknown_085EB900, 0 - .4byte gUnknown_085EB913, 0 - .4byte gUnknown_085EB92D, 0 - .4byte gUnknown_085EB946, 0 - .4byte gUnknown_085EB960, 0 - .4byte gUnknown_085EB979, 1 - .4byte gUnknown_085EB987, 0 - .4byte gUnknown_085EB9A1, 0 - .4byte gUnknown_085EB9AB, 0 - .4byte gUnknown_085EB843, 7 - .4byte gUnknown_085EB9C3, 0 - .4byte gUnknown_085EB9D6, 7 - .4byte gUnknown_085EB9EE, 0 - .4byte gUnknown_085EB9FF, 0 - .4byte gUnknown_085EBA19, 7 - .4byte gUnknown_085EBA29, 7 - .4byte gUnknown_085EBA38, 0 + .4byte gText_ExitFromBox, 0 + .4byte gText_WhatDoYouWantToDo, 0 + .4byte gText_PleasePickATheme, 0 + .4byte gText_PickTheWallpaper, 0 + .4byte gText_PkmnIsSelected, 1 + .4byte gText_JumpToWhichBox, 0 + .4byte gText_DepositInWhichBox, 0 + .4byte gText_PkmnWasDeposited, 1 + .4byte gText_BoxIsFull2, 0 + .4byte gText_ReleaseThisPokemon, 0 + .4byte gText_PkmnWasReleased, 4 + .4byte gText_ByeByePkmn, 6 + .4byte gText_MarkYourPkmn, 0 + .4byte gText_ThatsYourLastPkmn, 0 + .4byte gText_YourPartysFull, 0 + .4byte gText_YoureHoldingAPkmn, 0 + .4byte gText_WhichOneWillYouTake, 0 + .4byte gText_YouCantReleaseAnEgg, 0 + .4byte gText_ContinueBoxOperations, 0 + .4byte gText_PkmnCameBack, 1 + .4byte gText_WasItWorriedAboutYou, 0 + .4byte gText_FourEllipsesExclamation, 0 + .4byte gText_PleaseRemoveTheMail, 0 + .4byte gText_PkmnIsSelected, 7 + .4byte gText_GiveToAPkmn, 0 + .4byte gText_PlacedItemInBag, 7 + .4byte gText_BagIsFull2, 0 + .4byte gText_PutItemInBag, 0 + .4byte gText_ItemIsNowHeld, 7 + .4byte gText_ChangedToNewItem, 7 + .4byte gText_MailCantBeStored, 0 .align 2 gUnknown_08572864:: @ 8572864 @@ -531,15 +531,352 @@ PCGfx_Arrow: @ 8577678 .incbin "graphics/pokemon_storage/arrow.4bpp" .align 2 -gUnknown_085776F8:: @ 85776F8 - .incbin "baserom.gba", 0x5776F8, 0x384c +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 - .incbin "baserom.gba", 0x57af44, 0xc0 + .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 - .incbin "baserom.gba", 0x57b004, 0x7c + .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 + .incbin "baserom.gba", 0x57b07C, 0x4 + + .align 2 gUnknown_0857B080:: @ 857B080 .incbin "baserom.gba", 0x57b080, 0x28 diff --git a/data/strings.s b/data/strings.s index 01bca9cd8..2fe5a7d2f 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2498,94 +2498,94 @@ gText_DontRemember:: @ 85EB7DB gText_Exit:: @ 85EB7EA .string "EXIT$" -gUnknown_085EB7EF:: @ 85EB7EF +gText_ExitFromBox:: @ 85EB7EF .string "Exit from the BOX?$" -gUnknown_085EB802:: @ 85EB802 +gText_WhatDoYouWantToDo:: @ 85EB802 .string "What do you want to do?$" -gUnknown_085EB81A:: @ 85EB81A +gText_PleasePickATheme:: @ 85EB81A .string "Please pick a theme.$" -gUnknown_085EB82F:: @ 85EB82F +gText_PickTheWallpaper:: @ 85EB82F .string "Pick the wallpaper.$" -gUnknown_085EB843:: @ 85EB843 +gText_PkmnIsSelected:: @ 85EB843 .string "{SPECIAL_F7 0x00} is selected.$" -gUnknown_085EB853:: @ 85EB853 +gText_JumpToWhichBox:: @ 85EB853 .string "Jump to which BOX?$" -gUnknown_085EB866:: @ 85EB866 +gText_DepositInWhichBox:: @ 85EB866 .string "Deposit in which BOX?$" -gUnknown_085EB87C:: @ 85EB87C +gText_PkmnWasDeposited:: @ 85EB87C .string "{SPECIAL_F7 0x00} was deposited.$" -gUnknown_085EB88E:: @ 85EB88E +gText_BoxIsFull2:: @ 85EB88E .string "The BOX is full.$" -gUnknown_085EB89F:: @ 85EB89F +gText_ReleaseThisPokemon:: @ 85EB89F .string "Release this POKéMON?$" -gUnknown_085EB8B5:: @ 85EB8B5 +gText_PkmnWasReleased:: @ 85EB8B5 .string "{SPECIAL_F7 0x00} was released.$" -gUnknown_085EB8C6:: @ 85EB8C6 +gText_ByeByePkmn:: @ 85EB8C6 .string "Bye-bye, {SPECIAL_F7 0x00}!$" -gUnknown_085EB8D3:: @ 85EB8D3 +gText_MarkYourPkmn:: @ 85EB8D3 .string "Mark your POKéMON.$" -gUnknown_085EB8E6:: @ 85EB8E6 +gText_ThatsYourLastPkmn:: @ 85EB8E6 .string "That’s your last POKéMON!$" -gUnknown_085EB900:: @ 85EB900 +gText_YourPartysFull:: @ 85EB900 .string "Your party’s full!$" -gUnknown_085EB913:: @ 85EB913 +gText_YoureHoldingAPkmn:: @ 85EB913 .string "You’re holding a POKéMON!$" -gUnknown_085EB92D:: @ 85EB92D +gText_WhichOneWillYouTake:: @ 85EB92D .string "Which one will you take?$" -gUnknown_085EB946:: @ 85EB946 +gText_YouCantReleaseAnEgg:: @ 85EB946 .string "You can’t release an EGG.$" -gUnknown_085EB960:: @ 85EB960 +gText_ContinueBoxOperations:: @ 85EB960 .string "Continue BOX operations?$" -gUnknown_085EB979:: @ 85EB979 +gText_PkmnCameBack:: @ 85EB979 .string "{SPECIAL_F7 0x00} came back!$" -gUnknown_085EB987:: @ 85EB987 +gText_WasItWorriedAboutYou:: @ 85EB987 .string "Was it worried about you?$" -gUnknown_085EB9A1:: @ 85EB9A1 +gText_FourEllipsesExclamation:: @ 85EB9A1 .string "… … … … !$" -gUnknown_085EB9AB:: @ 85EB9AB +gText_PleaseRemoveTheMail:: @ 85EB9AB .string "Please remove the MAIL.$" -gUnknown_085EB9C3:: @ 85EB9C3 +gText_GiveToAPkmn:: @ 85EB9C3 .string "GIVE to a POKéMON?$" -gUnknown_085EB9D6:: @ 85EB9D6 +gText_PlacedItemInBag:: @ 85EB9D6 .string "Placed item in the BAG.$" -gUnknown_085EB9EE:: @ 85EB9EE +gText_BagIsFull2:: @ 85EB9EE .string "The BAG is full.$" -gUnknown_085EB9FF:: @ 85EB9FF +gText_PutItemInBag:: @ 85EB9FF .string "Put this item in the BAG?$" -gUnknown_085EBA19:: @ 85EBA19 +gText_ItemIsNowHeld:: @ 85EBA19 .string "{SPECIAL_F7 0x00} is now held.$" -gUnknown_085EBA29:: @ 85EBA29 +gText_ChangedToNewItem:: @ 85EBA29 .string "Changed to {SPECIAL_F7 0x00}.$" -gUnknown_085EBA38:: @ 85EBA38 +gText_MailCantBeStored:: @ 85EBA38 .string "MAIL can’t be stored!$" gUnknown_085EBA4E:: @ 85EBA4E diff --git a/graphics/pokemon_storage/aqua_icon.png b/graphics/pokemon_storage/aqua_icon.png new file mode 100644 index 000000000..169ba5b68 Binary files /dev/null and b/graphics/pokemon_storage/aqua_icon.png differ diff --git a/graphics/pokemon_storage/asterisk_icon.png b/graphics/pokemon_storage/asterisk_icon.png new file mode 100644 index 000000000..e353a1c3d Binary files /dev/null and b/graphics/pokemon_storage/asterisk_icon.png differ diff --git a/graphics/pokemon_storage/azumarill.bin b/graphics/pokemon_storage/azumarill.bin new file mode 100644 index 000000000..029fd418c Binary files /dev/null and b/graphics/pokemon_storage/azumarill.bin differ diff --git a/graphics/pokemon_storage/azumarill_bg.png b/graphics/pokemon_storage/azumarill_bg.png new file mode 100644 index 000000000..fcb387149 Binary files /dev/null and b/graphics/pokemon_storage/azumarill_bg.png differ diff --git a/graphics/pokemon_storage/big_asterisk_icon.png b/graphics/pokemon_storage/big_asterisk_icon.png new file mode 100644 index 000000000..9a56b0fc6 Binary files /dev/null and b/graphics/pokemon_storage/big_asterisk_icon.png differ diff --git a/graphics/pokemon_storage/blank.bin b/graphics/pokemon_storage/blank.bin new file mode 100644 index 000000000..b00854423 Binary files /dev/null and b/graphics/pokemon_storage/blank.bin differ diff --git a/graphics/pokemon_storage/blank_bg.png b/graphics/pokemon_storage/blank_bg.png new file mode 100644 index 000000000..7ff832672 Binary files /dev/null and b/graphics/pokemon_storage/blank_bg.png differ diff --git a/graphics/pokemon_storage/block.bin b/graphics/pokemon_storage/block.bin new file mode 100644 index 000000000..ec5df1525 Binary files /dev/null and b/graphics/pokemon_storage/block.bin differ diff --git a/graphics/pokemon_storage/block_bg.png b/graphics/pokemon_storage/block_bg.png new file mode 100644 index 000000000..9147ef881 Binary files /dev/null and b/graphics/pokemon_storage/block_bg.png differ diff --git a/graphics/pokemon_storage/bolt_icon.png b/graphics/pokemon_storage/bolt_icon.png new file mode 100644 index 000000000..674d22424 Binary files /dev/null and b/graphics/pokemon_storage/bolt_icon.png differ diff --git a/graphics/pokemon_storage/brick_icon.png b/graphics/pokemon_storage/brick_icon.png new file mode 100644 index 000000000..06a751af3 Binary files /dev/null and b/graphics/pokemon_storage/brick_icon.png differ diff --git a/graphics/pokemon_storage/circle_icon.png b/graphics/pokemon_storage/circle_icon.png new file mode 100644 index 000000000..cf92abeed Binary files /dev/null and b/graphics/pokemon_storage/circle_icon.png differ diff --git a/graphics/pokemon_storage/circles.bin b/graphics/pokemon_storage/circles.bin new file mode 100644 index 000000000..d2ed6d127 Binary files /dev/null and b/graphics/pokemon_storage/circles.bin differ diff --git a/graphics/pokemon_storage/circles_bg.png b/graphics/pokemon_storage/circles_bg.png new file mode 100644 index 000000000..c105b1760 Binary files /dev/null and b/graphics/pokemon_storage/circles_bg.png differ diff --git a/graphics/pokemon_storage/cross_icon.png b/graphics/pokemon_storage/cross_icon.png new file mode 100644 index 000000000..674d22424 Binary files /dev/null and b/graphics/pokemon_storage/cross_icon.png differ diff --git a/graphics/pokemon_storage/crystal_icon.png b/graphics/pokemon_storage/crystal_icon.png new file mode 100644 index 000000000..424f104de Binary files /dev/null and b/graphics/pokemon_storage/crystal_icon.png differ diff --git a/graphics/pokemon_storage/diagonal.bin b/graphics/pokemon_storage/diagonal.bin new file mode 100644 index 000000000..d63b17121 Binary files /dev/null and b/graphics/pokemon_storage/diagonal.bin differ diff --git a/graphics/pokemon_storage/diagonal_bg.png b/graphics/pokemon_storage/diagonal_bg.png new file mode 100644 index 000000000..d4fcbe06a Binary files /dev/null and b/graphics/pokemon_storage/diagonal_bg.png differ diff --git a/graphics/pokemon_storage/diglett_icon.png b/graphics/pokemon_storage/diglett_icon.png new file mode 100644 index 000000000..8e485cfd4 Binary files /dev/null and b/graphics/pokemon_storage/diglett_icon.png differ diff --git a/graphics/pokemon_storage/dot_icon.png b/graphics/pokemon_storage/dot_icon.png new file mode 100644 index 000000000..0b3e6b34c Binary files /dev/null and b/graphics/pokemon_storage/dot_icon.png differ diff --git a/graphics/pokemon_storage/dusclops.bin b/graphics/pokemon_storage/dusclops.bin new file mode 100644 index 000000000..1c520b119 Binary files /dev/null and b/graphics/pokemon_storage/dusclops.bin differ diff --git a/graphics/pokemon_storage/dusclops_bg.png b/graphics/pokemon_storage/dusclops_bg.png new file mode 100644 index 000000000..035cf7466 Binary files /dev/null and b/graphics/pokemon_storage/dusclops_bg.png differ diff --git a/graphics/pokemon_storage/five_star_icon.png b/graphics/pokemon_storage/five_star_icon.png new file mode 100644 index 000000000..29b2eb9b0 Binary files /dev/null and b/graphics/pokemon_storage/five_star_icon.png differ diff --git a/graphics/pokemon_storage/footprint_icon.png b/graphics/pokemon_storage/footprint_icon.png new file mode 100644 index 000000000..30f8c4e8a Binary files /dev/null and b/graphics/pokemon_storage/footprint_icon.png differ diff --git a/graphics/pokemon_storage/four_circles_icon.png b/graphics/pokemon_storage/four_circles_icon.png new file mode 100644 index 000000000..b8f8f991b Binary files /dev/null and b/graphics/pokemon_storage/four_circles_icon.png differ diff --git a/graphics/pokemon_storage/four_star_icon.png b/graphics/pokemon_storage/four_star_icon.png new file mode 100644 index 000000000..4c61ffc0d Binary files /dev/null and b/graphics/pokemon_storage/four_star_icon.png differ diff --git a/graphics/pokemon_storage/frame.bin b/graphics/pokemon_storage/frame.bin new file mode 100644 index 000000000..490a9968d Binary files /dev/null and b/graphics/pokemon_storage/frame.bin differ diff --git a/graphics/pokemon_storage/frame_bg.png b/graphics/pokemon_storage/frame_bg.png new file mode 100644 index 000000000..98a3d80b7 Binary files /dev/null and b/graphics/pokemon_storage/frame_bg.png differ diff --git a/graphics/pokemon_storage/friends_frame1.png b/graphics/pokemon_storage/friends_frame1.png new file mode 100644 index 000000000..e76eb4e73 Binary files /dev/null and b/graphics/pokemon_storage/friends_frame1.png differ diff --git a/graphics/pokemon_storage/friends_frame2.png b/graphics/pokemon_storage/friends_frame2.png new file mode 100644 index 000000000..b66c5ce12 Binary files /dev/null and b/graphics/pokemon_storage/friends_frame2.png differ diff --git a/graphics/pokemon_storage/heart_icon.png b/graphics/pokemon_storage/heart_icon.png new file mode 100644 index 000000000..928182bfd Binary files /dev/null and b/graphics/pokemon_storage/heart_icon.png differ diff --git a/graphics/unknown/unknown_DDDB80.bin b/graphics/pokemon_storage/horizontal.bin old mode 100755 new mode 100644 similarity index 100% rename from graphics/unknown/unknown_DDDB80.bin rename to graphics/pokemon_storage/horizontal.bin diff --git a/graphics/pokemon_storage/horizontal_bg.png b/graphics/pokemon_storage/horizontal_bg.png new file mode 100644 index 000000000..3c1facd74 Binary files /dev/null and b/graphics/pokemon_storage/horizontal_bg.png differ diff --git a/graphics/pokemon_storage/koffing_icon.png b/graphics/pokemon_storage/koffing_icon.png new file mode 100644 index 000000000..9ec2d166f Binary files /dev/null and b/graphics/pokemon_storage/koffing_icon.png differ diff --git a/graphics/pokemon_storage/latis_icon.png b/graphics/pokemon_storage/latis_icon.png new file mode 100644 index 000000000..90fbdfa25 Binary files /dev/null and b/graphics/pokemon_storage/latis_icon.png differ diff --git a/graphics/pokemon_storage/legendary.bin b/graphics/pokemon_storage/legendary.bin new file mode 100644 index 000000000..72444b590 Binary files /dev/null and b/graphics/pokemon_storage/legendary.bin differ diff --git a/graphics/pokemon_storage/legendary_bg.png b/graphics/pokemon_storage/legendary_bg.png new file mode 100644 index 000000000..bcfda2f3b Binary files /dev/null and b/graphics/pokemon_storage/legendary_bg.png differ diff --git a/graphics/pokemon_storage/line_circle_icon.png b/graphics/pokemon_storage/line_circle_icon.png new file mode 100644 index 000000000..0bcf9171b Binary files /dev/null and b/graphics/pokemon_storage/line_circle_icon.png differ diff --git a/graphics/pokemon_storage/lotad_icon.png b/graphics/pokemon_storage/lotad_icon.png new file mode 100644 index 000000000..2399ea256 Binary files /dev/null and b/graphics/pokemon_storage/lotad_icon.png differ diff --git a/graphics/pokemon_storage/ludicolo.bin b/graphics/pokemon_storage/ludicolo.bin new file mode 100644 index 000000000..6f39ea7d2 Binary files /dev/null and b/graphics/pokemon_storage/ludicolo.bin differ diff --git a/graphics/pokemon_storage/ludicolo_bg.png b/graphics/pokemon_storage/ludicolo_bg.png new file mode 100644 index 000000000..585cb0ce1 Binary files /dev/null and b/graphics/pokemon_storage/ludicolo_bg.png differ diff --git a/graphics/pokemon_storage/luvdisc_icon.png b/graphics/pokemon_storage/luvdisc_icon.png new file mode 100644 index 000000000..c3a06d3e0 Binary files /dev/null and b/graphics/pokemon_storage/luvdisc_icon.png differ diff --git a/graphics/pokemon_storage/magma_icon.png b/graphics/pokemon_storage/magma_icon.png new file mode 100644 index 000000000..69d5f4fb7 Binary files /dev/null and b/graphics/pokemon_storage/magma_icon.png differ diff --git a/graphics/pokemon_storage/maze_icon.png b/graphics/pokemon_storage/maze_icon.png new file mode 100644 index 000000000..42664ecb7 Binary files /dev/null and b/graphics/pokemon_storage/maze_icon.png differ diff --git a/graphics/pokemon_storage/minun_icon.png b/graphics/pokemon_storage/minun_icon.png new file mode 100644 index 000000000..5a8e56d18 Binary files /dev/null and b/graphics/pokemon_storage/minun_icon.png differ diff --git a/graphics/pokemon_storage/pichu_icon.png b/graphics/pokemon_storage/pichu_icon.png new file mode 100644 index 000000000..384027dca Binary files /dev/null and b/graphics/pokemon_storage/pichu_icon.png differ diff --git a/graphics/pokemon_storage/pikachu.bin b/graphics/pokemon_storage/pikachu.bin new file mode 100644 index 000000000..f94b31e37 Binary files /dev/null and b/graphics/pokemon_storage/pikachu.bin differ diff --git a/graphics/pokemon_storage/pikachu_bg.png b/graphics/pokemon_storage/pikachu_bg.png new file mode 100644 index 000000000..c08494fa9 Binary files /dev/null and b/graphics/pokemon_storage/pikachu_bg.png differ diff --git a/graphics/pokemon_storage/plusle_icon.png b/graphics/pokemon_storage/plusle_icon.png new file mode 100644 index 000000000..674d22424 Binary files /dev/null and b/graphics/pokemon_storage/plusle_icon.png differ diff --git a/graphics/pokemon_storage/pokeball_icon.png b/graphics/pokemon_storage/pokeball_icon.png new file mode 100644 index 000000000..65af70016 Binary files /dev/null and b/graphics/pokemon_storage/pokeball_icon.png differ diff --git a/graphics/pokemon_storage/pokecenter2.bin b/graphics/pokemon_storage/pokecenter2.bin new file mode 100644 index 000000000..d65cead67 Binary files /dev/null and b/graphics/pokemon_storage/pokecenter2.bin differ diff --git a/graphics/pokemon_storage/pokecenter2_bg.png b/graphics/pokemon_storage/pokecenter2_bg.png new file mode 100644 index 000000000..704f96164 Binary files /dev/null and b/graphics/pokemon_storage/pokecenter2_bg.png differ diff --git a/graphics/pokemon_storage/pss_window.pal b/graphics/pokemon_storage/pss_window.pal deleted file mode 100755 index bfd913069..000000000 --- a/graphics/pokemon_storage/pss_window.pal +++ /dev/null @@ -1,35 +0,0 @@ -JASC-PAL -0100 -32 -255 255 255 -74 205 139 -172 106 148 -49 0 148 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 -255 255 255 -57 164 148 -230 180 148 -49 0 148 -0 0 0 -255 148 148 -255 230 131 -255 189 115 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/pss_window.png b/graphics/pokemon_storage/pss_window.png deleted file mode 100755 index 59cc0b5d2..000000000 Binary files a/graphics/pokemon_storage/pss_window.png and /dev/null differ diff --git a/graphics/pokemon_storage/pss_window2.png b/graphics/pokemon_storage/pss_window2.png deleted file mode 100755 index ae2d3b969..000000000 Binary files a/graphics/pokemon_storage/pss_window2.png and /dev/null differ diff --git a/graphics/pokemon_storage/pss_window2.bin b/graphics/pokemon_storage/ribbon.bin old mode 100755 new mode 100644 similarity index 100% rename from graphics/pokemon_storage/pss_window2.bin rename to graphics/pokemon_storage/ribbon.bin diff --git a/graphics/pokemon_storage/ribbon_bg.png b/graphics/pokemon_storage/ribbon_bg.png new file mode 100644 index 000000000..f8d258d9b Binary files /dev/null and b/graphics/pokemon_storage/ribbon_bg.png differ diff --git a/graphics/pokemon_storage/pss_window2.pal b/graphics/pokemon_storage/ribbon_frame.pal old mode 100755 new mode 100644 similarity index 52% rename from graphics/pokemon_storage/pss_window2.pal rename to graphics/pokemon_storage/ribbon_frame.pal index 9696184a2..8180cfb89 --- a/graphics/pokemon_storage/pss_window2.pal +++ b/graphics/pokemon_storage/ribbon_frame.pal @@ -1,6 +1,6 @@ JASC-PAL 0100 -32 +16 255 255 255 139 180 255 222 238 255 @@ -17,19 +17,3 @@ JASC-PAL 255 255 255 164 164 164 82 82 82 -255 255 255 -197 222 255 -90 164 238 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -213 213 213 -156 156 156 -255 255 255 -164 164 164 -82 82 82 diff --git a/graphics/pokemon_storage/ribbon_icon.png b/graphics/pokemon_storage/ribbon_icon.png new file mode 100644 index 000000000..0c3d51bab Binary files /dev/null and b/graphics/pokemon_storage/ribbon_icon.png differ diff --git a/graphics/pokemon_storage/screen.bin b/graphics/pokemon_storage/screen.bin new file mode 100644 index 000000000..05d68aad4 Binary files /dev/null and b/graphics/pokemon_storage/screen.bin differ diff --git a/graphics/pokemon_storage/screen_bg.png b/graphics/pokemon_storage/screen_bg.png new file mode 100644 index 000000000..b9552d479 Binary files /dev/null and b/graphics/pokemon_storage/screen_bg.png differ diff --git a/graphics/pokemon_storage/spinda_icon.png b/graphics/pokemon_storage/spinda_icon.png new file mode 100644 index 000000000..8da756233 Binary files /dev/null and b/graphics/pokemon_storage/spinda_icon.png differ diff --git a/graphics/pokemon_storage/star_in_circle_icon.png b/graphics/pokemon_storage/star_in_circle_icon.png new file mode 100644 index 000000000..43a307891 Binary files /dev/null and b/graphics/pokemon_storage/star_in_circle_icon.png differ diff --git a/graphics/pokemon_storage/togepi_icon.png b/graphics/pokemon_storage/togepi_icon.png new file mode 100644 index 000000000..f8ce1c539 Binary files /dev/null and b/graphics/pokemon_storage/togepi_icon.png differ diff --git a/graphics/pokemon_storage/whiscash.bin b/graphics/pokemon_storage/whiscash.bin new file mode 100644 index 000000000..0ebb4d299 Binary files /dev/null and b/graphics/pokemon_storage/whiscash.bin differ diff --git a/graphics/pokemon_storage/whiscash_bg.png b/graphics/pokemon_storage/whiscash_bg.png new file mode 100644 index 000000000..703278948 Binary files /dev/null and b/graphics/pokemon_storage/whiscash_bg.png differ diff --git a/graphics/pokemon_storage/zigzagoon.bin b/graphics/pokemon_storage/zigzagoon.bin new file mode 100644 index 000000000..744b2210c Binary files /dev/null and b/graphics/pokemon_storage/zigzagoon.bin differ diff --git a/graphics/pokemon_storage/zigzagoon_bg.png b/graphics/pokemon_storage/zigzagoon_bg.png new file mode 100644 index 000000000..d4a6d1279 Binary files /dev/null and b/graphics/pokemon_storage/zigzagoon_bg.png differ diff --git a/graphics/unknown/unknown_DDD908.bin b/graphics/unknown/unknown_DDD908.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD908.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics/unknown/unknown_DDD920.bin b/graphics/unknown/unknown_DDD920.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD920.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics/unknown/unknown_DDD938.bin b/graphics/unknown/unknown_DDD938.bin deleted file mode 100755 index cb0a2fda1..000000000 --- a/graphics/unknown/unknown_DDD938.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 9fffa279f..62067bd6a 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -490,16 +490,16 @@ $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 $(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp - @cat $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 52 $(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp - @cat $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp - @cat $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 45 @@ -508,31 +508,31 @@ $(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 23 $(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp - @cat $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 49 $(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp - @cat $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 56 $(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp - @cat $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 57 $(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp - @cat $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 $(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp - @cat $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 46 @@ -541,13 +541,13 @@ $(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 23 $(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp - @cat $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 $(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp - @cat $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 51 @@ -556,34 +556,88 @@ $(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 $(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp - @cat $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 45 $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp - @cat $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/bubbles_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 $(PSSGFXDIR)/bubbles.4bpp: $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp - @cat $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 35 $(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp - @cat $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 33 $(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp - @cat $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp >$@ + @cat $^ >$@ $(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 18 $(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp - @cat $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp >$@ + @cat $^ >$@ + +$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp + @cat $^ >$@ + +$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp + @cat $^ >$@