merge w pret

.gitignore

@@ -30,7 +30,8 @@ build/
 .DS_Store
 *.ddump
 .idea/
-porymap.project.cfg
+porymap.*.cfg
+prefabs.json
 .vscode/
 *.a
 .fuse_hidden*

INSTALL.md

@@ -106,7 +106,7 @@ cd /mnt/c/Users/<user>/Desktop/decomps
 >   Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`.
 >   Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
 </details>
-    
+
 If this works, then proceed to [Installation](#installation).
 
 Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2).
@@ -216,7 +216,7 @@ Note that the directory **must exist** in Windows. If you want to store pokeemer
 >   Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`.
 >   Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
 </details>
-    
+
 If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
 
 ## macOS
@@ -539,7 +539,7 @@ devkitARM is now installed.
 devkitARM is now installed.
 
 ### Installing devkitARM on Arch Linux
-        
+
 1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
 2. Install `gba-dev`: run the following command as root.
 

Makefile

@@ -254,7 +254,7 @@ tidynonmodern:
 tidymodern:
 	rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
 	rm -rf $(MODERN_OBJ_DIR_NAME)
-	
+
 ifneq ($(MODERN),0)
 $(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
 endif
@@ -410,7 +410,7 @@ LD_SCRIPT := ld_script.txt
 LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
 else
 LD_SCRIPT := ld_script_modern.txt
-LD_SCRIPT_DEPS := 
+LD_SCRIPT_DEPS :=
 endif
 
 $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)

asm/macros/battle_ai_script.inc

@@ -550,38 +550,38 @@
 	.2byte \param1
 	.4byte \param2
 	.endm
-	
+
 @ useful script macros
 	.macro get_curr_move_type
 	get_type AI_TYPE_MOVE
 	.endm
-	
+
 	.macro get_user_type1
 	get_type AI_TYPE1_USER
 	.endm
-	
+
 	.macro get_user_type2
 	get_type AI_TYPE2_USER
 	.endm
-	
+
 	.macro get_target_type1
 	get_type AI_TYPE1_TARGET
 	.endm
-	
+
 	.macro get_target_type2
 	get_type AI_TYPE2_TARGET
 	.endm
-	
+
 	.macro if_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 1, \ptr
 	.endm
-	
+
 	.macro if_no_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 0, \ptr
 	.endm
-	
+
 	.macro if_type battler:req, type:req, ptr:req
 	is_of_type \battler, \type
 	if_equal 1, \ptr
@@ -591,20 +591,20 @@
 	is_of_type \battler, \type
 	if_equal 0, \ptr
 	.endm
-	
+
 	.macro if_target_faster ptr:req
 	if_user_goes 1, \ptr
 	.endm
-	
+
 	.macro if_user_faster ptr:req
 	if_user_goes 0, \ptr
 	.endm
-	
+
 	.macro if_double_battle ptr:req
 	is_double_battle
 	if_equal 1, \ptr
 	.endm
-	
+
 	.macro if_not_double_battle ptr:req
 	is_double_battle
 	if_equal 0, \ptr
@@ -613,7 +613,7 @@
 	.macro if_any_move_disabled battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 0, \ptr
 	.endm
-	
+
 	.macro if_any_move_encored battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 1, \ptr
 	.endm

asm/macros/battle_anim_script.inc

@@ -270,16 +270,16 @@
 	.macro stopsound
 	.byte 0x2f
 	.endm
-	
+
 @ useful macros
 	.macro jumpreteq value:req, ptr:req
 	jumpargeq ARG_RET_ID, \value, \ptr
 	.endm
-	
+
 	.macro jumprettrue ptr:req
 	jumpreteq TRUE, \ptr
 	.endm
-	
+
 	.macro jumpretfalse ptr:req
 	jumpreteq FALSE, \ptr
 	.endm

asm/macros/battle_script.inc

@@ -410,33 +410,33 @@
 	.byte \endMode
 	.byte \endState
 	.endm
-	
+
 	@ Help macros for 5 uses of moveend command
-	
+
 	@ All cases
 	.macro moveendall
 	setbyte sMOVEEND_STATE, 0
 	moveend 0, 0
 	.endm
-	
+
 	@ Chosen case
 	.macro moveendcase case:req
 	setbyte sMOVEEND_STATE, \case
 	moveend 1, 0
 	.endm
-	
+
 	@ All cases from (inclusive)
 	.macro moveendfrom from:req
 	setbyte sMOVEEND_STATE, \from
 	moveend 0, 0
 	.endm
-	
+
 	@ All cases from 0 to (not inclusive)
 	.macro moveendto to:req
 	setbyte sMOVEEND_STATE, 0
 	moveend 2, \to
 	.endm
-	
+
 	@ Cases from (inclusive) to (not inclusive)
 	.macro moveendfromto from:req, to:req
 	setbyte sMOVEEND_STATE, \from
@@ -1252,165 +1252,165 @@
 	.byte 0xf8
 	.byte \position
 	.endm
-	
+
 @ various command changed to more readable macros
 	.macro cancelmultiturnmoves battler:req
 	various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
 	.endm
-	
+
 	.macro setmagiccoattarget battler:req
 	various \battler, VARIOUS_SET_MAGIC_COAT_TARGET
 	.endm
-	
+
 	.macro getifcantrunfrombattle battler:req
 	various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE
 	.endm
-	
+
 	.macro getmovetarget battler:req
 	various \battler, VARIOUS_GET_MOVE_TARGET
 	.endm
-	
+
 	.macro getbattlerfainted battler:req
 	various \battler, VARIOUS_GET_BATTLER_FAINTED
 	.endm
-	
+
 	.macro resetintimidatetracebits battler:req
 	various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
 	.endm
-	
+
 	.macro updatechoicemoveonlvlup battler:req
 	various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
 	.endm
-	
+
 	.macro resetplayerfainted
 	various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
 	.endm
-	
+
 	.macro palaceflavortext battler:req
 	various \battler, VARIOUS_PALACE_FLAVOR_TEXT
 	.endm
-	
+
 	.macro arenajudgmentwindow
 	various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW
 	.endm
-	
+
 	.macro arenaopponentmonlost
 	various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST
 	.endm
-	
+
 	.macro arenaplayermonlost
 	various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST
 	.endm
-	
+
 	.macro arenabothmonlost
 	various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST
 	.endm
-	
+
 	.macro forfeityesnobox battler:req
 	various \battler, VARIOUS_EMIT_YESNOBOX
 	.endm
-	
+
 	.macro arenadrawreftextbox
 	various BS_ATTACKER, VARIOUS_DRAW_ARENA_REF_TEXT_BOX
 	.endm
-	
+
 	.macro arenaerasereftextbox
 	various BS_ATTACKER, VARIOUS_ERASE_ARENA_REF_TEXT_BOX
 	.endm
-	
+
 	.macro arenajudgmentstring id:req
 	various \id, VARIOUS_ARENA_JUDGMENT_STRING
 	.endm
-	
+
 	.macro arenawaitmessage id:req
 	various \id, VARIOUS_ARENA_WAIT_STRING
 	.endm
-	
+
 	.macro waitcry battler:req
 	various \battler, VARIOUS_WAIT_CRY
 	.endm
-	
+
 	.macro returnopponentmon1toball battler:req
 	various \battler, VARIOUS_RETURN_OPPONENT_MON1
 	.endm
-	
+
 	.macro returnopponentmon2toball battler:req
 	various \battler, VARIOUS_RETURN_OPPONENT_MON2
 	.endm
-	
+
 	.macro volumedown
 	various BS_ATTACKER, VARIOUS_VOLUME_DOWN
 	.endm
-	
+
 	.macro volumeup
 	various BS_ATTACKER, VARIOUS_VOLUME_UP
 	.endm
-	
+
 	.macro setalreadystatusedmoveattempt battler:req
 	various \battler, VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT
 	.endm
-	
+
 	.macro palacetryescapestatus battler:req
 	various \battler, VARIOUS_PALACE_TRY_ESCAPE_STATUS
 	.endm
-	
+
 	.macro setoutcomeonteleport battler:req
 	various \battler, VARIOUS_SET_TELEPORT_OUTCOME
 	.endm
-	
+
 	.macro playtrainerdefeatbgm battler:req
 	various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
 	.endm
-	
+
 @ helpful macros
 	.macro setstatchanger stat:req, stages:req, down:req
 	setbyte sSTATCHANGER, \stat | \stages << 4 | \down << 7
 	.endm
-	
+
 	.macro setmoveeffect effect:req
 	setbyte cEFFECT_CHOOSER, \effect
 	.endm
-	
+
 	.macro chosenstatus1animation battler:req, status:req
 	chosenstatusanimation \battler, 0x0, \status
 	.endm
-	
+
 	.macro chosenstatus2animation battler:req, status:req
 	chosenstatusanimation \battler, 0x1, \status
 	.endm
-	
+
 	.macro sethword dst:req, value:req
 	setbyte \dst, (\value) & 0xFF
 	setbyte \dst + 1, ((\value) >> 8) & 0xFF
 	.endm
-	
+
 	.macro setword dst:req, value:req
 	setbyte \dst, (\value) & 0xFF
 	setbyte \dst + 1, ((\value) >> 8) & 0xFF
 	setbyte \dst + 2, ((\value) >> 16) & 0xFF
 	setbyte \dst + 3, ((\value) >> 24) & 0xFF
 	.endm
-	
+
 	.macro copybyte dst:req, src:req
 	copyarray \dst, \src, 0x1
 	.endm
-	
+
 	.macro copyhword dst:req, src:req
 	copyarray \dst, \src, 0x2
 	.endm
-	
+
 	.macro copyword dst:req, src:req
 	copyarray \dst, \src, 0x4
 	.endm
-	
+
 	.macro jumpifbytenotequal byte1:req, byte2:req, jumpptr:req
 	jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr
 	.endm
-	
+
 	.macro jumpifbyteequal byte1:req, byte2:req, jumpptr:req
 	jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr
 	.endm
-	
+
 	.macro jumpifmove move:req, jumpptr:req
 	jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr
 	.endm
@@ -1418,23 +1418,23 @@
 	.macro jumpifnotmove move:req, jumpptr:req
 	jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr
 	.endm
-	
+
 	.macro jumpifstatus3 battler:req, status:req, jumpptr:req
 	jumpifstatus3condition \battler, \status, FALSE, \jumpptr
 	.endm
-	
+
 	.macro jumpifnostatus3 battler:req, status:req, jumpptr:req
 	jumpifstatus3condition \battler, \status, TRUE, \jumpptr
 	.endm
-	
+
 	.macro jumpifmovehadnoeffect jumpptr:req
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr
 	.endm
-	
+
 	.macro jumpifbattletype flags:req, jumpptr:req
 	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
 	.endm
-	
+
 	.macro jumpifnotbattletype flags:req, jumpptr:req
 	jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
 	.endm

asm/macros/event.inc

@@ -276,8 +276,8 @@
 	.2byte SPECIAL_\function
 	.endm
 
-	@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific 
-	@ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue.
+	@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific
+	@ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
 	.macro waitstate
 	.byte 0x27
 	.endm
@@ -985,7 +985,7 @@
 	.endm
 
 	@ Gives the player a Pokémon of the specified species and level, holding the specified item. The trailing 0s are unused parameters.
-	@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome. 
+	@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
 	.macro givemon species:req, level:req, item=ITEM_NONE
 	.byte 0x79
 	.2byte \species
@@ -997,7 +997,7 @@
 	.endm
 
 	@ Gives the player an Egg of the specified species.
-	@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome. 
+	@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
 	.macro giveegg species:req
 	.byte 0x7a
 	.2byte \species
@@ -1415,7 +1415,7 @@
 	.2byte \out
 	.endm
 
-	@ Gives 'count' coins to the player, up to a total of MAX_COINS. 
+	@ Gives 'count' coins to the player, up to a total of MAX_COINS.
 	@ If the player already has MAX_COINS then VAR_RESULT is set to TRUE, otherwise it is set to FALSE.
 	.macro addcoins count:req
 	.byte 0xb4
@@ -1887,7 +1887,7 @@
 
 	@ Gives 'amount' of the specified 'item' to the player and prints a message with fanfare.
 	@ If the player doesn't have space for all the items then as many are added as possible, the
-	@ message indicates there is no room, and VAR_RESULT is set to FALSE. 
+	@ message indicates there is no room, and VAR_RESULT is set to FALSE.
 	@ Otherwise VAR_RESULT is set to TRUE, and the message indicates they have received the item(s).
 	.macro giveitem item:req, amount=1
 	setorcopyvar VAR_0x8000, \item

asm/macros/movement.inc

@@ -152,8 +152,8 @@
 	create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
 	create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
 	create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
-	create_movement_action store_lock_anim, MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
-	create_movement_action free_unlock_anim, MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
+	create_movement_action lock_anim, MOVEMENT_ACTION_LOCK_ANIM
+	create_movement_action unlock_anim, MOVEMENT_ACTION_UNLOCK_ANIM
 	create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE
 	create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE
 	create_movement_action levitate, MOVEMENT_ACTION_LEVITATE

data/battle_anim_scripts.s

@@ -798,14 +798,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, 1, 0
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 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, 1, 1
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
 	delay 3
@@ -2441,7 +2441,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
@@ -2590,7 +2590,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
@@ -2835,7 +2835,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
@@ -3958,7 +3958,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
@@ -8570,14 +8570,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

@@ -1,6 +1,7 @@
 #include "constants/global.h"
 #include "constants/battle.h"
 #include "constants/pokemon.h"
+#include "constants/battle_arena.h"
 #include "constants/battle_script_commands.h"
 #include "constants/battle_anim.h"
 #include "constants/battle_string_ids.h"
@@ -14,7 +15,7 @@
 	.include "constants/constants.inc"
 
 	.section script_data, "aw", %progbits
-	
+
 .align 2
 gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectHit                    @ EFFECT_HIT
@@ -1927,8 +1928,8 @@ BattleScript_EffectTeleport::
 	ppreduce
 	jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
 	getifcantrunfrombattle BS_ATTACKER
-	jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed
-	jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective
+	jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
+	jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
 	attackanimation
 	waitanimation
 	printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -2825,7 +2826,7 @@ BattleScript_GiveExp::
 	setbyte sGIVEEXP_STATE, 0
 	getexp BS_TARGET
 	end2
-	
+
 BattleScript_HandleFaintedMon::
 	checkteamslost BattleScript_LinkHandleFaintedMonMultiple
 	jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
@@ -4045,7 +4046,7 @@ BattleScript_IntimidatePrevented:
 	printstring STRINGID_PREVENTEDFROMWORKING
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_IntimidateActivatesLoopIncrement
-	
+
 BattleScript_DroughtActivates::
 	pause B_WAIT_TIME_SHORT
 	printstring STRINGID_PKMNSXINTENSIFIEDSUN
@@ -4482,7 +4483,7 @@ BattleScript_ArenaDoJudgment::
 	arenajudgmentstring B_MSG_REF_THATS_IT
 	arenawaitmessage B_MSG_REF_THATS_IT
 	pause B_WAIT_TIME_LONG
-	setbyte gBattleCommunication, 0
+	setbyte gBattleCommunication, 0  @ Reset state for arenajudgmentwindow
 	arenajudgmentwindow
 	pause B_WAIT_TIME_LONG
 	arenajudgmentwindow
@@ -4495,8 +4496,9 @@ BattleScript_ArenaDoJudgment::
 	arenajudgmentstring B_MSG_REF_JUDGE_BODY
 	arenawaitmessage B_MSG_REF_JUDGE_BODY
 	arenajudgmentwindow
-	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses
-	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw
+	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
+	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
+@ ARENA_RESULT_PLAYER_WON
 	arenajudgmentstring B_MSG_REF_PLAYER_WON
 	arenawaitmessage B_MSG_REF_PLAYER_WON
 	arenajudgmentwindow

data/contest_ai_scripts.s

@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
 AI_CGM_BetterWhenAudienceExcited_1stUp:
 	@ BUG: Should be if_appeal_num_eq 0
 	@ 1st up on 1st appeal excitement will always be 0
-	if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal
+.ifdef BUGFIX
+	if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
+.else
+	if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
+.endif
 	if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
 	if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
 	end
-AI_CGM_BetterWhenAudienceExcited_Not1stAppeal:
+AI_CGM_BetterWhenAudienceExcited_1stAppeal:
 	if_random_less_than 125, AI_CGM_End
 	score -15
 	end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
 	end
 AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 	if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.else
 	if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
+.endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
 	score +2
 	if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 	if_user_order_eq MON_2, AI_CGM_End
 	if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.else
 	if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
+.endif
 	if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
 	score +2
 	if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
 AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
 	if_user_order_eq MON_3, AI_CGM_End
 	if_cannot_participate MON_3, AI_CGM_End
+.ifdef BUGFIX
+	if_not_used_combo_starter MON_3, AI_CGM_End
+.else
 	if_used_combo_starter MON_3, AI_CGM_End
+.endif
 	if_random_less_than 125, AI_CGM_End
 	score +2
 	if_not_completed_combo MON_3, AI_CGM_End

data/maps/AbandonedShip_HiddenFloorRooms/map.json

@@ -51,7 +51,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
-      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/AbandonedShip_Room_B1F/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
-      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
+      "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
     }
   ],
   "warp_events": [

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
 
 @ Unused
 BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
-    .string "For the feat of your 7-win streak,\n"
-    .string "we present you with Battle Point(s).$"
+	.string "For the feat of your 7-win streak,\n"
+	.string "we present you with Battle Point(s).$"
 
 BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
 	.string "You seem to have no space for\n"

data/maps/EverGrandeCity_ChampionsRoom/scripts.inc

@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
-    releaseall
-    end
+	releaseall
+	end
 
 EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
 	walk_up

data/maps/FortreeCity_DecorationShop/scripts.inc

@@ -19,7 +19,7 @@ FortreeCity_DecorationShop_EventScript_ClerkDesks::
 	release
 	end
 
-    .align 2
+	.align 2
 FortreeCity_DecorationShop_PokemartDecor_Desks:
 	.2byte DECOR_SMALL_DESK
 	.2byte DECOR_POKEMON_DESK

data/maps/MeteorFalls_1F_1R/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
-      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
+      "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM23"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/MeteorFalls_B1F_2R/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
-      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
+      "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM02"
     }
   ],
   "warp_events": [

data/maps/MtPyre_6F/map.json

@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MtPyre_6F_EventScript_ItemTM30",
-      "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
+      "flag": "FLAG_ITEM_MT_PYRE_6F_TM30"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",

data/maps/MtPyre_Exterior/map.json

@@ -38,7 +38,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MtPyre_Exterior_EventScript_ItemTM48",
-      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
+      "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM48"
     }
   ],
   "warp_events": [

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::
-	msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
+OldaleTown_EventScript_TownSign::
+	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/Route111/map.json

@@ -262,7 +262,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route111_EventScript_ItemTM37",
-      "flag": "FLAG_ITEM_ROUTE_111_TM_37"
+      "flag": "FLAG_ITEM_ROUTE_111_TM37"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",

data/maps/Route111/scripts.inc

@@ -144,7 +144,7 @@ Route111_EventScript_RootFossilDisappeared::
 
 @ Unused
 Route111_Movement_PlayerFall::
-	store_lock_anim
+	lock_anim
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down

data/maps/Route113/map.json

@@ -451,7 +451,7 @@
       "y": 5,
       "elevation": 3,
       "item": "ITEM_TM32",
-      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32"
+      "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM32"
     },
     {
       "type": "hidden_item",

data/maps/Route115/map.json

@@ -166,7 +166,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route115_EventScript_ItemTM01",
-      "flag": "FLAG_ITEM_ROUTE_115_TM_01"
+      "flag": "FLAG_ITEM_ROUTE_115_TM01"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/SafariZone_Northwest/map.json

@@ -49,7 +49,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "SafariZone_Northwest_EventScript_ItemTM22",
-      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22"
+      "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM22"
     }
   ],
   "warp_events": [],

data/maps/ScorchedSlab/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "ScorchedSlab_EventScript_ItemTM11",
-      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11"
+      "flag": "FLAG_ITEM_SCORCHED_SLAB_TM11"
     }
   ],
   "warp_events": [

data/maps/SeafloorCavern_Room9/map.json

@@ -90,7 +90,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "SeafloorCavern_Room9_EventScript_ItemTM26",
-      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26"
+      "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM26"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_KYOGRE_ASLEEP",

data/maps/ShoalCave_LowTideIceRoom/map.json

@@ -25,7 +25,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "ShoalCave_LowTideIceRoom_EventScript_ItemTM07",
-      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07"
+      "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM07"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/maps/SkyPillar_Top/map.json

@@ -56,7 +56,7 @@
       "x": 14,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE",
+      "var": "VAR_SKY_PILLAR_RAYQUAZA_CRY_DONE",
       "var_value": "0",
       "script": "SkyPillar_Top_EventScript_AwakenRayquaza"
     }

data/maps/SkyPillar_Top/scripts.inc

@@ -128,7 +128,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza::
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 5
 	setvar VAR_SKY_PILLAR_STATE, 1
-	setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1
+	setvar VAR_SKY_PILLAR_RAYQUAZA_CRY_DONE, 1
 	releaseall
 	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 1, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
-	case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
-	case 3, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
-	case 4, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
-	case 5, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
-	case 6, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
+	case FRIENDSHIP_NONE, VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou
+	case FRIENDSHIP_1_TO_49, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary
+	case FRIENDSHIP_50_TO_99, VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou
+	case FRIENDSHIP_100_TO_149, VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou
+	case FRIENDSHIP_150_TO_199, VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot
+	case FRIENDSHIP_200_TO_254, VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy
+	case FRIENDSHIP_MAX, VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou
 	release
 	end
 

data/maps/VictoryRoad_B1F/map.json

@@ -246,7 +246,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "VictoryRoad_B1F_EventScript_ItemTM29",
-      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29"
+      "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM29"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",

data/scripts/mauville_man.inc

@@ -315,7 +315,7 @@ MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory::
 	.string "the HOENN region!$"
 
 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
-    .string "The BERRY-Planting TRAINER$"
+	.string "The BERRY-Planting TRAINER$"
 
 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
 	.string "Planted BERRIES$"

data/scripts/new_game.inc

@@ -38,7 +38,7 @@ EventScript_ResetAllBerries::
 	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_3, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
 	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_2, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
 	setberrytree BERRY_TREE_ROUTE_117_WEPEAR_1, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
-	
+
 	@ Route 112
 	setberrytree BERRY_TREE_ROUTE_112_RAWST_2, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
 	setberrytree BERRY_TREE_ROUTE_112_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES

data/scripts/roulette.inc

@@ -22,7 +22,7 @@ Roulette_EventScript_Play::
 	special PlayRoulette
 	waitstate
 	end
-	
+
 Roulette_Text_PlayMinimumWagerIsX::
 	.string "The minimum wager at this table\n"
 	.string "is {STR_VAR_1}. Do you want to play?$"

data/text/event_ticket_2.inc

@@ -1,71 +1,71 @@
 EventTicket_Text_OldSeaMapTooFar:
-    .string "What's up, youngster?\p"
-    .string "What, it's you who's supposed to have\n"
-    .string "a tattered old map?\p"
-    .string "Let's have a look.\n"
-    .string "… … … … … …\p"
-    .string "Boy, this is quite a ways away.\n"
-    .string "I'm afraid I can't help you…$"
+	.string "What's up, youngster?\p"
+	.string "What, it's you who's supposed to have\n"
+	.string "a tattered old map?\p"
+	.string "Let's have a look.\n"
+	.string "… … … … … …\p"
+	.string "Boy, this is quite a ways away.\n"
+	.string "I'm afraid I can't help you…$"
 
 EventTicket_Text_BrineyHoldOnASecond:
-    .string "BRINEY: Hold on a second!\p"
-    .string "What's the idea of turning down\n"
-    .string "someone that I owe so much to?$"
+	.string "BRINEY: Hold on a second!\p"
+	.string "What's the idea of turning down\n"
+	.string "someone that I owe so much to?$"
 
 EventTicket_Text_BrineyLetsSail:
-    .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
-    .string "You came to me seeking my help,\n"
-    .string "and we almost turned you away.\p"
-    .string "Well, let me make things right.\p"
-    .string "We'll sail right away, of course!\p"
-    .string "Let's find this island on\n"
-    .string "this OLD SEA MAP!$"
+	.string "{PLAYER}{KUN}, I'm terribly sorry.\p"
+	.string "You came to me seeking my help,\n"
+	.string "and we almost turned you away.\p"
+	.string "Well, let me make things right.\p"
+	.string "We'll sail right away, of course!\p"
+	.string "Let's find this island on\n"
+	.string "this OLD SEA MAP!$"
 
 EventTicket_Text_OddTicketGetOnBoard:
-    .string "Is it you who brought that odd\n"
-    .string "ticket?\p"
-    .string "Where you're trying to go is an island\n"
-    .string "that's far, far away.\p"
-    .string "No one knows what awaits there…\p"
-    .string "The very thought excites my blood\n"
-    .string "as a sailing man!\p"
-    .string "Get on board, youngster!$"
+	.string "Is it you who brought that odd\n"
+	.string "ticket?\p"
+	.string "Where you're trying to go is an island\n"
+	.string "that's far, far away.\p"
+	.string "No one knows what awaits there…\p"
+	.string "The very thought excites my blood\n"
+	.string "as a sailing man!\p"
+	.string "Get on board, youngster!$"
 
 FarawayIsland_Entrance_Text_SailorReturn:
-    .string "CAPT. BRINEY can be so maddeningly\n"
-    .string "fickle…\p"
-    .string "Do you want to return to LILYCOVE?$"
+	.string "CAPT. BRINEY can be so maddeningly\n"
+	.string "fickle…\p"
+	.string "Do you want to return to LILYCOVE?$"
 
 BirthIsland_Harbor_Text_SailorReturn:
-    .string "What an oddly shaped island, eh?\n"
-    .string "Do you want to return to LILYCOVE?$"
+	.string "What an oddly shaped island, eh?\n"
+	.string "Do you want to return to LILYCOVE?$"
 
 EventTicket_Text_OddTicketsWhereTo:
-    .string "Is it you who brought those\n"
-    .string "odd tickets?\p"
-    .string "… … …Hm.\p"
-    .string "These tickets will get you to islands\n"
-    .string "that are far, far away.\p"
-    .string "No one knows what awaits there,\n"
-    .string "or what may happen there.\p"
-    .string "The very thought excites my blood\n"
-    .string "as a sailing man!\p"
-    .string "Get on board, youngster!\n"
-    .string "Where shall we sail first?$"
+	.string "Is it you who brought those\n"
+	.string "odd tickets?\p"
+	.string "… … …Hm.\p"
+	.string "These tickets will get you to islands\n"
+	.string "that are far, far away.\p"
+	.string "No one knows what awaits there,\n"
+	.string "or what may happen there.\p"
+	.string "The very thought excites my blood\n"
+	.string "as a sailing man!\p"
+	.string "Get on board, youngster!\n"
+	.string "Where shall we sail first?$"
 
 NavelRock_Harbor_Text_SailorReturn:
-    .string "Did… Did you hear that?\n"
-    .string "That low growling from deep in there.\p"
-    .string "Are you sure it's safe?\n"
-    .string "Do you think we should leave?$"
+	.string "Did… Did you hear that?\n"
+	.string "That low growling from deep in there.\p"
+	.string "Are you sure it's safe?\n"
+	.string "Do you think we should leave?$"
 
 FarawayIsland_Entrance_Text_Sign:
-    .string "The writing is fading as if it was\n"
-    .string "written a long time ago…\p"
-    .string "“…ber, 6th day\n"
-    .string "If any human…sets foot here…\l"
-    .string "again…et it be a kindhearted pers…\l"
-    .string "…ith that hope, I depar…”$"
+	.string "The writing is fading as if it was\n"
+	.string "written a long time ago…\p"
+	.string "“…ber, 6th day\n"
+	.string "If any human…sets foot here…\l"
+	.string "again…et it be a kindhearted pers…\l"
+	.string "…ith that hope, I depar…”$"
 
 FarawayIsland_Interior_Text_Mew:
-    .string "Myuu…$"
+	.string "Myuu…$"

data/text/pkmn_center_nurse.inc

@@ -1,51 +1,51 @@
 gText_WouldYouLikeToRestYourPkmn::
-    .string "Hello, and welcome to\n"
-    .string "the POKéMON CENTER.\p"
-    .string "We restore your tired POKéMON\n"
-    .string "to full health.\p"
-    .string "Would you like to rest your POKéMON?$"
+	.string "Hello, and welcome to\n"
+	.string "the POKéMON CENTER.\p"
+	.string "We restore your tired POKéMON\n"
+	.string "to full health.\p"
+	.string "Would you like to rest your POKéMON?$"
 
 gText_IllTakeYourPkmn::
-    .string "Okay, I'll take your POKéMON\n"
-    .string "for a few seconds.$"
+	.string "Okay, I'll take your POKéMON\n"
+	.string "for a few seconds.$"
 
 gText_RestoredPkmnToFullHealth::
-    .string "Thank you for waiting.\p"
-    .string "We've restored your POKéMON\n"
-    .string "to full health.$"
+	.string "Thank you for waiting.\p"
+	.string "We've restored your POKéMON\n"
+	.string "to full health.$"
 
 gText_WeHopeToSeeYouAgain::
-    .string "We hope to see you again!$"
+	.string "We hope to see you again!$"
 
 gText_WelcomeCutShort::
-    .string "Hello, and welcome to\n"
-    .string "the POKéMON CENTER.\p"
-    .string "We restore your tired POKéMON\n"
-    .string "to full health.\p"
-    .string "Would you like to…$"
+	.string "Hello, and welcome to\n"
+	.string "the POKéMON CENTER.\p"
+	.string "We restore your tired POKéMON\n"
+	.string "to full health.\p"
+	.string "Would you like to…$"
 
 gText_NoticesGoldCard::
-    .string "Th-that card…\n"
-    .string "Could it be… The GOLD CARD?!\p"
-    .string "Oh, the gold color is brilliant!\n"
-    .string "The four stars seem to sparkle!\p"
-    .string "I've seen several TRAINERS with\n"
-    .string "a SILVER CARD before, but, {PLAYER},\l"
-    .string "you're the first TRAINER I've ever\l"
-    .string "seen with a GOLD CARD!\p"
-    .string "Okay, {PLAYER}, please allow me\n"
-    .string "the honor of resting your POKéMON!$"
+	.string "Th-that card…\n"
+	.string "Could it be… The GOLD CARD?!\p"
+	.string "Oh, the gold color is brilliant!\n"
+	.string "The four stars seem to sparkle!\p"
+	.string "I've seen several TRAINERS with\n"
+	.string "a SILVER CARD before, but, {PLAYER},\l"
+	.string "you're the first TRAINER I've ever\l"
+	.string "seen with a GOLD CARD!\p"
+	.string "Okay, {PLAYER}, please allow me\n"
+	.string "the honor of resting your POKéMON!$"
 
 gText_YouWantTheUsual::
-    .string "I'm delighted to see you, {PLAYER}!\n"
-    .string "You want the usual, am I right?$"
+	.string "I'm delighted to see you, {PLAYER}!\n"
+	.string "You want the usual, am I right?$"
 
 gText_IllTakeYourPkmn2::
-    .string "Okay, I'll take your POKéMON\n"
-    .string "for a few seconds.$"
+	.string "Okay, I'll take your POKéMON\n"
+	.string "for a few seconds.$"
 
 gText_ThankYouForWaiting::
-    .string "Thank you for waiting.$"
+	.string "Thank you for waiting.$"
 
 gText_WeHopeToSeeYouAgain2::
-    .string "We hope to see you again!$"
+	.string "We hope to see you again!$"

data/text/secret_base_trainers.inc

@@ -1,286 +1,286 @@
 SecretBase_Text_Trainer0Intro:
-    .string "Have you made a SECRET BASE already?\p"
-    .string "I went here, there, everywhere before\n"
-    .string "choosing this place.\p"
-    .string "Since you're already here, how would\n"
-    .string "you like to battle?$"
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Since you're already here, how would\n"
+	.string "you like to battle?$"
 
 SecretBase_Text_Trainer0AcceptBattle:
-    .string "Okay!\n"
-    .string "Here we come!$"
+	.string "Okay!\n"
+	.string "Here we come!$"
 
 SecretBase_Text_Trainer0DeclineBattle:
-    .string "Hunh?\n"
-    .string "Oh, you can't now…$"
+	.string "Hunh?\n"
+	.string "Oh, you can't now…$"
 
 SecretBase_Text_Trainer0Defeated::
-    .string "Waaargh! You're too strong!\n"
-    .string "About me losing… Please keep it secret!$"
+	.string "Waaargh! You're too strong!\n"
+	.string "About me losing… Please keep it secret!$"
 
 SecretBase_Text_Trainer0PostBattle:
-    .string "What do you think of my SECRET BASE?\n"
-    .string "Come visit me again tomorrow.$"
+	.string "What do you think of my SECRET BASE?\n"
+	.string "Come visit me again tomorrow.$"
 
 SecretBase_Text_Trainer0PreChampion:
-    .string "Have you made a SECRET BASE already?\p"
-    .string "I went here, there, everywhere before\n"
-    .string "choosing this place.\p"
-    .string "Feel free to hang out!$"
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Feel free to hang out!$"
 
 SecretBase_Text_Trainer5Intro:
-    .string "There're a lot of places where\n"
-    .string "you can make a SECRET BASE.\p"
-    .string "But I like this spot best.\n"
-    .string "Don't you think it's nice?\p"
-    .string "Oh, would you like to have a battle?$"
+	.string "There're a lot of places where\n"
+	.string "you can make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?\p"
+	.string "Oh, would you like to have a battle?$"
 
 SecretBase_Text_Trainer5AcceptBattle:
-    .string "Okay, here goes!$"
+	.string "Okay, here goes!$"
 
 SecretBase_Text_Trainer5DeclineBattle:
-    .string "Oh…\n"
-    .string "You can't now, okay.$"
+	.string "Oh…\n"
+	.string "You can't now, okay.$"
 
 SecretBase_Text_Trainer5Defeated::
-    .string "Hmmm… It's our loss…\n"
-    .string "But don't tell anyone!\l"
-    .string "It's a confidential secret!$"
+	.string "Hmmm… It's our loss…\n"
+	.string "But don't tell anyone!\l"
+	.string "It's a confidential secret!$"
 
 SecretBase_Text_Trainer5PostBattle:
-    .string "If you're in this area again,\n"
-    .string "I hope you'll visit me.$"
+	.string "If you're in this area again,\n"
+	.string "I hope you'll visit me.$"
 
 SecretBase_Text_Trainer5PreChampion:
-    .string "There're a lot of places where you can\n"
-    .string "make a SECRET BASE.\p"
-    .string "But I like this spot best.\n"
-    .string "Don't you think it's nice?$"
+	.string "There're a lot of places where you can\n"
+	.string "make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?$"
 
 SecretBase_Text_Trainer1Intro:
-    .string "This is a popular spot.\n"
-    .string "It's always taken.\p"
-    .string "Oh! Were you thinking about\n"
-    .string "taking this spot, too?\p"
-    .string "I'll tell you what, you can have this\n"
-    .string "spot if you can beat me.$"
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "Oh! Were you thinking about\n"
+	.string "taking this spot, too?\p"
+	.string "I'll tell you what, you can have this\n"
+	.string "spot if you can beat me.$"
 
 SecretBase_Text_Trainer1AcceptBattle:
-    .string "Okay!\n"
-    .string "I'm going to defend my SECRET BASE!$"
+	.string "Okay!\n"
+	.string "I'm going to defend my SECRET BASE!$"
 
 SecretBase_Text_Trainer1DeclineBattle:
-    .string "Hunh? Is that right?\n"
-    .string "You're not interested in this spot?$"
+	.string "Hunh? Is that right?\n"
+	.string "You're not interested in this spot?$"
 
 SecretBase_Text_Trainer1Defeated::
-    .string "I can't keep going!\n"
-    .string "I surrender!$"
+	.string "I can't keep going!\n"
+	.string "I surrender!$"
 
 SecretBase_Text_Trainer1PostBattle:
-    .string "Okay, when I move one day,\n"
-    .string "this place will be yours!$"
+	.string "Okay, when I move one day,\n"
+	.string "this place will be yours!$"
 
 SecretBase_Text_Trainer1PreChampion:
-    .string "This is a popular spot.\n"
-    .string "It's always taken.\p"
-    .string "I waited a long time for it to open.\n"
-    .string "I finally got to use it!$"
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "I waited a long time for it to open.\n"
+	.string "I finally got to use it!$"
 
 SecretBase_Text_Trainer6Intro:
-    .string "Welcome to my POKéMON LAB.\p"
-    .string "I carry out research on battling in\n"
-    .string "secrecy.\p"
-    .string "Would you like to see how strong I am?$"
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.\p"
+	.string "Would you like to see how strong I am?$"
 
 SecretBase_Text_Trainer6AcceptBattle:
-    .string "I'm going to go all out!$"
+	.string "I'm going to go all out!$"
 
 SecretBase_Text_Trainer6DeclineBattle:
-    .string "Oh.\n"
-    .string "Some other time, then!$"
+	.string "Oh.\n"
+	.string "Some other time, then!$"
 
 SecretBase_Text_Trainer6Defeated::
-    .string "Hmm… I've still got lots to learn.\n"
-    .string "I have to study some more.$"
+	.string "Hmm… I've still got lots to learn.\n"
+	.string "I have to study some more.$"
 
 SecretBase_Text_Trainer6PostBattle:
-    .string "Thanks for battling with me.\n"
-    .string "Please come back again tomorrow.$"
+	.string "Thanks for battling with me.\n"
+	.string "Please come back again tomorrow.$"
 
 SecretBase_Text_Trainer6PreChampion:
-    .string "Welcome to my POKéMON LAB.\p"
-    .string "I carry out research on battling in\n"
-    .string "secrecy.$"
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.$"
 
 SecretBase_Text_Trainer2Intro:
-    .string "A big mansion is nice, but I like this\n"
-    .string "sort of place more.\p"
-    .string "I like it because all kinds of people\n"
-    .string "come visit me.\p"
-    .string "So, how would you like a battle?$"
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.\p"
+	.string "So, how would you like a battle?$"
 
 SecretBase_Text_Trainer2AcceptBattle:
-    .string "That's the way!$"
+	.string "That's the way!$"
 
 SecretBase_Text_Trainer2DeclineBattle:
-    .string "When you're ready, give me a shout!$"
+	.string "When you're ready, give me a shout!$"
 
 SecretBase_Text_Trainer2Defeated::
-    .string "Aww! Done in!\n"
-    .string "But it's still fun to battle!$"
+	.string "Aww! Done in!\n"
+	.string "But it's still fun to battle!$"
 
 SecretBase_Text_Trainer2PostBattle:
-    .string "Well, anyway, I should go buy some\n"
-    .string "decorations and furniture.\p"
-    .string "I want my SECRET BASE to be a place\n"
-    .string "other people can enjoy.$"
+	.string "Well, anyway, I should go buy some\n"
+	.string "decorations and furniture.\p"
+	.string "I want my SECRET BASE to be a place\n"
+	.string "other people can enjoy.$"
 
 SecretBase_Text_Trainer2PreChampion:
-    .string "A big mansion is nice, but I like this\n"
-    .string "sort of place more.\p"
-    .string "I like it because all kinds of people\n"
-    .string "come visit me.$"
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.$"
 
 SecretBase_Text_Trainer7Intro:
-    .string "I simply adore shopping for decorations\n"
-    .string "and furniture.\p"
-    .string "I also love raising POKéMON just\n"
-    .string "as much.\p"
-    .string "If you would be so kind, will you battle\n"
-    .string "with my POKéMON?$"
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.\p"
+	.string "If you would be so kind, will you battle\n"
+	.string "with my POKéMON?$"
 
 SecretBase_Text_Trainer7AcceptBattle:
-    .string "Thank you.\n"
-    .string "Shall we begin?$"
+	.string "Thank you.\n"
+	.string "Shall we begin?$"
 
 SecretBase_Text_Trainer7DeclineBattle:
-    .string "Oh.\n"
-    .string "How disappointing…$"
+	.string "Oh.\n"
+	.string "How disappointing…$"
 
 SecretBase_Text_Trainer7Defeated::
-    .string "I concede…$"
+	.string "I concede…$"
 
 SecretBase_Text_Trainer7PostBattle:
-    .string "That was all in good fun!\n"
-    .string "I should go enjoy shopping now.$"
+	.string "That was all in good fun!\n"
+	.string "I should go enjoy shopping now.$"
 
 SecretBase_Text_Trainer7PreChampion:
-    .string "I simply adore shopping for decorations\n"
-    .string "and furniture.\p"
-    .string "I also love raising POKéMON just\n"
-    .string "as much.$"
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.$"
 
 SecretBase_Text_Trainer3Intro:
-    .string "Some people make their SECRET BASES in\n"
-    .string "hard-to-find places.\l"
-    .string "Do they want to just lie low?\p"
-    .string "But since you found me, how about we\n"
-    .string "have a battle?$"
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?\p"
+	.string "But since you found me, how about we\n"
+	.string "have a battle?$"
 
 SecretBase_Text_Trainer3AcceptBattle:
-    .string "I'm not going down easily!$"
+	.string "I'm not going down easily!$"
 
 SecretBase_Text_Trainer3DeclineBattle:
-    .string "Oh… Are you maybe tired from searching\n"
-    .string "for this place?$"
+	.string "Oh… Are you maybe tired from searching\n"
+	.string "for this place?$"
 
 SecretBase_Text_Trainer3Defeated::
-    .string "I went down…$"
+	.string "I went down…$"
 
 SecretBase_Text_Trainer3PostBattle:
-    .string "Where's your SECRET BASE?\n"
-    .string "I should go visit you there.$"
+	.string "Where's your SECRET BASE?\n"
+	.string "I should go visit you there.$"
 
 SecretBase_Text_Trainer3PreChampion:
-    .string "Some people make their SECRET BASES in\n"
-    .string "hard-to-find places.\l"
-    .string "Do they want to just lie low?$"
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?$"
 
 SecretBase_Text_Trainer8Intro:
-    .string "People have told me that you can get\n"
-    .string "decorations in several ways.\p"
-    .string "We should have a race to see who can\n"
-    .string "get nicer decorations and furniture!\p"
-    .string "In the meantime, want to battle?$"
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!\p"
+	.string "In the meantime, want to battle?$"
 
 SecretBase_Text_Trainer8AcceptBattle:
-    .string "This is my SECRET BASE.\n"
-    .string "I can't lose!$"
+	.string "This is my SECRET BASE.\n"
+	.string "I can't lose!$"
 
 SecretBase_Text_Trainer8DeclineBattle:
-    .string "I'll battle with you anytime.$"
+	.string "I'll battle with you anytime.$"
 
 SecretBase_Text_Trainer8Defeated::
-    .string "Huh?\n"
-    .string "Did I just lose?$"
+	.string "Huh?\n"
+	.string "Did I just lose?$"
 
 SecretBase_Text_Trainer8PostBattle:
-    .string "I won't lose at collecting decorations.\n"
-    .string "Come visit again!$"
+	.string "I won't lose at collecting decorations.\n"
+	.string "Come visit again!$"
 
 SecretBase_Text_Trainer8PreChampion:
-    .string "People have told me that you can get\n"
-    .string "decorations in several ways.\p"
-    .string "We should have a race to see who can\n"
-    .string "get nicer decorations and furniture!$"
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!$"
 
 SecretBase_Text_Trainer4Intro:
-    .string "I found a spot I liked, and I did it up\n"
-    .string "with my favorite decorations.\p"
-    .string "I raise my favorite POKéMON and grow\n"
-    .string "stronger with it.\p"
-    .string "That's what I do.\n"
-    .string "Want to battle with me?$"
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "That's what I do.\n"
+	.string "Want to battle with me?$"
 
 SecretBase_Text_Trainer4AcceptBattle:
-    .string "Show me what you're made of!$"
+	.string "Show me what you're made of!$"
 
 SecretBase_Text_Trainer4DeclineBattle:
-    .string "I guess there are times when you're not\n"
-    .string "into it.$"
+	.string "I guess there are times when you're not\n"
+	.string "into it.$"
 
 SecretBase_Text_Trainer4Defeated::
-    .string "I know exactly what you're made of now.$"
+	.string "I know exactly what you're made of now.$"
 
 SecretBase_Text_Trainer4PostBattle:
-    .string "We can both become stronger.\n"
-    .string "Let's keep at it!$"
+	.string "We can both become stronger.\n"
+	.string "Let's keep at it!$"
 
 SecretBase_Text_Trainer4PreChampion:
-    .string "I found a spot I liked, and I did it up\n"
-    .string "with my favorite decorations.\p"
-    .string "I raise my favorite POKéMON and grow\n"
-    .string "stronger with it.\p"
-    .string "Every day is a great day.$"
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "Every day is a great day.$"
 
 SecretBase_Text_Trainer9Intro:
-    .string "You can learn a lot about the taste\n"
-    .string "and sense of people by the kinds of\l"
-    .string "decorations they have, and how they\l"
-    .string "display them.\p"
-    .string "What do you think of my taste?\n"
-    .string "Are you speechless?\p"
-    .string "Want to see my taste in battling?$"
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?\p"
+	.string "Want to see my taste in battling?$"
 
 SecretBase_Text_Trainer9AcceptBattle:
-    .string "There's no holding back!$"
+	.string "There's no holding back!$"
 
 SecretBase_Text_Trainer9DeclineBattle:
-    .string "I'll be happy to demonstrate my style\n"
-    .string "anytime.$"
+	.string "I'll be happy to demonstrate my style\n"
+	.string "anytime.$"
 
 SecretBase_Text_Trainer9Defeated::
-    .string "You're supremely talented!\n"
-    .string "Your power seems to be limitless…$"
+	.string "You're supremely talented!\n"
+	.string "Your power seems to be limitless…$"
 
 SecretBase_Text_Trainer9PostBattle:
-    .string "What did you think of my style?\n"
-    .string "I'll keep on polishing it!$"
+	.string "What did you think of my style?\n"
+	.string "I'll keep on polishing it!$"
 
 SecretBase_Text_Trainer9PreChampion:
-    .string "You can learn a lot about the taste\n"
-    .string "and sense of people by the kinds of\l"
-    .string "decorations they have, and how they\l"
-    .string "display them.\p"
-    .string "What do you think of my taste?\n"
-    .string "Are you speechless?$"
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?$"

docs/legacy_WSL1_INSTALL.md

@@ -17,8 +17,8 @@
     cd /mnt/c/Users/<user>/Downloads
     ```
 
-    > Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.  
-    > Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd     "/mnt/c/users/<user>/Downloads folder"`.  
+    > Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.
+    > Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd     "/mnt/c/users/<user>/Downloads folder"`.
     > Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
 
 4. Once the directory has been changed to the folder containing the devkitPro pacman package, run the following commands to install devkitARM.

gflib/bg.h

@@ -3,29 +3,29 @@
 
 enum
 {
-	BG_ATTR_CHARBASEINDEX = 1,
-	BG_ATTR_MAPBASEINDEX,
-	BG_ATTR_SCREENSIZE,
-	BG_ATTR_PALETTEMODE,
-	BG_ATTR_MOSAIC,
-	BG_ATTR_WRAPAROUND,
-	BG_ATTR_PRIORITY,
-	BG_ATTR_METRIC,
-	BG_ATTR_TYPE,
-	BG_ATTR_BASETILE,
+    BG_ATTR_CHARBASEINDEX = 1,
+    BG_ATTR_MAPBASEINDEX,
+    BG_ATTR_SCREENSIZE,
+    BG_ATTR_PALETTEMODE,
+    BG_ATTR_MOSAIC,
+    BG_ATTR_WRAPAROUND,
+    BG_ATTR_PRIORITY,
+    BG_ATTR_METRIC,
+    BG_ATTR_TYPE,
+    BG_ATTR_BASETILE,
 };
 
 enum {
-	BG_TYPE_NORMAL,
-	BG_TYPE_AFFINE,
-	BG_TYPE_NONE = 0xFFFF
+    BG_TYPE_NORMAL,
+    BG_TYPE_AFFINE,
+    BG_TYPE_NONE = 0xFFFF
 };
 
 // Modes for ChangeBgX / ChangeBgY
 enum {
-	BG_COORD_SET,
-	BG_COORD_ADD,
-	BG_COORD_SUB,
+    BG_COORD_SET,
+    BG_COORD_ADD,
+    BG_COORD_SUB,
 };
 
 // Modes for Unused_AdjustBgMosaic

gflib/malloc.h

@@ -2,13 +2,10 @@
 #define GUARD_ALLOC_H
 
 #define HEAP_SIZE 0x1C000
-#define malloc Alloc
-#define calloc(ct, sz) AllocZeroed((ct) * (sz))
-#define free Free
 
 #define FREE_AND_SET_NULL(ptr)          \
 {                                       \
-    free(ptr);                          \
+    Free(ptr);                          \
     ptr = NULL;                         \
 }
 

gflib/sprite.c

@@ -103,7 +103,7 @@ typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *);
 #define DUMMY_OAM_DATA                      \
 {                                           \
     .y = DISPLAY_HEIGHT,                    \
-    .affineMode = 0,                        \
+    .affineMode = ST_OAM_AFFINE_OFF,        \
     .objMode = 0,                           \
     .mosaic = FALSE,                        \
     .bpp = 0,                               \

gflib/text.c

@@ -73,7 +73,7 @@ static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_alt
 static const u8 sUnusedFRLGBlankedDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_blanked_down_arrow.4bpp");
 static const u8 sUnusedFRLGDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_down_arrow.4bpp");
 static const u8 sDownArrowYCoords[] = { 0, 1, 2, 1 };
-static const u8 sWindowVerticalScrollSpeeds[] = { 
+static const u8 sWindowVerticalScrollSpeeds[] = {
     [OPTIONS_TEXT_SPEED_SLOW] = 1,
     [OPTIONS_TEXT_SPEED_MID] = 2,
     [OPTIONS_TEXT_SPEED_FAST] = 4,
@@ -299,7 +299,7 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi
     else
     {
         sTempTextPrinter.textSpeed = 0;
-        
+
         // Render all text (up to limit) at once
         for (j = 0; j < 0x400; ++j)
         {

gflib/text.h

@@ -148,7 +148,6 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
 void DecompressGlyphTile(const void *src_, void *dest_);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
-u8 GetMenuCursorDimensionByFont(u8, u8);
 
 void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);
 void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter);

graphics/naming_screen/buttons.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+139 139 131
+197 189 180
+230 222 213
+74 115 139
+123 172 197
+172 115 74
+213 156 115
+98 156 57
+148 189 106
+189 164 32
+230 222 90
+57 57 57
+57 57 57

graphics/naming_screen/cursor.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 8 8
+222 57 74
+180 65 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 213
+0 0 0
+230 222 213
+0 0 0

graphics/naming_screen/menu.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-96
+16
 106 156 213
 255 255 255
 115 115 115
@@ -17,83 +17,3 @@ JASC-PAL
 230 222 90
 238 230 139
 246 238 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-74 115 139
-98 139 164
-123 172 197
-156 205 230
-180 222 246
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-172 115 74
-189 131 90
-213 156 115
-246 205 164
-255 230 197
-106 156 213
-255 255 255
-57 57 57
-115 115 115
-0 0 0
-0 0 0
-0 0 0
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-98 156 57
-123 172 82
-148 189 106
-197 230 156
-213 238 189
-106 156 213
-255 255 255
-57 57 57
-139 139 131
-197 189 180
-230 222 213
-74 115 139
-123 172 197
-172 115 74
-213 156 115
-98 156 57
-148 189 106
-189 164 32
-230 222 90
-57 57 57
-57 57 57
-106 156 213
-255 8 8
-222 57 74
-180 65 82
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-230 222 213
-0 0 0
-230 222 213
-0 0 0

graphics/naming_screen/page_swap_lower.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+172 115 74
+189 131 90
+213 156 115
+246 205 164
+255 230 197

graphics/naming_screen/page_swap_others.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+98 156 57
+123 172 82
+148 189 106
+197 230 156
+213 238 189

graphics/naming_screen/page_swap_upper.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 213
+255 255 255
+57 57 57
+115 115 115
+0 0 0
+0 0 0
+0 0 0
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+74 115 139
+98 139 164
+123 172 197
+156 205 230
+180 222 246