shithub: pokered

Download patch

ref: ccb01731fe8cd44ae4c8840ee8ddc02e6bdea97e
parent: 710c3275fc6a4caeeff3ad89c029a05984cf8388
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jul 3 11:57:35 EDT 2020 

Make suggested edits:

- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants

diff: cannot open a/data/mapWilds//null: file does not exist: 'a/data/mapWilds//null' diff: cannot open b/data/wild/maps//null: file does not exist: 'b/data/wild/maps//null' 
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -20,19 +20,6 @@
 REG_VOLUME_ENVELOPE EQU 2
 REG_FREQUENCY_LO    EQU 3
 
-MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA"
-MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
-MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR"
-
-NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01"
-NOISE_INSTRUMENTS_END   EQUS "SFX_NOISE_INSTRUMENT19 + 1"
-
-CRY_SFX_START EQUS "SFX_CRY_00"
-CRY_SFX_END   EQUS "SFX_CRY_25 + 3"
-
-BATTLE_SFX_START EQUS "SFX_PECK"
-BATTLE_SFX_END   EQUS "SFX_SILPH_SCOPE + 1"
-
 ; wChannelFlags1 constants
 BIT_PERFECT_PITCH          EQU 0 ; controlled by toggle_perfect_pitch command
 BIT_SOUND_CALL             EQU 1 ; if in sound call
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -56,6 +56,7 @@
 	music_const MUSIC_MEET_MALE_TRAINER,   Music_MeetMaleTrainer
 
 	; AUDIO_1 AUDIO_2 AUDIO_3
+NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01"
 	music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1
 	music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1
 	music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1
@@ -75,6 +76,9 @@
 	music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1
 	music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1
 	music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_1
+NOISE_INSTRUMENTS_END EQUS "SFX_NOISE_INSTRUMENT19 + 1"
+
+CRY_SFX_START EQUS "SFX_CRY_00"
 	music_const SFX_CRY_00,             SFX_Cry00_1
 	music_const SFX_CRY_01,             SFX_Cry01_1
 	music_const SFX_CRY_02,             SFX_Cry02_1
@@ -113,6 +117,7 @@
 	music_const SFX_CRY_23,             SFX_Cry23_1
 	music_const SFX_CRY_24,             SFX_Cry24_1
 	music_const SFX_CRY_25,             SFX_Cry25_1
+CRY_SFX_END EQUS "SFX_CRY_25 + 3"
 
 	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
 	music_const SFX_TINK,               SFX_Tink_1
@@ -157,10 +162,10 @@
 	; AUDIO_1
 	music_const SFX_POKEFLUTE,          SFX_Pokeflute
 	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
+MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA"
 
 	; AUDIO_2
 	music_const SFX_LEVEL_UP,           SFX_Level_Up
-
 	music_const SFX_BALL_TOSS,          SFX_Ball_Toss
 	music_const SFX_BALL_POOF,          SFX_Ball_Poof
 	music_const SFX_FAINT_THUD,         SFX_Faint_Thud
@@ -167,6 +172,8 @@
 	music_const SFX_RUN,                SFX_Run
 	music_const SFX_DEX_PAGE_ADDED,     SFX_Dex_Page_Added
 	music_const SFX_CAUGHT_MON,         SFX_Caught_Mon
+
+BATTLE_SFX_START EQUS "SFX_PECK"
 	music_const SFX_PECK,               SFX_Peck
 	music_const SFX_FAINT_FALL,         SFX_Faint_Fall
 	music_const SFX_BATTLE_09,          SFX_Battle_09
@@ -216,6 +223,8 @@
 	music_const SFX_BATTLE_35,          SFX_Battle_35
 	music_const SFX_BATTLE_36,          SFX_Battle_36
 	music_const SFX_SILPH_SCOPE,        SFX_Silph_Scope
+BATTLE_SFX_END   EQUS "SFX_SILPH_SCOPE + 1"
+MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
 
 	; AUDIO_3
 	music_const SFX_INTRO_LUNGE,        SFX_Intro_Lunge
@@ -228,3 +237,4 @@
 	music_const SFX_SLOTS_REWARD,       SFX_Slots_Reward
 	music_const SFX_SLOTS_NEW_SPIN,     SFX_Slots_New_Spin
 	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
+MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR"
--- a/data/mapWilds/CeruleanCave1F.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-DungeonMons1:
-	db $0A
-	db 46,GOLBAT
-	db 46,HYPNO
-	db 46,MAGNETON
-	db 49,DODRIO
-	db 49,VENOMOTH
-	IF DEF(_RED)
-		db 52,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 52,SANDSLASH
-	ENDC
-	db 49,KADABRA
-	db 52,PARASECT
-	db 53,RAICHU
-	db 53,DITTO
-	db $00
--- a/data/mapWilds/CeruleanCave2F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-DungeonMons2:
-	db $0F
-	db 51,DODRIO
-	db 51,VENOMOTH
-	db 51,KADABRA
-	db 52,RHYDON
-	db 52,MAROWAK
-	db 52,ELECTRODE
-	db 56,CHANSEY
-	db 54,WIGGLYTUFF
-	db 55,DITTO
-	db 60,DITTO
-	db $00
--- a/data/mapWilds/CeruleanCaveB1F.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-DungeonMonsB1:
-	db $19
-	db 55,RHYDON
-	db 55,MAROWAK
-	db 55,ELECTRODE
-	db 64,CHANSEY
-	db 64,PARASECT
-	db 64,RAICHU
-	IF DEF(_RED)
-		db 57,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 57,SANDSLASH
-	ENDC
-	db 65,DITTO
-	db 63,DITTO
-	db 67,DITTO
-	db $00
--- a/data/mapWilds/DiglettsCave.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-CaveMons:
-	db $14
-	db 18,DIGLETT
-	db 19,DIGLETT
-	db 17,DIGLETT
-	db 20,DIGLETT
-	db 16,DIGLETT
-	db 15,DIGLETT
-	db 21,DIGLETT
-	db 22,DIGLETT
-	db 29,DUGTRIO
-	db 31,DUGTRIO
-	db $00
--- a/data/mapWilds/MtMoon1F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-MoonMons1:
-	db $0A
-	db 8,ZUBAT
-	db 7,ZUBAT
-	db 9,ZUBAT
-	db 8,GEODUDE
-	db 6,ZUBAT
-	db 10,ZUBAT
-	db 10,GEODUDE
-	db 8,PARAS
-	db 11,ZUBAT
-	db 8,CLEFAIRY
-	db $00
--- a/data/mapWilds/MtMoonB1F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-MoonMonsB1:
-	db $0A
-	db 8,ZUBAT
-	db 7,ZUBAT
-	db 7,GEODUDE
-	db 8,GEODUDE
-	db 9,ZUBAT
-	db 10,PARAS
-	db 10,ZUBAT
-	db 11,ZUBAT
-	db 9,CLEFAIRY
-	db 9,GEODUDE
-	db $00
--- a/data/mapWilds/MtMoonB2F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-MoonMonsB2:
-	db $0A
-	db 9,ZUBAT
-	db 9,GEODUDE
-	db 10,ZUBAT
-	db 10,GEODUDE
-	db 11,ZUBAT
-	db 10,PARAS
-	db 12,PARAS
-	db 10,CLEFAIRY
-	db 12,ZUBAT
-	db 12,CLEFAIRY
-	db $00
--- a/data/mapWilds/PokemonMansion1F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-MansionMons1:
-	db $0A
-	IF DEF(_RED)
-		db 32,KOFFING
-		db 30,KOFFING
-		db 34,PONYTA
-		db 30,PONYTA
-		db 34,GROWLITHE
-		db 32,PONYTA
-		db 30,GRIMER
-		db 28,PONYTA
-		db 37,WEEZING
-		db 39,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 32,GRIMER
-		db 30,GRIMER
-		db 34,PONYTA
-		db 30,PONYTA
-		db 34,VULPIX
-		db 32,PONYTA
-		db 30,KOFFING
-		db 28,PONYTA
-		db 37,MUK
-		db 39,WEEZING
-	ENDC
-	db $00
--- a/data/mapWilds/PokemonMansion2F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-MansionMons2:
-	db $0A
-	IF DEF(_RED)
-		db 32,GROWLITHE
-		db 34,KOFFING
-		db 34,KOFFING
-		db 30,PONYTA
-		db 30,KOFFING
-		db 32,PONYTA
-		db 30,GRIMER
-		db 28,PONYTA
-		db 39,WEEZING
-		db 37,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 32,VULPIX
-		db 34,GRIMER
-		db 34,GRIMER
-		db 30,PONYTA
-		db 30,GRIMER
-		db 32,PONYTA
-		db 30,KOFFING
-		db 28,PONYTA
-		db 39,MUK
-		db 37,WEEZING
-	ENDC
-	db $00
--- a/data/mapWilds/PokemonMansion3F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-MansionMons3:
-	db $0A
-	IF DEF(_RED)
-		db 31,KOFFING
-		db 33,GROWLITHE
-		db 35,KOFFING
-		db 32,PONYTA
-		db 34,PONYTA
-		db 40,WEEZING
-		db 34,GRIMER
-		db 38,WEEZING
-		db 36,PONYTA
-		db 42,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 31,GRIMER
-		db 33,VULPIX
-		db 35,GRIMER
-		db 32,PONYTA
-		db 34,MAGMAR
-		db 40,MUK
-		db 34,KOFFING
-		db 38,MUK
-		db 36,PONYTA
-		db 42,WEEZING
-	ENDC
-	db $00
--- a/data/mapWilds/PokemonMansionB1F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-MansionMonsB1:
-	db $0A
-	IF DEF(_RED)
-		db 33,KOFFING
-		db 31,KOFFING
-		db 35,GROWLITHE
-		db 32,PONYTA
-		db 31,KOFFING
-		db 40,WEEZING
-		db 34,PONYTA
-		db 35,GRIMER
-		db 42,WEEZING
-		db 42,MUK
-	ENDC
-	IF DEF(_BLUE)
-		db 33,GRIMER
-		db 31,GRIMER
-		db 35,VULPIX
-		db 32,PONYTA
-		db 31,GRIMER
-		db 40,MUK
-		db 34,PONYTA
-		db 35,KOFFING
-		db 38,MAGMAR
-		db 42,WEEZING
-	ENDC
-	db $00
--- a/data/mapWilds/PokemonTower1F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-TowerMons1:
-	db $00
-	db $00
--- a/data/mapWilds/PokemonTower2F.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-TowerMons2:
-	db $00
-	db $00
--- a/data/mapWilds/PokemonTower3F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TowerMons3:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 24,GASTLY
-	db 20,CUBONE
-	db 22,CUBONE
-	db 25,HAUNTER
-	db $00
--- a/data/mapWilds/PokemonTower4F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TowerMons4:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 25,HAUNTER
-	db 20,CUBONE
-	db 22,CUBONE
-	db 24,GASTLY
-	db $00
--- a/data/mapWilds/PokemonTower5F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TowerMons5:
-	db $0A
-	db 20,GASTLY
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 19,GASTLY
-	db 18,GASTLY
-	db 25,HAUNTER
-	db 20,CUBONE
-	db 22,CUBONE
-	db 24,GASTLY
-	db $00
--- a/data/mapWilds/PokemonTower6F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TowerMons6:
-	db $0F
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 24,GASTLY
-	db 20,GASTLY
-	db 19,GASTLY
-	db 26,HAUNTER
-	db 22,CUBONE
-	db 24,CUBONE
-	db 28,HAUNTER
-	db $00
--- a/data/mapWilds/PokemonTower7F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TowerMons7:
-	db $0F
-	db 21,GASTLY
-	db 22,GASTLY
-	db 23,GASTLY
-	db 24,GASTLY
-	db 20,GASTLY
-	db 28,HAUNTER
-	db 22,CUBONE
-	db 24,CUBONE
-	db 28,HAUNTER
-	db 30,HAUNTER
-	db $00
--- a/data/mapWilds/PowerPlant.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-PowerPlantMons:
-	db $0A
-	db 21,VOLTORB
-	db 21,MAGNEMITE
-	db 20,PIKACHU
-	db 24,PIKACHU
-	db 23,MAGNEMITE
-	db 23,VOLTORB
-	db 32,MAGNETON
-	db 35,MAGNETON
-	IF DEF(_RED)
-		db 33,ELECTABUZZ
-		db 36,ELECTABUZZ
-	ENDC
-	IF DEF(_BLUE)
-		db 33,RAICHU
-		db 36,RAICHU
-	ENDC
-	db $00
--- a/data/mapWilds/RockTunnel1F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TunnelMonsB1:
-	db $0F
-	db 16,ZUBAT
-	db 17,ZUBAT
-	db 17,GEODUDE
-	db 15,MACHOP
-	db 16,GEODUDE
-	db 18,ZUBAT
-	db 15,ZUBAT
-	db 17,MACHOP
-	db 13,ONIX
-	db 15,ONIX
-	db $00
--- a/data/mapWilds/RockTunnelB1F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-TunnelMonsB2:
-	db $0F
-	db 16,ZUBAT
-	db 17,ZUBAT
-	db 17,GEODUDE
-	db 15,MACHOP
-	db 16,GEODUDE
-	db 18,ZUBAT
-	db 17,MACHOP
-	db 17,ONIX
-	db 13,ONIX
-	db 18,GEODUDE
-	db $00
--- a/data/mapWilds/Route1.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-Route1Mons:
-	db $19
-	db 3,PIDGEY
-	db 3,RATTATA
-	db 3,RATTATA
-	db 2,RATTATA
-	db 2,PIDGEY
-	db 3,PIDGEY
-	db 3,PIDGEY
-	db 4,RATTATA
-	db 4,PIDGEY
-	db 5,PIDGEY
-	db $00
--- a/data/mapWilds/Route10.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route10Mons:
-	db $0F
-	IF DEF(_RED)
-		db 16,VOLTORB
-		db 16,SPEAROW
-		db 14,VOLTORB
-		db 11,EKANS
-		db 13,SPEAROW
-		db 15,EKANS
-		db 17,VOLTORB
-		db 17,SPEAROW
-		db 13,EKANS
-		db 17,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 16,VOLTORB
-		db 16,SPEAROW
-		db 14,VOLTORB
-		db 11,SANDSHREW
-		db 13,SPEAROW
-		db 15,SANDSHREW
-		db 17,VOLTORB
-		db 17,SPEAROW
-		db 13,SANDSHREW
-		db 17,SANDSHREW
-	ENDC
-	db $00
--- a/data/mapWilds/Route11.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route11Mons:
-	db $0F
-	IF DEF(_RED)
-		db 14,EKANS
-		db 15,SPEAROW
-		db 12,EKANS
-		db 9,DROWZEE
-		db 13,SPEAROW
-		db 13,DROWZEE
-		db 15,EKANS
-		db 17,SPEAROW
-		db 11,DROWZEE
-		db 15,DROWZEE
-	ENDC
-	IF DEF(_BLUE)
-		db 14,SANDSHREW
-		db 15,SPEAROW
-		db 12,SANDSHREW
-		db 9,DROWZEE
-		db 13,SPEAROW
-		db 13,DROWZEE
-		db 15,SANDSHREW
-		db 17,SPEAROW
-		db 11,DROWZEE
-		db 15,DROWZEE
-	ENDC
-	db $00
--- a/data/mapWilds/Route12.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route12Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 25,PIDGEY
-		db 23,PIDGEY
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 27,PIDGEY
-		db 28,GLOOM
-		db 30,GLOOM
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 25,PIDGEY
-		db 23,PIDGEY
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 27,PIDGEY
-		db 28,WEEPINBELL
-		db 30,WEEPINBELL
-	ENDC
-	db $00
--- a/data/mapWilds/Route13.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-Route13Mons:
-	IF DEF(_RED)
-		db $14
-		db 24,ODDISH
-		db 25,PIDGEY
-		db 27,PIDGEY
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 25,DITTO
-		db 28,GLOOM
-		db 30,GLOOM
-	ENDC
-	IF DEF(_BLUE)
-		db $14
-		db 24,BELLSPROUT
-		db 25,PIDGEY
-		db 27,PIDGEY
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 25,DITTO
-		db 28,WEEPINBELL
-		db 30,WEEPINBELL
-	ENDC
-	db $00
--- a/data/mapWilds/Route14.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route14Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 26,PIDGEY
-		db 23,DITTO
-		db 24,VENONAT
-		db 22,ODDISH
-		db 26,VENONAT
-		db 26,ODDISH
-		db 30,GLOOM
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 26,PIDGEY
-		db 23,DITTO
-		db 24,VENONAT
-		db 22,BELLSPROUT
-		db 26,VENONAT
-		db 26,BELLSPROUT
-		db 30,WEEPINBELL
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	db $00
--- a/data/mapWilds/Route15.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route15Mons:
-	db $0F
-	IF DEF(_RED)
-		db 24,ODDISH
-		db 26,DITTO
-		db 23,PIDGEY
-		db 26,VENONAT
-		db 22,ODDISH
-		db 28,VENONAT
-		db 26,ODDISH
-		db 30,GLOOM
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	IF DEF(_BLUE)
-		db 24,BELLSPROUT
-		db 26,DITTO
-		db 23,PIDGEY
-		db 26,VENONAT
-		db 22,BELLSPROUT
-		db 28,VENONAT
-		db 26,BELLSPROUT
-		db 30,WEEPINBELL
-		db 28,PIDGEOTTO
-		db 30,PIDGEOTTO
-	ENDC
-	db $00
--- a/data/mapWilds/Route16.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-Route16Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 18,RATTATA
-	db 20,DODUO
-	db 20,RATTATA
-	db 18,DODUO
-	db 22,DODUO
-	db 22,RATTATA
-	db 23,RATICATE
-	db 25,RATICATE
-	db $00
--- a/data/mapWilds/Route17.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-Route17Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 25,RATICATE
-	db 24,DODUO
-	db 27,RATICATE
-	db 26,DODUO
-	db 28,DODUO
-	db 29,RATICATE
-	db 25,FEAROW
-	db 27,FEAROW
-	db $00
--- a/data/mapWilds/Route18.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-Route18Mons:
-	db $19
-	db 20,SPEAROW
-	db 22,SPEAROW
-	db 25,RATICATE
-	db 24,DODUO
-	db 25,FEAROW
-	db 26,DODUO
-	db 28,DODUO
-	db 29,RATICATE
-	db 27,FEAROW
-	db 29,FEAROW
-	db $00
--- a/data/mapWilds/Route2.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-Route2Mons:
-	db $19
-	db 3,RATTATA
-	db 3,PIDGEY
-	db 4,PIDGEY
-	db 4,RATTATA
-	db 5,PIDGEY
-	IF DEF(_RED)
-		db 3,WEEDLE
-	ENDC
-	IF DEF(_BLUE)
-		db 3,CATERPIE
-	ENDC
-	db 2,RATTATA
-	db 5,RATTATA
-	IF DEF(_RED)
-		db 4,WEEDLE
-		db 5,WEEDLE
-	ENDC
-	IF DEF(_BLUE)
-		db 4,CATERPIE
-		db 5,CATERPIE
-	ENDC
-	db $00
--- a/data/mapWilds/Route21.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-Route21Mons:
-	db $19
-	db 21,RATTATA
-	db 23,PIDGEY
-	db 30,RATICATE
-	db 23,RATTATA
-	db 21,PIDGEY
-	db 30,PIDGEOTTO
-	db 32,PIDGEOTTO
-	db 28,TANGELA
-	db 30,TANGELA
-	db 32,TANGELA
-	db $05
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACOOL
-	db 40,TENTACOOL
--- a/data/mapWilds/Route22.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route22Mons:
-	db $19
-	IF DEF(_RED)
-		db 3,RATTATA
-		db 3,NIDORAN_M
-		db 4,RATTATA
-		db 4,NIDORAN_M
-		db 2,RATTATA
-		db 2,NIDORAN_M
-		db 3,SPEAROW
-		db 5,SPEAROW
-		db 3,NIDORAN_F
-		db 4,NIDORAN_F
-	ENDC
-	IF DEF(_BLUE)
-		db 3,RATTATA
-		db 3,NIDORAN_F
-		db 4,RATTATA
-		db 4,NIDORAN_F
-		db 2,RATTATA
-		db 2,NIDORAN_F
-		db 3,SPEAROW
-		db 5,SPEAROW
-		db 3,NIDORAN_M
-		db 4,NIDORAN_M
-	ENDC
-	db $00
--- a/data/mapWilds/Route23.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-Route23Mons:
-	db $0A
-	IF DEF(_RED)
-		db 26,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 26,SANDSHREW
-	ENDC
-	db 33,DITTO
-	db 26,SPEAROW
-	db 38,FEAROW
-	db 38,DITTO
-	db 38,FEAROW
-	IF DEF(_RED)
-		db 41,ARBOK
-	ENDC
-	IF DEF(_BLUE)
-		db 41,SANDSLASH
-	ENDC
-	db 43,DITTO
-	db 41,FEAROW
-	db 43,FEAROW
-	db $00
--- a/data/mapWilds/Route24.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route24Mons:
-	db $19
-	IF DEF(_RED)
-		db 7,WEEDLE
-		db 8,KAKUNA
-		db 12,PIDGEY
-		db 12,ODDISH
-		db 13,ODDISH
-		db 10,ABRA
-		db 14,ODDISH
-		db 13,PIDGEY
-		db 8,ABRA
-		db 12,ABRA
-	ENDC
-	IF DEF(_BLUE)
-		db 7,CATERPIE
-		db 8,METAPOD
-		db 12,PIDGEY
-		db 12,BELLSPROUT
-		db 13,BELLSPROUT
-		db 10,ABRA
-		db 14,BELLSPROUT
-		db 13,PIDGEY
-		db 8,ABRA
-		db 12,ABRA
-	ENDC
-	db $00
--- a/data/mapWilds/Route25.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route25Mons:
-	db $0F
-	IF DEF(_RED)
-		db 8,WEEDLE
-		db 9,KAKUNA
-		db 13,PIDGEY
-		db 12,ODDISH
-		db 13,ODDISH
-		db 12,ABRA
-		db 14,ODDISH
-		db 10,ABRA
-		db 7,METAPOD
-		db 8,CATERPIE
-	ENDC
-	IF DEF(_BLUE)
-		db 8,CATERPIE
-		db 9,METAPOD
-		db 13,PIDGEY
-		db 12,BELLSPROUT
-		db 13,BELLSPROUT
-		db 12,ABRA
-		db 14,BELLSPROUT
-		db 10,ABRA
-		db 7,KAKUNA
-		db 8,WEEDLE
-	ENDC
-	db $00
--- a/data/mapWilds/Route3.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-Route3Mons:
-	db $14
-	db 6,PIDGEY
-	db 5,SPEAROW
-	db 7,PIDGEY
-	db 6,SPEAROW
-	db 7,SPEAROW
-	db 8,PIDGEY
-	db 8,SPEAROW
-	db 3,JIGGLYPUFF
-	db 5,JIGGLYPUFF
-	db 7,JIGGLYPUFF
-	db $00
--- a/data/mapWilds/Route4.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route4Mons:
-	db $14
-	IF DEF(_RED)
-		db 10,RATTATA
-		db 10,SPEAROW
-		db 8,RATTATA
-		db 6,EKANS
-		db 8,SPEAROW
-		db 10,EKANS
-		db 12,RATTATA
-		db 12,SPEAROW
-		db 8,EKANS
-		db 12,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 10,RATTATA
-		db 10,SPEAROW
-		db 8,RATTATA
-		db 6,SANDSHREW
-		db 8,SPEAROW
-		db 10,SANDSHREW
-		db 12,RATTATA
-		db 12,SPEAROW
-		db 8,SANDSHREW
-		db 12,SANDSHREW
-	ENDC
-	db $00
--- a/data/mapWilds/Route5.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route5Mons:
-	db $0F
-	IF DEF(_RED)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MANKEY
-		db 12,MANKEY
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MANKEY
-		db 16,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 13,BELLSPROUT
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,BELLSPROUT
-		db 16,BELLSPROUT
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-	ENDC
-	db $00
--- a/data/mapWilds/Route6.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route6Mons:
-	db $0F
-	IF DEF(_RED)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MANKEY
-		db 12,MANKEY
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MANKEY
-		db 16,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 13,BELLSPROUT
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,BELLSPROUT
-		db 16,BELLSPROUT
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-	ENDC
-	db $00
--- a/data/mapWilds/Route7.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route7Mons:
-	db $0F
-	IF DEF(_RED)
-		db 19,PIDGEY
-		db 19,ODDISH
-		db 17,MANKEY
-		db 22,ODDISH
-		db 22,PIDGEY
-		db 18,MANKEY
-		db 18,GROWLITHE
-		db 20,GROWLITHE
-		db 19,MANKEY
-		db 20,MANKEY
-	ENDC
-	IF DEF(_BLUE)
-		db 19,PIDGEY
-		db 19,BELLSPROUT
-		db 17,MEOWTH
-		db 22,BELLSPROUT
-		db 22,PIDGEY
-		db 18,MEOWTH
-		db 18,VULPIX
-		db 20,VULPIX
-		db 19,MEOWTH
-		db 20,MEOWTH
-	ENDC
-	db $00
--- a/data/mapWilds/Route8.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route8Mons:
-	db $0F
-	IF DEF(_RED)
-		db 18,PIDGEY
-		db 18,MANKEY
-		db 17,EKANS
-		db 16,GROWLITHE
-		db 20,PIDGEY
-		db 20,MANKEY
-		db 19,EKANS
-		db 17,GROWLITHE
-		db 15,GROWLITHE
-		db 18,GROWLITHE
-	ENDC
-	IF DEF(_BLUE)
-		db 18,PIDGEY
-		db 18,MEOWTH
-		db 17,SANDSHREW
-		db 16,VULPIX
-		db 20,PIDGEY
-		db 20,MEOWTH
-		db 19,SANDSHREW
-		db 17,VULPIX
-		db 15,VULPIX
-		db 18,VULPIX
-	ENDC
-	db $00
--- a/data/mapWilds/Route9.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-Route9Mons:
-	db $0F
-	IF DEF(_RED)
-		db 16,RATTATA
-		db 16,SPEAROW
-		db 14,RATTATA
-		db 11,EKANS
-		db 13,SPEAROW
-		db 15,EKANS
-		db 17,RATTATA
-		db 17,SPEAROW
-		db 13,EKANS
-		db 17,EKANS
-	ENDC
-	IF DEF(_BLUE)
-		db 16,RATTATA
-		db 16,SPEAROW
-		db 14,RATTATA
-		db 11,SANDSHREW
-		db 13,SPEAROW
-		db 15,SANDSHREW
-		db 17,RATTATA
-		db 17,SPEAROW
-		db 13,SANDSHREW
-		db 17,SANDSHREW
-	ENDC
-	db $00
--- a/data/mapWilds/SafariZoneCenter.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-ZoneMonsCenter:
-	db $1E
-	IF DEF(_RED)
-		db 22,NIDORAN_M
-		db 25,RHYHORN
-		db 22,VENONAT
-		db 24,EXEGGCUTE
-		db 31,NIDORINO
-		db 25,EXEGGCUTE
-		db 31,NIDORINA
-		db 30,PARASECT
-		db 23,SCYTHER
-		db 23,CHANSEY
-	ENDC
-	IF DEF(_BLUE)
-		db 22,NIDORAN_F
-		db 25,RHYHORN
-		db 22,VENONAT
-		db 24,EXEGGCUTE
-		db 31,NIDORINA
-		db 25,EXEGGCUTE
-		db 31,NIDORINO
-		db 30,PARASECT
-		db 23,PINSIR
-		db 23,CHANSEY
-	ENDC
-	db $00
--- a/data/mapWilds/SafariZoneEast.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-ZoneMons1:
-	db $1E
-	IF DEF(_RED)
-		db 24,NIDORAN_M
-		db 26,DODUO
-		db 22,PARAS
-		db 25,EXEGGCUTE
-		db 33,NIDORINO
-		db 23,EXEGGCUTE
-		db 24,NIDORAN_F
-		db 25,PARASECT
-		db 25,KANGASKHAN
-		db 28,SCYTHER
-	ENDC
-	IF DEF(_BLUE)
-		db 24,NIDORAN_F
-		db 26,DODUO
-		db 22,PARAS
-		db 25,EXEGGCUTE
-		db 33,NIDORINA
-		db 23,EXEGGCUTE
-		db 24,NIDORAN_M
-		db 25,PARASECT
-		db 25,KANGASKHAN
-		db 28,PINSIR
-	ENDC
-	db $00
--- a/data/mapWilds/SafariZoneNorth.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-ZoneMons2:
-	db $1E
-	IF DEF(_RED)
-		db 22,NIDORAN_M
-	ENDC
-	IF DEF(_BLUE)
-		db 22,NIDORAN_F
-	ENDC
-	db 26,RHYHORN
-	db 23,PARAS
-	db 25,EXEGGCUTE
-	IF DEF(_RED)
-		db 30,NIDORINO
-	ENDC
-	IF DEF(_BLUE)
-		db 30,NIDORINA
-	ENDC
-	db 27,EXEGGCUTE
-	IF DEF(_RED)
-		db 30,NIDORINA
-	ENDC
-	IF DEF(_BLUE)
-		db 30,NIDORINO
-	ENDC
-	db 32,VENOMOTH
-	db 26,CHANSEY
-	db 28,TAUROS
-	db $00
--- a/data/mapWilds/SafariZoneWest.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-ZoneMons3:
-	db $1E
-	IF DEF(_RED)
-		db 25,NIDORAN_M
-		db 26,DODUO
-		db 23,VENONAT
-		db 24,EXEGGCUTE
-		db 33,NIDORINO
-		db 26,EXEGGCUTE
-		db 25,NIDORAN_F
-		db 31,VENOMOTH
-		db 26,TAUROS
-		db 28,KANGASKHAN
-	ENDC
-	IF DEF(_BLUE)
-		db 25,NIDORAN_F
-		db 26,DODUO
-		db 23,VENONAT
-		db 24,EXEGGCUTE
-		db 33,NIDORINA
-		db 26,EXEGGCUTE
-		db 25,NIDORAN_M
-		db 31,VENOMOTH
-		db 26,TAUROS
-		db 28,KANGASKHAN
-	ENDC
-	db $00
--- a/data/mapWilds/SeaRoutes.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-WaterMons:
-	db $00
-	db $05
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 5,TENTACOOL
-	db 10,TENTACOOL
-	db 15,TENTACOOL
-	db 20,TENTACOOL
-	db 30,TENTACOOL
-	db 35,TENTACOOL
-	db 40,TENTACOOL
--- a/data/mapWilds/SeafoamIslands1F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-IslandMons1:
-	db $0F
-	IF DEF(_RED)
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 30,SHELLDER
-		db 30,HORSEA
-		db 28,HORSEA
-		db 21,ZUBAT
-		db 29,GOLBAT
-		db 28,PSYDUCK
-		db 28,SHELLDER
-		db 38,GOLDUCK
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 30,STARYU
-		db 30,KRABBY
-		db 28,KRABBY
-		db 21,ZUBAT
-		db 29,GOLBAT
-		db 28,SLOWPOKE
-		db 28,STARYU
-		db 38,SLOWBRO
-	ENDC
-	db $00
--- a/data/mapWilds/SeafoamIslandsB1F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-IslandMonsB1:
-	db $0A
-	IF DEF(_RED)
-		db 30,STARYU
-		db 30,HORSEA
-		db 32,SHELLDER
-		db 32,HORSEA
-		db 28,SLOWPOKE
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 28,SEEL
-		db 38,DEWGONG
-		db 37,SEADRA
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 32,STARYU
-		db 32,KRABBY
-		db 28,PSYDUCK
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 28,SEEL
-		db 38,DEWGONG
-		db 37,KINGLER
-	ENDC
-	db $00
--- a/data/mapWilds/SeafoamIslandsB2F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-IslandMonsB2:
-	db $0A
-	IF DEF(_RED)
-		db 30,SEEL
-		db 30,SLOWPOKE
-		db 32,SEEL
-		db 32,SLOWPOKE
-		db 28,HORSEA
-		db 30,STARYU
-		db 30,HORSEA
-		db 28,SHELLDER
-		db 30,GOLBAT
-		db 37,SLOWBRO
-	ENDC
-	IF DEF(_BLUE)
-		db 30,SEEL
-		db 30,PSYDUCK
-		db 32,SEEL
-		db 32,PSYDUCK
-		db 28,KRABBY
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 28,STARYU
-		db 30,GOLBAT
-		db 37,GOLDUCK
-	ENDC
-	db $00
--- a/data/mapWilds/SeafoamIslandsB3F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-IslandMonsB3:
-	db $0A
-	IF DEF(_RED)
-		db 31,SLOWPOKE
-		db 31,SEEL
-		db 33,SLOWPOKE
-		db 33,SEEL
-		db 29,HORSEA
-		db 31,SHELLDER
-		db 31,HORSEA
-		db 29,SHELLDER
-		db 39,SEADRA
-		db 37,DEWGONG
-	ENDC
-	IF DEF(_BLUE)
-		db 31,PSYDUCK
-		db 31,SEEL
-		db 33,PSYDUCK
-		db 33,SEEL
-		db 29,KRABBY
-		db 31,STARYU
-		db 31,KRABBY
-		db 29,STARYU
-		db 39,KINGLER
-		db 37,DEWGONG
-	ENDC
-	db $00
--- a/data/mapWilds/SeafoamIslandsB4F.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-IslandMonsB4:
-	db $0A
-	IF DEF(_RED)
-		db 31,HORSEA
-		db 31,SHELLDER
-		db 33,HORSEA
-		db 33,SHELLDER
-		db 29,SLOWPOKE
-		db 31,SEEL
-		db 31,SLOWPOKE
-		db 29,SEEL
-		db 39,SLOWBRO
-		db 32,GOLBAT
-	ENDC
-	IF DEF(_BLUE)
-		db 31,KRABBY
-		db 31,STARYU
-		db 33,KRABBY
-		db 33,STARYU
-		db 29,PSYDUCK
-		db 31,SEEL
-		db 31,PSYDUCK
-		db 29,SEEL
-		db 39,GOLDUCK
-		db 32,GOLBAT
-	ENDC
-	db $00
--- a/data/mapWilds/VictoryRoad1F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-PlateauMons1:
-	db $0F
-	db 24,MACHOP
-	db 26,GEODUDE
-	db 22,ZUBAT
-	db 36,ONIX
-	db 39,ONIX
-	db 42,ONIX
-	db 41,GRAVELER
-	db 41,GOLBAT
-	db 42,MACHOKE
-	db 43,MAROWAK
-	db $00
--- a/data/mapWilds/VictoryRoad2F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-PlateauMons2:
-	db $0A
-	db 22,MACHOP
-	db 24,GEODUDE
-	db 26,ZUBAT
-	db 36,ONIX
-	db 39,ONIX
-	db 42,ONIX
-	db 41,MACHOKE
-	db 40,GOLBAT
-	db 40,MAROWAK
-	db 43,GRAVELER
-	db $00
--- a/data/mapWilds/VictoryRoad3F.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-PlateauMons3:
-	db $0F
-	db 24,MACHOP
-	db 26,GEODUDE
-	db 22,ZUBAT
-	db 42,ONIX
-	db 40,VENOMOTH
-	db 45,ONIX
-	db 43,GRAVELER
-	db 41,GOLBAT
-	db 42,MACHOKE
-	db 45,MACHOKE
-	db $00
--- a/data/mapWilds/ViridianForest.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-ForestMons:
-	db $08
-	IF DEF(_RED)
-		db 4,WEEDLE
-		db 5,KAKUNA
-		db 3,WEEDLE
-		db 5,WEEDLE
-		db 4,KAKUNA
-		db 6,KAKUNA
-		db 4,METAPOD
-		db 3,CATERPIE
-	ENDC
-	IF DEF(_BLUE)
-		db 4,CATERPIE
-		db 5,METAPOD
-		db 3,CATERPIE
-		db 5,CATERPIE
-		db 4,METAPOD
-		db 6,METAPOD
-		db 4,KAKUNA
-		db 3,WEEDLE
-	ENDC
-	db 3,PIKACHU
-	db 5,PIKACHU
-	db $00
--- a/data/mapWilds/nothing.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-NoMons:
-	db $00
-	db $00
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@@ -260,62 +260,62 @@
         ; followed by 20 bytes:
         ; level, species (ten times)
 
-INCLUDE "data/mapWilds/nothing.asm"
-INCLUDE "data/mapWilds/Route1.asm"
-INCLUDE "data/mapWilds/Route2.asm"
-INCLUDE "data/mapWilds/Route22.asm"
-INCLUDE "data/mapWilds/ViridianForest.asm"
-INCLUDE "data/mapWilds/Route3.asm"
-INCLUDE "data/mapWilds/MtMoon1F.asm"
-INCLUDE "data/mapWilds/MtMoonB1F.asm"
-INCLUDE "data/mapWilds/MtMoonB2F.asm"
-INCLUDE "data/mapWilds/Route4.asm"
-INCLUDE "data/mapWilds/Route24.asm"
-INCLUDE "data/mapWilds/Route25.asm"
-INCLUDE "data/mapWilds/Route9.asm"
-INCLUDE "data/mapWilds/Route5.asm"
-INCLUDE "data/mapWilds/Route6.asm"
-INCLUDE "data/mapWilds/Route11.asm"
-INCLUDE "data/mapWilds/RockTunnel1F.asm"
-INCLUDE "data/mapWilds/RockTunnelB1F.asm"
-INCLUDE "data/mapWilds/Route10.asm"
-INCLUDE "data/mapWilds/Route12.asm"
-INCLUDE "data/mapWilds/Route8.asm"
-INCLUDE "data/mapWilds/Route7.asm"
-INCLUDE "data/mapWilds/PokemonTower1F.asm"
-INCLUDE "data/mapWilds/PokemonTower2F.asm"
-INCLUDE "data/mapWilds/PokemonTower3F.asm"
-INCLUDE "data/mapWilds/PokemonTower4F.asm"
-INCLUDE "data/mapWilds/PokemonTower5F.asm"
-INCLUDE "data/mapWilds/PokemonTower6F.asm"
-INCLUDE "data/mapWilds/PokemonTower7F.asm"
-INCLUDE "data/mapWilds/Route13.asm"
-INCLUDE "data/mapWilds/Route14.asm"
-INCLUDE "data/mapWilds/Route15.asm"
-INCLUDE "data/mapWilds/Route16.asm"
-INCLUDE "data/mapWilds/Route17.asm"
-INCLUDE "data/mapWilds/Route18.asm"
-INCLUDE "data/mapWilds/SafariZoneCenter.asm"
-INCLUDE "data/mapWilds/SafariZoneEast.asm"
-INCLUDE "data/mapWilds/SafariZoneNorth.asm"
-INCLUDE "data/mapWilds/SafariZoneWest.asm"
-INCLUDE "data/mapWilds/SeaRoutes.asm"
-INCLUDE "data/mapWilds/SeafoamIslands1F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB1F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB2F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB3F.asm"
-INCLUDE "data/mapWilds/SeafoamIslandsB4F.asm"
-INCLUDE "data/mapWilds/PokemonMansion1F.asm"
-INCLUDE "data/mapWilds/PokemonMansion2F.asm"
-INCLUDE "data/mapWilds/PokemonMansion3F.asm"
-INCLUDE "data/mapWilds/PokemonMansionB1F.asm"
-INCLUDE "data/mapWilds/Route21.asm"
-INCLUDE "data/mapWilds/CeruleanCave1F.asm"
-INCLUDE "data/mapWilds/CeruleanCave2F.asm"
-INCLUDE "data/mapWilds/CeruleanCaveB1F.asm"
-INCLUDE "data/mapWilds/PowerPlant.asm"
-INCLUDE "data/mapWilds/Route23.asm"
-INCLUDE "data/mapWilds/VictoryRoad2F.asm"
-INCLUDE "data/mapWilds/VictoryRoad3F.asm"
-INCLUDE "data/mapWilds/VictoryRoad1F.asm"
-INCLUDE "data/mapWilds/DiglettsCave.asm"
+INCLUDE "data/wild/maps/nothing.asm"
+INCLUDE "data/wild/maps/Route1.asm"
+INCLUDE "data/wild/maps/Route2.asm"
+INCLUDE "data/wild/maps/Route22.asm"
+INCLUDE "data/wild/maps/ViridianForest.asm"
+INCLUDE "data/wild/maps/Route3.asm"
+INCLUDE "data/wild/maps/MtMoon1F.asm"
+INCLUDE "data/wild/maps/MtMoonB1F.asm"
+INCLUDE "data/wild/maps/MtMoonB2F.asm"
+INCLUDE "data/wild/maps/Route4.asm"
+INCLUDE "data/wild/maps/Route24.asm"
+INCLUDE "data/wild/maps/Route25.asm"
+INCLUDE "data/wild/maps/Route9.asm"
+INCLUDE "data/wild/maps/Route5.asm"
+INCLUDE "data/wild/maps/Route6.asm"
+INCLUDE "data/wild/maps/Route11.asm"
+INCLUDE "data/wild/maps/RockTunnel1F.asm"
+INCLUDE "data/wild/maps/RockTunnelB1F.asm"
+INCLUDE "data/wild/maps/Route10.asm"
+INCLUDE "data/wild/maps/Route12.asm"
+INCLUDE "data/wild/maps/Route8.asm"
+INCLUDE "data/wild/maps/Route7.asm"
+INCLUDE "data/wild/maps/PokemonTower1F.asm"
+INCLUDE "data/wild/maps/PokemonTower2F.asm"
+INCLUDE "data/wild/maps/PokemonTower3F.asm"
+INCLUDE "data/wild/maps/PokemonTower4F.asm"
+INCLUDE "data/wild/maps/PokemonTower5F.asm"
+INCLUDE "data/wild/maps/PokemonTower6F.asm"
+INCLUDE "data/wild/maps/PokemonTower7F.asm"
+INCLUDE "data/wild/maps/Route13.asm"
+INCLUDE "data/wild/maps/Route14.asm"
+INCLUDE "data/wild/maps/Route15.asm"
+INCLUDE "data/wild/maps/Route16.asm"
+INCLUDE "data/wild/maps/Route17.asm"
+INCLUDE "data/wild/maps/Route18.asm"
+INCLUDE "data/wild/maps/SafariZoneCenter.asm"
+INCLUDE "data/wild/maps/SafariZoneEast.asm"
+INCLUDE "data/wild/maps/SafariZoneNorth.asm"
+INCLUDE "data/wild/maps/SafariZoneWest.asm"
+INCLUDE "data/wild/maps/SeaRoutes.asm"
+INCLUDE "data/wild/maps/SeafoamIslands1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm"
+INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm"
+INCLUDE "data/wild/maps/PokemonMansion1F.asm"
+INCLUDE "data/wild/maps/PokemonMansion2F.asm"
+INCLUDE "data/wild/maps/PokemonMansion3F.asm"
+INCLUDE "data/wild/maps/PokemonMansionB1F.asm"
+INCLUDE "data/wild/maps/Route21.asm"
+INCLUDE "data/wild/maps/CeruleanCave1F.asm"
+INCLUDE "data/wild/maps/CeruleanCave2F.asm"
+INCLUDE "data/wild/maps/CeruleanCaveB1F.asm"
+INCLUDE "data/wild/maps/PowerPlant.asm"
+INCLUDE "data/wild/maps/Route23.asm"
+INCLUDE "data/wild/maps/VictoryRoad2F.asm"
+INCLUDE "data/wild/maps/VictoryRoad3F.asm"
+INCLUDE "data/wild/maps/VictoryRoad1F.asm"
+INCLUDE "data/wild/maps/DiglettsCave.asm"
--- /dev/null
+++ b/data/wild/maps/CeruleanCave1F.asm
@@ -1,0 +1,18 @@
+DungeonMons1:
+	db $0A
+	db 46,GOLBAT
+	db 46,HYPNO
+	db 46,MAGNETON
+	db 49,DODRIO
+	db 49,VENOMOTH
+	IF DEF(_RED)
+		db 52,ARBOK
+	ENDC
+	IF DEF(_BLUE)
+		db 52,SANDSLASH
+	ENDC
+	db 49,KADABRA
+	db 52,PARASECT
+	db 53,RAICHU
+	db 53,DITTO
+	db $00
--- /dev/null
+++ b/data/wild/maps/CeruleanCave2F.asm
@@ -1,0 +1,13 @@
+DungeonMons2:
+	db $0F
+	db 51,DODRIO
+	db 51,VENOMOTH
+	db 51,KADABRA
+	db 52,RHYDON
+	db 52,MAROWAK
+	db 52,ELECTRODE
+	db 56,CHANSEY
+	db 54,WIGGLYTUFF
+	db 55,DITTO
+	db 60,DITTO
+	db $00
--- /dev/null
+++ b/data/wild/maps/CeruleanCaveB1F.asm
@@ -1,0 +1,18 @@
+DungeonMonsB1:
+	db $19
+	db 55,RHYDON
+	db 55,MAROWAK
+	db 55,ELECTRODE
+	db 64,CHANSEY
+	db 64,PARASECT
+	db 64,RAICHU
+	IF DEF(_RED)
+		db 57,ARBOK
+	ENDC
+	IF DEF(_BLUE)
+		db 57,SANDSLASH
+	ENDC
+	db 65,DITTO
+	db 63,DITTO
+	db 67,DITTO
+	db $00
--- /dev/null
+++ b/data/wild/maps/DiglettsCave.asm
@@ -1,0 +1,13 @@
+CaveMons:
+	db $14
+	db 18,DIGLETT
+	db 19,DIGLETT
+	db 17,DIGLETT
+	db 20,DIGLETT
+	db 16,DIGLETT
+	db 15,DIGLETT
+	db 21,DIGLETT
+	db 22,DIGLETT
+	db 29,DUGTRIO
+	db 31,DUGTRIO
+	db $00
--- /dev/null
+++ b/data/wild/maps/MtMoon1F.asm
@@ -1,0 +1,13 @@
+MoonMons1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 9,ZUBAT
+	db 8,GEODUDE
+	db 6,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 8,PARAS
+	db 11,ZUBAT
+	db 8,CLEFAIRY
+	db $00
--- /dev/null
+++ b/data/wild/maps/MtMoonB1F.asm
@@ -1,0 +1,13 @@
+MoonMonsB1:
+	db $0A
+	db 8,ZUBAT
+	db 7,ZUBAT
+	db 7,GEODUDE
+	db 8,GEODUDE
+	db 9,ZUBAT
+	db 10,PARAS
+	db 10,ZUBAT
+	db 11,ZUBAT
+	db 9,CLEFAIRY
+	db 9,GEODUDE
+	db $00
--- /dev/null
+++ b/data/wild/maps/MtMoonB2F.asm
@@ -1,0 +1,13 @@
+MoonMonsB2:
+	db $0A
+	db 9,ZUBAT
+	db 9,GEODUDE
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 10,PARAS
+	db 12,PARAS
+	db 10,CLEFAIRY
+	db 12,ZUBAT
+	db 12,CLEFAIRY
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonMansion1F.asm
@@ -1,0 +1,27 @@
+MansionMons1:
+	db $0A
+	IF DEF(_RED)
+		db 32,KOFFING
+		db 30,KOFFING
+		db 34,PONYTA
+		db 30,PONYTA
+		db 34,GROWLITHE
+		db 32,PONYTA
+		db 30,GRIMER
+		db 28,PONYTA
+		db 37,WEEZING
+		db 39,MUK
+	ENDC
+	IF DEF(_BLUE)
+		db 32,GRIMER
+		db 30,GRIMER
+		db 34,PONYTA
+		db 30,PONYTA
+		db 34,VULPIX
+		db 32,PONYTA
+		db 30,KOFFING
+		db 28,PONYTA
+		db 37,MUK
+		db 39,WEEZING
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonMansion2F.asm
@@ -1,0 +1,27 @@
+MansionMons2:
+	db $0A
+	IF DEF(_RED)
+		db 32,GROWLITHE
+		db 34,KOFFING
+		db 34,KOFFING
+		db 30,PONYTA
+		db 30,KOFFING
+		db 32,PONYTA
+		db 30,GRIMER
+		db 28,PONYTA
+		db 39,WEEZING
+		db 37,MUK
+	ENDC
+	IF DEF(_BLUE)
+		db 32,VULPIX
+		db 34,GRIMER
+		db 34,GRIMER
+		db 30,PONYTA
+		db 30,GRIMER
+		db 32,PONYTA
+		db 30,KOFFING
+		db 28,PONYTA
+		db 39,MUK
+		db 37,WEEZING
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonMansion3F.asm
@@ -1,0 +1,27 @@
+MansionMons3:
+	db $0A
+	IF DEF(_RED)
+		db 31,KOFFING
+		db 33,GROWLITHE
+		db 35,KOFFING
+		db 32,PONYTA
+		db 34,PONYTA
+		db 40,WEEZING
+		db 34,GRIMER
+		db 38,WEEZING
+		db 36,PONYTA
+		db 42,MUK
+	ENDC
+	IF DEF(_BLUE)
+		db 31,GRIMER
+		db 33,VULPIX
+		db 35,GRIMER
+		db 32,PONYTA
+		db 34,MAGMAR
+		db 40,MUK
+		db 34,KOFFING
+		db 38,MUK
+		db 36,PONYTA
+		db 42,WEEZING
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonMansionB1F.asm
@@ -1,0 +1,27 @@
+MansionMonsB1:
+	db $0A
+	IF DEF(_RED)
+		db 33,KOFFING
+		db 31,KOFFING
+		db 35,GROWLITHE
+		db 32,PONYTA
+		db 31,KOFFING
+		db 40,WEEZING
+		db 34,PONYTA
+		db 35,GRIMER
+		db 42,WEEZING
+		db 42,MUK
+	ENDC
+	IF DEF(_BLUE)
+		db 33,GRIMER
+		db 31,GRIMER
+		db 35,VULPIX
+		db 32,PONYTA
+		db 31,GRIMER
+		db 40,MUK
+		db 34,PONYTA
+		db 35,KOFFING
+		db 38,MAGMAR
+		db 42,WEEZING
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower1F.asm
@@ -1,0 +1,3 @@
+TowerMons1:
+	db $00
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower2F.asm
@@ -1,0 +1,3 @@
+TowerMons2:
+	db $00
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower3F.asm
@@ -1,0 +1,13 @@
+TowerMons3:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 24,GASTLY
+	db 20,CUBONE
+	db 22,CUBONE
+	db 25,HAUNTER
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower4F.asm
@@ -1,0 +1,13 @@
+TowerMons4:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower5F.asm
@@ -1,0 +1,13 @@
+TowerMons5:
+	db $0A
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,HAUNTER
+	db 20,CUBONE
+	db 22,CUBONE
+	db 24,GASTLY
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower6F.asm
@@ -1,0 +1,13 @@
+TowerMons6:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 19,GASTLY
+	db 26,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+	db $00
--- /dev/null
+++ b/data/wild/maps/PokemonTower7F.asm
@@ -1,0 +1,13 @@
+TowerMons7:
+	db $0F
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 20,GASTLY
+	db 28,HAUNTER
+	db 22,CUBONE
+	db 24,CUBONE
+	db 28,HAUNTER
+	db 30,HAUNTER
+	db $00
--- /dev/null
+++ b/data/wild/maps/PowerPlant.asm
@@ -1,0 +1,19 @@
+PowerPlantMons:
+	db $0A
+	db 21,VOLTORB
+	db 21,MAGNEMITE
+	db 20,PIKACHU
+	db 24,PIKACHU
+	db 23,MAGNEMITE
+	db 23,VOLTORB
+	db 32,MAGNETON
+	db 35,MAGNETON
+	IF DEF(_RED)
+		db 33,ELECTABUZZ
+		db 36,ELECTABUZZ
+	ENDC
+	IF DEF(_BLUE)
+		db 33,RAICHU
+		db 36,RAICHU
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/RockTunnel1F.asm
@@ -1,0 +1,13 @@
+TunnelMonsB1:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,ZUBAT
+	db 15,ZUBAT
+	db 17,MACHOP
+	db 13,ONIX
+	db 15,ONIX
+	db $00
--- /dev/null
+++ b/data/wild/maps/RockTunnelB1F.asm
@@ -1,0 +1,13 @@
+TunnelMonsB2:
+	db $0F
+	db 16,ZUBAT
+	db 17,ZUBAT
+	db 17,GEODUDE
+	db 15,MACHOP
+	db 16,GEODUDE
+	db 18,ZUBAT
+	db 17,MACHOP
+	db 17,ONIX
+	db 13,ONIX
+	db 18,GEODUDE
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route1.asm
@@ -1,0 +1,13 @@
+Route1Mons:
+	db $19
+	db 3,PIDGEY
+	db 3,RATTATA
+	db 3,RATTATA
+	db 2,RATTATA
+	db 2,PIDGEY
+	db 3,PIDGEY
+	db 3,PIDGEY
+	db 4,RATTATA
+	db 4,PIDGEY
+	db 5,PIDGEY
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route10.asm
@@ -1,0 +1,27 @@
+Route10Mons:
+	db $0F
+	IF DEF(_RED)
+		db 16,VOLTORB
+		db 16,SPEAROW
+		db 14,VOLTORB
+		db 11,EKANS
+		db 13,SPEAROW
+		db 15,EKANS
+		db 17,VOLTORB
+		db 17,SPEAROW
+		db 13,EKANS
+		db 17,EKANS
+	ENDC
+	IF DEF(_BLUE)
+		db 16,VOLTORB
+		db 16,SPEAROW
+		db 14,VOLTORB
+		db 11,SANDSHREW
+		db 13,SPEAROW
+		db 15,SANDSHREW
+		db 17,VOLTORB
+		db 17,SPEAROW
+		db 13,SANDSHREW
+		db 17,SANDSHREW
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route11.asm
@@ -1,0 +1,27 @@
+Route11Mons:
+	db $0F
+	IF DEF(_RED)
+		db 14,EKANS
+		db 15,SPEAROW
+		db 12,EKANS
+		db 9,DROWZEE
+		db 13,SPEAROW
+		db 13,DROWZEE
+		db 15,EKANS
+		db 17,SPEAROW
+		db 11,DROWZEE
+		db 15,DROWZEE
+	ENDC
+	IF DEF(_BLUE)
+		db 14,SANDSHREW
+		db 15,SPEAROW
+		db 12,SANDSHREW
+		db 9,DROWZEE
+		db 13,SPEAROW
+		db 13,DROWZEE
+		db 15,SANDSHREW
+		db 17,SPEAROW
+		db 11,DROWZEE
+		db 15,DROWZEE
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route12.asm
@@ -1,0 +1,27 @@
+Route12Mons:
+	db $0F
+	IF DEF(_RED)
+		db 24,ODDISH
+		db 25,PIDGEY
+		db 23,PIDGEY
+		db 24,VENONAT
+		db 22,ODDISH
+		db 26,VENONAT
+		db 26,ODDISH
+		db 27,PIDGEY
+		db 28,GLOOM
+		db 30,GLOOM
+	ENDC
+	IF DEF(_BLUE)
+		db 24,BELLSPROUT
+		db 25,PIDGEY
+		db 23,PIDGEY
+		db 24,VENONAT
+		db 22,BELLSPROUT
+		db 26,VENONAT
+		db 26,BELLSPROUT
+		db 27,PIDGEY
+		db 28,WEEPINBELL
+		db 30,WEEPINBELL
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route13.asm
@@ -1,0 +1,28 @@
+Route13Mons:
+	IF DEF(_RED)
+		db $14
+		db 24,ODDISH
+		db 25,PIDGEY
+		db 27,PIDGEY
+		db 24,VENONAT
+		db 22,ODDISH
+		db 26,VENONAT
+		db 26,ODDISH
+		db 25,DITTO
+		db 28,GLOOM
+		db 30,GLOOM
+	ENDC
+	IF DEF(_BLUE)
+		db $14
+		db 24,BELLSPROUT
+		db 25,PIDGEY
+		db 27,PIDGEY
+		db 24,VENONAT
+		db 22,BELLSPROUT
+		db 26,VENONAT
+		db 26,BELLSPROUT
+		db 25,DITTO
+		db 28,WEEPINBELL
+		db 30,WEEPINBELL
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route14.asm
@@ -1,0 +1,27 @@
+Route14Mons:
+	db $0F
+	IF DEF(_RED)
+		db 24,ODDISH
+		db 26,PIDGEY
+		db 23,DITTO
+		db 24,VENONAT
+		db 22,ODDISH
+		db 26,VENONAT
+		db 26,ODDISH
+		db 30,GLOOM
+		db 28,PIDGEOTTO
+		db 30,PIDGEOTTO
+	ENDC
+	IF DEF(_BLUE)
+		db 24,BELLSPROUT
+		db 26,PIDGEY
+		db 23,DITTO
+		db 24,VENONAT
+		db 22,BELLSPROUT
+		db 26,VENONAT
+		db 26,BELLSPROUT
+		db 30,WEEPINBELL
+		db 28,PIDGEOTTO
+		db 30,PIDGEOTTO
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route15.asm
@@ -1,0 +1,27 @@
+Route15Mons:
+	db $0F
+	IF DEF(_RED)
+		db 24,ODDISH
+		db 26,DITTO
+		db 23,PIDGEY
+		db 26,VENONAT
+		db 22,ODDISH
+		db 28,VENONAT
+		db 26,ODDISH
+		db 30,GLOOM
+		db 28,PIDGEOTTO
+		db 30,PIDGEOTTO
+	ENDC
+	IF DEF(_BLUE)
+		db 24,BELLSPROUT
+		db 26,DITTO
+		db 23,PIDGEY
+		db 26,VENONAT
+		db 22,BELLSPROUT
+		db 28,VENONAT
+		db 26,BELLSPROUT
+		db 30,WEEPINBELL
+		db 28,PIDGEOTTO
+		db 30,PIDGEOTTO
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route16.asm
@@ -1,0 +1,13 @@
+Route16Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 18,RATTATA
+	db 20,DODUO
+	db 20,RATTATA
+	db 18,DODUO
+	db 22,DODUO
+	db 22,RATTATA
+	db 23,RATICATE
+	db 25,RATICATE
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route17.asm
@@ -1,0 +1,13 @@
+Route17Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 27,RATICATE
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 25,FEAROW
+	db 27,FEAROW
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route18.asm
@@ -1,0 +1,13 @@
+Route18Mons:
+	db $19
+	db 20,SPEAROW
+	db 22,SPEAROW
+	db 25,RATICATE
+	db 24,DODUO
+	db 25,FEAROW
+	db 26,DODUO
+	db 28,DODUO
+	db 29,RATICATE
+	db 27,FEAROW
+	db 29,FEAROW
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route2.asm
@@ -1,0 +1,24 @@
+Route2Mons:
+	db $19
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 4,RATTATA
+	db 5,PIDGEY
+	IF DEF(_RED)
+		db 3,WEEDLE
+	ENDC
+	IF DEF(_BLUE)
+		db 3,CATERPIE
+	ENDC
+	db 2,RATTATA
+	db 5,RATTATA
+	IF DEF(_RED)
+		db 4,WEEDLE
+		db 5,WEEDLE
+	ENDC
+	IF DEF(_BLUE)
+		db 4,CATERPIE
+		db 5,CATERPIE
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route21.asm
@@ -1,0 +1,23 @@
+Route21Mons:
+	db $19
+	db 21,RATTATA
+	db 23,PIDGEY
+	db 30,RATICATE
+	db 23,RATTATA
+	db 21,PIDGEY
+	db 30,PIDGEOTTO
+	db 32,PIDGEOTTO
+	db 28,TANGELA
+	db 30,TANGELA
+	db 32,TANGELA
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
--- /dev/null
+++ b/data/wild/maps/Route22.asm
@@ -1,0 +1,27 @@
+Route22Mons:
+	db $19
+	IF DEF(_RED)
+		db 3,RATTATA
+		db 3,NIDORAN_M
+		db 4,RATTATA
+		db 4,NIDORAN_M
+		db 2,RATTATA
+		db 2,NIDORAN_M
+		db 3,SPEAROW
+		db 5,SPEAROW
+		db 3,NIDORAN_F
+		db 4,NIDORAN_F
+	ENDC
+	IF DEF(_BLUE)
+		db 3,RATTATA
+		db 3,NIDORAN_F
+		db 4,RATTATA
+		db 4,NIDORAN_F
+		db 2,RATTATA
+		db 2,NIDORAN_F
+		db 3,SPEAROW
+		db 5,SPEAROW
+		db 3,NIDORAN_M
+		db 4,NIDORAN_M
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route23.asm
@@ -1,0 +1,23 @@
+Route23Mons:
+	db $0A
+	IF DEF(_RED)
+		db 26,EKANS
+	ENDC
+	IF DEF(_BLUE)
+		db 26,SANDSHREW
+	ENDC
+	db 33,DITTO
+	db 26,SPEAROW
+	db 38,FEAROW
+	db 38,DITTO
+	db 38,FEAROW
+	IF DEF(_RED)
+		db 41,ARBOK
+	ENDC
+	IF DEF(_BLUE)
+		db 41,SANDSLASH
+	ENDC
+	db 43,DITTO
+	db 41,FEAROW
+	db 43,FEAROW
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route24.asm
@@ -1,0 +1,27 @@
+Route24Mons:
+	db $19
+	IF DEF(_RED)
+		db 7,WEEDLE
+		db 8,KAKUNA
+		db 12,PIDGEY
+		db 12,ODDISH
+		db 13,ODDISH
+		db 10,ABRA
+		db 14,ODDISH
+		db 13,PIDGEY
+		db 8,ABRA
+		db 12,ABRA
+	ENDC
+	IF DEF(_BLUE)
+		db 7,CATERPIE
+		db 8,METAPOD
+		db 12,PIDGEY
+		db 12,BELLSPROUT
+		db 13,BELLSPROUT
+		db 10,ABRA
+		db 14,BELLSPROUT
+		db 13,PIDGEY
+		db 8,ABRA
+		db 12,ABRA
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route25.asm
@@ -1,0 +1,27 @@
+Route25Mons:
+	db $0F
+	IF DEF(_RED)
+		db 8,WEEDLE
+		db 9,KAKUNA
+		db 13,PIDGEY
+		db 12,ODDISH
+		db 13,ODDISH
+		db 12,ABRA
+		db 14,ODDISH
+		db 10,ABRA
+		db 7,METAPOD
+		db 8,CATERPIE
+	ENDC
+	IF DEF(_BLUE)
+		db 8,CATERPIE
+		db 9,METAPOD
+		db 13,PIDGEY
+		db 12,BELLSPROUT
+		db 13,BELLSPROUT
+		db 12,ABRA
+		db 14,BELLSPROUT
+		db 10,ABRA
+		db 7,KAKUNA
+		db 8,WEEDLE
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route3.asm
@@ -1,0 +1,13 @@
+Route3Mons:
+	db $14
+	db 6,PIDGEY
+	db 5,SPEAROW
+	db 7,PIDGEY
+	db 6,SPEAROW
+	db 7,SPEAROW
+	db 8,PIDGEY
+	db 8,SPEAROW
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route4.asm
@@ -1,0 +1,27 @@
+Route4Mons:
+	db $14
+	IF DEF(_RED)
+		db 10,RATTATA
+		db 10,SPEAROW
+		db 8,RATTATA
+		db 6,EKANS
+		db 8,SPEAROW
+		db 10,EKANS
+		db 12,RATTATA
+		db 12,SPEAROW
+		db 8,EKANS
+		db 12,EKANS
+	ENDC
+	IF DEF(_BLUE)
+		db 10,RATTATA
+		db 10,SPEAROW
+		db 8,RATTATA
+		db 6,SANDSHREW
+		db 8,SPEAROW
+		db 10,SANDSHREW
+		db 12,RATTATA
+		db 12,SPEAROW
+		db 8,SANDSHREW
+		db 12,SANDSHREW
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route5.asm
@@ -1,0 +1,27 @@
+Route5Mons:
+	db $0F
+	IF DEF(_RED)
+		db 13,ODDISH
+		db 13,PIDGEY
+		db 15,PIDGEY
+		db 10,MANKEY
+		db 12,MANKEY
+		db 15,ODDISH
+		db 16,ODDISH
+		db 16,PIDGEY
+		db 14,MANKEY
+		db 16,MANKEY
+	ENDC
+	IF DEF(_BLUE)
+		db 13,BELLSPROUT
+		db 13,PIDGEY
+		db 15,PIDGEY
+		db 10,MEOWTH
+		db 12,MEOWTH
+		db 15,BELLSPROUT
+		db 16,BELLSPROUT
+		db 16,PIDGEY
+		db 14,MEOWTH
+		db 16,MEOWTH
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route6.asm
@@ -1,0 +1,27 @@
+Route6Mons:
+	db $0F
+	IF DEF(_RED)
+		db 13,ODDISH
+		db 13,PIDGEY
+		db 15,PIDGEY
+		db 10,MANKEY
+		db 12,MANKEY
+		db 15,ODDISH
+		db 16,ODDISH
+		db 16,PIDGEY
+		db 14,MANKEY
+		db 16,MANKEY
+	ENDC
+	IF DEF(_BLUE)
+		db 13,BELLSPROUT
+		db 13,PIDGEY
+		db 15,PIDGEY
+		db 10,MEOWTH
+		db 12,MEOWTH
+		db 15,BELLSPROUT
+		db 16,BELLSPROUT
+		db 16,PIDGEY
+		db 14,MEOWTH
+		db 16,MEOWTH
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route7.asm
@@ -1,0 +1,27 @@
+Route7Mons:
+	db $0F
+	IF DEF(_RED)
+		db 19,PIDGEY
+		db 19,ODDISH
+		db 17,MANKEY
+		db 22,ODDISH
+		db 22,PIDGEY
+		db 18,MANKEY
+		db 18,GROWLITHE
+		db 20,GROWLITHE
+		db 19,MANKEY
+		db 20,MANKEY
+	ENDC
+	IF DEF(_BLUE)
+		db 19,PIDGEY
+		db 19,BELLSPROUT
+		db 17,MEOWTH
+		db 22,BELLSPROUT
+		db 22,PIDGEY
+		db 18,MEOWTH
+		db 18,VULPIX
+		db 20,VULPIX
+		db 19,MEOWTH
+		db 20,MEOWTH
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route8.asm
@@ -1,0 +1,27 @@
+Route8Mons:
+	db $0F
+	IF DEF(_RED)
+		db 18,PIDGEY
+		db 18,MANKEY
+		db 17,EKANS
+		db 16,GROWLITHE
+		db 20,PIDGEY
+		db 20,MANKEY
+		db 19,EKANS
+		db 17,GROWLITHE
+		db 15,GROWLITHE
+		db 18,GROWLITHE
+	ENDC
+	IF DEF(_BLUE)
+		db 18,PIDGEY
+		db 18,MEOWTH
+		db 17,SANDSHREW
+		db 16,VULPIX
+		db 20,PIDGEY
+		db 20,MEOWTH
+		db 19,SANDSHREW
+		db 17,VULPIX
+		db 15,VULPIX
+		db 18,VULPIX
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/Route9.asm
@@ -1,0 +1,27 @@
+Route9Mons:
+	db $0F
+	IF DEF(_RED)
+		db 16,RATTATA
+		db 16,SPEAROW
+		db 14,RATTATA
+		db 11,EKANS
+		db 13,SPEAROW
+		db 15,EKANS
+		db 17,RATTATA
+		db 17,SPEAROW
+		db 13,EKANS
+		db 17,EKANS
+	ENDC
+	IF DEF(_BLUE)
+		db 16,RATTATA
+		db 16,SPEAROW
+		db 14,RATTATA
+		db 11,SANDSHREW
+		db 13,SPEAROW
+		db 15,SANDSHREW
+		db 17,RATTATA
+		db 17,SPEAROW
+		db 13,SANDSHREW
+		db 17,SANDSHREW
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SafariZoneCenter.asm
@@ -1,0 +1,27 @@
+ZoneMonsCenter:
+	db $1E
+	IF DEF(_RED)
+		db 22,NIDORAN_M
+		db 25,RHYHORN
+		db 22,VENONAT
+		db 24,EXEGGCUTE
+		db 31,NIDORINO
+		db 25,EXEGGCUTE
+		db 31,NIDORINA
+		db 30,PARASECT
+		db 23,SCYTHER
+		db 23,CHANSEY
+	ENDC
+	IF DEF(_BLUE)
+		db 22,NIDORAN_F
+		db 25,RHYHORN
+		db 22,VENONAT
+		db 24,EXEGGCUTE
+		db 31,NIDORINA
+		db 25,EXEGGCUTE
+		db 31,NIDORINO
+		db 30,PARASECT
+		db 23,PINSIR
+		db 23,CHANSEY
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SafariZoneEast.asm
@@ -1,0 +1,27 @@
+ZoneMons1:
+	db $1E
+	IF DEF(_RED)
+		db 24,NIDORAN_M
+		db 26,DODUO
+		db 22,PARAS
+		db 25,EXEGGCUTE
+		db 33,NIDORINO
+		db 23,EXEGGCUTE
+		db 24,NIDORAN_F
+		db 25,PARASECT
+		db 25,KANGASKHAN
+		db 28,SCYTHER
+	ENDC
+	IF DEF(_BLUE)
+		db 24,NIDORAN_F
+		db 26,DODUO
+		db 22,PARAS
+		db 25,EXEGGCUTE
+		db 33,NIDORINA
+		db 23,EXEGGCUTE
+		db 24,NIDORAN_M
+		db 25,PARASECT
+		db 25,KANGASKHAN
+		db 28,PINSIR
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SafariZoneNorth.asm
@@ -1,0 +1,28 @@
+ZoneMons2:
+	db $1E
+	IF DEF(_RED)
+		db 22,NIDORAN_M
+	ENDC
+	IF DEF(_BLUE)
+		db 22,NIDORAN_F
+	ENDC
+	db 26,RHYHORN
+	db 23,PARAS
+	db 25,EXEGGCUTE
+	IF DEF(_RED)
+		db 30,NIDORINO
+	ENDC
+	IF DEF(_BLUE)
+		db 30,NIDORINA
+	ENDC
+	db 27,EXEGGCUTE
+	IF DEF(_RED)
+		db 30,NIDORINA
+	ENDC
+	IF DEF(_BLUE)
+		db 30,NIDORINO
+	ENDC
+	db 32,VENOMOTH
+	db 26,CHANSEY
+	db 28,TAUROS
+	db $00
--- /dev/null
+++ b/data/wild/maps/SafariZoneWest.asm
@@ -1,0 +1,27 @@
+ZoneMons3:
+	db $1E
+	IF DEF(_RED)
+		db 25,NIDORAN_M
+		db 26,DODUO
+		db 23,VENONAT
+		db 24,EXEGGCUTE
+		db 33,NIDORINO
+		db 26,EXEGGCUTE
+		db 25,NIDORAN_F
+		db 31,VENOMOTH
+		db 26,TAUROS
+		db 28,KANGASKHAN
+	ENDC
+	IF DEF(_BLUE)
+		db 25,NIDORAN_F
+		db 26,DODUO
+		db 23,VENONAT
+		db 24,EXEGGCUTE
+		db 33,NIDORINA
+		db 26,EXEGGCUTE
+		db 25,NIDORAN_M
+		db 31,VENOMOTH
+		db 26,TAUROS
+		db 28,KANGASKHAN
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SeaRoutes.asm
@@ -1,0 +1,13 @@
+WaterMons:
+	db $00
+	db $05
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 5,TENTACOOL
+	db 10,TENTACOOL
+	db 15,TENTACOOL
+	db 20,TENTACOOL
+	db 30,TENTACOOL
+	db 35,TENTACOOL
+	db 40,TENTACOOL
--- /dev/null
+++ b/data/wild/maps/SeafoamIslands1F.asm
@@ -1,0 +1,27 @@
+IslandMons1:
+	db $0F
+	IF DEF(_RED)
+		db 30,SEEL
+		db 30,SLOWPOKE
+		db 30,SHELLDER
+		db 30,HORSEA
+		db 28,HORSEA
+		db 21,ZUBAT
+		db 29,GOLBAT
+		db 28,PSYDUCK
+		db 28,SHELLDER
+		db 38,GOLDUCK
+	ENDC
+	IF DEF(_BLUE)
+		db 30,SEEL
+		db 30,PSYDUCK
+		db 30,STARYU
+		db 30,KRABBY
+		db 28,KRABBY
+		db 21,ZUBAT
+		db 29,GOLBAT
+		db 28,SLOWPOKE
+		db 28,STARYU
+		db 38,SLOWBRO
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SeafoamIslandsB1F.asm
@@ -1,0 +1,27 @@
+IslandMonsB1:
+	db $0A
+	IF DEF(_RED)
+		db 30,STARYU
+		db 30,HORSEA
+		db 32,SHELLDER
+		db 32,HORSEA
+		db 28,SLOWPOKE
+		db 30,SEEL
+		db 30,SLOWPOKE
+		db 28,SEEL
+		db 38,DEWGONG
+		db 37,SEADRA
+	ENDC
+	IF DEF(_BLUE)
+		db 30,SHELLDER
+		db 30,KRABBY
+		db 32,STARYU
+		db 32,KRABBY
+		db 28,PSYDUCK
+		db 30,SEEL
+		db 30,PSYDUCK
+		db 28,SEEL
+		db 38,DEWGONG
+		db 37,KINGLER
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SeafoamIslandsB2F.asm
@@ -1,0 +1,27 @@
+IslandMonsB2:
+	db $0A
+	IF DEF(_RED)
+		db 30,SEEL
+		db 30,SLOWPOKE
+		db 32,SEEL
+		db 32,SLOWPOKE
+		db 28,HORSEA
+		db 30,STARYU
+		db 30,HORSEA
+		db 28,SHELLDER
+		db 30,GOLBAT
+		db 37,SLOWBRO
+	ENDC
+	IF DEF(_BLUE)
+		db 30,SEEL
+		db 30,PSYDUCK
+		db 32,SEEL
+		db 32,PSYDUCK
+		db 28,KRABBY
+		db 30,SHELLDER
+		db 30,KRABBY
+		db 28,STARYU
+		db 30,GOLBAT
+		db 37,GOLDUCK
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SeafoamIslandsB3F.asm
@@ -1,0 +1,27 @@
+IslandMonsB3:
+	db $0A
+	IF DEF(_RED)
+		db 31,SLOWPOKE
+		db 31,SEEL
+		db 33,SLOWPOKE
+		db 33,SEEL
+		db 29,HORSEA
+		db 31,SHELLDER
+		db 31,HORSEA
+		db 29,SHELLDER
+		db 39,SEADRA
+		db 37,DEWGONG
+	ENDC
+	IF DEF(_BLUE)
+		db 31,PSYDUCK
+		db 31,SEEL
+		db 33,PSYDUCK
+		db 33,SEEL
+		db 29,KRABBY
+		db 31,STARYU
+		db 31,KRABBY
+		db 29,STARYU
+		db 39,KINGLER
+		db 37,DEWGONG
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/SeafoamIslandsB4F.asm
@@ -1,0 +1,27 @@
+IslandMonsB4:
+	db $0A
+	IF DEF(_RED)
+		db 31,HORSEA
+		db 31,SHELLDER
+		db 33,HORSEA
+		db 33,SHELLDER
+		db 29,SLOWPOKE
+		db 31,SEEL
+		db 31,SLOWPOKE
+		db 29,SEEL
+		db 39,SLOWBRO
+		db 32,GOLBAT
+	ENDC
+	IF DEF(_BLUE)
+		db 31,KRABBY
+		db 31,STARYU
+		db 33,KRABBY
+		db 33,STARYU
+		db 29,PSYDUCK
+		db 31,SEEL
+		db 31,PSYDUCK
+		db 29,SEEL
+		db 39,GOLDUCK
+		db 32,GOLBAT
+	ENDC
+	db $00
--- /dev/null
+++ b/data/wild/maps/VictoryRoad1F.asm
@@ -1,0 +1,13 @@
+PlateauMons1:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 43,MAROWAK
+	db $00
--- /dev/null
+++ b/data/wild/maps/VictoryRoad2F.asm
@@ -1,0 +1,13 @@
+PlateauMons2:
+	db $0A
+	db 22,MACHOP
+	db 24,GEODUDE
+	db 26,ZUBAT
+	db 36,ONIX
+	db 39,ONIX
+	db 42,ONIX
+	db 41,MACHOKE
+	db 40,GOLBAT
+	db 40,MAROWAK
+	db 43,GRAVELER
+	db $00
--- /dev/null
+++ b/data/wild/maps/VictoryRoad3F.asm
@@ -1,0 +1,13 @@
+PlateauMons3:
+	db $0F
+	db 24,MACHOP
+	db 26,GEODUDE
+	db 22,ZUBAT
+	db 42,ONIX
+	db 40,VENOMOTH
+	db 45,ONIX
+	db 43,GRAVELER
+	db 41,GOLBAT
+	db 42,MACHOKE
+	db 45,MACHOKE
+	db $00
--- /dev/null
+++ b/data/wild/maps/ViridianForest.asm
@@ -1,0 +1,25 @@
+ForestMons:
+	db $08
+	IF DEF(_RED)
+		db 4,WEEDLE
+		db 5,KAKUNA
+		db 3,WEEDLE
+		db 5,WEEDLE
+		db 4,KAKUNA
+		db 6,KAKUNA
+		db 4,METAPOD
+		db 3,CATERPIE
+	ENDC
+	IF DEF(_BLUE)
+		db 4,CATERPIE
+		db 5,METAPOD
+		db 3,CATERPIE
+		db 5,CATERPIE
+		db 4,METAPOD
+		db 6,METAPOD
+		db 4,KAKUNA
+		db 3,WEEDLE
+	ENDC
+	db 3,PIKACHU
+	db 5,PIKACHU
+	db $00
--- /dev/null
+++ b/data/wild/maps/nothing.asm
@@ -1,0 +1,3 @@
+NoMons:
+	db $00
+	db $00
--- /dev/null
+++ b/engine/events/hidden_objects/book_or_sculpture.asm
@@ -1,0 +1,21 @@
+BookOrSculptureText::
+	TX_ASM
+	ld hl, PokemonBooksText
+	ld a, [wCurMapTileset]
+	cp MANSION ; Celadon Mansion tileset
+	jr nz, .ok
+	aCoord 8, 6
+	cp $38
+	jr nz, .ok
+	ld hl, DiglettSculptureText
+.ok
+	call PrintText
+	jp TextScriptEnd
+
+PokemonBooksText:
+	TX_FAR _PokemonBooksText
+	db "@"
+
+DiglettSculptureText:
+	TX_FAR _DiglettSculptureText
+	db "@"
--- a/engine/events/hidden_objects/diglett_sculpture.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-BookOrSculptureText::
-	TX_ASM
-	ld hl, PokemonBooksText
-	ld a, [wCurMapTileset]
-	cp MANSION ; Celadon Mansion tileset
-	jr nz, .ok
-	aCoord 8, 6
-	cp $38
-	jr nz, .ok
-	ld hl, DiglettSculptureText
-.ok
-	call PrintText
-	jp TextScriptEnd
-
-PokemonBooksText:
-	TX_FAR _PokemonBooksText
-	db "@"
-
-DiglettSculptureText:
-	TX_FAR _DiglettSculptureText
-	db "@"
--- a/main.asm
+++ b/main.asm
@@ -76,7 +76,7 @@
 INCLUDE "engine/gfx/hp_bar.asm"
 INCLUDE "engine/events/hidden_objects/bookshelves.asm"
 INCLUDE "engine/events/hidden_objects/indigo_plateau_statues.asm"
-INCLUDE "engine/events/hidden_objects/diglett_sculpture.asm"
+INCLUDE "engine/events/hidden_objects/book_or_sculpture.asm"
 INCLUDE "engine/events/hidden_objects/elevator.asm"
 INCLUDE "engine/events/hidden_objects/town_map.asm"
 INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm"