mirror of
				https://github.com/thornAvery/kep-hack.git
				synced 2025-11-04 20:51:02 +13:00 
			
		
		
		
	Pokemon data, Gym Leader teams, palette updates and a couple of other fixes
This commit is contained in:
		
							parent
							
								
									ac45c8b5bc
								
							
						
					
					
						commit
						f5a7cc9ffc
					
				| 
						 | 
				
			
			@ -36,8 +36,8 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_13, $00, $80 ; Blastoise
 | 
			
		||||
	mon_cry SFX_CRY_14, $00, $80 ; Pinsir
 | 
			
		||||
	mon_cry SFX_CRY_12, $00, $80 ; Tangela
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon
 | 
			
		||||
	mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign
 | 
			
		||||
	mon_cry SFX_CRY_1F, $20, $40 ; Growlithe
 | 
			
		||||
	mon_cry SFX_CRY_17, $FF, $C0 ; Onix
 | 
			
		||||
	mon_cry SFX_CRY_18, $40, $A0 ; Fearow
 | 
			
		||||
| 
						 | 
				
			
			@ -55,26 +55,26 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_21, $20, $60 ; Psyduck
 | 
			
		||||
	mon_cry SFX_CRY_0D, $88, $20 ; Drowzee
 | 
			
		||||
	mon_cry SFX_CRY_12, $E0, $40 ; Golem
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0E, $00, $80 ; Barunda
 | 
			
		||||
	mon_cry SFX_CRY_04, $FF, $30 ; Magmar
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0D, $2E, $E0 ; Buu
 | 
			
		||||
	mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz
 | 
			
		||||
	mon_cry SFX_CRY_1C, $20, $C0 ; Magneton
 | 
			
		||||
	mon_cry SFX_CRY_12, $E6, $DD ; Koffing
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_15, $40, $A5 ; Deer
 | 
			
		||||
	mon_cry SFX_CRY_0A, $DD, $60 ; Mankey
 | 
			
		||||
	mon_cry SFX_CRY_0C, $88, $C0 ; Seel
 | 
			
		||||
	mon_cry SFX_CRY_0B, $AA, $01 ; Diglett
 | 
			
		||||
	mon_cry SFX_CRY_1D, $11, $40 ; Tauros
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_03, $90, $B0 ; Trampel
 | 
			
		||||
	mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky
 | 
			
		||||
	mon_cry SFX_CRY_13, $93, $00 ; Blottle
 | 
			
		||||
	mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd
 | 
			
		||||
	mon_cry SFX_CRY_1A, $44, $40 ; Venonat
 | 
			
		||||
	mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite
 | 
			
		||||
	mon_cry SFX_CRY_00, $80, $10 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $80, $10 ; Cactus
 | 
			
		||||
	mon_cry SFX_CRY_17, $C8, $C0 ; Jagg
 | 
			
		||||
	mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat
 | 
			
		||||
	mon_cry SFX_CRY_0B, $BB, $01 ; Doduo
 | 
			
		||||
	mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag
 | 
			
		||||
	mon_cry SFX_CRY_0D, $FF, $FF ; Jynx
 | 
			
		||||
| 
						 | 
				
			
			@ -84,23 +84,23 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_0E, $FF, $FF ; Ditto
 | 
			
		||||
	mon_cry SFX_CRY_19, $77, $10 ; Meowth
 | 
			
		||||
	mon_cry SFX_CRY_20, $20, $E0 ; Krabby
 | 
			
		||||
	mon_cry SFX_CRY_22, $FF, $40 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_22, $FF, $40 ; Cheep
 | 
			
		||||
	mon_cry SFX_CRY_22, $32, $FF ; Jabetta
 | 
			
		||||
	mon_cry SFX_CRY_0E, $E0, $60 ; Mikon
 | 
			
		||||
	mon_cry SFX_CRY_24, $4F, $10 ; Vulpix
 | 
			
		||||
	mon_cry SFX_CRY_24, $88, $60 ; Ninetales
 | 
			
		||||
	mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu
 | 
			
		||||
	mon_cry SFX_CRY_09, $EE, $08 ; Raichu
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_12, $93, $60 ; Ribbito
 | 
			
		||||
	mon_cry SFX_CRY_12, $25, $FF ; Croakozuna
 | 
			
		||||
	mon_cry SFX_CRY_0F, $60, $40 ; Dratini
 | 
			
		||||
	mon_cry SFX_CRY_0F, $40, $80 ; Dragonair
 | 
			
		||||
	mon_cry SFX_CRY_16, $BB, $40 ; Kabuto
 | 
			
		||||
	mon_cry SFX_CRY_18, $EE, $01 ; Kabutops
 | 
			
		||||
	mon_cry SFX_CRY_19, $99, $10 ; Horsea
 | 
			
		||||
	mon_cry SFX_CRY_19, $3C, $01 ; Seadra
 | 
			
		||||
	mon_cry SFX_CRY_0F, $40, $C0 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua
 | 
			
		||||
	mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan
 | 
			
		||||
	mon_cry SFX_CRY_00, $20, $40 ; Sandshrew
 | 
			
		||||
	mon_cry SFX_CRY_00, $FF, $FF ; Sandslash
 | 
			
		||||
	mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte
 | 
			
		||||
| 
						 | 
				
			
			@ -120,38 +120,38 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_15, $EE, $01 ; Weedle
 | 
			
		||||
	mon_cry SFX_CRY_13, $FF, $01 ; Kakuna
 | 
			
		||||
	mon_cry SFX_CRY_13, $60, $80 ; Beedrill
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_18, $19, $FF ; Luxwan
 | 
			
		||||
	mon_cry SFX_CRY_0B, $99, $20 ; Dodrio
 | 
			
		||||
	mon_cry SFX_CRY_0A, $AF, $40 ; Primeape
 | 
			
		||||
	mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio
 | 
			
		||||
	mon_cry SFX_CRY_1A, $29, $80 ; Venomoth
 | 
			
		||||
	mon_cry SFX_CRY_0C, $23, $FF ; Dewgong
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu
 | 
			
		||||
	mon_cry SFX_CRY_13, $3C, $00 ; Pendraken
 | 
			
		||||
	mon_cry SFX_CRY_16, $80, $20 ; Caterpie
 | 
			
		||||
	mon_cry SFX_CRY_1C, $CC, $01 ; Metapod
 | 
			
		||||
	mon_cry SFX_CRY_16, $77, $40 ; Butterfree
 | 
			
		||||
	mon_cry SFX_CRY_1F, $08, $C0 ; Machamp
 | 
			
		||||
	mon_cry SFX_CRY_11, $20, $10 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_21, $93, $50 ; Weirduck
 | 
			
		||||
	mon_cry SFX_CRY_21, $FF, $40 ; Golduck
 | 
			
		||||
	mon_cry SFX_CRY_0D, $EE, $40 ; Hypno
 | 
			
		||||
	mon_cry SFX_CRY_1D, $FA, $80 ; Golbat
 | 
			
		||||
	mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo
 | 
			
		||||
	mon_cry SFX_CRY_05, $55, $01 ; Snorlax
 | 
			
		||||
	mon_cry SFX_CRY_17, $80, $00 ; Magikarp
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_19, $C1, $1C ; Konya
 | 
			
		||||
	mon_cry SFX_CRY_13, $00, $00 ; Omega
 | 
			
		||||
	mon_cry SFX_CRY_07, $EF, $FF ; Muk
 | 
			
		||||
	mon_cry SFX_CRY_0F, $40, $80 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0F, $40, $80 ; Decilla
 | 
			
		||||
	mon_cry SFX_CRY_20, $EE, $E0 ; Kingler
 | 
			
		||||
	mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite
 | 
			
		||||
	mon_cry SFX_CRY_06, $A8, $90 ; Electrode
 | 
			
		||||
	mon_cry SFX_CRY_19, $AA, $20 ; Clefable
 | 
			
		||||
	mon_cry SFX_CRY_12, $FF, $FF ; Weezing
 | 
			
		||||
	mon_cry SFX_CRY_19, $99, $FF ; Persian
 | 
			
		||||
	mon_cry SFX_CRY_08, $4F, $60 ; Marowak
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_08, $00, $FF ; Guardia
 | 
			
		||||
	mon_cry SFX_CRY_1C, $30, $40 ; Haunter
 | 
			
		||||
	mon_cry SFX_CRY_1C, $C0, $01 ; Abra
 | 
			
		||||
	mon_cry SFX_CRY_1C, $98, $FF ; Alakazam
 | 
			
		||||
| 
						 | 
				
			
			@ -161,13 +161,13 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur
 | 
			
		||||
	mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur
 | 
			
		||||
	mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_16, $89, $0E ; Gyopin
 | 
			
		||||
	mon_cry SFX_CRY_16, $80, $40 ; Goldeen
 | 
			
		||||
	mon_cry SFX_CRY_16, $10, $FF ; Seaking
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_03, $A3, $01 ; Kotora
 | 
			
		||||
	mon_cry SFX_CRY_03, $2D, $01 ; Gaotora
 | 
			
		||||
	mon_cry SFX_CRY_03, $05, $01 ; Gorotora
 | 
			
		||||
	mon_cry SFX_CRY_25, $37, $10 ; Puchikoon
 | 
			
		||||
	mon_cry SFX_CRY_25, $00, $80 ; Ponyta
 | 
			
		||||
	mon_cry SFX_CRY_25, $20, $C0 ; Rapidash
 | 
			
		||||
	mon_cry SFX_CRY_22, $00, $80 ; Rattata
 | 
			
		||||
| 
						 | 
				
			
			@ -177,16 +177,16 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_24, $F0, $10 ; Geodude
 | 
			
		||||
	mon_cry SFX_CRY_25, $AA, $FF ; Porygon
 | 
			
		||||
	mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_13, $F7, $00 ; Blastyke
 | 
			
		||||
	mon_cry SFX_CRY_1C, $80, $60 ; Magnemite
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_0F, $63, $40 ; Skimper
 | 
			
		||||
	mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu
 | 
			
		||||
	mon_cry SFX_CRY_04, $60, $40 ; Charmander
 | 
			
		||||
	mon_cry SFX_CRY_1D, $60, $40 ; Squirtle
 | 
			
		||||
	mon_cry SFX_CRY_04, $20, $40 ; Charmeleon
 | 
			
		||||
	mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
 | 
			
		||||
	mon_cry SFX_CRY_04, $00, $80 ; Charizard
 | 
			
		||||
	mon_cry SFX_CRY_1D, $00, $80 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_1D, $00, $80 ; Totartle
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
 | 
			
		||||
| 
						 | 
				
			
			@ -196,4 +196,13 @@ CryData::
 | 
			
		|||
	mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
 | 
			
		||||
	mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
 | 
			
		||||
	mon_cry SFX_CRY_25, $66, $CC ; Victreebel
 | 
			
		||||
	mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto
 | 
			
		||||
	mon_cry SFX_CRY_0E, $50, $FF ; Animon
 | 
			
		||||
	mon_cry SFX_CRY_12, $93, $00 ; Monja
 | 
			
		||||
	mon_cry SFX_CRY_1E, $79, $40 ; Para
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished)
 | 
			
		||||
	mon_cry SFX_CRY_1F, $40, $01 ; Pudi
 | 
			
		||||
	mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished)
 | 
			
		||||
	mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished)
 | 
			
		||||
	assert_table_length NUM_POKEMON_INDEXES
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,8 +30,8 @@ PokedexOrder:
 | 
			
		|||
	db DEX_BLASTOISE
 | 
			
		||||
	db DEX_PINSIR
 | 
			
		||||
	db DEX_TANGELA
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_GYAOON
 | 
			
		||||
	db DEX_NIDOREIGN
 | 
			
		||||
	db DEX_GROWLITHE
 | 
			
		||||
	db DEX_ONIX
 | 
			
		||||
	db DEX_FEAROW
 | 
			
		||||
| 
						 | 
				
			
			@ -49,26 +49,26 @@ PokedexOrder:
 | 
			
		|||
	db DEX_PSYDUCK
 | 
			
		||||
	db DEX_DROWZEE
 | 
			
		||||
	db DEX_GOLEM
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_BARUNDA
 | 
			
		||||
	db DEX_MAGMAR
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_BUU
 | 
			
		||||
	db DEX_ELECTABUZZ
 | 
			
		||||
	db DEX_MAGNETON
 | 
			
		||||
	db DEX_KOFFING
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_DEER
 | 
			
		||||
	db DEX_MANKEY
 | 
			
		||||
	db DEX_SEEL
 | 
			
		||||
	db DEX_DIGLETT
 | 
			
		||||
	db DEX_TAUROS
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_TRAMPEL
 | 
			
		||||
	db DEX_CROCKY
 | 
			
		||||
	db DEX_BLOTTLE
 | 
			
		||||
	db DEX_FARFETCHD
 | 
			
		||||
	db DEX_VENONAT
 | 
			
		||||
	db DEX_DRAGONITE
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_CACTUS
 | 
			
		||||
	db DEX_JAGG
 | 
			
		||||
	db DEX_BITTYBAT
 | 
			
		||||
	db DEX_DODUO
 | 
			
		||||
	db DEX_POLIWAG
 | 
			
		||||
	db DEX_JYNX
 | 
			
		||||
| 
						 | 
				
			
			@ -78,23 +78,23 @@ PokedexOrder:
 | 
			
		|||
	db DEX_DITTO
 | 
			
		||||
	db DEX_MEOWTH
 | 
			
		||||
	db DEX_KRABBY
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_CHEEP
 | 
			
		||||
	db DEX_JABETTA
 | 
			
		||||
	db DEX_MIKON
 | 
			
		||||
	db DEX_VULPIX
 | 
			
		||||
	db DEX_NINETALES
 | 
			
		||||
	db DEX_PIKACHU
 | 
			
		||||
	db DEX_RAICHU
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_RIBBITO
 | 
			
		||||
	db DEX_CROAKOZUNA
 | 
			
		||||
	db DEX_DRATINI
 | 
			
		||||
	db DEX_DRAGONAIR
 | 
			
		||||
	db DEX_KABUTO
 | 
			
		||||
	db DEX_KABUTOPS
 | 
			
		||||
	db DEX_HORSEA
 | 
			
		||||
	db DEX_SEADRA
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_BAWLIGUA
 | 
			
		||||
	db DEX_CRYITHAN
 | 
			
		||||
	db DEX_SANDSHREW
 | 
			
		||||
	db DEX_SANDSLASH
 | 
			
		||||
	db DEX_OMANYTE
 | 
			
		||||
| 
						 | 
				
			
			@ -114,38 +114,38 @@ PokedexOrder:
 | 
			
		|||
	db DEX_WEEDLE
 | 
			
		||||
	db DEX_KAKUNA
 | 
			
		||||
	db DEX_BEEDRILL
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_MADAAMU
 | 
			
		||||
	db DEX_DODRIO
 | 
			
		||||
	db DEX_PRIMEAPE
 | 
			
		||||
	db DEX_DUGTRIO
 | 
			
		||||
	db DEX_VENOMOTH
 | 
			
		||||
	db DEX_DEWGONG
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_PURAKKUSU
 | 
			
		||||
	db DEX_PENDRAKEN
 | 
			
		||||
	db DEX_CATERPIE
 | 
			
		||||
	db DEX_METAPOD
 | 
			
		||||
	db DEX_BUTTERFREE
 | 
			
		||||
	db DEX_MACHAMP
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_WEIRDUCK
 | 
			
		||||
	db DEX_GOLDUCK
 | 
			
		||||
	db DEX_HYPNO
 | 
			
		||||
	db DEX_GOLBAT
 | 
			
		||||
	db DEX_MEWTWO
 | 
			
		||||
	db DEX_SNORLAX
 | 
			
		||||
	db DEX_MAGIKARP
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_KONYA
 | 
			
		||||
	db DEX_OMEGA
 | 
			
		||||
	db DEX_MUK
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_DECILLA
 | 
			
		||||
	db DEX_KINGLER
 | 
			
		||||
	db DEX_CLOYSTER
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_MAGNETITE
 | 
			
		||||
	db DEX_ELECTRODE
 | 
			
		||||
	db DEX_CLEFABLE
 | 
			
		||||
	db DEX_WEEZING
 | 
			
		||||
	db DEX_PERSIAN
 | 
			
		||||
	db DEX_MAROWAK
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_GUARDIA
 | 
			
		||||
	db DEX_HAUNTER
 | 
			
		||||
	db DEX_ABRA
 | 
			
		||||
	db DEX_ALAKAZAM
 | 
			
		||||
| 
						 | 
				
			
			@ -155,13 +155,13 @@ PokedexOrder:
 | 
			
		|||
	db DEX_BULBASAUR
 | 
			
		||||
	db DEX_VENUSAUR
 | 
			
		||||
	db DEX_TENTACRUEL
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_GYOPIN
 | 
			
		||||
	db DEX_GOLDEEN
 | 
			
		||||
	db DEX_SEAKING
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_KOTORA
 | 
			
		||||
	db DEX_GAOTORA
 | 
			
		||||
	db DEX_GOROTORA
 | 
			
		||||
	db DEX_PUCHIKOON
 | 
			
		||||
	db DEX_PONYTA
 | 
			
		||||
	db DEX_RAPIDASH
 | 
			
		||||
	db DEX_RATTATA
 | 
			
		||||
| 
						 | 
				
			
			@ -171,16 +171,16 @@ PokedexOrder:
 | 
			
		|||
	db DEX_GEODUDE
 | 
			
		||||
	db DEX_PORYGON
 | 
			
		||||
	db DEX_AERODACTYL
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_BLASTYKE
 | 
			
		||||
	db DEX_MAGNEMITE
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_SKIMPER
 | 
			
		||||
	db DEX_GOROCHU
 | 
			
		||||
	db DEX_CHARMANDER
 | 
			
		||||
	db DEX_SQUIRTLE
 | 
			
		||||
	db DEX_CHARMELEON
 | 
			
		||||
	db DEX_WARTORTLE
 | 
			
		||||
	db DEX_CHARIZARD
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db DEX_TOTARTLE
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
	db 0 ; MISSINGNO.
 | 
			
		||||
| 
						 | 
				
			
			@ -190,4 +190,13 @@ PokedexOrder:
 | 
			
		|||
	db DEX_BELLSPROUT
 | 
			
		||||
	db DEX_WEEPINBELL
 | 
			
		||||
	db DEX_VICTREEBEL
 | 
			
		||||
	db DEX_TSUBOMITTO
 | 
			
		||||
	db DEX_ANIMON
 | 
			
		||||
	db DEX_MONJA
 | 
			
		||||
	db DEX_PARA
 | 
			
		||||
	db DEX_HINAAZU
 | 
			
		||||
	db DEX_PUDI
 | 
			
		||||
	db DEX_BETOBEBII
 | 
			
		||||
	db DEX_BELLOSSOM
 | 
			
		||||
	db DEX_SCIZOR
 | 
			
		||||
	assert_table_length NUM_POKEMON_INDEXES
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -104,8 +104,8 @@ MonsterPalettes:
 | 
			
		|||
	db PAL_PINKMON   ; BARUNDA
 | 
			
		||||
	db PAL_BROWNMON  ; FARFETCHD
 | 
			
		||||
	db PAL_BROWNMON  ; MADAAMU
 | 
			
		||||
	db PAL_BLUEMON   ; BLASTYKE
 | 
			
		||||
	db PAL_BLUEMON   ; BLASTOISE
 | 
			
		||||
	db PAL_CYANMON   ; BLASTYKE
 | 
			
		||||
	db PAL_CYANMON   ; BLASTOISE
 | 
			
		||||
	db PAL_BROWNMON  ; HINAAZU
 | 
			
		||||
	db PAL_BROWNMON  ; DODUO
 | 
			
		||||
	db PAL_BROWNMON  ; DODRIO
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,38 +1,38 @@
 | 
			
		|||
TitleMons:
 | 
			
		||||
; mons on the title screen are randomly chosen from here
 | 
			
		||||
IF DEF(_RED)
 | 
			
		||||
	db STARTER1
 | 
			
		||||
	db STARTER2
 | 
			
		||||
	db STARTER3
 | 
			
		||||
	db WEEDLE
 | 
			
		||||
	db NIDORAN_M
 | 
			
		||||
	db SCYTHER
 | 
			
		||||
	db PIKACHU
 | 
			
		||||
	db CLEFAIRY
 | 
			
		||||
	db RHYDON
 | 
			
		||||
	db ABRA
 | 
			
		||||
	db GASTLY
 | 
			
		||||
	db DITTO
 | 
			
		||||
	db PIDGEOTTO
 | 
			
		||||
	db ONIX
 | 
			
		||||
	db PONYTA
 | 
			
		||||
	db MAGIKARP
 | 
			
		||||
	db CHARIZARD
 | 
			
		||||
	db TOTARTLE
 | 
			
		||||
	db VENUSAUR
 | 
			
		||||
	db GOROCHU
 | 
			
		||||
	db CACTUS
 | 
			
		||||
	db DEER
 | 
			
		||||
	db BARUNDA
 | 
			
		||||
	db RIBBITO
 | 
			
		||||
	db GYAOON
 | 
			
		||||
	db PUDI
 | 
			
		||||
	db MAGNETITE
 | 
			
		||||
	db MONJA
 | 
			
		||||
	db ANIMON
 | 
			
		||||
	db SCIZOR
 | 
			
		||||
	db BELLOSSOM
 | 
			
		||||
	db BUU
 | 
			
		||||
ENDC
 | 
			
		||||
IF DEF(_BLUE)
 | 
			
		||||
	db STARTER2
 | 
			
		||||
	db STARTER1
 | 
			
		||||
	db STARTER3
 | 
			
		||||
	db MANKEY
 | 
			
		||||
	db HITMONLEE
 | 
			
		||||
	db VULPIX
 | 
			
		||||
	db CHANSEY
 | 
			
		||||
	db AERODACTYL
 | 
			
		||||
	db JOLTEON
 | 
			
		||||
	db SNORLAX
 | 
			
		||||
	db GLOOM
 | 
			
		||||
	db POLIWAG
 | 
			
		||||
	db DODUO
 | 
			
		||||
	db PORYGON
 | 
			
		||||
	db GENGAR
 | 
			
		||||
	db RAICHU
 | 
			
		||||
	db TOTARTLE
 | 
			
		||||
	db CHARIZARD
 | 
			
		||||
	db VENUSAUR
 | 
			
		||||
	db GOROCHU
 | 
			
		||||
	db CROCKY
 | 
			
		||||
	db TRAMPEL
 | 
			
		||||
	db JAGG
 | 
			
		||||
	db CHEEP
 | 
			
		||||
	db OMEGA
 | 
			
		||||
	db MIKON
 | 
			
		||||
	db WEIRDUCK
 | 
			
		||||
	db BLOTTLE
 | 
			
		||||
	db MADAAMU
 | 
			
		||||
	db PURAKKUSU
 | 
			
		||||
	db TSUBOMITTO
 | 
			
		||||
	db GUARDIA
 | 
			
		||||
ENDC
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,53 +1,53 @@
 | 
			
		|||
SuperPalettes:
 | 
			
		||||
; entries correspond to PAL_* constants
 | 
			
		||||
	table_width 2 * 4, SuperPalettes
 | 
			
		||||
	RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE
 | 
			
		||||
	RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET
 | 
			
		||||
	RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN
 | 
			
		||||
	RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER
 | 
			
		||||
	RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN
 | 
			
		||||
	RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER
 | 
			
		||||
	RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION
 | 
			
		||||
	RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON
 | 
			
		||||
	RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA
 | 
			
		||||
	RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR
 | 
			
		||||
	RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO
 | 
			
		||||
	RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON
 | 
			
		||||
	RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP
 | 
			
		||||
	RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE
 | 
			
		||||
	RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET
 | 
			
		||||
	RGB 31,31,31, 19,31,00, 11,23,31, 03,03,03 ; PAL_VIRIDIAN
 | 
			
		||||
	RGB 31,31,31, 18,18,15, 11,23,31, 03,03,03 ; PAL_PEWTER
 | 
			
		||||
	RGB 31,31,31, 05,08,31, 11,23,31, 03,03,03 ; PAL_CERULEAN
 | 
			
		||||
	RGB 31,31,31, 25,04,31, 11,23,31, 03,03,03 ; PAL_LAVENDER
 | 
			
		||||
	RGB 31,31,31, 31,19,00, 11,23,31, 03,03,03 ; PAL_VERMILION
 | 
			
		||||
	RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADON
 | 
			
		||||
	RGB 31,31,31, 31,15,15, 11,23,31, 03,03,03 ; PAL_FUCHSIA
 | 
			
		||||
	RGB 31,31,31, 31,08,08, 11,23,31, 03,03,03 ; PAL_CINNABAR
 | 
			
		||||
	RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
 | 
			
		||||
	RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
 | 
			
		||||
IF DEF(_RED)
 | 
			
		||||
	RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 17,23,10, 23,03,03 ; PAL_LOGO1
 | 
			
		||||
ENDC
 | 
			
		||||
IF DEF(_BLUE)
 | 
			
		||||
	RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 21,00,04, 03,03,23 ; PAL_LOGO1
 | 
			
		||||
ENDC
 | 
			
		||||
	RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2
 | 
			
		||||
	RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F
 | 
			
		||||
	RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON
 | 
			
		||||
	RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON
 | 
			
		||||
	RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON
 | 
			
		||||
	RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON
 | 
			
		||||
	RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON
 | 
			
		||||
	RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON
 | 
			
		||||
	RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON
 | 
			
		||||
	RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON
 | 
			
		||||
	RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON
 | 
			
		||||
	RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON
 | 
			
		||||
	RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
 | 
			
		||||
	RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F
 | 
			
		||||
	RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON
 | 
			
		||||
	RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON
 | 
			
		||||
	RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON
 | 
			
		||||
	RGB 31,31,31, 16,26,31, 00,17,31, 03,03,03 ; PAL_CYANMON
 | 
			
		||||
	RGB 31,31,31, 25,15,31, 19,00,22, 03,03,03 ; PAL_PURPLEMON
 | 
			
		||||
	RGB 31,31,31, 29,18,10, 17,09,05, 03,03,03 ; PAL_BROWNMON
 | 
			
		||||
	RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON
 | 
			
		||||
	RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON
 | 
			
		||||
	RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON
 | 
			
		||||
	RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1
 | 
			
		||||
IF DEF(_RED)
 | 
			
		||||
	RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2
 | 
			
		||||
	RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3
 | 
			
		||||
	RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 20,08,15, 03,03,03 ; PAL_SLOTS2
 | 
			
		||||
	RGB 31,31,31, 03,31,09, 20,08,15, 03,03,03 ; PAL_SLOTS3
 | 
			
		||||
	RGB 31,31,31, 09,05,30, 20,08,15, 03,03,03 ; PAL_SLOTS4
 | 
			
		||||
ENDC
 | 
			
		||||
IF DEF(_BLUE)
 | 
			
		||||
	RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2
 | 
			
		||||
	RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3
 | 
			
		||||
	RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2
 | 
			
		||||
	RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3
 | 
			
		||||
	RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4
 | 
			
		||||
ENDC
 | 
			
		||||
	RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK
 | 
			
		||||
	RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR
 | 
			
		||||
	RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR
 | 
			
		||||
	RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR
 | 
			
		||||
	RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE
 | 
			
		||||
	RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE
 | 
			
		||||
	RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK
 | 
			
		||||
	RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR
 | 
			
		||||
	RGB 31,31,31, 31,31,00, 31,00,00, 03,03,03 ; PAL_REDBAR
 | 
			
		||||
	RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE
 | 
			
		||||
	RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
 | 
			
		||||
	RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
 | 
			
		||||
	assert_table_length NUM_SGB_PALS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -497,9 +497,9 @@ Green1Data:
 | 
			
		|||
 | 
			
		||||
ProfOakData:
 | 
			
		||||
; Unused
 | 
			
		||||
	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, BLASTOISE, 70, GYARADOS, 0
 | 
			
		||||
	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, VENUSAUR, 70, GYARADOS, 0
 | 
			
		||||
	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, CHARIZARD, 70, GYARADOS, 0
 | 
			
		||||
	db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 69, NIDOKING, 70, TOTARTLE, 0
 | 
			
		||||
	db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 60, NIDOKING, 70, VENUSAUR, 0
 | 
			
		||||
	db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0
 | 
			
		||||
 | 
			
		||||
ChiefData:
 | 
			
		||||
; none
 | 
			
		||||
| 
						 | 
				
			
			@ -537,7 +537,7 @@ GiovanniData:
 | 
			
		|||
; Silph Co. 11F
 | 
			
		||||
	db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0
 | 
			
		||||
; Viridian Gym
 | 
			
		||||
	db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0
 | 
			
		||||
	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYDON, 0
 | 
			
		||||
 | 
			
		||||
RocketData:
 | 
			
		||||
; Mt. Moon B2F
 | 
			
		||||
| 
						 | 
				
			
			@ -636,28 +636,28 @@ CooltrainerFData:
 | 
			
		|||
	db 43, PERSIAN, NINETALES, RAICHU, 0
 | 
			
		||||
 | 
			
		||||
BrunoData:
 | 
			
		||||
	db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0
 | 
			
		||||
	db $FF, 54, PRIMEAPE, 55, ONIX, 55, POLIWRATH, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
 | 
			
		||||
 | 
			
		||||
BrockData:
 | 
			
		||||
	db $FF, 12, GEODUDE, 14, ONIX, 0
 | 
			
		||||
	db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0
 | 
			
		||||
 | 
			
		||||
MistyData:
 | 
			
		||||
	db $FF, 18, STARYU, 21, STARMIE, 0
 | 
			
		||||
	db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
 | 
			
		||||
 | 
			
		||||
LtSurgeData:
 | 
			
		||||
	db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0
 | 
			
		||||
	db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
 | 
			
		||||
 | 
			
		||||
ErikaData:
 | 
			
		||||
	db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0
 | 
			
		||||
	db $FF, 28, WEEPINBELL, 29, TANGELA, 28, CACTUS, 28, PARASECT, 31, VILEPLUME, 0
 | 
			
		||||
 | 
			
		||||
KogaData:
 | 
			
		||||
	db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0
 | 
			
		||||
	db $FF, 38, GOLBAT, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 41, WEEZING, 0
 | 
			
		||||
 | 
			
		||||
BlaineData:
 | 
			
		||||
	db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0
 | 
			
		||||
	db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0
 | 
			
		||||
 | 
			
		||||
SabrinaData:
 | 
			
		||||
	db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0
 | 
			
		||||
	db $FF, 39, HYPNO, 40, MR_MIME, 39, SLOWBRO, 40, JYNX, 43, ALAKAZAM, 0
 | 
			
		||||
 | 
			
		||||
GentlemanData:
 | 
			
		||||
; SS Anne 1F Rooms
 | 
			
		||||
| 
						 | 
				
			
			@ -680,21 +680,21 @@ Green2Data:
 | 
			
		|||
	db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
 | 
			
		||||
	db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
 | 
			
		||||
; Silph Co. 7F
 | 
			
		||||
	db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0
 | 
			
		||||
	db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
 | 
			
		||||
	db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
 | 
			
		||||
	db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
 | 
			
		||||
; Route 22
 | 
			
		||||
	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0
 | 
			
		||||
	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
 | 
			
		||||
	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
 | 
			
		||||
	db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
 | 
			
		||||
 | 
			
		||||
Green3Data:
 | 
			
		||||
	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0
 | 
			
		||||
	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
 | 
			
		||||
	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
 | 
			
		||||
	db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
 | 
			
		||||
 | 
			
		||||
LoreleiData:
 | 
			
		||||
	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0
 | 
			
		||||
	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 55, JYNX, 55, BUU, 56, LAPRAS, 0
 | 
			
		||||
 | 
			
		||||
ChannelerData:
 | 
			
		||||
; Unused
 | 
			
		||||
| 
						 | 
				
			
			@ -736,7 +736,7 @@ ChannelerData:
 | 
			
		|||
	db 33, GASTLY, GASTLY, HAUNTER, 0
 | 
			
		||||
 | 
			
		||||
AgathaData:
 | 
			
		||||
	db $FF, 56, GENGAR, 56, GOLBAT, 55, HAUNTER, 58, ARBOK, 60, GENGAR, 0
 | 
			
		||||
	db $FF, 57, GENGAR, 56, GOLBAT, 56, HAUNTER, 58, CROAKOZUNA, 58, ARBOK, 60, GENGAR, 0
 | 
			
		||||
 | 
			
		||||
LanceData:
 | 
			
		||||
	db $FF, 58, GYARADOS, 56, DRAGONAIR, 56, DRAGONAIR, 60, AERODACTYL, 62, DRAGONITE, 0
 | 
			
		||||
	db $FF, 58, CROCKY, 57, GYARADOS, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
Route4WildMons:
 | 
			
		||||
	def_grass_wildmons 20 ; encounter rate
 | 
			
		||||
	db 10, RATTATA
 | 
			
		||||
	db 10, RIBITTO
 | 
			
		||||
	db 10, HINAAZU
 | 
			
		||||
	db  8, KONYA
 | 
			
		||||
IF DEF(_RED)
 | 
			
		||||
	db  6, EKANS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ IF DEF(_RED)
 | 
			
		|||
	db 12, MANKEY
 | 
			
		||||
	db 15, BELLSPROUT
 | 
			
		||||
	db 16, BELLSPROUT
 | 
			
		||||
	db 16, PIDGEY
 | 
			
		||||
	db 16, HINAAZU
 | 
			
		||||
	db 14, MEOWTH
 | 
			
		||||
	db 16, MEOWTH
 | 
			
		||||
ENDC
 | 
			
		||||
| 
						 | 
				
			
			@ -20,7 +20,7 @@ IF DEF(_BLUE)
 | 
			
		|||
	db 12, MEOWTH
 | 
			
		||||
	db 15, ODDISH
 | 
			
		||||
	db 16, ODDISH
 | 
			
		||||
	db 16, PIDGEY
 | 
			
		||||
	db 16, HINAAZU
 | 
			
		||||
	db 14, MANKEY
 | 
			
		||||
	db 16, MANKEY
 | 
			
		||||
ENDC
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,13 +47,13 @@ SuperRodData:
 | 
			
		|||
	db 5, GYOPIN
 | 
			
		||||
 | 
			
		||||
.Group2:
 | 
			
		||||
	db 2
 | 
			
		||||
	db 3
 | 
			
		||||
	db 10, MAGIKARP
 | 
			
		||||
	db 7, POLIWAG
 | 
			
		||||
	db 10, GYOPIN
 | 
			
		||||
 | 
			
		||||
.Group3:
 | 
			
		||||
	db 3
 | 
			
		||||
	db 5
 | 
			
		||||
	db 15, SKIMPER
 | 
			
		||||
	db 19, MAGIKARP
 | 
			
		||||
	db 15, KRABBY
 | 
			
		||||
| 
						 | 
				
			
			@ -61,7 +61,7 @@ SuperRodData:
 | 
			
		|||
	db 15, CHEEP
 | 
			
		||||
 | 
			
		||||
.Group4:
 | 
			
		||||
	db 2
 | 
			
		||||
	db 5
 | 
			
		||||
	db 20, KRABBY
 | 
			
		||||
	db 20, SHELLDER
 | 
			
		||||
	db 20, TENTACOOL
 | 
			
		||||
| 
						 | 
				
			
			@ -69,7 +69,7 @@ SuperRodData:
 | 
			
		|||
	db 20, HORSEA
 | 
			
		||||
 | 
			
		||||
.Group5:
 | 
			
		||||
	db 2
 | 
			
		||||
	db 5
 | 
			
		||||
	db 25, POLIWHIRL
 | 
			
		||||
	db 25, SLOWPOKE
 | 
			
		||||
	db 20, SKIMPER
 | 
			
		||||
| 
						 | 
				
			
			@ -77,7 +77,7 @@ SuperRodData:
 | 
			
		|||
	db 25, BLOTTLE
 | 
			
		||||
 | 
			
		||||
.Group6:
 | 
			
		||||
	db 4
 | 
			
		||||
	db 6
 | 
			
		||||
	db 15, DRATINI
 | 
			
		||||
	db 28, KRABBY
 | 
			
		||||
	db 25, CHEEP
 | 
			
		||||
| 
						 | 
				
			
			@ -86,7 +86,7 @@ SuperRodData:
 | 
			
		|||
	db 32, BAWLIGUA
 | 
			
		||||
 | 
			
		||||
.Group7:
 | 
			
		||||
	db 4
 | 
			
		||||
	db 6
 | 
			
		||||
	db 40, TENTACRUEL
 | 
			
		||||
	db 40, KINGLER
 | 
			
		||||
	db 40, SEAKING
 | 
			
		||||
| 
						 | 
				
			
			@ -102,7 +102,7 @@ SuperRodData:
 | 
			
		|||
	db 40, PENDRAKEN
 | 
			
		||||
 | 
			
		||||
.Group9:
 | 
			
		||||
	db 4
 | 
			
		||||
	db 5
 | 
			
		||||
	db 50, GYARADOS
 | 
			
		||||
	db 50, SEAKING
 | 
			
		||||
	db 50, KINGLER
 | 
			
		||||
| 
						 | 
				
			
			@ -110,7 +110,7 @@ SuperRodData:
 | 
			
		|||
	db 50, PENDRAKEN
 | 
			
		||||
 | 
			
		||||
.Group10:
 | 
			
		||||
	db 4
 | 
			
		||||
	db 12
 | 
			
		||||
	db 50, KINGLER
 | 
			
		||||
	db 50, PENDRAKEN
 | 
			
		||||
	db 50, SEAKING
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -119,10 +119,10 @@ DisplayTitleScreen:
 | 
			
		|||
	call EnableLCD
 | 
			
		||||
 | 
			
		||||
IF DEF(_RED)
 | 
			
		||||
	ld a, STARTER1 ; which Pokemon to show first on the title screen
 | 
			
		||||
	ld a, CHARIZARD ; which Pokemon to show first on the title screen
 | 
			
		||||
ENDC
 | 
			
		||||
IF DEF(_BLUE)
 | 
			
		||||
	ld a, STARTER2 ; which Pokemon to show first on the title screen
 | 
			
		||||
	ld a, TOTARTLE ; which Pokemon to show first on the title screen
 | 
			
		||||
ENDC
 | 
			
		||||
	ld [wTitleMonSpecies], a
 | 
			
		||||
	call LoadTitleMonSprite
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -90,11 +90,11 @@ TitleBallYTable:
 | 
			
		|||
TitleScreenAnimateBallIfStarterOut:
 | 
			
		||||
; Animate the TitleBall if a starter just got scrolled out.
 | 
			
		||||
	ld a, [wTitleMonSpecies]
 | 
			
		||||
	cp STARTER1
 | 
			
		||||
	cp VENUSAUR
 | 
			
		||||
	jr z, .ok
 | 
			
		||||
	cp STARTER2
 | 
			
		||||
	cp CHARIZARD
 | 
			
		||||
	jr z, .ok
 | 
			
		||||
	cp STARTER3
 | 
			
		||||
	cp TOTARTLE
 | 
			
		||||
	ret nz
 | 
			
		||||
.ok
 | 
			
		||||
	ld e, 1 ; animate titleball
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,20 +1,8 @@
 | 
			
		|||
lllllllllllllllllllllll
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
oo
 | 
			
		||||
lllllllllllllllllllllooooooooo
 | 
			
		||||
ooo
 | 
			
		||||
oooooo
 | 
			
		||||
n !UUUU 
!U 
!UUUUUUUUUmnhi 
!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !
 ! !UU ! ! ! ! !
 | 
			
		||||
n7~7~7~UU7~|~|~7~|~
 | 
			
		||||
nUUUUUyUU !UUUUUUUUUUUU
 | 
			
		||||
n/7~UUUUUUUUUUUU
 | 
			
		||||
n
 | 
			
		||||
n !UUUU 
!U 
!UUUUUUUUUmnhi 
!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwwwLnUUUUUUUUUUUUUUUUUUUUUUmn !
 ! !UU ! ! ! ! !mn7~7~7~UU7~|~|~7~|~mnUUUUUyUU !UUUUUUUUUUUU
 | 
			
		||||
n/7~UUUUUUUUUUUUmn
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -24,5 +12,5 @@ n
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
llllll26llll
 | 
			
		||||
nooooooooooooooooo6ooooo
 | 
			
		||||
llllllmnllll
 | 
			
		||||
nooooooooooooooooooooooo
 | 
			
		||||
| 
						 | 
				
			
			@ -1,4 +1,18 @@
 | 
			
		|||
 
!zoooooz7:~zooooooznttmVUwnmnwVwVmzoo`wVwVwmzzzzzzznzzzzzzzzzzz !oooo`z 
!nlllmzz|szzzzzz7:~`wVwmzoooooyzznVUVzzzzzogmzznUlllll11NkkkPRR`Uwwww11NU_tnN>?????????;_t
 | 
			
		||||
 
!zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzogmzzMUlllll11NkkkPRROUwwww11N_tnN1wwwwwwwww1_t
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
nN$ 
!WWWW !%_8989nNX|~0|rY1<=<=1nNX11111111Y_Vw1wnNZ\ooo\[11nPRRRR>?;ttttPRRRRRn11111(,)1111>?;
 | 
			
		||||
nNn 
!
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN
 | 
			
		||||
 | 
			
		||||
1ooooo1
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
nPRRRR>?;ttttRRRRRRn11111(,)1111>?;
 | 
			
		||||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
566CB556566CB55656++CB,,5656ACBAAA5656BAACCC5656CACBAB5656ACCCBA5656CBBBBA56,+BACBAB,+AACCCBBBAAAAAAAAAAAA)*A56A56AA''56A
 | 
			
		||||
566CB556566CB55656++CB,,5656BBAACC5656CACBAB5656BBAACC5656ACAABA5656BBAACC56,+CACBAB,+AAAAAAAAAAAAAAAAAAAA)*A56A56AA''56A
 | 
			
		||||
H
 | 
			
		||||
 | 
			
		||||
AAA
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue