Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-09-14 14:27:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Retnuhytnuob
2026-08-30 14:52:29 -05:00
parent 58fad629a4
commit de868cd7d7
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/rom_2.s
View File

@@ -1816,7 +1816,7 @@ gIntroScene7Parade_WailmerQuadOffsets:: @ 0x086A7B7C
.2byte -64, 0
.2byte 0, 0
gIntroWailmerStarLarrgeSpriteSet:: @ 0x086A7B8C
gIntroWailmerStarLargeSpriteSet:: @ 0x086A7B8C
.2byte 4
packed_sprite_oaml x=-0x18, y=-0x18, spriteSize=SPRITE_SIZE_32x32, tileNum=0x98, paletteNum=0x9
packed_sprite_oaml x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x9C, paletteNum=0x9
@@ -1873,11 +1873,11 @@ gIntroScene8WailmerLaunch_SpriteSets:: @ 0x086A7C24
.4byte gIntroWailmerStarMediumFlippedSpriteSet
.4byte gIntroWailmerStarMediumSpriteSet
.4byte gIntroWailmerStarLarrgeSpriteSet
.4byte gIntroWailmerStarLargeSpriteSet
.4byte gIntroWailmerStarLarrgeFlippedSpriteSet
.4byte gIntroWailmerStarLarrgeSpriteSet
.4byte gIntroWailmerStarLargeSpriteSet
.4byte gIntroWailmerStarLarrgeFlippedSpriteSet
.4byte gIntroWailmerStarLarrgeSpriteSet
.4byte gIntroWailmerStarLargeSpriteSet
gIntroScene8WailmerLaunch_DebrisMovement:: @ 0x086A7C68
.byte 0x05, 0x02, 0x03, 0x01, 0x06, 0x01

1
src/all_board_pause_game.c
View File

@@ -50,6 +50,7 @@ void PauseGame(void)
{
for (j = 0; j < COLORS_PER_PALETTE; j++)
{
//Palette 9, color 12 is used for the white text in the pause screen
if (i != 9 || j != 12)
{
rgb[0] = (RGB5_GET_R(gCurrentPinballGame->pauseObjPalette[i][j]) * 2) / 5;

2
src/main_board_launcher_and_cutscenes.c
View File

@@ -674,7 +674,7 @@ void RunEvolutionCutscene(void)
gCurrentPinballGame->revealFramesetIndex = 10;
gCurrentPinballGame->stageTimer = 0;
gCurrentPinballGame->boardSubState++;
DmaCopy16(3, gCurrentPinballGame->pauseObjPalette, OBJ_PLTT, 12*PLTT_SLOT_SIZE);
DmaCopy16(3, gCurrentPinballGame->pauseObjPalette, OBJ_PLTT_SLOT(0), 12*PLTT_SLOT_SIZE);
gCurrentPinballGame->activePortraitType = 0;
}
}

4
src/titlescreen.c
View File

@@ -61,14 +61,14 @@ void LoadTitlescreenGraphics(void)
SaveFile_ReadSavedGamePresent();
if (gMain.hasSavedGame == TRUE)
{
DmaCopy16(3, gTitlescreenSprites_Pals, OBJ_PLTT, 5*PLTT_SLOT_SIZE);
DmaCopy16(3, gTitlescreenSprites_Pals, OBJ_PLTT_SLOT(0), 5*PLTT_SLOT_SIZE);
DmaCopy16(3, gTitlescreenSpritesSavedGame_Gfx, BG_CHAR_ADDR(4), 0x7000);
DmaCopy16(3, gGBAButtonIcons_Pals, OBJ_PLTT_SLOT(5), 2*PLTT_SLOT_SIZE);
DmaCopy16(3, gOptionsSprites_Gfx, (void *)OBJ_VRAM0 + 0x7000, 0x400);
}
else
{
DmaCopy16(3, gTitlescreenSprites_Pals, OBJ_PLTT, 5*PLTT_SLOT_SIZE);
DmaCopy16(3, gTitlescreenSprites_Pals, OBJ_PLTT_SLOT(0), 5*PLTT_SLOT_SIZE);
DmaCopy16(3, gTitlescreenSpritesNoSavedGame_Gfx, BG_CHAR_ADDR(4), 0x7000);
DmaCopy16(3, gGBAButtonIcons_Pals, OBJ_PLTT_SLOT(5), 2*PLTT_SLOT_SIZE);
DmaCopy16(3, gOptionsSprites_Gfx, (void *)OBJ_VRAM0 + 0x7000, 0x400);