From 7742e53476fbd71db2c6468b9ed655bacb9c3769 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 5 Jun 2018 11:56:42 -0400 Subject: Define landmark constants --- data/maps/landmarks.asm | 90 +++++++++++++++++++++++------------------------ data/pokemon/palettes.inc | 8 ++--- data/wild.asm | 18 +++++----- 3 files changed, 58 insertions(+), 58 deletions(-) (limited to 'data') diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 314e4ba..bc05bd3 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -3,48 +3,48 @@ INCLUDE "constants.asm" SECTION "LandmarkNames", ROMX[$4AAF], BANK[$3F] LandmarkNames:: - db "サイレント@" - db "オールド@" - db "ウエスト@" - db "ハイテク@" - db "フォント@" - db "バードン@" - db "ニュータイプ@" - db "シュガー@" - db "ブルーフォレスト@" - db "スタンド@" - db "カントー@" - db "プりンス@" - db "フジヤマ@" - db "サウス@" - db "ノース@" - db "１５ばんどうろ@" - db "１８ばんどうろ@" - db "はつでんしょ１@" - db "はつでんしょ２@" - db "はつでんしょ３@" - db "はつでんしょ４@" - db "いせき　１@" - db "いせき　２@" - db "はいこう１@" - db "はいこう２@" - db "はいこう３@" - db "はいこう４@" - db "はいこう５@" - db "はいこう６@" - db "はいこう７@" - db "アジト　１@" - db "アジト　２@" - db "アジト　３@" - db "ヤドンの　いど１@" - db "ヤドンの　いど２@" - db "#りーぐ１@" - db "#りーぐ１@" - db "#りーぐ２@" - db "#りーぐ３@" - db "#りーぐ４@" - db "#りーぐ５@" - db "#りーぐ６@" - db "#りーぐ７@" - db "#りーぐ７@" - db "しずかなおか@" + db "サイレント@" ; SILENT + db "オールド@" ; OLD + db "ウエスト@" ; WEST + db "ハイテク@" ; HIGH_TECH + db "フォント@" ; FOUNT + db "バードン@" ; BIRDON + db "ニュータイプ@" ; NEW_TYPE + db "シュガー@" ; SUGAR + db "ブルーフォレスト@" ; BLUE_FOREST + db "スタンド@" ; STAND + db "カントー@" ; KANTO + db "プりンス@" ; PRINCE + db "フジヤマ@" ; MT_FUJI + db "サウス@" ; SOUTH + db "ノース@" ; NORTH + db "１５ばんどうろ@" ; ROUTE_15 + db "１８ばんどうろ@" ; ROUTE_18 + db "はつでんしょ１@" ; POWER_PLANT_1 + db "はつでんしょ２@" ; POWER_PLANT_2 + db "はつでんしょ３@" ; POWER_PLANT_3 + db "はつでんしょ４@" ; POWER_PLANT_4 + db "いせき　１@" ; RUINS_1 + db "いせき　２@" ; RUINS_2 + db "はいこう１@" ; MINES_1 + db "はいこう２@" ; MINES_2 + db "はいこう３@" ; MINES_3 + db "はいこう４@" ; MINES_4 + db "はいこう５@" ; MINES_5 + db "はいこう６@" ; MINES_6 + db "はいこう７@" ; MINES_7 + db "アジト　１@" ; HIDEOUT_1 + db "アジト　２@" ; HIDEOUT_2 + db "アジト　３@" ; HIDEOUT_3 + db "ヤドンの　いど１@" ; SLOWPOKE_WELL_1 + db "ヤドンの　いど２@" ; SLOWPOKE_WELL_2 + db "#りーぐ１@" ; POKEMON_LEAGUE_1 + db "#りーぐ１@" ; POKEMON_LEAGUE_1_2 + db "#りーぐ２@" ; POKEMON_LEAGUE_2 + db "#りーぐ３@" ; POKEMON_LEAGUE_3 + db "#りーぐ４@" ; POKEMON_LEAGUE_4 + db "#りーぐ５@" ; POKEMON_LEAGUE_5 + db "#りーぐ６@" ; POKEMON_LEAGUE_6 + db "#りーぐ７@" ; POKEMON_LEAGUE_7 + db "#りーぐ７@" ; POKEMON_LEAGUE_7_2 + db "しずかなおか@" ; SILENT_HILL diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc index 41ca0d5..a38cd99 100755 --- a/data/pokemon/palettes.inc +++ b/data/pokemon/palettes.inc @@ -251,7 +251,7 @@ PokemonPalettes: db PAL_BROWNMON ; BULU db PAL_BROWNMON ; TAIL db PAL_GREENMON ; LEAFY - db PAL_MEWMON ; NONE - db PAL_MEWMON ; NONE - db PAL_MEWMON ; NONE - db PAL_MEWMON ; NONE + db PAL_MEWMON ; FC + db PAL_MEWMON ; FD + db PAL_MEWMON ; FE + db PAL_MEWMON ; FF diff --git a/data/wild.asm b/data/wild.asm index 515985d..d1cea5c 100644 --- a/data/wild.asm +++ b/data/wild.asm @@ -7,7 +7,7 @@ GrassWildMons:: ; f:6a3c db $01, $01 ; map group, map id db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite ; morn -if def(GOLD) +if DEF(GOLD) db 7, DEX_SUNNY db 3, DEX_SUNNY db 5, DEX_SUNNY @@ -23,7 +23,7 @@ endc db 4, DEX_KORATTA db 6, DEX_KIRINRIKI db 4, DEX_KIRINRIKI -if def(GOLD) +if DEF(GOLD) db 4, DEX_HANEKO else db 4, DEX_MARIL @@ -34,7 +34,7 @@ endc db 7, DEX_KORATTA db 5, DEX_KORATTA db 5, DEX_KORATTA -if def(GOLD) +if DEF(GOLD) db 7, DEX_KORATTA db 8, DEX_KORATTA else @@ -46,7 +46,7 @@ endc db $01, $02 ; map group, map id db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite ; morn -if def(GOLD) +if DEF(GOLD) db 6, DEX_SUNNY db 6, DEX_SUNNY db 6, DEX_SUNNY @@ -62,7 +62,7 @@ endc db 5, DEX_POPPO db 7, DEX_YOROIDORI db 5, DEX_KORATTA -if def(GOLD) +if DEF(GOLD) db 8, DEX_HANEKO else db 8, DEX_MARIL @@ -72,7 +72,7 @@ endc ; nite db 7, DEX_KORATTA db 6, DEX_ARBO -if def(GOLD) +if DEF(GOLD) db 6, DEX_KORATTA else db 6, DEX_HOHO @@ -622,7 +622,7 @@ endc db 6, DEX_POPPO db 4, DEX_CATERPIE db 6, DEX_CATERPIE -if def(GOLD) +if DEF(GOLD) db 6, DEX_HANEKO else db 6, DEX_MARIL @@ -632,7 +632,7 @@ endc ; nite db 4, DEX_TRANSEL db 6, DEX_KORATTA -if def(GOLD) +if DEF(GOLD) db 6, DEX_CATERPIE else db 5, DEX_HOHO @@ -641,5 +641,5 @@ endc db 5, DEX_TRANSEL db 5, DEX_PIKACHU - db $FF + db -1 ; end ; f:6e3e -- cgit v1.2.3 From 1023e4f2a9b315c5c38cf85118de3b9660d3a759 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 6 Jun 2018 01:23:38 +0200 Subject: Disassemble map headers --- data/maps/maps.asm | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 300 insertions(+) create mode 100644 data/maps/maps.asm (limited to 'data') diff --git a/data/maps/maps.asm b/data/maps/maps.asm new file mode 100644 index 0000000..c6751d7 --- /dev/null +++ b/data/maps/maps.asm @@ -0,0 +1,300 @@ +INCLUDE "constants.asm" + +map: MACRO +;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) +;\2: tileset: a TILESET_* constant +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm + db BANK(\1_MapAttributes), \2, \3 + dw \1_MapAttributes + db \4 + db 0, 0 ; ??? +ENDM + +SECTION "Map Data", ROMX[$4000], BANK[$04] + + db 0 ; ??? + +MapGroupPointers: + dw MapGroup_0 + dw MapGroup_1 + dw MapGroup_2 + dw MapGroup_3 + dw MapGroup_4 + dw MapGroup_5 + dw MapGroup_6 + dw MapGroup_7 + dw MapGroup_8 + dw MapGroup_9 + dw MapGroup_10 + dw MapGroup_11 + dw MapGroup_12 + dw MapGroup_13 + dw MapGroup_14 + dw MapGroup_15 + dw MapGroup_16 + +MapGroup_0: + map Route1P1, TILESET_00, ROUTE, LANDMARK_MT_FUJI + map Route1P2, TILESET_00, ROUTE, LANDMARK_SOUTH + map RouteSilentEast, TILESET_00, ROUTE, LANDMARK_BLUE_FOREST + map SilentHill, TILESET_00, TOWN, LANDMARK_STAND + map Route1Gate1F, TILESET_11, GATE, LANDMARK_SOUTH + map Route1Gate2F, TILESET_11, GATE, LANDMARK_SOUTH + map RouteSilentEastGate, TILESET_11, GATE, LANDMARK_BLUE_FOREST + map PlayerHouse1F, TILESET_09, INDOOR, LANDMARK_STAND + map PlayerHouse2F, TILESET_09, INDOOR, LANDMARK_STAND + map SilentPokecenter, TILESET_0C, INDOOR, LANDMARK_STAND + map SilentHillHouse, TILESET_09, INDOOR, LANDMARK_STAND + map SilentHillLab, TILESET_0A, INDOOR, LANDMARK_STAND + map SilentHillLab2, TILESET_0A, INDOOR, LANDMARK_STAND + map Unused13, TILESET_0A, INDOOR, LANDMARK_STAND + map ShizukanaOka, TILESET_1B, CAVE, LANDMARK_NONE + +MapGroup_1: + map Route2, TILESET_01, ROUTE, LANDMARK_ROUTE_15 + map OldCity, TILESET_01, TOWN, LANDMARK_NORTH + map Route2Gate1F, TILESET_11, GATE, LANDMARK_ROUTE_15 + map Route2Gate2F, TILESET_11, GATE, LANDMARK_ROUTE_15 + map Route2House, TILESET_09, INDOOR, LANDMARK_ROUTE_15 + map OldMuseum, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldGym, TILESET_14, INDOOR, LANDMARK_NORTH + map OldTower1F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldTower2F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldTower3F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldTower4F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldTower5F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldBillsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldMart, TILESET_0D, INDOOR, LANDMARK_NORTH + map OldHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldPokecenter1F, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldPokecenter2F, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldPokecenterTrade, TILESET_11, GATE, LANDMARK_NORTH + map OldPokecenterBattle, TILESET_11, GATE, LANDMARK_NORTH + map OldPokecenterTimeMachine, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldKurtsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldSchool, TILESET_0F, INDOOR, LANDMARK_NORTH + +MapGroup_2: + map West, TILESET_02, TOWN, LANDMARK_ROUTE_18 + map WestMart1F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMart2F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMart3F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMart4F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMart5F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMart6F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestMartElevator, TILESET_10, INDOOR, LANDMARK_ROUTE_18 + map WestRadioTower1F, TILESET_12, INDOOR, LANDMARK_ROUTE_18 + map WestRadioTower2F, TILESET_12, INDOOR, LANDMARK_ROUTE_18 + map WestRadioTower3F, TILESET_12, INDOOR, LANDMARK_ROUTE_18 + map WestRadioTower4F, TILESET_12, INDOOR, LANDMARK_ROUTE_18 + map WestRadioTower5F, TILESET_12, INDOOR, LANDMARK_ROUTE_18 + map WestRocketRaidedHouse, TILESET_09, INDOOR, LANDMARK_ROUTE_18 + map WestPokecenter1F, TILESET_0C, INDOOR, LANDMARK_ROUTE_18 + map WestPokecenter2F, TILESET_0C, INDOOR, LANDMARK_ROUTE_18 + map WestGym, TILESET_14, INDOOR, LANDMARK_ROUTE_18 + map WestHouse1, TILESET_09, INDOOR, LANDMARK_ROUTE_18 + map WestHouse2, TILESET_09, INDOOR, LANDMARK_ROUTE_18 + +MapGroup_3: + map HaitekuWestRoute, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_3 + map HaitekuWestRouteOcean, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_2 + map Haiteku, TILESET_03, TOWN, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuWestRouteGate, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_2 + map HaitekuPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuLeague1F, TILESET_0F, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuLeague2F, TILESET_14, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuMart, TILESET_0D, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuHouse1, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuHouse2, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuImposterOakHouse, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuAquarium1F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + map HaitekuAquarium2F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4 + +MapGroup_4: + map FontoRoute1, TILESET_05, ROUTE, LANDMARK_POKEMON_LEAGUE_1_2 + map FontoRoute2, TILESET_05, ROUTE, LANDMARK_HIDEOUT_3 + map FontoRoute3, TILESET_05, ROUTE, LANDMARK_HIDEOUT_1 + map FontoRoute4, TILESET_05, ROUTE, LANDMARK_POKEMON_LEAGUE_6 + map FontoRoute5, TILESET_05, ROUTE, LANDMARK_SLOWPOKE_WELL_2 + map FontoRoute6, TILESET_05, ROUTE, LANDMARK_SLOWPOKE_WELL_1 + map Fonto, TILESET_05, TOWN, LANDMARK_HIDEOUT_2 + map FontoRouteGate1, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_1_2 + map FontoRouteGate2, TILESET_11, GATE, LANDMARK_POKEMON_LEAGUE_6 + map FontoRouteGate3, TILESET_11, GATE, LANDMARK_SLOWPOKE_WELL_2 + map FontoRocketHouse, TILESET_13, INDOOR, LANDMARK_HIDEOUT_2 + map FontoMart, TILESET_0D, INDOOR, LANDMARK_HIDEOUT_2 + map FontoHouse, TILESET_09, INDOOR, LANDMARK_HIDEOUT_2 + map FontoPokecenter1F, TILESET_0C, INDOOR, LANDMARK_HIDEOUT_2 + map FontoPokecenter2F, TILESET_0C, INDOOR, LANDMARK_HIDEOUT_2 + map FontoLab, TILESET_0A, INDOOR, LANDMARK_HIDEOUT_2 + +MapGroup_5: + map BaadonRoute1, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_1 + map BaadonRoute2, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_3 + map BaadonRoute3, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_4 + map Baadon, TILESET_04, TOWN, LANDMARK_POWER_PLANT_2 + map BaadonRouteGateWest, TILESET_11, GATE, LANDMARK_POWER_PLANT_1 + map BaadonRouteGateNewtype, TILESET_11, GATE, LANDMARK_POWER_PLANT_4 + map BaadonMart, TILESET_0D, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonHouse1, TILESET_0B, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonWallpaperHouse, TILESET_0E, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonHouse2, TILESET_09, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonLeague1F, TILESET_0F, INDOOR, LANDMARK_POWER_PLANT_2 + map BaadonLeague2F, TILESET_14, INDOOR, LANDMARK_POWER_PLANT_2 + +MapGroup_6: + map Route15, TILESET_00, ROUTE, LANDMARK_RUINS_1 + map NewtypeRoute, TILESET_00, ROUTE, LANDMARK_MINES_3 + map Route18, TILESET_00, ROUTE, LANDMARK_MINES_4 + map Newtype, TILESET_00, TOWN, LANDMARK_RUINS_2 + map Route15Pokecenter1F, TILESET_0C, INDOOR, LANDMARK_RUINS_1 + map Route15Pokecenter2F, TILESET_0C, INDOOR, LANDMARK_RUINS_1 + map NewtypeRouteGate, TILESET_11, GATE, LANDMARK_MINES_4 + map Route18Pokecenter1F, TILESET_0C, INDOOR, LANDMARK_MINES_4 + map Route18Pokecenter2F, TILESET_0C, INDOOR, LANDMARK_MINES_4 + map NewtypePokecenter1F, TILESET_0C, INDOOR, LANDMARK_RUINS_2 + map NewtypePokecenter2F, TILESET_0C, INDOOR, LANDMARK_RUINS_2 + map NewtypeLeague1F, TILESET_0F, INDOOR, LANDMARK_RUINS_2 + map NewtypeLeague2F, TILESET_14, INDOOR, LANDMARK_RUINS_2 + map NewtypeSailorHouse, TILESET_09, INDOOR, LANDMARK_RUINS_2 + map NewtypeMart, TILESET_0D, INDOOR, LANDMARK_RUINS_2 + map NewtypeDojo, TILESET_0B, INDOOR, LANDMARK_RUINS_2 + map NewtypeHouse1, TILESET_09, INDOOR, LANDMARK_RUINS_2 + map NewtypeDiner, TILESET_0E, INDOOR, LANDMARK_RUINS_2 + map NewtypeHouse2, TILESET_09, INDOOR, LANDMARK_RUINS_2 + map NewtypeHouse3, TILESET_09, INDOOR, LANDMARK_RUINS_2 + +MapGroup_7: + map SugarRoute, TILESET_03, ROUTE, LANDMARK_MINES_1 + map Sugar, TILESET_03, TOWN, LANDMARK_MINES_2 + map SugarRouteGate, TILESET_11, GATE, LANDMARK_MINES_1 + map SugarHouse, TILESET_14, INDOOR, LANDMARK_MINES_2 + map SugarHouse2, TILESET_0B, INDOOR, LANDMARK_MINES_2 + map SugarMart, TILESET_0D, INDOOR, LANDMARK_MINES_2 + map SugarPokecenter1F, TILESET_0C, INDOOR, LANDMARK_MINES_2 + map SugarPokecenter2F, TILESET_0C, INDOOR, LANDMARK_MINES_2 + +MapGroup_8: + map BullForestRoute1, TILESET_06, ROUTE, LANDMARK_MINES_5 + map BullForestRoute2, TILESET_06, ROUTE, LANDMARK_HIGH_TECH + map BullForestRoute3, TILESET_06, ROUTE, LANDMARK_OLD + map BullForest, TILESET_06, TOWN, LANDMARK_WEST + map BullForestRoute1House, TILESET_09, INDOOR, LANDMARK_MINES_5 + map BullForestRouteGateStand, TILESET_11, GATE, LANDMARK_HIGH_TECH + map BullMart, TILESET_0D, INDOOR, LANDMARK_WEST + map BullHouse1, TILESET_0B, INDOOR, LANDMARK_WEST + map BullHouse2, TILESET_09, INDOOR, LANDMARK_WEST + map BullHouse3, TILESET_09, INDOOR, LANDMARK_WEST + map BullPokecenter1F, TILESET_0C, INDOOR, LANDMARK_WEST + map BullPokecenter2F, TILESET_0C, INDOOR, LANDMARK_WEST + map BullLeague1F, TILESET_0F, INDOOR, LANDMARK_WEST + map BullLeague2F, TILESET_14, INDOOR, LANDMARK_WEST + map BullHouse4, TILESET_09, INDOOR, LANDMARK_WEST + +MapGroup_9: + map StandRoute, TILESET_00, ROUTE, LANDMARK_BIRDON + map Stand, TILESET_00, TOWN, LANDMARK_FOUNT + map StandRouteGateKanto, TILESET_11, GATE, LANDMARK_BIRDON + map StandLab, TILESET_0C, INDOOR, LANDMARK_FOUNT + map StandPokecenter1F, TILESET_0C, INDOOR, LANDMARK_FOUNT + map StandPokecenter2F, TILESET_0C, INDOOR, LANDMARK_FOUNT + map StandOffice, TILESET_12, INDOOR, LANDMARK_FOUNT + map StandMart, TILESET_0D, INDOOR, LANDMARK_FOUNT + map StandHouse, TILESET_09, INDOOR, LANDMARK_FOUNT + map StandRocketHouse1F, TILESET_13, INDOOR, LANDMARK_FOUNT + map StandRocketHouse2F, TILESET_13, INDOOR, LANDMARK_FOUNT + map StandLeague1F, TILESET_0F, INDOOR, LANDMARK_FOUNT + map StandLeague2F, TILESET_14, INDOOR, LANDMARK_FOUNT + +MapGroup_10: + map KantoEastRoute, TILESET_07, ROUTE, LANDMARK_NEW_TYPE + map Kanto, TILESET_07, TOWN, LANDMARK_SUGAR + map KantoCeruleanHouse, TILESET_11, GATE, LANDMARK_SUGAR + map KantoPokecenter1F, TILESET_0C, INDOOR, LANDMARK_SUGAR + map KantoPokecenter2F, TILESET_0C, INDOOR, LANDMARK_SUGAR + map KantoLeague1F, TILESET_0F, INDOOR, LANDMARK_SUGAR + map KantoLeague2F, TILESET_14, INDOOR, LANDMARK_SUGAR + map KantoLavenderHouse, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoCeladonMart1F, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoCeladonMart2F, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoCeladonMart3F, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoCeladonMart4F, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoCeladonMart5F, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoCeladonElevator, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoMart, TILESET_0D, INDOOR, LANDMARK_SUGAR + map KantoGamefreakHQ1, TILESET_0A, INDOOR, LANDMARK_SUGAR + map KantoGamefreakHQ2, TILESET_0A, INDOOR, LANDMARK_SUGAR + map KantoGamefreakHQ3, TILESET_0A, INDOOR, LANDMARK_SUGAR + map KantoGamefreakHQ4, TILESET_0D, INDOOR, LANDMARK_SUGAR + map KantoGamefreakHQ5, TILESET_0A, INDOOR, LANDMARK_SUGAR + map KantoSilphCo, TILESET_13, INDOOR, LANDMARK_SUGAR + map KantoViridianHouse, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoGameCorner, TILESET_0E, INDOOR, LANDMARK_SUGAR + map KantoUnusedArea, TILESET_11, INDOOR, LANDMARK_SUGAR + map KantoGameCornerPrizes, TILESET_0E, INDOOR, LANDMARK_SUGAR + map KantoDiner, TILESET_0E, INDOOR, LANDMARK_SUGAR + map KantoSchool, TILESET_0F, INDOOR, LANDMARK_SUGAR + map KantoHospital, TILESET_10, INDOOR, LANDMARK_SUGAR + map KantoPokecenter21F, TILESET_0C, INDOOR, LANDMARK_SUGAR + map KantoPokecenter22F, TILESET_0C, INDOOR, LANDMARK_SUGAR + map KantoRedsHouse, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoGreensHouse1F, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoGreensHouse2F, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoEldersHouse, TILESET_09, INDOOR, LANDMARK_SUGAR + map KantoOaksLab, TILESET_0A, INDOOR, LANDMARK_SUGAR + map KantoLeague21F, TILESET_0F, INDOOR, LANDMARK_SUGAR + map KantoLeague22F, TILESET_14, INDOOR, LANDMARK_SUGAR + map KantoFishingGuru, TILESET_09, INDOOR, LANDMARK_SUGAR + +MapGroup_11: + map PrinceRoute, TILESET_00, ROUTE, LANDMARK_KANTO + map Prince, TILESET_00, TOWN, LANDMARK_KANTO + +MapGroup_12: + map MtFujiRoute, TILESET_00, ROUTE, LANDMARK_PRINCE + map MtFuji, TILESET_00, TOWN, LANDMARK_PRINCE + +MapGroup_13: + map South, TILESET_08, TOWN, LANDMARK_POKEMON_LEAGUE_1 + map SouthHouse1, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1 + map SouthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_1 + map SouthPokecenter2F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_1 + map SouthMart, TILESET_0D, INDOOR, LANDMARK_POKEMON_LEAGUE_1 + map SouthHouse2, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1 + +MapGroup_14: + map North, TILESET_06, TOWN, LANDMARK_SILENT + map NorthHouse1, TILESET_09, INDOOR, LANDMARK_SILENT + map NorthMart, TILESET_0D, INDOOR, LANDMARK_SILENT + map NorthHouse2, TILESET_09, INDOOR, LANDMARK_SILENT + map NorthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_SILENT + map NorthPokecenter2F, TILESET_0C, INDOOR, LANDMARK_SILENT + +MapGroup_15: + map PowerPlant1, TILESET_18, INDOOR, LANDMARK_NONE + map PowerPlant2, TILESET_18, INDOOR, LANDMARK_NONE + map PowerPlant3, TILESET_18, INDOOR, LANDMARK_NONE + map PowerPlant4, TILESET_18, INDOOR, LANDMARK_NONE + map RuinsOfAlphEntrance, TILESET_16, CAVE, LANDMARK_NONE + map RuinsOfAlphMain, TILESET_16, CAVE, LANDMARK_NONE + map CaveMinecarts1, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts2, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts3, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts4, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts5, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts6, TILESET_17, CAVE, LANDMARK_NONE + map CaveMinecarts7, TILESET_17, CAVE, LANDMARK_NONE + map Office1, TILESET_15, INDOOR, LANDMARK_NONE + map Office2, TILESET_15, INDOOR, LANDMARK_NONE + map Office3, TILESET_15, INDOOR, LANDMARK_NONE + map SlowpokeWellEntrance, TILESET_17, CAVE, LANDMARK_NONE + map SlowpokeWellMain, TILESET_17, CAVE, LANDMARK_NONE + +MapGroup_16: + +SECTION "MapAttributes1", ROMX[$59df], BANK[$36] +Map1_MapAttributes: -- cgit v1.2.3 From 77234a79ca007b88d9db3f84414dda31e6ade633 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 6 Jun 2018 01:26:33 +0200 Subject: Remove leftover cruft --- data/maps/maps.asm | 3 --- 1 file changed, 3 deletions(-) (limited to 'data') diff --git a/data/maps/maps.asm b/data/maps/maps.asm index c6751d7..59b8419 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -295,6 +295,3 @@ MapGroup_15: map SlowpokeWellMain, TILESET_17, CAVE, LANDMARK_NONE MapGroup_16: - -SECTION "MapAttributes1", ROMX[$59df], BANK[$36] -Map1_MapAttributes: -- cgit v1.2.3 From d4a65343dada6f15a56818fdf6ddb000fb381a55 Mon Sep 17 00:00:00 2001 From: pfero Date: Wed, 6 Jun 2018 01:41:42 +0200 Subject: Name the map groups --- data/maps/maps.asm | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'data') diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 59b8419..83f619d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -16,25 +16,25 @@ SECTION "Map Data", ROMX[$4000], BANK[$04] db 0 ; ??? MapGroupPointers: - dw MapGroup_0 - dw MapGroup_1 - dw MapGroup_2 - dw MapGroup_3 - dw MapGroup_4 - dw MapGroup_5 - dw MapGroup_6 - dw MapGroup_7 - dw MapGroup_8 - dw MapGroup_9 - dw MapGroup_10 - dw MapGroup_11 - dw MapGroup_12 - dw MapGroup_13 - dw MapGroup_14 - dw MapGroup_15 - dw MapGroup_16 + dw MapGroup_SilentHill + dw MapGroup_OldCity + dw MapGroup_West + dw MapGroup_Haiteku + dw MapGroup_Fonto + dw MapGroup_Baadon + dw MapGroup_Newtype + dw MapGroup_Sugar + dw MapGroup_Bull + dw MapGroup_Stand + dw MapGroup_Kanto + dw MapGroup_Prince + dw MapGroup_MtFuji + dw MapGroup_South + dw MapGroup_North + dw MapGroup_Misc + dw MapGroup_Empty -MapGroup_0: +MapGroup_SilentHill: map Route1P1, TILESET_00, ROUTE, LANDMARK_MT_FUJI map Route1P2, TILESET_00, ROUTE, LANDMARK_SOUTH map RouteSilentEast, TILESET_00, ROUTE, LANDMARK_BLUE_FOREST @@ -51,31 +51,31 @@ MapGroup_0: map Unused13, TILESET_0A, INDOOR, LANDMARK_STAND map ShizukanaOka, TILESET_1B, CAVE, LANDMARK_NONE -MapGroup_1: +MapGroup_OldCity: map Route2, TILESET_01, ROUTE, LANDMARK_ROUTE_15 map OldCity, TILESET_01, TOWN, LANDMARK_NORTH map Route2Gate1F, TILESET_11, GATE, LANDMARK_ROUTE_15 map Route2Gate2F, TILESET_11, GATE, LANDMARK_ROUTE_15 map Route2House, TILESET_09, INDOOR, LANDMARK_ROUTE_15 - map OldMuseum, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldGym, TILESET_14, INDOOR, LANDMARK_NORTH - map OldTower1F, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldTower2F, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldTower3F, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldTower4F, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldTower5F, TILESET_0F, INDOOR, LANDMARK_NORTH - map OldBillsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH - map OldMart, TILESET_0D, INDOOR, LANDMARK_NORTH - map OldHouse, TILESET_0B, INDOOR, LANDMARK_NORTH - map OldPokecenter1F, TILESET_0C, INDOOR, LANDMARK_NORTH - map OldPokecenter2F, TILESET_0C, INDOOR, LANDMARK_NORTH - map OldPokecenterTrade, TILESET_11, GATE, LANDMARK_NORTH - map OldPokecenterBattle, TILESET_11, GATE, LANDMARK_NORTH - map OldPokecenterTimeMachine, TILESET_0C, INDOOR, LANDMARK_NORTH - map OldKurtsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH - map OldSchool, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityMuseum, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityGym, TILESET_14, INDOOR, LANDMARK_NORTH + map OldCityTower1F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityTower2F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityTower3F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityTower4F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityTower5F, TILESET_0F, INDOOR, LANDMARK_NORTH + map OldCityBillsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldCityMart, TILESET_0D, INDOOR, LANDMARK_NORTH + map OldCityHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldCityPokecenter1F, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldCityPokecenter2F, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldCityPokecenterTrade, TILESET_11, GATE, LANDMARK_NORTH + map OldCityPokecenterBattle, TILESET_11, GATE, LANDMARK_NORTH + map OldCityPokecenterTimeMachine, TILESET_0C, INDOOR, LANDMARK_NORTH + map OldCityKurtsHouse, TILESET_0B, INDOOR, LANDMARK_NORTH + map OldCitySchool, TILESET_0F, INDOOR, LANDMARK_NORTH -MapGroup_2: +MapGroup_West: map West, TILESET_02, TOWN, LANDMARK_ROUTE_18 map WestMart1F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 map WestMart2F, TILESET_10, INDOOR, LANDMARK_ROUTE_18 @@ -96,7 +96,7 @@ MapGroup_2: map WestHouse1, TILESET_09, INDOOR, LANDMARK_ROUTE_18 map WestHouse2, TILESET_09, INDOOR, LANDMARK_ROUTE_18 -MapGroup_3: +MapGroup_Haiteku: map HaitekuWestRoute, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_3 map HaitekuWestRouteOcean, TILESET_03, ROUTE, LANDMARK_POKEMON_LEAGUE_2 map Haiteku, TILESET_03, TOWN, LANDMARK_POKEMON_LEAGUE_4 @@ -112,7 +112,7 @@ MapGroup_3: map HaitekuAquarium1F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4 map HaitekuAquarium2F, TILESET_0E, INDOOR, LANDMARK_POKEMON_LEAGUE_4 -MapGroup_4: +MapGroup_Fonto: map FontoRoute1, TILESET_05, ROUTE, LANDMARK_POKEMON_LEAGUE_1_2 map FontoRoute2, TILESET_05, ROUTE, LANDMARK_HIDEOUT_3 map FontoRoute3, TILESET_05, ROUTE, LANDMARK_HIDEOUT_1 @@ -130,7 +130,7 @@ MapGroup_4: map FontoPokecenter2F, TILESET_0C, INDOOR, LANDMARK_HIDEOUT_2 map FontoLab, TILESET_0A, INDOOR, LANDMARK_HIDEOUT_2 -MapGroup_5: +MapGroup_Baadon: map BaadonRoute1, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_1 map BaadonRoute2, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_3 map BaadonRoute3, TILESET_04, ROUTE, LANDMARK_POWER_PLANT_4 @@ -146,7 +146,7 @@ MapGroup_5: map BaadonLeague1F, TILESET_0F, INDOOR, LANDMARK_POWER_PLANT_2 map BaadonLeague2F, TILESET_14, INDOOR, LANDMARK_POWER_PLANT_2 -MapGroup_6: +MapGroup_Newtype: map Route15, TILESET_00, ROUTE, LANDMARK_RUINS_1 map NewtypeRoute, TILESET_00, ROUTE, LANDMARK_MINES_3 map Route18, TILESET_00, ROUTE, LANDMARK_MINES_4 @@ -168,7 +168,7 @@ MapGroup_6: map NewtypeHouse2, TILESET_09, INDOOR, LANDMARK_RUINS_2 map NewtypeHouse3, TILESET_09, INDOOR, LANDMARK_RUINS_2 -MapGroup_7: +MapGroup_Sugar: map SugarRoute, TILESET_03, ROUTE, LANDMARK_MINES_1 map Sugar, TILESET_03, TOWN, LANDMARK_MINES_2 map SugarRouteGate, TILESET_11, GATE, LANDMARK_MINES_1 @@ -178,7 +178,7 @@ MapGroup_7: map SugarPokecenter1F, TILESET_0C, INDOOR, LANDMARK_MINES_2 map SugarPokecenter2F, TILESET_0C, INDOOR, LANDMARK_MINES_2 -MapGroup_8: +MapGroup_Bull: map BullForestRoute1, TILESET_06, ROUTE, LANDMARK_MINES_5 map BullForestRoute2, TILESET_06, ROUTE, LANDMARK_HIGH_TECH map BullForestRoute3, TILESET_06, ROUTE, LANDMARK_OLD @@ -195,7 +195,7 @@ MapGroup_8: map BullLeague2F, TILESET_14, INDOOR, LANDMARK_WEST map BullHouse4, TILESET_09, INDOOR, LANDMARK_WEST -MapGroup_9: +MapGroup_Stand: map StandRoute, TILESET_00, ROUTE, LANDMARK_BIRDON map Stand, TILESET_00, TOWN, LANDMARK_FOUNT map StandRouteGateKanto, TILESET_11, GATE, LANDMARK_BIRDON @@ -210,7 +210,7 @@ MapGroup_9: map StandLeague1F, TILESET_0F, INDOOR, LANDMARK_FOUNT map StandLeague2F, TILESET_14, INDOOR, LANDMARK_FOUNT -MapGroup_10: +MapGroup_Kanto: map KantoEastRoute, TILESET_07, ROUTE, LANDMARK_NEW_TYPE map Kanto, TILESET_07, TOWN, LANDMARK_SUGAR map KantoCeruleanHouse, TILESET_11, GATE, LANDMARK_SUGAR @@ -250,15 +250,15 @@ MapGroup_10: map KantoLeague22F, TILESET_14, INDOOR, LANDMARK_SUGAR map KantoFishingGuru, TILESET_09, INDOOR, LANDMARK_SUGAR -MapGroup_11: +MapGroup_Prince: map PrinceRoute, TILESET_00, ROUTE, LANDMARK_KANTO map Prince, TILESET_00, TOWN, LANDMARK_KANTO -MapGroup_12: +MapGroup_MtFuji: map MtFujiRoute, TILESET_00, ROUTE, LANDMARK_PRINCE map MtFuji, TILESET_00, TOWN, LANDMARK_PRINCE -MapGroup_13: +MapGroup_South: map South, TILESET_08, TOWN, LANDMARK_POKEMON_LEAGUE_1 map SouthHouse1, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1 map SouthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_POKEMON_LEAGUE_1 @@ -266,7 +266,7 @@ MapGroup_13: map SouthMart, TILESET_0D, INDOOR, LANDMARK_POKEMON_LEAGUE_1 map SouthHouse2, TILESET_09, INDOOR, LANDMARK_POKEMON_LEAGUE_1 -MapGroup_14: +MapGroup_North: map North, TILESET_06, TOWN, LANDMARK_SILENT map NorthHouse1, TILESET_09, INDOOR, LANDMARK_SILENT map NorthMart, TILESET_0D, INDOOR, LANDMARK_SILENT @@ -274,7 +274,7 @@ MapGroup_14: map NorthPokecenter1F, TILESET_0C, INDOOR, LANDMARK_SILENT map NorthPokecenter2F, TILESET_0C, INDOOR, LANDMARK_SILENT -MapGroup_15: +MapGroup_Misc: map PowerPlant1, TILESET_18, INDOOR, LANDMARK_NONE map PowerPlant2, TILESET_18, INDOOR, LANDMARK_NONE map PowerPlant3, TILESET_18, INDOOR, LANDMARK_NONE @@ -294,4 +294,4 @@ MapGroup_15: map SlowpokeWellEntrance, TILESET_17, CAVE, LANDMARK_NONE map SlowpokeWellMain, TILESET_17, CAVE, LANDMARK_NONE -MapGroup_16: +MapGroup_Empty: -- cgit v1.2.3