diff options
101 files changed, 907 insertions, 138 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 3a359c9fa..b7a35d964 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -3966,14 +3966,14 @@ _0811BFE0: b _0811C124 .pool _0811C044: - ldr r1, =gUnknown_08DCBDD0 + ldr r1, =gEasyChatWindow_Gfx movs r0, 0 str r0, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, =gUnknown_08DCBF10 + ldr r1, =gEasyChatWindow_Tilemap movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -5810,7 +5810,7 @@ sub_811CF04: @ 811CF04 sub_811CF64: @ 811CF64 push {r4,lr} bl ResetPaletteFade - ldr r0, =gUnknown_08DCBDB0 + ldr r0, =gEasyChatMode_Pal movs r1, 0 movs r2, 0x20 bl LoadPalette diff --git a/asm/link.s b/asm/link.s index a6e580d5c..a270c8f62 100644 --- a/asm/link.s +++ b/asm/link.s @@ -44695,11 +44695,11 @@ sub_80205B4: @ 80205B4 task_tutorial_story_unknown: @ 8020604 push {r4,r5,lr} sub sp, 0x4 - ldr r0, =gUnknown_08DD4860 + ldr r0, =gLinkMiscMenu_Pal movs r1, 0 movs r2, 0x20 bl LoadPalette - ldr r1, =gUnknown_08DD4880 + ldr r1, =gLinkMiscMenu_Gfx movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -44727,7 +44727,7 @@ task_tutorial_story_unknown: @ 8020604 movs r2, 0x8 bl CpuFastSet _0802064E: - ldr r1, =gUnknown_08DD4AB8 + ldr r1, =gLinkMiscMenu_Tilemap movs r0, 0x2 movs r2, 0 movs r3, 0 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index cded48783..07ec0662f 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -3712,7 +3712,7 @@ _080E4C4A: thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54 push {r4-r6,lr} - ldr r0, =gUnknown_08DD3838 + ldr r0, =gNamingScreenMenu_Gfx ldr r6, =gUnknown_02039F94 ldr r1, [r6] ldr r4, =0x00001810 @@ -3760,7 +3760,7 @@ sub_80E4CB8: @ 80E4CB8 thumb_func_start choose_name_or_words_screen_apply_bg_pals choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8 push {lr} - ldr r0, =gUnknown_08DD3778 + ldr r0, =gNamingScreenMenu_Pal movs r1, 0 movs r2, 0xC0 bl LoadPalette diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 162f4b4e2..00a8b4d92 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5343,7 +5343,7 @@ sub_80CA044: @ 80CA044 movs r0, 0 movs r2, 0x4 bl InitBgsFromTemplates - ldr r1, =gUnknown_08DD2FE8 + ldr r1, =gPSSMenu_Gfx movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -6104,7 +6104,7 @@ sub_80CA704: @ 80CA704 ldr r1, [r4] adds r1, 0xB0 bl LZ77UnCompWram - ldr r0, =gUnknown_08DD36A8 + ldr r0, =gPSSMenu_Pal movs r1, 0x10 movs r2, 0x20 bl LoadPalette diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 24e755648..800b66a55 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -10588,7 +10588,7 @@ sub_812F7E4: @ 812F7E4 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r0, =gUnknown_08DD0050 + ldr r0, =gSlotMachineReelTime_Gfx bl LZDecompressWram ldr r4, =gUnknown_0203AAD8 movs r0, 0xD8 @@ -10715,14 +10715,14 @@ sub_812F908: @ 812F908 bl Alloc adds r1, r0, 0 str r1, [r4] - ldr r0, =gUnknown_08DCDB30 + ldr r0, =gSlotMachineMenu_Gfx bl LZDecompressWram ldr r1, [r4] movs r0, 0x2 adds r2, r5, 0 movs r3, 0 bl LoadBgTiles - ldr r0, =gUnknown_08DCDA90 + ldr r0, =gSlotMachineMenu_Pal movs r1, 0 movs r2, 0xA0 bl LoadPalette @@ -10748,7 +10748,7 @@ sub_812F958: @ 812F958 thumb_func_start sub_812F968 sub_812F968: @ 812F968 push {lr} - ldr r1, =gUnknown_08DCE770 + ldr r1, =gSlotMachineMenu_Tilemap movs r2, 0xA0 lsls r2, 3 movs r0, 0x2 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 3c1b46dcc..ab1b199e7 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -601,12 +601,12 @@ _080C2C04: ldrb r0, [r0] cmp r0, 0 beq _080C2C28 - ldr r0, =gUnknown_08DD1AB8 + ldr r0, =gEmeraldTrainerCard_Gfx ldr r2, =0x000019a8 b _080C2C4A .pool _080C2C28: - ldr r0, =gUnknown_08DD246C + ldr r0, =gFireRedTrainerCard_Gfx ldr r2, =0x000019a8 b _080C2C4A .pool @@ -3317,7 +3317,7 @@ _080C4418: ldrb r0, [r0] cmp r0, 0 beq _080C447C - ldr r1, =gUnknown_0856FAE4 + ldr r1, =gEmeraldTrainerCardStarPals ldr r3, =0x00000535 adds r0, r2, r3 ldrb r0, [r0] @@ -3344,7 +3344,7 @@ _080C4418: b _080C44B2 .pool _080C447C: - ldr r1, =gUnknown_0856FAF8 + ldr r1, =gFireRedTrainerCardStarPals ldr r3, =0x00000535 adds r0, r2, r3 ldrb r0, [r0] diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index b01f1eff4..60c11524a 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -2397,7 +2397,7 @@ _08167A74: b _08167B7E .pool _08167A9C: - ldr r0, =gUnknown_08DCCF7C + ldr r0, =gUsePokeblockGraph_Gfx ldr r1, =gUnknown_0203BCA4 _08167AA0: ldr r1, [r1] @@ -2405,11 +2405,11 @@ _08167AA0: b _08167B7E .pool _08167AB0: - ldr r0, =gUnknown_08DCD81C + ldr r0, =gUsePokeblockGraph_Tilemap ldr r1, =gUnknown_0203BCA0 ldr r1, [r1] bl LZ77UnCompVram - ldr r0, =gUnknown_08DCCF5C + ldr r0, =gUsePokeblockGraph_Pal movs r1, 0x20 movs r2, 0x20 bl LoadPalette @@ -2431,7 +2431,7 @@ _08167AEC: ldr r1, [r0] movs r0, 0x1 bl SetBgTilemapBuffer - ldr r1, =gUnknown_08DCDA30 + ldr r1, =gUsePokeblockNatureWin_Pal movs r0, 0xC str r0, [sp] movs r0, 0x4 @@ -3259,7 +3259,7 @@ sub_8168248: @ 8168248 ldr r0, [r0] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r0, =gUnknown_08DCCBB8 + ldr r0, =gUsePokeblockCondition_Gfx str r0, [sp] ldr r1, =0xffff0000 ldr r0, [sp, 0x4] diff --git a/data/graphics.s b/data/graphics.s index 528b88d2d..9e15903f8 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4469,159 +4469,429 @@ gBerryBlenderStartTiles:: @ 8DCA588 .space 0x200 - .align 2 + .align 2 gBerryBlenderArrowTiles:: @ 8DCAB88 .incbin "graphics/berry_blender/arrow.4bpp" -gUnknown_08DCB388:: @ 8DCB388 - .incbin "baserom.gba", 0xdcb388, 0xA28 + .space 0x2C0 -gUnknown_08DCBDB0:: @ 8DCBDB0 - .incbin "baserom.gba", 0xdcbdb0, 0x20 + .align 2 +gEasyChatCursor_Pal:: + .incbin "graphics/easy_chat/cursor.gbapal" -gUnknown_08DCBDD0:: @ 8DCBDD0 - .incbin "baserom.gba", 0xdcbdd0, 0x140 + .align 2 +gEasyChatCursor_Gfx:: @ 8DCB668 + .incbin "graphics/easy_chat/cursor.4bpp.lz" -gUnknown_08DCBF10:: @ 8DCBF10 - .incbin "baserom.gba", 0xdcbf10, 0x10c + .align 2 +gEasyChatRightWindow_Pal:: + .incbin "graphics/easy_chat/rwindow.gbapal" -gUnknown_08DCC01C:: @ 8DCC01C - .incbin "baserom.gba", 0xdcc01c, 0x20 + .align 2 +gEasyChatRightWindow_Gfx:: + .incbin "graphics/easy_chat/rwindow.4bpp.lz" -gUnknown_08DCC03C:: @ 8DCC03C - .incbin "baserom.gba", 0xdcc03c, 0x20 + .align 2 +gEasyChatMode_Gfx:: @ 8DCBAB0 + .incbin "graphics/easy_chat/mode.4bpp.lz" -gUnknown_08DCC05C:: @ 8DCC05C - .incbin "baserom.gba", 0xdcc05c, 0x5ec + .align 2 +gEasyChatMode_Pal:: @ 8DCBDB0 + .incbin "graphics/easy_chat/mode.gbapal" + + .align 2 +gEasyChatWindow_Gfx:: @ 8DCBDD0 + .incbin "graphics/easy_chat/window.4bpp.lz" @ uses mode pal + + .align 2 +gEasyChatWindow_Tilemap:: @ 8DCBF10 + .incbin "graphics/easy_chat/window.bin.lz" + .align 2 +gWallclockMale_Pal:: @ 8DCC01C + .incbin "graphics/interface/wallclock_male.gbapal" + + .align 2 +gWallclockFemale_Pal:: @ 8DCC03C + .incbin "graphics/interface/wallclock_female.gbapal" + + .align 2 +gWallclock_Gfx:: @ 8DCC05C + .incbin "graphics/interface/wallclock.4bpp.lz" + + .align 2 gUnknown_08DCC648:: @ 8DCC648 - .incbin "baserom.gba", 0xdcc648, 0x2c0 + .incbin "graphics/interface/wallclock1.bin.lz" + .align 2 gUnknown_08DCC908:: @ 8DCC908 - .incbin "baserom.gba", 0xdcc908, 0x290 + .incbin "graphics/interface/wallclock2.bin.lz" -gUnknown_08DCCB98:: @ 8DCCB98 - .incbin "baserom.gba", 0xdccb98, 0x20 + .align 2 +gUsePokeblockCondition_Pal:: @ 8DCCB98 + .incbin "graphics/pokeblock/use_screen/condition.gbapal" -gUnknown_08DCCBB8:: @ 8DCCBB8 - .incbin "baserom.gba", 0xdccbb8, 0x184 + .align 2 +gUsePokeblockCondition_Gfx:: @ 8DCCBB8 + .incbin "graphics/pokeblock/use_screen/condition.4bpp.lz" -gUnknown_08DCCD3C:: @ 8DCCD3C - .incbin "baserom.gba", 0xdccd3c, 0x20 + .align 2 +gUsePokeblockUpDown_Pal:: @ 8DCCD3C + .incbin "graphics/pokeblock/use_screen/updown.gbapal" -gUnknown_08DCCD5C:: @ 8DCCD5C - .incbin "baserom.gba", 0xdccd5c, 0x200 + .align 2 +gUsePokeblockUpDown_Gfx:: @ 8DCCD5C + .incbin "graphics/pokeblock/use_screen/updown.4bpp" -gUnknown_08DCCF5C:: @ 8DCCF5C - .incbin "baserom.gba", 0xdccf5c, 0x20 + .align 2 +gUsePokeblockGraph_Pal:: @ 8DCCF5C + .incbin "graphics/pokeblock/use_screen/graph.gbapal" + + .align 2 +gUsePokeblockGraph_Gfx:: @ 8DCCF7C + .incbin "graphics/pokeblock/use_screen/graph.4bpp.lz" -gUnknown_08DCCF7C:: @ 8DCCF7C - .incbin "baserom.gba", 0xdccf7c, 0x8a0 + .align 2 +gUsePokeblockGraph_Tilemap:: @ 8DCD81C + .incbin "graphics/pokeblock/use_screen/graph.bin.lz" -gUnknown_08DCD81C:: @ 8DCD81C - .incbin "baserom.gba", 0xdcd81c, 0x214 + .align 2 +gUsePokeblockNatureWin_Pal:: @ 8DCDA30 + .incbin "graphics/pokeblock/use_screen/nature.gbapal" -gUnknown_08DCDA30:: @ 8DCDA30 - .incbin "baserom.gba", 0xdcda30, 0x60 + @ slot machine -gUnknown_08DCDA90:: @ 8DCDA90 - .incbin "baserom.gba", 0xdcda90, 0xa0 + .align 2 +gSlotMachineMenu_Pal:: @ 8DCDA90 + .incbin "graphics/slot_machine/menu.gbapal" -gUnknown_08DCDB30:: @ 8DCDB30 - .incbin "baserom.gba", 0xdcdb30, 0xc40 + .align 2 +gSlotMachineMenu_Gfx:: @ 8DCDB30 + .incbin "graphics/slot_machine/menu.4bpp.lz" -gUnknown_08DCE770:: @ 8DCE770 - .incbin "baserom.gba", 0xdce770, 0x500 + .align 2 +gSlotMachineMenu_Tilemap:: @ 8DCE770 + .incbin "graphics/slot_machine/menu.bin" + .align 2 gUnknown_08DCEC70:: @ 8DCEC70 - .incbin "baserom.gba", 0xdcec70, 0x13e0 + .incbin "graphics/slot_machine/slots_layout.bin" + + .align 2 +gUnknown_08DCF170:: + .incbin "graphics/slot_machine/reel_symbols/1.gbapal" + + .align 2 +gUnknown_08DCF190:: + .incbin "graphics/slot_machine/reel_pikachu.gbapal" -gUnknown_08DD0050:: @ 8DD0050 - .incbin "baserom.gba", 0xdd0050, 0x1A08 + .align 2 +gUnknown_08DCF1B0:: + .incbin "graphics/slot_machine/shadow.gbapal" -gUnknown_08DD1A58:: @ 8DD1A58 - .incbin "baserom.gba", 0xdd1a58, 0x60 + .align 2 +gSlotMachineReelTime_Pal:: + .incbin "graphics/slot_machine/reel_time.gbapal" -gUnknown_08DD1AB8:: @ 8DD1AB8 - .incbin "baserom.gba", 0xdd1ab8, 0x4C0 + .align 2 +gUnknown_08DCF1F0:: + .incbin "graphics/slot_machine/smoke.gbapal" @ also duck and pika aura + + .align 2 +gUnknown_08DCF210:: + .incbin "graphics/slot_machine/reel_time_explosion/0.gbapal" + + .align 2 +gUnknown_08DCF230:: + .incbin "graphics/slot_machine/spr6.gbapal" @ huh? + + .align 2 +gSlotMachineReelSymbol1Tiles:: @ 8DCF250 + .incbin "graphics/slot_machine/reel_symbols/1.4bpp" + + .align 2 +gSlotMachineReelSymbol2Tiles:: + .incbin "graphics/slot_machine/reel_symbols/2.4bpp" + + .align 2 +gSlotMachineReelSymbol3Tiles:: + .incbin "graphics/slot_machine/reel_symbols/3.4bpp" + + .align 2 +gSlotMachineReelSymbol4Tiles:: + .incbin "graphics/slot_machine/reel_symbols/4.4bpp" + + .align 2 +gSlotMachineReelSymbol5Tiles:: + .incbin "graphics/slot_machine/reel_symbols/5.4bpp" + + .align 2 +gSlotMachineReelSymbol6Tiles:: + .incbin "graphics/slot_machine/reel_symbols/6.4bpp" + + .align 2 +gSlotMachineReelSymbol7Tiles:: + .incbin "graphics/slot_machine/reel_symbols/7.4bpp" + + .align 2 +gSlotMachineReelTime_Gfx:: @ 8DD0050 + .incbin "graphics/slot_machine/reel_time.4bpp.lz" + + .align 2 +gSlotMachineNumber0Tiles:: + .incbin "graphics/slot_machine/numbers/0.4bpp" + + .align 2 +gSlotMachineNumber1Tiles:: + .incbin "graphics/slot_machine/numbers/1.4bpp" + + .align 2 +gSlotMachineNumber2Tiles:: + .incbin "graphics/slot_machine/numbers/2.4bpp" + + .align 2 +gSlotMachineNumber3Tiles:: + .incbin "graphics/slot_machine/numbers/3.4bpp" + + .align 2 +gSlotMachineNumber4Tiles:: + .incbin "graphics/slot_machine/numbers/4.4bpp" + + .align 2 +gSlotMachineNumber5Tiles:: + .incbin "graphics/slot_machine/numbers/5.4bpp" + + .align 2 +gSlotMachineNumber6Tiles:: + .incbin "graphics/slot_machine/numbers/6.4bpp" + + .align 2 +gSlotMachineNumber7Tiles:: + .incbin "graphics/slot_machine/numbers/7.4bpp" + + .align 2 +gSlotMachineNumber8Tiles:: + .incbin "graphics/slot_machine/numbers/8.4bpp" + + .align 2 +gSlotMachineNumber9Tiles:: + .incbin "graphics/slot_machine/numbers/9.4bpp" + + .align 2 +gSlotMachineReelTimeBolt:: + .incbin "graphics/slot_machine/bolt.4bpp" + .align 2 +gSlotMachineReelTimeDuck:: + .incbin "graphics/slot_machine/duck.4bpp" + + .align 2 +gSlotMachineReelTimeSmoke:: + .incbin "graphics/slot_machine/smoke.4bpp" + + .align 2 +gSlotMachineReelTimeNumber0:: + .incbin "graphics/slot_machine/reel_time_numbers/0.4bpp" + + .align 2 +gSlotMachineReelTimeNumber1:: + .incbin "graphics/slot_machine/reel_time_numbers/1.4bpp" + + .align 2 +gSlotMachineReelTimeNumber2:: + .incbin "graphics/slot_machine/reel_time_numbers/2.4bpp" + + .align 2 +gSlotMachineReelTimeNumber3:: + .incbin "graphics/slot_machine/reel_time_numbers/3.4bpp" + + .align 2 +gSlotMachineReelTimeNumber4:: + .incbin "graphics/slot_machine/reel_time_numbers/4.4bpp" + + .align 2 +gSlotMachineReelTimeNumber5:: + .incbin "graphics/slot_machine/reel_time_numbers/5.4bpp" + + .align 2 +gSlotMachineReelTimeLargeBolt0:: + .incbin "graphics/slot_machine/large_bolt/0.4bpp" + + .align 2 +gSlotMachineReelTimeLargeBolt1:: + .incbin "graphics/slot_machine/large_bolt/1.4bpp" + + .align 2 +gSlotMachineReelTimeExplosion0:: + .incbin "graphics/slot_machine/reel_time_explosion/0.4bpp" + + .align 2 +gSlotMachineReelTimeExplosion1:: + .incbin "graphics/slot_machine/reel_time_explosion/1.4bpp" + + .align 2 +gSlotMachineReelTimeShadow:: + .incbin "graphics/slot_machine/shadow.4bpp" + + .align 2 +gSlotMachineReelTimePikaAura:: + .incbin "graphics/slot_machine/pika_aura.4bpp" + + .align 2 +gUnknown_08DD19F8:: + .incbin "graphics/unknown/unknown_DD19F8.bin" @ might be a palette? + + .align 2 +gUnknown_08DD1A18:: + .incbin "graphics/unknown/unknown_DD1A18.4bpp" + + @ trainer card + + .align 2 +gEmeraldTrainerCard0Star_Pal:: @ 8DD1A58 + .incbin "graphics/trainer_card/0star.gbapal" + + .align 2 +gEmeraldTrainerCard_Gfx:: @ 8DD1AB8 + .incbin "graphics/trainer_card/card.4bpp.lz" + + @ what are these? lz compressed files used for something, cant tell if tilemaps + + .align 2 gUnknown_08DD1F78:: @ 8DD1F78 - .incbin "baserom.gba", 0xdd1f78, 0x98 + .incbin "graphics/unknown/unknown_DD1F78.bin.lz" + .align 2 gUnknown_08DD2010:: @ 8DD2010 - .incbin "baserom.gba", 0xdd2010, 0x1A0 + .incbin "graphics/unknown/unknown_DD2010.bin.lz" + .align 2 gUnknown_08DD21B0:: @ 8DD21B0 - .incbin "baserom.gba", 0xdd21b0, 0xDC + .incbin "graphics/unknown/unknown_DD21B0.bin.lz" + .align 2 gUnknown_08DD228C:: @ 8DD228C - .incbin "baserom.gba", 0xdd228c, 0x180 + .incbin "graphics/unknown/unknown_DD228C.bin.lz" -gUnknown_08DD240C:: @ 8DD240C - .incbin "baserom.gba", 0xdd240c, 0x60 + .align 2 +gFireRedTrainerCard0Star_Pal:: @ 8DD240C + .incbin "graphics/trainer_card/0star_fr.gbapal" + + .align 2 +gFireRedTrainerCard_Gfx:: @ 8DD246C + .incbin "graphics/trainer_card/card_fr.4bpp.lz" -gUnknown_08DD246C:: @ 8DD246C - .incbin "baserom.gba", 0xdd246c, 0x674 + @ more of these weird compressed files, probably for the FR trainer card + .align 2 gUnknown_08DD2AE0:: @ 8DD2AE0 - .incbin "baserom.gba", 0xdd2ae0, 0x98 + .incbin "graphics/unknown/unknown_DD2AE0.bin.lz" + .align 2 gUnknown_08DD2B78:: @ 8DD2B78 - .incbin "baserom.gba", 0xdd2b78, 0x1b8 + .incbin "graphics/unknown/unknown_DD2B78.bin.lz" + .align 2 gUnknown_08DD2D30:: @ 8DD2D30 - .incbin "baserom.gba", 0xdd2d30, 0x12c + .incbin "graphics/unknown/unknown_DD2D30.bin.lz" + .align 2 gUnknown_08DD2E5C:: @ 8DD2E5C - .incbin "baserom.gba", 0xdd2e5c, 0x18c + .incbin "graphics/unknown/unknown_DD2E5C.bin.lz" + + @ pokemon storage system -gUnknown_08DD2FE8:: @ 8DD2FE8 - .incbin "baserom.gba", 0xdd2fe8, 0x6c0 + .align 2 +gPSSMenu_Gfx:: @ 8DD2FE8 + .incbin "graphics/pokemon_storage/menu.4bpp.lz" -gUnknown_08DD36A8:: @ 8DD36A8 - .incbin "baserom.gba", 0xdd36a8, 0x20 + .align 2 +gPSSMenu_Pal:: @ 8DD36A8 + .incbin "graphics/pokemon_storage/menu.gbapal" @ pal for the options in the gfx + .align 2 gUnknown_08DD36C8:: @ 8DD36C8 - .incbin "baserom.gba", 0xdd36c8, 0xb0 + .incbin "graphics/unknown/unknown_DD36C8.bin.lz" + + @ naming screen + + .align 2 +gNamingScreenMenu_Pal:: @ 8DD3778 + .incbin "graphics/naming_screen/menu.gbapal" + + .align 2 +gNamingScreenMenu_Gfx:: @ 8DD3838 + .incbin "graphics/naming_screen/menu.4bpp.lz" + + .align 2 +gNamingScreenRWindow_Gfx:: + .incbin "graphics/naming_screen/rwindow.4bpp" -gUnknown_08DD3778:: @ 8DD3778 - .incbin "baserom.gba", 0xdd3778, 0xc0 + .align 2 +gNamingScreenROptions_Gfx:: + .incbin "graphics/naming_screen/roptions.4bpp" + + .align 2 +gNamingScreenCursor_Gfx:: + .incbin "graphics/naming_screen/cursor.4bpp" + + .align 2 +gNamingScreenKeyboardButton_Gfx:: + .incbin "graphics/naming_screen/keyboard_button.4bpp" -gUnknown_08DD3838:: @ 8DD3838 - .incbin "baserom.gba", 0xdd3838, 0xd0c + .align 2 +gNamingScreenRightPointingTriangleTiles:: + .incbin "graphics/naming_screen/right_pointing_triangle.4bpp" + + .align 2 +gNamingScreenUnderscoreTiles:: + .incbin "graphics/naming_screen/underscore.4bpp" + .align 2 gUnknown_08DD4544:: @ 8DD4544 - .incbin "baserom.gba", 0xdd4544, 0xdc + .incbin "graphics/unknown/unknown_DD4544.bin.lz" + .align 2 gUnknown_08DD4620:: @ 8DD4620 - .incbin "baserom.gba", 0xdd4620, 0xc0 + .incbin "graphics/unknown/unknown_DD4620.bin.lz" + .align 2 gUnknown_08DD46E0:: @ 8DD46E0 - .incbin "baserom.gba", 0xdd46e0, 0xc0 + .incbin "graphics/unknown/unknown_DD46E0.bin.lz" + .align 2 gUnknown_08DD47A0:: @ 8DD47A0 - .incbin "baserom.gba", 0xdd47a0, 0xc0 + .incbin "graphics/unknown/unknown_DD47A0.bin.lz" -gUnknown_08DD4860:: @ 8DD4860 - .incbin "baserom.gba", 0xdd4860, 0x20 + @ link -gUnknown_08DD4880:: @ 8DD4880 - .incbin "baserom.gba", 0xdd4880, 0x238 + .align 2 +gLinkMiscMenu_Pal:: @ 8DD4860 + .incbin "graphics/link/misc.gbapal" + + .align 2 +gLinkMiscMenu_Gfx:: @ 8DD4880 + .incbin "graphics/link/misc.4bpp.lz" @ dont know where this is used -gUnknown_08DD4AB8:: @ 8DD4AB8 - .incbin "baserom.gba", 0xdd4ab8, 0xf8 + .align 2 +gLinkMiscMenu_Tilemap:: @ 8DD4AB8 + .incbin "graphics/link/misc.bin.lz" + .align 2 gUnknown_08DD4BB0:: @ 8DD4BB0 - .incbin "baserom.gba", 0xdd4bb0, 0x20 + .incbin "graphics/link/link1.gbapal" + .align 2 gUnknown_08DD4BD0:: @ 8DD4BD0 - .incbin "baserom.gba", 0xdd4bd0, 0x20 + .incbin "graphics/link/link2.gbapal" + .align 2 gUnknown_08DD4BF0:: @ 8DD4BF0 - .incbin "baserom.gba", 0xdd4bf0, 0x5c + .incbin "graphics/link/link_winedge.4bpp.lz" + .align 2 gUnknown_08DD4C4C:: @ 8DD4C4C - .incbin "baserom.gba", 0xdd4c4c, 0xac + .incbin "graphics/link/link_winedge.bin.lz" .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 diff --git a/data/slot_machine.s b/data/slot_machine.s index 08989ccdc..d68d4c243 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -241,8 +241,63 @@ gUnknown_085A8264:: @ 85A8264 gUnknown_085A82CC:: @ 85A82CC .incbin "baserom.gba", 0x5a82cc, 0x68 + @ 50 F2 DC 08 00 02 00 00 + @ 50 F4 DC 08 00 02 01 00 + @ 50 F6 DC 08 00 02 02 00 + @ 50 F8 DC 08 00 02 03 00 + @ 50 FA DC 08 00 02 04 00 + @ 50 FC DC 08 00 02 05 00 + @ 50 FE DC 08 00 02 06 00 + @ B8 07 DD 08 40 00 07 00 + @ F8 07 DD 08 40 00 08 00 + @ 38 08 DD 08 40 00 09 00 + @ 78 08 DD 08 40 00 0A 00 + @ B8 08 DD 08 40 00 0B 00 + @ F8 08 DD 08 40 00 0C 00 + @ 38 09 DD 08 40 00 0D 00 + @ 78 09 DD 08 40 00 0E 00 + @ B8 09 DD 08 40 00 0F 00 + @ F8 09 DD 08 40 00 10 00 + + .align 2 gUnknown_085A8334:: @ 85A8334 - .incbin "baserom.gba", 0x5a8334, 0xb0 + .4byte gSlotMachineReelSymbol1Tiles + .2byte 0x0200, 0x0000 + .4byte gSlotMachineReelSymbol2Tiles + .2byte 0x0200, 0x0001 + .4byte gSlotMachineReelSymbol3Tiles + .2byte 0x0200, 0x0002 + .4byte gSlotMachineReelSymbol4Tiles + .2byte 0x0200, 0x0003 + .4byte gSlotMachineReelSymbol5Tiles + .2byte 0x0200, 0x0004 + .4byte gSlotMachineReelSymbol6Tiles + .2byte 0x0200, 0x0005 + .4byte gSlotMachineReelSymbol7Tiles + .2byte 0x0200, 0x0006 + .4byte gSlotMachineNumber0Tiles + .2byte 0x0040, 0x0007 + .4byte gSlotMachineNumber1Tiles + .2byte 0x0040, 0x0008 + .4byte gSlotMachineNumber2Tiles + .2byte 0x0040, 0x0009 + .4byte gSlotMachineNumber3Tiles + .2byte 0x0040, 0x000A + .4byte gSlotMachineNumber4Tiles + .2byte 0x0040, 0x000B + .4byte gSlotMachineNumber5Tiles + .2byte 0x0040, 0x000C + .4byte gSlotMachineNumber6Tiles + .2byte 0x0040, 0x000D + .4byte gSlotMachineNumber7Tiles + .2byte 0x0040, 0x000E + .4byte gSlotMachineNumber8Tiles + .2byte 0x0040, 0x000F + .4byte gSlotMachineNumber9Tiles + .2byte 0x0040, 0x0010 + + .align 2 + .incbin "baserom.gba", 0x5a83bc, 0x28 gUnknown_085A83E4:: @ 85A83E4 .incbin "baserom.gba", 0x5a83e4, 0x24 @@ -277,8 +332,17 @@ gUnknown_085A8520:: @ 85A8520 gUnknown_085A8524:: @ 85A8524 .incbin "baserom.gba", 0x5a8524, 0x20 + .align 2 gUnknown_085A8544:: @ 85A8544 - .incbin "baserom.gba", 0x5a8544, 0x48 + .4byte gUnknown_08DCF170, 0 + .4byte gUnknown_08DCF190, 1 + .4byte gUnknown_08DCF1B0, 2 + .4byte gSlotMachineReelTime_Pal, 3 + .4byte gUnknown_08DCF1F0, 4 + .4byte gUnknown_08DCF210, 5 + .4byte gUnknown_08DCF230, 6 + .4byte gUnknown_08DCF1F0, 7 + .4byte 0, 0 gUnknown_085A858C:: @ 85A858C .incbin "baserom.gba", 0x5a858c, 0x1154 diff --git a/data/trainer_card.s b/data/trainer_card.s index 4f344c961..88d9b40f3 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -16,28 +16,28 @@ gUnknown_0856F018:: @ 856F018 .incbin "baserom.gba", 0x56f018, 0x194 -gUnknown_0856F1AC:: @ 856F1AC +gEmeraldTrainerCard1Star_Pal:: @ 856F1AC .incbin "baserom.gba", 0x56f1ac, 0x60 -gUnknown_0856F20C:: @ 856F20C +gFireRedTrainerCard1Star_Pal:: @ 856F20C .incbin "baserom.gba", 0x56f20c, 0x60 -gUnknown_0856F26C:: @ 856F26C +gEmeraldTrainerCard2Star_Pal:: @ 856F26C .incbin "baserom.gba", 0x56f26c, 0x60 -gUnknown_0856F2CC:: @ 856F2CC +gFireRedTrainerCard2Star_Pal:: @ 856F2CC .incbin "baserom.gba", 0x56f2cc, 0x60 -gUnknown_0856F32C:: @ 856F32C +gEmeraldTrainerCard3Star_Pal:: @ 856F32C .incbin "baserom.gba", 0x56f32c, 0x60 -gUnknown_0856F38C:: @ 856F38C +gFireRedTrainerCard3Star_Pal:: @ 856F38C .incbin "baserom.gba", 0x56f38c, 0x60 -gUnknown_0856F3EC:: @ 856F3EC +gEmeraldTrainerCard4Star_Pal:: @ 856F3EC .incbin "baserom.gba", 0x56f3ec, 0x60 -gUnknown_0856F44C:: @ 856F44C +gFireRedTrainerCard4Star_Pal:: @ 856F44C .incbin "baserom.gba", 0x56f44c, 0x60 gUnknown_0856F4AC:: @ 856F4AC @@ -79,19 +79,21 @@ gUnknown_0856FAB4:: @ 856FAB4 gUnknown_0856FAC4:: @ 856FAC4 .incbin "baserom.gba", 0x56fac4, 0x20 -gUnknown_0856FAE4:: @ 856FAE4 - .4byte gUnknown_08DD1A58 - .4byte gUnknown_0856F1AC - .4byte gUnknown_0856F26C - .4byte gUnknown_0856F32C - .4byte gUnknown_0856F3EC - -gUnknown_0856FAF8:: @ 856FAF8 - .4byte gUnknown_08DD240C - .4byte gUnknown_0856F20C - .4byte gUnknown_0856F2CC - .4byte gUnknown_0856F38C - .4byte gUnknown_0856F44C + .align 2 +gEmeraldTrainerCardStarPals:: @ 856FAE4 + .4byte gEmeraldTrainerCard0Star_Pal + .4byte gEmeraldTrainerCard1Star_Pal + .4byte gEmeraldTrainerCard2Star_Pal + .4byte gEmeraldTrainerCard3Star_Pal + .4byte gEmeraldTrainerCard4Star_Pal + + .align 2 +gFireRedTrainerCardStarPals:: @ 856FAF8 + .4byte gFireRedTrainerCard0Star_Pal + .4byte gFireRedTrainerCard1Star_Pal + .4byte gFireRedTrainerCard2Star_Pal + .4byte gFireRedTrainerCard3Star_Pal + .4byte gFireRedTrainerCard4Star_Pal gUnknown_0856FB0C:: @ 856FB0C .incbin "baserom.gba", 0x56fb0c, 0x3 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 7a2f26233..ffb7802d9 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04 .4byte gText_Beauty3 gUnknown_085DFD18:: @ 85DFD18 - obj_tiles gUnknown_08DCCD5C, 0x200, 0 + obj_tiles gUsePokeblockUpDown_Gfx, 0x200, 0 gUnknown_085DFD20:: @ 85DFD20 - obj_pal gUnknown_08DCCD3C, 0 + obj_pal gUsePokeblockUpDown_Pal, 0 gUnknown_085DFD28:: @ 85DFD28 .incbin "baserom.gba", 0x5dfd28, 0x34 @@ -62,5 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0 .incbin "baserom.gba", 0x5dfda0, 0x18 gUnknown_085DFDB8:: @ 85DFDB8 - .4byte gUnknown_08DCCB98 + .4byte gUsePokeblockCondition_Pal .4byte 1 diff --git a/graphics/easy_chat/cursor.png b/graphics/easy_chat/cursor.png Binary files differnew file mode 100755 index 000000000..502ea2d69 --- /dev/null +++ b/graphics/easy_chat/cursor.png diff --git a/graphics/easy_chat/mode.png b/graphics/easy_chat/mode.png Binary files differnew file mode 100755 index 000000000..31fb3fdd3 --- /dev/null +++ b/graphics/easy_chat/mode.png diff --git a/graphics/easy_chat/rwindow.png b/graphics/easy_chat/rwindow.png Binary files differnew file mode 100755 index 000000000..6319f9a5d --- /dev/null +++ b/graphics/easy_chat/rwindow.png diff --git a/graphics/easy_chat/window.bin b/graphics/easy_chat/window.bin Binary files differnew file mode 100755 index 000000000..c18d45d3f --- /dev/null +++ b/graphics/easy_chat/window.bin diff --git a/graphics/easy_chat/window.png b/graphics/easy_chat/window.png Binary files differnew file mode 100755 index 000000000..269971224 --- /dev/null +++ b/graphics/easy_chat/window.png diff --git a/graphics/interface/wallclock.png b/graphics/interface/wallclock.png Binary files differnew file mode 100755 index 000000000..e50f37e72 --- /dev/null +++ b/graphics/interface/wallclock.png diff --git a/graphics/interface/wallclock1.bin b/graphics/interface/wallclock1.bin Binary files differnew file mode 100755 index 000000000..49f21ed5b --- /dev/null +++ b/graphics/interface/wallclock1.bin diff --git a/graphics/interface/wallclock2.bin b/graphics/interface/wallclock2.bin Binary files differnew file mode 100755 index 000000000..ba479e7b1 --- /dev/null +++ b/graphics/interface/wallclock2.bin diff --git a/graphics/interface/wallclock_female.pal b/graphics/interface/wallclock_female.pal new file mode 100755 index 000000000..a7909e2e0 --- /dev/null +++ b/graphics/interface/wallclock_female.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 90 +222 230 238 +213 213 222 +205 205 213 +197 197 205 +255 197 255 +255 156 255 +255 115 255 +255 82 255 +74 180 189 +255 230 49 +90 90 123 +123 123 172 +65 65 90 +255 255 255 +0 0 0 diff --git a/graphics/interface/wallclock_male.pal b/graphics/interface/wallclock_male.pal new file mode 100755 index 000000000..1582ebfd2 --- /dev/null +++ b/graphics/interface/wallclock_male.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +65 65 90 +222 230 238 +213 213 222 +205 205 213 +197 197 205 +164 180 255 +115 139 255 +74 98 255 +32 65 255 +74 180 189 +255 230 49 +90 90 123 +123 123 172 +65 65 90 +255 255 255 +0 0 0 diff --git a/graphics/link/link1.pal b/graphics/link/link1.pal new file mode 100755 index 000000000..a86815b0e --- /dev/null +++ b/graphics/link/link1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +213 205 205 +255 255 255 +255 255 255 +41 41 41 +255 156 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/link/link2.pal b/graphics/link/link2.pal new file mode 100755 index 000000000..a8c95a3c0 --- /dev/null +++ b/graphics/link/link2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +156 197 98 +41 131 222 +0 82 172 +197 255 106 +172 230 49 +246 246 213 +255 49 49 +255 148 148 +131 164 213 +238 238 90 +65 65 65 +115 115 115 +172 172 172 +230 230 255 +0 0 0 +255 255 255 diff --git a/graphics/link/link_winedge.bin b/graphics/link/link_winedge.bin Binary files differnew file mode 100755 index 000000000..f3e264d05 --- /dev/null +++ b/graphics/link/link_winedge.bin diff --git a/graphics/link/link_winedge.png b/graphics/link/link_winedge.png Binary files differnew file mode 100755 index 000000000..86ddacc03 --- /dev/null +++ b/graphics/link/link_winedge.png diff --git a/graphics/link/misc.bin b/graphics/link/misc.bin Binary files differnew file mode 100755 index 000000000..e91b50c8d --- /dev/null +++ b/graphics/link/misc.bin diff --git a/graphics/link/misc.png b/graphics/link/misc.png Binary files differnew file mode 100755 index 000000000..ae6ba4d02 --- /dev/null +++ b/graphics/link/misc.png diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png Binary files differnew file mode 100755 index 000000000..3d92ef6f4 --- /dev/null +++ b/graphics/naming_screen/cursor.png diff --git a/graphics/naming_screen/keyboard_button.png b/graphics/naming_screen/keyboard_button.png Binary files differnew file mode 100755 index 000000000..e5a004894 --- /dev/null +++ b/graphics/naming_screen/keyboard_button.png diff --git a/graphics/naming_screen/menu.pal b/graphics/naming_screen/menu.pal new file mode 100755 index 000000000..0da3b93f2 --- /dev/null +++ b/graphics/naming_screen/menu.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +106 156 213 +255 255 255 +115 115 115 +139 139 131 +172 172 164 +197 189 180 +230 222 213 +197 230 156 +213 238 189 +230 246 222 +0 0 0 +0 0 0 +213 205 82 +230 222 90 +238 230 139 +246 238 197 +106 156 213 +255 255 255 +57 57 57 +115 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +74 115 139 +98 139 164 +123 172 197 +156 205 230 +180 222 246 +106 156 213 +255 255 255 +57 57 57 +115 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +172 115 74 +189 131 90 +213 156 115 +246 205 164 +255 230 197 +106 156 213 +255 255 255 +57 57 57 +115 115 115 +0 0 0 +0 0 0 +0 0 0 +0 0 255 +0 0 255 +0 0 255 +0 0 255 +98 156 57 +123 172 82 +148 189 106 +197 230 156 +213 238 189 +106 156 213 +255 255 255 +57 57 57 +139 139 131 +197 189 180 +230 222 213 +74 115 139 +123 172 197 +172 115 74 +213 156 115 +98 156 57 +148 189 106 +189 164 32 +230 222 90 +57 57 57 +57 57 57 +106 156 213 +255 8 8 +222 57 74 +180 65 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 222 213 +0 0 0 +230 222 213 +0 0 0 diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png Binary files differnew file mode 100755 index 000000000..ff8348514 --- /dev/null +++ b/graphics/naming_screen/menu.png diff --git a/graphics/naming_screen/right_pointing_triangle.png b/graphics/naming_screen/right_pointing_triangle.png Binary files differnew file mode 100755 index 000000000..e07b9e5a8 --- /dev/null +++ b/graphics/naming_screen/right_pointing_triangle.png diff --git a/graphics/naming_screen/roptions.png b/graphics/naming_screen/roptions.png Binary files differnew file mode 100755 index 000000000..dfb7e0105 --- /dev/null +++ b/graphics/naming_screen/roptions.png diff --git a/graphics/naming_screen/rwindow.png b/graphics/naming_screen/rwindow.png Binary files differnew file mode 100755 index 000000000..9571abb80 --- /dev/null +++ b/graphics/naming_screen/rwindow.png diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png Binary files differnew file mode 100755 index 000000000..409ca82ed --- /dev/null +++ b/graphics/naming_screen/underscore.png diff --git a/graphics/pokeblock/use_screen/condition.png b/graphics/pokeblock/use_screen/condition.png Binary files differnew file mode 100755 index 000000000..aaece5a38 --- /dev/null +++ b/graphics/pokeblock/use_screen/condition.png diff --git a/graphics/pokeblock/use_screen/graph.bin b/graphics/pokeblock/use_screen/graph.bin Binary files differnew file mode 100755 index 000000000..063c034b4 --- /dev/null +++ b/graphics/pokeblock/use_screen/graph.bin diff --git a/graphics/pokeblock/use_screen/graph.png b/graphics/pokeblock/use_screen/graph.png Binary files differnew file mode 100755 index 000000000..3b4b64473 --- /dev/null +++ b/graphics/pokeblock/use_screen/graph.png diff --git a/graphics/pokeblock/use_screen/nature.pal b/graphics/pokeblock/use_screen/nature.pal new file mode 100755 index 000000000..e0ce98921 --- /dev/null +++ b/graphics/pokeblock/use_screen/nature.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 65 +8 213 74 +0 213 74 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +32 213 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +131 180 65 +32 213 65 +24 213 65 +24 213 65 +24 213 65 +24 213 65 +24 213 65 +24 213 65 +24 213 65 +24 213 74 +24 213 65 +24 213 65 +24 213 65 +16 213 74 diff --git a/graphics/pokeblock/use_screen/updown.png b/graphics/pokeblock/use_screen/updown.png Binary files differnew file mode 100755 index 000000000..7d4049d86 --- /dev/null +++ b/graphics/pokeblock/use_screen/updown.png diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png Binary files differnew file mode 100755 index 000000000..204c07504 --- /dev/null +++ b/graphics/pokemon_storage/menu.png diff --git a/graphics/slot_machine/bolt.png b/graphics/slot_machine/bolt.png Binary files differnew file mode 100755 index 000000000..1afda2308 --- /dev/null +++ b/graphics/slot_machine/bolt.png diff --git a/graphics/slot_machine/duck.png b/graphics/slot_machine/duck.png Binary files differnew file mode 100755 index 000000000..1bf2afc30 --- /dev/null +++ b/graphics/slot_machine/duck.png diff --git a/graphics/slot_machine/large_bolt/0.png b/graphics/slot_machine/large_bolt/0.png Binary files differnew file mode 100755 index 000000000..6d833c264 --- /dev/null +++ b/graphics/slot_machine/large_bolt/0.png diff --git a/graphics/slot_machine/large_bolt/1.png b/graphics/slot_machine/large_bolt/1.png Binary files differnew file mode 100755 index 000000000..706f3fe8b --- /dev/null +++ b/graphics/slot_machine/large_bolt/1.png diff --git a/graphics/slot_machine/menu.bin b/graphics/slot_machine/menu.bin Binary files differnew file mode 100755 index 000000000..a7ec95508 --- /dev/null +++ b/graphics/slot_machine/menu.bin diff --git a/graphics/slot_machine/menu.pal b/graphics/slot_machine/menu.pal new file mode 100755 index 000000000..56a9d31d0 --- /dev/null +++ b/graphics/slot_machine/menu.pal @@ -0,0 +1,83 @@ +JASC-PAL +0100 +80 +0 0 0 +57 57 49 +230 230 230 +255 255 255 +131 213 172 +49 123 74 +90 172 106 +255 0 255 +90 172 106 +255 164 41 +255 98 57 +255 197 156 +172 57 0 +0 65 24 +98 98 90 +0 0 0 +222 222 222 +255 255 255 +131 213 172 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 0 255 +156 0 0 +0 0 0 +0 0 0 +255 255 255 +74 74 213 +115 172 255 +115 164 74 +156 238 74 +230 65 24 +255 164 41 +255 238 32 +131 213 172 +189 189 189 +156 156 156 +123 123 123 +90 90 90 +65 65 65 +0 0 0 +255 0 255 +255 255 255 +65 164 82 +139 230 139 +139 230 139 +148 238 148 +164 246 164 +180 246 180 +189 246 189 +205 255 205 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 +222 222 222 +65 90 213 +90 172 106 +255 255 255 +131 213 172 +0 98 115 +90 90 0 +90 90 0 +156 16 0 +156 16 0 +106 156 246 +205 205 0 +205 205 0 +246 106 74 +246 106 74 +0 0 0 diff --git a/graphics/slot_machine/menu.png b/graphics/slot_machine/menu.png Binary files differnew file mode 100755 index 000000000..08aa5989d --- /dev/null +++ b/graphics/slot_machine/menu.png diff --git a/graphics/slot_machine/numbers/0.png b/graphics/slot_machine/numbers/0.png Binary files differnew file mode 100755 index 000000000..07c668eea --- /dev/null +++ b/graphics/slot_machine/numbers/0.png diff --git a/graphics/slot_machine/numbers/1.png b/graphics/slot_machine/numbers/1.png Binary files differnew file mode 100755 index 000000000..0aa67e201 --- /dev/null +++ b/graphics/slot_machine/numbers/1.png diff --git a/graphics/slot_machine/numbers/2.png b/graphics/slot_machine/numbers/2.png Binary files differnew file mode 100755 index 000000000..0ff2a0265 --- /dev/null +++ b/graphics/slot_machine/numbers/2.png diff --git a/graphics/slot_machine/numbers/3.png b/graphics/slot_machine/numbers/3.png Binary files differnew file mode 100755 index 000000000..ea5f1e496 --- /dev/null +++ b/graphics/slot_machine/numbers/3.png diff --git a/graphics/slot_machine/numbers/4.png b/graphics/slot_machine/numbers/4.png Binary files differnew file mode 100755 index 000000000..d5353c752 --- /dev/null +++ b/graphics/slot_machine/numbers/4.png diff --git a/graphics/slot_machine/numbers/5.png b/graphics/slot_machine/numbers/5.png Binary files differnew file mode 100755 index 000000000..121a7b3c9 --- /dev/null +++ b/graphics/slot_machine/numbers/5.png diff --git a/graphics/slot_machine/numbers/6.png b/graphics/slot_machine/numbers/6.png Binary files differnew file mode 100755 index 000000000..95a9ae0ff --- /dev/null +++ b/graphics/slot_machine/numbers/6.png diff --git a/graphics/slot_machine/numbers/7.png b/graphics/slot_machine/numbers/7.png Binary files differnew file mode 100755 index 000000000..1b8b77b2a --- /dev/null +++ b/graphics/slot_machine/numbers/7.png diff --git a/graphics/slot_machine/numbers/8.png b/graphics/slot_machine/numbers/8.png Binary files differnew file mode 100755 index 000000000..17fe7938f --- /dev/null +++ b/graphics/slot_machine/numbers/8.png diff --git a/graphics/slot_machine/numbers/9.png b/graphics/slot_machine/numbers/9.png Binary files differnew file mode 100755 index 000000000..f684e0be7 --- /dev/null +++ b/graphics/slot_machine/numbers/9.png diff --git a/graphics/slot_machine/pika_aura.png b/graphics/slot_machine/pika_aura.png Binary files differnew file mode 100755 index 000000000..710d90256 --- /dev/null +++ b/graphics/slot_machine/pika_aura.png diff --git a/graphics/slot_machine/reel_pikachu.png b/graphics/slot_machine/reel_pikachu.png Binary files differnew file mode 100755 index 000000000..29b004c84 --- /dev/null +++ b/graphics/slot_machine/reel_pikachu.png diff --git a/graphics/slot_machine/reel_symbols/1.png b/graphics/slot_machine/reel_symbols/1.png Binary files differnew file mode 100755 index 000000000..73e9d3345 --- /dev/null +++ b/graphics/slot_machine/reel_symbols/1.png diff --git a/graphics/slot_machine/reel_symbols/2.png b/graphics/slot_machine/reel_symbols/2.png Binary files differnew file mode 100755 index 000000000..866f4cead --- /dev/null +++ b/graphics/slot_machine/reel_symbols/2.png diff --git a/graphics/slot_machine/reel_symbols/3.png b/graphics/slot_machine/reel_symbols/3.png Binary files differnew file mode 100755 index 000000000..9641dc4c5 --- /dev/null +++ b/graphics/slot_machine/reel_symbols/3.png diff --git a/graphics/slot_machine/reel_symbols/4.png b/graphics/slot_machine/reel_symbols/4.png Binary files differnew file mode 100755 index 000000000..b3319e0e4 --- /dev/null +++ b/graphics/slot_machine/reel_symbols/4.png diff --git a/graphics/slot_machine/reel_symbols/5.png b/graphics/slot_machine/reel_symbols/5.png Binary files differnew file mode 100755 index 000000000..16ae0f318 --- /dev/null +++ b/graphics/slot_machine/reel_symbols/5.png diff --git a/graphics/slot_machine/reel_symbols/6.png b/graphics/slot_machine/reel_symbols/6.png Binary files differnew file mode 100755 index 000000000..3d170585f --- /dev/null +++ b/graphics/slot_machine/reel_symbols/6.png diff --git a/graphics/slot_machine/reel_symbols/7.png b/graphics/slot_machine/reel_symbols/7.png Binary files differnew file mode 100755 index 000000000..e6535b380 --- /dev/null +++ b/graphics/slot_machine/reel_symbols/7.png diff --git a/graphics/slot_machine/reel_time.png b/graphics/slot_machine/reel_time.png Binary files differnew file mode 100755 index 000000000..4ba92175f --- /dev/null +++ b/graphics/slot_machine/reel_time.png diff --git a/graphics/slot_machine/reel_time_explosion/0.png b/graphics/slot_machine/reel_time_explosion/0.png Binary files differnew file mode 100755 index 000000000..163b7ab66 --- /dev/null +++ b/graphics/slot_machine/reel_time_explosion/0.png diff --git a/graphics/slot_machine/reel_time_explosion/1.png b/graphics/slot_machine/reel_time_explosion/1.png Binary files differnew file mode 100755 index 000000000..33492bc45 --- /dev/null +++ b/graphics/slot_machine/reel_time_explosion/1.png diff --git a/graphics/slot_machine/reel_time_numbers/0.png b/graphics/slot_machine/reel_time_numbers/0.png Binary files differnew file mode 100755 index 000000000..117a625b8 --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/0.png diff --git a/graphics/slot_machine/reel_time_numbers/1.png b/graphics/slot_machine/reel_time_numbers/1.png Binary files differnew file mode 100755 index 000000000..5527465e7 --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/1.png diff --git a/graphics/slot_machine/reel_time_numbers/2.png b/graphics/slot_machine/reel_time_numbers/2.png Binary files differnew file mode 100755 index 000000000..f424b5ff9 --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/2.png diff --git a/graphics/slot_machine/reel_time_numbers/3.png b/graphics/slot_machine/reel_time_numbers/3.png Binary files differnew file mode 100755 index 000000000..281273f7d --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/3.png diff --git a/graphics/slot_machine/reel_time_numbers/4.png b/graphics/slot_machine/reel_time_numbers/4.png Binary files differnew file mode 100755 index 000000000..772692ac4 --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/4.png diff --git a/graphics/slot_machine/reel_time_numbers/5.png b/graphics/slot_machine/reel_time_numbers/5.png Binary files differnew file mode 100755 index 000000000..21e2b2940 --- /dev/null +++ b/graphics/slot_machine/reel_time_numbers/5.png diff --git a/graphics/slot_machine/shadow.png b/graphics/slot_machine/shadow.png Binary files differnew file mode 100755 index 000000000..a7862ab30 --- /dev/null +++ b/graphics/slot_machine/shadow.png diff --git a/graphics/slot_machine/slots_layout.bin b/graphics/slot_machine/slots_layout.bin Binary files differnew file mode 100755 index 000000000..4009d8177 --- /dev/null +++ b/graphics/slot_machine/slots_layout.bin diff --git a/graphics/slot_machine/smoke.png b/graphics/slot_machine/smoke.png Binary files differnew file mode 100755 index 000000000..d38690d91 --- /dev/null +++ b/graphics/slot_machine/smoke.png diff --git a/graphics/slot_machine/spr6.pal b/graphics/slot_machine/spr6.pal new file mode 100755 index 000000000..4f74a3079 --- /dev/null +++ b/graphics/slot_machine/spr6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +197 65 16 +197 65 16 +197 65 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/trainer_card/0star.pal b/graphics/trainer_card/0star.pal new file mode 100755 index 000000000..f49b7f2c5 --- /dev/null +++ b/graphics/trainer_card/0star.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +255 255 255 +230 255 222 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +65 139 197 +180 230 156 +148 238 131 +131 222 115 +82 172 74 +106 189 255 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 213 +41 123 164 +0 0 0 +0 0 0 +98 98 115 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +255 255 255 +230 230 238 +164 164 164 +123 123 123 +106 189 255 +205 205 205 +0 0 0 diff --git a/graphics/trainer_card/0star_fr.pal b/graphics/trainer_card/0star_fr.pal new file mode 100755 index 000000000..1e83a252c --- /dev/null +++ b/graphics/trainer_card/0star_fr.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +139 98 115 +230 246 246 +222 238 255 +213 230 246 +197 213 230 +246 205 148 +164 164 164 +98 98 115 +246 213 139 +180 205 148 +106 164 222 +90 156 205 +57 115 156 +255 246 189 +255 255 255 +131 189 230 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +82 205 180 +49 156 148 +197 197 197 +90 90 90 +139 98 115 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +189 148 16 +255 213 82 +230 148 82 +213 98 41 +197 197 197 +90 90 90 diff --git a/graphics/trainer_card/card.png b/graphics/trainer_card/card.png Binary files differnew file mode 100755 index 000000000..eab827246 --- /dev/null +++ b/graphics/trainer_card/card.png diff --git a/graphics/trainer_card/card_fr.png b/graphics/trainer_card/card_fr.png Binary files differnew file mode 100755 index 000000000..2fea60d09 --- /dev/null +++ b/graphics/trainer_card/card_fr.png diff --git a/graphics/unknown/unknown_DD19F8.bin b/graphics/unknown/unknown_DD19F8.bin new file mode 100755 index 000000000..6338ade28 --- /dev/null +++ b/graphics/unknown/unknown_DD19F8.bin @@ -0,0 +1 @@ +33333333333333333333333333333333
\ No newline at end of file diff --git a/graphics/unknown/unknown_DD1A18.png b/graphics/unknown/unknown_DD1A18.png Binary files differnew file mode 100755 index 000000000..8b4a564bf --- /dev/null +++ b/graphics/unknown/unknown_DD1A18.png diff --git a/graphics/unknown/unknown_DD1F78.bin b/graphics/unknown/unknown_DD1F78.bin new file mode 100755 index 000000000..4e58fafc6 --- /dev/null +++ b/graphics/unknown/unknown_DD1F78.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/graphics/unknown/unknown_DD2010.bin b/graphics/unknown/unknown_DD2010.bin Binary files differnew file mode 100755 index 000000000..8ebf0b79a --- /dev/null +++ b/graphics/unknown/unknown_DD2010.bin diff --git a/graphics/unknown/unknown_DD21B0.bin b/graphics/unknown/unknown_DD21B0.bin Binary files differnew file mode 100755 index 000000000..3ef599ce5 --- /dev/null +++ b/graphics/unknown/unknown_DD21B0.bin diff --git a/graphics/unknown/unknown_DD228C.bin b/graphics/unknown/unknown_DD228C.bin Binary files differnew file mode 100755 index 000000000..63c4b4978 --- /dev/null +++ b/graphics/unknown/unknown_DD228C.bin diff --git a/graphics/unknown/unknown_DD2AE0.bin b/graphics/unknown/unknown_DD2AE0.bin new file mode 100755 index 000000000..c0914427d --- /dev/null +++ b/graphics/unknown/unknown_DD2AE0.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/graphics/unknown/unknown_DD2B78.bin b/graphics/unknown/unknown_DD2B78.bin Binary files differnew file mode 100755 index 000000000..c83a6e494 --- /dev/null +++ b/graphics/unknown/unknown_DD2B78.bin diff --git a/graphics/unknown/unknown_DD2D30.bin b/graphics/unknown/unknown_DD2D30.bin Binary files differnew file mode 100755 index 000000000..14840e5e4 --- /dev/null +++ b/graphics/unknown/unknown_DD2D30.bin diff --git a/graphics/unknown/unknown_DD2E5C.bin b/graphics/unknown/unknown_DD2E5C.bin Binary files differnew file mode 100755 index 000000000..3169533c0 --- /dev/null +++ b/graphics/unknown/unknown_DD2E5C.bin diff --git a/graphics/unknown/unknown_DD36C8.bin b/graphics/unknown/unknown_DD36C8.bin Binary files differnew file mode 100755 index 000000000..973ef9e15 --- /dev/null +++ b/graphics/unknown/unknown_DD36C8.bin diff --git a/graphics/unknown/unknown_DD4544.bin b/graphics/unknown/unknown_DD4544.bin Binary files differnew file mode 100755 index 000000000..7e3604311 --- /dev/null +++ b/graphics/unknown/unknown_DD4544.bin diff --git a/graphics/unknown/unknown_DD4620.bin b/graphics/unknown/unknown_DD4620.bin Binary files differnew file mode 100755 index 000000000..bc4260b1f --- /dev/null +++ b/graphics/unknown/unknown_DD4620.bin diff --git a/graphics/unknown/unknown_DD46E0.bin b/graphics/unknown/unknown_DD46E0.bin Binary files differnew file mode 100755 index 000000000..64095dce5 --- /dev/null +++ b/graphics/unknown/unknown_DD46E0.bin diff --git a/graphics/unknown/unknown_DD47A0.bin b/graphics/unknown/unknown_DD47A0.bin Binary files differnew file mode 100755 index 000000000..847486432 --- /dev/null +++ b/graphics/unknown/unknown_DD47A0.bin diff --git a/include/graphics.h b/include/graphics.h index a3feb9257..81aa43b82 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2545,9 +2545,9 @@ extern const u8 gUnknown_08DB9F08[]; extern const u8 gUnknown_08DB9FFC[]; extern const u8 gUnknown_08DBA020[]; extern const u8 gUnknown_08DBA12C[]; -extern const u8 gUnknown_08DCC05C[]; -extern const u16 gUnknown_08DCC01C[]; -extern const u16 gUnknown_08DCC03C[]; +extern const u8 gWallclock_Gfx[]; +extern const u16 gWallclockMale_Pal[]; +extern const u16 gWallclockFemale_Pal[]; extern const u8 gUnknown_08DCC648[]; extern const u8 gUnknown_08DCC908[]; extern const u8 gUnknown_08DD87C0[]; diff --git a/src/wallclock.c b/src/wallclock.c index 897576719..ea6137c5d 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -92,8 +92,8 @@ static const struct CompressedSpriteSheet gUnknown_085B2208 = { }; static const u32 filler_85B2210[2] = {}; static const struct SpritePalette gUnknown_085B2218[] = { - { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND }, - { gUnknown_08DCC03C, 0x1001 }, + { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND }, + { gWallclockFemale_Pal, 0x1001 }, {} }; static const struct OamData Unknown_085B2230 = { @@ -561,14 +561,14 @@ static void LoadWallClockGraphics(void) DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE); - LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM); + LZ77UnCompVram(gWallclock_Gfx, (void *)VRAM); if (gSpecialVar_0x8004 == 0) { - LoadPalette(gUnknown_08DCC01C, 0x00, 0x20); + LoadPalette(gWallclockMale_Pal, 0x00, 0x20); } else { - LoadPalette(gUnknown_08DCC03C, 0x00, 0x20); + LoadPalette(gWallclockFemale_Pal, 0x00, 0x20); } LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20); LoadPalette(sUnknown_085B21D4, 0xc0, 0x08); |
