diff options
Diffstat (limited to 'src/engine/bank04.asm')
| -rw-r--r-- | src/engine/bank04.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index fc17af0..19c81b0 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -2232,14 +2232,14 @@ Scene_TitleScreen: ; 12da7 (4:6da7) dw SGBData_TitleScreen dw NULL db PALETTE_25, PALETTE_25, $00 - db TILEMAP_TITLE_SCREEN_5, TILEMAP_TITLE_SCREEN_6, $00, $00 + db TILEMAP_TITLE_SCREEN, TILEMAP_TITLE_SCREEN_CGB, $00, $00 db $00 Scene_JapaneseTitleScreen: ; 12db3 (4:6db3) dw SGBData_TitleScreen dw NULL db PALETTE_25, PALETTE_25, $00 - db TILEMAP_TITLE_SCREEN_1, TILEMAP_TITLE_SCREEN_2, $80, $00 + db TILEMAP_JAPANESE_TITLE_SCREEN, TILEMAP_JAPANESE_TITLE_SCREEN_CGB, $80, $00 db $00 Scene_ColosseumBooster: ; 12dbf (4:6dbf) @@ -2356,14 +2356,14 @@ Scene_GameBoyLinkConnecting: ; 12e8b (4:6e8b) dw SGBData_GameBoyLink dw NULL db PALETTE_111, PALETTE_111, $00 - db TILEMAP_CARD_POP_2_UNKNOWN_2, TILEMAP_CARD_POP_2_UNKNOWN_1, $90, $00 + db TILEMAP_GAMEBOY_LINK_CONNECTING, TILEMAP_GAMEBOY_LINK_CONNECTING_CGB, $90, $00 db $00 Scene_GameBoyLinkTransmitting: ; 12e97 (4:6e97) dw SGBData_GameBoyLink dw NULL db PALETTE_111, PALETTE_111, $00 - db TILEMAP_CARD_POP_2_CGB, TILEMAP_CARD_POP_2, $90, $00 + db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00 db SPRITE_DUEL_52 db PALETTE_114, PALETTE_114, $00 db $b3, $b0, $50, $50 @@ -2373,7 +2373,7 @@ Scene_GameBoyLinkNotConnected: ; 12eac (4:6eac) dw SGBData_GameBoyLink dw NULL db PALETTE_111, PALETTE_111, $00 - db TILEMAP_CARD_POP_2_CGB, TILEMAP_CARD_POP_2, $90, $00 + db TILEMAP_GAMEBOY_LINK, TILEMAP_GAMEBOY_LINK_CGB, $90, $00 db SPRITE_DUEL_52 db PALETTE_114, PALETTE_114, $00 db $b4, $b1, $50, $50 @@ -2383,7 +2383,7 @@ Scene_GameBoyPrinterTransmitting: ; 12ec1 (4:6ec1) dw SGBData_GameBoyPrinter dw LoadScene_SetGameBoyPrinterAttrBlk db PALETTE_112, PALETTE_112, $00 - db TILEMAP_CARD_POP_3_CGB, TILEMAP_CARD_POP_3, $90, $00 + db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00 db SPRITE_DUEL_53 db PALETTE_115, PALETTE_115, $00 db $b7, $b5, $50, $30 @@ -2393,7 +2393,7 @@ Scene_GameBoyPrinterNotConnected: ; 12ed6 (4:6ed6) dw SGBData_GameBoyPrinter dw LoadScene_SetGameBoyPrinterAttrBlk db PALETTE_112, PALETTE_112, $00 - db TILEMAP_CARD_POP_3_CGB, TILEMAP_CARD_POP_3, $90, $00 + db TILEMAP_GAMEBOY_PRINTER, TILEMAP_GAMEBOY_PRINTER_CGB, $90, $00 db SPRITE_DUEL_53 db PALETTE_115, PALETTE_115, $00 db $b8, $b6, $50, $30 @@ -2403,7 +2403,7 @@ Scene_CardPop: ; 12eeb (4:6eeb) dw SGBData_CardPop dw LoadScene_SetCardPopAttrBlk db PALETTE_113, PALETTE_113, $00 - db TILEMAP_CARD_POP_1_CGB, TILEMAP_CARD_POP_1, $80, $00 + db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00 db SPRITE_DUEL_54 db PALETTE_116, PALETTE_116, $00 db $bb, $b9, $50, $40 @@ -2413,7 +2413,7 @@ Scene_CardPopError: ; 12f00 (4:6f00) dw SGBData_CardPop dw LoadScene_SetCardPopAttrBlk db PALETTE_113, PALETTE_113, $00 - db TILEMAP_CARD_POP_1_CGB, TILEMAP_CARD_POP_1, $80, $00 + db TILEMAP_CARD_POP, TILEMAP_CARD_POP_CGB, $80, $00 db SPRITE_DUEL_54 db PALETTE_116, PALETTE_116, $00 db $bc, $ba, $50, $40 @@ -2444,7 +2444,7 @@ Scene_JapaneseTitleScreen2: ; 12f39 (4:6f39) dw NULL dw NULL db PALETTE_109, PALETTE_100, $00 - db TILEMAP_TITLE_SCREEN_3, TILEMAP_TITLE_SCREEN_4, $01, $00 + db TILEMAP_JAPANESE_TITLE_SCREEN_2, TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB, $01, $00 db $00 LoadScene_LoadCompressedSGBPacket: ; 12f45 (4:6f45) |