Build only Yellow

Conflicts: gfx/intro_nido_1.6x6.png gfx/intro_nido_2.6x6.png gfx/intro_nido_3.6x6.png gfx/redgreenversion.png text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm yellow/main.asm
2026-09-30 13:16:50 -05:00 · 2015-06-06 13:51:06 -05:00
parent 10af88ddd7
commit 8f2edd9c41
173 changed files with 643 additions and 3077 deletions
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/sfx_1f_5d.asm
@@ -1,37 +1,20 @@
 SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
 	duty 2
-IF DEF(_RED)
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 3, 228, 128, 6
 	unknownsfx0x20 3, 228, 192, 6
 	unknownsfx0x20 3, 228, 0, 7
 	unknownsfx0x20 2, 228, 160, 7
-ELSE
-	unknownsfx0x20 3, 228, 0, 6
-	unknownsfx0x20 3, 228, 128, 6
-	unknownsfx0x20 3, 228, 192, 6
-	unknownsfx0x20 3, 228, 0, 7
-	unknownsfx0x20 15, 242, 224, 7
-ENDC
 	endchannel


 SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
 	duty 2
-IF DEF(_RED)
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 3, 212, 1, 7
 	unknownsfx0x20 3, 196, 129, 6
 	unknownsfx0x20 3, 196, 193, 6
 	unknownsfx0x20 3, 196, 1, 7
 	unknownsfx0x20 2, 196, 161, 7
-ELSE
-	unknownsfx0x20 3, 8, 0, 0
-	unknownsfx0x20 3, 196, 1, 6
-	unknownsfx0x20 3, 196, 129, 6
-	unknownsfx0x20 3, 196, 193, 6
-	unknownsfx0x20 3, 196, 1, 7
-	unknownsfx0x20 15, 210, 225, 7
-ENDC
 	endchannel
 ; 0x7c490
--- a/blue.asm
+++ b/blue.asm
@@ -1,2 +0,0 @@
-_BLUE EQU 1
-INCLUDE "charmap.asm"
--- a/blue/audio.asm
+++ b/blue/audio.asm
@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "audio.asm"
--- a/blue/main.asm
+++ b/blue/main.asm
@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "main.asm"
--- a/blue/text.asm
+++ b/blue/text.asm
@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "text.asm"
--- a/blue/wram.asm
+++ b/blue/wram.asm
@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "wram.asm"
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -246,6 +246,4 @@ TRADE_CENTER EQU $F0
 LORELEIS_ROOM EQU $F5
 BRUNOS_ROOM EQU $F6
 AGATHAS_ROOM EQU $F7
-IF DEF(_OPTION_BEACH_HOUSE)
 BEACH_HOUSE EQU $F8
-ENDC
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -892,7 +892,5 @@ BRUNOS_ROOM_WIDTH  EQU $05
 AGATHAS_ROOM_HEIGHT EQU $06
 AGATHAS_ROOM_WIDTH  EQU $05

-IF DEF(_OPTION_BEACH_HOUSE)
 BEACH_HOUSE_HEIGHT EQU 4
 BEACH_HOUSE_WIDTH  EQU 7
-ENDC
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -84,6 +84,9 @@ SPRITE_LYING_OLD_MAN_UNUSED_1    EQU $46
 SPRITE_LYING_OLD_MAN_UNUSED_2    EQU $47
 SPRITE_LYING_OLD_MAN             EQU $48

+SPRITE_JESSIE EQU $45
+SPRITE_JAMES  EQU $46
+
 ; different kinds of people events
 ITEM    EQU $80
 TRAINER EQU $40
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -22,6 +22,4 @@ LAB          EQU 20
 CLUB         EQU 21
 FACILITY     EQU 22
 PLATEAU      EQU 23
-IF DEF(_OPTION_BEACH_HOUSE)
 BEACH_HOUSE_TILESET EQU 24
-ENDC
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -14,13 +14,8 @@ dw AlakazamPicFront
 dw AlakazamPicBack
 ; attacks known at lvl 0
 db TELEPORT
-IF DEF(_YELLOW)
-	db KINESIS
-	db 0
-ELSE
-	db CONFUSION
-	db DISABLE
-ENDC
+db KINESIS
+db 0
 db 0
 db 3 ; growth rate
 ; learnset
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -25,9 +25,5 @@ db %00111000
 db %11110000
 db %01000011
 db %00101000
-IF DEF(_YELLOW)
-	db %01000010
-ELSE
-	db %00000010
-ENDC
+db %01000010
 db 0 ; padding
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -14,11 +14,7 @@ dw ChanseyPicFront
 dw ChanseyPicBack
 ; attacks known at lvl 0
 db POUND
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db DOUBLESLAP
-ENDC
+db TAIL_WHIP
 db 0
 db 0
 db 4 ; growth rate
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -25,9 +25,5 @@ db %01001111
 db %11001110
 db %11100011
 db %00001000
-IF DEF(_YELLOW)
-	db %00101110
-ELSE
-	db %00100110
-ENDC
+db %00101110
 db 0 ; padding
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -25,9 +25,5 @@ db %00001000
 db %11001110
 db %00000010
 db %10001000
-IF DEF(_YELLOW)
-	db %00000110
-ELSE
-	db %00000010
-ENDC
+db %00000110
 db 0 ; padding
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -25,9 +25,5 @@ db %00001000
 db %11001110
 db %00000010
 db %10001000
-IF DEF(_YELLOW)
-	db %00000110
-ELSE
-	db %00000010
-ENDC
+db %00000110
 db 0 ; padding
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -14,11 +14,7 @@ dw EeveePicFront
 dw EeveePicBack
 ; attacks known at lvl 0
 db TACKLE
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db SAND_ATTACK
-ENDC
+db TAIL_WHIP
 db 0
 db 0
 db 0 ; growth rate
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -14,11 +14,7 @@ dw FlareonPicFront
 dw FlareonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db SAND_ATTACK
-ENDC
+db TAIL_WHIP
 db QUICK_ATTACK
 db EMBER
 db 0 ; growth rate
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -13,17 +13,10 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions
 dw GyaradosPicFront
 dw GyaradosPicBack
 ; attacks known at lvl 0
-IF DEF(_YELLOW)
 db TACKLE
 db 0
 db 0
 db 0
-ELSE
-db BITE
-db DRAGON_RAGE
-db LEER
-db HYDRO_PUMP
-ENDC
 db 5 ; growth rate
 ; learnset
 db %10100000
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -14,11 +14,7 @@ dw JolteonPicFront
 dw JolteonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db SAND_ATTACK
-ENDC
+db TAIL_WHIP
 db QUICK_ATTACK
 db THUNDERSHOCK
 db 0 ; growth rate
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -14,13 +14,8 @@ dw KadabraPicFront
 dw KadabraPicBack
 ; attacks known at lvl 0
 db TELEPORT
-IF DEF(_YELLOW)
-	DB KINESIS
-	db 0
-ELSE
-	db CONFUSION
-	db DISABLE
-ENDC
+db KINESIS
+db 0
 db 0
 db 3 ; growth rate
 ; learnset
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -14,15 +14,9 @@ dw MarowakPicFront
 dw MarowakPicBack
 ; attacks known at lvl 0
 db BONE_CLUB
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-	db 0
-	db 0
-ELSE
-	db GROWL
-	db LEER
-	db FOCUS_ENERGY
-ENDC
+db TAIL_WHIP
+db 0
+db 0
 db 0 ; growth rate
 ; learnset
 db %10110001
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -14,14 +14,9 @@ dw PrimeapePicFront
 dw PrimeapePicBack
 ; attacks known at lvl 0
 db SCRATCH
-IF !DEF(_YELLOW)
-	db LEER
-ENDC
 db KARATE_CHOP
 db FURY_SWIPES
-IF DEF(_YELLOW)
-	db LOW_KICK
-ENDC
+db LOW_KICK
 db 0 ; growth rate
 ; learnset
 db %10110001
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -14,11 +14,7 @@ dw VaporeonPicFront
 dw VaporeonPicBack
 ; attacks known at lvl 0
 db TACKLE
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-ELSE
-	db SAND_ATTACK
-ENDC
+db TAIL_WHIP
 db QUICK_ATTACK
 db WATER_GUN
 db 0 ; growth rate
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -15,13 +15,8 @@ dw VenomothPicBack
 ; attacks known at lvl 0
 db TACKLE
 db DISABLE
-IF DEF(_YELLOW)
-	db SUPERSONIC
-	db CONFUSION
-ELSE
-	db POISONPOWDER
-	db LEECH_LIFE
-ENDC
+db SUPERSONIC
+db CONFUSION
 db 0 ; growth rate
 ; learnset
 db %00101010
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -22,16 +22,8 @@ db 0 ; growth rate
 db %00100000
 db %00000011
 db %00111000
-IF DEF(_YELLOW)
-	db %11110000
-	db %01000011
-	db %00101000
-	db %00100010
-ELSE
-	db %11010000
-	db %00000011
-	db %00101000
-	db %00000010
-ENDC
-
+db %11110000
+db %01000011
+db %00101000
+db %00100010
 db 0 ; padding
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,6 +22,4 @@ Lab_Coll::          INCBIN  "gfx/tilesets/lab.tilecoll"
 Club_Coll::         INCBIN  "gfx/tilesets/club.tilecoll"
 Facility_Coll::     INCBIN  "gfx/tilesets/facility.tilecoll"
 Plateau_Coll::      INCBIN  "gfx/tilesets/plateau.tilecoll"
-IF DEF(_OPTION_BEACH_HOUSE)
 BeachHouse_Coll::   INCBIN  "gfx/tilesets/beachhouse.tilecoll"
-ENDC
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -6,18 +6,10 @@ PokemonTower7Object: ; 0x60ef6 (size=42)

 	db $0 ; signs

-IF DEF(_YELLOW)
 	db 3 ; people
 	db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1
 	db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2
 	db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3
-ELSE
-	db $4 ; people
-	db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13
-	db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14
-	db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15
-	db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
-ENDC

 	; warp-to
 	EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,42 +1,23 @@
 Route19Object: ; 0x54e9a (size=87)
 	db $43 ; border block

-	IF DEF(_OPTION_BEACH_HOUSE)
-		db $1 ; warps
-		db $9, $5, $0, BEACH_HOUSE
-	ELSE
-		db $0 ; warps
-	ENDC
+	db $1 ; warps
+	db $9, $5, $0, BEACH_HOUSE

 	db $1 ; signs
-IF DEF(_OPTION_BEACH_HOUSE)
 	db $b,$b,$b
-ELSE
-	db $9, $b, $b ; Route19Text11
-ENDC

 	db $a ; people
-IF DEF(_OPTION_BEACH_HOUSE)
 	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2
 	db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3
-ELSE
-	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2
-	db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3
-ENDC
 	db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4
 	db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5
 	db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6
-IF DEF(_OPTION_BEACH_HOUSE)
 	db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
-ELSE
-	db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7
-ENDC
 	db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c
 	db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d
 	db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8
 	db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e

 	; warp-to
-	IF DEF(_OPTION_BEACH_HOUSE)
-		EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
-	ENDC
+	EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
--- a/data/prize_mon_levels.asm
+++ b/data/prize_mon_levels.asm
@@ -1,5 +1,4 @@
 PrizeMonLevelDictionary: ; 5298a (14:698a)
-IF DEF(_RED)
 	db ABRA,9
 	db CLEFAIRY,8
 	db NIDORINA,17
@@ -7,13 +6,3 @@ IF DEF(_RED)
 	db DRATINI,18
 	db SCYTHER,25
 	db PORYGON,26
-ENDC
-IF DEF(_BLUE)
-	db ABRA,6
-	db CLEFAIRY,12
-	db NIDORINO,17
-
-	db PINSIR,20
-	db DRATINI,24
-	db PORYGON,18
-ENDC
--- a/data/prizes.asm
+++ b/data/prizes.asm
@@ -14,49 +14,25 @@ NoThanksText: ; 5284f (14:684f)
 PrizeMenuMon1Entries: ; 52859 (14:6859)
 	db ABRA
 	db CLEFAIRY
-IF DEF(_RED)
 	db NIDORINA
-ENDC
-IF DEF(_BLUE)
-	db NIDORINO
-ENDC
 	db "@"

 PrizeMenuMon1Cost: ; 5285d (14:685d)
-IF DEF(_RED)
 	coins 180
 	coins 500
-ENDC
-IF DEF(_BLUE)
-	coins 120
-	coins 750
-ENDC
 	coins 1200
 	db "@"

 PrizeMenuMon2Entries: ; 52864 (14:6864)
-IF DEF(_RED)
 	db DRATINI
 	db SCYTHER
-ENDC
-IF DEF(_BLUE)
-	db PINSIR
-	db DRATINI
-ENDC
 	db PORYGON
 	db "@"

 PrizeMenuMon2Cost: ; 52868 (14:6868)
-IF DEF(_RED)
 	coins 2800
 	coins 5500
 	coins 9999
-ENDC
-IF DEF(_BLUE)
-	coins 2500
-	coins 4600
-	coins 6500
-ENDC
 	db "@"

 PrizeMenuTMsEntries: ; 5286f (14:686f)
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,62 +1,28 @@
 BorderPalettes: ; 72788 (1c:6788)
-IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.map"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.map"
-ENDC
+	INCBIN "gfx/tilemaps/sgbborder.map"

 	ds $100

-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB1
 	RGB 25,22,25
 	RGB 25,17,21
 	RGB 24,14,12
-ENDC
-IF DEF(_BLUE)
-	RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O)
-	RGB 10,17,26
-	RGB 5,9,20
-	RGB 16,20,27
-ENDC

 	ds $18

-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB2
 	RGB 22,31,16
 	RGB 27,20,6
 	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB2
-	RGB 27,11,6
-	RGB 5,9,20
-	RGB 28,25,15
-ENDC

 	ds $18

-IF DEF(_RED)
 	RGB 30,29,29 ; PAL_SGB3
 	RGB 31,31,17
 	RGB 18,21,29
 	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB3
-	RGB 12,15,11
-	RGB 5,9,20
-	RGB 14,22,17
-ENDC

 	ds $18

 SGBBorderGraphics: ; 72fe8 (1c:6fe8)
-IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.2bpp"
-ENDC
+	INCBIN "gfx/sgbborder.2bpp"
--- a/data/super_palettes.asm
+++ b/data/super_palettes.asm
@@ -52,18 +52,10 @@ SuperPalettes: ; 72660 (1c:6660)
 	RGB 20,26,31
 	RGB 17,23,10
 	RGB 3,2,2
-IF DEF(_RED)
 	RGB 31,29,31 ; PAL_LOGO1
 	RGB 30,30,17
 	RGB 17,23,10
 	RGB 21,0,4
-ENDC
-IF DEF(_BLUE)
-	RGB 31,29,31 ; PAL_LOGO1
-	RGB 30,30,17
-	RGB 21,0,4
-	RGB 14,19,29
-ENDC
 	RGB 31,29,31 ; PAL_LOGO2
 	RGB 30,30,17
 	RGB 18,18,24
@@ -118,31 +110,15 @@ ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS2
 	RGB 31,31,17
-IF DEF(_RED)
 	RGB 25,17,21
-ENDC
-IF DEF(_BLUE)
-	RGB 16,19,29
-ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS3
 	RGB 22,31,16
-IF DEF(_RED)
 	RGB 25,17,21
-ENDC
-IF DEF(_BLUE)
-	RGB 16,19,29
-ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_SLOTS4
-IF DEF(_RED)
 	RGB 16,19,29
 	RGB 25,17,21
-ENDC
-IF DEF(_BLUE)
-	RGB 25,17,21
-	RGB 16,19,29
-ENDC
 	RGB 3,2,2
 	RGB 31,29,31 ; PAL_BLACK
 	RGB 7,7,7
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,6 +23,4 @@ Tilesets: ; c7be (3:47be)
 	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
 	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
 	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
-IF DEF(_OPTION_BEACH_HOUSE)
 	tileset BeachHouse_Block,  BeachHouse_GFX,  BeachHouse_Coll,  $FF,$FF,$FF, $FF, INDOOR
-ENDC
--- a/data/title_mons.asm
+++ b/data/title_mons.asm
@@ -1,6 +1,5 @@
 TitleMons: ; 4588 (1:4588)
 ; mons on the title screen are randomly chosen from here
-IF DEF(_RED)
 	db CHARMANDER
 	db SQUIRTLE
 	db BULBASAUR
@@ -17,40 +16,3 @@ IF DEF(_RED)
 	db ONIX
 	db PONYTA
 	db MAGIKARP
-ENDC
-IF DEF(_GREEN)
-	db BULBASAUR
-	db CHARMANDER
-	db SQUIRTLE
-	db CATERPIE
-	db NIDORAN_F
-	db PINSIR
-	db PIKACHU
-	db CLEFAIRY
-	db RHYDON
-	db ABRA
-	db GASTLY
-	db DITTO
-	db PIDGEOTTO
-	db ONIX
-	db PONYTA
-	db MAGIKARP
-ENDC
-IF DEF(_BLUE)
-	db SQUIRTLE
-	db CHARMANDER
-	db BULBASAUR
-	db MANKEY
-	db HITMONLEE
-	db VULPIX
-	db CHANSEY
-	db AERODACTYL
-	db JOLTEON
-	db SNORLAX
-	db GLOOM
-	db POLIWAG
-	db DODUO
-	db PORYGON
-	db GENGAR
-	db RAICHU
-ENDC
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,6 +1,5 @@
 TradeMons: ; 71b7b (1c:5b7b)
 ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
-IF DEF(_YELLOW)
 	db LICKITUNG, DUGTRIO,   0,"GURIO@@@@@@"
 	db CLEFAIRY,  MR_MIME,   0,"MILES@@@@@@"
 	db BUTTERFREE,BEEDRILL,  2,"STINGER@@@@"
@@ -11,15 +10,3 @@ IF DEF(_YELLOW)
 	db GOLDUCK,   RHYDON,    1,"BUFFY@@@@@@"
 	db GROWLITHE, DEWGONG,   2,"CEZANNE@@@@"
 	db CUBONE,    MACHOKE,   2,"RICKY@@@@@@"
-ELSE
-	db NIDORINO,  NIDORINA,  0,"TERRY@@@@@@"
-	db ABRA,      MR_MIME,   0,"MARCEL@@@@@"
-	db BUTTERFREE,BEEDRILL,  2,"CHIKUCHIKU@"
-	db PONYTA,    SEEL,      0,"SAILOR@@@@@"
-	db SPEAROW,   FARFETCH_D,2,"DUX@@@@@@@@"
-	db SLOWBRO,   LICKITUNG, 0,"MARC@@@@@@@"
-	db POLIWHIRL, JYNX,      1,"LOLA@@@@@@@"
-	db RAICHU,    ELECTRODE, 1,"DORIS@@@@@@"
-	db VENONAT,   TANGELA,   2,"CRINKLES@@@"
-	db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@"
-ENDC
--- a/data/trainer_moves.asm
+++ b/data/trainer_moves.asm
@@ -1,38 +1,3 @@
-IF !DEF(YELLOW)
-LoneMoves: ; 39d22 (e:5d22)
-; these are used for gym leaders.
-; this is not automatic! you have to write the number you want to W_LONEATTACKNO
-; first. e.g., erika's script writes 4 to W_LONEATTACKNO to get mega drain,
-; the fourth entry in the list.
-
-; first byte:  pokemon in the trainer's party that gets the move
-; second byte: move
-; unterminated
-	db 1,BIDE
-	db 1,BUBBLEBEAM
-	db 2,THUNDERBOLT
-	db 2,MEGA_DRAIN
-	db 3,TOXIC
-	db 3,PSYWAVE
-	db 3,FIRE_BLAST
-	db 4,FISSURE
-
-TeamMoves: ; 39d32 (e:5d32)
-; these are used for elite four.
-; this is automatic, based on trainer class.
-; don't be confused by LoneMoves above, the two data structures are
-	; _completely_ unrelated.
-
-; first byte: trainer (all trainers in this class have this move)
-; second byte: move
-; ff-terminated
-	db LORELEI,BLIZZARD
-	db BRUNO,FISSURE
-	db AGATHA,TOXIC
-	db LANCE,BARRIER
-	db $FF
-
-ELSE
 ; yellow has its own format.

 ; entry ≔ trainerclass, trainerid, moveset+, 0
@@ -194,4 +159,3 @@ TeamMoves:
 	db 0

 	db $ff
-endc
--- a/data/trainer_parties.asm
+++ b/data/trainer_parties.asm
@@ -33,19 +33,11 @@ YoungsterData: ; 39d99 (e:5d99)
 	db 17,RATTATA,RATTATA,RATICATE,0
 	db 18,NIDORAN_M,NIDORINO,0
 	db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0
-if DEF(_YELLOW)
 	db 24,SANDSHREW,0
-endc
 BugCatcherData: ; 39dce (e:5dce)
-if DEF(_YELLOW)
 	db 7,CATERPIE,CATERPIE,0
 	db 6,METAPOD,CATERPIE,METAPOD,0
 	db 10,CATERPIE,0
-else
-	db 6,WEEDLE,CATERPIE,0
-	db 7,WEEDLE,KAKUNA,WEEDLE,0
-	db 9,WEEDLE,0
-endc
 	db 10,CATERPIE,WEEDLE,CATERPIE,0
 	db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0
 	db 11,CATERPIE,METAPOD,0
@@ -57,9 +49,7 @@ endc
 	db 18,METAPOD,CATERPIE,VENONAT,0
 	db 19,BEEDRILL,BEEDRILL,0
 	db 20,CATERPIE,WEEDLE,VENONAT,0
-if DEF(_YELLOW)
 	db 8,CATERPIE,METAPOD,0
-endc
 LassData: ; 39e0c (e:5e0c)
 	db 9,PIDGEY,PIDGEY,0
 	db 10,RATTATA,NIDORAN_M,0
@@ -72,24 +62,14 @@ LassData: ; 39e0c (e:5e0c)
 	db 15,NIDORAN_M,NIDORAN_F,0
 	db 13,ODDISH,PIDGEY,ODDISH,0
 	db 18,PIDGEY,NIDORAN_F,0
-if DEF(_YELLOW)
 	db 20,JIGGLYPUFF,0
-else
-	db 18,RATTATA,PIKACHU,0
-endc
 	db 23,NIDORAN_F,NIDORINA,0
 	db 24,MEOWTH,MEOWTH,MEOWTH,0
-if DEF(_YELLOW)
 	db 19,PIDGEY,RATTATA,NIDORAN_F,MEOWTH,NIDORAN_M,0
-else
-	db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0
-endc
 	db 22,CLEFAIRY,CLEFAIRY,0
 	db 23,BELLSPROUT,WEEPINBELL,0
 	db 23,ODDISH,GLOOM,0
-if DEF(_YELLOW)
 	db 6,NIDORAN_F,NIDORAN_M,0
-endc
 SailorData: ; 39e58 (e:5e58)
 	db 18,MACHOP,SHELLDER,0
 	db 17,MACHOP,TENTACOOL,0
@@ -98,17 +78,9 @@ SailorData: ; 39e58 (e:5e58)
 	db 18,TENTACOOL,STARYU,0
 	db 17,HORSEA,HORSEA,HORSEA,0
 	db 20,MACHOP,0
-if DEF(_YELLOW)
 	db 24,MAGNEMITE,0
-else
-	db 21,PIKACHU,PIKACHU,0
-endc
 JrTrainerMData: ; 39e78 (e:5e78)
-if DEF(_YELLOW)
 	db 9,DIGLETT,SANDSHREW,0
-else
-	db 11,DIGLETT,SANDSHREW,0
-endc
 	db 14,RATTATA,EKANS,0
 	db 18,MANKEY,0
 	db 20,SQUIRTLE,0
@@ -117,34 +89,20 @@ endc
 	db 21,GROWLITHE,CHARMANDER,0
 	db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0
 	db 29,NIDORAN_M,NIDORINO,0
-if DEF(_YELLOW)
 	db 16,WEEPINBELL,0
-endc
 JrTrainerFData: ; 39e9d (e:5e9d)
 	db 19,GOLDEEN,0
-if DEF(_YELLOW)
 	db 16,ODDISH,BELLSPROUT,0
-else
-	db 16,RATTATA,PIKACHU,0
-endc
 	db 16,PIDGEY,PIDGEY,PIDGEY,0
 	db 22,BULBASAUR,0
 	db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 23,MEOWTH,0
-if DEF(_YELLOW)
 	db 20,JIGGLYPUFF,CLEFAIRY,0
-else
-	db 20,PIKACHU,CLEFAIRY,0
-endc
 	db 21,PIDGEY,PIDGEOTTO,0
 	db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0
 	db 22,ODDISH,BULBASAUR,0
 	db 24,BULBASAUR,IVYSAUR,0
-if DEF(_YELLOW)
 	db 24,PIDGEY,MEOWTH,RATTATA,PIDGEY,MEOWTH,0
-else
-	db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0
-endc
 	db 30,POLIWAG,POLIWAG,0
 	db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0
 	db 28,GOLDEEN,POLIWAG,HORSEA,0
@@ -153,17 +111,11 @@ endc
 	db 20,MEOWTH,ODDISH,PIDGEY,0
 	db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0
 	db 28,GLOOM,ODDISH,ODDISH,0
-if DEF(_YELLOW)
 	db 29,PIDGEY,PIDGEOTTO,0
-else
-	db 29,PIKACHU,RAICHU,0
-endc
 	db 33,CLEFAIRY,0
 	db 29,BELLSPROUT,ODDISH,TANGELA,0
 	db 30,TENTACOOL,HORSEA,SEEL,0
-if DEF(_YELLOW)
 	db 20,CUBONE,0
-endc
 PokemaniacData: ; 39f09 (e:5f09)
 	db 30,RHYHORN,LICKITUNG,0
 	db 20,CUBONE,SLOWPOKE,0
@@ -282,11 +234,7 @@ BeautyData: ; 3a0d1 (e:60d1)
 	db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0
 	db 24,BELLSPROUT,BELLSPROUT,0
 	db 26,EXEGGCUTE,0
-if DEF(_YELLOW)
 	db 27,RATTATA,VULPIX,RATTATA,0
-else
-	db 27,RATTATA,PIKACHU,RATTATA,0
-endc
 	db 29,CLEFAIRY,MEOWTH,0
 	db 35,SEAKING,0
 	db 30,SHELLDER,SHELLDER,CLOYSTER,0
@@ -304,11 +252,7 @@ PsychicData: ; 3a115 (e:6115)
 	db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0
 	db 38,SLOWBRO,0
 RockerData: ; 3a127 (e:6127)
-if DEF(_YELLOW)
 	db 20,VOLTORB,VOLTORB,VOLTORB,0
-else
-	db 20,VOLTORB,MAGNEMITE,VOLTORB,0
-endc
 	db 29,VOLTORB,ELECTRODE,0
 JugglerData: ; 3a130 (e:6130)
 	db 29,KADABRA,MR_MIME,0
@@ -355,21 +299,9 @@ BlackbeltData: ; 3a1be (e:61be)
 	db 38,MACHOKE,MACHOP,MACHOKE,0
 	db 43,MACHOKE,MACHOP,MACHOKE,0
 Green1Data: ; 3a1e4 (e:61e4)
-if DEF(_YELLOW)
 	db 5,EEVEE,0
 	db $FF,9,SPEAROW,8,EEVEE,0
 	db $FF,18,SPEAROW,15,SANDSHREW,15,RATTATA,17,EEVEE,0
-else
-	db 5,SQUIRTLE,0
-	db 5,BULBASAUR,0
-	db 5,CHARMANDER,0
-	db $FF,9,PIDGEY,8,SQUIRTLE,0
-	db $FF,9,PIDGEY,8,BULBASAUR,0
-	db $FF,9,PIDGEY,8,CHARMANDER,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0
-	db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0
-endc
 ProfOakData: ; 3a21d (e:621d)
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0
 	db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0
@@ -391,15 +323,9 @@ ScientistData: ; 3a241 (e:6241)
 	db 33,MAGNEMITE,MAGNETON,VOLTORB,0
 	db 34,MAGNEMITE,ELECTRODE,0
 GiovanniData: ; 3a27e (e:627e)
-if DEF(_YELLOW)
 	db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0
 	db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0
 	db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0
-else
-	db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0
-	db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0
-	db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0
-endc
 RocketData: ; 3a29c (e:629c)
 	db 13,RATTATA,ZUBAT,0
 	db 11,SANDSHREW,RATTATA,ZUBAT,0
@@ -442,7 +368,6 @@ RocketData: ; 3a29c (e:629c)
 	db 33,MACHOKE,0
 	db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0
 	db 32,CUBONE,DROWZEE,MAROWAK,0
-if DEF(_YELLOW)
 JessieJamesData:
 	db 14,EKANS,MEOWTH,KOFFING,0
 	db 25,KOFFING,MEOWTH,EKANS,0
@@ -452,7 +377,6 @@ JessieJamesData:
 	db 27,KOFFING,0
 	db 29,WEEZING,0
 	db 33,WEEZING,0
-endc
 CooltrainerMData: ; 3a35a (e:635a)
 	db 39,NIDORINO,NIDOKING,0
 	db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0
@@ -476,55 +400,26 @@ CooltrainerFData: ; 3a385 (e:6385)
 BrunoData: ; 3a3a9 (e:63a9)
 	db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0
 BrockData: ; 3a3b5 (e:63b5)
-if DEF(_YELLOW)
 	db $FF,10,GEODUDE,12,ONIX,0
-else
-	db $FF,12,GEODUDE,14,ONIX,0
-endc
 MistyData: ; 3a3bb (e:63bb)
 	db $FF,18,STARYU,21,STARMIE,0
 LtSurgeData: ; 3a3c1 (e:63c1)
-if DEF(_YELLOW)
 	db $FF,28,RAICHU,0
-else
-	db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0
-endc
 ErikaData: ; 3a3c9 (e:63c9)
-if DEF(_YELLOW)
 	db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0
-else
-	db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0
-endc
 KogaData: ; 3a3d1 (e:63d1)
-if DEF(_YELLOW)
 	db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0
-else
-	db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0
-endc
 BlaineData: ; 3a3db (e:63db)
-if DEF(_YELLOW)
 	db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0
-else
-	db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0
-endc
 SabrinaData: ; 3a3e5 (e:63e5)
-if DEF(_YELLOW)
 	db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0
-else
-	db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0
-endc
 GentlemanData: ; 3a3ef (e:63ef)
 	db 18,GROWLITHE,GROWLITHE,0
 	db 19,NIDORAN_M,NIDORAN_F,0
-if DEF(_YELLOW)
 	db 22,VOLTORB,MAGNEMITE,0
-else
-	db 23,PIKACHU,0
-endc
 	db 48,PRIMEAPE,0
 	db 17,GROWLITHE,PONYTA,0
 Green2Data: ; 3a401 (e:6401)
-if DEF(_YELLOW)
 	db $FF,19,SPEAROW,16,RATTATA,18,SANDSHREW,20,EEVEE,0
 	db $FF,25,FEAROW,23,SHELLDER,22,VULPIX,20,SANDSHREW,25,EEVEE,0
 	db $FF,25,FEAROW,23,MAGNEMITE,22,SHELLDER,20,SANDSHREW,25,EEVEE,0
@@ -535,30 +430,10 @@ if DEF(_YELLOW)
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,NINETALES,47,CLOYSTER,50,KADABRA,53,JOLTEON,0
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0
 	db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0
-else
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0
-	db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0
-	db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0
-	db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0
-	db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0
-	db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
-	db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
-	db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
-	db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
-endc
 Green3Data: ; 3a491 (e:6491)
-if DEF(_YELLOW)
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0
 	db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0
-else
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0
-	db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0
-endc
 LoreleiData: ; 3a4bb (e:64bb)
 	db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
 ChannelerData: ; 3a4c7 (e:64c7)
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wildPokemon/mansion1.asm
@@ -1,43 +1,14 @@
 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(_GREEN) || 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
-
-	IF DEF(_YELLOW)
-		db 34,RATTATA
-		db 34,RATICATE
-		db 23,GRIMER
-		db 26,GROWLITHE
-		db 37,RATTATA
-		db 37,RATICATE
-		db 30,GROWLITHE
-		db 26,GRIMER
-		db 34,GROWLITHE
-		db 38,GROWLITHE
-	ENDC
-
+	db 34,RATTATA
+	db 34,RATICATE
+	db 23,GRIMER
+	db 26,GROWLITHE
+	db 37,RATTATA
+	db 37,RATICATE
+	db 30,GROWLITHE
+	db 26,GRIMER
+	db 34,GROWLITHE
+	db 38,GROWLITHE
 	db $00

--- a/data/wildPokemon/mansion2.asm
+++ b/data/wildPokemon/mansion2.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 32,GROWLITHE
-		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
-
-	IF DEF(_YELLOW)
-		db 37,RATTATA
-		db 37,RATICATE
-		db 26,GRIMER
-		db 29,GRIMER
-		db 40,RATTATA
-		db 40,RATICATE
-		db 32,GRIMER
-		db 35,GRIMER
-		db 35,MUK
-		db 38,MUK
-	ENDC
-
+	db 37,RATTATA
+	db 37,RATICATE
+	db 26,GRIMER
+	db 29,GRIMER
+	db 40,RATTATA
+	db 40,RATICATE
+	db 32,GRIMER
+	db 35,GRIMER
+	db 35,MUK
+	db 38,MUK
 	db $00

--- a/data/wildPokemon/mansion3.asm
+++ b/data/wildPokemon/mansion3.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 31,GRIMER
-		db 33,GROWLITHE
-		db 35,GRIMER
-		db 32,PONYTA
-		db 34,PONYTA
-		db 40,MUK
-		db 34,KOFFING
-		db 38,MUK
-		db 36,PONYTA
-		db 42,WEEZING
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 40,RATTATA
-		db 40,RATICATE
-		db 32,GRIMER
-		db 35,GRIMER
-		db 43,RATTATA
-		db 43,RATICATE
-		db 38,GRIMER
-		db 38,GRIMER
-		db 38,MUK
-		db 41,MUK
-	ENDC
-
+	db 40,RATTATA
+	db 40,RATICATE
+	db 32,GRIMER
+	db 35,GRIMER
+	db 43,RATTATA
+	db 43,RATICATE
+	db 38,GRIMER
+	db 38,GRIMER
+	db 38,MUK
+	db 41,MUK
 	db $00

--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wildPokemon/mansionb1.asm
@@ -1,55 +1,13 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 33,GRIMER
-		db 31,GRIMER
-		db 35,GROWLITHE
-		db 32,PONYTA
-		db 31,GRIMER
-		db 40,MUK
-		db 34,PONYTA
-		db 35,KOFFING
-		db 38,MUK
-		db 42,WEEZING
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 35,GRIMER
-		db 38,GRIMER
-		db 37,RATICATE
-		db 40,RATICATE
-		db 41,MUK
-		db 43,RATICATE
-		db 24,DITTO
-		db 46,RATICATE
-		db 18,DITTO
-		db 12,DITTO
-	ENDC
-
+	db 35,GRIMER
+	db 38,GRIMER
+	db 37,RATICATE
+	db 40,RATICATE
+	db 41,MUK
+	db 43,RATICATE
+	db 24,DITTO
+	db 46,RATICATE
+	db 18,DITTO
+	db 12,DITTO
 	db $00
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wildPokemon/mtmoon1.asm
@@ -1,27 +1,14 @@
 MoonMons1:
 	db $0A
-	IF DEF(_YELLOW)
-		db 8,ZUBAT
-		db 9,ZUBAT
-		db 10,GEODUDE
-		db 6,ZUBAT
-		db 7,ZUBAT
-		db 10,ZUBAT
-		db 10,GEODUDE
-		db 11,ZUBAT
-		db 12,SANDSHREW
-		db 11,CLEFAIRY
-	ELSE
-		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
-	ENDC
+	db 8,ZUBAT
+	db 9,ZUBAT
+	db 10,GEODUDE
+	db 6,ZUBAT
+	db 7,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 12,SANDSHREW
+	db 11,CLEFAIRY
 	db $00

--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wildPokemon/mtmoonb1.asm
@@ -1,27 +1,14 @@
 MoonMonsB1:
 	db $0A
-	IF DEF(_YELLOW)
-		db 8,ZUBAT
-		db 9,ZUBAT
-		db 10,GEODUDE
-		db 6,ZUBAT
-		db 7,ZUBAT
-		db 10,ZUBAT
-		db 10,GEODUDE
-		db 11,ZUBAT
-		db 12,SANDSHREW
-		db 11,CLEFAIRY
-	ELSE
-		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
-	ENDC
+	db 8,ZUBAT
+	db 9,ZUBAT
+	db 10,GEODUDE
+	db 6,ZUBAT
+	db 7,ZUBAT
+	db 10,ZUBAT
+	db 10,GEODUDE
+	db 11,ZUBAT
+	db 12,SANDSHREW
+	db 11,CLEFAIRY
 	db $00

--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wildPokemon/mtmoonb2.asm
@@ -1,27 +1,14 @@
 MoonMonsB2:
 	db $0A
-	IF DEF(_YELLOW)
-		db 10,ZUBAT
-		db 11,GEODUDE
-		db 13,PARAS
-		db 11,ZUBAT
-		db 11,ZUBAT
-		db 12,ZUBAT
-		db 13,ZUBAT
-		db 9,CLEFAIRY
-		db 11,CLEFAIRY
-		db 13,CLEFAIRY
-	ELSE
-		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
-	ENDC
+	db 10,ZUBAT
+	db 11,GEODUDE
+	db 13,PARAS
+	db 11,ZUBAT
+	db 11,ZUBAT
+	db 12,ZUBAT
+	db 13,ZUBAT
+	db 9,CLEFAIRY
+	db 11,CLEFAIRY
+	db 13,CLEFAIRY
 	db $00

--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wildPokemon/pokemontower3.asm
@@ -1,29 +1,14 @@
 TowerMons3:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 20,GASTLY
-		db 21,GASTLY
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 19,GASTLY
-		db 18,GASTLY
-		db 25,GASTLY
-		db 20,HAUNTER
-		db 25,HAUNTER
-	ELSE
-		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
-	ENDC
-
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,GASTLY
+	db 20,HAUNTER
+	db 25,HAUNTER
 	db $00

--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wildPokemon/pokemontower4.asm
@@ -1,29 +1,14 @@
 TowerMons4:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 20,GASTLY
-		db 21,GASTLY
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 19,GASTLY
-		db 18,GASTLY
-		db 25,GASTLY
-		db 20,HAUNTER
-		db 25,HAUNTER
-	ELSE
-		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
-	ENDC
-
+	db 20,GASTLY
+	db 21,GASTLY
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 19,GASTLY
+	db 18,GASTLY
+	db 25,GASTLY
+	db 20,HAUNTER
+	db 25,HAUNTER
 	db $00

--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wildPokemon/pokemontower5.asm
@@ -1,29 +1,14 @@
 TowerMons5:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 25,GASTLY
-		db 26,GASTLY
-		db 21,GASTLY
-		db 20,CUBONE
-		db 27,GASTLY
-		db 22,HAUNTER
-		db 27,HAUNTER
-	ELSE
-		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
-	ENDC
-
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 21,GASTLY
+	db 20,CUBONE
+	db 27,GASTLY
+	db 22,HAUNTER
+	db 27,HAUNTER
 	db $00

--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,29 +1,14 @@
 TowerMons6:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 22,GASTLY
-		db 23,GASTLY
-		db 24,GASTLY
-		db 25,GASTLY
-		db 26,GASTLY
-		db 21,GASTLY
-		db 22,CUBONE
-		db 27,GASTLY
-		db 22,HAUNTER
-		db 27,HAUNTER
-	ELSE
-		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
-	ENDC
-
+	db 22,GASTLY
+	db 23,GASTLY
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 21,GASTLY
+	db 22,CUBONE
+	db 27,GASTLY
+	db 22,HAUNTER
+	db 27,HAUNTER
 	db $00

--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wildPokemon/pokemontower7.asm
@@ -1,29 +1,14 @@
 TowerMons7:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 24,GASTLY
-		db 25,GASTLY
-		db 26,GASTLY
-		db 27,GASTLY
-		db 28,GASTLY
-		db 23,GASTLY
-		db 24,CUBONE
-		db 29,GASTLY
-		db 24,HAUNTER
-		db 29,HAUNTER
-	ELSE
-		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
-	ENDC
-
+	db 24,GASTLY
+	db 25,GASTLY
+	db 26,GASTLY
+	db 27,GASTLY
+	db 28,GASTLY
+	db 23,GASTLY
+	db 24,CUBONE
+	db 29,GASTLY
+	db 24,HAUNTER
+	db 29,HAUNTER
 	db $00

--- a/data/wildPokemon/powerplant.asm
+++ b/data/wildPokemon/powerplant.asm
@@ -1,34 +1,13 @@
 PowerPlantMons:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 30,MAGNEMITE
-		db 35,MAGNEMITE
-		db 33,MAGNETON
-		db 33,VOLTORB
-		db 37,VOLTORB
-		db 33,GRIMER
-		db 37,GRIMER
-		db 38,MAGNETON
-		db 33,MUK
-		db 37,MUK
-	ELSE
-		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(_GREEN) || DEF(_BLUE)
-			db 33,RAICHU
-			db 36,RAICHU
-		ENDC
-	ENDC
-
+	db 30,MAGNEMITE
+	db 35,MAGNEMITE
+	db 33,MAGNETON
+	db 33,VOLTORB
+	db 37,VOLTORB
+	db 33,GRIMER
+	db 37,GRIMER
+	db 38,MAGNETON
+	db 33,MUK
+	db 37,MUK
 	db $00
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wildPokemon/rocktunnel1.asm
@@ -1,34 +1,14 @@
 TunnelMonsB1:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 15,ZUBAT
-		db 16,GEODUDE
-		db 17,ZUBAT
-		db 19,ZUBAT
-		db 18,GEODUDE
-		db 20,GEODUDE
-		db 21,ZUBAT
-		db 17,MACHOP
-		db 19,MACHOP
-		db 21,MACHOP
-	ELSE
-		db 16,ZUBAT
-		db 17,ZUBAT
-		db 17,GEODUDE
-		db 15,MACHOP
-		db 16,GEODUDE
-		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
-			db 18,ZUBAT
-		ENDC
-		IF (DEF(_BLUE) && DEF(_JAPAN))
-			db 18,DITTO
-		ENDC
-		db 15,ZUBAT
-		db 17,MACHOP
-		db 13,ONIX
-		db 15,ONIX
-	ENDC
-
+	db 15,ZUBAT
+	db 16,GEODUDE
+	db 17,ZUBAT
+	db 19,ZUBAT
+	db 18,GEODUDE
+	db 20,GEODUDE
+	db 21,ZUBAT
+	db 17,MACHOP
+	db 19,MACHOP
+	db 21,MACHOP
 	db $00

--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,34 +1,14 @@
 TunnelMonsB2:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 20,ZUBAT
-		db 17,GEODUDE
-		db 18,MACHOP
-		db 21,ZUBAT
-		db 22,ZUBAT
-		db 21,GEODUDE
-		db 20,MACHOP
-		db 14,ONIX
-		db 18,ONIX
-		db 22,ONIX
-	ELSE
-		db 16,ZUBAT
-		db 17,ZUBAT
-		db 17,GEODUDE
-		db 15,MACHOP
-		db 16,GEODUDE
-		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
-			db 18,ZUBAT
-		ENDC
-		IF DEF(_BLUE) && DEF(_JAPAN)
-			db 18,DITTO
-		ENDC
-		db 17,MACHOP
-		db 17,ONIX
-		db 13,ONIX
-		db 18,GEODUDE
-	ENDC
-
+	db 20,ZUBAT
+	db 17,GEODUDE
+	db 18,MACHOP
+	db 21,ZUBAT
+	db 22,ZUBAT
+	db 21,GEODUDE
+	db 20,MACHOP
+	db 14,ONIX
+	db 18,ONIX
+	db 22,ONIX
 	db $00

--- a/data/wildPokemon/route1.asm
+++ b/data/wildPokemon/route1.asm
@@ -1,27 +1,14 @@
 Route1Mons:
 	db $19
-	IF DEF(_YELLOW)
-		db 3,PIDGEY
-		db 4,PIDGEY
-		db 2,RATTATA
-		db 3,RATTATA
-		db 2,PIDGEY
-		db 3,PIDGEY
-		db 5,PIDGEY
-		db 4,RATTATA
-		db 6,PIDGEY
-		db 7,PIDGEY
-	ELSE
-		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
-	ENDC
+	db 3,PIDGEY
+	db 4,PIDGEY
+	db 2,RATTATA
+	db 3,RATTATA
+	db 2,PIDGEY
+	db 3,PIDGEY
+	db 5,PIDGEY
+	db 4,RATTATA
+	db 6,PIDGEY
+	db 7,PIDGEY
 	db $00

--- a/data/wildPokemon/route10.asm
+++ b/data/wildPokemon/route10.asm
@@ -1,44 +1,14 @@
 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) || DEF(_GREEN)
-		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
-
-	IF DEF(_YELLOW)
-		db 16,MAGNEMITE
-		db 18,RATTATA
-		db 18,MAGNEMITE
-		db 20,MAGNEMITE
-		db 17,NIDORAN_M
-		db 17,NIDORAN_F
-		db 22,MAGNEMITE
-		db 20,RATICATE
-		db 16,MACHOP
-		db 18,MACHOP
-	ENDC
-
+	db 16,MAGNEMITE
+	db 18,RATTATA
+	db 18,MAGNEMITE
+	db 20,MAGNEMITE
+	db 17,NIDORAN_M
+	db 17,NIDORAN_F
+	db 22,MAGNEMITE
+	db 20,RATICATE
+	db 16,MACHOP
+	db 18,MACHOP
 	db $00

--- a/data/wildPokemon/route11.asm
+++ b/data/wildPokemon/route11.asm
@@ -1,44 +1,14 @@
 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(_GREEN) || 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
-
-	IF DEF(_YELLOW)
-		db 16,PIDGEY
-		db 15,RATTATA
-		db 18,PIDGEY
-		db 15,DROWZEE
-		db 17,RATTATA
-		db 17,DROWZEE
-		db 18,PIDGEOTTO
-		db 20,PIDGEOTTO
-		db 19,DROWZEE
-		db 17,RATICATE
-	ENDC
-
+	db 16,PIDGEY
+	db 15,RATTATA
+	db 18,PIDGEY
+	db 15,DROWZEE
+	db 17,RATTATA
+	db 17,DROWZEE
+	db 18,PIDGEOTTO
+	db 20,PIDGEOTTO
+	db 19,DROWZEE
+	db 17,RATICATE
 	db $00

--- a/data/wildPokemon/route12.asm
+++ b/data/wildPokemon/route12.asm
@@ -1,56 +1,25 @@
 Route12Mons:
 	db $0F
+	db 25,ODDISH
+	db 25,BELLSPROUT
+	db 28,PIDGEY
+	db 28,PIDGEOTTO
+	db 27,ODDISH
+	db 27,BELLSPROUT
+	db 29,GLOOM
+	db 29,WEEPINBELL
+	db 26,FARFETCH_D
+	db 31,FARFETCH_D

-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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
-		db $00
-	ENDC
-
-	IF DEF(_GREEN) || (!DEF(_JAPAN) && 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
-		db $00
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 25,ODDISH
-		db 25,BELLSPROUT
-		db 28,PIDGEY
-		db 28,PIDGEOTTO
-		db 27,ODDISH
-		db 27,BELLSPROUT
-		db 29,GLOOM
-		db 29,WEEPINBELL
-		db 26,FARFETCH_D
-		db 31,FARFETCH_D
-
-		db $03
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWBRO
-		db 20,SLOWBRO
-	ENDC
+	db $03
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWBRO
+	db 20,SLOWBRO

--- a/data/wildPokemon/route13.asm
+++ b/data/wildPokemon/route13.asm
@@ -1,57 +1,25 @@
 Route13Mons:
-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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
-		db $00
-	ENDC
+	db $0F
+	db 25,ODDISH
+	db 25,BELLSPROUT
+	db 28,PIDGEOTTO
+	db 28,PIDGEY
+	db 27,ODDISH
+	db 27,BELLSPROUT
+	db 29,GLOOM
+	db 29,WEEPINBELL
+	db 26,FARFETCH_D
+	db 31,FARFETCH_D

-	IF DEF(_GREEN) || (!DEF(_JAPAN) && 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
-		db $00
-	ENDC
-
-	IF DEF(_YELLOW)
-		db $0F
-		db 25,ODDISH
-		db 25,BELLSPROUT
-		db 28,PIDGEOTTO
-		db 28,PIDGEY
-		db 27,ODDISH
-		db 27,BELLSPROUT
-		db 29,GLOOM
-		db 29,WEEPINBELL
-		db 26,FARFETCH_D
-		db 31,FARFETCH_D
-
-		db $03
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWPOKE
-		db 15,SLOWBRO
-		db 20,SLOWBRO
-	ENDC
+	db $03
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWPOKE
+	db 15,SLOWBRO
+	db 20,SLOWBRO

--- a/data/wildPokemon/route14.asm
+++ b/data/wildPokemon/route14.asm
@@ -1,43 +1,14 @@
 Route14Mons:
 	db $0F
-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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(_GREEN) || (!DEF(_JAPAN) && 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
-
-	IF DEF(_YELLOW)
-		db 26,ODDISH
-		db 26,BELLSPROUT
-		db 24,VENONAT
-		db 30,PIDGEOTTO
-		db 28,ODDISH
-		db 28,BELLSPROUT
-		db 30,GLOOM
-		db 30,WEEPINBELL
-		db 27,VENONAT
-		db 30,VENOMOTH
-	ENDC
-
+	db 26,ODDISH
+	db 26,BELLSPROUT
+	db 24,VENONAT
+	db 30,PIDGEOTTO
+	db 28,ODDISH
+	db 28,BELLSPROUT
+	db 30,GLOOM
+	db 30,WEEPINBELL
+	db 27,VENONAT
+	db 30,VENOMOTH
 	db $00

--- a/data/wildPokemon/route15.asm
+++ b/data/wildPokemon/route15.asm
@@ -1,43 +1,14 @@
 Route15Mons:
 	db $0F
-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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(_GREEN) || (!DEF(_JAPAN) && 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
-
-	IF DEF(_YELLOW)
-		db 26,ODDISH
-		db 26,BELLSPROUT
-		db 24,VENONAT
-		db 32,PIDGEOTTO
-		db 28,ODDISH
-		db 28,BELLSPROUT
-		db 30,GLOOM
-		db 30,WEEPINBELL
-		db 27,VENONAT
-		db 30,VENOMOTH
-	ENDC
-
+	db 26,ODDISH
+	db 26,BELLSPROUT
+	db 24,VENONAT
+	db 32,PIDGEOTTO
+	db 28,ODDISH
+	db 28,BELLSPROUT
+	db 30,GLOOM
+	db 30,WEEPINBELL
+	db 27,VENONAT
+	db 30,VENOMOTH
 	db $00

--- a/data/wildPokemon/route16.asm
+++ b/data/wildPokemon/route16.asm
@@ -1,28 +1,14 @@
 Route16Mons:
 	db $19
-	IF DEF(_YELLOW)
-		db 22,SPEAROW
-		db 22,DODUO
-		db 23,RATTATA
-		db 24,DODUO
-		db 24,RATTATA
-		db 26,DODUO
-		db 23,SPEAROW
-		db 24,FEAROW
-		db 25,RATICATE
-		db 26,RATICATE
-	ELSE
-		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
-	ENDC
-
+	db 22,SPEAROW
+	db 22,DODUO
+	db 23,RATTATA
+	db 24,DODUO
+	db 24,RATTATA
+	db 26,DODUO
+	db 23,SPEAROW
+	db 24,FEAROW
+	db 25,RATICATE
+	db 26,RATICATE
 	db $00

--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,29 +1,14 @@
 Route17Mons:
 	db $19
-
-	IF DEF(_YELLOW)
-		db 26,DODUO
-		db 27,FEAROW
-		db 27,DODUO
-		db 28,DODUO
-		db 28,PONYTA
-		db 30,PONYTA
-		db 29,FEAROW
-		db 28,DODUO
-		db 32,PONYTA
-		db 29,DODRIO
-	ELSE
-		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
-	ENDC
-
+	db 26,DODUO
+	db 27,FEAROW
+	db 27,DODUO
+	db 28,DODUO
+	db 28,PONYTA
+	db 30,PONYTA
+	db 29,FEAROW
+	db 28,DODUO
+	db 32,PONYTA
+	db 29,DODRIO
 	db $00

--- a/data/wildPokemon/route18.asm
+++ b/data/wildPokemon/route18.asm
@@ -1,29 +1,14 @@
 Route18Mons:
 	db $19
-
-	IF DEF(_YELLOW)
-		db 22,SPEAROW
-		db 22,DODUO
-		db 23,RATTATA
-		db 24,DODUO
-		db 24,RATTATA
-		db 26,DODUO
-		db 23,SPEAROW
-		db 24,FEAROW
-		db 25,RATICATE
-		db 26,RATICATE
-	ELSE
-		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
-	ENDC
-
+	db 22,SPEAROW
+	db 22,DODUO
+	db 23,RATTATA
+	db 24,DODUO
+	db 24,RATTATA
+	db 26,DODUO
+	db 23,SPEAROW
+	db 24,FEAROW
+	db 25,RATICATE
+	db 26,RATICATE
 	db $00

--- a/data/wildPokemon/route2.asm
+++ b/data/wildPokemon/route2.asm
@@ -1,39 +1,14 @@
 Route2Mons:
 	db $19
-
-	IF DEF(_YELLOW)
-		db 3,RATTATA
-		db 3,PIDGEY
-		db 4,RATTATA
-		db 4,NIDORAN_M
-		db 4,NIDORAN_F
-		db 5,PIDGEY
-		db 6,NIDORAN_M
-		db 6,NIDORAN_F
-		db 7,PIDGEY
-		db 7,PIDGEY
-	ELSE
-		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
-	ENDC
+	db 3,RATTATA
+	db 3,PIDGEY
+	db 4,RATTATA
+	db 4,NIDORAN_M
+	db 4,NIDORAN_F
+	db 5,PIDGEY
+	db 6,NIDORAN_M
+	db 6,NIDORAN_F
+	db 7,PIDGEY
+	db 7,PIDGEY
 	db $00

--- a/data/wildPokemon/route21.asm
+++ b/data/wildPokemon/route21.asm
@@ -1,29 +1,15 @@
 Route21Mons:
 	db $19
-
-	IF DEF(_YELLOW)
-		db 15,PIDGEY
-		db 13,RATTATA
-		db 13,PIDGEY
-		db 11,PIDGEY
-		db 17,PIDGEY
-		db 15,RATTATA
-		db 15,RATICATE
-		db 17,PIDGEOTTO
-		db 19,PIDGEOTTO
-		db 15,PIDGEOTTO
-	ELSE
-		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
-	ENDC
+	db 15,PIDGEY
+	db 13,RATTATA
+	db 13,PIDGEY
+	db 11,PIDGEY
+	db 17,PIDGEY
+	db 15,RATTATA
+	db 15,RATICATE
+	db 17,PIDGEOTTO
+	db 19,PIDGEOTTO
+	db 15,PIDGEOTTO

 	db $05
 	db 5,TENTACOOL
--- a/data/wildPokemon/route22.asm
+++ b/data/wildPokemon/route22.asm
@@ -1,40 +1,14 @@
 Route22Mons:
 	db $19
-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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(_GREEN) || (!DEF(_JAPAN) && 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
-	IF DEF(_YELLOW)
-		db 2,NIDORAN_M
-		db 2,NIDORAN_F
-		db 3,MANKEY
-		db 3,RATTATA
-		db 4,NIDORAN_M
-		db 4,NIDORAN_F
-		db 5,MANKEY
-		db 2,SPEAROW
-		db 4,SPEAROW
-		db 6,SPEAROW
-	ENDC
+	db 2,NIDORAN_M
+	db 2,NIDORAN_F
+	db 3,MANKEY
+	db 3,RATTATA
+	db 4,NIDORAN_M
+	db 4,NIDORAN_F
+	db 5,MANKEY
+	db 2,SPEAROW
+	db 4,SPEAROW
+	db 6,SPEAROW
 	db $00

--- a/data/wildPokemon/route23.asm
+++ b/data/wildPokemon/route23.asm
@@ -1,39 +1,14 @@
 Route23Mons:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 41,NIDORINO
-		db 41,NIDORINA
-		db 36,MANKEY
-		db 44,NIDORINO
-		db 44,NIDORINA
-		db 40,FEAROW
-		db 41,MANKEY
-		db 45,FEAROW
-		db 41,PRIMEAPE
-		db 46,PRIMEAPE
-	ELSE
-		IF DEF(_RED)
-			db 26,EKANS
-		ENDC
-		IF !DEF(_RED)
-			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(_RED)
-			db 41,SANDSLASH
-		ENDC
-		db 43,DITTO
-		db 41,FEAROW
-		db 43,FEAROW
-	ENDC
-
+	db 41,NIDORINO
+	db 41,NIDORINA
+	db 36,MANKEY
+	db 44,NIDORINO
+	db 44,NIDORINA
+	db 40,FEAROW
+	db 41,MANKEY
+	db 45,FEAROW
+	db 41,PRIMEAPE
+	db 46,PRIMEAPE
 	db $00

--- a/data/wildPokemon/route24.asm
+++ b/data/wildPokemon/route24.asm
@@ -1,57 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 7,CATERPIE
-		db 8,METAPOD
-		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(_YELLOW)
-		db 12,ODDISH
-		db 12,BELLSPROUT
-		db 13,PIDGEY
-		db 14,ODDISH
-		db 14,BELLSPROUT
-		db 15,PIDGEY
-		db 13,VENONAT
-		db 16,VENONAT
-		db 17,PIDGEY
-		db 17,PIDGEOTTO
-	ENDC
-
+	db 12,ODDISH
+	db 12,BELLSPROUT
+	db 13,PIDGEY
+	db 14,ODDISH
+	db 14,BELLSPROUT
+	db 15,PIDGEY
+	db 13,VENONAT
+	db 16,VENONAT
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
 	db $00

--- a/data/wildPokemon/route25.asm
+++ b/data/wildPokemon/route25.asm
@@ -1,47 +1,6 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 8,CATERPIE
-		db 9,METAPOD
-		db 13,PIDGEY
-		db 12,ODDISH
-		db 13,ODDISH
-		db 12,ABRA
-		db 14,ODDISH
-		db 10,ABRA
-		db 7,KAKUNA
-		db 8,WEEDLE
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 12,ODDISH
+	db 12,ODDISH
 	db 12,BELLSPROUT
 	db 13,PIDGEY
 	db 14,ODDISH
@@ -51,7 +10,5 @@ Route25Mons:
 	db 16,VENONAT
 	db 17,PIDGEY
 	db 17,PIDGEOTTO
-	ENDC
-
 	db $00

--- a/data/wildPokemon/route3.asm
+++ b/data/wildPokemon/route3.asm
@@ -1,27 +1,14 @@
 Route3Mons:
 	db $14
-	IF DEF(_YELLOW)
-		db 8,SPEAROW
-		db 9,SPEAROW
-		db 9,MANKEY
-		db 10,SPEAROW
-		db 8,SANDSHREW
-		db 10,RATTATA
-		db 10,SANDSHREW
-		db 12,RATTATA
-		db 11,SPEAROW
-		db 12,SPEAROW
-	ELSE
-		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
-	ENDC
+	db 8,SPEAROW
+	db 9,SPEAROW
+	db 9,MANKEY
+	db 10,SPEAROW
+	db 8,SANDSHREW
+	db 10,RATTATA
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 11,SPEAROW
+	db 12,SPEAROW
 	db $00

--- a/data/wildPokemon/route4.asm
+++ b/data/wildPokemon/route4.asm
@@ -1,44 +1,14 @@
 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) || DEF(_GREEN)
-		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
-
-	IF DEF(_YELLOW)
-		db 8,SPEAROW
-		db 9,SPEAROW
-		db 9,MANKEY
-		db 10,SPEAROW
-		db 8,SANDSHREW
-		db 10,RATTATA
-		db 10,SANDSHREW
-		db 12,RATTATA
-		db 11,SPEAROW
-		db 12,SPEAROW
-	ENDC
-
+	db 8,SPEAROW
+	db 9,SPEAROW
+	db 9,MANKEY
+	db 10,SPEAROW
+	db 8,SANDSHREW
+	db 10,RATTATA
+	db 10,SANDSHREW
+	db 12,RATTATA
+	db 11,SPEAROW
+	db 12,SPEAROW
 	db $00

--- a/data/wildPokemon/route5.asm
+++ b/data/wildPokemon/route5.asm
@@ -1,57 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 15,PIDGEY
-		db 14,RATTATA
-		db 7,ABRA
-		db 16,PIDGEY
-		db 16,RATTATA
-		db 17,PIDGEY
-		db 17,PIDGEOTTO
-		db 3,JIGGLYPUFF
-		db 5,JIGGLYPUFF
-		db 7,JIGGLYPUFF
-	ENDC
-
+	db 15,PIDGEY
+	db 14,RATTATA
+	db 7,ABRA
+	db 16,PIDGEY
+	db 16,RATTATA
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF
 	db $00

--- a/data/wildPokemon/route6.asm
+++ b/data/wildPokemon/route6.asm
@@ -1,70 +1,25 @@
 Route6Mons:
 	db $0F
+	db 15,PIDGEY
+	db 14,RATTATA
+	db 7,ABRA
+	db 16,PIDGEY
+	db 16,RATTATA
+	db 17,PIDGEY
+	db 17,PIDGEOTTO
+	db 3,JIGGLYPUFF
+	db 5,JIGGLYPUFF
+	db 7,JIGGLYPUFF

-	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
-		db $00
-	ENDC
-
-	IF DEF(_GREEN) || !DEF(_JAPAN) && 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
-		db $00
-	ENDC
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 13,ODDISH
-		db 13,PIDGEY
-		db 15,PIDGEY
-		db 10,MEOWTH
-		db 12,MEOWTH
-		db 15,ODDISH
-		db 16,ODDISH
-		db 16,PIDGEY
-		db 14,MEOWTH
-		db 16,MEOWTH
-		db $00
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 15,PIDGEY
-		db 14,RATTATA
-		db 7,ABRA
-		db 16,PIDGEY
-		db 16,RATTATA
-		db 17,PIDGEY
-		db 17,PIDGEOTTO
-		db 3,JIGGLYPUFF
-		db 5,JIGGLYPUFF
-		db 7,JIGGLYPUFF
-
-		db $03
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,PSYDUCK
-		db 15,GOLDUCK
-		db 20,GOLDUCK
-	ENDC
+	db $03
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,PSYDUCK
+	db 15,GOLDUCK
+	db 20,GOLDUCK

--- a/data/wildPokemon/route7.asm
+++ b/data/wildPokemon/route7.asm
@@ -1,57 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 19,PIDGEY
-		db 19,ODDISH
-		db 17,MEOWTH
-		db 22,ODDISH
-		db 22,PIDGEY
-		db 18,MEOWTH
-		db 18,GROWLITHE
-		db 20,GROWLITHE
-		db 19,MEOWTH
-		db 20,MEOWTH
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 20,PIDGEY
-		db 22,PIDGEY
-		db 20,RATTATA
-		db 15,ABRA
-		db 19,ABRA
-		db 24,PIDGEOTTO
-		db 26,ABRA
-		db 19,JIGGLYPUFF
-		db 24,JIGGLYPUFF
-		db 24,JIGGLYPUFF
-	ENDC
-
+	db 20,PIDGEY
+	db 22,PIDGEY
+	db 20,RATTATA
+	db 15,ABRA
+	db 19,ABRA
+	db 24,PIDGEOTTO
+	db 26,ABRA
+	db 19,JIGGLYPUFF
+	db 24,JIGGLYPUFF
+	db 24,JIGGLYPUFF
 	db $00

--- a/data/wildPokemon/route8.asm
+++ b/data/wildPokemon/route8.asm
@@ -1,57 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 18,PIDGEY
-		db 18,MEOWTH
-		db 17,SANDSHREW
-		db 16,GROWLITHE
-		db 20,PIDGEY
-		db 20,MEOWTH
-		db 19,SANDSHREW
-		db 17,GROWLITHE
-		db 15,GROWLITHE
-		db 18,GROWLITHE
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 20,PIDGEY
-		db 22,PIDGEY
-		db 20,RATTATA
-		db 15,ABRA
-		db 19,ABRA
-		db 24,PIDGEOTTO
-		db 19,JIGGLYPUFF
-		db 24,JIGGLYPUFF
-		db 20,KADABRA
-		db 27,KADABRA
-	ENDC
-
+	db 20,PIDGEY
+	db 22,PIDGEY
+	db 20,RATTATA
+	db 15,ABRA
+	db 19,ABRA
+	db 24,PIDGEOTTO
+	db 19,JIGGLYPUFF
+	db 24,JIGGLYPUFF
+	db 20,KADABRA
+	db 27,KADABRA
 	db $00

--- a/data/wildPokemon/route9.asm
+++ b/data/wildPokemon/route9.asm
@@ -1,44 +1,14 @@
 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(_GREEN) || 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
-
-	IF DEF(_YELLOW)
-		db 16,NIDORAN_M
-		db 16,NIDORAN_F
-		db 18,RATTATA
-		db 18,NIDORAN_M
-		db 18,NIDORAN_F
-		db 17,SPEAROW
-		db 18,NIDORINO
-		db 18,NIDORINA
-		db 20,RATICATE
-		db 19,FEAROW
-	ENDC
-
+	db 16,NIDORAN_M
+	db 16,NIDORAN_F
+	db 18,RATTATA
+	db 18,NIDORAN_M
+	db 18,NIDORAN_F
+	db 17,SPEAROW
+	db 18,NIDORINO
+	db 18,NIDORINA
+	db 20,RATICATE
+	db 19,FEAROW
 	db $00

--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wildPokemon/safarizone1.asm
@@ -1,48 +1,14 @@
 ZoneMons1:
 	db $1E
-	IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-		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
-		IF DEF(_RED)
-			db 25,KANGASKHAN
-		ENDC
-		IF DEF(_JAPAN) && DEF(_BLUE)
-			db 25,LICKITUNG
-		ENDC
-		db 28,SCYTHER
-	ENDC
-
-	IF DEF(_GREEN) || (!DEF(_JAPAN) && 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
-
-	IF DEF(_YELLOW)
-		db 21,NIDORAN_M
-		db 29,NIDORAN_F
-		db 22,EXEGGCUTE
-		db 21,TAUROS
-		db 32,NIDORINA
-		db 19,CUBONE
-		db 26,EXEGGCUTE
-		db 24,MAROWAK
-		db 21,CHANSEY
-		db 15,SCYTHER
-	ENDC
-
+	db 21,NIDORAN_M
+	db 29,NIDORAN_F
+	db 22,EXEGGCUTE
+	db 21,TAUROS
+	db 32,NIDORINA
+	db 19,CUBONE
+	db 26,EXEGGCUTE
+	db 24,MAROWAK
+	db 21,CHANSEY
+	db 15,SCYTHER
 	db $00

--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wildPokemon/safarizone2.asm
@@ -1,48 +1,14 @@
 ZoneMons2:
 	db $1E
-	IF DEF(_YELLOW)
-		db 36,NIDORAN_M
-		db 14,NIDORAN_F
-		db 20,EXEGGCUTE
-		db 25,RHYHORN
-		db 23,NIDORINA
-		db 28,KANGASKHAN
-		db 16,CUBONE
-		db 33,KANGASKHAN
-		db 25,SCYTHER
-		db 15,PINSIR
-	ELSE
-		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-			db 22,NIDORAN_M
-		ENDC
-		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
-			db 22,NIDORAN_F
-		ENDC
-		db 26,RHYHORN
-		db 23,PARAS
-		db 25,EXEGGCUTE
-		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-			db 30,NIDORINO
-		ENDC
-		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
-			db 30,NIDORINA
-		ENDC
-		db 27,EXEGGCUTE
-		IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
-			db 30,NIDORINA
-		ENDC
-		IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
-			db 30,NIDORINO
-		ENDC
-		db 32,VENOMOTH
-		db 26,CHANSEY
-		IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
-			db 28,TAUROS
-		ENDC
-		IF (DEF(_JAPAN) && DEF(_BLUE))
-			db 28,PINSIR
-		ENDC
-	ENDC
-
+	db 36,NIDORAN_M
+	db 14,NIDORAN_F
+	db 20,EXEGGCUTE
+	db 25,RHYHORN
+	db 23,NIDORINA
+	db 28,KANGASKHAN
+	db 16,CUBONE
+	db 33,KANGASKHAN
+	db 25,SCYTHER
+	db 15,PINSIR
 	db $00

--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wildPokemon/safarizone3.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || (!DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		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,PINSIR
-		db 28,LICKITUNG
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 29,NIDORAN_M
-		db 21,NIDORAN_F
-		db 22,EXEGGCUTE
-		db 21,TAUROS
-		db 32,NIDORINO
-		db 19,CUBONE
-		db 26,EXEGGCUTE
-		db 24,MAROWAK
-		db 25,PINSIR
-		db 27,TANGELA
-	ENDC
-
+	db 29,NIDORAN_M
+	db 21,NIDORAN_F
+	db 22,EXEGGCUTE
+	db 21,TAUROS
+	db 32,NIDORINO
+	db 19,CUBONE
+	db 26,EXEGGCUTE
+	db 24,MAROWAK
+	db 25,PINSIR
+	db 27,TANGELA
 	db $00

--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wildPokemon/safarizonecenter.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || (!DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		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(_YELLOW)
-		db 14,NIDORAN_M
-		db 36,NIDORAN_F
-		db 24,EXEGGCUTE
-		db 20,RHYHORN
-		db 23,NIDORINO
-		db 27,PARASECT
-		db 27,PARAS
-		db 32,PARASECT
-		db 22,TANGELA
-		db 7,CHANSEY
-	ENDC
-
+	db 14,NIDORAN_M
+	db 36,NIDORAN_F
+	db 24,EXEGGCUTE
+	db 20,RHYHORN
+	db 23,NIDORINO
+	db 27,PARASECT
+	db 27,PARAS
+	db 32,PARASECT
+	db 22,TANGELA
+	db 7,CHANSEY
 	db $00

--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wildPokemon/seafoamisland1.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 30,SEEL
-		db 30,HORSEA
-		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
-
-	IF DEF(_YELLOW)
-		db 18,ZUBAT
-		db 25,KRABBY
-		db 27,KRABBY
-		db 27,ZUBAT
-		db 36,ZUBAT
-		db 28,SLOWPOKE
-		db 30,SLOWPOKE
-		db 9,ZUBAT
-		db 27,GOLBAT
-		db 36,GOLBAT
-	ENDC
-
+	db 18,ZUBAT
+	db 25,KRABBY
+	db 27,KRABBY
+	db 27,ZUBAT
+	db 36,ZUBAT
+	db 28,SLOWPOKE
+	db 30,SLOWPOKE
+	db 9,ZUBAT
+	db 27,GOLBAT
+	db 36,GOLBAT
 	db $00

--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wildPokemon/seafoamislandb1.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 32,STARYU
-		db 32,KRABBY
-		db 28,HORSEA
-		db 30,SEEL
-		db 30,HORSEA
-		db 28,SEEL
-		db 38,DEWGONG
-		db 37,KINGLER
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 27,ZUBAT
-		db 26,KRABBY
-		db 36,ZUBAT
-		db 28,KRABBY
-		db 27,GOLBAT
-		db 29,SLOWPOKE
-		db 18,ZUBAT
-		db 28,KINGLER
-		db 22,SEEL
-		db 26,SEEL
-	ENDC
-
+	db 27,ZUBAT
+	db 26,KRABBY
+	db 36,ZUBAT
+	db 28,KRABBY
+	db 27,GOLBAT
+	db 29,SLOWPOKE
+	db 18,ZUBAT
+	db 28,KINGLER
+	db 22,SEEL
+	db 26,SEEL
 	db $00

--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wildPokemon/seafoamislandb2.asm
@@ -1,56 +1,14 @@
 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(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 30,SEEL
-		db 30,HORSEA
-		db 32,SEEL
-		db 32,HORSEA
-		db 28,KRABBY
-		db 30,SHELLDER
-		db 30,KRABBY
-		db 28,STARYU
-		db 30,GOLBAT
-		db 37,JYNX
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 27,ZUBAT
-		db 27,KRABBY
-		db 36,ZUBAT
-		db 27,GOLBAT
-		db 28,KINGLER
-		db 24,SEEL
-		db 29,KRABBY
-		db 36,GOLBAT
-		db 31,SLOWPOKE
-		db 31,SLOWBRO
-	ENDC
-
+	db 27,ZUBAT
+	db 27,KRABBY
+	db 36,ZUBAT
+	db 27,GOLBAT
+	db 28,KINGLER
+	db 24,SEEL
+	db 29,KRABBY
+	db 36,GOLBAT
+	db 31,SLOWPOKE
+	db 31,SLOWBRO
 	db $00

--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wildPokemon/seafoamislandb3.asm
@@ -1,68 +1,25 @@
 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
+	db 27,GOLBAT
+	db 36,ZUBAT
+	db 29,KRABBY
+	db 27,ZUBAT
+	db 30,KINGLER
+	db 26,SEEL
+	db 31,KRABBY
+	db 30,SEEL
+	db 28,DEWGONG
+	db 32,DEWGONG

-	IF DEF(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 31,HORSEA
-		db 31,SEEL
-		db 33,HORSEA
-		db 33,SEEL
-		db 29,KRABBY
-		db 31,STARYU
-		db 31,KRABBY
-		db 29,STARYU
-		db 39,KINGLER
-		db 37,DEWGONG
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 27,GOLBAT
-		db 36,ZUBAT
-		db 29,KRABBY
-		db 27,ZUBAT
-		db 30,KINGLER
-		db 26,SEEL
-		db 31,KRABBY
-		db 30,SEEL
-		db 28,DEWGONG
-		db 32,DEWGONG
-
-		db $05
-		db 25,TENTACOOL
-		db 30,TENTACOOL
-		db 20,TENTACOOL
-		db 30,STARYU
-		db 35,TENTACOOL
-		db 30,STARYU
-		db 40,TENTACOOL
-		db 30,STARYU
-		db 30,STARYU
-		db 30,STARYU
-	ENDC
-
-	db $00
+	db $05
+	db 25,TENTACOOL
+	db 30,TENTACOOL
+	db 20,TENTACOOL
+	db 30,STARYU
+	db 35,TENTACOOL
+	db 30,STARYU
+	db 40,TENTACOOL
+	db 30,STARYU
+	db 30,STARYU
+	db 30,STARYU

--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wildPokemon/seafoamislandb4.asm
@@ -1,68 +1,25 @@
 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
+	db 36,GOLBAT
+	db 36,ZUBAT
+	db 30,KRABBY
+	db 32,KINGLER
+	db 28,SEEL
+	db 32,SEEL
+	db 27,GOLBAT
+	db 45,ZUBAT
+	db 30,DEWGONG
+	db 34,DEWGONG

-	IF DEF(_GREEN) || !DEF(_JAPAN) && 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
-
-	IF DEF(_JAPAN) && DEF(_BLUE)
-		db 31,KRABBY
-		db 31,STARYU
-		db 33,KRABBY
-		db 33,STARYU
-		db 29,HORSEA
-		db 31,SEEL
-		db 31,HORSEA
-		db 29,SEEL
-		db 39,JYNX
-		db 32,GOLBAT
-	ENDC
-
-	IF DEF(_YELLOW)
-		db 36,GOLBAT
-		db 36,ZUBAT
-		db 30,KRABBY
-		db 32,KINGLER
-		db 28,SEEL
-		db 32,SEEL
-		db 27,GOLBAT
-		db 45,ZUBAT
-		db 30,DEWGONG
-		db 34,DEWGONG
-
-		db $05
-		db 25,TENTACOOL
-		db 30,TENTACOOL
-		db 20,TENTACOOL
-		db 30,STARYU
-		db 35,TENTACOOL
-		db 30,STARYU
-		db 40,TENTACOOL
-		db 30,STARYU
-		db 30,STARYU
-		db 30,STARYU
-	ENDC
-
-	db $00
+	db $05
+	db 25,TENTACOOL
+	db 30,TENTACOOL
+	db 20,TENTACOOL
+	db 30,STARYU
+	db 35,TENTACOOL
+	db 30,STARYU
+	db 40,TENTACOOL
+	db 30,STARYU
+	db 30,STARYU
+	db 30,STARYU

--- a/data/wildPokemon/unknowndungeon1.asm
+++ b/data/wildPokemon/unknowndungeon1.asm
@@ -1,38 +1,14 @@
 DungeonMons1:
 	db $0A
-	IF DEF(_YELLOW)
-		db 50,GOLBAT
-		db 55,GOLBAT
-		db 45,GRAVELER
-		db 55,GLOOM
-		db 55,WEEPINBELL
-		db 52,SANDSLASH
-		db 54,VENOMOTH
-		db 54,PARASECT
-		db 55,DITTO
-		db 60,DITTO
-	ELSE
-		db 46,GOLBAT
-		db 46,HYPNO
-		db 46,MAGNETON
-		IF DEF(_RED) || DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
-			db 49,DODRIO
-		ENDC
-		IF DEF(_JAPAN) && DEF(_BLUE)
-			db 49,RAPIDASH
-		ENDC
-		db 49,VENOMOTH
-		IF DEF(_RED)
-			db 52,ARBOK
-		ENDC
-		IF !DEF(_RED)
-			db 52,SANDSLASH
-		ENDC
-		db 49,KADABRA
-		db 52,PARASECT
-		db 53,RAICHU
-		db 53,DITTO
-	ENDC
-
+	db 50,GOLBAT
+	db 55,GOLBAT
+	db 45,GRAVELER
+	db 55,GLOOM
+	db 55,WEEPINBELL
+	db 52,SANDSLASH
+	db 54,VENOMOTH
+	db 54,PARASECT
+	db 55,DITTO
+	db 60,DITTO
 	db $00

--- a/data/wildPokemon/unknowndungeon2.asm
+++ b/data/wildPokemon/unknowndungeon2.asm
@@ -1,33 +1,14 @@
 DungeonMons2:
 	db $0F
-	IF DEF(_YELLOW)
-		db 52,GOLBAT
-		db 57,GOLBAT
-		db 50,GRAVELER
-		db 56,SANDSLASH
-		db 50,RHYHORN
-		db 60,DITTO
-		db 58,GLOOM
-		db 58,WEEPINBELL
-		db 60,RHYDON
-		db 58,RHYDON
-	ELSE
-		db 51,DODRIO
-		db 51,VENOMOTH
-		db 51,KADABRA
-		db 52,RHYDON
-		IF DEF(_RED) || DEF(_GREEN) || (DEF(_BLUE) && !DEF(_JAPAN))
-			db 52,MAROWAK
-		ENDC
-		IF (DEF(_BLUE) && DEF(_JAPAN))
-			db 52,MAROWAK
-		ENDC
-		db 52,ELECTRODE
-		db 56,CHANSEY
-		db 54,WIGGLYTUFF
-		db 55,DITTO
-		db 60,DITTO
-	ENDC
-
+	db 52,GOLBAT
+	db 57,GOLBAT
+	db 50,GRAVELER
+	db 56,SANDSLASH
+	db 50,RHYHORN
+	db 60,DITTO
+	db 58,GLOOM
+	db 58,WEEPINBELL
+	db 60,RHYDON
+	db 58,RHYDON
 	db $00

--- a/data/wildPokemon/unknowndungeonb1.asm
+++ b/data/wildPokemon/unknowndungeonb1.asm
@@ -1,33 +1,14 @@
 DungeonMonsB1:
 	db $19
-	IF DEF(_YELLOW)
-		db 54,GOLBAT
-		db 59,GOLBAT
-		db 55,GRAVELER
-		db 52,RHYHORN
-		db 62,RHYDON
-		db 60,DITTO
-		db 56,CHANSEY
-		db 65,DITTO
-		db 55,LICKITUNG
-		db 50,LICKITUNG
-	ELSE
-		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) || DEF(_GREEN)
-			db 57,SANDSLASH
-		ENDC
-		db 65,DITTO
-		db 63,DITTO
-		db 67,DITTO
-	ENDC
-
+	db 54,GOLBAT
+	db 59,GOLBAT
+	db 55,GRAVELER
+	db 52,RHYHORN
+	db 62,RHYDON
+	db 60,DITTO
+	db 56,CHANSEY
+	db 65,DITTO
+	db 55,LICKITUNG
+	db 50,LICKITUNG
 	db $00

--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wildPokemon/victoryroad1.asm
@@ -1,29 +1,14 @@
 PlateauMons1:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 26,GEODUDE
-		db 31,GEODUDE
-		db 36,GEODUDE
-		db 39,ZUBAT
-		db 44,ZUBAT
-		db 41,GEODUDE
-		db 43,ONIX
-		db 45,ONIX
-		db 41,GRAVELER
-		db 47,GRAVELER
-	ELSE
-		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
-	ENDC
-
+	db 26,GEODUDE
+	db 31,GEODUDE
+	db 36,GEODUDE
+	db 39,ZUBAT
+	db 44,ZUBAT
+	db 41,GEODUDE
+	db 43,ONIX
+	db 45,ONIX
+	db 41,GRAVELER
+	db 47,GRAVELER
 	db $00

--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wildPokemon/victoryroad2.asm
@@ -1,29 +1,14 @@
 PlateauMons2:
 	db $0A
-
-	IF DEF(_YELLOW)
-		db 31,GEODUDE
-		db 36,GEODUDE
-		db 41,GEODUDE
-		db 44,ZUBAT
-		db 39,GOLBAT
-		db 44,GRAVELER
-		db 45,ONIX
-		db 47,ONIX
-		db 39,MACHOKE
-		db 42,MACHOKE
-	ELSE
-		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
-	ENDC
-
+	db 31,GEODUDE
+	db 36,GEODUDE
+	db 41,GEODUDE
+	db 44,ZUBAT
+	db 39,GOLBAT
+	db 44,GRAVELER
+	db 45,ONIX
+	db 47,ONIX
+	db 39,MACHOKE
+	db 42,MACHOKE
 	db $00

--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wildPokemon/victoryroad3.asm
@@ -1,29 +1,14 @@
 PlateauMons3:
 	db $0F
-
-	IF DEF(_YELLOW)
-		db 36,GEODUDE
-		db 44,GOLBAT
-		db 41,GEODUDE
-		db 49,ONIX
-		db 46,GEODUDE
-		db 41,GRAVELER
-		db 42,MACHOKE
-		db 45,MACHOKE
-		db 47,GRAVELER
-		db 47,GRAVELER
-	ELSE
-		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
-	ENDC
-
+	db 36,GEODUDE
+	db 44,GOLBAT
+	db 41,GEODUDE
+	db 49,ONIX
+	db 46,GEODUDE
+	db 41,GRAVELER
+	db 42,MACHOKE
+	db 45,MACHOKE
+	db 47,GRAVELER
+	db 47,GRAVELER
 	db $00

--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wildPokemon/viridianforest.asm
@@ -1,43 +1,14 @@
 ForestMons:
-	IF DEF(_YELLOW)
-		db $19
-		db 3,CATERPIE
-		db 4,METAPOD
-		db 4,CATERPIE
-		db 5,CATERPIE
-		db 4,PIDGEY
-		db 6,PIDGEY
-		db 6,CATERPIE
-		db 6,METAPOD
-		db 8,PIDGEY
-		db 9,PIDGEOTTO
-	ELSE
-		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) || DEF(_GREEN)
-			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
-	ENDC
-
-
+	db $19
+	db 3,CATERPIE
+	db 4,METAPOD
+	db 4,CATERPIE
+	db 5,CATERPIE
+	db 4,PIDGEY
+	db 6,PIDGEY
+	db 6,CATERPIE
+	db 6,METAPOD
+	db 8,PIDGEY
+	db 9,PIDGEOTTO
 	db $00

--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -247,9 +247,7 @@ WildDataPointers: ; ceeb (3:4eeb)
 	dw NoMons
 	dw NoMons
 	dw NoMons
-	IF DEF(_OPTION_BEACH_HOUSE)
-		dw NoMons
-	ENDC
+	dw NoMons
 	dw $FFFF

 ; wild pokemon data is divided into two parts.
--- a/engine/bank3f/data/map_songs.asm
+++ b/engine/bank3f/data/map_songs.asm
@@ -247,6 +247,4 @@ MapSongBanks: ; fc000 (3f:4000)
 	db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
 	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
 	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
-IF DEF(_OPTION_BEACH_HOUSE)
 	db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
-ENDC
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -367,15 +367,7 @@ AnimationTileset2: ; 786ee (1e:46ee)
 	INCBIN "gfx/attack_anim_2.2bpp"

 SlotMachineTiles2: ; 78bde (1e:4bde)
-IF DEF(_RED)
-	INCBIN "gfx/red/slotmachine2.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/slotmachine2.2bpp"
-ENDC
-IF DEF(_YELLOW)
-	INCBIN "gfx/yellow/slotmachine2.2bpp"
-ENDC
+	INCBIN "gfx/slotmachine2.2bpp"

 MoveAnimation: ; 78d5e (1e:4d5e)
 	push hl
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2972,11 +2972,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6)
 	jp Delay3

 DisabledText: ; 3d555 (f:5555)
-IF DEF(_YELLOW)
 	db "Disabled!@"
-ELSE
-	db "disabled!@"
-ENDC

 TypeText: ; 3d55f (f:555f)
 	db "TYPE@"
--- a/Show More
+++ b/Show More