ref: 31b118ab428a7ed88a62b31870a1946f7dbcd2d2
parent: 93fe3064750c2b4ae6c243dafd9702c7248520c6
parent: 38ea9cd829c51fbfd1e5e89e94c073ea1987948d
author: pikalaxalt <PikalaxALT@gmail.com>
date: Fri May 13 13:59:46 EDT 2016
Merge branch 'master' of https://github.com/pret/pokered
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,7 +1,6 @@
# Linux
- sudo apt-get install make gcc bison git python python-pip
- sudo pip install pypng
+ sudo apt-get install make gcc bison git python
git clone https://github.com/bentley/rgbds
cd rgbds
@@ -26,7 +25,6 @@
In **Terminal**, run:
xcode-select --install
- sudo easy_install pypng
git clone https://github.com/bentley/rgbds
cd rgbds
@@ -43,16 +41,12 @@
To build on Windows, use [**Cygwin**](http://cygwin.com/install.html). Use the default settings.
+In the installer, select the following packages: `make` `git` `python` `gettext`
+
Then get the most recent version of [**rgbds**](https://github.com/bentley/rgbds/releases/).
Extract the archive and put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`.
In the **Cygwin terminal**:
-
- install $(lynx -source rawgit.com/transcode-open/apt-cyg/master/apt-cyg) /bin
- apt-cyg install make git python gettext
-
- lynx -source bootstrap.pypa.io/get-pip.py | python
- pip install pypng
git clone --recursive https://github.com/pret/pokered
cd pokered
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,37 @@
-# python 2.7
PYTHON := python
-
-# md5sum -c is used to compare rom hashes. The options may vary across platforms.
MD5 := md5sum -c --quiet
+2bpp := $(PYTHON) extras/pokemontools/gfx.py 2bpp
+1bpp := $(PYTHON) extras/pokemontools/gfx.py 1bpp
+pic := $(PYTHON) extras/pokemontools/pic.py compress
+includes := $(PYTHON) extras/pokemontools/scan_includes.py
-# Clear the default suffixes.
+base_obj := \
+ audio.o \
+ main.o \
+ text.o \
+ wram.o
+
+red_obj := $(base_obj:.o=_red.o)
+blue_obj := $(base_obj:.o=_blue.o)
+all_obj := $(red_obj) $(blue_obj)
+
+$(foreach obj, $(base_obj:.o=), \
+ $(eval $(obj)_dep := $(shell $(includes) $(obj).asm)) \
+)
+
.SUFFIXES:
.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic
-
-# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
-
# Suppress annoying intermediate file deletion messages.
.PRECIOUS: %.2bpp
-
.PHONY: all clean red blue compare
-
-poketools := extras/pokemontools
-gfx := $(PYTHON) $(poketools)/gfx.py
-2bpp := $(gfx) 2bpp
-1bpp := $(gfx) 1bpp
-pic := $(PYTHON) $(poketools)/pic.py compress
-includes := $(PYTHON) $(poketools)/scan_includes.py
-
-versions := red blue
-
-# Collect file dependencies for objects in red/ and blue/.
-$(foreach ver, $(versions), \
- $(eval $(ver)_asm := $(shell find $(ver) -iname '*.asm')) \
- $(eval $(ver)_obj := $($(ver)_asm:.asm=.o)) \
- $(eval all_obj += $($(ver)_obj)) \
-)
-$(foreach obj, $(all_obj), \
- $(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \
-)
-
-
roms := pokered.gbc pokeblue.gbc
-all: $(roms)
-red: pokered.gbc
-blue: pokeblue.gbc
+all: $(roms)
+red: pokered.gbc
+blue: pokeblue.gbc
# For contributors to make sure a change didn't affect the contents of the rom.
compare: red blue
@@ -52,29 +41,21 @@
rm -f $(roms) $(all_obj) $(roms:.gbc=.sym)
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} ++%.asm: ;
+$(red_obj): %_red.o: %.asm $$(%_dep)
+ rgbasm -D "_RED" -h -o $@ $*.asm
+$(blue_obj): %_blue.o: %.asm $$(%_dep)
+ rgbasm -D "_BLUE" -h -o $@ $*.asm
-# Don't fix halts.
-asm_opt = -h
-
-# Make a symfile for debugging.
-link_opt = -n poke$*.sym
-
-# Header options for rgbfix.
dmg_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03
red_opt = $(dmg_opt) -t "POKEMON RED"
blue_opt = $(dmg_opt) -t "POKEMON BLUE"
+poke%.gbc: $$(%_obj)
+ rgblink -n poke$*.sym -o $@ $^
+ rgbfix $($*_opt) $@
%.png: ;
%.2bpp: %.png ; @$(2bpp) $<
%.1bpp: %.png ; @$(1bpp) $<
%.pic: %.2bpp ; @$(pic) $<
-
-# Assemble source files into objects.
-$(all_obj): $$*.asm $$($$*_dep)
- rgbasm $(asm_opt) -o $@ $*.asm
-
-# Link objects to produce a rom.
-poke%.gbc: $$(%_obj)
- rgblink $(link_opt) -o $@ $^
- rgbfix $($*_opt) $@
--- a/blue.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-_BLUE EQU 1
-INCLUDE "charmap.asm"
--- a/blue/audio.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "blue.asm"
-INCLUDE "audio.asm"
--- a/blue/main.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "blue.asm"
-INCLUDE "main.asm"
--- a/blue/text.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "blue.asm"
-INCLUDE "text.asm"
--- a/blue/wram.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "blue.asm"
-INCLUDE "wram.asm"
--- a/constants.asm
+++ b/constants.asm
@@ -1,4 +1,5 @@
INCLUDE "macros.asm"
+INCLUDE "charmap.asm"
INCLUDE "hram.asm"
INCLUDE "vram.asm"
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1121,15 +1121,15 @@
const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6)
const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7)
const EVENT_460 ; 460, (D7D3, bit 0)
- const EVENT_BEAT_POWER_PLANT_TRAINER_0 ; 461, (D7D3, bit 1)
- const EVENT_BEAT_POWER_PLANT_TRAINER_1 ; 462, (D7D3, bit 2)
- const EVENT_BEAT_POWER_PLANT_TRAINER_2 ; 463, (D7D3, bit 3)
- const EVENT_BEAT_POWER_PLANT_TRAINER_3 ; 464, (D7D3, bit 4)
- const EVENT_BEAT_POWER_PLANT_TRAINER_4 ; 465, (D7D3, bit 5)
- const EVENT_BEAT_POWER_PLANT_TRAINER_5 ; 466, (D7D3, bit 6)
- const EVENT_BEAT_POWER_PLANT_TRAINER_6 ; 467, (D7D3, bit 7)
- const EVENT_BEAT_POWER_PLANT_TRAINER_7 ; 468, (D7D4, bit 0)
- const EVENT_BEAT_POWER_PLANT_TRAINER_8 ; 469, (D7D4, bit 1)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_2 ; 463, (D7D3, bit 3)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_3 ; 464, (D7D3, bit 4)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_4 ; 465, (D7D3, bit 5)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_5 ; 466, (D7D3, bit 6)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_6 ; 467, (D7D3, bit 7)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_7 ; 468, (D7D4, bit 0)
+ const EVENT_BEAT_ZAPDOS ; 469, (D7D4, bit 1)
const EVENT_46A ; 46A, (D7D4, bit 2)
const EVENT_46B ; 46B, (D7D4, bit 3)
const EVENT_46C ; 46C, (D7D4, bit 4)
@@ -1342,7 +1342,7 @@
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3)
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4)
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5)
- const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 ; 53E, (D7EE, bit 6)
+ const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6)
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7)
const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0)
const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1)
@@ -2241,7 +2241,7 @@
const EVENT_8BE ; 8BE, (D85E, bit 6)
const EVENT_8BF ; 8BF, (D85E, bit 7)
const EVENT_8C0 ; 8C0, (D85F, bit 0)
- const EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 ; 8C1, (D85F, bit 1)
+ const EVENT_BEAT_MEWTWO ; 8C1, (D85F, bit 1)
const EVENT_8C2 ; 8C2, (D85F, bit 2)
const EVENT_8C3 ; 8C3, (D85F, bit 3)
const EVENT_8C4 ; 8C4, (D85F, bit 4)
@@ -2522,7 +2522,7 @@
const EVENT_9D7 ; 9D7, (D881, bit 7)
const EVENT_9D8 ; 9D8, (D882, bit 0)
const EVENT_9D9 ; 9D9, (D882, bit 1)
- const EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 ; 9DA, (D882, bit 2)
+ const EVENT_BEAT_ARTICUNO ; 9DA, (D882, bit 2)
const EVENT_9DB ; 9DB, (D882, bit 3)
const EVENT_9DC ; 9DC, (D882, bit 4)
const EVENT_9DD ; 9DD, (D882, bit 5)
--- a/data/baseStats/abra.asm
+++ b/data/baseStats/abra.asm
@@ -1,4 +1,3 @@
-AbraBaseStats: ; 38aa6 (e:4aa6)
db DEX_ABRA ; pokedex id
db 25 ; base hp
db 20 ; base attack
--- a/data/baseStats/aerodactyl.asm
+++ b/data/baseStats/aerodactyl.asm
@@ -1,4 +1,3 @@
-AerodactylBaseStats: ; 3934a (e:534a)
db DEX_AERODACTYL ; pokedex id
db 80 ; base hp
db 105 ; base attack
--- a/data/baseStats/alakazam.asm
+++ b/data/baseStats/alakazam.asm
@@ -1,4 +1,3 @@
-AlakazamBaseStats: ; 38ade (e:4ade)
db DEX_ALAKAZAM ; pokedex id
db 55 ; base hp
db 50 ; base attack
@@ -14,13 +13,8 @@
dw AlakazamPicBack
; attacks known at lvl 0
db TELEPORT
-IF DEF(_YELLOW)
- db KINESIS
- db 0
-ELSE
- db CONFUSION
- db DISABLE
-ENDC
+db CONFUSION
+db DISABLE
db 0
db 3 ; growth rate
; learnset
--- a/data/baseStats/arbok.asm
+++ b/data/baseStats/arbok.asm
@@ -1,4 +1,3 @@
-ArbokBaseStats: ; 38662 (e:4662)
db DEX_ARBOK ; pokedex id
db 60 ; base hp
db 85 ; base attack
--- a/data/baseStats/arcanine.asm
+++ b/data/baseStats/arcanine.asm
@@ -1,4 +1,3 @@
-ArcanineBaseStats: ; 38a36 (e:4a36)
db DEX_ARCANINE ; pokedex id
db 90 ; base hp
db 110 ; base attack
--- a/data/baseStats/articuno.asm
+++ b/data/baseStats/articuno.asm
@@ -1,4 +1,3 @@
-ArticunoBaseStats: ; 39382 (e:5382)
db DEX_ARTICUNO ; pokedex id
db 90 ; base hp
db 85 ; base attack
--- a/data/baseStats/beedrill.asm
+++ b/data/baseStats/beedrill.asm
@@ -1,4 +1,3 @@
-BeedrillBaseStats: ; 38566 (e:4566)
db DEX_BEEDRILL ; pokedex id
db 65 ; base hp
db 80 ; base attack
--- a/data/baseStats/bellsprout.asm
+++ b/data/baseStats/bellsprout.asm
@@ -1,4 +1,3 @@
-BellsproutBaseStats: ; 38b4e (e:4b4e)
db DEX_BELLSPROUT ; pokedex id
db 50 ; base hp
db 75 ; base attack
--- a/data/baseStats/blastoise.asm
+++ b/data/baseStats/blastoise.asm
@@ -1,4 +1,3 @@
-BlastoiseBaseStats: ; 384be (e:44be)
db DEX_BLASTOISE ; pokedex id
db 79 ; base hp
db 83 ; base attack
--- a/data/baseStats/bulbasaur.asm
+++ b/data/baseStats/bulbasaur.asm
@@ -1,4 +1,4 @@
-BulbasaurBaseStats: ; 383de (e:43de)
+MonBaseStats:
db DEX_BULBASAUR ; pokedex id
db 45 ; base hp
db 49 ; base attack
@@ -27,3 +27,4 @@
tmlearn 44
tmlearn 50,51
db 0 ; padding
+MonBaseStatsEnd:
--- a/data/baseStats/butterfree.asm
+++ b/data/baseStats/butterfree.asm
@@ -1,4 +1,3 @@
-ButterfreeBaseStats: ; 38512 (e:4512)
db DEX_BUTTERFREE ; pokedex id
db 60 ; base hp
db 45 ; base attack
@@ -25,9 +24,5 @@
tmlearn 29,30,31,32
tmlearn 33,34,39
tmlearn 44,46
-IF DEF(_YELLOW)
- tmlearn 50,55
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/caterpie.asm
+++ b/data/baseStats/caterpie.asm
@@ -1,4 +1,3 @@
-CaterpieBaseStats: ; 384da (e:44da)
db DEX_CATERPIE ; pokedex id
db 45 ; base hp
db 30 ; base attack
--- a/data/baseStats/chansey.asm
+++ b/data/baseStats/chansey.asm
@@ -1,4 +1,3 @@
-ChanseyBaseStats: ; 3901e (e:501e)
db DEX_CHANSEY ; pokedex id
db 250 ; base hp
db 5 ; base attack
@@ -14,11 +13,7 @@
dw ChanseyPicBack
; attacks known at lvl 0
db POUND
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db DOUBLESLAP
-ENDC
+db DOUBLESLAP
db 0
db 0
db 4 ; growth rate
--- a/data/baseStats/charizard.asm
+++ b/data/baseStats/charizard.asm
@@ -1,4 +1,3 @@
-CharizardBaseStats: ; 3846a (e:446a)
db DEX_CHARIZARD ; pokedex id
db 78 ; base hp
db 84 ; base attack
@@ -25,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 33,34,38,39,40
tmlearn 44
-IF DEF(_YELLOW)
- tmlearn 50,51,52,54
-ELSE
tmlearn 50,51,54
-ENDC
db 0 ; padding
--- a/data/baseStats/charmander.asm
+++ b/data/baseStats/charmander.asm
@@ -1,4 +1,3 @@
-CharmanderBaseStats: ; 38432 (e:4432)
db DEX_CHARMANDER ; pokedex id
db 39 ; base hp
db 52 ; base attack
--- a/data/baseStats/charmeleon.asm
+++ b/data/baseStats/charmeleon.asm
@@ -1,4 +1,3 @@
-CharmeleonBaseStats: ; 3844e (e:444e)
db DEX_CHARMELEON ; pokedex id
db 58 ; base hp
db 64 ; base attack
--- a/data/baseStats/clefable.asm
+++ b/data/baseStats/clefable.asm
@@ -1,4 +1,3 @@
-ClefableBaseStats: ; 387b2 (e:47b2)
db DEX_CLEFABLE ; pokedex id
db 95 ; base hp
db 70 ; base attack
--- a/data/baseStats/clefairy.asm
+++ b/data/baseStats/clefairy.asm
@@ -1,4 +1,3 @@
-ClefairyBaseStats: ; 38796 (e:4796)
db DEX_CLEFAIRY ; pokedex id
db 70 ; base hp
db 45 ; base attack
--- a/data/baseStats/cloyster.asm
+++ b/data/baseStats/cloyster.asm
@@ -1,4 +1,3 @@
-CloysterBaseStats: ; 38db6 (e:4db6)
db DEX_CLOYSTER ; pokedex id
db 50 ; base hp
db 95 ; base attack
--- a/data/baseStats/cubone.asm
+++ b/data/baseStats/cubone.asm
@@ -1,4 +1,3 @@
-CuboneBaseStats: ; 38f22 (e:4f22)
db DEX_CUBONE ; pokedex id
db 50 ; base hp
db 50 ; base attack
--- a/data/baseStats/dewgong.asm
+++ b/data/baseStats/dewgong.asm
@@ -1,4 +1,3 @@
-DewgongBaseStats: ; 38d46 (e:4d46)
db DEX_DEWGONG ; pokedex id
db 90 ; base hp
db 70 ; base attack
--- a/data/baseStats/diglett.asm
+++ b/data/baseStats/diglett.asm
@@ -1,4 +1,3 @@
-DiglettBaseStats: ; 3893a (e:493a)
db DEX_DIGLETT ; pokedex id
db 10 ; base hp
db 55 ; base attack
@@ -25,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
-IF DEF(_YELLOW)
- tmlearn 50,51
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/ditto.asm
+++ b/data/baseStats/ditto.asm
@@ -1,4 +1,3 @@
-DittoBaseStats: ; 39232 (e:5232)
db DEX_DITTO ; pokedex id
db 48 ; base hp
db 48 ; base attack
--- a/data/baseStats/dodrio.asm
+++ b/data/baseStats/dodrio.asm
@@ -1,4 +1,3 @@
-DodrioBaseStats: ; 38d0e (e:4d0e)
db DEX_DODRIO ; pokedex id
db 60 ; base hp
db 110 ; base attack
--- a/data/baseStats/doduo.asm
+++ b/data/baseStats/doduo.asm
@@ -1,4 +1,3 @@
-DoduoBaseStats: ; 38cf2 (e:4cf2)
db DEX_DODUO ; pokedex id
db 35 ; base hp
db 85 ; base attack
--- a/data/baseStats/dragonair.asm
+++ b/data/baseStats/dragonair.asm
@@ -1,4 +1,3 @@
-DragonairBaseStats: ; 393f2 (e:53f2)
db DEX_DRAGONAIR ; pokedex id
db 61 ; base hp
db 84 ; base attack
--- a/data/baseStats/dragonite.asm
+++ b/data/baseStats/dragonite.asm
@@ -1,4 +1,3 @@
-DragoniteBaseStats: ; 3940e (e:540e)
db DEX_DRAGONITE ; pokedex id
db 91 ; base hp
db 134 ; base attack
--- a/data/baseStats/dratini.asm
+++ b/data/baseStats/dratini.asm
@@ -1,4 +1,3 @@
-DratiniBaseStats: ; 393d6 (e:53d6)
db DEX_DRATINI ; pokedex id
db 41 ; base hp
db 64 ; base attack
--- a/data/baseStats/drowzee.asm
+++ b/data/baseStats/drowzee.asm
@@ -1,4 +1,3 @@
-DrowzeeBaseStats: ; 38e42 (e:4e42)
db DEX_DROWZEE ; pokedex id
db 60 ; base hp
db 48 ; base attack
--- a/data/baseStats/dugtrio.asm
+++ b/data/baseStats/dugtrio.asm
@@ -1,4 +1,3 @@
-DugtrioBaseStats: ; 38956 (e:4956)
db DEX_DUGTRIO ; pokedex id
db 35 ; base hp
db 80 ; base attack
@@ -25,9 +24,5 @@
tmlearn 26,27,28,31,32
tmlearn 34
tmlearn 44,48
-IF DEF(_YELLOW)
- tmlearn 50,51
-ELSE
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/eevee.asm
+++ b/data/baseStats/eevee.asm
@@ -1,4 +1,3 @@
-EeveeBaseStats: ; 3924e (e:524e)
db DEX_EEVEE ; pokedex id
db 55 ; base hp
db 55 ; base attack
@@ -14,11 +13,7 @@
dw EeveePicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db 0
db 0
db 0 ; growth rate
--- a/data/baseStats/ekans.asm
+++ b/data/baseStats/ekans.asm
@@ -1,4 +1,3 @@
-EkansBaseStats: ; 38646 (e:4646)
db DEX_EKANS ; pokedex id
db 35 ; base hp
db 60 ; base attack
--- a/data/baseStats/electabuzz.asm
+++ b/data/baseStats/electabuzz.asm
@@ -1,4 +1,3 @@
-ElectabuzzBaseStats: ; 3916e (e:516e)
db DEX_ELECTABUZZ ; pokedex id
db 65 ; base hp
db 83 ; base attack
--- a/data/baseStats/electrode.asm
+++ b/data/baseStats/electrode.asm
@@ -1,4 +1,3 @@
-ElectrodeBaseStats: ; 38ece (e:4ece)
db DEX_ELECTRODE ; pokedex id
db 60 ; base hp
db 50 ; base attack
--- a/data/baseStats/exeggcute.asm
+++ b/data/baseStats/exeggcute.asm
@@ -1,4 +1,3 @@
-ExeggcuteBaseStats: ; 38eea (e:4eea)
db DEX_EXEGGCUTE ; pokedex id
db 60 ; base hp
db 40 ; base attack
--- a/data/baseStats/exeggutor.asm
+++ b/data/baseStats/exeggutor.asm
@@ -1,4 +1,3 @@
-ExeggutorBaseStats: ; 38f06 (e:4f06)
db DEX_EXEGGUTOR ; pokedex id
db 95 ; base hp
db 95 ; base attack
--- a/data/baseStats/farfetchd.asm
+++ b/data/baseStats/farfetchd.asm
@@ -1,4 +1,3 @@
-FarfetchdBaseStats: ; 38cd6 (e:4cd6)
db DEX_FARFETCHD ; pokedex id
db 52 ; base hp
db 65 ; base attack
--- a/data/baseStats/fearow.asm
+++ b/data/baseStats/fearow.asm
@@ -1,4 +1,3 @@
-FearowBaseStats: ; 3862a (e:462a)
db DEX_FEAROW ; pokedex id
db 65 ; base hp
db 90 ; base attack
--- a/data/baseStats/flareon.asm
+++ b/data/baseStats/flareon.asm
@@ -1,4 +1,3 @@
-FlareonBaseStats: ; 392a2 (e:52a2)
db DEX_FLAREON ; pokedex id
db 65 ; base hp
db 130 ; base attack
@@ -14,11 +13,7 @@
dw FlareonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db EMBER
db 0 ; growth rate
--- a/data/baseStats/gastly.asm
+++ b/data/baseStats/gastly.asm
@@ -1,4 +1,3 @@
-GastlyBaseStats: ; 38dd2 (e:4dd2)
db DEX_GASTLY ; pokedex id
db 30 ; base hp
db 35 ; base attack
--- a/data/baseStats/gengar.asm
+++ b/data/baseStats/gengar.asm
@@ -1,4 +1,3 @@
-GengarBaseStats: ; 38e0a (e:4e0a)
db DEX_GENGAR ; pokedex id
db 60 ; base hp
db 65 ; base attack
--- a/data/baseStats/geodude.asm
+++ b/data/baseStats/geodude.asm
@@ -1,4 +1,3 @@
-GeodudeBaseStats: ; 38bda (e:4bda)
db DEX_GEODUDE ; pokedex id
db 40 ; base hp
db 80 ; base attack
--- a/data/baseStats/gloom.asm
+++ b/data/baseStats/gloom.asm
@@ -1,4 +1,3 @@
-GloomBaseStats: ; 38892 (e:4892)
db DEX_GLOOM ; pokedex id
db 60 ; base hp
db 65 ; base attack
--- a/data/baseStats/golbat.asm
+++ b/data/baseStats/golbat.asm
@@ -1,4 +1,3 @@
-GolbatBaseStats: ; 3885a (e:485a)
db DEX_GOLBAT ; pokedex id
db 75 ; base hp
db 80 ; base attack
--- a/data/baseStats/goldeen.asm
+++ b/data/baseStats/goldeen.asm
@@ -1,4 +1,3 @@
-GoldeenBaseStats: ; 390aa (e:50aa)
db DEX_GOLDEEN ; pokedex id
db 45 ; base hp
db 67 ; base attack
--- a/data/baseStats/golduck.asm
+++ b/data/baseStats/golduck.asm
@@ -1,4 +1,3 @@
-GolduckBaseStats: ; 389c6 (e:49c6)
db DEX_GOLDUCK ; pokedex id
db 80 ; base hp
db 82 ; base attack
--- a/data/baseStats/golem.asm
+++ b/data/baseStats/golem.asm
@@ -1,4 +1,3 @@
-GolemBaseStats: ; 38c12 (e:4c12)
db DEX_GOLEM ; pokedex id
db 80 ; base hp
db 110 ; base attack
--- a/data/baseStats/graveler.asm
+++ b/data/baseStats/graveler.asm
@@ -1,4 +1,3 @@
-GravelerBaseStats: ; 38bf6 (e:4bf6)
db DEX_GRAVELER ; pokedex id
db 55 ; base hp
db 95 ; base attack
--- a/data/baseStats/grimer.asm
+++ b/data/baseStats/grimer.asm
@@ -1,4 +1,3 @@
-GrimerBaseStats: ; 38d62 (e:4d62)
db DEX_GRIMER ; pokedex id
db 80 ; base hp
db 80 ; base attack
--- a/data/baseStats/growlithe.asm
+++ b/data/baseStats/growlithe.asm
@@ -1,4 +1,3 @@
-GrowlitheBaseStats: ; 38a1a (e:4a1a)
db DEX_GROWLITHE ; pokedex id
db 55 ; base hp
db 70 ; base attack
--- a/data/baseStats/gyarados.asm
+++ b/data/baseStats/gyarados.asm
@@ -1,4 +1,3 @@
-GyaradosBaseStats: ; 391fa (e:51fa)
db DEX_GYARADOS ; pokedex id
db 95 ; base hp
db 125 ; base attack
@@ -13,17 +12,10 @@
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
tmlearn 6,8
--- a/data/baseStats/haunter.asm
+++ b/data/baseStats/haunter.asm
@@ -1,4 +1,3 @@
-HaunterBaseStats: ; 38dee (e:4dee)
db DEX_HAUNTER ; pokedex id
db 45 ; base hp
db 50 ; base attack
--- a/data/baseStats/hitmonchan.asm
+++ b/data/baseStats/hitmonchan.asm
@@ -1,4 +1,3 @@
-HitmonchanBaseStats: ; 38f76 (e:4f76)
db DEX_HITMONCHAN ; pokedex id
db 50 ; base hp
db 105 ; base attack
--- a/data/baseStats/hitmonlee.asm
+++ b/data/baseStats/hitmonlee.asm
@@ -1,4 +1,3 @@
-HitmonleeBaseStats: ; 38f5a (e:4f5a)
db DEX_HITMONLEE ; pokedex id
db 50 ; base hp
db 120 ; base attack
--- a/data/baseStats/horsea.asm
+++ b/data/baseStats/horsea.asm
@@ -1,4 +1,3 @@
-HorseaBaseStats: ; 39072 (e:5072)
db DEX_HORSEA ; pokedex id
db 30 ; base hp
db 40 ; base attack
--- a/data/baseStats/hypno.asm
+++ b/data/baseStats/hypno.asm
@@ -1,4 +1,3 @@
-HypnoBaseStats: ; 38e5e (e:4e5e)
db DEX_HYPNO ; pokedex id
db 85 ; base hp
db 73 ; base attack
--- a/data/baseStats/ivysaur.asm
+++ b/data/baseStats/ivysaur.asm
@@ -1,4 +1,3 @@
-IvysaurBaseStats: ; 383fa (e:43fa)
db DEX_IVYSAUR ; pokedex id
db 60 ; base hp
db 62 ; base attack
--- a/data/baseStats/jigglypuff.asm
+++ b/data/baseStats/jigglypuff.asm
@@ -1,4 +1,3 @@
-JigglypuffBaseStats: ; 38806 (e:4806)
db DEX_JIGGLYPUFF ; pokedex id
db 115 ; base hp
db 45 ; base attack
--- a/data/baseStats/jolteon.asm
+++ b/data/baseStats/jolteon.asm
@@ -1,4 +1,3 @@
-JolteonBaseStats: ; 39286 (e:5286)
db DEX_JOLTEON ; pokedex id
db 65 ; base hp
db 65 ; base attack
@@ -14,11 +13,7 @@
dw JolteonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db THUNDERSHOCK
db 0 ; growth rate
--- a/data/baseStats/jynx.asm
+++ b/data/baseStats/jynx.asm
@@ -1,4 +1,3 @@
-JynxBaseStats: ; 39152 (e:5152)
db DEX_JYNX ; pokedex id
db 65 ; base hp
db 50 ; base attack
--- a/data/baseStats/kabuto.asm
+++ b/data/baseStats/kabuto.asm
@@ -1,4 +1,3 @@
-KabutoBaseStats: ; 39312 (e:5312)
db DEX_KABUTO ; pokedex id
db 30 ; base hp
db 80 ; base attack
--- a/data/baseStats/kabutops.asm
+++ b/data/baseStats/kabutops.asm
@@ -1,4 +1,3 @@
-KabutopsBaseStats: ; 3932e (e:532e)
db DEX_KABUTOPS ; pokedex id
db 60 ; base hp
db 115 ; base attack
--- a/data/baseStats/kadabra.asm
+++ b/data/baseStats/kadabra.asm
@@ -1,4 +1,3 @@
-KadabraBaseStats: ; 38ac2 (e:4ac2)
db DEX_KADABRA ; pokedex id
db 40 ; base hp
db 35 ; base attack
@@ -14,13 +13,8 @@
dw KadabraPicBack
; attacks known at lvl 0
db TELEPORT
-IF DEF(_YELLOW)
- DB KINESIS
- db 0
-ELSE
- db CONFUSION
- db DISABLE
-ENDC
+db CONFUSION
+db DISABLE
db 0
db 3 ; growth rate
; learnset
--- a/data/baseStats/kakuna.asm
+++ b/data/baseStats/kakuna.asm
@@ -1,4 +1,3 @@
-KakunaBaseStats: ; 3854a (e:454a)
db DEX_KAKUNA ; pokedex id
db 45 ; base hp
db 25 ; base attack
--- a/data/baseStats/kangaskhan.asm
+++ b/data/baseStats/kangaskhan.asm
@@ -1,4 +1,3 @@
-KangaskhanBaseStats: ; 39056 (e:5056)
db DEX_KANGASKHAN ; pokedex id
db 105 ; base hp
db 95 ; base attack
--- a/data/baseStats/kingler.asm
+++ b/data/baseStats/kingler.asm
@@ -1,4 +1,3 @@
-KinglerBaseStats: ; 38e96 (e:4e96)
db DEX_KINGLER ; pokedex id
db 55 ; base hp
db 130 ; base attack
--- a/data/baseStats/koffing.asm
+++ b/data/baseStats/koffing.asm
@@ -1,4 +1,3 @@
-KoffingBaseStats: ; 38fae (e:4fae)
db DEX_KOFFING ; pokedex id
db 40 ; base hp
db 65 ; base attack
--- a/data/baseStats/krabby.asm
+++ b/data/baseStats/krabby.asm
@@ -1,4 +1,3 @@
-KrabbyBaseStats: ; 38e7a (e:4e7a)
db DEX_KRABBY ; pokedex id
db 30 ; base hp
db 105 ; base attack
--- a/data/baseStats/lapras.asm
+++ b/data/baseStats/lapras.asm
@@ -1,4 +1,3 @@
-LaprasBaseStats: ; 39216 (e:5216)
db DEX_LAPRAS ; pokedex id
db 130 ; base hp
db 85 ; base attack
--- a/data/baseStats/lickitung.asm
+++ b/data/baseStats/lickitung.asm
@@ -1,4 +1,3 @@
-LickitungBaseStats: ; 38f92 (e:4f92)
db DEX_LICKITUNG ; pokedex id
db 90 ; base hp
db 55 ; base attack
--- a/data/baseStats/machamp.asm
+++ b/data/baseStats/machamp.asm
@@ -1,4 +1,3 @@
-MachampBaseStats: ; 38b32 (e:4b32)
db DEX_MACHAMP ; pokedex id
db 90 ; base hp
db 130 ; base attack
--- a/data/baseStats/machoke.asm
+++ b/data/baseStats/machoke.asm
@@ -1,4 +1,3 @@
-MachokeBaseStats: ; 38b16 (e:4b16)
db DEX_MACHOKE ; pokedex id
db 80 ; base hp
db 100 ; base attack
--- a/data/baseStats/machop.asm
+++ b/data/baseStats/machop.asm
@@ -1,4 +1,3 @@
-MachopBaseStats: ; 38afa (e:4afa)
db DEX_MACHOP ; pokedex id
db 70 ; base hp
db 80 ; base attack
--- a/data/baseStats/magikarp.asm
+++ b/data/baseStats/magikarp.asm
@@ -1,4 +1,3 @@
-MagikarpBaseStats: ; 391de (e:51de)
db DEX_MAGIKARP ; pokedex id
db 20 ; base hp
db 10 ; base attack
--- a/data/baseStats/magmar.asm
+++ b/data/baseStats/magmar.asm
@@ -1,4 +1,3 @@
-MagmarBaseStats: ; 3918a (e:518a)
db DEX_MAGMAR ; pokedex id
db 65 ; base hp
db 95 ; base attack
--- a/data/baseStats/magnemite.asm
+++ b/data/baseStats/magnemite.asm
@@ -1,4 +1,3 @@
-MagnemiteBaseStats: ; 38c9e (e:4c9e)
db DEX_MAGNEMITE ; pokedex id
db 25 ; base hp
db 35 ; base attack
--- a/data/baseStats/magneton.asm
+++ b/data/baseStats/magneton.asm
@@ -1,4 +1,3 @@
-MagnetonBaseStats: ; 38cba (e:4cba)
db DEX_MAGNETON ; pokedex id
db 50 ; base hp
db 60 ; base attack
--- a/data/baseStats/mankey.asm
+++ b/data/baseStats/mankey.asm
@@ -1,4 +1,3 @@
-MankeyBaseStats: ; 389e2 (e:49e2)
db DEX_MANKEY ; pokedex id
db 40 ; base hp
db 80 ; base attack
--- a/data/baseStats/marowak.asm
+++ b/data/baseStats/marowak.asm
@@ -1,4 +1,3 @@
-MarowakBaseStats: ; 38f3e (e:4f3e)
db DEX_MAROWAK ; pokedex id
db 60 ; base hp
db 80 ; base attack
@@ -14,15 +13,9 @@
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 GROWL
+db LEER
+db FOCUS_ENERGY
db 0 ; growth rate
; learnset
tmlearn 1,5,6,8
--- a/data/baseStats/meowth.asm
+++ b/data/baseStats/meowth.asm
@@ -1,4 +1,3 @@
-MeowthBaseStats: ; 38972 (e:4972)
db DEX_MEOWTH ; pokedex id
db 40 ; base hp
db 45 ; base attack
--- a/data/baseStats/metapod.asm
+++ b/data/baseStats/metapod.asm
@@ -1,4 +1,3 @@
-MetapodBaseStats: ; 384f6 (e:44f6)
db DEX_METAPOD ; pokedex id
db 50 ; base hp
db 20 ; base attack
--- a/data/baseStats/mew.asm
+++ b/data/baseStats/mew.asm
@@ -1,4 +1,4 @@
-MewBaseStats: ; 425b (1:425b)
+MewBaseStats:
db DEX_MEW ; pokedex id
db 100 ; base hp
db 100 ; base attack
--- a/data/baseStats/mewtwo.asm
+++ b/data/baseStats/mewtwo.asm
@@ -1,4 +1,3 @@
-MewtwoBaseStats: ; 3942a (e:542a)
db DEX_MEWTWO ; pokedex id
db 106 ; base hp
db 110 ; base attack
--- a/data/baseStats/moltres.asm
+++ b/data/baseStats/moltres.asm
@@ -1,4 +1,3 @@
-MoltresBaseStats: ; 393ba (e:53ba)
db DEX_MOLTRES ; pokedex id
db 90 ; base hp
db 100 ; base attack
--- a/data/baseStats/mrmime.asm
+++ b/data/baseStats/mrmime.asm
@@ -1,4 +1,3 @@
-MrMimeBaseStats: ; 3911a (e:511a)
db DEX_MR_MIME ; pokedex id
db 40 ; base hp
db 45 ; base attack
--- a/data/baseStats/muk.asm
+++ b/data/baseStats/muk.asm
@@ -1,4 +1,3 @@
-MukBaseStats: ; 38d7e (e:4d7e)
db DEX_MUK ; pokedex id
db 105 ; base hp
db 105 ; base attack
--- a/data/baseStats/nidoking.asm
+++ b/data/baseStats/nidoking.asm
@@ -1,4 +1,3 @@
-NidokingBaseStats: ; 3877a (e:477a)
db DEX_NIDOKING ; pokedex id
db 81 ; base hp
db 92 ; base attack
--- a/data/baseStats/nidoqueen.asm
+++ b/data/baseStats/nidoqueen.asm
@@ -1,4 +1,3 @@
-NidoqueenBaseStats: ; 38726 (e:4726)
db DEX_NIDOQUEEN ; pokedex id
db 90 ; base hp
db 82 ; base attack
--- a/data/baseStats/nidoranf.asm
+++ b/data/baseStats/nidoranf.asm
@@ -1,4 +1,3 @@
-NidoranFBaseStats: ; 386ee (e:46ee)
db DEX_NIDORAN_F ; pokedex id
db 55 ; base hp
db 47 ; base attack
--- a/data/baseStats/nidoranm.asm
+++ b/data/baseStats/nidoranm.asm
@@ -1,4 +1,3 @@
-NidoranMBaseStats: ; 38742 (e:4742)
db DEX_NIDORAN_M ; pokedex id
db 46 ; base hp
db 57 ; base attack
--- a/data/baseStats/nidorina.asm
+++ b/data/baseStats/nidorina.asm
@@ -1,4 +1,3 @@
-NidorinaBaseStats: ; 3870a (e:470a)
db DEX_NIDORINA ; pokedex id
db 70 ; base hp
db 62 ; base attack
--- a/data/baseStats/nidorino.asm
+++ b/data/baseStats/nidorino.asm
@@ -1,4 +1,3 @@
-NidorinoBaseStats: ; 3875e (e:475e)
db DEX_NIDORINO ; pokedex id
db 61 ; base hp
db 72 ; base attack
--- a/data/baseStats/ninetails.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-NinetalesBaseStats: ; 387ea (e:47ea)
-db DEX_NINETALES ; pokedex id
-db 73 ; base hp
-db 76 ; base attack
-db 75 ; base defense
-db 100 ; base speed
-db 100 ; base special
-db FIRE ; species type 1
-db FIRE ; species type 2
-db 75 ; catch rate
-db 178 ; base exp yield
-INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions
-dw NinetalesPicFront
-dw NinetalesPicBack
-; attacks known at lvl 0
-db EMBER
-db TAIL_WHIP
-db QUICK_ATTACK
-db ROAR
-db 0 ; growth rate
-; learnset
- tmlearn 6,8
- tmlearn 9,10,15
- tmlearn 20
- tmlearn 28,31,32
- tmlearn 33,34,38,39,40
- tmlearn 44
- tmlearn 50
-db 0 ; padding
--- /dev/null
+++ b/data/baseStats/ninetales.asm
@@ -1,0 +1,28 @@
+db DEX_NINETALES ; pokedex id
+db 73 ; base hp
+db 76 ; base attack
+db 75 ; base defense
+db 100 ; base speed
+db 100 ; base special
+db FIRE ; species type 1
+db FIRE ; species type 2
+db 75 ; catch rate
+db 178 ; base exp yield
+INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions
+dw NinetalesPicFront
+dw NinetalesPicBack
+; attacks known at lvl 0
+db EMBER
+db TAIL_WHIP
+db QUICK_ATTACK
+db ROAR
+db 0 ; growth rate
+; learnset
+ tmlearn 6,8
+ tmlearn 9,10,15
+ tmlearn 20
+ tmlearn 28,31,32
+ tmlearn 33,34,38,39,40
+ tmlearn 44
+ tmlearn 50
+db 0 ; padding
--- a/data/baseStats/oddish.asm
+++ b/data/baseStats/oddish.asm
@@ -1,4 +1,3 @@
-OddishBaseStats: ; 38876 (e:4876)
db DEX_ODDISH ; pokedex id
db 45 ; base hp
db 50 ; base attack
--- a/data/baseStats/omanyte.asm
+++ b/data/baseStats/omanyte.asm
@@ -1,4 +1,3 @@
-OmanyteBaseStats: ; 392da (e:52da)
db DEX_OMANYTE ; pokedex id
db 35 ; base hp
db 40 ; base attack
--- a/data/baseStats/omastar.asm
+++ b/data/baseStats/omastar.asm
@@ -1,4 +1,3 @@
-OmastarBaseStats: ; 392f6 (e:52f6)
db DEX_OMASTAR ; pokedex id
db 70 ; base hp
db 60 ; base attack
--- a/data/baseStats/onix.asm
+++ b/data/baseStats/onix.asm
@@ -1,4 +1,3 @@
-OnixBaseStats: ; 38e26 (e:4e26)
db DEX_ONIX ; pokedex id
db 35 ; base hp
db 45 ; base attack
--- a/data/baseStats/paras.asm
+++ b/data/baseStats/paras.asm
@@ -1,4 +1,3 @@
-ParasBaseStats: ; 388ca (e:48ca)
db DEX_PARAS ; pokedex id
db 35 ; base hp
db 70 ; base attack
--- a/data/baseStats/parasect.asm
+++ b/data/baseStats/parasect.asm
@@ -1,4 +1,3 @@
-ParasectBaseStats: ; 388e6 (e:48e6)
db DEX_PARASECT ; pokedex id
db 60 ; base hp
db 95 ; base attack
--- a/data/baseStats/persian.asm
+++ b/data/baseStats/persian.asm
@@ -1,4 +1,3 @@
-PersianBaseStats: ; 3898e (e:498e)
db DEX_PERSIAN ; pokedex id
db 65 ; base hp
db 70 ; base attack
--- a/data/baseStats/pidgeot.asm
+++ b/data/baseStats/pidgeot.asm
@@ -1,4 +1,3 @@
-PidgeotBaseStats: ; 385ba (e:45ba)
db DEX_PIDGEOT ; pokedex id
db 83 ; base hp
db 80 ; base attack
--- a/data/baseStats/pidgeotto.asm
+++ b/data/baseStats/pidgeotto.asm
@@ -1,4 +1,3 @@
-PidgeottoBaseStats: ; 3859e (e:459e)
db DEX_PIDGEOTTO ; pokedex id
db 63 ; base hp
db 60 ; base attack
--- a/data/baseStats/pidgey.asm
+++ b/data/baseStats/pidgey.asm
@@ -1,4 +1,3 @@
-PidgeyBaseStats: ; 38582 (e:4582)
db DEX_PIDGEY ; pokedex id
db 40 ; base hp
db 45 ; base attack
--- a/data/baseStats/pikachu.asm
+++ b/data/baseStats/pikachu.asm
@@ -1,4 +1,3 @@
-PikachuBaseStats: ; 3867e (e:467e)
db DEX_PIKACHU ; pokedex id
db 35 ; base hp
db 55 ; base attack
--- a/data/baseStats/pinsir.asm
+++ b/data/baseStats/pinsir.asm
@@ -1,4 +1,3 @@
-PinsirBaseStats: ; 391a6 (e:51a6)
db DEX_PINSIR ; pokedex id
db 65 ; base hp
db 125 ; base attack
--- a/data/baseStats/poliwag.asm
+++ b/data/baseStats/poliwag.asm
@@ -1,4 +1,3 @@
-PoliwagBaseStats: ; 38a52 (e:4a52)
db DEX_POLIWAG ; pokedex id
db 40 ; base hp
db 50 ; base attack
--- a/data/baseStats/poliwhirl.asm
+++ b/data/baseStats/poliwhirl.asm
@@ -1,4 +1,3 @@
-PoliwhirlBaseStats: ; 38a6e (e:4a6e)
db DEX_POLIWHIRL ; pokedex id
db 65 ; base hp
db 65 ; base attack
--- a/data/baseStats/poliwrath.asm
+++ b/data/baseStats/poliwrath.asm
@@ -1,4 +1,3 @@
-PoliwrathBaseStats: ; 38a8a (e:4a8a)
db DEX_POLIWRATH ; pokedex id
db 90 ; base hp
db 85 ; base attack
--- a/data/baseStats/ponyta.asm
+++ b/data/baseStats/ponyta.asm
@@ -1,4 +1,3 @@
-PonytaBaseStats: ; 38c2e (e:4c2e)
db DEX_PONYTA ; pokedex id
db 50 ; base hp
db 85 ; base attack
--- a/data/baseStats/porygon.asm
+++ b/data/baseStats/porygon.asm
@@ -1,4 +1,3 @@
-PorygonBaseStats: ; 392be (e:52be)
db DEX_PORYGON ; pokedex id
db 65 ; base hp
db 60 ; base attack
--- a/data/baseStats/primeape.asm
+++ b/data/baseStats/primeape.asm
@@ -1,4 +1,3 @@
-PrimeapeBaseStats: ; 389fe (e:49fe)
db DEX_PRIMEAPE ; pokedex id
db 65 ; base hp
db 105 ; base attack
@@ -14,14 +13,9 @@
dw PrimeapePicBack
; attacks known at lvl 0
db SCRATCH
-IF !DEF(_YELLOW)
- db LEER
-ENDC
+db LEER
db KARATE_CHOP
db FURY_SWIPES
-IF DEF(_YELLOW)
- db LOW_KICK
-ENDC
db 0 ; growth rate
; learnset
tmlearn 1,5,6,8
--- a/data/baseStats/psyduck.asm
+++ b/data/baseStats/psyduck.asm
@@ -1,4 +1,3 @@
-PsyduckBaseStats: ; 389aa (e:49aa)
db DEX_PSYDUCK ; pokedex id
db 50 ; base hp
db 52 ; base attack
--- a/data/baseStats/raichu.asm
+++ b/data/baseStats/raichu.asm
@@ -1,4 +1,3 @@
-RaichuBaseStats: ; 3869a (e:469a)
db DEX_RAICHU ; pokedex id
db 60 ; base hp
db 90 ; base attack
--- a/data/baseStats/rapidash.asm
+++ b/data/baseStats/rapidash.asm
@@ -1,4 +1,3 @@
-RapidashBaseStats: ; 38c4a (e:4c4a)
db DEX_RAPIDASH ; pokedex id
db 65 ; base hp
db 100 ; base attack
--- a/data/baseStats/raticate.asm
+++ b/data/baseStats/raticate.asm
@@ -1,4 +1,3 @@
-RaticateBaseStats: ; 385f2 (e:45f2)
db DEX_RATICATE ; pokedex id
db 55 ; base hp
db 81 ; base attack
--- a/data/baseStats/rattata.asm
+++ b/data/baseStats/rattata.asm
@@ -1,4 +1,3 @@
-RattataBaseStats: ; 385d6 (e:45d6)
db DEX_RATTATA ; pokedex id
db 30 ; base hp
db 56 ; base attack
--- a/data/baseStats/rhydon.asm
+++ b/data/baseStats/rhydon.asm
@@ -1,5 +1,3 @@
-MonBaseStats:
-RhydonBaseStats: ; 39002 (e:5002)
db DEX_RHYDON ; pokedex id
db 105 ; base hp
db 130 ; base attack
@@ -28,4 +26,3 @@
tmlearn 44,48
tmlearn 50,53,54
db 0 ; padding
-MonBaseStatsEnd:
--- a/data/baseStats/rhyhorn.asm
+++ b/data/baseStats/rhyhorn.asm
@@ -1,4 +1,3 @@
-RhyhornBaseStats: ; 38fe6 (e:4fe6)
db DEX_RHYHORN ; pokedex id
db 80 ; base hp
db 85 ; base attack
--- a/data/baseStats/sandshrew.asm
+++ b/data/baseStats/sandshrew.asm
@@ -1,4 +1,3 @@
-SandshrewBaseStats: ; 386b6 (e:46b6)
db DEX_SANDSHREW ; pokedex id
db 50 ; base hp
db 75 ; base attack
--- a/data/baseStats/sandslash.asm
+++ b/data/baseStats/sandslash.asm
@@ -1,4 +1,3 @@
-SandslashBaseStats: ; 386d2 (e:46d2)
db DEX_SANDSLASH ; pokedex id
db 75 ; base hp
db 100 ; base attack
--- a/data/baseStats/scyther.asm
+++ b/data/baseStats/scyther.asm
@@ -1,4 +1,3 @@
-ScytherBaseStats: ; 39136 (e:5136)
db DEX_SCYTHER ; pokedex id
db 70 ; base hp
db 110 ; base attack
--- a/data/baseStats/seadra.asm
+++ b/data/baseStats/seadra.asm
@@ -1,4 +1,3 @@
-SeadraBaseStats: ; 3908e (e:508e)
db DEX_SEADRA ; pokedex id
db 55 ; base hp
db 65 ; base attack
--- a/data/baseStats/seaking.asm
+++ b/data/baseStats/seaking.asm
@@ -1,4 +1,3 @@
-SeakingBaseStats: ; 390c6 (e:50c6)
db DEX_SEAKING ; pokedex id
db 80 ; base hp
db 92 ; base attack
--- a/data/baseStats/seel.asm
+++ b/data/baseStats/seel.asm
@@ -1,4 +1,3 @@
-SeelBaseStats: ; 38d2a (e:4d2a)
db DEX_SEEL ; pokedex id
db 65 ; base hp
db 45 ; base attack
--- a/data/baseStats/shellder.asm
+++ b/data/baseStats/shellder.asm
@@ -1,4 +1,3 @@
-ShellderBaseStats: ; 38d9a (e:4d9a)
db DEX_SHELLDER ; pokedex id
db 30 ; base hp
db 65 ; base attack
--- a/data/baseStats/slowbro.asm
+++ b/data/baseStats/slowbro.asm
@@ -1,4 +1,3 @@
-SlowbroBaseStats: ; 38c82 (e:4c82)
db DEX_SLOWBRO ; pokedex id
db 95 ; base hp
db 75 ; base attack
--- a/data/baseStats/slowpoke.asm
+++ b/data/baseStats/slowpoke.asm
@@ -1,4 +1,3 @@
-SlowpokeBaseStats: ; 38c66 (e:4c66)
db DEX_SLOWPOKE ; pokedex id
db 90 ; base hp
db 65 ; base attack
--- a/data/baseStats/snorlax.asm
+++ b/data/baseStats/snorlax.asm
@@ -1,4 +1,3 @@
-SnorlaxBaseStats: ; 39366 (e:5366)
db DEX_SNORLAX ; pokedex id
db 160 ; base hp
db 110 ; base attack
--- a/data/baseStats/spearow.asm
+++ b/data/baseStats/spearow.asm
@@ -1,4 +1,3 @@
-SpearowBaseStats: ; 3860e (e:460e)
db DEX_SPEAROW ; pokedex id
db 40 ; base hp
db 60 ; base attack
--- a/data/baseStats/squirtle.asm
+++ b/data/baseStats/squirtle.asm
@@ -1,4 +1,3 @@
-SquirtleBaseStats: ; 38486 (e:4486)
db DEX_SQUIRTLE ; pokedex id
db 44 ; base hp
db 48 ; base attack
--- a/data/baseStats/starmie.asm
+++ b/data/baseStats/starmie.asm
@@ -1,4 +1,3 @@
-StarmieBaseStats: ; 390fe (e:50fe)
db DEX_STARMIE ; pokedex id
db 60 ; base hp
db 75 ; base attack
--- a/data/baseStats/staryu.asm
+++ b/data/baseStats/staryu.asm
@@ -1,4 +1,3 @@
-StaryuBaseStats: ; 390e2 (e:50e2)
db DEX_STARYU ; pokedex id
db 30 ; base hp
db 45 ; base attack
--- a/data/baseStats/tangela.asm
+++ b/data/baseStats/tangela.asm
@@ -1,4 +1,3 @@
-TangelaBaseStats: ; 3903a (e:503a)
db DEX_TANGELA ; pokedex id
db 65 ; base hp
db 55 ; base attack
--- a/data/baseStats/tauros.asm
+++ b/data/baseStats/tauros.asm
@@ -1,4 +1,3 @@
-TaurosBaseStats: ; 391c2 (e:51c2)
db DEX_TAUROS ; pokedex id
db 75 ; base hp
db 100 ; base attack
--- a/data/baseStats/tentacool.asm
+++ b/data/baseStats/tentacool.asm
@@ -1,4 +1,3 @@
-TentacoolBaseStats: ; 38ba2 (e:4ba2)
db DEX_TENTACOOL ; pokedex id
db 40 ; base hp
db 40 ; base attack
--- a/data/baseStats/tentacruel.asm
+++ b/data/baseStats/tentacruel.asm
@@ -1,4 +1,3 @@
-TentacruelBaseStats: ; 38bbe (e:4bbe)
db DEX_TENTACRUEL ; pokedex id
db 80 ; base hp
db 70 ; base attack
--- a/data/baseStats/vaporeon.asm
+++ b/data/baseStats/vaporeon.asm
@@ -1,4 +1,3 @@
-VaporeonBaseStats: ; 3926a (e:526a)
db DEX_VAPOREON ; pokedex id
db 130 ; base hp
db 65 ; base attack
@@ -14,11 +13,7 @@
dw VaporeonPicBack
; attacks known at lvl 0
db TACKLE
-IF DEF(_YELLOW)
- db TAIL_WHIP
-ELSE
- db SAND_ATTACK
-ENDC
+db SAND_ATTACK
db QUICK_ATTACK
db WATER_GUN
db 0 ; growth rate
--- a/data/baseStats/venomoth.asm
+++ b/data/baseStats/venomoth.asm
@@ -1,4 +1,3 @@
-VenomothBaseStats: ; 3891e (e:491e)
db DEX_VENOMOTH ; pokedex id
db 70 ; base hp
db 65 ; base attack
@@ -15,13 +14,8 @@
; attacks known at lvl 0
db TACKLE
db DISABLE
-IF DEF(_YELLOW)
- db SUPERSONIC
- db CONFUSION
-ELSE
- db POISONPOWDER
- db LEECH_LIFE
-ENDC
+db POISONPOWDER
+db LEECH_LIFE
db 0 ; growth rate
; learnset
tmlearn 2,4,6
--- a/data/baseStats/venonat.asm
+++ b/data/baseStats/venonat.asm
@@ -1,4 +1,3 @@
-VenonatBaseStats: ; 38902 (e:4902)
db DEX_VENONAT ; pokedex id
db 60 ; base hp
db 55 ; base attack
@@ -22,15 +21,8 @@
tmlearn 6
tmlearn 9,10
tmlearn 20,21,22
-IF DEF(_YELLOW)
- tmlearn 29,30,31,32
- tmlearn 33,34,39
- tmlearn 44,46
- tmlearn 50,55
-ELSE
tmlearn 29,31,32
tmlearn 33,34
tmlearn 44,46
tmlearn 50
-ENDC
db 0 ; padding
--- a/data/baseStats/venusaur.asm
+++ b/data/baseStats/venusaur.asm
@@ -1,4 +1,3 @@
-VenusaurBaseStats: ; 38416 (e:4416)
db DEX_VENUSAUR ; pokedex id
db 80 ; base hp
db 82 ; base attack
--- a/data/baseStats/victreebel.asm
+++ b/data/baseStats/victreebel.asm
@@ -1,4 +1,3 @@
-VictreebelBaseStats: ; 38b86 (e:4b86)
db DEX_VICTREEBEL ; pokedex id
db 80 ; base hp
db 105 ; base attack
--- a/data/baseStats/vileplume.asm
+++ b/data/baseStats/vileplume.asm
@@ -1,4 +1,3 @@
-VileplumeBaseStats: ; 388ae (e:48ae)
db DEX_VILEPLUME ; pokedex id
db 75 ; base hp
db 80 ; base attack
--- a/data/baseStats/voltorb.asm
+++ b/data/baseStats/voltorb.asm
@@ -1,4 +1,3 @@
-VoltorbBaseStats: ; 38eb2 (e:4eb2)
db DEX_VOLTORB ; pokedex id
db 40 ; base hp
db 30 ; base attack
--- a/data/baseStats/vulpix.asm
+++ b/data/baseStats/vulpix.asm
@@ -1,4 +1,3 @@
-VulpixBaseStats: ; 387ce (e:47ce)
db DEX_VULPIX ; pokedex id
db 38 ; base hp
db 41 ; base attack
--- a/data/baseStats/wartortle.asm
+++ b/data/baseStats/wartortle.asm
@@ -1,4 +1,3 @@
-WartortleBaseStats: ; 384a2 (e:44a2)
db DEX_WARTORTLE ; pokedex id
db 59 ; base hp
db 63 ; base attack
--- a/data/baseStats/weedle.asm
+++ b/data/baseStats/weedle.asm
@@ -1,4 +1,3 @@
-WeedleBaseStats: ; 3852e (e:452e)
db DEX_WEEDLE ; pokedex id
db 40 ; base hp
db 35 ; base attack
--- a/data/baseStats/weepinbell.asm
+++ b/data/baseStats/weepinbell.asm
@@ -1,4 +1,3 @@
-WeepinbellBaseStats: ; 38b6a (e:4b6a)
db DEX_WEEPINBELL ; pokedex id
db 65 ; base hp
db 90 ; base attack
--- a/data/baseStats/weezing.asm
+++ b/data/baseStats/weezing.asm
@@ -1,4 +1,3 @@
-WeezingBaseStats: ; 38fca (e:4fca)
db DEX_WEEZING ; pokedex id
db 65 ; base hp
db 90 ; base attack
--- a/data/baseStats/wigglytuff.asm
+++ b/data/baseStats/wigglytuff.asm
@@ -1,4 +1,3 @@
-WigglytuffBaseStats: ; 38822 (e:4822)
db DEX_WIGGLYTUFF ; pokedex id
db 140 ; base hp
db 70 ; base attack
--- a/data/baseStats/zapdos.asm
+++ b/data/baseStats/zapdos.asm
@@ -1,4 +1,3 @@
-ZapdosBaseStats: ; 3939e (e:539e)
db DEX_ZAPDOS ; pokedex id
db 90 ; base hp
db 90 ; base attack
--- a/data/baseStats/zubat.asm
+++ b/data/baseStats/zubat.asm
@@ -1,4 +1,3 @@
-ZubatBaseStats: ; 3883e (e:483e)
db DEX_ZUBAT ; pokedex id
db 40 ; base hp
db 45 ; base attack
--- a/data/base_stats.asm
+++ b/data/base_stats.asm
@@ -35,7 +35,7 @@
INCLUDE "data/baseStats/clefairy.asm"
INCLUDE "data/baseStats/clefable.asm"
INCLUDE "data/baseStats/vulpix.asm"
-INCLUDE "data/baseStats/ninetails.asm"
+INCLUDE "data/baseStats/ninetales.asm"
INCLUDE "data/baseStats/jigglypuff.asm"
INCLUDE "data/baseStats/wigglytuff.asm"
INCLUDE "data/baseStats/zubat.asm"
--- a/data/mart_inventories.asm
+++ b/data/mart_inventories.asm
@@ -1,75 +1,64 @@
; mart inventories are below
; they are texts
-; first byte $FE, next byte # of items, last byte $FF
; Viridian
-ViridianMartText6:: ; 2442 (0:2442)
- db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF
+ViridianCashierText::
+ TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
; Pewter
-PewterMartText1:: ; 2449 (0:2449)
- db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING
- db PARLYZ_HEAL,$FF
+PewterCashierText::
+ TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Cerulean
-CeruleanMartText1:: ; 2453 (0:2453)
- db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING
- db PARLYZ_HEAL,$FF
+CeruleanCashierText::
+ TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Bike shop
- db $FE,1,BICYCLE,$FF
+ TX_MART BICYCLE
; Vermilion
-VermilionMartText1:: ; 2461 (0:2461)
- db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL
- db REPEL,$FF
+VermilionCashierText::
+ TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
; Lavender
-LavenderMartText1:: ; 246a (0:246a)
- db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL
- db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
+LavenderCashierText::
+ TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
; Celadon Dept. Store 2F (1)
-CeladonMart2Text1:: ; 2476 (0:2476)
- db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE
- db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
+CeladonMart2Clerk1Text::
+ TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
; Celadon Dept. Store 2F (2)
-CeladonMart2Text2:: ; 2482 (0:2482)
- db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF
+CeladonMart2Clerk2Text::
+ TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
; Celadon Dept. Store 4F
-CeladonMart4Text1:: ; 248e (0:248e)
- db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF
+CeladonMart4ClerkText::
+ TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
; Celadon Dept. Store 5F (1)
-CeladonMart5Text3:: ; 2496 (0:2496)
- db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
- db X_SPECIAL,$FF
+CeladonMart5Clerk1Text::
+ TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
; Celadon Dept. Store 5F (2)
-CeladonMart5Text4:: ; 24a0 (0:24a0)
- db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF
+CeladonMart5Clerk2Text::
+ TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
; Fuchsia
-FuchsiaMartText1:: ; 24a8 (0:24a8)
- db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL
- db SUPER_REPEL,$FF
+FuchsiaCashierText::
+ TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
-; unused? 24b1
- db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF
+; unused?
+ TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
; Cinnabar
-CinnabarMartText1:: ; 24b9 (0:24b9)
- db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE
- db FULL_HEAL,REVIVE,$FF
+CinnabarCashierText::
+ TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Saffron
-SaffronMartText1:: ; 24c3 (0:24c3)
- db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL
- db REVIVE,$FF
+SaffronCashierText::
+ TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Indigo
-IndigoPlateauLobbyText4:: ; 24cc (0:24cc)
- db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL
- db REVIVE,MAX_REPEL,$FF
+IndigoCashierText::
+ TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,17 +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@@@@"
- db KANGASKHAN,MUK, 0,"STICKY@@@@@"
- db MEW, MEW, 2,"BART@@@@@@@"
- db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
- db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
- 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@"
@@ -22,4 +10,3 @@
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,4 +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 wLoneAttackNo
@@ -31,167 +30,3 @@
db AGATHA,TOXIC
db LANCE,BARRIER
db $FF
-
-ELSE
-; yellow has its own format.
-
-; entry ≔ trainerclass, trainerid, moveset+, 0
-; moveset ≔ partymon, partymon'smove, moveid
-
-LoneMoves:
-TeamMoves:
- db BUG_CATCHER,$f
- db 2,2,TACKLE
- db 2,3,STRING_SHOT
- db 0
-
- db YOUNGSTER,$e
- db 1,4,FISSURE
- db 0
-
- db BROCK,$1
- db 2,3,BIND
- db 2,4,BIDE
- db 0
-
- db MISTY,$1
- db 2,4,BUBBLEBEAM
- db 0
-
- db LT_SURGE,$1
- db 1,1,THUNDERBOLT
- db 1,2,MEGA_PUNCH
- db 1,3,MEGA_KICK
- db 1,4,GROWL
- db 0
-
- db ERIKA,$1
- db 1,3,MEGA_DRAIN
- db 2,1,RAZOR_LEAF
- db 3,1,PETAL_DANCE
- db 0
-
- db KOGA,$1
- db 1,1,TOXIC
- db 1,2,TACKLE
- db 2,1,TOXIC
- db 2,3,SUPERSONIC
- db 3,1,TOXIC
- db 3,2,DOUBLE_EDGE
- db 4,1,LEECH_LIFE
- db 4,2,DOUBLE_TEAM
- db 4,3,PSYCHIC_M
- db 4,4,TOXIC
- db 0
-
- db BLAINE,$1
- db 1,1,FLAMETHROWER
- db 1,4,CONFUSE_RAY
- db 3,1,FLAMETHROWER
- db 3,2,FIRE_BLAST
- db 3,3,REFLECT
- db 0
-
- db SABRINA,$1
- db 1,1,FLASH
- db 2,1,KINESIS
- db 2,4,PSYWAVE
- db 3,1,PSYWAVE
- db 0
-
- db GIOVANNI,$3
- db 1,3,FISSURE
- db 2,2,DOUBLE_TEAM
- db 3,1,EARTHQUAKE
- db 3,3,THUNDER
- db 4,1,EARTHQUAKE
- db 4,2,LEER
- db 4,3,THUNDER
- db 5,1,ROCK_SLIDE
- db 5,4,EARTHQUAKE
- db 0
-
- db LORELEI,$1
- db 1,1,BUBBLEBEAM
- db 2,3,ICE_BEAM
- db 3,1,PSYCHIC_M
- db 3,2,SURF
- db 4,3,LOVELY_KISS
- db 5,3,BLIZZARD
- db 0
-
- db BRUNO,$1
- db 1,1,ROCK_SLIDE
- db 1,2,SCREECH
- db 1,4,DIG
- db 2,3,FIRE_PUNCH
- db 2,4,DOUBLE_TEAM
- db 3,1,DOUBLE_KICK
- db 3,2,MEGA_KICK
- db 3,4,DOUBLE_TEAM
- db 4,1,ROCK_SLIDE
- db 4,2,SCREECH
- db 4,4,EARTHQUAKE
- db 5,2,KARATE_CHOP
- db 5,3,STRENGTH
- db 0
-
- db AGATHA,$1
- db 1,2,SUBSTITUTE
- db 1,3,LICK
- db 1,4,MEGA_DRAIN
- db 2,2,TOXIC
- db 2,4,LEECH_LIFE
- db 3,2,LICK
- db 4,1,WRAP
- db 5,2,PSYCHIC_M
- db 0
-
- db LANCE,$1
- db 1,1,DRAGON_RAGE
- db 2,1,THUNDER_WAVE
- db 2,3,THUNDERBOLT
- db 3,1,BUBBLEBEAM
- db 3,2,WRAP
- db 3,3,ICE_BEAM
- db 4,1,WING_ATTACK
- db 4,2,SWIFT
- db 4,3,FLY
- db 5,1,BLIZZARD
- db 5,2,FIRE_BLAST
- db 5,3,THUNDER
- db 0
-
- db SONY3,$1
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,ICE_BEAM
- db 5,1,CONFUSE_RAY
- db 5,4,FIRE_SPIN
- db 6,3,QUICK_ATTACK
- db 0
-
- db SONY3,$2
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,THUNDERBOLT
- db 5,1,ICE_BEAM
- db 6,2,REFLECT
- db 6,3,QUICK_ATTACK
- db 0
-
- db SONY3,$3
- db 1,3,EARTHQUAKE
- db 2,4,KINESIS
- db 3,4,LEECH_SEED
- db 4,1,CONFUSE_RAY
- db 4,4,FIRE_SPIN
- db 5,1,THUNDERBOLT
- db 6,1,AURORA_BEAM
- db 6,3,QUICK_ATTACK
- db 0
-
- db $ff
-endc
--- a/data/wildPokemon/diglettscave.asm
+++ b/data/wildPokemon/diglettscave.asm
@@ -11,4 +11,3 @@
db 29,DUGTRIO
db 31,DUGTRIO
db $00
-
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wildPokemon/mansion1.asm
@@ -12,8 +12,7 @@
db 37,WEEZING
db 39,MUK
ENDC
-
- IF DEF(_GREEN) || DEF(_BLUE)
+ IF DEF(_BLUE)
db 32,GRIMER
db 30,GRIMER
db 34,PONYTA
@@ -25,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/mansion2.asm
+++ b/data/wildPokemon/mansion2.asm
@@ -12,8 +12,7 @@
db 39,WEEZING
db 37,MUK
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 32,VULPIX
db 34,GRIMER
db 34,GRIMER
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/mansion3.asm
+++ b/data/wildPokemon/mansion3.asm
@@ -12,8 +12,7 @@
db 36,PONYTA
db 42,MUK
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 31,GRIMER
db 33,VULPIX
db 35,GRIMER
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wildPokemon/mansionb1.asm
@@ -12,8 +12,7 @@
db 42,WEEZING
db 42,MUK
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 33,GRIMER
db 31,GRIMER
db 35,VULPIX
@@ -25,31 +24,4 @@
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 $00
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wildPokemon/mtmoon1.asm
@@ -1,27 +1,13 @@
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 7,ZUBAT
+ db 9,ZUBAT
+ db 8,GEODUDE
+ db 6,ZUBAT
+ db 10,ZUBAT
+ db 10,GEODUDE
+ db 8,PARAS
+ db 11,ZUBAT
+ db 8,CLEFAIRY
db $00
-
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wildPokemon/mtmoonb1.asm
@@ -1,27 +1,13 @@
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 7,ZUBAT
+ db 7,GEODUDE
+ db 8,GEODUDE
+ db 9,ZUBAT
+ db 10,PARAS
+ db 10,ZUBAT
+ db 11,ZUBAT
+ db 9,CLEFAIRY
+ db 9,GEODUDE
db $00
-
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wildPokemon/mtmoonb2.asm
@@ -1,27 +1,13 @@
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 9,ZUBAT
+ db 9,GEODUDE
+ db 10,ZUBAT
+ db 10,GEODUDE
+ db 11,ZUBAT
+ db 10,PARAS
+ db 12,PARAS
+ db 10,CLEFAIRY
+ db 12,ZUBAT
+ db 12,CLEFAIRY
db $00
-
--- a/data/wildPokemon/nomons.asm
+++ b/data/wildPokemon/nomons.asm
@@ -1,4 +1,3 @@
NoMons:
db $00
db $00
-
--- a/data/wildPokemon/pokemontower1.asm
+++ b/data/wildPokemon/pokemontower1.asm
@@ -1,4 +1,3 @@
TowerMons1:
db $00
db $00
-
--- a/data/wildPokemon/pokemontower2.asm
+++ b/data/wildPokemon/pokemontower2.asm
@@ -1,4 +1,3 @@
TowerMons2:
db $00
db $00
-
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wildPokemon/pokemontower3.asm
@@ -1,29 +1,13 @@
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 19,GASTLY
+ db 18,GASTLY
+ db 24,GASTLY
+ db 20,CUBONE
+ db 22,CUBONE
+ db 25,HAUNTER
db $00
-
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wildPokemon/pokemontower4.asm
@@ -1,29 +1,13 @@
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 19,GASTLY
+ db 18,GASTLY
+ db 25,HAUNTER
+ db 20,CUBONE
+ db 22,CUBONE
+ db 24,GASTLY
db $00
-
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wildPokemon/pokemontower5.asm
@@ -1,29 +1,13 @@
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 20,GASTLY
+ db 21,GASTLY
+ db 22,GASTLY
+ db 23,GASTLY
+ db 19,GASTLY
+ db 18,GASTLY
+ db 25,HAUNTER
+ db 20,CUBONE
+ db 22,CUBONE
+ db 24,GASTLY
db $00
-
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,29 +1,13 @@
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 21,GASTLY
+ db 22,GASTLY
+ db 23,GASTLY
+ db 24,GASTLY
+ db 20,GASTLY
+ db 19,GASTLY
+ db 26,HAUNTER
+ db 22,CUBONE
+ db 24,CUBONE
+ db 28,HAUNTER
db $00
-
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wildPokemon/pokemontower7.asm
@@ -1,29 +1,13 @@
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 21,GASTLY
+ db 22,GASTLY
+ db 23,GASTLY
+ db 24,GASTLY
+ db 20,GASTLY
+ db 28,HAUNTER
+ db 22,CUBONE
+ db 24,CUBONE
+ db 28,HAUNTER
+ db 30,HAUNTER
db $00
-
--- a/data/wildPokemon/powerplant.asm
+++ b/data/wildPokemon/powerplant.asm
@@ -1,34 +1,19 @@
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
+ db 21,VOLTORB
+ db 21,MAGNEMITE
+ db 20,PIKACHU
+ db 24,PIKACHU
+ db 23,MAGNEMITE
+ db 23,VOLTORB
+ db 32,MAGNETON
+ db 35,MAGNETON
+ IF DEF(_RED)
+ db 33,ELECTABUZZ
+ db 36,ELECTABUZZ
ENDC
-
+ IF DEF(_BLUE)
+ db 33,RAICHU
+ db 36,RAICHU
+ ENDC
db $00
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wildPokemon/rocktunnel1.asm
@@ -1,34 +1,13 @@
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 16,ZUBAT
+ db 17,ZUBAT
+ db 17,GEODUDE
+ db 15,MACHOP
+ db 16,GEODUDE
+ db 18,ZUBAT
+ db 15,ZUBAT
+ db 17,MACHOP
+ db 13,ONIX
+ db 15,ONIX
db $00
-
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,34 +1,13 @@
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 16,ZUBAT
+ db 17,ZUBAT
+ db 17,GEODUDE
+ db 15,MACHOP
+ db 16,GEODUDE
+ db 18,ZUBAT
+ db 17,MACHOP
+ db 17,ONIX
+ db 13,ONIX
+ db 18,GEODUDE
db $00
-
--- a/data/wildPokemon/route1.asm
+++ b/data/wildPokemon/route1.asm
@@ -1,27 +1,13 @@
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 3,RATTATA
+ db 3,RATTATA
+ db 2,RATTATA
+ db 2,PIDGEY
+ db 3,PIDGEY
+ db 3,PIDGEY
+ db 4,RATTATA
+ db 4,PIDGEY
+ db 5,PIDGEY
db $00
-
--- a/data/wildPokemon/route10.asm
+++ b/data/wildPokemon/route10.asm
@@ -1,6 +1,5 @@
Route10Mons:
db $0F
-
IF DEF(_RED)
db 16,VOLTORB
db 16,SPEAROW
@@ -13,8 +12,7 @@
db 13,EKANS
db 17,EKANS
ENDC
-
- IF DEF(_BLUE) || DEF(_GREEN)
+ IF DEF(_BLUE)
db 16,VOLTORB
db 16,SPEAROW
db 14,VOLTORB
@@ -26,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route11.asm
+++ b/data/wildPokemon/route11.asm
@@ -1,6 +1,5 @@
Route11Mons:
db $0F
-
IF DEF(_RED)
db 14,EKANS
db 15,SPEAROW
@@ -13,8 +12,7 @@
db 11,DROWZEE
db 15,DROWZEE
ENDC
-
- IF DEF(_GREEN) || DEF(_BLUE)
+ IF DEF(_BLUE)
db 14,SANDSHREW
db 15,SPEAROW
db 12,SANDSHREW
@@ -26,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route12.asm
+++ b/data/wildPokemon/route12.asm
@@ -1,7 +1,6 @@
Route12Mons:
db $0F
-
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db 24,ODDISH
db 25,PIDGEY
db 23,PIDGEY
@@ -12,10 +11,8 @@
db 27,PIDGEY
db 28,GLOOM
db 30,GLOOM
- db $00
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 24,BELLSPROUT
db 25,PIDGEY
db 23,PIDGEY
@@ -26,31 +23,5 @@
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,FARFETCHD
- db 31,FARFETCHD
-
- 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 $00
--- a/data/wildPokemon/route13.asm
+++ b/data/wildPokemon/route13.asm
@@ -1,5 +1,5 @@
Route13Mons:
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db $14
db 24,ODDISH
db 25,PIDGEY
@@ -11,10 +11,8 @@
db 25,DITTO
db 28,GLOOM
db 30,GLOOM
- db $00
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db $14
db 24,BELLSPROUT
db 25,PIDGEY
@@ -26,32 +24,5 @@
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,FARFETCHD
- db 31,FARFETCHD
-
- 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 $00
--- a/data/wildPokemon/route14.asm
+++ b/data/wildPokemon/route14.asm
@@ -1,6 +1,6 @@
Route14Mons:
db $0F
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db 24,ODDISH
db 26,PIDGEY
db 23,DITTO
@@ -12,8 +12,7 @@
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 24,BELLSPROUT
db 26,PIDGEY
db 23,DITTO
@@ -25,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route15.asm
+++ b/data/wildPokemon/route15.asm
@@ -1,6 +1,6 @@
Route15Mons:
db $0F
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db 24,ODDISH
db 26,DITTO
db 23,PIDGEY
@@ -12,8 +12,7 @@
db 28,PIDGEOTTO
db 30,PIDGEOTTO
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 24,BELLSPROUT
db 26,DITTO
db 23,PIDGEY
@@ -25,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route16.asm
+++ b/data/wildPokemon/route16.asm
@@ -1,28 +1,13 @@
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 20,SPEAROW
+ db 22,SPEAROW
+ db 18,RATTATA
+ db 20,DODUO
+ db 20,RATTATA
+ db 18,DODUO
+ db 22,DODUO
+ db 22,RATTATA
+ db 23,RATICATE
+ db 25,RATICATE
db $00
-
--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,29 +1,13 @@
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 20,SPEAROW
+ db 22,SPEAROW
+ db 25,RATICATE
+ db 24,DODUO
+ db 27,RATICATE
+ db 26,DODUO
+ db 28,DODUO
+ db 29,RATICATE
+ db 25,FEAROW
+ db 27,FEAROW
db $00
-
--- a/data/wildPokemon/route18.asm
+++ b/data/wildPokemon/route18.asm
@@ -1,29 +1,13 @@
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 20,SPEAROW
+ db 22,SPEAROW
+ db 25,RATICATE
+ db 24,DODUO
+ db 25,FEAROW
+ db 26,DODUO
+ db 28,DODUO
+ db 29,RATICATE
+ db 27,FEAROW
+ db 29,FEAROW
db $00
-
--- a/data/wildPokemon/route2.asm
+++ b/data/wildPokemon/route2.asm
@@ -1,39 +1,24 @@
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
+ db 3,RATTATA
+ db 3,PIDGEY
+ db 4,PIDGEY
+ db 4,RATTATA
+ db 5,PIDGEY
+ if DEF(_RED)
+ db 3,WEEDLE
ENDC
+ if DEF(_BLUE)
+ db 3,CATERPIE
+ ENDC
+ db 2,RATTATA
+ db 5,RATTATA
+ if DEF(_RED)
+ db 4,WEEDLE
+ db 5,WEEDLE
+ ENDC
+ if DEF(_BLUE)
+ db 4,CATERPIE
+ db 5,CATERPIE
+ ENDC
db $00
-
--- a/data/wildPokemon/route21.asm
+++ b/data/wildPokemon/route21.asm
@@ -1,30 +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 21,RATTATA
+ db 23,PIDGEY
+ db 30,RATICATE
+ db 23,RATTATA
+ db 21,PIDGEY
+ db 30,PIDGEOTTO
+ db 32,PIDGEOTTO
+ db 28,TANGELA
+ db 30,TANGELA
+ db 32,TANGELA
db $05
db 5,TENTACOOL
db 10,TENTACOOL
@@ -36,4 +21,3 @@
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL
-
--- a/data/wildPokemon/route22.asm
+++ b/data/wildPokemon/route22.asm
@@ -1,6 +1,6 @@
Route22Mons:
db $19
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db 3,RATTATA
db 3,NIDORAN_M
db 4,RATTATA
@@ -12,7 +12,7 @@
db 3,NIDORAN_F
db 4,NIDORAN_F
ENDC
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 3,RATTATA
db 3,NIDORAN_F
db 4,RATTATA
@@ -24,17 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route23.asm
+++ b/data/wildPokemon/route23.asm
@@ -1,39 +1,23 @@
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
+ 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
db $00
-
--- a/data/wildPokemon/route24.asm
+++ b/data/wildPokemon/route24.asm
@@ -1,6 +1,5 @@
Route24Mons:
db $19
-
IF DEF(_RED)
db 7,WEEDLE
db 8,KAKUNA
@@ -13,8 +12,7 @@
db 8,ABRA
db 12,ABRA
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 7,CATERPIE
db 8,METAPOD
db 12,PIDGEY
@@ -26,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route25.asm
+++ b/data/wildPokemon/route25.asm
@@ -1,6 +1,5 @@
Route25Mons:
db $0F
-
IF DEF(_RED)
db 8,WEEDLE
db 9,KAKUNA
@@ -13,8 +12,7 @@
db 7,METAPOD
db 8,CATERPIE
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 8,CATERPIE
db 9,METAPOD
db 13,PIDGEY
@@ -26,32 +24,4 @@
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,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 $00
-
--- a/data/wildPokemon/route3.asm
+++ b/data/wildPokemon/route3.asm
@@ -1,27 +1,13 @@
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 6,PIDGEY
+ db 5,SPEAROW
+ db 7,PIDGEY
+ db 6,SPEAROW
+ db 7,SPEAROW
+ db 8,PIDGEY
+ db 8,SPEAROW
+ db 3,JIGGLYPUFF
+ db 5,JIGGLYPUFF
+ db 7,JIGGLYPUFF
db $00
-
--- a/data/wildPokemon/route4.asm
+++ b/data/wildPokemon/route4.asm
@@ -1,6 +1,5 @@
Route4Mons:
db $14
-
IF DEF(_RED)
db 10,RATTATA
db 10,SPEAROW
@@ -13,8 +12,7 @@
db 8,EKANS
db 12,EKANS
ENDC
-
- IF DEF(_BLUE) || DEF(_GREEN)
+ IF DEF(_BLUE)
db 10,RATTATA
db 10,SPEAROW
db 8,RATTATA
@@ -26,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route5.asm
+++ b/data/wildPokemon/route5.asm
@@ -1,6 +1,5 @@
Route5Mons:
db $0F
-
IF DEF(_RED)
db 13,ODDISH
db 13,PIDGEY
@@ -13,8 +12,7 @@
db 14,MANKEY
db 16,MANKEY
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 13,BELLSPROUT
db 13,PIDGEY
db 15,PIDGEY
@@ -26,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route6.asm
+++ b/data/wildPokemon/route6.asm
@@ -1,6 +1,5 @@
Route6Mons:
db $0F
-
IF DEF(_RED)
db 13,ODDISH
db 13,PIDGEY
@@ -12,10 +11,8 @@
db 16,PIDGEY
db 14,MANKEY
db 16,MANKEY
- db $00
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 13,BELLSPROUT
db 13,PIDGEY
db 15,PIDGEY
@@ -26,45 +23,5 @@
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 $00
--- a/data/wildPokemon/route7.asm
+++ b/data/wildPokemon/route7.asm
@@ -1,6 +1,5 @@
Route7Mons:
db $0F
-
IF DEF(_RED)
db 19,PIDGEY
db 19,ODDISH
@@ -13,8 +12,7 @@
db 19,MANKEY
db 20,MANKEY
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 19,PIDGEY
db 19,BELLSPROUT
db 17,MEOWTH
@@ -26,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route8.asm
+++ b/data/wildPokemon/route8.asm
@@ -1,6 +1,5 @@
Route8Mons:
db $0F
-
IF DEF(_RED)
db 18,PIDGEY
db 18,MANKEY
@@ -13,8 +12,7 @@
db 15,GROWLITHE
db 18,GROWLITHE
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 18,PIDGEY
db 18,MEOWTH
db 17,SANDSHREW
@@ -26,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/route9.asm
+++ b/data/wildPokemon/route9.asm
@@ -1,6 +1,5 @@
Route9Mons:
db $0F
-
IF DEF(_RED)
db 16,RATTATA
db 16,SPEAROW
@@ -13,8 +12,7 @@
db 13,EKANS
db 17,EKANS
ENDC
-
- IF DEF(_GREEN) || DEF(_BLUE)
+ IF DEF(_BLUE)
db 16,RATTATA
db 16,SPEAROW
db 14,RATTATA
@@ -26,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wildPokemon/safarizone1.asm
@@ -1,6 +1,6 @@
ZoneMons1:
db $1E
- IF DEF(_RED) || (DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_RED)
db 24,NIDORAN_M
db 26,DODUO
db 22,PARAS
@@ -9,16 +9,10 @@
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 25,KANGASKHAN
db 28,SCYTHER
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 24,NIDORAN_F
db 26,DODUO
db 22,PARAS
@@ -30,19 +24,4 @@
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 $00
-
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wildPokemon/safarizone2.asm
@@ -1,48 +1,28 @@
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
+ IF DEF(_RED)
+ db 22,NIDORAN_M
ENDC
-
+ IF DEF(_BLUE)
+ db 22,NIDORAN_F
+ ENDC
+ db 26,RHYHORN
+ db 23,PARAS
+ db 25,EXEGGCUTE
+ IF DEF(_RED)
+ db 30,NIDORINO
+ ENDC
+ IF DEF(_BLUE)
+ db 30,NIDORINA
+ ENDC
+ db 27,EXEGGCUTE
+ IF DEF(_RED)
+ db 30,NIDORINA
+ ENDC
+ IF DEF(_BLUE)
+ db 30,NIDORINO
+ ENDC
+ db 32,VENOMOTH
+ db 26,CHANSEY
+ db 28,TAUROS
db $00
-
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wildPokemon/safarizone3.asm
@@ -12,8 +12,7 @@
db 26,TAUROS
db 28,KANGASKHAN
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 25,NIDORAN_F
db 26,DODUO
db 23,VENONAT
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wildPokemon/safarizonecenter.asm
@@ -12,8 +12,7 @@
db 23,SCYTHER
db 23,CHANSEY
ENDC
-
- IF DEF(_GREEN) || (!DEF(_JAPAN) && DEF(_BLUE))
+ IF DEF(_BLUE)
db 22,NIDORAN_F
db 25,RHYHORN
db 22,VENONAT
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wildPokemon/seafoamisland1.asm
@@ -12,8 +12,7 @@
db 28,SHELLDER
db 38,GOLDUCK
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 30,SEEL
db 30,PSYDUCK
db 30,STARYU
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wildPokemon/seafoamislandb1.asm
@@ -12,8 +12,7 @@
db 38,DEWGONG
db 37,SEADRA
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 30,SHELLDER
db 30,KRABBY
db 32,STARYU
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wildPokemon/seafoamislandb2.asm
@@ -12,8 +12,7 @@
db 30,GOLBAT
db 37,SLOWBRO
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 30,SEEL
db 30,PSYDUCK
db 32,SEEL
@@ -25,32 +24,4 @@
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 $00
-
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wildPokemon/seafoamislandb3.asm
@@ -12,8 +12,7 @@
db 39,SEADRA
db 37,DEWGONG
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 31,PSYDUCK
db 31,SEEL
db 33,PSYDUCK
@@ -25,44 +24,4 @@
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
-
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wildPokemon/seafoamislandb4.asm
@@ -12,8 +12,7 @@
db 39,SLOWBRO
db 32,GOLBAT
ENDC
-
- IF DEF(_GREEN) || !DEF(_JAPAN) && DEF(_BLUE)
+ IF DEF(_BLUE)
db 31,KRABBY
db 31,STARYU
db 33,KRABBY
@@ -25,44 +24,4 @@
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
-
--- a/data/wildPokemon/unknowndungeon1.asm
+++ b/data/wildPokemon/unknowndungeon1.asm
@@ -1,38 +1,18 @@
DungeonMons1:
db $0A
- IF DEF(_YELLOW)
- db 50,GOLBAT
- db 55,GOLBAT
- db 45,GRAVELER
- db 55,GLOOM
- db 55,WEEPINBELL
+ db 46,GOLBAT
+ db 46,HYPNO
+ db 46,MAGNETON
+ db 49,DODRIO
+ db 49,VENOMOTH
+ IF DEF(_RED)
+ db 52,ARBOK
+ ENDC
+ IF !DEF(_RED)
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 49,KADABRA
+ db 52,PARASECT
+ db 53,RAICHU
+ db 53,DITTO
db $00
-
--- a/data/wildPokemon/unknowndungeon2.asm
+++ b/data/wildPokemon/unknowndungeon2.asm
@@ -1,33 +1,13 @@
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 51,DODRIO
+ db 51,VENOMOTH
+ db 51,KADABRA
+ db 52,RHYDON
+ db 52,MAROWAK
+ db 52,ELECTRODE
+ db 56,CHANSEY
+ db 54,WIGGLYTUFF
+ db 55,DITTO
+ db 60,DITTO
db $00
-
--- a/data/wildPokemon/unknowndungeonb1.asm
+++ b/data/wildPokemon/unknowndungeonb1.asm
@@ -1,33 +1,18 @@
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
+ db 55,RHYDON
+ db 55,MAROWAK
+ db 55,ELECTRODE
+ db 64,CHANSEY
+ db 64,PARASECT
+ db 64,RAICHU
+ IF DEF(_RED)
+ db 57,ARBOK
ENDC
-
+ IF DEF(_BLUE)
+ db 57,SANDSLASH
+ ENDC
+ db 65,DITTO
+ db 63,DITTO
+ db 67,DITTO
db $00
-
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wildPokemon/victoryroad1.asm
@@ -1,29 +1,13 @@
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 24,MACHOP
+ db 26,GEODUDE
+ db 22,ZUBAT
+ db 36,ONIX
+ db 39,ONIX
+ db 42,ONIX
+ db 41,GRAVELER
+ db 41,GOLBAT
+ db 42,MACHOKE
+ db 43,MAROWAK
db $00
-
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wildPokemon/victoryroad2.asm
@@ -1,29 +1,13 @@
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 22,MACHOP
+ db 24,GEODUDE
+ db 26,ZUBAT
+ db 36,ONIX
+ db 39,ONIX
+ db 42,ONIX
+ db 41,MACHOKE
+ db 40,GOLBAT
+ db 40,MAROWAK
+ db 43,GRAVELER
db $00
-
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wildPokemon/victoryroad3.asm
@@ -1,29 +1,13 @@
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 24,MACHOP
+ db 26,GEODUDE
+ db 22,ZUBAT
+ db 42,ONIX
+ db 40,VENOMOTH
+ db 45,ONIX
+ db 43,GRAVELER
+ db 41,GOLBAT
+ db 42,MACHOKE
+ db 45,MACHOKE
db $00
-
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wildPokemon/viridianforest.asm
@@ -1,43 +1,25 @@
ForestMons:
- IF DEF(_YELLOW)
- db $19
- db 3,CATERPIE
+ db $08
+ IF DEF(_RED)
+ db 4,WEEDLE
+ db 5,KAKUNA
+ db 3,WEEDLE
+ db 5,WEEDLE
+ db 4,KAKUNA
+ db 6,KAKUNA
db 4,METAPOD
+ db 3,CATERPIE
+ ENDC
+ IF DEF(_BLUE)
db 4,CATERPIE
+ db 5,METAPOD
+ db 3,CATERPIE
db 5,CATERPIE
- db 4,PIDGEY
- db 6,PIDGEY
- db 6,CATERPIE
+ db 4,METAPOD
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
+ db 4,KAKUNA
+ db 3,WEEDLE
ENDC
-
-
+ db 3,PIKACHU
+ db 5,PIKACHU
db $00
-
--- a/data/wildPokemon/waterpokemon.asm
+++ b/data/wildPokemon/waterpokemon.asm
@@ -1,6 +1,5 @@
WaterMons:
db $00
-
db $05
db 5,TENTACOOL
db 10,TENTACOOL
@@ -12,4 +11,3 @@
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL
-
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -373,9 +373,6 @@
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine2.2bpp"
-ENDC
MoveAnimation: ; 78d5e (1e:4d5e)
push hl
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1727,7 +1727,7 @@
ld bc, NUM_MOVES
call CopyData
ld de, wBattleMonLevel
- ld bc, $b
+ ld bc, wBattleMonPP - wBattleMonLevel
call CopyData
ld a, [wBattleMonSpecies2]
ld [wd0b5], a
@@ -1771,7 +1771,7 @@
ld bc, NUM_MOVES
call CopyData
ld de, wEnemyMonLevel
- ld bc, $b
+ ld bc, wEnemyMonPP - wEnemyMonLevel
call CopyData
ld a, [wEnemyMonSpecies]
ld [wd0b5], a
@@ -1913,11 +1913,11 @@
call PlaceString
ld hl, wBattleMonSpecies
ld de, wLoadedMon
- ld bc, $c
+ ld bc, wBattleMonDVs - wBattleMonSpecies
call CopyData
ld hl, wBattleMonLevel
ld de, wLoadedMonLevel
- ld bc, $b
+ ld bc, wBattleMonPP - wBattleMonLevel
call CopyData
coord hl, 14, 8
push hl
@@ -2982,11 +2982,7 @@
jp Delay3
DisabledText: ; 3d555 (f:5555)
-IF DEF(_YELLOW)
- db "Disabled!@"
-ELSE
db "disabled!@"
-ENDC
TypeText: ; 3d55f (f:555f)
db "TYPE@"
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -863,7 +863,7 @@
jr nc,.healHP ; if it's a Full Restore or one of the potions
; fall through if it's one of the status-specifc healing items
.cureStatusAilment
- ld bc,4
+ ld bc,wPartyMon1Status - wPartyMon1
add hl,bc ; hl now points to status
ld a,[wcf91]
lb bc, ANTIDOTE_MSG, 1 << PSN
@@ -2039,7 +2039,7 @@
cp a,ETHER
jr nc,.useEther ; if Ether or Max Ether
.usePPUp
- ld bc,21
+ ld bc,wPartyMon1PP - wPartyMon1Moves
add hl,bc
ld a,[hl] ; move PP
cp a,3 << 6 ; have 3 PP Ups already been used?
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -343,9 +343,6 @@
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
-IF DEF(_YELLOW)
- next "PRINT BOX"
-ENDC
next "SEE YA!"
db "@"
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -367,9 +367,6 @@
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
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -219,22 +219,6 @@
db "@"
ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayer:
- db "NEW NAME"
- next "YELLOW"
- next "ASH"
- next "JACK"
- db "@"
-
-DefaultNamesRival:
- db "NEW NAME"
- next "BLUE"
- next "GARY"
- next "JOHN"
- db "@"
-ENDC
-
GetDefaultName: ; 6ad6 (1:6ad6)
; a = name index
; hl = name list
@@ -282,18 +266,6 @@
db "RED@"
db "ASH@"
db "JACK@"
-ENDC
-IF DEF(_YELLOW)
-DefaultNamesPlayerList:
- db "NEW NAME@"
- db "YELLOW@"
- db "ASH@"
- db "JACK@"
-DefaultNamesRivalList:
- db "NEW NAME@"
- db "BLUE@"
- db "GARY@"
- db "JOHN@"
ENDC
TextTerminator_6b20: ; 6b20 (1:6b20)
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -888,6 +888,3 @@
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine1.2bpp"
ENDC
-IF DEF(_YELLOW)
- INCBIN "gfx/yellow/slotmachine1.2bpp"
-ENDC
--- a/macros.asm
+++ b/macros.asm
@@ -41,6 +41,8 @@
ld [MBC1RomBank], a
ENDM
+farcall EQUS "callba"
+
callba: MACRO
ld b, BANK(\1)
ld hl, \1
@@ -210,6 +212,15 @@
TX_ASM: MACRO
db $08
+ ENDM
+
+TX_MART: MACRO
+ db $FE, _NARG
+ rept _NARG
+ db \1
+ shift
+ endr
+ db $FF
ENDM
; Predef macro.
--- a/red.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-_RED EQU 1
-INCLUDE "charmap.asm"
--- a/red/audio.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "red.asm"
-INCLUDE "audio.asm"
--- a/red/main.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "red.asm"
-INCLUDE "main.asm"
--- a/red/text.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "red.asm"
-INCLUDE "text.asm"
--- a/red/wram.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "red.asm"
-INCLUDE "wram.asm"
--- a/scripts/celadonmart1.asm
+++ b/scripts/celadonmart1.asm
@@ -1,19 +1,19 @@
-CeladonMart1Script: ; 60f86 (18:4f86)
+CeladonMart1Script:
jp EnableAutoTextBoxDrawing
-CeladonMart1TextPointers: ; 60f89 (18:4f89)
+CeladonMart1TextPointers:
dw CeladonMart1Text1
dw CeladonMart1Text2
dw CeladonMart1Text3
-CeladonMart1Text1: ; 60f8f (18:4f8f)
+CeladonMart1Text1:
TX_FAR _CeladonMart1Text1
db "@"
-CeladonMart1Text2: ; 60f94 (18:4f94)
+CeladonMart1Text2:
TX_FAR _CeladonMart1Text2
db "@"
-CeladonMart1Text3: ; 60f99 (18:4f99)
+CeladonMart1Text3:
TX_FAR _CeladonMart1Text3
db "@"
--- a/scripts/celadonmart2.asm
+++ b/scripts/celadonmart2.asm
@@ -1,21 +1,21 @@
-CeladonMart2Script: ; 560f5 (15:60f5)
+CeladonMart2Script:
jp EnableAutoTextBoxDrawing
-CeladonMart2TextPointers: ; 560f8 (15:60f8)
- dw CeladonMart2Text1
- dw CeladonMart2Text2
+CeladonMart2TextPointers:
+ dw CeladonMart2Clerk1Text
+ dw CeladonMart2Clerk2Text
dw CeladonMart2Text3
dw CeladonMart2Text4
dw CeladonMart2Text5
-CeladonMart2Text3: ; 56102 (15:6102)
+CeladonMart2Text3:
TX_FAR _CeladonMart2Text3
db "@"
-CeladonMart2Text4: ; 56107 (15:6107)
+CeladonMart2Text4:
TX_FAR _CeladonMart2Text4
db "@"
-CeladonMart2Text5: ; 5610c (15:610c)
+CeladonMart2Text5:
TX_FAR _CeladonMart2Text5
db "@"
--- a/scripts/celadonmart3.asm
+++ b/scripts/celadonmart3.asm
@@ -1,7 +1,7 @@
-CeladonMart3Script: ; 48225 (12:4225)
+CeladonMart3Script:
jp EnableAutoTextBoxDrawing
-CeladonMart3TextPointers: ; 48228 (12:4228)
+CeladonMart3TextPointers:
dw CeladonMart3Text1
dw CeladonMart3Text2
dw CeladonMart3Text3
@@ -20,7 +20,7 @@
dw CeladonMart3Text16
dw CeladonMart3Text17
-CeladonMart3Text1: ; 4824a (12:424a)
+CeladonMart3Text1:
TX_ASM
CheckEvent EVENT_GOT_TM18
jr nz, .asm_a5463
@@ -41,67 +41,67 @@
call PrintText
jp TextScriptEnd
-TM18PreReceiveText: ; 48278 (12:4278)
+TM18PreReceiveText:
TX_FAR _TM18PreReceiveText
db "@"
-ReceivedTM18Text: ; 4827d (12:427d)
+ReceivedTM18Text:
TX_FAR _ReceivedTM18Text
db $0B, "@"
-TM18ExplanationText: ; 48283 (12:4283)
+TM18ExplanationText:
TX_FAR _TM18ExplanationText
db "@"
-TM18NoRoomText: ; 48288 (12:4288)
+TM18NoRoomText:
TX_FAR _TM18NoRoomText
db "@"
-CeladonMart3Text2: ; 4828d (12:428d)
+CeladonMart3Text2:
TX_FAR _CeladonMart3Text2
db "@"
-CeladonMart3Text3: ; 48292 (12:4292)
+CeladonMart3Text3:
TX_FAR _CeladonMart3Text3
db "@"
-CeladonMart3Text4: ; 48297 (12:4297)
+CeladonMart3Text4:
TX_FAR _CeladonMart3Text4
db "@"
-CeladonMart3Text5: ; 4829c (12:429c)
+CeladonMart3Text5:
TX_FAR _CeladonMart3Text5
db "@"
CeladonMart3Text12
-CeladonMart3Text10: ; 482a1 (12:42a1)
-CeladonMart3Text8: ; 482a1 (12:42a1)
-CeladonMart3Text6: ; 482a1 (12:42a1)
+CeladonMart3Text10:
+CeladonMart3Text8:
+CeladonMart3Text6:
TX_FAR _CeladonMart3Text6
db "@"
-CeladonMart3Text7: ; 482a6 (12:42a6)
+CeladonMart3Text7:
TX_FAR _CeladonMart3Text7
db "@"
-CeladonMart3Text9: ; 482ab (12:42ab)
+CeladonMart3Text9:
TX_FAR _CeladonMart3Text9
db "@"
-CeladonMart3Text11: ; 482b0 (12:42b0)
+CeladonMart3Text11:
TX_FAR _CeladonMart3Text11
db "@"
-CeladonMart3Text13: ; 482b5 (12:42b5)
+CeladonMart3Text13:
TX_FAR _CeladonMart3Text13
db "@"
-CeladonMart3Text14: ; 482ba (12:42ba)
+CeladonMart3Text14:
TX_FAR _CeladonMart3Text14
db "@"
-CeladonMart3Text17: ; 482bf (12:42bf)
-CeladonMart3Text16: ; 482bf (12:42bf)
-CeladonMart3Text15: ; 482bf (12:42bf)
+CeladonMart3Text17:
+CeladonMart3Text16:
+CeladonMart3Text15:
TX_FAR _CeladonMart3Text15
db "@"
--- a/scripts/celadonmart4.asm
+++ b/scripts/celadonmart4.asm
@@ -1,20 +1,20 @@
-CeladonMart4Script: ; 48356 (12:4356)
+CeladonMart4Script:
jp EnableAutoTextBoxDrawing
-CeladonMart4TextPointers: ; 48359 (12:4359)
- dw CeladonMart4Text1
+CeladonMart4TextPointers:
+ dw CeladonMart4ClerkText
dw CeladonMart4Text2
dw CeladonMart4Text3
dw CeladonMart4Text4
-CeladonMart4Text2: ; 48361 (12:4361)
+CeladonMart4Text2:
TX_FAR _CeladonMart4Text2
db "@"
-CeladonMart4Text3: ; 48366 (12:4366)
+CeladonMart4Text3:
TX_FAR _CeladonMart4Text3
db "@"
-CeladonMart4Text4: ; 4836b (12:436b)
+CeladonMart4Text4:
TX_FAR _CeladonMart4Text4
db "@"
--- a/scripts/celadonmart5.asm
+++ b/scripts/celadonmart5.asm
@@ -1,21 +1,21 @@
-CeladonMart5Script: ; 49069 (12:5069)
+CeladonMart5Script:
jp EnableAutoTextBoxDrawing
-CeladonMart5TextPointers: ; 4906c (12:506c)
+CeladonMart5TextPointers:
dw CeladonMart5Text1
dw CeladonMart5Text2
- dw CeladonMart5Text3
- dw CeladonMart5Text4
+ dw CeladonMart5Clerk1Text
+ dw CeladonMart5Clerk2Text
dw CeladonMart5Text5
-CeladonMart5Text1: ; 49076 (12:5076)
+CeladonMart5Text1:
TX_FAR _CeladonMart5Text1
db "@"
-CeladonMart5Text2: ; 4907b (12:507b)
+CeladonMart5Text2:
TX_FAR _CeladonMart5Text2
db "@"
-CeladonMart5Text5: ; 49080 (12:5080)
+CeladonMart5Text5:
TX_FAR _CeladonMart5Text5
db "@"
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorScript: ; 48600 (12:4600)
+CeladonMartElevatorScript:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -14,7 +14,7 @@
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
-CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
+CeladonMartElevatorScript_4861c:
ld hl, wWarpEntries
ld a, [wWarpedFromWhichWarp]
ld b, a
@@ -22,7 +22,7 @@
ld c, a
call CeladonMartElevatorScript_4862a
-CeladonMartElevatorScript_4862a: ; 4862a (12:462a)
+CeladonMartElevatorScript_4862a:
inc hl
inc hl
ld a, b
@@ -31,24 +31,24 @@
ld [hli], a
ret
-CeladonMartElevatorScript_48631: ; 48631 (12:4631)
- ld hl, CeladonMartElavatorFloors
+CeladonMartElevatorScript_48631:
+ ld hl, CeladonMartElevatorFloors
call LoadItemList
- ld hl, CeldaonMartElevatorWarpMaps
+ ld hl, CeladonMartElevatorWarpMaps
ld de, wElevatorWarpMaps
- ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps
+ ld bc, CeladonMartElevatorWarpMapsEnd - CeladonMartElevatorWarpMaps
jp CopyData
-CeladonMartElavatorFloors: ; 48643 (12:4643)
- db $05 ; num elements in list
+CeladonMartElevatorFloors:
+ db 5 ; number of elements in list
db FLOOR_1F
db FLOOR_2F
db FLOOR_3F
db FLOOR_4F
db FLOOR_5F
- db $FF ; terminator
+ db $FF
-CeldaonMartElevatorWarpMaps: ; 4864a (12:464a)
+CeladonMartElevatorWarpMaps:
; first byte is warp number
; second byte is map number
; These specify where the player goes after getting out of the elevator.
@@ -57,17 +57,17 @@
db $02, CELADON_MART_3
db $02, CELADON_MART_4
db $02, CELADON_MART_5
-CeldaonMartElevatorWarpMapsEnd:
+CeladonMartElevatorWarpMapsEnd:
-CeladonMartElevatorScript_48654: ; 48654 (12:4654)
+CeladonMartElevatorScript_48654:
jpba ShakeElevator
-CeladonMartElevatorTextPointers: ; 4865c (12:465c)
+CeladonMartElevatorTextPointers:
dw CeladonMartElevatorText1
-CeladonMartElevatorText1: ; 4865e (12:465e)
+CeladonMartElevatorText1:
TX_ASM
call CeladonMartElevatorScript_48631
- ld hl, CeldaonMartElevatorWarpMaps
+ ld hl, CeladonMartElevatorWarpMaps
predef DisplayElevatorFloorMenu
jp TextScriptEnd
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -1,7 +1,7 @@
-CeladonMartRoofScript: ; 483d5 (12:43d5)
+CeladonMartRoofScript:
jp EnableAutoTextBoxDrawing
-CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8)
+CeladonMartRoofScript_GetDrinksInBag:
; construct a list of all drinks in the player's bag
xor a
ld [wFilteredBagItemsCount], a
@@ -34,13 +34,13 @@
ld [de], a
ret
-CeladonMartRoofDrinkList: ; 48408 (12:4408)
+CeladonMartRoofDrinkList:
db FRESH_WATER
db SODA_POP
db LEMONADE
db $00
-CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c)
+CeladonMartRoofScript_GiveDrinkToGirl:
ld hl, wd730
set 6, [hl]
ld hl, CeladonMartRoofText_484ee
@@ -130,19 +130,19 @@
ld hl, CeladonMartRoofText_4852c
jp PrintText
-RemoveItemByIDBank12: ; 484e6 (12:44e6)
+RemoveItemByIDBank12:
jpba RemoveItemByID
-CeladonMartRoofText_484ee: ; 484ee (12:44ee)
+CeladonMartRoofText_484ee:
TX_FAR _CeladonMartRoofText_484ee
db "@"
-CeladonMartRoofText_484f3: ; 484f3 (12:44f3)
+CeladonMartRoofText_484f3:
TX_FAR _CeladonMartRoofText_484f3
db $0d
db "@"
-CeladonMartRoofText_484f9: ; 484f9 (12:44f9)
+CeladonMartRoofText_484f9:
TX_FAR _CeladonMartRoofText_484f9
db $0b
TX_FAR _CeladonMartRoofText_484fe
@@ -149,12 +149,12 @@
db $0d
db "@"
-CeladonMartRoofText_48504: ; 48504 (12:4504)
+CeladonMartRoofText_48504:
TX_FAR _CeladonMartRoofText_48504
db $0d
db "@"
-CeladonMartRoofText_4850a: ; 4850a (12:450a)
+CeladonMartRoofText_4850a:
TX_FAR _CeladonMartRoofText_4850a
db $0b
TX_FAR _CeladonMartRoofText_4850f
@@ -161,12 +161,12 @@
db $0d
db "@"
-CeladonMartRoofText_48515: ; 48515 (12:4515)
+CeladonMartRoofText_48515:
TX_FAR _CeladonMartRoofText_48515
db $0d
db "@"
-ReceivedTM49Text: ; 4851b (12:451b)
+ReceivedTM49Text:
TX_FAR _ReceivedTM49Text
db $0b
TX_FAR _CeladonMartRoofText_48520
@@ -173,17 +173,17 @@
db $0d
db "@"
-CeladonMartRoofText_48526: ; 48526 (12:4526)
+CeladonMartRoofText_48526:
TX_FAR _CeladonMartRoofText_48526
db $0d
db "@"
-CeladonMartRoofText_4852c: ; 4852c (12:452c)
+CeladonMartRoofText_4852c:
TX_FAR _CeladonMartRoofText_4852c
db $0d
db "@"
-CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532)
+CeladonMartRoofScript_PrintDrinksInBag:
ld hl, wFilteredBagItems
xor a
ld [hItemCounter], a
@@ -205,7 +205,7 @@
pop hl
jr .loop
-CeladonMartRoofTextPointers: ; 4855b (12:455b)
+CeladonMartRoofTextPointers:
dw CeladonMartRoofText1
dw CeladonMartRoofText2
dw CeladonMartRoofText5
@@ -213,11 +213,11 @@
dw CeladonMartRoofText5
dw CeladonMartRoofText6
-CeladonMartRoofText1: ; 48567 (12:4567)
+CeladonMartRoofText1:
TX_FAR _CeladonMartRoofText1
db "@"
-CeladonMartRoofText2: ; 4856c (12:456c)
+CeladonMartRoofText2:
TX_ASM
call CeladonMartRoofScript_GetDrinksInBag
ld a, [wFilteredBagItemsCount]
@@ -239,17 +239,17 @@
.done
jp TextScriptEnd
-CeladonMartRoofText3: ; 48598 (12:4598)
+CeladonMartRoofText3:
TX_FAR _CeladonMartRoofText_48598
db "@"
-CeladonMartRoofText4: ; 4859d (12:459d)
+CeladonMartRoofText4:
TX_FAR _CeladonMartRoofText4
db "@"
-CeladonMartRoofText5: ; 485a2 (12:45a2)
+CeladonMartRoofText5:
db $f5
-CeladonMartRoofText6: ; 485a3 (12:45a3)
+CeladonMartRoofText6:
TX_FAR _CeladonMartRoofText6
db "@"
--- a/scripts/celadonpokecenter.asm
+++ b/scripts/celadonpokecenter.asm
@@ -1,23 +1,23 @@
-CeladonPokecenterScript: ; 488b8 (12:48b8)
+CeladonPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-CeladonPokecenterTextPointers: ; 488be (12:48be)
- dw CeladonPokecenterText1
+CeladonPokecenterTextPointers:
+ dw CeladonHealNurseText
dw CeladonPokecenterText2
dw CeladonPokecenterText3
- dw CeladonPokecenterText4
+ dw CeladonTradeNurseText
-CeladonPokecenterText4: ; 488c6 (12:48c6)
+CeladonTradeNurseText:
db $f6
-CeladonPokecenterText1: ; 488c7 (12:48c7)
+CeladonHealNurseText:
db $ff
-CeladonPokecenterText2: ; 488c8 (12:48c8)
+CeladonPokecenterText2:
TX_FAR _CeladonPokecenterText2
db "@"
-CeladonPokecenterText3: ; 488cd (12:48cd)
+CeladonPokecenterText3:
TX_FAR _CeladonPokecenterText3
db "@"
--- a/scripts/ceruleanmart.asm
+++ b/scripts/ceruleanmart.asm
@@ -1,15 +1,15 @@
-CeruleanMartScript: ; 5c895 (17:4895)
+CeruleanMartScript:
jp EnableAutoTextBoxDrawing
-CeruleanMartTextPointers: ; 5c898 (17:4898)
- dw CeruleanMartText1
+CeruleanMartTextPointers:
+ dw CeruleanCashierText
dw CeruleanMartText2
dw CeruleanMartText3
-CeruleanMartText2: ; 5c89e (17:489e)
+CeruleanMartText2:
TX_FAR _CeruleanMartText2
db "@"
-CeruleanMartText3: ; 5c8a3 (17:48a3)
+CeruleanMartText3:
TX_FAR _CeruleanMartText3
db "@"
--- a/scripts/ceruleanpokecenter.asm
+++ b/scripts/ceruleanpokecenter.asm
@@ -1,23 +1,23 @@
-CeruleanPokecenterScript: ; 5c645 (17:4645)
+CeruleanPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-CeruleanPokecenterTextPointers: ; 5c64b (17:464b)
- dw CeruleanPokecenterText1
+CeruleanPokecenterTextPointers:
+ dw CeruleanHealNurseText
dw CeruleanPokecenterText2
dw CeruleanPokecenterText3
- dw CeruleanPokecenterText4
+ dw CeruleanTradeNurseText
-CeruleanPokecenterText4: ; 5c653 (17:4653)
+CeruleanTradeNurseText:
db $f6
-CeruleanPokecenterText1: ; 5c654 (17:4654)
+CeruleanHealNurseText:
db $ff
-CeruleanPokecenterText2: ; 5c655 (17:4655)
- TX_FAR _CeruleanPokecenterText1
+CeruleanPokecenterText2:
+ TX_FAR _CeruleanPokecenterText2
db "@"
-CeruleanPokecenterText3: ; 5c65a (17:465a)
+CeruleanPokecenterText3:
TX_FAR _CeruleanPokecenterText3
db "@"
--- a/scripts/cinnabarmart.asm
+++ b/scripts/cinnabarmart.asm
@@ -1,15 +1,15 @@
-CinnabarMartScript: ; 75e7e (1d:5e7e)
+CinnabarMartScript:
jp EnableAutoTextBoxDrawing
-CinnabarMartTextPointers: ; 75e81 (1d:5e81)
- dw CinnabarMartText1
+CinnabarMartTextPointers:
+ dw CinnabarCashierText
dw CinnabarMartText2
dw CinnabarMartText3
-CinnabarMartText2: ; 75e87 (1d:5e87)
+CinnabarMartText2:
TX_FAR _CinnabarMartText2
db "@"
-CinnabarMartText3: ; 75e8c (1d:5e8c)
+CinnabarMartText3:
TX_FAR _CinnabarMartText3
db "@"
--- a/scripts/cinnabarpokecenter.asm
+++ b/scripts/cinnabarpokecenter.asm
@@ -1,23 +1,23 @@
-CinnabarPokecenterScript: ; 75e2c (1d:5e2c)
+CinnabarPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32)
- dw CinnabarPokecenterText1
+CinnabarPokecenterTextPointers:
+ dw CinnabarHealNurseText
dw CinnabarPokecenterText2
dw CinnabarPokecenterText3
- dw CinnabarPokecenterText4
+ dw CinnabarTradeNurseText
-CinnabarPokecenterText1: ; 75e3a (1d:5e3a)
+CinnabarHealNurseText:
db $ff
-CinnabarPokecenterText2: ; 75e3b (1d:5e3b)
- TX_FAR _CinnabarPokecenterText1
+CinnabarPokecenterText2:
+ TX_FAR _CinnabarPokecenterText2
db "@"
-CinnabarPokecenterText3: ; 75e40 (1d:5e40)
+CinnabarPokecenterText3:
TX_FAR _CinnabarPokecenterText3
db "@"
-CinnabarPokecenterText4: ; 75e45 (1d:5e45)
+CinnabarTradeNurseText:
db $f6
--- a/scripts/fuchsiamart.asm
+++ b/scripts/fuchsiamart.asm
@@ -1,15 +1,15 @@
-FuchsiaMartScript: ; 1dd88 (7:5d88)
+FuchsiaMartScript:
jp EnableAutoTextBoxDrawing
-FuchsiaMartTextPointers: ; 1dd8b (7:5d8b)
- dw FuchsiaMartText1
+FuchsiaMartTextPointers:
+ dw FuchsiaCashierText
dw FuchsiaMartText2
dw FuchsiaMartText3
-FuchsiaMartText2: ; 1dd91 (7:5d91)
+FuchsiaMartText2:
TX_FAR _FuchsiaMartText2
db "@"
-FuchsiaMartText3: ; 1dd96 (7:5d96)
+FuchsiaMartText3:
TX_FAR _FuchsiaMartText3
db "@"
--- a/scripts/fuchsiapokecenter.asm
+++ b/scripts/fuchsiapokecenter.asm
@@ -1,23 +1,23 @@
-FuchsiaPokecenterScript: ; 75063 (1d:5063)
+FuchsiaPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-FuchsiaPokecenterTextPointers: ; 75069 (1d:5069)
- dw FuchsiaPokecenterText1
+FuchsiaPokecenterTextPointers:
+ dw FuchsiaHealNurseText
dw FuchsiaPokecenterText2
dw FuchsiaPokecenterText3
- dw FuchsiaPokecenterText4
+ dw FuchsiaTradeNurseText
-FuchsiaPokecenterText1: ; 75071 (1d:5071)
+FuchsiaHealNurseText:
db $ff
-FuchsiaPokecenterText2: ; 75072 (1d:5072)
+FuchsiaPokecenterText2:
TX_FAR _FuchsiaPokecenterText1
db "@"
-FuchsiaPokecenterText3: ; 75077 (1d:5077)
+FuchsiaPokecenterText3:
TX_FAR _FuchsiaPokecenterText3
db "@"
-FuchsiaPokecenterText4: ; 7507c (1d:507c)
+FuchsiaTradeNurseText:
db $f6
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
+IndigoPlateauLobbyScript:
call Serial_TryEstablishingExternallyClockedConnection
call EnableAutoTextBoxDrawing
ld hl, wCurrentMapScriptFlags
@@ -14,23 +14,23 @@
ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
ret
-IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f)
- dw IndigoPlateauLobbyText1
+IndigoPlateauLobbyTextPointers:
+ dw IndigoHealNurseText
dw IndigoPlateauLobbyText2
dw IndigoPlateauLobbyText3
- dw IndigoPlateauLobbyText4
- dw IndigoPlateauLobbyText5
+ dw IndigoCashierText
+ dw IndigoTradeNurseText
-IndigoPlateauLobbyText1: ; 19c89 (6:5c89)
+IndigoHealNurseText:
db $ff
-IndigoPlateauLobbyText2: ; 19c8a (6:5c8a)
- TX_FAR _IndigoPlateauLobbyText1
+IndigoPlateauLobbyText2:
+ TX_FAR _IndigoPlateauLobbyText2
db "@"
-IndigoPlateauLobbyText3: ; 19c8f (6:5c8f)
+IndigoPlateauLobbyText3:
TX_FAR _IndigoPlateauLobbyText3
db "@"
-IndigoPlateauLobbyText5: ; 19c94 (6:5c94)
+IndigoTradeNurseText:
db $f6
--- a/scripts/lavendermart.asm
+++ b/scripts/lavendermart.asm
@@ -1,32 +1,32 @@
-LavenderMartScript: ; 5c92c (17:492c)
+LavenderMartScript:
jp EnableAutoTextBoxDrawing
-LavenderMartTextPointers: ; 5c92f (17:492f)
- dw LavenderMartText1
+LavenderMartTextPointers:
+ dw LavenderCashierText
dw LavenderMartText2
dw LavenderMartText3
-LavenderMartText2: ; 5c935 (17:4935)
+LavenderMartText2:
TX_FAR _LavenderMartText2
db "@"
-LavenderMartText3: ; 5c93a (17:493a)
+LavenderMartText3:
TX_ASM
CheckEvent EVENT_RESCUED_MR_FUJI
- jr nz, .asm_c88d4
- ld hl, LavenderMart_5c953
+ jr nz, .Nugget
+ ld hl, .ReviveText
call PrintText
- jr .asm_6d225
-.asm_c88d4
- ld hl, LavenderMart_5c958
+ jr .done
+.Nugget
+ ld hl, .NuggetText
call PrintText
-.asm_6d225
+.done
jp TextScriptEnd
-LavenderMart_5c953: ; 5c953 (17:4953)
- TX_FAR _LavenderMart_5c953
+.ReviveText
+ TX_FAR _LavenderMartReviveText
db "@"
-LavenderMart_5c958: ; 5c958 (17:4958)
- TX_FAR _LavenderMart_5c958
+.NuggetText
+ TX_FAR _LavenderMartNuggetText
db "@"
--- a/scripts/lavenderpokecenter.asm
+++ b/scripts/lavenderpokecenter.asm
@@ -1,23 +1,23 @@
-LavenderPokecenterScript: ; 5c8da (17:48da)
+LavenderPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0)
- dw LavenderPokecenterText1
+LavenderPokecenterTextPointers:
+ dw LavenderHealNurseText
dw LavenderPokecenterText2
dw LavenderPokecenterText3
- dw LavenderPokecenterText4
+ dw LavenderTradeNurseText
-LavenderPokecenterText4: ; 5c8e8 (17:48e8)
+LavenderTradeNurseText:
db $f6
-LavenderPokecenterText1: ; 5c8e9 (17:48e9)
+LavenderHealNurseText:
db $ff
-LavenderPokecenterText2: ; 5c8ea (17:48ea)
- TX_FAR _LavenderPokecenterText1
+LavenderPokecenterText2:
+ TX_FAR _LavenderPokecenterText2
db "@"
-LavenderPokecenterText3: ; 5c8ef (17:48ef)
+LavenderPokecenterText3:
TX_FAR _LavenderPokecenterText3
db "@"
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -1,31 +1,31 @@
-MtMoonPokecenterScript: ; 492cf (12:52cf)
+MtMoonPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-MtMoonPokecenterTextPointers: ; 492d5 (12:52d5)
- dw MtMoonPokecenterText1
+MtMoonPokecenterTextPointers:
+ dw MtMoonHealNurseText
dw MtMoonPokecenterText2
dw MtMoonPokecenterText3
- dw MtMoonPokecenterText4
+ dw MagikarpSalesmanText
dw MtMoonPokecenterText5
- dw MtMoonPokecenterText6
+ dw MtMoonTradeNurseText
-MtMoonPokecenterText1: ; 492e1 (12:52e1)
+MtMoonHealNurseText:
db $ff
-MtMoonPokecenterText2: ; 492e2 (12:52e2)
+MtMoonPokecenterText2:
TX_FAR _MtMoonPokecenterText1
db "@"
-MtMoonPokecenterText3: ; 492e7 (12:52e7)
+MtMoonPokecenterText3:
TX_FAR _MtMoonPokecenterText3
db "@"
-MtMoonPokecenterText4: ; 492ec (12:52ec)
+MagikarpSalesmanText:
TX_ASM
CheckEvent EVENT_BOUGHT_MAGIKARP, 1
jp c, .alreadyBoughtMagikarp
- ld hl, MtMoonPokecenterText_4935c
+ ld hl, .Text1
call PrintText
ld a, MONEY_BOX
ld [wTextBoxID], a
@@ -40,7 +40,7 @@
ld [hMoney + 1], a
call HasEnoughMoney
jr nc, .enoughMoney
- ld hl, MtMoonPokecenterText_49366
+ ld hl, .NoMoneyText
jr .printText
.enoughMoney
lb bc, MAGIKARP, 5
@@ -61,34 +61,34 @@
SetEvent EVENT_BOUGHT_MAGIKARP
jr .done
.choseNo
- ld hl, MtMoonPokecenterText_49361
+ ld hl, .RefuseText
jr .printText
.alreadyBoughtMagikarp
- ld hl, MtMoonPokecenterText_4936b
+ ld hl, .Text2
.printText
call PrintText
.done
jp TextScriptEnd
-MtMoonPokecenterText_4935c: ; 4935c (12:535c)
- TX_FAR _MtMoonPokecenterText_4935c
+.Text1
+ TX_FAR _MagikarpSalesmanText1
db "@"
-MtMoonPokecenterText_49361: ; 49361 (12:5361)
- TX_FAR _MtMoonPokecenterText_49361
+.RefuseText
+ TX_FAR _MagikarpSalesmanNoText
db "@"
-MtMoonPokecenterText_49366: ; 49366 (12:5366)
- TX_FAR _MtMoonPokecenterText_49366
+.NoMoneyText
+ TX_FAR _MagikarpSalesmanNoMoneyText
db "@"
-MtMoonPokecenterText_4936b: ; 4936b (12:536b)
- TX_FAR _MtMoonPokecenterText_4936b
+.Text2
+ TX_FAR _MagikarpSalesmanText2
db "@"
-MtMoonPokecenterText5: ; 49370 (12:5370)
+MtMoonPokecenterText5:
TX_FAR _MtMoonPokecenterText5
db "@"
-MtMoonPokecenterText6: ; 49375 (12:5375)
+MtMoonTradeNurseText:
db $f6
--- a/scripts/pewtermart.asm
+++ b/scripts/pewtermart.asm
@@ -1,30 +1,28 @@
-PewterMartScript: ; 74cad (1d:4cad)
+PewterMartScript:
call EnableAutoTextBoxDrawing
ld a, $1
ld [wAutoTextBoxDrawingControl], a
ret
-PewterMartTextPointers: ; 74cb6 (1d:4cb6)
- dw PewterMartText1
+PewterMartTextPointers:
+ dw PewterCashierText
dw PewterMartText2
dw PewterMartText3
-PewterMartText2: ; 74cbc (1d:4cbc)
+PewterMartText2:
TX_ASM
- ld hl, PewterMartText_74cc6
+ ld hl, .Text
call PrintText
jp TextScriptEnd
-
-PewterMartText_74cc6: ; 74cc6 (1d:4cc6)
- TX_FAR _PewterMartText_74cc6
+.Text
+ TX_FAR _PewterMartText2
db "@"
-PewterMartText3: ; 74ccb (1d:4ccb)
+PewterMartText3:
TX_ASM
- ld hl, PewterMartText_74cd5
+ ld hl, .Text
call PrintText
jp TextScriptEnd
-
-PewterMartText_74cd5: ; 74cd5 (1d:4cd5)
- TX_FAR _PewterMartText_74cd5
+.Text
+ TX_FAR _PewterMartText3
db "@"
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -1,25 +1,25 @@
-PewterPokecenterScript: ; 5c587 (17:4587)
+PewterPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-PewterPokecenterTextPointers: ; 5c58d (17:458d)
- dw PewterPokecenterText1
+PewterPokecenterTextPointers:
+ dw PewterHealNurseText
dw PewterPokecenterText2
- dw PewterPokecenterText3
- dw PewterPokecenterText4
+ dw PewterJigglypuffText
+ dw PewterTradeNurseText
-PewterPokecenterText1: ; 5c595 (17:4595)
+PewterHealNurseText:
db $ff
-PewterPokecenterText2: ; 5c596 (17:4596)
- TX_FAR _PewterPokecenterText1
+PewterPokecenterText2:
+ TX_FAR _PewterPokecenterText2
db "@"
-PewterPokecenterText3: ; 5c59b (17:459b)
+PewterJigglypuffText:
TX_ASM
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
- ld hl, PewterPokecenterText5
+ ld hl, .Text
call PrintText
ld a, $ff
call PlaySound
@@ -70,11 +70,11 @@
call PlayDefaultMusic
jp TextScriptEnd
-PewterPokecenterText5: ; 5c603 (17:4603)
- TX_FAR _PewterPokecenterText5
+.Text
+ TX_FAR _PewterJigglypuffText
db "@"
-JigglypuffFacingDirections: ; 5c608 (17:4608)
+JigglypuffFacingDirections:
db $30 | SPRITE_FACING_DOWN
db $30 | SPRITE_FACING_LEFT
db $30 | SPRITE_FACING_UP
@@ -81,5 +81,5 @@
db $30 | SPRITE_FACING_RIGHT
JigglypuffFacingDirectionsEnd:
-PewterPokecenterText4: ; 5c60c (17:460c)
+PewterTradeNurseText:
db $f6
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -1,27 +1,27 @@
-PowerPlantScript: ; 1e2c6 (7:62c6)
+PowerPlantScript:
call EnableAutoTextBoxDrawing
ld hl, PowerPlantTrainerHeaders
- ld de, PowerPlantScriptPointers
+ ld de, .ScriptPointers
ld a, [wPowerPlantCurScript]
call ExecuteCurMapScriptInTable
ld [wPowerPlantCurScript], a
ret
-PowerPlantScriptPointers: ; 1e2d9 (7:62d9)
+.ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-PowerPlantTextPointers: ; 1e2df (7:62df)
- dw PowerPlantText1
- dw PowerPlantText2
- dw PowerPlantText3
- dw PowerPlantText4
- dw PowerPlantText5
- dw PowerPlantText6
- dw PowerPlantText7
- dw PowerPlantText8
- dw PowerPlantText9
+PowerPlantTextPointers:
+ dw Voltorb0Text
+ dw Voltorb1Text
+ dw Voltorb2Text
+ dw Voltorb3Text
+ dw Voltorb4Text
+ dw Voltorb5Text
+ dw Voltorb6Text
+ dw Voltorb7Text
+ dw ZapdosText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
@@ -28,83 +28,83 @@
dw PickUpItemText
dw PickUpItemText
-PowerPlantTrainerHeaders: ; 1e2fb (7:62fb)
-PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0
+PowerPlantTrainerHeaders:
+Voltorb0TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader1: ; 1e307 (7:6307)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1
+Voltorb1TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader2: ; 1e313 (7:6313)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2
+Voltorb2TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader3: ; 1e31f (7:631f)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3
+Voltorb3TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader4: ; 1e32b (7:632b)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4
+Voltorb4TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader5: ; 1e337 (7:6337)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5
+Voltorb5TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader6: ; 1e343 (7:6343)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6
+Voltorb6TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader7: ; 1e34f (7:634f)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+Voltorb7TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader8: ; 1e35b (7:635b)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+ZapdosTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_ZAPDOS, 1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+ dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1
dw ZapdosBattleText ; TextBeforeBattle
dw ZapdosBattleText ; TextAfterBattle
dw ZapdosBattleText ; TextEndBattle
@@ -112,62 +112,62 @@
db $ff
-InitVoltorbBattle: ; 1e368 (7:6368)
+InitVoltorbBattle:
call TalkToTrainer
ld a, [wCurMapScript]
ld [wPowerPlantCurScript], a
jp TextScriptEnd
-PowerPlantText1: ; 1e374 (7:6374)
+Voltorb0Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader0
+ ld hl, Voltorb0TrainerHeader
jr InitVoltorbBattle
-PowerPlantText2: ; 1e37a (7:637a)
+Voltorb1Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader1
+ ld hl, Voltorb1TrainerHeader
jr InitVoltorbBattle
-PowerPlantText3: ; 1e380 (7:6380)
+Voltorb2Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader2
+ ld hl, Voltorb2TrainerHeader
jr InitVoltorbBattle
-PowerPlantText4: ; 1e386 (7:6386)
+Voltorb3Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader3
+ ld hl, Voltorb3TrainerHeader
jr InitVoltorbBattle
-PowerPlantText5: ; 1e38c (7:638c)
+Voltorb4Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader4
+ ld hl, Voltorb4TrainerHeader
jr InitVoltorbBattle
-PowerPlantText6: ; 1e392 (7:6392)
+Voltorb5Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader5
+ ld hl, Voltorb5TrainerHeader
jr InitVoltorbBattle
-PowerPlantText7: ; 1e398 (7:6398)
+Voltorb6Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader6
+ ld hl, Voltorb6TrainerHeader
jr InitVoltorbBattle
-PowerPlantText8: ; 1e39e (7:639e)
+Voltorb7Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader7
+ ld hl, Voltorb7TrainerHeader
jr InitVoltorbBattle
-PowerPlantText9: ; 1e3a4 (7:63a4)
+ZapdosText:
TX_ASM
- ld hl, PowerPlantTrainerHeader8
+ ld hl, ZapdosTrainerHeader
jr InitVoltorbBattle
-VoltorbBattleText: ; 1e3aa (7:63aa)
+VoltorbBattleText:
TX_FAR _VoltorbBattleText
db "@"
-ZapdosBattleText: ; 1e3af (7:63af)
+ZapdosBattleText:
TX_FAR _ZapdosBattleText
TX_ASM
ld a, ZAPDOS
--- a/scripts/rocktunnelpokecenter.asm
+++ b/scripts/rocktunnelpokecenter.asm
@@ -1,23 +1,23 @@
-RockTunnelPokecenterScript: ; 493ba (12:53ba)
+RockTunnelPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0)
- dw RockTunnelPokecenterText1
+RockTunnelPokecenterTextPointers:
+ dw RockTunnelHealNurseText
dw RockTunnelPokecenterText2
dw RockTunnelPokecenterText3
- dw RockTunnelPokecenterText4
+ dw RockTunnelTradeNurseText
-RockTunnelPokecenterText1: ; 493c8 (12:53c8)
+RockTunnelHealNurseText:
db $ff
-RockTunnelPokecenterText2: ; 493c9 (12:53c9)
- TX_FAR _RockTunnelPokecenterText1
+RockTunnelPokecenterText2:
+ TX_FAR _RockTunnelPokecenterText2
db "@"
-RockTunnelPokecenterText3: ; 493ce (12:53ce)
+RockTunnelPokecenterText3:
TX_FAR _RockTunnelPokecenterText3
db "@"
-RockTunnelPokecenterText4: ; 493d3 (12:53d3)
+RockTunnelTradeNurseText:
db $f6
--- a/scripts/saffronmart.asm
+++ b/scripts/saffronmart.asm
@@ -1,15 +1,15 @@
-SaffronMartScript: ; 5d409 (17:5409)
+SaffronMartScript:
jp EnableAutoTextBoxDrawing
-SaffronMartTextPointers: ; 5d40c (17:540c)
- dw SaffronMartText1
+SaffronMartTextPointers:
+ dw SaffronCashierText
dw SaffronMartText2
dw SaffronMartText3
-SaffronMartText2: ; 5d412 (17:5412)
+SaffronMartText2:
TX_FAR _SaffronMartText2
db "@"
-SaffronMartText3: ; 5d417 (17:5417)
+SaffronMartText3:
TX_FAR _SaffronMartText3
db "@"
--- a/scripts/saffronpokecenter.asm
+++ b/scripts/saffronpokecenter.asm
@@ -1,23 +1,23 @@
-SaffronPokecenterScript: ; 5d535 (17:5535)
+SaffronPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-SaffronPokecenterTextPointers: ; 5d53b (17:553b)
- dw SaffronPokecenterText1
+SaffronPokecenterTextPointers:
+ dw SaffronHealNurseText
dw SaffronPokecenterText2
dw SaffronPokecenterText3
- dw SaffronPokecenterText4
+ dw SaffronTradeNurseText
-SaffronPokecenterText1: ; 5d543 (17:5543)
+SaffronHealNurseText:
db $ff
-SaffronPokecenterText2: ; 5d544 (17:5544)
- TX_FAR _SaffronPokecenterText1
+SaffronPokecenterText2:
+ TX_FAR _SaffronPokecenterText2
db "@"
-SaffronPokecenterText3: ; 5d549 (17:5549)
+SaffronPokecenterText3:
TX_FAR _SaffronPokecenterText3
db "@"
-SaffronPokecenterText4: ; 5d54e (17:554e)
+SaffronTradeNurseText:
db $f6
--- a/scripts/seafoamislands1.asm
+++ b/scripts/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Script: ; 447e9 (11:47e9)
+SeafoamIslands1Script:
call EnableAutoTextBoxDrawing
SetEvent EVENT_IN_SEAFOAM_ISLANDS
ld hl, wFlags_0xcd60
@@ -37,11 +37,11 @@
ld hl, Seafoam1HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam1HolesCoords: ; 44846 (11:4846)
+Seafoam1HolesCoords:
db $06,$11
db $06,$18
db $ff
-SeafoamIslands1TextPointers: ; 4484b (11:484b)
+SeafoamIslands1TextPointers:
dw BoulderText
dw BoulderText
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Script: ; 46315 (11:6315)
+SeafoamIslands2Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -36,11 +36,11 @@
ld hl, Seafoam2HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam2HolesCoords: ; 4636d (11:636d)
+Seafoam2HolesCoords:
db $06,$12
db $06,$17
db $ff
-SeafoamIslands2TextPointers: ; 46372 (11:6372)
+SeafoamIslands2TextPointers:
dw BoulderText
dw BoulderText
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Script: ; 46451 (11:6451)
+SeafoamIslands3Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -36,11 +36,11 @@
ld hl, Seafoam3HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam3HolesCoords: ; 464a9 (11:64a9)
+Seafoam3HolesCoords:
db $06,$13
db $06,$16
db $ff
-SeafoamIslands3TextPointers: ; 464ae (11:64ae)
+SeafoamIslands3TextPointers:
dw BoulderText
dw BoulderText
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Script: ; 4658d (11:658d)
+SeafoamIslands4Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -44,18 +44,18 @@
ld a, [wSeafoamIslands4CurScript]
jp CallFunctionInTable
-Seafoam4HolesCoords: ; 465f6 (11:65f6)
+Seafoam4HolesCoords:
db $10,$03
db $10,$06
db $ff
-SeafoamIslands4ScriptPointers: ; 465fb (11:65fb)
+SeafoamIslands4ScriptPointers:
dw SeafoamIslands4Script0
dw SeafoamIslands4Script1
dw SeafoamIslands4Script2
dw SeafoamIslands4Script3
-SeafoamIslands4Script0: ; 46603 (11:6603)
+SeafoamIslands4Script0:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z
ld a, [wYCoord]
@@ -76,13 +76,13 @@
ld [wSeafoamIslands4CurScript], a
ret
-RLEMovement46632: ; 46632 (11:6632)
+RLEMovement46632:
db D_DOWN,6
db D_RIGHT,5
db D_DOWN,3
db $ff
-SeafoamIslands4Script1: ; 46639 (11:6639)
+SeafoamIslands4Script1:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
@@ -90,7 +90,7 @@
ld [wSeafoamIslands4CurScript], a
ret
-SeafoamIslands4Script2: ; 46644 (11:6644)
+SeafoamIslands4Script2:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z
ld a, [wXCoord]
@@ -119,7 +119,7 @@
ld [wSeafoamIslands4CurScript], a
ret
-RLEData_4667f: ; 4667f (11:667f)
+RLEData_4667f:
db D_DOWN,$06
db D_RIGHT,$02
db D_DOWN,$04
@@ -126,13 +126,13 @@
db D_LEFT,$01
db $FF
-RLEData_46688: ; 46688 (11:6688)
+RLEData_46688:
db D_DOWN,$06
db D_RIGHT,$02
db D_DOWN,$04
db $FF
-SeafoamIslands4Script3: ; 4668f (11:668f)
+SeafoamIslands4Script3:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
@@ -140,7 +140,7 @@
ld [wSeafoamIslands4CurScript], a
ret
-SeafoamIslands4TextPointers: ; 4669a (11:669a)
+SeafoamIslands4TextPointers:
dw BoulderText
dw BoulderText
dw BoulderText
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -1,16 +1,16 @@
-SeafoamIslands5Script: ; 46799 (11:6799)
+SeafoamIslands5Script:
call EnableAutoTextBoxDrawing
ld a, [wSeafoamIslands5CurScript]
ld hl, SeafoamIslands5ScriptPointers
jp CallFunctionInTable
-SeafoamIslands5Script_467a5: ; 467a5 (11:67a5)
+SeafoamIslands5Script_467a5:
xor a
ld [wSeafoamIslands5CurScript], a
ld [wJoyIgnore], a
ret
-SeafoamIslands5ScriptPointers: ; 467ad (11:67ad)
+SeafoamIslands5ScriptPointers:
dw SeafoamIslands5Script0
dw SeafoamIslands5Script1
dw SeafoamIslands5Script2
@@ -17,7 +17,7 @@
dw SeafoamIslands5Script3
dw SeafoamIslands5Script4
-SeafoamIslands5Script4: ; 467b7 (11:67b7)
+SeafoamIslands5Script4:
ld a, [wIsInBattle]
cp $ff
jr z, SeafoamIslands5Script_467a5
@@ -26,10 +26,10 @@
ld [wSeafoamIslands5CurScript], a
ret
-SeafoamIslands5Script0: ; 467c7 (11:67c7)
+SeafoamIslands5Script0:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z
- ld hl, CoordsData_467fe
+ ld hl, .Coords
call ArePlayerCoordsInArray
ret nc
ld a, [wCoordIndex]
@@ -52,7 +52,7 @@
ld [wSeafoamIslands5CurScript], a
ret
-CoordsData_467fe: ; 467fe (11:67fe)
+.Coords
db $11,$14
db $11,$15
db $10,$14
@@ -59,7 +59,7 @@
db $10,$15
db $FF
-SeafoamIslands5Script1: ; 46807 (11:6807)
+SeafoamIslands5Script1:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
@@ -69,11 +69,11 @@
ld [wSeafoamIslands5CurScript], a
ret
-SeafoamIslands5Script2: ; 46816 (11:6816)
+SeafoamIslands5Script2:
CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
ld a, $0
jr z, .asm_46849
- ld hl, CoordsData_4684d
+ ld hl, .Coords
call ArePlayerCoordsInArray
ld a, $0
jr nc, .asm_46849
@@ -95,24 +95,24 @@
ld [wSeafoamIslands5CurScript], a
ret
-CoordsData_4684d: ; 4684d (11:684d)
+.Coords
db $0E,$04
db $0E,$05
db $FF
-RLEMovementData_46852: ; 46852 (11:6852)
+RLEMovementData_46852:
db D_UP,$03
db D_RIGHT,$02
db D_UP,$01
db $FF
-RLEMovementData_46859: ; 46859 (11:6859)
+RLEMovementData_46859:
db D_UP,$03
db D_RIGHT,$03
db D_UP,$01
db $FF
-SeafoamIslands5Script3: ; 46860 (11:6860)
+SeafoamIslands5Script3:
ld a, [wSimulatedJoypadStatesIndex]
ld b, a
cp $1
@@ -124,41 +124,40 @@
ld [wSeafoamIslands5CurScript], a
ret
-SeaFoamIslands5Script_46872: ; 46872 (11:6872)
+SeaFoamIslands5Script_46872:
xor a
ld [wWalkBikeSurfState], a
ld [wWalkBikeSurfStateCopy], a
jp ForceBikeOrSurf
-SeafoamIslands5TextPointers: ; 4687c (11:687c)
+SeafoamIslands5TextPointers:
dw BoulderText
dw BoulderText
- dw SeafoamIslands5Text3
+ dw ArticunoText
dw SeafoamIslands5Text4
dw SeafoamIslands5Text5
-SeafoamIslands5TrainerHeaders: ; 46886 (11:6886)
-SeafoamIslands5TrainerHeader0: ; 46886 (11:6886)
- dbEventFlagBit EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0
+ArticunoTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_ARTICUNO
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0
- dw SeafoamIslands5BattleText2 ; TextBeforeBattle
- dw SeafoamIslands5BattleText2 ; TextAfterBattle
- dw SeafoamIslands5BattleText2 ; TextEndBattle
- dw SeafoamIslands5BattleText2 ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_ARTICUNO
+ dw ArticunoBattleText ; TextBeforeBattle
+ dw ArticunoBattleText ; TextAfterBattle
+ dw ArticunoBattleText ; TextEndBattle
+ dw ArticunoBattleText ; TextEndBattle
db $ff
-SeafoamIslands5Text3: ; 46893 (11:6893)
+ArticunoText:
TX_ASM
- ld hl, SeafoamIslands5TrainerHeader0
+ ld hl, ArticunoTrainerHeader
call TalkToTrainer
ld a, $4
ld [wSeafoamIslands5CurScript], a
jp TextScriptEnd
-SeafoamIslands5BattleText2: ; 468a2 (11:68a2)
- TX_FAR _SeafoamIslands5BattleText2
+ArticunoBattleText:
+ TX_FAR _ArticunoBattleText
TX_ASM
ld a, ARTICUNO
call PlayCry
@@ -165,10 +164,10 @@
call WaitForSoundToFinish
jp TextScriptEnd
-SeafoamIslands5Text4: ; 468b2 (11:68b2)
+SeafoamIslands5Text4:
TX_FAR _SeafoamIslands5Text4
db "@"
-SeafoamIslands5Text5: ; 468b7 (11:68b7)
+SeafoamIslands5Text5:
TX_FAR _SeafoamIslands5Text5
db "@"
--- a/scripts/unknowndungeon1.asm
+++ b/scripts/unknowndungeon1.asm
@@ -1,7 +1,7 @@
-UnknownDungeon1Script: ; 74d0c (1d:4d0c)
+UnknownDungeon1Script:
jp EnableAutoTextBoxDrawing
-UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f)
+UnknownDungeon1TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
--- a/scripts/unknowndungeon2.asm
+++ b/scripts/unknowndungeon2.asm
@@ -1,7 +1,7 @@
-UnknownDungeon2Script: ; 45e0b (11:5e0b)
+UnknownDungeon2Script:
jp EnableAutoTextBoxDrawing
-UnknownDungeon2TextPointers: ; 45e0e (11:5e0e)
+UnknownDungeon2TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -1,42 +1,42 @@
-UnknownDungeon3Script: ; 45ef0 (11:5ef0)
+UnknownDungeon3Script:
call EnableAutoTextBoxDrawing
ld hl, UnknownDungeon3TrainerHeaders
- ld de, UnknownDungeon3ScriptPointers
+ ld de, .ScriptPointers
ld a, [wUnknownDungeon3CurScript]
call ExecuteCurMapScriptInTable
ld [wUnknownDungeon3CurScript], a
ret
-UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03)
+.ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-UnknownDungeon3TextPointers: ; 45f09 (11:5f09)
- dw UnknownDungeon3Text1
+UnknownDungeon3TextPointers:
+ dw MewtwoText
dw PickUpItemText
dw PickUpItemText
-UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f)
-UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)
- dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0
+UnknownDungeon3TrainerHeaders:
+MewtwoTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_MEWTWO
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0
- dw UnknownDungeon3MewtwoText ; TextBeforeBattle
- dw UnknownDungeon3MewtwoText ; TextAfterBattle
- dw UnknownDungeon3MewtwoText ; TextEndBattle
- dw UnknownDungeon3MewtwoText ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_MEWTWO
+ dw MewtwoBattleText ; TextBeforeBattle
+ dw MewtwoBattleText ; TextAfterBattle
+ dw MewtwoBattleText ; TextEndBattle
+ dw MewtwoBattleText ; TextEndBattle
db $ff
-UnknownDungeon3Text1: ; 45f1c (11:5f1c)
+MewtwoText:
TX_ASM
- ld hl, UnknownDungeon3TrainerHeader0
+ ld hl, MewtwoTrainerHeader
call TalkToTrainer
jp TextScriptEnd
-UnknownDungeon3MewtwoText: ; 45f26 (11:5f26)
- TX_FAR _UnknownDungeon3MewtwoText
+MewtwoBattleText:
+ TX_FAR _MewtwoBattleText
TX_ASM
ld a, MEWTWO
call PlayCry
--- a/scripts/vermilionmart.asm
+++ b/scripts/vermilionmart.asm
@@ -1,15 +1,15 @@
-VermilionMartScript: ; 5c9e1 (17:49e1)
+VermilionMartScript:
jp EnableAutoTextBoxDrawing
-VermilionMartTextPointers: ; 5c9e4 (17:49e4)
- dw VermilionMartText1
+VermilionMartTextPointers:
+ dw VermilionCashierText
dw VermilionMartText2
dw VermilionMartText3
-VermilionMartText2: ; 5c9ea (17:49ea)
+VermilionMartText2:
TX_FAR _VermilionMartText2
db "@"
-VermilionMartText3: ; 5c9ef (17:49ef)
+VermilionMartText3:
TX_FAR _VermilionMartText3
db "@"
--- a/scripts/vermilionpokecenter.asm
+++ b/scripts/vermilionpokecenter.asm
@@ -1,23 +1,23 @@
-VermilionPokecenterScript: ; 5c98f (17:498f)
+VermilionPokecenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-VermilionPokecenterTextPointers: ; 5c995 (17:4995)
- dw VermilionPokecenterText1
+VermilionPokecenterTextPointers:
+ dw VermilionHealNurseText
dw VermilionPokecenterText2
dw VermilionPokecenterText3
- dw VermilionPokecenterText4
+ dw VermilionTradeNurseText
-VermilionPokecenterText1: ; 5c99d (17:499d)
+VermilionHealNurseText:
db $ff
-VermilionPokecenterText2: ; 5c99e (17:499e)
- TX_FAR _VermilionPokecenterText1
+VermilionPokecenterText2:
+ TX_FAR _VermilionPokecenterText2
db "@"
-VermilionPokecenterText3: ; 5c9a3 (17:49a3)
+VermilionPokecenterText3:
TX_FAR _VermilionPokecenterText3
db "@"
-VermilionPokecenterText4: ; 5c9a8 (17:49a8)
+VermilionTradeNurseText:
db $f6
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1Script: ; 5da0a (17:5a0a)
+VictoryRoad1Script:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -18,12 +18,12 @@
lb bc, 6, 4
predef_jump ReplaceTileBlock
-VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a)
+VictoryRoad1ScriptPointers:
dw VictoryRoad1Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad1Script0: ; 5da40 (17:5a40)
+VictoryRoad1Script0:
CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5da5c
@@ -34,10 +34,10 @@
SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
ret
-CoordsData_5da5c: ; 5da5c (17:5a5c)
+CoordsData_5da5c:
db $0D,$11,$FF
-VictoryRoad1TextPointers: ; 5da5f (17:5a5f)
+VictoryRoad1TextPointers:
dw VictoryRoad1Text1
dw VictoryRoad1Text2
dw PickUpItemText
@@ -46,8 +46,8 @@
dw BoulderText
dw BoulderText
-VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d)
-VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d)
+VictoryRoad1TrainerHeaders:
+VictoryRoad1TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
@@ -56,7 +56,7 @@
dw VictoryRoad1EndBattleText1 ; TextEndBattle
dw VictoryRoad1EndBattleText1 ; TextEndBattle
-VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79)
+VictoryRoad1TrainerHeader1:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
@@ -67,38 +67,38 @@
db $ff
-VictoryRoad1Text1: ; 5da86 (17:5a86)
+VictoryRoad1Text1:
TX_ASM
ld hl, VictoryRoad1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad1Text2: ; 5da90 (17:5a90)
+VictoryRoad1Text2:
TX_ASM
ld hl, VictoryRoad1TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad1BattleText1: ; 5da9a (17:5a9a)
+VictoryRoad1BattleText1:
TX_FAR _VictoryRoad1BattleText1
db "@"
-VictoryRoad1EndBattleText1: ; 5da9f (17:5a9f)
+VictoryRoad1EndBattleText1:
TX_FAR _VictoryRoad1EndBattleText1
db "@"
-VictoryRoad1AfterBattleText1: ; 5daa4 (17:5aa4)
+VictoryRoad1AfterBattleText1:
TX_FAR _VictoryRoad1AfterBattleText1
db "@"
-VictoryRoad1BattleText2: ; 5daa9 (17:5aa9)
+VictoryRoad1BattleText2:
TX_FAR _VictoryRoad1BattleText2
db "@"
-VictoryRoad1EndBattleText2: ; 5daae (17:5aae)
+VictoryRoad1EndBattleText2:
TX_FAR _VictoryRoad1EndBattleText2
db "@"
-VictoryRoad1AfterBattleText2: ; 5dab3 (17:5ab3)
+VictoryRoad1AfterBattleText2:
TX_FAR _VictoryRoad1AfterBattleText2
db "@"
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Script: ; 5179d (14:579d)
+VictoryRoad2Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
@@ -15,10 +15,10 @@
ld [wVictoryRoad2CurScript], a
ret
-VictoryRoad2Script_517c4: ; 517c4 (14:57c4)
+VictoryRoad2Script_517c4:
ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
-VictoryRoad2Script_517c9: ; 517c9 (14:57c9)
+VictoryRoad2Script_517c9:
CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1
jr z, .asm_517da
push af
@@ -32,17 +32,17 @@
ld a, $1d
lb bc, 7, 11
-VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
+VictoryRoad2Script_517e2:
ld [wNewTileBlockID], a
predef ReplaceTileBlock
ret
-VictoryRoad2ScriptPointers: ; 517eb (14:57eb)
+VictoryRoad2ScriptPointers:
dw VictoryRoad2Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad2Script0: ; 517f1 (14:57f1)
+VictoryRoad2Script0:
ld hl, CoordsData_51816
call CheckBoulderCoords
jp nc, CheckFightingMapTrainers
@@ -63,18 +63,18 @@
set 5, [hl]
ret
-CoordsData_51816: ; 51816 (14:5816)
+CoordsData_51816:
db $10,$01
db $10,$09
db $FF
-VictoryRoad2TextPointers: ; 5181b (14:581b)
+VictoryRoad2TextPointers:
dw VictoryRoad2Text1
dw VictoryRoad2Text2
dw VictoryRoad2Text3
dw VictoryRoad2Text4
dw VictoryRoad2Text5
- dw VictoryRoad2Text6
+ dw MoltresText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
@@ -83,8 +83,8 @@
dw BoulderText
dw BoulderText
-VictoryRoad2TrainerHeaders: ; 51835 (14:5835)
-VictoryRoad2TrainerHeader0: ; 51835 (14:5835)
+VictoryRoad2TrainerHeaders:
+VictoryRoad2TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
@@ -93,7 +93,7 @@
dw VictoryRoad2EndBattleText1 ; TextEndBattle
dw VictoryRoad2EndBattleText1 ; TextEndBattle
-VictoryRoad2TrainerHeader2: ; 51841 (14:5841)
+VictoryRoad2TrainerHeader2:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
@@ -102,7 +102,7 @@
dw VictoryRoad2EndBattleText2 ; TextEndBattle
dw VictoryRoad2EndBattleText2 ; TextEndBattle
-VictoryRoad2TrainerHeader3: ; 5184d (14:584d)
+VictoryRoad2TrainerHeader3:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
@@ -111,7 +111,7 @@
dw VictoryRoad2EndBattleText3 ; TextEndBattle
dw VictoryRoad2EndBattleText3 ; TextEndBattle
-VictoryRoad2TrainerHeader4: ; 51859 (14:5859)
+VictoryRoad2TrainerHeader4:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
db ($1 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
@@ -120,7 +120,7 @@
dw VictoryRoad2EndBattleText4 ; TextEndBattle
dw VictoryRoad2EndBattleText4 ; TextEndBattle
-VictoryRoad2TrainerHeader5: ; 51865 (14:5865)
+VictoryRoad2TrainerHeader5:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
@@ -129,55 +129,55 @@
dw VictoryRoad2EndBattleText5 ; TextEndBattle
dw VictoryRoad2EndBattleText5 ; TextEndBattle
-VictoryRoad2TrainerHeader6: ; 51871 (14:5871)
- dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6
+MoltresTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_MOLTRES
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6
- dw VictoryRoad2BattleText6 ; TextBeforeBattle
- dw VictoryRoad2BattleText6 ; TextAfterBattle
- dw VictoryRoad2BattleText6 ; TextEndBattle
- dw VictoryRoad2BattleText6 ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_MOLTRES
+ dw MoltresBattleText ; TextBeforeBattle
+ dw MoltresBattleText ; TextAfterBattle
+ dw MoltresBattleText ; TextEndBattle
+ dw MoltresBattleText ; TextEndBattle
db $ff
-VictoryRoad2Text1: ; 5187e (14:587e)
+VictoryRoad2Text1:
TX_ASM
ld hl, VictoryRoad2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text2: ; 51888 (14:5888)
+VictoryRoad2Text2:
TX_ASM
ld hl, VictoryRoad2TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text3: ; 51892 (14:5892)
+VictoryRoad2Text3:
TX_ASM
ld hl, VictoryRoad2TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text4: ; 5189c (14:589c)
+VictoryRoad2Text4:
TX_ASM
ld hl, VictoryRoad2TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text5: ; 518a6 (14:58a6)
+VictoryRoad2Text5:
TX_ASM
ld hl, VictoryRoad2TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text6: ; 518b0 (14:58b0)
+MoltresText:
TX_ASM
- ld hl, VictoryRoad2TrainerHeader6
+ ld hl, MoltresTrainerHeader
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2BattleText6: ; 518ba (14:58ba)
- TX_FAR _VictoryRoad2BattleText6
+MoltresBattleText:
+ TX_FAR _MoltresBattleText
TX_ASM
ld a, MOLTRES
call PlayCry
@@ -184,62 +184,62 @@
call WaitForSoundToFinish
jp TextScriptEnd
-VictoryRoad2BattleText1: ; 518ca (14:58ca)
+VictoryRoad2BattleText1:
TX_FAR _VictoryRoad2BattleText1
db "@"
-VictoryRoad2EndBattleText1: ; 518cf (14:58cf)
+VictoryRoad2EndBattleText1:
TX_FAR _VictoryRoad2EndBattleText1
db "@"
-VictoryRoad2AfterBattleText1: ; 518d4 (14:58d4)
+VictoryRoad2AfterBattleText1:
TX_FAR _VictoryRoad2AfterBattleText1
db "@"
-VictoryRoad2BattleText2: ; 518d9 (14:58d9)
+VictoryRoad2BattleText2:
TX_FAR _VictoryRoad2BattleText2
db "@"
-VictoryRoad2EndBattleText2: ; 518de (14:58de)
+VictoryRoad2EndBattleText2:
TX_FAR _VictoryRoad2EndBattleText2
db "@"
-VictoryRoad2AfterBattleText2: ; 518e3 (14:58e3)
+VictoryRoad2AfterBattleText2:
TX_FAR _VictoryRoad2AfterBattleText2
db "@"
-VictoryRoad2BattleText3: ; 518e8 (14:58e8)
+VictoryRoad2BattleText3:
TX_FAR _VictoryRoad2BattleText3
db "@"
-VictoryRoad2EndBattleText3: ; 518ed (14:58ed)
+VictoryRoad2EndBattleText3:
TX_FAR _VictoryRoad2EndBattleText3
db "@"
-VictoryRoad2AfterBattleText3: ; 518f2 (14:58f2)
+VictoryRoad2AfterBattleText3:
TX_FAR _VictoryRoad2AfterBattleText3
db "@"
-VictoryRoad2BattleText4: ; 518f7 (14:58f7)
+VictoryRoad2BattleText4:
TX_FAR _VictoryRoad2BattleText4
db "@"
-VictoryRoad2EndBattleText4: ; 518fc (14:58fc)
+VictoryRoad2EndBattleText4:
TX_FAR _VictoryRoad2EndBattleText4
db "@"
-VictoryRoad2AfterBattleText4: ; 51901 (14:5901)
+VictoryRoad2AfterBattleText4:
TX_FAR _VictoryRoad2AfterBattleText4
db "@"
-VictoryRoad2BattleText5: ; 51906 (14:5906)
+VictoryRoad2BattleText5:
TX_FAR _VictoryRoad2BattleText5
db "@"
-VictoryRoad2EndBattleText5: ; 5190b (14:590b)
+VictoryRoad2EndBattleText5:
TX_FAR _VictoryRoad2EndBattleText5
db "@"
-VictoryRoad2AfterBattleText5: ; 51910 (14:5910)
+VictoryRoad2AfterBattleText5:
TX_FAR _VictoryRoad2AfterBattleText5
db "@"
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3Script: ; 44980 (11:4980)
+VictoryRoad3Script:
call VictoryRoad3Script_44996
call EnableAutoTextBoxDrawing
ld hl, VictoryRoad3TrainerHeaders
@@ -8,7 +8,7 @@
ld [wVictoryRoad3CurScript], a
ret
-VictoryRoad3Script_44996: ; 44996 (11:4996)
+VictoryRoad3Script_44996:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -20,12 +20,12 @@
lb bc, 5, 3
predef_jump ReplaceTileBlock
-VictoryRoad3ScriptPointers: ; 449b1 (11:49b1)
+VictoryRoad3ScriptPointers:
dw VictoryRoad3Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad3Script0: ; 449b7 (11:49b7)
+VictoryRoad3Script0:
ld hl, wFlags_0xcd60
bit 7, [hl]
res 7, [hl]
@@ -50,7 +50,7 @@
ld [wMissableObjectIndex], a
predef_jump ShowObject
-.coordsData_449f9: ; 449f9 (11:49f9)
+.coordsData_449f9:
db $05,$03
db $0F,$17
db $FF
@@ -74,7 +74,7 @@
jp z, CheckFightingMapTrainers
ret
-VictoryRoad3TextPointers: ; 44a24 (11:4a24)
+VictoryRoad3TextPointers:
dw VictoryRoad3Text1
dw VictoryRoad3Text2
dw VictoryRoad3Text3
@@ -86,8 +86,8 @@
dw BoulderText
dw BoulderText
-VictoryRoad3TrainerHeaders: ; 44a38 (11:4a38)
-VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38)
+VictoryRoad3TrainerHeaders:
+VictoryRoad3TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
db ($1 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
@@ -96,7 +96,7 @@
dw VictoryRoad3EndBattleText2 ; TextEndBattle
dw VictoryRoad3EndBattleText2 ; TextEndBattle
-VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44)
+VictoryRoad3TrainerHeader2:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
@@ -105,7 +105,7 @@
dw VictoryRoad3EndBattleText3 ; TextEndBattle
dw VictoryRoad3EndBattleText3 ; TextEndBattle
-VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50)
+VictoryRoad3TrainerHeader3:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
@@ -114,7 +114,7 @@
dw VictoryRoad3EndBattleText4 ; TextEndBattle
dw VictoryRoad3EndBattleText4 ; TextEndBattle
-VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c)
+VictoryRoad3TrainerHeader4:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
@@ -125,74 +125,74 @@
db $ff
-VictoryRoad3Text1: ; 44a69 (11:4a69)
+VictoryRoad3Text1:
TX_ASM
ld hl, VictoryRoad3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text2: ; 44a73 (11:4a73)
+VictoryRoad3Text2:
TX_ASM
ld hl, VictoryRoad3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text3: ; 44a7d (11:4a7d)
+VictoryRoad3Text3:
TX_ASM
ld hl, VictoryRoad3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text4: ; 44a87 (11:4a87)
+VictoryRoad3Text4:
TX_ASM
ld hl, VictoryRoad3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3BattleText2: ; 44a91 (11:4a91)
+VictoryRoad3BattleText2:
TX_FAR _VictoryRoad3BattleText2
db "@"
-VictoryRoad3EndBattleText2: ; 44a96 (11:4a96)
+VictoryRoad3EndBattleText2:
TX_FAR _VictoryRoad3EndBattleText2
db "@"
-VictoryRoad3AfterBattleText2: ; 44a9b (11:4a9b)
+VictoryRoad3AfterBattleText2:
TX_FAR _VictoryRoad3AfterBattleText2
db "@"
-VictoryRoad3BattleText3: ; 44aa0 (11:4aa0)
+VictoryRoad3BattleText3:
TX_FAR _VictoryRoad3BattleText3
db "@"
-VictoryRoad3EndBattleText3: ; 44aa5 (11:4aa5)
+VictoryRoad3EndBattleText3:
TX_FAR _VictoryRoad3EndBattleText3
db "@"
-VictoryRoad3AfterBattleText3: ; 44aaa (11:4aaa)
+VictoryRoad3AfterBattleText3:
TX_FAR _VictoryRoad3AfterBattleText3
db "@"
-VictoryRoad3BattleText4: ; 44aaf (11:4aaf)
+VictoryRoad3BattleText4:
TX_FAR _VictoryRoad3BattleText4
db "@"
-VictoryRoad3EndBattleText4: ; 44ab4 (11:4ab4)
+VictoryRoad3EndBattleText4:
TX_FAR _VictoryRoad3EndBattleText4
db "@"
-VictoryRoad3AfterBattleText4: ; 44ab9 (11:4ab9)
+VictoryRoad3AfterBattleText4:
TX_FAR _VictoryRoad3AfterBattleText4
db "@"
-VictoryRoad3BattleText5: ; 44abe (11:4abe)
+VictoryRoad3BattleText5:
TX_FAR _VictoryRoad3BattleText5
db "@"
-VictoryRoad3EndBattleText5: ; 44ac3 (11:4ac3)
+VictoryRoad3EndBattleText5:
TX_FAR _VictoryRoad3EndBattleText5
db "@"
-VictoryRoad3AfterBattleText5: ; 44ac8 (11:4ac8)
+VictoryRoad3AfterBattleText5:
TX_FAR _VictoryRoad3AfterBattleText5
db "@"
--- a/scripts/viridianmart.asm
+++ b/scripts/viridianmart.asm
@@ -1,4 +1,4 @@
-ViridianMartScript: ; 1d46e (7:546e)
+ViridianMartScript:
call ViridianMartScript_1d47d
call EnableAutoTextBoxDrawing
ld hl, ViridianMartScriptPointers
@@ -5,7 +5,7 @@
ld a, [wViridianMarketCurScript]
jp CallFunctionInTable
-ViridianMartScript_1d47d: ; 1d47d (7:547d)
+ViridianMartScript_1d47d:
CheckEvent EVENT_OAK_GOT_PARCEL
jr nz, .asm_1d489
ld hl, ViridianMartTextPointers
@@ -19,12 +19,12 @@
ld [wMapTextPtr+1], a
ret
-ViridianMartScriptPointers: ; 1d495 (7:5495)
+ViridianMartScriptPointers:
dw ViridianMartScript0
dw ViridianMartScript1
dw ViridianMartScript2
-ViridianMartScript0: ; 1d49b (7:549b)
+ViridianMartScript0:
call UpdateSprites
ld a, $4
ld [hSpriteIndexOrTextID], a
@@ -39,12 +39,12 @@
ld [wViridianMarketCurScript], a
ret
-RLEMovement1d4bb: ; 1d4bb (7:54bb)
+RLEMovement1d4bb:
db D_LEFT, $01
db D_UP, $02
db $ff
-ViridianMartScript1: ; 1d4c0 (7:54c0)
+ViridianMartScript1:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
@@ -58,36 +58,36 @@
ld a, $2
ld [wViridianMarketCurScript], a
; fallthrough
-ViridianMartScript2: ; 1d4df (7:54df)
+ViridianMartScript2:
ret
-ViridianMartTextPointers: ; 1d4e0 (7:54e0)
+ViridianMartTextPointers:
dw ViridianMartText1
dw ViridianMartText2
dw ViridianMartText3
dw ViridianMartText4
dw ViridianMartText5
- dw ViridianMartText6
+ dw ViridianCashierText
dw ViridianMartText2
dw ViridianMartText3
-ViridianMartText1: ; 1d4f0 (7:54f0)
+ViridianMartText1:
TX_FAR _ViridianMartText1
db "@"
-ViridianMartText4: ; 1d4f5 (7:54f5)
+ViridianMartText4:
TX_FAR _ViridianMartText4
db "@"
-ViridianMartText5: ; 1d4fa (7:54fa)
+ViridianMartText5:
TX_FAR ViridianMartParcelQuestText
db $11
db "@"
-ViridianMartText2: ; 1d500 (7:5500)
+ViridianMartText2:
TX_FAR _ViridianMartText2
db "@"
-ViridianMartText3: ; 1d505 (7:5505)
+ViridianMartText3:
TX_FAR _ViridianMartText3
db "@"
--- a/scripts/viridianpokecenter.asm
+++ b/scripts/viridianpokecenter.asm
@@ -1,23 +1,23 @@
-ViridianPokeCenterScript: ; 4425d (11:425d)
+ViridianPokeCenterScript:
call Serial_TryEstablishingExternallyClockedConnection
jp EnableAutoTextBoxDrawing
-ViridianPokecenterTextPointers: ; 44263 (11:4263)
- dw ViridianPokeCenterText1
+ViridianPokecenterTextPointers:
+ dw ViridianHealNurseText
dw ViridianPokeCenterText2
dw ViridianPokeCenterText3
- dw ViridianPokeCenterText4
+ dw ViridianTradeNurseText
-ViridianPokeCenterText1: ; 4426b (11:426b)
+ViridianHealNurseText:
db $ff
-ViridianPokeCenterText2: ; 4426c (11:426c)
- TX_FAR _ViridianPokeCenterText1
+ViridianPokeCenterText2:
+ TX_FAR _ViridianPokeCenterText2
db "@"
-ViridianPokeCenterText3: ; 44271 (11:4271)
+ViridianPokeCenterText3:
TX_FAR _ViridianPokeCenterText3
db "@"
-ViridianPokeCenterText4: ; 44276 (11:4276)
+ViridianTradeNurseText:
db $f6
--- a/text.asm
+++ b/text.asm
@@ -15,6 +15,7 @@
MOVE_NAMES EQU POKEDEX_TEXT + 1
INCLUDE "macros.asm"
+INCLUDE "charmap.asm"
INCLUDE "hram.asm"
@@ -2338,6 +2339,7 @@
INCLUDE "text/maps/reds_house_1f.asm"
INCLUDE "text/maps/blues_house.asm"
INCLUDE "text/maps/oaks_lab.asm"
+INCLUDE "text/maps/viridian_pokecenter.asm"
INCLUDE "text/maps/viridian_mart.asm"
INCLUDE "text/maps/school.asm"
INCLUDE "text/maps/viridian_house.asm"
--- a/text/maps/celadon_dept_store_1f.asm
+++ b/text/maps/celadon_dept_store_1f.asm
@@ -29,4 +29,3 @@
text "1F: SERVICE"
line " COUNTER"
done
-
--- a/text/maps/celadon_dept_store_2f.asm
+++ b/text/maps/celadon_dept_store_2f.asm
@@ -20,4 +20,3 @@
para "2F: TRAINER'S"
line " MARKET"
done
-
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -96,4 +96,3 @@
text "Red and Blue!"
line "Both are #MON!"
done
-
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/celadon_dept_store_4f.asm
@@ -24,4 +24,3 @@
line "Element STONEs on"
cont "sale now!"
done
-
--- a/text/maps/celadon_dept_store_5f.asm
+++ b/text/maps/celadon_dept_store_5f.asm
@@ -26,4 +26,3 @@
_CeladonMart5Text5::
text "5F: DRUG STORE"
done
-
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -136,4 +136,3 @@
_VendingMachineText7::
text "Not thirsty!"
done
-
--- a/text/maps/celadon_pokecenter.asm
+++ b/text/maps/celadon_pokecenter.asm
@@ -10,4 +10,3 @@
line "CYCLING ROAD from"
cont "FUCHSIA!"
done
-
--- a/text/maps/cerulean_mart.asm
+++ b/text/maps/cerulean_mart.asm
@@ -17,4 +17,3 @@
line "make #MON go"
cont "up one level!"
done
-
--- a/text/maps/cerulean_pokecenter.asm
+++ b/text/maps/cerulean_pokecenter.asm
@@ -1,4 +1,4 @@
-_CeruleanPokecenterText1::
+_CeruleanPokecenterText2::
text "That BILL!"
para "I heard that"
@@ -22,4 +22,3 @@
line "to boast about"
cont "their #MON?"
done
-
--- a/text/maps/cinnabar_mart.asm
+++ b/text/maps/cinnabar_mart.asm
@@ -8,4 +8,3 @@
text "It never hurts to"
line "have extra items!"
done
-
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/cinnabar_pokecenter.asm
@@ -1,5 +1,4 @@
_CinnabarPokecenterText2::
-_CinnabarPokecenterText1::
text "You can cancel"
line "evolution."
@@ -20,4 +19,3 @@
para "I think it's"
line "worth a try!"
done
-
--- a/text/maps/fuchsia_mart.asm
+++ b/text/maps/fuchsia_mart.asm
@@ -12,4 +12,3 @@
cont "up a #MON in"
cont "battle!"
done
-
--- a/text/maps/fuchsia_pokecenter.asm
+++ b/text/maps/fuchsia_pokecenter.asm
@@ -18,4 +18,3 @@
cont "The HQ governs"
cont "all trainers."
done
-
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/indigo_plateau_lobby.asm
@@ -1,4 +1,4 @@
-_IndigoPlateauLobbyText1::
+_IndigoPlateauLobbyText2::
text "Yo! Champ in"
line "making!"
@@ -23,4 +23,3 @@
cont "next trainer!"
cont "Good luck!"
done
-
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/lavender_mart.asm
@@ -14,13 +14,13 @@
line "I can get them?"
done
-_LavenderMart_5c953::
+_LavenderMartReviveText::
text "You know REVIVE?"
line "It revives any"
cont "fainted #MON!"
done
-_LavenderMart_5c958::
+_LavenderMartNuggetText::
text "I found a NUGGET"
line "in the mountains."
@@ -28,4 +28,3 @@
line "useless, but it"
cont "sold for ¥5000!"
done
-
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/lavender_pokecenter.asm
@@ -1,6 +1,4 @@
-_LavenderPokecenterText4::
_LavenderPokecenterText2::
-_LavenderPokecenterText1::
text "TEAM ROCKET will"
line "do anything for"
cont "the sake of gold!"
@@ -12,4 +10,3 @@
cont "to escape from"
cont "TEAM ROCKET!"
done
-
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/mt_moon_pokecenter.asm
@@ -16,7 +16,7 @@
cont "news!"
done
-_MtMoonPokecenterText_4935c::
+_MagikarpSalesmanText1::
text "MAN: Hello, there!"
line "Have I got a deal"
cont "just for you!"
@@ -27,18 +27,18 @@
cont "What do you say?"
done
-_MtMoonPokecenterText_49361::
+_MagikarpSalesmanNoText::
text "No? I'm only"
line "doing this as a"
cont "favor to you!"
done
-_MtMoonPokecenterText_49366::
+_MagikarpSalesmanNoMoneyText::
text "You'll need more"
line "money than that!"
done
-_MtMoonPokecenterText_4936b::
+_MagikarpSalesmanText2::
text "MAN: Well, I don't"
line "give refunds!"
done
@@ -46,4 +46,3 @@
_MtMoonPokecenterText5::
db $0
done
-
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/pewter_mart.asm
@@ -1,4 +1,4 @@
-_PewterMartText_74cc6::
+_PewterMartText2::
text "A shady, old man"
line "got me to buy"
cont "this really weird"
@@ -8,7 +8,7 @@
line "and it cost ¥500!"
done
-_PewterMartText_74cd5::
+_PewterMartText3::
text "Good things can"
line "happen if you"
cont "raise #MON"
@@ -15,4 +15,3 @@
cont "diligently, even"
cont "the weak ones!"
done
-
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -1,4 +1,4 @@
-_PewterPokecenterText1::
+_PewterPokecenterText2::
text "What!?"
para "TEAM ROCKET is"
@@ -8,7 +8,7 @@
para "Scram!"
done
-_PewterPokecenterText5::
+_PewterJigglypuffText::
text "JIGGLYPUFF: Puu"
line "pupuu!"
done
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/rock_tunnel_pokecenter.asm
@@ -1,4 +1,4 @@
-_RockTunnelPokecenterText1::
+_RockTunnelPokecenterText2::
text "The element types"
line "of #MON make"
cont "them stronger"
@@ -11,4 +11,3 @@
text "I sold a useless"
line "NUGGET for ¥5000!"
done
-
--- a/text/maps/saffron_mart.asm
+++ b/text/maps/saffron_mart.asm
@@ -11,4 +11,3 @@
line "but it revives"
cont "fainted #MON!"
done
-
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/saffron_pokecenter.asm
@@ -1,4 +1,4 @@
-_SaffronPokecenterText1::
+_SaffronPokecenterText2::
text "#MON growth"
line "rates differ from"
cont "specie to specie."
@@ -10,4 +10,3 @@
cont "why it attracted"
cont "TEAM ROCKET!"
done
-
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -1,4 +1,4 @@
-_SeafoamIslands5BattleText2::
+_ArticunoBattleText::
text "Gyaoo!@@"
_SeafoamIslands5Text4::
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,3 @@
-_UnknownDungeon3MewtwoText::
+_MewtwoBattleText::
text "Mew!@@"
--- a/text/maps/vermilion_mart.asm
+++ b/text/maps/vermilion_mart.asm
@@ -21,4 +21,3 @@
cont "evil. It depends"
cont "on the trainer."
done
-
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/vermilion_pokecenter.asm
@@ -1,5 +1,4 @@
_VermilionPokecenterText2::
-_VermilionPokecenterText1::
text "Even if they are"
line "the same level,"
cont "#MON can have"
@@ -18,4 +17,3 @@
cont "fainted while we"
cont "were walking!"
done
-
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -1,4 +1,4 @@
-_VictoryRoad2BattleText6::
+_MoltresBattleText::
text "Gyaoo!@@"
_VictoryRoad2BattleText1::
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -1,21 +1,3 @@
-_ViridianPokeCenterText2::
-_ViridianPokeCenterText1::
- text "You can use that"
- line "PC in the corner."
-
- para "The receptionist"
- line "told me. So kind!"
- done
-
-_ViridianPokeCenterText3::
- text "There's a #MON"
- line "CENTER in every"
- cont "town ahead."
-
- para "They don't charge"
- line "any money either!"
- done
-
_ViridianMartText1::
text "Okay! Say hi to"
line "PROF.OAK for me!"
--- /dev/null
+++ b/text/maps/viridian_pokecenter.asm
@@ -1,0 +1,16 @@
+_ViridianPokeCenterText2::
+ text "You can use that"
+ line "PC in the corner."
+
+ para "The receptionist"
+ line "told me. So kind!"
+ done
+
+_ViridianPokeCenterText3::
+ text "There's a #MON"
+ line "CENTER in every"
+ cont "town ahead."
+
+ para "They don't charge"
+ line "any money either!"
+ done
--- a/yellow.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-_YELLOW EQU 1
-_OPTION_BEACH_HOUSE EQU 1
-_OPTION_LOWCOST_SAFARI EQU 1
-INCLUDE "charmap.asm"
--- a/yellow/audio.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "yellow.asm"
-INCLUDE "audio.asm"
--- a/yellow/main.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "yellow.asm"
-INCLUDE "main.asm"
--- a/yellow/text.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "yellow.asm"
-INCLUDE "text.asm"
--- a/yellow/wram.asm
+++ /dev/null
@@ -1,2 +1,0 @@
-INCLUDE "yellow.asm"
-INCLUDE "wram.asm"