Merge branch 'master' into clone-union

data/maps/PewterCity_Gym/scripts.inc

@@ -22,9 +22,8 @@ PewterCity_Gym_EventScript_DefeatedBrock::
 
 PewterCity_Gym_EventScript_GiveTM39::
 	msgbox PewterCity_Gym_Text_TakeThisWithYou
-	checkitemspace ITEM_TM39, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq PewterCity_Gym_EventScript_NoRoomForTM39
+	checkitemspace ITEM_TM39
+	goto_if_eq VAR_RESULT, FALSE, PewterCity_Gym_EventScript_NoRoomForTM39
 	giveitem_msg PewterCity_Gym_Text_ReceivedTM39FromBrock, ITEM_TM39
 	setflag FLAG_GOT_TM39_FROM_BROCK
 	msgbox PewterCity_Gym_Text_ExplainTM39
@@ -46,10 +45,8 @@ PewterCity_Gym_EventScript_GymGuy::
 	faceplayer
 	goto_if_set FLAG_DEFEATED_BROCK, PewterCity_Gym_EventScript_GymGuyPostVictory
 	msgbox PewterCity_Gym_Text_LetMeTakeYouToTheTop, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq PewterCity_Gym_EventScript_GymGuyTakeMeToTop
-	compare VAR_RESULT, NO
-	goto_if_eq PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop
+	goto_if_eq VAR_RESULT, YES, PewterCity_Gym_EventScript_GymGuyTakeMeToTop
+	goto_if_eq VAR_RESULT, NO, PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop
 	end
 
 PewterCity_Gym_EventScript_GymGuyPostVictory::

data/maps/PewterCity_Gym/text.inc

@@ -16,7 +16,7 @@ PewterCity_Gym_Text_BrockIntro::
 
 @ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle
 @ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise
-@ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists.
+@ unused array after that, sFlickerArray. Perhaps that's the reason why said array exists.
 PewterCity_Gym_Text_BrockDefeat::
     .string "I took you for granted, and so\n"
     .string "I lost.\p"