pushing so I can pull from master

This commit is contained in:
golem galvanize 2018-03-30 16:48:30 -04:00
parent 6cbea9af6d
commit 3006ff177b
4 changed files with 1140 additions and 3981 deletions

File diff suppressed because it is too large Load Diff

View File

@ -22,15 +22,6 @@
.byte 0 @padding
.endm
gUnknown_0855D2B8:: @ 855D2B8
.string "{UNK_CTRL_F9 8}000$"
gUnknown_0855D2BE:: @ 855D2BE
.incbin "graphics/pokedex/caught_ball.4bpp"
sText_TenDashes:: @ 855D2FE
.string "----------$"
.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"

View File

@ -2651,8 +2651,17 @@ extern const u8 gBattleTerrainPalette_StadiumGlacia[];
extern const u8 gBattleTerrainPalette_StadiumDrake[];
extern const u8 gBattleTerrainPalette_StadiumWallace[];
// pokedex
extern const u8 gPokedexMenu2_Gfx[];
extern const u8 gPokedexText_Pal[];
extern const u16 gPokedexText_Pal[];
extern const u8 gPokedexMenu_Gfx[];
extern const u8 gUnknown_08DC2C5C[];
extern const u8 gUnknown_08DC2DAC[];
extern const u8 gUnknown_08DC2A08[];
extern const u8 gUnknown_08DC2B1C[];
extern const u16 gPokedexHoennBg_Pal[];
extern const u16 gPokedexText_Pal[];
extern const u16 gPokedexNationalBg_Pal[];
// berry tag screen
extern const u8 gUnknown_08D9BB44[];

File diff suppressed because it is too large Load Diff