summaryrefslogtreecommitdiff
path: root/data/maps/FiveIsland_WaterLabyrinth
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FiveIsland_WaterLabyrinth')
-rw-r--r--data/maps/FiveIsland_WaterLabyrinth/map.json4
-rw-r--r--data/maps/FiveIsland_WaterLabyrinth/scripts.inc60
-rw-r--r--data/maps/FiveIsland_WaterLabyrinth/text.inc28
3 files changed, 53 insertions, 39 deletions
diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json
index 627ee6b87..2950419f3 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/map.json
+++ b/data/maps/FiveIsland_WaterLabyrinth/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FiveIsland_WaterLabyrinth_EventScript_16884E",
+ "script": "FiveIsland_WaterLabyrinth_EventScript_EggGentleman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
- "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9",
+ "script": "FiveIsland_WaterLabyrinth_EventScript_Alize",
"flag": "0"
}
],
diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
index ed82fc5eb..f1080d094 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc
@@ -1,68 +1,70 @@
FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
.byte 0
-FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E
+FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
- goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3
- goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C
- msgbox gUnknown_818A80D
- specialvar VAR_RESULT, Special_GetLeadMonFriendship
- compare VAR_RESULT, 6
- goto_if_eq EventScript_1688AC
- msgbox gUnknown_818A88F
+ goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment
+ goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg
+ msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons
+ specialvar VAR_RESULT, GetLeadMonFriendship
+ compare VAR_RESULT, 6 @ Max friendship
+ goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
+ msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee
release
end
-EventScript_168895:: @ 8168895
+FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment:: @ 8168895
famechecker FAMECHECKER_DAISY, 2
- msgbox gUnknown_818AA0C
+ msgbox FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy
release
end
-EventScript_1688AC:: @ 81688AC
- msgbox gUnknown_818A8A6
- goto EventScript_1688BA
+FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship:: @ 81688AC
+ msgbox FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis
+ goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg
end
-EventScript_1688BA:: @ 81688BA
+FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA
getpartysize
compare VAR_RESULT, PARTY_SIZE
- goto_if_eq EventScript_16891F
+ goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor 3
playfanfare MUS_FANFA1
- message Text_18A91F
+ message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan
waitfanfare
waitmessage
call EventScript_1A6675
- goto EventScript_1688E3
+ goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment
end
-EventScript_1688E3:: @ 81688E3
+@ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it
+@ Otherwise make normal comment
+FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: @ 81688E3
getspeciesname 1, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
- specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
- compare VAR_RESULT, 1
- goto_if_eq EventScript_168895
+ specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
+ compare VAR_RESULT, TRUE
+ goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
- specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
- compare VAR_RESULT, 1
- goto_if_eq EventScript_168895
- msgbox gUnknown_818A9C0
+ specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
+ compare VAR_RESULT, TRUE
+ goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
+ msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou
release
end
-EventScript_16891F:: @ 816891F
+FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg:: @ 816891F
setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG
- msgbox gUnknown_818A940
+ msgbox FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty
release
end
-EventScript_16892C:: @ 816892C
- goto EventScript_1688BA
+FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg:: @ 816892C
+ goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg
end
diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc
index 111671eb9..c4a5542d3 100644
--- a/data/maps/FiveIsland_WaterLabyrinth/text.inc
+++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc
@@ -1,4 +1,4 @@
-gUnknown_818A80D:: @ 818A80D
+FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: @ 818A80D
.string "You travel all over the place,\n"
.string "don't you?\p"
.string "You're not driving your POKéMON\n"
@@ -6,38 +6,39 @@ gUnknown_818A80D:: @ 818A80D
.string "Let me take a look.\n"
.string "… … … … … …$"
-gUnknown_818A88F:: @ 818A88F
+FiveIsland_WaterLabyrinth_Text_HmmISeeIsee:: @ 818A88F
.string "Ah, hmm…\n"
.string "I see, I see…$"
-gUnknown_818A8A6:: @ 818A8A6
+FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis:: @ 818A8A6
.string "Oh, impressive.\n"
.string "You treat your POKéMON right.\p"
.string "I think you can be entrusted with\n"
.string "this.\p"
.string "Please, I'd like you to have this.$"
-Text_18A91F:: @ 818A91F
+FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan:: @ 818A91F
.string "{PLAYER} received an EGG\n"
.string "from the man!$"
-gUnknown_818A940:: @ 818A940
+FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty:: @ 818A940
.string "…Unfortunately, you don't have\n"
.string "space for this in your party.\p"
.string "You'd better come back for it\n"
.string "another time.$"
-Text_18A9A9:: @ 818A9A9
+@ Unused
+FiveIsland_WaterLabyrinth_Text_YouveComeBackForTheEgg:: @ 818A9A9
.string "やあ\n"
.string "タマゴを もらいに\l"
.string "きて くれたんだね$"
-gUnknown_818A9C0:: @ 818A9C0
+FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou:: @ 818A9C0
.string "I received that EGG while I was\n"
.string "traveling.\p"
.string "I'm glad I met someone like you.$"
-gUnknown_818AA0C:: @ 818AA0C
+FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: @ 818AA0C
.string "Oh, hello.\n"
.string "That's a cute {STR_VAR_2}.\p"
.string "Seeing it reminds me of a sweet \n"
@@ -47,3 +48,14 @@ gUnknown_818AA0C:: @ 818AA0C
.string "That little girl's name…\n"
.string "I think it was DAISY.$"
+FiveIsland_WaterLabyrinth_Text_AlizeIntro:: @ 818AAD5
+ .string "This is an excellent environment\n"
+ .string "for raising POKéMON.$"
+
+FiveIsland_WaterLabyrinth_Text_AlizeDefeat:: @ 818AB0B
+ .string "Your POKéMON are growing up\n"
+ .string "admirably well!$"
+
+FiveIsland_WaterLabyrinth_Text_AlizePostBattle:: @ 818AB37
+ .string "You know, I think you have the\n"
+ .string "talent to be a good BREEDER.$"