Pokemon overworld sprites

hg-commit-id: a810d29962df

3 files changed, 101 insertions, 2 deletions

diff --git a/README b/README
index 3d0ebcda..52979b84 100644
--- a/README
+++ b/README
@@ -15,4 +15,5 @@ Then run "make" in your shell.
 
 This will output a file named "pokered.gbc".
 
-nucleus.kafuka.org #skeetendo
+Our IRC channel is located here:
+irc://nucleus.kafuka.org/#skeetendo
diff --git a/constants.asm b/constants.asm
index 09299cac..3ef503d6 100644
--- a/constants.asm
+++ b/constants.asm
@@ -50,6 +50,11 @@ TSETHEAD: MACRO
 	dw \1,\2,\3
 	db \4,\5,\6,\7,\8
 	ENDM
+	
+; macro for two nibbles
+dn: MACRO
+	db (\1 << 4 | \2)
+	ENDM
 
 ; macro for putting a byte then a word
 dbw: MACRO
@@ -2009,6 +2014,19 @@ BRN     EQU %00010000
 FRZ     EQU %00100000
 PAR     EQU %01000000
 
+; pokemon's overworld sprites
+SPRITE_MON			EQU $0
+SPRITE_BALL_M		EQU $1
+SPRITE_HELIX		EQU $2
+SPRITE_FAIRY		EQU $3
+SPRITE_BIRD_M		EQU $4
+SPRITE_WATER		EQU $5
+SPRITE_BUG			EQU $6
+SPRITE_GRASS		EQU $7
+SPRITE_SNAKE		EQU $8
+SPRITE_QUADRUPED 	EQU $9
+
+; overworld sprites
 SPRITE_RED                       EQU $01
 SPRITE_BLUE                      EQU $02
 SPRITE_OAK                       EQU $03
diff --git a/main.asm b/main.asm
index ac7dbada..7398aabc 100644
--- a/main.asm
+++ b/main.asm
@@ -67380,7 +67380,87 @@ CeruleanCaveName:
 PowerPlantName:
 	db "POWER PLANT@"
 
-INCBIN "baserom.gbc",$716BE,$71AD9-$716BE
+INCBIN "baserom.gbc",$716BE,$7190D-$716BE
+
+MonOverworldData:
+	dn SPRITE_GRASS, SPRITE_GRASS			;Bulbasaur/Ivysaur
+	dn SPRITE_GRASS, SPRITE_MON				;Venusaur/Charmander
+	dn SPRITE_MON, SPRITE_MON				;Charmeleon/Charizard
+	dn SPRITE_WATER, SPRITE_WATER			;Squirtle/Wartortle
+	dn SPRITE_WATER, SPRITE_BUG				;Blastoise/Caterpie
+	dn SPRITE_BUG, SPRITE_BUG				;Metapod/Butterfree
+	dn SPRITE_BUG, SPRITE_BUG				;Weedle/Kakuna
+	dn SPRITE_BUG, SPRITE_BIRD_M			;Beedrill/Pidgey
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Pidgeotto/Pidgeot
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Rattata/Raticate
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Spearow/Fearow
+	dn SPRITE_SNAKE, SPRITE_SNAKE			;Ekans/Arbok
+	dn SPRITE_FAIRY, SPRITE_FAIRY			;Pikachu/Raichu
+	dn SPRITE_MON, SPRITE_MON				;Sandshrew/Sandslash
+	dn SPRITE_MON, SPRITE_MON				;Nidoran?/Nidorina
+	dn SPRITE_MON, SPRITE_MON				;Nidoqueen/Nidoran?
+	dn SPRITE_MON, SPRITE_MON				;Nidorino/Nidoking
+	dn SPRITE_FAIRY, SPRITE_FAIRY			;Clefairy/Clefable
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Vulpix/Ninetales
+	dn SPRITE_FAIRY, SPRITE_FAIRY			;Jigglypuff/Wigglytuff
+	dn SPRITE_MON, SPRITE_MON				;Zubat/Golbat
+	dn SPRITE_GRASS, SPRITE_GRASS			;Oddish/Gloom
+	dn SPRITE_GRASS, SPRITE_BUG				;Vileplume/Paras
+	dn SPRITE_BUG, SPRITE_BUG				;Parasect/Venonat
+	dn SPRITE_BUG, SPRITE_MON				;Venomoth/Diglett
+	dn SPRITE_MON, SPRITE_MON				;Dugtrio/Meowth
+	dn SPRITE_MON, SPRITE_MON				;Persian/Psyduck
+	dn SPRITE_MON, SPRITE_MON				;Golduck/Mankey
+	dn SPRITE_MON, SPRITE_QUADRUPED			;Primeape/Growlithe
+	dn SPRITE_QUADRUPED, SPRITE_MON			;Arcanine/Poliwag
+	dn SPRITE_MON, SPRITE_MON				;Poliwhirl/Poliwrath
+	dn SPRITE_MON, SPRITE_MON				;Abra/Kadabra
+	dn SPRITE_MON, SPRITE_MON				;Alakazam/Machop
+	dn SPRITE_MON, SPRITE_MON				;Machoke/Machamp
+	dn SPRITE_GRASS, SPRITE_GRASS			;Bellsprout/Weepinbell
+	dn SPRITE_GRASS, SPRITE_WATER			;Victreebel/Tentacool
+	dn SPRITE_WATER, SPRITE_MON				;Tentacruel/Geodude
+	dn SPRITE_MON, SPRITE_MON				;Graveler/Golem
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Ponyta/Rapidash
+	dn SPRITE_QUADRUPED, SPRITE_MON			;Slowpoke/Slowbro
+	dn SPRITE_BALL_M, SPRITE_BALL_M			;Magnemite/Magneton
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Farfetch'd/Doduo
+	dn SPRITE_BIRD_M, SPRITE_WATER			;Dodrio/Seel
+	dn SPRITE_WATER, SPRITE_MON				;Dewgong/Grimer
+	dn SPRITE_MON, SPRITE_HELIX				;Muk/Shellder
+	dn SPRITE_HELIX, SPRITE_MON				;Cloyster/Gastly
+	dn SPRITE_MON, SPRITE_MON				;Haunter/Gengar
+	dn SPRITE_SNAKE, SPRITE_MON				;Onix/Drowzee
+	dn SPRITE_MON, SPRITE_WATER				;Hypno/Krabby
+	dn SPRITE_WATER, SPRITE_BALL_M			;Kingler/Voltorb
+	dn SPRITE_BALL_M, SPRITE_GRASS			;Electrode/Exeggcute
+	dn SPRITE_GRASS, SPRITE_MON				;Exeggutor/Cubone
+	dn SPRITE_MON, SPRITE_MON				;Marowak/Hitmonlee
+	dn SPRITE_MON, SPRITE_MON				;Hitmonchan/Lickitung
+	dn SPRITE_MON, SPRITE_MON				;Koffing/Weezing
+	dn SPRITE_QUADRUPED, SPRITE_MON			;Rhyhorn/Rhydon
+	dn SPRITE_FAIRY, SPRITE_GRASS			;Chansey/Tangela
+	dn SPRITE_MON, SPRITE_WATER				;Kangaskhan/Horsea
+	dn SPRITE_WATER, SPRITE_WATER			;Seadra/Goldeen
+	dn SPRITE_WATER, SPRITE_HELIX			;Seaking/Staryu
+	dn SPRITE_HELIX, SPRITE_MON				;Starmie/Mr.Mime
+	dn SPRITE_BUG, SPRITE_MON				;Scyther/Jynx
+	dn SPRITE_MON, SPRITE_MON				;Electabuzz/Magmar
+	dn SPRITE_BUG, SPRITE_QUADRUPED			;Pinsir/Tauros
+	dn SPRITE_WATER, SPRITE_SNAKE			;Magikarp/Gyarados
+	dn SPRITE_WATER, SPRITE_MON				;Lapras/Ditto
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Eevee/Vaporeon
+	dn SPRITE_QUADRUPED, SPRITE_QUADRUPED	;Jolteon/Flareon
+	dn SPRITE_MON, SPRITE_HELIX				;Porygon/Omanyte
+	dn SPRITE_HELIX, SPRITE_HELIX			;Omastar/Kabuto
+	dn SPRITE_HELIX, SPRITE_BIRD_M			;Kabutops/Aerodactyl
+	dn SPRITE_MON, SPRITE_BIRD_M			;Snorlax/Articuno
+	dn SPRITE_BIRD_M, SPRITE_BIRD_M			;Zapdos/Moltres
+	dn SPRITE_SNAKE, SPRITE_SNAKE			;Dratini/Dragonair
+	dn SPRITE_SNAKE, SPRITE_MON				;Dragonite/Mewtwo
+	dn SPRITE_MON, 0						;Mew/Padding
+
+INCBIN "baserom.gbc",$71959,$71AD9-$71959
 
 Predef54: ; 0x71ad9
 ; trigger the trade offer/action specified by W_WHICHTRADE