From 4618ba740756547e4534d8d29a6e5651cf8bca8e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 1 Apr 2025 00:25:30 +0200 Subject: [PATCH 1/3] Align gMPlayTrack_BGM --- sound/music_player_table.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index 5981a4d037..955d4d556f 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -5,6 +5,7 @@ .equiv NUM_TRACKS_SE3, 1 .bss + .align 2 gMPlayTrack_BGM:: .space TRACK_SIZE * NUM_TRACKS_BGM From a3075325a0ef2e10ad3cc0550d37e30c9c999ef2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 5 Apr 2025 21:18:07 -0300 Subject: [PATCH 2/3] GENDER_COUNT in sPlayer/RivalAvatarGfxIds (#2117) --- src/field_player_avatar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 1f0708af22..43a7189da2 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -232,7 +232,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}, @@ -244,7 +244,7 @@ static const u8 sRivalAvatarGfxIds[][2] = [PLAYER_AVATAR_STATE_WATERING] = {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING} }; -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}, From a0d9cf4516bbf3a09e779b865ba9defe4e0f3fcc Mon Sep 17 00:00:00 2001 From: BOT00XX Date: Mon, 7 Apr 2025 14:28:23 +0900 Subject: [PATCH 3/3] Change the display of Pokemon Logo, version banner and "PRESS START" banner in the title screen. --- graphics/intro/copyright.png | Bin 530 -> 578 bytes graphics/title_screen/emerald_version.png | Bin 1100 -> 1579 bytes graphics/title_screen/pokemon_logo.pal | 186 +++++++++++----------- graphics/title_screen/pokemon_logo.png | Bin 4666 -> 5098 bytes graphics/title_screen/press_start.png | Bin 473 -> 602 bytes src/title_screen.c | 24 ++- 6 files changed, 113 insertions(+), 97 deletions(-) diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png index 988a07318342291d0318c66e2ccea59c5c18f463..3ba8dc4d5d3899cd96614dd14c52ba7c90fe523e 100644 GIT binary patch delta 505 zcmV10004VQb$4nuFf3kks&{Sz)3_wR7i={R!Ne? zAPj?}Q$^|jznvK54LZFXhe|uaF$xwkbZczg+W+7XXtLh9hrP1|58~jG+lWIe#EGqp zKBb;o$$eMFGjWhb3d84WSA^L^Q5hU{`o&g&Ul7|ow7(Ffj+3EEy7wi7kH$OK{jibi?K~ z#+y>*B};Jy>A6(*jOD%IYf_c+^hvMiYec%ae*as4E&BD~n+EP&4v viklDI^E^|rU;&UBGgTzwv^Z;!U`P4`W(zj!T@7!W00000NkvXXu0mjflBw>d delta 457 zcmV;)0XF`^1d;@h7zqRe0001=T>e0jE5^X(+AAg)>@gW?~Lq3g)k6ZsbmI0?CcEjU)_X!T8 zK;dhnS^k`|DHCl1iY}uEv*PU}{q(&ix`~M@OaMirak$_Zq6xRv{jOrBoPtWN!@YkE zJ!K^Ca4+fYrWTpUhcV!^C@+VHCN5k3i3WVx#+eD{u9&v9)MhsW;-Or`0)YWZ>E@hQn0*<$`=fW9J(!HKe zQxTH~@ysp$fDzM#^Uh*Q6V9_SD?>bN76}{pu03?MA-a4J`gnmek(oJpgZq}-fV-b? zXTlS%jBd%yNfs|NSG;tqS+*Kg)s4pa7^3C%uf$`_&u~w;*PcUfL1jo@QB5^jH1&Y% zg4uJN&1d$St+0a3Ty4rd&1Pb8qNgg7wGPoQ2L;IKX}fJ200000NkvXXu0mjft?t)* diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png index 9ee2992607efdb2b1c44ce09e01457575e9aa309..ffdf1fbeddad135a73cb61cfa01bc423f095201e 100644 GIT binary patch literal 1579 zcmeHGYfuw+5dV{a91kHBd1w`5K{PEmo>(OaBM}e?R3SnMQ3?bQyiV0NqLqUIdJ@2^ z1&32aQRsL@3df@w6lg<5NabM)mIlpGC0aa&R{$vp6?=^{{Z#tdPu==nS?75as_-?ir@qZsc;S{ z;~Cf_5&}rN&A%8fK28z<3nK!x1H;=PPg#trSWS5r)F3R7w%3l2Xzd2o*s>7?SWgd>&_x z;oRlwtq~AizL| zfQJ4B6@#JRKQYH&QVawrbYByO`*eks0gOA6DM|7V)h4(5m$8i9+vJ#vRFh>1hW$2VD2|Y2Eh6PA_g@t2YSC zR%a~s);u2>8o6WAT^D_GHh(dLU)XBWng?;w4;>7GW7dqP03O&S@KW3TRbTyD#kWivd&JN3qD=3vU9Bi zA&5xv@s_oFum{^F+Z(i#GX8oFNX>(klV-*nQ>25-<6#Q8>kvfvt9;n99q$~xS8 zLzlG$VaF`n=HNt!D}L|(BW69&`n{JIpS^hBJhDe~@F?LOb!qhd80tn-CF{DTHp}-+ zUHPFxmd*D?MwNxF+b+AqGY+;bM4jRHs65EfulscI9YqaMtKjlUlB^D z?##(Mv-@Fs@&P#F%f7jX1Jc~dhNSW-xt|tF+|in3opSo-)#%--z>v|}BLiohC!6i& z1L&(`BQKvkx-ze8W$sRvEu3h4l$2PZYw{^wx6+JInLhp1qOBLU6_>fpG_0qU5s>ah-NDao4f9Cn;ezQ$Jn9F&#rV4D}~bztzAUE&W4VAY;Fw(6(-MdCD1 zy|IdUl~>`=*4} lvaQaYWr{Xa>%Z2tup@uD9>Th_X!82Qf&=#W*Y1k@;%|BmAHM(q literal 1100 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 M07*qoM6N<$f*#z$G5`Po delta 4195 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 Z(`l$GBiUU3oB!Omp7t%R>g$ft{{w)&yifoD diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png index 63a5c23d045f1af021481b0c5d80d7a402a1c436..50d77a803ae60ab602074d86ef64db6bab3aa6b0 100644 GIT binary patch delta 529 zcmV+s0`C3U1KI?T7#0Wv00005)dkl80004VQb$4nuFf3kks&{S*hxe|R7i=%Ra;`j zAP5u*_rG$L#|Xx3f3hu2i<$vO;@H*>CjL8}TbkT370+WRSS}!51!DDV(o&_2l}ZfD z77(eCUK-0}w8dJ)r}{IQB!Cegp`}aBbeH1IKOG&(V;OQwKP47paVM z%9!;dfy*pr>*HO2`q=17c>nRSK7b<)QnICIhun>Mmc)tS^aiu}o|&x!Za!YIoWr@K z;>~Xij@Y`+iO#Gj2l5-fuA3k*Cg+1mT@}zr9r2NiBKbtZ@uK+2Lhf*Xlg^T@l&fwhAWB$b!&dO- zwV2_B0vR;$LtI>V|1E~G)aCEMxyQJ6C!D{UT; zY(w+o&+=;Ics5Kp0|q?8$quR?a6h&WXF%U|B@p?l_pAjUuL=RsX;C(+KtU%4zpB7d z75~w!e!9hQ@?G~=w(kSN#dg0;Ktiw3=MruVgUwfrs+_BEA#1!WAN(Z-Q>0a&A>3=J z+IdBzUL|142whSZE~Jv~8Rh$C56ERod>3vD262G|jQB+YA9YHP|H@t?@Xz)Gw!I9~ TC%Ko100000NkvXXu0mjfWTE?$ delta 399 zcmV;A0dW4>1la?S7zqRe0002MCFs_XEl_*M-oH#@TBo)==AFw* z+j@@;q^v_CQzLItR!i7sOza8`nk;u$yHm3puCb1J_zhIGYF1Hy<6NQf4QzkR zl`OAVPo9npY@2PbZnS9{yMb2N*GmI?u@iwKg>;~kJbmHe%TJs%h|z#}@(&F@dw+1T zo2gH+=K(R51L4r17%m1t12u(5VG#G|JLS+|Sz6-{!?qYmS8LyP0t46p(J)TRG0AMi zc<>X2z{Lz~njNBHt^?M^H&DHCR?vIibz{$~Lv#c9M3op(kSB$6Tp0W-_J<@v4bf$B zT*YH{E_EiS{7Z#}CzzdE;323N;O3WKkoL|M`#Dz>%Ua@pi@;#(TxYC~8|`kD^5PL_ t>s-ZdWwa=Y1nBc?24}9I@K(xy#t*D5Xg(#a-t7PY002ovPDHLkV1h#syG{TA 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)