Merge branch 'dev' into release

Author: voloved

README.md

@@ -8,10 +8,15 @@ Link to [Patch File is Here](https://drive.google.com/drive/folders/1GFChFDEmOJH
 To build it, use [LunarIPS](https://fusoya.eludevisibility.org/lips/) and your legally obtained copy of Pokémon Emerald (those devs who made the game 20 years ago gotta eat too).  
 
  ![Example](https://i.imgur.com/KSMvc0h.png)  
+## v2.3.1
+ - Fly Will Only Be Displayed by Pokémon Who Cannot Learn iit If Flying Is Currently Allowed.
+ - Bugfix where Dad giving SS Ticket causes him to not move.
+
 ## v2.3.0
  - Now Able to Access PC from PokéNav in caves, houses, and gyms after receiving Balance Badge.
    - [Pokémon withdrawn from the PokéNav will not be healed from when they were put into the PC.](https://github.com/pret/pokeemerald/wiki/Make-Pokemon-Not-Heal-When-Going-into-PC)
  - Move Status is now displayed in summary screen, TM bag pocket, and TM Case.
+ - [Added TM Case that Displays Which Pokémon Can Learn the Move.](https://www.pokecommunity.com/showpost.php?p=10378278)
  - [Added Ability to Display Mugshots](https://www.pokecommunity.com/showpost.php?p=10593661&postcount=444) [Credit: Anon822]
    - Prof. Birch's lab now has a book that shows the Type Chart and one that shows the Nature Chart.
    - Nature Chart is shown when choosing mints from Jaime.

data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc

@@ -408,9 +408,11 @@ PlayersHouse_1F_Text_PortsInSlateportLilycove:
 PlayersHouse_1F_Text_BetterGetBackToGym:
 	.string "I'd better get back to PETALBURG GYM.\p"
 	.string "MOM, thanks for looking after the house\n"
-	.string "while I'm away.\p"
-	.string "Also, {PLAYER}, I left a\n"
-	.string "few gifts in your PC.$"
+	.string "while I'm away.$"
+
+PlayersHouse_1F_Text_AddedItemsToPC:
+	.string "Oh {PLAYER}, before I forget:\n"
+	.string "I left a few gifts in your PC.$"
 
 PlayersHouse_1F_Text_DadShouldStayLonger:
 	.string "MOM: That DAD of yours…\p"

data/scripts/obtain_item.inc

@@ -90,7 +90,9 @@ EventScript_ObtainedItemMessage:
 	message gText_ObtainedTheItem
 EventScript_ContinueObtainedItem:
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitfanfare
 	call EventScript_PutItemMsg
 	setvar VAR_RESULT, TRUE
@@ -176,7 +178,9 @@ EventScript_PickUpItemContinueAdd::
 	call_if_eq VAR_0x8008, TRUE, EventScript_FoundTMHM
 	call_if_eq VAR_0x8008, FALSE, EventScript_FoundItem
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitfanfare
 	waitmessage
 	bufferitemnameplural STR_VAR_2, VAR_0x8004, VAR_0x8005
@@ -249,7 +253,9 @@ EventScript_FoundHiddenItem::
 
 EventScript_PutHiddenItemInPocket::
 	delay 10
+	copyvar VAR_TEMP_B, VAR_0x8009
 	showitemdesc
+	copyvar VAR_0x8009, VAR_TEMP_B
 	waitmessage
 	waitfanfare
 	bufferitemnameplural STR_VAR_2, VAR_0x8004, 1

data/scripts/players_house.inc

@@ -445,6 +445,9 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
 	call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_MomApproachDadMale
 	call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_MomApproachDadFemale
 	msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT
+	applymovement VAR_0x8009, Common_Movement_FacePlayer
+	waitmovement 0
+	msgbox PlayersHouse_1F_Text_AddedItemsToPC, MSGBOX_DEFAULT
 	closemessage
 	call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_DadExitsMale
 	call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_DadExitsFemale

graphics/intro/copyright.png

@@ -2664,7 +2664,7 @@ static u8 SlotToShowFly(void)
 // Returns the slot to display fly in if no one in the party can learn fly. Returns the party size otherwise
 {
     u8 i;
-    if (CanLearnFlyInParty())
+    if (CanLearnFlyInParty() || !Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType))
         return PARTY_SIZE;
     for (i = 0; i < PARTY_SIZE; i++)
     {