Merge branch 'master' of https://github.com/PlagueVonKarma/jep-hack

README.md

@@ -151,6 +151,7 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 - LadyMisticus: Sprite edits of Imposter Oak, Archer, Ariana, Prof.Blue, Giovanni (both), Green; Cal, Blaine (original)
 
 ### Unaffiliated
+Many sprites in this hack are taken from different artists and ROM Hacks, aggressively curated and sometimes even edited and worked upon by JEP developers. The grand aim was to get a consistent GSC artstyle. 
 - [nuuk](https://x.com/nuukiie): Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Mamoswine, Porygon-Z, Sylveon, Wyrdeer, Clodsire (back)
 - Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly: Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Pockle (Shuqlour, edited by Martha), Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Smujj, Stricheel, SW99 Feraligatr (edited by Plague von Karma), Belledam, Feradactyl (Gargranite)
 	- Gorotora is edited from RacieBeep's Yellow sprite in the Helix Chamber PokeThon ROM Hack. A full list of Helix Chamber sprites are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). Helix Chamber spriters have a "must credit" policy.
@@ -161,6 +162,8 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co
 - Tom Wang: Gold/Chris running sprite
 - Seasick: Kris running sprite
 - Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FeMC sprites.
+- ShadowOne333: Annihilape and Ursaluna sprites used in [JohtoLegends](https://github.com/aforward9600/JohtoLegends)
+- [ShadowOne333 & Rangi/polishedcrystal](https://github.com/ShadowOne333/polishedcrystal/): Alolan Dugtrio, Kleavor, Mr. Rime, Galarian Ponyta, Hisuian Sneasel, Galarian Weezing, and Galarian Zapdos. ShadowOne333's repository contained animations for some Pokemon that the [mother branch](https://github.com/Rangi42/polishedcrystal] did not.
 
 ## Music Credits
 

audio.asm

@@ -166,8 +166,12 @@ INCLUDE "audio/music/NorthCity.asm"
 INCLUDE "audio/music/Tanoby01.asm"
 INCLUDE "audio/music/mart.asm"
 INCLUDE "audio/music/SepiaCity.asm"
+
+SECTION "New Songs 2", ROMX
+
 INCLUDE "audio/music/CoralCity.asm"
 INCLUDE "audio/music/CrystalCrater.asm"
+INCLUDE "audio/music/SavoyCity.asm"
 
 SECTION "Sound Effects", ROMX
 

audio/music_pointers.asm

@@ -123,4 +123,5 @@ Music:
 	dba Music_CoralCity
 	dba Music_SepiaCity
 	dba Music_CrystalCrater
+	dba Music_SavoyCity
 	assert_table_length NUM_MUSIC_SONGS

constants/battle_constants.asm

@@ -96,6 +96,7 @@ DEF SPDSPCDV_SHINY EQU $AA
 	const BATTLETYPE_FORCEITEM
 	const BATTLETYPE_CELEBI
 	const BATTLETYPE_SUICUNE
+	const BATTLETYPE_INVERSE
 
 ; BattleVarPairs indexes (see home/battle_vars.asm)
 	const_def

constants/music_constants.asm

@@ -121,6 +121,7 @@
 	const MUSIC_CORALCITY					 ; 74
 	const MUSIC_SEPIACITY					 ; 75
 	const MUSIC_CRYSTALCRATER				 ; 76
+	const MUSIC_SAVOYCITY					 ; 77
 DEF NUM_MUSIC_SONGS EQU const_value
 
 ; GetMapMusic picks music for this value (see home/map.asm)

data/maps/maps.asm

@@ -718,28 +718,28 @@ MapGroup_OldCity:
 	map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda2F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, TRUE, PALETTE_AUTO, FISHGROUP_NONE
-	map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_OLD_CITY_MAPS
 
 MapGroup_SavoyCity:
 	table_width MAP_LENGTH, MapGroup_SavoyCity
-	map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_SAVOYCITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SavoyCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map SavoyCityBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SavoyCityBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_SAVOYCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map SavoyCityBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SavoyCityBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_SAVOYCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SavoyCityRocketBlockedHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SAVOY_CITY_MAPS
 	

data/pokemon/base_stats/dokuroar.asm

@@ -1,13 +1,13 @@
 	db 0 ; species ID placeholder
 
-	db  87, 125, 110,  66,  66,  66
+	db 101, 131, 119,  76,  69,  84
 	;   hp  atk  def  spd  sat  sdf
 
 	db GHOST, ROCK ; type
-	db 25 ; catch rate
+	db 3 ; catch rate
-	db 166 ; base exp
+	db 203 ; base exp
 	db THICK_CLUB, THICK_CLUB ; items
-	db GENDER_F50 ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2

data/pokemon/dex_entries/dokuroar.asm

@@ -1,10 +1,10 @@
 	db "SKELETAL@" ; species name
 	dw 902, 4960 ; height, weight - placeholder
 
-	db   "Believed to be a"
+	db   "The skeleton of a"
-	next "spirit inhabiting"
+	next "dinosaur given new"
-	next "a super-ancient"
+	next "life. It harbors"
 
-	page "#MON skeleton,"
+	page "intense malice due"
-	next "but research is"
+	next "to being forgotten"
-	next "still needed.@"
+	next "for so long.@"

data/pokemon/egg_moves_johto.asm

@@ -165,7 +165,7 @@ EggMovePointers2::
 	dw RuddernautEggMoves
 	dw XylodonEggMoves
 	dw NoEggMoves2
-	dw DokuroarEggMoves ; Dokuroar
+	dw NoEggMoves2 ; Dokuroar
 	dw NoEggMoves2
 	dw NoEggMoves2
 	dw NoEggMoves2
@@ -788,14 +788,6 @@ XylodonEggMoves:
 	dw THRASH
 	dw -1 ;end 
 
-DokuroarEggMoves:
-	dw BONEMERANG
-	dw BONE_RUSH
-	dw BONE_CLUB
-	dw ROCK_SLIDE
-	dw SCARY_FACE
-	dw -1 ;end 
-
 LarvitarEggMoves:
 	dw PURSUIT
 	dw STOMP

data/pokemon/evos_attacks_johto.asm

@@ -2813,11 +2813,12 @@ XylofinEvosAttacks:
 DokuroarEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, SCRATCH
-	dbw 1, LEER
+	dbw 1, SCARY_FACE
+	dbw 1, BONE_CLUB
 	dbw 7, SPITE
 	dbw 14, NIGHT_SHADE
 	dbw 21, ANCIENTPOWER
-	dbw 28, BONE_CLUB
+	dbw 28, BONEMERANG
 	dbw 35, SLASH
 	dbw 42, ROCK_HEAD
 	dbw 49, BONE_RUSH

data/types/type_matchups.asm

@@ -1,132 +1,253 @@
 TypeMatchups:
-	;  attacker,     defender,     *=
+	;  attacker,	  defender,	  *=
-	db NORMAL,       ROCK,         NOT_VERY_EFFECTIVE
+	db NORMAL,		 ROCK,			NOT_VERY_EFFECTIVE
-	db NORMAL,       STEEL,        NOT_VERY_EFFECTIVE
+	db NORMAL,		 STEEL,		  NOT_VERY_EFFECTIVE
-	db FIRE,         FIRE,         NOT_VERY_EFFECTIVE
+	db FIRE,			FIRE,			NOT_VERY_EFFECTIVE
-	db FIRE,         WATER,        NOT_VERY_EFFECTIVE
+	db FIRE,			WATER,		  NOT_VERY_EFFECTIVE
-	db FIRE,         GRASS,        SUPER_EFFECTIVE
+	db FIRE,			GRASS,		  SUPER_EFFECTIVE
-	db FIRE,         ICE,          SUPER_EFFECTIVE
+	db FIRE,			ICE,			 SUPER_EFFECTIVE
-	db FIRE,         BUG,          SUPER_EFFECTIVE
+	db FIRE,			BUG,			 SUPER_EFFECTIVE
-	db FIRE,         ROCK,         NOT_VERY_EFFECTIVE
+	db FIRE,			ROCK,			NOT_VERY_EFFECTIVE
-	db FIRE,         DRAGON,       NOT_VERY_EFFECTIVE
+	db FIRE,			DRAGON,		 NOT_VERY_EFFECTIVE
-	db FIRE,         STEEL,        SUPER_EFFECTIVE
+	db FIRE,			STEEL,		  SUPER_EFFECTIVE
-	db FIRE,         FAIRY,        SUPER_EFFECTIVE
+	db FIRE,			FAIRY,		  SUPER_EFFECTIVE
-	db WATER,        FIRE,         SUPER_EFFECTIVE
+	db WATER,		  FIRE,			SUPER_EFFECTIVE
-	db WATER,        WATER,        NOT_VERY_EFFECTIVE
+	db WATER,		  WATER,		  NOT_VERY_EFFECTIVE
-	db WATER,        GRASS,        NOT_VERY_EFFECTIVE
+	db WATER,		  GRASS,		  NOT_VERY_EFFECTIVE
-	db WATER,        GROUND,       SUPER_EFFECTIVE
+	db WATER,		  GROUND,		 SUPER_EFFECTIVE
-	db WATER,        ROCK,         SUPER_EFFECTIVE
+	db WATER,		  ROCK,			SUPER_EFFECTIVE
-	db WATER,        DRAGON,       NOT_VERY_EFFECTIVE
+	db WATER,		  DRAGON,		 NOT_VERY_EFFECTIVE
-	db ELECTRIC,     WATER,        SUPER_EFFECTIVE
+	db ELECTRIC,	  WATER,		  SUPER_EFFECTIVE
-	db ELECTRIC,     ELECTRIC,     NOT_VERY_EFFECTIVE
+	db ELECTRIC,	  ELECTRIC,	  NOT_VERY_EFFECTIVE
-	db ELECTRIC,     GRASS,        NOT_VERY_EFFECTIVE
+	db ELECTRIC,	  GRASS,		  NOT_VERY_EFFECTIVE
-	db ELECTRIC,     GROUND,       NO_EFFECT
+	db ELECTRIC,	  GROUND,		 NO_EFFECT
-	db ELECTRIC,     FLYING,       SUPER_EFFECTIVE
+	db ELECTRIC,	  FLYING,		 SUPER_EFFECTIVE
-	db ELECTRIC,     DRAGON,       NOT_VERY_EFFECTIVE
+	db ELECTRIC,	  DRAGON,		 NOT_VERY_EFFECTIVE
-	db GRASS,        FIRE,         NOT_VERY_EFFECTIVE
+	db GRASS,		  FIRE,			NOT_VERY_EFFECTIVE
-	db GRASS,        WATER,        SUPER_EFFECTIVE
+	db GRASS,		  WATER,		  SUPER_EFFECTIVE
-	db GRASS,        GRASS,        NOT_VERY_EFFECTIVE
+	db GRASS,		  GRASS,		  NOT_VERY_EFFECTIVE
-	db GRASS,        POISON,       NOT_VERY_EFFECTIVE
+	db GRASS,		  POISON,		 NOT_VERY_EFFECTIVE
-	db GRASS,        GROUND,       SUPER_EFFECTIVE
+	db GRASS,		  GROUND,		 SUPER_EFFECTIVE
-	db GRASS,        FLYING,       NOT_VERY_EFFECTIVE
+	db GRASS,		  FLYING,		 NOT_VERY_EFFECTIVE
-	db GRASS,        BUG,          NOT_VERY_EFFECTIVE
+	db GRASS,		  BUG,			 NOT_VERY_EFFECTIVE
-	db GRASS,        ROCK,         SUPER_EFFECTIVE
+	db GRASS,		  ROCK,			SUPER_EFFECTIVE
-	db GRASS,        DRAGON,       NOT_VERY_EFFECTIVE
+	db GRASS,		  DRAGON,		 NOT_VERY_EFFECTIVE
-	db GRASS,        STEEL,        NOT_VERY_EFFECTIVE
+	db GRASS,		  STEEL,		  NOT_VERY_EFFECTIVE
-	db ICE,          WATER,        NOT_VERY_EFFECTIVE
+	db ICE,			 WATER,		  NOT_VERY_EFFECTIVE
-	db ICE,          GRASS,        SUPER_EFFECTIVE
+	db ICE,			 GRASS,		  SUPER_EFFECTIVE
-	db ICE,          ICE,          NOT_VERY_EFFECTIVE
+	db ICE,			 ICE,			 NOT_VERY_EFFECTIVE
-	db ICE,          GROUND,       SUPER_EFFECTIVE
+	db ICE,			 GROUND,		 SUPER_EFFECTIVE
-	db ICE,          FLYING,       SUPER_EFFECTIVE
+	db ICE,			 FLYING,		 SUPER_EFFECTIVE
-	db ICE,          DRAGON,       SUPER_EFFECTIVE
+	db ICE,			 DRAGON,		 SUPER_EFFECTIVE
-	db ICE,          STEEL,        NOT_VERY_EFFECTIVE
+	db ICE,			 STEEL,		  NOT_VERY_EFFECTIVE
-	db ICE,          FAIRY,        SUPER_EFFECTIVE
+	db ICE,			 FAIRY,		  SUPER_EFFECTIVE
-	db ICE,          FIRE,         NOT_VERY_EFFECTIVE
+	db ICE,			 FIRE,			NOT_VERY_EFFECTIVE
-	db FIGHTING,     NORMAL,       SUPER_EFFECTIVE
+	db FIGHTING,	  NORMAL,		 SUPER_EFFECTIVE
-	db FIGHTING,     ICE,          SUPER_EFFECTIVE
+	db FIGHTING,	  ICE,			 SUPER_EFFECTIVE
-	db FIGHTING,     POISON,       NOT_VERY_EFFECTIVE
+	db FIGHTING,	  POISON,		 NOT_VERY_EFFECTIVE
-	db FIGHTING,     FLYING,       NOT_VERY_EFFECTIVE
+	db FIGHTING,	  FLYING,		 NOT_VERY_EFFECTIVE
-	db FIGHTING,     PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
+	db FIGHTING,	  PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
-	db FIGHTING,     BUG,          NOT_VERY_EFFECTIVE
+	db FIGHTING,	  BUG,			 NOT_VERY_EFFECTIVE
-	db FIGHTING,     ROCK,         SUPER_EFFECTIVE
+	db FIGHTING,	  ROCK,			SUPER_EFFECTIVE
-	db FIGHTING,     DARK,         SUPER_EFFECTIVE
+	db FIGHTING,	  DARK,			SUPER_EFFECTIVE
-	db FIGHTING,     STEEL,        SUPER_EFFECTIVE
+	db FIGHTING,	  STEEL,		  SUPER_EFFECTIVE
-	db FIGHTING,	 FAIRY,		   NOT_VERY_EFFECTIVE
+	db FIGHTING,	 FAIRY,			NOT_VERY_EFFECTIVE
-	db POISON,       GRASS,        SUPER_EFFECTIVE
+	db POISON,		 GRASS,		  SUPER_EFFECTIVE
-	db POISON,       POISON,       NOT_VERY_EFFECTIVE
+	db POISON,		 POISON,		 NOT_VERY_EFFECTIVE
-	db POISON,       GROUND,       NOT_VERY_EFFECTIVE
+	db POISON,		 GROUND,		 NOT_VERY_EFFECTIVE
-	db POISON,       ROCK,         NOT_VERY_EFFECTIVE
+	db POISON,		 ROCK,			NOT_VERY_EFFECTIVE
-	db POISON,       GHOST,        NOT_VERY_EFFECTIVE
+	db POISON,		 GHOST,		  NOT_VERY_EFFECTIVE
-	db POISON,       STEEL,        NO_EFFECT
+	db POISON,		 STEEL,		  NO_EFFECT
-	db GROUND,       FIRE,         SUPER_EFFECTIVE
+	db GROUND,		 FIRE,			SUPER_EFFECTIVE
-	db GROUND,       ELECTRIC,     SUPER_EFFECTIVE
+	db GROUND,		 ELECTRIC,	  SUPER_EFFECTIVE
-	db GROUND,       GRASS,        NOT_VERY_EFFECTIVE
+	db GROUND,		 GRASS,		  NOT_VERY_EFFECTIVE
-	db GROUND,       POISON,       SUPER_EFFECTIVE
+	db GROUND,		 POISON,		 SUPER_EFFECTIVE
-	db GROUND,       FLYING,       NO_EFFECT
+	db GROUND,		 FLYING,		 NO_EFFECT
-	db GROUND,       BUG,          NOT_VERY_EFFECTIVE
+	db GROUND,		 BUG,			 NOT_VERY_EFFECTIVE
-	db GROUND,       ROCK,         SUPER_EFFECTIVE
+	db GROUND,		 ROCK,			SUPER_EFFECTIVE
-	db GROUND,       STEEL,        SUPER_EFFECTIVE
+	db GROUND,		 STEEL,		  SUPER_EFFECTIVE
-	db FLYING,       ELECTRIC,     NOT_VERY_EFFECTIVE
+	db FLYING,		 ELECTRIC,	  NOT_VERY_EFFECTIVE
-	db FLYING,       GRASS,        SUPER_EFFECTIVE
+	db FLYING,		 GRASS,		  SUPER_EFFECTIVE
-	db FLYING,       FIGHTING,     SUPER_EFFECTIVE
+	db FLYING,		 FIGHTING,	  SUPER_EFFECTIVE
-	db FLYING,       BUG,          SUPER_EFFECTIVE
+	db FLYING,		 BUG,			 SUPER_EFFECTIVE
-	db FLYING,       ROCK,         NOT_VERY_EFFECTIVE
+	db FLYING,		 ROCK,			NOT_VERY_EFFECTIVE
-	db FLYING,       STEEL,        NOT_VERY_EFFECTIVE
+	db FLYING,		 STEEL,		  NOT_VERY_EFFECTIVE
-	db PSYCHIC_TYPE, FIGHTING,     SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, FIGHTING,	  SUPER_EFFECTIVE
-	db PSYCHIC_TYPE, POISON,       SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, POISON,		 SUPER_EFFECTIVE
 	db PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
-	db PSYCHIC_TYPE, DARK,         NO_EFFECT
+	db PSYCHIC_TYPE, DARK,			NO_EFFECT
-	db PSYCHIC_TYPE, STEEL,        NOT_VERY_EFFECTIVE
+	db PSYCHIC_TYPE, STEEL,		  NOT_VERY_EFFECTIVE
-	db BUG,          FIRE,         NOT_VERY_EFFECTIVE
+	db BUG,			 FIRE,			NOT_VERY_EFFECTIVE
-	db BUG,          GRASS,        SUPER_EFFECTIVE
+	db BUG,			 GRASS,		  SUPER_EFFECTIVE
-	db BUG,          FIGHTING,     NOT_VERY_EFFECTIVE
+	db BUG,			 FIGHTING,	  NOT_VERY_EFFECTIVE
-	db BUG,          POISON,       NOT_VERY_EFFECTIVE
+	db BUG,			 POISON,		 NOT_VERY_EFFECTIVE
-	db BUG,          FLYING,       NOT_VERY_EFFECTIVE
+	db BUG,			 FLYING,		 NOT_VERY_EFFECTIVE
-	db BUG,          PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db BUG,			 PSYCHIC_TYPE, SUPER_EFFECTIVE
-	db BUG,          GHOST,        NOT_VERY_EFFECTIVE
+	db BUG,			 GHOST,		  NOT_VERY_EFFECTIVE
-	db BUG,          DARK,         SUPER_EFFECTIVE
+	db BUG,			 DARK,			SUPER_EFFECTIVE
-	db BUG,          STEEL,        NOT_VERY_EFFECTIVE
+	db BUG,			 STEEL,		  NOT_VERY_EFFECTIVE
-	db BUG,			 FAIRY,		   NOT_VERY_EFFECTIVE
+	db BUG,			 FAIRY,			NOT_VERY_EFFECTIVE
-	db ROCK,         FIRE,         SUPER_EFFECTIVE
+	db ROCK,			FIRE,			SUPER_EFFECTIVE
-	db ROCK,         ICE,          SUPER_EFFECTIVE
+	db ROCK,			ICE,			 SUPER_EFFECTIVE
-	db ROCK,         FIGHTING,     NOT_VERY_EFFECTIVE
+	db ROCK,			FIGHTING,	  NOT_VERY_EFFECTIVE
-	db ROCK,         GROUND,       NOT_VERY_EFFECTIVE
+	db ROCK,			GROUND,		 NOT_VERY_EFFECTIVE
-	db ROCK,         FLYING,       SUPER_EFFECTIVE
+	db ROCK,			FLYING,		 SUPER_EFFECTIVE
-	db ROCK,         BUG,          SUPER_EFFECTIVE
+	db ROCK,			BUG,			 SUPER_EFFECTIVE
-	db ROCK,         STEEL,        NOT_VERY_EFFECTIVE
+	db ROCK,			STEEL,		  NOT_VERY_EFFECTIVE
-	db GHOST,        NORMAL,       NO_EFFECT
+	db GHOST,		  NORMAL,		 NO_EFFECT
-	db GHOST,        PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db GHOST,		  PSYCHIC_TYPE, SUPER_EFFECTIVE
-	db GHOST,        DARK,         NOT_VERY_EFFECTIVE
+	db GHOST,		  DARK,			NOT_VERY_EFFECTIVE
-	db GHOST,        STEEL,        NOT_VERY_EFFECTIVE
+	db GHOST,		  STEEL,		  NOT_VERY_EFFECTIVE
-	db GHOST,        GHOST,        SUPER_EFFECTIVE
+	db GHOST,		  GHOST,		  SUPER_EFFECTIVE
-	db DRAGON,       DRAGON,       SUPER_EFFECTIVE
+	db DRAGON,		 DRAGON,		 SUPER_EFFECTIVE
-	db DRAGON,       STEEL,        NOT_VERY_EFFECTIVE
+	db DRAGON,		 STEEL,		  NOT_VERY_EFFECTIVE
-	db DRAGON,		 FAIRY,		   NO_EFFECT
+	db DRAGON,		 FAIRY,			NO_EFFECT
-	db DARK,         FIGHTING,     NOT_VERY_EFFECTIVE
+	db DARK,			FIGHTING,	  NOT_VERY_EFFECTIVE
-	db DARK,         PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db DARK,			PSYCHIC_TYPE, SUPER_EFFECTIVE
-	db DARK,         GHOST,        SUPER_EFFECTIVE
+	db DARK,			GHOST,		  SUPER_EFFECTIVE
-	db DARK,         DARK,         NOT_VERY_EFFECTIVE
+	db DARK,			DARK,			NOT_VERY_EFFECTIVE
-	db DARK,         STEEL,        NOT_VERY_EFFECTIVE
+	db DARK,			STEEL,		  NOT_VERY_EFFECTIVE
-	db DARK,		 FAIRY,		   NOT_VERY_EFFECTIVE
+	db DARK,		 FAIRY,			NOT_VERY_EFFECTIVE
-	db STEEL,        FIRE,         NOT_VERY_EFFECTIVE
+	db STEEL,		  FIRE,			NOT_VERY_EFFECTIVE
-	db STEEL,        WATER,        NOT_VERY_EFFECTIVE
+	db STEEL,		  WATER,		  NOT_VERY_EFFECTIVE
-	db STEEL,        ELECTRIC,     NOT_VERY_EFFECTIVE
+	db STEEL,		  ELECTRIC,	  NOT_VERY_EFFECTIVE
-	db STEEL,        ICE,          SUPER_EFFECTIVE
+	db STEEL,		  ICE,			 SUPER_EFFECTIVE
-	db STEEL,        ROCK,         SUPER_EFFECTIVE
+	db STEEL,		  ROCK,			SUPER_EFFECTIVE
-	db STEEL,        STEEL,        NOT_VERY_EFFECTIVE
+	db STEEL,		  STEEL,		  NOT_VERY_EFFECTIVE
-	db STEEL,     	 FAIRY,        SUPER_EFFECTIVE
+	db STEEL,	  	 FAIRY,		  SUPER_EFFECTIVE
-	db FAIRY,   	 FIRE,         NOT_VERY_EFFECTIVE
+	db FAIRY,		 FIRE,			NOT_VERY_EFFECTIVE
-	db FAIRY,        BUG,          SUPER_EFFECTIVE
+	db FAIRY,		  BUG,			 SUPER_EFFECTIVE
-	db FAIRY,	   	 FIGHTING,     SUPER_EFFECTIVE
+	db FAIRY,			 FIGHTING,	  SUPER_EFFECTIVE
-	db FAIRY,        ICE,          NOT_VERY_EFFECTIVE
+	db FAIRY,		  ICE,			 NOT_VERY_EFFECTIVE
-	db FAIRY,	  	 DRAGON,       SUPER_EFFECTIVE
+	db FAIRY,	  	 DRAGON,		 SUPER_EFFECTIVE
-	db FAIRY,	     DARK,         SUPER_EFFECTIVE
+	db FAIRY,		  DARK,			SUPER_EFFECTIVE
-	db FAIRY,	  	 STEEL,        NOT_VERY_EFFECTIVE
+	db FAIRY,	  	 STEEL,		  NOT_VERY_EFFECTIVE
 
 	db -2 ; end (with Foresight)
 
 ; Foresight removes Ghost's immunities.
-	db NORMAL,       GHOST,        NO_EFFECT
+	db NORMAL,		 GHOST,		  NO_EFFECT
-	db FIGHTING,     GHOST,        NO_EFFECT
+	db FIGHTING,	 GHOST,		  NO_EFFECT
 
 	db -1 ; end
+
+InverseTypeMatchups:
+	;  attacker,	  defender,	  *=
+	db NORMAL,		 ROCK,			SUPER_EFFECTIVE
+	db NORMAL,		 STEEL,		  SUPER_EFFECTIVE
+	db FIRE,		FIRE,			SUPER_EFFECTIVE
+	db FIRE,		WATER,		  SUPER_EFFECTIVE
+	db FIRE,		GRASS,		  NOT_VERY_EFFECTIVE
+	db FIRE,		ICE,			 NOT_VERY_EFFECTIVE
+	db FIRE,		BUG,			 NOT_VERY_EFFECTIVE
+	db FIRE,		ROCK,			SUPER_EFFECTIVE
+	db FIRE,		DRAGON,		 SUPER_EFFECTIVE
+	db FIRE,		STEEL,		  NOT_VERY_EFFECTIVE
+	db WATER,		FIRE,			NOT_VERY_EFFECTIVE
+	db WATER,		WATER,		  SUPER_EFFECTIVE
+	db WATER,		GRASS,		  SUPER_EFFECTIVE
+	db WATER,		GROUND,		 NOT_VERY_EFFECTIVE
+	db WATER,		ROCK,			NOT_VERY_EFFECTIVE
+	db WATER,		DRAGON,		 SUPER_EFFECTIVE
+	db ELECTRIC,	WATER,		  NOT_VERY_EFFECTIVE
+	db ELECTRIC,	ELECTRIC,	  SUPER_EFFECTIVE
+	db ELECTRIC,	GRASS,		  SUPER_EFFECTIVE
+	db ELECTRIC,	GROUND,		 SUPER_EFFECTIVE
+	db ELECTRIC,	FLYING,		 NOT_VERY_EFFECTIVE
+	db ELECTRIC,	DRAGON,		 SUPER_EFFECTIVE
+	db GRASS,		FIRE,			SUPER_EFFECTIVE
+	db GRASS,		WATER,		  NOT_VERY_EFFECTIVE
+	db GRASS,		 GRASS,		  SUPER_EFFECTIVE
+	db GRASS,		 POISON,		 SUPER_EFFECTIVE
+	db GRASS,		 GROUND,		 NOT_VERY_EFFECTIVE
+	db GRASS,		 FLYING,		 SUPER_EFFECTIVE
+	db GRASS,		 BUG,			 SUPER_EFFECTIVE
+	db GRASS,		  ROCK,			NOT_VERY_EFFECTIVE
+	db GRASS,		 DRAGON,		 SUPER_EFFECTIVE
+	db GRASS,		 STEEL,		  SUPER_EFFECTIVE
+	db ICE,			 WATER,		  SUPER_EFFECTIVE
+	db ICE,			 GRASS,		  NOT_VERY_EFFECTIVE
+	db ICE,			 ICE,			 SUPER_EFFECTIVE
+	db ICE,			 GROUND,		 NOT_VERY_EFFECTIVE
+	db ICE,			 FLYING,		 NOT_VERY_EFFECTIVE
+	db ICE,			 DRAGON,		 NOT_VERY_EFFECTIVE
+	db ICE,			 STEEL,		  SUPER_EFFECTIVE
+	db ICE,			 FIRE,			SUPER_EFFECTIVE
+	db FIGHTING,	  NORMAL,		 NOT_VERY_EFFECTIVE
+	db FIGHTING,	  ICE,			 NOT_VERY_EFFECTIVE
+	db FIGHTING,	  POISON,		 SUPER_EFFECTIVE
+	db FIGHTING,	  FLYING,		 SUPER_EFFECTIVE
+	db FIGHTING,	  PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db FIGHTING,	  BUG,			 SUPER_EFFECTIVE
+	db FIGHTING,	  ROCK,			NOT_VERY_EFFECTIVE
+	db FIGHTING,	  DARK,			NOT_VERY_EFFECTIVE
+	db FIGHTING,	  STEEL,		  NOT_VERY_EFFECTIVE
+	db POISON,		 GRASS,		  NOT_VERY_EFFECTIVE
+	db POISON,		 POISON,		 SUPER_EFFECTIVE
+	db POISON,		 GROUND,		 SUPER_EFFECTIVE
+	db POISON,		 ROCK,			SUPER_EFFECTIVE
+	db POISON,		 GHOST,		  SUPER_EFFECTIVE
+	db POISON,		 STEEL,		  SUPER_EFFECTIVE
+	db GROUND,		 FIRE,			NOT_VERY_EFFECTIVE
+	db GROUND,		 ELECTRIC,	  NOT_VERY_EFFECTIVE
+	db GROUND,		 GRASS,		  SUPER_EFFECTIVE
+	db GROUND,		 POISON,		 NOT_VERY_EFFECTIVE
+	db GROUND,		 FLYING,		 SUPER_EFFECTIVE
+	db GROUND,		 BUG,			 SUPER_EFFECTIVE
+	db GROUND,		 ROCK,			NOT_VERY_EFFECTIVE
+	db GROUND,		 STEEL,		  NOT_VERY_EFFECTIVE
+	db FLYING,		 ELECTRIC,	  SUPER_EFFECTIVE
+	db FLYING,		 GRASS,		  NOT_VERY_EFFECTIVE
+	db FLYING,		 FIGHTING,	  NOT_VERY_EFFECTIVE
+	db FLYING,		 BUG,			 NOT_VERY_EFFECTIVE
+	db FLYING,		 ROCK,			SUPER_EFFECTIVE
+	db FLYING,		 STEEL,		  SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, FIGHTING,	  NOT_VERY_EFFECTIVE
+	db PSYCHIC_TYPE, POISON,		 NOT_VERY_EFFECTIVE
+	db PSYCHIC_TYPE, PSYCHIC_TYPE, SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, DARK,			SUPER_EFFECTIVE
+	db PSYCHIC_TYPE, STEEL,		  SUPER_EFFECTIVE
+	db BUG,			 FIRE,			SUPER_EFFECTIVE
+	db BUG,			 GRASS,		  NOT_VERY_EFFECTIVE
+	db BUG,			 FIGHTING,	  SUPER_EFFECTIVE
+	db BUG,			 POISON,		 SUPER_EFFECTIVE
+	db BUG,			 FLYING,		 SUPER_EFFECTIVE
+	db BUG,			 PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
+	db BUG,			 GHOST,		  SUPER_EFFECTIVE
+	db BUG,			 DARK,			NOT_VERY_EFFECTIVE
+	db BUG,			 STEEL,		  SUPER_EFFECTIVE
+	db ROCK,			FIRE,			NOT_VERY_EFFECTIVE
+	db ROCK,			ICE,			 NOT_VERY_EFFECTIVE
+	db ROCK,			FIGHTING,	  SUPER_EFFECTIVE
+	db ROCK,			GROUND,		 SUPER_EFFECTIVE
+	db ROCK,			FLYING,		 NOT_VERY_EFFECTIVE
+	db ROCK,			BUG,			 NOT_VERY_EFFECTIVE
+	db ROCK,			STEEL,		  SUPER_EFFECTIVE
+	db GHOST,		  NORMAL,		 SUPER_EFFECTIVE
+	db GHOST,		  PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
+	db GHOST,		  DARK,			SUPER_EFFECTIVE
+	db GHOST,		  STEEL,		  SUPER_EFFECTIVE
+	db GHOST,		  GHOST,		  NOT_VERY_EFFECTIVE
+	db DRAGON,		 DRAGON,		 NOT_VERY_EFFECTIVE
+	db DRAGON,		 STEEL,		  SUPER_EFFECTIVE
+	db DARK,			FIGHTING,	  SUPER_EFFECTIVE
+	db DARK,			PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
+	db DARK,			GHOST,		  NOT_VERY_EFFECTIVE
+	db DARK,			DARK,			SUPER_EFFECTIVE
+	db DARK,			STEEL,		  SUPER_EFFECTIVE
+	db STEEL,		  FIRE,			SUPER_EFFECTIVE
+	db STEEL,		  WATER,		  SUPER_EFFECTIVE
+	db STEEL,		  ELECTRIC,	  SUPER_EFFECTIVE
+	db STEEL,		  ICE,			 NOT_VERY_EFFECTIVE
+	db STEEL,		  ROCK,			NOT_VERY_EFFECTIVE
+	db STEEL,		  STEEL,		  SUPER_EFFECTIVE
+	db NORMAL,		 GHOST,		  SUPER_EFFECTIVE
+	db FIGHTING,	  GHOST,		  SUPER_EFFECTIVE
+	db FAIRY,		FIRE,			SUPER_EFFECTIVE
+	db FAIRY,		BUG,			NOT_VERY_EFFECTIVE
+	db FAIRY,		FIGHTING,	  	NOT_VERY_EFFECTIVE
+	db FAIRY,		ICE,			SUPER_EFFECTIVE
+	db FAIRY,	  	DRAGON,		 	NOT_VERY_EFFECTIVE
+	db FAIRY,		DARK,			NOT_VERY_EFFECTIVE
+	db FAIRY,	  	STEEL,		  	SUPER_EFFECTIVE
+	db -1 ; end

engine/battle/effect_commands.asm

@@ -359,7 +359,7 @@ CantMove:
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	push hl
-	ld hl, .fly_dig_moves
+	ld hl, FlyDigMoves
 	call CheckMoveInList
 	pop hl
 	ret nc
@@ -371,13 +371,6 @@ CantMove:
 	res SUBSTATUS_UNDERWATER, [hl]
 	jp AppearUserRaiseSub
 
-.fly_dig_moves
-	dw FLY
-	dw DIG
-	dw BOUNCE
-	dw WATER_SPORT
-	dw -1
-
 OpponentCantMove:
 	call BattleCommand_SwitchTurn
 	call CantMove
@@ -1370,7 +1363,13 @@ BattleCommand_Stab:
 	ld a, BATTLE_VARS_MOVE_TYPE
 	call GetBattleVar
 	ld b, a
+	ld a, [wBattleType]
+	cp BATTLETYPE_INVERSE
+	jr z, .inverse
 	ld hl, TypeMatchups
+	jr .TypesLoop
+.inverse
+	ld hl, InverseTypeMatchups
 
 .TypesLoop:
 ;	ld a, [hli]
@@ -1497,7 +1496,13 @@ CheckTypeMatchup:
 	ld c, [hl]
 	ld a, EFFECTIVE
 	ld [wTypeMatchup], a
+	ld a, [wBattleType]
+	cp BATTLETYPE_INVERSE
+	jr z, .inverse
 	ld hl, TypeMatchups
+	jr .TypesLoop
+.inverse
+	ld hl, InverseTypeMatchups
 .TypesLoop:
 ;	ld a, [hli]
 	call GetNextTypeMatchupsByte
@@ -1511,7 +1516,6 @@ CheckTypeMatchup:
 	bit SUBSTATUS_IDENTIFIED, a
 	jr nz, .End
 	jr .TypesLoop
-
 .Next:
 	cp d
 	jr nz, .Nope
@@ -1788,6 +1792,7 @@ BattleCommand_CheckHit:
 	call GetBattleVar
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	jr nz, .flying_or_underground
+	
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVar
 	and 1 << SUBSTATUS_UNDERWATER
@@ -1795,12 +1800,34 @@ BattleCommand_CheckHit:
 	
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
-	cp SURF
+	ld hl, SURF
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(SURF)
+		cp HIGH(SURF)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(SURF)
 	ret z
-	cp WHIRLPOOL
+	ld hl, WHIRLPOOL
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(WHIRLPOOL)
+		cp HIGH(WHIRLPOOL)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(WHIRLPOOL)
 	ret
-.flying_or_underground
 
+.flying_or_underground
 	bit SUBSTATUS_FLYING, a
 	ld hl, .FlyMoves
 	jr z, .check_move_in_list
@@ -2071,18 +2098,11 @@ BattleCommand_MoveAnimNoSub:
 
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
-	ld hl, .fly_dig_moves
+	ld hl, FlyDigMoves
 	call CheckMoveInList
 	ret nc
 	jp AppearUserLowerSub
 
-.fly_dig_moves
-	dw FLY
-	dw DIG
-	dw BOUNCE
-	dw WATER_SPORT
-	dw -1
-
 .alternate_anim
 	ld a, [wBattleAnimParam]
 	and 1
@@ -2167,7 +2187,7 @@ BattleCommand_FailureText:
 	call GetBattleVarAddr
 
 	push hl
-	ld hl, .fly_dig_moves
+	ld hl, FlyDigMoves
 	call CheckMoveInList
 	pop hl
 	jr c, .fly_dig
@@ -2200,13 +2220,6 @@ BattleCommand_FailureText:
 	call AppearUserRaiseSub
 	jp EndMoveEffect
 
-.fly_dig_moves
-	dw FLY
-	dw DIG
-	dw WATER_SPORT
-	dw BOUNCE
-	dw -1
-
 BattleCommand_ApplyDamage:
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
 	call GetBattleVar
@@ -5645,26 +5658,134 @@ BattleCommand_Charge:
 	call LoadMoveAnim
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
-	
+	ld hl, WATER_SPORT
-	ld hl, .fly_dig_moves ; attempt to resolve 16-bit issue with bounce and water sport - this can probably be made more efficient with a farcallable list
+	call GetMoveIDFromIndex
-	call CheckMoveInList
+	ld a, h
+	if HIGH(WATER_SPORT)
+		cp HIGH(WATER_SPORT)
+	else
+		and a
+	endc
+	ld a, l
 	pop hl
-	jr c, .got_move_type
+	ret nz
+	cp LOW(WATER_SPORT)
+	jp z, .set_diving
+	ld hl, FLY
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(FLY)
+		cp HIGH(FLY)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(FLY)
+	jr z, .set_flying
+	ld hl, BOUNCE
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(BOUNCE)
+		cp HIGH(BOUNCE)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(BOUNCE)
+	jr z, .set_flying
+	ld hl, DIG
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(DIG)
+		cp HIGH(DIG)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(DIG)
+	jr z, .set_flying
 	call BattleCommand_RaiseSub
-	xor a
+	jr .not_flying
 
-.got_move_type
+.flying
-	; a will contain the substatus 3 bit to set (1 << bit), or 0 if none (not flying/digging underground)
+	call DisappearUser
-	and a
+.not_flying
-	ld l, a
-	push hl
-	call nz, DisappearUser
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVarAddr
-	pop bc
+	ld a, BATTLE_VARS_MOVE_ANIM
-	ld a, c
+	call GetBattleVar
-	or [hl]
+	ld b, a
-	ld [hl], a
+	ld hl, WATER_SPORT
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(WATER_SPORT)
+		cp HIGH(WATER_SPORT)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(WATER_SPORT)
+	jr z, .set_diving
+	ld hl, FLY
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(FLY)
+		cp HIGH(FLY)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(FLY)
+	jr z, .set_flying
+	ld hl, BOUNCE
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(BOUNCE)
+		cp HIGH(BOUNCE)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(BOUNCE)
+	jr z, .set_flying
+	ld hl, DIG
+	call GetMoveIDFromIndex
+	ld a, h
+	if HIGH(DIG)
+		cp HIGH(DIG)
+	else
+		and a
+	endc
+	ld a, l
+	pop hl
+	ret nz
+	cp LOW(DIG)
+	jr z, .set_flying
+	jr nz, .dont_set_digging
+	set SUBSTATUS_UNDERGROUND, [hl]
+	jr .dont_set_digging
+
+.set_diving
+	ld a, BATTLE_VARS_SUBSTATUS4
+	call GetBattleVarAddr
+	set SUBSTATUS_UNDERWATER, [hl]
+	jr .dont_set_digging
+.set_flying
+	set SUBSTATUS_FLYING, [hl]
+
+.dont_set_digging
 	call CheckUserIsCharging
 	jr nz, .mimic
 	ld a, BATTLE_VARS_LAST_COUNTER_MOVE
@@ -5750,13 +5871,6 @@ BattleCommand_Charge:
 	text_jump HidUnderwaterText
 	db "@"
 
-.fly_dig_moves
-	dw FLY
-	dw DIG
-	dw BOUNCE
-	dw WATER_SPORT
-	dw -1
-
 BattleCommand_TrapTarget:
 	ld a, [wAttackMissed]
 	and a
@@ -6132,6 +6246,7 @@ BattleCommand_DoubleUnderwaterDamage:
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVar
 	bit SUBSTATUS_UNDERWATER, a
+	ret z
 	; fallthrough
 
 DoubleDamage:
@@ -6952,3 +7067,10 @@ CheckMoveInList:
 	pop de
 	pop bc
 	ret
+
+FlyDigMoves:
+	dw FLY
+	dw DIG
+	dw BOUNCE
+	dw WATER_SPORT
+	dw -1

gfx/pics.asm

@@ -707,15 +707,14 @@ UnownYBackpic:       INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
 UnownPBackpic:       INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
 UnownIBackpic:       INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
 UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
-
-
-SECTION "Pics 19", ROMX
-
 UnownExclamationFrontpic: INCBIN "gfx/pokemon/unown_exclamation/front.animated.2bpp.lz"
 UnownExclamationBackpic:  INCBIN "gfx/pokemon/unown_exclamation/back.2bpp.lz"
 UnownQuestionFrontpic: INCBIN "gfx/pokemon/unown_question/front.animated.2bpp.lz"
 UnownQuestionBackpic:  INCBIN "gfx/pokemon/unown_question/back.2bpp.lz"
 
+
+SECTION "Pics 19", ROMX
+
 BellignanFrontpic:	 INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
 BellignanBackpic:	 INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
 WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz"
@@ -736,12 +735,6 @@ LickilickyFrontpic:  INCBIN "gfx/pokemon/lickilicky/front.animated.2bpp.lz"
 LickilickyBackpic:   INCBIN "gfx/pokemon/lickilicky/back.2bpp.lz"
 LickilordFrontpic:   INCBIN "gfx/pokemon/lickilord/front.animated.2bpp.lz"
 LickilordBackpic:    INCBIN "gfx/pokemon/lickilord/back.2bpp.lz"
-BurgelaFrontpic:     INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz"
-BurgelaBackpic:      INCBIN "gfx/pokemon/burgela/back.2bpp.lz"
-TangrowthFrontpic:   INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz"
-TangrowthBackpic:    INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz"
-JungelaFrontpic:     INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz"
-JungelaBackpic:      INCBIN "gfx/pokemon/jungela/back.2bpp.lz"
 MamoswineFrontpic:   INCBIN "gfx/pokemon/mamoswine/front.animated.2bpp.lz"
 MamoswineBackpic:    INCBIN "gfx/pokemon/mamoswine/back.2bpp.lz"
 HirsuswineFrontpic:  INCBIN "gfx/pokemon/hirsuswine/front.animated.2bpp.lz"
@@ -827,6 +820,12 @@ TotartleFrontpic:    INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
 TotartleBackpic:     INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
 BlastykeFrontpic:    INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
 BlastykeBackpic:     INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
+BurgelaFrontpic:     INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz"
+BurgelaBackpic:      INCBIN "gfx/pokemon/burgela/back.2bpp.lz"
+TangrowthFrontpic:   INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz"
+TangrowthBackpic:    INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz"
+JungelaFrontpic:     INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz"
+JungelaBackpic:      INCBIN "gfx/pokemon/jungela/back.2bpp.lz"
 
 SECTION "Pics 22", ROMX
 CheepFrontpic:	     INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz"

gfx/pokemon/annihilape/anim.asm

@@ -1 +1,12 @@
-	endanim
+	frame 0, 08
+	setrepeat 2
+	frame 1, 10
+	frame 2, 10
+	dorepeat 2
+	frame 3, 08
+	setrepeat 3
+	frame 3, 06
+	frame 4, 06
+	dorepeat 7
+	frame 3, 06
+	endanim

gfx/pokemon/annihilape/anim_idle.asm

@@ -1 +1,5 @@
-	endanim
+	setrepeat 2
+	frame 0, 10
+	frame 5, 10
+	dorepeat 1
+	endanim

gfx/pokemon/annihilape/credit.txt

@@ -0,0 +1,4 @@
+Sprited by ShadowOne333.
+
+Taken from Johto Legends
+https://github.com/aforward9600/JohtoLegends

gfx/pokemon/annihilape/normal.pal

@@ -0,0 +1,3 @@
+
+	RGB 17, 16, 17
+	RGB 29, 00, 11

gfx/pokemon/annihilape/shiny.pal

@@ -1,2 +1,3 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 12, 08, 24
+	RGB 31, 13, 00

gfx/pokemon/dugtrioa/anim.asm

@@ -0,0 +1,11 @@
+	frame 0, 12
+	frame 1, 06
+	setrepeat 3
+	frame 2, 12
+	frame 3, 12
+	dorepeat 3
+	frame 0, 12
+	frame 4, 5
+	frame 5, 5
+	frame 6, 5
+	endanim

gfx/pokemon/dugtrioa/anim_idle.asm

@@ -0,0 +1,6 @@
+	frame 0, 12
+	setrepeat 2
+	frame 1, 05
+	frame 0, 05
+	dorepeat 2
+	endanim

gfx/pokemon/dugtrioa/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/dugtrioa/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 25, 16, 08
+	RGB 09, 11, 11
+

gfx/pokemon/dugtrioa/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 20, 07, 05
+	RGB 09, 11, 11
+

gfx/pokemon/kleavor/anim.asm

@@ -1 +1,18 @@
+	setrepeat 1
+	frame 0, 07
+	frame 1, 07
+	dorepeat 1
+	frame 1, 07
+	frame 2, 18
+	frame 3, 08
+	setrepeat 2
+	frame 4, 10
+	frame 5, 06
+	frame 3, 08
+	dorepeat 8
+	setrepeat 6
+	frame 3, 04
+	frame 2, 04
+	dorepeat 13
+	frame 1, 06
 	endanim

gfx/pokemon/kleavor/anim_idle.asm

@@ -1 +1,7 @@
+	frame 0, 08
+	setrepeat 2
+	frame 6, 04
+	frame 7, 04
+	frame 6, 04
+	dorepeat 2
 	endanim

gfx/pokemon/kleavor/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/kleavor/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 27, 17, 00
+	RGB 10, 07, 00
+

gfx/pokemon/kleavor/shiny.pal

@@ -1,4 +1,4 @@
 
-	RGB 17, 24, 00
+	RGB 12, 14, 06
-	RGB 28, 09, 00
+	RGB 10, 07, 00
 

gfx/pokemon/mr__rime/anim.asm

@@ -0,0 +1,21 @@
+	frame 0, 07
+	frame 2, 07
+	setrepeat 2
+	frame 3, 07
+	frame 4, 07
+	dorepeat 3
+	frame 6, 07
+	setrepeat 2
+	frame 5, 07
+	frame 3, 07
+	dorepeat 8
+	frame 7, 07
+	frame 8, 07
+	frame 9, 07
+	frame 10, 07
+	setrepeat 2
+	frame 8, 07
+	frame 3, 07
+	dorepeat 16
+	frame 2, 07
+	endanim

gfx/pokemon/mr__rime/anim_idle.asm

@@ -0,0 +1,5 @@
+	frame 0, 08
+	frame 1, 08
+	frame 11, 08
+	frame 1, 08
+	endanim

gfx/pokemon/mr__rime/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/mr__rime/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 28, 16, 21
+	RGB 09, 10, 24
+

gfx/pokemon/mr__rime/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 23, 23, 23
+	RGB 14, 14, 15
+

gfx/pokemon/ponytag/anim.asm

@@ -0,0 +1,9 @@
+	frame 1, 07
+	frame 2, 07
+	frame 1, 07
+	frame 2, 07
+	frame 0, 18
+	frame 3, 06
+	frame 0, 06
+	frame 3, 06
+	endanim

gfx/pokemon/ponytag/anim_idle.asm

@@ -0,0 +1,4 @@
+	frame 4, 06
+	frame 5, 06
+	frame 3, 06
+	endanim

gfx/pokemon/ponytag/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/ponytag/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 10, 26, 27
+	RGB 20, 14, 27
+

gfx/pokemon/ponytag/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 27, 26, 25
+	RGB 10, 26, 27
+

gfx/pokemon/sneaselh/anim.asm

@@ -0,0 +1,16 @@
+	frame 0, 08
+	frame 1, 22
+	frame 2, 04
+	frame 3, 04
+	frame 4, 04
+	frame 3, 04
+	frame 2, 04
+	frame 0, 07
+	frame 5, 07
+	frame 6, 07
+	frame 7, 07
+	frame 8, 07
+	frame 7, 07
+	frame 6, 07
+	frame 5, 07
+	endanim

gfx/pokemon/sneaselh/anim_idle.asm

@@ -0,0 +1,9 @@
+	setrepeat 2
+	frame 0, 08
+	frame 2, 03
+	frame 3, 03
+	frame 4, 03
+	frame 3, 03
+	frame 2, 03
+	dorepeat 1
+	endanim

gfx/pokemon/sneaselh/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/sneaselh/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 21, 22, 23
+	RGB 15, 13, 20
+

gfx/pokemon/sneaselh/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 14, 16, 17
+	RGB 28, 24, 10
+

gfx/pokemon/sneasler/anim.asm

@@ -0,0 +1,18 @@
+	frame 0, 08
+	frame 1, 07
+	frame 2, 07
+	frame 3, 07
+	frame 4, 07
+	frame 1, 07
+	frame 5, 07
+	frame 1, 07
+	frame 6, 07
+	frame 7, 07
+	frame 8, 07
+	frame 9, 07
+	frame 10, 07
+	frame 11, 07
+	frame 12, 07
+	frame 13, 07
+	frame 6, 07
+	endanim

gfx/pokemon/sneasler/anim_idle.asm

@@ -0,0 +1,7 @@
+	setrepeat 2
+	frame 0, 08
+	frame 1, 05
+	frame 5, 05
+	frame 1, 05
+	dorepeat 1
+	endanim

gfx/pokemon/sneasler/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/sneasler/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 21, 22, 23
+	RGB 15, 13, 20
+

gfx/pokemon/sneasler/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 12, 10, 11
+	RGB 26, 25, 18
+

gfx/pokemon/tangrowth/anim.asm

@@ -1 +1,15 @@
-	endanim
+	setrepeat 2
+	frame 1, 04
+	frame 2, 04
+	frame 1, 04
+	frame 0, 04
+	dorepeat 1
+	setrepeat 2
+	frame 5, 04
+	frame 0, 04
+	dorepeat 7
+	setrepeat 2
+	frame 3, 04
+	frame 4, 04
+	dorepeat 11
+	endanim

gfx/pokemon/tangrowth/anim_idle.asm

@@ -1 +1,5 @@
-	endanim
+	setrepeat 2
+	frame 5, 08
+	frame 0, 08
+	dorepeat 1
+	endanim

gfx/pokemon/tangrowth/credit.txt

@@ -0,0 +1,5 @@
+Taken from JohtoLegends, ultimately from PolishedCrystal
+https://github.com/aforward9600/JohtoLegends
+https://github.com/Rangi42/polishedcrystal
+
+Artist is uncredited.

gfx/pokemon/tangrowth/shiny.pal

@@ -1,2 +1,3 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 31, 17, 16
+	RGB 12, 27, 10

gfx/pokemon/ursaluna/anim.asm

@@ -1 +1,15 @@
-	endanim
+	setrepeat 2
+	frame 0, 06
+	frame 1, 06
+	frame 2, 06
+	frame 1, 06
+	dorepeat 1
+	frame 3, 06
+	setrepeat 3
+	frame 4, 05
+	frame 5, 05
+	frame 6, 05
+	dorepeat 8
+	frame 4, 05
+	frame 3, 05
+	endanim

gfx/pokemon/ursaluna/anim_idle.asm

@@ -1 +1,7 @@
-	endanim
+	setrepeat 2
+	frame 0, 06
+	frame 1, 06
+	frame 2, 06
+	frame 1, 06
+	dorepeat 1
+	endanim

gfx/pokemon/ursaluna/credit.txt

@@ -0,0 +1,4 @@
+Sprited by ShadowOne333, Cure, and Scarlax.
+
+Taken from Johto Legends
+https://github.com/aforward9600/JohtoLegends

gfx/pokemon/ursaluna/normal.pal

@@ -0,0 +1,3 @@
+
+	RGB 18, 16, 15
+	RGB 09, 06, 06

gfx/pokemon/ursaluna/shiny.pal

@@ -1,2 +1,3 @@
-	RGB 22, 22, 12
+
-	RGB 07, 15, 25
+	RGB 19, 17, 15
+	RGB 12, 04, 03

gfx/pokemon/weezingg/anim.asm

@@ -0,0 +1,9 @@
+	frame 0, 8
+	frame 1, 18
+	frame 2, 18
+	frame 3, 18
+	frame 4, 12
+	frame 5, 12
+	frame 6, 12
+	frame 7, 12
+	endanim

gfx/pokemon/weezingg/anim_idle.asm

@@ -0,0 +1,5 @@
+	frame  0, 12
+	frame  8, 12
+	frame  0, 12
+	frame  9, 12
+	endanim

gfx/pokemon/weezingg/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/

gfx/pokemon/weezingg/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 13, 23, 08
+	RGB 12, 12, 11
+

gfx/pokemon/weezingg/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 16, 28, 09
+	RGB 19, 08, 05
+

gfx/pokemon/zapdosg/anim.asm

@@ -0,0 +1,11 @@
+	frame 3, 24
+	frame 0, 08
+	setrepeat 2
+	frame 1, 16
+	frame 2, 16
+	dorepeat 3
+	setrepeat 4
+	frame 0, 06
+	frame 1, 06
+	dorepeat 7
+	endanim

gfx/pokemon/zapdosg/anim_idle.asm

@@ -0,0 +1,5 @@
+	setrepeat 3
+	frame 0, 08
+	frame 4, 08
+	dorepeat 1
+	endanim

gfx/pokemon/zapdosg/credit.txt

@@ -0,0 +1,3 @@
+Taken from ShadowOne333's fork of PolishedCrystal.
+
+https://github.com/ShadowOne333/polishedcrystal/blob/master/gfx/pokemon/zapdos_galarian/front.png

gfx/pokemon/zapdosg/normal.pal

@@ -0,0 +1,4 @@
+
+	RGB 29, 12, 07
+	RGB 04, 02, 03
+

gfx/pokemon/zapdosg/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 31, 28, 00
+	RGB 26, 13, 06
+

maps/CalsHouse2F.ablk

@@ -1 +1 @@
-
+%&'

maps/CalsHouse2F.asm

@@ -12,6 +12,7 @@
 
 	object_const_def
 	const CALSHOUSE_KEN
+	const CALSHOUSE_BOOK
 
 CalsHouse2F_MapScripts:
 	def_scene_scripts
@@ -21,6 +22,17 @@ CalsHouse2F_MapScripts:
 CalsHouseKen:
 	jumptextfaceplayer CalsHouseKenText
 
+CalsHouseBook:
+	opentext
+	writetext CalsHouseBookIntro
+	yesorno
+	iffalse .Done
+	writetext CalsHouseBookText
+	waitbutton
+.Done:
+	closetext
+	end
+
 CalsHouseKenText:
 	text "CAL? He's my"
 	line "brother!"
@@ -37,6 +49,46 @@ CalsHouseKenText:
 	line "He's so cool!"
 	done
 
+CalsHouseBookIntro:
+	text "There's a book"
+	line "on CAL's desk…"
+
+	para "MYSTERIES OF"
+	line "THE EARTH"
+
+	para "It's written by..."
+	line "GIOVANNI?!"
+
+	para "Read it anyway?"
+	done
+
+CalsHouseBookText:
+	text "In this book, I"
+	line "will reveal the"
+	cont "highest form of"
+	cont "RHYDON."
+	
+	para "Its name is"
+	line "RHYPERIOR."
+	
+	para "We can't get it"
+	line "obtained with"
+	cont "items native to"
+	cont "KANTO. We must"
+	cont "use a PROTECTOR."
+	
+	para "Unfortunately,"
+	line "RHYPERIOR does"
+	cont "not address"
+	cont "RHYDON's poor"
+	cont "SPEED. Ergo, it"
+	cont "cannot use my"
+	cont "own technique,"
+	cont "FISSURE, to its"
+	cont "full potential."
+	done
+
+
 ; Usually, there's a thing about Skarmory here, but Silver's House details it, so let's use this unused quote instead.
 CalsHousePCText:
 	jumpstd SilphPokegearScript
@@ -109,3 +161,4 @@ CalsHouse2F_MapEvents:
 
 	def_object_events
 	object_event  8,  1, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CalsHouseKen, -1
+	object_event  1,  5, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CalsHouseBook, -1

maps/DebugRoom.asm

@@ -8,12 +8,12 @@ DebugRoom_MapScripts:
 
 DebugPokemon1Script:
 	opentext
-	getmonname STRING_BUFFER_3, AZUMARILL
+	getmonname STRING_BUFFER_3, BIPULLA
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke AZUMARILL, 4, HM_WATER_SPORT
+	givepoke BIPULLA, 15, HM_WATER_SPORT
 	closetext
 	end
 
@@ -39,11 +39,11 @@ DebugPokemon3Script:
 	faceplayer
 	opentext
 	writetext DebugTextA
-	cry STROMEN
+	cry BELLSPROUT
 	pause 15
 	closetext
-	loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY
+	loadvar VAR_BATTLETYPE, BATTLETYPE_INVERSE
-	loadwildmon COATL, 75
+	loadwildmon BELLSPROUT, 10
 	startbattle
 	reloadmapafterbattle
 	end
@@ -56,11 +56,11 @@ DebugPokemon4Script:
 	faceplayer
 	opentext
 	writetext DebugTextB
-	cry STROMEN
+	cry BELLSPROUT
 	pause 15
 	closetext
 	loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
-	loadwildmon COATL, 75
+	loadwildmon BELLSPROUT, 10
 	startbattle
 	reloadmapafterbattle
 	end