diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 5c4f38151..29808c86b 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -445,7 +445,7 @@ IntroScene1: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap001 + ld hl, IntroUnownAAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -456,18 +456,18 @@ IntroScene1: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap002 + ld hl, IntroUnownATilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -521,7 +521,7 @@ IntroScene3: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -529,18 +529,18 @@ IntroScene3: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -584,7 +584,7 @@ IntroScene5: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap005 + ld hl, IntroUnownHIAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -595,18 +595,18 @@ IntroScene5: ld hl, IntroPulseGFX ld de, vTiles0 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap006 + ld hl, IntroUnownHITilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -682,7 +682,7 @@ IntroScene7: ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -700,7 +700,7 @@ IntroScene7: ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles @@ -709,12 +709,12 @@ IntroScene7: ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -852,7 +852,7 @@ IntroScene11: ldh [hLCDCPointer], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap007 + ld hl, IntroUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -860,18 +860,18 @@ IntroScene11: ld hl, IntroUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap008 + ld hl, IntroUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette2 + ld hl, IntroUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -975,7 +975,7 @@ IntroScene13: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap003 + ld hl, IntroBackgroundAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -986,18 +986,18 @@ IntroScene13: ld hl, IntroBackgroundGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap004 + ld hl, IntroBackgroundTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette1 + ld hl, IntroBackgroundPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1079,7 +1079,7 @@ IntroScene15: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap009 + ld hl, IntroSuicuneJumpAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1094,7 +1094,7 @@ IntroScene15: ld hl, vTiles1 tile $00 lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap010 + ld hl, IntroSuicuneJumpTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1102,11 +1102,11 @@ IntroScene15: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1161,7 +1161,7 @@ IntroScene17: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap011 + ld hl, IntroSuicuneCloseAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1169,18 +1169,18 @@ IntroScene17: ld hl, IntroSuicuneCloseGFX ld de, vTiles1 tile $00 call Intro_DecompressRequest2bpp_255Tiles - ld hl, IntroTilemap012 + ld hl, IntroSuicuneCloseTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette4 + ld hl, IntroSuicuneClosePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1227,7 +1227,7 @@ IntroScene19: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap013 + ld hl, IntroSuicuneBackAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1242,7 +1242,7 @@ IntroScene19: ld hl, vTiles1 tile $7f lb bc, BANK(IntroGrass4GFX), 1 call Request2bpp - ld hl, IntroTilemap014 + ld hl, IntroSuicuneBackTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles call Intro_LoadTilemap @@ -1250,11 +1250,11 @@ IntroScene19: push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette5 + ld hl, IntroSuicunePalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -1404,7 +1404,7 @@ IntroScene26: ldh [hBGMapMode], a ld a, $1 ldh [rVBK], a - ld hl, IntroTilemap015 + ld hl, IntroCrystalUnownsAttrmap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ld a, $0 @@ -1412,18 +1412,18 @@ IntroScene26: ld hl, IntroCrystalUnownsGFX ld de, vTiles2 tile $00 call Intro_DecompressRequest2bpp_128Tiles - ld hl, IntroTilemap017 + ld hl, IntroCrystalUnownsTilemap debgcoord 0, 0 call Intro_DecompressRequest2bpp_64Tiles ldh a, [rSVBK] push af ld a, BANK(wBGPals1) ldh [rSVBK], a - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals1 ld bc, 16 palettes call CopyBytes - ld hl, IntroPalette3 + ld hl, IntroCrystalUnownsPalette ld de, wBGPals2 ld bc, 16 palettes call CopyBytes @@ -2038,14 +2038,14 @@ INCBIN "gfx/intro/pichu_wooper.2bpp.lz" IntroBackgroundGFX: INCBIN "gfx/intro/background.2bpp.lz" -IntroTilemap004: -INCBIN "gfx/intro/004.tilemap.lz" +IntroBackgroundTilemap: +INCBIN "gfx/intro/background.tilemap.lz" -IntroTilemap003: -INCBIN "gfx/intro/003.tilemap.lz" +IntroBackgroundAttrmap: +INCBIN "gfx/intro/background.attrmap.lz" -IntroPalette1: -INCLUDE "gfx/intro/intro_1.pal" +IntroBackgroundPalette: +INCLUDE "gfx/intro/background.pal" IntroUnownsGFX: INCBIN "gfx/intro/unowns.2bpp.lz" @@ -2053,50 +2053,50 @@ INCBIN "gfx/intro/unowns.2bpp.lz" IntroPulseGFX: INCBIN "gfx/intro/pulse.2bpp.lz" -IntroTilemap002: -INCBIN "gfx/intro/002.tilemap.lz" +IntroUnownATilemap: +INCBIN "gfx/intro/unown_a.tilemap.lz" -IntroTilemap001: -INCBIN "gfx/intro/001.tilemap.lz" +IntroUnownAAttrmap: +INCBIN "gfx/intro/unown_a.attrmap.lz" -IntroTilemap006: -INCBIN "gfx/intro/006.tilemap.lz" +IntroUnownHITilemap: +INCBIN "gfx/intro/unown_hi.tilemap.lz" -IntroTilemap005: -INCBIN "gfx/intro/005.tilemap.lz" +IntroUnownHIAttrmap: +INCBIN "gfx/intro/unown_hi.attrmap.lz" -IntroTilemap008: -INCBIN "gfx/intro/008.tilemap.lz" +IntroUnownsTilemap: +INCBIN "gfx/intro/unowns.tilemap.lz" -IntroTilemap007: -INCBIN "gfx/intro/007.tilemap.lz" +IntroUnownsAttrmap: +INCBIN "gfx/intro/unowns.attrmap.lz" -IntroPalette2: -INCLUDE "gfx/intro/intro_2.pal" +IntroUnownsPalette: +INCLUDE "gfx/intro/unowns.pal" IntroCrystalUnownsGFX: INCBIN "gfx/intro/crystal_unowns.2bpp.lz" -IntroTilemap017: -INCBIN "gfx/intro/017.tilemap.lz" +IntroCrystalUnownsTilemap: +INCBIN "gfx/intro/crystal_unowns.tilemap.lz" -IntroTilemap015: -INCBIN "gfx/intro/015.tilemap.lz" +IntroCrystalUnownsAttrmap: +INCBIN "gfx/intro/crystal_unowns.attrmap.lz" -IntroPalette3: -INCLUDE "gfx/intro/intro_3.pal" +IntroCrystalUnownsPalette: +INCLUDE "gfx/intro/crystal_unowns.pal" IntroSuicuneCloseGFX: INCBIN "gfx/intro/suicune_close.2bpp.lz" -IntroTilemap012: -INCBIN "gfx/intro/012.tilemap.lz" +IntroSuicuneCloseTilemap: +INCBIN "gfx/intro/suicune_close.tilemap.lz" -IntroTilemap011: -INCBIN "gfx/intro/011.tilemap.lz" +IntroSuicuneCloseAttrmap: +INCBIN "gfx/intro/suicune_close.attrmap.lz" -IntroPalette4: -INCLUDE "gfx/intro/intro_4.pal" +IntroSuicuneClosePalette: +INCLUDE "gfx/intro/suicune_close.pal" IntroSuicuneJumpGFX: INCBIN "gfx/intro/suicune_jump.2bpp.lz" @@ -2104,20 +2104,20 @@ INCBIN "gfx/intro/suicune_jump.2bpp.lz" IntroSuicuneBackGFX: INCBIN "gfx/intro/suicune_back.2bpp.lz" -IntroTilemap010: -INCBIN "gfx/intro/010.tilemap.lz" +IntroSuicuneJumpTilemap: +INCBIN "gfx/intro/suicune_jump.tilemap.lz" -IntroTilemap009: -INCBIN "gfx/intro/009.tilemap.lz" +IntroSuicuneJumpAttrmap: +INCBIN "gfx/intro/suicune_jump.attrmap.lz" -IntroTilemap014: -INCBIN "gfx/intro/014.tilemap.lz" +IntroSuicuneBackTilemap: +INCBIN "gfx/intro/suicune_back.tilemap.lz" -IntroTilemap013: -INCBIN "gfx/intro/013.tilemap.lz" +IntroSuicuneBackAttrmap: +INCBIN "gfx/intro/suicune_back.attrmap.lz" -IntroPalette5: -INCLUDE "gfx/intro/intro_5.pal" +IntroSuicunePalette: +INCLUDE "gfx/intro/suicune.pal" IntroUnownBackGFX: INCBIN "gfx/intro/unown_back.2bpp.lz" diff --git a/gfx/intro/003.tilemap b/gfx/intro/background.attrmap similarity index 100% rename from gfx/intro/003.tilemap rename to gfx/intro/background.attrmap diff --git a/gfx/intro/003.tilemap.lz.9f90366a b/gfx/intro/background.attrmap.lz.9f90366a similarity index 100% rename from gfx/intro/003.tilemap.lz.9f90366a rename to gfx/intro/background.attrmap.lz.9f90366a diff --git a/gfx/intro/intro_1.pal b/gfx/intro/background.pal similarity index 100% rename from gfx/intro/intro_1.pal rename to gfx/intro/background.pal diff --git a/gfx/intro/004.tilemap b/gfx/intro/background.tilemap similarity index 100% rename from gfx/intro/004.tilemap rename to gfx/intro/background.tilemap diff --git a/gfx/intro/004.tilemap.lz.4c7562ee b/gfx/intro/background.tilemap.lz.4c7562ee similarity index 100% rename from gfx/intro/004.tilemap.lz.4c7562ee rename to gfx/intro/background.tilemap.lz.4c7562ee diff --git a/gfx/intro/015.tilemap b/gfx/intro/crystal_unowns.attrmap similarity index 100% rename from gfx/intro/015.tilemap rename to gfx/intro/crystal_unowns.attrmap diff --git a/gfx/intro/015.tilemap.lz.1bfc5a89 b/gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 similarity index 100% rename from gfx/intro/015.tilemap.lz.1bfc5a89 rename to gfx/intro/crystal_unowns.attrmap.lz.1bfc5a89 diff --git a/gfx/intro/intro_3.pal b/gfx/intro/crystal_unowns.pal similarity index 100% rename from gfx/intro/intro_3.pal rename to gfx/intro/crystal_unowns.pal diff --git a/gfx/intro/017.tilemap b/gfx/intro/crystal_unowns.tilemap similarity index 100% rename from gfx/intro/017.tilemap rename to gfx/intro/crystal_unowns.tilemap diff --git a/gfx/intro/017.tilemap.lz.e4772015 b/gfx/intro/crystal_unowns.tilemap.lz.e4772015 similarity index 100% rename from gfx/intro/017.tilemap.lz.e4772015 rename to gfx/intro/crystal_unowns.tilemap.lz.e4772015 diff --git a/gfx/intro/intro_5.pal b/gfx/intro/suicune.pal similarity index 100% rename from gfx/intro/intro_5.pal rename to gfx/intro/suicune.pal diff --git a/gfx/intro/013.tilemap b/gfx/intro/suicune_back.attrmap similarity index 100% rename from gfx/intro/013.tilemap rename to gfx/intro/suicune_back.attrmap diff --git a/gfx/intro/013.tilemap.lz.18e3115f b/gfx/intro/suicune_back.attrmap.lz.18e3115f similarity index 100% rename from gfx/intro/013.tilemap.lz.18e3115f rename to gfx/intro/suicune_back.attrmap.lz.18e3115f diff --git a/gfx/intro/014.tilemap b/gfx/intro/suicune_back.tilemap similarity index 100% rename from gfx/intro/014.tilemap rename to gfx/intro/suicune_back.tilemap diff --git a/gfx/intro/014.tilemap.lz.7b59259d b/gfx/intro/suicune_back.tilemap.lz.7b59259d similarity index 100% rename from gfx/intro/014.tilemap.lz.7b59259d rename to gfx/intro/suicune_back.tilemap.lz.7b59259d diff --git a/gfx/intro/011.tilemap b/gfx/intro/suicune_close.attrmap similarity index 100% rename from gfx/intro/011.tilemap rename to gfx/intro/suicune_close.attrmap diff --git a/gfx/intro/011.tilemap.lz.bb066632 b/gfx/intro/suicune_close.attrmap.lz.bb066632 similarity index 100% rename from gfx/intro/011.tilemap.lz.bb066632 rename to gfx/intro/suicune_close.attrmap.lz.bb066632 diff --git a/gfx/intro/intro_4.pal b/gfx/intro/suicune_close.pal similarity index 100% rename from gfx/intro/intro_4.pal rename to gfx/intro/suicune_close.pal diff --git a/gfx/intro/012.tilemap b/gfx/intro/suicune_close.tilemap similarity index 100% rename from gfx/intro/012.tilemap rename to gfx/intro/suicune_close.tilemap diff --git a/gfx/intro/012.tilemap.lz.bc182264 b/gfx/intro/suicune_close.tilemap.lz.bc182264 similarity index 100% rename from gfx/intro/012.tilemap.lz.bc182264 rename to gfx/intro/suicune_close.tilemap.lz.bc182264 diff --git a/gfx/intro/009.tilemap b/gfx/intro/suicune_jump.attrmap similarity index 100% rename from gfx/intro/009.tilemap rename to gfx/intro/suicune_jump.attrmap diff --git a/gfx/intro/009.tilemap.lz.911a1ace b/gfx/intro/suicune_jump.attrmap.lz.911a1ace similarity index 100% rename from gfx/intro/009.tilemap.lz.911a1ace rename to gfx/intro/suicune_jump.attrmap.lz.911a1ace diff --git a/gfx/intro/010.tilemap b/gfx/intro/suicune_jump.tilemap similarity index 100% rename from gfx/intro/010.tilemap rename to gfx/intro/suicune_jump.tilemap diff --git a/gfx/intro/010.tilemap.lz.2717d106 b/gfx/intro/suicune_jump.tilemap.lz.2717d106 similarity index 100% rename from gfx/intro/010.tilemap.lz.2717d106 rename to gfx/intro/suicune_jump.tilemap.lz.2717d106 diff --git a/gfx/intro/001.tilemap b/gfx/intro/unown_a.attrmap similarity index 100% rename from gfx/intro/001.tilemap rename to gfx/intro/unown_a.attrmap diff --git a/gfx/intro/001.tilemap.lz.c2341875 b/gfx/intro/unown_a.attrmap.lz.c2341875 similarity index 100% rename from gfx/intro/001.tilemap.lz.c2341875 rename to gfx/intro/unown_a.attrmap.lz.c2341875 diff --git a/gfx/intro/002.tilemap b/gfx/intro/unown_a.tilemap similarity index 100% rename from gfx/intro/002.tilemap rename to gfx/intro/unown_a.tilemap diff --git a/gfx/intro/002.tilemap.lz.54d5b74b b/gfx/intro/unown_a.tilemap.lz.54d5b74b similarity index 100% rename from gfx/intro/002.tilemap.lz.54d5b74b rename to gfx/intro/unown_a.tilemap.lz.54d5b74b diff --git a/gfx/intro/005.tilemap b/gfx/intro/unown_hi.attrmap similarity index 100% rename from gfx/intro/005.tilemap rename to gfx/intro/unown_hi.attrmap diff --git a/gfx/intro/005.tilemap.lz.bed1ff6d b/gfx/intro/unown_hi.attrmap.lz.bed1ff6d similarity index 100% rename from gfx/intro/005.tilemap.lz.bed1ff6d rename to gfx/intro/unown_hi.attrmap.lz.bed1ff6d diff --git a/gfx/intro/006.tilemap b/gfx/intro/unown_hi.tilemap similarity index 100% rename from gfx/intro/006.tilemap rename to gfx/intro/unown_hi.tilemap diff --git a/gfx/intro/006.tilemap.lz.c8756972 b/gfx/intro/unown_hi.tilemap.lz.c8756972 similarity index 100% rename from gfx/intro/006.tilemap.lz.c8756972 rename to gfx/intro/unown_hi.tilemap.lz.c8756972 diff --git a/gfx/intro/007.tilemap b/gfx/intro/unowns.attrmap similarity index 100% rename from gfx/intro/007.tilemap rename to gfx/intro/unowns.attrmap diff --git a/gfx/intro/007.tilemap.lz.a9cbcbca b/gfx/intro/unowns.attrmap.lz.a9cbcbca similarity index 100% rename from gfx/intro/007.tilemap.lz.a9cbcbca rename to gfx/intro/unowns.attrmap.lz.a9cbcbca diff --git a/gfx/intro/intro_2.pal b/gfx/intro/unowns.pal similarity index 100% rename from gfx/intro/intro_2.pal rename to gfx/intro/unowns.pal diff --git a/gfx/intro/008.tilemap b/gfx/intro/unowns.tilemap similarity index 100% rename from gfx/intro/008.tilemap rename to gfx/intro/unowns.tilemap diff --git a/gfx/intro/008.tilemap.lz.f12ed6d9 b/gfx/intro/unowns.tilemap.lz.f12ed6d9 similarity index 100% rename from gfx/intro/008.tilemap.lz.f12ed6d9 rename to gfx/intro/unowns.tilemap.lz.f12ed6d9