9 files changed, 5 insertions, 104 deletions
diff --git a/engine/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm
index 4a84aebb..b7f50c93 100644
--- 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
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index dc08e0e1..8791d538 100755
--- 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
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 8775604e..1b8203b1 100755
--- 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@"
diff --git a/engine/intro.asm b/engine/intro.asm
index 7c0464d3..5b03f23a 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -428,16 +428,7 @@ FightIntroBackMon: ; 41a99 (10:5a99)
 	INCBIN "gfx/intro_fight.2bpp"
 
 FightIntroFrontMon: ; 42099 (10:6099)
-
-IF DEF(_RED)
-	INCBIN "gfx/red/intro_nido_1.6x6.2bpp"
-	INCBIN "gfx/red/intro_nido_2.6x6.2bpp"
-	INCBIN "gfx/red/intro_nido_3.6x6.2bpp"
-	ds $10 ; blank tile
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/intro_purin_1.6x6.2bpp"
-	INCBIN "gfx/blue/intro_purin_2.6x6.2bpp"
-	INCBIN "gfx/blue/intro_purin_3.6x6.2bpp"
+	INCBIN "gfx/intro_nido_1.6x6.2bpp"
+	INCBIN "gfx/intro_nido_2.6x6.2bpp"
+	INCBIN "gfx/intro_nido_3.6x6.2bpp"
 	ds $10 ; blank tile
-ENDC
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 61e6204e..70b5bc33 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -345,9 +345,7 @@ BillsPCMenuText: ; 216e1 (8:56e1)
 	next "DEPOSIT ",  $4a
 	next "RELEASE ",  $4a
 	next "CHANGE BOX"
-IF DEF(_YELLOW)
 	next "PRINT BOX"
-ENDC
 	next "SEE YA!"
 	db "@"
 
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 4351ae4c..bd4c40bd 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -366,9 +366,7 @@ PokedexMenuItemsText: ; 402af (10:42af)
 	db   "DATA"
 	next "CRY"
 	next "AREA"
-IF DEF(_YELLOW)
 	next "PRNT"
-ENDC
 	next "QUIT@"
 
 ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 34d98fd7..16a97377 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -181,39 +181,6 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
 .namestring ; 6aa3 (1:6aa3)
 	db "NAME@"
 
-IF DEF(_RED)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NEW NAME"
-	next "RED"
-	next "ASH"
-	next "JACK"
-	db   "@"
-
-DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
-ENDC
-
-IF DEF(_BLUE)
-DefaultNamesPlayer: ; 6aa8 (1:6aa8)
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
-
-DefaultNamesRival: ; 6abe (1:6abe)
-	db   "NEW NAME"
-	next "RED"
-	next "ASH"
-	next "JACK"
-	db   "@"
-ENDC
-
-IF DEF(_YELLOW)
 DefaultNamesPlayer:
 	db   "NEW NAME"
 	next "YELLOW"
@@ -227,7 +194,6 @@ DefaultNamesRival:
 	next "GARY"
 	next "JOHN"
 	db   "@"
-ENDC
 
 Func_6ad6: ; 6ad6 (1:6ad6)
 	ld b, a
@@ -250,24 +216,10 @@ Func_6ad6: ; 6ad6 (1:6ad6)
 	ld de, wcd6d
 	ld bc, $14
 	jp CopyData
-IF DEF(_RED)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NEW NAME@RED@ASH@JACK@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@BLUE@GARY@JOHN@"
-ENDC
-IF DEF(_BLUE)
-DefaultNamesPlayerList: ; 6af2 (1:6af2)
-	db "NEW NAME@BLUE@GARY@JOHN@"
-DefaultNamesRivalList: ; 6b08 (1:6b08)
-	db "NEW NAME@RED@ASH@JACK@"
-ENDC
-IF DEF(_YELLOW)
 DefaultNamesPlayerList:
 	db "NEW NAME@YELLOW@ASH@JACK@"
 DefaultNamesRivalList:
 	db "NEW NAME@BLUE@GARY@JOHN@"
-ENDC
 
 TextTerminator_6b20: ; 6b20 (1:6b20)
 	db "@"
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index e3e452f3..fc1a3e11 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -862,12 +862,4 @@ SLOTSMOUSE	EQU $1614
 INCLUDE "data/slot_machine_wheels.asm"
 
 SlotMachineTiles1: ; 37a51 (d:7a51)
-IF DEF(_RED)
-	INCBIN "gfx/red/slotmachine1.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/blue/slotmachine1.2bpp"
-ENDC
-IF DEF(_YELLOW)
-	INCBIN "gfx/yellow/slotmachine1.2bpp"
-ENDC
+	INCBIN "gfx/slotmachine1.2bpp"
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index ed23fbc4..8f2fcfe7 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -56,14 +56,8 @@ LoadTitlescreenGraphics: ; 42dd (1:42dd)
 	ld a, BANK(PokemonLogoGraphics)
 	call FarCopyData2          ; second chunk
 	ld hl, Version_GFX ; $402f
-IF DEF(_RED)
 	ld de,vChars2 + $600
 	ld bc,$50
-ENDC
-IF DEF(_BLUE)
-	ld de,vChars2 + $600 + $10
-	ld bc,$50 - $10
-ENDC
 
 	ld a, BANK(Version_GFX)
 	call FarCopyDataDouble
@@ -114,12 +108,7 @@ ENDC
 	call SaveScreenTilesToBuffer2
 	call LoadScreenTilesFromBuffer2
 	call EnableLCD
-IF DEF(_RED)
 	ld a,CHARMANDER ; which Pokemon to show first on the title screen
-ENDC
-IF DEF(_BLUE)
-	ld a,SQUIRTLE ; which Pokemon to show first on the title screen
-ENDC
 
 	ld [wWhichTrade], a ; wWhichTrade
 	call Func_4524
@@ -382,9 +371,4 @@ PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
 
 ; these point to special tiles specifically loaded for that purpose and are not usual text
 VersionOnTitleScreenText: ; 45a1 (1:45a1)
-IF DEF(_RED)
 	db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version"
-ENDC
-IF DEF(_BLUE)
-	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version"
-ENDC