Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-04-24 23:26:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

painter palette rename

Browse Source
This commit is contained in:
Retnuhytnuob 2026-03-22 23:59:50 -05:00
parent 984d1b36a6
commit 3c79da39e6
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/rom_1.s
View File

@ -893,14 +893,14 @@ gRubyTravelPaint_Gfx:: @ 0x081BCAA4
.incbin "graphics/stage/ruby/travel_paint.4bpp"
.space 0x120
gRubyBoardBonusObjPalette:: @ 0x081BE2C4
gRubyPainterPalette:: @ 0x081BE2C4
.incbin "baserom.gba", 0x1BE2C4, 0x200
gSapphireTravelPaint_Gfx:: @ 0x081BE4C4
.incbin "graphics/stage/sapphire/travel_paint.4bpp"
.space 0x120
gSapphireBoardBonusObjPalette:: @ 0x081BFCE4
gSapphirePainterPalette:: @ 0x081BFCE4
.incbin "baserom.gba", 0x1BFCE4, 0x200
gRubyBoardPalette:: @ 0x081BFEE4
@ -970,7 +970,8 @@ gUnknown_0825D610:: @ 0x0825D610
.incbin "baserom.gba", 0x25D610, 0x60
gUnknown_0825D670:: @ 0x0825D670
.incbin "baserom.gba", 0x25D670, 0xA0
.incbin "baserom.gba", 0x25D670, 0x60
.space 0x40
gUnknown_0825D710:: @ 0x0825D710
.incbin "baserom.gba", 0x25D710, 0x60
@ -1000,7 +1001,8 @@ gUnknown_0825DA10:: @ 0x0825DA10
.incbin "baserom.gba", 0x25DA10, 0x60
gUnknown_0825DA70:: @ 0x0825DA70
.incbin "baserom.gba", 0x25DA70, 0xA0
.incbin "baserom.gba", 0x25DA70, 0x60
.space 0x40
gUnknown_0825DB10:: @ 0x0825DB10
.incbin "baserom.gba", 0x25DB10, 0x60
@ -1030,7 +1032,8 @@ gUnknown_0825DE10:: @ 0x0825DE10
.incbin "baserom.gba", 0x25DE10, 0x60
gUnknown_0825DE70:: @ 0x0825DE70
.incbin "baserom.gba", 0x25DE70, 0xA0
.incbin "baserom.gba", 0x25DE70, 0x60
.space 0x40
gUnknown_0825DF10:: @ 0x0825DF10
.incbin "baserom.gba", 0x25DF10, 0x60

8
src/launcher_and_cutscenes.c
View File

@ -6,9 +6,9 @@
extern const u8 gRubyTravelVolbeat_Gfx[][0x480];
extern const u8 gSapphireTravelIllumise_Gfx[][0x480];
extern const u8 gRubyTravelPaint_Gfx[];
extern const u8 gRubyBoardBonusObjPalette[];
extern const u8 gRubyPainterPalette[];
extern const u8 gSapphireTravelPaint_Gfx[];
extern const u8 gSapphireBoardBonusObjPalette[];
extern const u8 gSapphirePainterPalette[];
extern const s16 gTravelEventAnimData[][3];
extern const s16 gAreaToSpeciesTable[];
extern const s16 gAreaRouletteTable[][7];
@ -718,13 +718,13 @@ void RunTravelEventCutscene(void)
if (gMain.selectedField == FIELD_RUBY)
{
DmaCopy16(3, gRubyTravelPaint_Gfx, (void *)0x06015800, 0x1800);
DmaCopy16(3, gRubyBoardBonusObjPalette, (void *)0x050003C0, 0x20);
DmaCopy16(3, gRubyPainterPalette, (void *)0x050003C0, 0x20);
DmaCopy16(3, gRubyTravelVolbeat_Gfx, (void *)0x06015800, 0x480);
}
else
{
DmaCopy16(3, gSapphireTravelPaint_Gfx, (void *)0x06015800, 0x1800);
DmaCopy16(3, gSapphireBoardBonusObjPalette, (void *)0x050003C0, 0x20);
DmaCopy16(3, gSapphirePainterPalette, (void *)0x050003C0, 0x20);
DmaCopy16(3, gSapphireTravelIllumise_Gfx, (void *)0x06015800, 0x480);
}
}

8
src/save_and_restore_game.c
View File

@ -26,7 +26,7 @@ extern const s16 gEvoShopAnimFrames[][7];
extern const u16 gShopCursorToItemMap[];
extern const u8 gRubyTravelPaint_Gfx[];
extern const u8 gRubyBoardBonusObjPalette[];
extern const u8 gRubyPainterPalette[];
extern const u8 gRubyBoardHatchCave_Gfx[][0x480];
extern const u8 gRubyFlashingDecorationTiles[][0x300];
extern const u8 gRubyBoardSharpedo_Gfx[][0x260];
@ -36,7 +36,7 @@ extern const u8 gRubyStageCyndaquil_Gfx[][0x280];
extern const u8 gRubyBoardShop_Gfx[][0x500];
extern const u8 gSapphireTravelPaint_Gfx[];
extern const u8 gSapphireBoardBonusObjPalette[];
extern const u8 gSapphirePainterPalette[];
extern const u8 gSapphireCatchTilesGfx[];
extern const u8 gSapphireBoardZigzagoonFx_Gfx[];
@ -453,12 +453,12 @@ void RestoreFieldSpecificGraphics(void)
if (gMain.selectedField == FIELD_RUBY)
{
DmaCopy16(3, gRubyTravelPaint_Gfx, (void *)0x6015800, 0x1800);
DmaCopy16(3, gRubyBoardBonusObjPalette, (void *)OBJ_PLTT + 0x1C0, 0x20);
DmaCopy16(3, gRubyPainterPalette, (void *)OBJ_PLTT + 0x1C0, 0x20);
}
else
{
DmaCopy16(3, gSapphireTravelPaint_Gfx, (void *)0x6015800, 0x1800);
DmaCopy16(3, gSapphireBoardBonusObjPalette, (void *)OBJ_PLTT + 0x1C0, 0x20);
DmaCopy16(3, gSapphirePainterPalette, (void *)OBJ_PLTT + 0x1C0, 0x20);
}
break;
case 21: