Merge branch 'master' of https://github.com/pret/pokered

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 @@ To build them individually:
 In **Terminal**, run:
 
 	xcode-select --install
-	sudo easy_install pypng
 
 	git clone https://github.com/bentley/rgbds
 	cd rgbds
@@ -43,17 +41,13 @@ In **Terminal**, run:
 
 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
 

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
+
+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)) \
+)
 
-# Clear the default suffixes.
 .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 @@ clean:
 	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) $@

blue.asm

@@ -1,2 +0,0 @@
-_BLUE EQU 1
-INCLUDE "charmap.asm"

blue/audio.asm

@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "audio.asm"

blue/main.asm

@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "main.asm"

blue/text.asm

@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "text.asm"

blue/wram.asm

@@ -1,2 +0,0 @@
-INCLUDE "blue.asm"
-INCLUDE "wram.asm"

constants.asm

@@ -1,4 +1,5 @@
 INCLUDE "macros.asm"
+INCLUDE "charmap.asm"
 
 INCLUDE "hram.asm"
 INCLUDE "vram.asm"

constants/event_constants.asm

@@ -1121,15 +1121,15 @@ const_value = 0
 	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_value = 0
 	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_value = 0
 	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_value = 0
 	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)

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

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

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 AlakazamPicFront
 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

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

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

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

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

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

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

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 @@ db 3 ; growth rate
 	tmlearn 44
 	tmlearn 50,51
 db 0 ; padding
+MonBaseStatsEnd:

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 @@ db 0 ; growth rate
 	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

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

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 ChanseyPicFront
 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

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 @@ db 3 ; growth rate
 	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

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

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

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

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

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

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

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

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 @@ db 0 ; growth rate
 	tmlearn 26,27,28,31,32
 	tmlearn 34
 	tmlearn 44,48
-IF DEF(_YELLOW)
-	tmlearn 50,51
-ELSE
 	tmlearn 50
-ENDC
 db 0 ; padding

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

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

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

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

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

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

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

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 @@ db 0 ; growth rate
 	tmlearn 26,27,28,31,32
 	tmlearn 34
 	tmlearn 44,48
-IF DEF(_YELLOW)
-	tmlearn 50,51
-ELSE
 	tmlearn 50
-ENDC
 db 0 ; padding

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 EeveePicFront
 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

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

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

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

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

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

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

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

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 FlareonPicFront
 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

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

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

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

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

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

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

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

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

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

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

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

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 @@ INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions
 dw GyaradosPicFront
 dw GyaradosPicBack
 ; attacks known at lvl 0
-IF DEF(_YELLOW)
-db TACKLE
-db 0
-db 0
-db 0
-ELSE
 db BITE
 db DRAGON_RAGE
 db LEER
 db HYDRO_PUMP
-ENDC
 db 5 ; growth rate
 ; learnset
 	tmlearn 6,8

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

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

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

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

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

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

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

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 JolteonPicFront
 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

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

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

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

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 KadabraPicFront
 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 MarowakPicFront
 dw MarowakPicBack
 ; attacks known at lvl 0
 db BONE_CLUB
-IF DEF(_YELLOW)
-	db TAIL_WHIP
-	db 0
-	db 0
-ELSE
-	db GROWL
-	db LEER
-	db FOCUS_ENERGY
-ENDC
+db GROWL
+db LEER
+db FOCUS_ENERGY
 db 0 ; growth rate
 ; learnset
 	tmlearn 1,5,6,8

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

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

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

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

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

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

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

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

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

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

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

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