diff options
| author | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
|---|---|---|
| committer | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-07-29 11:35:23 -0400 |
| commit | e92408af0133974a769215a83500c965f8524724 (patch) | |
| tree | 9f1556b72ebb1a9f1b7f288ba4b8d23471a46608 /src/title_screen.c | |
| parent | a9da4340a3c91553d19afdcd07355c53d5157a3e (diff) | |
| parent | 8b39cdac9adb52a6e6abd03314056ee5d6003a1b (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
`:Q
B
A
B:`
r
A
r
D
D
C
D
D
r
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 664e07978..ab0f1d505 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -30,14 +30,17 @@ #define VERSION_BANNER_BYTES 0x2000 #define VERSION_BANNER_LEFT_X 108 #define VERSION_BANNER_RIGHT_X 172 -#define VERSION_BANNER_Y 44 +#ifdef SAPPHIRE +#define VERSION_BANNER_Y_GOAL 83 +#else #define VERSION_BANNER_Y_GOAL 84 +#endif +#define VERSION_BANNER_Y (VERSION_BANNER_Y_GOAL - 40) #define START_BANNER_X DISPLAY_WIDTH / 2 - 2 #endif extern u8 gReservedSpritePaletteCount; extern struct MusicPlayerInfo gMPlay_BGM; -extern u8 gUnknown_0202F7E4; extern u16 gUnknown_030041B4; extern u16 gUnknown_030042C0; extern const u8 gUnknown_08E9D8CC[]; @@ -47,6 +50,8 @@ extern const u8 gVersionTiles[]; extern const u8 gTitleScreenPressStart_Gfx[]; extern const u16 gTitleScreenLogoShinePalette[]; +static EWRAM_DATA u8 gUnknown_0202F7E4 = 0; + #ifdef SAPPHIRE static const u16 sLegendaryMonPalettes[][16] = { @@ -331,7 +336,9 @@ static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] = #define LEGENDARY_MARKING_COLOR(c) RGB(0, 0, (c)) #endif -#ifdef SAPPHIRE +#if defined(GERMAN) && defined(SAPPHIRE) +#define PLTT_BUFFER_INDEX 9 +#elif defined(SAPPHIRE) #define PLTT_BUFFER_INDEX 26 #else #define PLTT_BUFFER_INDEX 21 |