From de868cd7d79cbbf077e3e495a0844e0aa2aa78c2 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sun, 30 Aug 2026 14:52:29 -0500 Subject: [PATCH] . --- data/rom_2.s | 8 ++++---- src/all_board_pause_game.c | 1 + src/main_board_launcher_and_cutscenes.c | 2 +- src/titlescreen.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 9f43b3c8..565fb6ff 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -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 diff --git a/src/all_board_pause_game.c b/src/all_board_pause_game.c index 94223bb1..de4be1d9 100644 --- a/src/all_board_pause_game.c +++ b/src/all_board_pause_game.c @@ -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; diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index e38e7de4..adad9c44 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -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; } } diff --git a/src/titlescreen.c b/src/titlescreen.c index 671cc62e..2c3dc5f3 100644 --- a/src/titlescreen.c +++ b/src/titlescreen.c @@ -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);