Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate

.github/pull_request_template.md

@@ -3,6 +3,14 @@
 ## Description
 <!--- Describe your changes in detail -->
 
+## Images
+<!-- Please provide with relevant GIFs or images to make it easier for reviewers to accept your PR quicker.-->
+<!-- If it doesn't apply, feel free to remove this section. -->
+
+## Issue(s) that this PR fixes
+<!-- Format: "Fixes #2345, fixes #4523, fixes #2222." -->
+<!-- If it doesn't apply, feel free to remove this section. -->
+
 ## **Discord contact info**
-<!--- formatted as name#numbers, e.g. PikalaxALT#5823 -->
+<!--- formatted as name#numbers, e.g. Lunos#4026 -->
-<!--- Contributors must join https://discord.gg/d5dubZ3 -->
+<!--- Contributors must join https://discord.gg/6CzjAG6GZk -->

asm/macros/battle_script.inc

@@ -1330,6 +1330,22 @@
 	.4byte \jumpInstr
 	.endm
 
+	.macro itemrestorehp
+	callnative BS_ItemRestoreHP
+	.endm
+
+	.macro itemcurestatus
+	callnative BS_ItemCureStatus
+	.endm
+
+	.macro itemincreasestat
+	callnative BS_ItemIncreaseStat
+	.endm
+
+	.macro itemrestorepp
+	callnative BS_ItemRestorePP
+	.endm
+
 @ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
@@ -2271,3 +2287,8 @@
 	.macro hitswitchtargetfailed
 	various 0, VARIOUS_HIT_SWITCH_TARGET_FAILED
 	.endm
+
+	.macro tryrevivalblessing, jumpInstr:req
+	various 0, VARIOUS_TRY_REVIVAL_BLESSING
+	.4byte \jumpInstr
+	.endm

charmap.txt

@@ -805,7 +805,7 @@ MUS_LITTLEROOT = 95 01
 MUS_MT_CHIMNEY = 96 01
 MUS_ENCOUNTER_FEMALE = 97 01
 MUS_LILYCOVE = 98 01
-MUS_ROUTE111 = 99 01
+MUS_DESERT = 99 01
 MUS_HELP = 9A 01
 MUS_UNDERWATER = 9B 01
 MUS_VICTORY_TRAINER = 9C 01

data/battle_anim_scripts.s

@@ -854,6 +854,8 @@ gBattleAnims_Moves::
 	.4byte Move_NOXIOUS_TORQUE
 	.4byte Move_COMBAT_TORQUE
 	.4byte Move_MAGICAL_TORQUE
+	.4byte Move_PSYBLADE
+	.4byte Move_HYDRO_STEAM
 @@@@ Z MOVES
 	.4byte Move_BREAKNECK_BLITZ
 	.4byte Move_ALL_OUT_PUMMELING
@@ -14464,6 +14466,8 @@ Move_WICKED_TORQUE::
 Move_NOXIOUS_TORQUE::
 Move_COMBAT_TORQUE::
 Move_MAGICAL_TORQUE::
+Move_PSYBLADE::
+Move_HYDRO_STEAM::
 	end @to do
 
 @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@

data/battle_scripts_1.s

@@ -417,7 +417,51 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectVictoryDance            @ EFFECT_VICTORY_DANCE
 	.4byte BattleScript_EffectTeatime                 @ EFFECT_TEATIME
 	.4byte BattleScript_EffectAttackUpUserAlly        @ EFFECT_ATTACK_UP_USER_ALLY
-	.4byte BattleScript_EffectShellTrap				  @ EFFECT_SHELL_TRAP
+	.4byte BattleScript_EffectShellTrap               @ EFFECT_SHELL_TRAP
+	.4byte BattleScript_EffectHit                     @ EFFECT_PSYBLADE
+	.4byte BattleScript_EffectHit                     @ EFFECT_HYDRO_STEAM
+	.4byte BattleScript_EffectHitSetEntryHazard       @ EFFECT_HIT_SET_ENTRY_HAZARD
+	.4byte BattleScript_EffectDireClaw                @ EFFECT_DIRE_CLAW
+	.4byte BattleScript_EffectBarbBarrage             @ EFFECT_BARB_BARRAGE
+	.4byte BattleScript_EffectRevivalBlessing         @ EFFECT_REVIVAL_BLESSING
+
+BattleScript_EffectRevivalBlessing::
+	attackcanceler
+	attackstring
+	ppreduce
+	attackanimation
+	waitanimation
+	tryrevivalblessing BattleScript_ButItFailed
+	printstring STRINGID_PKMNREVIVEDREADYTOFIGHT
+	waitmessage B_WAIT_TIME_LONG
+    jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectRevivalBlessingSendOut
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectRevivalBlessingSendOut:
+    switchinanim BS_SCRIPTING, FALSE
+	waitstate
+	switchineffects BS_SCRIPTING
+    goto BattleScript_MoveEnd
+
+BattleScript_StealthRockActivates::
+	setstealthrock BattleScript_MoveEnd
+	printfromtable gDmgHazardsStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
+
+BattleScript_EffectDireClaw::
+	setmoveeffect MOVE_EFFECT_DIRE_CLAW
+	goto BattleScript_EffectHit
+
+BattleScript_EffectHitSetEntryHazard::
+	argumenttomoveeffect
+	goto BattleScript_EffectHit
+
+BattleScript_SpikesActivates::
+	trysetspikes BattleScript_MoveEnd
+	printfromtable gDmgHazardsStringIds
+	waitmessage B_WAIT_TIME_LONG
+	goto BattleScript_MoveEnd
 
 BattleScript_EffectAttackUpUserAlly:
 	jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp
@@ -2585,8 +2629,7 @@ BattleScript_EffectPsychicTerrain:
 	printfromtable gTerrainStringIds
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectTopsyTurvy:
@@ -3370,6 +3413,7 @@ BattleScript_CantMakeAsleep::
 	orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
 	goto BattleScript_MoveEnd
 
+BattleScript_EffectBarbBarrage:
 BattleScript_EffectPoisonHit:
 	setmoveeffect MOVE_EFFECT_POISON
 	goto BattleScript_EffectHit
@@ -5568,7 +5612,7 @@ BattleScript_EffectStockpileSpDef::
 BattleScript_EffectStockpileEnd:
 	stockpile 1
 	goto BattleScript_MoveEnd
-	
+
 BattleScript_MoveEffectStockpileWoreOff::
 	.if B_STOCKPILE_RAISES_DEFS >= GEN_4
 	dostockpilestatchangeswearoff BS_ATTACKER, BattleScript_StockpileStatChangeDown
@@ -5576,7 +5620,7 @@ BattleScript_MoveEffectStockpileWoreOff::
 	waitmessage B_WAIT_TIME_SHORT
 	.endif
 	return
-	
+
 BattleScript_StockpileStatChangeDown:
 	statbuffchange MOVE_EFFECT_AFFECTS_USER, BattleScript_StockpileStatChangeDown_Ret
 	setgraphicalstatchangevalues
@@ -6841,7 +6885,7 @@ BattleScript_OverworldTerrain::
 	printfromtable gTerrainStringIds
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_TerrainSeedLoop
+	call BattleScript_ActivateTerrainEffects
 	end3
 
 BattleScript_SideStatusWoreOff::
@@ -6899,7 +6943,7 @@ BattleScript_MagicRoomEnds::
 	printstring STRINGID_MAGICROOMENDS
 	waitmessage B_WAIT_TIME_LONG
 	end2
-	
+
 BattleScript_GrassyTerrainEnds:
 	setbyte cMULTISTRING_CHOOSER, B_MSG_TERRAINENDS_GRASS
 BattleScript_TerrainEnds_Ret::
@@ -6907,7 +6951,7 @@ BattleScript_TerrainEnds_Ret::
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
 	return
-	
+
 BattleScript_TerrainEnds::
 	call BattleScript_TerrainEnds_Ret
 	end2
@@ -7320,8 +7364,7 @@ BattleScript_SeedSowerActivates::
 	printstring STRINGID_TERRAINBECOMESGRASSY
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	return
 
 BattleScript_AngerShellActivates::
@@ -7453,7 +7496,7 @@ BattleScript_StealthRockFree::
 	printstring STRINGID_PKMNBLEWAWAYSTEALTHROCK
 	waitmessage B_WAIT_TIME_LONG
 	return
-	
+
 BattleScript_SpikesDefog::
 	printstring STRINGID_SPIKESDISAPPEAREDFROMTEAM
 	waitmessage B_WAIT_TIME_LONG
@@ -8629,6 +8672,7 @@ BattleScript_IntimidateActivates::
 BattleScript_IntimidateLoop:
 	jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_IntimidateLoopIncrement
 	jumpiftargetally BattleScript_IntimidateLoopIncrement
+	jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement
 	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
 	jumpifholdeffect BS_TARGET, HOLD_EFFECT_CLEAR_AMULET, BattleScript_IntimidatePrevented_Item
 	jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
@@ -8656,6 +8700,7 @@ BattleScript_IntimidateLoopIncrement:
 	addbyte gBattlerTarget, 1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_IntimidateLoop
 BattleScript_IntimidateEnd:
+	copybyte sBATTLER, gBattlerAttacker
 	destroyabilitypopup
 	pause B_WAIT_TIME_MED
 	end3
@@ -8804,18 +8849,19 @@ BattleScript_SnowWarningActivates::
 	call BattleScript_WeatherFormChanges
 	end3
 
-BattleScript_TerrainSeedLoop:
+BattleScript_ActivateTerrainEffects:
 	savetarget
 	setbyte gBattlerTarget, 0
-BattleScript_TerrainSeedLoopIter:
+BattleScript_ActivateTerrainSeed:
 	copybyte sBATTLER, gBattlerTarget
-	doterrainseed BS_TARGET, BattleScript_TerrainSeedLoop_NextBattler
+	doterrainseed BS_TARGET, BattleScript_ActivateTerrainAbility
 	removeitem BS_TARGET
-BattleScript_TerrainSeedLoop_NextBattler:
+BattleScript_ActivateTerrainAbility:
+	activateterrainchangeabilities BS_TARGET
+BattleScript_ActivateTerrainEffects_Increment:
 	addbyte gBattlerTarget, 0x1
-	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TerrainSeedLoopIter
+	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_ActivateTerrainSeed
 	restoretarget
-	call BattleScript_ActivateSwitchInAbilities
 	return
 
 BattleScript_ActivateSwitchInAbilities:
@@ -8829,25 +8875,13 @@ BattleScript_ActivateSwitchInAbilities_Increment:
 	copybyte gBattlerAttacker, sBATTLER
 	return
 
-BattleScript_ActivateTerrainAbilities:
-	copybyte sBATTLER, gBattlerAttacker
-	setbyte gBattlerAttacker, 0
-BattleScript_ActivateTerrainAbilities_Loop:
-	activateterrainchangeabilities BS_ATTACKER
-BattleScript_ActivateTerrainAbilities_Increment:
-	addbyte gBattlerAttacker, 1
-	jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateTerrainAbilities_Loop
-	copybyte gBattlerAttacker, sBATTLER
-	return
-
 BattleScript_ElectricSurgeActivates::
 	pause B_WAIT_TIME_SHORT
 	call BattleScript_AbilityPopUp
 	printstring STRINGID_TERRAINBECOMESELECTRIC
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	end3
 
 BattleScript_MistySurgeActivates::
@@ -8856,8 +8890,7 @@ BattleScript_MistySurgeActivates::
 	printstring STRINGID_TERRAINBECOMESMISTY
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	end3
 
 BattleScript_GrassySurgeActivates::
@@ -8866,8 +8899,7 @@ BattleScript_GrassySurgeActivates::
 	printstring STRINGID_TERRAINBECOMESGRASSY
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	end3
 
 BattleScript_PsychicSurgeActivates::
@@ -8876,8 +8908,7 @@ BattleScript_PsychicSurgeActivates::
 	printstring STRINGID_TERRAINBECOMESPSYCHIC
 	waitmessage B_WAIT_TIME_LONG
 	playanimation BS_SCRIPTING, B_ANIM_RESTORE_BG
-	call BattleScript_ActivateTerrainAbilities
+	call BattleScript_ActivateTerrainEffects
-	call BattleScript_TerrainSeedLoop
 	end3
 
 BattleScript_HurtTarget_NoString:
@@ -9153,7 +9184,7 @@ BattleScript_WanderingSpiritActivates::
 	pause 20
 	destroyabilitypopup
 	pause 40
-
+	copybyte gBattlerAbility, gBattlerAttacker
 	setbyte sFIXED_ABILITY_POPUP, TRUE
 	copyhword sABILITY_OVERWRITE, gLastUsedAbility
 	showabilitypopup BS_ATTACKER
@@ -10164,7 +10195,6 @@ BattleScript_EffectHitSetRemoveTerrain:
 	setterrain BattleScript_TryFaint
 	playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
 	printfromtable gTerrainStringIds
-	call BattleScript_ActivateTerrainAbilities
 BattleScript_TryFaint:
 	tryfaintmon BS_TARGET
 	goto BattleScript_MoveEnd

data/battle_scripts_2.s

@@ -3,219 +3,255 @@
 #include "constants/battle_script_commands.h"
 #include "constants/battle_anim.h"
 #include "constants/battle_string_ids.h"
-#include "constants/items.h"
+#include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/game_stat.h"
-	.include "asm/macros.inc"
+    .include "asm/macros.inc"
-	.include "asm/macros/battle_script.inc"
+    .include "asm/macros/battle_script.inc"
-	.include "constants/constants.inc"
+    .include "constants/constants.inc"
 
-	.section script_data, "aw", %progbits
+    .section script_data, "aw", %progbits
 
-	.align 2
+    .align 2
 gBattlescriptsForUsingItem::
-	.4byte BattleScript_PlayerUsesItem
+    .4byte BattleScript_ItemRestoreHP                @ EFFECT_ITEM_RESTORE_HP
-	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_FULL_RESTORE
+    .4byte BattleScript_ItemCureStatus               @ EFFECT_ITEM_CURE_STATUS
-	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_HEAL_HP
+    .4byte BattleScript_ItemHealAndCureStatus        @ EFFECT_ITEM_HEAL_AND_CURE_STATUS
-	.4byte BattleScript_OpponentUsesStatusCureItem  @ AI_ITEM_CURE_CONDITION
+    .4byte BattleScript_ItemIncreaseStat             @ EFFECT_ITEM_INCREASE_STAT
-	.4byte BattleScript_OpponentUsesXItem           @ AI_ITEM_X_STAT
+    .4byte BattleScript_ItemSetMist                  @ EFFECT_ITEM_SET_MIST
-	.4byte BattleScript_OpponentUsesGuardSpec       @ AI_ITEM_GUARD_SPEC
+    .4byte BattleScript_ItemSetFocusEnergy           @ EFFECT_ITEM_SET_FOCUS_ENERGY
+    .4byte BattleScript_RunByUsingItem               @ EFFECT_ITEM_ESCAPE
+    .4byte BattleScript_BallThrow                    @ EFFECT_ITEM_THROW_BALL
+    .4byte BattleScript_ItemRestoreHP                @ EFFECT_ITEM_REVIVE
+    .4byte BattleScript_ItemRestorePP                @ EFFECT_ITEM_RESTORE_PP
+    .4byte BattleScript_ItemIncreaseAllStats         @ EFFECT_ITEM_INCREASE_ALL_STATS
 
-	.align 2
+    .align 2
-gBattlescriptsForRunningByItem::
-	.4byte BattleScript_RunByUsingItem
-
-	.align 2
 gBattlescriptsForSafariActions::
-	.4byte BattleScript_ActionWatchesCarefully
+    .4byte BattleScript_ActionWatchesCarefully
-	.4byte BattleScript_ActionGetNear
+    .4byte BattleScript_ActionGetNear
-	.4byte BattleScript_ActionThrowPokeblock
+    .4byte BattleScript_ActionThrowPokeblock
-	.4byte BattleScript_ActionWallyThrow
+    .4byte BattleScript_ActionWallyThrow
+
+BattleScript_ItemEnd:
+    end
+
+BattleScript_UseItemMessage:
+    printstring STRINGID_EMPTYSTRING3
+    pause B_WAIT_TIME_MED
+    playse SE_USE_ITEM
+    getbattlerside BS_ATTACKER
+    copybyte cMULTISTRING_CHOOSER, gBattleCommunication
+    printfromtable gTrainerUsedItemStringIds
+    waitmessage B_WAIT_TIME_LONG
+    return
+
+BattleScript_ItemRestoreHP::
+    call BattleScript_UseItemMessage
+    itemrestorehp
+    jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_ItemRestoreHP_SendOutRevivedBattler
+    bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
+    orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
+    healthbarupdate BS_ATTACKER
+    datahpupdate BS_ATTACKER
+    printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemRestoreHP_SendOutRevivedBattler:
+    switchinanim BS_ATTACKER, FALSE
+    waitstate
+    switchineffects BS_ATTACKER
+    end
+
+BattleScript_ItemCureStatus::
+    call BattleScript_UseItemMessage
+    itemcurestatus
+    updatestatusicon BS_ATTACKER
+    printstring STRINGID_ITEMCUREDSPECIESSTATUS
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemHealAndCureStatus::
+    call BattleScript_UseItemMessage
+    itemrestorehp
+    curestatus BS_ATTACKER
+    bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
+    orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
+    healthbarupdate BS_ATTACKER
+    datahpupdate BS_ATTACKER
+    updatestatusicon BS_ATTACKER
+    printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemIncreaseStat::
+    call BattleScript_UseItemMessage
+    itemincreasestat
+    statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_ItemEnd
+    setgraphicalstatchangevalues
+    playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+    printfromtable gStatUpStringIds
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemSetMist::
+    call BattleScript_UseItemMessage
+    setmist
+    playmoveanimation BS_ATTACKER, MOVE_MIST
+    waitanimation
+    printfromtable gMistUsedStringIds
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemSetFocusEnergy::
+    call BattleScript_UseItemMessage
+    jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed
+    setfocusenergy
+    playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
+    waitanimation
+    printstring STRINGID_PKMNUSEDXTOGETPUMPED
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemRestorePP::
+    call BattleScript_UseItemMessage
+    itemrestorepp
+    printstring STRINGID_ITEMRESTOREDSPECIESPP
+    waitmessage B_WAIT_TIME_LONG
+    end
+
+BattleScript_ItemIncreaseAllStats::
+    call BattleScript_UseItemMessage
+    call BattleScript_AllStatsUp
+    end
 
 BattleScript_BallThrow::
-	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
+    jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
-	printstring STRINGID_PLAYERUSEDITEM
+    printstring STRINGID_PLAYERUSEDITEM
-	handleballthrow
+    handleballthrow
 
 BattleScript_BallThrowByWally::
-	printstring STRINGID_WALLYUSEDITEM
+    printstring STRINGID_WALLYUSEDITEM
-	handleballthrow
+    handleballthrow
 
 BattleScript_SafariBallThrow::
-	printstring STRINGID_PLAYERUSEDITEM
+    printstring STRINGID_PLAYERUSEDITEM
-	updatestatusicon BS_ATTACKER
+    updatestatusicon BS_ATTACKER
-	handleballthrow
+    handleballthrow
 
 BattleScript_SuccessBallThrow::
-	setbyte sMON_CAUGHT, TRUE
+    setbyte sMON_CAUGHT, TRUE
-	incrementgamestat GAME_STAT_POKEMON_CAPTURES
+    incrementgamestat GAME_STAT_POKEMON_CAPTURES
 BattleScript_PrintCaughtMonInfo::
-	printstring STRINGID_GOTCHAPKMNCAUGHT
+    printstring STRINGID_GOTCHAPKMNCAUGHTPLAYER
-	jumpifbyte CMP_NOT_EQUAL, sEXP_CATCH, TRUE, BattleScript_TryPrintCaughtMonInfo
+    jumpifbyte CMP_NOT_EQUAL, sEXP_CATCH, TRUE, BattleScript_TryPrintCaughtMonInfo
-	setbyte sGIVEEXP_STATE, 0
+    setbyte sGIVEEXP_STATE, 0
-	getexp BS_TARGET
+    getexp BS_TARGET
-	sethword gBattle_BG2_X, 0
+    sethword gBattle_BG2_X, 0
 BattleScript_TryPrintCaughtMonInfo:
-	trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
+    trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
-	printstring STRINGID_PKMNDATAADDEDTODEX
+    printstring STRINGID_PKMNDATAADDEDTODEX
-	waitstate
+    waitstate
-	setbyte gBattleCommunication, 0
+    setbyte gBattleCommunication, 0
-	displaydexinfo
+    displaydexinfo
 BattleScript_TryNicknameCaughtMon::
-	printstring STRINGID_GIVENICKNAMECAPTURED
+    printstring STRINGID_GIVENICKNAMECAPTURED
-	waitstate
+    waitstate
-	setbyte gBattleCommunication, 0
+    setbyte gBattleCommunication, 0
-	trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
+    trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
-	givecaughtmon
+    givecaughtmon
-	printfromtable gCaughtMonStringIds
+    printfromtable gCaughtMonStringIds
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	goto BattleScript_SuccessBallThrowEnd
+    goto BattleScript_SuccessBallThrowEnd
 BattleScript_GiveCaughtMonEnd::
-	givecaughtmon
+    givecaughtmon
 BattleScript_SuccessBallThrowEnd::
-	setbyte gBattleOutcome, B_OUTCOME_CAUGHT
+    setbyte gBattleOutcome, B_OUTCOME_CAUGHT
-	finishturn
+    finishturn
 
 BattleScript_WallyBallThrow::
-	printstring STRINGID_GOTCHAPKMNCAUGHT2
+    printstring STRINGID_GOTCHAPKMNCAUGHTWALLY
-	setbyte gBattleOutcome, B_OUTCOME_CAUGHT
+    setbyte gBattleOutcome, B_OUTCOME_CAUGHT
-	finishturn
+    finishturn
 
 BattleScript_ShakeBallThrow::
-	printfromtable gBallEscapeStringIds
+    printfromtable gBallEscapeStringIds
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
+    jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
-	jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
+    jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
-	printstring STRINGID_OUTOFSAFARIBALLS
+    printstring STRINGID_OUTOFSAFARIBALLS
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
+    setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS
 BattleScript_ShakeBallThrowEnd::
-	finishaction
+    finishaction
 
 BattleScript_TrainerBallBlock::
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	printstring STRINGID_TRAINERBLOCKEDBALL
+    printstring STRINGID_TRAINERBLOCKEDBALL
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	printstring STRINGID_DONTBEATHIEF
+    printstring STRINGID_DONTBEATHIEF
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	finishaction
+    finishaction
-
-BattleScript_PlayerUsesItem::
-	moveendcase MOVEEND_MIRROR_MOVE
-	end
-
-BattleScript_OpponentUsesHealItem::
-	printstring STRINGID_EMPTYSTRING3
-	pause B_WAIT_TIME_MED
-	playse SE_USE_ITEM
-	printstring STRINGID_TRAINER1USEDITEM
-	waitmessage B_WAIT_TIME_LONG
-	bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
-	useitemonopponent
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
-	healthbarupdate BS_ATTACKER
-	datahpupdate BS_ATTACKER
-	printstring STRINGID_PKMNSITEMRESTOREDHEALTH
-	waitmessage B_WAIT_TIME_LONG
-	updatestatusicon BS_ATTACKER
-	moveendcase MOVEEND_MIRROR_MOVE
-	finishaction
-
-BattleScript_OpponentUsesStatusCureItem::
-	printstring STRINGID_EMPTYSTRING3
-	pause B_WAIT_TIME_MED
-	playse SE_USE_ITEM
-	printstring STRINGID_TRAINER1USEDITEM
-	waitmessage B_WAIT_TIME_LONG
-	useitemonopponent
-	printfromtable gTrainerItemCuredStatusStringIds
-	waitmessage B_WAIT_TIME_LONG
-	updatestatusicon BS_ATTACKER
-	moveendcase MOVEEND_MIRROR_MOVE
-	finishaction
-
-BattleScript_OpponentUsesXItem::
-	printstring STRINGID_EMPTYSTRING3
-	pause B_WAIT_TIME_MED
-	playse SE_USE_ITEM
-	printstring STRINGID_TRAINER1USEDITEM
-	waitmessage B_WAIT_TIME_LONG
-	useitemonopponent
-	printfromtable gStatUpStringIds
-	waitmessage B_WAIT_TIME_LONG
-	moveendcase MOVEEND_MIRROR_MOVE
-	finishaction
-
-BattleScript_OpponentUsesGuardSpec::
-	printstring STRINGID_EMPTYSTRING3
-	pause B_WAIT_TIME_MED
-	playse SE_USE_ITEM
-	printstring STRINGID_TRAINER1USEDITEM
-	waitmessage B_WAIT_TIME_LONG
-	useitemonopponent
-	printfromtable gMistUsedStringIds
-	waitmessage B_WAIT_TIME_LONG
-	moveendcase MOVEEND_MIRROR_MOVE
-	finishaction
 
 BattleScript_RunByUsingItem::
-	playse SE_FLEE
+    playse SE_FLEE
-	setbyte gBattleOutcome, B_OUTCOME_RAN
+    setbyte gBattleOutcome, B_OUTCOME_RAN
-	finishturn
+    finishturn
 
 BattleScript_ActionWatchesCarefully:
-	printstring STRINGID_PKMNWATCHINGCAREFULLY
+    printstring STRINGID_PKMNWATCHINGCAREFULLY
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	end2
+    end2
 
 BattleScript_ActionGetNear:
-	printfromtable gSafariGetNearStringIds
+    printfromtable gSafariGetNearStringIds
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	end2
+    end2
 
 BattleScript_ActionThrowPokeblock:
-	printstring STRINGID_THREWPOKEBLOCKATPKMN
+    printstring STRINGID_THREWPOKEBLOCKATPKMN
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
+    playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
-	printfromtable gSafariPokeblockResultStringIds
+    printfromtable gSafariPokeblockResultStringIds
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	end2
+    end2
 
 BattleScript_ActionWallyThrow:
-	printstring STRINGID_RETURNMON
+    printstring STRINGID_RETURNMON
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	returnatktoball
+    returnatktoball
-	waitstate
+    waitstate
-	trainerslidein BS_TARGET
+    trainerslidein BS_TARGET
-	waitstate
+    waitstate
-	printstring STRINGID_YOUTHROWABALLNOWRIGHT
+    printstring STRINGID_YOUTHROWABALLNOWRIGHT
-	waitmessage B_WAIT_TIME_LONG
+    waitmessage B_WAIT_TIME_LONG
-	end2
+    end2
 
 BattleScript_TrainerASlideMsgRet::
-	handletrainerslidemsg BS_SCRIPTING, 0
+    handletrainerslidemsg BS_SCRIPTING, 0
-	trainerslidein B_POSITION_OPPONENT_LEFT
+    trainerslidein B_POSITION_OPPONENT_LEFT
-	handletrainerslidemsg BS_SCRIPTING, 1
+    handletrainerslidemsg BS_SCRIPTING, 1
-	waitstate
+    waitstate
-	trainerslideout B_POSITION_OPPONENT_LEFT
+    trainerslideout B_POSITION_OPPONENT_LEFT
-	waitstate
+    waitstate
-	handletrainerslidemsg BS_SCRIPTING, 2
+    handletrainerslidemsg BS_SCRIPTING, 2
-	return
+    return
 
 BattleScript_TrainerASlideMsgEnd2::
-	call BattleScript_TrainerASlideMsgRet
+    call BattleScript_TrainerASlideMsgRet
-	end2
+    end2
-	
+    
 BattleScript_TrainerBSlideMsgRet::
-	handletrainerslidemsg BS_SCRIPTING, 0
+    handletrainerslidemsg BS_SCRIPTING, 0
-	trainerslidein B_POSITION_OPPONENT_RIGHT
+    trainerslidein B_POSITION_OPPONENT_RIGHT
-	handletrainerslidemsg BS_SCRIPTING, 1
+    handletrainerslidemsg BS_SCRIPTING, 1
-	waitstate
+    waitstate
-	trainerslideout B_POSITION_OPPONENT_RIGHT
+    trainerslideout B_POSITION_OPPONENT_RIGHT
-	waitstate
+    waitstate
-	handletrainerslidemsg BS_SCRIPTING, 2
+    handletrainerslidemsg BS_SCRIPTING, 2
-	return
+    return
 
 BattleScript_TrainerBSlideMsgEnd2::
-	call BattleScript_TrainerBSlideMsgRet
+    call BattleScript_TrainerBSlideMsgRet
-	end2
+    end2

data/maps/AbandonedShip_CaptainsOffice/scripts.inc

@@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
 	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
 	checkitem ITEM_SCANNER
 	goto_if_eq VAR_RESULT, TRUE, AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
-	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
+	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
 	msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
 	release
 	end

data/maps/AbandonedShip_HiddenFloorRooms/map.json

@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
-      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/MossdeepCity_Gym/scripts.inc

@@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_CheckSwitch4::
 
 @ All the below set metatile scripts are leftover from RS and are functionally unused
 MossdeepCity_Gym_EventScript_SetSwitch1Metatiles::
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch2
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch2Metatiles::
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch3
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch3Metatiles::
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch4
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch4Metatiles::
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Up, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	end
 
 MossdeepCity_Gym_EventScript_TateAndLiza::
@@ -116,8 +116,8 @@ MossdeepCity_Gym_EventScript_Switch1::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -131,8 +131,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch1::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -142,8 +142,8 @@ MossdeepCity_Gym_EventScript_Switch2::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -151,8 +151,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch2::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, FALSE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Down, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -162,8 +162,8 @@ MossdeepCity_Gym_EventScript_Switch3::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -171,8 +171,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch3::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -182,8 +182,8 @@ MossdeepCity_Gym_EventScript_Switch4::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Up, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -191,8 +191,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch4::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 

data/maps/Route111/scripts.inc

@@ -260,7 +260,7 @@ Route111_EventScript_SunTrigger::
 
 Route111_EventScript_SandstormTrigger::
 	setweather WEATHER_SANDSTORM
-	fadenewbgm MUS_ROUTE111
+	fadenewbgm MUS_DESERT
 	doweather
 	end
 

data/scripts/mauville_man.inc

@@ -64,9 +64,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics::
 MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
 	lock
 	faceplayer
-	setflag FLAG_SYS_HIPSTER_MEET
+	setflag FLAG_UNLOCKED_TRENDY_SAYINGS
 	msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT
-	special GetHipsterSpokenFlag
+	special HasHipsterTaughtWord
 	goto_if_eq VAR_RESULT, FALSE, MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord
 	msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT
 	release
@@ -80,8 +80,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_TeachWord::
-	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
+	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfWord, MSGBOX_DEFAULT
-	special SetHipsterSpokenFlag
+	special SetHipsterTaughtWord
 	release
 	end
 
@@ -969,7 +969,7 @@ MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach:
 	.string "what's hip and happening.\p"
 	.string "I've got nothing new to teach you!$"
 
-MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase:
+MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfWord:
 	.string "Hey, have you heard about\n"
 	.string "“{STR_VAR_1}”?\p"
 	.string "What's it mean? Well…\n"

data/specials.inc

@@ -111,8 +111,8 @@ gSpecials::
 	def_special Script_GetCurrentMauvilleMan
 	def_special HasBardSongBeenChanged
 	def_special SaveBardSongLyrics
-	def_special GetHipsterSpokenFlag
+	def_special HasHipsterTaughtWord
-	def_special SetHipsterSpokenFlag
+	def_special SetHipsterTaughtWord
 	def_special HipsterTryTeachWord
 	def_special PlayBardSong
 	def_special SetMauvilleOldManObjEventGfx

gflib/text.c

@@ -36,7 +36,7 @@ static u32 GetGlyphWidth_Narrow(u16, bool32);
 static u32 GetGlyphWidth_SmallNarrow(u16, bool32);
 
 static EWRAM_DATA struct TextPrinter sTempTextPrinter = {0};
-static EWRAM_DATA struct TextPrinter sTextPrinters[NUM_TEXT_PRINTERS] = {0};
+static EWRAM_DATA struct TextPrinter sTextPrinters[WINDOWS_MAX] = {0};
 
 static u16 sFontHalfRowLookupTable[0x51];
 static u16 sLastTextBgColor;
@@ -244,7 +244,7 @@ static void SetFontsPointer(const struct FontInfo *fonts)
 void DeactivateAllTextPrinters(void)
 {
     int printer;
-    for (printer = 0; printer < NUM_TEXT_PRINTERS; ++printer)
+    for (printer = 0; printer < WINDOWS_MAX; ++printer)
         sTextPrinters[printer].active = FALSE;
 }
 
@@ -322,7 +322,7 @@ void RunTextPrinters(void)
 
     if (!gDisableTextPrinters)
     {
-        for (i = 0; i < NUM_TEXT_PRINTERS; ++i)
+        for (i = 0; i < WINDOWS_MAX; ++i)
         {
             if (sTextPrinters[i].active)
             {

gflib/text.h

@@ -3,8 +3,6 @@
 
 #include "characters.h"
 
-#define NUM_TEXT_PRINTERS 32
-
 // Given as a text speed when all the text should be
 // loaded at once but not copied to vram yet.
 #define TEXT_SKIP_DRAW 0xFF

gflib/window.c

@@ -9,8 +9,6 @@ u8 gTransparentTileNumber;
 void *gWindowBgTilemapBuffers[NUM_BACKGROUNDS];
 extern u32 gWindowTileAutoAllocEnabled;
 
-#define WINDOWS_MAX  32
-
 EWRAM_DATA struct Window gWindows[WINDOWS_MAX] = {0};
 EWRAM_DATA static struct Window* sWindowPtr = NULL;
 EWRAM_DATA static u16 sWindowSize = 0;

gflib/window.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_WINDOW_H
 #define GUARD_WINDOW_H
 
+#define WINDOWS_MAX  32
+
 #define PIXEL_FILL(num) ((num) | ((num) << 4))
 
 enum {

graphics/items/icon_palettes/ability_shield.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+248 200 240
+224 176 232
+200 144 224
+240 224 248
+176 120 216
+77 146 186
+105 179 221
+238 246 246
+222 222 222
+197 197 197
+161 161 161
+48 48 48
+255 255 255
+0 0 0

graphics/items/icon_palettes/adamant_crystal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+184 208 248
+168 200 248
+81 123 173
+128 168 216
+200 232 248
+224 248 248
+248 248 248
+104 104 104
+48 48 48
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/auspicious_armor.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+160 144 32
+192 176 56
+224 208 88
+128 112 32
+72 56 24
+224 80 80
+176 88 88
+120 72 72
+48 48 48
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/big_bamboo_shoot.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+189 202 71
+121 168 43
+120 167 42
+163 126 74
+116 101 78
+79 66 46
+115 77 43
+180 133 94
+233 176 96
+241 241 193
+183 170 147
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/black_augurite.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+120 192 168
+0 0 0
+111 108 124
+58 48 49
+206 206 214
+151 149 160
+142 93 117
+89 62 76
+255 255 255
+111 109 124
+194 192 202
+88 62 76
+80 74 88
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/booster_energy.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+111 45 22
+0 0 0
+190 91 13
+255 139 1
+255 255 255
+255 231 10
+251 42 6
+154 157 151
+193 161 19
+234 238 234
+122 111 115
+74 67 68
+90 185 248
+78 86 255
+111 52 255

graphics/items/icon_palettes/covert_cloak.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+54 52 72
+101 120 143
+103 139 163
+84 105 130
+74 75 101
+90 108 136
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/gimmighoul_coin.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+180 124 35
+115 66 13
+255 249 234
+224 159 27
+255 226 121
+255 200 59
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/griseous_core.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+206 181 41
+222 198 57
+247 231 140
+156 132 33
+189 156 41
+123 99 33
+49 49 49
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/leaders_crest.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+188 143 70
+131 85 43
+186 181 176
+80 74 71
+239 185 78
+138 128 128
+220 217 215
+250 225 159
+246 205 93
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/linking_cord.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+128 192 168
+87 87 88
+155 158 156
+117 114 116
+0 0 0
+36 37 42
+62 66 68
+56 57 61
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/loaded_dice.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+48 52 78
+127 216 17
+0 0 0
+192 240 140
+128 217 18
+90 137 46
+129 218 19
+88 135 48
+107 182 17
+128 217 18
+93 144 44
+89 136 47
+255 255 255
+127 216 19
+48 38 64

graphics/items/icon_palettes/lustrous_globe.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+248 216 232
+198 159 217
+210 171 229
+224 192 240
+210 192 240
+160 192 232
+144 200 232
+160 216 240
+128 216 224
+208 240 240
+248 240 240
+248 248 248
+80 80 80
+48 48 48

graphics/items/icon_palettes/malicious_armor.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+66 66 99
+90 90 132
+115 115 156
+90 115 230
+132 140 181
+125 147 246
+48 48 48
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/mirror_herb.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+39 194 168
+124 228 211
+19 101 84
+187 228 77
+238 250 169
+234 244 124
+24 152 108
+126 106 28
+173 171 15
+43 138 128
+127 175 55
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/peat_block.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+128 198 168
+32 32 32
+230 217 213
+199 189 184
+156 135 143
+102 83 83
+143 118 130
+65 56 56
+179 162 151
+117 100 100
+210 183 192
+180 158 167
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/punching_glove.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 212 0
+200 56 32
+248 64 48
+232 232 232
+48 48 48
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/scroll_of_darkness.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+130 116 116
+86 86 86
+54 41 49
+104 78 86
+56 56 56
+141 105 41
+223 191 65
+242 241 242
+184 172 179
+186 140 57
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/scroll_of_waters.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+118 109 109
+143 130 127
+101 77 83
+73 68 68
+122 108 104
+141 105 41
+223 191 65
+242 241 242
+184 172 179
+186 140 57
+102 78 84
+0 0 0
+0 0 0
+0 0 0

graphics/items/icon_palettes/tera_orb.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+81 41 75
+98 61 92
+66 72 65
+51 4 43
+201 185 199
+110 86 106
+84 73 92
+32 41 34
+255 255 255
+71 50 92
+64 71 94
+139 165 201
+183 191 209
+0 0 0

graphics/items/icon_palettes/tiny_bamboo_shoot.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+111 167 43
+179 192 68
+107 144 66
+84 116 48
+68 93 37
+124 137 52
+168 87 80
+168 116 111
+241 241 193
+168 87 80
+183 170 147
+121 52 57
+0 0 0
+0 0 0

graphics/pokemon/arcanine/hisuian/normal.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-48 40 32
+32 44 40
-0 0 0
+128 140 128
-136 136 128
+16 16 16
-96 96 80
+80 100 96
-232 72 56
+96 12 0
-176 48 32
+248 120 96
-216 216 208
+232 72 48
-248 248 240
+168 40 32
-72 64 56
+184 180 176
-40 40 40
+248 248 248
-208 88 64
+0 0 0
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/arcanine/hisuian/shiny.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-48 40 32
+32 44 40
-0 0 0
+128 140 128
-136 136 128
+16 16 16
-96 96 80
+80 100 96
-224 208 40
+90 65 16
-176 152 0
+231 184 41
-216 216 208
+231 184 41
-248 248 240
+181 126 0
-72 64 56
+184 180 176
-40 40 40
+248 248 248
-224 208 40
+0 0 0
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/avalugg/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 168 208
+80 96 104
-80 112 144
+176 224 240
-184 240 248
+136 176 192
-104 80 64
+16 16 16
-128 208 240
+104 84 64
-248 248 248
+232 244 248
-80 40 24
+80 60 48
-8 8 8
+72 44 32
 144 120 96
-144 64 32
+112 112 112
-200 200 216
+184 188 184
-144 152 168
+232 232 232
-248 192 0
+144 68 32
-88 56 56
+240 184 72
 0 0 0

graphics/pokemon/avalugg/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 152 208
+80 96 104
-80 96 168
+176 224 240
-184 232 248
+136 176 192
-200 160 144
+16 16 16
-128 192 240
+104 84 64
-248 248 248
+232 244 248
-112 80 72
+80 60 48
-8 8 8
+72 44 32
-232 192 176
+144 120 96
-248 176 24
+149 41 26
-248 176 120
+213 79 53
-248 136 88
+249 131 79
-248 176 24
+144 68 32
-160 128 120
+240 184 72
 0 0 0

graphics/pokemon/basculegion/female/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+98 98 98
+16 16 16
+46 92 120
+171 222 224
+230 230 230
+227 242 239
+164 164 164
+122 168 175
+32 49 57
+65 82 82
+55 140 89
+21 64 34
+34 96 61
+16 16 18
+99 62 41

graphics/pokemon/basculegion/female/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+98 98 98
+16 16 16
+112 96 64
+216 208 112
+230 230 230
+248 236 160
+164 164 164
+160 152 72
+32 49 57
+64 80 80
+96 144 48
+21 64 34
+72 108 56
+16 16 18
+99 62 41

graphics/pokemon/basculegion/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 140 88
+192 52 80
+160 164 160
+16 64 32
+16 16 16
+120 24 24
+248 164 200
+96 60 40
+224 228 224
+64 80 80
+32 48 56
+32 96 56
+248 80 120
+96 96 96
+56 84 72

graphics/pokemon/basculegion/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+96 144 48
+144 72 176
+160 164 160
+16 64 32
+16 16 16
+88 36 112
+224 176 240
+96 60 40
+224 228 224
+60 82 76
+32 48 56
+72 108 56
+184 84 232
+96 96 96
+56 84 72

graphics/pokemon/braviary/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 80
+184 156 16
-8 8 8
+80 188 160
-232 232 224
+96 80 32
-184 176 168
+16 16 16
-56 56 64
+144 60 160
-80 88 88
+160 48 48
-152 64 168
+232 212 88
-168 96 184
-32 40 40
 144 152 184
-80 184 160
+228 230 224
-168 24 24
+168 100 184
-240 248 248
+48 52 64
-224 192 72
+104 92 80
-184 128 56
+184 176 168
+88 84 104
+240 240 240

graphics/pokemon/braviary/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-24 24 24
+208 160 70
-8 8 8
+233 254 252
-64 64 56
+103 74 27
-40 40 32
+16 16 16
-56 56 64
+51 180 217
-80 88 88
+96 63 150
-48 176 216
+243 215 139
-120 232 240
+174 251 251
-32 40 40
+71 66 63
-168 248 248
+122 234 243
-232 248 248
+48 52 64
-96 56 144
+30 28 26
-240 248 248
+45 41 38
-224 192 72
+88 84 104
-184 128 56
+240 240 240