summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s4
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc2
-rw-r--r--data/maps/MauvilleCity_GameCorner/scripts.inc4
-rw-r--r--data/maps/Route110_TrickHouseEnd/scripts.inc2
-rw-r--r--data/maps/Route110_TrickHouseEntrance/scripts.inc2
-rw-r--r--data/maps/Route111_OldLadysRestStop/map.json2
-rw-r--r--data/maps/Route111_OldLadysRestStop/scripts.inc30
-rw-r--r--data/maps/Route111_WinstrateFamilysHouse/map.json8
-rw-r--r--data/maps/Route111_WinstrateFamilysHouse/scripts.inc56
-rw-r--r--data/maps/Route113_GlassWorkshop/scripts.inc2
-rw-r--r--data/maps/Route114_LanettesHouse/map.json8
-rw-r--r--data/maps/Route114_LanettesHouse/scripts.inc50
-rw-r--r--data/maps/Route119_House/map.json14
-rw-r--r--data/maps/Route119_House/scripts.inc12
14 files changed, 98 insertions, 98 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 532e87d36..b1e637bf0 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -825,12 +825,12 @@ Common_EventScript_BagIsFull:: @ 827205E
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
return
-Route114_LanettesHouse_EventScript_272067:: @ 8272067
+Common_EventScript_ShowNoRoomForDecor:: @ 8272067
msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
release
end
-Common_EventScript_NoRoomLeftForAnother:: @ 8272071
+Common_EventScript_NoRoomForDecor:: @ 8272071
msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
return
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 71aead3e4..190c2b677 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -127,7 +127,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911
- call Common_EventScript_NoRoomLeftForAnother
+ call Common_EventScript_NoRoomForDecor
msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT
closemessage
releaseall
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 98f4a2a77..7e4180b92 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -213,7 +213,7 @@ MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79
end
MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87
- call Common_EventScript_NoRoomLeftForAnother
+ call Common_EventScript_NoRoomForDecor
goto MauvilleCity_GameCorner_EventScript_20FD20
end
@@ -446,7 +446,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0
end
MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA
- call Common_EventScript_NoRoomLeftForAnother
+ call Common_EventScript_NoRoomForDecor
msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT
release
end
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 46c4c316e..db5d2b5f2 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -206,7 +206,7 @@ Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
return
Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
- call Common_EventScript_NoRoomLeftForAnother
+ call Common_EventScript_NoRoomForDecor
msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
return
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index ab3ef25aa..8c8dae533 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -445,7 +445,7 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
compare VAR_RESULT, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A
compare VAR_RESULT, 0
- call_if_eq Common_EventScript_NoRoomLeftForAnother
+ call_if_eq Common_EventScript_NoRoomForDecor
msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT
releaseall
end
diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json
index c915bfb95..71afc39f8 100644
--- a/data/maps/Route111_OldLadysRestStop/map.json
+++ b/data/maps/Route111_OldLadysRestStop/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_OldLadysRestStop_EventScript_22A920",
+ "script": "Route111_OldLadysRestStop_EventScript_OldLady",
"flag": "0"
}
],
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 63b373fbf..0df1e6b6e 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -6,49 +6,49 @@ Route111_OldLadysRestStop_OnTransition: @ 822A91C
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
end
-Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920
+Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920
lock
faceplayer
- msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO
+ msgbox Route111_OldLadysRestStop_Text_RestUpHere, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq Route111_OldLadysRestStop_EventScript_22A941
+ goto_if_eq Route111_OldLadysRestStop_EventScript_Rest
compare VAR_RESULT, NO
- goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E
+ goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
end
-Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941
- msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT
+Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941
+ msgbox Route111_OldLadysRestStop_Text_TakeYourTimeRestUp, MSGBOX_DEFAULT
closemessage
call Common_EventScript_OutOfCenterPartyHeal
- msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO
+ msgbox Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq Route111_OldLadysRestStop_EventScript_22A941
+ goto_if_eq Route111_OldLadysRestStop_EventScript_Rest
compare VAR_RESULT, NO
- goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E
+ goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
end
-Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E
- msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT
+Route111_OldLadysRestStop_EventScript_DeclineRest:: @ 822A96E
+ msgbox Route111_OldLadysRestStop_Text_DontNeedToBeShy, MSGBOX_DEFAULT
release
end
-Route111_OldLadysRestStop_Text_22A978: @ 822A978
+Route111_OldLadysRestStop_Text_RestUpHere: @ 822A978
.string "Oh, dear, dear.\n"
.string "Aren't your POKéMON exhausted?\p"
.string "If you'd like, rest up here.\n"
.string "That's a fine idea! You should do that.$"
-Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC
+Route111_OldLadysRestStop_Text_TakeYourTimeRestUp: @ 822A9EC
.string "That's right.\n"
.string "Take your time and rest up!$"
-Route111_OldLadysRestStop_Text_22AA16: @ 822AA16
+Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest: @ 822AA16
.string "Oh, dear, dear.\n"
.string "Are your POKéMON still tired?\p"
.string "You should take another rest here.\n"
.string "That's a fine idea. You should do that.$"
-Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F
+Route111_OldLadysRestStop_Text_DontNeedToBeShy: @ 822AA8F
.string "Is that so?\n"
.string "You don't need to be shy about it.$"
diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json
index fed3dab3f..640de23cb 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/map.json
+++ b/data/maps/Route111_WinstrateFamilysHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8",
+ "script": "Route111_WinstrateFamilysHouse_EventScript_Vivi",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D",
+ "script": "Route111_WinstrateFamilysHouse_EventScript_Victor",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2",
+ "script": "Route111_WinstrateFamilysHouse_EventScript_Victoria",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD",
+ "script": "Route111_WinstrateFamilysHouse_EventScript_Vicky",
"flag": "0"
}
],
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 312bf739f..387b8f630 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -1,63 +1,63 @@
Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C
.byte 0
-Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D
+Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D
lock
faceplayer
setvar VAR_0x8008, 2
- msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+ msgbox Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou, MSGBOX_DEFAULT
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2
+Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2
lock
faceplayer
setvar VAR_0x8008, 3
- goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_22A4DA
- msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace
+ msgbox Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace, MSGBOX_DEFAULT
giveitem_std ITEM_MACHO_BRACE
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_MACHO_BRACE
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA
- msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: @ 822A4DA
+ msgbox Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles, MSGBOX_DEFAULT
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8
+Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8
lock
faceplayer
setvar VAR_0x8008, 1
- msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+ msgbox Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers, MSGBOX_DEFAULT
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD
+Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD
lock
faceplayer
setvar VAR_0x8008, 4
- goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E
- msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT
+ goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo
+ msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrong, MSGBOX_DEFAULT
setflag FLAG_TEMP_4
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E
- msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT
- goto Route111_WinstrateFamilysHouse_EventScript_22A52C
+Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: @ 822A51E
+ msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort, MSGBOX_DEFAULT
+ goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
end
-Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C
+Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: @ 822A52C
closemessage
applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539
+Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539
.string "You're the first TRAINER I've seen who\n"
.string "deploys POKéMON so masterfully.\p"
.string "But, I should tell you--my son is\n"
@@ -65,7 +65,7 @@ Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539
.string "He even took the POKéMON LEAGUE\n"
.string "challenge, I'll have you know.$"
-Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4
+Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4
.string "We use this MACHO BRACE to more\n"
.string "effectively strengthen our POKéMON\l"
.string "in training.\p"
@@ -73,18 +73,18 @@ Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4
.string "I don't know if you need it, but we\l"
.string "would like you to have our MACHO BRACE.$"
-Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4
+Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles: @ 822A6B4
.string "When it comes to POKéMON battles,\n"
.string "we tend to be pretty passionate.$"
-Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7
+Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers: @ 822A6F7
.string "Mommy is stronger than Daddy.\p"
.string "I'm stronger than Mommy.\p"
.string "And Grandma's stronger than me!\p"
.string "But my big brother is even stronger\n"
.string "than Grandma.$"
-Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780
+Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780
.string "There's no question that you're strong.\p"
.string "But if you were to battle my grandson,\n"
.string "you'd end up crying in frustration.\p"
@@ -95,7 +95,7 @@ Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780
.string "Knowing my grandson, he could be the\n"
.string "CHAMPION already!$"
-Route111_WinstrateFamilysHouse_Text_22A89B: @ 822A89B
+Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort: @ 822A89B
.string "My grandson must be challenging the\n"
.string "POKéMON LEAGUE CHAMPION by now.\p"
.string "Knowing my grandson, he could be the\n"
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index b959cf523..30d453abd 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -238,7 +238,7 @@ Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072
end
Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081
- call Common_EventScript_NoRoomLeftForAnother
+ call Common_EventScript_NoRoomForDecor
msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT
release
end
diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json
index b4b1b412b..6709d055e 100644
--- a/data/maps/Route114_LanettesHouse/map.json
+++ b/data/maps/Route114_LanettesHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route114_LanettesHouse_EventScript_22B2D2",
+ "script": "Route114_LanettesHouse_EventScript_Lanette",
"flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE"
}
],
@@ -52,7 +52,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route114_LanettesHouse_EventScript_22B309"
+ "script": "Route114_LanettesHouse_EventScript_Notebook"
},
{
"type": "sign",
@@ -60,7 +60,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route114_LanettesHouse_EventScript_22B345"
+ "script": "Route114_LanettesHouse_EventScript_PC"
},
{
"type": "sign",
@@ -68,7 +68,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "Route114_LanettesHouse_EventScript_22B345"
+ "script": "Route114_LanettesHouse_EventScript_PC"
}
]
} \ No newline at end of file
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 59d82ffe1..b772228e4 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -6,49 +6,49 @@ Route114_LanettesHouse_OnTransition: @ 822B2CE
setflag FLAG_LANDMARK_LANETTES_HOUSE
end
-Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2
+Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2
lock
faceplayer
- goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF
+ goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice
setflag FLAG_SYS_PC_LANETTE
- msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT
+ msgbox Route114_LanettesHouse_Text_EverythingClutteredKeepThis, MSGBOX_DEFAULT
givedecoration_std DECOR_LOTAD_DOLL
- compare VAR_RESULT, 0
- goto_if_eq Route114_LanettesHouse_EventScript_272067
+ compare VAR_RESULT, FALSE
+ goto_if_eq Common_EventScript_ShowNoRoomForDecor
setflag FLAG_RECEIVED_DOLL_LANETTE
release
end
-Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF
- msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT
+Route114_LanettesHouse_EventScript_OfferAdvice:: @ 822B2FF
+ msgbox Route114_LanettesHouse_Text_OrganizeYourBoxes, MSGBOX_DEFAULT
release
end
-Route114_LanettesHouse_EventScript_22B309:: @ 822B309
+Route114_LanettesHouse_EventScript_Notebook:: @ 822B309
lockall
- msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO
+ msgbox Route114_LanettesHouse_Text_ResearchNotesPage1, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq Route114_LanettesHouse_EventScript_22B327
- msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT
+ goto_if_eq Route114_LanettesHouse_EventScript_NotebookPage2
+ msgbox Route114_LanettesHouse_Text_ClosedTheNotebook, MSGBOX_DEFAULT
releaseall
end
-Route114_LanettesHouse_EventScript_22B327:: @ 822B327
- msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO
+Route114_LanettesHouse_EventScript_NotebookPage2:: @ 822B327
+ msgbox Route114_LanettesHouse_Text_ResearchNotesPage2, MSGBOX_YESNO
compare VAR_RESULT, YES
- call_if_eq Route114_LanettesHouse_EventScript_22B33C
+ call_if_eq Route114_LanettesHouse_EventScript_NotebookPage3
releaseall
end
-Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C
- msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT
+Route114_LanettesHouse_EventScript_NotebookPage3:: @ 822B33C
+ msgbox Route114_LanettesHouse_Text_ResearchNotesPage3, MSGBOX_DEFAULT
return
-Route114_LanettesHouse_EventScript_22B345:: @ 822B345
- msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN
+Route114_LanettesHouse_EventScript_PC:: @ 822B345
+ msgbox Route114_LanettesHouse_Text_EmailFromBill, MSGBOX_SIGN
end
-Route114_LanettesHouse_Text_22B34E: @ 822B34E
+Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E
.string "LANETTE: Oh! {PLAYER}{KUN}!\p"
.string "I'm sorry everything is so cluttered…\n"
.string "When I get engrossed in research,\l"
@@ -56,13 +56,13 @@ Route114_LanettesHouse_Text_22B34E: @ 822B34E
.string "This is embarrassing… Please keep\n"
.string "this a secret in exchange for this.$"
-Route114_LanettesHouse_Text_22B407: @ 822B407
+Route114_LanettesHouse_Text_OrganizeYourBoxes: @ 822B407
.string "May I offer advice about my POKéMON\n"
.string "Storage System?\p"
.string "You should organize your BOXES so you\n"
.string "can tell which POKéMON are in them.$"
-Route114_LanettesHouse_Text_22B485: @ 822B485
+Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485
.string "It's LANETTE's research notes.\n"
.string "There's information about BOXES.\p"
.string "Design BOXES to hold 30 POKéMON each.\p"
@@ -70,7 +70,7 @@ Route114_LanettesHouse_Text_22B485: @ 822B485
.string "420 POKéMON on the PC system.\p"
.string "Keep reading?$"
-Route114_LanettesHouse_Text_22B53C: @ 822B53C
+Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C
.string "A marking system should be added to\n"
.string "make POKéMON easier to organize.\p"
.string "The name and wallpaper design of each\n"
@@ -78,7 +78,7 @@ Route114_LanettesHouse_Text_22B53C: @ 822B53C
.string "the stored POKéMON.\p"
.string "Keep reading?$"
-Route114_LanettesHouse_Text_22B5EF: @ 822B5EF
+Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF
.string "When storing a POKéMON, it should be\n"
.string "sent to the BOX inspected last.\p"
.string "If that BOX is full, the received\n"
@@ -87,10 +87,10 @@ Route114_LanettesHouse_Text_22B5EF: @ 822B5EF
.string "it is automatically selected as the BOX\l"
.string "to which POKéMON are sent.$"
-Route114_LanettesHouse_Text_22B6E4: @ 822B6E4
+Route114_LanettesHouse_Text_ClosedTheNotebook: @ 822B6E4
.string "{PLAYER} closed the notebook.$"
-Route114_LanettesHouse_Text_22B6FC: @ 822B6FC
+Route114_LanettesHouse_Text_EmailFromBill: @ 822B6FC
.string "There's an e-mail from someone on\n"
.string "the PC.\p"
.string "“… … … … … … …\p"
diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json
index 31d84664f..f07156653 100644
--- a/data/maps/Route119_House/map.json
+++ b/data/maps/Route119_House/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_270966",
+ "script": "Route119_House_EventScript_Woman",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 3,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route119_House_EventScript_27096F",
+ "script": "Route119_House_EventScript_Wingull",
"flag": "0"
}
],
diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc
index 4d4826bdf..b6915aaa3 100644
--- a/data/maps/Route119_House/scripts.inc
+++ b/data/maps/Route119_House/scripts.inc
@@ -1,27 +1,27 @@
Route119_House_MapScripts:: @ 8270965
.byte 0
-Route119_House_EventScript_270966:: @ 8270966
- msgbox Route119_House_Text_270982, MSGBOX_NPC
+Route119_House_EventScript_Woman:: @ 8270966
+ msgbox Route119_House_Text_RumorAboutCaveOfOrigin, MSGBOX_NPC
end
-Route119_House_EventScript_27096F:: @ 827096F
+Route119_House_EventScript_Wingull:: @ 827096F
lock
faceplayer
waitse
playmoncry SPECIES_WINGULL, 0
- msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT
+ msgbox Route119_House_Text_Wingull, MSGBOX_DEFAULT
waitmoncry
release
end
-Route119_House_Text_270982: @ 8270982
+Route119_House_Text_RumorAboutCaveOfOrigin: @ 8270982
.string "I heard about a cave called the CAVE\n"
.string "OF ORIGIN.\p"
.string "People rumor that the spirits of\n"
.string "POKéMON are revived there. Could\l"
.string "something like that really happen?$"
-Route119_House_Text_270A17: @ 8270A17
+Route119_House_Text_Wingull: @ 8270A17
.string "WINGULL: Pihyoh!$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 05:53:45 +0000