diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index a63267e48..3c2a10116 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -189,7 +189,7 @@ _0819A69C: bl ResetSpriteData bl ResetTasks bl FreeAllSpritePalettes - ldr r0, =gUnknown_08DC0754 + ldr r0, =gFrontierFactorySelectMenu_Gfx ldr r5, =gUnknown_0203CE2C ldr r1, [r5] movs r2, 0x88 @@ -211,7 +211,7 @@ _0819A69C: movs r2, 0x60 movs r3, 0 bl LoadBgTiles - ldr r0, =gUnknown_08DC0B94 + ldr r0, =gFrontierFactorySelectMenu_Tilemap ldr r4, =gUnknown_0203CE34 ldr r1, [r4] movs r2, 0x80 @@ -223,7 +223,7 @@ _0819A69C: movs r0, 0x1 movs r3, 0 bl LoadBgTilemap - ldr r0, =gUnknown_08DC0714 + ldr r0, =gFrontierFactorySelectMenu_Pal movs r1, 0 movs r2, 0x40 bl LoadPalette @@ -6646,7 +6646,7 @@ _0819DDA8: bl ResetTasks bl FreeAllSpritePalettes bl dp13_810BB8C - ldr r0, =gUnknown_08DC0754 + ldr r0, =gFrontierFactorySelectMenu_Gfx ldr r5, =gUnknown_0203CE40 ldr r1, [r5] movs r2, 0x88 @@ -6668,7 +6668,7 @@ _0819DDA8: movs r2, 0x60 movs r3, 0 bl LoadBgTiles - ldr r0, =gUnknown_08DC0B94 + ldr r0, =gFrontierFactorySelectMenu_Tilemap ldr r4, =gUnknown_0203CE48 ldr r1, [r4] movs r2, 0x80 @@ -6680,7 +6680,7 @@ _0819DDA8: movs r0, 0x1 movs r3, 0 bl LoadBgTilemap - ldr r0, =gUnknown_08DC0714 + ldr r0, =gFrontierFactorySelectMenu_Pal movs r1, 0 movs r2, 0x40 bl LoadPalette diff --git a/asm/pokedex.s b/asm/pokedex.s index ac35c3f7b..147f8921b 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -2054,7 +2054,7 @@ _080BC56E: adds r1, r0, 0 movs r0, 0 bl SetBgTilemapBuffer - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 str r6, [sp] @@ -2291,14 +2291,14 @@ sub_80BC844: @ 80BC844 lsrs r0, 24 cmp r0, 0x1 bne _080BC858 - ldr r0, =gUnknown_08DC17B6 + ldr r0, =gPokedexHoennBg_Pal + 0x2 b _080BC862 .pool _080BC858: bl IsNationalPokedexEnabled cmp r0, 0 bne _080BC870 - ldr r0, =gUnknown_08DC16F4 + 2 + ldr r0, =gPokedexText_Pal + 2 _080BC862: movs r1, 0x1 movs r2, 0xBE @@ -2306,7 +2306,7 @@ _080BC862: b _080BC87A .pool _080BC870: - ldr r0, =gUnknown_08DC1876 + ldr r0, =gPokedexNationalBg_Pal + 0x2 movs r1, 0x1 movs r2, 0xBE bl LoadPalette @@ -6369,7 +6369,7 @@ _080BEACA: b _080BEDA0 .pool _080BEAF0: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -7257,7 +7257,7 @@ _080BF2B6: b _080BF5B2 .pool _080BF310: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -7856,7 +7856,7 @@ _080BF88E: b _080BFB94 .pool _080BF8D8: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -8543,7 +8543,7 @@ _080BFE92: b _080C0074 .pool _080BFF0C: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -8751,14 +8751,14 @@ _080C00E8: ands r1, r0 cmp r1, 0 beq _080C0114 - ldr r0, =gUnknown_08DC16F4 + 2 + ldr r0, =gPokedexText_Pal + 2 movs r1, 0x31 movs r2, 0xE bl LoadPalette b _080C011E .pool _080C0114: - ldr r0, =gUnknown_08DC1756 + ldr r0, =gPokedexCaughtScreenFade_Pal + 0x2 movs r1, 0x31 movs r2, 0xE bl LoadPalette @@ -11135,7 +11135,7 @@ _080C1332: bl DeactivateAllTextPrinters movs r0, 0 bl PutWindowTilemap - ldr r1, =gUnknown_08DC3304 + ldr r1, =gPokedexSearchMenu_Gfx movs r2, 0x80 lsls r2, 6 str r5, [sp] @@ -11145,7 +11145,7 @@ _080C1332: bl IsNationalPokedexEnabled cmp r0, 0 bne _080C13E4 - ldr r1, =gUnknown_08DC3A0C + ldr r1, =gPokedexSearch2_Tilemap movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -11153,13 +11153,13 @@ _080C1332: b _080C13F0 .pool _080C13E4: - ldr r1, =gUnknown_08DC3870 + ldr r1, =gPokedexSearch1_Tilemap movs r0, 0x3 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer _080C13F0: - ldr r0, =gUnknown_08DC3286 + ldr r0, =gPokedexSearchMenu_Pal + 0x2 movs r1, 0x1 movs r2, 0x7E bl LoadPalette diff --git a/asm/roulette.s b/asm/roulette.s index 85d857f39..347dfec76 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -452,14 +452,14 @@ _08140662: lsls r2, 1 movs r1, 0 bl LoadPalette - ldr r1, =gUnknown_08DBC2E8 + ldr r1, =gRouletteMenuTiles movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DBCA14 + ldr r1, =gRouletteWheelTiles str r4, [sp] movs r0, 0x2 movs r2, 0 diff --git a/data/graphics.s b/data/graphics.s index 0e6ec9d38..37771d4c5 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3875,11 +3875,33 @@ gRaySceneHushBg_Pal:: @ 8DAAFEC @ 8DB7AA0 .include "data/graphics/decorations/decoration_graphics.inc" -@ 8DBA14C - .incbin "baserom.gba", 0xdba14c, 0x3cc + .align 2 +gBattleAnimSpritePalette_282:: @ 8E7E7D0 + .incbin "graphics/battle_anims/sprites/282.gbapal.lz" + .align 2 +gBattleAnimSpriteSheet_282:: @ 8E7E7F8 + .incbin "graphics/battle_anims/sprites/282.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_270:: @ 8E7E9E0 + .incbin "graphics/battle_anims/sprites/270.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_270:: @ 8E7E9FC + .incbin "graphics/battle_anims/sprites/270.4bpp.lz" + + .align 2 +gBattleAnimSpritePalette_271:: @ 8E7EB24 + .incbin "graphics/battle_anims/sprites/271.gbapal.lz" + + .align 2 +gBattleAnimSpriteSheet_271:: @ 8E7EB3C + .incbin "graphics/battle_anims/sprites/271.4bpp.lz" + + .align 2 gUnknown_08DBA518:: @ 8DBA518 - .incbin "baserom.gba", 0xdba518, 0x80 + .incbin "graphics/misc/cable_car_bg.gbapal" .align 2 gCableCar_Pal:: @ 8DBA598 @@ -3887,7 +3909,7 @@ gCableCar_Pal:: @ 8DBA598 .align 2 gUnknown_08DBA5B8:: @ 8DBA5B8 - .incbin "baserom.gba", 0xdba5b8, 0x19d8 + .incbin "graphics/misc/cable_car_bg.4bpp.lz" .align 2 gCableCar_Gfx:: @ 8DBBF90 @@ -3902,203 +3924,303 @@ gCableCarCord_Gfx:: @ 8DBC2C0 .incbin "graphics/misc/cable_car_cord.4bpp.lz" .align 2 -gUnknown_08DBC2E8:: @ 8DBC2E8 - .incbin "baserom.gba", 0xdbc2e8, 0x72c +gRouletteMenuTiles:: @ 8DBC2E8 + .incbin "graphics/roulette/window.4bpp.lz" -gUnknown_08DBCA14:: @ 0x08DBCA14 - .incbin "baserom.gba", 0xdbca14, 0x1e04 + .align 2 +gRouletteWheelTiles:: + .incbin "graphics/roulette/wheel.8bpp.lz" -gUnknown_08DBE818:: @ 0x08DBE818 - .incbin "baserom.gba", 0xdbe818, 0x20 + .align 2 +gRouletteCenter_Gfx:: + .incbin "graphics/roulette/center.4bpp.lz" -gUnknown_08DBE838:: @ 0x08DBE838 - .incbin "baserom.gba", 0xdbe838, 0x20 + .align 2 +gRouletteHeadersTiles:: @ 8E824BC + .incbin "graphics/roulette/headers.4bpp.lz" -gUnknown_08DBE858:: @ 0x08DBE858 - .incbin "baserom.gba", 0xdbe858, 0x20 + .align 2 +gRouletteCreditTiles:: @ 8E82AE0 + .incbin "graphics/roulette/credit.4bpp.lz" -gUnknown_08DBE878:: @ 0x08DBE878 - .incbin "baserom.gba", 0xdbe878, 0x20 + .align 2 +gRouletteNumbersTiles:: @ 8E82C30 + .incbin "graphics/roulette/numbers.4bpp.lz" -gUnknown_08DBE898:: @ 0x08DBE898 - .incbin "baserom.gba", 0xdbe898, 0x20 + .align 2 +gRouletteMultiplierTiles:: @ 8E82D14 + .incbin "graphics/roulette/multiplier.4bpp.lz" -gUnknown_08DBE8B8:: @ 0x08DBE8B8 - .incbin "baserom.gba", 0xdbe8b8, 0x20 + .align 2 +gMailPalette_Orange:: @ 0x08DBE818 + .incbin "graphics/mail/orange/palette.gbapal" -gUnknown_08DBE8D8:: @ 0x08DBE8D8 - .incbin "baserom.gba", 0xdbe8d8, 0x20 + .align 2 +gMailPalette_Harbor:: @ 0x08DBE838 + .incbin "graphics/mail/harbor/palette.gbapal" -gUnknown_08DBE8F8:: @ 0x08DBE8F8 - .incbin "baserom.gba", 0xdbe8f8, 0x20 + .align 2 +gMailPalette_Glitter:: @ 0x08DBE858 + .incbin "graphics/mail/glitter/palette.gbapal" -gUnknown_08DBE918:: @ 0x08DBE918 - .incbin "baserom.gba", 0xdbe918, 0x20 + .align 2 +gMailPalette_Mech:: @ 0x08DBE878 + .incbin "graphics/mail/mech/palette.gbapal" -gUnknown_08DBE938:: @ 0x08DBE938 - .incbin "baserom.gba", 0xdbe938, 0x20 + .align 2 +gMailPalette_Wood:: @ 0x08DBE898 + .incbin "graphics/mail/wood/palette.gbapal" -gUnknown_08DBE958:: @ 0x08DBE958 - .incbin "baserom.gba", 0xdbe958, 0x20 + .align 2 +gMailPalette_Wave:: @ 0x08DBE8B8 + .incbin "graphics/mail/wave/palette.gbapal" -gUnknown_08DBE978:: @ 0x08DBE978 - .incbin "baserom.gba", 0xdbe978, 0x20 + .align 2 +gMailPalette_Bead:: @ 0x08DBE8D8 + .incbin "graphics/mail/bead/palette.gbapal" -gUnknown_08DBE998:: @ 0x08DBE998 - .incbin "baserom.gba", 0xdbe998, 0x1a0 + .align 2 +gMailPalette_Shadow:: @ 0x08DBE8F8 + .incbin "graphics/mail/shadow/palette.gbapal" -gUnknown_08DBEB38:: @ 0x08DBEB38 - .incbin "baserom.gba", 0xdbeb38, 0x13c + .align 2 +gMailPalette_Tropic:: @ 0x08DBE918 + .incbin "graphics/mail/tropic/palette.gbapal" -gUnknown_08DBEC74:: @ 0x08DBEC74 - .incbin "baserom.gba", 0xdbec74, 0x210 + .align 2 +gMailPalette_Dream:: @ 0x08DBE938 + .incbin "graphics/mail/dream/palette.gbapal" -gUnknown_08DBEE84:: @ 0x08DBEE84 - .incbin "baserom.gba", 0xdbee84, 0xd8 + .align 2 +gMailPalette_Fab:: @ 0x08DBE958 + .incbin "graphics/mail/fab/palette.gbapal" -gUnknown_08DBEF5C:: @ 0x08DBEF5C - .incbin "baserom.gba", 0xdbef5c, 0x1f8 + .align 2 +gMailPalette_Retro:: @ 0x08DBE978 + .incbin "graphics/mail/retro/palette.gbapal" -gUnknown_08DBF154:: @ 0x08DBF154 - .incbin "baserom.gba", 0xdbf154, 0x180 + .align 2 +gMailTiles_Orange:: @ 0x08DBE998 + .incbin "graphics/mail/orange/tiles.4bpp.lz" -gUnknown_08DBF2D4:: @ 0x08DBF2D4 - .incbin "baserom.gba", 0xdbf2d4, 0xa8 + .align 2 +gMailTiles_Harbor:: @ 0x08DBEB38 + .incbin "graphics/mail/harbor/tiles.4bpp.lz" -gUnknown_08DBF37C:: @ 0x08DBF37C - .incbin "baserom.gba", 0xdbf37c, 0x190 + .align 2 +gMailTiles_Glitter:: @ 0x08DBEC74 + .incbin "graphics/mail/glitter/tiles.4bpp.lz" -gUnknown_08DBF50C:: @ 0x08DBF50C - .incbin "baserom.gba", 0xdbf50c, 0x140 + .align 2 +gMailTiles_Mech:: @ 0x08DBEE84 + .incbin "graphics/mail/mech/tiles.4bpp.lz" -gUnknown_08DBF64C:: @ 0x08DBF64C - .incbin "baserom.gba", 0xdbf64c, 0x168 + .align 2 +gMailTiles_Wood:: @ 0x08DBEF5C + .incbin "graphics/mail/wood/tiles.4bpp.lz" -gUnknown_08DBF7B4:: @ 0x08DBF7B4 - .incbin "baserom.gba", 0xdbf7b4, 0x150 + .align 2 +gMailTiles_Wave:: @ 0x08DBF154 + .incbin "graphics/mail/wave/tiles.4bpp.lz" -gUnknown_08DBF904:: @ 0x08DBF904 - .incbin "baserom.gba", 0xdbf904, 0x2a0 + .align 2 +gMailTiles_Bead:: @ 0x08DBF2D4 + .incbin "graphics/mail/bead/tiles.4bpp.lz" -gUnknown_08DBFBA4:: @ 0x08DBFBA4 - .incbin "baserom.gba", 0xdbfba4, 0xd8 + .align 2 +gMailTiles_Shadow:: @ 0x08DBF37C + .incbin "graphics/mail/shadow/tiles.4bpp.lz" -gUnknown_08DBFC7C:: @ 0x08DBFC7C - .incbin "baserom.gba", 0xdbfc7c, 0xe0 + .align 2 +gMailTiles_Tropic:: @ 0x08DBF50C + .incbin "graphics/mail/tropic/tiles.4bpp.lz" -gUnknown_08DBFD5C:: @ 0x08DBFD5C - .incbin "baserom.gba", 0xdbfd5c, 0x10c + .align 2 +gMailTiles_Dream:: @ 0x08DBF64C + .incbin "graphics/mail/dream/tiles.4bpp.lz" -gUnknown_08DBFE68:: @ 0x08DBFE68 - .incbin "baserom.gba", 0xdbfe68, 0xdc + .align 2 +gMailTiles_Fab:: @ 0x08DBF7B4 + .incbin "graphics/mail/fab/tiles.4bpp.lz" -gUnknown_08DBFF44:: @ 0x08DBFF44 - .incbin "baserom.gba", 0xdbff44, 0xf0 + .align 2 +gMailTiles_Retro:: @ 0x08DBF904 + .incbin "graphics/mail/retro/tiles.4bpp.lz" -gUnknown_08DC0034:: @ 0x08DC0034 - .incbin "baserom.gba", 0xdc0034, 0xe0 + .align 2 +gMailTilemap_Orange:: @ 0x08DBFBA4 + .incbin "graphics/mail/orange/map.bin.lz" -gUnknown_08DC0114:: @ 0x08DC0114 - .incbin "baserom.gba", 0xdc0114, 0xe0 + .align 2 +gMailTilemap_Harbor:: @ 0x08DBFC7C + .incbin "graphics/mail/harbor/map.bin.lz" -gUnknown_08DC01F4:: @ 0x08DC01F4 - .incbin "baserom.gba", 0xdc01f4, 0x10c + .align 2 +gMailTilemap_Glitter:: @ 0x08DBFD5C + .incbin "graphics/mail/glitter/map.bin.lz" -gUnknown_08DC0300:: @ 0x08DC0300 - .incbin "baserom.gba", 0xdc0300, 0xf0 + .align 2 +gMailTilemap_Mech:: @ 0x08DBFE68 + .incbin "graphics/mail/mech/map.bin.lz" -gUnknown_08DC03F0:: @ 0x08DC03F0 - .incbin "baserom.gba", 0xdc03f0, 0xf8 + .align 2 +gMailTilemap_Wood:: @ 0x08DBFF44 + .incbin "graphics/mail/wood/map.bin.lz" -gUnknown_08DC04E8:: @ 0x08DC04E8 - .incbin "baserom.gba", 0xdc04e8, 0x118 + .align 2 +gMailTilemap_Wave:: @ 0x08DC0034 + .incbin "graphics/mail/wave/map.bin.lz" -gUnknown_08DC0600:: @ 0x08DC0600 - .incbin "baserom.gba", 0xdc0600, 0x114 + .align 2 +gMailTilemap_Bead:: @ 0x08DC0114 + .incbin "graphics/mail/bead/map.bin.lz" -gUnknown_08DC0714:: @ 8DC0714 - .incbin "baserom.gba", 0xdc0714, 0x40 + .align 2 +gMailTilemap_Shadow:: @ 0x08DC01F4 + .incbin "graphics/mail/shadow/map.bin.lz" -gUnknown_08DC0754:: @ 8DC0754 - .incbin "baserom.gba", 0xdc0754, 0x440 + .align 2 +gMailTilemap_Tropic:: @ 0x08DC0300 + .incbin "graphics/mail/tropic/map.bin.lz" -gUnknown_08DC0B94:: @ 8DC0B94 - .incbin "baserom.gba", 0xdc0b94, 0x800 + .align 2 +gMailTilemap_Dream:: @ 0x08DC03F0 + .incbin "graphics/mail/dream/map.bin.lz" -gUnknown_08DC1394:: @ 8DC1394 - .incbin "baserom.gba", 0xdc1394, 0x2E0 + .align 2 +gMailTilemap_Fab:: @ 0x08DC04E8 + .incbin "graphics/mail/fab/map.bin.lz" -gUnknown_08DC1674:: @ 8DC1674 - .incbin "baserom.gba", 0xdc1674, 0x20 + .align 2 +gMailTilemap_Retro:: @ 0x08DC0600 + .incbin "graphics/mail/retro/map.bin.lz" -gUnknown_08DC1694:: @ 8DC1694 - .incbin "baserom.gba", 0xdc1694, 0x20 + .align 2 +gFrontierFactorySelectMenu_Pal:: @ 8DC0714 + .incbin "graphics/battle_frontier/factory_menu1.gbapal" + .incbin "graphics/battle_frontier/factory_menu2.gbapal" -gUnknown_08DC16B4:: @ 8DC16B4 - .incbin "baserom.gba", 0xdc16b4, 0x20 + .align 2 +gFrontierFactorySelectMenu_Gfx:: @ 8DC0754 + .incbin "graphics/battle_frontier/factory_menu1.4bpp" + .incbin "graphics/battle_frontier/factory_menu2.4bpp" -gUnknown_08DC16D4:: @ 8DC16D4 - .incbin "baserom.gba", 0xdc16d4, 0x20 + .align 2 +gFrontierFactorySelectMenu_Tilemap:: @ 8DC0B94 + .incbin "graphics/battle_frontier/factory_menu.bin" -gUnknown_08DC16F4:: @ 8DC16F4 - .incbin "baserom.gba", 0xdc16f4, 0x62 + .align 2 +gFrontierPassMedals_Gfx:: @ 8DC1394 + .incbin "graphics/frontier_pass/medals.4bpp.lz" @ battle frontier medals -gUnknown_08DC1756:: @ 8DC1756 - .incbin "baserom.gba", 0xdc1756, 0x60 + .align 2 +gFrontierPassCursor_Pal:: @ 8DC1674 + .incbin "graphics/frontier_pass/cursor.gbapal" @ frontier pass cursor pal -gUnknown_08DC17B6:: @ 8DC17B6 - .incbin "baserom.gba", 0xdc17b6, 0xc0 + .align 2 +gFrontierPassMapCursor_Pal:: @ 8DC1694 + .incbin "graphics/frontier_pass/map_cursor.gbapal" @ frontier pass map cursor pal -gUnknown_08DC1876:: @ 8DC1876 - .incbin "baserom.gba", 0xdc1876, 0xbe + .align 2 +gFrontierPassMedalsSilver_Pal:: @ 8DC16B4 + .incbin "graphics/frontier_pass/silver.gbapal" -gUnknown_08DC1934:: @ 8DC1934 - .incbin "baserom.gba", 0xdc1934, 0xA18 + .align 2 +gFrontierPassMedalsGold_Pal:: @ 8DC16D4 + .incbin "graphics/frontier_pass/gold.gbapal" -gUnknown_08DC234C:: @ 8DC234C - .incbin "baserom.gba", 0xDC234C, 0x6BC + .align 2 +gPokedexText_Pal:: @ 8DC16F4 + .incbin "graphics/pokedex/text.gbapal" + .align 2 +gPokedexCaughtScreenFade_Pal:: @ 8DC1756 + .incbin "graphics/pokedex/fade.gbapal" + + .align 2 +gPokedexHoennBg_Pal:: @ 8DC17B6 + .incbin "graphics/pokedex/hoenn_bg.gbapal" + + .align 2 +gPokedexNationalBg_Pal:: @ 8DC1876 + .incbin "graphics/pokedex/national_bg.gbapal" + + .align 2 +gPokedexMenu_Gfx:: @ 8DC1934 + .incbin "graphics/pokedex/menu.4bpp.lz" + + .align 2 +gPokedexMenu2_Gfx:: @ 8DC234C + .incbin "graphics/pokedex/menu2.4bpp.lz" + + .align 2 + .incbin "graphics/pokedex/noball_unused.4bpp.lz" @ unused + + @ these are a series of 9 tilemaps used for something pokedex related. + + .align 2 gUnknown_08DC2A08:: @ 8DC2A08 - .incbin "baserom.gba", 0xdc2a08, 0x114 + .incbin "graphics/pokedex/tilemap1.bin.lz" + .align 2 gUnknown_08DC2B1C:: @ 8DC2B1C - .incbin "baserom.gba", 0xdc2b1c, 0x140 + .incbin "graphics/pokedex/tilemap2.bin.lz" + .align 2 gUnknown_08DC2C5C:: @ 8DC2C5C - .incbin "baserom.gba", 0xdc2c5c, 0x150 + .incbin "graphics/pokedex/tilemap3.bin.lz" + .align 2 gUnknown_08DC2DAC:: @ 8DC2DAC - .incbin "baserom.gba", 0xdc2dac, 0xc0 + .incbin "graphics/pokedex/tilemap4.bin.lz" + .align 2 gUnknown_08DC2E6C:: @ 8DC2E6C - .incbin "baserom.gba", 0xdc2e6c, 0xf0 + .incbin "graphics/pokedex/tilemap5.bin.lz" + .align 2 gUnknown_08DC2F5C:: @ 8DC2F5C - .incbin "baserom.gba", 0xdc2f5c, 0x90 + .incbin "graphics/pokedex/tilemap6.bin.lz" + .align 2 gUnknown_08DC2FEC:: @ 8DC2FEC - .incbin "baserom.gba", 0xdc2fec, 0x94 + .incbin "graphics/pokedex/tilemap7.bin.lz" + .align 2 gUnknown_08DC3080:: @ 8DC3080 - .incbin "baserom.gba", 0xdc3080, 0x118 + .incbin "graphics/pokedex/tilemap8.bin.lz" + .align 2 gUnknown_08DC3198:: @ 8DC3198 - .incbin "baserom.gba", 0xdc3198, 0xee + .incbin "graphics/pokedex/tilemap9.bin.lz" @ all tilemaps -gUnknown_08DC3286:: @ 8DC3286 - .incbin "baserom.gba", 0xdc3286, 0x7e + .align 2 +gPokedexSearchMenu_Pal:: @ 8DC3284 + .incbin "graphics/pokedex/search_menu.gbapal" -gUnknown_08DC3304:: @ 8DC3304 - .incbin "baserom.gba", 0xdc3304, 0x56c + .align 2 +gPokedexSearchMenu_Gfx:: @ 8DC3304 + .incbin "graphics/pokedex/search_menu.4bpp.lz" -gUnknown_08DC3870:: @ 8DC3870 - .incbin "baserom.gba", 0xdc3870, 0x19c + .align 2 +gPokedexSearch1_Tilemap:: @ 8DC3870 + .incbin "graphics/pokedex/search1.bin.lz" -gUnknown_08DC3A0C:: @ 8DC3A0C - .incbin "baserom.gba", 0xdc3a0c, 0x2c8 + .align 2 +gPokedexSearch2_Tilemap:: @ 8DC3A0C + .incbin "graphics/pokedex/search2.bin.lz" -gUnknown_08DC3CD4:: @ 8DC3CD4 - .incbin "baserom.gba", 0xdc3cd4, 0x80 + .align 2 +gSummaryScreenPowAcc_Tilemap:: @ 8DC3B94 + .incbin "graphics/interface/powacc_tilemap.bin" @ pow/acc tilemap + + .align 2 +gUnknown_08DC3C34:: @ 8DC3C34 + .incbin "graphics/interface/unk_tilemap.bin" @ probably trade summary screen related? cant check + + .align 2 +gSummaryScreenWindow_Tilemap:: @ 8DC3CD4 + .incbin "graphics/interface/summary.bin" .align 2 gIntroCopyright_Pal:: @ 8DC3D54 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index d3cb51fca..659498743 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -18,12 +18,27 @@ gUnknown_0861CBEC:: @ 861CBEC gUnknown_0861CBF8:: @ 861CBF8 .incbin "baserom.gba", 0x61cbf8, 0xc + .align 2 gUnknown_0861CC04:: @ 861CC04 - .incbin "baserom.gba", 0x61cc04, 0xc + .4byte gSummaryScreenPowAcc_Tilemap + .byte 0x00 + .byte 0x00 + .byte 0x0A + .byte 0x07 + .byte 0x00 + .byte 0x2D + .align 2 gUnknown_0861CC10:: @ 861CC10 - .incbin "baserom.gba", 0x61cc10, 0xc + .4byte gUnknown_08DC3C34 + .byte 0x00 + .byte 0x00 + .byte 0x0A + .byte 0x07 + .byte 0x00 + .byte 0x2D + .align 2 gUnknown_0861CC1C:: @ 861CC1C .incbin "baserom.gba", 0x61cc1c, 0x8 diff --git a/data/trainer_card.s b/data/trainer_card.s index 8e49b040f..4f344c961 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -161,14 +161,16 @@ gUnknown_0856FB9C:: @ 856FB9C gUnknown_0856FBBC:: @ 856FBBC .incbin "baserom.gba", 0x56fbbc, 0xFEC -gUnknown_08570BA8:: @ 8570BA8 - .incbin "baserom.gba", 0x570ba8, 0x9C + .align 2 +gFrontierPassCursor_Gfx:: @ 8570BA8 + .incbin "graphics/frontier_pass/cursor.4bpp.lz" gUnknown_08570C44:: @ 8570C44 .incbin "baserom.gba", 0x570c44, 0xBC -gUnknown_08570D00:: @ 8570D00 - .incbin "baserom.gba", 0x570d00, 0x100 + .align 2 +gFrontierPassMapCursor_Gfx:: @ 8570D00 + .incbin "graphics/frontier_pass/map_cursor.4bpp.lz" gUnknown_08570E00:: @ 8570E00 .incbin "baserom.gba", 0x570e00, 0x260 @@ -210,19 +212,19 @@ gUnknown_08571454:: @ 8571454 .incbin "baserom.gba", 0x571454, 0x68 gUnknown_085714BC:: @ 85714BC - obj_tiles gUnknown_08570BA8, 0x100, 0 - obj_tiles gUnknown_08570D00, 0x400, 1 - obj_tiles gUnknown_08DC1394, 0x380, 2 + obj_tiles gFrontierPassCursor_Gfx, 0x100, 0 + obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1 + obj_tiles gFrontierPassMedals_Gfx, 0x380, 2 gUnknown_085714D4:: @ 85714D4 obj_tiles gUnknown_08570C44, 0x100, 4 obj_tiles NULL, 0, 0 gUnknown_085714E4:: @ 85714E4 - obj_pal gUnknown_08DC1674, 0 - obj_pal gUnknown_08DC1694, 1 - obj_pal gUnknown_08DC16B4, 2 - obj_pal gUnknown_08DC16D4, 3 + obj_pal gFrontierPassCursor_Pal, 0 + obj_pal gFrontierPassMapCursor_Pal, 1 + obj_pal gFrontierPassMedalsSilver_Pal, 2 + obj_pal gFrontierPassMedalsGold_Pal, 3 obj_pal gUnknown_0856FB7C, 4 obj_pal gUnknown_0856FB9C, 5 obj_pal NULL, 0 diff --git a/graphics/battle_frontier/factory_menu.bin b/graphics/battle_frontier/factory_menu.bin new file mode 100755 index 000000000..767257ac2 Binary files /dev/null and b/graphics/battle_frontier/factory_menu.bin differ diff --git a/graphics/battle_frontier/factory_menu1.png b/graphics/battle_frontier/factory_menu1.png new file mode 100755 index 000000000..52f073ff3 Binary files /dev/null and b/graphics/battle_frontier/factory_menu1.png differ diff --git a/graphics/battle_frontier/factory_menu2.png b/graphics/battle_frontier/factory_menu2.png new file mode 100755 index 000000000..0d103927e Binary files /dev/null and b/graphics/battle_frontier/factory_menu2.png differ diff --git a/graphics/frontier_pass/cursor.png b/graphics/frontier_pass/cursor.png new file mode 100755 index 000000000..3a7af3dd2 Binary files /dev/null and b/graphics/frontier_pass/cursor.png differ diff --git a/graphics/frontier_pass/gold.pal b/graphics/frontier_pass/gold.pal new file mode 100755 index 000000000..6db146382 --- /dev/null +++ b/graphics/frontier_pass/gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 65 +255 255 255 +205 205 205 +164 164 164 +230 164 8 +230 139 8 +230 123 16 +255 230 131 +255 213 65 +255 205 8 +238 189 8 +222 172 16 +205 156 16 +197 139 24 +164 106 32 +139 82 41 diff --git a/graphics/frontier_pass/map_cursor.png b/graphics/frontier_pass/map_cursor.png new file mode 100755 index 000000000..c20bbb59a Binary files /dev/null and b/graphics/frontier_pass/map_cursor.png differ diff --git a/graphics/frontier_pass/medals.png b/graphics/frontier_pass/medals.png new file mode 100755 index 000000000..1c0d36688 Binary files /dev/null and b/graphics/frontier_pass/medals.png differ diff --git a/graphics/frontier_pass/silver.pal b/graphics/frontier_pass/silver.pal new file mode 100755 index 000000000..2c99390bb --- /dev/null +++ b/graphics/frontier_pass/silver.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 164 65 +255 255 255 +205 205 205 +164 164 164 +230 213 197 +222 180 156 +222 156 115 +238 238 246 +222 222 230 +213 205 213 +197 197 197 +189 180 180 +172 164 164 +164 156 148 +148 139 131 +139 131 115 diff --git a/graphics/interface/powacc_tilemap.bin b/graphics/interface/powacc_tilemap.bin new file mode 100755 index 000000000..5b492db68 Binary files /dev/null and b/graphics/interface/powacc_tilemap.bin differ diff --git a/graphics/interface/summary.bin b/graphics/interface/summary.bin new file mode 100755 index 000000000..0a19222a3 Binary files /dev/null and b/graphics/interface/summary.bin differ diff --git a/graphics/interface/unk_tilemap.bin b/graphics/interface/unk_tilemap.bin new file mode 100755 index 000000000..0b3837ae2 Binary files /dev/null and b/graphics/interface/unk_tilemap.bin differ diff --git a/graphics/mail/bead/map.bin b/graphics/mail/bead/map.bin new file mode 100755 index 000000000..6ebb4932c Binary files /dev/null and b/graphics/mail/bead/map.bin differ diff --git a/graphics/mail/bead/palette.pal b/graphics/mail/bead/palette.pal new file mode 100755 index 000000000..e2e6ca291 --- /dev/null +++ b/graphics/mail/bead/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +65 90 123 +98 123 156 +213 230 238 +238 255 255 +139 189 164 +255 148 131 +213 106 90 +164 156 189 +255 197 82 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/bead/tiles.png b/graphics/mail/bead/tiles.png new file mode 100755 index 000000000..d006fb987 Binary files /dev/null and b/graphics/mail/bead/tiles.png differ diff --git a/graphics/mail/dream/map.bin b/graphics/mail/dream/map.bin new file mode 100755 index 000000000..bc28d8864 Binary files /dev/null and b/graphics/mail/dream/map.bin differ diff --git a/graphics/mail/dream/palette.pal b/graphics/mail/dream/palette.pal new file mode 100755 index 000000000..47172825c --- /dev/null +++ b/graphics/mail/dream/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 189 205 +222 164 197 +197 148 189 +172 131 189 +255 213 230 +0 0 0 +205 255 213 +230 255 230 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/dream/tiles.png b/graphics/mail/dream/tiles.png new file mode 100755 index 000000000..cb4411757 Binary files /dev/null and b/graphics/mail/dream/tiles.png differ diff --git a/graphics/mail/fab/map.bin b/graphics/mail/fab/map.bin new file mode 100755 index 000000000..b11121bdf Binary files /dev/null and b/graphics/mail/fab/map.bin differ diff --git a/graphics/mail/fab/palette.pal b/graphics/mail/fab/palette.pal new file mode 100755 index 000000000..17e1afcc3 --- /dev/null +++ b/graphics/mail/fab/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +238 205 222 +255 230 238 +213 230 238 +238 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/fab/tiles.png b/graphics/mail/fab/tiles.png new file mode 100755 index 000000000..99e9cac71 Binary files /dev/null and b/graphics/mail/fab/tiles.png differ diff --git a/graphics/mail/glitter/map.bin b/graphics/mail/glitter/map.bin new file mode 100755 index 000000000..fad949aa9 Binary files /dev/null and b/graphics/mail/glitter/map.bin differ diff --git a/graphics/mail/glitter/palette.pal b/graphics/mail/glitter/palette.pal new file mode 100755 index 000000000..544a0a11b --- /dev/null +++ b/graphics/mail/glitter/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +255 255 172 +255 238 123 +255 238 0 +255 41 41 +255 238 230 +255 189 41 +238 180 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/glitter/tiles.png b/graphics/mail/glitter/tiles.png new file mode 100755 index 000000000..12bd11801 Binary files /dev/null and b/graphics/mail/glitter/tiles.png differ diff --git a/graphics/mail/harbor/map.bin b/graphics/mail/harbor/map.bin new file mode 100755 index 000000000..ce07a7539 Binary files /dev/null and b/graphics/mail/harbor/map.bin differ diff --git a/graphics/mail/harbor/palette.pal b/graphics/mail/harbor/palette.pal new file mode 100755 index 000000000..1a8795c33 --- /dev/null +++ b/graphics/mail/harbor/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +24 172 255 +255 255 148 +115 205 255 +74 172 255 +16 57 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/harbor/tiles.png b/graphics/mail/harbor/tiles.png new file mode 100755 index 000000000..b0a09ef69 Binary files /dev/null and b/graphics/mail/harbor/tiles.png differ diff --git a/graphics/mail/mech/map.bin b/graphics/mail/mech/map.bin new file mode 100755 index 000000000..d74974008 Binary files /dev/null and b/graphics/mail/mech/map.bin differ diff --git a/graphics/mail/mech/palette.pal b/graphics/mail/mech/palette.pal new file mode 100755 index 000000000..bb55d7c04 --- /dev/null +++ b/graphics/mail/mech/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 230 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 230 189 +197 189 139 +172 164 115 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/mech/tiles.png b/graphics/mail/mech/tiles.png new file mode 100755 index 000000000..4d47dd73b Binary files /dev/null and b/graphics/mail/mech/tiles.png differ diff --git a/graphics/mail/orange/map.bin b/graphics/mail/orange/map.bin new file mode 100755 index 000000000..be4dbf9c5 Binary files /dev/null and b/graphics/mail/orange/map.bin differ diff --git a/graphics/mail/orange/palette.pal b/graphics/mail/orange/palette.pal new file mode 100755 index 000000000..20efef172 --- /dev/null +++ b/graphics/mail/orange/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 213 148 +238 180 74 +205 139 65 +189 246 222 +148 222 197 +131 189 164 +255 255 148 +189 180 123 +139 123 65 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/orange/tiles.png b/graphics/mail/orange/tiles.png new file mode 100755 index 000000000..1676bd258 Binary files /dev/null and b/graphics/mail/orange/tiles.png differ diff --git a/graphics/mail/retro/map.bin b/graphics/mail/retro/map.bin new file mode 100755 index 000000000..30ee05ba2 Binary files /dev/null and b/graphics/mail/retro/map.bin differ diff --git a/graphics/mail/retro/palette.pal b/graphics/mail/retro/palette.pal new file mode 100755 index 000000000..707bdff93 --- /dev/null +++ b/graphics/mail/retro/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +246 106 41 +255 246 156 +255 205 65 +148 238 82 +172 106 49 +189 164 57 +123 213 246 +0 0 0 +255 230 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/retro/tiles.png b/graphics/mail/retro/tiles.png new file mode 100755 index 000000000..da96ad486 Binary files /dev/null and b/graphics/mail/retro/tiles.png differ diff --git a/graphics/mail/shadow/map.bin b/graphics/mail/shadow/map.bin new file mode 100755 index 000000000..01fcfe4ce Binary files /dev/null and b/graphics/mail/shadow/map.bin differ diff --git a/graphics/mail/shadow/palette.pal b/graphics/mail/shadow/palette.pal new file mode 100755 index 000000000..f08b838c5 --- /dev/null +++ b/graphics/mail/shadow/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 139 164 +123 123 139 +106 106 123 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +213 65 16 +148 49 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/shadow/tiles.png b/graphics/mail/shadow/tiles.png new file mode 100755 index 000000000..cdc63cde1 Binary files /dev/null and b/graphics/mail/shadow/tiles.png differ diff --git a/graphics/mail/tropic/map.bin b/graphics/mail/tropic/map.bin new file mode 100755 index 000000000..8ef408f37 Binary files /dev/null and b/graphics/mail/tropic/map.bin differ diff --git a/graphics/mail/tropic/palette.pal b/graphics/mail/tropic/palette.pal new file mode 100755 index 000000000..99b2bb636 --- /dev/null +++ b/graphics/mail/tropic/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +230 255 98 +197 246 131 +189 246 65 +123 213 41 +255 180 98 +255 255 148 +123 180 24 +197 238 65 +205 156 90 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/tropic/tiles.png b/graphics/mail/tropic/tiles.png new file mode 100755 index 000000000..6cee88775 Binary files /dev/null and b/graphics/mail/tropic/tiles.png differ diff --git a/graphics/mail/wave/map.bin b/graphics/mail/wave/map.bin new file mode 100755 index 000000000..0af44f798 Binary files /dev/null and b/graphics/mail/wave/map.bin differ diff --git a/graphics/mail/wave/palette.pal b/graphics/mail/wave/palette.pal new file mode 100755 index 000000000..dd9bbfae4 --- /dev/null +++ b/graphics/mail/wave/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +0 172 246 +65 90 156 +106 131 197 +197 222 255 +82 156 197 +230 246 255 +0 0 0 +0 0 0 +0 0 0 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wave/tiles.png b/graphics/mail/wave/tiles.png new file mode 100755 index 000000000..6b5af8a01 Binary files /dev/null and b/graphics/mail/wave/tiles.png differ diff --git a/graphics/mail/wood/map.bin b/graphics/mail/wood/map.bin new file mode 100755 index 000000000..4338a31c8 Binary files /dev/null and b/graphics/mail/wood/map.bin differ diff --git a/graphics/mail/wood/palette.pal b/graphics/mail/wood/palette.pal new file mode 100755 index 000000000..9ed936918 --- /dev/null +++ b/graphics/mail/wood/palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 164 189 +139 131 74 +164 180 82 +189 180 106 +222 205 106 +180 156 65 +246 213 156 +189 164 90 +222 164 123 +255 205 180 +98 197 197 +57 148 148 +82 82 82 +139 139 139 +205 205 205 +255 255 255 diff --git a/graphics/mail/wood/tiles.png b/graphics/mail/wood/tiles.png new file mode 100755 index 000000000..a55029fac Binary files /dev/null and b/graphics/mail/wood/tiles.png differ diff --git a/graphics/pokedex/fade.pal b/graphics/pokedex/fade.pal new file mode 100755 index 000000000..26da98a84 --- /dev/null +++ b/graphics/pokedex/fade.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +123 131 0 +255 255 255 +255 238 0 +255 189 0 +255 115 0 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +189 0 0 +74 148 180 +8 90 131 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/hoenn_bg.pal b/graphics/pokedex/hoenn_bg.pal new file mode 100755 index 000000000..41196a269 --- /dev/null +++ b/graphics/pokedex/hoenn_bg.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +255 0 189 +123 148 32 +41 82 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +255 0 189 +123 148 32 +41 82 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +255 238 0 +255 189 0 +255 115 0 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +255 0 189 +123 148 32 +41 82 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +180 0 0 +74 148 180 +8 90 131 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +49 49 65 +255 255 255 +238 246 57 +180 0 0 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png new file mode 100755 index 000000000..fea195312 Binary files /dev/null and b/graphics/pokedex/menu.png differ diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png new file mode 100755 index 000000000..529914813 Binary files /dev/null and b/graphics/pokedex/menu2.png differ diff --git a/graphics/pokedex/national_bg.pal b/graphics/pokedex/national_bg.pal new file mode 100755 index 000000000..ea8f2bc64 --- /dev/null +++ b/graphics/pokedex/national_bg.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +255 0 189 +123 164 115 +74 115 65 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +255 0 189 +123 164 115 +74 115 65 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +255 238 0 +255 189 0 +255 115 0 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +255 0 189 +123 164 115 +74 115 65 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +189 0 0 +74 148 180 +8 90 131 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/noball_unused.png b/graphics/pokedex/noball_unused.png new file mode 100755 index 000000000..59979aed4 Binary files /dev/null and b/graphics/pokedex/noball_unused.png differ diff --git a/graphics/pokedex/search1.bin b/graphics/pokedex/search1.bin new file mode 100755 index 000000000..83bf29bec Binary files /dev/null and b/graphics/pokedex/search1.bin differ diff --git a/graphics/pokedex/search2.bin b/graphics/pokedex/search2.bin new file mode 100755 index 000000000..838007715 Binary files /dev/null and b/graphics/pokedex/search2.bin differ diff --git a/graphics/pokedex/search_menu.pal b/graphics/pokedex/search_menu.pal new file mode 100755 index 000000000..b6142eb3f --- /dev/null +++ b/graphics/pokedex/search_menu.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +123 131 0 +0 0 0 +172 172 172 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +156 230 0 +57 115 0 +255 172 0 +131 32 32 +82 189 90 +24 131 32 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +255 255 255 +255 255 255 +98 98 115 +57 57 57 +123 115 74 +41 115 0 +32 49 32 +180 106 0 +16 0 0 +82 189 90 +24 131 32 +0 0 0 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +82 189 90 +24 131 32 +255 32 32 +0 0 0 +123 131 0 +0 0 0 +172 172 172 +172 172 172 +172 172 172 +98 98 115 +57 57 57 +123 115 74 +32 49 32 +32 32 32 +74 32 32 +32 32 32 +82 189 90 +24 131 32 +0 0 0 +0 0 0 diff --git a/graphics/pokedex/search_menu.png b/graphics/pokedex/search_menu.png new file mode 100755 index 000000000..755c2d35d Binary files /dev/null and b/graphics/pokedex/search_menu.png differ diff --git a/graphics/pokedex/text.pal b/graphics/pokedex/text.pal new file mode 100755 index 000000000..569c7821a --- /dev/null +++ b/graphics/pokedex/text.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +49 213 74 +24 131 32 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +41 57 106 +0 0 41 +255 255 255 +238 246 57 +255 0 189 +180 205 246 +49 139 255 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/tilemap1.bin b/graphics/pokedex/tilemap1.bin new file mode 100755 index 000000000..585524bab Binary files /dev/null and b/graphics/pokedex/tilemap1.bin differ diff --git a/graphics/pokedex/tilemap2.bin b/graphics/pokedex/tilemap2.bin new file mode 100755 index 000000000..ac2e068f2 Binary files /dev/null and b/graphics/pokedex/tilemap2.bin differ diff --git a/graphics/pokedex/tilemap3.bin b/graphics/pokedex/tilemap3.bin new file mode 100755 index 000000000..cd6a67be4 Binary files /dev/null and b/graphics/pokedex/tilemap3.bin differ diff --git a/graphics/pokedex/tilemap4.bin b/graphics/pokedex/tilemap4.bin new file mode 100755 index 000000000..300fa8ff4 Binary files /dev/null and b/graphics/pokedex/tilemap4.bin differ diff --git a/graphics/pokedex/tilemap5.bin b/graphics/pokedex/tilemap5.bin new file mode 100755 index 000000000..283aa518c Binary files /dev/null and b/graphics/pokedex/tilemap5.bin differ diff --git a/graphics/pokedex/tilemap6.bin b/graphics/pokedex/tilemap6.bin new file mode 100755 index 000000000..154ed7196 Binary files /dev/null and b/graphics/pokedex/tilemap6.bin differ diff --git a/graphics/pokedex/tilemap7.bin b/graphics/pokedex/tilemap7.bin new file mode 100755 index 000000000..7183514e6 Binary files /dev/null and b/graphics/pokedex/tilemap7.bin differ diff --git a/graphics/pokedex/tilemap8.bin b/graphics/pokedex/tilemap8.bin new file mode 100755 index 000000000..dbfea3ba5 Binary files /dev/null and b/graphics/pokedex/tilemap8.bin differ diff --git a/graphics/pokedex/tilemap9.bin b/graphics/pokedex/tilemap9.bin new file mode 100755 index 000000000..6a72a88bc Binary files /dev/null and b/graphics/pokedex/tilemap9.bin differ diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png new file mode 100755 index 000000000..0653b0e97 Binary files /dev/null and b/graphics/roulette/center.png differ diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png new file mode 100755 index 000000000..687d47934 Binary files /dev/null and b/graphics/roulette/credit.png differ diff --git a/graphics/roulette/headers.png b/graphics/roulette/headers.png new file mode 100755 index 000000000..70f5fec90 Binary files /dev/null and b/graphics/roulette/headers.png differ diff --git a/graphics/roulette/multiplier.png b/graphics/roulette/multiplier.png new file mode 100755 index 000000000..b993f8091 Binary files /dev/null and b/graphics/roulette/multiplier.png differ diff --git a/graphics/roulette/numbers.png b/graphics/roulette/numbers.png new file mode 100755 index 000000000..97d0b0e03 Binary files /dev/null and b/graphics/roulette/numbers.png differ diff --git a/graphics/roulette/wheel.png b/graphics/roulette/wheel.png new file mode 100755 index 000000000..a0f121843 Binary files /dev/null and b/graphics/roulette/wheel.png differ diff --git a/graphics/roulette/window.png b/graphics/roulette/window.png new file mode 100755 index 000000000..561c73bc2 Binary files /dev/null and b/graphics/roulette/window.png differ diff --git a/include/graphics.h b/include/graphics.h index a12fb7ab8..a3feb9257 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2647,8 +2647,8 @@ extern const u8 gBattleTerrainPalette_StadiumGlacia[]; extern const u8 gBattleTerrainPalette_StadiumDrake[]; extern const u8 gBattleTerrainPalette_StadiumWallace[]; -extern const u8 gUnknown_08DC234C[]; -extern const u8 gUnknown_08DC16F4[]; +extern const u8 gPokedexMenu2_Gfx[]; +extern const u8 gPokedexText_Pal[]; // rayquaza scene gfx extern const u8 gRaySceneGroudon_Gfx[]; diff --git a/src/mail.c b/src/mail.c index ec7ff2ce2..68a55e242 100644 --- a/src/mail.c +++ b/src/mail.c @@ -20,42 +20,42 @@ #include "malloc.h" #include "easy_chat.h" -extern const u16 gUnknown_08DBE818[]; -extern const u16 gUnknown_08DBE838[]; -extern const u16 gUnknown_08DBE858[]; -extern const u16 gUnknown_08DBE878[]; -extern const u16 gUnknown_08DBE898[]; -extern const u16 gUnknown_08DBE8B8[]; -extern const u16 gUnknown_08DBE8D8[]; -extern const u16 gUnknown_08DBE8F8[]; -extern const u16 gUnknown_08DBE918[]; -extern const u16 gUnknown_08DBE938[]; -extern const u16 gUnknown_08DBE958[]; -extern const u16 gUnknown_08DBE978[]; -extern const u8 gUnknown_08DBE998[]; -extern const u8 gUnknown_08DBFBA4[]; -extern const u8 gUnknown_08DBEB38[]; -extern const u8 gUnknown_08DBFC7C[]; -extern const u8 gUnknown_08DBEC74[]; -extern const u8 gUnknown_08DBFD5C[]; -extern const u8 gUnknown_08DBEE84[]; -extern const u8 gUnknown_08DBFE68[]; -extern const u8 gUnknown_08DBEF5C[]; -extern const u8 gUnknown_08DBFF44[]; -extern const u8 gUnknown_08DBF154[]; -extern const u8 gUnknown_08DC0034[]; -extern const u8 gUnknown_08DBF2D4[]; -extern const u8 gUnknown_08DC0114[]; -extern const u8 gUnknown_08DBF37C[]; -extern const u8 gUnknown_08DC01F4[]; -extern const u8 gUnknown_08DBF50C[]; -extern const u8 gUnknown_08DC0300[]; -extern const u8 gUnknown_08DBF64C[]; -extern const u8 gUnknown_08DC03F0[]; -extern const u8 gUnknown_08DBF7B4[]; -extern const u8 gUnknown_08DC04E8[]; -extern const u8 gUnknown_08DBF904[]; -extern const u8 gUnknown_08DC0600[]; +extern const u16 gMailPalette_Orange[]; +extern const u16 gMailPalette_Harbor[]; +extern const u16 gMailPalette_Glitter[]; +extern const u16 gMailPalette_Mech[]; +extern const u16 gMailPalette_Wood[]; +extern const u16 gMailPalette_Wave[]; +extern const u16 gMailPalette_Bead[]; +extern const u16 gMailPalette_Shadow[]; +extern const u16 gMailPalette_Tropic[]; +extern const u16 gMailPalette_Dream[]; +extern const u16 gMailPalette_Fab[]; +extern const u16 gMailPalette_Retro[]; +extern const u8 gMailTiles_Orange[]; +extern const u8 gMailTilemap_Orange[]; +extern const u8 gMailTiles_Harbor[]; +extern const u8 gMailTilemap_Harbor[]; +extern const u8 gMailTiles_Glitter[]; +extern const u8 gMailTilemap_Glitter[]; +extern const u8 gMailTiles_Mech[]; +extern const u8 gMailTilemap_Mech[]; +extern const u8 gMailTiles_Wood[]; +extern const u8 gMailTilemap_Wood[]; +extern const u8 gMailTiles_Wave[]; +extern const u8 gMailTilemap_Wave[]; +extern const u8 gMailTiles_Bead[]; +extern const u8 gMailTilemap_Bead[]; +extern const u8 gMailTiles_Shadow[]; +extern const u8 gMailTilemap_Shadow[]; +extern const u8 gMailTiles_Tropic[]; +extern const u8 gMailTilemap_Tropic[]; +extern const u8 gMailTiles_Dream[]; +extern const u8 gMailTilemap_Dream[]; +extern const u8 gMailTiles_Fab[]; +extern const u8 gMailTilemap_Fab[]; +extern const u8 gMailTiles_Retro[]; +extern const u8 gMailTilemap_Retro[]; // Static type declarations @@ -170,29 +170,29 @@ static const u16 sUnknown_0859F2B0[][2] = { static const struct MailGraphics sUnknown_0859F2B8[] = { { - gUnknown_08DBE818, gUnknown_08DBE998, gUnknown_08DBFBA4, 0x02c0, 0x0000, 0x294a, 0x6739 + gMailPalette_Orange, gMailTiles_Orange, gMailTilemap_Orange, 0x02c0, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE838, gUnknown_08DBEB38, gUnknown_08DBFC7C, 0x02e0, 0x0000, 0x7fff, 0x4631 + gMailPalette_Harbor, gMailTiles_Harbor, gMailTilemap_Harbor, 0x02e0, 0x0000, 0x7fff, 0x4631 }, { - gUnknown_08DBE858, gUnknown_08DBEC74, gUnknown_08DBFD5C, 0x0400, 0x0000, 0x294a, 0x6739 + gMailPalette_Glitter, gMailTiles_Glitter, gMailTilemap_Glitter, 0x0400, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE878, gUnknown_08DBEE84, gUnknown_08DBFE68, 0x01e0, 0x0000, 0x7fff, 0x4631 + gMailPalette_Mech, gMailTiles_Mech, gMailTilemap_Mech, 0x01e0, 0x0000, 0x7fff, 0x4631 }, { - gUnknown_08DBE898, gUnknown_08DBEF5C, gUnknown_08DBFF44, 0x02e0, 0x0000, 0x7fff, 0x4631 + gMailPalette_Wood, gMailTiles_Wood, gMailTilemap_Wood, 0x02e0, 0x0000, 0x7fff, 0x4631 }, { - gUnknown_08DBE8B8, gUnknown_08DBF154, gUnknown_08DC0034, 0x0300, 0x0000, 0x294a, 0x6739 + gMailPalette_Wave, gMailTiles_Wave, gMailTilemap_Wave, 0x0300, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE8D8, gUnknown_08DBF2D4, gUnknown_08DC0114, 0x0140, 0x0000, 0x7fff, 0x4631 + gMailPalette_Bead, gMailTiles_Bead, gMailTilemap_Bead, 0x0140, 0x0000, 0x7fff, 0x4631 }, { - gUnknown_08DBE8F8, gUnknown_08DBF37C, gUnknown_08DC01F4, 0x0300, 0x0000, 0x7fff, 0x4631 + gMailPalette_Shadow, gMailTiles_Shadow, gMailTilemap_Shadow, 0x0300, 0x0000, 0x7fff, 0x4631 }, { - gUnknown_08DBE918, gUnknown_08DBF50C, gUnknown_08DC0300, 0x0220, 0x0000, 0x294a, 0x6739 + gMailPalette_Tropic, gMailTiles_Tropic, gMailTilemap_Tropic, 0x0220, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE938, gUnknown_08DBF64C, gUnknown_08DC03F0, 0x0340, 0x0000, 0x294a, 0x6739 + gMailPalette_Dream, gMailTiles_Dream, gMailTilemap_Dream, 0x0340, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE958, gUnknown_08DBF7B4, gUnknown_08DC04E8, 0x02a0, 0x0000, 0x294a, 0x6739 + gMailPalette_Fab, gMailTiles_Fab, gMailTilemap_Fab, 0x02a0, 0x0000, 0x294a, 0x6739 }, { - gUnknown_08DBE978, gUnknown_08DBF904, gUnknown_08DC0600, 0x0520, 0x0000, 0x294a, 0x6739 + gMailPalette_Retro, gMailTiles_Retro, gMailTilemap_Retro, 0x0520, 0x0000, 0x294a, 0x6739 } }; diff --git a/src/pokedex.c b/src/pokedex.c index 964f41716..a74594865 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -481,13 +481,13 @@ const struct SpriteTemplate gUnknown_0855D254 = const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] = { - {gUnknown_08DC234C, 0x2000, 4096}, + {gPokedexMenu2_Gfx, 0x2000, 4096}, {0} }; const struct CompressedSpritePalette gSpritePalettes_0855D26C[] = { - {gUnknown_08DC16F4, 4096}, + {gPokedexText_Pal, 4096}, {0} }; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 45aaf0e08..d659b2a02 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -50,7 +50,7 @@ extern struct UnkStruct_61CC04 gUnknown_0861CC04; extern struct UnkStruct_61CC04 gUnknown_0861CC10; extern struct UnkStruct_61CC04 gUnknown_0861CBEC; extern struct UnkStruct_61CC04 gUnknown_0861CBF8; -extern u16 gUnknown_08DC3CD4[]; +extern u16 gSummaryScreenWindow_Tilemap[]; extern struct ContestMove gContestMoves[]; extern struct ContestEffect gContestEffects[]; extern struct WindowTemplate gUnknown_0861CC24; @@ -2343,18 +2343,18 @@ void sub_81C2194(u16 *a, u16 b, u8 c) { for (i = 0; i < 20; i++) { - a[(i + var) << 1] = gUnknown_08DC3CD4[i] + b; - a[((i + var) << 1) + 0x40] = gUnknown_08DC3CD4[i] + b; - a[((i + var) << 1) + 0x80] = gUnknown_08DC3CD4[i + 20] + b; + a[(i + var) << 1] = gSummaryScreenWindow_Tilemap[i] + b; + a[((i + var) << 1) + 0x40] = gSummaryScreenWindow_Tilemap[i] + b; + a[((i + var) << 1) + 0x80] = gSummaryScreenWindow_Tilemap[i + 20] + b; } } else { for (i = 0; i < 20; i++) { - a[(i + var)] = gUnknown_08DC3CD4[i + 20] + b; - a[((i + var)) + 0x40] = gUnknown_08DC3CD4[i + 40] + b; - a[((i + var)) + 0x80] = gUnknown_08DC3CD4[i + 40] + b; + a[(i + var)] = gSummaryScreenWindow_Tilemap[i + 20] + b; + a[((i + var)) + 0x40] = gSummaryScreenWindow_Tilemap[i + 40] + b; + a[((i + var)) + 0x80] = gSummaryScreenWindow_Tilemap[i + 40] + b; } } } @@ -2372,7 +2372,7 @@ void sub_81C2194(u16 *a, u16 b, u8 c) cmp r2, 0\n\ bne _081C21E4\n\ movs r3, 0\n\ - ldr r5, =gUnknown_08DC3CD4\n\ + ldr r5, =gSummaryScreenWindow_Tilemap\n\ _081C21A8:\n\ adds r2, r7, r3\n\ lsls r2, 1\n\ @@ -2402,7 +2402,7 @@ _081C21A8:\n\ .pool\n\ _081C21E4:\n\ movs r3, 0\n\ - ldr r5, =gUnknown_08DC3CD4\n\ + ldr r5, =gSummaryScreenWindow_Tilemap\n\ _081C21E8:\n\ adds r1, r7, r3\n\ lsls r1, 1\n\