Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'translation_title' of https://github.com/12014/pokeemerald into 12014-translation_title

Browse Source
This commit is contained in:
RoamerX 2025-04-08 16:11:27 +08:00
commit b225979334
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/intro/copyright.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 530 B

After

Width:  |  Height:  |  Size: 578 B

BIN
graphics/title_screen/press_start.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 473 B

After

Width:  |  Height:  |  Size: 602 B

1
sound/music_player_table.inc
View File

@ -5,6 +5,7 @@
.equiv NUM_TRACKS_SE3, 1
.bss
.align 2
gMPlayTrack_BGM::
.space TRACK_SIZE * NUM_TRACKS_BGM

4
src/field_player_avatar.c
View File

@ -251,7 +251,7 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
[DIR_EAST - 1] = MetatileBehavior_IsEastArrowWarp,
};
static const u8 sRivalAvatarGfxIds[][2] =
static const u8 sRivalAvatarGfxIds[][GENDER_COUNT] =
{
[PLAYER_AVATAR_STATE_NORMAL] = {OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL},
[PLAYER_AVATAR_STATE_MACH_BIKE] = {OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE},
@ -264,7 +264,7 @@ static const u8 sRivalAvatarGfxIds[][2] =
[PLAYER_AVATAR_STATE_VSSEEKER] = {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE},
};
static const u8 sPlayerAvatarGfxIds[][2] =
static const u8 sPlayerAvatarGfxIds[][GENDER_COUNT] =
{
[PLAYER_AVATAR_STATE_NORMAL] = {OBJ_EVENT_GFX_BRENDAN_NORMAL, OBJ_EVENT_GFX_MAY_NORMAL},
[PLAYER_AVATAR_STATE_MACH_BIKE] = {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_MAY_MACH_BIKE},

22
src/title_screen.c
View File

@ -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)
@ -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)