summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/maps/Route109_SeashoreHouse/map.json8
-rw-r--r--data/maps/Route109_SeashoreHouse/scripts.inc114
2 files changed, 61 insertions, 61 deletions
diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json
index 3f293b291..ebd5583c6 100644
--- a/data/maps/Route109_SeashoreHouse/map.json
+++ b/data/maps/Route109_SeashoreHouse/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "Route109_SeashoreHouse_EventScript_2693FE",
+ "script": "Route109_SeashoreHouse_EventScript_Owner",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route109_SeashoreHouse_EventScript_2694E2",
+ "script": "Route109_SeashoreHouse_EventScript_Dwayne",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route109_SeashoreHouse_EventScript_269518",
+ "script": "Route109_SeashoreHouse_EventScript_Simon",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "1",
"trainer_sight_or_berry_tree_id": "2",
- "script": "Route109_SeashoreHouse_EventScript_2694FD",
+ "script": "Route109_SeashoreHouse_EventScript_Johanna",
"flag": "0"
}
],
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index d74b6b671..bc018c2f0 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -6,56 +6,56 @@ Route109_SeashoreHouse_OnTransition: @ 82693FA
setflag FLAG_LANDMARK_SEASHORE_HOUSE
end
-Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE
+Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE
lock
faceplayer
- goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_269460
- goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_269432
- goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428
- msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT
+ goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop
+ goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_DefeatedTrainers
+ goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction
+ msgbox Route109_SeashoreHouse_Text_SeashoreHouseIntro, MSGBOX_DEFAULT
setflag FLAG_TEMP_2
release
end
-Route109_SeashoreHouse_EventScript_269428:: @ 8269428
- msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428
+ msgbox Route109_SeashoreHouse_Text_ShowMeSomeHotMatches, MSGBOX_DEFAULT
release
end
-Route109_SeashoreHouse_EventScript_269432:: @ 8269432
- msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
+ msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
giveitem_std ITEM_SODA_POP, 6
compare VAR_RESULT, 0
- goto_if_eq Route109_SeashoreHouse_EventScript_269456
+ goto_if_eq Route109_SeashoreHouse_EventScript_BagFull
setflag FLAG_RECEIVED_6_SODA_POP
release
end
-Route109_SeashoreHouse_EventScript_269456:: @ 8269456
- msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_BagFull:: @ 8269456
+ msgbox Route109_SeashoreHouse_Text_BagFull, MSGBOX_DEFAULT
release
end
-Route109_SeashoreHouse_EventScript_269460:: @ 8269460
+Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
showmoneybox 0, 0, 0
- msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO
- compare VAR_RESULT, 1
- goto_if_eq Route109_SeashoreHouse_EventScript_269484
- msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT
+ msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO
+ compare VAR_RESULT, YES
+ goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop
+ msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
-Route109_SeashoreHouse_EventScript_269484:: @ 8269484
+Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
checkmoney 300, 0
- compare VAR_RESULT, 0
- goto_if_eq Route109_SeashoreHouse_EventScript_2694C8
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney
checkitemspace ITEM_SODA_POP, 1
- compare VAR_RESULT, 0
- goto_if_eq Route109_SeashoreHouse_EventScript_2694D5
- msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
+ compare VAR_RESULT, FALSE
+ goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace
+ msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT
takemoney 300, 0
updatemoneybox 0, 0
giveitem_std ITEM_SODA_POP
@@ -65,15 +65,15 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484
release
end
-Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8
- msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT
+Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8
+ msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
-Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
+Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
@@ -81,37 +81,37 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
release
end
-Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2
- trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533
- msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Dwayne:: @ 82694E2
+ trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_DwayneIntro, Route109_SeashoreHouse_Text_DwayneDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+ msgbox Route109_SeashoreHouse_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE
end
-Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD
- trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533
- msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Johanna:: @ 82694FD
+ trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_JohannaIntro, Route109_SeashoreHouse_Text_JohannaDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+ msgbox Route109_SeashoreHouse_Text_JohannaPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_SeashoreHouse_EventScript_269518:: @ 8269518
- trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533
- msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE
+Route109_SeashoreHouse_EventScript_Simon:: @ 8269518
+ trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_SimonIntro, Route109_SeashoreHouse_Text_SimonDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
+ msgbox Route109_SeashoreHouse_Text_SimonPostBattle, MSGBOX_AUTOCLOSE
end
-Route109_SeashoreHouse_EventScript_269533:: @ 8269533
+Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
checktrainerflag TRAINER_DWAYNE
- goto_if_lt Route109_SeashoreHouse_EventScript_269553
+ goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
checktrainerflag TRAINER_JOHANNA
- goto_if_lt Route109_SeashoreHouse_EventScript_269553
+ goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
checktrainerflag TRAINER_SIMON
- goto_if_lt Route109_SeashoreHouse_EventScript_269553
+ goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted
setflag FLAG_DEFEATED_SEASHORE_HOUSE
release
end
-Route109_SeashoreHouse_EventScript_269553:: @ 8269553
+Route109_SeashoreHouse_EventScript_TrainersNotCompleted:: @ 8269553
release
end
-Route109_SeashoreHouse_Text_269555: @ 8269555
+Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555
.string "I'm the owner of the SEASHORE HOUSE.\n"
.string "But you can call me MR. SEA!\p"
.string "What I love above all is to see hot\n"
@@ -120,12 +120,12 @@ Route109_SeashoreHouse_Text_269555: @ 8269555
.string "If you can defeat all the TRAINERS\n"
.string "here, I'll reward your efforts.$"
-Route109_SeashoreHouse_Text_269635: @ 8269635
+Route109_SeashoreHouse_Text_ShowMeSomeHotMatches: @ 8269635
.string "Show me some hot matches!\p"
.string "I run this SEASHORE HOUSE just for\n"
.string "that reason alone!$"
-Route109_SeashoreHouse_Text_269685: @ 8269685
+Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685
.string "You're scorching hot!\n"
.string "Those battles blazed!\l"
.string "I'm more than just satisfied!\p"
@@ -133,59 +133,59 @@ Route109_SeashoreHouse_Text_269685: @ 8269685
.string "streak, I want you to take these.\p"
.string "It's half a dozen bottles of SODA POP!$"
-Route109_SeashoreHouse_Text_26973A: @ 826973A
+Route109_SeashoreHouse_Text_BagFull: @ 826973A
.string "Oh, but hey, your BAG's jammed full.\n"
.string "I'll hang on to these for you.$"
-Route109_SeashoreHouse_Text_26977E: @ 826977E
+Route109_SeashoreHouse_Text_WantToBuySodaPop: @ 826977E
.string "Want to buy some SODA POP?\n"
.string "POKéMON love it!\p"
.string "Just ¥300 a bottle!\n"
.string "Buy some!$"
-Route109_SeashoreHouse_Text_2697C8: @ 82697C8
+Route109_SeashoreHouse_Text_HereYouGo: @ 82697C8
.string "Here you go!$"
-Route109_SeashoreHouse_Text_2697D5: @ 82697D5
+Route109_SeashoreHouse_Text_NotEnoughMoney: @ 82697D5
.string "You don't have the money.$"
-Route109_SeashoreHouse_Text_2697EF: @ 82697EF
+Route109_SeashoreHouse_Text_ThatsTooBad: @ 82697EF
.string "No?\n"
.string "That's too bad.$"
-Route109_SeashoreHouse_Text_269803: @ 8269803
+Route109_SeashoreHouse_Text_DwayneIntro: @ 8269803
.string "If you're looking for a battle in the\n"
.string "SEASHORE HOUSE, you'll find no\l"
.string "hotter TRAINER than me, matey!$"
-Route109_SeashoreHouse_Text_269867: @ 8269867
+Route109_SeashoreHouse_Text_DwayneDefeated: @ 8269867
.string "That was a hot battle!\n"
.string "I can accept that loss, matey!$"
-Route109_SeashoreHouse_Text_26989D: @ 826989D
+Route109_SeashoreHouse_Text_DwaynePostBattle: @ 826989D
.string "Whenever I'm in SLATEPORT, I enjoy\n"
.string "hot battles and ice-cold SODA POP!$"
-Route109_SeashoreHouse_Text_2698E3: @ 82698E3
+Route109_SeashoreHouse_Text_JohannaIntro: @ 82698E3
.string "Boring battles aren't worth the effort.\p"
.string "Fiery hot battles are what toughen up\n"
.string "TRAINERS and POKéMON!$"
-Route109_SeashoreHouse_Text_269947: @ 8269947
+Route109_SeashoreHouse_Text_JohannaDefeated: @ 8269947
.string "That's hot!$"
-Route109_SeashoreHouse_Text_269953: @ 8269953
+Route109_SeashoreHouse_Text_JohannaPostBattle: @ 8269953
.string "Whew, I'm all thirsty.\n"
.string "Maybe I'll have a SODA POP.$"
-Route109_SeashoreHouse_Text_269986: @ 8269986
+Route109_SeashoreHouse_Text_SimonIntro: @ 8269986
.string "I'm going to show you how great\n"
.string "my POKéMON are, but don't cry!$"
-Route109_SeashoreHouse_Text_2699C5: @ 82699C5
+Route109_SeashoreHouse_Text_SimonDefeated: @ 82699C5
.string "…I lost, but I won't cry…$"
-Route109_SeashoreHouse_Text_2699DF: @ 82699DF
+Route109_SeashoreHouse_Text_SimonPostBattle: @ 82699DF
.string "If one of my POKéMON knew the move\n"
.string "for carrying me across water on its\l"
.string "back, I could get rid of this inner tube.$"