summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-05-06 14:48:14 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-05-06 14:48:14 -0400
commitd3127e359447688e37cad222ae1586c6ec202ab0 (patch)
treeace0980ae648527f3afa5d4b80ede4cb70479b2b /data/scripts
parent554a26b6bece91e89cacd2ed2138b1dc66b31789 (diff)
Sync common scripts up to prof_birch.inc
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/obtain_item.inc4
-rw-r--r--data/scripts/players_house.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 0dced2de8..5cd27302a 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -126,7 +126,7 @@ EventScript_PickUpItem: @ 819FF52
EventScript_NoRoomToPickUpItem: @ 819FF65
msgbox Message_ObtainedItem
- msgbox Message_BagFull
+ msgbox Text_TooBadBagIsFull
setvar VAR_RESULT, FALSE
return
@@ -155,7 +155,7 @@ EventScript_PickUpHiddenItem:
EventScript_NoRoomToPickUpHiddenItem:
msgbox Message_FoundOneItem
- msgbox Message_BagFull
+ msgbox Text_TooBadBagIsFull
setvar VAR_RESULT, FALSE
releaseall
end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 63cfd18dc..2b746dbe0 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -275,7 +275,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT
giveitem ITEM_AMULET_COIN
compare VAR_RESULT, 0
- goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
+ goto_if_eq Common_EventScript_ShowBagIsFull
msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_AMULET_COIN
release
@@ -293,7 +293,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80
LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A
closemessage
- call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA
+ call Common_EventScript_OutOfCenterPartyHeal
incrementgamestat GAME_STAT_RESTED_AT_HOME
msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT
release