diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/bank04.asm | 20 | ||||
| -rw-r--r-- | src/engine/bank20.asm | 34 |
2 files changed, 27 insertions, 27 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) diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 12bdd54..8026829 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -1000,8 +1000,8 @@ Tilemaps: ; 80e67 (20:4e67) tilemap Unused8Tilemap, TILESET_POKEMON_DOME ; TILEMAP_UNUSED_8 tilemap HallOfHonorTilemap, TILESET_HALL_OF_HONOR ; TILEMAP_HALL_OF_HONOR tilemap HallOfHonorCGBTilemap, TILESET_HALL_OF_HONOR ; TILEMAP_HALL_OF_HONOR_CGB - tilemap CardPop1Tilemap, TILESET_CARD_POP_1 ; TILEMAP_CARD_POP_1 - tilemap CardPop1CGBTilemap, TILESET_CARD_POP_1 ; TILEMAP_CARD_POP_1_CGB + tilemap CardPopCGBTilemap, TILESET_CARD_POP ; TILEMAP_CARD_POP_CGB + tilemap CardPopTilemap, TILESET_CARD_POP ; TILEMAP_CARD_POP tilemap GrassMedalTilemap, TILESET_MEDAL ; TILEMAP_GRASS_MEDAL tilemap ScienceMedalTilemap, TILESET_MEDAL ; TILEMAP_SCIENCE_MEDAL tilemap FireMedalTilemap, TILESET_MEDAL ; TILEMAP_FIRE_MEDAL @@ -1010,12 +1010,12 @@ Tilemaps: ; 80e67 (20:4e67) tilemap FightingMedalTilemap, TILESET_MEDAL ; TILEMAP_FIGHTING_MEDAL tilemap RockMedalTilemap, TILESET_MEDAL ; TILEMAP_ROCK_MEDAL tilemap PsychicMedalTilemap, TILESET_MEDAL ; TILEMAP_PSYCHIC_MEDAL - tilemap CardPop2Tilemap, TILESET_CARD_POP_2 ; TILEMAP_CARD_POP_2 - tilemap CardPop2CGBTilemap, TILESET_CARD_POP_2 ; TILEMAP_CARD_POP_2_CGB - tilemap CardPop2Unknown1Tilemap, TILESET_CARD_POP_2 ; TILEMAP_CARD_POP_2_UNKNOWN_1 - tilemap CardPop2Unknown2Tilemap, TILESET_CARD_POP_2 ; TILEMAP_CARD_POP_2_UNKNOWN_2 - tilemap CardPop3Tilemap, TILESET_CARD_POP_3 ; TILEMAP_CARD_POP_3 - tilemap CardPop3CGBTilemap, TILESET_CARD_POP_3 ; TILEMAP_CARD_POP_3_CGB + tilemap GameBoyLinkCGBTilemap, TILESET_GAMEBOY_LINK ; TILEMAP_GAMEBOY_LINK_CGB + tilemap GameBoyLinkTilemap, TILESET_GAMEBOY_LINK ; TILEMAP_GAMEBOY_LINK + tilemap GameBoyLinkConnectingCGBTilemap, TILESET_GAMEBOY_LINK ; TILEMAP_GAMEBOY_LINK_CONNECTING_CGB + tilemap GameBoyLinkConnectingTilemap, TILESET_GAMEBOY_LINK ; TILEMAP_GAMEBOY_LINK_CONNECTING + tilemap GameBoyPrinterCGBTilemap, TILESET_GAMEBOY_PRINTER ; TILEMAP_GAMEBOY_PRINTER_CGB + tilemap GameBoyPrinterTilemap, TILESET_GAMEBOY_PRINTER ; TILEMAP_GAMEBOY_PRINTER tilemap ColosseumTilemap, TILESET_COLOSSEUM_1 ; TILEMAP_COLOSSEUM tilemap ColosseumCGBTilemap, TILESET_COLOSSEUM_2 ; TILEMAP_COLOSSEUM_CGB tilemap EvolutionTilemap, TILESET_EVOLUTION_1 ; TILEMAP_EVOLUTION @@ -1030,18 +1030,18 @@ Tilemaps: ; 80e67 (20:4e67) tilemap ScytherIntroCGBTilemap, TILESET_SCYTHER_INTRO_2 ; TILEMAP_SCYTHER_INTRO_CGB tilemap AerodactylIntroTilemap, TILESET_AERODACTYL_INTRO_1 ; TILEMAP_AERODACTYL_INTRO tilemap AerodactylIntroCGBTilemap, TILESET_AERODACTYL_INTRO_2 ; TILEMAP_AERODACTYL_INTRO_CGB - tilemap TitleScreen1Tilemap, TILESET_TITLE_SCREEN_1 ; TILEMAP_TITLE_SCREEN_1 - tilemap TitleScreen2Tilemap, TILESET_TITLE_SCREEN_2 ; TILEMAP_TITLE_SCREEN_2 + tilemap TitleScreen1Tilemap, TILESET_TITLE_SCREEN_1 ; TILEMAP_JAPANESE_TITLE_SCREEN + tilemap TitleScreen2Tilemap, TILESET_TITLE_SCREEN_2 ; TILEMAP_JAPANESE_TITLE_SCREEN_CGB tilemap SolidTiles1Tilemap, TILESET_SOLID_TILES_1 ; TILEMAP_SOLID_TILES_1 tilemap SolidTiles2Tilemap, TILESET_SOLID_TILES_1 ; TILEMAP_SOLID_TILES_2 tilemap SolidTiles3Tilemap, TILESET_SOLID_TILES_1 ; TILEMAP_SOLID_TILES_3 - tilemap TitleScreen3Tilemap, TILESET_TITLE_SCREEN_3 ; TILEMAP_TITLE_SCREEN_3 - tilemap TitleScreen4Tilemap, TILESET_TITLE_SCREEN_4 ; TILEMAP_TITLE_SCREEN_4 + tilemap TitleScreen3Tilemap, TILESET_TITLE_SCREEN_3 ; TILEMAP_JAPANESE_TITLE_SCREEN_2 + tilemap TitleScreen4Tilemap, TILESET_TITLE_SCREEN_4 ; TILEMAP_JAPANESE_TITLE_SCREEN_2_CGB tilemap SolidTiles4Tilemap, TILESET_SOLID_TILES_2 ; TILEMAP_SOLID_TILES_4 tilemap PlayerTilemap, TILESET_PLAYER ; TILEMAP_PLAYER tilemap OpponentTilemap, TILESET_RONALD ; TILEMAP_OPPONENT - tilemap TitleScreen5Tilemap, TILESET_TITLE_SCREEN_5 ; TILEMAP_TITLE_SCREEN_5 - tilemap TitleScreen6Tilemap, TILESET_TITLE_SCREEN_6 ; TILEMAP_TITLE_SCREEN_6 + tilemap TitleScreen5Tilemap, TILESET_TITLE_SCREEN_5 ; TILEMAP_TITLE_SCREEN + tilemap TitleScreen6Tilemap, TILESET_TITLE_SCREEN_6 ; TILEMAP_TITLE_SCREEN_CGB tilemap CopyrightTilemap, TILESET_COPYRIGHT ; TILEMAP_COPYRIGHT tilemap CopyrightCGBTilemap, TILESET_COPYRIGHT ; TILEMAP_COPYRIGHT_CGB tilemap NintendoTilemap, TILESET_NINTENDO ; TILEMAP_NINTENDO @@ -1072,10 +1072,10 @@ Tilesets: ; 8100f (20:500f) tileset PokemonDomeEntranceTilesetGfx, 78 ; TILESET_POKEMON_DOME_ENTRANCE tileset PokemonDomeTilesetGfx, 207 ; TILESET_POKEMON_DOME tileset HallOfHonorTilesetGfx, 121 ; TILESET_HALL_OF_HONOR - tileset CardPop1Gfx, 189 ; TILESET_CARD_POP_1 + tileset CardPopGfx, 189 ; TILESET_CARD_POP tileset MedalGfx, 72 ; TILESET_MEDAL - tileset CardPop2Gfx, 109 ; TILESET_CARD_POP_2 - tileset CardPop3Gfx, 93 ; TILESET_CARD_POP_3 + tileset GameBoyLinkGfx, 109 ; TILESET_GAMEBOY_LINK + tileset GameBoyPrinterGfx, 93 ; TILESET_GAMEBOY_PRINTER tileset Colosseum1Gfx, 96 ; TILESET_COLOSSEUM_1 tileset Colosseum2Gfx, 86 ; TILESET_COLOSSEUM_2 tileset Evolution1Gfx, 96 ; TILESET_EVOLUTION_1 |