Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs

# Conflicts:
#	src/battle_script_commands.c

README.md

@@ -2,14 +2,25 @@
 
 ## What is the pokeemerald Expansion?
 
-The pokeemerald Expansion is a collection of feature branches that can be integrated into existing [pokeemerald](https://github.com/pret/pokeemerald) projects.
+The Pokeemerald Expansion is a collection of feature branches that can be integrated into existing [pokeemerald](https://github.com/pret/pokeemerald) projects.
 
-## What feature branches are included?
+## What features are included?
+- Upgraded battle engine.
+    - Fairy Type.
+    - Physical/Special/Status Category Split.
+    - New moves and abilities up to SwSh.
+    - Options to change behaviors and data by generation.
+    - Mega Evolution and Primal Reversion
+    - Z-Moves
+- Pokémon Species from newer Generations (with the option to disable them if needed).
+    - Updates Hoenn's Regional Dex to match ORAS'.
+    - Updates National Dex incorporating all the new species.
+    - Option to change base stats by generation.
+    - New evolution methods.
+    - Hidden Abilities data (How to make them available is up to the user).
+- Items from newer Generations and updated item effects for battle and field use.
 
-- **[Battle Engine Upgrade](../tree/battle_engine):** Upgrades the battle engine in pokeemerald to newer Generation games' standards. It also adds newer moves and abilities.
+Certain mechanics, moves, abilities and species sprites are missing. For more information, see [the project's milestones](https://github.com/rh-hideout/pokeemerald-expansion/milestones).
-- **[Pokémon Expansion](../tree/pokemon_expansion):** Adds Pokémon from newer Generations and makes them available in the National Dex. It also updates base stats and other Pokémon info.
-- **[Item Expansion](../tree/item_expansion):** Adds items from newer Generations and also updates item effects for field use.
-- **[master](../tree/master):** Combines the above branches into one single branch for the sake of convenience. Note that this branch is only updated once in a while, so you must merge manually if you want the latest features.
 
 ## Who maintains the project?
 
@@ -19,7 +30,7 @@ The project has now gotten larger and DizzyEgg is now maintaining the project as
 
 ## Can I contribute even if I'm not a member of ROM Hacking Hideout?
 
-Yes! Contributions are welcome via Pull Requests and they will be reviewed by maintainers. Please note that PRs to master are not accepted, as master is only intended to be a merged branch.
+Yes! Contributions are welcome via Pull Requests and they will be reviewed by maintainers. Don't feel discouraged if we take a bit to review your PR, we'll get to it.
 
 ## What is ROM Hacking Hideout?
 

data/battle_anim_scripts.s

@@ -779,6 +779,31 @@ gBattleAnims_Moves::
 	.4byte Move_GLACIAL_LANCE
 	.4byte Move_ASTRAL_BARRAGE
 	.4byte Move_EERIE_SPELL
+@@@@LA MOVES
+	.4byte Move_DIRE_CLAW
+	.4byte Move_PSYSHIELD_BASH
+	.4byte Move_POWER_SHIFT
+	.4byte Move_STONE_AXE
+	.4byte Move_SPRINGTIDE_STORM
+	.4byte Move_MYSTICAL_POWER
+	.4byte Move_RAGING_FURY
+	.4byte Move_WAVE_CRASH
+	.4byte Move_CHLOROBLAST
+	.4byte Move_MOUNTAIN_GALE
+	.4byte Move_VICTORY_DANCE
+	.4byte Move_HEADLONG_RUSH
+	.4byte Move_BARB_BARRAGE
+	.4byte Move_ESPER_WING
+	.4byte Move_BITTER_MALICE
+	.4byte Move_SHELTER
+	.4byte Move_TRIPLE_ARROWS
+	.4byte Move_INFERNAL_PARADE
+	.4byte Move_CEASELESS_EDGE
+	.4byte Move_BLEAKWIND_STORM
+	.4byte Move_WILDBOLT_STORM
+	.4byte Move_SANDSEAR_STORM
+	.4byte Move_LUNAR_BLESSING
+	.4byte Move_TAKE_HEART
 @@@@ Z MOVES
 	.4byte Move_BREAKNECK_BLITZ
 	.4byte Move_ALL_OUT_PUMMELING
@@ -14270,55 +14295,51 @@ Move_POLTERGEIST::
 	end
 
 Move_CORROSIVE_GAS::
-	end @to do:
-
 Move_COACHING::
-	end @to do:
-
 Move_FLIP_TURN::
-	end @to do:
-
 Move_TRIPLE_AXEL::
-	end @to do:
-
 Move_DUAL_WINGBEAT::
-	end @to do:
-
 Move_SCORCHING_SANDS::
-	end @to do:
+	end @to do
 
 Move_JUNGLE_HEALING::
 	goto Move_AROMATHERAPY
 
 Move_WICKED_BLOW::
-	end @to do:
-
 Move_SURGING_STRIKES::
-	end @to do:
-
 Move_THUNDER_CAGE::
-	end @to do:
-
 Move_DRAGON_ENERGY::
-	end @to do:
-
 Move_FREEZING_GLARE::
-	end @to do:
-
 Move_FIERY_WRATH::
-	end @to do:
-
 Move_THUNDEROUS_KICK::
-	end @to do:
-
 Move_GLACIAL_LANCE::
-	end @to do:
-
 Move_ASTRAL_BARRAGE::
-	end @to do:
-
 Move_EERIE_SPELL::
-	end @to do:
+Move_DIRE_CLAW::
+Move_PSYSHIELD_BASH::
+Move_POWER_SHIFT::
+Move_STONE_AXE::
+Move_SPRINGTIDE_STORM::
+Move_MYSTICAL_POWER::
+Move_RAGING_FURY::
+Move_WAVE_CRASH::
+Move_CHLOROBLAST::
+Move_MOUNTAIN_GALE::
+Move_VICTORY_DANCE::
+Move_HEADLONG_RUSH::
+Move_BARB_BARRAGE::
+Move_ESPER_WING::
+Move_BITTER_MALICE::
+Move_SHELTER::
+Move_TRIPLE_ARROWS::
+Move_INFERNAL_PARADE::
+Move_CEASELESS_EDGE::
+Move_BLEAKWIND_STORM::
+Move_WILDBOLT_STORM::
+Move_SANDSEAR_STORM::
+Move_LUNAR_BLESSING::
+Move_TAKE_HEART::
+	end @to do
 
 @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@
 Move_NONE:
@@ -14698,14 +14719,14 @@ Move_DOUBLE_EDGE:
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
 	waitforvisualfinish
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 0
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 0
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
 	waitforvisualfinish
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 1
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 1
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
 	delay 3
@@ -16342,7 +16363,7 @@ Move_HORN_ATTACK:
 Move_FURY_ATTACK:
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_HORN_HIT
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, 0, 2
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, ANIM_ATTACKER, 2
 	choosetwoturnanim FuryAttackRight, FuryAttackLeft
 FuryAttackContinue:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
@@ -16491,7 +16512,7 @@ Move_LOW_KICK:
 	createsprite gSlidingKickSpriteTemplate, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2
 	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
@@ -16736,7 +16757,7 @@ SkullBashSetUpHeadDown:
 	createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0
 	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
-	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 2
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 10, 1
 	waitforvisualfinish
@@ -17855,7 +17876,7 @@ Move_MIST_BALL:
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 1, 1, RGB(23, 16, 31), 16, RGB_WHITE, 16
 	delay 0
 	playsewithpan SE_M_HAZE, 0
-	createvisualtask AnimTask_LoadMistTiles, 5
+	createvisualtask AnimTask_MistBallFog, 5
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 16, RGB_WHITE
 	delay 8
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
@@ -22455,14 +22476,14 @@ Move_ARM_THRUST:
 	loadspritegfx ANIM_TAG_IMPACT
 	splitbgprio ANIM_TARGET
 	setalpha 12, 8
-	createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 0
+	createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 0
 	delay 6
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3
 	delay 4
 	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3
 	waitforvisualfinish
-	createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1
+	createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 1
 	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	choosetwoturnanim ArmThrustRight, ArmThrustLeft
 ArmThrustContinue:

data/battle_scripts_1.s

@@ -2016,12 +2016,11 @@ BattleScript_EffectHitSwitchTarget:
 	resultmessage
 	waitmessage B_WAIT_TIME_LONG
 	tryfaintmon BS_TARGET
-	moveendcase MOVEEND_MAGICIAN	@ possibly others?
+	moveendall
 	jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
 	jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
 	tryhitswitchtarget BattleScript_EffectHitSwitchTargetMoveEnd
 BattleScript_EffectHitSwitchTargetMoveEnd:
-	moveendall
 	end
 
 BattleScript_EffectClearSmog:
@@ -7456,6 +7455,7 @@ BattleScript_MagicCoatBounce::
 	printfromtable gMagicCoatBounceStringIds
 	waitmessage B_WAIT_TIME_LONG
 	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
+	bicword gHitMarker, HITMARKER_NO_ATTACKSTRING
 	setmagiccoattarget BS_ATTACKER
 	return
 

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -67,51 +67,61 @@ BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove::
 
 BattleFrontier_Lounge7_EventScript_Softboiled::
 	setvar VAR_0x8008, 16
+	setvar VAR_0x8005, MOVE_SOFT_BOILED
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_SeismicToss::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_SEISMIC_TOSS
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_DreamEater::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_DREAM_EATER
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_MegaPunch::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_MEGA_PUNCH
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_MegaKick::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_MEGA_KICK
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_BodySlam::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_BODY_SLAM
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_RockSlide::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_ROCK_SLIDE
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_Counter::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_COUNTER
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_ThunderWave::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_THUNDER_WAVE
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_SwordsDance::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_SWORDS_DANCE
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
@@ -135,7 +145,6 @@ BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove::
 	waitmessage
 	special ShowBattlePointsWindow
 	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
 	setvar VAR_0x8006, 0
 	special ShowScrollableMultichoice
 	waitstate
@@ -159,7 +168,6 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
 	setvar VAR_0x8006, 1
 	special ShowScrollableMultichoice
 	waitstate
@@ -181,51 +189,61 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove::
 
 BattleFrontier_Lounge7_EventScript_DefenseCurl::
 	setvar VAR_0x8008, 16
+	setvar VAR_0x8005, MOVE_DEFENSE_CURL
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_Snore::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_SNORE
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_MudSlap::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_MUD_SLAP
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_Swift::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_SWIFT
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_IcyWind::
 	setvar VAR_0x8008, 24
+	setvar VAR_0x8005, MOVE_ICY_WIND
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_Endure::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_ENDURE
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_PsychUp::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_PSYCH_UP
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_IcePunch::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_ICE_PUNCH
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_ThunderPunch::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_THUNDER_PUNCH
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
 BattleFrontier_Lounge7_EventScript_FirePunch::
 	setvar VAR_0x8008, 48
+	setvar VAR_0x8005, MOVE_FIRE_PUNCH
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
@@ -246,11 +264,8 @@ BattleFrontier_Lounge7_EventScript_CancelChooseMon::
 @ VAR_TEMP_D is the move selection
 @ VAR_TEMP_E is which move tutor was spoken to
 BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection::
-	copyvar VAR_0x8004, VAR_TEMP_D
-	copyvar VAR_0x8005, VAR_TEMP_E
 	special BufferBattleFrontierTutorMoveName
 	buffernumberstring STR_VAR_2, VAR_0x8008
-	copyvar VAR_0x8004, VAR_TEMP_C
 	msgbox BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints, MSGBOX_YESNO
 	goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
@@ -261,7 +276,6 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection::
 
 BattleFrontier_Lounge7_EventScript_TeachTutorMove::
 	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
-	special GetBattleFrontierTutorMoveIndex
 	fadescreen FADE_TO_BLACK
 	special CloseBattlePointsWindow
 	special CloseBattleFrontierTutorWindow

data/maps/OldaleTown/map.json

@@ -158,7 +158,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "OldaleTown_EventScript_CitySign"
+      "script": "OldaleTown_EventScript_TownSign"
     },
     {
       "type": "sign",

data/maps/OldaleTown/scripts.inc

@@ -29,8 +29,8 @@ OldaleTown_EventScript_MoveMartEmployee::
 	setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-OldaleTown_EventScript_CitySign::
+OldaleTown_EventScript_TownSign::
-	msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
+	msgbox OldaleTown_Text_TownSign, MSGBOX_SIGN
 	end
 
 OldaleTown_EventScript_Girl::
@@ -395,7 +395,7 @@ OldaleTown_Text_BrendanLetsGoBack:
 	.string "LAB now.\l"
 	.string "{PLAYER}, you should hustle back, too.$"
 
-OldaleTown_Text_CitySign:
+OldaleTown_Text_TownSign:
 	.string "OLDALE TOWN\n"
 	.string "“Where things start off scarce.”$"
 

data/maps/PacifidlogTown_House2/scripts.inc

@@ -11,9 +11,9 @@ PacifidlogTown_House2_EventScript_FanClubYoungerBrother::
 	call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment
 	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
-	goto_if_ge VAR_RESULT, 4, PacifidlogTown_House2_EventScript_GiveReturn
+	goto_if_ge VAR_RESULT, FRIENDSHIP_150_TO_199, PacifidlogTown_House2_EventScript_GiveReturn
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
-	goto_if_ge VAR_RESULT, 2, PacifidlogTown_House2_EventScript_PutInEffort
+	goto_if_ge VAR_RESULT, FRIENDSHIP_50_TO_99, PacifidlogTown_House2_EventScript_PutInEffort
 	goto PacifidlogTown_House2_EventScript_GiveFrustration
 	end
 

data/maps/SlateportCity_PokemonFanClub/scripts.inc

@@ -192,7 +192,7 @@ SlateportCity_PokemonFanClub_EventScript_SootheBellWoman::
 	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell
 	msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
-	goto_if_ge VAR_RESULT, 4, SlateportCity_PokemonFanClub_EventScript_GiveSootheBell
+	goto_if_ge VAR_RESULT, FRIENDSHIP_150_TO_199, SlateportCity_PokemonFanClub_EventScript_GiveSootheBell
 	release
 	end
 

data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc

@@ -7,13 +7,13 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	switch VAR_RESULT
-	case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
+	case FRIENDSHIP_NONE, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
-	case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
+	case FRIENDSHIP_1_TO_49, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
-	case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
+	case FRIENDSHIP_50_TO_99, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
-	case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
+	case FRIENDSHIP_100_TO_149, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
-	case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
+	case FRIENDSHIP_150_TO_199, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
-	case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
+	case FRIENDSHIP_200_TO_254, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
-	case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
+	case FRIENDSHIP_MAX, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
 	release
 	end
 

data/scripts/move_tutors.inc

@@ -7,7 +7,7 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SwaggerDeclined
 	msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_SWAGGER
+	setvar VAR_0x8005, MOVE_SWAGGER
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SwaggerDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
@@ -33,7 +33,7 @@ MauvilleCity_EventScript_RolloutTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_RolloutDeclined
 	msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT
+	setvar VAR_0x8005, MOVE_ROLLOUT
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_RolloutDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
@@ -59,7 +59,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_FuryCutterDeclined
 	msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER
+	setvar VAR_0x8005, MOVE_FURY_CUTTER
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_FuryCutterDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
@@ -85,7 +85,7 @@ LavaridgeTown_House_EventScript_MimicTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MimicDeclined
 	msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_MIMIC
+	setvar VAR_0x8005, MOVE_MIMIC
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_MimicDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
@@ -111,7 +111,7 @@ FallarborTown_Mart_EventScript_MetronomeTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_MetronomeDeclined
 	msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_METRONOME
+	setvar VAR_0x8005, MOVE_METRONOME
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_MetronomeDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
@@ -137,7 +137,7 @@ FortreeCity_House2_EventScript_SleepTalkTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SleepTalkDeclined
 	msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK
+	setvar VAR_0x8005, MOVE_SLEEP_TALK
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SleepTalkDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
@@ -163,7 +163,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_SubstituteDeclined
 	msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE
+	setvar VAR_0x8005, MOVE_SUBSTITUTE
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_SubstituteDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
@@ -189,7 +189,7 @@ MossdeepCity_EventScript_DynamicPunchTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DynamicPunchDeclined
 	msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH
+	setvar VAR_0x8005, MOVE_DYNAMIC_PUNCH
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_DynamicPunchDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
@@ -215,7 +215,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_DoubleEdgeDeclined
 	msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE
+	setvar VAR_0x8005, MOVE_DOUBLE_EDGE
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_DoubleEdgeDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
@@ -241,7 +241,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor::
 	call MoveTutor_EventScript_CanOnlyBeLearnedOnce
 	goto_if_eq VAR_RESULT, NO, MoveTutor_EventScript_ExplosionDeclined
 	msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT
-	setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION
+	setvar VAR_0x8005, MOVE_EXPLOSION
 	call MoveTutor_EventScript_OpenPartyMenu
 	goto_if_eq VAR_RESULT, 0, MoveTutor_EventScript_ExplosionDeclined
 	setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION

data/specials.inc

@@ -486,7 +486,6 @@ gSpecials::
 	def_special CloseBattleFrontierTutorWindow
 	def_special ScrollableMultichoice_RedrawPersistentMenu
 	def_special ChooseMonForMoveTutor
-	def_special GetBattleFrontierTutorMoveIndex
 	def_special ScrollableMultichoice_ClosePersistentMenu
 	def_special DoDeoxysRockInteraction
 	def_special SetDeoxysRockPalette

graphics/pokemon/arcanine/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 40 32
+0 0 0
+136 136 128
+96 96 80
+232 72 56
+176 48 32
+216 216 208
+248 248 240
+72 64 56
+40 40 40
+208 88 64
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/arcanine/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 40 32
+0 0 0
+136 136 128
+96 96 80
+224 208 40
+176 152 0
+216 216 208
+248 248 240
+72 64 56
+40 40 40
+224 208 40
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/avalugg/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+88 168 208
+80 112 144
+184 240 248
+104 80 64
+128 208 240
+248 248 248
+80 40 24
+8 8 8
+144 120 96
+144 64 32
+200 200 216
+144 152 168
+248 192 0
+88 56 56
+0 0 0

graphics/pokemon/avalugg/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+112 152 208
+80 96 168
+184 232 248
+200 160 144
+128 192 240
+248 248 248
+112 80 72
+8 8 8
+232 192 176
+248 176 24
+248 176 120
+248 136 88
+248 176 24
+160 128 120
+0 0 0

graphics/pokemon/basculin/white_striped/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+72 80 80
+8 8 8
+224 224 224
+160 160 160
+32 48 56
+16 16 16
+64 80 80
+120 168 168
+168 216 224
+64 160 80
+0 64 32
+40 112 48
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/basculin/white_striped/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+72 80 80
+8 8 8
+224 224 224
+160 160 160
+32 48 56
+16 16 16
+64 80 80
+120 168 168
+168 216 224
+120 168 56
+40 64 0
+80 112 40
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/braviary/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+104 88 80
+8 8 8
+232 232 224
+184 176 168
+56 56 64
+80 88 88
+152 64 168
+168 96 184
+32 40 40
+144 152 184
+80 184 160
+168 24 24
+240 248 248
+224 192 72
+184 128 56

graphics/pokemon/braviary/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+24 24 24
+8 8 8
+64 64 56
+40 40 32
+56 56 64
+80 88 88
+48 176 216
+120 232 240
+32 40 40
+168 248 248
+232 248 248
+96 56 144
+240 248 248
+224 192 72
+184 128 56

graphics/pokemon/dialga/origin/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+96 160 192
+24 64 104
+152 208 240
+8 8 8
+24 88 144
+56 120 176
+64 72 80
+112 136 160
+88 128 168
+240 80 64
+64 128 248
+56 88 120
+64 112 152
+96 112 128
+0 0 0

graphics/pokemon/dialga/origin/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+112 184 152
+8 104 120
+152 240 144
+8 8 8
+8 144 152
+24 200 200
+112 112 72
+184 200 168
+128 200 176
+240 80 64
+64 128 248
+80 136 112
+96 176 160
+152 168 112
+0 0 0

graphics/pokemon/electrode/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+104 72 32
+152 104 32
+240 216 136
+184 136 40
+232 176 80
+248 240 192
+16 16 16
+184 48 24
+248 80 32
+88 0 0
+184 168 168
+232 232 232
+80 72 64
+128 16 16
+240 216 136

graphics/pokemon/electrode/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+120 104 72
+152 144 80
+232 224 184
+152 128 80
+184 168 120
+240 232 208
+16 16 16
+40 40 40
+80 80 80
+16 8 8
+184 168 168
+232 232 232
+80 72 64
+16 8 8
+224 200 136

graphics/pokemon/goodra/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 176 232
+128 96 112
+216 192 208
+136 136 136
+8 8 8
+240 240 240
+200 200 200
+168 152 168
+64 64 64
+176 176 176
+96 96 104
+136 104 168
+64 56 88
+168 152 192
+232 208 232
+16 16 16

graphics/pokemon/goodra/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+128 96 112
+216 192 208
+120 104 56
+8 8 8
+240 240 240
+200 176 88
+168 152 168
+56 40 32
+160 136 72
+80 64 40
+136 104 168
+64 56 88
+168 152 192
+232 208 232
+16 16 16

graphics/pokemon/growlithe/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+88 72 88
+200 192 184
+16 16 16
+120 104 128
+104 16 8
+248 80 48
+184 32 32
+160 144 160
+112 96 32
+208 128 112
+184 152 120
+224 200 160
+72 72 72
+0 0 0
+16 0 0

graphics/pokemon/growlithe/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+112 104 96
+232 232 232
+16 16 16
+160 152 144
+88 72 40
+232 184 128
+168 136 48
+208 200 192
+112 96 32
+208 128 112
+184 152 120
+224 200 160
+72 72 72
+0 0 0
+16 0 0

graphics/pokemon/kleavor/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 32 32
+144 112 112
+16 16 16
+88 64 64
+128 80 40
+224 192 128
+248 248 248
+200 200 168
+192 136 80
+240 224 184
+200 184 144
+160 144 104
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/kleavor/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+32 32 32
+104 104 104
+16 16 16
+56 56 56
+72 80 48
+144 168 104
+248 248 248
+200 200 168
+104 128 56
+216 184 104
+184 128 56
+136 80 24
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/lilligant/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+184 160 80
+96 64 64
+248 128 184
+184 88 152
+248 216 64
+16 16 16
+80 96 40
+48 88 48
+248 248 248
+72 176 64
+200 192 184
+72 128 72
+120 168 48
+136 232 40
+184 88 152

graphics/pokemon/lilligant/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+184 160 80
+112 64 32
+248 104 56
+184 96 56
+248 216 64
+16 16 16
+96 96 40
+48 64 88
+248 248 248
+56 176 112
+200 192 184
+32 128 128
+112 168 64
+144 224 80
+184 88 152

graphics/pokemon/overqwil/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+120 192 168
+120 32 96
+240 72 208
+16 16 16
+160 72 200
+96 96 104
+184 56 152
+40 40 48
+64 64 72
+128 128 128
+88 80 56
+208 200 176
+176 168 120
+136 120 88
+248 248 248
+0 0 0

graphics/pokemon/overqwil/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+120 192 168
+40 48 128
+80 96 224
+16 16 16
+96 136 216
+168 184 208
+64 64 200
+80 80 96
+136 136 152
+208 224 240
+64 64 48
+200 192 184
+168 160 136
+112 112 96
+248 248 248
+0 0 0

graphics/pokemon/palkia/origin/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+96 80 120
+96 120 144
+200 176 208
+152 184 200
+232 216 240
+152 128 176
+192 216 224
+8 8 8
+104 56 112
+216 104 80
+152 88 160
+184 104 208
+240 160 152
+224 192 184
+224 208 200

graphics/pokemon/palkia/origin/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+128 32 56
+128 112 192
+224 176 176
+176 168 216
+248 216 232
+200 104 112
+216 216 248
+8 8 8
+128 32 80
+216 104 80
+168 48 80
+208 96 136
+240 160 152
+224 192 184
+224 208 200

graphics/pokemon/qwilfish/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+120 32 96
+240 64 208
+16 16 16
+184 48 152
+128 128 128
+64 64 72
+40 40 48
+88 88 96
+152 136 80
+176 160 120
+184 192 192
+88 80 40
+248 248 248
+184 176 144
+0 0 0

graphics/pokemon/qwilfish/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+40 48 128
+120 112 208
+16 16 16
+96 88 184
+208 224 240
+136 136 152
+80 80 96
+168 184 208
+168 160 136
+184 184 168
+184 192 192
+96 96 80
+248 248 248
+200 192 184
+0 0 0

graphics/pokemon/sliggoo/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+232 224 176
+128 96 112
+240 240 240
+216 192 208
+168 152 168
+8 8 8
+136 136 136
+72 152 80
+200 200 200
+64 64 64
+88 200 80
+176 176 176
+168 152 192
+64 56 88
+136 104 168
+104 96 104

graphics/pokemon/sliggoo/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+232 224 176
+128 96 112
+240 240 240
+216 192 208
+168 152 168
+8 8 8
+120 104 56
+72 152 80
+200 176 88
+56 40 32
+88 200 80
+160 136 72
+168 152 192
+64 56 88
+136 104 168
+104 96 104

graphics/pokemon/sneasel/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+120 88 176
+80 48 104
+160 120 216
+56 40 64
+152 152 160
+16 16 16
+216 216 224
+184 184 192
+128 96 160
+160 120 56
+232 192 48
+88 56 120
+240 240 248
+120 120 120
+232 56 64

graphics/pokemon/sneasel/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+248 144 40
+168 72 16
+248 200 80
+32 24 32
+64 88 80
+16 16 16
+112 160 120
+88 128 104
+80 72 88
+64 112 224
+136 160 240
+48 40 48
+240 240 248
+120 120 120
+72 176 96

graphics/pokemon/typhlosion/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+240 88 160
+232 96 224
+176 56 152
+240 72 104
+56 48 96
+88 72 152
+16 16 80
+96 80 176
+136 128 80
+216 216 168
+16 16 16
+232 136 0
+248 248 248
+176 176 120
+80 64 48

graphics/pokemon/typhlosion/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+240 88 160
+232 96 224
+176 56 152
+240 72 104
+40 64 96
+64 88 136
+8 32 88
+64 120 152
+136 128 80
+216 216 168
+16 16 16
+232 136 0
+248 248 248
+176 176 120
+80 64 48