diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 1938 | ||||
| -rw-r--r-- | data/graphics.s | 1224 | ||||
| -rw-r--r-- | data/text/battle_strings.s | 3 | ||||
| -rw-r--r-- | data/trainer_parties.s | 2 |
4 files changed, 2199 insertions, 968 deletions
diff --git a/data/data2.s b/data/data2.s index 2c8fb6ee6..ff525aa82 100644 --- a/data/data2.s +++ b/data/data2.s @@ -27,7 +27,7 @@ gUnknown_081E796C:: @ 81E796C .space 16 .align 2 -gUnknown_081E797C:: @ 81E797C +gMainMenuPalette:: @ 81E797C .incbin "graphics/misc/main_menu.gbapal" .align 2 @@ -1156,7 +1156,7 @@ gUnknown_081FA73C:: @ 81FA73C .4byte sub_80213D0 .4byte atk46_cmd46 .4byte sub_80214B4 - .4byte sub_8021580 + .4byte atk47 .4byte atk48_playstatchangeanimation .4byte sub_80217F8 .4byte atk4A_damagecalc2 @@ -1705,7 +1705,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C .align 2 gUnknown_081FAF24:: @ 81FAF24 - obj_tiles gUnknown_08E6A728, 128, 0xD759 + obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 .align 2 gOamData_81FAF2C:: @ 81FAF2C @@ -2358,8 +2358,8 @@ gSubspriteTables_820A6EC:: @ 820A6EC .align 2 gUnknown_0820A754:: @ 820A754 - obj_tiles gUnknown_08E6A758, 512, 0xd70c - obj_tiles gUnknown_08E6A758, 512, 0xd70d + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d .align 2 gUnknown_0820A764:: @ 820A764 @@ -2779,23 +2779,144 @@ gUnknown_0820C14C:: @ 820C14C .4byte TradeText_CancelTradePrompt .4byte TradeText_PressBToExit -gUnknown_0820C164:: @ 820C164 - .incbin "baserom.gba", 0x0020c164, 0x138 - -gUnknown_0820C29C:: @ 820C29C - .incbin "baserom.gba", 0x0020c29c, 0x1a - -gUnknown_0820C2B6:: @ 820C2B6 - .incbin "baserom.gba", 0x0020c2b6, 0x18 - -gUnknown_0820C2CE:: @ 820C2CE - .incbin "baserom.gba", 0x0020c2ce, 0x18 - -gUnknown_0820C2E6:: @ 820C2E6 - .incbin "baserom.gba", 0x0020c2e6, 0x3 - -gUnknown_0820C2E9:: @ 820C2E9 - .incbin "baserom.gba", 0x0020c2e9, 0x7 +@ This is used to determine the next mon to select when the D-Pad is +@ pressed in a given direction. +@ Note that the mons are laid out like this. +@ 0-5 are the player's party and 6-11 are the trading partner's party. +@ 12 is the cancel button. +@ 0 1 6 7 +@ 2 3 8 9 +@ 4 5 10 11 +@ 12 +gTradeNextSelectedMonTable:: @ 820C164 + @ 0 + .byte 4, 2, 12, 12, 0, 0 @ up + .byte 2, 4, 12, 12, 0, 0 @ down + .byte 7, 6, 1, 0, 0, 0 @ left + .byte 1, 6, 7, 0, 0, 0 @ right + @ 1 + .byte 5, 3, 12, 12, 0, 0 @ up + .byte 3, 5, 12, 12, 0, 0 @ down + .byte 0, 7, 6, 1, 0, 0 @ left + .byte 6, 7, 0, 1, 0, 0 @ right + @ 2 + .byte 0, 0, 0, 0, 0, 0 @ up + .byte 4, 0, 0, 0, 0, 0 @ down + .byte 9, 8, 7, 6, 0, 0 @ left + .byte 3, 1, 0, 0, 0, 0 @ right + @ 3 + .byte 1, 1, 1, 1, 0, 0 @ up + .byte 5, 1, 1, 1, 0, 0 @ down + .byte 2, 9, 8, 7, 0, 0 @ left + .byte 8, 9, 6, 6, 0, 0 @ right + @ 4 + .byte 2, 2, 2, 2, 0, 0 @ up + .byte 0, 0, 0, 0, 0, 0 @ down + .byte 11, 10, 9, 8, 7, 6 @ left + .byte 5, 3, 1, 0, 0, 0 @ right + @ 5 + .byte 3, 3, 3, 3, 0, 0 @ up + .byte 1, 1, 1, 1, 0, 0 @ down + .byte 4, 4, 4, 4, 0, 0 @ left + .byte 10, 8, 6, 0, 0, 0 @ right + @ 6 + .byte 10, 8, 12, 0, 0, 0 @ up + .byte 8, 10, 12, 0, 0, 0 @ down + .byte 1, 0, 0, 0, 0, 0 @ left + .byte 7, 0, 1, 0, 0, 0 @ right + @ 7 + .byte 12, 0, 0, 0, 0, 0 @ up + .byte 9, 12, 0, 0, 0, 0 @ down + .byte 6, 0, 0, 0, 0, 0 @ left + .byte 0, 0, 0, 0, 0, 0 @ right + @ 8 + .byte 6, 0, 0, 0, 0, 0 @ up + .byte 10, 6, 0, 0, 0, 0 @ down + .byte 3, 2, 1, 0, 0, 0 @ left + .byte 9, 7, 0, 0, 0, 0 @ right + @ 9 + .byte 7, 0, 0, 0, 0, 0 @ up + .byte 11, 12, 0, 0, 0, 0 @ down + .byte 8, 0, 0, 0, 0, 0 @ left + .byte 2, 1, 0, 0, 0, 0 @ right + @ 10 + .byte 8, 0, 0, 0, 0, 0 @ up + .byte 6, 0, 0, 0, 0, 0 @ down + .byte 5, 4, 3, 2, 1, 0 @ left + .byte 11, 9, 7, 0, 0, 0 @ right + @ 11 + .byte 9, 0, 0, 0, 0, 0 @ up + .byte 12, 0, 0, 0, 0, 0 @ down + .byte 10, 0, 0, 0, 0, 0 @ left + .byte 4, 2, 0, 0, 0, 0 @ right + @ 12 + .byte 11, 9, 7, 6, 0, 0 @ up + .byte 7, 6, 0, 0, 0, 0 @ down + .byte 12, 0, 0, 0, 0, 0 @ left + .byte 12, 0, 0, 0, 0, 0 @ right + +@ The coordinates are in units of tiles. +@ These are used for both mon icons and the selected mon cursor, +@ but the origins of the coordinates differ. +gTradeMonSpriteCoords:: @ 820C29C + @ left-side party + .byte 1, 5 + .byte 8, 5 + .byte 1, 10 + .byte 8, 10 + .byte 1, 15 + .byte 8, 15 + + @ right-side party + .byte 16, 5 + .byte 23, 5 + .byte 16, 10 + .byte 23, 10 + .byte 16, 15 + .byte 23, 15 + + @ cancel button + .byte 23, 18 + +gTradeLevelDisplayCoords:: @ 820C2B6 + @ left-side party + .byte 5, 4 + .byte 12, 4 + .byte 5, 9 + .byte 12, 9 + .byte 5, 14 + .byte 12, 14 + + @ right-side party + .byte 20, 4 + .byte 27, 4 + .byte 20, 9 + .byte 27, 9 + .byte 20, 14 + .byte 27, 14 + +gTradeMonBoxCoords:: @ 820C2CE + @ left-side party + .byte 1, 3 + .byte 8, 3 + .byte 1, 8 + .byte 8, 8 + .byte 1, 13 + .byte 8, 13 + + @ right-side party + .byte 16, 3 + .byte 23, 3 + .byte 16, 8 + .byte 23, 8 + .byte 16, 13 + .byte 23, 13 + +gTradeUnknownSpriteCoords:: @ 820C2E6 + .byte 59, 10 + .byte 179, 10 + .byte 59, 10 + .byte 179, 10 .align 2 gUnknown_0820C2F0:: @ 820C2F0 @@ -2806,15 +2927,18 @@ gUnknown_0820C2F0:: @ 820C2F0 .4byte TradeText_WaitingForFriend .4byte TradeText_WantToTrade -gUnknown_0820C308:: @ 820C308 - .incbin "baserom.gba", 0x0020c308, 0x18 +gTradeMessageWindowRects:: @ 820C308 + .byte 8, 7, 22, 12 + .byte 8, 7, 22, 12 + .byte 6, 7, 24, 12 + .byte 6, 7, 24, 12 + .byte 8, 7, 22, 12 + .byte 7, 7, 23, 12 .align 2 gUnknown_0820C320:: @ 820C320 - .4byte TradeText_Summary2 - .4byte sub_804A9F4 @unknown - .4byte TradeText_Trade2 - .4byte sub_804AA00 + .4byte TradeText_Summary2, sub_804A9F4 @unknown + .4byte TradeText_Trade2, sub_804AA00 gUnknown_0820C330:: @ 820C330 .byte 0, 14 @@ -3147,8 +3271,20 @@ gUnknown_08215A78:: @ 8215A78 gSpriteTemplate_8215A80:: @ 8215A80 spr_template 5556, 5555, gOamData_8215A48, gSpriteAnimTable_8215A74, NULL, gDummySpriteAffineAnimTable, sub_804B104 -gUnknown_08215A98:: @ 8215A98 - .incbin "baserom.gba", 0x00215a98, 0x18 + .align 1 +gTradeGlow2PaletteAnimTable:: @ 8215A98 + .2byte 0x7F12 + .2byte 0x7F12 + .2byte 0x7F12 + .2byte 0x7FFF + .2byte 0x7FFF + .2byte 0x7FFF + .2byte 0x7F12 + .2byte 0x7F12 + .2byte 0x7F12 + .2byte 0x7FFF + .2byte 0x7FFF + .2byte 0x7FFF .align 2 gSpriteAffineAnim_8215AB0:: @ 8215AB0 @@ -3162,8 +3298,115 @@ gSpriteAffineAnimTable_8215AC0:: @ 8215AC0 @ 8215AC4 .include "data/ingame_trades.s" -gUnknown_08215BA0:: @ 8215BA0 - .incbin "baserom.gba", 0x00215ba0, 0x6c +gTradeBallVerticalVelocityTable:: @ 8215BA0 + .byte 0 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 1 + .byte 1 + .byte 1 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + .byte 3 + .byte 3 + .byte 3 + .byte 3 + .byte 4 + .byte 4 + .byte 4 + .byte 4 + .byte -4 + .byte -4 + .byte -4 + .byte -3 + .byte -3 + .byte -3 + .byte -3 + .byte -2 + .byte -2 + .byte -2 + .byte -2 + .byte -1 + .byte -1 + .byte -1 + .byte -1 + .byte 0 + .byte -1 + .byte 0 + .byte -1 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 1 + .byte 1 + .byte 1 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + .byte 3 + .byte 3 + .byte 3 + .byte 3 + .byte 4 + .byte 4 + .byte 4 + .byte 4 + .byte -4 + .byte -3 + .byte -3 + .byte -2 + .byte -2 + .byte -1 + .byte -1 + .byte -1 + .byte 0 + .byte -1 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 1 + .byte 1 + .byte 2 + .byte 2 + .byte 3 + .byte 3 + .byte 4 + .byte -4 + .byte -3 + .byte -2 + .byte -1 + .byte -1 + .byte -1 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 0 + .byte 1 + .byte 1 + .byte 2 + .byte 3 .align 2 gUnknown_08215C0C:: @ 8215C0C @@ -3181,7 +3424,15 @@ gUnknown_0821602C:: @ 821602C .align 2 .incbin "baserom.gba", 0x0021604c, 0x20 - .incbin "baserom.gba", 0x0021606c, 0x1dd + .space 0x1C0 + + .string "▶$" + .string " $" + .string "カッコイ$" @ "cool" (missing an イ at the end) + .string "カワイイ$" @ "cute" + .string "ウツクシ$" @ "beautiful" (missing an イ at the end) + .string "カシコイ$" @ "smart" + .string "タクマシ$" @ "tough" (missing an イ at the end) gUnknown_08216249:: @ 8216249 .string "\p$" @@ -3256,10 +3507,13 @@ gUnknown_082162E4:: @ 82162E4 .byte 168, 128 gUnknown_082162EC:: @ 82162EC - .incbin "baserom.gba", 0x002162ec, 0xc + .byte -1, 0, 1, -1 + .byte -1, 0, 1, 2 + .byte 0, 1, 2, 3 + .align 1 gUnknown_082162F8:: @ 82162F8 - .incbin "baserom.gba", 0x002162f8, 0x8 + .2byte 0x0000, 0xC000, 0x4000, 0x8000 gUnknown_08216300:: @ 8216300 .byte 1 @@ -3553,29 +3807,42 @@ gUnknown_08216574:: @ 8216574 gSpriteTemplate_821657C:: @ 821657C spr_template 12346, 46546, gOamData_8216560, gSpriteAnimTable_8216570, NULL, gDummySpriteAffineAnimTable, sub_80518CC + .align 1 gUnknown_08216594:: @ 8216594 - .incbin "baserom.gba", 0x00216594, 0x28 + .2byte -10, 20, 10, 2, 1 + .2byte 250, 20, 10, -2, 1 + .2byte -10, 140, 10, 2, -1 + .2byte 250, 140, 10, -2, -1 gUnknown_082165BC:: @ 82165BC - .incbin "baserom.gba", 0x002165bc, 0x1e + .byte 4, 3, 2 + .byte 0, 4, 3 + .byte 1, 0, 4 + .byte 2, 1, 0 + .byte 3, 2, 1 + .byte 0, 2, 3 + .byte 1, 3, 4 + .byte 2, 4, 0 + .byte 3, 0, 1 + .byte 4, 1, 2 gUnknown_082165DA:: @ 82165DA - .incbin "baserom.gba", 0x002165da, 0x5 + .byte 1, 1, 2, 3, 4 gUnknown_082165DF:: @ 82165DF - .incbin "baserom.gba", 0x002165df, 0xa + .byte 0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15 gUnknown_082165E9:: @ 82165E9 - .incbin "baserom.gba", 0x002165e9, 0x5 + .byte 6, 6, 6, 6, 5 gUnknown_082165EE:: @ 82165EE - .incbin "baserom.gba", 0x002165ee, 0x5 + .byte 3, 3, 3, 2, 2 gUnknown_082165F3:: @ 82165F3 - .incbin "baserom.gba", 0x002165f3, 0x5 + .byte 3, 3, 3, 3, 2 gUnknown_082165F8:: @ 82165F8 - .incbin "baserom.gba", 0x002165f8, 0x2 + .string " $" gUnknown_082165FA:: @ 82165FA OtherText_BPM:: @@ -3584,7 +3851,9 @@ OtherText_Dash:: .string "-$" gUnknown_08216600:: @ 8216600 - .incbin "baserom.gba", 0x00216600, 0x4 + .string "\n$" + + .string "\n$" gUnknown_08216604:: @ 8216604 .incbin "baserom.gba", 0x00216604, 0x20 @@ -6765,49 +7034,30 @@ gUnknown_083761EC:: @ 83761EC .align 2 gUnknown_083761F0:: @ 83761F0 - .4byte gUnknown_08E9ADDC - .4byte gUnknown_08E9AEFC - .4byte gUnknown_08E9AF1C - .4byte gUnknown_08E9B03C - .4byte gUnknown_08E9B05C - .4byte gUnknown_08E9B17C - .4byte gUnknown_08E9B19C - .4byte gUnknown_08E9B2BC - .4byte gUnknown_08E9B2DC - .4byte gUnknown_08E9B3FC - .4byte gUnknown_08E9B41C - .4byte gUnknown_08E9B53C - .4byte gUnknown_08E9B55C - .4byte gUnknown_08E9B67C - .4byte gUnknown_08E9B69C - .4byte gUnknown_08E9B7BC - .4byte gUnknown_08E9B7DC - .4byte gUnknown_08E9B8FC - .4byte gUnknown_08E9B91C - .4byte gUnknown_08E9BA3C - .4byte gUnknown_08E9BA5C - .4byte gUnknown_08E9BB7C - .4byte gUnknown_08E9BB9C - .4byte gUnknown_08E9BCBC - .4byte gUnknown_08E9BCDC - .4byte gUnknown_08E9BDFC - .4byte gUnknown_08E9BE1C - .4byte gUnknown_08E9BF3C - .4byte gUnknown_08E9BF5C - .4byte gUnknown_08E9C07C - .4byte gUnknown_08E9C09C - .4byte gUnknown_08E9C1BC - .4byte gUnknown_08E9C1DC - .4byte gUnknown_08E9C2FC - .4byte gUnknown_08E9C31C - .4byte gUnknown_08E9C43C - .4byte gUnknown_08E9C45C - .4byte gUnknown_08E9C57C - .4byte gUnknown_08E9C59C - .4byte gUnknown_08E9C6BC - -gUnknown_08376290:: @ 8376290 - .incbin "baserom.gba", 0x00376290, 0x48 + .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal + .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal + .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal + .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal + .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal + .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal + .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal + .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal + .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal + .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal + .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal + .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal + .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal + .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal + .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal + .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal + .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal + .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal + .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal + .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal + + .align 1 +gMessageBoxTilemap:: @ 8376290 + .incbin "graphics/text_window/message_box_map.bin" gUnknown_083762D8:: @ 83762D8 .space 4 @@ -7046,78 +7296,592 @@ gUnknown_08376624:: @ 8376624 .4byte OtherText_NoIdenticalHoldItems .4byte OtherText_TeachWhichPoke + .align 2 gUnknown_08376678:: @ 8376678 - .incbin "baserom.gba", 0x00376678, 0xc0 @ 4 byte array? + .byte 16, 40, 0, 0 + .byte 104, 18, 0, 0 + .byte 104, 42, 0, 0 + .byte 104, 66, 0, 0 + .byte 104, 90, 0, 0 + .byte 104, 114, 0, 0 + .byte 16, 24, 0, 0 + .byte 16, 80, 0, 0 + .byte 104, 18, 0, 0 + .byte 104, 50, 0, 0 + .byte 104, 82, 0, 0 + .byte 104, 114, 0, 0 + .byte 16, 24, 0, 0 + .byte 16, 80, 0, 0 + .byte 104, 26, 0, 0 + .byte 104, 50, 0, 0 + .byte 104, 82, 0, 0 + .byte 104, 106, 0, 0 + .byte 16, 24, 0, 0 + .byte 104, 26, 0, 0 + .byte 104, 50, 0, 0 + .byte 16, 80, 0, 0 + .byte 104, 82, 0, 0 + .byte 104, 106, 0, 0 + .byte 5, 4, 0, 0 + .byte 16, 1, 0, 0 + .byte 16, 4, 0, 0 + .byte 16, 7, 0, 0 + .byte 16, 10, 0, 0 + .byte 16, 13, 0, 0 + .byte 5, 2, 0, 0 + .byte 5, 9, 0, 0 + .byte 16, 1, 0, 0 + .byte 16, 5, 0, 0 + .byte 16, 9, 0, 0 + .byte 16, 13, 0, 0 + .byte 5, 2, 0, 0 + .byte 5, 9, 0, 0 + .byte 16, 2, 0, 0 + .byte 16, 5, 0, 0 + .byte 16, 9, 0, 0 + .byte 16, 12, 0, 0 + .byte 5, 2, 0, 0 + .byte 16, 2, 0, 0 + .byte 16, 5, 0, 0 + .byte 5, 9, 0, 0 + .byte 16, 9, 0, 0 + .byte 16, 12, 0, 0 + .align 2 gUnknown_08376738:: @ 8376738 - .incbin "baserom.gba", 0x00376738, 0x120 + .byte 6, 5, 0, 0 + .byte 17, 2, 0, 0 + .byte 17, 5, 0, 0 + .byte 17, 8, 0, 0 + .byte 17, 11, 0, 0 + .byte 17, 14, 0, 0 + .byte 6, 3, 0, 0 + .byte 6, 10, 0, 0 + .byte 17, 2, 0, 0 + .byte 17, 6, 0, 0 + .byte 17, 10, 0, 0 + .byte 17, 14, 0, 0 + .byte 6, 3, 0, 0 + .byte 6, 10, 0, 0 + .byte 17, 3, 0, 0 + .byte 17, 6, 0, 0 + .byte 17, 10, 0, 0 + .byte 17, 13, 0, 0 + .byte 6, 3, 0, 0 + .byte 17, 3, 0, 0 + .byte 17, 6, 0, 0 + .byte 6, 10, 0, 0 + .byte 17, 10, 0, 0 + .byte 17, 13, 0, 0 + .byte 3, 7, 0, 0 + .byte 22, 2, 0, 0 + .byte 22, 5, 0, 0 + .byte 22, 8, 0, 0 + .byte 22, 11, 0, 0 + .byte 22, 14, 0, 0 + .byte 3, 5, 0, 0 + .byte 3, 12, 0, 0 + .byte 22, 2, 0, 0 + .byte 22, 6, 0, 0 + .byte 22, 10, 0, 0 + .byte 22, 14, 0, 0 + .byte 3, 5, 0, 0 + .byte 3, 12, 0, 0 + .byte 22, 3, 0, 0 + .byte 22, 6, 0, 0 + .byte 22, 10, 0, 0 + .byte 22, 13, 0, 0 + .byte 3, 5, 0, 0 + .byte 22, 3, 0, 0 + .byte 22, 6, 0, 0 + .byte 3, 12, 0, 0 + .byte 22, 10, 0, 0 + .byte 22, 13, 0, 0 + .byte 7, 7, 0, 0 + .byte 26, 2, 0, 0 + .byte 26, 5, 0, 0 + .byte 26, 8, 0, 0 + .byte 26, 11, 0, 0 + .byte 26, 14, 0, 0 + .byte 7, 5, 0, 0 + .byte 7, 12, 0, 0 + .byte 26, 2, 0, 0 + .byte 26, 6, 0, 0 + .byte 26, 10, 0, 0 + .byte 26, 14, 0, 0 + .byte 7, 5, 0, 0 + .byte 7, 12, 0, 0 + .byte 26, 3, 0, 0 + .byte 26, 6, 0, 0 + .byte 26, 10, 0, 0 + .byte 26, 13, 0, 0 + .byte 7, 5, 0, 0 + .byte 26, 3, 0, 0 + .byte 26, 6, 0, 0 + .byte 7, 12, 0, 0 + .byte 26, 10, 0, 0 + .byte 26, 13, 0, 0 + .align 2 gUnknown_08376858:: @ 8376858 - .incbin "baserom.gba", 0x00376858, 0x60 + .4byte BG_VRAM + 0xF1C8 + .4byte BG_VRAM + 0xF0AE + .4byte BG_VRAM + 0xF16E + .4byte BG_VRAM + 0xF22E + .4byte BG_VRAM + 0xF2EE + .4byte BG_VRAM + 0xF3AE + .4byte BG_VRAM + 0xF148 + .4byte BG_VRAM + 0xF308 + .4byte BG_VRAM + 0xF0AE + .4byte BG_VRAM + 0xF1AE + .4byte BG_VRAM + 0xF2AE + .4byte BG_VRAM + 0xF3AE + .4byte BG_VRAM + 0xF148 + .4byte BG_VRAM + 0xF308 + .4byte BG_VRAM + 0xF0EE + .4byte BG_VRAM + 0xF1AE + .4byte BG_VRAM + 0xF2AE + .4byte BG_VRAM + 0xF36E + .4byte BG_VRAM + 0xF148 + .4byte BG_VRAM + 0xF0EE + .4byte BG_VRAM + 0xF1AE + .4byte BG_VRAM + 0xF308 + .4byte BG_VRAM + 0xF2AE + .4byte BG_VRAM + 0xF36E + .align 2 gUnknown_083768B8:: @ 83768B8 - .incbin "baserom.gba", 0x003768b8, 0x60 + .byte 8, 44, 0, 0 + .byte 92, 22, 0, 0 + .byte 92, 46, 0, 0 + .byte 92, 70, 0, 0 + .byte 92, 94, 0, 0 + .byte 92, 118, 0, 0 + .byte 196, 136, 0, 0 + .byte 196, 152, 0, 0 + .byte 8, 28, 0, 0 + .byte 8, 84, 0, 0 + .byte 92, 22, 0, 0 + .byte 92, 54, 0, 0 + .byte 92, 86, 0, 0 + .byte 92, 118, 0, 0 + .byte 196, 136, 0, 0 + .byte 196, 152, 0, 0 + .byte 8, 28, 0, 0 + .byte 8, 84, 0, 0 + .byte 92, 30, 0, 0 + .byte 92, 54, 0, 0 + .byte 92, 86, 0, 0 + .byte 92, 110, 0, 0 + .byte 196, 136, 0, 0 + .byte 196, 152, 0, 0 + .align 2 gUnknown_08376918:: @ 8376918 - .incbin "baserom.gba", 0x00376918, 0x30 + .4byte BG_VRAM + 0xF1C6 + .4byte BG_VRAM + 0xF06C + .4byte BG_VRAM + 0xF12C + .4byte BG_VRAM + 0xF1EC + .4byte BG_VRAM + 0xF2AC + .4byte BG_VRAM + 0xF36C + .4byte BG_VRAM + 0xF148 + .4byte BG_VRAM + 0xF308 + .4byte BG_VRAM + 0xF0AE + .4byte BG_VRAM + 0xF1AE + .4byte BG_VRAM + 0xF2AE + .4byte BG_VRAM + 0xF3AE + .align 2 gUnknown_08376948:: @ 8376948 - .incbin "baserom.gba", 0x00376948, 0x30 + .byte 2, 4, 10, 9 + .byte 16, 1, 29, 3 + .byte 16, 4, 29, 6 + .byte 16, 7, 29, 9 + .byte 16, 10, 29, 12 + .byte 16, 13, 29, 15 + .byte 2, 2, 10, 7 + .byte 2, 9, 10, 14 + .byte 16, 1, 29, 3 + .byte 16, 5, 29, 7 + .byte 16, 9, 29, 11 + .byte 16, 13, 29, 15 + .align 2 gUnknown_08376978:: @ 8376978 - .incbin "baserom.gba", 0x00376978, 0x30 + .byte 2, 7, 10, 9 + .byte 21, 1, 29, 3 + .byte 21, 4, 29, 6 + .byte 21, 7, 29, 9 + .byte 21, 10, 29, 12 + .byte 21, 13, 29, 15 + .byte 2, 2, 10, 7 + .byte 2, 9, 10, 14 + .byte 16, 1, 29, 3 + .byte 16, 5, 29, 7 + .byte 16, 9, 29, 11 + .byte 16, 13, 29, 15 + .align 2 gUnknown_083769A8:: @ 83769A8 - .incbin "baserom.gba", 0x003769a8, 0x18 + .byte 0, 3 + .byte 11, 1 + .byte 11, 4 + .byte 11, 7 + .byte 11, 10 + .byte 11, 13 + .byte 0, 1 + .byte 0, 8 + .byte 11, 1 + .byte 11, 5 + .byte 11, 9 + .byte 11, 13 + .align 2 gUnknown_083769C0:: @ 83769C0 - .incbin "baserom.gba", 0x003769c0, 0x18 + .byte 0, 1 + .byte 0, 8 + .byte 11, 2 + .byte 11, 5 + .byte 11, 9 + .byte 11, 12 + .byte 0, 1 + .byte 0, 8 + .byte 11, 2 + .byte 11, 5 + .byte 11, 9 + .byte 11, 12 gUnknown_083769D8:: @ 83769D8 - .incbin "baserom.gba", 0x003769d8, 0x4d + .byte 0x24,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x27 + .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 + .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 + .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 + .byte 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x47 + .byte 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x47 + .byte 0x54,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x57 gUnknown_08376A25:: @ 8376A25 - .incbin "baserom.gba", 0x00376a25, 0x39 + .byte 0x50,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x53 + .byte 0x60,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x63 + .byte 0x70,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x73 gUnknown_08376A5E:: @ 8376A5E - .incbin "baserom.gba", 0x00376a5e, 0xf3 + .byte 0x20,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x23 + .byte 0x30,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x33 + .byte 0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x43 + +@ unknown, unreferenced data + .byte 0x0C + .byte 0x0D + .byte 0x0E + .byte 0x0F + .byte 0x00 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x05 + .byte 0x0F + .byte 0x10 + .byte 0x11 + .byte 0x12 + .byte 0x13 + .byte 0x14 + .byte 0x15 + .byte 0x0F + .byte 0x06 + .byte 0x05 + .byte 0x01 + .byte 0x07 + .byte 0x08 + .byte 0x09 + .byte 0x0F + .byte 0x16 + .byte 0x15 + .byte 0x11 + .byte 0x17 + .byte 0x18 + .byte 0x19 + .byte 0x0F + .byte 0x09 + .byte 0x0A + .byte 0x0B + .byte 0x05 + .byte 0x0C + .byte 0x0F + .byte 0x0F + .byte 0x19 + .byte 0x1A + .byte 0x1B + .byte 0x15 + .byte 0x1C + .byte 0x0F + .byte 0x0F + .byte 0x0D + .byte 0x0B + .byte 0x05 + .byte 0x0C + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x1D + .byte 0x1B + .byte 0x15 + .byte 0x1C + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x06 + .byte 0x05 + .byte 0x0B + .byte 0x05 + .byte 0x0C + .byte 0x0F + .byte 0x0F + .byte 0x16 + .byte 0x15 + .byte 0x1B + .byte 0x15 + .byte 0x1C + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x20 + .byte 0x0C + .byte 0x09 + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x1F + .byte 0x30 + .byte 0x1C + .byte 0x19 + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x25 + .byte 0x0F + .byte 0x22 + .byte 0x24 + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x35 + .byte 0x41 + .byte 0x32 + .byte 0x34 + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x26 + .byte 0x0F + .byte 0x23 + .byte 0x0E + .byte 0x0F + .byte 0x0F + .byte 0x0F + .byte 0x36 + .byte 0x43 + .byte 0x33 + .byte 0x1E + .byte 0x0F + .byte 0x0F + .byte 0x27 + .byte 0x28 + .byte 0x29 + .byte 0x03 + .byte 0x2A + .byte 0x0F + .byte 0x0F + .byte 0x37 + .byte 0x38 + .byte 0x39 + .byte 0x13 + .byte 0x3A + .byte 0x0F + .byte 0x0F + .byte 0x27 + .byte 0x28 + .byte 0x29 + .byte 0x03 + .byte 0x04 + .byte 0x05 + .byte 0x0F + .byte 0x37 + .byte 0x38 + .byte 0x39 + .byte 0x13 + .byte 0x14 + .byte 0x15 + .byte 0x0F + .byte 0x2B + .byte 0x2C + .byte 0x02 + .byte 0x28 + .byte 0x29 + .byte 0x2D + .byte 0x21 + .byte 0x3B + .byte 0x3C + .byte 0x12 + .byte 0x38 + .byte 0x39 + .byte 0x3D + .byte 0x31 + .byte 0x2B + .byte 0x2C + .byte 0x02 + .byte 0x28 + .byte 0x29 + .byte 0x08 + .byte 0x09 + .byte 0x3B + .byte 0x3C + .byte 0x12 + .byte 0x38 + .byte 0x39 + .byte 0x18 + .byte 0x19 + .byte 0x2E + .byte 0x2F + .byte 0x2B + .byte 0x2C + .byte 0x02 + .byte 0x27 + .byte 0x2D + .byte 0x3E + .byte 0x3F + .byte 0x3B + .byte 0x3C + .byte 0x12 + .byte 0x45 + .byte 0x3D .align 2 gUnknown_08376B54:: @ 8376B54 .4byte ether_effect_related_2 .4byte sub_80704F0 + .align 1 Unknown_08376B5C: - .incbin "baserom.gba", 0x00376b5c, 0x2c + .2byte 0x4000, 0x4018, 0xF400 + .2byte 0x4000, 0x4038, 0xF404 + .2byte 0x4008, 0x4018, 0xF408 + .2byte 0x4008, 0x4038, 0xF40C + .2byte 0x4010, 0x4020, 0xF410 + .2byte 0x4020, 0x4025, 0xF418 + .2byte 0x4020, 0x4045, 0xF41C + .2byte -1 + + .align 1 Unknown_08376B88: - .incbin "baserom.gba", 0x00376b88, 0x2c + .2byte 0x4000, 0x4018, 0xF400 + .2byte 0x4000, 0x4038, 0xF404 + .2byte 0x4008, 0x4018, 0xF408 + .2byte 0x4008, 0x4038, 0xF40C + .2byte 0x4010, 0x4020, 0xF410 + .2byte 0x4010, 0x4065, 0xF418 + .2byte 0x4010, 0x4085, 0xF41C + .2byte -1 .align 2 gUnknown_08376BB4:: @ 8376BB4 - .4byte 0x401, Unknown_08376B5C - .4byte 0x10C, Unknown_08376B88 - .4byte 0x40C, Unknown_08376B88 - .4byte 0x70C, Unknown_08376B88 - .4byte 0xA0C, Unknown_08376B88 - .4byte 0xD0C, Unknown_08376B88 - .4byte 0x201, Unknown_08376B5C - .4byte 0x901, Unknown_08376B5C - .4byte 0x10C, Unknown_08376B88 - .4byte 0x50C, Unknown_08376B88 - .4byte 0x90C, Unknown_08376B88 - .4byte 0xD0C, Unknown_08376B88 - .4byte 0x201, Unknown_08376B5C - .4byte 0x901, Unknown_08376B5C - .4byte 0x20C, Unknown_08376B88 - .4byte 0x50C, Unknown_08376B88 - .4byte 0x90C, Unknown_08376B88 - .4byte 0xC0C, Unknown_08376B88 - .4byte 0x201, Unknown_08376B5C - .4byte 0x20C, Unknown_08376B88 - .4byte 0x50C, Unknown_08376B88 - .4byte 0x901, Unknown_08376B5C - .4byte 0x90C, Unknown_08376B88 - .4byte 0xC0C, Unknown_08376B88 + .byte 0x1, 0x4 + .space 2 + .4byte Unknown_08376B5C + + .byte 0xC, 0x1 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x4 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x7 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0xA + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0xD + .space 2 + .4byte Unknown_08376B88 + + .byte 0x1, 0x2 + .space 2 + .4byte Unknown_08376B5C + + .byte 0x1, 0x9 + .space 2 + .4byte Unknown_08376B5C + + .byte 0xC, 0x1 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x5 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x9 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0xD + .space 2 + .4byte Unknown_08376B88 + + .byte 0x1, 0x2 + .space 2 + .4byte Unknown_08376B5C + + .byte 0x1, 0x9 + .space 2 + .4byte Unknown_08376B5C + + .byte 0xC, 0x2 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x5 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x9 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0xC + .space 2 + .4byte Unknown_08376B88 + + .byte 0x1, 0x2 + .space 2 + .4byte Unknown_08376B5C + + .byte 0xC, 0x2 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0x5 + .space 2 + .4byte Unknown_08376B88 + + .byte 0x1, 0x9 + .space 2 + .4byte Unknown_08376B5C + + .byte 0xC, 0x9 + .space 2 + .4byte Unknown_08376B88 + + .byte 0xC, 0xC + .space 2 + .4byte Unknown_08376B88 .align 2 gUnknown_08376C74:: @ 8376C74 @@ -7130,11 +7894,15 @@ gUnknown_08376C74:: @ 8376C74 .4byte sub_8122E0C, sub_806AFD0, 0x0F .4byte sub_80F9E64, sub_80F9CE8, 0 + .align 2 gUnknown_08376CD4:: @ 8376CD4 - .incbin "baserom.gba", 0x00376cd4, 0x18 + .2byte 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F + .2byte 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F + .align 2 gUnknown_08376CEC:: @ 8376CEC - .incbin "baserom.gba", 0x00376cec, 0x18 + .2byte 0x2A, 0x0B, 0x0C, 0x0D, 0x0E, 0x2F + .2byte 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F .align 2 gUnknown_08376D04:: @ 8376D04 @@ -7146,7 +7914,12 @@ gUnknown_08376D04:: @ 8376D04 .4byte OtherText_Speed gUnknown_08376D1C:: @ 8376D1C - .incbin "baserom.gba", 0x00376d1c, 0x8 + .byte 0x3A @ HP + .byte 0x3B @ Attack + .byte 0x3C @ Defense + .byte 0x3E @ Sp. Attack + .byte 0x3F @ Sp. Defense + .byte 0x3D @ Speed .align 2 gUnknown_08376D24:: @ 8376D24 @@ -9611,7 +10384,7 @@ gSpriteTemplate_8393F74:: @ 8393F74 .align 2 gUnknown_08393F8C:: @ 8393F8C - obj_tiles Tiles_E9D644, 0x520, 1001 + obj_tiles gTitleScreenPressStart_Gfx, 0x520, 1001 null_obj_tiles .align 2 @@ -9675,7 +10448,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_3 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - + @.4byte unk_20000000 .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000? .align 2 @@ -10158,36 +10931,46 @@ gUnknown_0839AE28:: @ 839AE28 gUnknown_0839B1F0:: @ 839B1F0 .2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e -Unknown_839B200: - .incbin "baserom.gba", 0x0039b200, 0x7 -Unknown_839B207: - .incbin "baserom.gba", 0x0039b207, 0x7 -Unknown_839B20E: - .incbin "baserom.gba", 0x0039b20e, 0x7 -Unknown_839B215: - .incbin "baserom.gba", 0x0039b215, 0x7 +TrainerCardColorName_Bronze: + .string "BRONZE$", 7 +TrainerCardColorName_Copper: + .string "COPPER$", 7 +TrainerCardColorName_Silver: + .string "SILVER$", 7 +TrainerCardColorName_Gold: + .string "GOLD$", 7 .align 2 -gUnknown_0839B21C:: @ 839B21C - .4byte Unknown_839B200 - .4byte Unknown_839B207 - .4byte Unknown_839B20E - .4byte Unknown_839B215 +gTrainerCardColorNames:: @ 839B21C + .4byte TrainerCardColorName_Bronze + .4byte TrainerCardColorName_Copper + .4byte TrainerCardColorName_Silver + .4byte TrainerCardColorName_Gold +@ These seem to be strings for keypad test code. gUnknown_0839B22C:: @ 839B22C - .incbin "baserom.gba", 0x0039b22c, 0x1e + .string " A$" @ A + .string " B$" @ B + .string "SL$" @ SELECT + .string "ST$" @ START + .string "RK$" @ right + .string "LK$" @ left + .string "UK$" @ up + .string "DK$" @ down + .string "RT$" @ R + .string "LT$" @ L gUnknown_0839B24A:: @ 839B24A - .incbin "baserom.gba", 0x0039b24a, 0x3 + .string "ND$" gUnknown_0839B24D:: @ 839B24D - .incbin "baserom.gba", 0x0039b24d, 0x8 + .string "の こどもは\n$" @ "'s child <topic-particle>" gUnknown_0839B255:: @ 839B255 - .incbin "baserom.gba", 0x0039b255, 0x2 + .string " $" gUnknown_0839B257:: @ 839B257 - .incbin "baserom.gba", 0x39b257, 0xb + .string "ながいなまえぽけもん$" @ "long name pokemon" (used as test name) Text_39B262: @ 839B262 .string "Search a child$" @@ -10776,21 +11559,29 @@ gUnknown_0839F58C:: @ 839F58C .4byte sub_8133CCC, 0x10 .4byte sub_812BFB4, 0x9 + .align 2 gUnknown_0839F5FC:: @ 839F5FC .incbin "baserom.gba", 0x0039f5fc, 0x40 + .align 2 gUnknown_0839F63C:: @ 839F63C - .incbin "baserom.gba", 0x0039f63c, 0x42 + .incbin "baserom.gba", 0x0039f63c, 0x40 + + .align 2 +gUnknown_0839F67C:: @ 839F67C + .incbin "graphics/pokedex/search.gbapal" -gUnknown_0839F67E:: @ 839F67E - .incbin "baserom.gba", 0x0039f67e, 0xc0 + .align 2 +gUnknown_0839F73C:: @ 839F73C + .incbin "graphics/pokedex/national.gbapal" -gUnknown_0839F73E:: @ 839F73E - .incbin "baserom.gba", 0x0039f73e, 0x162 + .space 0xA4 + .align 2 gUnknown_0839F8A0:: @ 839F8A0 .incbin "baserom.gba", 0x0039f8a0, 0xe8 + .align 2 gUnknown_0839F988:: @ 839F988 .incbin "baserom.gba", 0x0039f988, 0xf4 @@ -11007,12 +11798,12 @@ gSpriteTemplate_83A05B4:: @ 83A05B4 .align 2 gUnknown_083A05CC:: @ 83A05CC - obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000 + obj_tiles gPokedexMenu2_Gfx, 0x1F00, 0x1000 null_obj_tiles .align 2 gUnknown_083A05DC:: @ 83A05DC - obj_pal gUnknown_08E87AF4, 0x1000 + obj_pal gPokedexMenu_Pal, 0x1000 null_obj_pal gUnknown_083A05EC:: @ 83A05EC @@ -11246,13 +12037,13 @@ gUnknown_083B59C8:: @ 83B59C8 .4byte 0x0, 0x0 gUnknown_083B5A60:: @ 83B5A60 - .incbin "baserom.gba", 0x003b5a60, 0x2 + .byte 0, 1 gUnknown_083B5A62:: @ 83B5A62 - .incbin "baserom.gba", 0x003b5a62, 0x6 + .byte 0, 1, 2, 3, 4, 5 gUnknown_083B5A68:: @ 83B5A68 - .incbin "baserom.gba", 0x003b5a68, 0x14 + .byte -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17 .align 2 gUnknown_083B5A7C:: @ 83B5A7C @@ -11310,11 +12101,11 @@ gUnknown_083B5EF4:: @ 83B5EF4 .align 2 gUnknown_083B5EF8:: @ 83B5EF8 - .4byte gUnknown_08E8C8E0 - .4byte gUnknown_08E8C940 - .4byte gUnknown_08E8C9A0 - .4byte gUnknown_08E8CA00 - .4byte gUnknown_08E8CA60 + .4byte gMenuTrainerCard0Star_Pal + .4byte gMenuTrainerCard1Star_Pal + .4byte gMenuTrainerCard2Star_Pal + .4byte gMenuTrainerCard3Star_Pal + .4byte gMenuTrainerCard4Star_Pal gUnknown_083B5F0C:: @ 83B5F0C .incbin "baserom.gba", 0x003b5f0c, 0x20 @@ -11797,7 +12588,8 @@ gWallpaperTiles_Plain: @ 83BAD78 gWallpaperTilemap_Plain: @ 83BAE74 .incbin "graphics/pokemon_storage/plain.bin.lz" - .incbin "baserom.gba", 0x003BAEF8, 0x1B0 +@ 12×18 tilemap + .incbin "graphics/unused/tilemap_3BAEF8.bin" gUnknown_083BB0A8:: @ 83BB0A8 .incbin "baserom.gba", 0x003bb0a8, 0x40 @@ -12097,38 +12889,84 @@ gUnknown_083BBCA0:: @ 83BBCA0 @ 83BC5B8 .include "data/graphics/pokemon/icon_palette_table.s" -gUnknown_083BC5E8:: @ 83BC5E8 - .incbin "baserom.gba", 0x003BC5E8, 0x8 -Unknown_83BC5F0: - .incbin "baserom.gba", 0x003BC5F0, 0xC -Unknown_83BC5FC: - .incbin "baserom.gba", 0x003BC5FC, 0xC -Unknown_83BC608: - .incbin "baserom.gba", 0x003BC608, 0xC -Unknown_83BC614: - .incbin "baserom.gba", 0x003BC614, 0xC -Unknown_83BC620: - .incbin "baserom.gba", 0x003BC620, 0xC - - .align 2 -gUnknown_083BC62C:: @ 83BC62C - .4byte Unknown_83BC5F0 - .4byte Unknown_83BC5FC - .4byte Unknown_83BC608 - .4byte Unknown_83BC614 - .4byte Unknown_83BC620 -Unknown_83BC640: - .incbin "baserom.gba", 0x003bc640, 0x10 -Unknown_83BC650: - .incbin "baserom.gba", 0x003bc650, 0x10 - - .align 2 -gUnknown_083BC660:: @ 83BC660 - .4byte Unknown_83BC640 - .4byte Unknown_83BC650 - -gUnknown_083BC668:: @ 83BC668 - .incbin "baserom.gba", 0x003bc668, 0x18 + .align 2 +gOamData_83BC5E8:: @ 83BC5E8 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gSpriteAnim_83BC5F0:: @ 83BC5F0 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83BC5FC:: @ 83BC5FC + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83BC608:: @ 83BC608 + obj_image_anim_frame 0, 14 + obj_image_anim_frame 1, 14 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83BC614:: @ 83BC614 + obj_image_anim_frame 0, 22 + obj_image_anim_frame 1, 22 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_83BC620:: @ 83BC620 + obj_image_anim_frame 0, 29 + obj_image_anim_frame 0, 29 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_83BC62C:: @ 83BC62C + .4byte gSpriteAnim_83BC5F0 + .4byte gSpriteAnim_83BC5FC + .4byte gSpriteAnim_83BC608 + .4byte gSpriteAnim_83BC614 + .4byte gSpriteAnim_83BC620 + + .align 2 +gSpriteAffineAnim_83BC640:: @ 83BC640 + obj_rot_scal_anim_frame 0x0, 0x0, 0, 10 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_83BC650:: @ 83BC650 + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 122 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_83BC660:: @ 83BC660 + .4byte gSpriteAffineAnim_83BC640 + .4byte gSpriteAffineAnim_83BC650 + + .align 1 +gSpriteImageSizes:: @ 83BC668 + @ square + .2byte 0x20 @ 1×1 + .2byte 0x80 @ 2×2 + .2byte 0x200 @ 4×4 + .2byte 0x800 @ 8×8 + + @ horizontal rectangle + .2byte 0x40 @ 2×1 + .2byte 0x80 @ 4×1 + .2byte 0x100 @ 4×2 + .2byte 0x400 @ 8×4 + + @ vertical rectangle + .2byte 0x40 @ 1×2 + .2byte 0x80 @ 1×4 + .2byte 0x100 @ 2×4 + .2byte 0x400 @ 4×8 @ 83BC680 .include "data/text/move_descriptions.s" @@ -12305,7 +13143,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C .align 2 gUnknown_083C11B8:: @ 83C11B8 - obj_tiles gUnknown_08E71D10, 5888, 0x7532 + obj_tiles gMoveTypes_Gfx, 5888, 0x7532 .align 2 gSpriteTemplate_83C11C0:: @ 83C11C0 @@ -12458,21 +13296,27 @@ gUnknown_083C12FC:: @ 83C12FC gSpriteTemplate_83C1304:: @ 83C1304 spr_template 30001, 30001, gOamData_83C1298, gSpriteAnimTable_83C12D8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_083C131C:: @ 83C131C - .incbin "baserom.gba", 0x003c131c, 0x20 + .align 2 +gSummaryScreenMonMarkingsPalette:: @ 83C131C + .incbin "graphics/summary_screen/mon_markings.gbapal" -gUnknown_083C133C:: @ 83C133C - .incbin "baserom.gba", 0x003c133c, 0x140 + .align 2 +gSummaryScreenTextTiles:: @ 83C133C + .incbin "graphics/summary_screen/text.4bpp" -gUnknown_083C147C:: @ 83C147C - .incbin "baserom.gba", 0x003c147c, 0x100 + .align 2 +gSummaryScreenButtonTiles:: @ 83C147C + .incbin "graphics/summary_screen/buttons.4bpp" + .align 1 gUnknown_083C157C:: @ 83C157C - .incbin "baserom.gba", 0x003c157c, 0x2 + .2byte 0x5F5A @ palette color + .align 1 gUnknown_083C157E:: @ 83C157E - .incbin "baserom.gba", 0x003c157e, 0x2 + .2byte 0x6FDE @ palette color + .align 2 gUnknown_083C1580:: @ 83C1580 .4byte sub_809FC0C .4byte sub_809FEB8 @@ -12492,13 +13336,13 @@ gUnknown_083C1598:: @ 83C1598 .4byte sub_80A015C gUnknown_083C15A8:: @ 83C15A8 - .incbin "baserom.gba", 0x003c15a8, 0x6 + .byte 0, 2, 3, 1, 4, 5 gUnknown_083C15AE:: @ 83C15AE - .incbin "baserom.gba", 0x003c15ae, 0x6 + .string "{STR_VAR_1}{CLEAR_TO 64}$" gUnknown_083C15B4:: @ 83C15B4 - .incbin "baserom.gba", 0x003c15b4, 0x8 + .string "{STR_VAR_1}{CLEAR_TO 72}$" .align 2 gUnknown_083C15BC:: @ 83C15BC @@ -12791,11 +13635,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04 .align 2 gUnknown_083C1F74:: @ 83C1F74 - obj_tiles gUnknown_08E78BB4, 2048, 0x2710 + obj_tiles gBerryCheckCircle_Gfx, 2048, 0x2710 .align 2 gUnknown_083C1F7C:: @ 83C1F7C - obj_pal gUnknown_08E7883C, 0x2710 + obj_pal gBerryCheck_Pal, 0x2710 .align 2 gOamData_83C1F84:: @ 83C1F84 @@ -13199,7 +14043,11 @@ UnknownText_UnknownFormatting:: .string "{COLOR WHITE2}$" UnknownText_WinnerIs:: .string "The winner is {STR_VAR_1}’s {STR_VAR_2}!\nCongratulations!$" - .incbin "baserom.gba", 0x003cc39d, 0x3 + +@ unknown, unreferenced data + .byte 0x00 + .byte 0x9C + .byte 0x77 gUnknown_083CC3A0:: @ 83CC3A0 UnknownText_UnknownFormatting2:: @@ -13348,7 +14196,7 @@ gUnknown_083CC59C:: @ 83CC59C .incbin "baserom.gba", 0x003cc59c, 0x6 gUnknown_083CC5A2:: @ 83CC5A2 - .incbin "baserom.gba", 0x003cc5a2, 0x2 + .string "/$" gUnknown_083CC5A4:: @ 83CC5A4 .incbin "baserom.gba", 0x003cc5a4, 0x10 @@ -13367,10 +14215,26 @@ gUnknown_083CC6D0:: @ 83CC6D0 .4byte ContestStatsText_Quit2, HandleShopMenuQuit gUnknown_083CC6E8:: @ 83CC6E8 - .incbin "baserom.gba", 0x003cc6e8, 0x3 + .byte 0, 1, 2 gUnknown_083CC6EB:: @ 83CC6EB - .incbin "baserom.gba", 0x003cc6eb, 0x1d + .byte 0, 2 + +@ unknown, unreferenced data + .align 1 + .2byte 0x2 + .2byte 0x3 + .2byte 0x4 + .2byte 0xD + .2byte 0x121 + .2byte 0xE + .2byte 0xE + .2byte 0xE + .2byte 0xE + .2byte 0xE + .2byte 0xE + .2byte 0x0 + .2byte 0x0 .align 2 gUnknown_083CC708:: @ 83CC708 @@ -13851,19 +14715,39 @@ gUnknown_083D0284:: @ 83D0284 .4byte 0x02024f4c gUnknown_083D0288:: @ 83D0288 - .incbin "baserom.gba", 0x003d0288, 0x2 + .byte 1, 0 gUnknown_083D028A:: @ 83D028A - .incbin "baserom.gba", 0x003d028a, 0x6 + .byte 1, 2, 0 + .byte 2, 0, 1 gUnknown_083D0290:: @ 83D0290 - .incbin "baserom.gba", 0x003d0290, 0x24 + .byte 1, 0, 3, 2 + .byte 3, 0, 1, 2 + .byte 2, 0, 3, 1 + .byte 1, 3, 0, 2 + .byte 2, 3, 0, 1 + .byte 3, 2, 0, 1 + .byte 1, 2, 3, 0 + .byte 2, 3, 1, 0 + .byte 3, 2, 1, 0 gUnknown_083D02B4:: @ 83D02B4 - .incbin "baserom.gba", 0x003d02b4, 0x6 + .byte 0, 1 + .byte 1, 2 + .byte 2, 0 gUnknown_083D02BA:: @ 83D02BA - .incbin "baserom.gba", 0x003d02ba, 0xe + .byte 0, 1 + .byte 2, 3 + + .byte 0, 2 + .byte 1, 3 + + .byte 0, 3 + .byte 2, 1 + + .align 2 @ object file boundary? gUnknown_083D02C8:: @ 83D02C8 DebugText_SoundCheckJap: @@ -13934,28 +14818,28 @@ DebugText_Priority: .string "PRIORITY‥$" gUnknown_083D0381:: @ 83D0381 - .incbin "baserom.gba", 0x003d0381, 0x9 + .string "さいせいちゆう‥$" @ 再生中 (playing) gUnknown_083D038A:: @ 83D038A - .incbin "baserom.gba", 0x003d038a, 0x9 + .string "はんてん‥‥‥‥$" @ 反転 (reverse) gUnknown_083D0393:: @ 83D0393 - .incbin "baserom.gba", 0x003d0393, 0x9 + .string "すてれお‥‥‥‥$" @ stereo gUnknown_083D039C:: @ 83D039C .incbin "baserom.gba", 0x003d039c, 0x40 gUnknown_083D03DC:: @ 83D03DC - .incbin "baserom.gba", 0x003d03dc, 0x2 + .string "▶$" gUnknown_083D03DE:: @ 83D03DE - .incbin "baserom.gba", 0x003d03de, 0x2 + .string " $" gUnknown_083D03E0:: @ 83D03E0 .incbin "baserom.gba", 0x003d03e0, 0x18 gUnknown_083D03F8:: @ 83D03F8 - .incbin "baserom.gba", 0x003d03f8, 0x5 + .byte 0x3F, 0x00, 0xC0, 0x7F, 0x80 @ stereo panning gUnknown_083D03FD:: @ 83D03FD OtherText_SE: @@ -14231,22 +15115,25 @@ gUnknown_083D17D4:: @ 83D17D4 obj_pal gContestConfetti_Pal, 0x0bc9 gUnknown_083D17DC:: @ 83D17DC - .incbin "baserom.gba", 0x003d17dc, 0x4 + .string "{COLOR RED}$" gUnknown_083D17E0:: @ 83D17E0 - .incbin "baserom.gba", 0x003d17e0, 0x2 + .string "/$" gUnknown_083D17E2:: @ 83D17E2 - .incbin "baserom.gba", 0x003d17e2, 0x2a + .string "{SIZE 3}{COLOR_HIGHLIGHT_SHADOW WHITE2 DARK_GREY LIGHT_BLUE}$" + + .align 2 + .incbin "baserom.gba", 0x003d17ec, 0x20 gUnknown_083D180C:: @ 83D180C .incbin "baserom.gba", 0x003d180c, 0x80 gUnknown_083D188C:: @ 83D188C - .incbin "baserom.gba", 0x003d188c, 0x2 + .string ".$" gUnknown_083D188E:: @ 83D188E - .incbin "baserom.gba", 0x003d188e, 0xa + .byte 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E .align 2 gUnknown_083D1898:: @ 83D1898 @@ -14576,19 +15463,60 @@ gMapObjectPalette19: @ 83D292C .incbin "graphics/map_objects/palettes/19.gbapal" gUnknown_083D294C:: @ 83D294C - .incbin "baserom.gba", 0x003d294c, 0x13 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + .byte -1 + .byte -1 + .byte -1 + .byte 0 gUnknown_083D295F:: @ 83D295F - .incbin "baserom.gba", 0x003d295f, 0x2 + step_18 + step_end gUnknown_083D2961:: @ 83D2961 - .incbin "baserom.gba", 0x003d2961, 0x3 + step_17 + step_end + .align 2 gUnknown_083D2964:: @ 83D2964 - .incbin "baserom.gba", 0x003d2964, 0x38 + .byte 12, 0, 5, 0, 3, 0, 0, 0 + .byte 14, 0, 7, 0, 3, 3, 0, 0 + .byte 16, 0, 4, 0, 5, 1, 0, 0 + .byte 15, 0, 14, 0, 1, 0, 0, 0 + .byte 18, 0, 13, 0, 4, 2, 0, 0 + .byte 8, 0, 20, 0, 4, 2, 0, 0 + .byte 16, 0, 20, 0, 7, 1, 0, 0 + .align 2 gUnknown_083D299C:: @ 83D299C - .incbin "baserom.gba", 0x003d299c, 0x70 + .byte 13, 0, 3, 0, 4, 3, 0, 0 + .byte 12, 0, 6, 0, 4, 2, 0, 0 + .byte 3, 0, 6, 0, 4, 2, 0, 0 + .byte 3, 0, 9, 0, 5, 3, 0, 0 + .byte 8, 0, 8, 0, 0, 1, 0, 0 + .byte 2, 0, 12, 0, 6, 2, 0, 0 + .byte 9, 0, 13, 0, 1, 0, 0, 0 + .byte 3, 0, 14, 0, 2, 1, 0, 0 + .byte 9, 0, 15, 0, 3, 2, 0, 0 + .byte 3, 0, 18, 0, 5, 2, 0, 0 + .byte 2, 0, 19, 0, 4, 0, 0, 0 + .byte 5, 0, 21, 0, 0, 0, 0, 0 + .byte 9, 0, 19, 0, 3, 3, 0, 0 + .byte 12, 0, 20, 0, 4, 1, 0, 0 .align 2 RotatingGateTiles_1: @ 83D2A0C @@ -16865,8 +17793,8 @@ gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74 spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014 .align 2 - .incbin "graphics/unused/unknown_3D7D8C.4bpp" - .incbin "graphics/unused/unknown_3D810C.bin" + .incbin "graphics/unknown/unknown_3D7D8C.4bpp" + .incbin "graphics/unknown/unknown_3D810C.bin" .align 2 gSpriteAnim_83D910C:: @ 83D910C @@ -17298,11 +18226,15 @@ gBattleAnimSpriteTemplate_83D96AC:: @ 83D96AC gSpriteTemplate_83D96C4:: @ 83D96C4 spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC + .align 1 gUnknown_083D96DC:: @ 83D96DC - .incbin "baserom.gba", 0x003d96dc, 0x2 - -gUnknown_083D96DE:: @ 83D96DE - .incbin "baserom.gba", 0x003d96de, 0x1A + .2byte -2, -5 + .2byte -1, -1 + .2byte 3, -6 + .2byte 4, -2 + .2byte 2, -8 + .2byte -5, -5 + .2byte 4, -7 .align 2 gBattleAnimSpriteTemplate_83D96F8:: @ 83D96F8 @@ -19453,11 +20385,12 @@ gUnknown_083DB5E4:: @ 83DB5E4 .4byte CheckMovementInputAcroBikeUnknownMode5 .4byte CheckMovementInputAcroBikeUnknownMode6 + .align 1 gUnknown_083DB600:: @ 83DB600 - .incbin "baserom.gba", 0x3db600, 0x6 + .2byte 1, 2, 4 Unknown_3DB606:: @ 83DB606 - .incbin "baserom.gba", 0x3db606, 0x2 + .byte 4, 0 .align 2 gUnknown_083DB608:: @ 83DB608 @@ -19466,14 +20399,29 @@ gUnknown_083DB608:: @ 83DB608 .4byte 0x3, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x3 .4byte 0x4, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x4 -gUnknown_083DB678:: @ 83DB678 - .incbin "baserom.gba", 0x003db678, 0x8 + .align 1 +gMysteryEventPhrase:: @ 83DB678 + ec_word MYSTERY + ec_word EVENT + ec_word IS + ec_word EXCITING -gUnknown_083DB680:: @ 83DB680 - .incbin "baserom.gba", 0x003db680, 0x2 + .align 1 +gBerryMasterWifePhrases:: @ 83DB680 + ec_word GREAT + ec_word BATTLE + + ec_word CHALLENGE + ec_word CONTEST + + ec_word OVERWHELMING + ec_pokemon1 LATIAS + + ec_word COOL + ec_pokemon1 LATIOS -gUnknown_083DB682:: @ 83DB682 - .incbin "baserom.gba", 0x003db682, 0x12 + ec_word SUPER + ec_word HUSTLE gUnknown_083DB694:: @ 83DB694 .4byte 0x02001000 @@ -19523,17 +20471,21 @@ gUnknown_083DB7EC:: @ 83DB7EC gUnknown_083DB7F4:: @ 83DB7F4 .incbin "baserom.gba", 0x3db7f4, 0xc -Palette_3DB800:: @ 83DB800 - .incbin "baserom.gba", 0x3db800, 0x20 + .align 2 +InterviewPalette_0:: @ 83DB800 + .incbin "graphics/misc/interview_pal0.gbapal" -Palette_3DB820:: @ 83DB820 - .incbin "baserom.gba", 0x3db820, 0x20 + .align 2 +InterviewPalette_1:: @ 83DB820 + .incbin "graphics/misc/interview_pal1.gbapal" -Tiles_3DB840: @ 83DB840 - .incbin "baserom.gba", 0x3db840, 0x100 + .align 2 +InterviewArrowTiles: @ 83DB840 + .incbin "graphics/misc/interview_arrow.4bpp" -Tiles_3DB940: @ 83DB940 - .incbin "baserom.gba", 0x3db940, 0x100 + .align 2 +InterviewButtonTiles: @ 83DB940 + .incbin "graphics/misc/interview_buttons.4bpp" .align 2 gMenuInterviewFrame_Pal:: @@ -19543,22 +20495,23 @@ gMenuInterviewFrame_Pal:: gMenuInterviewFrame_Gfx:: .incbin "graphics/misc/interview_frame.4bpp.lz" -Tiles_3DBB94: @ 83DBB94 - .incbin "baserom.gba", 0x3dbb94, 0x20 + .align 2 +InterviewTriangleCursorTiles: @ 83DBB94 + .incbin "graphics/misc/interview_triangle_cursor.4bpp" .align 2 -gUnknown_083DBBB4:: @ 83DBBB4 - obj_tiles Tiles_3DBB94, 0x20, 0 - obj_tiles Tiles_E9CF44, 0x700, 1 - obj_tiles Tiles_3DB840, 0x100, 2 - obj_tiles Tiles_3DB940, 0x100, 3 +gSpriteSheets_Interview:: @ 83DBBB4 + obj_tiles InterviewTriangleCursorTiles, 0x20, 0 + obj_tiles gInterviewOutlineCursorTiles, 0x700, 1 + obj_tiles InterviewArrowTiles, 0x100, 2 + obj_tiles InterviewButtonTiles, 0x100, 3 null_obj_tiles .align 2 -gUnknown_083DBBDC:: @ 83DBBDC - obj_pal Palette_3DB800, 0 - obj_pal Palette_3DB820, 1 - obj_pal 0x0, 0 +gSpritePalettes_Interview:: @ 83DBBDC + obj_pal InterviewPalette_0, 0 + obj_pal InterviewPalette_1, 1 + null_obj_pal .align 2 gOamData_83DBBF4:: @ 83DBBF4 @@ -19719,11 +20672,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48 .align 2 gUnknown_083DBD60:: @ 83DBD60 - obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007 + obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007 .align 2 gUnknown_083DBD68:: @ 83DBD68 - obj_pal gMenuWordGroup_Pal, 0x0005 + obj_pal gMenuWordGroupIndicator_Pal, 0x0005 .align 2 gOamData_83DBD70:: @ 83DBD70 @@ -19855,8 +20808,9 @@ gUnknown_083E0254:: @ 83E0254 gUnknown_083E0274:: @ 83E0274 .incbin "baserom.gba", 0x003e0274, 0x20 -gUnknown_083E0294:: @ 83E0294 - .incbin "baserom.gba", 0x003e0294, 0x20 + .align 2 +gPokenavConditionSearch2_Pal:: @ 83E0294 + .incbin "graphics/pokenav/condition_search2.gbapal" gUnknown_083E02B4:: @ 83E02B4 .incbin "baserom.gba", 0x003e02b4, 0x60 @@ -19864,9 +20818,11 @@ gUnknown_083E02B4:: @ 83E02B4 gUnknown_083E0314:: @ 83E0314 .incbin "baserom.gba", 0x003e0314, 0x20 + .align 2 gUnknown_083E0334:: @ 83E0334 .incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced + .align 2 gUnknown_083E0354:: @ 83E0354 .incbin "graphics/pokenav/trainereyes_misc.4bpp.lz" @@ -20041,31 +20997,42 @@ gUnknown_083E3270:: @ 83E3270 .4byte sub_80F0A24 .4byte sub_80F0A74 + .align 2 gPokenavIconPalette:: .incbin "graphics/pokenav/icon.gbapal" + .align 2 gUnknown_083E329C:: @ 83E329C .incbin "graphics/pokenav/icon.4bpp.lz" -gPokenavContestPokeballTiles:: - .incbin "graphics/pokenav/contest_pokeball.4bpp" + + .align 2 +gPokenavPokeballTiles:: + .incbin "graphics/pokenav/pokeball.4bpp" + + .align 2 gUnknown_083E3780: @ 83E3780 .incbin "baserom.gba", 0x3e3780, 0x20 .align 2 -gContestSparkle_Pal:: - .incbin "graphics/pokenav/contest_sparkle.gbapal" +gPokenavSparkle_Pal:: + .incbin "graphics/pokenav/sparkle.gbapal" + + .align 2 +gPokenavSparkle_Gfx:: + .incbin "graphics/pokenav/sparkle.4bpp" .align 2 -gContestSparkle_Gfx:: - .incbin "graphics/pokenav/contest_sparkle.4bpp" +gPokenavUpDownArrows_Gfx:: + .incbin "graphics/pokenav/arrows.4bpp" -gContestArrows_Gfx:: - .incbin "graphics/pokenav/contest_arrows.4bpp" gUnknown_083E3BC0:: .incbin "baserom.gba", 0x003E3BC0, 0x20 + + .align 2 gTiles_083E3BE0:: .incbin "graphics/unknown/unknown_3E3BE0.4bpp" + .align 2 gUnknown_083E3C60:: @ 83E3C60 .incbin "graphics/misc/ribbons_cool.gbapal" .incbin "graphics/misc/ribbons_beauty.gbapal" @@ -20078,12 +21045,12 @@ gUnknown_083E3D00:: @ 83E3D00 .incbin "graphics/misc/ribbons_full.4bpp.lz" .align 2 -gUnknownPal_083E41D8:: - .incbin "graphics/unknown/unknown_3E41D8.gbapal" +PokenavBlueLightPalette: + .incbin "graphics/pokenav/blue_light.gbapal" .align 2 -gUnknownGfx_083E41D8:: - .incbin "graphics/unknown/unknown_3E41D8.4bpp" +PokenavBlueLightTiles: + .incbin "graphics/pokenav/blue_light.4bpp" Palette_3E42D8: @ 83E42D8 .incbin "baserom.gba", 0x3e42d8, 0x20 @@ -20255,12 +21222,12 @@ gSpriteTemplate_83E4454:: @ 83E4454 spr_template 0, 0, gOamData_83E4318, gSpriteAnimTable_83E43E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gUnknown_083E446C:: @ 83E446C - obj_tiles gUnknownGfx_083E41D8, 256, 0x0019 +gSpriteSheet_PokenavBlueLight:: @ 83E446C + obj_tiles PokenavBlueLightTiles, 0x100, 25 .align 2 -gUnknown_083E4474:: @ 83E4474 - obj_pal gUnknownPal_083E41D8, 0x0011 +gSpritePalette_PokenavBlueLight:: @ 83E4474 + obj_pal PokenavBlueLightPalette, 17 .align 2 gOamData_83E447C:: @ 83E447C @@ -20273,8 +21240,8 @@ gSpriteTemplate_83E4484:: @ 83E4484 spr_template 25, 17, gOamData_83E447C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2654 gUnknown_083E449C:: @ 83E449C - obj_pal Palette_E88A68, 2 - obj_pal Palette_E8ACE4, 3 + obj_pal gPokenavMenuOptions3_Pal, 2 + obj_pal gPokenavCondition5_Pal, 3 obj_pal 0x0, 0 .align 2 @@ -20360,13 +21327,13 @@ gUnknown_083E4588:: @ 83E4588 .align 2 gUnknown_083E4590:: @ 83E4590 - obj_tiles Tiles_E9F9A8, 0x40, 9 - obj_tiles gContestArrows_Gfx, 0x80, 10 + obj_tiles gPokenavArrow_Gfx, 0x40, 9 + obj_tiles gPokenavUpDownArrows_Gfx, 0x80, 10 null_obj_tiles .align 2 gUnknown_083E45A8:: @ 83E45A8 - obj_pal gPokenavContestArrowsPalette, 9 + obj_pal gPokenavArrowsPalette, 9 .align 2 gOamData_83E45B0:: @ 83E45B0 @@ -20426,15 +21393,15 @@ gSpriteAnimTable_83E4620:: @ 83E4620 .align 2 gUnknown_083E4628:: @ 83E4628 - obj_tiles gPokenavContestPokeballTiles, 0x100, 3 + obj_tiles gPokenavPokeballTiles, 0x100, 3 obj_tiles gUnknown_083E3780, 0x20, 4 - obj_tiles gTiles_08E8A498, 0x100, 5 + obj_tiles gPokenavConditionMenuCancel_Gfx, 0x100, 5 null_obj_tiles .align 2 gUnknown_083E4648:: @ 83E4648 - obj_pal PokenavContestPokeballPalette, 4 - obj_pal Palette_E8A5B8, 5 + obj_pal gPokenavConditionPokeball_Pal, 4 + obj_pal gPokenavCondition4_Pal, 5 .space 8 .align 2 @@ -20482,11 +21449,11 @@ gSpriteTemplate_83E476C:: @ 83E476C .align 2 gUnknown_083E4784:: @ 83E4784 - obj_tiles gContestSparkle_Gfx, 896, 0x0017 + obj_tiles gPokenavSparkle_Gfx, 896, 0x0017 .align 2 gUnknown_083E478C:: @ 83E478C - obj_pal gContestSparkle_Pal, 0x000f + obj_pal gPokenavSparkle_Pal, 0x000f gUnknown_083E4794:: @ 83E4794 .incbin "baserom.gba", 0x003e4794, 0x28 @@ -22654,8 +23621,8 @@ gUnknown_083EDDA0:: @ 83EDDA0 .align 2 gUnknown_083EDDAC:: @ 83EDDAC -Unknown_83EDDAC: .4byte gUnknown_08E95A18 + 32 + Unknown_83EDDB0: .incbin "baserom.gba", 0x003eddb0, 0x20 Unknown_83EDDD0: @@ -22689,11 +23656,13 @@ gSlotMachineSpritePalettes:: @ 83EDE44 obj_pal gSlotMachineSpritePalette4, 7 null_obj_pal + .align 2 gUnknown_083EDE8C:: @ 83EDE8C .incbin "graphics/slot_machine/reel_time.4bpp.lz" -gUnknown_083EEFE0:: @ 83EEFE0 - .incbin "baserom.gba", 0x003eefe0, 0x1b8 + .align 2 +gReelTimeWindowTilemap:: @ 83EEFE0 + .incbin "graphics/slot_machine/reel_time_window_map.bin" .align 2 gPictureFramePalettes:: @ 83EF198 @@ -22929,11 +23898,13 @@ gBirchBallarrow_Pal:: gBirchCircle_Pal:: .incbin "graphics/misc/birch_circle.gbapal" -gUnknown_083F636C:: @ 83F636C - .incbin "baserom.gba", 0x003f636c, 0x18c + .align 2 +gBirchBagTilemap:: @ 83F636C + .incbin "graphics/misc/birch_bag_map.bin.lz" -gUnknown_083F64F8:: @ 83F64F8 - .incbin "baserom.gba", 0x003f64f8, 0x1f8 + .align 2 +gBirchGrassTilemap:: @ 83F64F8 + .incbin "graphics/misc/birch_grass_map.bin.lz" gUnknown_083F66F0:: @ 83F66F0 .incbin "graphics/misc/birch_help.4bpp.lz" @@ -23077,8 +24048,8 @@ gUnknown_083F7A90:: @ 83F7A90 .space 8 gUnknown_083F7AA0:: @ 83F7AA0 - obj_pal gUnknown_08E8F804, 0x1000 - obj_pal gUnknown_08E8F824, 0x1001 + obj_pal gMiscClockMale_Pal, 0x1000 + obj_pal gMiscClockFemale_Pal, 0x1001 .space 8 .align 2 @@ -23236,6 +24207,7 @@ gSpriteTemplate_83F7F84:: @ 83F7F84 gUnknown_083F7F9C:: @ 83F7F9C .incbin "baserom.gba", 0x003f7f9c, 0x28 + .align 2 gUnknown_083F7FC4:: @ 83F7FC4 .byte 1, 4, 1, 0 .4byte sub_810CFF8 @@ -23274,11 +24246,17 @@ gUnknown_083F7FC4:: @ 83F7FC4 .byte 0, 0, 0, 0 .4byte NULL -gUnknown_083F804C:: @ 83F804C - .incbin "baserom.gba", 0x003f804c, 0x20 + .align 2 +gCaveTransitionPalette_White:: @ 83F804C + .rept 16 + .2byte 0x7FFF + .endr -gUnknown_083F806C:: @ 83F806C - .space 32 + .align 2 +gCaveTransitionPalette_Black:: @ 83F806C + .rept 16 + .2byte 0x0000 + .endr gUnknown_083F808C:: @ 83F808C .incbin "baserom.gba", 0x003f808c, 0x10 @@ -23286,11 +24264,13 @@ gUnknown_083F808C:: @ 83F808C gUnknown_083F809C:: @ 83F809C .incbin "baserom.gba", 0x003f809c, 0x10 -gUnknown_083F80AC:: @ 83F80AC - .incbin "baserom.gba", 0x003f80ac, 0x1e0 + .align 2 +gCaveTransitionTilemap:: @ 83F80AC + .incbin "graphics/misc/cave_transition_map.bin.lz" -gUnknown_083F828C:: @ 83F828C - .incbin "graphics/pokenav/map_squares.4bpp.lz" + .align 2 +gCaveTransitionTiles:: @ 83F828C + .incbin "graphics/misc/cave_transition.4bpp.lz" gUnknown_083F8340:: @ 83F8340 .incbin "baserom.gba", 0x003f8340, 0x18 @@ -23364,11 +24344,14 @@ gUnknown_083F8418:: @ 83F8418 gUnknown_083F8438:: @ 83F8438 .incbin "graphics/pokedex/area_glow.4bpp.lz" + .align 1 gUnknown_083F856C:: @ 83F856C - .incbin "baserom.gba", 0x003f856c, 0x2 + .2byte 360 + .align 1 gUnknown_083F856E:: @ 83F856E - .incbin "baserom.gba", 0x003f856e, 0xc + .2byte 328, 0, 34 + .2byte 412, 0, 0 gUnknown_083F857A:: @ 83F857A .incbin "baserom.gba", 0x003f857a, 0x12 @@ -24228,7 +25211,7 @@ gUnknown_083FA632:: @ 83FA632 .incbin "baserom.gba", 0x003fa632, 0x18 gUnknown_083FA64A:: @ 83FA64A - .incbin "baserom.gba", 0x003fa64a, 0x2 + .byte -1, 1 gUnknown_083FA64C:: @ 83FA64C .incbin "baserom.gba", 0x003fa64c, 0x10 @@ -24271,7 +25254,7 @@ gUnknown_083FB718:: @ 83FB718 .incbin "baserom.gba", 0x003fb718, 0x20 gUnknown_083FB738:: @ 83FB738 - .incbin "baserom.gba", 0x003fb738, 0x2 + .byte 0xF0, 0x0F gUnknown_083FB73A:: @ 83FB73A .incbin "baserom.gba", 0x003fb73a, 0x26 @@ -24681,19 +25664,27 @@ gUnknown_084017B0:: @ 84017B0 .4byte UnknownText_Exit, sub_8122838 gUnknown_084017D0:: @ 84017D0 - .incbin "baserom.gba", 0x4017d0, 0x3 + .byte 1, 0, 3 gUnknown_084017D3: @ 84017D3 - .incbin "baserom.gba", 0x4017d3, 0x3 + .byte 2, 0, 3 gUnknown_084017D6: @ 84017D6 - .incbin "baserom.gba", 0x4017d6, 0x2 + .byte 0, 3 .align 2 gUnknown_084017D8:: @ 84017D8 - .4byte 2307, gUnknown_084017D0 - .4byte 2307, gUnknown_084017D3 - .4byte 2306, gUnknown_084017D6 + .byte 3, 9 + .space 2 + .4byte gUnknown_084017D0 + + .byte 3, 9 + .space 2 + .4byte gUnknown_084017D3 + + .byte 2, 9 + .space 2 + .4byte gUnknown_084017D6 .align 2 gUnknown_084017F0:: @ 84017F0 @@ -24702,47 +25693,60 @@ gUnknown_084017F0:: @ 84017F0 .4byte UnknownText_Exit, sub_81230F4 gUnknown_08401808:: @ 8401808 - .incbin "baserom.gba", 0x401808, 0x3 + .byte 0, 1, 2 gUnknown_0840180B:: @ 840180B - .incbin "baserom.gba", 0x40180b, 0x5 + .byte 1, 2 .align 2 gUnknown_08401810:: @ 8401810 - .4byte 2307, gUnknown_08401808 - .4byte 2306, gUnknown_0840180B - -gUnknown_08401820:: @ 8401820 - .incbin "baserom.gba", 0x00401820, 0x158 + .byte 3, 9 + .space 2 + .4byte gUnknown_08401808 -gUnknown_08401978:: @ 8401978 - .incbin "baserom.gba", 0x00401978, 0x184 + .byte 2, 9 + .space 2 + .4byte gUnknown_0840180B -gUnknown_08401AFC:: @ 8401AFC - .incbin "baserom.gba", 0x00401afc, 0x1c4 + .align 2 +gCableCarMtChimneyTilemap:: @ 8401820 + .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz" -gUnknown_08401CC0:: @ 8401CC0 - .incbin "baserom.gba", 0x00401cc0, 0x4 + .align 2 +gCableCarTreeTilemap:: @ 8401978 + .incbin "graphics/misc/cable_car_tree_map.bin.lz" -gUnknown_08401CC4:: @ 8401CC4 - .incbin "baserom.gba", 0x00401cc4, 0x4 + .align 2 +gCableCarMountainTilemap:: @ 8401AFC + .incbin "graphics/misc/cable_car_mountain_map.bin.lz" -gUnknown_08401CC8:: @ 8401CC8 - .incbin "baserom.gba", 0x00401cc8, 0xc + .align 2 +gCableCarPylonHookTilemapEntries:: @ 8401CC0 + .2byte 0x3000 + .2byte 0x3001 + .2byte 0x3002 + .2byte 0x3003 + .2byte 0x3004 + .2byte 0x3005 + .2byte 0x3006 + .2byte 0x3007 + .2byte 0x3008 + .2byte 0x3009 -gUnknown_08401CD4:: @ 8401CD4 - .incbin "baserom.gba", 0x00401cd4, 0x24 + .align 2 +gCableCarPylonStemTilemap:: @ 8401CD4 + .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz" .align 2 gUnknown_08401CF8:: @ 8401CF8 - obj_tiles gUnknown_08E80614, 0x800, 1 - obj_tiles gUnknown_08E80914, 0x40, 2 - obj_tiles gUnknown_08E80944, 0x80, 3 + obj_tiles gCableCar_Gfx, 0x800, 1 + obj_tiles gCableCarDoor_Gfx, 0x40, 2 + obj_tiles gCableCarCord_Gfx, 0x80, 3 .space 8 .align 2 gUnknown_08401D18:: @ 8401D18 - obj_pal Palette_08E7EC1C, 1 + obj_pal gCableCar_Pal, 1 .space 8 .align 2 @@ -24775,17 +25779,26 @@ gSpriteTemplate_8401D58:: @ 8401D58 gSpriteTemplate_8401D70:: @ 8401D70 spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76 -gUnknown_08401D88:: @ 8401D88 - .incbin "baserom.gba", 0x00401d88, 0x2 +gCableCarPlayerGraphicsIDs:: @ 8401D88 + .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL -gUnknown_08401D8A:: @ 8401D8A - .incbin "baserom.gba", 0x00401d8a, 0x4 +gMtChimneyHikerGraphicsIDs:: @ 8401D8A + .byte MAP_OBJ_GFX_HIKER + .byte MAP_OBJ_GFX_CAMPER + .byte MAP_OBJ_GFX_PICNICKER + .byte MAP_OBJ_GFX_POOCHYENA @ not used -gUnknown_08401D8E:: @ 8401D8E - .incbin "baserom.gba", 0x00401d8e, 0x8 + .align 1 +gMtChimneyHikerCoords:: @ 8401D8E + .2byte 0, 80 + .2byte 240, 146 -gUnknown_08401D96:: @ 8401D96 - .incbin "baserom.gba", 0x00401d96, 0x4 +gMtChimneyHikerMovementDelayTable:: @ 8401D96 + .byte 0 + .byte 60 + .byte 120 + .byte 170 .align 2 gUnknown_08401D9C:: @ 8401D9C @@ -24834,22 +25847,22 @@ gUnknown_08401E5A:: @ 8401E5A .align 2 gUnknown_08401E60:: @ 8401E60 .4byte sub_8128AA8 - .4byte sub_8128AF0 + .4byte contest_ai_get_turn .4byte sub_8128B0C .4byte sub_8128B4C .4byte sub_8128B8C .4byte sub_8128BCC - .4byte sub_8128C0C + .4byte contest_ai_get_excitement .4byte sub_8128C2C .4byte sub_8128C6C .4byte sub_8128CAC .4byte sub_8128CEC - .4byte sub_8128D2C + .4byte contest_ai_get_user_order .4byte sub_8128D50 .4byte sub_8128D90 .4byte sub_8128DD0 .4byte sub_8128E10 - .4byte sub_8128E50 + .4byte contest_ai_get_user_condition_maybe .4byte sub_8128E90 .4byte sub_8128ED0 .4byte sub_8128F10 @@ -24864,21 +25877,21 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_8129160 .4byte sub_81291AC .4byte sub_81291F8 - .4byte sub_8129244 + .4byte contest_ai_get_contest_type .4byte sub_8129264 .4byte sub_81292A4 - .4byte sub_81292E4 + .4byte contest_ai_get_move_excitement .4byte sub_8129324 .4byte sub_8129368 .4byte sub_81293AC .4byte sub_81293F0 - .4byte sub_8129434 + .4byte contest_ai_get_move_effect .4byte sub_8129470 .4byte sub_81294B0 - .4byte sub_81294F0 + .4byte contest_ai_get_move_effect_type .4byte sub_8129538 .4byte sub_8129578 - .4byte sub_81295B8 + .4byte contest_ai_check_move_has_highest_appeal .4byte sub_8129638 .4byte sub_812967C .4byte sub_81296FC @@ -24892,34 +25905,34 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_8129930 .4byte sub_8129970 .4byte sub_81299B0 - .4byte sub_81299F0 + .4byte contest_ai_get_move_used_count .4byte sub_8129A44 .4byte sub_8129A84 .4byte sub_8129AC4 .4byte sub_8129B04 - .4byte sub_8129B44 + .4byte contest_ai_check_combo_starter .4byte sub_8129BB8 .4byte sub_8129BFC - .4byte sub_8129C40 + .4byte contest_ai_check_combo_finisher .4byte sub_8129CB4 .4byte sub_8129CF8 - .4byte sub_8129D3C + .4byte contest_ai_check_would_finish_combo .4byte sub_8129D98 .4byte sub_8129DDC - .4byte sub_8129E20 + .4byte contest_ai_get_condition .4byte sub_8129E64 .4byte sub_8129EA4 .4byte sub_8129EE4 .4byte sub_8129F24 - .4byte sub_8129F64 + .4byte contest_ai_get_used_combo_starter .4byte sub_8129FBC .4byte sub_8129FFC .4byte sub_812A03C .4byte sub_812A07C - .4byte sub_812A0BC + .4byte contest_ai_check_can_participate .4byte sub_812A100 .4byte sub_812A144 - .4byte sub_812A188 + .4byte contest_ai_get_val_812A188 .4byte sub_812A1C4 .4byte sub_812A208 .4byte sub_812A24C @@ -24963,7 +25976,7 @@ gUnknown_08401E60:: @ 8401E60 .4byte sub_812AC34 .4byte sub_812AC54 .4byte sub_812AC84 - .4byte sub_812ACFC + .4byte contest_ai_check_for_exciting_move .4byte sub_812AD50 .4byte sub_812AD94 .4byte sub_812ADD8 @@ -25760,10 +26773,10 @@ gUnknown_08402E24:: @ 8402E24 .incbin "baserom.gba", 0x00402e24, 0x15 gUnknown_08402E39:: @ 8402E39 - .incbin "baserom.gba", 0x00402e39, 0x4 + .byte 0, 1, 2, 3 gUnknown_08402E3D:: @ 8402E3D - .incbin "baserom.gba", 0x00402e3d, 0x3 + .byte 4, 5, 6 gUnknown_08402E40:: @ 8402E40 .incbin "baserom.gba", 0x00402e40, 0x40 @@ -25795,8 +26808,19 @@ gUnknown_08405E92:: @ 8405E92 gUnknown_08405EB0:: @ 8405EB0 .incbin "baserom.gba", 0x00405eb0, 0x14 -gUnknown_08405EC4:: @ 8405EC4 - .incbin "baserom.gba", 0x00405ec4, 0x16 + .align 1 +gBattleTowerBanlist:: @ 8405EC4 + .2byte SPECIES_MEW + .2byte SPECIES_MEWTWO + .2byte SPECIES_HO_OH + .2byte SPECIES_LUGIA + .2byte SPECIES_CELEBI + .2byte SPECIES_KYOGRE + .2byte SPECIES_GROUDON + .2byte SPECIES_RAYQUAZA + .2byte SPECIES_JIRACHI + .2byte SPECIES_DEOXYS + .2byte -1 gUnknown_08405EDA:: @ 8405EDA .incbin "baserom.gba", 0x00405eda, 0xc @@ -25805,14 +26829,12 @@ gUnknown_08405EE6:: @ 8405EE6 .incbin "baserom.gba", 0x00405ee6, 0x12 .align 2 -gUnknownPal_08405EF8:: - .incbin "baserom.gba", 0x00405ef8, 0x20 +ConditionUpDownPalette: + .incbin "graphics/misc/condition_up_down.gbapal" .align 2 -gUnknownPal_08405F18:: - .incbin "baserom.gba", 0x00405f18, 0x20 - - .incbin "baserom.gba", 0x00405f38, 0x1E0 +ConditionUpDownTiles: + .incbin "graphics/misc/condition_up_down.4bpp" gUnknown_08406118:: @ 8406118 .incbin "baserom.gba", 0x00406118, 0x14 @@ -25830,12 +26852,12 @@ gUnknown_08406134:: @ 8406134 .4byte OtherText_Beauty .align 2 -gUnknown_08406148:: @ 8406148 - obj_pal gUnknownPal_08405F18, 0x0200 +gSpriteSheet_ConditionUpDown:: @ 8406148 + obj_tiles ConditionUpDownTiles, 0x200, 0 .align 2 -gUnknown_08406150:: @ 8406150 - obj_pal gUnknownPal_08405EF8, 0x0000 +gSpritePalette_ConditionUpDown:: @ 8406150 + obj_pal ConditionUpDownPalette, 0 gUnknown_08406158:: @ 8406158 .incbin "baserom.gba", 0x00406158, 0x14 @@ -25993,15 +27015,19 @@ gUnknown_08406334:: @ 8406334 gUnknown_0840633A:: @ 840633A .string "{COLOR RED}{STR_VAR_1}$" + .align 2 Palette_406340:: @ 8406340 .incbin "baserom.gba", 0x406340, 0x20 + .align 2 Palette_406360:: @ 8406360 .incbin "baserom.gba", 0x406360, 0x20 + .align 2 gIntroTiles:: .incbin "graphics/intro/intro.4bpp.lz" + .align 2 gUnknown_08406974:: @ 8406974 .incbin "graphics/intro/intro1_bgpal1.gbapal" .incbin "graphics/intro/intro1_bgpal2.gbapal" @@ -26036,35 +27062,51 @@ gUnknown_0840725C:: @ 840725C gUnknown_0840754C:: @ 840754C .incbin "graphics/intro/intro1_bg3_map.bin.lz" + .align 2 gUnknown_08407764:: @ 8407764 .incbin "graphics/intro/introgfx.4bpp.lz" + .align 2 gUnknown_084098D4:: @ 84098D4 .incbin "graphics/intro/intro3_pokeball.gbapal" + .align 2 gUnknown_08409AD4:: @ 8409AD4 - .incbin "baserom.gba", 0x00409ad4, 0x130 + .incbin "graphics/intro/intro3_pokeball_map.bin.lz" + .align 2 gUnknown_08409C04:: @ 8409C04 .incbin "graphics/intro/intro3_pokeball.8bpp.lz" + .align 2 gUnknown_0840A758:: @ 840A758 - .incbin "baserom.gba", 0x0040a758, 0x20 + .incbin "graphics/intro/intro3_streaks.gbapal" + .align 2 gUnknown_0840A778:: @ 840A778 - .incbin "baserom.gba", 0x0040a778, 0x6c + .incbin "graphics/intro/intro3_streaks.4bpp.lz" + .align 2 gUnknown_0840A7E4:: @ 840A7E4 - .incbin "baserom.gba", 0x0040a7e4, 0x13c + .incbin "graphics/intro/intro3_streaks_map.bin.lz" + .align 2 gIntro3Misc1Palette:: .incbin "graphics/intro/intro3_misc1.gbapal" + + .align 2 gIntro3Misc2Palette:: .incbin "graphics/intro/intro3_misc2.gbapal" + + .align 2 gIntro3MiscTiles:: .incbin "graphics/intro/intro3_misc.4bpp.lz" + + .align 2 gIntro1EonPalette:: .incbin "graphics/intro/intro1_eon.gbapal" + + .align 2 gIntro1EonTiles:: .incbin "graphics/intro/intro1_eon.4bpp.lz" @@ -27003,60 +28045,52 @@ gUnknown_0840DCC8:: @ 840DCC8 SystemText_Pokemon2: .string "POKéMON$" -gUnknown_0840DCD0:: @ 840DCD0 -SystemText_NewGame: +gMainMenuString_NewGame:: @ 840DCD0 .string "NEW GAME$" -gUnknown_0840DCD9:: @ 840DCD9 -SystemText_Continue: +gMainMenuString_Continue:: @ 840DCD9 .string "CONTINUE$" -gUnknown_0840DCE2:: @ 840DCE2 -SystemText_Option2: +gMainMenuString_Option:: @ 840DCE2 .string "OPTION$" -gUnknown_0840DCE9:: @ 840DCE9 -SystemText_MysteryEvents: +gMainMenuString_MysteryEvents:: @ 840DCE9 .string "MYSTERY EVENTS$" + SystemText_UpdatingSaveExternal: .string "Updating save file using external\ndata. Please wait.$" + SystemText_SaveUpdated: .string "The save file has been updated.$" + SystemText_SaveUpdatedExchangeBackup: .string "The save file has been updated.\pFurther game data cannot be saved\nto the backup memory.\pPlease exchange the backup memory.\pFor details, please contact the\nNintendo Service Center.$" + SystemText_SaveNotUpdated: .string "The save file could not be updated.\pPlease exchange the backup\nmemory.\pFor details, please contact the\nNintendo Service Center.$" -gUnknown_0840DE81:: @ 840DE81 -SystemText_SaveCorrupt: +gSaveFileCorruptMessage:: @ 840DE81 .string "The save file is corrupt. The\nprevious save file will be loaded.$" -gUnknown_0840DEC2:: @ 840DEC2 -SystemText_SaveDeleted: +gSaveFileDeletedMessage:: @ 840DEC2 .string " The save file has been deleted...$" -gUnknown_0840DEE5:: @ 840DEE5 -SystemText_1MSubCircuitNotInstalled: +gBoardNotInstalledMessage:: @ 840DEE5 .string "The 1M sub-circuit board is\nnot installed.$" -gUnknown_0840DF10:: @ 840DF10 -SystemText_InternalBatteryIsDry: +gBatteryDryMessage:: @ 840DF10 .string "The internal battery has run dry.\nThe game can be played.\pHowever, clock-based events will\nno longer occur.$" -gUnknown_0840DF7C:: @ 840DF7C -SystemText_Player2:: +gMainMenuString_Player:: @ 840DF7C .string "PLAYER$" -gUnknown_0840DF83:: @ 840DF83 -SystemText_Pokedex2:: +gMainMenuString_Pokedex:: @ 840DF83 .string "POKéDEX$" -gUnknown_0840DF8B:: @ 840DF8B -SystemText_Time:: +gMainMenuString_Time:: @ 840DF8B .string "TIME$" -gUnknown_0840DF90:: @ 840DF90 -SystemText_Badges:: +gMainMenuString_Badges:: @ 840DF90 .string "BADGES$" gBirchText_Boy:: @@ -29428,20 +30462,20 @@ gSpriteAffineAnimTable_8412050:: @ 8412050 .align 2 gUnknown_084120A4:: @ 84120A4 - .4byte gUnknown_08E781E4 - .4byte gUnknown_08E781F8 - .4byte gUnknown_08E7820C - .4byte gUnknown_08E78220 - .4byte gUnknown_08E78234 - .4byte gUnknown_08E78248 - .4byte gUnknown_08E7825C - .4byte gUnknown_08E78270 - .4byte gUnknown_08E78284 - .4byte gUnknown_08E78298 - .4byte gUnknown_08E782ac - .4byte gUnknown_08E782c0 - .4byte gUnknown_08E782d4 - .4byte gUnknown_08E782e8 + .4byte gPokeblockRed_Pal + .4byte gPokeblockBlue_Pal + .4byte gPokeblockPink_Pal + .4byte gPokeblockGreen_Pal + .4byte gPokeblockYellow_Pal + .4byte gPokeblockPurple_Pal + .4byte gPokeblockIndigo_Pal + .4byte gPokeblockBrown_Pal + .4byte gPokeblockLiteBlue_Pal + .4byte gPokeblockOlive_Pal + .4byte gPokeblockGray_Pal + .4byte gPokeblockBlack_Pal + .4byte gPokeblockWhite_Pal + .4byte gPokeblockGold_Pal .align 2 gSpriteAffineAnim_84120DC:: @ 84120DC @@ -29853,9 +30887,11 @@ gUnknown_08416E34:: @ 8416E34 obj_tiles gIntro2MayTiles, 0x2000, 1003 .space 8 + .align 2 gEvoSparklePalette: @ 8416E44 .incbin "graphics/misc/evo_sparkle.gbapal" + .align 2 gEvoSparkleTiles: @ 8416E64 .incbin "graphics/misc/evo_sparkle.4bpp.lz" @@ -30464,8 +31500,7 @@ OtherText_Cancel:: OtherText_Lv:: .string "LV$" -gUnknown_0842CC34:: @ 842CC34 -OtherText_Egg:: +gEggNickname:: @ 842CC34 .string "EGG$" gUnknown_0842CC38:: @ 842CC38 @@ -30968,11 +32003,44 @@ Unknown_842F558: @ 842F558 .4byte Unknown_842F4F0 .4byte Unknown_842F520 + .align 2 gUnknown_0842F5BC:: @ 842F5BC .4byte Unknown_842F558 -gUnknown_0842F5C0:: @ 842F5C0 - .incbin "baserom.gba", 0x0042f5c0, 0x100 + .align 2 +gSubspriteTables_842F5C0:: @ 842F5C0 + .4byte 1, gSubspriteTable_203A380 + .4byte 1, gSubspriteTable_203A380 + .4byte 2, gSubspriteTable_203A380 + .4byte 3, gSubspriteTable_203A380 + .4byte 4, gSubspriteTable_203A380 + .4byte 5, gSubspriteTable_203A380 + .4byte 6, gSubspriteTable_203A380 + .4byte 7, gSubspriteTable_203A380 + .4byte 8, gSubspriteTable_203A380 + .4byte 9, gSubspriteTable_203A380 + .4byte 10, gSubspriteTable_203A380 + .4byte 11, gSubspriteTable_203A380 + .4byte 12, gSubspriteTable_203A380 + .4byte 13, gSubspriteTable_203A380 + .4byte 14, gSubspriteTable_203A380 + .4byte 15, gSubspriteTable_203A380 + .4byte 1, gSubspriteTable_203A380 + .4byte 17, gSubspriteTable_203A380 + .4byte 18, gSubspriteTable_203A380 + .4byte 19, gSubspriteTable_203A380 + .4byte 20, gSubspriteTable_203A380 + .4byte 21, gSubspriteTable_203A380 + .4byte 22, gSubspriteTable_203A380 + .4byte 23, gSubspriteTable_203A380 + .4byte 24, gSubspriteTable_203A380 + .4byte 25, gSubspriteTable_203A380 + .4byte 26, gSubspriteTable_203A380 + .4byte 27, gSubspriteTable_203A380 + .4byte 28, gSubspriteTable_203A380 + .4byte 29, gSubspriteTable_203A380 + .4byte 30, gSubspriteTable_203A380 + .4byte 31, gSubspriteTable_203A380 .align 2 gUnknown_0842F6C0:: @ 842F6C0 diff --git a/data/graphics.s b/data/graphics.s index 360338b53..39cfaf5d9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,9 +18,9 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.s" @ 8D019E4 - .incbin "graphics/unused/old.4bpp.lz" @ japanese table and bunch of stuff - .incbin "graphics/unused/unknown_D021BC.bin" - .incbin "graphics/unused/unknown_D023E8.bin" + .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff + .incbin "graphics/unused/old_charmap.bin.lz" + .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 gSmokescreenImpactTiles:: @ 8D02410 @@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410 gSmokescreenImpactPalette:: @ 8D024F0 .incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz" + .align 2 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PokeBall:: .incbin "graphics/interface/ball/poke.gbapal.lz" + .align 2 gInterfaceGfx_GreatBall:: .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_GreatBall:: .incbin "graphics/interface/ball/great.gbapal.lz" + .align 2 gInterfaceGfx_SafariBall:: .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_SafariBall:: .incbin "graphics/interface/ball/safari.gbapal.lz" + .align 2 gInterfaceGfx_UltraBall:: .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_UltraBall:: .incbin "graphics/interface/ball/ultra.gbapal.lz" + .align 2 gInterfaceGfx_MasterBall:: .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_MasterBall:: .incbin "graphics/interface/ball/master.gbapal.lz" + .align 2 gInterfaceGfx_NetBall:: .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NetBall:: .incbin "graphics/interface/ball/net.gbapal.lz" + .align 2 gInterfaceGfx_DiveBall:: .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_DiveBall:: .incbin "graphics/interface/ball/dive.gbapal.lz" + .align 2 gInterfaceGfx_NestBall:: .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_NestBall:: .incbin "graphics/interface/ball/nest.gbapal.lz" + .align 2 gInterfaceGfx_RepeatBall:: .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_RepeatBall:: .incbin "graphics/interface/ball/repeat.gbapal.lz" + .align 2 gInterfaceGfx_TimerBall:: .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_TimerBall:: .incbin "graphics/interface/ball/timer.gbapal.lz" + .align 2 gInterfaceGfx_LuxuryBall:: .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_LuxuryBall:: .incbin "graphics/interface/ball/luxury.gbapal.lz" + .align 2 gInterfaceGfx_PremierBall:: .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC + .align 2 gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" + .align 2 gUnknown_08D030D0:: @ 8D030D0 .incbin "graphics/interface/ball_open.4bpp.lz" @@ -250,7 +275,7 @@ gBattleAnimSpriteSheet_017:: @ 8D04368 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD04388, 0x21 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D04388.4bpp.lz" .align 2 gBattleAnimSpritePalette_019:: @ 8D043AC @@ -277,10 +302,10 @@ gBattleAnimSpriteSheet_023:: @ 8D045A4 .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD046AC, 0x26 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/battle_anim_023.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD046D4, 0xFA @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/music_notes.4bpp.lz" .align 2 gBattleAnimSpritePalette_021:: @ 8D047D0 @@ -395,31 +420,33 @@ gBattleAnimSpriteSheet_037:: @ 8D0781C .incbin "graphics/battle_anims/sprites/037.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07B68, 0x42 @ LZ, uncomp. size = 0xA0 + .incbin "graphics/unknown/unknown_D07B68.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07BAC, 0x14 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D07B68.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD07BC0, 0x33 @ LZ, uncomp. size = 0x40 + .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz" + +@ old battle interface data, unused .align 2 - .incbin "baserom.gba", 0xD07BF4, 0x362 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/obi1.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD07F58, 0x41 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3 .align 2 - .incbin "baserom.gba", 0xD07F9C, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/old_pal4.gbapal.lz" @ 4 is by itself .align 2 - .incbin "baserom.gba", 0xD07FB4, 0x57 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7 .align 2 - .incbin "baserom.gba", 0xD0800C, 0x5C6 @ LZ, uncomp. size = 0x1400 + .incbin "graphics/unused/obi2.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD085D4, 0x10D @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 gBattleAnimSpritePalette_038:: @ 8D086E4 @@ -479,7 +506,7 @@ gBattleAnimSpriteSheet_045:: @ 8D099DC .align 2 gUnknown_08D09C48:: @ 8D09C48 - .incbin "baserom.gba", 0xD09C48, 0x211 @ LZ, uncomp. size = 0x520 + .incbin "graphics/interface/hp_numbers.4bpp.lz" .align 2 gBattleAnimSpriteSheet_046:: @ 8D09E5C @@ -522,10 +549,10 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8 .incbin "graphics/battle_anims/sprites/052.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD0A7A4, 0x181 @ LZ, uncomp. size = 0x600 + .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused .align 2 - .incbin "baserom.gba", 0xD0A928, 0xF @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/line_sketch.gbapal.lz" .align 2 gBattleAnimSpriteSheet_054:: @ 8D0A938 @@ -604,7 +631,7 @@ gBattleAnimSpritePalette_063:: @ 8D0BB90 .incbin "graphics/battle_anims/sprites/063.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0BBB8, 0x6D @ LZ, uncomp. size = 0x80 + .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point .align 2 gBattleAnimSpritePalette_091:: @ 8D0BC28 @@ -690,23 +717,23 @@ gBattleAnimSpriteSheet_081:: @ 8D0CF04 gBattleAnimSpritePalette_081:: @ 8D0CF88 .incbin "graphics/battle_anims/sprites/081.gbapal.lz" - .align 2 - .incbin "baserom.gba", 0xD0CFAC, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFAC + .incbin "graphics/unknown/unknown_D0CFAC.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFD0, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFD0 + .incbin "graphics/unknown/unknown_D0CFD0.bin" - .align 2 - .incbin "baserom.gba", 0xD0CFF4, 0x24 @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0CFF4 + .incbin "graphics/unknown/unknown_D0CFF4.bin" .align 2 - .incbin "baserom.gba", 0xD0D018, 0x57 @ LZ, uncomp. size = 0x240 + .incbin "graphics/unused/line_sketch_2.8bpp.lz" - .align 2 - .incbin "baserom.gba", 0xD0D070, 0x1F @ LZ, uncomp. size = 0x20 + .align 2 @ 8D0D070 + .incbin "graphics/unknown/unknown_D0D070.bin" .align 2 - .incbin "baserom.gba", 0xD0D090, 0x8F @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/line_sketch_2.bin.lz" .align 2 gBattleAnimSpriteSheet_082:: @ 8D0D120 @@ -757,7 +784,7 @@ gBattleAnimSpritePalette_094:: @ 8D0D294 .incbin "graphics/battle_anims/sprites/094.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD0D2B4, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D0D2B4.bin.lz" .align 2 gBattleAnimSpritePalette_095:: @ 8D0D2D4 @@ -936,48 +963,71 @@ gBattleAnimSpritePalette_114:: @ 8D1106C .incbin "graphics/battle_anims/sprites/114.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11094, 0x115 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps? .align 2 - .incbin "baserom.gba", 0xD111AC, 0x3FE @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/redyellowgreen_frame.bin.lz" .align 2 - .incbin "baserom.gba", 0xD115AC, 0x59F @ LZ, uncomp. size = 0x2C20 + .incbin "graphics/unused/color_frames.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11B4C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/color_frames.gbapal.lz" .align 2 gBattleAnimSpriteSheet_115:: @ 8D11B74 .incbin "graphics/battle_anims/sprites/115.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11CA4, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/water_splash.8bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11E2C, 0xDD @ LZ, uncomp. size = 0x400 + .incbin "graphics/unused/water_splash.bin.lz" .align 2 - .incbin "baserom.gba", 0xD11F0C, 0x5D @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/water_splash.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD11F6C, 0x8C @ LZ, uncomp. size = 0x140 + .incbin "graphics/unused/basic_frame.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD11FF8, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/basic_frame.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/basic_frame.bin.lz" + .align 2 gUnknown_08D1212C:: - .incbin "graphics/interface/battle_window.gbapal" + .incbin "graphics/battle_interface/window.gbapal" + + .align 2 gUnknown_08D1214C:: - .incbin "baserom.gba", 0xd1214c, 0x20 + .incbin "graphics/battle_interface/hpbar.gbapal" + + .align 2 gUnknown_08D1216C:: @ 8D1216C - .incbin "baserom.gba", 0xd1216c, 0x840 + .incbin "graphics/battle_interface/hpbar.4bpp" + .incbin "graphics/battle_interface/expbar.4bpp" + .incbin "graphics/battle_interface/status_psn.4bpp" + .incbin "graphics/battle_interface/status_par.4bpp" + .incbin "graphics/battle_interface/status_slp.4bpp" + .incbin "graphics/battle_interface/status_frz.4bpp" + .incbin "graphics/battle_interface/status_brn.4bpp" + .incbin "graphics/battle_interface/misc.4bpp" + .incbin "graphics/battle_interface/hpbar_anim.4bpp" + .incbin "graphics/battle_interface/misc_frameend.4bpp" + .align 2 Tiles_D129AC:: @ 8D129AC - .incbin "baserom.gba", 0xd129ac, 0x680 + .incbin "graphics/battle_interface/ball_display.4bpp" + + @ extra stuff + .incbin "graphics/battle_interface/ball_display_unused_extra.4bpp" + .incbin "graphics/battle_interface/status2.4bpp" @ these three duplicate sets of graphics are for the opponent pokemon and are also for use in double battles. they use dynamic palettes so coloring them is an extreme headache and wont be done for now. + .incbin "graphics/battle_interface/status3.4bpp" + .incbin "graphics/battle_interface/status4.4bpp" + .incbin "graphics/unknown/unknown_D12FEC.4bpp" + .incbin "graphics/unknown/unknown_D1300C.4bpp" .align 2 gBattleAnimSpriteSheet_116:: @ 8D1302C @@ -1128,13 +1178,13 @@ gBattleAnimSpriteSheet_077:: @ 8D150F4 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD151C8, 0x912 @ LZ, uncomp. size = 0x2000 + .incbin "graphics/unused/old_contest.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD15ADC, 0x104 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD15BE0, 0x183 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest.bin.lz" .align 2 .incbin "baserom.gba", 0xD15D64, 0x2C0 @ LZ, uncomp. size = 0x1000 @@ -1148,15 +1198,15 @@ gContestNumbers_UnusedPal:: .incbin "graphics/unused/numbers.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD16134, 0x100F @ LZ, uncomp. size = 0x4000 + .incbin "graphics/unused/old_contest_2.4bpp.lz" .align 2 gUnknown_08D17144:: @ 8D17144 - .incbin "baserom.gba", 0xD17144, 0x116 @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_contest_2.gbapal.lz" @ the tilemap and palette for unused contest assets are used. however, these two files aren't old .align 2 gUnknown_08D1725C:: @ 8D1725C - .incbin "baserom.gba", 0xD1725C, 0x1C5 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/old_contest_2.bin.lz" .align 2 gUnknown_08D17424:: @ 8D17424 @@ -1173,47 +1223,47 @@ gUnknown_08D17C3C:: @ 8D17C3C .incbin "baserom.gba", 0xD17C3C, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08D17D6C:: @ 8D17D6C - .incbin "baserom.gba", 0xD17D6C, 0xAAA @ LZ, uncomp. size = 0x2000 +gContestMiscGfx:: @ 8D17D6C + .incbin "graphics/contest/misc.4bpp.lz" .align 2 -gUnknown_08D18818:: @ 8D18818 - .incbin "baserom.gba", 0xD18818, 0xC59 @ LZ, uncomp. size = 0x2000 +gContestAudienceGfx:: @ 8D18818 + .incbin "graphics/contest/audience.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD19474, 0x11C @ LZ, uncomp. size = 0x180 + .incbin "graphics/contest/faces.4bpp.lz" .align 2 gContestJudgeSymbolsGfx:: @ 8D19590 - .incbin "graphics/misc/judge_symbols.4bpp.lz" + .incbin "graphics/contest/judge_symbols.4bpp.lz" .align 2 gContest3Pal:: - .incbin "graphics/misc/judge_symbols.gbapal.lz" + .incbin "graphics/contest/judge_symbols.gbapal.lz" .align 2 gTiles_8D1975C:: @ 8D1975C - .incbin "baserom.gba", 0x00d1975c, 0x20 + .incbin "graphics/contest/heart.4bpp" .align 2 gUnknown_08D1977C:: @ 8D1977C - .incbin "baserom.gba", 0xD1977C, 0xAD1 @ LZ, uncomp. size = 0x2400 + .incbin "graphics/contest/misc_2.4bpp.lz" .align 2 gUnknown_08D1A250:: @ 8D1A250 - .incbin "baserom.gba", 0xD1A250, 0x112 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_1.bin.lz" .align 2 gUnknown_08D1A364:: @ 8D1A364 - .incbin "baserom.gba", 0xD1A364, 0x129 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_2.bin.lz" .align 2 gUnknown_08D1A490:: @ 8D1A490 - .incbin "baserom.gba", 0xD1A490, 0x188 @ LZ, uncomp. size = 0x800 + .incbin "graphics/contest/misc_2_tilemap_3.bin.lz" .align 2 gUnknown_08D1A618:: @ 8D1A618 - .incbin "baserom.gba", 0xD1A618, 0xEA @ LZ, uncomp. size = 0x200 + .incbin "graphics/contest/misc_2.gbapal.lz" .align 2 gBattleAnimSpriteSheet_135:: @ 8D1A704 @@ -1276,10 +1326,10 @@ gBattleAnimSpriteSheet_142:: @ 8D1B1B8 .incbin "graphics/battle_anims/sprites/142.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B218, 0x9C @ LZ, uncomp. size = 0x200 + .incbin "graphics/unused/old_beatup.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1B2B4, 0x1B @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/old_beatup.gbapal.lz" .align 2 gBattleAnimSpriteSheet_147:: @ 8D1B2D0 @@ -1398,13 +1448,13 @@ gBattleAnimSpritePalette_144:: @ 8D1C040 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C060, 0x26 @ LZ, uncomp. size = 0x60 + .incbin "graphics/unknown/unknown_D1C060.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1C088, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unknown/unknown_D1C060.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1C0A0, 0x102 @ LZ, uncomp. size = 0x800 + .incbin "graphics/unknown/unknown_D1C060.bin.lz" .align 2 gBattleAnimSpriteSheet_162:: @ 8D1C1A4 @@ -1472,11 +1522,11 @@ gBattleAnimSpritePalette_172:: @ 8D1C728 .align 2 gContestJudgeGfx:: - .incbin "graphics/misc/judge.4bpp.lz" + .incbin "graphics/contest/judge.4bpp.lz" .align 2 gContest2Pal:: @ 8D1CA1C - .incbin "graphics/misc/judge.gbapal.lz" + .incbin "graphics/contest/judge.gbapal.lz" .align 2 gBattleAnimSpriteSheet_001:: @ 8D1CA44 @@ -1504,24 +1554,24 @@ gBattleAnimBackgroundTilemap_00:: @ 8D1D1C0 .align 2 gUnknown_08D1D410:: @ 8D1D410 - .incbin "baserom.gba", 0xD1D410, 0x13A @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz" .align 2 gUnknown_08D1D54C:: @ 8D1D54C - .incbin "baserom.gba", 0xD1D54C, 0x28 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz" .align 2 gUnknown_08D1D574:: @ 8D1D574 - .incbin "baserom.gba", 0xD1D574, 0x172 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/metal_shine.bin.lz" .align 2 - .incbin "baserom.gba", 0xD1D6E8, 0x10E @ LZ, uncomp. size = 0x600 + .incbin "graphics/unused/goosuto.4bpp.lz" @ ghost .align 2 - .incbin "baserom.gba", 0xD1D7F8, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/goosuto.gbapal.lz" .align 2 - .incbin "baserom.gba", 0xD1D810, 0x14E @ LZ, uncomp. size = 0x800 + .incbin "graphics/unused/goosuto.bin.lz" .align 2 gBattleAnimSpriteSheet_174:: @ 8D1D960 @@ -1641,29 +1691,29 @@ gBattleAnimSpritePalette_186:: @ 8D1F508 .align 2 gBattleWindowLargeGfx:: - .incbin "graphics/interface/battle_window.4bpp.lz" + .incbin "graphics/battle_interface/window.4bpp.lz" .align 2 gBattleWindowSmallGfx:: - .incbin "graphics/interface/battle_window2.4bpp.lz" + .incbin "graphics/battle_interface/window2.4bpp.lz" .align 2 gBattleWindowSmall2Gfx:: - .incbin "graphics/interface/battle_window3.4bpp.lz" + .incbin "graphics/battle_interface/window3.4bpp.lz" .align 2 gBattleWindowSmall3Gfx:: - .incbin "graphics/interface/battle_window4.4bpp.lz" + .incbin "graphics/battle_interface/window4.4bpp.lz" .align 2 -gBattleWindowLarge2Gfx:: @ 8d1fc94 - .incbin "graphics/interface/battle_window5.4bpp.lz" +gBattleWindowLarge2Gfx:: + .incbin "graphics/battle_interface/window5.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF0C, 0x5D @ LZ, uncomp. size = 0x100 + .incbin "graphics/unused/shadow.4bpp.lz" .align 2 - .incbin "baserom.gba", 0xD1FF6C, 0x12 @ LZ, uncomp. size = 0x20 + .incbin "graphics/unused/shadow.gbapal.lz" .align 2 gBattleAnimSpriteSheet_014:: @ 8D1FF80 @@ -1715,11 +1765,11 @@ gBattleAnimSpritePalette_193:: @ 8D209EC .align 2 gUnknown_08D20A14:: @ 8D20A14 - .incbin "baserom.gba", 0xD20A14, 0x1A @ LZ, uncomp. size = 0x60 + .incbin "graphics/battle_anims/masks/curse.4bpp.lz" .align 2 gUnknown_08D20A30:: @ 8D20A30 - .incbin "baserom.gba", 0xD20A30, 0xFD @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/curse.bin.lz" .align 2 gBattleAnimSpriteSheet_002:: @ 8D20B30 @@ -1822,7 +1872,6 @@ gBattleAnimSpriteSheet_206:: @ 8D227B0 .incbin "graphics/battle_anims/sprites/206.4bpp.lz" .align 2 -gUnknown_08D229BC:: gBattleAnimSpritePalette_206:: @ 8D229BC .incbin "graphics/battle_anims/sprites/206.gbapal.lz" @@ -1879,16 +1928,16 @@ gBattleAnimSpritePalette_216:: @ 8D2366C .incbin "graphics/battle_anims/sprites/216.gbapal.lz" .align 2 -gUnknown_08D2368C:: @ 8D2368C - .incbin "baserom.gba", 0xD2368C, 0xA6E @ LZ, uncomp. size = 0x2000 +gAttractGfx:: @ 8D2368C + .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" .align 2 -gUnknown_08D240FC:: @ 8D240FC - .incbin "baserom.gba", 0xD240FC, 0x28 @ LZ, uncomp. size = 0x20 +gAttractPal:: @ 8D240FC + .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" .align 2 -gUnknown_08D24124:: @ 8D24124 - .incbin "baserom.gba", 0xD24124, 0x27A @ LZ, uncomp. size = 0x800 +gAttractTilemap:: @ 8D24124 + .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" .align 2 gBattleAnimSpriteSheet_217:: @ 8D243A0 @@ -1927,12 +1976,12 @@ gBattleAnimSpritePalette_215:: @ 8D24D58 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 -gUnknown_08D24D7C:: @ 8D24D7C - .incbin "baserom.gba", 0xD24D7C, 0x28 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundPalette_ScaryFace:: @ 8D24D7C + .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gUnknown_08D24DA4:: @ 8D24DA4 - .incbin "baserom.gba", 0xD24DA4, 0x22D @ LZ, uncomp. size = 0xA00 +gBattleAnimBackgroundImage_ScaryFace:: @ 8D24DA4 + .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 gBattleAnimSpritePalette_218:: @ 8D24FD4 @@ -2176,15 +2225,15 @@ gBattleAnimBackgroundTilemap_10:: @ 8D2A6E8 .align 2 gUnknown_08D2A9E0:: @ 8D2A9E0 - .incbin "baserom.gba", 0xD2A9E0, 0x9F @ LZ, uncomp. size = 0x280 + .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" .align 2 gUnknown_08D2AA80:: @ 8D2AA80 - .incbin "baserom.gba", 0xD2AA80, 0x16 @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" .align 2 gUnknown_08D2AA98:: @ 8D2AA98 - .incbin "baserom.gba", 0xD2AA98, 0x11B @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" .align 2 gBattleAnimBackgroundTilemap_12:: @ 8D2ABB4 @@ -2243,16 +2292,16 @@ gBattleAnimSpritePalette_240:: @ 8D2D240 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 -gUnknown_08D2D268:: @ 8D2D268 - .incbin "baserom.gba", 0xD2D268, 0x24 @ LZ, uncomp. size = 0x20 +gSubstituteDollPal:: @ 8D2D268 + .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" .align 2 -gUnknown_08D2D28C:: @ 8D2D28C - .incbin "baserom.gba", 0xD2D28C, 0x23D @ LZ, uncomp. size = 0x800 +gSubstituteDollGfx:: @ 8D2D28C + .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" .align 2 -gUnknown_08D2D4CC:: @ 8D2D4CC - .incbin "baserom.gba", 0xD2D4CC, 0x225 @ LZ, uncomp. size = 0x800 +gSubstituteDollTilemap:: @ 8D2D4CC + .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 gBattleAnimSpriteSheet_241:: @ 8D2D6F4 @@ -2287,60 +2336,60 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4 .incbin "graphics/battle_anims/sprites/243.gbapal.lz" .align 2 -gUnknown_08D2DACC:: @ 8D2DACC - .incbin "baserom.gba", 0xD2DACC, 0x20E @ LZ, uncomp. size = 0x800 +gBattleStatMask_Gfx:: @ 8D2DACC + .incbin "graphics/battle_anims/masks/stat.4bpp.lz" .align 2 -gUnknown_08D2DCDC:: @ 8D2DCDC - .incbin "baserom.gba", 0xD2DCDC, 0x11C @ LZ, uncomp. size = 0x800 +gBattleStatMask1_Tilemap:: @ 8D2DCDC + .incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz" .align 2 -gUnknown_08D2DDF8:: @ 8D2DDF8 - .incbin "baserom.gba", 0xD2DDF8, 0x11C @ LZ, uncomp. size = 0x800 +gBattleStatMask2_Tilemap:: @ 8D2DDF8 + .incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz" .align 2 -gUnknown_08D2DF14:: @ 8D2DF14 - .incbin "baserom.gba", 0xD2DF14, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask1_Pal:: @ 8D2DF14 + .incbin "graphics/battle_anims/masks/stat1.gbapal.lz" .align 2 -gUnknown_08D2DF34:: @ 8D2DF34 - .incbin "baserom.gba", 0xD2DF34, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask2_Pal:: @ 8D2DF34 + .incbin "graphics/battle_anims/masks/stat2.gbapal.lz" .align 2 -gUnknown_08D2DF54:: @ 8D2DF54 - .incbin "baserom.gba", 0xD2DF54, 0x1F @ LZ, uncomp. size = 0x20 +gBattleStatMask3_Pal:: @ 8D2DF54 + .incbin "graphics/battle_anims/masks/stat3.gbapal.lz" .align 2 -gUnknown_08D2DF74:: @ 8D2DF74 - .incbin "baserom.gba", 0xD2DF74, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask4_Pal:: @ 8D2DF74 + .incbin "graphics/battle_anims/masks/stat4.gbapal.lz" .align 2 -gUnknown_08D2DF94:: @ 8D2DF94 - .incbin "baserom.gba", 0xD2DF94, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask5_Pal:: @ 8D2DF94 + .incbin "graphics/battle_anims/masks/stat5.gbapal.lz" .align 2 -gUnknown_08D2DFB4:: @ 8D2DFB4 - .incbin "baserom.gba", 0xD2DFB4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask6_Pal:: @ 8D2DFB4 + .incbin "graphics/battle_anims/masks/stat6.gbapal.lz" .align 2 -gUnknown_08D2DFD4:: @ 8D2DFD4 - .incbin "baserom.gba", 0xD2DFD4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask7_Pal:: @ 8D2DFD4 + .incbin "graphics/battle_anims/masks/stat7.gbapal.lz" .align 2 -gUnknown_08D2DFF4:: @ 8D2DFF4 - .incbin "baserom.gba", 0xD2DFF4, 0x1D @ LZ, uncomp. size = 0x20 +gBattleStatMask8_Pal:: @ 8D2DFF4 + .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" .align 2 gUnknown_08D2E014:: @ 8D2E014 - .incbin "baserom.gba", 0xD2E014, 0x13A @ LZ, uncomp. size = 0x200 + .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" .align 2 gUnknown_08D2E150:: @ 8D2E150 - .incbin "baserom.gba", 0xD2E150, 0x1D @ LZ, uncomp. size = 0x20 + .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" .align 2 gUnknown_08D2E170:: @ 8D2E170 - .incbin "baserom.gba", 0xD2E170, 0x11C @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" .align 2 gBattleAnimSpritePalette_245:: @ 8D2E28C @@ -2372,11 +2421,11 @@ gBattleAnimSpriteSheet_053:: @ 8D2EBDC .align 2 gUnknown_08D2EDFC:: @ 8D2EDFC - .incbin "baserom.gba", 0xD2EDFC, 0x4B @ LZ, uncomp. size = 0x1C0 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.4bpp.lz" .align 2 gUnknown_08D2EE48:: @ 8D2EE48 - .incbin "baserom.gba", 0xD2EE48, 0x106 @ LZ, uncomp. size = 0x800 + .incbin "graphics/battle_anims/masks/unknown_D2EDFC.bin.lz" .align 2 gBattleAnimSpriteSheet_248:: @ 8D2EF50 @@ -2477,16 +2526,16 @@ gMonFootprint_QuestionMark:: @ 8E5D9F0 .incbin "graphics/pokemon/question_mark/footprint.1bpp" .align 2 -gUnknown_08E5DA10:: @ 8E5DA10 - .incbin "baserom.gba", 0xE5DA10, 0xE5 @ LZ, uncomp. size = 0x200 +gVersusFrameGfx:: @ 8E5DA10 + .incbin "graphics/battle_transitions/vs_frame.4bpp.lz" .align 2 -gUnknown_08E5DAF8:: @ 8E5DAF8 - .incbin "baserom.gba", 0xE5DAF8, 0x10A @ LZ, uncomp. size = 0x800 +gVersusFrameTilemap:: @ 8E5DAF8 + .incbin "graphics/battle_transitions/vs_frame.bin.lz" .align 2 -gUnknown_08E5DC04:: @ 8E5DC04 - .incbin "baserom.gba", 0xE5DC04, 0x28 @ LZ, uncomp. size = 0x20 +gVersusFramePal:: @ 8E5DC04 + .incbin "graphics/battle_transitions/vs_frame.gbapal.lz" .align 2 gUnknown_08E5DC2C:: @ 8E5DC2C @@ -2597,68 +2646,68 @@ gBattleTerrainTiles_Building:: @ 8E62514 .incbin "graphics/battle_terrain/building/tiles.4bpp.lz" .align 2 -gUnknown_08E62AC0:: @ 8E62AC0 - .incbin "baserom.gba", 0xE62AC0, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BattleTower:: @ 8E62AC0 + .incbin "graphics/battle_terrain/stadium/battle_tower.gbapal.lz" @ this is also used for link battles .align 2 gBattleTerrainTilemap_Building:: @ 8E62AFC .incbin "graphics/battle_terrain/building/map.bin.lz" .align 2 -gUnknown_08E62DAC:: @ 8E62DAC - .incbin "baserom.gba", 0xE62DAC, 0x606 @ LZ, uncomp. size = 0x2000 +gBattleTerrainTiles_Stadium:: @ 8E62DAC + .incbin "graphics/battle_terrain/stadium/tiles.4bpp.lz" .align 2 -gUnknown_08E633B4:: @ 8E633B4 - .incbin "baserom.gba", 0xE633B4, 0x2AE @ LZ, uncomp. size = 0x1000 +gBattleTerrainTilemap_Stadium:: @ 8E633B4 + .incbin "graphics/battle_terrain/stadium/map.bin.lz" .align 2 gBattleTerrainPalette_Building:: @ 8E63664 .incbin "graphics/battle_terrain/building/palette.gbapal.lz" .align 2 -gUnknown_08E636A4:: @ 8E636A4 - .incbin "baserom.gba", 0xE636A4, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Kyogre:: + .incbin "graphics/battle_terrain/water/kyogre.gbapal.lz" .align 2 -gUnknown_08E636E0:: @ 8E636E0 - .incbin "baserom.gba", 0xE636E0, 0x57 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_Groudon:: + .incbin "graphics/battle_terrain/cave/groudon.gbapal.lz" .align 2 -gUnknown_08E63738:: @ 8E63738 - .incbin "baserom.gba", 0xE63738, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingGym:: @ 8E63738 + .incbin "graphics/battle_terrain/building/palette2.gbapal.lz" .align 2 -gUnknown_08E63774:: @ 8E63774 - .incbin "baserom.gba", 0xE63774, 0x3C @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_BuildingLeader:: @ 8E63774 + .incbin "graphics/battle_terrain/building/palette3.gbapal.lz" .align 2 -gUnknown_08E637B0:: @ 8E637B0 - .incbin "baserom.gba", 0xE637B0, 0x5E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumAqua:: @ 8E637B0 + .incbin "graphics/battle_terrain/stadium/palette1.gbapal.lz" .align 2 -gUnknown_08E63810:: @ 8E63810 - .incbin "baserom.gba", 0xE63810, 0x6A @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumMagma:: @ 8E63810 + .incbin "graphics/battle_terrain/stadium/palette2.gbapal.lz" .align 2 -gUnknown_08E6387C:: @ 8E6387C - .incbin "baserom.gba", 0xE6387C, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSidney:: @ 8E6387C + .incbin "graphics/battle_terrain/stadium/palette3.gbapal.lz" .align 2 -gUnknown_08E638CC:: @ 8E638CC - .incbin "baserom.gba", 0xE638CC, 0x48 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumPhoebe:: @ 8E638CC + .incbin "graphics/battle_terrain/stadium/palette4.gbapal.lz" .align 2 -gUnknown_08E63914:: @ 8E63914 - .incbin "baserom.gba", 0xE63914, 0x41 @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumGlacia:: @ 8E63914 + .incbin "graphics/battle_terrain/stadium/palette5.gbapal.lz" .align 2 -gUnknown_08E63958:: @ 8E63958 - .incbin "baserom.gba", 0xE63958, 0x4E @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumDrake:: @ 8E63958 + .incbin "graphics/battle_terrain/stadium/palette6.gbapal.lz" .align 2 -gUnknown_08E639A8:: @ 8E639A8 - .incbin "baserom.gba", 0xE639A8, 0x3B @ LZ, uncomp. size = 0x60 +gBattleTerrainPalette_StadiumSteven:: @ 8E639A8 + .incbin "graphics/battle_terrain/stadium/palette7.gbapal.lz" .align 2 gBattleTerrainAnimTiles_TallGrass:: @ 8E639E4 @@ -2737,14 +2786,14 @@ gBattleAnimSpriteSheet_261:: @ 8E67D6C .incbin "graphics/battle_anims/sprites/261.4bpp.lz" .align 2 -gUnknown_08E67ED8:: @ 8E67ED8 - .incbin "baserom.gba", 0xE67ED8, 0x17C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_SandstormBrew:: @ 8E67ED8 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.bin.lz" .align 2 -gUnknown_08E68054:: @ 8E68054 - .incbin "baserom.gba", 0xE68054, 0x52C @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundImage_SandstormBrew:: @ 8E68054 + .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" -gUnknown_08E68580:: @ 8E68580 + .align 2 gBattleAnimSpritePalette_261:: @ 8E68580 .incbin "graphics/battle_anims/sprites/261.gbapal.lz" @@ -2778,13 +2827,15 @@ gBattleAnimSpritePalette_262:: @ 8E693DC .align 2 gContestNextTurnGfx:: - .incbin "graphics/misc/nextturn.4bpp.lz" + .incbin "graphics/contest/nextturn.4bpp.lz" -gUnknown_08E69478:: @ 8E69478 - .incbin "baserom.gba", 0x00e69478, 0x100 + .align 2 +gContestNextTurnNumbersGfx:: @ 8E69478 + .incbin "graphics/contest/nextturn_numbers.4bpp" -gUnknown_08E69578:: @ 8E69578 - .incbin "baserom.gba", 0x00e69578, 0x40 + .align 2 +gContestNextTurnRandomGfx:: @ 8E69578 + .incbin "graphics/contest/nextturn_random.4bpp" .align 2 gBattleAnimSpriteSheet_264:: @ 8E695B8 @@ -2808,14 +2859,15 @@ gBattleAnimSpritePalette_068:: @ 8E69628 .align 2 gContestApplauseGfx:: - .incbin "graphics/misc/applause.4bpp.lz" + .incbin "graphics/contest/applause.4bpp.lz" -gUnknown_08E6978C:: @ 8E6978C - .incbin "baserom.gba", 0x00e6978c, 0x80 + .align 2 +gContestApplauseMeterGfx:: @ 8E6978C + .incbin "graphics/contest/applause_meter.4bpp" .align 2 gContestPal:: - .incbin "graphics/misc/nextturn.gbapal" + .incbin "graphics/contest/nextturn.gbapal" .align 2 gBattleAnimSpriteSheet_272:: @ 8E6982C @@ -2874,16 +2926,16 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4 .incbin "graphics/battle_anims/sprites/280.gbapal.lz" .align 2 -gUnknown_08E6A704:: @ 8E6A704 - .incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundImageMuddyWater_Pal:: @ 8E6A704 + .incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz" .align 2 -gUnknown_08E6A728:: @ 8E6A728 - .incbin "baserom.gba", 0xE6A728, 0x2E @ LZ, uncomp. size = 0x80 +gEnemyMonShadow_Gfx:: @ 8E6A728 + .incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz" .align 2 -gUnknown_08E6A758:: @ 8E6A758 - .incbin "baserom.gba", 0xE6A758, 0x81 @ LZ, uncomp. size = 0x200 +gBattleGfx_BallStatusBar:: @ 8E6A758 + .incbin "graphics/battle_interface/bar.4bpp.lz" .align 2 gMonIcon_Egg:: @ 8E6A7DC @@ -2945,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gUnknown_08E6DE48:: @ 8E6DE48 - .incbin "baserom.gba", 0xE6DE48, 0x176 @ LZ, uncomp. size = 0x800 +gWeatherFog1Tilemap:: @ 8E6DE48 + .incbin "graphics/weather/fog1.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 @@ -2957,16 +3009,16 @@ gBattleAnimSpriteSheet_283:: @ 8E6DFDC .incbin "graphics/battle_anims/sprites/283.4bpp.lz" .align 2 -gUnknown_08E6E100:: @ 8E6E100 - .incbin "baserom.gba", 0xE6E100, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFacePlayer:: @ 8E6E100 + .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" .align 2 -gUnknown_08E6E2E4:: @ 8E6E2E4 - .incbin "baserom.gba", 0xE6E2E4, 0x1E4 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceOpponent:: @ 8E6E2E4 + .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" .align 2 -gUnknown_08E6E4C8:: @ 8E6E4C8 - .incbin "baserom.gba", 0xE6E4C8, 0x1E2 @ LZ, uncomp. size = 0x800 +gBattleAnimBackgroundTilemap_ScaryFaceContest:: @ 8E6E4C8 + .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" .align 2 gBattleAnimSpriteSheet_263:: @ 8E6E6AC @@ -3045,12 +3097,12 @@ gBattleAnimSpritePalette_285:: @ 8E6F5F8 .incbin "graphics/battle_anims/sprites/285.gbapal.lz" .align 2 -gUnknown_08E6F620:: @ 8E6F620 - .incbin "baserom.gba", 0xE6F620, 0x131D @ LZ, uncomp. size = 0x2000 +gBattleAnimBackgroundImage_Surf:: @ 8E6F620 + .incbin "graphics/battle_anims/backgrounds/water.4bpp.lz" .align 2 -gUnknown_08E70940:: @ 8E70940 - .incbin "baserom.gba", 0xE70940, 0x25 @ LZ, uncomp. size = 0x20 +gBattleAnimBackgroundPalette_Surf:: @ 8E70940 + .incbin "graphics/battle_anims/backgrounds/water.gbapal.lz" .align 2 gUnknown_08E70968:: @ 8E70968 @@ -3077,37 +3129,38 @@ gBattleAnimSpritePalette_188:: @ 8E7133C .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 -gUnknown_08E71354:: @ 8E71354 - .incbin "baserom.gba", 0xE71354, 0x34C @ LZ, uncomp. size = 0xE80 +gPartyMenuMisc_Gfx:: @ 8E71354 + .incbin "graphics/interface/party_menu_misc.4bpp.lz" .align 2 -gUnknown_08E716A0:: @ 8E716A0 - .incbin "baserom.gba", 0xE716A0, 0xE7 @ LZ, uncomp. size = 0x160 +gPartyMenuMisc_Pal:: @ 8E716A0 + .incbin "graphics/interface/party_menu_misc.gbapal.lz" .align 2 -gUnknown_08E71788:: @ 8E71788 - .incbin "baserom.gba", 0xE71788, 0x10B @ LZ, uncomp. size = 0x800 +gPartyMenuMisc_Tilemap:: @ 8E71788 + .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 -gUnknown_08E71894:: @ 8E71894 - .incbin "baserom.gba", 0xE71894, 0x9D @ LZ, uncomp. size = 0x180 +gPartyMenuHpBar_Gfx:: @ 8E71894 + .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" .align 2 -gUnknown_08E71934:: @ 8E71934 - .incbin "baserom.gba", 0xE71934, 0x3D9 @ LZ, uncomp. size = 0x1000 +gPartyMenuOrderText_Gfx:: @ 8E71934 + .incbin "graphics/interface/party_menu_ordertext.4bpp.lz" .align 2 -gUnknown_08E71D10:: @ 8E71D10 - .incbin "baserom.gba", 0xE71D10, 0x9D1 @ LZ, uncomp. size = 0x1700 +gMoveTypes_Gfx:: @ 8E71D10 + .incbin "graphics/types/move_types.4bpp.lz" .align 2 -gUnknown_08E726E4:: @ 8E726E4 - .incbin "baserom.gba", 0xE726E4, 0x67 @ LZ, uncomp. size = 0x60 +gMoveTypes_Pal:: @ 8E726E4 + .incbin "graphics/types/move_types.gbapal.lz" .align 2 gMenuSummaryGfx:: @ 8E7274C .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused. + .align 2 gMenuSummaryPal:: @ 8E72848 .incbin "graphics/interface/summary_frames.gbapal.lz" @@ -3120,19 +3173,20 @@ gStatusPal_Icons:: @ 8E72A50 .incbin "graphics/interface/status_icons.gbapal.lz" .align 2 -gUnknown_08E72A78:: @ 8E72A78 - .incbin "baserom.gba", 0xE72A78, 0x9F0 @ LZ, uncomp. size = 0x1B20 +gStatusScreen_Gfx:: @ 8E72A78 + .incbin "graphics/interface/status_screen.4bpp.lz" .align 2 -gUnknown_08E73468:: @ 8E73468 - .incbin "baserom.gba", 0xE73468, 0xA0 @ LZ, uncomp. size = 0xA0 +gStatusScreen_Pal:: @ 8E73468 + .incbin "graphics/interface/status_screen.gbapal.lz" + .align 2 gUnknown_08E73508:: @ 8E73508 - .incbin "baserom.gba", 0x00e73508, 0x800 + .incbin "baserom.gba", 0xE73508, 0x800 .align 2 -gUnknown_08E73D08:: @ 8E73D08 - .incbin "baserom.gba", 0xE73D08, 0x180 @ LZ, uncomp. size = 0x800 +gStatusScreen_Tilemap:: @ 8E73D08 + .incbin "graphics/interface/status_screen.bin.lz" gUnknown_08E73E88:: @ 8E73E88 .incbin "baserom.gba", 0x00e73e88, 0x800 @@ -3157,43 +3211,43 @@ gBagPalette:: @ 8E76700 .incbin "graphics/misc/bag.gbapal.lz" .align 2 -gUnknown_08E76728:: @ 8E76728 - .incbin "baserom.gba", 0xE76728, 0x86B @ LZ, uncomp. size = 0x2000 +gBagScreen_Gfx:: @ 8E76728 + .incbin "graphics/interface/bag_screen.4bpp.lz" .align 2 -gUnknown_08E76F94:: @ 8E76F94 - .incbin "baserom.gba", 0xE76F94, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenMale_Pal:: @ 8E76F94 + .incbin "graphics/interface/bag_screen_male.gbapal.lz" .align 2 -gUnknown_08E76FCC:: @ 8E76FCC - .incbin "baserom.gba", 0xE76FCC, 0x38 @ LZ, uncomp. size = 0x40 +gBagScreenFemale_Pal:: @ 8E76FCC + .incbin "graphics/interface/bag_screen_female.gbapal.lz" gUnknown_08E77004:: @ 8E77004 .incbin "baserom.gba", 0x00e77004, 0x800 .align 2 -gUnknown_08E77804:: @ 8E77804 - .incbin "baserom.gba", 0xE77804, 0xFA @ LZ, uncomp. size = 0x300 +gBuyMenuFrame_Gfx:: @ 8E77804 + .incbin "graphics/interface/mart_frame.4bpp.lz" .align 2 gMenuMoneyPal:: @ 8E77900 .incbin "graphics/interface/money.gbapal.lz" .align 2 -gUnknown_08E77928:: @ 8E77928 - .incbin "baserom.gba", 0xE77928, 0x134 @ LZ, uncomp. size = 0x800 +gBuyMenuFrame_Tilemap:: @ 8E77928 + .incbin "graphics/interface/mart_frame.bin.lz" .align 2 gMenuMoneyGfx:: @ 8E77A5C .incbin "graphics/interface/money.4bpp.lz" .align 2 -gUnknown_08E77AE4:: @ 8E77AE4 - .incbin "baserom.gba", 0xE77AE4, 0x23A @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Gfx:: @ 8E77AE4 + .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" .align 2 -gUnknown_08E77D20:: @ 8E77D20 - .incbin "baserom.gba", 0xE77D20, 0x6E @ LZ, uncomp. size = 0xC0 +gMenuPokeblock_Pal:: @ 8E77D20 + .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" .align 2 gMenuPokeblockDevice_Gfx:: @ 8E77D90 @@ -3204,80 +3258,80 @@ gMenuPokeblockDevice_Pal:: @ 8E78050 .incbin "graphics/interface/pokeblock_device.gbapal.lz" .align 2 -gUnknown_08E78078:: @ 8E78078 - .incbin "baserom.gba", 0xE78078, 0x150 @ LZ, uncomp. size = 0x800 +gMenuPokeblock_Tilemap:: @ 8E78078 + .incbin "graphics/interface/pokeblock.bin.lz" .align 2 gPokeblock_Gfx:: - .incbin "graphics/misc/pokeblock.4bpp.lz" + .incbin "graphics/pokeblock/pokeblock.4bpp.lz" .align 2 -gUnknown_08E781E4:: - .incbin "baserom.gba", 0xE781E4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockRed_Pal:: + .incbin "graphics/pokeblock/red.gbapal.lz" .align 2 -gUnknown_08E781F8:: - .incbin "baserom.gba", 0xE781F8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlue_Pal:: + .incbin "graphics/pokeblock/blue.gbapal.lz" .align 2 -gUnknown_08E7820C:: - .incbin "baserom.gba", 0xE7820C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPink_Pal:: + .incbin "graphics/pokeblock/pink.gbapal.lz" .align 2 -gUnknown_08E78220:: - .incbin "baserom.gba", 0xE78220, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGreen_Pal:: + .incbin "graphics/pokeblock/green.gbapal.lz" .align 2 -gUnknown_08E78234:: - .incbin "baserom.gba", 0xE78234, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockYellow_Pal:: + .incbin "graphics/pokeblock/yellow.gbapal.lz" .align 2 -gUnknown_08E78248:: - .incbin "baserom.gba", 0xE78248, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockPurple_Pal:: + .incbin "graphics/pokeblock/purple.gbapal.lz" .align 2 -gUnknown_08E7825C:: - .incbin "baserom.gba", 0xE7825C, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockIndigo_Pal:: + .incbin "graphics/pokeblock/indigo.gbapal.lz" .align 2 -gUnknown_08E78270:: - .incbin "baserom.gba", 0xE78270, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBrown_Pal:: + .incbin "graphics/pokeblock/brown.gbapal.lz" .align 2 -gUnknown_08E78284:: - .incbin "baserom.gba", 0xE78284, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockLiteBlue_Pal:: + .incbin "graphics/pokeblock/liteblue.gbapal.lz" .align 2 -gUnknown_08E78298:: - .incbin "baserom.gba", 0xE78298, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockOlive_Pal:: + .incbin "graphics/pokeblock/olive.gbapal.lz" .align 2 -gUnknown_08E782ac:: - .incbin "baserom.gba", 0xE782AC, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGray_Pal:: + .incbin "graphics/pokeblock/gray.gbapal.lz" .align 2 -gUnknown_08E782c0:: - .incbin "baserom.gba", 0xE782C0, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockBlack_Pal:: + .incbin "graphics/pokeblock/black.gbapal.lz" .align 2 -gUnknown_08E782d4:: - .incbin "baserom.gba", 0xE782D4, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockWhite_Pal:: + .incbin "graphics/pokeblock/white.gbapal.lz" .align 2 -gUnknown_08E782e8:: - .incbin "baserom.gba", 0xE782E8, 0x14 @ LZ, uncomp. size = 0x20 +gPokeblockGold_Pal:: + .incbin "graphics/pokeblock/gold.gbapal.lz" .align 2 gUnknown_08E782FC:: @ 8E782FC .incbin "baserom.gba", 0xE782FC, 0x100 @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E783FC:: @ 8E783FC - .incbin "baserom.gba", 0xE783FC, 0x43E @ LZ, uncomp. size = 0xC00 +gBerryCheck_Gfx:: @ 8E783FC + .incbin "graphics/interface/check_berry.4bpp.lz" .align 2 -gUnknown_08E7883C:: @ 8E7883C - .incbin "graphics/battle_transitions/vs.gbapal.lz" +gBerryCheck_Pal:: @ 8E7883C + .incbin "graphics/interface/check_berry.gbapal.lz" .align 2 gUnknown_08E788E4:: @ 8E788E4 @@ -3288,8 +3342,8 @@ gUnknown_08E78A84:: @ 8E78A84 .incbin "baserom.gba", 0xE78A84, 0x12D @ LZ, uncomp. size = 0x800 .align 2 -gUnknown_08E78BB4:: @ 8E78BB4 - .incbin "baserom.gba", 0xE78BB4, 0x14C @ LZ, uncomp. size = 0x800 +gBerryCheckCircle_Gfx:: @ 8E78BB4 + .incbin "graphics/interface/check_berry_circle.4bpp.lz" @ 8E78D00 .include "data/graphics/berries/graphics.s" @@ -3318,27 +3372,29 @@ gBattleAnimSpritePalette_271:: @ 8E7EB24 gBattleAnimSpriteSheet_271:: @ 8E7EB3C .incbin "graphics/battle_anims/sprites/271.4bpp.lz" -gUnknown_08E7EB9C:: @ 8E7EB9C - .incbin "baserom.gba", 0xe7eb9c, 0x80 + .align 2 +gCableCarBG_Pal:: @ 8E7EB9C + .incbin "graphics/misc/cable_car_bg.gbapal" -Palette_08E7EC1C:: @ 8E7EC1C - .incbin "baserom.gba", 0xe7ec1c, 0x20 + .align 2 +gCableCar_Pal:: @ 8E7EC1C + .incbin "graphics/misc/cable_car.gbapal" .align 2 -gUnknown_08E7EC3C:: @ 8E7EC3C - .incbin "baserom.gba", 0xE7EC3C, 0x19D6 @ LZ, uncomp. size = 0x4000 +gCableCarBG_Gfx:: @ 8E7EC3C + .incbin "graphics/misc/cable_car_bg.4bpp.lz" .align 2 -gUnknown_08E80614:: @ 8E80614 - .incbin "baserom.gba", 0xE80614, 0x2FF @ LZ, uncomp. size = 0x800 +gCableCar_Gfx:: @ 8E80614 + .incbin "graphics/misc/cable_car.4bpp.lz" .align 2 -gUnknown_08E80914:: @ 8E80914 - .incbin "baserom.gba", 0xE80914, 0x30 @ LZ, uncomp. size = 0x40 +gCableCarDoor_Gfx:: @ 8E80914 + .incbin "graphics/misc/cable_car_door.4bpp.lz" .align 2 -gUnknown_08E80944:: @ 8E80944 - .incbin "baserom.gba", 0xE80944, 0x28 @ LZ, uncomp. size = 0x80 +gCableCarCord_Gfx:: @ 8E80944 + .incbin "graphics/misc/cable_car_cord.4bpp.lz" .align 2 gUnknown_08E8096C:: @ 8E8096C @@ -3562,10 +3618,11 @@ gNamingScreenLowerTextTiles:: @ 8E85778 gNamingScreenUpperTextTiles:: @ 8E857D8 .incbin "graphics/naming_screen/upper_text.4bpp" - .incbin "baserom.gba", 0x00e85838, 0x160 + .space 352 -gUnknown_08E85998:: @ 8E85998 - .incbin "baserom.gba", 0x00e85998, 0x800 + .align 2 +gNamingScreenMenu_Gfx:: @ 8E85998 + .incbin "graphics/naming_screen/menu.4bpp" .align 2 gNamingScreenPalettes:: @ 8E86198 @@ -3580,22 +3637,20 @@ gUnknown_08E86258:: @ 8E86258 .incbin "baserom.gba", 0x00e86258, 0x500 .align 2 -gUnknown_08E86758:: @ 8E86758 - .incbin "baserom.gba", 0xE86758, 0xD6E @ LZ, uncomp. size = 0x3000 +gPokedexMenu_Gfx:: @ 8E86758 + .incbin "graphics/pokedex/menu.4bpp.lz" .align 2 -gUnknown_08E874C8:: - .incbin "baserom.gba", 0xE874C8, 0x62C @ LZ, uncomp. size = 0x1F00 +gPokedexMenu2_Gfx:: @ 8E874C8 + .incbin "graphics/pokedex/menu2.4bpp.lz" .align 2 -gUnknown_08E87AF4:: - .incbin "baserom.gba", 0x00e87af4, 0x2 - -gUnknown_08E87AF6:: @ 8E87AF6 - .incbin "baserom.gba", 0x00e87af6, 0x60 +gPokedexMenu_Pal:: @ 8E87AF4 + .incbin "graphics/pokedex/menu1.gbapal" -gUnknown_08E87B56:: @ 8E87B56 - .incbin "baserom.gba", 0x00e87b56, 0x5e + .align 2 +gPokedexMenu2_Pal:: @ 8E87B54 + .incbin "graphics/pokedex/menu2.gbapal" .align 2 gAreaUnknownTiles:: @ 8E87BB4 @@ -3606,129 +3661,144 @@ gAreaUnknownPalette:: @ 8E87D90 .incbin "graphics/pokedex/area_unknown.gbapal" .align 2 -gUnknown_08E87DB0:: @ 8E87DB0 - .incbin "baserom.gba", 0xE87DB0, 0x528 @ LZ, uncomp. size = 0x1000 +gPokedexMenuSearch_Gfx:: @ 8E87DB0 + .incbin "graphics/pokedex/menu_search.4bpp.lz" .align 2 -gUnknown_08E882D8:: @ 8E882D8 - .incbin "baserom.gba", 0x00e882d8, 0x80 +gPokedexMenuSearch_Pal:: @ 8E882D8 + .incbin "graphics/pokedex/menu3.gbapal" .align 2 -gUnknown_08E88358:: @ 8E88358 - .incbin "baserom.gba", 0xE88358, 0x173 @ LZ, uncomp. size = 0x600 +gPokenavMainMenu_Gfx:: @ 8E88358 + .incbin "graphics/pokenav/mainmenu.4bpp.lz" .align 2 -gUnknown_08E884CC:: @ 8E884CC - .incbin "baserom.gba", 0xE884CC, 0x55A @ LZ, uncomp. size = 0x1400 +gPokenavMenuOptions_Gfx:: @ 8E884CC + .incbin "graphics/pokenav/menu_options.4bpp.lz" .align 2 -gUnknown_08E88A28:: @ 8E88A28 - .incbin "baserom.gba", 0x00e88a28, 0x20 +gPokenavMenuOptions1_Pal:: @ 8E88A28 + .incbin "graphics/pokenav/pokenav1.gbapal" -gUnknown_08E88A48:: @ 8E88A48 - .incbin "baserom.gba", 0xe88a48, 0x20 + .align 2 +gPokenavMenuOptions2_Pal:: @ 8E88A48 + .incbin "graphics/pokenav/pokenav2.gbapal" -Palette_E88A68:: @ 8E88A68 - .incbin "baserom.gba", 0xe88a68, 0x20 + .align 2 +gPokenavMenuOptions3_Pal:: @ 8E88A68 + .incbin "graphics/pokenav/pokenav3.gbapal" .align 2 -gUnknown_08E88A88:: @ 8E88A88 - .incbin "baserom.gba", 0xE88A88, 0x2C4 @ LZ, uncomp. size = 0xC00 +gPokenavHoennMapHeader_Gfx:: @ 8E88A88 + .incbin "graphics/pokenav/map_header.4bpp.lz" .align 2 -gUnknown_08E88D4C:: @ 8E88D4C - .incbin "baserom.gba", 0xE88D4C, 0x575 @ LZ, uncomp. size = 0x1200 +gPokenavHoennMapMisc_Gfx:: @ 8E88D4C + .incbin "graphics/pokenav/map_misc2.4bpp.lz" .align 2 -gUnknown_08E892C4:: @ 8E892C4 - .incbin "baserom.gba", 0xE892C4, 0x364 @ LZ, uncomp. size = 0x840 +gPokenavHoennMapSquares_Gfx:: @ 8E892C4 + .incbin "graphics/pokenav/map_squares.4bpp.lz" -gUnknown_08E89628:: @ 8E89628 - .incbin "baserom.gba", 0x00e89628, 0x20 + .align 2 +gPokenavHoennMap1_Pal:: @ 8E89628 + .incbin "graphics/pokenav/map_menu.gbapal" -gUnknown_08E89648:: @ 8E89648 + .align 2 +gPokenavHoennMapSquares_Pal:: @ 8E89648 .incbin "graphics/pokenav/map_squares.gbapal" .align 2 -gUnknown_08E89668:: @ 8E89668 - .incbin "baserom.gba", 0xE89668, 0x2EE @ LZ, uncomp. size = 0xC00 +gPokenavConditionMenu_Gfx:: @ 8E89668 + .incbin "graphics/pokenav/condition_menu.4bpp.lz" .align 2 -gUnknown_08E89958:: @ 8E89958 - .incbin "baserom.gba", 0x00e89958, 0x20 +gPokenavConditionMenu_Pal:: @ 8E89958 + .incbin "graphics/pokenav/condition1.gbapal" .align 2 -gUnknown_08E89978:: @ 8E89978 - .incbin "baserom.gba", 0xE89978, 0x15D @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuHeader_Gfx:: @ 8E89978 + .incbin "graphics/pokenav/condition_menu_header.4bpp.lz" .align 2 -gUnknown_08E89AD8:: @ 8E89AD8 - .incbin "baserom.gba", 0xE89AD8, 0x6E6 @ LZ, uncomp. size = 0xFA0 +gPokenavConditionView_Gfx:: @ 8E89AD8 + .incbin "graphics/pokenav/condition_view.4bpp.lz" .align 2 -gUnknown_08E8A1C0:: @ 8E8A1C0 - .incbin "baserom.gba", 0x00e8a1c0, 0x20 +gPokenavConditionMenu2_Pal:: @ 8E8A1C0 + .incbin "graphics/pokenav/condition2.gbapal" .align 2 -gUnknown_08E8A1E0:: @ 8E8A1E0 - .incbin "baserom.gba", 0xE8A1E0, 0x2B8 @ LZ, uncomp. size = 0x800 +gPokenavConditionMenuOptions_Gfx:: @ 8E8A1E0 + .incbin "graphics/pokenav/condition_menu_options.4bpp.lz" -gTiles_08E8A498:: @ 8E8A498 - .incbin "baserom.gba", 0xe8a498, 0x100 + .align 2 +gPokenavConditionMenuCancel_Gfx:: @ 8E8A498 + .incbin "graphics/pokenav/condition_cancel.4bpp" -PokenavContestPokeballPalette:: @ 8E8A598 - .incbin "graphics/pokenav/contest_pokeball.gbapal" + .align 2 +gPokenavConditionPokeball_Pal:: @ 8E8A598 + .incbin "graphics/pokenav/condition3.gbapal" -Palette_E8A5B8:: @ 8E8A5B8 - .incbin "baserom.gba", 0xe8a5b8, 0x20 + .align 2 +gPokenavCondition4_Pal:: @ 8E8A5B8 + .incbin "graphics/pokenav/condition4.gbapal" .align 2 -gUnknown_08E8A5D8:: @ 8E8A5D8 - .incbin "baserom.gba", 0xE8A5D8, 0x1EB @ LZ, uncomp. size = 0x600 +gPokenavConditionMenuOptions2_Gfx:: @ 8E8A5D8 + .incbin "graphics/pokenav/condition_menu_options2.4bpp.lz" .align 2 -gUnknown_08E8A7C4:: @ 8E8A7C4 - .incbin "baserom.gba", 0xe8a7c4, 0x520 +gPokenavConditionMenuMisc_Gfx:: @ 8E8A7C4 + .incbin "graphics/pokenav/condition_menu_misc.4bpp" -Palette_E8ACE4:: @ 8E8ACE4 - .incbin "baserom.gba", 0xe8ace4, 0x20 + .align 2 +gPokenavCondition5_Pal:: @ 8E8ACE4 + .incbin "graphics/pokenav/condition5.gbapal" .align 2 -gUnknown_08E8AD04:: @ 8E8AD04 - .incbin "baserom.gba", 0xE8AD04, 0x4BE @ LZ, uncomp. size = 0x1800 +gPokenavConditionSearch_Gfx:: @ 8E8AD04 + .incbin "graphics/pokenav/condition_search.4bpp.lz" .align 2 -gUnknown_08E8B1C4:: @ 8E8B1C4 - .incbin "baserom.gba", 0x00e8b1c4, 0x20 +gPokenavCondition6_Pal:: @ 8E8B1C4 + .incbin "graphics/pokenav/condition6.gbapal" -gUnknown_08E8B1E4:: @ 8E8B1E4 - .incbin "baserom.gba", 0x00e8b1e4, 0x20 + .align 2 +gPokenavCondition7_Pal:: @ 8E8B1E4 + .incbin "graphics/pokenav/condition7.bin" @ another palette thats impossible to leave as native pal file due to 0xFFFF instead of 0x7FFF. .align 2 -gUnknown_08E8B204:: @ 8E8B204 - .incbin "baserom.gba", 0xE8B204, 0x19B @ LZ, uncomp. size = 0x600 +gPokenavTrainersEyesHeader_Gfx:: @ 8E8B204 + .incbin "graphics/pokenav/trainereyes.4bpp.lz" .align 2 -gUnknown_08E8B3A0:: @ 8E8B3A0 - .incbin "baserom.gba", 0xE8B3A0, 0x140 @ LZ, uncomp. size = 0x600 +gPokenavRibbonsHeader_Gfx:: @ 8E8B3A0 + .incbin "graphics/pokenav/ribbons.4bpp.lz" -gUnknown_08E8B4E0:: @ 8E8B4E0 - .incbin "baserom.gba", 0x00e8b4e0, 0x1400 + .align 2 +gMenuTrainerCard_Gfx:: @ 8E8B4E0 + .incbin "graphics/misc/trainer_card.4bpp" -gUnknown_08E8C8E0:: - .incbin "baserom.gba", 0x00e8c8e0, 0x60 + .align 2 +gMenuTrainerCard0Star_Pal:: + .incbin "graphics/misc/trainer_card_0star.gbapal" -gUnknown_08E8C940:: - .incbin "baserom.gba", 0x00e8c940, 0x60 + .align 2 +gMenuTrainerCard1Star_Pal:: + .incbin "graphics/misc/trainer_card_1star.gbapal" -gUnknown_08E8C9A0:: - .incbin "baserom.gba", 0x00e8c9a0, 0x60 + .align 2 +gMenuTrainerCard2Star_Pal:: + .incbin "graphics/misc/trainer_card_2star.gbapal" -gUnknown_08E8CA00:: - .incbin "baserom.gba", 0x00e8ca00, 0x60 + .align 2 +gMenuTrainerCard3Star_Pal:: + .incbin "graphics/misc/trainer_card_3star.gbapal" -gUnknown_08E8CA60:: - .incbin "baserom.gba", 0x00e8ca60, 0x60 + .align 2 +gMenuTrainerCard4Star_Pal:: + .incbin "graphics/misc/trainer_card_4star.gbapal" gUnknown_08E8CAC0:: .incbin "baserom.gba", 0x00e8cac0, 0x500 @@ -3743,81 +3813,87 @@ gUnknown_08E8D9C0:: @ 8E8D9C0 .incbin "baserom.gba", 0x00e8d9c0, 0x500 .align 2 -gUnknown_08E8DEC0:: @ 8E8DEC0 - .incbin "baserom.gba", 0xE8DEC0, 0x226 @ LZ, uncomp. size = 0x5E0 +gPSSMenuHeader_Gfx:: @ 8E8DEC0 + .incbin "graphics/pokemon_storage/header.4bpp.lz" .align 2 -gUnknown_08E8E0E8:: @ 8E8E0E8 - .incbin "baserom.gba", 0x00e8e0e8, 0x20 - -gUnknown_08E8E108:: @ 8E8E108 - .incbin "baserom.gba", 0x00e8e108, 0x20 +gPSSMenu1_Pal:: @ 8E8E0E8 + .incbin "graphics/pokemon_storage/menu1.gbapal" .align 2 -gUnknown_08E8E128:: @ 8E8E128 - .incbin "baserom.gba", 0xE8E128, 0x119 @ LZ, uncomp. size = 0x500 +gPSSMenu2_Pal:: @ 8E8E108 + .incbin "graphics/pokemon_storage/menu2.bin" .align 2 -gUnknown_08E8E244:: @ 8E8E244 - .incbin "baserom.gba", 0xE8E244, 0x464 @ LZ, uncomp. size = 0xB60 +gPSSMenuHeader_Tilemap:: @ 8E8E128 + .incbin "graphics/pokemon_storage/header.bin.lz" -gUnknown_08E8E6A8:: @ 8E8E6A8 - .incbin "baserom.gba", 0x00e8e6a8, 0x20 + .align 2 +gPSSMenuMisc_Gfx:: @ 8E8E244 + .incbin "graphics/pokemon_storage/misc1.4bpp.lz" -gUnknown_08E8E6C8:: @ 8E8E6C8 - .incbin "baserom.gba", 0x00e8e6c8, 0x20 + .align 2 +gPSSMenu3_Pal:: @ 8E8E6A8 + .incbin "graphics/pokemon_storage/menu3.gbapal" .align 2 -gUnknown_08E8E6E8:: @ 8E8E6E8 - .incbin "baserom.gba", 0xE8E6E8, 0x1C5 @ LZ, uncomp. size = 0x800 +gPSSMenu4_Pal:: @ 8E8E6C8 + .incbin "graphics/pokemon_storage/menu4.gbapal" .align 2 -gUnknown_08E8E8B0:: @ 8E8E8B0 - .incbin "baserom.gba", 0xE8E8B0, 0x1C7 @ LZ, uncomp. size = 0x4A0 +gPSSMenuMisc_Tilemap:: @ 8E8E6E8 + .incbin "graphics/pokemon_storage/misc1.bin.lz" .align 2 -gUnknown_08E8EA78:: @ 8E8EA78 - .incbin "baserom.gba", 0x00e8ea78, 0x20 +gHallOfFame_Gfx:: @ 8E8E8B0 + .incbin "graphics/misc/hof.4bpp.lz" .align 2 -gMenuWordGroup_Gfx:: @ 8E8EA98 - .incbin "graphics/interface/wordgroup.4bpp.lz" +gHallOfFame_Pal:: @ 8E8EA78 + .incbin "graphics/misc/hof.gbapal" .align 2 -gUnknown_08E8EE18:: @ 8E8EE18 - .incbin "baserom.gba", 0xE8EE18, 0x33D @ LZ, uncomp. size = 0x820 +gMenuWordGroupIndicator_Gfx:: @ 8E8EA98 + .incbin "graphics/interface/wordgroup_indicator.4bpp.lz" .align 2 -gMenuWordGroup_Pal:: @ 8E8F158 - .incbin "graphics/interface/wordgroup.gbapal" +gMenuWordGroupFrame_Gfx:: @ 8E8EE18 + .incbin "graphics/interface/wordgroup_frame.4bpp.lz" -gUnknown_08E8F178:: @ 8E8F178 - .incbin "baserom.gba", 0x00e8f178, 0x22 + .align 2 +gMenuWordGroupIndicator_Pal:: @ 8E8F158 + .incbin "graphics/interface/wordgroup_indicator.gbapal" -gUnknown_08E8F19A:: @ 8E8F19A - .incbin "baserom.gba", 0x00e8f19a, 0x6 + .align 2 +gMenuWordGroupFrame1_Pal:: @ 8E8F178 + .incbin "graphics/interface/wordgroup_pink.gbapal" -gUnknown_08E8F1A0:: @ 8E8F1A0 - .incbin "baserom.gba", 0x00e8f1a0, 0x18 + .align 2 +gMenuWordGroupFrame2_Pal:: @ 8E8F198 + .incbin "graphics/interface/wordgroup_blue.gbapal" .align 2 -gUnknown_08E8F1B8:: @ 8E8F1B8 - .incbin "baserom.gba", 0xE8F1B8, 0x649 @ LZ, uncomp. size = 0x1000 +gMiscClock_Gfx:: @ 8E8F1B8 + .incbin "graphics/misc/clock.4bpp.lz" .align 2 -gUnknown_08E8F804:: @ 8E8F804 - .incbin "graphics/misc/clock1.gbapal" +gMiscClockMale_Pal:: @ 8E8F804 + .incbin "graphics/misc/clock1.gbapal" @ male -gUnknown_08E8F824:: @ 8E8F824 - .incbin "graphics/misc/clock2.gbapal" + .align 2 +gMiscClockFemale_Pal:: @ 8E8F824 + .incbin "graphics/misc/clock2.gbapal" @ female .align 2 -gUnknown_08E8F844:: @ 8E8F844 - .incbin "baserom.gba", 0xE8F844, 0xBB3 @ LZ, uncomp. size = 0x1E00 +gSlotMachine_Gfx:: @ 8E8F844 + .incbin "graphics/slot_machine/slots.4bpp.lz" .align 2 -gUnknown_08E903F8:: @ 8E903F8 - .incbin "baserom.gba", 0x00e903f8, 0x220 +gBattleInterfaceStatusIcons_DynPal:: @ 8E903F8 + .incbin "graphics/battle_interface/status.gbapal" + + @ unused + .incbin "graphics/unused/arrow.4bpp" .align 2 gBerryBlenderMarubatsuTiles:: @ 8E90618 @@ -3837,13 +3913,15 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18 gBerryBlenderStartTiles:: @ 8E91018 .incbin "graphics/berry_blender/start.4bpp" - .incbin "baserom.gba", 0x00e91418, 0x200 + .incbin "graphics/unknown/unknown_E91418.bin" + + .space 0x1E0 .align 2 gBerryBlenderArrowTiles:: @ 8E91618 .incbin "graphics/berry_blender/arrow.4bpp" - .incbin "baserom.gba", 0x00e91e18, 0x2c0 + .space 0x2C0 .align 2 gBerryBlenderMiscPalette:: @ 8E920D8 @@ -3920,6 +3998,7 @@ gUnknown_08E964B8:: @ 8E964B8 gUnknown_08E966B8:: @ 8E966B8 .incbin "baserom.gba", 0x00e966b8, 0x20 + .align 2 gMonIconPalettes:: @ 8E966D8 .incbin "graphics/pokemon_icon_palettes/0.gbapal" .incbin "graphics/pokemon_icon_palettes/1.gbapal" @@ -3993,39 +4072,71 @@ gSlotMachineSpritePalette5:: @ 8E97768 gSlotMachineSpritePalette6:: @ 8E97788 .incbin "graphics/slot_machine/spr6.gbapal" + .align 2 gSlotMachineReelSymbol1Tiles:: .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 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" @@ -4098,8 +4209,8 @@ gSpriteImage_8E99808:: @ 8E99808 .incbin "graphics/unknown_sprites/8E99808.4bpp" .align 2 -gUnknown_08E99848:: @ 8E99848 - .incbin "baserom.gba", 0xE99848, 0x766 @ LZ, uncomp. size = 0x3200 +gSlotMachineReelTimeLights_Gfx:: @ 8E99848 + .incbin "graphics/slot_machine/reel_time_lights.4bpp.lz" .align 2 gUnknown_08E99FB0:: @ 8E99FB0 @@ -4133,164 +4244,213 @@ gUnknown_08E9AC2C:: @ 8E9AC2C gUnknown_08E9AC4C:: @ 8E9AC4C .incbin "baserom.gba", 0xE9AC4C, 0x18F @ LZ, uncomp. size = 0x500 +@ text window frames + .align 2 -gUnknown_08E9ADDC:: - .incbin "baserom.gba", 0x00e9addc, 0x120 +gTextWindowFrame1_Gfx:: + .incbin "graphics/text_window/1.4bpp" -gUnknown_08E9AEFC:: - .incbin "baserom.gba", 0x00e9aefc, 0x20 + .align 2 +gTextWindowFrame1_Pal:: + .incbin "graphics/text_window/1.gbapal" -gUnknown_08E9AF1C:: - .incbin "baserom.gba", 0x00e9af1c, 0x120 + .align 2 +gTextWindowFrame2_Gfx:: + .incbin "graphics/text_window/2.4bpp" -gUnknown_08E9B03C:: - .incbin "baserom.gba", 0x00e9b03c, 0x20 + .align 2 +gTextWindowFrame2_Pal:: + .incbin "graphics/text_window/2.gbapal" -gUnknown_08E9B05C:: - .incbin "baserom.gba", 0x00e9b05c, 0x120 + .align 2 +gTextWindowFrame3_Gfx:: + .incbin "graphics/text_window/3.4bpp" -gUnknown_08E9B17C:: - .incbin "baserom.gba", 0x00e9b17c, 0x20 + .align 2 +gTextWindowFrame3_Pal:: + .incbin "graphics/text_window/3.gbapal" -gUnknown_08E9B19C:: - .incbin "baserom.gba", 0x00e9b19c, 0x120 + .align 2 +gTextWindowFrame4_Gfx:: + .incbin "graphics/text_window/4.4bpp" -gUnknown_08E9B2BC:: - .incbin "baserom.gba", 0x00e9b2bc, 0x20 + .align 2 +gTextWindowFrame4_Pal:: + .incbin "graphics/text_window/4.gbapal" -gUnknown_08E9B2DC:: - .incbin "baserom.gba", 0x00e9b2dc, 0x120 + .align 2 +gTextWindowFrame5_Gfx:: + .incbin "graphics/text_window/5.4bpp" -gUnknown_08E9B3FC:: - .incbin "baserom.gba", 0x00e9b3fc, 0x20 + .align 2 +gTextWindowFrame5_Pal:: + .incbin "graphics/text_window/5.gbapal" -gUnknown_08E9B41C:: - .incbin "baserom.gba", 0x00e9b41c, 0x120 + .align 2 +gTextWindowFrame6_Gfx:: + .incbin "graphics/text_window/6.4bpp" -gUnknown_08E9B53C:: - .incbin "baserom.gba", 0x00e9b53c, 0x20 + .align 2 +gTextWindowFrame6_Pal:: + .incbin "graphics/text_window/6.gbapal" -gUnknown_08E9B55C:: - .incbin "baserom.gba", 0x00e9b55c, 0x120 + .align 2 +gTextWindowFrame7_Gfx:: + .incbin "graphics/text_window/7.4bpp" -gUnknown_08E9B67C:: - .incbin "baserom.gba", 0x00e9b67c, 0x20 + .align 2 +gTextWindowFrame7_Pal:: + .incbin "graphics/text_window/7.gbapal" -gUnknown_08E9B69C:: - .incbin "baserom.gba", 0x00e9b69c, 0x120 + .align 2 +gTextWindowFrame8_Gfx:: + .incbin "graphics/text_window/8.4bpp" -gUnknown_08E9B7BC:: - .incbin "baserom.gba", 0x00e9b7bc, 0x20 + .align 2 +gTextWindowFrame8_Pal:: + .incbin "graphics/text_window/8.gbapal" -gUnknown_08E9B7DC:: - .incbin "baserom.gba", 0x00e9b7dc, 0x120 + .align 2 +gTextWindowFrame9_Gfx:: + .incbin "graphics/text_window/9.4bpp" -gUnknown_08E9B8FC:: - .incbin "baserom.gba", 0x00e9b8fc, 0x20 + .align 2 +gTextWindowFrame9_Pal:: + .incbin "graphics/text_window/9.gbapal" -gUnknown_08E9B91C:: - .incbin "baserom.gba", 0x00e9b91c, 0x120 + .align 2 +gTextWindowFrame10_Gfx:: + .incbin "graphics/text_window/10.4bpp" -gUnknown_08E9BA3C:: - .incbin "baserom.gba", 0x00e9ba3c, 0x20 + .align 2 +gTextWindowFrame10_Pal:: + .incbin "graphics/text_window/10.gbapal" -gUnknown_08E9BA5C:: - .incbin "baserom.gba", 0x00e9ba5c, 0x120 + .align 2 +gTextWindowFrame11_Gfx:: + .incbin "graphics/text_window/11.4bpp" -gUnknown_08E9BB7C:: - .incbin "baserom.gba", 0x00e9bb7c, 0x20 + .align 2 +gTextWindowFrame11_Pal:: + .incbin "graphics/text_window/11.gbapal" -gUnknown_08E9BB9C:: - .incbin "baserom.gba", 0x00e9bb9c, 0x120 + .align 2 +gTextWindowFrame12_Gfx:: + .incbin "graphics/text_window/12.4bpp" -gUnknown_08E9BCBC:: - .incbin "baserom.gba", 0x00e9bcbc, 0x20 + .align 2 +gTextWindowFrame12_Pal:: + .incbin "graphics/text_window/12.gbapal" -gUnknown_08E9BCDC:: - .incbin "baserom.gba", 0x00e9bcdc, 0x120 + .align 2 +gTextWindowFrame13_Gfx:: + .incbin "graphics/text_window/13.4bpp" -gUnknown_08E9BDFC:: - .incbin "baserom.gba", 0x00e9bdfc, 0x20 + .align 2 +gTextWindowFrame13_Pal:: + .incbin "graphics/text_window/13.gbapal" -gUnknown_08E9BE1C:: - .incbin "baserom.gba", 0x00e9be1c, 0x120 + .align 2 +gTextWindowFrame14_Gfx:: + .incbin "graphics/text_window/14.4bpp" -gUnknown_08E9BF3C:: - .incbin "baserom.gba", 0x00e9bf3c, 0x20 + .align 2 +gTextWindowFrame14_Pal:: + .incbin "graphics/text_window/14.gbapal" -gUnknown_08E9BF5C:: - .incbin "baserom.gba", 0x00e9bf5c, 0x120 + .align 2 +gTextWindowFrame15_Gfx:: + .incbin "graphics/text_window/15.4bpp" -gUnknown_08E9C07C:: - .incbin "baserom.gba", 0x00e9c07c, 0x20 + .align 2 +gTextWindowFrame15_Pal:: + .incbin "graphics/text_window/15.gbapal" -gUnknown_08E9C09C:: - .incbin "baserom.gba", 0x00e9c09c, 0x120 + .align 2 +gTextWindowFrame16_Gfx:: + .incbin "graphics/text_window/16.4bpp" -gUnknown_08E9C1BC:: - .incbin "baserom.gba", 0x00e9c1bc, 0x20 + .align 2 +gTextWindowFrame16_Pal:: + .incbin "graphics/text_window/16.gbapal" -gUnknown_08E9C1DC:: - .incbin "baserom.gba", 0x00e9c1dc, 0x120 + .align 2 +gTextWindowFrame17_Gfx:: + .incbin "graphics/text_window/17.4bpp" -gUnknown_08E9C2FC:: - .incbin "baserom.gba", 0x00e9c2fc, 0x20 + .align 2 +gTextWindowFrame17_Pal:: + .incbin "graphics/text_window/17.gbapal" -gUnknown_08E9C31C:: - .incbin "baserom.gba", 0x00e9c31c, 0x120 + .align 2 +gTextWindowFrame18_Gfx:: + .incbin "graphics/text_window/18.4bpp" -gUnknown_08E9C43C:: - .incbin "baserom.gba", 0x00e9c43c, 0x20 + .align 2 +gTextWindowFrame18_Pal:: + .incbin "graphics/text_window/18.gbapal" -gUnknown_08E9C45C:: - .incbin "baserom.gba", 0x00e9c45c, 0x120 + .align 2 +gTextWindowFrame19_Gfx:: + .incbin "graphics/text_window/19.4bpp" -gUnknown_08E9C57C:: - .incbin "baserom.gba", 0x00e9c57c, 0x20 + .align 2 +gTextWindowFrame19_Pal:: + .incbin "graphics/text_window/19.gbapal" -gUnknown_08E9C59C:: - .incbin "baserom.gba", 0x00e9c59c, 0x120 + .align 2 +gTextWindowFrame20_Gfx:: + .incbin "graphics/text_window/20.4bpp" -gUnknown_08E9C6BC:: - .incbin "baserom.gba", 0x00e9c6bc, 0x20 + .align 2 +gTextWindowFrame20_Pal:: + .incbin "graphics/text_window/20.gbapal" .align 2 gUnknown_08E9C6DC:: @ 8E9C6DC .incbin "baserom.gba", 0xE9C6DC, 0xBC @ LZ, uncomp. size = 0x500 .align 2 -gUnknown_08E9C798:: @ 8E9C798 - .incbin "baserom.gba", 0xE9C798, 0x289 @ LZ, uncomp. size = 0x560 +gIntroCopyright_Gfx:: @ 8E9C798 + .incbin "graphics/intro/copyright.4bpp.lz" .align 2 -gUnknown_08E9CA24:: @ 8E9CA24 - .incbin "baserom.gba", 0x00e9ca24, 0x20 +gIntroCopyright_Pal:: @ 8E9CA24 + .incbin "graphics/intro/copyright.gbapal" -gUnknown_08E9CA44:: @ 8E9CA44 - .incbin "baserom.gba", 0xe9ca44, 0x500 + .align 2 +gIntroCopyright_Tilemap:: @ 8E9CA44 + .incbin "graphics/intro/copyright.bin" -Tiles_E9CF44:: @ 8E9CF44 - .incbin "baserom.gba", 0xe9cf44, 0x700 + .align 2 +gInterviewOutlineCursorTiles:: @ 8E9CF44 + .incbin "graphics/misc/interview_outline_cursor.4bpp" .align 2 -Tiles_E9D644:: @ 8E9D644 - .incbin "baserom.gba", 0xE9D644, 0x265 @ LZ, uncomp. size = 0x520 +gTitleScreenPressStart_Gfx:: @ 8E9D644 + .incbin "graphics/title_screen/press_start.4bpp.lz" .align 2 -gTitleScreenLogoShinePalette:: +gTitleScreenLogoShinePalette:: @ E9D8E4 .incbin "graphics/title_screen/logo_shine.gbapal" + .align 2 gUnknown_08E9D8CC:: @ 8E9D8CC .ifdef SAPPHIRE .incbin "graphics/title_screen/pokemon_sapphire.8bpp.lz" -gVersionTiles:: - .incbin "graphics/title_screen/sapphireversion.8bpp.lz" .else .incbin "graphics/title_screen/pokemon_ruby.8bpp.lz" + .endif + + .align 2 gVersionTiles:: + .ifdef SAPPHIRE + .incbin "graphics/title_screen/sapphireversion.8bpp.lz" + .else .incbin "graphics/title_screen/rubyversion.8bpp.lz" .endif + .align 2 gUnknown_08E9F624:: @ 8E9F624 .ifdef SAPPHIRE .incbin "graphics/title_screen/logo_sapphire.gbapal" @ for some reason, the sapphire palette is different even though the visible colors for the logo and version are not, weird @@ -4303,32 +4463,30 @@ gUnknown_08E9F7E4:: @ 8E9F7E4 .incbin "baserom.gba", 0xE9F7E4, 0x182 @ LZ, uncomp. size = 0x400 .align 2 -gPokenavContestArrowsPalette:: - .incbin "graphics/pokenav/contest_arrows.gbapal" +gPokenavArrowsPalette:: + .incbin "graphics/pokenav/arrows.gbapal" gUnknown_08E9F988:: @ 8E9F988 .incbin "baserom.gba", 0xe9f988, 0x20 -Tiles_E9F9A8:: @ 8E9F9A8 - .incbin "baserom.gba", 0xe9f9a8, 0x40 + .align 2 +gPokenavArrow_Gfx:: @ 8E9F9A8 + .incbin "graphics/pokenav/arrow2.4bpp" gUnknown_08E9F9E8:: @ 8E9F9E8 .incbin "baserom.gba", 0x00e9f9e8, 0x20 .align 2 -gUnknown_08E9FA08:: @ 8E9FA08 - .incbin "baserom.gba", 0xE9FA08, 0xF2 @ LZ, uncomp. size = 0x300 +gPokenavConditionSearch2_Gfx:: @ 8E9FA08 + .incbin "graphics/pokenav/condition_search2.4bpp.lz" .align 2 -gUnknown_08E9FAFC:: @ 8E9FAFC - .incbin "baserom.gba", 0x00e9fafc, 0x1c - -gUnknown_08E9FB18:: @ 8E9FB18 - .incbin "baserom.gba", 0x00e9fb18, 0x4 +gPokenavRibbonView_Pal:: @ 8E9FAFC + .incbin "graphics/pokenav/ribbon_view.pal.bin" .align 2 -gUnknown_08E9FB1C:: @ 8E9FB1C - .incbin "baserom.gba", 0xE9FB1C, 0x83 @ LZ, uncomp. size = 0x160 +gPokenavRibbonView_Gfx:: @ 8E9FB1C + .incbin "graphics/pokenav/ribbon_view.4bpp.lz" .align 2 gUnknown_08E9FBA0:: @ 8E9FBA0 @@ -4357,11 +4515,12 @@ gUnknown_08E9FF58:: @ 8E9FF58 .incbin "baserom.gba", 0xE9FF58, 0xCF @ LZ, uncomp. size = 0x640 .align 2 -gUnknown_08EA0028:: @ 8EA0028 - .incbin "baserom.gba", 0x00ea0028, 0xe0 +gPokenavRibbonPokeView_Gfx:: @ 8EA0028 + .incbin "graphics/pokenav/ribbon_pokeview.4bpp" -gUnknown_08EA0108:: @ 8EA0108 - .incbin "baserom.gba", 0x00ea0108, 0x1c0 + .align 2 +gMessageBox_Gfx:: @ 8EA0108 + .incbin "graphics/text_window/message_box.4bpp" .align 2 gUnknown_08EA02C8:: @ 8EA02C8 @@ -4381,31 +4540,36 @@ gUnknown_08EA0348:: @ 8EA0348 gUnknown_08EA15C8:: @ 8EA15C8 .incbin "graphics/trade/menu_map.bin" -gUnknown_08EA1DC8:: @ 8EA1DC8 - .incbin "baserom.gba", 0x00ea1dc8, 0x24 + .align 2 +gTradeMonBoxTilemap:: @ 8EA1DC8 + .incbin "graphics/trade/mon_box_map.bin" .align 2 gUnknown_08EA1DEC:: @ 8EA1DEC .incbin "graphics/trade/selected_mon.4bpp" - .incbin "baserom.gba", 0x00ea25ec, 0x20 + .incbin "graphics/unknown/unknown_EA25EC.bin" .align 2 -gUnknown_08EA260C:: @ 8EA260C - .incbin "baserom.gba", 0xEA260C, 0x436 @ LZ, uncomp. size = 0xB40 +gCreditsCopyrightEnd_Gfx:: @ 8EA260C + .incbin "graphics/misc/end_copyright.4bpp.lz" .align 2 -gUnknown_08EA2A44:: @ 8EA2A44 - .incbin "baserom.gba", 0x00ea2a44, 0x200 +gDecoration10000_Gfx:: @ 8EA2A44 + .incbin "graphics/misc/decoration_10000.4bpp" + .align 2 gFont3LatinGlyphs:: @ 8EA2C44 .incbin "graphics/fonts/font3_lat.4bpp" + .align 2 gFont4LatinGlyphs:: @ 8EA6BC4 .incbin "graphics/fonts/font4_lat.4bpp" + .align 2 gFont3JapaneseGlyphs:: @ 8EA8744 .incbin "graphics/fonts/font3_jpn.4bpp" + .align 2 gFont4JapaneseGlyphs:: @ 8EAC6C4 .incbin "graphics/fonts/font4_jpn.4bpp" diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index e9195e261..b4542b1b9 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1156,8 +1156,7 @@ gUnknown_08400E36:: @ 8400E36 BattleText_Format9: .string "are$" -gUnknown_08400E3A:: @ 8400E3A -BattleText_BadEGG: +gBadEggNickname:: @ 8400E3A .string "Bad EGG$" gUnknown_08400E42:: @ 8400E42 diff --git a/data/trainer_parties.s b/data/trainer_parties.s index 4274b6bc8..b9eff1839 100644 --- a/data/trainer_parties.s +++ b/data/trainer_parties.s @@ -761,7 +761,7 @@ gTrainerParty_Carmen: @ 81ED0A0 .align 2 -gTrainerParty_Gwen : @ 81ED0A8 +gTrainerParty_Gwen: @ 81ED0A8 .2byte 0 @ IV (0-255) .2byte 27 @ level .2byte SPECIES_MARILL |