From 1c4d420047bddfaeb09e72add72f49987434ef34 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 18 Feb 2021 08:58:38 +0000 Subject: Extract compressed data --- src/constants/map_constants.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/constants') diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm index 84656c4..be5ee7d 100644 --- a/src/constants/map_constants.asm +++ b/src/constants/map_constants.asm @@ -68,13 +68,13 @@ MAP_SCRIPT_CLOSE_TEXTBOX EQU $0e ; map palettes for use in SGB mode const_def 1 - const MAP_SGB_PALETTE_1 ; $1 - const MAP_SGB_PALETTE_2 ; $2 - const MAP_SGB_PALETTE_3 ; $3 - const MAP_SGB_PALETTE_4 ; $4 - const MAP_SGB_PALETTE_5 ; $5 - const MAP_SGB_PALETTE_6 ; $6 - const MAP_SGB_PALETTE_7 ; $7 - const MAP_SGB_PALETTE_8 ; $8 - const MAP_SGB_PALETTE_9 ; $9 - const MAP_SGB_PALETTE_10 ; $a + const MAP_SGB_PALS_1 ; $1 + const MAP_SGB_PALS_2 ; $2 + const MAP_SGB_PALS_3 ; $3 + const MAP_SGB_PALS_4 ; $4 + const MAP_SGB_PALS_5 ; $5 + const MAP_SGB_PALS_6 ; $6 + const MAP_SGB_PALS_7 ; $7 + const MAP_SGB_PALS_8 ; $8 + const MAP_SGB_PALS_9 ; $9 + const MAP_SGB_PALS_10 ; $a -- cgit v1.2.3 From 0321ab4252c27cbb9077621a8965762faae5da83 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 18 Feb 2021 20:33:14 +0000 Subject: Label data, split map tiles and permissions --- src/constants/tilemap_constants.asm | 16 ++-- src/constants/tileset_constants.asm | 174 ++++++++++++++++++------------------ 2 files changed, 95 insertions(+), 95 deletions(-) (limited to 'src/constants') diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm index 19761fa..d179584 100644 --- a/src/constants/tilemap_constants.asm +++ b/src/constants/tilemap_constants.asm @@ -3,12 +3,12 @@ const TILEMAP_OVERWORLD_MAP_CGB ; $01 const TILEMAP_MASON_LABORATORY ; $02 const TILEMAP_MASON_LABORATORY_CGB ; $03 - const TILEMAP_UNUSED_1 ; $04 - const TILEMAP_UNUSED_2 ; $05 + const TILEMAP_UNKNOWN_1 ; $04 + const TILEMAP_UNKNOWN_1_CGB ; $05 const TILEMAP_DECK_MACHINE_ROOM ; $06 const TILEMAP_DECK_MACHINE_ROOM_CGB ; $07 - const TILEMAP_UNUSED_3 ; $08 - const TILEMAP_UNUSED_4 ; $09 + const TILEMAP_UNKNOWN_2 ; $08 + const TILEMAP_UNKNOWN_2_CGB ; $09 const TILEMAP_ISHIHARA ; $0a const TILEMAP_ISHIHARA_CGB ; $0b const TILEMAP_FIGHTING_CLUB_ENTRANCE ; $0c @@ -51,12 +51,12 @@ const TILEMAP_CHALLENGE_HALL_CGB ; $31 const TILEMAP_POKEMON_DOME_ENTRANCE ; $32 const TILEMAP_POKEMON_DOME_ENTRANCE_CGB ; $33 - const TILEMAP_UNUSED_5 ; $34 - const TILEMAP_UNUSED_6 ; $35 + const TILEMAP_UNKNOWN_3 ; $34 + const TILEMAP_UNKNOWN_3_CGB ; $35 const TILEMAP_POKEMON_DOME ; $36 const TILEMAP_POKEMON_DOME_CGB ; $37 - const TILEMAP_UNUSED_7 ; $38 - const TILEMAP_UNUSED_8 ; $39 + const TILEMAP_UNKNOWN_4 ; $38 + const TILEMAP_UNKNOWN_4_CGB ; $39 const TILEMAP_HALL_OF_HONOR ; $3a const TILEMAP_HALL_OF_HONOR_CGB ; $3b const TILEMAP_CARD_POP_CGB ; $3c diff --git a/src/constants/tileset_constants.asm b/src/constants/tileset_constants.asm index 6319263..ecac689 100644 --- a/src/constants/tileset_constants.asm +++ b/src/constants/tileset_constants.asm @@ -1,88 +1,88 @@ const_def - const TILESET_OVERWORLD_MAP ; $00 - const TILESET_MASON_LABORATORY ; $01 - const TILESET_ISHIHARA ; $02 - const TILESET_CLUB_ENTRANCE ; $03 - const TILESET_CLUB_LOBBY ; $04 - const TILESET_FIGHTING_CLUB ; $05 - const TILESET_ROCK_CLUB ; $06 - const TILESET_WATER_CLUB ; $07 - const TILESET_LIGHTNING_CLUB ; $08 - const TILESET_GRASS_CLUB ; $09 - const TILESET_PSYCHIC_CLUB ; $0a - const TILESET_SCIENCE_CLUB ; $0b - const TILESET_FIRE_CLUB ; $0c - const TILESET_CHALLENGE_HALL ; $0d - const TILESET_POKEMON_DOME_ENTRANCE ; $0e - const TILESET_POKEMON_DOME ; $0f - const TILESET_HALL_OF_HONOR ; $10 - const TILESET_CARD_POP ; $11 - const TILESET_MEDAL ; $12 - const TILESET_GAMEBOY_LINK ; $13 - const TILESET_GAMEBOY_PRINTER ; $14 - const TILESET_COLOSSEUM_1 ; $15 - const TILESET_COLOSSEUM_2 ; $16 - const TILESET_EVOLUTION_1 ; $17 - const TILESET_EVOLUTION_2 ; $18 - const TILESET_MYSTERY_1 ; $19 - const TILESET_MYSTERY_2 ; $1a - const TILESET_LABORATORY_1 ; $1b - const TILESET_LABORATORY_2 ; $1c - const TILESET_CHARIZARD_INTRO_1 ; $1d - const TILESET_CHARIZARD_INTRO_2 ; $1e - const TILESET_SCYTHER_INTRO_1 ; $1f - const TILESET_SCYTHER_INTRO_2 ; $20 - const TILESET_AERODACTYL_INTRO_1 ; $21 - const TILESET_AERODACTYL_INTRO_2 ; $22 - const TILESET_TITLE_SCREEN_1 ; $23 - const TILESET_TITLE_SCREEN_2 ; $24 - const TILESET_SOLID_TILES_1 ; $25 - const TILESET_TITLE_SCREEN_3 ; $26 - const TILESET_TITLE_SCREEN_4 ; $27 - const TILESET_SOLID_TILES_2 ; $28 - const TILESET_PLAYER ; $29 - const TILESET_RONALD ; $2a - const TILESET_TITLE_SCREEN_5 ; $2b - const TILESET_TITLE_SCREEN_6 ; $2c - const TILESET_COPYRIGHT ; $2d - const TILESET_NINTENDO ; $2e - const TILESET_COMPANIES ; $2f - const TILESET_SAM ; $30 - const TILESET_IMAKUNI ; $31 - const TILESET_NIKKI ; $32 - const TILESET_RICK ; $33 - const TILESET_KEN ; $34 - const TILESET_AMY ; $35 - const TILESET_ISAAC ; $36 - const TILESET_MITCH ; $37 - const TILESET_GENE ; $38 - const TILESET_MURRAY ; $39 - const TILESET_COURTNEY ; $3a - const TILESET_STEVE ; $3b - const TILESET_JACK ; $3c - const TILESET_ROD ; $3d - const TILESET_JOSEPH ; $3e - const TILESET_DAVID ; $3f - const TILESET_ERIK ; $40 - const TILESET_JOHN ; $41 - const TILESET_ADAM ; $42 - const TILESET_JONATHAN ; $43 - const TILESET_JOSHUA ; $44 - const TILESET_NICHOLAS ; $45 - const TILESET_BRANDON ; $46 - const TILESET_MATTHEW ; $47 - const TILESET_RYAN ; $48 - const TILESET_ANDREW ; $49 - const TILESET_CHRIS ; $4a - const TILESET_MICHAEL ; $4b - const TILESET_DANIEL ; $4c - const TILESET_ROBERT ; $4d - const TILESET_BRITTANY ; $4e - const TILESET_KRISTIN ; $4f - const TILESET_HEATHER ; $50 - const TILESET_SARA ; $51 - const TILESET_AMANDA ; $52 - const TILESET_JENNIFER ; $53 - const TILESET_JESSICA ; $54 - const TILESET_STEPHANIE ; $55 - const TILESET_AARON ; $56 + const TILESET_OVERWORLD_MAP ; $00 + const TILESET_MASON_LABORATORY ; $01 + const TILESET_ISHIHARA ; $02 + const TILESET_CLUB_ENTRANCE ; $03 + const TILESET_CLUB_LOBBY ; $04 + const TILESET_FIGHTING_CLUB ; $05 + const TILESET_ROCK_CLUB ; $06 + const TILESET_WATER_CLUB ; $07 + const TILESET_LIGHTNING_CLUB ; $08 + const TILESET_GRASS_CLUB ; $09 + const TILESET_PSYCHIC_CLUB ; $0a + const TILESET_SCIENCE_CLUB ; $0b + const TILESET_FIRE_CLUB ; $0c + const TILESET_CHALLENGE_HALL ; $0d + const TILESET_POKEMON_DOME_ENTRANCE ; $0e + const TILESET_POKEMON_DOME ; $0f + const TILESET_HALL_OF_HONOR ; $10 + const TILESET_CARD_POP ; $11 + const TILESET_MEDAL ; $12 + const TILESET_GAMEBOY_LINK ; $13 + const TILESET_GAMEBOY_PRINTER ; $14 + const TILESET_COLOSSEUM_1 ; $15 + const TILESET_COLOSSEUM_2 ; $16 + const TILESET_EVOLUTION_1 ; $17 + const TILESET_EVOLUTION_2 ; $18 + const TILESET_MYSTERY_1 ; $19 + const TILESET_MYSTERY_2 ; $1a + const TILESET_LABORATORY_1 ; $1b + const TILESET_LABORATORY_2 ; $1c + const TILESET_CHARIZARD_INTRO_1 ; $1d + const TILESET_CHARIZARD_INTRO_2 ; $1e + const TILESET_SCYTHER_INTRO_1 ; $1f + const TILESET_SCYTHER_INTRO_2 ; $20 + const TILESET_AERODACTYL_INTRO_1 ; $21 + const TILESET_AERODACTYL_INTRO_2 ; $22 + const TILESET_JAPANESE_TITLE_SCREEN ; $23 + const TILESET_JAPANESE_TITLE_SCREEN_CGB ; $24 + const TILESET_SOLID_TILES_1 ; $25 + const TILESET_JAPANESE_TITLE_SCREEN_2 ; $26 + const TILESET_JAPANESE_TITLE_SCREEN_2_CGB ; $27 + const TILESET_SOLID_TILES_2 ; $28 + const TILESET_PLAYER ; $29 + const TILESET_RONALD ; $2a + const TILESET_TITLE_SCREEN ; $2b + const TILESET_TITLE_SCREEN_CGB ; $2c + const TILESET_COPYRIGHT ; $2d + const TILESET_NINTENDO ; $2e + const TILESET_COMPANIES ; $2f + const TILESET_SAM ; $30 + const TILESET_IMAKUNI ; $31 + const TILESET_NIKKI ; $32 + const TILESET_RICK ; $33 + const TILESET_KEN ; $34 + const TILESET_AMY ; $35 + const TILESET_ISAAC ; $36 + const TILESET_MITCH ; $37 + const TILESET_GENE ; $38 + const TILESET_MURRAY ; $39 + const TILESET_COURTNEY ; $3a + const TILESET_STEVE ; $3b + const TILESET_JACK ; $3c + const TILESET_ROD ; $3d + const TILESET_JOSEPH ; $3e + const TILESET_DAVID ; $3f + const TILESET_ERIK ; $40 + const TILESET_JOHN ; $41 + const TILESET_ADAM ; $42 + const TILESET_JONATHAN ; $43 + const TILESET_JOSHUA ; $44 + const TILESET_NICHOLAS ; $45 + const TILESET_BRANDON ; $46 + const TILESET_MATTHEW ; $47 + const TILESET_RYAN ; $48 + const TILESET_ANDREW ; $49 + const TILESET_CHRIS ; $4a + const TILESET_MICHAEL ; $4b + const TILESET_DANIEL ; $4c + const TILESET_ROBERT ; $4d + const TILESET_BRITTANY ; $4e + const TILESET_KRISTIN ; $4f + const TILESET_HEATHER ; $50 + const TILESET_SARA ; $51 + const TILESET_AMANDA ; $52 + const TILESET_JENNIFER ; $53 + const TILESET_JESSICA ; $54 + const TILESET_STEPHANIE ; $55 + const TILESET_AARON ; $56 -- cgit v1.2.3 From c8351624f7342b8b8081cb06a8c010ede7491f1d Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 18 Feb 2021 20:39:00 +0000 Subject: Fix spaces --- src/constants/tilemap_constants.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/constants') diff --git a/src/constants/tilemap_constants.asm b/src/constants/tilemap_constants.asm index d179584..4a64930 100644 --- a/src/constants/tilemap_constants.asm +++ b/src/constants/tilemap_constants.asm @@ -3,12 +3,12 @@ const TILEMAP_OVERWORLD_MAP_CGB ; $01 const TILEMAP_MASON_LABORATORY ; $02 const TILEMAP_MASON_LABORATORY_CGB ; $03 - const TILEMAP_UNKNOWN_1 ; $04 - const TILEMAP_UNKNOWN_1_CGB ; $05 + const TILEMAP_UNKNOWN_1 ; $04 + const TILEMAP_UNKNOWN_1_CGB ; $05 const TILEMAP_DECK_MACHINE_ROOM ; $06 const TILEMAP_DECK_MACHINE_ROOM_CGB ; $07 - const TILEMAP_UNKNOWN_2 ; $08 - const TILEMAP_UNKNOWN_2_CGB ; $09 + const TILEMAP_UNKNOWN_2 ; $08 + const TILEMAP_UNKNOWN_2_CGB ; $09 const TILEMAP_ISHIHARA ; $0a const TILEMAP_ISHIHARA_CGB ; $0b const TILEMAP_FIGHTING_CLUB_ENTRANCE ; $0c @@ -51,12 +51,12 @@ const TILEMAP_CHALLENGE_HALL_CGB ; $31 const TILEMAP_POKEMON_DOME_ENTRANCE ; $32 const TILEMAP_POKEMON_DOME_ENTRANCE_CGB ; $33 - const TILEMAP_UNKNOWN_3 ; $34 - const TILEMAP_UNKNOWN_3_CGB ; $35 + const TILEMAP_UNKNOWN_3 ; $34 + const TILEMAP_UNKNOWN_3_CGB ; $35 const TILEMAP_POKEMON_DOME ; $36 const TILEMAP_POKEMON_DOME_CGB ; $37 - const TILEMAP_UNKNOWN_4 ; $38 - const TILEMAP_UNKNOWN_4_CGB ; $39 + const TILEMAP_UNKNOWN_4 ; $38 + const TILEMAP_UNKNOWN_4_CGB ; $39 const TILEMAP_HALL_OF_HONOR ; $3a const TILEMAP_HALL_OF_HONOR_CGB ; $3b const TILEMAP_CARD_POP_CGB ; $3c -- cgit v1.2.3