diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 432 | ||||
| -rw-r--r-- | data/slot_machine.s | 68 | ||||
| -rw-r--r-- | data/trainer_card.s | 44 | ||||
| -rw-r--r-- | data/use_pokeblock.s | 6 |
4 files changed, 443 insertions, 107 deletions
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 |