Use constants to delineate map types, and factor out more data

4 files changed, 73 insertions, 0 deletions

diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm
new file mode 100644
index 00000000..2e7eeb2a
--- /dev/null
+++ b/data/events/bench_guys.asm
@@ -0,0 +1,20 @@
+bench_guy_text: MACRO
+	db \1, \2
+	db_tx_pre \3
+ENDM
+
+BenchGuyTextPointers:
+	; map id, player facing direction, predef text
+	bench_guy_text VIRIDIAN_POKECENTER,    SPRITE_FACING_LEFT, ViridianCityPokecenterBenchGuyText
+	bench_guy_text PEWTER_POKECENTER,      SPRITE_FACING_LEFT, PewterCityPokecenterBenchGuyText
+	bench_guy_text CERULEAN_POKECENTER,    SPRITE_FACING_LEFT, CeruleanCityPokecenterBenchGuyText
+	bench_guy_text LAVENDER_POKECENTER,    SPRITE_FACING_LEFT, LavenderCityPokecenterBenchGuyText
+	bench_guy_text VERMILION_POKECENTER,   SPRITE_FACING_LEFT, VermilionCityPokecenterBenchGuyText
+	bench_guy_text CELADON_POKECENTER,     SPRITE_FACING_LEFT, CeladonCityPokecenterBenchGuyText
+	bench_guy_text CELADON_HOTEL,          SPRITE_FACING_LEFT, CeladonCityHotelText
+	bench_guy_text FUCHSIA_POKECENTER,     SPRITE_FACING_LEFT, FuchsiaCityPokecenterBenchGuyText
+	bench_guy_text CINNABAR_POKECENTER,    SPRITE_FACING_LEFT, CinnabarIslandPokecenterBenchGuyText
+	bench_guy_text SAFFRON_POKECENTER,     SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText
+	bench_guy_text MT_MOON_POKECENTER,     SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText
+	bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText
+	db -1 ; end
diff --git a/data/events/card_key_coords.asm b/data/events/card_key_coords.asm
new file mode 100644
index 00000000..afdcfbd4
--- /dev/null
+++ b/data/events/card_key_coords.asm
@@ -0,0 +1,36 @@
+; These tables are probably supposed to be door locations in Silph Co.,
+; but they are unused.
+; The reason there are 3 tables is unknown.
+
+; Format: map ID, Y, X, gate ID?
+
+CardKeyTable1:
+	db  SILPH_CO_2F, $04, $04, 0
+	db  SILPH_CO_2F, $04, $05, 1
+	db  SILPH_CO_4F, $0C, $04, 2
+	db  SILPH_CO_4F, $0C, $05, 3
+	db  SILPH_CO_7F, $06, $0A, 4
+	db  SILPH_CO_7F, $06, $0B, 5
+	db  SILPH_CO_9F, $04, $12, 6
+	db  SILPH_CO_9F, $04, $13, 7
+	db SILPH_CO_10F, $08, $0A, 8
+	db SILPH_CO_10F, $08, $0B, 9
+	db -1 ; end
+
+CardKeyTable2:
+	db SILPH_CO_3F, $08, $09, 10
+	db SILPH_CO_3F, $09, $09, 11
+	db SILPH_CO_5F, $04, $07, 12
+	db SILPH_CO_5F, $05, $07, 13
+	db SILPH_CO_6F, $0C, $05, 14
+	db SILPH_CO_6F, $0D, $05, 15
+	db SILPH_CO_8F, $08, $07, 16
+	db SILPH_CO_8F, $09, $07, 17
+	db SILPH_CO_9F, $08, $03, 18
+	db SILPH_CO_9F, $09, $03, 19
+	db -1 ; end
+
+CardKeyTable3:
+	db SILPH_CO_11F, $08, $09, 20
+	db SILPH_CO_11F, $09, $09, 21
+	db -1 ; end
diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm
new file mode 100644
index 00000000..c66f31d9
--- /dev/null
+++ b/data/events/card_key_maps.asm
@@ -0,0 +1,12 @@
+SilphCoMapList:
+	db SILPH_CO_2F
+	db SILPH_CO_3F
+	db SILPH_CO_4F
+	db SILPH_CO_5F
+	db SILPH_CO_6F
+	db SILPH_CO_7F
+	db SILPH_CO_8F
+	db SILPH_CO_9F
+	db SILPH_CO_10F
+	db SILPH_CO_11F
+	db -1 ; end
diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm
index bec97b48..d647923c 100644
--- a/data/maps/dungeon_maps.asm
+++ b/data/maps/dungeon_maps.asm
@@ -1,3 +1,8 @@
+; GetBattleTransitionID_IsDungeonMap fails to recognize
+; VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps,
+; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT,
+; DIGLETTS_CAVE, and SILPH_CO_[9-11]F as dungeon maps
+
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is equal to one of these maps
 DungeonMaps1: