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

2026-02-07 16:45:24 +13:00 · 2024-09-14 15:25:29 -04:00 · 2024-09-14 15:25:29 -04:00 · 848c79784f
commit 848c79784f
parent 2964cc14fa 80f44a530c
199 changed files with 10126 additions and 2998 deletions
--- a/data/battle/ai/useful_moves.asm
+++ b/data/battle/ai/useful_moves.asm
@ -20,4 +20,5 @@ UsefulMoves:
 	dw FIRE_BLAST
 	dw SOFTBOILED
 	dw SUPER_FANG
+	dw COIN_HURL
 	dw -1 ; end
--- a/data/battle/effect_command_pointers.asm
+++ b/data/battle/effect_command_pointers.asm
@ -180,4 +180,5 @@ BattleCommandPointers:
 	dw BattleCommand_SuperEffectiveLoopText
 	dw BattleCommand_StartLoop
 	dw BattleCommand_Curl
+	dw BattleCommand_CoinHurlPower
 	assert_table_length NUM_EFFECT_COMMANDS
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@ -186,6 +186,7 @@ BattleAnimFrameData:
 	dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6
 	dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7
 	dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8
+	dw .Frameset_Mist ; BATTLEANIMFRAMESET_MIST
 	assert_table_length NUM_BATTLEANIMFRAMESETS

 .Frameset_00:
@ -1268,3 +1269,8 @@ BattleAnimFrameData:
 .Frameset_b8:
 	oamframe BATTLEANIMOAMSET_D7,  8
 	oamend
+
+.Frameset_Mist:
+	oamframe BATTLEANIMOAMSET_91, 16
+	oamframe BATTLEANIMOAMSET_92, 16
+	oamend
--- a/data/battle_anims/objects.asm
+++ b/data/battle_anims/objects.asm
@ -395,4 +395,8 @@ BattleAnimObjects:
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_ENEMY, ANIM_GFX_PLAYERHEAD
 ; ANIM_OBJ_PLAYERHEAD_2ROW
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_PLAYER, ANIM_GFX_ENEMYFEET
+; ANIM_OBJ_COIN_HURL - just the Poke Ball toss but with Pay Day's gfx chucked in
+	battleanimobj ABSOLUTE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_COINHURL, PAL_BATTLE_OB_BROWN, ANIM_GFX_STATUS
+; ANIM_OBJ_SHOOTING_MIST
+	battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_MIST, BATTLEANIMFUNC_USER_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
 	assert_table_length NUM_ANIM_OBJS
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -431,11 +431,11 @@ MapGroup_Lavender:
 	map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
-	map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
-	map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
-	map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
-	map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE
+	map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE
 	map HauntedHouseFoyer, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
 	map HauntedHouse1F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
 	map HauntedHouse2F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
@ -685,20 +685,20 @@ MapGroup_SilentHills:
 	table_width MAP_LENGTH, MapGroup_SilentHills
 	map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
 	map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
-	map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
+	map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_NIHONTIME, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
 	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
 	map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
-	map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
-	map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
-	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
 	map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
-	map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
-	map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SILENT_HILLS_MAPS

@ -718,7 +718,7 @@ MapGroup_OldCity:
 	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_ROUTE_30, TRUE, PALETTE_AUTO, 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
 	assert_table_length NUM_OLD_CITY_MAPS

--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@ -90,4 +90,6 @@ MapScenes::
 	scene_var BLUE_LAB,									   wBlueLabSceneID
 	scene_var ROUTE_66_WHITE_CITY_GATE, wRoute66WhiteCityGateID
 	scene_var SAFARI_ZONE_FUCHSIA_GATE_BETA, wFuchsiaSafariZoneGateID
+	scene_var VERMILION_CITY, wVermilionCityID
+	scene_var ROUTE_14, wVermilionCityID
 	db -1 ; end
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@ -283,7 +283,23 @@ BattleAnimations::
 	dw BattleAnim_RockSlash
 	dw BattleAnim_CrossCutter
 	dw BattleAnim_Megaphone
-	dw BattleAnim_Wind_Ride
+	dw BattleAnim_Wind_Ride ; Mystic Ice - to be changed, all new anims here are temp. Wind Ride's animation fits Mystic Ice but may want some touch-ups. It's buggy.
+	dw BattleAnim_Splash ; Bounce
+	dw BattleAnim_Flash ; Bright Moss
+	dw BattleAnim_CoinHurl ; Coin Hurl
+	dw BattleAnim_RockSmash ; Uproot
+	dw BattleAnim_Psybeam ; Synchronize
+	dw BattleAnim_StrongArm
+	dw BattleAnim_Uppercut
+	dw BattleAnim_WaterGun ; uhhh
+	dw BattleAnim_Wind_Ride ; Wind Ride but real
+	dw BattleAnim_Flash ; Dazzling Gleam
+	dw BattleAnim_Sing ; Disarming Voice
+	dw BattleAnim_DrainingKiss ; From Sour Crystal
+	dw BattleAnim_FairyWind ; From Sour Crystal
+	dw BattleAnim_Psywave ; Moonblast
+	dw BattleAnim_Rollout ; Play Rough
+	dw BattleAnim_ConfuseRay ; Strange Steam
 	assert_table_length NUM_ATTACKS + 1
 	dw BattleAnim_SweetScent2

@ -1318,7 +1334,7 @@ BattleAnim_RazorWind:
 	anim_wait 24
 	anim_ret

-BattleAnim_Sonicboom_JP: ; unreferenced
+BattleAnim_Sonicboom:
 	anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT
 .loop
 	anim_sound 3, 0, SFX_RAZOR_WIND
@ -1343,7 +1359,6 @@ BattleAnim_Sonicboom_JP: ; unreferenced
 	anim_ret

 BattleAnim_Gust:
-BattleAnim_Sonicboom:
 	anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT
 .loop
 	anim_sound 0, 1, SFX_RAZOR_WIND
@ -4689,7 +4704,7 @@ BattleAnim_Wind_Ride:
 	anim_sound 0, 1, SFX_MEGA_KICK
 	anim_obj ANIM_OBJ_HIT_BIG_YFIX, 136, 56, $0
 	anim_bgeffect ANIM_BG_SHOW_MON, $0, BG_EFFECT_USER, $0
-	anim_wait 32
+	anim_wait 32 ; something causes the tip of the back sprite to disappear
 	anim_ret


@ -4882,6 +4897,125 @@ BattleAnimSub_Glimmer2:
 	anim_wait 16
 	anim_ret

+; Splices the "metal" animation, Tackle, and DynamicPunch, using the Spark SFX from Rollout.
+BattleAnim_StrongArm:
+	anim_1gfx ANIM_GFX_REFLECT
+	anim_obp0 $0
+	anim_sound 0, 0, SFX_RAGE
+	anim_call BattleAnim_TargetObj_1Row
+	anim_call BattleAnimSub_Metallic
+	anim_call BattleAnim_ShowMon_0
+	anim_1gfx ANIM_GFX_HIT
+	anim_resetobp0
+	anim_sound 0, 0, SFX_SPARK
+	anim_call BattleAnim_TargetObj_1Row
+	anim_bgeffect ANIM_BG_TACKLE, $0, BG_EFFECT_USER, $0
+	anim_wait 4
+	anim_sound 0, 1, SFX_MEGA_PUNCH
+	anim_obj ANIM_OBJ_HIT_BIG, 136, 40, $0
+	anim_wait 8
+	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_EXPLOSION
+	anim_resetobp0
+	anim_obj ANIM_OBJ_PUNCH_SHAKE, 136, 56, $43
+	anim_wait 16
+	anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $e, $4, $0
+	anim_call BattleAnim_ShowMon_0
+	anim_ret
+
+; Made in virtually the same way to KEP, reversing Karate Chop's animation.
+; Difference here is using Comet Punch's SFX, not repeating it, having the Punch icon, and having a lower low and higher high in its arc. Karate Chop changed lots in GSC!
+BattleAnim_Uppercut:
+	anim_1gfx ANIM_GFX_HIT
+	anim_sound 0, 1, SFX_COMET_PUNCH
+	anim_obj ANIM_OBJ_PUNCH, 136, 52, $0
+	anim_obj ANIM_OBJ_HIT_YFIX, 136, 52, $0
+	anim_wait 3
+	anim_obj ANIM_OBJ_PUNCH, 136, 48, $0
+	anim_obj ANIM_OBJ_HIT_YFIX, 136, 48, $0
+	anim_wait 3
+	anim_obj ANIM_OBJ_PUNCH, 136, 44, $0
+	anim_obj ANIM_OBJ_HIT_YFIX, 136, 44, $0
+	anim_wait 3
+	anim_obj ANIM_OBJ_PUNCH, 136, 40, $0
+	anim_obj ANIM_OBJ_HIT_YFIX, 136, 40, $0
+	anim_wait 3
+	anim_obj ANIM_OBJ_PUNCH, 136, 36, $0
+	anim_obj ANIM_OBJ_HIT_YFIX, 136, 36, $0
+	anim_wait 16
+	anim_ret
+
+; Takes the Poke Ball throw code, applies it to the Pay Day coins, then spits out coins on hit.
+BattleAnim_CoinHurl:
+	anim_2gfx ANIM_GFX_HIT, ANIM_GFX_STATUS
+	anim_sound 6, 2, SFX_PAY_DAY
+	anim_obj ANIM_OBJ_COIN_HURL, 68, 92, $40
+	anim_wait 4
+	anim_sound 6, 2, SFX_PAY_DAY
+	anim_obj ANIM_OBJ_COIN_HURL, 68, 92, $40
+	anim_wait 4
+	anim_sound 6, 2, SFX_PAY_DAY
+	anim_obj ANIM_OBJ_COIN_HURL, 68, 92, $40
+	anim_wait 28
+	anim_obj ANIM_OBJ_PAY_DAY, 110, 76, $1
+	anim_wait 2
+	anim_obj ANIM_OBJ_PAY_DAY, 120, 66, $1
+	anim_wait 2
+	anim_obj ANIM_OBJ_PAY_DAY, 130, 86, $1
+	anim_wait 64
+	anim_ret
+	
+BattleAnim_FairyWind: ; from Sour Crystal
+	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HAZE
+	anim_bgeffect ANIM_BG_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
+	anim_sound 0, 1, SFX_GAME_FREAK_LOGO_GS
+.loop
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 80, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 88, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 96, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 80, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 88, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 96, $4
+	anim_wait 4
+	anim_loop 2, .loop
+	anim_bgeffect ANIM_BG_FADE_MON_TO_BLACK_REPEATING, $0, $0, $40
+	anim_wait 64
+	anim_ret
+	
+BattleAnim_DrainingKiss: ; from Sour Crystal
+	anim_3gfx ANIM_GFX_OBJECTS, ANIM_GFX_CHARGE, ANIM_GFX_SHINE
+	anim_sound 0, 1, SFX_SWEET_KISS
+	anim_obj ANIM_OBJ_HEART, 120, 40, $0
+	anim_wait 8
+.loop
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 128, 48, $2
+	anim_wait 5
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 136, 64, $3
+	anim_wait 5
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 136, 32, $4
+	anim_wait 5
+	anim_loop 5, .loop
+	anim_wait 32
+	anim_bgeffect ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW, $0, $0, $0
+	anim_jump BattleAnim_Glimmer_branch3
+	
+BattleAnim_Glimmer_branch3:
+	anim_sound 0, 0, SFX_METRONOME
+	anim_obj ANIM_OBJ_GLIMMER, 44, 64, $0
+	anim_wait 5
+	anim_obj ANIM_OBJ_GLIMMER, 24, 96, $0
+	anim_wait 5
+	anim_obj ANIM_OBJ_GLIMMER, 56, 104, $0
+	anim_wait 21
+	anim_ret
+
 BattleAnim_TargetObj_1Row:
 	anim_battlergfx_2row
 	anim_bgeffect ANIM_BG_BATTLEROBJ_1ROW, $0, BG_EFFECT_TARGET, $0
--- a/data/moves/critical_hit_moves.asm
+++ b/data/moves/critical_hit_moves.asm
@ -7,4 +7,5 @@ CriticalHitMoves:
 	dw AEROBLAST
 	dw CROSS_CHOP
 	dw CROSS_CUTTER
+	dw WIND_RIDE
 	dw -1
--- a/data/moves/descriptions.asm
+++ b/data/moves/descriptions.asm
@ -260,7 +260,23 @@ MoveDescriptions1:
 	dw RockSlashDescription
 	dw CrossCutterDescription
 	dw MegaphoneDescription
+	dw MysticIceDescription
+	dw BounceDescription
+	dw BrightMossDescription
+	dw CoinHurlDescription
+	dw UprootDescription
+	dw SynchroniseDescription
+	dw StrongArmDescription
+	dw UppercutDescription
+	dw WaterSportDescription
 	dw WindRideDescription
+	dw DazzlingGleamDescription
+	dw DisarmingVoiceDescription
+	dw DrainingKissDescription
+	dw FairyWindDescription
+	dw MoonblastDescription
+	dw PlayRoughDescription
+	dw StrangeSteamDescription

 .IndirectEnd::

@ -271,7 +287,15 @@ PoundDescription:
 	db   "Pounds with fore-"
 	next "legs or tail.@"

+; optimised
+WindRideDescription:
+CrossCutterDescription:
+RazorLeafDescription:
 KarateChopDescription:
+CrabhammerDescription:
+SlashDescription:
+AeroblastDescription:
+CrossChopDescription:
 	db   "Has a high criti-"
 	next "cal hit ratio.@"

@ -503,6 +527,7 @@ BlizzardDescription:
 	db   "An attack that may"
 	next "freeze the foe.@"

+StrangeSteamDescription:
 PsybeamDescription:
 	db   "An attack that may"
 	next "confuse the foe.@"
@ -511,6 +536,7 @@ BubblebeamDescription:
 	db   "An attack that may"
 	next "lower SPEED.@"

+PlayRoughDescription:
 AuroraBeamDescription:
 	db   "An attack that may"
 	next "lower ATTACK.@"
@ -551,6 +577,7 @@ AbsorbDescription:
 	db   "Steals 1/2 of the"
 	next "damage inflicted.@"

+DrainingKissDescription:
 MegaDrainDescription:
 	db   "Steals 1/2 of the"
 	next "damage inflicted.@"
@ -563,10 +590,6 @@ GrowthDescription:
 	db   "Raises the SPCL."
 	next "ATK rating.@"

-RazorLeafDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 SolarbeamDescription:
 	db   "1st turn: Prepare"
 	next "2nd turn: Attack@"
@ -779,6 +802,7 @@ ClampDescription:
 	db   "Traps the foe for"
 	next "2-5 turns.@"

+DisarmingVoiceDescription:
 SwiftDescription:
 	db   "An attack that"
 	next "never misses.@"
@ -871,10 +895,6 @@ AcidArmorDescription:
 	db   "Sharply raises the"
 	next "user's DEFENSE.@"

-CrabhammerDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 ExplosionDescription:
 	db   "Very powerful but"
 	next "makes user faint.@"
@ -915,10 +935,6 @@ SuperFangDescription:
 	db   "Cuts the foe's HP"
 	next "by 1/2.@"

-SlashDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 SubstituteDescription:
 	db   "Makes a decoy with"
 	next "1/4 user's max HP.@"
@ -971,10 +987,6 @@ Conversion2Description:
 	db   "The user's type is"
 	next "made resistant.@"

-AeroblastDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 CottonSporeDescription:
 	db   "Sharply reduces"
 	next "the foe's SPEED.@"
@ -1215,10 +1227,6 @@ HiddenPowerDescription:
 	db   "The power varies"
 	next "with the #MON.@"

-CrossChopDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-
 TwisterDescription:
 	db   "Whips up a tornado"
 	next "to attack.@"
@ -1279,14 +1287,55 @@ RockSlashDescription:
 	db   "A strong imprecise"
 	next "ROCK-type attack.@" ;the original description was too long I think
 	
-CrossCutterDescription:
-	db   "Has a high criti-"
-	next "cal hit ratio.@"
-	
 MegaphoneDescription:
 	db   "Reduces the foe's"
 	next "SPCL.ATK.@"
 	
-WindRideDescription:
+MysticIceDescription:
 	db   "Summons the north"
 	next "wind. May freeze.@"
+
+BounceDescription:
+	db "Bounces up, then"
+	next "down next turn.@"
+
+BrightMossDescription:
+	db "Lights up area to"
+	next "boost accuracy.@"
+
+CoinHurlDescription:
+	db "Power raises with"
+	next "wealth.@"
+
+UprootDescription:
+	db "Flings foe for"
+	next "massive damage.@"
+
+SynchroniseDescription:
+	db "Enemy takes same"
+	next "damage as user.@"
+
+StrongArmDescription:
+	db "May raise the"
+	next "user's ATTACK.@"
+
+UppercutDescription:
+	db "An attack that may"
+	next "cause flinching.@"
+
+WaterSportDescription:
+	db "Lowers FIRE move" ; I really want to change this tbh
+	next "power.@" 
+
+DazzlingGleamDescription:
+	db "Flashes a bright"
+	next "light to attack.@"
+
+FairyWindDescription:
+	db "Blows a pleasant"
+	next "wind to attack.@"
+
+MoonblastDescription:
+	db   "An attack that may"
+	next "lower SPCL.ATK.@"
+
--- a/data/moves/effects.asm
+++ b/data/moves/effects.asm
@ -2077,3 +2077,23 @@ DefenseCurl:
 	statupmessage
 	statupfailtext
 	endmove
+
+CoinHurl: ; Identical to Return, except it calculates damage differently, and does not trigger King's Rock, as contact isn't being made.
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagestats
+	coinhurlpower
+	damagecalc
+	stab
+	damagevariation
+	checkhit
+	moveanim
+	failuretext
+	applydamage
+	criticaltext
+	supereffectivetext
+	checkfaint
+	buildopponentrage
+	endmove
--- a/data/moves/effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
@ -158,4 +158,5 @@ MoveEffectsPointers:
 	dw BeatUp
 	dw Fly
 	dw DefenseCurl
+	dw CoinHurl
 	assert_table_length NUM_MOVE_EFFECTS
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@ -273,5 +273,21 @@ Moves1:
 	move EFFECT_NORMAL_HIT,        140, ROCK,           70,  5,   0      ;ROCK_SLASH
 	move EFFECT_NORMAL_HIT,         50, BUG,           100, 15,   0      ;CROSS_CUTTER
 	move EFFECT_SP_ATK_DOWN,         0, NORMAL,        100, 40,   0      ;MEGAPHONE
-	move EFFECT_FREEZE_HIT,        100, FLYING,         95,  5,  30      ;WIND RIDE
+	move EFFECT_FREEZE_HIT,        100, ICE,         	95,  5,  30      ;MYSTIC_ICE
+	move EFFECT_FLY,                85, WATER,         85,  5,   0     ; BOUNCE - went back and forth on type (making it modern or keeping it spaceworldy), chose spaceworld to diversify the "fly" move category
+	move EFFECT_ACCURACY_UP,        85, GRASS,         	 0, 20,   0     ; BRIGHT_MOSS
+	move EFFECT_COIN_HURL,           1, NORMAL,        100, 20,   0     ; COIN_HURL
+	move EFFECT_NORMAL_HIT,         85, GROUND,        100, 10,   0     ; UPROOT
+	move EFFECT_MIRROR_COAT,         1, PSYCHIC_TYPE,  100, 10,   0     ; SYNCHRONIZE - effect not implemented
+	move EFFECT_ATTACK_UP_HIT,      70, STEEL,         	90, 10,  10     ; STRONG_ARM
+	move EFFECT_FLINCH_HIT,         55, FIGHTING,       80, 15,   30    ; UPPERCUT
+	move EFFECT_NORMAL_HIT,          1, WATER,         	 1, 15,   0     ; WATER_SPORT  - effect not implemented
+	move EFFECT_NORMAL_HIT,         55, FLYING,         95, 10,   0     ; WIND_RIDE
+	move EFFECT_NORMAL_HIT,         80, FAIRY,         100, 10,   0     ; DAZZLING_GLEAM
+	move EFFECT_ALWAYS_HIT,         40, FAIRY,         100, 15,   0     ; DISARMING_VOICE
+	move EFFECT_LEECH_HIT,          50, FAIRY,         100, 10,   0     ; DRAINING_KISS
+	move EFFECT_NORMAL_HIT,         40, FAIRY,         100, 30,   0     ; FAIRY_WIND
+	move EFFECT_SP_ATK_DOWN_HIT,    95, FAIRY,  	   100, 15,  30      ; MOONBLAST
+	move EFFECT_ATTACK_DOWN_HIT,    90, FAIRY,          90, 10,  10      ; PLAY_ROUGH
+	move EFFECT_CONFUSE_HIT,        90, FAIRY,  	    95, 10,  20      ; STRANGE_STEAM
 .IndirectEnd::
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@ -255,5 +255,21 @@ MoveNames::
 	li "ROCK SLASH"
 	li "CROSS CUTTER"
 	li "MEGAPHONE"
+	li "MYSTIC ICE"
+	li "BOUNCE"
+	li "BRIGHT MOSS"
+	li "COIN HURL"
+	li "UPROOT"
+	li "SYNCHRONIZE"
+	li "STRONG ARM"
+	li "UPPERCUT"
+	li "WATER SPORT"
 	li "WIND RIDE"
+	li "DAZZLE GLEAM"
+	li "DISARM VOICE"
+	li "DRAININGKISS"
+	li "FAIRY WIND"
+	li "MOONBLAST"
+	li "PLAY ROUGH"
+	li "STRANGE STEAM"
 	assert_list_length NUM_ATTACKS
--- a/data/player_names.asm
+++ b/data/player_names.asm
@ -10,10 +10,10 @@ ChrisNameMenuHeader:
 	db 5 ; items
 	db "NEW NAME@"
 MalePlayerNameArray:
-	db "ETHAN@"
-	db "GOLD@"
-	db "CHRIS@"
-	db "JIMMY@"
+	db "ETHAN@" ; games
+	db "GOLD@" ; manga
+	db "JIMMY@" ; legend of thunder
+	db "CHRIS@" ; vanilla
 	db 2 ; title indent
 	db " NAME @" ; title

@ -29,10 +29,10 @@ KrisNameMenuHeader:
 	db 5 ; items
 	db "NEW NAME@"
 FemalePlayerNameArray:
-	db "KRIS@"
-	db "MARINA@"
-	db "AMANDA@"
-	db "JODI@"
+	db "KRIS@" ; game
+	db "MARINA@" ; legend of thunder
+	db "CRYSTAL@" ; manga
+	db "CHRIS@" ; golden boys - plays with the male player version as well, showing it's a unisex name
 	db 2 ; title indent
 	db " NAME @" ; title

--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@ -302,7 +302,7 @@ INCLUDE "data/pokemon/base_stats/aercrow.asm"
 INCLUDE "data/pokemon/base_stats/foxfire.asm"
 INCLUDE "data/pokemon/base_stats/yanma.asm"
 INCLUDE "data/pokemon/base_stats/yanmega.asm"
-INCLUDE "data/pokemon/base_stats/pending03.asm"
+INCLUDE "data/pokemon/base_stats/oniyanma.asm"
 INCLUDE "data/pokemon/base_stats/wooper.asm"
 INCLUDE "data/pokemon/base_stats/quagsire.asm"
 INCLUDE "data/pokemon/base_stats/espeon.asm"
@ -383,7 +383,7 @@ INCLUDE "data/pokemon/base_stats/sonegg.asm"
 INCLUDE "data/pokemon/base_stats/cacawphony.asm"
 INCLUDE "data/pokemon/base_stats/trebir.asm"
 INCLUDE "data/pokemon/base_stats/sakuraze.asm"
-INCLUDE "data/pokemon/base_stats/amanobi.asm"
+INCLUDE "data/pokemon/base_stats/tanobi.asm"
 INCLUDE "data/pokemon/base_stats/trustan.asm"
 INCLUDE "data/pokemon/base_stats/kuwaguard.asm"
 INCLUDE "data/pokemon/base_stats/tonquito.asm"
@ -421,6 +421,7 @@ INCLUDE "data/pokemon/base_stats/pupitar.asm"
 INCLUDE "data/pokemon/base_stats/tyranitar.asm"
 INCLUDE "data/pokemon/base_stats/lugia.asm"
 INCLUDE "data/pokemon/base_stats/ho_oh.asm"
-INCLUDE "data/pokemon/base_stats/shi_shi.asm"
+INCLUDE "data/pokemon/base_stats/hyoshu_yang.asm"
+INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm"
 INCLUDE "data/pokemon/base_stats/celebi.asm"
 .IndirectEnd::
--- a/data/pokemon/base_stats/bittybat.asm
+++ b/data/pokemon/base_stats/bittybat.asm
@ -17,5 +17,5 @@
 	dn EGG_FLYING, EGG_FLYING ; egg groups

 	; tm/hm learnset
-	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
 	; end
--- a/data/pokemon/base_stats/bulbasaur.asm
+++ b/data/pokemon/base_stats/bulbasaur.asm
@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
+	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
--- a/data/pokemon/base_stats/crobat.asm
+++ b/data/pokemon/base_stats/crobat.asm
@ -17,5 +17,5 @@
 	dn EGG_FLYING, EGG_FLYING ; egg groups

 	; tm/hm learnset
-	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
 	; end
--- a/data/pokemon/base_stats/cyclorp.asm
+++ b/data/pokemon/base_stats/cyclorp.asm
@ -14,7 +14,7 @@
 	INCBIN "gfx/pokemon/cyclorp/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_SLOW ; growth rate				; PLACEHOLDER
-	dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_BUG, EGG_WATER_3 ; egg groups

 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT
--- a/data/pokemon/base_stats/foxfire.asm
+++ b/data/pokemon/base_stats/foxfire.asm
@ -1,9 +1,9 @@
 	db FOXFIRE ; species ID placeholder

-	db  70,  65,  60,  85,  85,  80
+	db  55,  85,  50, 115, 100,  70
 	;   hp  atk  def  spd  sat  sdf

-	db FIRE, FIRE ; type
+	db FIRE, ELECTRIC ; type
 	db 130 ; catch rate
 	db 110 ; base exp
 	db BURNT_BERRY, BURNT_BERRY ; items
@ -17,5 +17,5 @@
 	dn EGG_GROUND, EGG_GROUND ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, STRENGTH, FLAMETHROWER
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, STRENGTH, FLAMETHROWER, THUNDERBOLT, THUNDER
 	; end
--- a/data/pokemon/base_stats/golbat.asm
+++ b/data/pokemon/base_stats/golbat.asm
@ -17,5 +17,5 @@
 	dn EGG_FLYING, EGG_FLYING ; egg groups

 	; tm/hm learnset
-	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
 	; end
--- a/data/pokemon/base_stats/grimer.asm
+++ b/data/pokemon/base_stats/grimer.asm
@ -17,5 +17,5 @@
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
+	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, SURF, FLAMETHROWER, THUNDERBOLT
 	; end
--- a/data/pokemon/base_stats/hyoshu_yang.asm
+++ b/data/pokemon/base_stats/hyoshu_yang.asm
@ -0,0 +1,21 @@
+	db 0 ; species ID placeholder
+
+	db 106, 154,  90, 110, 130,  90
+	;   hp  atk  def  spd  sat  sdf
+
+	db ICE, FAIRY ; type
+	db 3 ; catch rate
+	db 220 ; base exp
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F0 ; gender ratio
+	db 100 ; unknown 1
+	db 120 ; step cycles to hatch
+	db 5 ; unknown 2
+	INCBIN "gfx/pokemon/hyoshu_yang/front.dimensions"
+	dw NULL, NULL ; unused (beta front/back pics)
+	db GROWTH_SLOW ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
+
+	; tm/hm learnset
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, CUT, STRENGTH, FLASH, ICE_BEAM
+	; end
--- a/data/pokemon/base_stats/hyoshu_yin.asm
+++ b/data/pokemon/base_stats/hyoshu_yin.asm
@ -3,19 +3,19 @@
 	db 106, 154,  90, 110, 130,  90
 	;   hp  atk  def  spd  sat  sdf

-	db ICE, FLYING ; type
+	db ICE, DARK ; type
 	db 3 ; catch rate
 	db 220 ; base exp
 	db NO_ITEM, NO_ITEM ; items
-	db GENDER_UNKNOWN ; gender ratio
+	db GENDER_F100 ; gender ratio
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/shi_shi/front.dimensions"
+	INCBIN "gfx/pokemon/hyoshu_yin/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_SLOW ; growth rate
 	dn EGG_NONE, EGG_NONE ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, THIEF, NIGHTMARE, FLY, STRENGTH, FLASH, ICE_BEAM
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, THIEF, NIGHTMARE, CUT, STRENGTH, ICE_BEAM
 	; end
--- a/data/pokemon/base_stats/ivysaur.asm
+++ b/data/pokemon/base_stats/ivysaur.asm
@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
+	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
--- a/data/pokemon/base_stats/mime_jr_.asm
+++ b/data/pokemon/base_stats/mime_jr_.asm
@ -17,5 +17,5 @@
 	dn EGG_NONE, EGG_NONE ; egg groups

 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT
+	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
 	; end
--- a/data/pokemon/base_stats/muk.asm
+++ b/data/pokemon/base_stats/muk.asm
@ -17,5 +17,5 @@
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT
+	tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, SURF, FLAMETHROWER, THUNDERBOLT
 	; end
--- a/data/pokemon/base_stats/pending03.asm
+++ b/data/pokemon/base_stats/pending03.asm
@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 20 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/pending03/front.dimensions"
+	INCBIN "gfx/pokemon/oniyanma/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_BUG, EGG_BUG ; egg groups
--- a/data/pokemon/base_stats/smujj.asm
+++ b/data/pokemon/base_stats/smujj.asm
@ -17,5 +17,5 @@
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups

 	; tm/hm learnset
-	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT
+	tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, SURF, FLAMETHROWER, THUNDERBOLT
 	; end
--- a/data/pokemon/base_stats/amanobi.asm
+++ b/data/pokemon/base_stats/amanobi.asm
@ -1,6 +1,6 @@
 	db 0 ; species ID placeholder

-	db  50,  90,  65, 105,  75,  50
+	db  80,  90,  85, 105,  75,  50
 	;   hp  atk  def  spd  sat  sdf

 	db FIGHTING, STEEL ; type
@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/amanobi/front.dimensions"
+	INCBIN "gfx/pokemon/tanobi/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_SLOW ; growth rate				; PLACEHOLDER
 	dn EGG_NONE, EGG_NONE ; egg groups
--- a/data/pokemon/base_stats/trustan.asm
+++ b/data/pokemon/base_stats/trustan.asm
@ -1,6 +1,6 @@
 	db 0 ; species ID placeholder

-	db  50,  75,  40, 115,  95,  50
+	db 100,  75,  65, 105,  90,  50
 	;   hp  atk  def  spd  sat  sdf

 	db NORMAL, FIRE ; type
--- a/data/pokemon/base_stats/venusaur.asm
+++ b/data/pokemon/base_stats/venusaur.asm
@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_PLANT ; egg groups

 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
+	tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
 	; end
--- a/data/pokemon/base_stats/zubat.asm
+++ b/data/pokemon/base_stats/zubat.asm
@ -17,5 +17,5 @@
 	dn EGG_FLYING, EGG_FLYING ; egg groups

 	; tm/hm learnset
-	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
 	; end
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@ -281,7 +281,7 @@ PokemonCries::
 	mon_cry CRY_NIDORAN_M,     0,    0 ; FOXFIRE	(incomplete)
 	mon_cry CRY_TOTODILE,     49,  200 ; YANMA
 	mon_cry CRY_NIDORAN_M,     0,    0 ; YANMEGA	(incomplete)
-	mon_cry CRY_NIDORAN_M,     0,    0 ; PENDING03	(incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; ONIYANMA	(incomplete)
 	mon_cry CRY_WOOPER,      147,  175 ; WOOPER
 	mon_cry CRY_WOOPER,     -198,  320 ; QUAGSIRE
 	mon_cry CRY_AIPOM,       162,  320 ; ESPEON
@ -362,7 +362,7 @@ PokemonCries::
 	mon_cry CRY_NIDORAN_M,     0,  128 ; CACAWPHONY
 	mon_cry CRY_NIDORAN_M,     0,  128 ; TREBIR
 	mon_cry CRY_NIDORAN_M,     0,  128 ; SAKURAZE
-	mon_cry CRY_NIDORAN_M,     0,  128 ; AMANOBI
+	mon_cry CRY_NIDORAN_M,     0,  128 ; TANOBI
 	mon_cry CRY_NIDORAN_M,     0,  128 ; TRUSTAN
 	mon_cry CRY_NIDORAN_M,     0,  128 ; KUWAGUARD
 	mon_cry CRY_NIDORAN_M,     0,  128 ; TONQUITO
@ -400,6 +400,7 @@ PokemonCries::
 	mon_cry CRY_RAIKOU,     -256,  384 ; TYRANITAR
 	mon_cry CRY_TYPHLOSION,    0,  256 ; LUGIA
 	mon_cry CRY_AIPOM,         0,  384 ; HO_OH
-	mon_cry CRY_NIDORAN_M,     0,  128 ; SHI_SHI (placeholder) 
+	mon_cry CRY_NIDORAN_M,     0,  128 ; HYOSHU_YANG (placeholder)
+	mon_cry CRY_NIDORAN_M,     0,  128 ; HYOSHU_YIN  (placeholder)
 	mon_cry CRY_ENTEI,       330,  273 ; CELEBI
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@ -275,7 +275,7 @@ SECTION "Pokedex Entries 193-251", ROMX

 YanmaPokedexEntry::      INCLUDE "data/pokemon/dex_entries/yanma.asm"
 YanmegaPokedexEntry::    INCLUDE "data/pokemon/dex_entries/yanmega.asm"
-Pending03PokedexEntry::  INCLUDE "data/pokemon/dex_entries/pending03.asm"
+OniyanmaPokedexEntry::   INCLUDE "data/pokemon/dex_entries/oniyanma.asm"
 WooperPokedexEntry::     INCLUDE "data/pokemon/dex_entries/wooper.asm"
 QuagsirePokedexEntry::   INCLUDE "data/pokemon/dex_entries/quagsire.asm"
 EspeonPokedexEntry::     INCLUDE "data/pokemon/dex_entries/espeon.asm"
@ -355,7 +355,7 @@ SoneggPokedexEntry::    INCLUDE "data/pokemon/dex_entries/sonegg.asm"
 CacawphonyPokedexEntry::    INCLUDE "data/pokemon/dex_entries/cacawphony.asm"
 TrebirPokedexEntry::    INCLUDE "data/pokemon/dex_entries/trebir.asm"
 SakurazePokedexEntry::    INCLUDE "data/pokemon/dex_entries/sakuraze.asm"
-AmanobiPokedexEntry::    INCLUDE "data/pokemon/dex_entries/amanobi.asm"
+TanobiPokedexEntry::    INCLUDE "data/pokemon/dex_entries/tanobi.asm"
 TrustanPokedexEntry::    INCLUDE "data/pokemon/dex_entries/trustan.asm"
 KuwaguardPokedexEntry::    INCLUDE "data/pokemon/dex_entries/kuwaguard.asm"
 TonquitoPokedexEntry::    INCLUDE "data/pokemon/dex_entries/tonquito.asm"
@ -393,7 +393,8 @@ PupitarPokedexEntry::    INCLUDE "data/pokemon/dex_entries/pupitar.asm"
 TyranitarPokedexEntry::  INCLUDE "data/pokemon/dex_entries/tyranitar.asm"
 LugiaPokedexEntry::      INCLUDE "data/pokemon/dex_entries/lugia.asm"
 HoOhPokedexEntry::       INCLUDE "data/pokemon/dex_entries/ho_oh.asm"
-ShiShiPokedexEntry::     INCLUDE "data/pokemon/dex_entries/shi_shi.asm"
+HyoshuYangPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hyoshu_yang.asm"
+HyoshuYinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hyoshu_yin.asm"
 CelebiPokedexEntry::     INCLUDE "data/pokemon/dex_entries/celebi.asm"
 MagipreyPokedexEntry::   INCLUDE "data/pokemon/dex_entries/magiprey.asm"
 TerradosPokedexEntry::   INCLUDE "data/pokemon/dex_entries/terrados.asm"
--- a/data/pokemon/dex_entries/bruinous.asm
+++ b/data/pokemon/dex_entries/bruinous.asm
@ -1,10 +1,10 @@
 	db "DYNAMITE@" ; species name
 	dw 603, 3420 ; height, weight

-	db   "Fiercely loyal to"
-	next "its TRAINER. If"
-	next "given the order,"
+	db   "If it thinks its"
+	next "TRAINER in danger,"
+	next "it will gather as"

-	page "BRUINOUS will"
-	next "attack with an"
-	next "explosive bite.@"
+	page "much energy as it"
+	next "can to trigger a"
+	next "huge explosion.@"
--- a/data/pokemon/dex_entries/cubburn.asm
+++ b/data/pokemon/dex_entries/cubburn.asm
@ -1,5 +1,5 @@
-	db "PYRO@" ; species name
-	dw 108, 170 ; height, weight
+	db "FIRE BEAR@" ; species name
+	dw 200, 220 ; height, weight

 	db   "If its TRAINER is"
 	next "cold, CUBBURN will"
--- a/data/pokemon/dex_entries/donmarin.asm
+++ b/data/pokemon/dex_entries/donmarin.asm
@ -1,10 +1,10 @@
-	db "LOCH BOSS@" ; species name
+	db "LOCHKEEPER@" ; species name
 	dw 802, 4850 ; height, weight

-	db   "Tempered and even-"
-	next "handed, DONMARIN"
-	next "carefully raises"
+	db   "Every PALSSIO pod"
+	next "is raised by one"
+	next "DONMARIN leader."

-	page "its pod. Its"
-	next "punishments are"
-	next "always fair.@"
+	page "The punishments it"
+	next "deals are harsh,"
+	next "but always fair.@"
--- a/data/pokemon/dex_entries/flambear.asm
+++ b/data/pokemon/dex_entries/flambear.asm
@ -1,10 +1,10 @@
-	db "BLAST@" ; species name
-	dw 211, 420 ; height, weight
+	db "FIRE BEAR@" ; species name
+	dw 303, 720 ; height, weight

-	db   "If it thinks its"
-	next "TRAINER in danger,"
-	next "it'll bark loudly."
+	db   "Fiercely loyal to"
+	next "its TRAINER. If"
+	next "given the order,"

-	page "Reining this in"
-	next "is a true test"
-	next "of skill.@"
+	page "FLAMBEAR will"
+	next "attack with an"
+	next "explosive bite.@"
--- a/data/pokemon/dex_entries/hyoshu_yang.asm
+++ b/data/pokemon/dex_entries/hyoshu_yang.asm
@ -0,0 +1,10 @@
+	db "GUARDIAN@" ; species name
+	dw 1002, 6060 ; height, weight
+
+	db   "Leads and protects"
+	next "those fleeing from"
+	next "persecution. The"
+
+	page "temari it holds"
+	next "is vital for it to"
+	next "ward off evil.@"
--- a/data/pokemon/dex_entries/hyoshu_yin.asm
+++ b/data/pokemon/dex_entries/hyoshu_yin.asm
@ -0,0 +1,10 @@
+	db "GUARDIAN@" ; species name
+	dw 1002, 6060 ; height, weight
+
+	db   "Folklore states it"
+	next "raised 3 powerful"
+	next "beasts. Some say"
+
+	page "this #MON is"
+	next "a representation"
+	next "of the end.@"
--- a/data/pokemon/dex_entries/pending03.asm
+++ b/data/pokemon/dex_entries/pending03.asm
--- a/data/pokemon/dex_entries/palssio.asm
+++ b/data/pokemon/dex_entries/palssio.asm
@ -1,10 +1,10 @@
 	db "PLAYFUL@" ; species name
-	dw 311, 70 ; height, weight
+	dw 207, 310 ; height, weight

-	db   "Calm and collected,"
-	next "PALSSIO's presence"
-	next "soothes all around"
+	db   "A smart and level-"
+	next "headed #MON, it"
+	next "has a soothing"

-	page "it. Popular with"
-	next "newer and more"
-	next "anxious TRAINERS.@"
+	page "presence. Popular"
+	next "with new, inexpe-"
+	next "rienced TRAINERS.@"
--- a/data/pokemon/dex_entries/pressio.asm
+++ b/data/pokemon/dex_entries/pressio.asm
@ -1,10 +1,10 @@
-	db "PROUD@" ; species name
-	dw 509, 70 ; height, weight
+	db "PRIDEFUL@" ; species name
+	dw 411, 910 ; height, weight

-	db   "Prideful in its"
-	next "growing intellect,"
-	next "PRESSIO often"
+	db   "Arrogant and proud"
+	next "in nature, PRESSIO"
+	next "picks on weaker"

-	page "picks fights with"
-	next "#MON it sees"
-	next "as inferior.@"
+	page "#MON. Its skin"
+	next "is smooth and cold"
+	next "to touch.@"
--- a/data/pokemon/dex_entries/shi_shi.asm
+++ b/data/pokemon/dex_entries/shi_shi.asm
@ -1,10 +0,0 @@
-	db "GUARDIAN@" ; species name
-	dw 1002, 6060 ; height, weight
-
-	db   "Said to be the"
-	next "embodiment of the"
-	next "the north wind, it"
-
-	page "leads and protects"
-	next "those fleeing from"
-	next "persecution.@"
--- a/data/pokemon/dex_entries/amanobi.asm
+++ b/data/pokemon/dex_entries/amanobi.asm
@ -1,7 +1,7 @@
 	db "SHINOBI@" ; species name
 	dw 311, 191 ; height, weight - placeholder

-	db   "AMANOBI assisted"
+	db   "TANOBI assisted"
 	next "ninja warriors in"
 	next "the distant past."
 	
--- a/data/pokemon/dex_entry_pointers.asm
+++ b/data/pokemon/dex_entry_pointers.asm
@ -276,7 +276,7 @@ PokedexDataPointerTable:
 	dba FoxfirePokedexEntry
 	dba YanmaPokedexEntry
 	dba YanmegaPokedexEntry
-	dba Pending03PokedexEntry
+	dba OniyanmaPokedexEntry
 	dba WooperPokedexEntry
 	dba QuagsirePokedexEntry
 	dba EspeonPokedexEntry
@ -357,7 +357,7 @@ PokedexDataPointerTable:
 	dba CacawphonyPokedexEntry
 	dba TrebirPokedexEntry
 	dba SakurazePokedexEntry
-	dba AmanobiPokedexEntry
+	dba TanobiPokedexEntry
 	dba TrustanPokedexEntry
 	dba KuwaguardPokedexEntry
 	dba TonquitoPokedexEntry
@ -395,6 +395,7 @@ PokedexDataPointerTable:
 	dba TyranitarPokedexEntry
 	dba LugiaPokedexEntry
 	dba HoOhPokedexEntry
-	dba ShiShiPokedexEntry
+	dba HyoshuYangPokedexEntry
+	dba HyoshuYinPokedexEntry
 	dba CelebiPokedexEntry
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/dex_order_alpha.asm
+++ b/data/pokemon/dex_order_alpha.asm
@ -7,7 +7,7 @@ AlphabeticalPokedexOrder:
 	dw AERODACTYL
 	dw AIPOM
 	dw ALAKAZAM
-	dw AMANOBI
+	dw TANOBI
 	dw AMBIPOM
 	dw AMPHAROS
 	dw ANGORE
@ -151,6 +151,8 @@ AlphabeticalPokedexOrder:
 	dw HORSEA
 	dw HOUNDOOM
 	dw HOUNDOUR
+	dw HYOSHU_YANG
+	dw HYOSHU_YIN
 	dw HYPNO
 	dw IGGLYBUFF
 	dw IGUANARCH
@ -248,6 +250,7 @@ AlphabeticalPokedexOrder:
 	dw OMANYTE
 	dw OMASTAR
 	dw ONIX
+	dw ONIYANMA
 	dw ORFRY
 	dw PALSSIO
 	dw PARAS
@ -312,7 +315,6 @@ AlphabeticalPokedexOrder:
 	dw SEEL
 	dw SENTRET
 	dw SHELLDER
-	dw SHI_SHI
 	dw SHUCKLE
 	dw SKARMORY
 	dw SKIPLOOM
@ -395,7 +397,6 @@ AlphabeticalPokedexOrder:
 	dw XYLODON
 	dw XYLOFIN
 	dw YANMA
-	dw PENDING03 ; this thing's gonna start with Yan, surely, so I'm putting it here.
 	dw YANMEGA
 	dw ZAPDOS
 	dw ZUBAT
--- a/data/pokemon/dex_order_new.asm
+++ b/data/pokemon/dex_order_new.asm
@ -132,7 +132,7 @@ NewPokedexOrder:
 	dw NIDOREIGN
 	dw YANMA
 	dw YANMEGA
-	dw PENDING03
+	dw ONIYANMA
 	dw SUNKERN
 	dw SUNBUD
 	dw SUNFLORA
@ -326,7 +326,7 @@ NewPokedexOrder:
 	dw CACAWPHONY
 	dw TREBIR
 	dw SAKURAZE
-	dw AMANOBI
+	dw TANOBI
 	dw TRUSTAN
 	dw KUWAGUARD
 	dw TONQUITO
@ -394,7 +394,8 @@ NewPokedexOrder:
 	dw TYRANITAR
 	dw LUGIA
 	dw HO_OH
-	dw SHI_SHI
+	dw HYOSHU_YANG
+	dw HYOSHU_YIN
 	dw MEWTWO
 	dw MEW
 	dw CELEBI
--- a/data/pokemon/egg_moves_johto.asm
+++ b/data/pokemon/egg_moves_johto.asm
@ -64,7 +64,7 @@ EggMovePointers2::
 	dw FoxfireEggMoves
 	dw YanmaEggMoves
 	dw NoEggMoves2 ; Yanmega
-	dw NoEggMoves2 ; Pending03
+	dw NoEggMoves2 ; Oniyanma
 	dw WooperEggMoves
 	dw NoEggMoves2
 	dw NoEggMoves2
@ -146,7 +146,7 @@ EggMovePointers2::
 	dw NoEggMoves2
 	dw NoEggMoves2
 	dw SakurazeEggMoves
-	dw AmanobiEggMoves
+	dw TanobiEggMoves
 	dw TrustanEggMoves
 	dw KuwaguardEggMoves
 	dw TonquitoEggMoves
@ -186,6 +186,7 @@ EggMovePointers2::
 	dw NoEggMoves2
 	dw NoEggMoves2
 	dw NoEggMoves2
+	dw NoEggMoves2
 .IndirectEnd::

 ChikoritaEggMoves:
@ -213,6 +214,7 @@ TotodileEggMoves:
 	dw ANCIENTPOWER
 	dw RAZOR_WIND
 	dw ROCK_SLIDE
+	dw WATER_SPORT
 	dw -1 ; end

 CubburnEggMoves:
@ -252,6 +254,8 @@ LedybaEggMoves:
 	dw PSYBEAM
 	dw BIDE
 	dw LIGHT_SCREEN
+	dw STRONG_ARM
+	dw UPPERCUT
 	dw -1 ; end

 SpinarakEggMoves:
@ -260,6 +264,7 @@ SpinarakEggMoves:
 	dw SONICBOOM
 	dw BATON_PASS
 	dw PURSUIT
+	dw PIN_MISSILE
 	dw -1 ; end

 ChinchouEggMoves:
@ -296,6 +301,7 @@ IgglybuffEggMoves:
 	dw PERISH_SONG
 	dw PRESENT
 	dw FAINT_ATTACK
+	dw BOUNCE
 	dw -1 ; end

 TogepiEggMoves:
@ -338,6 +344,7 @@ AzurillEggMoves:
 	dw PERISH_SONG
 	dw SUPERSONIC
 	dw FORESIGHT
+	dw WATER_SPORT
 	dw -1 ; end

 BonslyEggMoves:
@ -393,12 +400,15 @@ YanmaEggMoves:
 	dw WHIRLWIND
 	dw REVERSAL
 	dw LEECH_LIFE
+	dw CONFUSION
+	dw FLAIL
 	dw -1 ; end

 WooperEggMoves:
 	dw BODY_SLAM
 	dw ANCIENTPOWER
 	dw SAFEGUARD
+	dw UPROOT
 	dw -1 ; end

 MurkrowEggMoves:
@ -480,6 +490,10 @@ QwilfishEggMoves:

 ShuckleEggMoves:
 	dw SWEET_SCENT
+	dw MIST
+	dw MUD_SLAP
+	dw STRING_SHOT
+	dw ANCIENTPOWER
 	dw -1 ; end

 HeracrossEggMoves:
@ -515,6 +529,7 @@ SwinubEggMoves:
 	dw BODY_SLAM
 	dw ROCK_SLIDE
 	dw ANCIENTPOWER
+	dw UPROOT
 	dw -1 ; end

 CorsolaEggMoves:
@ -560,6 +575,7 @@ SkarmoryEggMoves:
 	dw PURSUIT
 	dw WHIRLWIND
 	dw SKY_ATTACK
+	dw WIND_RIDE
 	dw -1 ; end

 HoundourEggMoves:
@ -577,6 +593,7 @@ PhanpyEggMoves:
 	dw BODY_SLAM
 	dw ANCIENTPOWER
 	dw WATER_GUN
+	dw ROCK_HEAD
 	dw -1 ; end

 StantlerEggMoves:
@ -601,6 +618,8 @@ TyrogueEggMoves:
 	dw HI_JUMP_KICK
 	dw MACH_PUNCH
 	dw MIND_READER
+	dw STRONG_ARM
+	dw UPPERCUT
 	dw -1 ; end

 SmoochumEggMoves:
@ -652,7 +671,7 @@ SakurazeEggMoves:
 	dw MORNING_SUN
 	dw -1 ;end 

-AmanobiEggMoves:
+TanobiEggMoves:
 	dw EXTREMESPEED
 	dw FAINT_ATTACK
 	dw FURY_SWIPES
--- a/data/pokemon/egg_moves_kanto.asm
+++ b/data/pokemon/egg_moves_kanto.asm
@ -180,7 +180,7 @@ EggMovePointers1:
 	dw PinsirEggMoves
 	dw NoEggMoves1 ; Tricules
 	dw NoEggMoves1
-	dw NoEggMoves1
+	dw MagikarpEggMoves
 	dw NoEggMoves1
 	dw NoEggMoves1 ; Magiprey
 	dw NoEggMoves1 ; Terrados
@ -221,6 +221,7 @@ BulbasaurEggMoves:
 	dw SAFEGUARD
 	dw RAZOR_WIND
 	dw PETAL_DANCE
+	dw UPROOT
 	dw -1 ; end

 CharmanderEggMoves:
@ -268,6 +269,7 @@ SpearowEggMoves:
 	dw SCARY_FACE
 	dw QUICK_ATTACK
 	dw TRI_ATTACK
+	dw WIND_RIDE
 	dw -1 ; end

 EkansEggMoves:
@ -304,6 +306,7 @@ NidoranMEggMoves:
 	dw AMNESIA
 	dw COUNTER
 	dw BEAT_UP
+	dw ROCK_HEAD
 	dw -1 ; end

 VulpiiiEggMoves:
@ -395,6 +398,7 @@ PoliwagEggMoves:
 	dw BUBBLEBEAM
 	dw HAZE
 	dw MIND_READER
+	dw WATER_SPORT
 	dw -1 ; end

 AbraEggMoves:
@ -408,6 +412,7 @@ MachopEggMoves:
 	dw MEDITATE
 	dw ROLLING_KICK
 	dw ENCORE
+	dw BARRIER
 	dw -1 ; end

 BellsproutEggMoves:
@ -505,6 +510,7 @@ DoduoEggMoves:
 	dw HAZE
 	dw FAINT_ATTACK
 	dw FLAIL
+	dw MEGAPHONE
 	dw -1 ; end

 SeelEggMoves:
@ -553,6 +559,7 @@ KrabbyEggMoves:
 	dw FLAIL
 	dw SLAM
 	dw ROCK_SLASH
+	dw CROSS_CUTTER
 	dw -1 ; end

 ExeggcuteEggMoves:
@ -618,6 +625,7 @@ KangaskhanEggMoves:
 	dw FOCUS_ENERGY
 	dw SAFEGUARD
 	dw DISABLE
+	dw MEGAPHONE
 	dw -1 ; end

 HorseaEggMoves:
@ -673,6 +681,10 @@ PinsirEggMoves:
 	dw ROCK_SLASH
 	dw -1 ; end

+MagikarpEggMoves:
+	dw BOUNCE
+	dw -1 ; end
+
 LaprasEggMoves:
 	dw AURORA_BEAM
 	dw FORESIGHT
@ -681,6 +693,7 @@ LaprasEggMoves:
 EeveeEggMoves:
 	dw FLAIL
 	dw CHARM
+	dw BRIGHT_MOSS
 	dw -1 ; end

 OmanyteEggMoves:
@ -689,6 +702,7 @@ OmanyteEggMoves:
 	dw SLAM
 	dw SUPERSONIC
 	dw HAZE
+	dw BRIGHT_MOSS
 	dw -1 ; end

 KabutoEggMoves:
@ -697,6 +711,7 @@ KabutoEggMoves:
 	dw RAPID_SPIN
 	dw DIG
 	dw FLAIL
+	dw CROSS_CUTTER
 	dw -1 ; end

 FeradactylEggMoves:
--- a/data/pokemon/evolution_moves.asm
+++ b/data/pokemon/evolution_moves.asm
@ -274,7 +274,7 @@ EvolutionMoves::
 	dw NO_MOVE ;FOXFIRE
 	dw NO_MOVE ;YANMA      ; c1
 	dw NO_MOVE ;YANMEGA
-	dw NO_MOVE ;PENDING03
+	dw NO_MOVE ;ONIYANMA
 	dw NO_MOVE ;WOOPER     ; c2
 	dw NO_MOVE ;QUAGSIRE   ; c3
 	dw NO_MOVE ;ESPEON     ; c4
@ -355,7 +355,7 @@ EvolutionMoves::
 	dw NO_MOVE ;CACAWPHONY
 	dw NO_MOVE ;TREBIR
 	dw NO_MOVE ;SAKURAZE
-	dw NO_MOVE ;AMANOBI
+	dw NO_MOVE ;TANOBI
 	dw NO_MOVE ;TRUSTAN
 	dw NO_MOVE ;KUWAGUARD
 	dw NO_MOVE ;TONQUITO
@ -393,7 +393,8 @@ EvolutionMoves::
 	dw NO_MOVE ;TYRANITAR  ; f8
 	dw NO_MOVE ;LUGIA      ; f9
 	dw NO_MOVE ;HO_OH      ; fa
-	dw NO_MOVE ;SHI_SHI
+	dw NO_MOVE ;HYOSHU_YANG
+	dw NO_MOVE ;HYOSHU_YIN
 	dw NO_MOVE ;CELEBI     ; fb
 	
 ;---
--- a/data/pokemon/evos_attacks_johto.asm
+++ b/data/pokemon/evos_attacks_johto.asm
--- a/data/pokemon/evos_attacks_kanto.asm
+++ b/data/pokemon/evos_attacks_kanto.asm
--- a/data/pokemon/first_stages.asm
+++ b/data/pokemon/first_stages.asm
@ -357,7 +357,7 @@ FirstEvoStages::
 	dw SONEGG
 	dw SONEGG
 	dw SAKURAZE
-	dw AMANOBI
+	dw TANOBI
 	dw TRUSTAN
 	dw KUWAGUARD
 	dw TONQUITO
@ -395,6 +395,7 @@ FirstEvoStages::
 	dw LARVITAR   ;f8
 	dw LUGIA
 	dw HO_OH
-	dw SHI_SHI
+	dw HYOSHU_YANG
+	dw HYOSHU_YIN
 	dw CELEBI
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/menu_icons.asm
+++ b/data/pokemon/menu_icons.asm
@ -277,7 +277,7 @@ MonMenuIcons:
 	db ICON_FOX         ; FOXFIRE
 	db ICON_BUG         ; YANMA
 	db ICON_BUG         ; YANMEGA
-	db ICON_BUG         ; PENDING03
+	db ICON_BUG         ; ONIYANMA
 	db ICON_MONSTER     ; WOOPER
 	db ICON_MONSTER     ; QUAGSIRE
 	db ICON_FOX         ; ESPEON
@ -358,7 +358,7 @@ MonMenuIcons:
 	db ICON_BIRD		; CACAWPHONY
 	db ICON_BIRD		; TREBIR
 	db ICON_ODDISH		; SAKURAZE - Want this to be the old Flower icon
-	db ICON_FOX			; AMANOBI
+	db ICON_FOX			; TANOBI
 	db ICON_FOX			; TRUSTAN
 	db ICON_BUG			; KUWAGUARD
 	db ICON_BUG			; TONQUITO
@ -396,6 +396,7 @@ MonMenuIcons:
 	db ICON_MONSTER     ; TYRANITAR
 	db ICON_LUGIA       ; LUGIA
 	db ICON_HO_OH       ; HO_OH
-	db ICON_FOX         ; SHI_SHI
+	db ICON_FOX         ; HYOSHU_YANG
+	db ICON_FOX         ; HYOSHU_YIN
 	db ICON_HUMANSHAPE  ; CELEBI
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@ -279,7 +279,7 @@ PokemonNames::
 	db "FOXFIRE@@@"
 	db "YANMA@@@@@"
 	db "YANMEGA@@@"
-	db "PENDING03@"
+	db "ONIYANMA@@"
 	db "WOOPER@@@@"
 	db "QUAGSIRE@@"
 	db "ESPEON@@@@"
@ -361,7 +361,7 @@ PokemonNames::
 	db "CACAWPHONY"
 	db "TREBIR@@@@"
 	db "SAKURAZE@@"
-	db "AMANOBI@@@"
+	db "TANOBI@@@@"
 	db "TRUSTAN@@@"
 	db "KUWAGUARD@"
 	db "TONQUITO@@"
@ -399,6 +399,7 @@ PokemonNames::
 	db "TYRANITAR@"
 	db "LUGIA@@@@@"
 	db "HO-OH@@@@@"
-	db "SHI-SHI@@@"
+	db "HYOSHU@@@@"
+	db "HYOSHU@@@@"
 	db "CELEBI@@@@"
 	assert_table_length NUM_POKEMON
--- a/data/pokemon/palettes.asm
+++ b/data/pokemon/palettes.asm
@ -583,8 +583,8 @@ INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/yanma/shiny.pal"
 INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/yanmega/shiny.pal"
-INCBIN "gfx/pokemon/pending03/front.gbcpal", middle_colors
-INCLUDE "gfx/pokemon/pending03/shiny.pal"
+INCBIN "gfx/pokemon/oniyanma/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/oniyanma/shiny.pal"
 INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/wooper/shiny.pal"
 INCBIN "gfx/pokemon/quagsire/front.gbcpal", middle_colors
@ -746,8 +746,8 @@ INCBIN "gfx/pokemon/trebir/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/trebir/shiny.pal"
 INCBIN "gfx/pokemon/sakuraze/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sakuraze/shiny.pal"
-INCBIN "gfx/pokemon/amanobi/front.gbcpal", middle_colors
-INCLUDE "gfx/pokemon/amanobi/shiny.pal"
+INCBIN "gfx/pokemon/tanobi/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/tanobi/shiny.pal"
 INCBIN "gfx/pokemon/trustan/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/trustan/shiny.pal"
 INCBIN "gfx/pokemon/kuwaguard/front.gbcpal", middle_colors
@ -824,8 +824,10 @@ INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/lugia/shiny.pal"
 INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/ho_oh/shiny.pal"
-INCBIN "gfx/pokemon/shi_shi/front.gbcpal", middle_colors
-INCLUDE "gfx/pokemon/shi_shi/shiny.pal"
+INCBIN "gfx/pokemon/hyoshu_yang/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/hyoshu_yang/shiny.pal"
+INCBIN "gfx/pokemon/hyoshu_yin/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/hyoshu_yin/shiny.pal"
 INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/celebi/shiny.pal"

--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@ -563,8 +563,8 @@ PokemonPicPointers::
 	dba YanmaBackpic
 	dba YanmegaFrontpic
 	dba YanmegaBackpic
-	dba Pending03Frontpic
-	dba Pending03Backpic
+	dba OniyanmaFrontpic
+	dba OniyanmaBackpic
 	dba WooperFrontpic
 	dba WooperBackpic
 	dba QuagsireFrontpic
@ -728,8 +728,8 @@ PokemonPicPointers::
 	dba TrebirBackpic
 	dba SakurazeFrontpic
 	dba SakurazeBackpic
-	dba AmanobiFrontpic
-	dba AmanobiBackpic
+	dba TanobiFrontpic
+	dba TanobiBackpic
 	dba TrustanFrontpic
 	dba TrustanBackpic
 	dba KuwaguardFrontpic
@ -804,8 +804,10 @@ PokemonPicPointers::
 	dba LugiaBackpic
 	dba HoOhFrontpic
 	dba HoOhBackpic
-	dba ShiShiFrontpic
-	dba ShiShiBackpic
+	dba HyoshuYangFrontpic
+	dba HyoshuYangBackpic
+	dba HyoshuYinFrontpic
+	dba HyoshuYinBackpic
 	dba CelebiFrontpic
 	dba CelebiBackpic
 	assert_table_length NUM_POKEMON + 1
--- a/data/pokemon/unown_pic_pointers.asm
+++ b/data/pokemon/unown_pic_pointers.asm
@ -53,4 +53,8 @@ UnownPicPointers::
 	dba UnownYBackpic
 	dba UnownZFrontpic
 	dba UnownZBackpic
+	dba UnownExclamationFrontpic
+	dba UnownExclamationBackpic
+	dba UnownQuestionFrontpic
+	dba UnownQuestionBackpic
 	assert_table_length NUM_UNOWN
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@ -35,6 +35,8 @@ UnownWords:
 	dw UnownWordX
 	dw UnownWordY
 	dw UnownWordZ
+	dw UnownWordExclamation
+	dw UnownWordQuestion
 	assert_table_length NUM_UNOWN + 1

 UnownWordA: unownword "ANGRY"
@ -63,3 +65,6 @@ UnownWordW: unownword "WANT"
 UnownWordX: unownword "XXXXX"
 UnownWordY: unownword "YIELD"
 UnownWordZ: unownword "ZOOM"
+UnownWordExclamation: unownword "(((((" ; "!!!!!" since "Z" + 1 == "("
+UnownWordQuestion: unownword ")))))" ; "?????" since "Z" + 2 == ")"
+; these use the words from the hgss unown report
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@ -1634,6 +1634,22 @@ CooltrainerMGroup:
 	dw DRAGONAIR
 	dw WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
+	
+	next_list_item ; COOLTRAINERM (11)
+	db "RITCHIE@", TRAINERTYPE_MOVES ; anime reference
+	db 43
+	dw BUTTERFREE
+	dw SLEEP_POWDER, PSYCHIC_M, WHIRLWIND, STUN_SPORE
+	db 41
+	dw PUPITAR
+	dw HEADBUTT, SANDSTORM, ROCK_SLIDE, EARTHQUAKE
+	db 41
+	dw CHARIZARD
+	dw FLAMETHROWER, WING_ATTACK, SLASH, EARTHQUAKE
+	db 45
+	dw GOROCHU
+	dw THUNDERBOLT, SUBMISSION, BODY_SLAM, THUNDER_WAVE
+	db -1 ; end

 	end_list_items

@ -2687,12 +2703,10 @@ BugCatcherGroup:
 FisherGroup:
 	next_list_item ; FISHER (1)
 	db "JUSTIN@", TRAINERTYPE_NORMAL ; There are multiple "Karp Spam" Fishers, so Justin is being completely changed.
+	db 9
+	dw ORFRY
 	db 15 ; Essentially, he is the player's introduction to Old Rod fishing in GSC.
 	dw MAGIKARP
-	db 15
-	dw ORFRY
-	db 17
-	dw TENTACOOL 
 	db -1 ; end

 	next_list_item ; FISHER (2)
@ -3679,7 +3693,7 @@ HikerGroup:

 	next_list_item ; HIKER (2)
 	db "RUSSELL@", TRAINERTYPE_NORMAL
-	db 4
+	db 5
 	dw PHANPY
 	db 6
 	dw WOOPER
@ -3831,7 +3845,7 @@ HikerGroup:
 	db "DANIEL@", TRAINERTYPE_NORMAL
 	db 10
 	dw WOOPER
-	db 12
+	db 11
 	dw ONIX
 	db -1 ; end

--- a/data/trainers/parties_new_classes.asm
+++ b/data/trainers/parties_new_classes.asm
@ -349,7 +349,7 @@ LassGroup:
 	dw DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
 	
-	next_list_item ; LASS (2)
+	next_list_item ; LASS (18)
 	db "IKUE@", TRAINERTYPE_ITEM_MOVES
 	db 43
 	dw NIDOQUEEN ; From the Yellow Lass
@ -364,6 +364,33 @@ LassGroup:
 	db LIGHT_BALL
 	dw THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
 	db -1 ; end
+	
+	next_list_item ; LASS (19)
+	db "CASEY@", TRAINERTYPE_MOVES ; anime reference
+	db 45 ; She's from New Bark Town, and is last seen when going to Cerulean City to watch a baseball game.
+	dw RATICATE ; So she's on Route 4, here.
+	dw SUPER_FANG, HYPER_FANG, BUBBLEBEAM, TAIL_WHIP ; BubbleBeam is a soft-reference to Misty's old TM, also BubbleRat is cool
+	db 45
+	dw PIDGEOT
+	dw WING_ATTACK, DOUBLE_EDGE, MIRROR_MOVE, SING
+	db 45
+	dw BEEDRILL
+	dw TWINEEDLE, SLUDGE_BOMB, SWORDS_DANCE, AGILITY
+	db 45
+	dw ELECTIVIRE
+	dw MEDITATE, CROSS_CHOP, THUNDERBOLT, ICE_PUNCH
+	db 45
+	dw MEGANIUM
+	dw SWORDS_DANCE, EARTHQUAKE, RAZOR_LEAF, BODY_SLAM
+	db -1
+	
+	next_list_item ; COOLTRAINERM (11)
+	db "DUPLICA@", TRAINERTYPE_NORMAL ; anime reference
+	db 40
+	dw DITTO ; Mini-Dit!
+	db 43
+	dw MIMMEO
+	db -1 ; end

 	end_list_items

@ -733,7 +760,7 @@ JackGroup:
 	next_list_item
 	db "JACKY@", TRAINERTYPE_MOVES
 	db 50
-	dw AMANOBI ; Kage-Maru
+	dw TANOBI ; Kage-Maru
 	dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE
 	db 50
 	dw ANNIHILAPE
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@ -3,11 +3,15 @@
 ; General philosophies:
 ; - Johto encounter bias at every opportunity.
 ; - However, Kanto Pokemon should still be present.
-; - If there is an equivalent, it should switch (eg. Sentret vs Rattata)
+; - If there is an equivalent, it should switch (eg. Sentret vs Rattata, Gastly vs Misdreavus)
 ; - Making some Kanto Pokemon exclusive to Kanto is acceptable given the region's changes.
 ; - Johto can't always stand on its own, so it's ok to have Kanto plurality.
 ; - In general: Increase Johto *frequency*. Don't make an ethnostate (see: BW and its consequences).

+; FAQ
+; "Isn't Misdreavus too strong?"
+; It's worse than Gastly. It starts with Psywave and is stuck with it until L26, and gets less TMs. Thus, it "nerfs" Gastly more than anything - which has better moves, higher offensive stats, and a Poison resistance for the early-game - improved Johto accessibility is always a priority.
+
 JohtoGrassWildMons:

 	def_grass_wildmons SPROUT_TOWER_2F
@ -1464,29 +1468,29 @@ JohtoGrassWildMons:
 	def_grass_wildmons ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 14, LEDYBA
-	dbw 16, FARFETCH_D
-	dbw 15, AERCROW
-	dbw 15, KOTORA
-	dbw 17, KOTORA
-	dbw 14, NATU
-	dbw 16, NATU
+	dbw 5, LEDYBA
+	dbw 6, BELLSPROUT
+	dbw 6, PUPPERON
+	dbw 6, KOTORA
+	dbw 7, KOTORA
+	dbw 5, NATU
+	dbw 7, FARFETCH_D
 	; day
-	dbw 15, FARFETCH_D
-	dbw 14, KOTORA
-	dbw 15, BELLSPROUT
-	dbw 16, AERCROW
-	dbw 17, AERCROW
-	dbw 15, NATU
-	dbw 16, NATU
+	dbw 6, BELLSPROUT
+	dbw 5, KOTORA
+	dbw 5, BELLSPROUT
+	dbw 5, PUPPERON
+	dbw 6, PUPPERON
+	dbw 6, NATU
+	dbw 7, FARFETCH_D
 	; nite
-	dbw 15, SPINARAK
-	dbw 14, HOOTHOOT
-	dbw 16, BELLSPROUT
-	dbw 14, VULPIII ; Silver data, but specifically at night
-	dbw 15, HOOTHOOT
-	dbw 16, MISDREAVUS
-	dbw 17, MISDREAVUS
+	dbw 5, SPINARAK
+	dbw 6, HOOTHOOT
+	dbw 6, ODDISH
+	dbw 5, VULPIII ; Silver data, but specifically at night
+	dbw 5, HOOTHOOT
+	dbw 6, MISDREAVUS
+	dbw 7, MISDREAVUS
 	end_grass_wildmons

 ; Restored the 30% Stantler from GS.
--- a/data/wild/unlocked_unowns.asm
+++ b/data/wild/unlocked_unowns.asm
@ -13,6 +13,7 @@ UnlockedUnownLetterSets:
 	dw .Set_L_R ; UNLOCKED_UNOWNS_L_TO_R_F
 	dw .Set_S_W ; UNLOCKED_UNOWNS_S_TO_W_F
 	dw .Set_X_Z ; UNLOCKED_UNOWNS_X_TO_Z_F
+	dw .Set_Exclamation_Question ; UNLOCKED_UNOWNS_EXCLAMATION_QUESTION
 	assert_table_length NUM_UNLOCKED_UNOWN_SETS

 .Set_A_K:
@ -23,3 +24,5 @@ UnlockedUnownLetterSets:
 	unown_set S, T, U, V, W
 .Set_X_Z:
 	unown_set X, Y, Z
+.Set_Exclamation_Question ; I'm not the biggest fan of this - could easily just put them with XYZ, but it seems in HGSS it was made more awkward, so let's do it this way. Could also be used to place them somewhere else - Tanoby Ruins?
+	unown_set EXCLAMATION, QUESTION