From f7000f066941779d75ef445ed534c7126ae08a6b Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 25 Sep 2020 15:25:09 -0400 Subject: Factor out Town Map tilemap and adjust its graphics --- engine/dumps/bank02.asm | 166 ++-------------------------------- engine/gfx.asm | 2 +- gfx/gfx.asm | 2 - gfx/pokedex/locations.png | Bin 146 -> 0 bytes gfx/trainer_gear/town_map.png | Bin 339 -> 383 bytes gfx/trainer_gear/town_map.tilemap.rle | Bin 0 -> 309 bytes 6 files changed, 7 insertions(+), 163 deletions(-) delete mode 100644 gfx/pokedex/locations.png create mode 100644 gfx/trainer_gear/town_map.tilemap.rle diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm index d69e694..17e2930 100755 --- a/engine/dumps/bank02.asm +++ b/engine/dumps/bank02.asm @@ -1104,10 +1104,10 @@ Function881e: call ClearTileMap call UpdateSprites call DisableLCD - ld hl, PokedexLocationGFX + ld hl, TownMapGFX ld de, vTilesetEnd - ld bc, $0200 - ld a, BANK(PokedexLocationGFX) + ld bc, TownMapGFX.End - TownMapGFX + ld a, BANK(TownMapGFX) call FarCopyData ld hl, wTileMap call DecompTownMapTilemap @@ -1197,161 +1197,7 @@ Function88b3: ret TownMapTilemap: - db $04, $05 - db $19, $01 - db $1a, $08 - db $1b, $01 - db $04, $02 - db $09, $01 - db $06, $02 - db $04, $05 - db $1c, $01 - db $05, $01 - db $11, $01 - db $12, $01 - db $13, $01 - db $14, $01 - db $15, $01 - db $16, $01 - db $17, $01 - db $1c, $01 - db $04, $02 - db $0a, $01 - db $05, $01 - db $06, $01 - db $04, $05 - db $1d, $01 - db $1a, $08 - db $1e, $01 - db $04, $03 - db $0f, $01 - db $10, $01 - db $04, $01 - db $0d, $01 - db $0e, $02 - db $0d, $01 - db $04, $09 - db $02, $01 - db $04, $02 - db $01, $01 - db $07, $01 - db $08, $01 - db $02, $01 - db $0f, $01 - db $02, $01 - db $04, $01 - db $0f, $01 - db $09, $01 - db $06, $01 - db $08, $01 - db $04, $05 - db $01, $01 - db $05, $01 - db $03, $01 - db $07, $02 - db $05, $01 - db $06, $01 - db $06, $01 - db $05, $01 - db $07, $01 - db $0e, $01 - db $05, $01 - db $07, $03 - db $08, $01 - db $04, $03 - db $02, $01 - db $04, $01 - db $0f, $01 - db $04, $01 - db $0c, $01 - db $06, $01 - db $07, $01 - db $0b, $01 - db $06, $01 - db $07, $01 - db $0b, $01 - db $04, $01 - db $0f, $01 - db $10, $01 - db $06, $01 - db $05, $01 - db $07, $02 - db $0c, $01 - db $07, $02 - db $03, $01 - db $0f, $01 - db $09, $01 - db $07, $01 - db $06, $01 - db $07, $01 - db $03, $01 - db $06, $01 - db $0f, $01 - db $09, $01 - db $06, $01 - db $07, $01 - db $03, $01 - db $0a, $01 - db $06, $05 - db $07, $02 - db $05, $01 - db $07, $02 - db $06, $01 - db $05, $01 - db $04, $01 - db $0b, $01 - db $0d, $01 - db $0c, $01 - db $07, $01 - db $05, $01 - db $0e, $01 - db $07, $02 - db $06, $0a - db $07, $01 - db $03, $01 - db $04, $02 - db $0a, $01 - db $06, $01 - db $0b, $01 - db $04, $01 - db $06, $01 - db $05, $01 - db $07, $02 - db $05, $01 - db $06, $01 - db $05, $01 - db $06, $05 - db $0c, $01 - db $08, $01 - db $04, $06 - db $0a, $01 - db $06, $02 - db $0b, $01 - db $07, $01 - db $06, $01 - db $0c, $01 - db $06, $02 - db $18, $01 - db $06, $02 - db $07, $01 - db $06, $01 - db $04, $0a - db $0c, $01 - db $07, $01 - db $05, $01 - db $07, $02 - db $05, $01 - db $07, $03 - db $0b, $01 - db $04, $0d - db $10, $01 - db $04, $01 - db $0a, $01 - db $0b, $01 - db $04, $01 - db $10, $01 - db $04, $01 - db $00 +INCBIN "gfx/trainer_gear/town_map.tilemap.rle" SECTION "engine/dumps/bank02.asm@Data8a17", ROMX @@ -1642,9 +1488,9 @@ DrawMap: call WaitForAutoBgMapTransfer ld b, $14 call GetSGBLayout - ld de, PokedexLocationGFX + ld de, TownMapGFX ld hl, vTilesetEnd - lb bc, BANK(PokedexLocationGFX), $1f + lb bc, BANK(TownMapGFX), ((TownMapGFX.End - TownMapGFX) / LEN_2BPP_TILE - 1) call Request2bpp coord hl, 0, 3 call DecompTownMapTilemap diff --git a/engine/gfx.asm b/engine/gfx.asm index ca14505..5700904 100644 --- a/engine/gfx.asm +++ b/engine/gfx.asm @@ -70,7 +70,7 @@ LoadPokeDexGraphics:: call LoadPokemonMenuGraphics ld de, PokedexGFX ld hl, $9600 - lb bc, BANK(PokedexGFX), ((PokedexLocationGFX.End - PokedexGFX) / LEN_2BPP_TILE) + lb bc, BANK(PokedexGFX), ((PokedexGFX.End - PokedexGFX) / LEN_2BPP_TILE + 5) ; copies first 5 tiles of TownMapGFX call Get2bpp ld de, PokeBallsGFX ld hl, $9720 diff --git a/gfx/gfx.asm b/gfx/gfx.asm index b8bba2e..e0ed3ee 100644 --- a/gfx/gfx.asm +++ b/gfx/gfx.asm @@ -618,8 +618,6 @@ ExpBarGFX:: INCBIN "gfx/battle/exp_bar.2bpp" .End:: PokedexGFX:: INCBIN "gfx/pokedex/pokedex.2bpp" .End:: -PokedexLocationGFX:: INCBIN "gfx/pokedex/locations.2bpp" -.End:: TownMapGFX:: INCBIN "gfx/trainer_gear/town_map.2bpp" .End:: HUD_GFX:: INCBIN "gfx/hud/hud.2bpp" diff --git a/gfx/pokedex/locations.png b/gfx/pokedex/locations.png deleted file mode 100644 index c7e37a2..0000000 Binary files a/gfx/pokedex/locations.png and /dev/null differ diff --git a/gfx/trainer_gear/town_map.png b/gfx/trainer_gear/town_map.png index fb880cd..d465673 100644 Binary files a/gfx/trainer_gear/town_map.png and b/gfx/trainer_gear/town_map.png differ diff --git a/gfx/trainer_gear/town_map.tilemap.rle b/gfx/trainer_gear/town_map.tilemap.rle new file mode 100644 index 0000000..1743d08 Binary files /dev/null and b/gfx/trainer_gear/town_map.tilemap.rle differ -- cgit v1.2.3