Removing version differences, and adding Mew

Makefile

@@ -1,10 +1,7 @@
 roms := \
-	pokered.gbc \
+	kep.gbc
-	pokeblue.gbc \
-	pokeblue_debug.gbc
 patches := \
-	pokered.patch \
+	kep.patch
-	pokeblue.patch
 
 rom_obj := \
 	audio.o \
@@ -17,12 +14,7 @@ rom_obj := \
 	gfx/sprites.o \
 	gfx/tilesets.o
 
-pokered_obj        := $(rom_obj:.o=_red.o)
+kep_obj        := $(rom_obj:.o=_kep.o)
-pokeblue_obj       := $(rom_obj:.o=_blue.o)
-pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
-pokered_vc_obj     := $(rom_obj:.o=_red_vc.o)
-pokeblue_vc_obj    := $(rom_obj:.o=_blue_vc.o)
-
 
 ### Build tools
 
@@ -48,11 +40,7 @@ RGBLINK ?= $(RGBDS)rgblink
 .PHONY: all red blue blue_debug clean tidy compare tools
 
 all: $(roms)
-red:        pokered.gbc
+kep:        kep.gbc
-blue:       pokeblue.gbc
-blue_debug: pokeblue_debug.gbc
-red_vc:     pokered.patch
-blue_vc:    pokeblue.patch
 
 clean: tidy
 	find gfx \
@@ -70,11 +58,7 @@ tidy:
 	      $(patches:.patch=_vc.sym) \
 	      $(patches:.patch=_vc.map) \
 	      $(patches:%.patch=vc/%.constants.sym) \
-	      $(pokered_obj) \
+	      $(kep_obj) \
-	      $(pokeblue_obj) \
-	      $(pokered_vc_obj) \
-	      $(pokeblue_vc_obj) \
-	      $(pokeblue_debug_obj) \
 	      rgbdscheck.o
 	$(MAKE) clean -C tools/
 
@@ -91,11 +75,7 @@ ifeq ($(DEBUG),1)
 RGBASMFLAGS += -E
 endif
 
-$(pokered_obj):        RGBASMFLAGS += -D _RED
+$(kep_obj):        RGBASMFLAGS += -D _KEP -D _DEBUG
-$(pokeblue_obj):       RGBASMFLAGS += -D _BLUE
-$(pokeblue_debug_obj): RGBASMFLAGS += -D _BLUE -D _DEBUG
-$(pokered_vc_obj):     RGBASMFLAGS += -D _RED -D _RED_VC
-$(pokeblue_vc_obj):    RGBASMFLAGS += -D _BLUE -D _BLUE_VC
 
 %.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
 	tools/make_patch $*_vc.sym $^ $@
@@ -118,11 +98,7 @@ ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS)))
 $(info $(shell $(MAKE) -C tools))
 
 # Dependencies for objects (drop _red and _blue from asm file basenames)
-$(foreach obj, $(pokered_obj), $(eval $(call DEP,$(obj),$(obj:_red.o=.asm))))
+$(foreach obj, $(kep_obj), $(eval $(call DEP,$(obj),$(obj:_kep.o=.asm))))
-$(foreach obj, $(pokeblue_obj), $(eval $(call DEP,$(obj),$(obj:_blue.o=.asm))))
-$(foreach obj, $(pokeblue_debug_obj), $(eval $(call DEP,$(obj),$(obj:_blue_debug.o=.asm))))
-$(foreach obj, $(pokered_vc_obj), $(eval $(call DEP,$(obj),$(obj:_red_vc.o=.asm))))
-$(foreach obj, $(pokeblue_vc_obj), $(eval $(call DEP,$(obj),$(obj:_blue_vc.o=.asm))))
 
 # Dependencies for VC files that need to run scan_includes
 %.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) | rgbdscheck.o
@@ -134,17 +110,9 @@ endif
 %.asm: ;
 
 
-pokered_pad        = 0x00
+kep_pad        = 0x00
-pokeblue_pad       = 0x00
-pokered_vc_pad     = 0x00
-pokeblue_vc_pad    = 0x00
-pokeblue_debug_pad = 0xff
 
-pokered_opt        = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
+kep_opt        = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "KEP Hack"
-pokeblue_opt       = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
-pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
-pokered_vc_opt     = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
-pokeblue_vc_opt    = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
 
 %.gbc: $$(%_obj) layout.link
 	$(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^)
@@ -156,9 +124,6 @@ pokeblue_vc_opt    = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
 gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
 gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
 
-gfx/intro/blue_jigglypuff_1.2bpp: rgbgfx += -h
-gfx/intro/blue_jigglypuff_2.2bpp: rgbgfx += -h
-gfx/intro/blue_jigglypuff_3.2bpp: rgbgfx += -h
 gfx/intro/red_nidorino_1.2bpp: rgbgfx += -h
 gfx/intro/red_nidorino_2.2bpp: rgbgfx += -h
 gfx/intro/red_nidorino_3.2bpp: rgbgfx += -h
@@ -167,8 +132,7 @@ gfx/intro/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76
 
 gfx/credits/the_end.2bpp: tools/gfx += --interleave --png=$<
 
-gfx/slots/red_slots_1.2bpp: tools/gfx += --trim-whitespace
+gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace
-gfx/slots/blue_slots_1.2bpp: tools/gfx += --trim-whitespace
 
 gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
 gfx/tilesets/reds_house.2bpp: tools/gfx += --preserve=0x48

audio/sfx/save_3.asm

@@ -1,35 +1,18 @@
 SFX_Save_3_Ch5:
 	duty_cycle 2
-IF DEF(_RED)
-	square_note 4, 15, 4, 1792
-	square_note 3, 14, 4, 1664
-	square_note 3, 14, 4, 1728
-	square_note 3, 14, 4, 1792
-	square_note 2, 14, 4, 1952
-ELSE
 	square_note 3, 14, 4, 1536
 	square_note 3, 14, 4, 1664
 	square_note 3, 14, 4, 1728
 	square_note 3, 14, 4, 1792
 	square_note 15, 15, 2, 2016
-ENDC
 	sound_ret
 
 SFX_Save_3_Ch6:
 	duty_cycle 2
-IF DEF(_RED)
-	square_note 4, 0, 8, 0
-	square_note 3, 13, 4, 1793
-	square_note 3, 12, 4, 1665
-	square_note 3, 12, 4, 1729
-	square_note 3, 12, 4, 1793
-	square_note 2, 12, 4, 1953
-ELSE
 	square_note 3, 0, 8, 0
 	square_note 3, 12, 4, 1537
 	square_note 3, 12, 4, 1665
 	square_note 3, 12, 4, 1729
 	square_note 3, 12, 4, 1793
 	square_note 15, 13, 2, 2017
-ENDC
 	sound_ret

constants/event_constants.asm

@@ -551,7 +551,10 @@
 
 ; S.S. Anne events
 	const_next $5C0
-	const_skip 4
+	const_skip
+	const EVENT_ENCOUNTERED_MEW
+	const EVENT_FOUND_MEW
+	const_skip
 	const EVENT_BEAT_SS_ANNE_5_TRAINER_0
 	const EVENT_BEAT_SS_ANNE_5_TRAINER_1
 	const_skip 26

constants/hide_show_constants.asm

@@ -238,4 +238,5 @@ DEF SHOW EQU $15
 	const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2
 	const HS_ARTICUNO                      ; E3 X
 	const HS_CROCKY	               ; E4 X
+	const HS_MEW	                              ; E5 X
 DEF NUM_HS_OBJECTS EQU const_value

data/credits/credits_text.asm

@@ -68,12 +68,7 @@ CreditsTextPointers:
 	assert_table_length NUM_CRED_STRINGS
 
 CredVersion:
-IF DEF(_RED)
+	db -8, "RBY VERSION STAFF@"
-	db -8, "RED VERSION STAFF@"
-ENDC
-IF DEF(_BLUE)
-	db -8, "BLUE VERSION STAFF@"
-ENDC
 CredTajiri:
 	db -6, "SATOSHI TAJIRI@"
 CredTaOota:

data/events/prize_mon_levels.asm

@@ -1,19 +1,9 @@
 PrizeMonLevelDictionary:
-IF DEF(_RED)
+
 	db CUBONE,     12
 	db BLASTYKE,   12
-	db CLEFAIRY,   18
+	db CACTUS,      20
 
-	db CACTUS,     25
+	db SCYTHER,      25
-	db SCYTHER,    25
+	db PINSIR,          25
-	db PORYGON,    30
+	db PORYGON,    30
-ENDC
-IF DEF(_BLUE)
-	db CUBONE,     12
-	db BLASTYKE,   12
-	db JIGGLYPUFF, 18
-
-	db CACTUS,     25
-	db PINSIR,     25
-	db PORYGON,    30
-ENDC

data/events/prizes.asm

@@ -9,34 +9,24 @@ NoThanksText:
 PrizeMenuMon1Entries:
 	db CUBONE
 	db BLASTYKE
-IF DEF(_RED)
+	db CACTUS
-	db CLEFAIRY
-ENDC
-IF DEF(_BLUE)
-	db JIGGLYPUFF
-ENDC
 	db "@"
 
 PrizeMenuMon1Cost:
 	bcd2 200
 	bcd2 700
-	bcd2 1200
+	bcd2 1700
 	db "@"
 
 PrizeMenuMon2Entries:
-IF DEF(_RED)
 	db SCYTHER
-ENDC
-IF DEF(_BLUE)
 	db PINSIR
-ENDC
-	db CACTUS
 	db PORYGON
 	db "@"
 
 PrizeMenuMon2Cost:
-	bcd2 2500
+	bcd2 3500
-	bcd2 4600
+	bcd2 3500
 	bcd2 6500
 	db "@"
 

data/maps/hide_show_data.asm

@@ -97,7 +97,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS
-	dw NoHS
+	dw VermilionDockHS
 	dw NoHS
 	dw SSAnne2FHS
 	dw NoHS
@@ -566,5 +566,7 @@ SeafoamIslandsB4FHS:
 	db SEAFOAM_ISLANDS_B4F, $01, HIDE
 	db SEAFOAM_ISLANDS_B4F, $02, HIDE
 	db SEAFOAM_ISLANDS_B4F, $03, SHOW
+VermilionDockHS:
+	db VERMILION_DOCK, $01, HIDE
 	db $FF, $01, SHOW ; end
 	assert_table_length NUM_HS_OBJECTS + 1

data/maps/objects/VermilionDock.asm

@@ -8,6 +8,6 @@ VermilionDock_Object:
 	def_bg_events
 
 	def_object_events
-	; object_event 0,  0, SPRITE_MONSTER, STAY, DOWN, 1, MEW, 30 | OW_POKEMON
+	object_event 21,  0, SPRITE_MONSTER, STAY, DOWN, 2, MEW, 30 | OW_POKEMON
 
 	def_warps_to VERMILION_DOCK

data/player_names.asm

@@ -1,4 +1,3 @@
-IF DEF(_RED)
 DefaultNamesPlayer:
 	db   "NEW NAME"
 	next "RED"
@@ -12,20 +11,3 @@ DefaultNamesRival:
 	next "GARY"
 	next "JOHN"
 	db   "@"
-ENDC
-
-IF DEF(_BLUE)
-DefaultNamesPlayer:
-	db   "NEW NAME"
-	next "BLUE"
-	next "GARY"
-	next "JOHN"
-	db   "@"
-
-DefaultNamesRival:
-	db   "NEW NAME"
-	next "RED"
-	next "ASH"
-	next "JACK"
-	db   "@"
-ENDC

data/player_names_list.asm

@@ -1,4 +1,3 @@
-IF DEF(_RED)
 DefaultNamesPlayerList:
 	db "NEW NAME@"
 	db "RED@"
@@ -10,18 +9,4 @@ DefaultNamesRivalList:
 	db "BLUE@"
 	db "GARY@"
 	db "JOHN@"
-ENDC
 
-IF DEF(_BLUE)
-DefaultNamesPlayerList:
-	db "NEW NAME@"
-	db "BLUE@"
-	db "GARY@"
-	db "JOHN@"
-
-DefaultNamesRivalList:
-	db "NEW NAME@"
-	db "RED@"
-	db "ASH@"
-	db "JACK@"
-ENDC

data/pokemon/title_mons.asm

@@ -1,24 +1,5 @@
 TitleMons:
 ; mons on the title screen are randomly chosen from here
-IF DEF(_RED)
-	db CHARIZARD
-	db TOTARTLE
-	db VENUSAUR
-	db GOROCHU
-	db CACTUS
-	db DEER
-	db BARUNDA
-	db RIBBITO
-	db GYAOON
-	db PUDI
-	db MAGNETITE
-	db MONJA
-	db SYLVEON
-	db SCIZOR
-	db SKIMPER
-	db BUU
-ENDC
-IF DEF(_BLUE)
 	db TOTARTLE
 	db CHARIZARD
 	db VENUSAUR
@@ -32,7 +13,6 @@ IF DEF(_BLUE)
 	db WEIRDUCK
 	db BLOTTLE
 	db MADAAMU
-	db PURAKKUSU
+	db DEER
-	db KLEAVOR
+	db GYAOON
 	db GUARDIA
-ENDC

data/sgb/sgb_palettes.asm

@@ -14,12 +14,7 @@ SuperPalettes:
 	RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
 	RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
 	RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
-IF DEF(_RED)
+	RGB 31,31,31, 31,31,00, 25,10,31, 19,00,23 ; PAL_LOGO1
-	RGB 31,31,31, 31,31,00, 17,23,10, 23,03,03 ; PAL_LOGO1
-ENDC
-IF DEF(_BLUE)
-	RGB 31,31,31, 31,31,00, 21,00,04, 03,03,23 ; PAL_LOGO1
-ENDC
 	RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
 	RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F
 	RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON
@@ -33,16 +28,9 @@ ENDC
 	RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON
 	RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON
 	RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1
-IF DEF(_RED)
-	RGB 31,31,31, 31,31,00, 20,08,15, 03,03,03 ; PAL_SLOTS2
-	RGB 31,31,31, 03,31,09, 20,08,15, 03,03,03 ; PAL_SLOTS3
-	RGB 31,31,31, 09,05,30, 20,08,15, 03,03,03 ; PAL_SLOTS4
-ENDC
-IF DEF(_BLUE)
 	RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2
 	RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3
 	RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4
-ENDC
 	RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK
 	RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR
 	RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR

data/wild/maps/CeruleanCave1F.asm

@@ -5,12 +5,7 @@ CeruleanCave1FWildMons:
 	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

data/wild/maps/CeruleanCaveB1F.asm

@@ -6,12 +6,7 @@ CeruleanCaveB1FWildMons:
 	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

data/wild/maps/PokemonMansion1F.asm

@@ -1,18 +1,5 @@
 PokemonMansion1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-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
@@ -23,7 +10,6 @@ IF DEF(_BLUE)
 	db 28, PONYTA
 	db 37, MUK
 	db 39, WEEZING
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PokemonMansion2F.asm

@@ -1,6 +1,5 @@
 PokemonMansion2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-IF DEF(_RED)
 	db 32, GROWLITHE
 	db 34, KOFFING
 	db 34, KOFFING
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	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
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PokemonMansion3F.asm

@@ -1,18 +1,5 @@
 PokemonMansion3FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-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
@@ -23,7 +10,6 @@ IF DEF(_BLUE)
 	db 38, MUK
 	db 36, PONYTA
 	db 42, WEEZING
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PokemonMansionB1F.asm

@@ -1,18 +1,5 @@
 PokemonMansionB1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-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
@@ -23,7 +10,6 @@ IF DEF(_BLUE)
 	db 35, KOFFING
 	db 38, MAGMAR
 	db 42, WEEZING
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/PowerPlant.asm

@@ -8,14 +8,8 @@ PowerPlantWildMons:
 	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
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route10.asm

@@ -3,7 +3,6 @@ Route10WildMons:
 	db 16, MAGNEMITE
 	db 16, KOTORA
 	db 14, VOLTORB
-IF DEF(_RED)
 	db 11, EKANS
 	db 13, SPEAROW
 	db 15, EKANS
@@ -11,16 +10,6 @@ IF DEF(_RED)
 	db 20, FEAROW
 	db 13, SANDSHREW
 	db 17, SANDSHREW
-ENDC
-IF DEF(_BLUE)
-	db 11, SANDSHREW
-	db 13, SPEAROW
-	db 15, SANDSHREW
-	db 17, CACTUS
-	db 20, FEAROW
-	db 13, EKANS
-	db 17, EKANS
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route11.asm

@@ -1,6 +1,5 @@
 Route11WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 14, EKANS
 	db 15, SPEAROW
 	db 12, EKANS
@@ -8,16 +7,6 @@ IF DEF(_RED)
 	db 13, MAGNEMITE
 	db 13, DROWZEE
 	db 15, SANDSHREW
-ENDC
-IF DEF(_BLUE)
-	db 14, SANDSHREW
-	db 15, SPEAROW
-	db 12, SANDSHREW
-	db 13, DROWZEE
-	db 13, MAGNEMITE
-	db 13, DROWZEE
-	db 15, EKANS
-ENDC
 	db 17, SPEAROW
 	db 11, DROWZEE
 	db 15, DROWZEE

data/wild/maps/Route12.asm

@@ -1,18 +1,5 @@
 Route12WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
-	db 24, ODDISH
-	db 25, PIDGEOTTO
-	db 23, BLASTYKE
-	db 24, BELLSPROUT
-	db 22, SQUIRTLE
-	db 26, BARUNDA
-	db 26, WEEPINBELL
-	db 27, FARFETCHD
-	db 28, GLOOM
-	db 30, GLOOM
-ENDC
-IF DEF(_BLUE)
 	db 24, BELLSPROUT
 	db 25, PIDGEOTTO
 	db 23, BLASTYKE
@@ -23,7 +10,6 @@ IF DEF(_BLUE)
 	db 27, FARFETCHD
 	db 28, WEEPINBELL
 	db 30, WEEPINBELL
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route13.asm

@@ -1,6 +1,5 @@
 Route13WildMons:
 	def_grass_wildmons 20 ; encounter rate
-IF DEF(_RED)
 	db 24, ODDISH
 	db 25, FARFETCHD
 	db 27, PIDGEOTTO
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	db 25, DITTO
 	db 28, GLOOM
 	db 30, GLOOM
-ENDC
-IF DEF(_BLUE)
-	db 24, BELLSPROUT
-	db 25, FARFETCHD
-	db 27, PIDGEOTTO
-	db 24, VENONAT
-	db 22, BELLSPROUT
-	db 26, KRABBY
-	db 26, ODDISH
-	db 25, DITTO
-	db 28, WEEPINBELL
-	db 30, WEEPINBELL
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route14.asm

@@ -1,6 +1,5 @@
 Route14WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 26, ODDISH
 	db 28, PIDGEOTTO
 	db 25, DITTO
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	db 32, WEEPINBELL
 	db 30, PIDGEOTTO
 	db 32, SCYTHER
-ENDC
-IF DEF(_BLUE)
-	db 26, BELLSPROUT
-	db 28, PIDGEOTTO
-	db 25, DITTO
-	db 26, TANGELA
-	db 24, ODDISH
-	db 28, VENOMOTH
-	db 28, WEEPINBELL
-	db 32, GLOOM
-	db 30, PIDGEOTTO
-	db 32, PINSIR
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route15.asm

@@ -1,6 +1,5 @@
 Route15WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 24, ODDISH
 	db 26, DITTO
 	db 23, PIDGEOTTO
@@ -9,17 +8,6 @@ IF DEF(_RED)
 	db 28, DEER
 	db 26, BELLSPROUT
 	db 30, GLOOM
-ENDC
-IF DEF(_BLUE)
-	db 24, BELLSPROUT
-	db 26, DITTO
-	db 23, PIDGEOTTO
-	db 26, VENONAT
-	db 22, BELLSPROUT
-	db 28, DEER
-	db 26, ODDISH
-	db 30, WEEPINBELL
-ENDC
 	db 28, GAOTORA
 	db 30, GAOTORA
 	end_grass_wildmons

data/wild/maps/Route2.asm

@@ -5,20 +5,11 @@ Route2WildMons:
 	db  4, PIDGEY
 	db  4, RATTATA
 	db  5, MONJA
-IF DEF(_RED)
 	db  4, WEEDLE
 	db  3, RATTATA
 	db  5, RATTATA
-	db  5, WEEDLE
-	db  6, WEEDLE
-ENDC
-IF DEF(_BLUE)
-	db  4, CATERPIE
-	db  3, RATTATA
-	db  5, RATTATA
 	db  5, CATERPIE
 	db  6, CATERPIE
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route22.asm

@@ -1,7 +1,6 @@
 Route22WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db  5, RATTATA
-IF DEF(_RED)
 	db  3, NIDORAN_M
 	db  4, PUDI
 	db  4, NIDORAN_M
@@ -11,18 +10,6 @@ IF DEF(_RED)
 	db  5, MIKON
 	db  3, NIDORAN_F
 	db  4, NIDORAN_F
-ENDC
-IF DEF(_BLUE)
-	db  3, NIDORAN_F
-	db  4, MIKON
-	db  4, NIDORAN_F
-	db  2, RATTATA
-	db  2, NIDORAN_F
-	db  3, SPEAROW
-	db  5, PUDI
-	db  3, NIDORAN_M
-	db  4, NIDORAN_M
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route23.asm

@@ -1,22 +1,12 @@
 Route23WildMons:
 	def_grass_wildmons 10 ; encounter rate
-IF DEF(_RED)
 	db 41, ARBOK
-ENDC
-IF DEF(_BLUE)
-	db 41, SANDSLASH
-ENDC
 	db 40, TANGELA
 	db 38, FEAROW
 	db 38, RHYHORN
 	db 38, EXEGGCUTE
 	db 40, PRIMEAPE
-IF DEF(_RED)
-	db 41, SCYTHER
-ENDC
-IF DEF(_BLUE)
 	db 41, PINSIR
-ENDC
 	db 43, EXEGGCUTE
 	db 41, WEIRDUCK
 	db 38, TAUROS

data/wild/maps/Route24.asm

@@ -1,6 +1,5 @@
 Route24WildMons:
 	def_grass_wildmons 25 ; encounter rate
-IF DEF(_RED)
 	db 13, BEEDRILL
 	db 12, ODDISH
 	db 12, PIDGEY
@@ -8,16 +7,6 @@ IF DEF(_RED)
 	db 13, ODDISH
 	db 10, ABRA
 	db 14, BELLSPROUT
-ENDC
-IF DEF(_BLUE)
-	db 13, BUTTERFREE
-	db 12, BELLSPROUT
-	db 12, PIDGEY
-	db 12, BELLSPROUT
-	db 13, BELLSPROUT
-	db 10, ABRA
-	db 14, ODDISH
-ENDC
 	db 13, PIDGEY
 	db 12, ABRA
 	db 16, PIDGEOTTO

data/wild/maps/Route25.asm

@@ -1,6 +1,5 @@
 Route25WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 14, BEEDRILL
 	db 13, ODDISH
 	db 13, PIDGEY
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	db 10, ABRA
 	db 10, SKIMPER
 	db 15, BUTTERFREE
-ENDC
-IF DEF(_BLUE)
-	db 14, BUTTERFREE
-	db 13, BELLSPROUT
-	db 13, PIDGEY
-	db 12, BELLSPROUT
-	db 13, PARAS
-	db 12, ABRA
-	db 14, ODDISH
-	db 10, ABRA
-	db 10, SKIMPER
-	db 15, BEEDRILL
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route4.asm

@@ -3,24 +3,14 @@ Route4WildMons:
 	db 10, RATTATA
 	db 10, PIDGEY
 	db  8, KONYA
-IF DEF(_RED)
 	db  6, EKANS
 	db  8, SPEAROW
 	db 10, EKANS
 	db 12, RATTATA
 	db 12, PUDI
-	db  8, SANDSHREW
-	db 12, SANDSHREW
-ENDC
-IF DEF(_BLUE)
-	db  6, SANDSHREW
-	db  8, SPEAROW
-	db 10, SANDSHREW
-	db 12, RATTATA
 	db 12, MIKON
 	db  8, EKANS
-	db 12, EKANS
+
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route5.asm

@@ -1,6 +1,5 @@
 Route5WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 13, ODDISH
 	db 13, KOTORA
 	db 15, MONJA
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	db 16, PIDGEOTTO
 	db 14, MEOWTH
 	db 16, MEOWTH
-ENDC
-IF DEF(_BLUE)
-	db 13, BELLSPROUT
-	db 13, KOTORA
-	db 15, MONJA
-	db 10, MEOWTH
-	db 12, MEOWTH
-	db 15, ODDISH
-	db 16, ODDISH
-	db 16, PIDGEOTTO
-	db 14, MANKEY
-	db 16, MANKEY
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route6.asm

@@ -1,6 +1,5 @@
 Route6WildMons:
 	def_grass_wildmons 15 ; encounter rate
-IF DEF(_RED)
 	db 13, ODDISH
 	db 13, PSYDUCK
 	db 15, PIDGEOTTO
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	db 16, PSYDUCK
 	db 14, MEOWTH
 	db 16, MEOWTH
-ENDC
-IF DEF(_BLUE)
-	db 13, BELLSPROUT
-	db 13, PSYDUCK
-	db 15, PIDGEOTTO
-	db 10, MEOWTH
-	db 12, MEOWTH
-	db 15, ODDISH
-	db 16, ODDISH
-	db 16, PSYDUCK
-	db 14, MANKEY
-	db 16, MANKEY
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route7.asm

@@ -1,7 +1,6 @@
 Route7WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 22, PIDGEOTTO
-IF DEF(_RED)
 	db 19, ODDISH
 	db 17, MANKEY
 	db 22, BELLSPROUT
@@ -11,18 +10,6 @@ IF DEF(_RED)
 	db 20, GROWLITHE
 	db 19, VULPIX
 	db 20, VULPIX
-ENDC
-IF DEF(_BLUE)
-	db 19, BELLSPROUT
-	db 17, MEOWTH
-	db 22, ODDISH
-	db 19, EEVEE
-	db 18, MANKEY
-	db 18, VULPIX
-	db 20, VULPIX
-	db 19, GROWLITHE
-	db 20, GROWLITHE
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route8.asm

@@ -1,7 +1,6 @@
 Route8WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 20, PIDGEOTTO
-IF DEF(_RED)
 	db 18, MANKEY
 	db 17, EKANS
 	db 16, GROWLITHE
@@ -11,18 +10,6 @@ IF DEF(_RED)
 	db 17, VULPIX
 	db 18, VULPIX
 	db 15, KADABRA
-ENDC
-IF DEF(_BLUE)
-	db 18, MEOWTH
-	db 17, SANDSHREW
-	db 16, VULPIX
-	db 18, BULBASAUR
-	db 20, EKANS
-	db 19, MANKEY
-	db 17, GROWLITHE
-	db 18, GROWLITHE
-	db 15, KADABRA
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/Route9.asm

@@ -3,7 +3,6 @@ Route9WildMons:
 	db 16, RATTATA
 	db 16, SPEAROW
 	db 14, RATTATA
-IF DEF(_RED)
 	db 11, EKANS
 	db 13, CUBONE
 	db 15, CACTUS
@@ -11,16 +10,6 @@ IF DEF(_RED)
 	db 20, FEAROW
 	db 13, SANDSHREW
 	db 17, SANDSHREW
-ENDC
-IF DEF(_BLUE)
-	db 11, SANDSHREW
-	db 13, CUBONE
-	db 15, CACTUS
-	db 17, RATICATE
-	db 20, FEAROW
-	db 13, EKANS
-	db 17, EKANS
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SafariZoneCenter.asm

@@ -1,6 +1,5 @@
 SafariZoneCenterWildMons:
 	def_grass_wildmons 30 ; encounter rate
-IF DEF(_RED)
 	db 22, NIDORAN_M
 	db 25, RHYHORN
 	db 22, VENONAT
@@ -9,19 +8,7 @@ IF DEF(_RED)
 	db 25, EXEGGCUTE
 	db 31, NIDORINA
 	db 30, PARASECT
-	db 23, SCYTHER
+	db 23, TRAMPEL
-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
-ENDC
 	db 23, CHANSEY
 	end_grass_wildmons
 

data/wild/maps/SafariZoneEast.asm

@@ -1,6 +1,5 @@
 SafariZoneEastWildMons:
 	def_grass_wildmons 30 ; encounter rate
-IF DEF(_RED)
 	db 24, NIDORAN_M
 	db 26, DODUO
 	db 22, PARAS
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	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
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SafariZoneNorth.asm

@@ -1,15 +1,5 @@
 SafariZoneNorthWildMons:
 	def_grass_wildmons 30 ; encounter rate
-IF DEF(_RED)
-	db 22, NIDORAN_M
-	db 26, RHYHORN
-	db 23, PARAS
-	db 25, EXEGGCUTE
-	db 30, NIDORINO
-	db 27, EXEGGCUTE
-	db 30, NIDORINA
-ENDC
-IF DEF(_BLUE)
 	db 22, NIDORAN_F
 	db 26, RHYHORN
 	db 23, PARAS
@@ -17,7 +7,6 @@ IF DEF(_BLUE)
 	db 30, NIDORINA
 	db 27, EXEGGCUTE
 	db 30, NIDORINO
-ENDC
 	db 32, VENOMOTH
 	db 26, CHANSEY
 	db 28, TAUROS

data/wild/maps/SafariZoneWest.asm

@@ -1,15 +1,5 @@
 SafariZoneWestWildMons:
 	def_grass_wildmons 30 ; encounter rate
-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
-ENDC
-IF DEF(_BLUE)
 	db 25, NIDORAN_F
 	db 26, DODUO
 	db 23, VENONAT
@@ -17,7 +7,6 @@ IF DEF(_BLUE)
 	db 33, NIDORINA
 	db 26, EXEGGCUTE
 	db 25, NIDORAN_M
-ENDC
 	db 31, VENOMOTH
 	db 26, TAUROS
 	db 28, KANGASKHAN

data/wild/maps/SeafoamIslands1F.asm

@@ -1,18 +1,6 @@
 SeafoamIslands1FWildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 30, SEEL
-IF DEF(_RED)
-	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, PSYDUCK
 	db 30, STARYU
 	db 30, KRABBY
@@ -22,7 +10,6 @@ IF DEF(_BLUE)
 	db 28, SLOWPOKE
 	db 28, STARYU
 	db 38, SLOWBRO
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SeafoamIslandsB1F.asm

@@ -1,6 +1,5 @@
 SeafoamIslandsB1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-IF DEF(_RED)
 	db 30, STARYU
 	db 30, HORSEA
 	db 32, SHELLDER
@@ -11,19 +10,6 @@ IF DEF(_RED)
 	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
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SeafoamIslandsB2F.asm

@@ -1,7 +1,6 @@
 SeafoamIslandsB2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 30, SEEL
-IF DEF(_RED)
 	db 30, SLOWPOKE
 	db 32, SEEL
 	db 32, SLOWPOKE
@@ -11,18 +10,6 @@ IF DEF(_RED)
 	db 28, SHELLDER
 	db 30, GOLBAT
 	db 37, SLOWBRO
-ENDC
-IF DEF(_BLUE)
-	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
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SeafoamIslandsB3F.asm

@@ -1,17 +1,5 @@
 SeafoamIslandsB3FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-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
-ENDC
-IF DEF(_BLUE)
 	db 31, PSYDUCK
 	db 31, SEEL
 	db 33, PSYDUCK
@@ -21,7 +9,6 @@ IF DEF(_BLUE)
 	db 31, KRABBY
 	db 29, STARYU
 	db 39, KINGLER
-ENDC
 	db 37, DEWGONG
 	end_grass_wildmons
 

data/wild/maps/SeafoamIslandsB4F.asm

@@ -1,17 +1,5 @@
 SeafoamIslandsB4FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-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
-ENDC
-IF DEF(_BLUE)
 	db 31, KRABBY
 	db 31, STARYU
 	db 33, KRABBY
@@ -21,7 +9,6 @@ IF DEF(_BLUE)
 	db 31, PSYDUCK
 	db 29, SEEL
 	db 39, GOLDUCK
-ENDC
 	db 32, GOLBAT
 	end_grass_wildmons
 

data/wild/maps/ViridianForest.asm

@@ -1,18 +1,5 @@
 ViridianForestWildMons:
 	def_grass_wildmons 8 ; encounter rate
-IF DEF(_RED)
-	db  6, WEEDLE
-	db  9, KAKUNA
-	db  6, WEEDLE
-	db  6, WEEDLE
-	db  5, MONJA
-	db  9, KAKUNA
-	db  9, METAPOD
-	db  6, CATERPIE
-	db  5, PIKACHU
-	db 10, BEEDRILL
-ENDC
-IF DEF(_BLUE)
 	db  6, CATERPIE
 	db  9, METAPOD
 	db  6, CATERPIE
@@ -23,7 +10,6 @@ IF DEF(_BLUE)
 	db  6, WEEDLE
 	db  5, PIKACHU
 	db 10, BUTTERFREE
-ENDC
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

engine/battle/animations.asm

@@ -391,12 +391,7 @@ AnimationTileset2:
 	INCBIN "gfx/battle/attack_anim_2.2bpp"
 
 SlotMachineTiles2:
-IF DEF(_RED)
+	INCBIN "gfx/slots/slots_2.2bpp"
-	INCBIN "gfx/slots/red_slots_2.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/slots/blue_slots_2.2bpp"
-ENDC
 SlotMachineTiles2End:
 
 MoveAnimation:

engine/movie/intro.asm

@@ -451,23 +451,12 @@ FightIntroBackMon:
 	ds 16, $00 ; blank tile
 FightIntroBackMonEnd:
 
-IF DEF(_RED)
 FightIntroFrontMon:
 	INCBIN "gfx/intro/red_nidorino_1.2bpp"
 FightIntroFrontMon2:
 	INCBIN "gfx/intro/red_nidorino_2.2bpp"
 FightIntroFrontMon3:
 	INCBIN "gfx/intro/red_nidorino_3.2bpp"
-ENDC
-
-IF DEF(_BLUE)
-FightIntroFrontMon:
-	INCBIN "gfx/intro/blue_jigglypuff_1.2bpp"
-FightIntroFrontMon2:
-	INCBIN "gfx/intro/blue_jigglypuff_2.2bpp"
-FightIntroFrontMon3:
-	INCBIN "gfx/intro/blue_jigglypuff_3.2bpp"
-ENDC
 
 FightIntroFrontMonEnd:
 

engine/movie/title.asm

@@ -118,12 +118,7 @@ DisplayTitleScreen:
 	call LoadScreenTilesFromBuffer2
 	call EnableLCD
 
-IF DEF(_RED)
+	ld a, GYAOON
-	ld a, CHARIZARD ; which Pokemon to show first on the title screen
-ENDC
-IF DEF(_BLUE)
-	ld a, TOTARTLE ; which Pokemon to show first on the title screen
-ENDC
 	ld [wTitleMonSpecies], a
 	call LoadTitleMonSprite
 
@@ -398,12 +393,7 @@ PrintGameVersionOnTitleScreen:
 
 ; these point to special tiles specifically loaded for that purpose and are not usual text
 VersionOnTitleScreenText:
-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
 
 NintenText: db "NINTEN@"
 SonyText:   db "SONY@"

engine/overworld/update_map.asm

@@ -46,7 +46,7 @@ ReplaceTileBlock:
 	call CompareHLWithBC
 	ret c ; return if the replaced tile block is above the map view in memory
 
-RedrawMapView:
+RedrawMapView::
 	ld a, [wIsInBattle]
 	inc a
 	ret z

engine/slots/slot_machine.asm

@@ -888,10 +888,5 @@ SlotMachineMapEnd:
 INCLUDE "data/events/slot_machine_wheels.asm"
 
 SlotMachineTiles1:
-IF DEF(_RED)
+	INCBIN "gfx/slots/slots_1.2bpp"
-	INCBIN "gfx/slots/red_slots_1.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/slots/blue_slots_1.2bpp"
-ENDC
 SlotMachineTiles1End:

gfx/version.asm

@@ -1,8 +1,3 @@
 Version_GFX:
-IF DEF(_RED)
+	INCBIN "gfx/title/kep_version.1bpp" ; 8 tiles
-	INCBIN "gfx/title/red_version.1bpp" ; 10 tiles
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/title/blue_version.1bpp" ; 8 tiles
-ENDC
 Version_GFXEnd:

scripts/VermilionCity.asm

@@ -50,8 +50,12 @@ VermilionCityScript0:
 	ld a, $3
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
+	ld a, [wObtainedBadges] ; ship returns after obtaining the soul badge
+	bit 4, a
+	jr nz, .default
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .shipHasDeparted
+.default
 	ld b, S_S_TICKET
 	predef GetQuantityOfItemInBag
 	ld a, b
@@ -155,8 +159,12 @@ VermilionCityTextSSAnneDeparted:
 
 VermilionCityText3:
 	text_asm
+	ld a, [wObtainedBadges]
+	bit 4, a ; after obtaining soul badge the ship returns
+	jr nz, .default
 	CheckEvent EVENT_SS_ANNE_LEFT
 	jr nz, .shipHasDeparted
+.default
 	ld a, [wSpritePlayerStateData1FacingDirection]
 	cp SPRITE_FACING_RIGHT
 	jr z, .greetPlayer
@@ -233,9 +241,24 @@ VermilionCityText14:
 	text_end
 
 VermilionCityText6:
+	text_asm
+	ld a, [wObtainedBadges]
+	bit 4, a ; after obtaining the soul badge the ship returns
+	jr z, .default
+	ld hl, VermilionCityText15
+	ret
+.default
+	ld hl, VermilionCityText6get
+	ret
+
+VermilionCityText6get:
 	text_far _VermilionCityText6
 	text_end
 
+VermilionCityText15:
+	text_far _VermilionCityText15
+	text_end
+
 VermilionCityText7:
 	text_far _VermilionCityText7
 	text_end

scripts/VermilionDock.asm

@@ -1,5 +1,9 @@
 VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
+	ld hl, VermilionDockTrainerHeaders
+	ld de, VermilionDock_ScriptPointers
+	call ExecuteCurMapScriptInTable
+	call TruckCheck
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
 	CheckEventReuseHL EVENT_GOT_HM01
@@ -36,7 +40,15 @@ VermilionDock_Script:
 	SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK
 	ret
 
+VermilionDock_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw EndTrainerBattle
+
 VermilionDock_1db9b:
+	ld a, [wObtainedBadges]
+	bit 4, a ; after obtaining 4 badges the ship returns
+	ret nz
 	SetEventForceReuseHL EVENT_SS_ANNE_LEFT
 	ld a, SFX_STOP_ALL_MUSIC
 	ld [wJoyIgnore], a
@@ -210,7 +222,173 @@ VermilionDock_EraseSSAnne:
 
 VermilionDock_TextPointers:
 	dw VermilionDockText1
+	dw VermilionDockText2
 
 VermilionDockText1:
 	text_far _VermilionDockText1
 	text_end
+
+; this massive new set of scripts allows the truck to be pushed with Strength. Credit to Vortyne's pureRGB hack for figuring this out!
+
+VermilionDockTrainerHeaders:
+	def_trainers
+MewTrainerHeader:
+	trainer EVENT_ENCOUNTERED_MEW, 0, MewBattleText, MewBattleText, MewBattleText
+	db -1 ; end
+
+VermilionDockText2:
+	text_asm
+	ld hl, MewTrainerHeader
+	call TalkToTrainer
+	jp TextScriptEnd
+
+MewBattleText:
+	text_far _MewtwoBattleText ; Mew!
+	text_asm
+	ld a, MEW
+	call PlayCry
+	call WaitForSoundToFinish
+	jp TextScriptEnd
+
+TruckOAMTable:
+	db $50, $28, $C0, $10
+	db $50, $30, $C1, $10
+	db $50, $38, $C2, $10
+	db $50, $40, $C3, $10
+	db $58, $28, $C4, $10
+	db $58, $30, $C5, $10
+	db $58, $38, $C6, $10
+	db $58, $40, $C7, $10
+
+RedLeftOAMTable:
+	db $8,$0,$9,$0
+	db $a,$2,$b,$3
+
+TruckSpriteGFX: INCBIN  "gfx/sprites/truck_sprite.2bpp"
+
+TruckCheck:
+	CheckEventHL EVENT_FOUND_MEW
+	jp nz, ChangeTruckTile
+	ld c, HS_MEW
+	ld b, $2
+	ld hl, wMissableObjectFlags
+	predef FlagActionPredef
+	ld a, c
+	and a
+	jr nz, .skiphidingmew
+	ld a, HS_MEW
+	ld [wMissableObjectIndex], a
+	predef HideObject
+.skiphidingmew
+	ld a, [wd728]
+	bit 0, a ; using Strength?
+	ret z
+	; the position for moving truck is $00, $15
+	ld hl, wYCoord
+	ld a, [hli]
+	and a
+	ret nz
+	ld a, [hl]
+	cp $16
+	ret nz
+	; if the player is trying to walk left
+	ld a, [wPlayerDirection]
+	cp 2
+	ret nz
+	
+	xor a
+	ld [$ff8c], a
+	ld a, $8
+	ld [$ff8d], a
+	call SetSpriteFacingDirection
+	ld a, $ff
+	ld [wJoyIgnore], a
+	ld [wUpdateSpritesEnabled], a
+	xor a
+	ld bc, $4c48
+	ld de, RedLeftOAMTable
+	call WriteOAMBlock
+	ld bc, (Bank(TruckSpriteGFX) << 8) | 8
+	ld hl, vChars1 + $400
+	ld de, TruckSpriteGFX
+	call CopyVideoData
+	ld hl, TruckOAMTable
+	ld bc, $20
+	ld de, wShadowOAM + $20
+	call CopyData
+	ld a, $c
+	ld [wNewTileBlockID], a ; used to be wd09f
+	ld bc, $a
+	predef ReplaceTileBlock
+	; moving the truck
+	ld a, SFX_PUSH_BOULDER
+	call PlaySound
+	ld b, 32
+	ld de, 4
+.movingtruck
+	ld hl, wShadowOAM + $21
+	ld a, 8
+.movingtruck2
+	dec [hl]
+	add hl, de
+	dec a
+	jr nz, .movingtruck2
+	ld c, 2
+	call DelayFrames
+	dec b
+	jr nz, .movingtruck
+	ld a, $3
+	ld [wNewTileBlockID], a ; used to be wd09f
+	ld bc, $9
+	predef ReplaceTileBlock
+	call ShowMew
+	jp FinishShowMew
+	; show mew and print its dialogue
+ShowMew:	
+	ld a, 1
+	ld [wUpdateSpritesEnabled], a
+	ld a, HS_MEW
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ret
+FinishShowMew:
+	ld c, 60
+	call DelayFrames
+	xor a
+	ld [wJoyIgnore], a
+	SetEvent EVENT_FOUND_MEW
+	ret
+
+ChangeTruckTile:
+	ld bc, $9
+	call GetOWCoord
+	ld a, [hl]
+	cp $3
+	ret z
+	ld a, $3
+	ld [hli], a
+	ld a, $c
+	ld [hl], a
+	CheckEvent EVENT_ENCOUNTERED_MEW
+	call z, ShowMew
+	jpfar RedrawMapView
+
+GetOWCoord:
+	ld hl, wOverworldMap + 2
+	ld a, [wCurMapWidth]
+	add $6
+	ld e, a
+	ld d, $0
+	add hl, de
+	add hl, de
+	inc b
+	inc c
+.bloop
+	add hl, de
+	dec b
+	jr nz, .bloop
+.cloop
+	inc hl
+	dec c
+	jr nz, .cloop
+	ret

text/VermilionCity.asm

@@ -125,3 +125,8 @@ _VermilionCityText12::
 _VermilionCityText13::
 	text "VERMILION HARBOR"
 	done
+
+_VermilionCityText15::
+	text "The S.S.ANNE"
+	line "has returned!"
+	done