summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/items/names.asm4
-rw-r--r--data/pokemon/base_stats.asm502
-rw-r--r--data/pokemon/base_stats/kirinriki.inc4
-rw-r--r--data/predef_pointers.inc173
-rw-r--r--data/super_palettes.inc4
-rw-r--r--data/tileset_headers.asm4
-rw-r--r--data/trainers/parties.asm200
-rw-r--r--data/wild.asm37
8 files changed, 587 insertions, 341 deletions
diff --git a/data/items/names.asm b/data/items/names.asm
index a48579c..942af41 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,6 +1,10 @@
INCLUDE "constants.asm"
+if DEBUG
SECTION "ItemNames", ROMX[$6FEC], BANK[$01]
+else
+SECTION "ItemNames", ROMX[$6FE9], BANK[$01]
+endc
ItemNames::
db "マスターボール@" ; MASTER_BALL
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 59715d5..7b3a07e 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -37,255 +37,255 @@ ENDM
BaseData::
MonBaseStats::
-INCLUDE "data/pokemon/base_stats/fushigidane.inc"
+BaseStats_Fushigidane:: INCLUDE "data/pokemon/base_stats/fushigidane.inc"
MonBaseStatsEnd::
-INCLUDE "data/pokemon/base_stats/fushigisou.inc"
-INCLUDE "data/pokemon/base_stats/fushigibana.inc"
-INCLUDE "data/pokemon/base_stats/hitokage.inc"
-INCLUDE "data/pokemon/base_stats/lizardo.inc"
-INCLUDE "data/pokemon/base_stats/lizardon.inc"
-INCLUDE "data/pokemon/base_stats/zenigame.inc"
-INCLUDE "data/pokemon/base_stats/kameil.inc"
-INCLUDE "data/pokemon/base_stats/kamex.inc"
-INCLUDE "data/pokemon/base_stats/caterpie.inc"
-INCLUDE "data/pokemon/base_stats/transel.inc"
-INCLUDE "data/pokemon/base_stats/butterfree.inc"
-INCLUDE "data/pokemon/base_stats/beedle.inc"
-INCLUDE "data/pokemon/base_stats/cocoon.inc"
-INCLUDE "data/pokemon/base_stats/spear.inc"
-INCLUDE "data/pokemon/base_stats/poppo.inc"
-INCLUDE "data/pokemon/base_stats/pigeon.inc"
-INCLUDE "data/pokemon/base_stats/pigeot.inc"
-INCLUDE "data/pokemon/base_stats/koratta.inc"
-INCLUDE "data/pokemon/base_stats/ratta.inc"
-INCLUDE "data/pokemon/base_stats/onisuzume.inc"
-INCLUDE "data/pokemon/base_stats/onidrill.inc"
-INCLUDE "data/pokemon/base_stats/arbo.inc"
-INCLUDE "data/pokemon/base_stats/arbok.inc"
-INCLUDE "data/pokemon/base_stats/pikachu.inc"
-INCLUDE "data/pokemon/base_stats/raichu.inc"
-INCLUDE "data/pokemon/base_stats/sand.inc"
-INCLUDE "data/pokemon/base_stats/sandpan.inc"
-INCLUDE "data/pokemon/base_stats/nidoran_f.inc"
-INCLUDE "data/pokemon/base_stats/nidorina.inc"
-INCLUDE "data/pokemon/base_stats/nidoqueen.inc"
-INCLUDE "data/pokemon/base_stats/nidoran_m.inc"
-INCLUDE "data/pokemon/base_stats/nidorino.inc"
-INCLUDE "data/pokemon/base_stats/nidoking.inc"
-INCLUDE "data/pokemon/base_stats/pippi.inc"
-INCLUDE "data/pokemon/base_stats/pixy.inc"
-INCLUDE "data/pokemon/base_stats/rokon.inc"
-INCLUDE "data/pokemon/base_stats/kyukon.inc"
-INCLUDE "data/pokemon/base_stats/purin.inc"
-INCLUDE "data/pokemon/base_stats/pukurin.inc"
-INCLUDE "data/pokemon/base_stats/zubat.inc"
-INCLUDE "data/pokemon/base_stats/golbat.inc"
-INCLUDE "data/pokemon/base_stats/nazonokusa.inc"
-INCLUDE "data/pokemon/base_stats/kusaihana.inc"
-INCLUDE "data/pokemon/base_stats/ruffresia.inc"
-INCLUDE "data/pokemon/base_stats/paras.inc"
-INCLUDE "data/pokemon/base_stats/parasect.inc"
-INCLUDE "data/pokemon/base_stats/kongpang.inc"
-INCLUDE "data/pokemon/base_stats/morphon.inc"
-INCLUDE "data/pokemon/base_stats/digda.inc"
-INCLUDE "data/pokemon/base_stats/dugtrio.inc"
-INCLUDE "data/pokemon/base_stats/nyarth.inc"
-INCLUDE "data/pokemon/base_stats/persian.inc"
-INCLUDE "data/pokemon/base_stats/koduck.inc"
-INCLUDE "data/pokemon/base_stats/golduck.inc"
-INCLUDE "data/pokemon/base_stats/mankey.inc"
-INCLUDE "data/pokemon/base_stats/okorizaru.inc"
-INCLUDE "data/pokemon/base_stats/gardie.inc"
-INCLUDE "data/pokemon/base_stats/windie.inc"
-INCLUDE "data/pokemon/base_stats/nyoromo.inc"
-INCLUDE "data/pokemon/base_stats/nyorozo.inc"
-INCLUDE "data/pokemon/base_stats/nyorobon.inc"
-INCLUDE "data/pokemon/base_stats/casey.inc"
-INCLUDE "data/pokemon/base_stats/yungerer.inc"
-INCLUDE "data/pokemon/base_stats/foodin.inc"
-INCLUDE "data/pokemon/base_stats/wanriky.inc"
-INCLUDE "data/pokemon/base_stats/goriky.inc"
-INCLUDE "data/pokemon/base_stats/kairiky.inc"
-INCLUDE "data/pokemon/base_stats/madatsubomi.inc"
-INCLUDE "data/pokemon/base_stats/utsudon.inc"
-INCLUDE "data/pokemon/base_stats/utsubot.inc"
-INCLUDE "data/pokemon/base_stats/menokurage.inc"
-INCLUDE "data/pokemon/base_stats/dokukurage.inc"
-INCLUDE "data/pokemon/base_stats/isitsubute.inc"
-INCLUDE "data/pokemon/base_stats/golone.inc"
-INCLUDE "data/pokemon/base_stats/golonya.inc"
-INCLUDE "data/pokemon/base_stats/ponyta.inc"
-INCLUDE "data/pokemon/base_stats/gallop.inc"
-INCLUDE "data/pokemon/base_stats/yadon.inc"
-INCLUDE "data/pokemon/base_stats/yadoran.inc"
-INCLUDE "data/pokemon/base_stats/coil.inc"
-INCLUDE "data/pokemon/base_stats/rarecoil.inc"
-INCLUDE "data/pokemon/base_stats/kamonegi.inc"
-INCLUDE "data/pokemon/base_stats/dodo.inc"
-INCLUDE "data/pokemon/base_stats/dodorio.inc"
-INCLUDE "data/pokemon/base_stats/pawou.inc"
-INCLUDE "data/pokemon/base_stats/jugon.inc"
-INCLUDE "data/pokemon/base_stats/betbeter.inc"
-INCLUDE "data/pokemon/base_stats/betbeton.inc"
-INCLUDE "data/pokemon/base_stats/shellder.inc"
-INCLUDE "data/pokemon/base_stats/parshen.inc"
-INCLUDE "data/pokemon/base_stats/ghos.inc"
-INCLUDE "data/pokemon/base_stats/ghost.inc"
-INCLUDE "data/pokemon/base_stats/gangar.inc"
-INCLUDE "data/pokemon/base_stats/iwark.inc"
-INCLUDE "data/pokemon/base_stats/sleepe.inc"
-INCLUDE "data/pokemon/base_stats/sleeper.inc"
-INCLUDE "data/pokemon/base_stats/crab.inc"
-INCLUDE "data/pokemon/base_stats/kingler.inc"
-INCLUDE "data/pokemon/base_stats/biriridama.inc"
-INCLUDE "data/pokemon/base_stats/marumine.inc"
-INCLUDE "data/pokemon/base_stats/tamatama.inc"
-INCLUDE "data/pokemon/base_stats/nassy.inc"
-INCLUDE "data/pokemon/base_stats/karakara.inc"
-INCLUDE "data/pokemon/base_stats/garagara.inc"
-INCLUDE "data/pokemon/base_stats/sawamular.inc"
-INCLUDE "data/pokemon/base_stats/ebiwalar.inc"
-INCLUDE "data/pokemon/base_stats/beroringa.inc"
-INCLUDE "data/pokemon/base_stats/dogars.inc"
-INCLUDE "data/pokemon/base_stats/matadogas.inc"
-INCLUDE "data/pokemon/base_stats/sihorn.inc"
-INCLUDE "data/pokemon/base_stats/sidon.inc"
-INCLUDE "data/pokemon/base_stats/lucky.inc"
-INCLUDE "data/pokemon/base_stats/monjara.inc"
-INCLUDE "data/pokemon/base_stats/garura.inc"
-INCLUDE "data/pokemon/base_stats/tattu.inc"
-INCLUDE "data/pokemon/base_stats/seadra.inc"
-INCLUDE "data/pokemon/base_stats/tosakinto.inc"
-INCLUDE "data/pokemon/base_stats/azumao.inc"
-INCLUDE "data/pokemon/base_stats/hitodeman.inc"
-INCLUDE "data/pokemon/base_stats/starmie.inc"
-INCLUDE "data/pokemon/base_stats/barrierd.inc"
-INCLUDE "data/pokemon/base_stats/strike.inc"
-INCLUDE "data/pokemon/base_stats/rougela.inc"
-INCLUDE "data/pokemon/base_stats/eleboo.inc"
-INCLUDE "data/pokemon/base_stats/boober.inc"
-INCLUDE "data/pokemon/base_stats/kailios.inc"
-INCLUDE "data/pokemon/base_stats/kentauros.inc"
-INCLUDE "data/pokemon/base_stats/koiking.inc"
-INCLUDE "data/pokemon/base_stats/gyarados.inc"
-INCLUDE "data/pokemon/base_stats/laplace.inc"
-INCLUDE "data/pokemon/base_stats/metamon.inc"
-INCLUDE "data/pokemon/base_stats/eievui.inc"
-INCLUDE "data/pokemon/base_stats/showers.inc"
-INCLUDE "data/pokemon/base_stats/thunders.inc"
-INCLUDE "data/pokemon/base_stats/booster.inc"
-INCLUDE "data/pokemon/base_stats/porygon.inc"
-INCLUDE "data/pokemon/base_stats/omnite.inc"
-INCLUDE "data/pokemon/base_stats/omstar.inc"
-INCLUDE "data/pokemon/base_stats/kabuto.inc"
-INCLUDE "data/pokemon/base_stats/kabutops.inc"
-INCLUDE "data/pokemon/base_stats/ptera.inc"
-INCLUDE "data/pokemon/base_stats/kabigon.inc"
-INCLUDE "data/pokemon/base_stats/freezer.inc"
-INCLUDE "data/pokemon/base_stats/thunder.inc"
-INCLUDE "data/pokemon/base_stats/fire.inc"
-INCLUDE "data/pokemon/base_stats/miniryu.inc"
-INCLUDE "data/pokemon/base_stats/hakuryu.inc"
-INCLUDE "data/pokemon/base_stats/kairyu.inc"
-INCLUDE "data/pokemon/base_stats/mewtwo.inc"
-INCLUDE "data/pokemon/base_stats/mew.inc"
-INCLUDE "data/pokemon/base_stats/happa.inc"
-INCLUDE "data/pokemon/base_stats/hanamogura.inc"
-INCLUDE "data/pokemon/base_stats/hanaryu.inc"
-INCLUDE "data/pokemon/base_stats/honoguma.inc"
-INCLUDE "data/pokemon/base_stats/volbear.inc"
-INCLUDE "data/pokemon/base_stats/dynabear.inc"
-INCLUDE "data/pokemon/base_stats/kurusu.inc"
-INCLUDE "data/pokemon/base_stats/aqua.inc"
-INCLUDE "data/pokemon/base_stats/aquaria.inc"
-INCLUDE "data/pokemon/base_stats/hoho.inc"
-INCLUDE "data/pokemon/base_stats/bobo.inc"
-INCLUDE "data/pokemon/base_stats/pachimee.inc"
-INCLUDE "data/pokemon/base_stats/mokoko.inc"
-INCLUDE "data/pokemon/base_stats/denryu.inc"
-INCLUDE "data/pokemon/base_stats/mikon.inc"
-INCLUDE "data/pokemon/base_stats/monja.inc"
-INCLUDE "data/pokemon/base_stats/jaranra.inc"
-INCLUDE "data/pokemon/base_stats/haneei.inc"
-INCLUDE "data/pokemon/base_stats/puku.inc"
-INCLUDE "data/pokemon/base_stats/shibirefugu.inc"
-INCLUDE "data/pokemon/base_stats/pichu.inc"
-INCLUDE "data/pokemon/base_stats/py.inc"
-INCLUDE "data/pokemon/base_stats/pupurin.inc"
-INCLUDE "data/pokemon/base_stats/mizuuo.inc"
-INCLUDE "data/pokemon/base_stats/naty.inc"
-INCLUDE "data/pokemon/base_stats/natio.inc"
-INCLUDE "data/pokemon/base_stats/gyopin.inc"
-INCLUDE "data/pokemon/base_stats/maril.inc"
-INCLUDE "data/pokemon/base_stats/manbo1.inc"
-INCLUDE "data/pokemon/base_stats/ikari.inc"
-INCLUDE "data/pokemon/base_stats/grotess.inc"
-INCLUDE "data/pokemon/base_stats/eksing.inc"
-INCLUDE "data/pokemon/base_stats/para.inc"
-INCLUDE "data/pokemon/base_stats/kokumo.inc"
-INCLUDE "data/pokemon/base_stats/twohead.inc"
-INCLUDE "data/pokemon/base_stats/yoroidori.inc"
-INCLUDE "data/pokemon/base_stats/animon.inc"
-INCLUDE "data/pokemon/base_stats/hinazu.inc"
-INCLUDE "data/pokemon/base_stats/sunny.inc"
-INCLUDE "data/pokemon/base_stats/paon.inc"
-INCLUDE "data/pokemon/base_stats/donphan.inc"
-INCLUDE "data/pokemon/base_stats/twinz.inc"
-INCLUDE "data/pokemon/base_stats/kirinriki.inc"
-INCLUDE "data/pokemon/base_stats/painter.inc"
-INCLUDE "data/pokemon/base_stats/kounya.inc"
-INCLUDE "data/pokemon/base_stats/rinrin.inc"
-INCLUDE "data/pokemon/base_stats/berurun.inc"
-INCLUDE "data/pokemon/base_stats/nyorotono.inc"
-INCLUDE "data/pokemon/base_stats/yadoking.inc"
-INCLUDE "data/pokemon/base_stats/annon.inc"
-INCLUDE "data/pokemon/base_stats/rediba.inc"
-INCLUDE "data/pokemon/base_stats/mitsuboshi.inc"
-INCLUDE "data/pokemon/base_stats/puchicorn.inc"
-INCLUDE "data/pokemon/base_stats/eifie.inc"
-INCLUDE "data/pokemon/base_stats/blacky.inc"
-INCLUDE "data/pokemon/base_stats/turban.inc"
-INCLUDE "data/pokemon/base_stats/betbaby.inc"
-INCLUDE "data/pokemon/base_stats/teppouo.inc"
-INCLUDE "data/pokemon/base_stats/okutank.inc"
-INCLUDE "data/pokemon/base_stats/gongu.inc"
-INCLUDE "data/pokemon/base_stats/kapoerer.inc"
-INCLUDE "data/pokemon/base_stats/pudie.inc"
-INCLUDE "data/pokemon/base_stats/haneko.inc"
-INCLUDE "data/pokemon/base_stats/poponeko.inc"
-INCLUDE "data/pokemon/base_stats/wataneko.inc"
-INCLUDE "data/pokemon/base_stats/baririna.inc"
-INCLUDE "data/pokemon/base_stats/lip.inc"
-INCLUDE "data/pokemon/base_stats/elebaby.inc"
-INCLUDE "data/pokemon/base_stats/booby.inc"
-INCLUDE "data/pokemon/base_stats/kireihana.inc"
-INCLUDE "data/pokemon/base_stats/tsubomitto.inc"
-INCLUDE "data/pokemon/base_stats/miltank.inc"
-INCLUDE "data/pokemon/base_stats/bombseeker.inc"
-INCLUDE "data/pokemon/base_stats/gift.inc"
-INCLUDE "data/pokemon/base_stats/kotora.inc"
-INCLUDE "data/pokemon/base_stats/raitora.inc"
-INCLUDE "data/pokemon/base_stats/madame.inc"
-INCLUDE "data/pokemon/base_stats/norowara.inc"
-INCLUDE "data/pokemon/base_stats/kyonpan.inc"
-INCLUDE "data/pokemon/base_stats/yamikarasu.inc"
-INCLUDE "data/pokemon/base_stats/happi.inc"
-INCLUDE "data/pokemon/base_stats/scissors.inc"
-INCLUDE "data/pokemon/base_stats/purakkusu.inc"
-INCLUDE "data/pokemon/base_stats/devil.inc"
-INCLUDE "data/pokemon/base_stats/helgaa.inc"
-INCLUDE "data/pokemon/base_stats/wolfman.inc"
-INCLUDE "data/pokemon/base_stats/warwolf.inc"
-INCLUDE "data/pokemon/base_stats/porygon2.inc"
-INCLUDE "data/pokemon/base_stats/nameil.inc"
-INCLUDE "data/pokemon/base_stats/haganeil.inc"
-INCLUDE "data/pokemon/base_stats/kingdra.inc"
-INCLUDE "data/pokemon/base_stats/rai.inc"
-INCLUDE "data/pokemon/base_stats/en.inc"
-INCLUDE "data/pokemon/base_stats/sui.inc"
-INCLUDE "data/pokemon/base_stats/nyula.inc"
-INCLUDE "data/pokemon/base_stats/houou.inc"
-INCLUDE "data/pokemon/base_stats/togepy.inc"
-INCLUDE "data/pokemon/base_stats/bulu.inc"
-INCLUDE "data/pokemon/base_stats/tail.inc"
-INCLUDE "data/pokemon/base_stats/leafy.inc"
+BaseStats_Fushigisou:: INCLUDE "data/pokemon/base_stats/fushigisou.inc"
+BaseStats_Fushigibana:: INCLUDE "data/pokemon/base_stats/fushigibana.inc"
+BaseStats_Hitokage:: INCLUDE "data/pokemon/base_stats/hitokage.inc"
+BaseStats_Lizardo:: INCLUDE "data/pokemon/base_stats/lizardo.inc"
+BaseStats_Lizardon:: INCLUDE "data/pokemon/base_stats/lizardon.inc"
+BaseStats_Zenigame:: INCLUDE "data/pokemon/base_stats/zenigame.inc"
+BaseStats_Kameil:: INCLUDE "data/pokemon/base_stats/kameil.inc"
+BaseStats_Kamex:: INCLUDE "data/pokemon/base_stats/kamex.inc"
+BaseStats_Caterpie:: INCLUDE "data/pokemon/base_stats/caterpie.inc"
+BaseStats_Transel:: INCLUDE "data/pokemon/base_stats/transel.inc"
+BaseStats_Butterfree:: INCLUDE "data/pokemon/base_stats/butterfree.inc"
+BaseStats_Beedle:: INCLUDE "data/pokemon/base_stats/beedle.inc"
+BaseStats_Cocoon:: INCLUDE "data/pokemon/base_stats/cocoon.inc"
+BaseStats_Spear:: INCLUDE "data/pokemon/base_stats/spear.inc"
+BaseStats_Poppo:: INCLUDE "data/pokemon/base_stats/poppo.inc"
+BaseStats_Pigeon:: INCLUDE "data/pokemon/base_stats/pigeon.inc"
+BaseStats_Pigeot:: INCLUDE "data/pokemon/base_stats/pigeot.inc"
+BaseStats_Koratta:: INCLUDE "data/pokemon/base_stats/koratta.inc"
+BaseStats_Ratta:: INCLUDE "data/pokemon/base_stats/ratta.inc"
+BaseStats_Onisuzume:: INCLUDE "data/pokemon/base_stats/onisuzume.inc"
+BaseStats_Onidrill:: INCLUDE "data/pokemon/base_stats/onidrill.inc"
+BaseStats_Arbo:: INCLUDE "data/pokemon/base_stats/arbo.inc"
+BaseStats_Arbok:: INCLUDE "data/pokemon/base_stats/arbok.inc"
+BaseStats_Pikachu:: INCLUDE "data/pokemon/base_stats/pikachu.inc"
+BaseStats_Raichu:: INCLUDE "data/pokemon/base_stats/raichu.inc"
+BaseStats_Sand:: INCLUDE "data/pokemon/base_stats/sand.inc"
+BaseStats_Sandpan:: INCLUDE "data/pokemon/base_stats/sandpan.inc"
+BaseStats_Nidoran_f:: INCLUDE "data/pokemon/base_stats/nidoran_f.inc"
+BaseStats_Nidorina:: INCLUDE "data/pokemon/base_stats/nidorina.inc"
+BaseStats_Nidoqueen:: INCLUDE "data/pokemon/base_stats/nidoqueen.inc"
+BaseStats_Nidoran_m:: INCLUDE "data/pokemon/base_stats/nidoran_m.inc"
+BaseStats_Nidorino:: INCLUDE "data/pokemon/base_stats/nidorino.inc"
+BaseStats_Nidoking:: INCLUDE "data/pokemon/base_stats/nidoking.inc"
+BaseStats_Pippi:: INCLUDE "data/pokemon/base_stats/pippi.inc"
+BaseStats_Pixy:: INCLUDE "data/pokemon/base_stats/pixy.inc"
+BaseStats_Rokon:: INCLUDE "data/pokemon/base_stats/rokon.inc"
+BaseStats_Kyukon:: INCLUDE "data/pokemon/base_stats/kyukon.inc"
+BaseStats_Purin:: INCLUDE "data/pokemon/base_stats/purin.inc"
+BaseStats_Pukurin:: INCLUDE "data/pokemon/base_stats/pukurin.inc"
+BaseStats_Zubat:: INCLUDE "data/pokemon/base_stats/zubat.inc"
+BaseStats_Golbat:: INCLUDE "data/pokemon/base_stats/golbat.inc"
+BaseStats_Nazonokusa:: INCLUDE "data/pokemon/base_stats/nazonokusa.inc"
+BaseStats_Kusaihana:: INCLUDE "data/pokemon/base_stats/kusaihana.inc"
+BaseStats_Ruffresia:: INCLUDE "data/pokemon/base_stats/ruffresia.inc"
+BaseStats_Paras:: INCLUDE "data/pokemon/base_stats/paras.inc"
+BaseStats_Parasect:: INCLUDE "data/pokemon/base_stats/parasect.inc"
+BaseStats_Kongpang:: INCLUDE "data/pokemon/base_stats/kongpang.inc"
+BaseStats_Morphon:: INCLUDE "data/pokemon/base_stats/morphon.inc"
+BaseStats_Digda:: INCLUDE "data/pokemon/base_stats/digda.inc"
+BaseStats_Dugtrio:: INCLUDE "data/pokemon/base_stats/dugtrio.inc"
+BaseStats_Nyarth:: INCLUDE "data/pokemon/base_stats/nyarth.inc"
+BaseStats_Persian:: INCLUDE "data/pokemon/base_stats/persian.inc"
+BaseStats_Koduck:: INCLUDE "data/pokemon/base_stats/koduck.inc"
+BaseStats_Golduck:: INCLUDE "data/pokemon/base_stats/golduck.inc"
+BaseStats_Mankey:: INCLUDE "data/pokemon/base_stats/mankey.inc"
+BaseStats_Okorizaru:: INCLUDE "data/pokemon/base_stats/okorizaru.inc"
+BaseStats_Gardie:: INCLUDE "data/pokemon/base_stats/gardie.inc"
+BaseStats_Windie:: INCLUDE "data/pokemon/base_stats/windie.inc"
+BaseStats_Nyoromo:: INCLUDE "data/pokemon/base_stats/nyoromo.inc"
+BaseStats_Nyorozo:: INCLUDE "data/pokemon/base_stats/nyorozo.inc"
+BaseStats_Nyorobon:: INCLUDE "data/pokemon/base_stats/nyorobon.inc"
+BaseStats_Casey:: INCLUDE "data/pokemon/base_stats/casey.inc"
+BaseStats_Yungerer:: INCLUDE "data/pokemon/base_stats/yungerer.inc"
+BaseStats_Foodin:: INCLUDE "data/pokemon/base_stats/foodin.inc"
+BaseStats_Wanriky:: INCLUDE "data/pokemon/base_stats/wanriky.inc"
+BaseStats_Goriky:: INCLUDE "data/pokemon/base_stats/goriky.inc"
+BaseStats_Kairiky:: INCLUDE "data/pokemon/base_stats/kairiky.inc"
+BaseStats_Madatsubomi:: INCLUDE "data/pokemon/base_stats/madatsubomi.inc"
+BaseStats_Utsudon:: INCLUDE "data/pokemon/base_stats/utsudon.inc"
+BaseStats_Utsubot:: INCLUDE "data/pokemon/base_stats/utsubot.inc"
+BaseStats_Menokurage:: INCLUDE "data/pokemon/base_stats/menokurage.inc"
+BaseStats_Dokukurage:: INCLUDE "data/pokemon/base_stats/dokukurage.inc"
+BaseStats_Isitsubute:: INCLUDE "data/pokemon/base_stats/isitsubute.inc"
+BaseStats_Golone:: INCLUDE "data/pokemon/base_stats/golone.inc"
+BaseStats_Golonya:: INCLUDE "data/pokemon/base_stats/golonya.inc"
+BaseStats_Ponyta:: INCLUDE "data/pokemon/base_stats/ponyta.inc"
+BaseStats_Gallop:: INCLUDE "data/pokemon/base_stats/gallop.inc"
+BaseStats_Yadon:: INCLUDE "data/pokemon/base_stats/yadon.inc"
+BaseStats_Yadoran:: INCLUDE "data/pokemon/base_stats/yadoran.inc"
+BaseStats_Coil:: INCLUDE "data/pokemon/base_stats/coil.inc"
+BaseStats_Rarecoil:: INCLUDE "data/pokemon/base_stats/rarecoil.inc"
+BaseStats_Kamonegi:: INCLUDE "data/pokemon/base_stats/kamonegi.inc"
+BaseStats_Dodo:: INCLUDE "data/pokemon/base_stats/dodo.inc"
+BaseStats_Dodorio:: INCLUDE "data/pokemon/base_stats/dodorio.inc"
+BaseStats_Pawou:: INCLUDE "data/pokemon/base_stats/pawou.inc"
+BaseStats_Jugon:: INCLUDE "data/pokemon/base_stats/jugon.inc"
+BaseStats_Betbeter:: INCLUDE "data/pokemon/base_stats/betbeter.inc"
+BaseStats_Betbeton:: INCLUDE "data/pokemon/base_stats/betbeton.inc"
+BaseStats_Shellder:: INCLUDE "data/pokemon/base_stats/shellder.inc"
+BaseStats_Parshen:: INCLUDE "data/pokemon/base_stats/parshen.inc"
+BaseStats_Ghos:: INCLUDE "data/pokemon/base_stats/ghos.inc"
+BaseStats_Ghost:: INCLUDE "data/pokemon/base_stats/ghost.inc"
+BaseStats_Gangar:: INCLUDE "data/pokemon/base_stats/gangar.inc"
+BaseStats_Iwark:: INCLUDE "data/pokemon/base_stats/iwark.inc"
+BaseStats_Sleepe:: INCLUDE "data/pokemon/base_stats/sleepe.inc"
+BaseStats_Sleeper:: INCLUDE "data/pokemon/base_stats/sleeper.inc"
+BaseStats_Crab:: INCLUDE "data/pokemon/base_stats/crab.inc"
+BaseStats_Kingler:: INCLUDE "data/pokemon/base_stats/kingler.inc"
+BaseStats_Biriridama:: INCLUDE "data/pokemon/base_stats/biriridama.inc"
+BaseStats_Marumine:: INCLUDE "data/pokemon/base_stats/marumine.inc"
+BaseStats_Tamatama:: INCLUDE "data/pokemon/base_stats/tamatama.inc"
+BaseStats_Nassy:: INCLUDE "data/pokemon/base_stats/nassy.inc"
+BaseStats_Karakara:: INCLUDE "data/pokemon/base_stats/karakara.inc"
+BaseStats_Garagara:: INCLUDE "data/pokemon/base_stats/garagara.inc"
+BaseStats_Sawamular:: INCLUDE "data/pokemon/base_stats/sawamular.inc"
+BaseStats_Ebiwalar:: INCLUDE "data/pokemon/base_stats/ebiwalar.inc"
+BaseStats_Beroringa:: INCLUDE "data/pokemon/base_stats/beroringa.inc"
+BaseStats_Dogars:: INCLUDE "data/pokemon/base_stats/dogars.inc"
+BaseStats_Matadogas:: INCLUDE "data/pokemon/base_stats/matadogas.inc"
+BaseStats_Sihorn:: INCLUDE "data/pokemon/base_stats/sihorn.inc"
+BaseStats_Sidon:: INCLUDE "data/pokemon/base_stats/sidon.inc"
+BaseStats_Lucky:: INCLUDE "data/pokemon/base_stats/lucky.inc"
+BaseStats_Monjara:: INCLUDE "data/pokemon/base_stats/monjara.inc"
+BaseStats_Garura:: INCLUDE "data/pokemon/base_stats/garura.inc"
+BaseStats_Tattu:: INCLUDE "data/pokemon/base_stats/tattu.inc"
+BaseStats_Seadra:: INCLUDE "data/pokemon/base_stats/seadra.inc"
+BaseStats_Tosakinto:: INCLUDE "data/pokemon/base_stats/tosakinto.inc"
+BaseStats_Azumao:: INCLUDE "data/pokemon/base_stats/azumao.inc"
+BaseStats_Hitodeman:: INCLUDE "data/pokemon/base_stats/hitodeman.inc"
+BaseStats_Starmie:: INCLUDE "data/pokemon/base_stats/starmie.inc"
+BaseStats_Barrierd:: INCLUDE "data/pokemon/base_stats/barrierd.inc"
+BaseStats_Strike:: INCLUDE "data/pokemon/base_stats/strike.inc"
+BaseStats_Rougela:: INCLUDE "data/pokemon/base_stats/rougela.inc"
+BaseStats_Eleboo:: INCLUDE "data/pokemon/base_stats/eleboo.inc"
+BaseStats_Boober:: INCLUDE "data/pokemon/base_stats/boober.inc"
+BaseStats_Kailios:: INCLUDE "data/pokemon/base_stats/kailios.inc"
+BaseStats_Kentauros:: INCLUDE "data/pokemon/base_stats/kentauros.inc"
+BaseStats_Koiking:: INCLUDE "data/pokemon/base_stats/koiking.inc"
+BaseStats_Gyarados:: INCLUDE "data/pokemon/base_stats/gyarados.inc"
+BaseStats_Laplace:: INCLUDE "data/pokemon/base_stats/laplace.inc"
+BaseStats_Metamon:: INCLUDE "data/pokemon/base_stats/metamon.inc"
+BaseStats_Eievui:: INCLUDE "data/pokemon/base_stats/eievui.inc"
+BaseStats_Showers:: INCLUDE "data/pokemon/base_stats/showers.inc"
+BaseStats_Thunders:: INCLUDE "data/pokemon/base_stats/thunders.inc"
+BaseStats_Booster:: INCLUDE "data/pokemon/base_stats/booster.inc"
+BaseStats_Porygon:: INCLUDE "data/pokemon/base_stats/porygon.inc"
+BaseStats_Omnite:: INCLUDE "data/pokemon/base_stats/omnite.inc"
+BaseStats_Omstar:: INCLUDE "data/pokemon/base_stats/omstar.inc"
+BaseStats_Kabuto:: INCLUDE "data/pokemon/base_stats/kabuto.inc"
+BaseStats_Kabutops:: INCLUDE "data/pokemon/base_stats/kabutops.inc"
+BaseStats_Ptera:: INCLUDE "data/pokemon/base_stats/ptera.inc"
+BaseStats_Kabigon:: INCLUDE "data/pokemon/base_stats/kabigon.inc"
+BaseStats_Freezer:: INCLUDE "data/pokemon/base_stats/freezer.inc"
+BaseStats_Thunder:: INCLUDE "data/pokemon/base_stats/thunder.inc"
+BaseStats_Fire:: INCLUDE "data/pokemon/base_stats/fire.inc"
+BaseStats_Miniryu:: INCLUDE "data/pokemon/base_stats/miniryu.inc"
+BaseStats_Hakuryu:: INCLUDE "data/pokemon/base_stats/hakuryu.inc"
+BaseStats_Kairyu:: INCLUDE "data/pokemon/base_stats/kairyu.inc"
+BaseStats_Mewtwo:: INCLUDE "data/pokemon/base_stats/mewtwo.inc"
+BaseStats_Mew:: INCLUDE "data/pokemon/base_stats/mew.inc"
+BaseStats_Happa:: INCLUDE "data/pokemon/base_stats/happa.inc"
+BaseStats_Hanamogura:: INCLUDE "data/pokemon/base_stats/hanamogura.inc"
+BaseStats_Hanaryu:: INCLUDE "data/pokemon/base_stats/hanaryu.inc"
+BaseStats_Honoguma:: INCLUDE "data/pokemon/base_stats/honoguma.inc"
+BaseStats_Volbear:: INCLUDE "data/pokemon/base_stats/volbear.inc"
+BaseStats_Dynabear:: INCLUDE "data/pokemon/base_stats/dynabear.inc"
+BaseStats_Kurusu:: INCLUDE "data/pokemon/base_stats/kurusu.inc"
+BaseStats_Aqua:: INCLUDE "data/pokemon/base_stats/aqua.inc"
+BaseStats_Aquaria:: INCLUDE "data/pokemon/base_stats/aquaria.inc"
+BaseStats_Hoho:: INCLUDE "data/pokemon/base_stats/hoho.inc"
+BaseStats_Bobo:: INCLUDE "data/pokemon/base_stats/bobo.inc"
+BaseStats_Pachimee:: INCLUDE "data/pokemon/base_stats/pachimee.inc"
+BaseStats_Mokoko:: INCLUDE "data/pokemon/base_stats/mokoko.inc"
+BaseStats_Denryu:: INCLUDE "data/pokemon/base_stats/denryu.inc"
+BaseStats_Mikon:: INCLUDE "data/pokemon/base_stats/mikon.inc"
+BaseStats_Monja:: INCLUDE "data/pokemon/base_stats/monja.inc"
+BaseStats_Jaranra:: INCLUDE "data/pokemon/base_stats/jaranra.inc"
+BaseStats_Haneei:: INCLUDE "data/pokemon/base_stats/haneei.inc"
+BaseStats_Puku:: INCLUDE "data/pokemon/base_stats/puku.inc"
+BaseStats_Shibirefugu:: INCLUDE "data/pokemon/base_stats/shibirefugu.inc"
+BaseStats_Pichu:: INCLUDE "data/pokemon/base_stats/pichu.inc"
+BaseStats_Py:: INCLUDE "data/pokemon/base_stats/py.inc"
+BaseStats_Pupurin:: INCLUDE "data/pokemon/base_stats/pupurin.inc"
+BaseStats_Mizuuo:: INCLUDE "data/pokemon/base_stats/mizuuo.inc"
+BaseStats_Naty:: INCLUDE "data/pokemon/base_stats/naty.inc"
+BaseStats_Natio:: INCLUDE "data/pokemon/base_stats/natio.inc"
+BaseStats_Gyopin:: INCLUDE "data/pokemon/base_stats/gyopin.inc"
+BaseStats_Maril:: INCLUDE "data/pokemon/base_stats/maril.inc"
+BaseStats_Manbo1:: INCLUDE "data/pokemon/base_stats/manbo1.inc"
+BaseStats_Ikari:: INCLUDE "data/pokemon/base_stats/ikari.inc"
+BaseStats_Grotess:: INCLUDE "data/pokemon/base_stats/grotess.inc"
+BaseStats_Eksing:: INCLUDE "data/pokemon/base_stats/eksing.inc"
+BaseStats_Para:: INCLUDE "data/pokemon/base_stats/para.inc"
+BaseStats_Kokumo:: INCLUDE "data/pokemon/base_stats/kokumo.inc"
+BaseStats_Twohead:: INCLUDE "data/pokemon/base_stats/twohead.inc"
+BaseStats_Yoroidori:: INCLUDE "data/pokemon/base_stats/yoroidori.inc"
+BaseStats_Animon:: INCLUDE "data/pokemon/base_stats/animon.inc"
+BaseStats_Hinazu:: INCLUDE "data/pokemon/base_stats/hinazu.inc"
+BaseStats_Sunny:: INCLUDE "data/pokemon/base_stats/sunny.inc"
+BaseStats_Paon:: INCLUDE "data/pokemon/base_stats/paon.inc"
+BaseStats_Donphan:: INCLUDE "data/pokemon/base_stats/donphan.inc"
+BaseStats_Twinz:: INCLUDE "data/pokemon/base_stats/twinz.inc"
+BaseStats_Kirinriki:: INCLUDE "data/pokemon/base_stats/kirinriki.inc"
+BaseStats_Painter:: INCLUDE "data/pokemon/base_stats/painter.inc"
+BaseStats_Kounya:: INCLUDE "data/pokemon/base_stats/kounya.inc"
+BaseStats_Rinrin:: INCLUDE "data/pokemon/base_stats/rinrin.inc"
+BaseStats_Berurun:: INCLUDE "data/pokemon/base_stats/berurun.inc"
+BaseStats_Nyorotono:: INCLUDE "data/pokemon/base_stats/nyorotono.inc"
+BaseStats_Yadoking:: INCLUDE "data/pokemon/base_stats/yadoking.inc"
+BaseStats_Annon:: INCLUDE "data/pokemon/base_stats/annon.inc"
+BaseStats_Rediba:: INCLUDE "data/pokemon/base_stats/rediba.inc"
+BaseStats_Mitsuboshi:: INCLUDE "data/pokemon/base_stats/mitsuboshi.inc"
+BaseStats_Puchicorn:: INCLUDE "data/pokemon/base_stats/puchicorn.inc"
+BaseStats_Eifie:: INCLUDE "data/pokemon/base_stats/eifie.inc"
+BaseStats_Blacky:: INCLUDE "data/pokemon/base_stats/blacky.inc"
+BaseStats_Turban:: INCLUDE "data/pokemon/base_stats/turban.inc"
+BaseStats_Betbaby:: INCLUDE "data/pokemon/base_stats/betbaby.inc"
+BaseStats_Teppouo:: INCLUDE "data/pokemon/base_stats/teppouo.inc"
+BaseStats_Okutank:: INCLUDE "data/pokemon/base_stats/okutank.inc"
+BaseStats_Gongu:: INCLUDE "data/pokemon/base_stats/gongu.inc"
+BaseStats_Kapoerer:: INCLUDE "data/pokemon/base_stats/kapoerer.inc"
+BaseStats_Pudie:: INCLUDE "data/pokemon/base_stats/pudie.inc"
+BaseStats_Haneko:: INCLUDE "data/pokemon/base_stats/haneko.inc"
+BaseStats_Poponeko:: INCLUDE "data/pokemon/base_stats/poponeko.inc"
+BaseStats_Wataneko:: INCLUDE "data/pokemon/base_stats/wataneko.inc"
+BaseStats_Baririna:: INCLUDE "data/pokemon/base_stats/baririna.inc"
+BaseStats_Lip:: INCLUDE "data/pokemon/base_stats/lip.inc"
+BaseStats_Elebaby:: INCLUDE "data/pokemon/base_stats/elebaby.inc"
+BaseStats_Booby:: INCLUDE "data/pokemon/base_stats/booby.inc"
+BaseStats_Kireihana:: INCLUDE "data/pokemon/base_stats/kireihana.inc"
+BaseStats_Tsubomitto:: INCLUDE "data/pokemon/base_stats/tsubomitto.inc"
+BaseStats_Miltank:: INCLUDE "data/pokemon/base_stats/miltank.inc"
+BaseStats_Bombseeker:: INCLUDE "data/pokemon/base_stats/bombseeker.inc"
+BaseStats_Gift:: INCLUDE "data/pokemon/base_stats/gift.inc"
+BaseStats_Kotora:: INCLUDE "data/pokemon/base_stats/kotora.inc"
+BaseStats_Raitora:: INCLUDE "data/pokemon/base_stats/raitora.inc"
+BaseStats_Madame:: INCLUDE "data/pokemon/base_stats/madame.inc"
+BaseStats_Norowara:: INCLUDE "data/pokemon/base_stats/norowara.inc"
+BaseStats_Kyonpan:: INCLUDE "data/pokemon/base_stats/kyonpan.inc"
+BaseStats_Yamikarasu:: INCLUDE "data/pokemon/base_stats/yamikarasu.inc"
+BaseStats_Happi:: INCLUDE "data/pokemon/base_stats/happi.inc"
+BaseStats_Scissors:: INCLUDE "data/pokemon/base_stats/scissors.inc"
+BaseStats_Purakkusu:: INCLUDE "data/pokemon/base_stats/purakkusu.inc"
+BaseStats_Devil:: INCLUDE "data/pokemon/base_stats/devil.inc"
+BaseStats_Helgaa:: INCLUDE "data/pokemon/base_stats/helgaa.inc"
+BaseStats_Wolfman:: INCLUDE "data/pokemon/base_stats/wolfman.inc"
+BaseStats_Warwolf:: INCLUDE "data/pokemon/base_stats/warwolf.inc"
+BaseStats_Porygon2:: INCLUDE "data/pokemon/base_stats/porygon2.inc"
+BaseStats_Nameil:: INCLUDE "data/pokemon/base_stats/nameil.inc"
+BaseStats_Haganeil:: INCLUDE "data/pokemon/base_stats/haganeil.inc"
+BaseStats_Kingdra:: INCLUDE "data/pokemon/base_stats/kingdra.inc"
+BaseStats_Rai:: INCLUDE "data/pokemon/base_stats/rai.inc"
+BaseStats_En:: INCLUDE "data/pokemon/base_stats/en.inc"
+BaseStats_Sui:: INCLUDE "data/pokemon/base_stats/sui.inc"
+BaseStats_Nyula:: INCLUDE "data/pokemon/base_stats/nyula.inc"
+BaseStats_Houou:: INCLUDE "data/pokemon/base_stats/houou.inc"
+BaseStats_Togepy:: INCLUDE "data/pokemon/base_stats/togepy.inc"
+BaseStats_Bulu:: INCLUDE "data/pokemon/base_stats/bulu.inc"
+BaseStats_Tail:: INCLUDE "data/pokemon/base_stats/tail.inc"
+BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc"
diff --git a/data/pokemon/base_stats/kirinriki.inc b/data/pokemon/base_stats/kirinriki.inc
index 400a807..30b2312 100644
--- a/data/pokemon/base_stats/kirinriki.inc
+++ b/data/pokemon/base_stats/kirinriki.inc
@@ -6,7 +6,11 @@
db TYPE_DARK, TYPE_NORMAL ; type
db 255 ; catch rate
db 100 ; base exp
+if DEBUG || def(SILVER)
db ITEM_BERRY, ITEM_TAG ; items
+else
+ db ITEM_APPLE, ITEM_TAG ; item
+endc
db GENDER_50_50 ; gender ratio
db 100, 4, 70 ; unknown
dn 7, 7 ; sprite dimensions
diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
index 8dd6d54..0cc8d67 100644
--- a/data/predef_pointers.inc
+++ b/data/predef_pointers.inc
@@ -3,7 +3,7 @@
add_predef: MACRO
\1Predef::
- dab \1
+ dba \1
ENDM
PredefPointers:: ; 1:62d3
@@ -11,90 +11,91 @@ PredefPointers:: ; 1:62d3
; Please be a peach and nuke the hell out of these:
; WE NEED LABELS!
; Thank youu~
- dbw 1, $6445 ; 0
- dbw 1, $5D27
- dbw 1, $6713
- dbw 1, $66B1
- dbw 1, $4031
- dbw 3, $4E10
- dbw 3, $4D6F
- dbw 3, $4DE3
- dbw 3, $4DE3 ; 8
- dbw 3, $4DE3
- dbw 3, $4DF9
- dbw 3, $4E10
- dbw 3, $4D33
+ add_predef Function_6445
+ add_predef Function_5d27
+ add_predef Function_6713
+ add_predef Function_66b1
+ add_predef Function_4031
+ add_predef Function_ce10
+ add_predef Function_cd6f
+ add_predef Function_cde3
+ add_predef Function_cde3_2
+ add_predef Function_cde3_3
+ add_predef Function_cdf9
+ add_predef Function_ce10_2
+ add_predef Function_cd33
+GiveItemPredef::
dbw 3, GiveItem
- dbw 3, $4E3C
- dbw 3, $5A28
- dbw 3, $5886 ; 10
- dbw 3, $5A4F
- dbw 3, $5AC8
- dbw 3, $5CFC
- dbw 3, $5C16
- dbw 3, $5D5C
- dbw 3, $5E79
- dbw 3, $4E7C
- dbw 3, $5F7D ; 18
- dbw 3, $5F91
- dbw 4, $528F
- dbw 4, $52C1
- dbw 10, $4C98
- dbw 11, $5663
- dbw 15, $55CE
- dbw 15, $7019
- dbw 15, $7068 ; 20
- dbw 15, $704A
- dbw 15, $508C
- dbw 15, $567C
- dbw 15, $61A4
- dbw 15, $6F19
- dbw 15, $6874
- dbw 15, $691E
- dbw 15, $6963 ; 28
- dbw 16, $61F8
- dbw 16, $6252
- dbw 16, $5FA1
- dbw 10, $4DA4
- dbw 10, $4D6E
- dbw 16, $4AC7
- dbw 16, $4000
- dbw 16, $4B5C ; 30
- dbw 20, $4000
- dbw 20, $4BFE
- dbw 20, $4BCD
- dbw 20, $4B92
- dbw 20, $48C4
- dbw 20, $4771
- dbw 20, $4774
- dbw 20, $481F ; 38
- dbw 20, $46D4
- dbw 20, $469E
- dbw 20, $42B5
- dbw 20, $4244
- dbw 20, $4248
- dbw 20, $40C6
- dbw 20, $40A0
- dbw 20, $4073 ; 40
- dbw 20, $4ED9
- dbw 50, $76FF
- dbw 50, $7710
- dbw 50, $7733
- dbw 5, $45B8
- dbw 5, $46DC
- dbw 5, $45DE
- dbw 50, $4000 ; 48
- dbw 5, $457A
- dbw 5, $43E0
- dbw 2, $5695
- dbw 2, $528B
- dbw 2, $4786
- dbw 35, $44BE
- dbw 35, $49C6
- dbw 35, $4940 ; 50
- dbw 51, $4001
- dbw 51, $4000
- dbw 51, $4000
- dbw 63, $5B66
- dbw 4, $640B
+ add_predef Function_ce3c
+ add_predef Function_da28
+ add_predef Function_d886
+ add_predef Function_da4f
+ add_predef Function_dac8
+ add_predef Function_dcfc
+ add_predef Function_dc16
+ add_predef Function_dd5c
+ add_predef Function_de79
+ add_predef Function_ce7c
+ add_predef Function_df7d
+ add_predef Function_df91
+ add_predef Function_1128f
+ add_predef Function_112c1
+ add_predef Function_28c98
+ add_predef Function_2d663
+ add_predef Function_3d5ce
+ add_predef Function_3f019
+ add_predef Function_3f068
+ add_predef Function_3f04a
+ add_predef Function_3d08c
+ add_predef Function_3d67c
+ add_predef Function_3e1a4
+ add_predef Function_3ef19
+ add_predef Function_3e874
+ add_predef Function_3e91e
+ add_predef Function_3e963
+ add_predef Function_421f8
+ add_predef Function_42252
+ add_predef Function_41fa1
+ add_predef Function_28da4
+ add_predef Function_28d6e
+ add_predef Function_40ac7
+ add_predef Function_40000
+ add_predef Function_40b5c
+ add_predef Function_50000
+ add_predef Function_50bfe
+ add_predef Function_50bcd
+ add_predef Function_50b92
+ add_predef Function_508c4
+ add_predef Function_50771
+ add_predef Function_50774
+ add_predef Function_5081f
+ add_predef Function_506d4
+ add_predef Function_5069e
+ add_predef Function_502b5
+ add_predef Function_50244
+ add_predef Function_50248
+ add_predef Function_500c6
+ add_predef Function_500a0
+ add_predef Function_50073
+ add_predef Function_50ed9
+ add_predef Function_cb6ff
+ add_predef Function_cb710
+ add_predef Function_cb733
+ add_predef Function_145b8
+ add_predef Function_146dc
+ add_predef Function_145de
+ add_predef Function_c8000
+ add_predef Function_1457a
+ add_predef Function_143e0
+ add_predef Function_9695
+ add_predef Function_928b
+ add_predef Function_8786
+ add_predef Function_8c4be
+ add_predef Function_8c9c6
+ add_predef Function_8c940
+ add_predef Function_cc001
+ add_predef Function_cc000
+ add_predef Function_cc000_2
+ add_predef Function_fdb66
+ add_predef Function_1240b
dbw $ff, InexplicablyEmptyFunction
diff --git a/data/super_palettes.inc b/data/super_palettes.inc
index 39d115b..cf654c3 100644
--- a/data/super_palettes.inc
+++ b/data/super_palettes.inc
@@ -38,7 +38,11 @@ SuperPalettes::
RGB 28,28,28, 30,26,15, 26,20,00, 04,04,04 ; YELLOW_BAR
RGB 28,28,28, 30,26,15, 26,10,06, 04,04,04 ; RED_BAR
RGB 28,28,28, 20,26,31, 17,23,10, 04,04,04 ; TOWN_MAP
+if def(GOLD)
RGB 28,28,28, 24,20,10, 21,00,04, 04,04,04 ; LOGO_1
+else
+ RGB 28,28,28, 18,18,18, 21,00,04, 04,04,04 ; LOGO_1
+endc
RGB 28,28,28, 31,20,10, 21,00,04, 04,04,04 ; LOGO_2
RGB 28,28,28, 30,26,16, 16,12,09, 04,04,04 ; GAME_FREAK
RGB 28,28,28, 15,28,26, 12,22,26, 03,16,14 ; INTRO_WATER
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index 5425b91..47b0c38 100644
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -1,6 +1,10 @@
INCLUDE "constants.asm"
+if DEBUG
SECTION "Tileset Headers", ROMX[$488D], BANK[$03]
+else
+SECTION "Tileset Headers", ROMX[$4875], BANK[$03]
+endc
Tileset_00: ; 0xc88d
db $06 ; bank
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index c264733..4514b38 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -3,10 +3,10 @@ INCLUDE "constants.asm"
; Trainer data structure:
; - db "NAME@", TRAINERTYPE_* constant
; - 1 to 6 Pokémon:
-; * for TRAINERTYPE_NORMAL: db level, species
-; * for TRAINERTYPE_ITEM: db level, species, item
-; * for TRAINERTYPE_MOVES: db level, species, 4 moves
-; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
+; * for TRAINERTYPE_NORMAL: db level, species
+; * for TRAINERTYPE_ITEM: db level, species, item
+; * for TRAINERTYPE_MOVES: db level, species, 4 moves
+; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
; - db -1 ; end
SECTION "Trainer Parties", ROMX[$5110], BANK[$E]
@@ -15,6 +15,7 @@ INCLUDE "data/trainers/party_pointers.inc"
; TODO: decode all data
+if def(GOLD)
HayatoGroup::
; Leftover Youngster data from Red/Blue
db 11, MON_KORATTA, MON_ARBO, 0
@@ -399,3 +400,194 @@ KimonoGirlGroup::
db "こうめ@", TRAINERTYPE_ITEM_MOVES
db 10, DEX_PIPPI, ITEM_NONE, MOVE_CHARM, MOVE_SWEET_KISS, MOVE_POUND, MOVE_NONE
db -1 ; end
+else
+
+
+SECTION "Trainer Parties 1 TEMPORARY", ROMX[$51BF],BANK[$E]
+AkaneGroup::
+BugCatcherBoyGroup::
+ ; BUG_CATCHER_BOY_KENJI
+ db "けんじ@", TRAINERTYPE_ITEM_MOVES
+ db 9, DEX_REDIBA, ITEM_NONE, MOVE_SCRATCH, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE
+ db -1 ; end
+
+ ; BUG_CATCHER_BOY_KEN
+ db "けん@", TRAINERTYPE_ITEM_MOVES
+ db 7, DEX_KONGPANG, ITEM_NONE, MOVE_STUN_SPORE, MOVE_LEECH_LIFE, MOVE_NONE, MOVE_NONE
+ db -1 ; end
+
+SECTION "Trainer Parties 2 TEMPORARY", ROMX[$52B4],BANK[$E]
+MikanGroup::
+
+SECTION "Trainer Parties 3 TEMPORARY", ROMX[$53BC],BANK[$E]
+OkidoGroup::
+
+SECTION "Trainer Parties 4 TEMPORARY", ROMX[$54BA],BANK[$E]
+WataruGroup::
+
+SECTION "Trainer Parties 5 TEMPORARY", ROMX[$54E0],BANK[$E]
+GerugeMemberMGroup::
+
+SECTION "Trainer Parties 6 TEMPORARY", ROMX[$54FE],BANK[$E]
+Trio1Group::
+BeautyGroup::
+
+SECTION "Trainer Parties 7 TEMPORARY", ROMX[$55EB],BANK[$E]
+FledglingGroup::
+
+SECTION "Trainer Parties 8 TEMPORARY", ROMX[$56CE],BANK[$E]
+PokeManiacGroup::
+
+SECTION "Trainer Parties 9 TEMPORARY", ROMX[$57BC],BANK[$E]
+GentlemanGroup::
+
+SECTION "Trainer Parties 10 TEMPORARY", ROMX[$57E0],BANK[$E]
+TeacherMGroup::
+
+SECTION "Trainer Parties 11 TEMPORARY", ROMX[$57EC],BANK[$E]
+TeacherFGroup::
+
+SECTION "Trainer Parties 12 TEMPORARY", ROMX[$57F2],BANK[$E]
+ManchildGroup::
+
+SECTION "Trainer Parties 13 TEMPORARY", ROMX[$58C3],BANK[$E]
+RockerGroup::
+
+SECTION "Trainer Parties 14 TEMPORARY", ROMX[$58F2],BANK[$E]
+HikerGroup::
+
+SECTION "Trainer Parties 15 TEMPORARY", ROMX[$5995],BANK[$E]
+KimonoGirlGroup::
+ ; KIMONO_GIRL_KOUME
+ db "こうめ@", TRAINERTYPE_ITEM_MOVES
+ db 9, DEX_DONPHAN, ITEM_NONE, MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_NONE, MOVE_NONE
+ db -1 ; end
+
+ ; KIMONO_GIRL_TAMAO
+ db "たまお@", TRAINERTYPE_ITEM_MOVES
+ db 10, DEX_PURIN, ITEM_NONE, MOVE_CHARM, MOVE_POUND, MOVE_ENCORE, MOVE_NONE
+ db -1 ; end
+
+SECTION "Trainer Parties 16 TEMPORARY", ROMX[$518A],BANK[$E]
+HayatoGroup::
+
+SECTION "Trainer Parties 17 TEMPORARY", ROMX[$5216],BANK[$E]
+TsukishiGroup::
+LassGroup::
+
+SECTION "Trainer Parties 18 TEMPORARY", ROMX[$526F],BANK[$E]
+EnokiGroup::
+
+SECTION "Trainer Parties 19 TEMPORARY", ROMX[$528F],BANK[$E]
+OkeraGroup::
+
+SECTION "Trainer Parties 20 TEMPORARY", ROMX[$533D],BANK[$E]
+GamaGroup::
+
+SECTION "Trainer Parties 21 TEMPORARY", ROMX[$5542],BANK[$E]
+Trio2Group::
+
+SECTION "Trainer Parties 22 TEMPORARY", ROMX[$5554],BANK[$E]
+Trio3Group::
+
+SECTION "Trainer Parties 23 TEMPORARY", ROMX[$5673],BANK[$E]
+ProfessionalMGroup::
+ProfessionalFGroup::
+
+SECTION "Trainer Parties 24 TEMPORARY", ROMX[$5812],BANK[$E]
+SwimmerMGroup::
+
+SECTION "Trainer Parties 25 TEMPORARY", ROMX[$5821],BANK[$E]
+SuperNerdGroup::
+
+SECTION "Trainer Parties 26 TEMPORARY", ROMX[$5833],BANK[$E]
+EngineerGroup::
+
+SECTION "Trainer Parties 27 TEMPORARY", ROMX[$5965],BANK[$E]
+JugglerGroup::
+
+SECTION "Trainer Parties 28 TEMPORARY", ROMX[$5971],BANK[$E]
+TwinsGroup::
+
+SECTION "Trainer Parties 29 TEMPORARY", ROMX[$5976],BANK[$E]
+SchoolboyGroup::
+ ; SCHOOLBOY_TETSUYA
+ db "てつや@", TRAINERTYPE_ITEM
+ db 8, DEX_YADOKING, ITEM_NONE
+ db -1 ; end
+
+SECTION "Trainer Parties 30 TEMPORARY", ROMX[$597F],BANK[$E]
+FirebreatherGroup::
+ ; FIREBREATHER_AKITO
+ db "あきと@", TRAINERTYPE_ITEM
+ db 8, DEX_BOOBY, ITEM_NONE
+ db -1 ; end
+
+SECTION "Trainer Parties 31 TEMPORARY", ROMX[$5320],BANK[$E]
+BlueGroup::
+
+SECTION "Trainer Parties 32 TEMPORARY", ROMX[$5375],BANK[$E]
+RivalGroup::
+
+SECTION "Trainer Parties 33 TEMPORARY", ROMX[$5404],BANK[$E]
+SakakiGroup::
+
+SECTION "Trainer Parties 34 TEMPORARY", ROMX[$5427],BANK[$E]
+ProtagonistGroup::
+
+SECTION "Trainer Parties 35 TEMPORARY", ROMX[$5433],BANK[$E]
+SibaGroup::
+KasumiGroup::
+FisherGroup::
+
+SECTION "Trainer Parties 36 TEMPORARY", ROMX[$5476],BANK[$E]
+KannaGroup::
+
+SECTION "Trainer Parties 37 TEMPORARY", ROMX[$555D],BANK[$E]
+RocketFGroup::
+
+SECTION "Trainer Parties 38 TEMPORARY", ROMX[$557E],BANK[$E]
+YoungsterGroup::
+
+SECTION "Trainer Parties 39 TEMPORARY", ROMX[$564F],BANK[$E]
+ProdigyGroup::
+
+SECTION "Trainer Parties 40 TEMPORARY", ROMX[$578C],BANK[$E]
+RocketMGroup::
+
+SECTION "Trainer Parties 41 TEMPORARY", ROMX[$5808],BANK[$E]
+SwimmerFGroup::
+
+SECTION "Trainer Parties 42 TEMPORARY", ROMX[$5817],BANK[$E]
+SailorGroup::
+
+SECTION "Trainer Parties 43 TEMPORARY", ROMX[$58FE],BANK[$E]
+BikerGroup::
+
+SECTION "Trainer Parties 44 TEMPORARY", ROMX[$594D],BANK[$E]
+RockClimberGroup::
+
+SECTION "Trainer Parties 45 TEMPORARY", ROMX[$5959],BANK[$E]
+BurglarGroup::
+
+SECTION "Trainer Parties 46 TEMPORARY", ROMX[$5969],BANK[$E]
+BlackbeltGroup::
+
+SECTION "Trainer Parties 47 TEMPORARY", ROMX[$596D],BANK[$E]
+PsychicGroup::
+KungFuMasterGroup::
+FortuneTellerGroup::
+HooliganGroup::
+SageGroup::
+MediumGroup::
+SoldierGroup::
+GerugeMemberFGroup::
+
+SECTION "Trainer Parties 48 TEMPORARY", ROMX[$5988],BANK[$E]
+SportsmanGroup::
+ ; SPORTSMAN_SHIGEKI
+ db "てつじ@", TRAINERTYPE_ITEM_MOVES
+ db 9, DEX_DONPHAN, ITEM_NONE, MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_NONE, MOVE_NONE
+ db -1 ; end
+
+endc
diff --git a/data/wild.asm b/data/wild.asm
index d827686..515985d 100644
--- a/data/wild.asm
+++ b/data/wild.asm
@@ -7,9 +7,15 @@ GrassWildMons:: ; f:6a3c
db $01, $01 ; map group, map id
db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
; morn
+if def(GOLD)
db 7, DEX_SUNNY
db 3, DEX_SUNNY
db 5, DEX_SUNNY
+else
+ db 8, DEX_POPPO
+ db 8, DEX_POPPO
+ db 7, DEX_POPPO
+endc
db 5, DEX_PIKACHU
db 5, DEX_POPPO
db 5, DEX_POPPO
@@ -17,23 +23,38 @@ GrassWildMons:: ; f:6a3c
db 4, DEX_KORATTA
db 6, DEX_KIRINRIKI
db 4, DEX_KIRINRIKI
+if def(GOLD)
db 4, DEX_HANEKO
+else
+ db 4, DEX_MARIL
+endc
db 4, DEX_POPPO
db 8, DEX_KORATTA
; nite
db 7, DEX_KORATTA
db 5, DEX_KORATTA
db 5, DEX_KORATTA
+if def(GOLD)
db 7, DEX_KORATTA
db 8, DEX_KORATTA
+else
+ db 5, DEX_HOHO
+ db 3, DEX_HOHO
+endc
db 5, DEX_PIKACHU
db $01, $02 ; map group, map id
db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
; morn
+if def(GOLD)
db 6, DEX_SUNNY
db 6, DEX_SUNNY
db 6, DEX_SUNNY
+else
+ db 8, DEX_POPPO
+ db 8, DEX_POPPO
+ db 6, DEX_POPPO
+endc
db 5, DEX_PIKACHU
db 4, DEX_ARBO
db 5, DEX_KORATTA
@@ -41,13 +62,21 @@ GrassWildMons:: ; f:6a3c
db 5, DEX_POPPO
db 7, DEX_YOROIDORI
db 5, DEX_KORATTA
+if def(GOLD)
db 8, DEX_HANEKO
+else
+ db 8, DEX_MARIL
+endc
db 4, DEX_POPPO
db 7, DEX_KORATTA
; nite
db 7, DEX_KORATTA
db 6, DEX_ARBO
+if def(GOLD)
db 6, DEX_KORATTA
+else
+ db 6, DEX_HOHO
+endc
db 7, DEX_ARBO
db 8, DEX_KORATTA
db 5, DEX_PIKACHU
@@ -593,13 +622,21 @@ GrassWildMons:: ; f:6a3c
db 6, DEX_POPPO
db 4, DEX_CATERPIE
db 6, DEX_CATERPIE
+if def(GOLD)
db 6, DEX_HANEKO
+else
+ db 6, DEX_MARIL
+endc
db 5, DEX_CATERPIE
db 8, DEX_REDIBA
; nite
db 4, DEX_TRANSEL
db 6, DEX_KORATTA
+if def(GOLD)
db 6, DEX_CATERPIE
+else
+ db 5, DEX_HOHO
+endc
db 6, DEX_REDIBA
db 5, DEX_TRANSEL
db 5, DEX_PIKACHU
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 03:53:36 +0000