Merge branch 'dev' into release

Author: voloved

README.md

@@ -9,6 +9,28 @@ To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your l
 
  ![Example](https://i.imgur.com/KSMvc0h.png)  
 
+## v2.2.0
+ - [Added Eon Flute](https://www.pokecommunity.com/showthread.php?t=422107) [Credit: camthesaxman and paccy for the Emerald Port]
+ - [Go-Goggles can be Used to and a Sandstorm in Battles](https://gitlab.com/devolov/pokeemerald_fork/-/commit/00c938536e5abfe4db4e89fd3e93b2c6ac1a450c)
+ - [Added Ability to See Zigzagoon on Cable Car](https://www.youtube.com/watch?v=7xdcbbfwEto) [Credit: Goppier]
+ - [Added Party Members Icons in the Main Menu for Existing Save Files.](https://github.com/AsparagusEduardo/pokeemerald/commit/5a638b567cfa8bb8f5a27cf96b3d1bc92a4df572) [Credit: Sangetsuki and Lunos]
+ - All Battle Frontier Pokémon are fully-evolved.
+ - Player's icon shown and them raising their Poké Ball not shown when performing a field move that the party does not known.
+ - Sped up slow and medium text speed.
+ - [Arrows show that cycling balls can be done.](https://github.com/rh-hideout/pokeemerald-expansion/pull/3039)
+ - Thief Ball option only shows if the Pokémon's catch rate is low enough (proxy for its rarity).
+ - Register icon for Cleanse Tag and Poké Doll aligned.
+ - Repels can now be registered items.
+ - [Added Frostbite](https://github.com/rh-hideout/pokeemerald-expansion/pull/2942) [Credit: Bassoonian]
+   - Option for using Frostbite as an ailment over Frozen is possible in the Special PC Menu.
+ - Added Chill-O-Wisp (Which behaves like Will-O-Wisp, but causes Frostbite).
+   - Misdreavus, the Spheal line, and the Snorunt can learn this via level-up.
+   - Drowsee, Sneasel, and Swinub can learn this as an egg move.
+ - [Made Tri Attach's Type Effectiveness Change Based on the Defender's Strength Against Fire, Electric, and Ice Types.](https://gitlab.com/devolov/pokeemerald_fork/-/wikis/Make-Tri-Attack's-power-be-based-off-how-Fire,-Ice,-and-Electric-moves-affect-the-defender)
+ - Hidden Thief Ball Added in Rival's House When Selecting Their Ball After First Talking to Thyem at Their House.
+ - Added a Mean Zigzagoon in Petalberg Woods.
+ - Bug fix where player is not properly shown when using Surf or Dive.
+
 ## v2.1.0
  - [Added last used ball in battle menu.](https://github.com/rh-hideout/pokeemerald-expansion/commit/c06029bc721119b0efd6e26c24a3f77772dfd77b) [Credit: Ghoulslash]
    - This defaults to a Thief ball if in a trainer battle.

asm/macros/battle_script.inc

@@ -1257,6 +1257,11 @@
 	.byte 0xf9
 	.endm
 
+	.macro checkflag position:req
+	.byte 0xfa
+	.byte \flag
+	.endm
+
 @ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@@ -1366,6 +1371,12 @@
 	various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
 	.endm
 
+	.macro jumpifset, flag:req, ptr:req
+	various BS_TARGET, VARIOUS_JUMP_IF_SET
+	.2byte \flag
+	.4byte \ptr
+	.endm
+
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER, \stat | \stages << 4 | \down << 7

asm/macros/event.inc

@@ -1171,11 +1171,13 @@
 	.endm
 
 	@ Subtracts value from the player's money. If the player has less than 'value' money, their money is set to 0.
-	@ If 'disable' is set to anything but 0 then this command does nothing.
-	.macro removemoney value:req, disable=0
+	@ If 'setting' is set to 0 then 'value' will be subtracted.
+	@ If 'setting' is set to 1 then this command does nothing.
+	@ If 'setting' is set to 2 then the current money will be divided by 'value'.
+	.macro removemoney value:req, setting=0
 	.byte 0x91
 	.4byte \value
-	.byte \disable
+	.byte \setting
 	.endm
 
 	@ Checks if the player has money >= value. VAR_RESULT is set to TRUE if the player has enough money, or FALSE if they do not.

data/battle_ai_scripts.s

@@ -190,6 +190,7 @@ AI_CheckBadMove_CheckEffect:
 	if_effect EFFECT_TORMENT, AI_CBM_Torment
 	if_effect EFFECT_FLATTER, AI_CBM_Confuse
 	if_effect EFFECT_WILL_O_WISP, AI_CBM_WillOWisp
+	if_effect EFFECT_CHILL_O_WISP, AI_CBM_ChillOWisp
 	if_effect EFFECT_MEMENTO, AI_CBM_Memento
 	if_effect EFFECT_FOCUS_PUNCH, AI_CBM_HighRiskForDamage
 	if_effect EFFECT_HELPING_HAND, AI_CBM_HelpingHand
@@ -536,6 +537,16 @@ AI_CBM_WillOWisp:
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
+AI_CBM_ChillOWisp:
+	get_ability AI_TARGET
+	if_equal ABILITY_WATER_VEIL, Score_Minus10
+	if_status AI_TARGET, STATUS1_ANY, Score_Minus10
+	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
+	if_type_effectiveness AI_EFFECTIVENESS_x0_5, Score_Minus10
+	if_type_effectiveness AI_EFFECTIVENESS_x0_25, Score_Minus10
+	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
+	end
+
 AI_CBM_HelpingHand:
 	if_not_double_battle Score_Minus10
 	end
@@ -559,7 +570,7 @@ AI_CBM_Imprison:
 	end
 
 AI_CBM_Refresh:
-	if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, Score_Minus10
+	if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON | STATUS1_FROSTBITE, Score_Minus10
 	end
 
 AI_CBM_MudSport:
@@ -1560,6 +1571,7 @@ AI_CV_Substitute4:
 	if_equal EFFECT_POISON, AI_CV_Substitute5
 	if_equal EFFECT_PARALYZE, AI_CV_Substitute5
 	if_equal EFFECT_WILL_O_WISP, AI_CV_Substitute5
+	if_equal EFFECT_CHILL_O_WISP, AI_CV_Substitute5
 	if_equal EFFECT_CONFUSE, AI_CV_Substitute6
 	if_equal EFFECT_LEECH_SEED, AI_CV_Substitute7
 	goto AI_CV_Substitute_End
@@ -1747,6 +1759,7 @@ AI_CV_Encore_EncouragedMovesToEncore:
 	.byte EFFECT_WATER_SPORT
 	.byte EFFECT_DRAGON_DANCE
 	.byte EFFECT_CAMOUFLAGE
+	.byte EFFECT_CHILL_O_WISP
 	.byte -1
 
 AI_CV_PainSplit:
@@ -2251,9 +2264,9 @@ AI_CV_Hail_End:
 @ BUG: Facade score is increased if the target is statused, but should be if the user is
 AI_CV_Facade:
 .ifdef BUGFIX
-	if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
+	if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON | STATUS1_FROSTBITE, AI_CV_Facade_End
 .else
-	if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
+	if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON | STATUS1_FROSTBITE, AI_CV_Facade_End
 .endif
 	score +1
 AI_CV_Facade_End:
@@ -2675,6 +2688,7 @@ AI_SetupFirstTurn_SetupEffectsToEncourage:
 	.byte EFFECT_BULK_UP
 	.byte EFFECT_CALM_MIND
 	.byte EFFECT_CAMOUFLAGE
+	.byte EFFECT_CHILL_O_WISP
 	.byte -1
 
 @ ~60% chance to prefer moves that do 0 or 1 damage, or are in sIgnoredPowerfulMoveEffects
@@ -3165,6 +3179,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP:
 	.byte EFFECT_BULK_UP
 	.byte EFFECT_CALM_MIND
 	.byte EFFECT_DRAGON_DANCE
+	.byte EFFECT_CHILL_O_WISP
 	.byte -1
 
 @ Given the AI_TryOnAlly at the beginning it's possible that this was the start of a more

data/battle_anim_scripts.s

@@ -377,6 +377,7 @@ gBattleAnims_Moves::
 	.4byte Move_DRAINING_KISS
 	.4byte Move_FAIRY_WIND
 	.4byte Move_DEATH_MOVE
+	.4byte Move_CHILL_O_WISP
 	.4byte Move_COUNT @ cannot be reached, because last move is Psycho Boost
 
 	.align 2
@@ -2233,6 +2234,7 @@ BulbblebeamCreateBubbles:
 	return
 
 Move_ICY_WIND:
+Move_CHILL_O_WISP:
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	loadspritegfx ANIM_TAG_ICE_SPIKES
 	monbg ANIM_DEF_PARTNER

data/battle_scripts_1.s

@@ -10,6 +10,7 @@
 #include "constants/songs.h"
 #include "constants/game_stat.h"
 #include "constants/trainers.h"
+#include "constants/flags.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"
@@ -23,7 +24,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectPoisonHit              @ EFFECT_POISON_HIT
 	.4byte BattleScript_EffectAbsorb                 @ EFFECT_ABSORB
 	.4byte BattleScript_EffectBurnHit                @ EFFECT_BURN_HIT
-	.4byte BattleScript_EffectFreezeHit              @ EFFECT_FREEZE_HIT
+	.4byte BattleScript_EffectFreezeFrostbiteHit     @ EFFECT_FREEZE_FROSTBITE_HIT
 	.4byte BattleScript_EffectParalyzeHit            @ EFFECT_PARALYZE_HIT
 	.4byte BattleScript_EffectExplosion              @ EFFECT_EXPLOSION
 	.4byte BattleScript_EffectDreamEater             @ EFFECT_DREAM_EATER
@@ -233,6 +234,7 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectDragonDance            @ EFFECT_DRAGON_DANCE
 	.4byte BattleScript_EffectCamouflage             @ EFFECT_CAMOUFLAGE
 	.4byte BattleScript_EffectOHKO                   @ EFFECT_DEATH_MOVE
+	.4byte BattleScript_EffectChillOWisp             @ EFFECT_CHILL_O_WISP
 
 BattleScript_EffectHit::
 	jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler
@@ -364,6 +366,14 @@ BattleScript_EffectBurnHit::
 	setmoveeffect MOVE_EFFECT_BURN
 	goto BattleScript_EffectHit
 
+BattleScript_EffectFreezeFrostbiteHit::
+	jumpifset FLAG_USE_FROSTBITE, BattleScript_EffectFrostbiteHit
+	goto BattleScript_EffectFreezeHit
+
+BattleScript_EffectFrostbiteHit::
+	setmoveeffect MOVE_EFFECT_FROSTBITE
+	goto BattleScript_EffectHit
+
 BattleScript_EffectFreezeHit::
 	setmoveeffect MOVE_EFFECT_FREEZE
 	goto BattleScript_EffectHit
@@ -2189,6 +2199,31 @@ BattleScript_EffectWillOWisp::
 	seteffectprimary
 	goto BattleScript_MoveEnd
 
+BattleScript_EffectChillOWisp::
+	attackcanceler
+	attackstring
+	ppreduce
+	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
+	jumpifset FLAG_USE_FROSTBITE, BattleScript_EffectChillOWisp_AlreadyFrostBitten
+	jumpifstatus BS_TARGET, STATUS1_FREEZE, BattleScript_AlreadyFrozen
+	goto BattleScript_EffectChillOWisp_Cont1
+BattleScript_EffectChillOWisp_AlreadyFrostBitten::
+	jumpifstatus BS_TARGET, STATUS1_FROSTBITE, BattleScript_AlreadyFrostBitten
+BattleScript_EffectChillOWisp_Cont1::
+	jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
+	accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
+	jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
+	attackanimation
+	waitanimation
+	jumpifset FLAG_USE_FROSTBITE, BattleScript_EffectChillOWisp_FrostBite
+	setmoveeffect MOVE_EFFECT_FREEZE
+	goto BattleScript_EffectChillOWisp_Cont2
+BattleScript_EffectChillOWisp_FrostBite::
+	setmoveeffect MOVE_EFFECT_FROSTBITE
+BattleScript_EffectChillOWisp_Cont2::
+	seteffectprimary
+	goto BattleScript_MoveEnd
+
 BattleScript_WaterVeilPrevents::
 	copybyte gEffectBattler, gBattlerTarget
 	setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS
@@ -2202,6 +2237,20 @@ BattleScript_AlreadyBurned::
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
 
+BattleScript_AlreadyFrostBitten::
+	setalreadystatusedmoveattempt BS_ATTACKER
+	pause B_WAIT_TIME_SHORT
+	printstring STRINGID_PKMNALREADYHASFROSTBITE
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+BattleScript_AlreadyFrozen::
+	setalreadystatusedmoveattempt BS_ATTACKER
+	pause B_WAIT_TIME_SHORT
+	printstring STRINGID_PKMNALREADYFROZEN
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
 BattleScript_EffectMemento::
 	attackcanceler
 	jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect
@@ -3763,6 +3812,11 @@ BattleScript_BurnTurnDmg::
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_DoStatusTurnDmg
 
+BattleScript_FrostbiteTurnDmg::
+	printstring STRINGID_PKMNHURTBYFROSTBITE
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_DoStatusTurnDmg
+
 BattleScript_MoveUsedIsFrozen::
 	printstring STRINGID_PKMNISFROZEN
 	waitmessage B_WAIT_TIME_LONG
@@ -3775,12 +3829,24 @@ BattleScript_MoveUsedUnfroze::
 	updatestatusicon BS_ATTACKER
 	return
 
+BattleScript_MoveUsedUnfrostbite::
+	printfromtable gFrostbiteHealedStringIds
+	waitmessage B_WAIT_TIME_LONG
+	updatestatusicon BS_ATTACKER
+	return
+
 BattleScript_DefrostedViaFireMove::
 	printstring STRINGID_PKMNWASDEFROSTED
 	waitmessage B_WAIT_TIME_LONG
 	updatestatusicon BS_TARGET
 	return
 
+BattleScript_FrostbiteHealedViaFireMove::
+	printstring STRINGID_PKMNFROSTBITEHEALED
+	waitmessage B_WAIT_TIME_LONG
+	updatestatusicon BS_TARGET
+	return
+
 BattleScript_MoveUsedIsParalyzed::
 	printstring STRINGID_PKMNISPARALYZED
 	waitmessage B_WAIT_TIME_LONG
@@ -3907,6 +3973,12 @@ BattleScript_MoveEffectBurn::
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_UpdateEffectStatusIconRet
 
+BattleScript_MoveEffectFrostbite::
+	statusanimation BS_EFFECT_BATTLER
+	printfromtable gGotFrostbiteStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_UpdateEffectStatusIconRet
+
 BattleScript_MoveEffectFreeze::
 	statusanimation BS_EFFECT_BATTLER
 	printfromtable gGotFrozenStringIds
@@ -4318,6 +4390,18 @@ BattleScript_BerryCureFrzRet::
 	removeitem BS_SCRIPTING
 	return
 
+BattleScript_BerryCureFsbEnd2::
+	call BattleScript_BerryCureFrzRet
+	end2
+
+BattleScript_BerryCureFsbRet::
+	playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
+	printstring STRINGID_PKMNSITEMHEALEDFROSTBITE
+	waitmessage B_WAIT_TIME_LONG
+	updatestatusicon BS_SCRIPTING
+	removeitem BS_SCRIPTING
+	return
+
 BattleScript_BerryCureSlpEnd2::
 	call BattleScript_BerryCureSlpRet
 	end2

data/maps/AbandonedShip_Deck/scripts.inc

@@ -4,5 +4,6 @@ AbandonedShip_Deck_MapScripts::
 
 AbandonedShip_Deck_OnTransition:
 	setflag FLAG_LANDMARK_ABANDONED_SHIP
+	setflag FLAG_VISITED_ROUTE108
 	end
 

data/maps/DewfordTown/scripts.inc

@@ -16,6 +16,8 @@ DewfordTown_MapScripts::
 
 DewfordTown_OnTransition:
 	setflag FLAG_VISITED_DEWFORD_TOWN
+	setflag FLAG_VISITED_ROUTE106
+	setflag FLAG_VISITED_ROUTE107
 	end
 
 DewfordTown_EventScript_Briney::

data/maps/FallarborTown/scripts.inc

@@ -4,6 +4,8 @@ FallarborTown_MapScripts::
 
 FallarborTown_OnTransition:
 	setflag FLAG_VISITED_FALLARBOR_TOWN
+	setflag FLAG_VISITED_ROUTE111
+	setflag FLAG_VISITED_ROUTE113
 	setvar VAR_CONTEST_HALL_STATE, 0
 	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end

data/maps/FortreeCity/scripts.inc

@@ -5,6 +5,9 @@ FortreeCity_MapScripts::
 
 FortreeCity_OnTransition:
 	setflag FLAG_VISITED_FORTREE_CITY
+	setflag FLAG_VISITED_ROUTE118
+	setflag FLAG_VISITED_ROUTE119
+	setflag FLAG_VISITED_ROUTE123
 	end
 
 FortreeCity_OnResume: