mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
0668db0ef0
This adds the Mt Moon Square House, faithfully recreated from GSC. I haven't yet sorted out the important details regarding the Crater Guard and such, though. Making the map involved making a new desk tile and making house tile $36 be considered a counter tile. Hopefully there aren't any adverse consequences but I've never seen anything of that nature. I noticed there are a ton of Clefairy text bits, so I refactored it to be a single line farcalled from `text_7.asm`. This also involved an interesting thing with the Pokemon Fan Club where the Pikachu fan has a Clefairy, so I fixed that too. I figured that adding the dance was a little difficult right now, so we have Clefairys walking around instead. I haven't figured out a good place to add the ladders yet (since there should be two entrances) but we'll figure that out eventually. It's plausible that we just make the Crater the southern warp, but I like how out-of-the-way the current one is. Oh, and I fixed the Crater warps. Overall, functional, but not finished.
280 lines
15 KiB
NASM
280 lines
15 KiB
NASM
MACRO map_const
|
|
const \1
|
|
DEF \1_WIDTH EQU \2
|
|
DEF \1_HEIGHT EQU \3
|
|
ENDM
|
|
|
|
; map ids
|
|
; indexes for:
|
|
; - MapHeaderBanks (see data/maps/map_header_banks.asm)
|
|
; - MapHeaderPointers (see data/maps/map_header_pointers.asm)
|
|
; - MapSongBanks (see data/maps/songs.asm)
|
|
; - MapHSPointers (see data/maps/hide_show_data.asm)
|
|
; - MapSpriteSets (see data/maps/sprite_sets.asm)
|
|
; - ExternalMapEntries (see data/maps/town_map_entries.asm)
|
|
; - WildDataPointers (see data/wild/grass_water.asm)
|
|
; Each map also has associated data in maps.asm.
|
|
; Order: towns/cities, then routes, then indoor/dungeon maps
|
|
const_def
|
|
map_const PALLET_TOWN, 10, 9 ; $00
|
|
map_const VIRIDIAN_CITY, 20, 18 ; $01
|
|
map_const PEWTER_CITY, 20, 18 ; $02
|
|
map_const CERULEAN_CITY, 20, 18 ; $03
|
|
map_const VERMILION_CITY, 20, 18 ; $04
|
|
map_const LAVENDER_TOWN, 10, 9 ; $05
|
|
map_const CELADON_CITY, 25, 18 ; $06
|
|
map_const CELADON_UNIVERSITY_OUTSIDE, 21, 20 ; $07
|
|
map_const FUCHSIA_CITY, 20, 18 ; $08
|
|
map_const SAFFRON_CITY, 20, 18 ; $0A
|
|
map_const CINNABAR_ISLAND, 14, 15 ; $0A
|
|
map_const INDIGO_PLATEAU, 10, 9 ; $0B
|
|
map_const CITRINE_CITY, 20, 18 ; $0C
|
|
DEF NUM_CITY_MAPS EQU const_value
|
|
DEF FIRST_ROUTE_MAP EQU const_value
|
|
map_const ROUTE_1, 10, 18 ; $0D
|
|
map_const ROUTE_2, 10, 36 ; $0E
|
|
map_const ROUTE_3, 35, 9 ; $0F
|
|
map_const ROUTE_4, 45, 9 ; $10
|
|
map_const ROUTE_5, 10, 18 ; $11
|
|
map_const ROUTE_6, 10, 18 ; $12
|
|
map_const ROUTE_7, 10, 9 ; $13
|
|
map_const ROUTE_8, 30, 9 ; $14
|
|
map_const ROUTE_9, 30, 13 ; $15
|
|
map_const ROUTE_10, 10, 40 ; $16
|
|
map_const ROUTE_11, 30, 9 ; $17
|
|
map_const ROUTE_12, 10, 54 ; $18
|
|
map_const ROUTE_13, 30, 9 ; $19
|
|
map_const ROUTE_14, 10, 27 ; $1A
|
|
map_const ROUTE_15, 30, 9 ; $1B
|
|
map_const ROUTE_16, 20, 9 ; $1C
|
|
map_const ROUTE_17, 10, 72 ; $1D
|
|
map_const ROUTE_18, 25, 9 ; $1E
|
|
map_const ROUTE_19, 10, 27 ; $1F
|
|
map_const ROUTE_20, 50, 15 ; $20
|
|
map_const ROUTE_21, 10, 45 ; $21
|
|
map_const ROUTE_22, 20, 9 ; $22
|
|
map_const ROUTE_23, 10, 72 ; $23
|
|
map_const ROUTE_24, 10, 18 ; $24
|
|
map_const ROUTE_25, 37, 9 ; $25
|
|
map_const BRUNSWICK_TRAIL, 32, 14 ; $26 - was unused Cinnabar Mart copy, moved to $26
|
|
DEF FIRST_INDOOR_MAP EQU const_value
|
|
map_const REDS_HOUSE_1F, 4, 4 ; $27
|
|
map_const REDS_HOUSE_2F, 4, 4 ; $28
|
|
map_const BLUES_HOUSE, 4, 4 ; $29
|
|
map_const OAKS_LAB, 7, 6 ; $2A
|
|
map_const VIRIDIAN_POKECENTER, 7, 4 ; $2B
|
|
map_const VIRIDIAN_MART, 4, 4 ; $2C
|
|
map_const VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2D
|
|
map_const VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2E
|
|
map_const VIRIDIAN_GYM, 10, 9 ; $2F
|
|
map_const DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $30
|
|
map_const VIRIDIAN_FOREST_NORTH_GATE, 5, 4 ; $31
|
|
map_const ROUTE_2_TRADE_HOUSE, 4, 4 ; $32
|
|
map_const ROUTE_2_GATE, 5, 4 ; $33
|
|
map_const VIRIDIAN_FOREST_SOUTH_GATE, 5, 4 ; $34
|
|
map_const VIRIDIAN_FOREST, 17, 24 ; $35
|
|
map_const MUSEUM_1F, 10, 4 ; $36
|
|
map_const MUSEUM_2F, 7, 4 ; $37
|
|
map_const PEWTER_GYM, 5, 7 ; $38
|
|
map_const PEWTER_NIDORAN_HOUSE, 4, 4 ; $39
|
|
map_const PEWTER_MART, 4, 4 ; $3A
|
|
map_const PEWTER_SPEECH_HOUSE, 4, 4 ; $3B
|
|
map_const PEWTER_POKECENTER, 7, 4 ; $3C
|
|
map_const MT_MOON_1F, 20, 18 ; $3D
|
|
map_const MT_MOON_B1F, 14, 14 ; $3E
|
|
map_const MT_MOON_B2F, 20, 18 ; $3F
|
|
map_const CERULEAN_TRASHED_HOUSE, 4, 4 ; $40
|
|
map_const CERULEAN_TRADE_HOUSE, 4, 4 ; $41
|
|
map_const CERULEAN_POKECENTER, 7, 4 ; $42
|
|
map_const CERULEAN_GYM, 5, 7 ; $43
|
|
map_const BIKE_SHOP, 4, 4 ; $44
|
|
map_const CERULEAN_MART, 4, 4 ; $45
|
|
map_const MT_MOON_POKECENTER, 7, 4 ; $46
|
|
map_const VIRIDIAN_PRE_GYM, 5, 7 ; $47 - was CERULEAN_TRASHED_HOUSE_COPY
|
|
map_const ROUTE_5_GATE, 4, 3 ; $48
|
|
map_const UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $49
|
|
map_const DAYCARE, 4, 4 ; $4A
|
|
map_const ROUTE_6_GATE, 4, 3 ; $4B
|
|
map_const UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4C
|
|
map_const CELESTE_HILL, 12, 12 ; $4D - Was copy of above & unused
|
|
map_const ROUTE_7_GATE, 3, 4 ; $4E
|
|
map_const UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4F
|
|
map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $50 - was UNDERGROUND_PATH_ROUTE_7_COPY
|
|
map_const ROUTE_8_GATE, 3, 4 ; $51
|
|
map_const UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $52
|
|
map_const ROCK_TUNNEL_POKECENTER, 7, 4 ; $53
|
|
map_const ROCK_TUNNEL_1F, 20, 18 ; $54
|
|
map_const POWER_PLANT, 20, 18 ; $55
|
|
map_const ROUTE_11_GATE_1F, 4, 5 ; $56
|
|
map_const DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $57
|
|
map_const ROUTE_11_GATE_2F, 4, 4 ; $58
|
|
map_const ROUTE_12_GATE_1F, 5, 4 ; $59
|
|
map_const BILLS_HOUSE, 7, 4 ; $5A
|
|
map_const VERMILION_POKECENTER, 7, 4 ; $5B
|
|
map_const POKEMON_FAN_CLUB, 4, 4 ; $5C
|
|
map_const VERMILION_MART, 4, 4 ; $5D
|
|
map_const VERMILION_GYM, 5, 9 ; $5E
|
|
map_const VERMILION_PIDGEY_HOUSE, 4, 4 ; $5F
|
|
map_const VERMILION_DOCK, 14, 6 ; $60
|
|
map_const SS_ANNE_1F, 20, 9 ; $61
|
|
map_const SS_ANNE_2F, 20, 9 ; $62
|
|
map_const SS_ANNE_3F, 10, 3 ; $63
|
|
map_const SS_ANNE_B1F, 15, 4 ; $64
|
|
map_const SS_ANNE_BOW, 10, 7 ; $65
|
|
map_const SS_ANNE_KITCHEN, 7, 8 ; $66
|
|
map_const SS_ANNE_CAPTAINS_ROOM, 3, 4 ; $67
|
|
map_const SS_ANNE_1F_ROOMS, 12, 8 ; $68
|
|
map_const SS_ANNE_2F_ROOMS, 12, 8 ; $69
|
|
map_const SS_ANNE_B1F_ROOMS, 12, 8 ; $6A
|
|
map_const SILPH_GAUNTLET_1F, 10, 9 ; $6B - Was UNUSED_MAP_69
|
|
map_const SILPH_GAUNTLET_2F, 13, 10 ; $6C - Was UNUSED_MAP_6A
|
|
map_const SILPH_GAUNTLET_3F, 17, 13 ; $6D - Was UNUSED_MAP_6B
|
|
map_const VICTORY_ROAD_1F, 10, 9 ; $6E
|
|
map_const SILPH_GAUNTLET_4F, 10, 9 ; $6F - Was UNUSED_MAP_6D
|
|
map_const SILPH_GAUNTLET_5F, 10, 9 ; $70 - Was UNUSED_MAP_6E
|
|
map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F
|
|
map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70
|
|
map_const LANCES_ROOM, 13, 13 ; $73
|
|
map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72
|
|
map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73
|
|
map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74
|
|
map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75
|
|
map_const HALL_OF_FAME, 5, 4 ; $78
|
|
map_const UNDERGROUND_PATH_NORTH_SOUTH, 4, 24 ; $79 ; UndergroundPathNorthSouth.blk is actually 4x23
|
|
map_const CHAMPIONS_ROOM, 4, 4 ; $7A
|
|
map_const UNDERGROUND_PATH_WEST_EAST, 25, 4 ; $7B
|
|
map_const CELADON_MART_1F, 10, 4 ; $7C
|
|
map_const CELADON_MART_2F, 10, 4 ; $7D
|
|
map_const CELADON_MART_3F, 10, 4 ; $7E
|
|
map_const CELADON_MART_4F, 10, 4 ; $7F
|
|
map_const CELADON_MART_ROOF, 10, 4 ; $80
|
|
map_const CELADON_MART_ELEVATOR, 2, 2 ; $81
|
|
map_const CELADON_MANSION_1F, 4, 6 ; $82
|
|
map_const CELADON_MANSION_2F, 4, 6 ; $83
|
|
map_const CELADON_MANSION_3F, 4, 6 ; $84
|
|
map_const CELADON_MANSION_ROOF, 4, 6 ; $85
|
|
map_const CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $86
|
|
map_const CELADON_POKECENTER, 7, 4 ; $87
|
|
map_const CELADON_GYM, 5, 9 ; $88
|
|
map_const GAME_CORNER, 10, 9 ; $89
|
|
map_const CELADON_MART_5F, 10, 4 ; $8A
|
|
map_const GAME_CORNER_PRIZE_ROOM, 5, 4 ; $8B
|
|
map_const CELADON_DINER, 5, 4 ; $8C
|
|
map_const CELADON_CHIEF_HOUSE, 4, 4 ; $8D
|
|
map_const CELADON_HOTEL, 7, 4 ; $8E
|
|
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
|
|
map_const POKEMON_TOWER_1F, 10, 9 ; $90
|
|
map_const POKEMON_TOWER_2F, 10, 9 ; $91
|
|
map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
|
|
map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
|
|
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
|
|
map_const POKEMON_TOWER_6F, 10, 9 ; $95
|
|
map_const POKEMON_TOWER_7F, 10, 9 ; $96
|
|
map_const MR_FUJIS_HOUSE, 4, 4 ; $97
|
|
map_const LAVENDER_MART, 4, 4 ; $98
|
|
map_const LAVENDER_CUBONE_HOUSE, 4, 4 ; $99
|
|
map_const FUCHSIA_MART, 4, 4 ; $9A
|
|
map_const FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $9B
|
|
map_const FUCHSIA_POKECENTER, 7, 4 ; $9C
|
|
map_const WARDENS_HOUSE, 5, 4 ; $9D
|
|
map_const SAFARI_ZONE_GATE, 4, 3 ; $9E
|
|
map_const FUCHSIA_GYM, 5, 9 ; $9F
|
|
map_const FUCHSIA_MEETING_ROOM, 7, 4 ; $A0
|
|
map_const SEAFOAM_ISLANDS_B1F, 15, 9 ; $A1
|
|
map_const SEAFOAM_ISLANDS_B2F, 15, 9 ; $A2
|
|
map_const SEAFOAM_ISLANDS_B3F, 15, 9 ; $A3
|
|
map_const SEAFOAM_ISLANDS_B4F, 15, 9 ; $A4
|
|
map_const CITRINE_TRADEBACK_HOUSE, 4, 4 ; $A5 - Was Vermillion Old Rod house
|
|
map_const CITRINE_POKECENTER, 7, 4 ; $A6 - Was Fuschia Good Rod house
|
|
map_const POKEMON_MANSION_1F, 15, 14 ; $A7
|
|
map_const CINNABAR_GYM, 10, 9 ; $A8
|
|
map_const CINNABAR_LAB, 9, 4 ; $A9
|
|
map_const CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $AA
|
|
map_const CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $AB
|
|
map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AC
|
|
map_const CINNABAR_POKECENTER, 7, 4 ; $AD
|
|
map_const CINNABAR_MART, 4, 4 ; $AE
|
|
map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF
|
|
map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0
|
|
map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1
|
|
map_const FIGHTING_DOJO, 5, 6 ; $B2
|
|
map_const SAFFRON_GYM, 10, 9 ; $B3
|
|
map_const SAFFRON_PIDGEY_HOUSE, 4, 4 ; $B4
|
|
map_const SAFFRON_MART, 4, 4 ; $B5
|
|
map_const SILPH_CO_1F, 15, 9 ; $B6
|
|
map_const SAFFRON_POKECENTER, 7, 4 ; $B7
|
|
map_const MR_PSYCHICS_HOUSE, 4, 4 ; $B8
|
|
map_const ROUTE_15_GATE_1F, 4, 5 ; $B9
|
|
map_const ROUTE_15_GATE_2F, 4, 4 ; $BA
|
|
map_const ROUTE_16_GATE_1F, 4, 7 ; $BB
|
|
map_const ROUTE_16_GATE_2F, 4, 4 ; $BC
|
|
map_const ROUTE_16_FLY_HOUSE, 4, 4 ; $BD
|
|
map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; $BE
|
|
map_const ROUTE_18_GATE_1F, 4, 5 ; $BF
|
|
map_const ROUTE_18_GATE_2F, 4, 4 ; $C0
|
|
map_const SEAFOAM_ISLANDS_1F, 15, 9 ; $C1
|
|
map_const ROUTE_22_GATE, 5, 4 ; $C2
|
|
map_const VICTORY_ROAD_2F, 15, 9 ; $C3
|
|
map_const ROUTE_12_GATE_2F, 4, 4 ; $C4
|
|
map_const VERMILION_TRADE_HOUSE, 4, 4 ; $C5
|
|
map_const DIGLETTS_CAVE, 20, 18 ; $C6
|
|
map_const VICTORY_ROAD_3F, 15, 9 ; $C7
|
|
map_const ROCKET_HIDEOUT_B1F, 15, 14 ; $C8
|
|
map_const ROCKET_HIDEOUT_B2F, 15, 14 ; $C9
|
|
map_const ROCKET_HIDEOUT_B3F, 15, 14 ; $CA
|
|
map_const ROCKET_HIDEOUT_B4F, 15, 12 ; $CB
|
|
map_const ROCKET_HIDEOUT_ELEVATOR, 3, 4 ; $CC
|
|
map_const CITRINE_MART, 4, 4 ; $CD - was UNUSED_MAP_CC
|
|
map_const GARNET_CAVERN_1F, 15, 9 ; $CE - was UNUSED_MAP_CD
|
|
map_const GARNET_CAVERN_B1F, 15, 9 ; $CF - was UNUSED_MAP_CE
|
|
map_const SILPH_CO_2F, 15, 9 ; $D0
|
|
map_const SILPH_CO_3F, 15, 9 ; $D1
|
|
map_const SILPH_CO_4F, 15, 9 ; $D2
|
|
map_const SILPH_CO_5F, 15, 9 ; $D3
|
|
map_const SILPH_CO_6F, 13, 9 ; $D4
|
|
map_const SILPH_CO_7F, 13, 9 ; $D5
|
|
map_const SILPH_CO_8F, 13, 9 ; $D6
|
|
map_const POKEMON_MANSION_2F, 15, 14 ; $D7
|
|
map_const POKEMON_MANSION_3F, 15, 9 ; $D8
|
|
map_const POKEMON_MANSION_B1F, 15, 14 ; $D9
|
|
map_const SAFARI_ZONE_EAST, 15, 13 ; $DA
|
|
map_const SAFARI_ZONE_NORTH, 20, 18 ; $DB
|
|
map_const SAFARI_ZONE_WEST, 15, 13 ; $DC
|
|
map_const SAFARI_ZONE_CENTER, 15, 13 ; $DD
|
|
map_const SAFARI_ZONE_CENTER_REST_HOUSE, 4, 4 ; $DE
|
|
map_const SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DF
|
|
map_const SAFARI_ZONE_WEST_REST_HOUSE, 4, 4 ; $E0
|
|
map_const SAFARI_ZONE_EAST_REST_HOUSE, 4, 4 ; $E1
|
|
map_const SAFARI_ZONE_NORTH_REST_HOUSE, 4, 4 ; $E2
|
|
map_const CERULEAN_CAVE_2F, 15, 9 ; $E3
|
|
map_const CERULEAN_CAVE_B1F, 15, 9 ; $E4
|
|
map_const CERULEAN_CAVE_1F, 15, 9 ; $E5
|
|
map_const NAME_RATERS_HOUSE, 4, 4 ; $E6
|
|
map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7
|
|
map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7
|
|
map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $F8 - Switched with ROCK_TUNNEL_B1F
|
|
map_const SILPH_CO_9F, 13, 9 ; $EA
|
|
map_const SILPH_CO_10F, 8, 9 ; $EB
|
|
map_const SILPH_CO_11F, 9, 9 ; $EC
|
|
map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED
|
|
map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED
|
|
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE
|
|
map_const TRADE_CENTER, 5, 4 ; $F0
|
|
map_const COLOSSEUM, 5, 4 ; $F1
|
|
map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1
|
|
map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2
|
|
map_const BILLS_GARDEN, 10, 10 ; $F4 - Was UNUSED_MAP_F3
|
|
map_const LORELEIS_ROOM, 5, 6 ; $F5
|
|
map_const BRUNOS_ROOM, 5, 6 ; $F6
|
|
map_const AGATHAS_ROOM, 5, 6 ; $F7
|
|
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F8 - Switched with CINNABAR_VOLCANO_FLOORS
|
|
map_const GIOVANNIS_ROOM, 11, 14 ; $F9
|
|
map_const BATTLE_TENT, 5, 10 ; $FA
|
|
map_const MT_MOON_SQUARE, 13, 7 ; $FB
|
|
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC
|
|
DEF NUM_MAPS EQU const_value
|
|
|
|
; Indoor maps, such as houses, use this as the Map ID in their exit warps
|
|
; This map ID takes the player back to the last outdoor map they were on, stored in wLastMap
|
|
DEF LAST_MAP EQU -1
|