Merge with pret

2022-07-06 17:43:40 -07:00
commit 836895cc57
@@ -451,13 +451,6 @@ Replace `<output of nproc>` with the number that the `nproc` command returned.

 `nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).

-## Debug info
-
-To build **pokeemerald.elf** with enhanced debug info:
-```bash
-make DINFO=1
-```
-
 ## devkitARM's C compiler

 This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run:
@@ -534,7 +527,7 @@ devkitARM is now installed.

 devkitARM is now installed.

-## Installing devkitARM on Arch Linux
+### 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.
@@ -552,7 +545,7 @@ devkitARM is now installed.

 devkitARM is now installed.

-## Other toolchains
+### Other toolchains

 To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`.
 ```bash
@@ -564,6 +557,14 @@ make TOOLCHAIN="/usr/local/arm-none-eabi"
 ```
 To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present.

+### Building with debug info under a modern toolchain
+
+To build **pokeemerald.elf** with debug symbols under a modern toolchain:
+```bash
+make modern DINFO=1
+```
+Note that this is not necessary for a non-modern build since those are built with debug symbols by default.
+
 # Useful additional tools

 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
@@ -107,7 +107,7 @@ LIBPATH := -L ../../tools/agbcc/lib
 LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
 CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
+override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
 ROM := $(MODERN_ROM_NAME)
 OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
 LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
@@ -100,9 +100,9 @@
 	special CallTrainerHillFunction
 	.endm

-	@ Set the challenge mode to HILL_TAG_* (Normal, Variety, Unique, or Expert)
-	.macro trainerhill_settag tag:req
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
-	copyvar VAR_0x8005, \tag
+	@ Set the challenge mode to HILL_MODE_* (Normal, Variety, Unique, or Expert)
+	.macro trainerhill_setmode mode:req
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_MODE
+	copyvar VAR_0x8005, \mode
 	special CallTrainerHillFunction
 	.endm
@@ -5,6 +5,10 @@
 .set LOCALID_PLAYER, 13
 .set LOCALID_OPPONENT, 15

+.set NO_DRAW,       0
+.set DRAW_TRAINER,  1
+.set DRAW_TUCKER,   2
+
 BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
@@ -12,10 +16,6 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
 	.byte 0

-	.set NO_DRAW,       0
-	.set DRAW_TRAINER,  1
-	.set DRAW_TUCKER,   2
-
 BattleFrontier_BattleDomeBattleRoom_OnTransition:
 	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
@@ -364,7 +364,8 @@ BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2:
@ Unused
 BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit:
 	.string "You appear to have reached the limit\n"
-	.string "for Battle Points…\pPlease exchange some Battle Points\n"
+	.string "for Battle Points…\p"
+	.string "Please exchange some Battle Points\n"
 	.string "for prizes, then return…$"

 BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting:
@@ -22,18 +22,20 @@ BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
 	end

 BattleFrontier_Lounge2_EventScript_GiveAdvice::
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 0, BattleFrontier_Lounge2_EventScript_BufferSingle
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 1, BattleFrontier_Lounge2_EventScript_BufferDouble
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 2, BattleFrontier_Lounge2_EventScript_BufferMulti
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BufferMultiLink
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_BufferBattleDome
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 5, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 6, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 7, BattleFrontier_Lounge2_EventScript_BufferBattleArena
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 8, BattleFrontier_Lounge2_EventScript_BufferBattlePike
-	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 9, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
-	call_if_le VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BattleTowerNews
-	call_if_ge VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_FacilityNews
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_SINGLES, BattleFrontier_Lounge2_EventScript_BufferSingle
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_DOUBLES, BattleFrontier_Lounge2_EventScript_BufferDouble
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_MULTIS, BattleFrontier_Lounge2_EventScript_BufferMulti
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BufferMultiLink
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_BufferBattleDome
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_FACTORY, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PALACE, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_ARENA, BattleFrontier_Lounge2_EventScript_BufferBattleArena
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PIKE, BattleFrontier_Lounge2_EventScript_BufferBattlePike
+	call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PYRAMID, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
+@ <= FRONTIER_MANIAC_TOWER_LINK is any Battle Tower mode
+	call_if_le VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BattleTowerNews
+@ >= FRONTIER_MANIAC_DOME is any facility other than Battle Tower
+	call_if_ge VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_FacilityNews
 	special ShowFrontierManiacMessage
 	waitmessage
 	waitbuttonpress
@@ -157,7 +157,7 @@ TrainerHill_Entrance_EventScript_ChooseChallenge::
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_CancelEntry
 	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
-	trainerhill_settag VAR_RESULT
+	trainerhill_setmode VAR_RESULT
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
@@ -12,7 +12,7 @@ MysteryGiftScript_AlteringCave_:
 	release
 	end

-sText_MysteryGiftAlteringCave::
+sText_MysteryGiftAlteringCave:
 	.string "Thank you for using the MYSTERY\n"
 	.string "GIFT System.\p"
 	.string "There appears to be a rumor about\n"
@@ -4,145 +4,192 @@ gText_HighlyAppealingMove::
 	.string "A highly appealing move.$"

 gText_UserMoreEasilyStartled::
-	.string "After this move, the user is\nmore easily startled.$"
+	.string "After this move, the user is\n"
+	.string "more easily startled.$"

 gText_GreatAppealButNoMoreToEnd::
-	.string "Makes a great appeal, but\nallows no more to the end.$"
+	.string "Makes a great appeal, but\n"
+	.string "allows no more to the end.$"

 gText_UsedRepeatedlyWithoutBoringJudge::
-	.string "Can be repeatedly used\nwithout boring the JUDGE.$"
+	.string "Can be repeatedly used\n"
+	.string "without boring the JUDGE.$"

 gText_AvoidStartledByOthersOnce::
-	.string "Can avoid being startled\nby others once.$"
+	.string "Can avoid being startled\n"
+	.string "by others once.$"

 gText_AvoidStartledByOthers::
-	.string "Can avoid being startled\nby others.$"
+	.string "Can avoid being startled\n"
+	.string "by others.$"

 gText_AvoidStartledByOthersLittle::
-	.string "Can avoid being startled\nby others a little.$"
+	.string "Can avoid being startled\n"
+	.string "by others a little.$"

 gText_UserLessLikelyStartled::
-	.string "After this move, the user is\nless likely to be startled.$"
+	.string "After this move, the user is\n"
+	.string "less likely to be startled.$"

 gText_SlightlyStartleFrontMon::
-	.string "Slightly startles the\nPOKéMON in front.$"
+	.string "Slightly startles the\n"
+	.string "POKéMON in front.$"

 gText_SlightlyStartleAppealed::
-	.string "Slightly startles those\nthat have made appeals.$"
+	.string "Slightly startles those\n"
+	.string "that have made appeals.$"

 gText_StartleAppealedBeforeUser::
-	.string "Startles the POKéMON that\nappealed before the user.$"
+	.string "Startles the POKéMON that\n"
+	.string "appealed before the user.$"

 gText_StartleAllAppealed::
-	.string "Startles all POKéMON that\nhave done their appeals.$"
+	.string "Startles all POKéMON that\n"
+	.string "have done their appeals.$"

 gText_BadlyStartleFrontMon::
-	.string "Badly startles the\nPOKéMON in front.$"
+	.string "Badly startles the\n"
+	.string "POKéMON in front.$"

 gText_BadlyStartleAppealed::
-	.string "Badly startles those that\nhave made appeals.$"
+	.string "Badly startles those that\n"
+	.string "have made appeals.$"

 gText_StartleAppealedBeforeUser2::
-	.string "Startles the POKéMON that\nappealed before the user.$"
+	.string "Startles the POKéMON that\n"
+	.string "appealed before the user.$"

 gText_StartleAllAppealed2::
-	.string "Startles all POKéMON that\nhave done their appeals.$"
+	.string "Startles all POKéMON that\n"
+	.string "have done their appeals.$"

 gText_ShiftJudgesAttentionFromOthers::
-	.string "Shifts the JUDGE's\nattention from others.$"
+	.string "Shifts the JUDGE's\n"
+	.string "attention from others.$"

 gText_StartleMonHasJudgesAttention::
-	.string "Startles the POKéMON that\nhas the JUDGE's attention.$"
+	.string "Startles the POKéMON that\n"
+	.string "has the JUDGE's attention.$"

 gText_JamOthersMissesTurn::
-	.string "Jams the others, and misses\none turn of appeals.$"
+	.string "Jams the others, and misses\n"
+	.string "one turn of appeals.$"

 gText_StartleMonsMadeSameTypeAppeal::
-	.string "Startles POKéMON that\nmade a same-type appeal.$"
+	.string "Startles POKéMON that\n"
+	.string "made a same-type appeal.$"

 gText_BadlyStartleCoolAppeals::
-	.string "Badly startles POKéMON\nthat made COOL appeals.$"
+	.string "Badly startles POKéMON\n"
+	.string "that made COOL appeals.$"

 gText_BadlyStartleBeautyAppeals::
-	.string "Badly startles POKéMON\nthat made BEAUTY appeals.$"
+	.string "Badly startles POKéMON\n"
+	.string "that made BEAUTY appeals.$"

 gText_BadlyStartleCuteAppeals::
-	.string "Badly startles POKéMON\nthat made CUTE appeals.$"
+	.string "Badly startles POKéMON\n"
+	.string "that made CUTE appeals.$"

 gText_BadlyStartleSmartAppeals::
-	.string "Badly startles POKéMON\nthat made SMART appeals.$"
+	.string "Badly startles POKéMON\n"
+	.string "that made SMART appeals.$"

 gText_BadlyStartleToughAppeals::
-	.string "Badly startles POKéMON\nthat made TOUGH appeals.$"
+	.string "Badly startles POKéMON\n"
+	.string "that made TOUGH appeals.$"

 gText_MakeMonAfterUserNervous::
-	.string "Makes one POKéMON after\nthe user nervous.$"
+	.string "Makes one POKéMON after\n"
+	.string "the user nervous.$"

 gText_MakeAllMonsAfterUserNervous::
-	.string "Makes all POKéMON after\nthe user nervous.$"
+	.string "Makes all POKéMON after\n"
+	.string "the user nervous.$"

 gText_WorsenConditionOfThoseMadeAppeals::
-	.string "Worsens the condition of\nthose that made appeals.$"
+	.string "Worsens the condition of\n"
+	.string "those that made appeals.$"

 gText_BadlyStartleMonsGoodCondition::
-	.string "Badly startles POKéMON in\ngood condition.$"
+	.string "Badly startles POKéMON in\n"
+	.string "good condition.$"

 gText_AppealGreatIfPerformedFirst::
-	.string "The appeal works great if\nperformed first.$"
+	.string "The appeal works great if\n"
+	.string "performed first.$"

 gText_AppealGreatIfPerformedLast::
-	.string "The appeal works great if\nperformed last.$"
+	.string "The appeal works great if\n"
+	.string "performed last.$"

 gText_AppealAsGoodAsThoseBeforeIt::
-	.string "Makes the appeal as good\nas those before it.$"
+	.string "Makes the appeal as good\n"
+	.string "as those before it.$"

 gText_AppealAsGoodAsOneBeforeIt::
-	.string "Makes the appeal as good\nas the one before it.$"
+	.string "Makes the appeal as good\n"
+	.string "as the one before it.$"

 gText_AppealBetterLaterItsPerformed::
-	.string "The appeal works better\nthe later it is performed.$"
+	.string "The appeal works better\n"
+	.string "the later it is performed.$"

 gText_AppealVariesDependingOnTiming::
-	.string "The appeal's quality varies\ndepending on its timing.$"
+	.string "The appeal's quality varies\n"
+	.string "depending on its timing.$"

 gText_WorksWellIfSameTypeAsBefore::
-	.string "Works well if it's the same\ntype as the one before.$"
+	.string "Works well if it's the same\n"
+	.string "type as the one before.$"

 gText_WorksWellIfDifferentTypeAsBefore::
-	.string "Works well if different in\ntype than the one before.$"
+	.string "Works well if different in\n"
+	.string "type than the one before.$"

 gText_AffectedByAppealInFront::
-	.string "Affected by how well the\nappeal in front goes.$"
+	.string "Affected by how well the\n"
+	.string "appeal in front goes.$"

 gText_UpsConditionHelpsPreventNervousness::
-	.string "Ups the user's condition.\nHelps prevent nervousness.$"
+	.string "Ups the user's condition.\n"
+	.string "Helps prevent nervousness.$"

 gText_AppealWorksWellIfConditionGood::
-	.string "The appeal works well if the\nuser's condition is good.$"
+	.string "The appeal works well if the\n"
+	.string "user's condition is good.$"

 gText_NextAppealMadeEarlier::
-	.string "The next appeal can be\nmade earlier next turn.$"
+	.string "The next appeal can be\n"
+	.string "made earlier next turn.$"

 gText_NextAppealMadeLater::
-	.string "The next appeal can be\nmade later next turn.$"
+	.string "The next appeal can be\n"
+	.string "made later next turn.$"

 gText_TurnOrderMoreEasilyScrambled::
-	.string "Makes the next turn's order\nmore easily scrambled.$"
+	.string "Makes the next turn's order\n"
+	.string "more easily scrambled.$"

 gText_ScrambleOrderOfNextAppeals::
-	.string "Scrambles the order of\nappeals on the next turn.$"
+	.string "Scrambles the order of\n"
+	.string "appeals on the next turn.$"

 gText_AppealExcitesAudienceInAnyContest::
-	.string "An appeal that excites the\naudience in any CONTEST.$"
+	.string "An appeal that excites the\n"
+	.string "audience in any CONTEST.$"

 gText_BadlyStartlesMonsGoodAppeals::
-	.string "Badly startles all POKéMON\nthat made good appeals.$"
+	.string "Badly startles all POKéMON\n"
+	.string "that made good appeals.$"

 gText_AppealBestMoreCrowdExcited::
-	.string "The appeal works best the\nmore the crowd is excited.$"
+	.string "The appeal works best the\n"
+	.string "more the crowd is excited.$"

 gText_TemporarilyStopCrowdExcited::
-	.string "Temporarily stops the\ncrowd from growing excited.$"
+	.string "Temporarily stops the\n"
+	.string "crowd from growing excited.$"

@ Unused move names

@@ -5,7 +5,8 @@ gText_PkmnTransferredSomeonesPC::
 	.string "BOX “{STR_VAR_1}.”$"

 gText_PkmnTransferredLanettesPC::
-	.string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p"
+	.string "{STR_VAR_2} was transferred to\n"
+	.string "LANETTE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"

@@ -3,7 +3,7 @@ gBirchDexRatingText_AreYouCurious::
 	.string "Are you curious about how your\n"
 	.string "POKéDEX is coming along?$"

-gBirchDexRatingText_Cancel:
+gBirchDexRatingText_Cancel::
 	.string "Hm? Oh, you haven't caught enough\n"
 	.string "POKéMON to make it worthwhile.$"

@@ -1,5 +1,6 @@
 gText_WantToUseSurf::
-	.string "The water is dyed a deep blue…\nWould you like to SURF?$"
+	.string "The water is dyed a deep blue…\n"
+	.string "Would you like to SURF?$"

 gText_PlayerUsedSurf::
 	.string "{STR_VAR_1} used SURF!$"
@@ -166,7 +166,7 @@ BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle::
 	.string "I'll be looking forward to your\n"
 	.string "next battle!$"

-gTVBravoTrainerBattleTowerText00::
+BravoTrainerBattleTower_Text_Intro::
 	.string "Yeah!\n"
 	.string "It's BRAVO TRAINER time!\p"
 	.string "Today, we're going to profile {STR_VAR_1},\n"
@@ -174,12 +174,12 @@ gTVBravoTrainerBattleTowerText00::
 	.string "For the challenge, {STR_VAR_1} entered\n"
 	.string "one wicked {STR_VAR_2}.$"

-gTVBravoTrainerBattleTowerText01::
+BravoTrainerBattleTower_Text_NewRecord::
 	.string "The pair set a new record of {STR_VAR_2} wins\n"
 	.string "in a row in {STR_VAR_1} competition!\l"
 	.string "Bravo, TRAINER!$"

-gTVBravoTrainerBattleTowerText02::
+BravoTrainerBattleTower_Text_Lost::
 	.string "The twosome finally succumbed to\n"
 	.string "{STR_VAR_1} in match number {STR_VAR_2}.\l"
 	.string "Nice try, TRAINER!\p"
@@ -188,7 +188,7 @@ gTVBravoTrainerBattleTowerText02::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the match with {STR_VAR_1}.$"

-gTVBravoTrainerBattleTowerText03::
+BravoTrainerBattleTower_Text_Won::
 	.string "The twosome won it all by defeating\n"
 	.string "{STR_VAR_1}'s {STR_VAR_2} thoroughly.\l"
 	.string "Bravo, TRAINER!\p"
@@ -197,7 +197,7 @@ gTVBravoTrainerBattleTowerText03::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the moment of glory.$"

-gTVBravoTrainerBattleTowerText04::
+BravoTrainerBattleTower_Text_LostFinal::
 	.string "After a string of wins, the pair finally\n"
 	.string "succumbed to {STR_VAR_1}'s {STR_VAR_2},\l"
 	.string "their final hurdle.\p"
@@ -208,7 +208,7 @@ gTVBravoTrainerBattleTowerText04::
 	.string "We asked the TRAINER for impressions\n"
 	.string "on battling the celebrity pair.$"

-gTVBravoTrainerBattleTowerText05::
+BravoTrainerBattleTower_Text_Satisfied::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm satisfied!”\p"
 	.string "Now isn't that a refreshing reply?\n"
@@ -218,7 +218,7 @@ gTVBravoTrainerBattleTowerText05::
 	.string "I found out exactly how satisfied\n"
 	.string "when I heard the TRAINER say this:$"

-gTVBravoTrainerBattleTowerText06::
+BravoTrainerBattleTower_Text_Unsatisfied::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm not satisfied…”\p"
 	.string "Our TRAINER was obviously a little down\n"
@@ -228,22 +228,22 @@ gTVBravoTrainerBattleTowerText06::
 	.string "Anyway, I found out how dissatisfied\n"
 	.string "our TRAINER was when I heard this:$"

-gTVBravoTrainerBattleTowerText07::
+BravoTrainerBattleTower_Text_None1::
 	.string "None$"

-gTVBravoTrainerBattleTowerText08::
+BravoTrainerBattleTower_Text_None2::
 	.string "None$"

-gTVBravoTrainerBattleTowerText09::
+BravoTrainerBattleTower_Text_None3::
 	.string "None$"

-gTVBravoTrainerBattleTowerText10::
+BravoTrainerBattleTower_Text_None4::
 	.string "None$"

-gTVBravoTrainerBattleTowerText11::
+BravoTrainerBattleTower_Text_Response::
 	.string "“{STR_VAR_1}.”$"

-gTVBravoTrainerBattleTowerText12::
+BravoTrainerBattleTower_Text_ResponseSatisfied::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that great?\p"
 	.string "It really expresses {STR_VAR_2}'s joy,\n"
@@ -252,7 +252,7 @@ gTVBravoTrainerBattleTowerText12::
 	.string "end… It really was what you'd call\l"
 	.string "“{STR_VAR_1}”!$"

-gTVBravoTrainerBattleTowerText13::
+BravoTrainerBattleTower_Text_ResponseUnsatisfied::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that fitting?\p"
 	.string "That battle with {STR_VAR_3} at the\n"
@@ -261,7 +261,7 @@ gTVBravoTrainerBattleTowerText13::
 	.string "{STR_VAR_2}'s disappointment comes across\n"
 	.string "loud and clear, I'd say!$"

-gTVBravoTrainerBattleTowerText14::
+BravoTrainerBattleTower_Text_Outro::
 	.string "Bravo, {STR_VAR_1}!\n"
 	.string "Bravo, {STR_VAR_2}!\p"
 	.string "I hope we can count on seeing\n"
@@ -1,51 +0,0 @@
-
-# Bugs and Glitches
-
-These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` and `UBFIX` preprocessor variables will fix some of these automatically. `UBFIX` will already be defined for MODERN builds.
-
-Fixes are written in the `diff` format. If you've used Git before, this should look familiar:
-
-```diff
- this is some code
-delete red - lines
-+add green + lines
-```
-
-## Contents
-
- [Scrolling through items in the bag causes the image to flicker](#scrolling-through-items-in-the-bag-causes-the-image-to-flicker)
-
-
-## Scrolling through items in the bag causes the image to flicker
-
-**Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c):
-```diff
-+void HideBagItemIconSprite(u8 id)
-+{
-+	u8 *spriteId = &gBagMenu->spriteId[10];
-+	if (spriteId[id] != 0xFF)
-+	{
-+		gSprites[spriteId[id]].invisible = TRUE;
-+	}
-+}
-
-```
-
-and its corresponding declaration in [include/item_menu_icons.h](https://github.com/pret/pokeemerald/blob/master/include/item_menu_icons.h):
-
-```diff
-+void HideBagItemIconSprite(u8 id);
-
-```
-
-Then edit `BagMenu_MoveCursorCallback` in [src/item_menu.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu.c):
-
-```diff
-	...
-{
-	RemoveBagItemIconSprite(1 ^ gBagMenu->itemIconSlot);
-+	HideBagItemIconSprite(gBagMenu->itemIconSlot ^ 1);
-+	RemoveBagItemIconSprite(gBagMenu->itemIconSlot);
-	if (itemIndex != LIST_CANCEL)
-	...
-```
@@ -76,7 +76,7 @@ s32 ChangeBgY(u8 bg, s32 value, u8 op);
 s32 ChangeBgY_ScreenOff(u8 bg, s32 value, u8 op);
 s32 GetBgY(u8 bg);
 void SetBgAffine(u8 bg, s32 srcCenterX, s32 srcCenterY, s16 dispCenterX, s16 dispCenterY, s16 scaleX, s16 scaleY, u16 rotationAngle);
-u8 Unused_AdjustBgMosaic(u8 a1, u8 a2);
+u8 Unused_AdjustBgMosaic(u8 val, u8 mode);
 void SetBgTilemapBuffer(u8 bg, void *tilemap);
 void UnsetBgTilemapBuffer(u8 bg);
 void* GetBgTilemapBuffer(u8 bg);
@@ -96,7 +96,7 @@ static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameC
 static u8 IndexOfSpriteTileTag(u16 tag);
 static void AllocSpriteTileRange(u16 tag, u16 start, u16 count);
 static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset);
-static void UpdateSpriteMatrixAnchorPos(struct Sprite* sprite, s32 a1, s32 a2);
+static void UpdateSpriteMatrixAnchorPos(struct Sprite*, s32, s32);

 typedef void (*AnimFunc)(struct Sprite *);
 typedef void (*AnimCmdFunc)(struct Sprite *);
@@ -634,14 +634,11 @@ void DestroySprite(struct Sprite *sprite)
    }
 }

-void ResetOamRange(u8 a, u8 b)
+void ResetOamRange(u8 start, u8 end)
 {
    u8 i;
-
-    for (i = a; i < b; i++)
-    {
+    for (i = start; i < end; i++)
        gMain.oamBuffer[i] = *(struct OamData *)&gDummyOamData;
-    }
 }

 void LoadOam(void)
@@ -270,7 +270,7 @@ u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 sub
 u8 CreateInvisibleSprite(void (*callback)(struct Sprite *));
 u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority);
 void DestroySprite(struct Sprite *sprite);
-void ResetOamRange(u8 a, u8 b);
+void ResetOamRange(u8 start, u8 end);
 void LoadOam(void);
 void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d);
 void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode);
@@ -326,14 +326,14 @@ void RunTextPrinters(void)
        {
            if (sTextPrinters[i].active)
            {
-                u16 temp = RenderFont(&sTextPrinters[i]);
-                switch (temp)
+                u16 renderCmd = RenderFont(&sTextPrinters[i]);
+                switch (renderCmd)
                {
                case RENDER_PRINT:
                    CopyWindowToVram(sTextPrinters[i].printerTemplate.windowId, COPYWIN_GFX);
                case RENDER_UPDATE:
-                    if (sTextPrinters[i].callback != 0)
-                        sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, temp);
+                    if (sTextPrinters[i].callback != NULL)
+                        sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, renderCmd);
                    break;
                case RENDER_FINISH:
                    sTextPrinters[i].active = FALSE;
@@ -0,0 +1 @@
+1;;;9989:;;;1;;;;;,99:;;;;;1;;;;isMMMMŃMMMMis@;UUUUŃUUUU1AiAĹŮŮŮšŮŮŮĆAsi;ÔŰ›sss›ŰĚ1si;Í›ssDss›Ő1si;ÔŰ›sss›ŰĚ1siAŃŰŰŰ›ŰŰŰŰAs@;ÇÇŰŰŰÇÇ1Ai;MMggŰŰŰggMM1si;UU××ŃŰŰ××UU1si;9999:;;9999:sissssssssssssss
@@ -0,0 +1 @@
+1;;;9989:;;;‘FFFFFFFFFFFFFx‘F›|›››}›|›{›z›‘F}FFFFFFFFFFFF‘F›~›››}›~›ł›››‘FFFFFFFFFFFFF›‘F›}›|›{›z›|›››‘F›FFFFFFFFFFFF‘F›|›}›~›››}›~›‘FFFFFFFFFFFFFł‘Ö–››–ÖŰÖ–››–Ö›Ö–››–ÖŰŰŰÖ–››–Ö–››–ÖŰŰŰŰŰÖ–››–Ö–››–ÖŰŰŰÖ–››–Ö‘Ö–››–ÖŰÖ–››–Ö›
@@ -0,0 +1 @@
+�áñù>ù>}~=x½=x}~y>ù>ñá
@@ -0,0 +1 @@
+ﾑﾛﾛﾛﾙﾙ�圀屁ﾑﾛﾛﾛﾕﾕﾃ�歯屁屁ﾑﾛﾛﾕﾋﾋﾋ絜給副屁ﾑﾛﾕﾋﾋﾋﾋ絜給虚屁ﾑﾛﾋﾋﾋﾋﾋ絜給給屁ﾑﾕﾋﾋﾋﾋﾋ綷給給副ﾑﾋﾋﾋﾋﾌﾌ驎結給魚ﾑﾌﾌﾌﾌ顥顥絜給魚ﾑﾕﾕﾕﾕ隯隯絜給魚ﾑﾋﾋﾋﾋ�驎�給魚ﾑﾌﾋﾋﾋﾋﾋ驎給給憲ﾑﾛﾋﾋﾋﾋﾋ顥給給屁ﾑﾛﾌﾋﾋﾋﾋ絜給旧屁ﾑﾛﾛﾌﾋﾋﾋ絜給憲屁ﾑﾛﾛﾛﾌﾌﾋ綷血屁屁ﾑﾛﾛﾛﾛﾛﾌ蕙屁屁屁
@@ -0,0 +1 @@
+1;;;9999:;;;�������F��������������F������������FF�FF���������F66�66F�������F�FF�FF�F�����F6F���ۛF6F����F6�����ۛ6F��������֖��ۛ�����F6�����ۛ6F����F6F���ۛF6F�����F�FF�FF�F�������F66�66F���������FF�FF������������F��������������F�������
@@ -0,0 +1 @@
+�ÁoAcA`ADAUAUÁÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
@@ -0,0 +1 @@
+155;&&%9:;;;1++;44++43????;1++;;;44;3???;;1++55555;3???;?1+444+44;,???;;1+;5;+;5;5;???;1+;+;+;+;+;???;14;+;4;+5+;;?;;1;;4;;;444?;;;?
@@ -0,0 +1 @@
+1;5;9&%9:;5;1;+;;+++++;;;+;1;+;;+++++>>;+;1;+;;+++++;;;+;?;+;;+++++;>>+;1;+;;++,++;;;+;1?+;;,,;,,>>;+;1;+5555;55555+;?;,,,,,;,,,,,,;1;??;55;55555551???;++5+++++++1??;;++++++++++1;;;?,,,,,,,,,,
@@ -0,0 +1 @@
+�ĺ?í˝%„˝ß!~A	}	÷Aůy˙˙
@@ -0,0 +1 @@
+1;55&&%&:;5;1;,,,+$$$$,;;,;-;;;;+;;;;5;55;3;2!0+;2!0+;,+;35;;;,5;;;+;;+;4,;2!0+20;+20,;15;;5;,;;5,;;551,20+205;+2!0,,15;;+;;+;,;5;;;1,20+20+;20+20;1555+;;+;;5+;551+,,,20+20,,;,,1+;;5;;+;;5;;;;1,20+;;,20,20;51;;;,;;;;;;;;;,
@@ -0,0 +1 @@
+��s@@�Q�S�Q�Q�Q�Q�QPP��
@@ -0,0 +1 @@
+ﾑﾕﾕﾕﾙﾙﾅﾆﾎﾕﾛﾕﾑﾋﾄﾄﾛﾛﾄﾄﾄﾌﾌﾌﾋﾛﾋﾑﾋﾛﾛﾛﾛﾛﾛﾛﾋﾛﾋﾑﾋﾛﾕﾕﾕﾕﾕﾟﾋﾛﾋﾑﾋﾛﾋﾋﾋﾄﾄﾛﾋﾛﾋﾑﾋﾛﾋﾛﾛﾄﾋﾋﾟﾕﾕﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾛﾄﾄﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾕﾕﾟﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾄﾄﾛﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾟﾕﾕﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾄﾄﾛﾄﾄﾄﾛﾋﾑﾋﾛﾋ屁屁屁ﾛﾕﾕﾕﾋﾑﾄﾛﾋﾛﾛﾛﾛﾛ巒ﾋﾋﾋﾋﾑﾛﾛﾋﾛﾛﾛﾛﾛ巒ﾋﾋﾋﾋﾑﾛﾛﾄﾛﾛﾛﾛﾛ巒ﾄﾄﾄﾄ
@@ -0,0 +1 @@
+1555&&8&.55;icddddqqqrdddcsicssssssssssscsicssssssssssscsicCA@ABAAJBAAcsicsssssssdssscsicACKCCABB@A@csicssdsssssssscsicA@BBAABJBABcsicsssssssdssscsicABACKAAA@CAcsicssssdsssssscsicA@CABBAJBABcsidsssssssdsssdsiCCABBACAA@BABsiBsssssssssssBs
@@ -0,0 +1 @@
+1;;;9&%9:;;;+$$$+;;;;;3+;;;+55;553+;;;+,,;,,3+;;;+4,+;;;,,;;;;;;;3+;;;54+;;;+,;;++;;;+,,+;;;+;;3+;;;+;+;3+555+;,;4,,,,,
@@ -0,0 +1 @@
+������������������������������������������������ۛ����������������������������������������������������������������������������������������������������������������������������������������������������������������������������
@@ -0,0 +1 @@
+1;;;9&%9:;;;-;;;5,#$#,5;;;;���������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
@@ -0,0 +1 @@
+1;;;9989:;;;iFFFFFFFFFFFF|FiFzsssysss}sssFiFsFFFFFFFFFFFFiFss{s|s{szsssFiFFFFFFFFFFFFzFiFsssss}|s|s{sFiFFFFFF|FFFFFFF詮屁妲;;;F屁屁F詮屁妲;;;F屁屁F詮屁妲;;;F屁屁F�FFFFFxFFFFFFF�驎驎驎z驎驎礰�FFFFFFFFFFFF�|硺硤硎﨤礼神礼
@@ -0,0 +1 @@
+ّ�����منَ���ٍ�����ًٌٌٌٌٌٌ���ٌٌٌ�����ً�����ّ��������ً�����ًًٌٌٌٌٌّ�ٌ�ًٌٌٌٌّ���ً���������ًّ���ً�ً�ً�����ًّ�ً�ً�ً�ًٌٌٌ��ًّ�ً�ً�ً�ً�����ًّ�ً�ً�ً�ً�ًٌٌٌٌّ�ً�ً�ً�ً�����ًّ�ً�ً�ً�ً�����ٌّ�ً�ٌ�ً�ٌٌٌٌٌ�ّ��ً���ً�������ّ��ٌ���ٌ�������
@@ -0,0 +1 @@
+1;;;9989:;;;@AAAAABCCCCC@AA@ûCAAAB@CABBBûA@AûAAAB@CACCû@A@AAûCAB@CCCûA@A@AAABBB@CCCAA@A@AAAþþþûþþþAA@A@AAAþþþûþþþAA@A@ABAþûûûûûþAA@A@AAAþþþûþþþAA@A@AAAþþþûþþþAA@A@BACCCA@BBBBA@A@@AûAAAAAAAûA@A@@ûCCAAABBBBû@A@ûCCAACCCCCCCûA@BBBBBBBBBBBBBB
@@ -0,0 +1 @@
+1;;;9989:;;;����@@���@@�������@��@�@��B�����@���������B���B�����������B��B�����������B��B�����������B��B�����������B��B�����������B���B���������B�����B�������B�������B�����B���������A���B�����֖����A�B�������֖����@�����֜
@@ -0,0 +1 @@
+1;;;9989:;;;����������������������������������������������������������������������������������������������������������������������������������
@@ -0,0 +1 @@
+1;;;9989:;;;i@mAsA^AqBEEEEECsdsCsdsAsEEEEEe@sBmBsBmBEEEEElsAsds@sds@sBsAi@mAs@mCsCmBsBm@sdsCsdsAsdsAsdeBsBmAs@mBsAmBslsAsdsBsdsBsdsBi@mAsAmBsCmAsCm@sdsCsdsCsdsBsdeBsBmCsBmBsAm@sls@sdsAsdsBsdsBi@mBsBmCs@mAs@m@sds@sds@sdsCsd
@@ -62,7 +62,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
 bool8 IsContest(void);
 s8 BattleAnimAdjustPanning(s8 pan);
 s8 BattleAnimAdjustPanning2(s8 pan);
-s16 KeepPanInRange(s16 a, int oldPan);
+s16 KeepPanInRange(s16 panArg, int oldPan);
 s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
 void RelocateBattleBgPal(u16 paletteNum, u16 *dest, u32 offset, bool8 largeScreen);
 void ResetBattleAnimBg(bool8);
@@ -91,14 +91,14 @@ bool8 AnimTranslateLinear(struct Sprite *sprite);
 void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
 u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId);
 void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite);
-u16 ArcTan2Neg(s16 a, s16 b);
-void TrySetSpriteRotScale(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation);
+u16 ArcTan2Neg(s16 x, s16 y);
+void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
 void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite);
 void TranslateSpriteLinearAndFlicker(struct Sprite *sprite);
 void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite);
 void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite);
-void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2);
-s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 a2);
+void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset);
+s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr);
 u8 GetBattlerYCoordWithElevation(u8 battlerId);
 void WaitAnimForDuration(struct Sprite *sprite);
 void AnimTravelDiagonally(struct Sprite *sprite);
@@ -109,7 +109,7 @@ void *LoadPointerFromVars(s16 bottom, s16 top);
 void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr);
 void InitPrioritiesForVisibleBattlers(void);
 void GetBattleAnimBg1Data(struct BattleAnimBgData*);
-void GetBattleAnimBgData(struct BattleAnimBgData*, u32 arg1);
+void GetBattleAnimBgData(struct BattleAnimBgData*, u32 bgId);
 u8 GetBattlerSpriteSubpriority(u8 battlerId);
 bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
 void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
@@ -118,7 +118,7 @@ void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
 void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
 void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
 void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
-u32 GetBattleBgPalettesMask(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
+u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 anim1, bool8 anim2);
 u32 GetBattleMonSpritePalettesMask(u8 playerLeft, u8 playerRight, u8 opponentLeft, u8 opponentRight);
 u8 AnimDummyReturnArg(u8 battler);
 s16 CloneBattlerSpriteWithBlend(u8);
@@ -129,7 +129,7 @@ void AnimLoadCompressedBgGfx(u32, const u32*, u32);
 void UpdateAnimBg3ScreenSize(bool8);
 void TranslateSpriteInGrowingCircle(struct Sprite *);
 void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
-void PrepareEruptAnimTaskData(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
+void PrepareEruptAnimTaskData(struct Task *task, u8 spriteId, s16 xScaleStart, s16 yScaleStart, s16 xScaleEnd, s16 yScaleEnd, u16 duration);
 u8 UpdateEruptAnimTask(struct Task *task);
 void DestroyAnimSpriteAndDisableBlend(struct Sprite *);
 void AnimLoadCompressedBgTilemap(u32 bgId, const void *src);
@@ -146,7 +146,7 @@ void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union Aff
 bool8 RunAffineAnimFromTaskData(struct Task *task);
 void AnimThrowProjectile(struct Sprite *sprite);
 void GetBgDataForTransform(struct BattleAnimBgData *dest, u8 battlerId);
-u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, bool32 ignoreDeoxysForm);
+u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, bool32 ignoreDeoxysForm);
 void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite);
 void TradeMenuBouncePartySprites(struct Sprite *sprite);
 void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
@@ -181,7 +181,7 @@ enum
 u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);

 bool8 IsBattlerSpritePresent(u8 battlerId);
-void ClearBattleAnimBg(u32 arg0);
+void ClearBattleAnimBg(u32 bgId);
 u8 GetAnimBattlerSpriteId(u8 wantedBattler);
 bool8 IsDoubleBattle(void);
 u8 GetBattleBgPaletteNum(void);
@@ -209,11 +209,11 @@ void AnimTask_HorizontalShake(u8 taskId);
 void TryShinyAnimation(u8 battler, struct Pokemon *mon);
 u8 ItemIdToBallId(u16 itemId);
 u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
-u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, u8 ballId);
+u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 spritePalNum, u32 selectedPalettes, u8 ballId);

 // battle_anim_utility_funcs.c
 void InitStatsChangeAnimation(u8);
-void StartMonScrollingBgMask(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette);
+void StartMonScrollingBgMask(u8 taskId, int unused, u16 scrollSpeed, u8 battler, bool8 includePartner, u8 numFadeSteps, u8 fadeStepDelay, u8 duration, const u32 *gfx, const u32 *tilemap, const u32 *palette);

 // battle_anim_effects_1.c
 void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite);
@@ -227,9 +227,9 @@ void AnimWaterPulseRing(struct Sprite *sprite);
 void DestroyAnimSpriteAfterTimer(struct Sprite *sprite);

 // battle_anim_smokescreen.c
-u8 SmokescreenImpact(s16 x, s16 y, u8 a3);
+u8 SmokescreenImpact(s16 x, s16 y, bool8 persist);

-u32 UnpackSelectedBattleBgPalettes(s16);
+u32 UnpackSelectedBattlePalettes(s16);

 u8 GetBattlerSpriteFinal_Y(u8, u16, u8);

@@ -222,7 +222,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId);
 void BtlController_EmitChooseAction(u8 bufferId, u8 action, u16 itemId);
 void BtlController_EmitYesNoBox(u8 bufferId);
 void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
-void BtlController_EmitChooseItem(u8 bufferId, u8* arg1);
+void BtlController_EmitChooseItem(u8 bufferId, u8* battlePartyOrder);
 void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 slotId, u8 abilityId, u8* data);
 void BtlController_EmitCmd23(u8 bufferId); // unused
 void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
@@ -233,11 +233,11 @@ void BtlController_EmitStatusXor(u8 bufferId, u8 b); // unused
 void BtlController_EmitDataTransfer(u8 bufferId, u16 size, void *data);
 void BtlController_EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused
 void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *data); // unused
-void BtlController_EmitCmd32(u8 bufferId, u16 size, void *c); // unused
-void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
-void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
-void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1);
-void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
+void BtlController_EmitCmd32(u8 bufferId, u16 size, void *data); // unused
+void BtlController_EmitTwoReturnValues(u8 bufferId, u8 ret8, u16 ret16);
+void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 partyId, u8 *battlePartyOrder);
+void BtlController_EmitOneReturnValue(u8 bufferId, u16 ret);
+void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 ret);
 void BtlController_EmitClearUnkVar(u8 bufferId); // unused
 void BtlController_EmitSetUnkVar(u8 bufferId, u8 b); // unused
 void BtlController_EmitClearUnkFlag(u8 bufferId); // unused
@@ -254,7 +254,7 @@ void BtlController_EmitHidePartyStatusSummary(u8 bufferId);
 void BtlController_EmitEndBounceEffect(u8 bufferId);
 void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
 void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
-void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 record);
+void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 mode, bool32 record);
 void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
 void BtlController_EmitEndLinkBattle(u8 bufferId, u8 battleOutcome);

@@ -19,7 +19,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battlerId);
 void BattleGfxSfxDummy3(u8 gender);
 void FreeTrainerFrontPicPalette(u16 frontPicId);
 bool8 BattleLoadAllHealthBoxesGfx(u8 state);
-void LoadBattleBarGfx(u8 arg0);
+void LoadBattleBarGfx(u8 unused);
 bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId);
 void ClearSpritesHealthboxAnimData(void);
 void CopyAllBattleSpritesInvisibilities(void);
@@ -71,10 +71,10 @@ void UpdateOamPriorityInAllHealthboxes(u8 priority);
 void InitBattlerHealthboxCoords(u8 battler);
 void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent);
 void SwapHpBarsWithHpText(void);
-u8 CreatePartyStatusSummarySprites(u8 battler, struct HpAndStatus *partyInfo, u8 arg2, bool8 isBattleStart);
+u8 CreatePartyStatusSummarySprites(u8 battler, struct HpAndStatus *partyInfo, bool8 skipPlayer, bool8 isBattleStart);
 void Task_HidePartyStatusSummary(u8 taskId);
 void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elementId);
-s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 arg3);
+s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 unused);
 u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale);
 u8 GetHPBarLevel(s16 hp, s16 maxhp);
				`@@ -0,0 +1 @@`
				`1;;;9989:;;;1;;;;;,99:;;;;;1;;;;isMMMMŃMMMMis@;UUUUŃUUUU1AiAĹŮŮŮšŮŮŮĆAsi;ÔŰ›sss›ŰĚ1si;Í›ssDss›Ő1si;ÔŰ›sss›ŰĚ1siAŃŰŰŰ›ŰŰŰŰAs@;ÇÇŰŰŰÇÇ1Ai;MMggŰŰŰggMM1si;UU××ŃŰŰ××UU1si;9999:;;9999:sissssssssssssss`
				`@@ -0,0 +1 @@`
				`1;;;9989:;;;‘FFFFFFFFFFFFFx‘F›\|›››}›\|›{›z›‘F}FFFFFFFFFFFF‘F›~›››}›~›ł›››‘FFFFFFFFFFFFF›‘F›}›\|›{›z›\|›››‘F›FFFFFFFFFFFF‘F›\|›}›~›››}›~›‘FFFFFFFFFFFFFł‘Ö–››–ÖŰÖ–››–Ö›Ö–››–ÖŰŰŰÖ–››–Ö–››–ÖŰŰŰŰŰÖ–››–Ö–››–ÖŰŰŰÖ–››–Ö‘Ö–››–ÖŰÖ–››–Ö›`
				`@@ -0,0 +1 @@`
				ﾑﾛﾛﾛﾙﾙ�圀屁ﾑﾛﾛﾛﾕﾕﾃ�歯屁屁ﾑﾛﾛﾕﾋﾋﾋ絜給副屁ﾑﾛﾕﾋﾋﾋﾋ絜給虚屁ﾑﾛﾋﾋﾋﾋﾋ絜給給屁ﾑﾕﾋﾋﾋﾋﾋ綷給給副ﾑﾋﾋﾋﾋﾌﾌ驎結給魚ﾑﾌﾌﾌﾌ顥顥絜給魚ﾑﾕﾕﾕﾕ隯隯絜給魚ﾑﾋﾋﾋﾋ�驎�給魚ﾑﾌﾋﾋﾋﾋﾋ驎給給憲ﾑﾛﾋﾋﾋﾋﾋ顥給給屁ﾑﾛﾌﾋﾋﾋﾋ絜給旧屁ﾑﾛﾛﾌﾋﾋﾋ絜給憲屁ﾑﾛﾛﾛﾌﾌﾋ綷血屁屁ﾑﾛﾛﾛﾛﾛﾌ蕙屁屁屁
				`@@ -0,0 +1 @@`
				1;;;9999:;;;��F��F��FF�FF��F66�66F��F�FF�FF�F��F6F��ۛF6F��F6��ۛ6F��֖��ۛ��F6��ۛ6F��F6F��ۛF6F��F�FF�FF�F��F66�66F��FF�FF��F��F��
				`@@ -0,0 +1 @@`
				�ÁoAcA`ADAUAUÁÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
				`@@ -0,0 +1 @@`
				`155;&&%9:;;;1++;44++43????;1++;;;44;3???;;1++55555;3???;?1+444+44;,???;;1+;5;+;5;5;???;1+;+;+;+;+;???;14;+;4;+5+;;?;;1;;4;;;444?;;;?`
				`@@ -0,0 +1 @@`
				`1;5;9&%9:;5;1;+;;+++++;;;+;1;+;;+++++>>;+;1;+;;+++++;;;+;?;+;;+++++;>>+;1;+;;++,++;;;+;1?+;;,,;,,>>;+;1;+5555;55555+;?;,,,,,;,,,,,,;1;??;55;55555551???;++5+++++++1??;;++++++++++1;;;?,,,,,,,,,,`
				`@@ -0,0 +1 @@`
				`1;55&&%&:;5;1;,,,+$$$$,;;,;-;;;;+;;;;5;55;3;2!0+;2!0+;,+;35;;;,5;;;+;;+;4,;2!0+20;+20,;15;;5;,;;5,;;551,20+205;+2!0,,15;;+;;+;,;5;;;1,20+20+;20+20;1555+;;+;;5+;551+,,,20+20,,;,,1+;;5;;+;;5;;;;1,20+;;,20,20;51;;;,;;;;;;;;;,`
				`@@ -0,0 +1 @@`
				`��s@@�Q�S�Q�Q�Q�Q�QPP��`
				`@@ -0,0 +1 @@`
				ﾑﾕﾕﾕﾙﾙﾅﾆﾎﾕﾛﾕﾑﾋﾄﾄﾛﾛﾄﾄﾄﾌﾌﾌﾋﾛﾋﾑﾋﾛﾛﾛﾛﾛﾛﾛﾋﾛﾋﾑﾋﾛﾕﾕﾕﾕﾕﾟﾋﾛﾋﾑﾋﾛﾋﾋﾋﾄﾄﾛﾋﾛﾋﾑﾋﾛﾋﾛﾛﾄﾋﾋﾟﾕﾕﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾛﾄﾄﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾕﾕﾟﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾄﾄﾛﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾋﾋﾟﾕﾕﾋﾛﾋﾑﾋﾛﾋﾛﾛﾛﾄﾄﾛﾄﾄﾄﾛﾋﾑﾋﾛﾋ屁屁屁ﾛﾕﾕﾕﾋﾑﾄﾛﾋﾛﾛﾛﾛﾛ巒ﾋﾋﾋﾋﾑﾛﾛﾋﾛﾛﾛﾛﾛ巒ﾋﾋﾋﾋﾑﾛﾛﾄﾛﾛﾛﾛﾛ巒ﾄﾄﾄﾄ