diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png index 988a073183..3ba8dc4d5d 100644 Binary files a/graphics/intro/copyright.png and b/graphics/intro/copyright.png differ diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png index 9ee2992607..ffdf1fbedd 100644 Binary files a/graphics/title_screen/emerald_version.png and b/graphics/title_screen/emerald_version.png differ diff --git a/graphics/title_screen/pokemon_logo.pal b/graphics/title_screen/pokemon_logo.pal index f62cfac20d..f6356e7ddf 100644 --- a/graphics/title_screen/pokemon_logo.pal +++ b/graphics/title_screen/pokemon_logo.pal @@ -2,69 +2,69 @@ JASC-PAL 0100 256 0 0 0 -0 0 0 -255 238 16 -246 222 41 -246 238 246 -255 246 24 -246 246 41 +172 16 32 +106 32 41 +115 115 123 +148 148 156 +205 205 213 +156 164 197 +82 115 131 +49 98 106 +41 74 74 +57 90 90 +98 106 106 +131 139 139 +172 180 180 +189 197 197 +82 131 123 +65 106 98 +205 246 238 +98 164 148 +180 246 230 +0 246 180 +8 189 139 +16 172 131 +41 189 148 +41 164 131 +65 246 197 +32 90 74 +57 148 123 +123 180 164 +0 230 164 +8 205 148 +24 246 180 +16 156 115 +24 222 164 +24 139 106 +57 172 139 +82 222 180 +49 230 172 +49 205 156 +32 115 90 +49 123 98 +41 139 106 +90 189 156 +123 246 205 +115 213 180 +148 246 213 +180 222 205 +148 230 197 +115 139 115 246 246 246 -246 255 255 -255 246 255 -0 0 255 -8 0 255 -24 0 238 -246 222 24 -246 222 32 -255 238 41 -255 238 49 -255 255 16 -255 255 24 -255 255 246 -255 255 255 +230 230 230 +164 164 164 +148 148 148 +90 90 90 +74 74 74 +57 57 57 +16 16 16 +0 0 0 +246 32 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 0 0 0 -24 41 32 -32 32 74 -32 0 230 -32 0 238 -32 0 246 -32 0 255 -246 238 32 -255 230 24 -246 230 41 -246 238 41 -246 230 49 -246 238 49 -255 246 32 -255 246 41 -255 255 32 -255 255 41 -32 24 32 -32 32 41 -197 156 41 -197 164 41 -16 0 246 -16 0 255 -24 0 246 -24 0 255 -41 0 230 -41 0 238 -57 0 238 -41 0 246 -41 0 255 -8 8 197 -246 230 24 -246 230 32 -255 238 24 -255 238 32 -32 32 32 -32 41 32 -41 32 32 -41 41 32 -49 32 32 -49 41 32 -41 32 41 -49 32 41 24 41 41 32 32 90 16 24 106 @@ -225,35 +225,35 @@ JASC-PAL 41 49 57 32 41 82 32 41 90 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 +189 106 8 +0 139 74 +255 255 255 +16 172 98 +8 156 106 +8 139 115 +8 123 123 +0 115 131 +0 98 139 +0 82 148 +0 74 164 +0 74 98 +180 230 172 +255 255 255 +255 0 0 +0 74 98 +255 74 238 +156 156 156 +90 90 90 +222 222 222 +24 16 24 +74 74 74 +238 238 238 +41 41 41 +172 172 172 +106 106 106 +189 189 189 +139 139 139 +205 205 205 +123 123 123 +65 57 57 +255 255 255 diff --git a/graphics/title_screen/pokemon_logo.png b/graphics/title_screen/pokemon_logo.png index 7d141ad673..4843f86291 100644 Binary files a/graphics/title_screen/pokemon_logo.png and b/graphics/title_screen/pokemon_logo.png differ diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png index 63a5c23d04..50d77a803a 100644 Binary files a/graphics/title_screen/press_start.png and b/graphics/title_screen/press_start.png differ diff --git a/src/title_screen.c b/src/title_screen.c index 1d605d1fc0..47814efbce 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -30,10 +30,17 @@ enum { }; #define VERSION_BANNER_RIGHT_TILEOFFSET 64 -#define VERSION_BANNER_LEFT_X 98 +//修改，修改「绿宝石」版本号显示位置 +/*#define VERSION_BANNER_LEFT_X 98 #define VERSION_BANNER_RIGHT_X 162 #define VERSION_BANNER_Y 2 -#define VERSION_BANNER_Y_GOAL 66 +#define VERSION_BANNER_Y_GOAL 66*/ + +#define VERSION_BANNER_LEFT_X 164 +#define VERSION_BANNER_RIGHT_X 228 +#define VERSION_BANNER_Y -16 +#define VERSION_BANNER_Y_GOAL 60 + #define START_BANNER_X 128 #define CLEAR_SAVE_BUTTON_COMBO (B_BUTTON | SELECT_BUTTON | DPAD_UP) @@ -613,7 +620,7 @@ void CB2_InitTitleScreen(void) LoadCompressedSpriteSheet(&sSpriteSheet_EmeraldVersion[0]); LoadCompressedSpriteSheet(&sSpriteSheet_PressStart[0]); LoadCompressedSpriteSheet(&sPokemonLogoShineSpriteSheet[0]); - LoadPalette(gTitleScreenEmeraldVersionPal, OBJ_PLTT_ID(0), PLTT_SIZE_4BPP); + LoadPalette(gTitleScreenEmeraldVersionPal, OBJ_PLTT_ID(0), PLTT_SIZE_8BPP); LoadSpritePalette(&sSpritePalette_PressStart[0]); gMain.state = 2; break; @@ -731,7 +738,9 @@ static void Task_TitleScreenPhase1(u8 taskId) // Create "Press Start" and copyright banners, and slide Pokémon logo up static void Task_TitleScreenPhase2(u8 taskId) { - u32 yPos; + //u32 yPos; + //修改，新增「宠物小精灵」大标题向右偏移相关（不按按键跳过时） + u32 xPos, yPos; // Skip to next phase when A, B, Start, or Select is pressed if (JOY_NEW(A_B_START_SELECT) || gTasks[taskId].tSkipToNext) @@ -768,6 +777,10 @@ static void Task_TitleScreenPhase2(u8 taskId) gTasks[taskId].tBg2Y++; // Slide Pokémon logo up + //修改，新增「宠物小精灵」大标题向右偏移相关（不按按键跳过时） + xPos = gTasks[taskId].data[3] * 256; + SetGpuReg(REG_OFFSET_BG2X_L, xPos); + SetGpuReg(REG_OFFSET_BG2X_H, xPos / 0x10000); yPos = gTasks[taskId].tBg2Y * 256; SetGpuReg(REG_OFFSET_BG2Y_L, yPos); SetGpuReg(REG_OFFSET_BG2Y_H, yPos / 0x10000); @@ -804,6 +817,9 @@ static void Task_TitleScreenPhase3(u8 taskId) } else { + //修改，新增「宠物小精灵」大标题向右偏移相关（按按键跳过时） + SetGpuReg(REG_OFFSET_BG2X_L, 0); + SetGpuReg(REG_OFFSET_BG2X_H, 0); SetGpuReg(REG_OFFSET_BG2Y_L, 0); SetGpuReg(REG_OFFSET_BG2Y_H, 0); if (++gTasks[taskId].tCounter & 1)